[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCHv6 14/17] block/get_block_status: fix BDRV_BLOCK_ZERO
From: |
Peter Lieven |
Subject: |
[Qemu-devel] [PATCHv6 14/17] block/get_block_status: fix BDRV_BLOCK_ZERO for unallocated blocks |
Date: |
Thu, 24 Oct 2013 09:46:48 +0200 |
this patch does 2 things:
a) only do additional call outs if BDRV_BLOCK_ZERO is not already set.
b) use the newly introduced bdrv_has_discard_zeroes() to return the
zero state of an unallocated block. the used callout to
bdrv_has_zero_init() is only valid right after bdrv_create.
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Peter Lieven <address@hidden>
---
block.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/block.c b/block.c
index 21a992a..69a2d2b 100644
--- a/block.c
+++ b/block.c
@@ -3263,8 +3263,8 @@ static int64_t coroutine_fn
bdrv_co_get_block_status(BlockDriverState *bs,
*pnum, pnum);
}
- if (!(ret & BDRV_BLOCK_DATA)) {
- if (bdrv_has_zero_init(bs)) {
+ if (!(ret & BDRV_BLOCK_DATA) && !(ret & BDRV_BLOCK_ZERO)) {
+ if (bdrv_unallocated_blocks_are_zero(bs)) {
ret |= BDRV_BLOCK_ZERO;
} else if (bs->backing_hd) {
BlockDriverState *bs2 = bs->backing_hd;
--
1.7.9.5
- [Qemu-devel] [PATCHv6 01/17] block: make BdrvRequestFlags public, (continued)
- [Qemu-devel] [PATCHv6 01/17] block: make BdrvRequestFlags public, Peter Lieven, 2013/10/24
- [Qemu-devel] [PATCHv6 02/17] block: add flags to bdrv_*_write_zeroes, Peter Lieven, 2013/10/24
- [Qemu-devel] [PATCHv6 06/17] block/iscsi: add .bdrv_get_info, Peter Lieven, 2013/10/24
- [Qemu-devel] [PATCHv6 05/17] block: add wrappers for logical block provisioning information, Peter Lieven, 2013/10/24
- [Qemu-devel] [PATCHv6 11/17] iscsi: set limits in BlockDriverState, Peter Lieven, 2013/10/24
- [Qemu-devel] [PATCHv6 08/17] block: honour BlockLimits in bdrv_co_do_write_zeroes, Peter Lieven, 2013/10/24
- [Qemu-devel] [PATCHv6 07/17] block: add BlockLimits structure to BlockDriverState, Peter Lieven, 2013/10/24
- [Qemu-devel] [PATCHv6 09/17] block: honour BlockLimits in bdrv_co_discard, Peter Lieven, 2013/10/24
- [Qemu-devel] [PATCHv6 10/17] iscsi: simplify iscsi_co_discard, Peter Lieven, 2013/10/24
- [Qemu-devel] [PATCHv6 14/17] block/get_block_status: fix BDRV_BLOCK_ZERO for unallocated blocks,
Peter Lieven <=
- [Qemu-devel] [PATCHv6 13/17] block: introduce bdrv_make_zero, Peter Lieven, 2013/10/24
- [Qemu-devel] [PATCHv6 12/17] iscsi: add bdrv_co_write_zeroes, Peter Lieven, 2013/10/24
- [Qemu-devel] [PATCHv6 16/17] qemu-img: conditionally zero out target on convert, Peter Lieven, 2013/10/24
- [Qemu-devel] [PATCHv6 17/17] block/raw: copy BlockLimits on raw_open, Peter Lieven, 2013/10/24