From 6ea43a1599b4abdfe480d6e963dbbafa9339601a Mon Sep 17 00:00:00 2001 From: John Snow Date: Mon, 23 Nov 2015 17:38:28 +0100 Subject: [PATCH 09/27] qemu-io: Move 'quit' function RH-Author: John Snow Message-id: <1448300320-7772-10-git-send-email-jsnow@redhat.com> Patchwork-id: 68436 O-Subject: [RHEL-7.3 qemu-kvm PATCH v2 09/21] qemu-io: Move 'quit' function Bugzilla: 1272523 RH-Acked-by: Thomas Huth RH-Acked-by: Laszlo Ersek RH-Acked-by: Max Reitz From: Kevin Wolf This one only makes sense in the context of the qemu-io tool, so move it to qemu-io.c. Adapt coding style and register it like other commands. Signed-off-by: Kevin Wolf Reviewed-by: Eric Blake Signed-off-by: Stefan Hajnoczi (cherry picked from commit e681be7eca0143fe7259ce8233fe5dd8898d072f) Signed-off-by: John Snow Signed-off-by: Miroslav Rezanina --- cmd.c | 29 ----------------------------- cmd.h | 2 -- qemu-io.c | 17 ++++++++++++++++- 3 files changed, 16 insertions(+), 32 deletions(-) diff --git a/cmd.c b/cmd.c index 2941ad3..8496e74 100644 --- a/cmd.c +++ b/cmd.c @@ -410,32 +410,3 @@ timestr( snprintf(ts, size, "0.%04u sec", (unsigned int) (usec * 10000)); } } - - -/* from libxcmd/quit.c */ - -static cmdinfo_t quit_cmd; - -/* ARGSUSED */ -static int -quit_f( - BlockDriverState *bs, - int argc, - char **argv) -{ - return 1; -} - -void -quit_init(void) -{ - quit_cmd.name = _("quit"); - quit_cmd.altname = _("q"); - quit_cmd.cfunc = quit_f; - quit_cmd.argmin = -1; - quit_cmd.argmax = -1; - quit_cmd.flags = CMD_FLAG_GLOBAL; - quit_cmd.oneline = _("exit the program"); - - add_command(&quit_cmd); -} diff --git a/cmd.h b/cmd.h index 89e7c6e..5b6f61b 100644 --- a/cmd.h +++ b/cmd.h @@ -42,8 +42,6 @@ typedef struct cmdinfo { extern cmdinfo_t *cmdtab; extern int ncmds; -void quit_init(void); - typedef int (*checkfunc_t)(BlockDriverState *bs, const cmdinfo_t *ci); void add_command(const cmdinfo_t *ci); diff --git a/qemu-io.c b/qemu-io.c index 4f1c808..b86bfbf 100644 --- a/qemu-io.c +++ b/qemu-io.c @@ -170,6 +170,21 @@ static int open_f(BlockDriverState *bs, int argc, char **argv) return openfile(argv[optind], flags, growable, opts); } +static int quit_f(BlockDriverState *bs, int argc, char **argv) +{ + return 1; +} + +static const cmdinfo_t quit_cmd = { + .name = "quit", + .altname = "q", + .cfunc = quit_f, + .argmin = -1, + .argmax = -1, + .flags = CMD_FLAG_GLOBAL, + .oneline = "exit the program", +}; + static void usage(const char *name) { printf( @@ -285,7 +300,7 @@ int main(int argc, char **argv) bdrv_init(); /* initialize commands */ - quit_init(); + add_command(&quit_cmd); add_command(&open_cmd); add_command(&close_cmd); -- 1.8.3.1