Commit da7a50f9 authored by Fam Zheng's avatar Fam Zheng Committed by Stefan Hajnoczi
Browse files

vmdk: Implement .bdrv_has_zero_init 



Depending on the subformat, has_zero_init queries underlying storage for
flat extent. If it has a flat extent and its underlying storage doesn't
have zero init, return 0. Otherwise return 1.

Aligns the operator assignments.

Signed-off-by: default avatarFam Zheng <famz@redhat.com>
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent ab8bf290

block/vmdk.c

+33 −15
Original line number Diff line number Diff line
@@ -1724,6 +1724,23 @@ static int64_t vmdk_get_allocated_file_size(BlockDriverState *bs) 
    return ret;

}



static int vmdk_has_zero_init(BlockDriverState *bs)

{

    int i;

    BDRVVmdkState *s = bs->opaque;



    /* If has a flat extent and its underlying storage doesn't have zero init,

     * return 0. */

    for (i = 0; i < s->num_extents; i++) {

        if (s->extents[i].flat) {

            if (!bdrv_has_zero_init(s->extents[i].file)) {

                return 0;

            }

        }

    }

    return 1;

}



static QEMUOptionParameter vmdk_create_options[] = {

    {

        .name = BLOCK_OPT_SIZE,
@@ -1775,6 +1792,7 @@ static BlockDriver bdrv_vmdk = { 
    .bdrv_co_flush_to_disk        = vmdk_co_flush,

    .bdrv_co_is_allocated         = vmdk_co_is_allocated,

    .bdrv_get_allocated_file_size = vmdk_get_allocated_file_size,

    .bdrv_has_zero_init           = vmdk_has_zero_init,



    .create_options               = vmdk_create_options,

};