From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59090) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WuoQV-0003zg-Rj for qemu-devel@nongnu.org; Wed, 11 Jun 2014 15:43:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WuoQP-0000En-4b for qemu-devel@nongnu.org; Wed, 11 Jun 2014 15:43:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49028) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WuoQO-0000EL-Pu for qemu-devel@nongnu.org; Wed, 11 Jun 2014 15:43:09 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s5BJh774018451 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 11 Jun 2014 15:43:07 -0400 Message-ID: <5398B14A.8090903@redhat.com> Date: Wed, 11 Jun 2014 13:43:06 -0600 From: Eric Blake MIME-Version: 1.0 References: <1402495503-4722-1-git-send-email-kwolf@redhat.com> <1402495503-4722-5-git-send-email-kwolf@redhat.com> In-Reply-To: <1402495503-4722-5-git-send-email-kwolf@redhat.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="OmcUIfO6XXvh07ASM9VblOTpUsuuTAoFf" Subject: Re: [Qemu-devel] [PATCH 4/9] block: Always pass driver name through options QDict List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Kevin Wolf , qemu-devel@nongnu.org Cc: armbru@redhat.com, stefanha@redhat.com This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --OmcUIfO6XXvh07ASM9VblOTpUsuuTAoFf Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable 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. >=20 > We also catch cases now where both the drv argument and a "driver" > option is specified, e.g. by specifying -drive format=3Dqcow2,driver=3D= raw >=20 > Signed-off-by: Kevin Wolf > --- > block.c | 76 ++++++++++++++++++++++++--------------= -------- > tests/qemu-iotests/051 | 1 + > tests/qemu-iotests/051.out | 5 ++- > 3 files changed, 45 insertions(+), 37 deletions(-) >=20 > @@ -1062,12 +1061,8 @@ static int bdrv_fill_options(QDict **options, co= nst char **pfilename, int flags, > *pfilename =3D filename =3D NULL; > } > =20 > - 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 --=20 Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org --OmcUIfO6XXvh07ASM9VblOTpUsuuTAoFf Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 Comment: Public key at http://people.redhat.com/eblake/eblake.gpg Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQEcBAEBCAAGBQJTmLFKAAoJEKeha0olJ0NqVmwH/07sKw4h6i0z7ii1bTBA8y76 DcwxcDpu7Bh+BZR4tHftODFB1fRcobzckH8XIwyMvLEr/iu3AvOuZCFd+osH6r9W Lxt/GL8lxuOnNrOUkS0xxhPRbOkkT8dluK74jMWs7+kBxFAsQQGZ9bXinjKvJ4wd k1tLfsvyqeNAYxAUlBSxkWuYBSuaxq72mXwmvFICQgrvvf67+hGftP7VgFdZOEBE tgo5fJ+SxT5BK4gk2dfd0wHXTCC2zGhjPbLisheCwerRfiArvNj9KOvsP+Jh6IOw ConAcNhnVSKSLSzOQz0cIG2InWSHr5IsukM16xwVmp4K6g79k7BqsL/Sdz1vIF0= =Rmak -----END PGP SIGNATURE----- --OmcUIfO6XXvh07ASM9VblOTpUsuuTAoFf--