|
 |
9ae3a8 |
From ae042c767589da954f1b6c4662371dea189fcf50 Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
Message-Id: <ae042c767589da954f1b6c4662371dea189fcf50.1389014116.git.minovotn@redhat.com>
|
|
|
9ae3a8 |
In-Reply-To: <c8cc35838d42aa286242772d97e3a9be7bb786ba.1389014116.git.minovotn@redhat.com>
|
|
|
9ae3a8 |
References: <c8cc35838d42aa286242772d97e3a9be7bb786ba.1389014116.git.minovotn@redhat.com>
|
|
|
9ae3a8 |
From: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
9ae3a8 |
Date: Mon, 9 Dec 2013 14:09:08 +0100
|
|
|
9ae3a8 |
Subject: [PATCH 20/50] block/get_block_status: fix BDRV_BLOCK_ZERO for
|
|
|
9ae3a8 |
unallocated blocks
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
RH-Author: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
9ae3a8 |
Message-id: <1386598178-11845-23-git-send-email-pbonzini@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 56059
|
|
|
9ae3a8 |
O-Subject: [RHEL 7.0 qemu-kvm PATCH 22/52] block/get_block_status: fix BDRV_BLOCK_ZERO for unallocated blocks
|
|
|
9ae3a8 |
Bugzilla: 1007815
|
|
|
9ae3a8 |
RH-Acked-by: Jeffrey Cody <jcody@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Fam Zheng <famz@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
From: Peter Lieven <pl@kamp.de>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
this patch does 2 things:
|
|
|
9ae3a8 |
a) only do additional call outs if BDRV_BLOCK_ZERO is not already set.
|
|
|
9ae3a8 |
b) use the newly introduced bdrv_unallocated_blocks_are_zero()
|
|
|
9ae3a8 |
to return the zero state of an unallocated block. the used callout
|
|
|
9ae3a8 |
to bdrv_has_zero_init() is only valid right after bdrv_create.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Reviewed-by: Eric Blake <eblake@redhat.com>
|
|
|
9ae3a8 |
Signed-off-by: Peter Lieven <pl@kamp.de>
|
|
|
9ae3a8 |
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
9ae3a8 |
(cherry picked from commit c3d8688470a33feb0ea78c006b4399d50c13185e)
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
block.c | 4 ++--
|
|
|
9ae3a8 |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Michal Novotny <minovotn@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
block.c | 4 ++--
|
|
|
9ae3a8 |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/block.c b/block.c
|
|
|
9ae3a8 |
index 2e77763..60484a6 100644
|
|
|
9ae3a8 |
--- a/block.c
|
|
|
9ae3a8 |
+++ b/block.c
|
|
|
9ae3a8 |
@@ -3290,8 +3290,8 @@ static int64_t coroutine_fn bdrv_co_get_block_status(BlockDriverState *bs,
|
|
|
9ae3a8 |
*pnum, pnum);
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
- if (!(ret & BDRV_BLOCK_DATA)) {
|
|
|
9ae3a8 |
- if (bdrv_has_zero_init(bs)) {
|
|
|
9ae3a8 |
+ if (!(ret & BDRV_BLOCK_DATA) && !(ret & BDRV_BLOCK_ZERO)) {
|
|
|
9ae3a8 |
+ if (bdrv_unallocated_blocks_are_zero(bs)) {
|
|
|
9ae3a8 |
ret |= BDRV_BLOCK_ZERO;
|
|
|
9ae3a8 |
} else if (bs->backing_hd) {
|
|
|
9ae3a8 |
BlockDriverState *bs2 = bs->backing_hd;
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
1.7.11.7
|
|
|
9ae3a8 |
|