Commit d0a18f10 authored by Fam Zheng's avatar Fam Zheng Committed by Max Reitz
Browse files

vmdk: Fix calculation of block status's offset 



"offset" is the offset of cluster and sector_num doesn't necessarily
refer to the start of it, it should add index_in_cluster.

Signed-off-by: default avatarFam Zheng <famz@redhat.com>
Message-id: 1453780743-16806-12-git-send-email-famz@redhat.com
Reviewed-by: default avatarMax Reitz <mreitz@redhat.com>
Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
parent 7429e207

block/vmdk.c

+4 −2
Original line number Diff line number Diff line
@@ -1278,6 +1278,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;
@@ -1291,13 +1292,14 @@ static int64_t coroutine_fn vmdk_co_get_block_status(BlockDriverState *bs, 
    case VMDK_OK:

        ret = BDRV_BLOCK_DATA;

        if (extent->file == bs->file && !extent->compressed) {

            ret |= BDRV_BLOCK_OFFSET_VALID | offset;

            ret |= BDRV_BLOCK_OFFSET_VALID;

            ret |= (offset + (index_in_cluster << BDRV_SECTOR_BITS))

                    & BDRV_BLOCK_OFFSET_MASK;

        }



        break;

    }



    index_in_cluster = vmdk_find_index_in_cluster(extent, sector_num);

    n = extent->cluster_sectors - index_in_cluster;

    if (n > nb_sectors) {

        n = nb_sectors;