From 8d6f59c923b536461df1aea18045535b090984fb Mon Sep 17 00:00:00 2001

From: John Snow <jsnow@redhat.com>

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

Subject: [PATCH 08/27] qemu-io: Move 'help' function

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

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

Patchwork-id: 68435

O-Subject: [RHEL-7.3 qemu-kvm PATCH v2 08/21] qemu-io: Move 'help' function

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>

No reason to treat it different from other commands. Move it to

qemu-io-cmds.c, adapt the coding style and register it like any other

command.

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 f18a834a92f0b490cefeb71410f3f25b969d336f)

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

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

Conflicts:

  qemu-io-cmds:  patch context (from sleep_f)

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

---

 cmd.c          | 79 ----------------------------------------------------------

 cmd.h          |  1 -

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

 3 files changed, 65 insertions(+), 81 deletions(-)

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

index 7ae978f..2941ad3 100644

--- a/cmd.c

+++ b/cmd.c

@@ -439,82 +439,3 @@ quit_init(void)

 	add_command(&quit_cmd);

 }

-

-/* from libxcmd/help.c */

-

-static cmdinfo_t help_cmd;

-static void help_onecmd(const char *cmd, const cmdinfo_t *ct);

-static void help_oneline(const char *cmd, const cmdinfo_t *ct);

-

-static void

-help_all(void)

-{

-	const cmdinfo_t	*ct;

-

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

-		help_oneline(ct->name, ct);

-	printf(_("\nUse 'help commandname' for extended help.\n"));

-}

-

-static int

-help_f(

-    BlockDriverState *bs,

-	int		argc,

-	char		**argv)

-{

-	const cmdinfo_t	*ct;

-

-	if (argc == 1) {

-		help_all();

-		return 0;

-	}

-	ct = find_command(argv[1]);

-	if (ct == NULL) {

-		printf(_("command %s not found\n"), argv[1]);

-		return 0;

-	}

-	help_onecmd(argv[1], ct);

-	return 0;

-}

-

-static void

-help_onecmd(

-	const char	*cmd,

-	const cmdinfo_t	*ct)

-{

-	help_oneline(cmd, ct);

-	if (ct->help)

-		ct->help();

-}

-

-static void

-help_oneline(

-	const char	*cmd,

-	const cmdinfo_t	*ct)

-{

-	if (cmd)

-		printf("%s ", cmd);

-	else {

-		printf("%s ", ct->name);

-		if (ct->altname)

-			printf("(or %s) ", ct->altname);

-	}

-	if (ct->args)

-		printf("%s ", ct->args);

-	printf("-- %s\n", ct->oneline);

-}

-

-void

-help_init(void)

-{

-	help_cmd.name = _("help");

-	help_cmd.altname = _("?");

-	help_cmd.cfunc = help_f;

-	help_cmd.argmin = 0;

-	help_cmd.argmax = 1;

-	help_cmd.flags = CMD_FLAG_GLOBAL;

-	help_cmd.args = _("[command]");

-	help_cmd.oneline = _("help for one or all commands");

-

-	add_command(&help_cmd);

-}

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

index d676408..89e7c6e 100644

--- a/cmd.h

+++ b/cmd.h

@@ -42,7 +42,6 @@ typedef struct cmdinfo {

 extern cmdinfo_t	*cmdtab;

 extern int		ncmds;

-void help_init(void);

 void quit_init(void);

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

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

index 09e4099..a8e891a 100644

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

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

@@ -1811,6 +1811,70 @@ static const cmdinfo_t sleep_cmd = {

        .oneline        = "waits for the given value in milliseconds",

 };

+static void help_oneline(const char *cmd, const cmdinfo_t *ct)

+{

+    if (cmd) {

+        printf("%s ", cmd);

+    } else {

+        printf("%s ", ct->name);

+        if (ct->altname) {

+            printf("(or %s) ", ct->altname);

+        }

+    }

+

+    if (ct->args) {

+        printf("%s ", ct->args);

+    }

+    printf("-- %s\n", ct->oneline);

+}

+

+static void help_onecmd(const char *cmd, const cmdinfo_t *ct)

+{

+    help_oneline(cmd, ct);

+    if (ct->help) {

+        ct->help();

+    }

+}

+

+static void help_all(void)

+{

+    const cmdinfo_t *ct;

+

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

+        help_oneline(ct->name, ct);

+    }

+    printf("\nUse 'help commandname' for extended help.\n");

+}

+

+static int help_f(BlockDriverState *bs, int argc, char **argv)

+{

+    const cmdinfo_t *ct;

+

+    if (argc == 1) {

+        help_all();

+        return 0;

+    }

+

+    ct = find_command(argv[1]);

+    if (ct == NULL) {

+        printf("command %s not found\n", argv[1]);

+        return 0;

+    }

+

+    help_onecmd(argv[1], ct);

+    return 0;

+}

+

+static const cmdinfo_t help_cmd = {

+    .name       = "help",

+    .altname    = "?",

+    .cfunc      = help_f,

+    .argmin     = 0,

+    .argmax     = 1,

+    .flags      = CMD_FLAG_GLOBAL,

+    .args       = "[command]",

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

+};

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

 {

@@ -1851,7 +1915,7 @@ bool qemuio_command(const char *cmd)

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

 {

     /* initialize commands */

-    help_init();

+    add_command(&help_cmd);

     add_command(&read_cmd);

     add_command(&readv_cmd);

     add_command(&write_cmd);

-- 

1.8.3.1