From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49743) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aGJ9N-0002yA-Gi for qemu-devel@nongnu.org; Mon, 04 Jan 2016 23:23:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aGJ9M-0004Yt-Ln for qemu-devel@nongnu.org; Mon, 04 Jan 2016 23:23:13 -0500 Date: Tue, 5 Jan 2016 12:23:02 +0800 From: Fam Zheng Message-ID: <20160105042302.GA2779@ad.usersys.redhat.com> References: <1450936225-4249-1-git-send-email-famz@redhat.com> <1450936225-4249-12-git-send-email-famz@redhat.com> <568ADA82.1000605@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <568ADA82.1000605@redhat.com> 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: Max Reitz Cc: Kevin Wolf , qemu-block@nongnu.org, qemu-devel@nongnu.org, Stefan Hajnoczi , pbonzini@redhat.com On Mon, 01/04 21:48, Max Reitz wrote: > 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(-) > > > > 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_status(BlockDriverState *bs, > > 0, 0); > > qemu_co_mutex_unlock(&s->lock); > > > > + index_in_cluster = vmdk_find_index_in_cluster(extent, sector_num); > > switch (ret) { > > case VMDK_ERROR: > > ret = -EIO; > > @@ -1276,15 +1277,13 @@ static int64_t coroutine_fn vmdk_co_get_block_status(BlockDriverState *bs, > > ret = BDRV_BLOCK_ZERO; > > break; > > case VMDK_OK: > > - ret = BDRV_BLOCK_DATA; > > - if (extent->file == bs->file && !extent->compressed) { > > - ret |= BDRV_BLOCK_OFFSET_VALID | offset; > > - } > > - > > + ret = BDRV_BLOCK_DATA | BDRV_BLOCK_OFFSET_VALID; > > + ret |= (offset + (index_in_cluster << BDRV_SECTOR_BITS)) > > + & BDRV_BLOCK_OFFSET_MASK; > > + *file = extent->file->bs; > > What if the extent is compressed? > You're right, the offset shouldn't be set if compressed. Will fix. Thanks! Fam