From: Kevin Wolf <kwolf@redhat.com>
Date: Wed, 27 Feb 2019 12:22:56 +0000 (+0100)
Subject: qcow2: Prepare qcow2_co_block_status() for data file
X-Git-Tag: v4.0.0-rc0~46^2~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=37be14036b1a7ae066f76d3296bbd37b0c697637;p=thirdparty%2Fqemu.git

qcow2: Prepare qcow2_co_block_status() for data file

Offset 0 cannot be assumed to mean an unallocated cluster any more.
Instead, the cluster type needs to be checked.

*file must refer to the data file instead of the image file if a valid
offset is returned from qcow2_co_block_status().

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---

diff --git a/block/qcow2.c b/block/qcow2.c
index eaccd1c11a9..8d1f667e915 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -1829,11 +1829,11 @@ static int coroutine_fn qcow2_co_block_status(BlockDriverState *bs,
 
     *pnum = bytes;
 
-    if (cluster_offset != 0 && ret != QCOW2_CLUSTER_COMPRESSED &&
+    if ((ret == QCOW2_CLUSTER_NORMAL || ret == QCOW2_CLUSTER_ZERO_ALLOC) &&
         !s->crypto) {
         index_in_cluster = offset & (s->cluster_size - 1);
         *map = cluster_offset | index_in_cluster;
-        *file = bs->file->bs;
+        *file = s->data_file->bs;
         status |= BDRV_BLOCK_OFFSET_VALID;
     }
     if (ret == QCOW2_CLUSTER_ZERO_PLAIN || ret == QCOW2_CLUSTER_ZERO_ALLOC) {