From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49884) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VtkeI-0001gc-Jd for qemu-devel@nongnu.org; Thu, 19 Dec 2013 15:56:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VtkeD-0000kI-NP for qemu-devel@nongnu.org; Thu, 19 Dec 2013 15:56:50 -0500 Received: from mx1.redhat.com ([209.132.183.28]:49599) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VtkeD-0000kC-EJ for qemu-devel@nongnu.org; Thu, 19 Dec 2013 15:56:45 -0500 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id rBJKuhcK014959 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 19 Dec 2013 15:56:44 -0500 Message-ID: <52B35D89.4000506@redhat.com> Date: Thu, 19 Dec 2013 13:56:41 -0700 From: Eric Blake MIME-Version: 1.0 References: <1387482443-10633-1-git-send-email-mreitz@redhat.com> <1387482443-10633-3-git-send-email-mreitz@redhat.com> In-Reply-To: <1387482443-10633-3-git-send-email-mreitz@redhat.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="QsPtfujPBOcQNpnThbkKLTOIJ1XJKJSa7" Subject: Re: [Qemu-devel] [PATCH v6 02/22] blkdebug: Don't require sophisticated filename List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Max Reitz , qemu-devel@nongnu.org Cc: Kevin Wolf , Fam Zheng , Stefan Hajnoczi This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --QsPtfujPBOcQNpnThbkKLTOIJ1XJKJSa7 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 12/19/2013 12:47 PM, Max Reitz wrote: > If the filename is not prefixed by "blkdebug:" in > blkdebug_parse_filename(), the blkdebug driver was not selected through= > that protocol prefix, but by an explicit command line option > (file.driver=3Dblkdebug or something similar). Contrary to the current > reaction, this is not a problem at all; we just need to store the > filename (in the x-image option) and can go on; the user just has to > manually specify the config option. >=20 > Signed-off-by: Max Reitz > Reviewed-by: Kevin Wolf > --- > block/blkdebug.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) Reviewed-by: Eric Blake >=20 > diff --git a/block/blkdebug.c b/block/blkdebug.c > index 627e29d..a2301d7 100644 > --- a/block/blkdebug.c > +++ b/block/blkdebug.c > @@ -313,7 +313,9 @@ static void blkdebug_parse_filename(const char *fil= ename, QDict *options, > =20 > /* Parse the blkdebug: prefix */ > if (!strstart(filename, "blkdebug:", &filename)) { > - error_setg(errp, "File name string must start with 'blkdebug:'= "); > + /* There was no prefix; therefore, all options have to be alre= ady > + present in the QDict (except for the filename) */ > + qdict_put(options, "x-image", qstring_from_str(filename)); Am I correct that x-image is internal use only, and that we aren't exposing an x- interface to the public user? --=20 Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org --QsPtfujPBOcQNpnThbkKLTOIJ1XJKJSa7 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.4.15 (GNU/Linux) Comment: Public key at http://people.redhat.com/eblake/eblake.gpg Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQEcBAEBCAAGBQJSs12JAAoJEKeha0olJ0NqkXsH/2uzFdDmriWhqU8iiFSNMFF/ 6cH5PBfqfvzILivUEhJNgOBKL36PJljrjHFxvuFUUP32AsTw2Rn1kenjLS60qSFb nAeT5ueFmduXgL5pHyKCEGzISLmTeizhlTbGpdb5YhL8a1yQMXQn59nAkHwa8M0+ kNs9cwyzVaPg+PWwjS7grgAQiG1BhanjSXf4bZuU2yW5vdHMGFvlrwqTC+JC5iDx gCURgzwx2zBVILONUvN+QYdt38f1nn6yKctBRntqa3WuzdIyCS9fBPmyavPyJqmo oq9DbsDoGjP+zmTOLeKJ9wk3S4yOCg2c7zgzLaaFR6zD5WKzokAuoHtFQRMvvF8= =bLdn -----END PGP SIGNATURE----- --QsPtfujPBOcQNpnThbkKLTOIJ1XJKJSa7--