From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46787) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xorll-0006V7-B2 for qemu-devel@nongnu.org; Thu, 13 Nov 2014 05:37:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xorlc-0002WA-AW for qemu-devel@nongnu.org; Thu, 13 Nov 2014 05:36:53 -0500 Received: from mail-wg0-x22c.google.com ([2a00:1450:400c:c00::22c]:48146) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xorlc-0002W6-31 for qemu-devel@nongnu.org; Thu, 13 Nov 2014 05:36:44 -0500 Received: by mail-wg0-f44.google.com with SMTP id x12so16614466wgg.31 for ; Thu, 13 Nov 2014 02:36:43 -0800 (PST) Date: Thu, 13 Nov 2014 10:36:40 +0000 From: Stefan Hajnoczi Message-ID: <20141113103640.GA7462@stefanha-thinkpad.redhat.com> References: <1415389165-16157-1-git-send-email-kwolf@redhat.com> <1415389165-16157-7-git-send-email-kwolf@redhat.com> <5460D054.7040905@redhat.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="jRHKVT23PllUwdXP" Content-Disposition: inline In-Reply-To: <5460D054.7040905@redhat.com> Subject: Re: [Qemu-devel] [PATCH v2 6/9] block: Read only one sector for format probing List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Max Reitz Cc: Kevin Wolf , jcody@redhat.com, qemu-devel@nongnu.org, stefanha@redhat.com, armbru@redhat.com --jRHKVT23PllUwdXP Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Nov 10, 2014 at 03:48:52PM +0100, Max Reitz wrote: > On 2014-11-07 at 20:39, Kevin Wolf wrote: > >The only image format driver that even potentially accesses anything > >after 512 bytes in its bdrv_probe() implementation is VMDK, which reads > >a plain-text descriptor file. In practice, the field it's looking for > >seems to come first and will be well within the first 512 bytes, too. > > > >Signed-off-by: Kevin Wolf > >Reviewed-by: Stefan Hajnoczi > >--- > > block.c | 2 +- > > include/block/block_int.h | 2 ++ > > 2 files changed, 3 insertions(+), 1 deletion(-) > > > >diff --git a/block.c b/block.c > >index 2fdc33f..1fd4b8e 100644 > >--- a/block.c > >+++ b/block.c > >@@ -682,7 +682,7 @@ static int find_image_format(BlockDriverState *bs, c= onst char *filename, > > BlockDriver **pdrv, Error **errp) > > { > > BlockDriver *drv; > >- uint8_t buf[2048]; > >+ uint8_t buf[BLOCK_PROBE_BUF_SIZE]; > > int ret =3D 0; > > /* Return the raw BlockDriver * to scsi-generic devices or empty d= rives */ > >diff --git a/include/block/block_int.h b/include/block/block_int.h > >index a1c17b9..cd94559 100644 > >--- a/include/block/block_int.h > >+++ b/include/block/block_int.h > >@@ -57,6 +57,8 @@ > > #define BLOCK_OPT_REDUNDANCY "redundancy" > > #define BLOCK_OPT_NOCOW "nocow" > >+#define BLOCK_PROBE_BUF_SIZE 512 > >+ > > typedef struct BdrvTrackedRequest { > > BlockDriverState *bs; > > int64_t offset; >=20 > You should change the description of the buf_size parameter for > bdrv_probe_all, as I wrote in my review for patch 5. >=20 > With that description fixed (either here or in patch 5): Here please, since the value is still 2048 in Patch 5. Stefan --jRHKVT23PllUwdXP Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAEBAgAGBQJUZIm4AAoJEJykq7OBq3PIhVYH/irgw4Xen1am+ivz9pJIXB76 bN2nPkm5dOZKOQgmiMzuwlxP7RYqLNjgu7lY2RyAmQTp9j5+Fbe8FfG+pFHMxP7E 5lWfvkIsziaI4JR8i8BoJ4PSisy1Bd68IGTbBefJS8Fh4VJ6k2e+iQS6FdkVszzW wvRwgxY9teof4c2VtJmzMW0wcZUMgpn0kQMxPQe4eVA7ZolIhTHpsPMrIeI9Yt5x A8cYMDkcWteiXUjjUOwN03HSdcqhygn7Wl9dDxlCGgZ3G20A2R7cMAI+HowKjUV1 qYIRtSYdCEattIAvpHR4VYO27wFmSbeCO5E9oZkEaAL68zF+y/Fe3iKgMNEci+I= =zsbG -----END PGP SIGNATURE----- --jRHKVT23PllUwdXP--