Skip to content

Commit

Permalink
qemu-img: rebase: stop when reaching EOF of old backing file
Browse files Browse the repository at this point in the history
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 <andrey.drobyshev@virtuozzo.com>
Reviewed-by: Denis V. Lunev <den@openvz.org>
Reviewed-by: Hanna Czenczek <hreitz@redhat.com>
Message-ID: <20230919165804.439110-2-andrey.drobyshev@virtuozzo.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
  • Loading branch information
Andrey Drobyshev authored and kevmw committed Oct 31, 2023
1 parent 516fffc commit 8b097fd
Showing 1 changed file with 12 additions and 1 deletion.
13 changes: 12 additions & 1 deletion qemu-img.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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;
}
}

/*
Expand Down

0 comments on commit 8b097fd

Please sign in to comment.