From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:38811)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jcody@redhat.com>) id 1WGZSj-0001RM-3q
	for qemu-devel@nongnu.org; Thu, 20 Feb 2014 14:39:19 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jcody@redhat.com>) id 1WGZSd-0001lM-5B
	for qemu-devel@nongnu.org; Thu, 20 Feb 2014 14:39:13 -0500
Received: from mx1.redhat.com ([209.132.183.28]:26098)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jcody@redhat.com>) id 1WGZSc-0001lG-Ss
	for qemu-devel@nongnu.org; Thu, 20 Feb 2014 14:39:07 -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 s1KJd6We027866
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK)
	for <qemu-devel@nongnu.org>; Thu, 20 Feb 2014 14:39:06 -0500
Date: Thu, 20 Feb 2014 14:39:02 -0500
From: Jeff Cody <jcody@redhat.com>
Message-ID: <20140220193902.GF30664@localhost.localdomain>
References: <1392908243-8835-1-git-send-email-kwolf@redhat.com>
	<1392908243-8835-5-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-5-git-send-email-kwolf@redhat.com>
Subject: Re: [Qemu-devel] [PATCH v2 4/6] qemu-img amend: Support multiple -o
 options
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Kevin Wolf <kwolf@redhat.com>
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:21PM +0100, Kevin Wolf wrote:
> 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 <kwolf@redhat.com>

Reviewed-by: Jeff Cody <jcody@redhat.com>

> ---
>  qemu-img.c | 12 ++++++++++--
>  1 file changed, 10 insertions(+), 2 deletions(-)
> 
> diff --git a/qemu-img.c b/qemu-img.c
> index ba6e82d..d6dc7ec 100644
> --- a/qemu-img.c
> +++ b/qemu-img.c
> @@ -2658,7 +2658,13 @@ static int img_amend(int argc, char **argv)
>                  help();
>                  break;
>              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 'f':
>                  fmt = optarg;
> @@ -2688,7 +2694,7 @@ static int img_amend(int argc, char **argv)
>  
>      fmt = bs->drv->format_name;
>  
> -    if (is_help_option(options)) {
> +    if (has_help_option(options)) {
>          ret = print_block_option_help(filename, fmt);
>          goto out;
>      }
> @@ -2715,6 +2721,8 @@ out:
>      }
>      free_option_parameters(create_options);
>      free_option_parameters(options_param);
> +    g_free(options);
> +
>      if (ret) {
>          return 1;
>      }
> -- 
> 1.8.1.4
> 
>