From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54220) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WGV4I-00069C-KM for qemu-devel@nongnu.org; Thu, 20 Feb 2014 09:57:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WGV4C-0000Zu-GW for qemu-devel@nongnu.org; Thu, 20 Feb 2014 09:57:42 -0500 Received: from mx1.redhat.com ([209.132.183.28]:39484) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WGV4C-0000Zn-8r for qemu-devel@nongnu.org; Thu, 20 Feb 2014 09:57:36 -0500 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s1KEvZnB014809 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 20 Feb 2014 09:57:35 -0500 From: Kevin Wolf Date: Thu, 20 Feb 2014 15:57:20 +0100 Message-Id: <1392908243-8835-4-git-send-email-kwolf@redhat.com> In-Reply-To: <1392908243-8835-1-git-send-email-kwolf@redhat.com> References: <1392908243-8835-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH v2 3/6] qemu-img convert: 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, famz@redhat.com, armbru@redhat.com, mreitz@redhat.com, stefanha@redhat.com Instead of ignoring all option values but the last one, multiple -o options now have 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 | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/qemu-img.c b/qemu-img.c index 770e4e6..ba6e82d 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -1160,6 +1160,9 @@ static int img_convert(int argc, char **argv) Error *local_err = NULL; QemuOpts *sn_opts = NULL; + /* Initialize before goto out */ + qemu_progress_init(progress, 1.0); + fmt = NULL; out_fmt = "raw"; cache = "unsafe"; @@ -1191,13 +1194,21 @@ static int img_convert(int argc, char **argv) case 'e': error_report("option -e is deprecated, please use \'-o " "encryption\' instead!"); - return 1; + ret = -1; + goto out; case '6': error_report("option -6 is deprecated, please use \'-o " "compat6\' instead!"); - return 1; + ret = -1; + goto out; case 'o': - options = optarg; + if (!options) { + options = g_strdup(optarg); + } else { + char *old_options = options; + options = g_strdup_printf("%s,%s", options, optarg); + g_free(old_options); + } break; case 's': snapshot_name = optarg; @@ -1208,7 +1219,8 @@ static int img_convert(int argc, char **argv) if (!sn_opts) { error_report("Failed in parsing snapshot param '%s'", optarg); - return 1; + ret = -1; + goto out; } } else { snapshot_name = optarg; @@ -1221,7 +1233,8 @@ static int img_convert(int argc, char **argv) sval = strtosz_suffix(optarg, &end, STRTOSZ_DEFSUFFIX_B); if (sval < 0 || *end) { error_report("Invalid minimum zero buffer size for sparse output specified"); - return 1; + ret = -1; + goto out; } min_sparse = sval / BDRV_SECTOR_SIZE; @@ -1253,10 +1266,7 @@ static int img_convert(int argc, char **argv) out_filename = argv[argc - 1]; - /* Initialize before goto out */ - qemu_progress_init(progress, 1.0); - - if (options && is_help_option(options)) { + if (options && has_help_option(options)) { ret = print_block_option_help(out_filename, out_fmt); goto out; } @@ -1649,6 +1659,7 @@ out: free_option_parameters(create_options); free_option_parameters(param); qemu_vfree(buf); + g_free(options); if (sn_opts) { qemu_opts_del(sn_opts); } -- 1.8.1.4