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