From: Max Reitz <mreitz@redhat.com>
Date: Wed, 12 Jun 2019 15:10:46 +0000 (+0200)
Subject: block: bdrv_cow_child() for bdrv_has_zero_init()
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=34778172f1eb75796c8af9fae8d88b889cff4fd2;p=qemu.git

block: bdrv_cow_child() for bdrv_has_zero_init()

bdrv_has_zero_init() should use bdrv_cow_child() if it wants to check
whether the given BDS has a COW backing file.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
---

diff --git a/block.c b/block.c
index b162142609..656baa521e 100644
--- a/block.c
+++ b/block.c
@@ -5415,7 +5415,7 @@ int bdrv_has_zero_init(BlockDriverState *bs)
 
     /* If BS is a copy on write image, it is initialized to
        the contents of the base image, which may not be zeroes.  */
-    if (bs->backing) {
+    if (bdrv_cow_child(bs)) {
         return 0;
     }
     if (bs->drv->bdrv_has_zero_init) {