From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=33219 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PODF9-0000po-2a for qemu-devel@nongnu.org; Thu, 02 Dec 2010 12:46:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PODF8-0001mU-01 for qemu-devel@nongnu.org; Thu, 02 Dec 2010 12:46:54 -0500 Received: from mx1.redhat.com ([209.132.183.28]:27378) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PODF7-0001mK-Pc for qemu-devel@nongnu.org; Thu, 02 Dec 2010 12:46:53 -0500 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id oB2HkrQI009551 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 2 Dec 2010 12:46:53 -0500 From: Jes.Sorensen@redhat.com Date: Thu, 2 Dec 2010 18:46:47 +0100 Message-Id: <1291312009-24351-2-git-send-email-Jes.Sorensen@redhat.com> In-Reply-To: <1291312009-24351-1-git-send-email-Jes.Sorensen@redhat.com> References: <1291312009-24351-1-git-send-email-Jes.Sorensen@redhat.com> Subject: [Qemu-devel] [PATCH 1/3] Consolidate printing of block driver options List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: kwolf@redhat.com Cc: 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 --- qemu-img.c | 46 +++++++++++++++++++++++++++++++++++++--------- 1 files changed, 37 insertions(+), 9 deletions(-) diff --git a/qemu-img.c b/qemu-img.c index fa77ac0..99f30b3 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -188,6 +188,32 @@ 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); + return 0; +} + static BlockDriverState *bdrv_new_open(const char *filename, const char *fmt, int flags) @@ -310,6 +336,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 +359,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 +720,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 out2; + } + if (bs_n > 1 && out_baseimg) { error("-B makes no sense when concatenating multiple input images"); return 1; @@ -749,10 +780,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); @@ -984,6 +1011,7 @@ out: } } free(bs); +out2: if (ret) { return 1; } -- 1.7.3.2