diff --git a/src/qemu/qemu_blockjob.h b/src/qemu/qemu_blockjob.h
index 72c7fa053e..e2e28ca4d3 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 e4aa25c343..edc8ba2ddb 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -2611,6 +2611,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, "\n", job->data.commit.base->nodeformat);
@@ -2622,6 +2625,11 @@ qemuDomainPrivateBlockJobFormatCommit(qemuBlockJobDataPtr job,
if (job->data.commit.deleteCommittedImages)
virBufferAddLit(buf, "\n");
+
+ while (bitmaps && *bitmaps)
+ virBufferEscapeString(&disabledBitmapsBuf, "\n", *(bitmaps++));
+
+ virXMLFormatElement(buf, "disabledBaseBitmaps", NULL, &disabledBitmapsBuf);
}
@@ -3234,6 +3242,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)",
@@ -3260,6 +3271,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 @@
+
+
+
+