From: Max Reitz <mreitz@redhat.com>
Date: Tue, 23 Jun 2020 09:29:04 +0000 (+0200)
Subject: block-copy: Use CAF to find sync=top base
X-Git-Tag: v5.2.0-rc0~123^2~21
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c6f6d8462cecda0b9c390831904f1346c01f75ee;p=thirdparty%2Fqemu.git

block-copy: Use CAF to find sync=top base

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/block-copy.c b/block/block-copy.c
index a30b9097ef4..cd9bc47c8f6 100644
--- a/block/block-copy.c
+++ b/block/block-copy.c
@@ -440,8 +440,8 @@ static int block_copy_block_status(BlockCopyState *s, int64_t offset,
     BlockDriverState *base;
     int ret;
 
-    if (s->skip_unallocated && s->source->bs->backing) {
-        base = s->source->bs->backing->bs;
+    if (s->skip_unallocated) {
+        base = bdrv_backing_chain_next(s->source->bs);
     } else {
         base = NULL;
     }