Received: from [140.186.70.92] (port=44578 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PQeN8-0006Gq-8e for qemu-devel@nongnu.org; Thu, 09 Dec 2010 06:09:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PQeN7-0000GW-3J for qemu-devel@nongnu.org; Thu, 09 Dec 2010 06:09:14 -0500 Received: from mx1.redhat.com ([209.132.183.28]:19823) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PQeN6-0000GN-Ra for qemu-devel@nongnu.org; Thu, 09 Dec 2010 06:09:13 -0500 From: Kevin Wolf Date: Thu, 9 Dec 2010 12:10:01 +0100 Message-Id: <1291893010-29223-6-git-send-email-kwolf@redhat.com> In-Reply-To: <1291893010-29223-1-git-send-email-kwolf@redhat.com> References: <1291893010-29223-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 05/14] Consolidate printing of block driver options List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Jes Sorensen This consolidates the printing of block driver options in print_block_option_help() which is called from both img_create() and img_convert(). This allows for the "?" detection to be done just after the parsing of options and the filename, instead of half way down the codepath of these functions. Signed-off-by: Jes Sorensen Signed-off-by: Kevin Wolf --- qemu-img.c | 46 +++++++++++++++++++++++++++++++++++++--------- 1 files changed, 37 insertions(+), 9 deletions(-) diff --git a/qemu-img.c b/qemu-img.c index aded72d..50cfdda 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -188,6 +188,33 @@ static int read_password(char *buf, int buf_size) } #endif +static int print_block_option_help(const char *filename, const char *fmt) +{ + BlockDriver *drv, *proto_drv; + QEMUOptionParameter *create_options = NULL; + + /* Find driver and parse its options */ + drv = bdrv_find_format(fmt); + if (!drv) { + error("Unknown file format '%s'", fmt); + return 1; + } + + proto_drv = bdrv_find_protocol(filename); + if (!proto_drv) { + error("Unknown protocol '%s'", filename); + return 1; + } + + create_options = append_option_parameters(create_options, + drv->create_options); + create_options = append_option_parameters(create_options, + proto_drv->create_options); + print_option_help(create_options); + free_option_parameters(create_options); + return 0; +} + static BlockDriverState *bdrv_new_open(const char *filename, const char *fmt, int flags) @@ -310,6 +337,11 @@ static int img_create(int argc, char **argv) help(); filename = argv[optind++]; + if (options && !strcmp(options, "?")) { + ret = print_block_option_help(filename, fmt); + goto out; + } + /* Find driver and parse its options */ drv = bdrv_find_format(fmt); if (!drv) { @@ -328,11 +360,6 @@ static int img_create(int argc, char **argv) create_options = append_option_parameters(create_options, proto_drv->create_options); - if (options && !strcmp(options, "?")) { - print_option_help(create_options); - goto out; - } - /* Create parameter list with default values */ param = parse_option_parameters("", create_options, param); set_option_parameter_int(param, BLOCK_OPT_SIZE, -1); @@ -694,6 +721,11 @@ static int img_convert(int argc, char **argv) out_filename = argv[argc - 1]; + if (options && !strcmp(options, "?")) { + ret = print_block_option_help(out_filename, out_fmt); + goto out; + } + if (bs_n > 1 && out_baseimg) { error("-B makes no sense when concatenating multiple input images"); ret = -1; @@ -746,10 +778,6 @@ static int img_convert(int argc, char **argv) drv->create_options); create_options = append_option_parameters(create_options, proto_drv->create_options); - if (options && !strcmp(options, "?")) { - print_option_help(create_options); - goto out; - } if (options) { param = parse_option_parameters(options, create_options, param); -- 1.7.2.3