From: Fam Zheng <famz@redhat.com>
Date: Tue, 26 Jan 2016 03:58:59 +0000 (+0800)
Subject: vmdk: Return extent's file in bdrv_get_block_status
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=e0f100f57ceee919a7df7af316961b175ffef4e6;p=people%2Fliuw%2Flibxenctrl-split%2Fqemu-xen.git

vmdk: Return extent's file in bdrv_get_block_status

Signed-off-by: Fam Zheng <famz@redhat.com>
Message-id: 1453780743-16806-13-git-send-email-famz@redhat.com
Reviewed-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
---

diff --git a/block/vmdk.c b/block/vmdk.c
index 9d5a18ac0..a8db5d9ec 100644
--- a/block/vmdk.c
+++ b/block/vmdk.c
@@ -1291,12 +1291,12 @@ static int64_t coroutine_fn vmdk_co_get_block_status(BlockDriverState *bs,
         break;
     case VMDK_OK:
         ret = BDRV_BLOCK_DATA;
-        if (extent->file == bs->file && !extent->compressed) {
+        if (!extent->compressed) {
             ret |= BDRV_BLOCK_OFFSET_VALID;
             ret |= (offset + (index_in_cluster << BDRV_SECTOR_BITS))
                     & BDRV_BLOCK_OFFSET_MASK;
         }
-
+        *file = extent->file->bs;
         break;
     }