libvirt/SOURCES/libvirt-qemu-blockjob-Store-list-of-bitmaps-disabled-prior-to-commit.patch
2021-10-08 13:11:20 +00:00

118 lines
4.3 KiB
Diff

From 7322bb9f51c7c2c35d2e65734e03ff0056b5af22 Mon Sep 17 00:00:00 2001
Message-Id: <7322bb9f51c7c2c35d2e65734e03ff0056b5af22@dist-git>
From: Peter Krempa <pkrempa@redhat.com>
Date: Mon, 16 Mar 2020 22:12:22 +0100
Subject: [PATCH] qemu: blockjob: Store list of bitmaps disabled prior to
commit
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Starting a commit job will require disabling bitmaps in the base image
so that they are not dirtied by the commit job. We need to store a list
of the bitmaps so that we can later re-enable them.
Add a field and status XML handling code as well as a test.
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
(cherry picked from commit 41de7230ab169e80237f3e3a29bfecd9baf1a578)
https://bugzilla.redhat.com/show_bug.cgi?id=1799013
Message-Id: <f009cdda8b29df504d19bddffea5638913f8c931.1584391727.git.pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---
src/qemu/qemu_blockjob.h | 2 ++
src/qemu/qemu_domain.c | 26 +++++++++++++++++++
.../blockjob-blockdev-in.xml | 4 +++
3 files changed, 32 insertions(+)
diff --git a/src/qemu/qemu_blockjob.h b/src/qemu/qemu_blockjob.h
index 4045878568..c1d95ea3d8 100644
--- a/src/qemu/qemu_blockjob.h
+++ b/src/qemu/qemu_blockjob.h
@@ -88,6 +88,8 @@ struct _qemuBlockJobCommitData {
virStorageSourcePtr top;
virStorageSourcePtr base;
bool deleteCommittedImages;
+ char **disabledBitmapsBase; /* a NULL-terminated list of bitmap names which
+ were disabled in @base for the commit job */
};
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 0faf042145..a273aefa6b 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -2603,6 +2603,9 @@ static void
qemuDomainPrivateBlockJobFormatCommit(qemuBlockJobDataPtr job,
virBufferPtr buf)
{
+ g_auto(virBuffer) disabledBitmapsBuf = VIR_BUFFER_INIT_CHILD(buf);
+ char **bitmaps = job->data.commit.disabledBitmapsBase;
+
if (job->data.commit.base)
virBufferAsprintf(buf, "<base node='%s'/>\n", job->data.commit.base->nodeformat);
@@ -2614,6 +2617,11 @@ qemuDomainPrivateBlockJobFormatCommit(qemuBlockJobDataPtr job,
if (job->data.commit.deleteCommittedImages)
virBufferAddLit(buf, "<deleteCommittedImages/>\n");
+
+ while (bitmaps && *bitmaps)
+ virBufferEscapeString(&disabledBitmapsBuf, "<bitmap name='%s'/>\n", *(bitmaps++));
+
+ virXMLFormatElement(buf, "disabledBaseBitmaps", NULL, &disabledBitmapsBuf);
}
@@ -3240,6 +3248,9 @@ static int
qemuDomainObjPrivateXMLParseBlockjobDataCommit(qemuBlockJobDataPtr job,
xmlXPathContextPtr ctxt)
{
+ g_autofree xmlNodePtr *nodes = NULL;
+ ssize_t nnodes;
+
if (job->type == QEMU_BLOCKJOB_TYPE_COMMIT) {
qemuDomainObjPrivateXMLParseBlockjobNodename(job,
"string(./topparent/@node)",
@@ -3266,6 +3277,21 @@ qemuDomainObjPrivateXMLParseBlockjobDataCommit(qemuBlockJobDataPtr job,
!job->data.commit.base)
return -1;
+ if ((nnodes = virXPathNodeSet("./disabledBaseBitmaps/bitmap", ctxt, &nodes)) > 0) {
+ size_t i;
+
+ job->data.commit.disabledBitmapsBase = g_new0(char *, nnodes + 1);
+
+ for (i = 0; i < nnodes; i++) {
+ char *tmp;
+
+ if (!(tmp = virXMLPropString(nodes[i], "name")))
+ return -1;
+
+ job->data.commit.disabledBitmapsBase[i] = g_steal_pointer(&tmp);
+ }
+ }
+
return 0;
}
diff --git a/tests/qemustatusxml2xmldata/blockjob-blockdev-in.xml b/tests/qemustatusxml2xmldata/blockjob-blockdev-in.xml
index ca6d110179..cc17a17ff4 100644
--- a/tests/qemustatusxml2xmldata/blockjob-blockdev-in.xml
+++ b/tests/qemustatusxml2xmldata/blockjob-blockdev-in.xml
@@ -243,6 +243,10 @@
<base node='libvirt-19-format'/>
<top node='libvirt-17-format'/>
<deleteCommittedImages/>
+ <disabledBaseBitmaps>
+ <bitmap name='test'/>
+ <bitmap name='test1'/>
+ </disabledBaseBitmaps>
</blockjob>
<blockjob name='create-libvirt-1337-storage' type='create' state='running'>
<create mode='storage'/>
--
2.25.1