[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 6/8] qemu-img: move common options parsing before com
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL 6/8] qemu-img: move common options parsing before commands processing |
Date: |
Tue, 28 Jun 2016 22:27:28 +0100 |
From: "Denis V. Lunev" <address@hidden>
This is necessary to enable creation of common qemu-img options which will
be specified before command.
The patch also enables '-V' alias to '--version' (exactly like in other
block utilities) and documents this change.
Signed-off-by: Denis V. Lunev <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Message-id: address@hidden
CC: Paolo Bonzini <address@hidden>
CC: Kevin Wolf <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
qemu-img.c | 41 +++++++++++++++++++++++++++--------------
qemu-img.texi | 10 +++++++++-
2 files changed, 36 insertions(+), 15 deletions(-)
diff --git a/qemu-img.c b/qemu-img.c
index 14e2661..2194c2d 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -91,9 +91,12 @@ static void QEMU_NORETURN help(void)
{
const char *help_msg =
QEMU_IMG_VERSION
- "usage: qemu-img command [command options]\n"
+ "usage: qemu-img [standard options] command [command options]\n"
"QEMU disk image utility\n"
"\n"
+ " '-h', '--help' display this help and exit\n"
+ " '-V', '--version' output version information and exit\n"
+ "\n"
"Command syntax:\n"
#define DEF(option, callback, arg_string) \
" " arg_string "\n"
@@ -3806,7 +3809,7 @@ int main(int argc, char **argv)
int c;
static const struct option long_options[] = {
{"help", no_argument, 0, 'h'},
- {"version", no_argument, 0, 'v'},
+ {"version", no_argument, 0, 'V'},
{0, 0, 0, 0}
};
@@ -3829,28 +3832,38 @@ int main(int argc, char **argv)
if (argc < 2) {
error_exit("Not enough arguments");
}
- cmdname = argv[1];
qemu_add_opts(&qemu_object_opts);
qemu_add_opts(&qemu_source_opts);
+ while ((c = getopt_long(argc, argv, "+hV", long_options, NULL)) != -1) {
+ switch (c) {
+ case 'h':
+ help();
+ return 0;
+ case 'V':
+ printf(QEMU_IMG_VERSION);
+ return 0;
+ }
+ }
+
+ cmdname = argv[optind];
+
+ /* reset getopt_long scanning */
+ argc -= optind;
+ if (argc < 1) {
+ return 0;
+ }
+ argv += optind;
+ optind = 1;
+
/* find the command */
for (cmd = img_cmds; cmd->name != NULL; cmd++) {
if (!strcmp(cmdname, cmd->name)) {
- return cmd->handler(argc - 1, argv + 1);
+ return cmd->handler(argc, argv);
}
}
- c = getopt_long(argc, argv, "h", long_options, NULL);
-
- if (c == 'h') {
- help();
- }
- if (c == 'v') {
- printf(QEMU_IMG_VERSION);
- return 0;
- }
-
/* not found */
error_exit("Command not found: %s", cmdname);
}
diff --git a/qemu-img.texi b/qemu-img.texi
index cbe50e9..f1b874d 100644
--- a/qemu-img.texi
+++ b/qemu-img.texi
@@ -1,6 +1,6 @@
@example
@c man begin SYNOPSIS
address@hidden @var{command} address@hidden @var{options}]
address@hidden address@hidden @var{options}] @var{command} address@hidden
@var{options}]
@c man end
@end example
@@ -16,6 +16,14 @@ inconsistent state.
@c man begin OPTIONS
+Standard options:
address@hidden @option
address@hidden -h, --help
+Display this help and exit
address@hidden -V, --version
+Display version information and exit
address@hidden table
+
The following commands are supported:
@include qemu-img-cmds.texi
--
2.7.4
- [Qemu-devel] [PULL 0/8] Tracing patches, Stefan Hajnoczi, 2016/06/28
- [Qemu-devel] [PULL 1/8] doc: sync help description for --trace with man for qemu.1, Stefan Hajnoczi, 2016/06/28
- [Qemu-devel] [PULL 2/8] doc: move text describing --trace to specific .texi file, Stefan Hajnoczi, 2016/06/28
- [Qemu-devel] [PULL 3/8] trace: move qemu_trace_opts to trace/control.c, Stefan Hajnoczi, 2016/06/28
- [Qemu-devel] [PULL 4/8] trace: enable tracing in qemu-io, Stefan Hajnoczi, 2016/06/28
- [Qemu-devel] [PULL 6/8] qemu-img: move common options parsing before commands processing,
Stefan Hajnoczi <=
- [Qemu-devel] [PULL 5/8] trace: enable tracing in qemu-nbd, Stefan Hajnoczi, 2016/06/28
- [Qemu-devel] [PULL 7/8] trace: enable tracing in qemu-img, Stefan Hajnoczi, 2016/06/28
- [Qemu-devel] [PULL 8/8] trace: [*-user] Add events to trace guest syscalls in syscall emulation mode, Stefan Hajnoczi, 2016/06/28
- Re: [Qemu-devel] [PULL 0/8] Tracing patches, Peter Maydell, 2016/06/29