[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 12/12] block/get_block_status: fix BDRV_BLOCK_ZERO f
From: |
Peter Lieven |
Subject: |
[Qemu-devel] [PATCH 12/12] block/get_block_status: fix BDRV_BLOCK_ZERO for unallocated blocks |
Date: |
Fri, 13 Sep 2013 12:25:09 +0200 |
this patch does 2 things:
a) only do additional call outs if BDRV_BLOCK_ZERO is not already set.
b) use bdi.discard_zeroes to return the zero state of an unallocated block.
the callout to bdrv_has_zero_init() is only valid right after bdrv_create.
Signed-off-by: Peter Lieven <address@hidden>
---
block.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/block.c b/block.c
index 282943b..6698c10 100644
--- a/block.c
+++ b/block.c
@@ -3153,8 +3153,10 @@ static int64_t coroutine_fn
bdrv_co_get_block_status(BlockDriverState *bs,
return ret;
}
- if (!(ret & BDRV_BLOCK_DATA)) {
- if (bdrv_has_zero_init(bs)) {
+ if (!(ret & BDRV_BLOCK_DATA) && !(ret & BDRV_BLOCK_ZERO)) {
+ BlockDriverInfo bdi;
+ if (bdrv_get_info(bs, &bdi) == 0 &&
+ bdi.discard_zeroes) {
ret |= BDRV_BLOCK_ZERO;
} else if (bs->backing_hd) {
BlockDriverState *bs2 = bs->backing_hd;
--
1.7.9.5
- Re: [Qemu-devel] [PATCH 05/12] block: add logical block provisioning information to BlockDriverInfo, (continued)
[Qemu-devel] [PATCH 06/12] iscsi: add .bdrv_get_info, Peter Lieven, 2013/09/13
[Qemu-devel] [PATCH 11/12] block/get_block_status: avoid redundant callouts on raw devices, Peter Lieven, 2013/09/13
[Qemu-devel] [PATCH 09/12] block/get_block_status: set *pnum = 0 on error, Peter Lieven, 2013/09/13
[Qemu-devel] [PATCH 10/12] block/get_block_status: avoid segfault if there is no backing_hd, Peter Lieven, 2013/09/13
[Qemu-devel] [PATCH 12/12] block/get_block_status: fix BDRV_BLOCK_ZERO for unallocated blocks,
Peter Lieven <=