Commit 415b5b01 authored by Paolo Bonzini's avatar Paolo Bonzini Committed by Stefan Hajnoczi
Browse files

block: use bdrv_has_zero_init to return BDRV_BLOCK_ZERO 



Alternatively, this could use a "discard zeroes data" flag returned
by bdrv_get_info.

Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent 4bc74be9

block.c

+10 −1
Original line number Diff line number Diff line
@@ -3075,6 +3075,7 @@ static int64_t coroutine_fn bdrv_co_get_block_status(BlockDriverState *bs, 
{

    int64_t length;

    int64_t n;

    int64_t ret;



    length = bdrv_getlength(bs);

    if (length < 0) {
@@ -3096,7 +3097,15 @@ static int64_t coroutine_fn bdrv_co_get_block_status(BlockDriverState *bs, 
        return BDRV_BLOCK_DATA;

    }



    return bs->drv->bdrv_co_get_block_status(bs, sector_num, nb_sectors, pnum);

    ret = bs->drv->bdrv_co_get_block_status(bs, sector_num, nb_sectors, pnum);

    if (ret < 0) {

        return ret;

    }



    if (!(ret & BDRV_BLOCK_DATA) && bdrv_has_zero_init(bs)) {

        ret |= BDRV_BLOCK_ZERO;

    }

    return ret;

}



/* Coroutine wrapper for bdrv_get_block_status() */