From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53802) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WkKwf-0005kV-J1 for qemu-devel@nongnu.org; Tue, 13 May 2014 18:13:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WkKwa-0007cd-Er for qemu-devel@nongnu.org; Tue, 13 May 2014 18:13:09 -0400 Received: from mx1.redhat.com ([209.132.183.28]:6452) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WkKwa-0007cZ-6r for qemu-devel@nongnu.org; Tue, 13 May 2014 18:13:04 -0400 Message-ID: <537298EB.8010704@redhat.com> Date: Tue, 13 May 2014 16:12:59 -0600 From: Eric Blake MIME-Version: 1.0 References: <1399572762-13990-1-git-send-email-mreitz@redhat.com> <1399572762-13990-4-git-send-email-mreitz@redhat.com> In-Reply-To: <1399572762-13990-4-git-send-email-mreitz@redhat.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="Sw3aOqqpLA0TFWrRT8Kcot6UveLXdQMnd" Subject: Re: [Qemu-devel] [PATCH v3 3/4] block: Allow JSON filenames List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Max Reitz , qemu-devel@nongnu.org Cc: Kevin Wolf , =?UTF-8?B?QmVub8OudCBDYW5ldA==?= , Stefan Hajnoczi This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --Sw3aOqqpLA0TFWrRT8Kcot6UveLXdQMnd Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 05/08/2014 12:12 PM, Max Reitz wrote: > If the filename given to bdrv_open() is prefixed with "json:", parse th= e > rest as a JSON object and merge the result into the options QDict. If > there are conflicts, report one of them to the user and abort. Commit message is stale compared to change in the code. >=20 > Signed-off-by: Max Reitz > --- > block.c | 41 +++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 41 insertions(+) Code is find, though, so: Reviewed-by: Eric Blake > + > + /* Options given in the filename have lower priority than opti= ons > + * specified directly */ > + qdict_join(options, json_options, false); > + QDECREF(json_options); > + filename =3D NULL; > + } > + > bs->options =3D options; > options =3D qdict_clone_shallow(options); > =20 >=20 --=20 Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org --Sw3aOqqpLA0TFWrRT8Kcot6UveLXdQMnd 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/ iQEcBAEBCAAGBQJTcpjrAAoJEKeha0olJ0NqmJoH/RavNNlN1hpEfZDX604kR9Mq dSPofkqBcdFCgVFDQHKZCOteLT5Mlgjm0GP0yA6fWX5F1SMEWYKUHLLw7vHpggIb M5a9pqetaNR0PeLfoAzqAs+Wx3Lncc8pcmyRv+0G7wA+6kKK1fxBe/HHggJGVIyg cgAlKVVP8Qj4CjHOhJxsCVfr2EcHFj8NN00GZu4dcM37wD8LH6rjb7+EIAAEuonN CNYMzEdevmkWShaoXWEY0Q2krz3q/q/jvRiTSm0D/d9Z5mVlndg1pSniLIagZmNK Mu+ru+9DuHfjmxGnJJb8sM5BJizxVItS11wtB+JO7TtXXDsciLe5nrt94iD1eQE= =cEw1 -----END PGP SIGNATURE----- --Sw3aOqqpLA0TFWrRT8Kcot6UveLXdQMnd--