From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:50019)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <kwolf@redhat.com>) id 1aOR7J-0000j3-0U
	for qemu-devel@nongnu.org; Wed, 27 Jan 2016 09:30:47 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <kwolf@redhat.com>) id 1aOR7E-0003Eb-Lw
	for qemu-devel@nongnu.org; Wed, 27 Jan 2016 09:30:40 -0500
Date: Wed, 27 Jan 2016 15:30:29 +0100
From: Kevin Wolf <kwolf@redhat.com>
Message-ID: <20160127143029.GD9484@noname.str.redhat.com>
References: <1453815262-13440-1-git-send-email-berrange@redhat.com>
	<1453815262-13440-8-git-send-email-berrange@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1453815262-13440-8-git-send-email-berrange@redhat.com>
Subject: Re: [Qemu-devel] [PATCH v4 07/10] qemu-img: allow specifying image
 as a set of options args
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: "Daniel P. Berrange" <berrange@redhat.com>
Cc: qemu-block@nongnu.org, qemu-devel@nongnu.org, Markus Armbruster <armbru@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>, Andreas =?iso-8859-1?Q?F=E4rber?= <afaerber@suse.de>

Am 26.01.2016 um 14:34 hat Daniel P. Berrange geschrieben:
> Currently qemu-img allows an image filename to be passed on the
> command line, but unless using the JSON format, it does not have
> a way to set any options except the format eg
> 
>    qemu-img info https://127.0.0.1/images/centos7.iso
> 
> This adds a --image-opts arg that indicates that the positional
> filename should be interpreted as a full option string, not
> just a filename.
> 
>    qemu-img info --source driver=http,url=https://127.0.0.1/images,sslverify=off
> 
> This flag is mutually exclusive with the '-f' / '-F' flags.
> 
> Signed-off-by: Daniel P. Berrange <berrange@redhat.com>

> @@ -633,7 +671,20 @@ static int img_check(int argc, char **argv)
>          return 1;
>      }
>  
> -    blk = img_open("image", filename, fmt, flags, true, quiet);
> +    if (image_opts) {
> +        if (fmt) {
> +            error_report("--image-opts and --format are mutually exclusive");
> +            exit(1);
> +        }
> +        opts = qemu_opts_parse_noisily(qemu_find_opts("source"),
> +                                       filename, true);
> +        if (!opts) {
> +            exit(1);
> +        }
> +        blk = img_open_opts("image", opts, flags);
> +    } else {
> +        blk = img_open_file("image", filename, fmt, flags, true, quiet);
> +    }

This block is duplicated everywhere. Can you make it a function so that
it stays a single line in each of the callers?

Kevin