qemu-kvm/SOURCES/kvm-qemu-img-Factor-out-code-for-merging-bitmaps.patch

90 lines
3.4 KiB
Diff

From 58816c3709e5058e8805333ca011cc4e793d67ff Mon Sep 17 00:00:00 2001
From: Eric Blake <eblake@redhat.com>
Date: Tue, 2 Jun 2020 02:34:18 +0100
Subject: [PATCH 13/26] qemu-img: Factor out code for merging bitmaps
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
RH-Author: Eric Blake <eblake@redhat.com>
Message-id: <20200602023420.2133649-11-eblake@redhat.com>
Patchwork-id: 97078
O-Subject: [RHEL-AV-8.2.1 qemu-kvm PATCH 10/12] qemu-img: Factor out code for merging bitmaps
Bugzilla: 1779893 1779904
RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
RH-Acked-by: Max Reitz <mreitz@redhat.com>
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
The next patch will add another client that wants to merge dirty
bitmaps; it will be easier to refactor the code to construct the QAPI
struct correctly into a helper function.
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <20200521192137.1120211-4-eblake@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
(cherry picked from commit 6c729dd832207d7347ecb074912f538e2942f269)
Signed-off-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
---
qemu-img.c | 34 +++++++++++++++++++++-------------
1 file changed, 21 insertions(+), 13 deletions(-)
diff --git a/qemu-img.c b/qemu-img.c
index b57856e..39e1586 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -1582,6 +1582,24 @@ out4:
return ret;
}
+/* Convenience wrapper around qmp_block_dirty_bitmap_merge */
+static void do_dirty_bitmap_merge(const char *dst_node, const char *dst_name,
+ const char *src_node, const char *src_name,
+ Error **errp)
+{
+ BlockDirtyBitmapMergeSource *merge_src;
+ BlockDirtyBitmapMergeSourceList *list;
+
+ merge_src = g_new0(BlockDirtyBitmapMergeSource, 1);
+ merge_src->type = QTYPE_QDICT;
+ merge_src->u.external.node = g_strdup(src_node);
+ merge_src->u.external.name = g_strdup(src_name);
+ list = g_new0(BlockDirtyBitmapMergeSourceList, 1);
+ list->value = merge_src;
+ qmp_block_dirty_bitmap_merge(dst_node, dst_name, list, errp);
+ qapi_free_BlockDirtyBitmapMergeSourceList(list);
+}
+
enum ImgConvertBlockStatus {
BLK_DATA,
BLK_ZERO,
@@ -4614,21 +4632,11 @@ static int img_bitmap(int argc, char **argv)
qmp_block_dirty_bitmap_disable(bs->node_name, bitmap, &err);
op = "disable";
break;
- case BITMAP_MERGE: {
- BlockDirtyBitmapMergeSource *merge_src;
- BlockDirtyBitmapMergeSourceList *list;
-
- merge_src = g_new0(BlockDirtyBitmapMergeSource, 1);
- merge_src->type = QTYPE_QDICT;
- merge_src->u.external.node = g_strdup(src_bs->node_name);
- merge_src->u.external.name = g_strdup(act->src);
- list = g_new0(BlockDirtyBitmapMergeSourceList, 1);
- list->value = merge_src;
- qmp_block_dirty_bitmap_merge(bs->node_name, bitmap, list, &err);
- qapi_free_BlockDirtyBitmapMergeSourceList(list);
+ case BITMAP_MERGE:
+ do_dirty_bitmap_merge(bs->node_name, bitmap, src_bs->node_name,
+ act->src, &err);
op = "merge";
break;
- }
default:
g_assert_not_reached();
}
--
1.8.3.1