On Tue, May 17, 2022 at 02:12:05PM +0300, Vladimir Sementsov-Ogievskiy wrote:
> From: Vladimir Sementsov-Ogievskiy <vsement...@openvz.org>
>
> We don't need extra bitmap. All we need is to backup the original
> bitmap when we do first merge. So, drop extra temporary bitmap and work
> directly with target and backup.
>
> Still to keep old semantics, that on failure target is unchanged and
> user don't need to restore, we need a local_backup variable and do
> restore ourselves on failure path.
>
> Signed-off-by: Vladimir Sementsov-Ogievskiy <v.sementsov...@mail.ru>
> ---
> block/monitor/bitmap-qmp-cmds.c | 41 +++++++++++++++++----------------
> 1 file changed, 21 insertions(+), 20 deletions(-)
Reviewed-by: Eric Blake <ebl...@redhat.com>
>
> diff --git a/block/monitor/bitmap-qmp-cmds.c b/block/monitor/bitmap-qmp-cmds.c
> index bd10468596..282363606f 100644
> --- a/block/monitor/bitmap-qmp-cmds.c
> +++ b/block/monitor/bitmap-qmp-cmds.c
> @@ -261,8 +261,9 @@ BdrvDirtyBitmap *block_dirty_bitmap_merge(const char
> *node, const char *target,
> HBitmap **backup, Error **errp)
> {
> BlockDriverState *bs;
> - BdrvDirtyBitmap *dst, *src, *anon;
> + BdrvDirtyBitmap *dst, *src;
> BlockDirtyBitmapOrStrList *lst;
> + HBitmap *local_backup = NULL;
Basically, instead of tracking the backup via a full-featured
BdrvDirtyBitmap, we are instead tracking it via a lightweight HBitmap.
--
Eric Blake, Principal Software Engineer
Red Hat, Inc. +1-919-301-3266
Virtualization: qemu.org | libvirt.org
