From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54525) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WG8pn-0000oY-TQ for qemu-devel@nongnu.org; Wed, 19 Feb 2014 10:13:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WG8ph-0002i0-TZ for qemu-devel@nongnu.org; Wed, 19 Feb 2014 10:13:15 -0500 Received: from mx1.redhat.com ([209.132.183.28]:19740) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WG8ph-0002hs-Js for qemu-devel@nongnu.org; Wed, 19 Feb 2014 10:13:09 -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.14.4/8.14.4) with ESMTP id s1JFD8Rn002986 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 19 Feb 2014 10:13:09 -0500 From: Kevin Wolf Date: Wed, 19 Feb 2014 16:12:56 +0100 Message-Id: <1392822778-4823-6-git-send-email-kwolf@redhat.com> In-Reply-To: <1392822778-4823-1-git-send-email-kwolf@redhat.com> References: <1392822778-4823-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 5/7] qemu-img create: Support multiple -o options List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, stefanha@redhat.com, mreitz@redhat.com Multiple -o options has the same meaning as having a single option with all settings in the order of their respective -o options. Signed-off-by: Kevin Wolf --- qemu-img.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/qemu-img.c b/qemu-img.c index a889c84..30273ad 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -384,21 +384,18 @@ static int img_create(int argc, char **argv) case 'e': error_report("option -e is deprecated, please use \'-o " "encryption\' instead!"); - return 1; + goto fail; case '6': error_report("option -6 is deprecated, please use \'-o " "compat6\' instead!"); - return 1; + goto fail; case 'o': if (is_help_option(optarg)) { options_help = true; } else if (!options) { - options = optarg; + options = g_strdup(optarg); } else { - error_report("-o cannot be used multiple times. Please use a " - "single -o option with comma-separated settings " - "instead."); - return 1; + options = g_strdup_printf("%s,%s", options, optarg); } break; case 'q': @@ -431,7 +428,7 @@ static int img_create(int argc, char **argv) error_report("kilobytes, megabytes, gigabytes, terabytes, " "petabytes and exabytes."); } - return 1; + goto fail; } img_size = (uint64_t)sval; } @@ -440,6 +437,7 @@ static int img_create(int argc, char **argv) } if (options_help) { + g_free(options); return print_block_option_help(filename, fmt); } @@ -448,10 +446,15 @@ static int img_create(int argc, char **argv) if (error_is_set(&local_err)) { error_report("%s: %s", filename, error_get_pretty(local_err)); error_free(local_err); - return 1; + goto fail; } + g_free(options); return 0; + +fail: + g_free(options); + return 1; } static void dump_json_image_check(ImageCheck *check, bool quiet) -- 1.8.1.4