From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57716) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aRMO2-0007ln-0E for qemu-devel@nongnu.org; Thu, 04 Feb 2016 11:04:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aRMNz-0001pI-AT for qemu-devel@nongnu.org; Thu, 04 Feb 2016 11:04:01 -0500 Date: Thu, 4 Feb 2016 16:03:46 +0000 From: "Daniel P. Berrange" Message-ID: <20160204160346.GC30301@redhat.com> References: <1454417864-18774-1-git-send-email-berrange@redhat.com> <1454417864-18774-8-git-send-email-berrange@redhat.com> <56B3757C.5060401@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <56B3757C.5060401@redhat.com> Subject: Re: [Qemu-devel] [PATCH v5 07/10] qemu-img: allow specifying image as a set of options args Reply-To: "Daniel P. Berrange" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Eric Blake Cc: Kevin Wolf , qemu-block@nongnu.org, qemu-devel@nongnu.org, Markus Armbruster , Paolo Bonzini , Andreas =?utf-8?Q?F=C3=A4rber?= On Thu, Feb 04, 2016 at 08:59:56AM -0700, Eric Blake wrote: > On 02/02/2016 05:57 AM, Daniel P. Berrange wrote: > > 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 --image-opts driver=https,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 > > --- > > qemu-img-cmds.hx | 44 +++++++-------- > > qemu-img.c | 164 +++++++++++++++++++++++++++++++++++++++++++++++-------- > > qemu-img.texi | 6 ++ > > 3 files changed, 170 insertions(+), 44 deletions(-) > > > > > +static BlockBackend *img_open_opts(const char *id, > > + QemuOpts *opts, int flags) > > +{ > > + QDict *options; > > + Error *local_err = NULL; > > + char *file = NULL; > > + BlockBackend *blk; > > + file = g_strdup(qemu_opt_get(opts, "file")); > > + qemu_opt_unset(opts, "file"); > > + options = qemu_opts_to_qdict(opts, NULL); > > + blk = blk_new_open(id, file, NULL, options, flags, &local_err); > > + if (!blk) { > > + error_report("Could not open '%s': %s", file ? file : "", > > + error_get_pretty(local_err)); > > Markus' code has landed; this would be cleaner with error_reportf_err() > from commit 8277d2aa. Ok will change. > > > @@ -2720,6 +2828,7 @@ static int img_rebase(int argc, char **argv) > > if (optind != argc - 1) { > > error_exit("Expecting one image file name"); > > } > > + > > if (!unsafe && !out_baseimg) { > > error_exit("Must specify backing file (-b) or use unsafe mode (-u)"); > > } > > Spurious hunk? Yes, left over from earlier versions Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|