[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 19/19] block: look for zero blocks in bs->file
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH v3 19/19] block: look for zero blocks in bs->file |
Date: |
Thu, 25 Jul 2013 16:23:17 +0200 |
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
block.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/block.c b/block.c
index 8738937..1493f22 100644
--- a/block.c
+++ b/block.c
@@ -2991,7 +2991,7 @@ static int64_t coroutine_fn
bdrv_co_get_block_status(BlockDriverState *bs,
int nb_sectors, int *pnum)
{
int64_t n;
- int64_t ret;
+ int64_t ret, ret2;
if (sector_num >= bs->total_sectors) {
*pnum = 0;
@@ -3017,6 +3017,14 @@ static int64_t coroutine_fn
bdrv_co_get_block_status(BlockDriverState *bs,
ret |= BDRV_BLOCK_ZERO;
}
+ 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);
+ ret |= (ret2 & BDRV_BLOCK_ZERO);
+ }
+
return ret;
}
--
1.8.3.1
- [Qemu-devel] [PATCH v3 14/19] docs, qapi: document qemu-img map, (continued)
- [Qemu-devel] [PATCH v3 14/19] docs, qapi: document qemu-img map, Paolo Bonzini, 2013/07/25
- [Qemu-devel] [PATCH v3 15/19] block: use bdrv_has_zero_init to return BDRV_BLOCK_ZERO, Paolo Bonzini, 2013/07/25
- [Qemu-devel] [PATCH v3 16/19] raw-posix: return get_block_status data and flags, Paolo Bonzini, 2013/07/25
- [Qemu-devel] [PATCH v3 17/19] raw-posix: detect XFS unwritten extents, Paolo Bonzini, 2013/07/25
- [Qemu-devel] [PATCH v3 18/19] block: add default get_block_status implementation for protocols, Paolo Bonzini, 2013/07/25
- [Qemu-devel] [PATCH v3 19/19] block: look for zero blocks in bs->file,
Paolo Bonzini <=