From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51863) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aGC34-0005SU-Bk for qemu-devel@nongnu.org; Mon, 04 Jan 2016 15:48:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aGC33-0001NX-EF for qemu-devel@nongnu.org; Mon, 04 Jan 2016 15:48:14 -0500 References: <1450936225-4249-1-git-send-email-famz@redhat.com> <1450936225-4249-12-git-send-email-famz@redhat.com> From: Max Reitz Message-ID: <568ADA82.1000605@redhat.com> Date: Mon, 4 Jan 2016 21:48:02 +0100 MIME-Version: 1.0 In-Reply-To: <1450936225-4249-12-git-send-email-famz@redhat.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="CAanMlhtIcX2NSQlPdSiSWdnctS1VsWm0" Subject: Re: [Qemu-devel] [PATCH v4 11/14] vmdk: Return extent's file in bdrv_get_block_status List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Fam Zheng , qemu-devel@nongnu.org Cc: Kevin Wolf , pbonzini@redhat.com, Stefan Hajnoczi , qemu-block@nongnu.org This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --CAanMlhtIcX2NSQlPdSiSWdnctS1VsWm0 Content-Type: text/plain; charset=iso-8859-15 Content-Transfer-Encoding: quoted-printable On 24.12.2015 06:50, Fam Zheng wrote: > Reviewed-by: Stefan Hajnoczi > Signed-off-by: Fam Zheng > --- > block/vmdk.c | 11 +++++------ > 1 file changed, 5 insertions(+), 6 deletions(-) >=20 > diff --git a/block/vmdk.c b/block/vmdk.c > index f5a56fd..b60a5af 100644 > --- a/block/vmdk.c > +++ b/block/vmdk.c > @@ -1265,6 +1265,7 @@ static int64_t coroutine_fn vmdk_co_get_block_sta= tus(BlockDriverState *bs, > 0, 0); > qemu_co_mutex_unlock(&s->lock); > =20 > + index_in_cluster =3D vmdk_find_index_in_cluster(extent, sector_num= ); > switch (ret) { > case VMDK_ERROR: > ret =3D -EIO; > @@ -1276,15 +1277,13 @@ static int64_t coroutine_fn vmdk_co_get_block_s= tatus(BlockDriverState *bs, > ret =3D BDRV_BLOCK_ZERO; > break; > case VMDK_OK: > - ret =3D BDRV_BLOCK_DATA; > - if (extent->file =3D=3D bs->file && !extent->compressed) { > - ret |=3D BDRV_BLOCK_OFFSET_VALID | offset; > - } > - > + ret =3D BDRV_BLOCK_DATA | BDRV_BLOCK_OFFSET_VALID; > + ret |=3D (offset + (index_in_cluster << BDRV_SECTOR_BITS)) > + & BDRV_BLOCK_OFFSET_MASK; > + *file =3D extent->file->bs; What if the extent is compressed? Max > break; > } > =20 > - index_in_cluster =3D vmdk_find_index_in_cluster(extent, sector_num= ); > n =3D extent->cluster_sectors - index_in_cluster; > if (n > nb_sectors) { > n =3D nb_sectors; >=20 --CAanMlhtIcX2NSQlPdSiSWdnctS1VsWm0 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBCAAGBQJWitqCAAoJEDuxQgLoOKyt7xkH/RrOWROW2uzjL5Jr69T2sobZ /wsbVl8UJw9MnV74jANlnf8yE1rHXV0tbL13hgdZsKjaLJcGonK3yILd0wBJtoKX u1Z0o4xO4jMGk0iB/58dw5uUyMW49I6RBF5iwtWfjXCW/EfWKwMCRq8oiY9h1ci2 25+ByJLitoBXb8X2yEYVW0TWYmgLfD7yCGn+ixhoDvuGl8b1JcxSDtggPbDWBof6 sRyU+FgyNIRQxn4PKN4hqbWGcdk6EclfNtwvbEB6T2X8LG4pW+y7rFuD1iIQC2CQ J1gIKn4UnCluDGMm+BOL4wOaQUsxqx/sX5db0UVvi7Wk0sXkIp1icd3dGSKN9iQ= =A+Ui -----END PGP SIGNATURE----- --CAanMlhtIcX2NSQlPdSiSWdnctS1VsWm0--