diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2013-09-04 19:00:31 +0200 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2013-09-06 15:25:09 +0200 |
| commit | 415b5b013ce74126e71459b922a92377918ae2ef (patch) | |
| tree | 9d336fd4804aa7eabd41840c9d7f08f53607e8ce | |
| parent | 4bc74be997a72922170f4f272fd5e8074a3ecc27 (diff) | |
| download | focaccia-qemu-415b5b013ce74126e71459b922a92377918ae2ef.tar.gz focaccia-qemu-415b5b013ce74126e71459b922a92377918ae2ef.zip | |
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: Eric Blake <eblake@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
| -rw-r--r-- | block.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/block.c b/block.c index 97406ec7bd..aa9ec835a7 100644 --- a/block.c +++ b/block.c @@ -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() */ |