From patchwork Thu Feb 20 14:57:19 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 322219 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4AEFC2C00CC for ; Fri, 21 Feb 2014 01:59:48 +1100 (EST) Received: from localhost ([::1]:39051 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WGV6I-0001Bt-8n for incoming@patchwork.ozlabs.org; Thu, 20 Feb 2014 09:59:46 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54209) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WGV4H-000699-Me for qemu-devel@nongnu.org; Thu, 20 Feb 2014 09:57:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WGV4B-0000Zj-O6 for qemu-devel@nongnu.org; Thu, 20 Feb 2014 09:57:41 -0500 Received: from mx1.redhat.com ([209.132.183.28]:2170) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WGV4B-0000ZQ-FW for qemu-devel@nongnu.org; Thu, 20 Feb 2014 09:57:35 -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 s1KEvXVE023037 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 20 Feb 2014 09:57:34 -0500 Received: from dhcp-200-207.str.redhat.com (ovpn-116-74.ams2.redhat.com [10.36.116.74]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id s1KEvQlw031016; Thu, 20 Feb 2014 09:57:31 -0500 From: Kevin Wolf To: qemu-devel@nongnu.org Date: Thu, 20 Feb 2014 15:57:19 +0100 Message-Id: <1392908243-8835-3-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> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, famz@redhat.com, armbru@redhat.com, mreitz@redhat.com, stefanha@redhat.com Subject: [Qemu-devel] [PATCH v2 2/6] qemu-img create: Support multiple -o options X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org If you specified multiple -o options for qemu-img create, it would silently ignore all but the last one. This patch fixes the problem. Now 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 Reviewed-by: Eric Blake Reviewed-by: Jeff Cody --- qemu-img.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/qemu-img.c b/qemu-img.c index b834d52..770e4e6 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -369,13 +369,19 @@ 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': - 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 'q': quiet = true; @@ -403,7 +409,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; } @@ -411,7 +417,8 @@ static int img_create(int argc, char **argv) help(); } - if (options && is_help_option(options)) { + if (options && has_help_option(options)) { + g_free(options); return print_block_option_help(filename, fmt); } @@ -420,10 +427,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)