[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 21/21] block: look for zero blocks in bs->file
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH v4 21/21] block: look for zero blocks in bs->file |
Date: |
Thu, 29 Aug 2013 16:00:21 +0200 |
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
block.c | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/block.c b/block.c
index 9299605..94c6942 100644
--- a/block.c
+++ b/block.c
@@ -3001,7 +3001,7 @@ static int64_t coroutine_fn
bdrv_co_get_block_status(BlockDriverState *bs,
{
int64_t length;
int64_t n;
- int64_t ret;
+ int64_t ret, ret2;
length = bdrv_getlength(bs);
if (length < 0) {
@@ -3043,6 +3043,20 @@ static int64_t coroutine_fn
bdrv_co_get_block_status(BlockDriverState *bs,
}
}
}
+
+ if (bs->file &&
+ (ret & BDRV_BLOCK_DATA) && !(ret & BDRV_BLOCK_ZERO) &&
+ (ret & BDRV_BLOCK_OFFSET_VALID)) {
+ ret2 = bdrv_co_get_block_status(bs->file, ret >> BDRV_SECTOR_BITS,
+ *pnum, pnum);
+ if (ret2 >= 0) {
+ /* Ignore errors. This is just providing extra information, it
+ * is useful but not necessary.
+ */
+ ret |= (ret2 & BDRV_BLOCK_ZERO);
+ }
+ }
+
return ret;
}
--
1.8.3.1
- [Qemu-devel] [PATCH v4 11/21] block: introduce bdrv_get_block_status API, (continued)
- [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, 2013/08/29
- [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 <=