From df682d833654f2f42595d6156341439644a8848d Mon Sep 17 00:00:00 2001

From: John Snow <jsnow@redhat.com>

Date: Mon, 23 Nov 2015 17:38:30 +0100

Subject: [PATCH 11/27] qemu-io: Move functions for registering and running

 commands

RH-Author: John Snow <jsnow@redhat.com>

Message-id: <1448300320-7772-12-git-send-email-jsnow@redhat.com>

Patchwork-id: 68439

O-Subject: [RHEL-7.3 qemu-kvm PATCH v2 11/21] qemu-io: Move functions for registering and running commands

Bugzilla: 1272523

RH-Acked-by: Thomas Huth <thuth@redhat.com>

RH-Acked-by: Laszlo Ersek <lersek@redhat.com>

RH-Acked-by: Max Reitz <mreitz@redhat.com>

From: Kevin Wolf <kwolf@redhat.com>

Signed-off-by: Kevin Wolf <kwolf@redhat.com>

Reviewed-by: Eric Blake <eblake@redhat.com>

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>

(cherry picked from commit c2cdf5c5892165cbe7d3567bff5930521bc52669)

Signed-off-by: John Snow <jsnow@redhat.com>

Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>

Conflicts:

    qemu-io-cmds.c: Conflicts over sleep_f, again.

Signed-off-by: John Snow <jsnow@redhat.com>

---

 cmd.c          | 113 ---------------------------------

 cmd.h          |  11 +---

 qemu-io-cmds.c | 194 +++++++++++++++++++++++++++++++++++++++++----------------

 qemu-io.c      |  10 +--

 4 files changed, 149 insertions(+), 179 deletions(-)

diff --git a/cmd.c b/cmd.c

index f6bf2c5..6616d61 100644

--- a/cmd.c

+++ b/cmd.c

@@ -31,94 +31,9 @@

 /* from libxcmd/command.c */

-cmdinfo_t	*cmdtab;

-int		ncmds;

-

-static checkfunc_t	check_func;

 static int		ncmdline;

 static char		**cmdline;

-static int

-compare(const void *a, const void *b)

-{

-	return strcmp(((const cmdinfo_t *)a)->name,

-		      ((const cmdinfo_t *)b)->name);

-}

-

-void add_command(const cmdinfo_t *ci)

-{

-    cmdtab = g_realloc((void *)cmdtab, ++ncmds * sizeof(*cmdtab));

-    cmdtab[ncmds - 1] = *ci;

-    qsort(cmdtab, ncmds, sizeof(*cmdtab), compare);

-}

-

-static int

-check_command(

-	const cmdinfo_t	*ci)

-{

-	if (check_func)

-		return check_func(qemuio_bs, ci);

-	return 1;

-}

-

-void

-add_check_command(

-	checkfunc_t	cf)

-{

-	check_func = cf;

-}

-

-int

-command_usage(

-	const cmdinfo_t *ci)

-{

-	printf("%s %s -- %s\n", ci->name, ci->args, ci->oneline);

-	return 0;

-}

-

-int

-command(

-	const cmdinfo_t	*ct,

-	int		argc,

-	char		**argv)

-{

-	char		*cmd = argv[0];

-

-	if (!check_command(ct))

-		return 0;

-

-	if (argc-1 < ct->argmin || (ct->argmax != -1 && argc-1 > ct->argmax)) {

-		if (ct->argmax == -1)

-			fprintf(stderr,

-	_("bad argument count %d to %s, expected at least %d arguments\n"),

-				argc-1, cmd, ct->argmin);

-		else if (ct->argmin == ct->argmax)

-			fprintf(stderr,

-	_("bad argument count %d to %s, expected %d arguments\n"),

-				argc-1, cmd, ct->argmin);

-		else

-			fprintf(stderr,

-	_("bad argument count %d to %s, expected between %d and %d arguments\n"),

-			argc-1, cmd, ct->argmin, ct->argmax);

-		return 0;

-	}

-	optind = 0;

-	return ct->cfunc(qemuio_bs, argc, argv);

-}

-

-const cmdinfo_t *

-find_command(

-	const char	*cmd)

-{

-	cmdinfo_t	*ct;

-

-	for (ct = cmdtab; ct < &cmdtab[ncmds]; ct++) {

-		if (strcmp(ct->name, cmd) == 0 ||

-		    (ct->altname && strcmp(ct->altname, cmd) == 0))

-			return (const cmdinfo_t *)ct;

-	}

-	return NULL;

-}

 void add_user_command(char *optarg)

 {

@@ -255,34 +170,6 @@ fetchline(void)

 }

 #endif

-char **breakline(char *input, int *count)

-{

-    int c = 0;

-    char *p;

-    char **rval = calloc(sizeof(char *), 1);

-    char **tmp;

-

-    while (rval && (p = qemu_strsep(&input, " ")) != NULL) {

-        if (!*p) {

-            continue;

-        }

-        c++;

-        tmp = realloc(rval, sizeof(*rval) * (c + 1));

-        if (!tmp) {

-            free(rval);

-            rval = NULL;

-            c = 0;

-            break;

-        } else {

-            rval = tmp;

-        }

-        rval[c - 1] = p;

-        rval[c] = NULL;

-    }

-    *count = c;

-    return rval;

-}

-

 #define EXABYTES(x)	((long long)(x) << 60)

 #define PETABYTES(x)	((long long)(x) << 50)

 #define TERABYTES(x)	((long long)(x) << 40)

diff --git a/cmd.h b/cmd.h

index 5b6f61b..0d01a33 100644

--- a/cmd.h

+++ b/cmd.h

@@ -39,23 +39,16 @@ typedef struct cmdinfo {

 	helpfunc_t      help;

 } cmdinfo_t;

-extern cmdinfo_t	*cmdtab;

-extern int		ncmds;

-

 typedef int (*checkfunc_t)(BlockDriverState *bs, const cmdinfo_t *ci);

-void add_command(const cmdinfo_t *ci);

+void qemuio_add_command(const cmdinfo_t *ci);

 void add_user_command(char *optarg);

 void add_check_command(checkfunc_t cf);

-const cmdinfo_t *find_command(const char *cmd);

-

 void command_loop(void);

-int command_usage(const cmdinfo_t *ci);

-int command(const cmdinfo_t *ci, int argc, char **argv);

+int qemuio_command_usage(const cmdinfo_t *ci);

 /* from input.h */

-char **breakline(char *input, int *count);

 char *fetchline(void);

 void cvtstr(double value, char *str, size_t sz);

diff --git a/qemu-io-cmds.c b/qemu-io-cmds.c

index a8e891a..27a903f 100644

--- a/qemu-io-cmds.c

+++ b/qemu-io-cmds.c

@@ -17,6 +17,110 @@

 int qemuio_misalign;

+static cmdinfo_t *cmdtab;

+static int ncmds;

+

+static int compare_cmdname(const void *a, const void *b)

+{

+    return strcmp(((const cmdinfo_t *)a)->name,

+                  ((const cmdinfo_t *)b)->name);

+}

+

+void qemuio_add_command(const cmdinfo_t *ci)

+{

+    cmdtab = g_realloc(cmdtab, ++ncmds * sizeof(*cmdtab));

+    cmdtab[ncmds - 1] = *ci;

+    qsort(cmdtab, ncmds, sizeof(*cmdtab), compare_cmdname);

+}

+

+int qemuio_command_usage(const cmdinfo_t *ci)

+{

+    printf("%s %s -- %s\n", ci->name, ci->args, ci->oneline);

+    return 0;

+}

+

+static int init_check_command(BlockDriverState *bs, const cmdinfo_t *ct)

+{

+    if (ct->flags & CMD_FLAG_GLOBAL) {

+        return 1;

+    }

+    if (!(ct->flags & CMD_NOFILE_OK) && !bs) {

+        fprintf(stderr, "no file open, try 'help open'\n");

+        return 0;

+    }

+    return 1;

+}

+

+static int command(const cmdinfo_t *ct, int argc, char **argv)

+{

+    char *cmd = argv[0];

+

+    if (!init_check_command(qemuio_bs, ct)) {

+        return 0;

+    }

+

+    if (argc - 1 < ct->argmin || (ct->argmax != -1 && argc - 1 > ct->argmax)) {

+        if (ct->argmax == -1) {

+            fprintf(stderr,

+                    "bad argument count %d to %s, expected at least %d arguments\n",

+                    argc-1, cmd, ct->argmin);

+        } else if (ct->argmin == ct->argmax) {

+            fprintf(stderr,

+                    "bad argument count %d to %s, expected %d arguments\n",

+                    argc-1, cmd, ct->argmin);

+        } else {

+            fprintf(stderr,

+                    "bad argument count %d to %s, expected between %d and %d arguments\n",

+                    argc-1, cmd, ct->argmin, ct->argmax);

+        }

+        return 0;

+    }

+    optind = 0;

+    return ct->cfunc(qemuio_bs, argc, argv);

+}

+

+static const cmdinfo_t *find_command(const char *cmd)

+{

+    cmdinfo_t *ct;

+

+    for (ct = cmdtab; ct < &cmdtab[ncmds]; ct++) {

+        if (strcmp(ct->name, cmd) == 0 ||

+            (ct->altname && strcmp(ct->altname, cmd) == 0))

+        {

+            return (const cmdinfo_t *)ct;

+        }

+    }

+    return NULL;

+}

+

+static char **breakline(char *input, int *count)

+{

+    int c = 0;

+    char *p;

+    char **rval = g_malloc0(sizeof(char *));

+    char **tmp;

+

+    while (rval && (p = qemu_strsep(&input, " ")) != NULL) {

+        if (!*p) {

+            continue;

+        }

+        c++;

+        tmp = g_realloc(rval, sizeof(*rval) * (c + 1));

+        if (!tmp) {

+            g_free(rval);

+            rval = NULL;

+            c = 0;

+            break;

+        } else {

+            rval = tmp;

+        }

+        rval[c - 1] = p;

+        rval[c] = NULL;

+    }

+    *count = c;

+    return rval;

+}

+

 static int64_t cvtnum(const char *s)

 {

     char *end;

@@ -468,12 +572,12 @@ static int read_f(BlockDriverState *bs, int argc, char **argv)

             vflag = 1;

             break;

         default:

-            return command_usage(&read_cmd);

+            return qemuio_command_usage(&read_cmd);

         }

     }

     if (optind != argc - 2) {

-        return command_usage(&read_cmd);

+        return qemuio_command_usage(&read_cmd);

     }

     if (bflag && pflag) {

@@ -495,7 +599,7 @@ static int read_f(BlockDriverState *bs, int argc, char **argv)

     }

     if (!Pflag && (lflag || sflag)) {

-        return command_usage(&read_cmd);

+        return qemuio_command_usage(&read_cmd);

     }

     if (!lflag) {

@@ -630,12 +734,12 @@ static int readv_f(BlockDriverState *bs, int argc, char **argv)

             vflag = 1;

             break;

         default:

-            return command_usage(&readv_cmd);

+            return qemuio_command_usage(&readv_cmd);

         }

     }

     if (optind > argc - 2) {

-        return command_usage(&readv_cmd);

+        return qemuio_command_usage(&readv_cmd);

     }

@@ -770,12 +874,12 @@ static int write_f(BlockDriverState *bs, int argc, char **argv)

             zflag = 1;

             break;

         default:

-            return command_usage(&write_cmd);

+            return qemuio_command_usage(&write_cmd);

         }

     }

     if (optind != argc - 2) {

-        return command_usage(&write_cmd);

+        return qemuio_command_usage(&write_cmd);

     }

     if (bflag + pflag + zflag > 1) {

@@ -912,12 +1016,12 @@ static int writev_f(BlockDriverState *bs, int argc, char **argv)

             }

             break;

         default:

-            return command_usage(&writev_cmd);

+            return qemuio_command_usage(&writev_cmd);

         }

     }

     if (optind > argc - 2) {

-        return command_usage(&writev_cmd);

+        return qemuio_command_usage(&writev_cmd);

     }

     offset = cvtnum(argv[optind]);

@@ -1024,12 +1128,12 @@ static int multiwrite_f(BlockDriverState *bs, int argc, char **argv)

             }

             break;

         default:

-            return command_usage(&writev_cmd);

+            return qemuio_command_usage(&writev_cmd);

         }

     }

     if (optind > argc - 2) {

-        return command_usage(&writev_cmd);

+        return qemuio_command_usage(&writev_cmd);

     }

     nr_reqs = 1;

@@ -1258,13 +1362,13 @@ static int aio_read_f(BlockDriverState *bs, int argc, char **argv)

             break;

         default:

             g_free(ctx);

-            return command_usage(&aio_read_cmd);

+            return qemuio_command_usage(&aio_read_cmd);

         }

     }

     if (optind > argc - 2) {

         g_free(ctx);

-        return command_usage(&aio_read_cmd);

+        return qemuio_command_usage(&aio_read_cmd);

     }

     ctx->offset = cvtnum(argv[optind]);

@@ -1350,13 +1454,13 @@ static int aio_write_f(BlockDriverState *bs, int argc, char **argv)

             break;

         default:

             g_free(ctx);

-            return command_usage(&aio_write_cmd);

+            return qemuio_command_usage(&aio_write_cmd);

         }

     }

     if (optind > argc - 2) {

         g_free(ctx);

-        return command_usage(&aio_write_cmd);

+        return qemuio_command_usage(&aio_write_cmd);

     }

     ctx->offset = cvtnum(argv[optind]);

@@ -1556,12 +1660,12 @@ static int discard_f(BlockDriverState *bs, int argc, char **argv)

             qflag = 1;

             break;

         default:

-            return command_usage(&discard_cmd);

+            return qemuio_command_usage(&discard_cmd);

         }

     }

     if (optind != argc - 2) {

-        return command_usage(&discard_cmd);

+        return qemuio_command_usage(&discard_cmd);

     }

     offset = cvtnum(argv[optind]);

@@ -1876,18 +1980,6 @@ static const cmdinfo_t help_cmd = {

     .oneline    = "help for one or all commands",

 };

-static int init_check_command(BlockDriverState *bs, const cmdinfo_t *ct)

-{

-    if (ct->flags & CMD_FLAG_GLOBAL) {

-        return 1;

-    }

-    if (!(ct->flags & CMD_NOFILE_OK) && !bs) {

-        fprintf(stderr, "no file open, try 'help open'\n");

-        return 0;

-    }

-    return 1;

-}

-

 bool qemuio_command(const char *cmd)

 {

     char *input;

@@ -1915,27 +2007,25 @@ bool qemuio_command(const char *cmd)

 static void __attribute((constructor)) init_qemuio_commands(void)

 {

     /* initialize commands */

-    add_command(&help_cmd);

-    add_command(&read_cmd);

-    add_command(&readv_cmd);

-    add_command(&write_cmd);

-    add_command(&writev_cmd);

-    add_command(&multiwrite_cmd);

-    add_command(&aio_read_cmd);

-    add_command(&aio_write_cmd);

-    add_command(&aio_flush_cmd);

-    add_command(&flush_cmd);

-    add_command(&truncate_cmd);

-    add_command(&length_cmd);

-    add_command(&info_cmd);

-    add_command(&discard_cmd);

-    add_command(&alloc_cmd);

-    add_command(&map_cmd);

-    add_command(&break_cmd);

-    add_command(&resume_cmd);

-    add_command(&wait_break_cmd);

-    add_command(&abort_cmd);

-    add_command(&sleep_cmd);

-

-    add_check_command(init_check_command);

+    qemuio_add_command(&help_cmd);

+    qemuio_add_command(&read_cmd);

+    qemuio_add_command(&readv_cmd);

+    qemuio_add_command(&write_cmd);

+    qemuio_add_command(&writev_cmd);

+    qemuio_add_command(&multiwrite_cmd);

+    qemuio_add_command(&aio_read_cmd);

+    qemuio_add_command(&aio_write_cmd);

+    qemuio_add_command(&aio_flush_cmd);

+    qemuio_add_command(&flush_cmd);

+    qemuio_add_command(&truncate_cmd);

+    qemuio_add_command(&length_cmd);

+    qemuio_add_command(&info_cmd);

+    qemuio_add_command(&discard_cmd);

+    qemuio_add_command(&alloc_cmd);

+    qemuio_add_command(&map_cmd);

+    qemuio_add_command(&break_cmd);

+    qemuio_add_command(&resume_cmd);

+    qemuio_add_command(&wait_break_cmd);

+    qemuio_add_command(&abort_cmd);

+    qemuio_add_command(&sleep_cmd);

 }

diff --git a/qemu-io.c b/qemu-io.c

index b86bfbf..97af39e 100644

--- a/qemu-io.c

+++ b/qemu-io.c

@@ -155,7 +155,7 @@ static int open_f(BlockDriverState *bs, int argc, char **argv)

             qemu_opts_del(qopts);

             break;

         default:

-            return command_usage(&open_cmd);

+            return qemuio_command_usage(&open_cmd);

         }

     }

@@ -164,7 +164,7 @@ static int open_f(BlockDriverState *bs, int argc, char **argv)

     }

     if (optind != argc - 1) {

-        return command_usage(&open_cmd);

+        return qemuio_command_usage(&open_cmd);

     }

     return openfile(argv[optind], flags, growable, opts);

@@ -300,9 +300,9 @@ int main(int argc, char **argv)

     bdrv_init();

     /* initialize commands */

-    add_command(&quit_cmd);

-    add_command(&open_cmd);

-    add_command(&close_cmd);

+    qemuio_add_command(&quit_cmd);

+    qemuio_add_command(&open_cmd);

+    qemuio_add_command(&close_cmd);

     /* open the device */

     if (!readonly) {

-- 

1.8.3.1