From: Andrey Drobyshev Date: Tue, 19 Sep 2023 16:57:57 +0000 (+0300) Subject: qemu-img: rebase: stop when reaching EOF of old backing file X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=8b097fd6b06ec295faefd4f30f96f8709abc9605;p=qemu.git qemu-img: rebase: stop when reaching EOF of old backing file In case when we're rebasing within one backing chain, and when target image is larger than old backing file, bdrv_is_allocated_above() ends up setting *pnum = 0. As a result, target offset isn't getting incremented, and we get stuck in an infinite for loop. Let's detect this case and proceed further down the loop body, as the offsets beyond the old backing size need to be explicitly zeroed. Signed-off-by: Andrey Drobyshev Reviewed-by: Denis V. Lunev Reviewed-by: Hanna Czenczek Message-ID: <20230919165804.439110-2-andrey.drobyshev@virtuozzo.com> Reviewed-by: Kevin Wolf Signed-off-by: Kevin Wolf --- diff --git a/qemu-img.c b/qemu-img.c index 585b65640f..2b2a3a86ca 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -3814,6 +3814,8 @@ static int img_rebase(int argc, char **argv) } if (prefix_chain_bs) { + uint64_t bytes = n; + /* * If cluster wasn't changed since prefix_chain, we don't need * to take action @@ -3826,9 +3828,18 @@ static int img_rebase(int argc, char **argv) strerror(-ret)); goto out; } - if (!ret) { + if (!ret && n) { continue; } + if (!n) { + /* + * If we've reached EOF of the old backing, it means that + * offsets beyond the old backing size were read as zeroes. + * Now we will need to explicitly zero the cluster in + * order to preserve that state after the rebase. + */ + n = bytes; + } } /*