Re: [Qemu-block] [PATCH v4 07/10] qemu-img: allow specifying image as a set of options args

[Daniel P. Berrange]

On Wed, Jan 27, 2016 at 03:30:29PM +0100, Kevin Wolf wrote:
> 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 <address@hidden>
> 
> > @@ -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?

Yes, I've done that and its much nicer now

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 :|