On 06/11/2014 08:04 AM, Kevin Wolf wrote: > The "driver" entry in the options QDict is now only missing if we're > opening an image with format probing. > > We also catch cases now where both the drv argument and a "driver" > option is specified, e.g. by specifying -drive format=qcow2,driver=raw > > Signed-off-by: Kevin Wolf <kw...@redhat.com> > --- > block.c | 76 > ++++++++++++++++++++++++---------------------- > tests/qemu-iotests/051 | 1 + > tests/qemu-iotests/051.out | 5 ++- > 3 files changed, 45 insertions(+), 37 deletions(-) >
> @@ -1062,12 +1061,8 @@ static int bdrv_fill_options(QDict **options, const
> char **pfilename, int flags,
> *pfilename = filename = NULL;
> }
>
> - if (!protocol) {
> - return 0;
> - }
> -
> /* Fetch the file name from the options QDict if necessary */
> - if (filename) {
> + if (protocol && filename) {
> if (filename && !qdict_haskey(*options, "filename")) {
Slight conflict here when you clean up the dead 'filename &&' in patch
1; obvious resolution.
Reviewed-by: Eric Blake <ebl...@redhat.com>
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
signature.asc
Description: OpenPGP digital signature
