From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33547) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WGZ5P-0001dn-5U for qemu-devel@nongnu.org; Thu, 20 Feb 2014 14:15:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WGZ5J-0003Vy-52 for qemu-devel@nongnu.org; Thu, 20 Feb 2014 14:15:07 -0500 Received: from mx1.redhat.com ([209.132.183.28]:40716) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WGZ5I-0003Vr-Ta for qemu-devel@nongnu.org; Thu, 20 Feb 2014 14:15:01 -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 s1KJExI4019073 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 20 Feb 2014 14:15:00 -0500 Date: Thu, 20 Feb 2014 14:14:56 -0500 From: Jeff Cody Message-ID: <20140220191456.GD30664@localhost.localdomain> References: <1392908243-8835-1-git-send-email-kwolf@redhat.com> <1392908243-8835-3-git-send-email-kwolf@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1392908243-8835-3-git-send-email-kwolf@redhat.com> Subject: Re: [Qemu-devel] [PATCH v2 2/6] qemu-img create: Support multiple -o options List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Kevin Wolf Cc: mreitz@redhat.com, famz@redhat.com, qemu-devel@nongnu.org, stefanha@redhat.com, armbru@redhat.com On Thu, Feb 20, 2014 at 03:57:19PM +0100, Kevin Wolf wrote: > 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 > --- > 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; One minor preference: there are 3 separate cleanup spots to free 'options'. If a ret variable was used, the label 'fail:' could become 'out:', and those 3 cleanups could be consolidated to a single g_free(options). That would help any future committer not forget a cleanup spot. But, as it is correct as-is: Reviewed-by: Jeff Cody > } > > static void dump_json_image_check(ImageCheck *check, bool quiet) > -- > 1.8.1.4 > >