[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 14/21] block: use bdrv_has_zero_init to return BD
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH v4 14/21] block: use bdrv_has_zero_init to return BDRV_BLOCK_ZERO |
Date: |
Thu, 29 Aug 2013 16:00:14 +0200 |
Alternatively, this could use a "discard zeroes data" flag returned
by bdrv_get_info.
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
block.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/block.c b/block.c
index c9756f5..ecae287 100644
--- a/block.c
+++ b/block.c
@@ -3001,6 +3001,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) {
@@ -3022,7 +3023,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() */
--
1.8.3.1
- [Qemu-devel] [PATCH v4 08/21] block: expect errors from bdrv_co_is_allocated, (continued)
- [Qemu-devel] [PATCH v4 08/21] block: expect errors from bdrv_co_is_allocated, Paolo Bonzini, 2013/08/29
- [Qemu-devel] [PATCH v4 06/21] block: do not use ->total_sectors in bdrv_co_is_allocated, Paolo Bonzini, 2013/08/29
- [Qemu-devel] [PATCH v4 07/21] block: remove bdrv_is_allocated_above/bdrv_co_is_allocated_above distinction, Paolo Bonzini, 2013/08/29
- [Qemu-devel] [PATCH v4 09/21] qemu-img: always probe the input image for allocated sectors, Paolo Bonzini, 2013/08/29
- [Qemu-devel] [PATCH v4 10/21] block: make bdrv_has_zero_init return false for copy-on-write-images, Paolo Bonzini, 2013/08/29
- [Qemu-devel] [PATCH v4 13/21] block: return get_block_status data and flags for formats, Paolo Bonzini, 2013/08/29
- [Qemu-devel] [PATCH v4 11/21] block: introduce bdrv_get_block_status API, Paolo Bonzini, 2013/08/29
- [Qemu-devel] [PATCH v4 12/21] block: define get_block_status return value, Paolo Bonzini, 2013/08/29
- [Qemu-devel] [PATCH v4 14/21] block: use bdrv_has_zero_init to return BDRV_BLOCK_ZERO,
Paolo Bonzini <=
- [Qemu-devel] [PATCH v4 15/21] block: return BDRV_BLOCK_ZERO past end of backing file, Paolo Bonzini, 2013/08/29
- [Qemu-devel] [PATCH v4 16/21] qemu-img: add a "map" subcommand, Paolo Bonzini, 2013/08/29
- [Qemu-devel] [PATCH v4 17/21] docs, qapi: document qemu-img map, Paolo Bonzini, 2013/08/29
- [Qemu-devel] [PATCH v4 18/21] raw-posix: return get_block_status data and flags, Paolo Bonzini, 2013/08/29
- [Qemu-devel] [PATCH v4 19/21] raw-posix: report unwritten extents as zero, Paolo Bonzini, 2013/08/29
- [Qemu-devel] [PATCH v4 20/21] block: add default get_block_status implementation for protocols, Paolo Bonzini, 2013/08/29
- [Qemu-devel] [PATCH v4 21/21] block: look for zero blocks in bs->file, Paolo Bonzini, 2013/08/29