diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2019-02-27 13:22:56 +0100 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2019-03-08 12:26:45 +0100 |
| commit | 37be14036b1a7ae066f76d3296bbd37b0c697637 (patch) | |
| tree | 2ff2be43bce66ac98a692709dab8bfa287823146 | |
| parent | 77e023ff79222191e8cc3d377504da8f19926837 (diff) | |
| download | focaccia-qemu-37be14036b1a7ae066f76d3296bbd37b0c697637.tar.gz focaccia-qemu-37be14036b1a7ae066f76d3296bbd37b0c697637.zip | |
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>
| -rw-r--r-- | block/qcow2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/block/qcow2.c b/block/qcow2.c index eaccd1c11a..8d1f667e91 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) { |