Commit 37be1403 authored by Kevin Wolf's avatar Kevin Wolf
Browse files

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: default avatarKevin Wolf <kwolf@redhat.com>
parent 77e023ff

block/qcow2.c

+2 −2
Original line number Diff line number Diff line
@@ -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) {