11:26 a.m.
This implements handling of bitmaps during block-commit so that
incremental backups are not broken after commit.
Note that this applies on top of
https://www.redhat.com/archives/libvir-list/2020-February/msg01125.html
or can be fetched at
git fetch https://gitlab.com/pipo.sk/libvirt.git reopen-impl
https://gitlab.com/pipo.sk/libvirt/-/commits/reopen-impl
It uses blockdev-reopen so it's required to use that series. As noted
the branch mentioned above the series contains patches to enable
incremental backup and blockdev-reopen and depends on the following qemu
patches:
https://lists.gnu.org/archive/html/qemu-block/2020-02/msg01423.html
https://lists.gnu.org/archive/html/qemu-block/2020-02/msg01467.html
git fetch https://gitlab.com/pipo.sk/qemu.git bitmap-reopen
https://gitlab.com/pipo.sk/qemu/-/commits/bitmap-reopen
Peter Krempa (13):
qemu: domain: Extract formatting of 'commit' blockjob data into a
function
qemu: domain: Extract parsing of 'commit' blockjob data into a
function
qemu: blockjob: Store list of bitmaps disabled prior to commit
qemublocktest: Fix and optimize fake image chain
qemu: block: Implement helpers for dealing with bitmaps during block
commit
qemublocktest: Add tests for handling of bitmaps during block-commit
qemublocktest: Add more tests for block-commit bitmap handling with
snapshots
qemublocktest: Add tests of broken bitmap chain handling during
block-commit
qemuBlockJobDiskNewCommit: Propagate 'disabledBitmapsBase'
qemuDomainBlockCommit: Handle bitmaps on start of commit
qemuDomainBlockPivot: Handle merging of bitmaps when pivoting an
active block-commit
qemu: blockjob: Handle bitmaps after finish of normal block-commit
qemu: blockjob: Re-enable bitmaps after failed block-copy
src/qemu/qemu_block.c | 217 ++++++++++++++++++
src/qemu/qemu_block.h | 14 ++
src/qemu/qemu_blockjob.c | 94 +++++++-
src/qemu/qemu_blockjob.h | 3 +
src/qemu/qemu_domain.c | 110 ++++++---
src/qemu/qemu_driver.c | 59 ++++-
tests/qemublocktest.c | 126 +++++++++-
.../bitmapblockcommit/basic-1-2 | 119 ++++++++++
.../bitmapblockcommit/basic-1-3 | 119 ++++++++++
.../bitmapblockcommit/basic-2-3 | 2 +
.../bitmapblockcommit/snapshots-1-2 | 49 ++++
.../bitmapblockcommit/snapshots-1-3 | 76 ++++++
.../bitmapblockcommit/snapshots-1-4 | 126 ++++++++++
.../bitmapblockcommit/snapshots-1-5 | 130 +++++++++++
.../bitmapblockcommit/snapshots-2-3 | 49 ++++
.../bitmapblockcommit/snapshots-2-4 | 99 ++++++++
.../bitmapblockcommit/snapshots-2-5 | 103 +++++++++
.../bitmapblockcommit/snapshots-3-4 | 72 ++++++
.../bitmapblockcommit/snapshots-3-5 | 76 ++++++
.../bitmapblockcommit/snapshots-4-4 | 11 +
.../bitmapblockcommit/snapshots-4-5 | 33 +++
.../snapshots-synthetic-broken-1-2 | 30 +++
.../snapshots-synthetic-broken-1-3 | 66 ++++++
.../snapshots-synthetic-broken-1-4 | 76 ++++++
.../snapshots-synthetic-broken-1-5 | 76 ++++++
.../snapshots-synthetic-broken-2-3 | 43 ++++
.../snapshots-synthetic-broken-2-4 | 53 +++++
.../snapshots-synthetic-broken-2-5 | 53 +++++
.../snapshots-synthetic-broken-3-4 | 30 +++
.../snapshots-synthetic-broken-3-5 | 30 +++
.../snapshots-synthetic-broken-4-5 | 20 ++
.../blockjob-blockdev-in.xml | 4 +
32 files changed, 2135 insertions(+), 33 deletions(-)
create mode 100644 tests/qemublocktestdata/bitmapblockcommit/basic-1-2
create mode 100644 tests/qemublocktestdata/bitmapblockcommit/basic-1-3
create mode 100644 tests/qemublocktestdata/bitmapblockcommit/basic-2-3
create mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-1-2
create mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-1-3
create mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-1-4
create mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-1-5
create mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-2-3
create mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-2-4
create mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-2-5
create mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-3-4
create mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-3-5
create mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-4-4
create mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-4-5
create mode 100644
tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-2
create mode 100644
tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-3
create mode 100644
tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-4
create mode 100644
tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-5
create mode 100644
tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-2-3
create mode 100644
tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-2-4
create mode 100644
tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-2-5
create mode 100644
tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-3-4
create mode 100644
tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-3-5
create mode 100644
tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-4-5
--
2.24.1
11:26 a.m.
New subject: [PATCH 01/13] qemu: domain: Extract formatting of 'commit' blockjob data into a function
I'll be adding more fields to care about so splitting the code out will
be better long-term.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_domain.c | 27 +++++++++++++++++++--------
1 file changed, 19 insertions(+), 8 deletions(-)
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 33c2158eb5..71d0a400cc 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -2530,6 +2530,24 @@ qemuDomainObjPrivateXMLFormatBlockjobFormatSource(virBufferPtr
buf,
}
+static void
+qemuDomainPrivateBlockJobFormatCommit(qemuBlockJobDataPtr job,
+ virBufferPtr buf)
+{
+ if (job->data.commit.base)
+ virBufferAsprintf(buf, "<base node='%s'/>\n",
job->data.commit.base->nodeformat);
+
+ if (job->data.commit.top)
+ virBufferAsprintf(buf, "<top node='%s'/>\n",
job->data.commit.top->nodeformat);
+
+ if (job->data.commit.topparent)
+ virBufferAsprintf(buf, "<topparent node='%s'/>\n",
job->data.commit.topparent->nodeformat);
+
+ if (job->data.commit.deleteCommittedImages)
+ virBufferAddLit(buf, "<deleteCommittedImages/>\n");
+}
+
+
static int
qemuDomainObjPrivateXMLFormatBlockjobIterator(void *payload,
const void *name G_GNUC_UNUSED,
@@ -2589,14 +2607,7 @@ qemuDomainObjPrivateXMLFormatBlockjobIterator(void *payload,
case QEMU_BLOCKJOB_TYPE_COMMIT:
case QEMU_BLOCKJOB_TYPE_ACTIVE_COMMIT:
- if (job->data.commit.base)
- virBufferAsprintf(&childBuf, "<base
node='%s'/>\n", job->data.commit.base->nodeformat);
- if (job->data.commit.top)
- virBufferAsprintf(&childBuf, "<top
node='%s'/>\n", job->data.commit.top->nodeformat);
- if (job->data.commit.topparent)
- virBufferAsprintf(&childBuf, "<topparent
node='%s'/>\n", job->data.commit.topparent->nodeformat);
- if (job->data.commit.deleteCommittedImages)
- virBufferAddLit(&childBuf,
"<deleteCommittedImages/>\n");
+ qemuDomainPrivateBlockJobFormatCommit(job, &childBuf);
break;
case QEMU_BLOCKJOB_TYPE_CREATE:
--
2.24.1
3:24 a.m.
New subject: [PATCH 01/13] qemu: domain: Extract formatting of 'commit' blockjob data into a function
On Wed, Mar 04, 2020 at 06:26:29PM +0100, Peter Krempa wrote:
I'll be adding more fields to care about so splitting the code
out will
be better long-term.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_domain.c | 27 +++++++++++++++++++--------
1 file changed, 19 insertions(+), 8 deletions(-)
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 33c2158eb5..71d0a400cc 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -2530,6 +2530,24 @@ qemuDomainObjPrivateXMLFormatBlockjobFormatSource(virBufferPtr
buf,
}
+static void
+qemuDomainPrivateBlockJobFormatCommit(qemuBlockJobDataPtr job,
+ virBufferPtr buf)
+{
+ if (job->data.commit.base)
+ virBufferAsprintf(buf, "<base node='%s'/>\n",
job->data.commit.base->nodeformat);
+
+ if (job->data.commit.top)
+ virBufferAsprintf(buf, "<top node='%s'/>\n",
job->data.commit.top->nodeformat);
+
+ if (job->data.commit.topparent)
+ virBufferAsprintf(buf, "<topparent node='%s'/>\n",
job->data.commit.topparent->nodeformat);
+
+ if (job->data.commit.deleteCommittedImages)
+ virBufferAddLit(buf, "<deleteCommittedImages/>\n");
+}
+
+
static int
qemuDomainObjPrivateXMLFormatBlockjobIterator(void *payload,
const void *name G_GNUC_UNUSED,
@@ -2589,14 +2607,7 @@ qemuDomainObjPrivateXMLFormatBlockjobIterator(void *payload,
case QEMU_BLOCKJOB_TYPE_COMMIT:
case QEMU_BLOCKJOB_TYPE_ACTIVE_COMMIT:
- if (job->data.commit.base)
- virBufferAsprintf(&childBuf, "<base
node='%s'/>\n", job->data.commit.base->nodeformat);
- if (job->data.commit.top)
- virBufferAsprintf(&childBuf, "<top
node='%s'/>\n", job->data.commit.top->nodeformat);
- if (job->data.commit.topparent)
- virBufferAsprintf(&childBuf, "<topparent
node='%s'/>\n", job->data.commit.topparent->nodeformat);
- if (job->data.commit.deleteCommittedImages)
- virBufferAddLit(&childBuf,
"<deleteCommittedImages/>\n");
+ qemuDomainPrivateBlockJobFormatCommit(job, &childBuf);
break;
case QEMU_BLOCKJOB_TYPE_CREATE:
--
2.24.1
Reviewed-by: Pavel Mores <pmores(a)redhat.com>
11:26 a.m.
New subject: [PATCH 02/13] qemu: domain: Extract parsing of 'commit' blockjob data into a function
I'll be adding more fields to care about so splitting the code out will
be better long-term.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_domain.c | 57 ++++++++++++++++++++++++++----------------
1 file changed, 36 insertions(+), 21 deletions(-)
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 71d0a400cc..0a478d2080 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -3153,6 +3153,40 @@ qemuDomainObjPrivateXMLParseBlockjobNodename(qemuBlockJobDataPtr
job,
}
+static int
+qemuDomainObjPrivateXMLParseBlockjobDataCommit(qemuBlockJobDataPtr job,
+ xmlXPathContextPtr ctxt)
+{
+ if (job->type == QEMU_BLOCKJOB_TYPE_COMMIT) {
+ qemuDomainObjPrivateXMLParseBlockjobNodename(job,
+
"string(./topparent/@node)",
+ &job->data.commit.topparent,
+ ctxt);
+
+ if (!job->data.commit.topparent)
+ return -1;
+ }
+
+ qemuDomainObjPrivateXMLParseBlockjobNodename(job,
+ "string(./top/@node)",
+ &job->data.commit.top,
+ ctxt);
+ qemuDomainObjPrivateXMLParseBlockjobNodename(job,
+ "string(./base/@node)",
+ &job->data.commit.base,
+ ctxt);
+
+ if (virXPathNode("./deleteCommittedImages", ctxt))
+ job->data.commit.deleteCommittedImages = true;
+
+ if (!job->data.commit.top ||
+ !job->data.commit.base)
+ return -1;
+
+ return 0;
+}
+
+
static void
qemuDomainObjPrivateXMLParseBlockjobDataSpecific(qemuBlockJobDataPtr job,
xmlXPathContextPtr ctxt,
@@ -3172,29 +3206,10 @@
qemuDomainObjPrivateXMLParseBlockjobDataSpecific(qemuBlockJobDataPtr job,
break;
case QEMU_BLOCKJOB_TYPE_COMMIT:
- qemuDomainObjPrivateXMLParseBlockjobNodename(job,
-
"string(./topparent/@node)",
-
&job->data.commit.topparent,
- ctxt);
-
- if (!job->data.commit.topparent)
- goto broken;
-
- G_GNUC_FALLTHROUGH;
case QEMU_BLOCKJOB_TYPE_ACTIVE_COMMIT:
- qemuDomainObjPrivateXMLParseBlockjobNodename(job,
-
"string(./top/@node)",
- &job->data.commit.top,
- ctxt);
- qemuDomainObjPrivateXMLParseBlockjobNodename(job,
-
"string(./base/@node)",
- &job->data.commit.base,
- ctxt);
- if (virXPathNode("./deleteCommittedImages", ctxt))
- job->data.commit.deleteCommittedImages = true;
- if (!job->data.commit.top ||
- !job->data.commit.base)
+ if (qemuDomainObjPrivateXMLParseBlockjobDataCommit(job, ctxt) < 0)
goto broken;
+
break;
case QEMU_BLOCKJOB_TYPE_CREATE:
--
2.24.1
3:25 a.m.
New subject: [PATCH 02/13] qemu: domain: Extract parsing of 'commit' blockjob data into a function
On Wed, Mar 04, 2020 at 06:26:30PM +0100, Peter Krempa wrote:
I'll be adding more fields to care about so splitting the code
out will
be better long-term.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_domain.c | 57 ++++++++++++++++++++++++++----------------
1 file changed, 36 insertions(+), 21 deletions(-)
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 71d0a400cc..0a478d2080 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -3153,6 +3153,40 @@ qemuDomainObjPrivateXMLParseBlockjobNodename(qemuBlockJobDataPtr
job,
}
+static int
+qemuDomainObjPrivateXMLParseBlockjobDataCommit(qemuBlockJobDataPtr job,
+ xmlXPathContextPtr ctxt)
+{
+ if (job->type == QEMU_BLOCKJOB_TYPE_COMMIT) {
+ qemuDomainObjPrivateXMLParseBlockjobNodename(job,
+
"string(./topparent/@node)",
+
&job->data.commit.topparent,
+ ctxt);
+
+ if (!job->data.commit.topparent)
+ return -1;
+ }
+
+ qemuDomainObjPrivateXMLParseBlockjobNodename(job,
+ "string(./top/@node)",
+ &job->data.commit.top,
+ ctxt);
+ qemuDomainObjPrivateXMLParseBlockjobNodename(job,
+ "string(./base/@node)",
+ &job->data.commit.base,
+ ctxt);
+
+ if (virXPathNode("./deleteCommittedImages", ctxt))
+ job->data.commit.deleteCommittedImages = true;
+
+ if (!job->data.commit.top ||
+ !job->data.commit.base)
+ return -1;
+
+ return 0;
+}
+
+
static void
qemuDomainObjPrivateXMLParseBlockjobDataSpecific(qemuBlockJobDataPtr job,
xmlXPathContextPtr ctxt,
@@ -3172,29 +3206,10 @@
qemuDomainObjPrivateXMLParseBlockjobDataSpecific(qemuBlockJobDataPtr job,
break;
case QEMU_BLOCKJOB_TYPE_COMMIT:
- qemuDomainObjPrivateXMLParseBlockjobNodename(job,
-
"string(./topparent/@node)",
-
&job->data.commit.topparent,
- ctxt);
-
- if (!job->data.commit.topparent)
- goto broken;
-
- G_GNUC_FALLTHROUGH;
case QEMU_BLOCKJOB_TYPE_ACTIVE_COMMIT:
- qemuDomainObjPrivateXMLParseBlockjobNodename(job,
-
"string(./top/@node)",
- &job->data.commit.top,
- ctxt);
- qemuDomainObjPrivateXMLParseBlockjobNodename(job,
-
"string(./base/@node)",
- &job->data.commit.base,
- ctxt);
- if (virXPathNode("./deleteCommittedImages", ctxt))
- job->data.commit.deleteCommittedImages = true;
- if (!job->data.commit.top ||
- !job->data.commit.base)
+ if (qemuDomainObjPrivateXMLParseBlockjobDataCommit(job, ctxt) < 0)
goto broken;
+
break;
case QEMU_BLOCKJOB_TYPE_CREATE:
--
2.24.1
Reviewed-by: Pavel Mores <pmores(a)redhat.com>
11:26 a.m.
New subject: [PATCH 03/13] qemu: blockjob: Store list of bitmaps disabled prior to commit
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(a)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 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 0a478d2080..c5f4b0ae7f 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -2534,6 +2534,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);
@@ -2545,6 +2548,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);
}
@@ -3157,6 +3165,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)",
@@ -3183,6 +3194,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.24.1
3:43 a.m.
New subject: [PATCH 03/13] qemu: blockjob: Store list of bitmaps disabled prior to commit
On Wed, Mar 04, 2020 at 06:26:31PM +0100, Peter Krempa wrote:
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(a)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 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 */
};
Is it guaranteed that the new member 'disabledBitmapsBase' is properly
initialised? How about something along the lines of
diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c
index 2e53821d43..f9fc83430e 100644
--- a/src/qemu/qemu_blockjob.c
+++ b/src/qemu/qemu_blockjob.c
@@ -312,6 +312,7 @@ qemuBlockJobDiskNewCommit(virDomainObjPtr vm,
job->data.commit.top = top;
job->data.commit.base = base;
job->data.commit.deleteCommittedImages = delete_imgs;
+ job->data.commit.disabledBitmapsBase = NULL;
job->jobflags = jobflags;
if (qemuBlockJobRegister(job, vm, disk, true) < 0)
Even if explicit initialisation is somehow not needed here, I'd consider that
fact worth a line of explanation in the commit message.
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 0a478d2080..c5f4b0ae7f 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -2534,6 +2534,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);
@@ -2545,6 +2548,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);
}
@@ -3157,6 +3165,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)",
@@ -3183,6 +3194,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.24.1
11:41 a.m.
New subject: [PATCH 03/13] qemu: blockjob: Store list of bitmaps disabled prior to commit
On Thu, Mar 05, 2020 at 10:43:15 +0100, Pavel Mores wrote:
On Wed, Mar 04, 2020 at 06:26:31PM +0100, Peter Krempa wrote:
> 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(a)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 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 */
> };
Is it guaranteed that the new member 'disabledBitmapsBase' is properly
initialised? How about something along the lines of
diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c
index 2e53821d43..f9fc83430e 100644
--- a/src/qemu/qemu_blockjob.c
+++ b/src/qemu/qemu_blockjob.c
@@ -312,6 +312,7 @@ qemuBlockJobDiskNewCommit(virDomainObjPtr vm,
job->data.commit.top = top;
job->data.commit.base = base;
job->data.commit.deleteCommittedImages = delete_imgs;
+ job->data.commit.disabledBitmapsBase = NULL;
job->jobflags = jobflags;
if (qemuBlockJobRegister(job, vm, disk, true) < 0)
Even if explicit initialisation is somehow not needed here, I'd consider that
fact worth a line of explanation in the commit message.
g_new0 and VIR_ALLOC (which uses calloc) always zero-out the memory
which is allocated. This means that setting integers to 0, pointers to
NULL and booleans to false is always assumed when allocating a new
object and we rarely re-initialize it explicitly if ever.
11:26 a.m.
New subject: [PATCH 04/13] qemublocktest: Fix and optimize fake image chain
Set the 'id' field of the backing chain properly so that we can look
up images and initialize 6 images instead of 10 as we don't use more
currently.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
tests/qemublocktest.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c
index 7b7948d4c6..a6b6376c7d 100644
--- a/tests/qemublocktest.c
+++ b/tests/qemublocktest.c
@@ -570,6 +570,7 @@ testQemuBackupIncrementalBitmapCalculateGetFakeImage(size_t idx)
if (!(ret = virStorageSourceNew()))
abort();
+ ret->id = idx;
ret->type = VIR_STORAGE_TYPE_FILE;
ret->format = VIR_STORAGE_FILE_QCOW2;
ret->path = g_strdup_printf("/image%zu", idx);
@@ -589,7 +590,7 @@ testQemuBackupIncrementalBitmapCalculateGetFakeChain(void)
n = ret = testQemuBackupIncrementalBitmapCalculateGetFakeImage(1);
- for (i = 2; i < 10; i++) {
+ for (i = 2; i < 6; i++) {
n->backingStore = testQemuBackupIncrementalBitmapCalculateGetFakeImage(i);
n = n->backingStore;
}
--
2.24.1
11:26 a.m.
New subject: [PATCH 05/13] qemu: block: Implement helpers for dealing with bitmaps during block commit
qemuBlockBitmapsHandleCommitStart prepares for disabling the bitmaps in
the 'base' of the commit job so that the bitmaps are not dirtied by the
commit job. This needs to be done prior to start of the commit job.
qemuBlockBitmapsHandleCommitFinish then calculates the necessary merges
that agregate all the bitmaps between the commited images and write them
into the base bitmap.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_block.c | 217 ++++++++++++++++++++++++++++++++++++++++++
src/qemu/qemu_block.h | 14 +++
2 files changed, 231 insertions(+)
diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
index 11df8eedd0..2467315563 100644
--- a/src/qemu/qemu_block.c
+++ b/src/qemu/qemu_block.c
@@ -2962,6 +2962,223 @@ qemuBlockBitmapsHandleBlockcopy(virStorageSourcePtr src,
}
+/**
+ * @topsrc: virStorageSource representing 'top' of the job
+ * @basesrc: virStorageSource representing 'base' of the job
+ * @blockNamedNodeData: hash table containing data about bitmaps
+ * @actions: filled with arguments for a 'transaction' command
+ * @disabledBitmapsBase: filled with a list of bitmap names which must be disabled
+ *
+ * Prepares data for correctly hanlding bitmaps during the start of a commit
+ * job. The bitmaps in the 'base' image must be disabled, so that the writes
+ * done by the blockjob don't dirty the enabled bitmaps.
+ *
+ * @actions and @disabledBitmapsBase are untouched if no bitmaps need
+ * to be disabled.
+ */
+int
+qemuBlockBitmapsHandleCommitStart(virStorageSourcePtr top,
+ virStorageSourcePtr basesrc,
+ virHashTablePtr blockNamedNodeData,
+ virJSONValuePtr *actions,
+ char ***disabledBitmapsBase)
+{
+ g_autoptr(virJSONValue) act = virJSONValueNewArray();
+ VIR_AUTOSTRINGLIST bitmaplist = NULL;
+ size_t curbitmapstr = 0;
+ qemuBlockNamedNodeDataPtr entry;
+ bool disable_bitmaps = true;
+ size_t i;
+
+ if (!(entry = virHashLookup(blockNamedNodeData, basesrc->nodeformat)))
+ return 0;
+
+ bitmaplist = g_new0(char *, entry->nbitmaps);
+
+ for (i = 0; i < entry->nbitmaps; i++) {
+ qemuBlockNamedNodeDataBitmapPtr bitmap = entry->bitmaps[i];
+
+ if (!bitmap->recording || bitmap->inconsistent ||
+ !qemuBlockBitmapChainIsValid(top, bitmap->name, blockNamedNodeData))
+ continue;
+
+ disable_bitmaps = true;
+
+ if (qemuMonitorTransactionBitmapDisable(act, basesrc->nodeformat,
+ bitmap->name) < 0)
+ return -1;
+
+ bitmaplist[curbitmapstr++] = g_strdup(bitmap->name);
+ }
+
+ if (disable_bitmaps) {
+ *actions = g_steal_pointer(&act);
+ *disabledBitmapsBase = g_steal_pointer(&bitmaplist);
+ }
+
+ return 0;
+}
+
+
+struct qemuBlockBitmapsHandleCommitData {
+ bool skip;
+ bool create;
+ bool enable;
+ const char *basenode;
+ virJSONValuePtr merge;
+ unsigned long long granularity;
+ bool persistent;
+};
+
+
+static void
+qemuBlockBitmapsHandleCommitDataFree(void *opaque)
+{
+ struct qemuBlockBitmapsHandleCommitData *data = opaque;
+
+ virJSONValueFree(data->merge);
+ g_free(data);
+}
+
+
+static int
+qemuBlockBitmapsHandleCommitFinishIterate(void *payload,
+ const void *entryname,
+ void *opaque)
+{
+ struct qemuBlockBitmapsHandleCommitData *data = payload;
+ const char *bitmapname = entryname;
+ virJSONValuePtr actions = opaque;
+
+ if (data->skip)
+ return 0;
+
+ if (data->create) {
+ if (qemuMonitorTransactionBitmapAdd(actions, data->basenode, bitmapname,
+ data->persistent, !data-> enable,
+ data->granularity) < 0)
+ return -1;
+ } else {
+ if (data->enable &&
+ qemuMonitorTransactionBitmapEnable(actions, data->basenode, bitmapname)
< 0)
+ return -1;
+ }
+
+ if (data->merge &&
+ qemuMonitorTransactionBitmapMerge(actions, data->basenode, bitmapname,
+ &data->merge) < 0)
+ return -1;
+
+ return 0;
+}
+
+
+/**
+ * @topsrc: virStorageSource representing 'top' of the job
+ * @basesrc: virStorageSource representing 'base' of the job
+ * @blockNamedNodeData: hash table containing data about bitmaps
+ * @actions: filled with arguments for a 'transaction' command
+ * @disabledBitmapsBase: bitmap names which were disabled
+ *
+ * Calculates the necessary bitmap merges/additions/enablements to properly
+ * handle commit of images from 'top' into 'base'. The necessary
operations
+ * in form of argumets of the 'transaction' command are filled into
'actions'
+ * if there is anything to do. Otherwise NULL is returned.
+ */
+int
+qemuBlockBitmapsHandleCommitFinish(virStorageSourcePtr topsrc,
+ virStorageSourcePtr basesrc,
+ virHashTablePtr blockNamedNodeData,
+ virJSONValuePtr *actions,
+ char **disabledBitmapsBase)
+{
+ g_autoptr(virJSONValue) act = virJSONValueNewArray();
+ virStorageSourcePtr n;
+ qemuBlockNamedNodeDataPtr entry;
+ g_autoptr(virHashTable) commitdata = NULL;
+ struct qemuBlockBitmapsHandleCommitData *bitmapdata;
+ size_t i;
+
+ commitdata = virHashNew(qemuBlockBitmapsHandleCommitDataFree);
+
+ for (n = topsrc; n != basesrc; n = n->backingStore) {
+ if (!(entry = virHashLookup(blockNamedNodeData, n->nodeformat)))
+ continue;
+
+ for (i = 0; i < entry->nbitmaps; i++) {
+ qemuBlockNamedNodeDataBitmapPtr bitmap = entry->bitmaps[i];
+
+ if (!(bitmapdata = virHashLookup(commitdata, bitmap->name))) {
+ bitmapdata = g_new0(struct qemuBlockBitmapsHandleCommitData, 1);
+
+ /* we must mirror the state of the topmost bitmap and merge
+ * everything else */
+ bitmapdata->create = true;
+ bitmapdata->enable = bitmap->recording;
+ bitmapdata->basenode = basesrc->nodeformat;
+ bitmapdata->merge = virJSONValueNewArray();
+ bitmapdata->granularity = bitmap->granularity;
+ bitmapdata->persistent = bitmap->persistent;
+
+ if (virHashAddEntry(commitdata, bitmap->name, bitmapdata) < 0) {
+ qemuBlockBitmapsHandleCommitDataFree(bitmapdata);
+ return -1;
+ }
+ }
+
+ if (bitmap->inconsistent ||
+ !qemuBlockBitmapChainIsValid(topsrc, bitmap->name,
blockNamedNodeData))
+ bitmapdata->skip = true;
+
+ if (qemuMonitorTransactionBitmapMergeSourceAddBitmap(bitmapdata->merge,
+ n->nodeformat,
+ bitmap->name) <
0)
+ return -1;
+ }
+ }
+
+ if ((entry = virHashLookup(blockNamedNodeData, basesrc->nodeformat))) {
+ /* note that all bitmaps in 'base' were disabled when commit was started
*/
+ for (i = 0; i < entry->nbitmaps; i++) {
+ qemuBlockNamedNodeDataBitmapPtr bitmap = entry->bitmaps[i];
+
+ if ((bitmapdata = virHashLookup(commitdata, bitmap->name))) {
+ bitmapdata->create = false;
+ } else {
+ char **disabledbitmaps = disabledBitmapsBase;
+
+ for (disabledbitmaps = disabledBitmapsBase; *disabledbitmaps;
disabledbitmaps++) {
+ if (STREQ(*disabledBitmapsBase, bitmap->name)) {
+ bitmapdata = g_new0(struct qemuBlockBitmapsHandleCommitData, 1);
+
+ bitmapdata->create = false;
+ bitmapdata->enable = true;
+ bitmapdata->basenode = basesrc->nodeformat;
+ bitmapdata->granularity = bitmap->granularity;
+ bitmapdata->persistent = bitmap->persistent;
+
+ if (virHashAddEntry(commitdata, bitmap->name, bitmapdata) <
0) {
+ qemuBlockBitmapsHandleCommitDataFree(bitmapdata);
+ return -1;
+ }
+
+ break;
+ }
+ }
+ }
+ }
+ }
+
+ if (virHashForEach(commitdata, qemuBlockBitmapsHandleCommitFinishIterate, act) <
0)
+ return -1;
+
+ if (virJSONValueArraySize(act) > 0)
+ *actions = g_steal_pointer(&act);
+
+ return 0;
+}
+
+
/**
* qemuBlockReopenFormat:
* @vm: domain object
diff --git a/src/qemu/qemu_block.h b/src/qemu/qemu_block.h
index b3d7d0f876..cb408d2eee 100644
--- a/src/qemu/qemu_block.h
+++ b/src/qemu/qemu_block.h
@@ -229,6 +229,20 @@ qemuBlockBitmapsHandleBlockcopy(virStorageSourcePtr src,
bool shallow,
virJSONValuePtr *actions);
+int
+qemuBlockBitmapsHandleCommitStart(virStorageSourcePtr topsrc,
+ virStorageSourcePtr basesrc,
+ virHashTablePtr blockNamedNodeData,
+ virJSONValuePtr *actions,
+ char ***disabledBitmapsBase);
+
+int
+qemuBlockBitmapsHandleCommitFinish(virStorageSourcePtr topsrc,
+ virStorageSourcePtr basesrc,
+ virHashTablePtr blockNamedNodeData,
+ virJSONValuePtr *actions,
+ char **disabledBitmapsBase);
+
int
qemuBlockReopenFormat(virDomainObjPtr vm,
virStorageSourcePtr src,
--
2.24.1
4:20 a.m.
New subject: [PATCH 05/13] qemu: block: Implement helpers for dealing with bitmaps during block commit
On Wed, Mar 04, 2020 at 06:26:33PM +0100, Peter Krempa wrote:
qemuBlockBitmapsHandleCommitStart prepares for disabling the bitmaps
in
the 'base' of the commit job so that the bitmaps are not dirtied by the
commit job. This needs to be done prior to start of the commit job.
qemuBlockBitmapsHandleCommitFinish then calculates the necessary merges
that agregate all the bitmaps between the commited images and write them
into the base bitmap.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_block.c | 217 ++++++++++++++++++++++++++++++++++++++++++
src/qemu/qemu_block.h | 14 +++
2 files changed, 231 insertions(+)
diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
index 11df8eedd0..2467315563 100644
--- a/src/qemu/qemu_block.c
+++ b/src/qemu/qemu_block.c
@@ -2962,6 +2962,223 @@ qemuBlockBitmapsHandleBlockcopy(virStorageSourcePtr src,
}
+/**
+ * @topsrc: virStorageSource representing 'top' of the job
+ * @basesrc: virStorageSource representing 'base' of the job
+ * @blockNamedNodeData: hash table containing data about bitmaps
+ * @actions: filled with arguments for a 'transaction' command
+ * @disabledBitmapsBase: filled with a list of bitmap names which must be disabled
+ *
+ * Prepares data for correctly hanlding bitmaps during the start of a commit
+ * job. The bitmaps in the 'base' image must be disabled, so that the writes
+ * done by the blockjob don't dirty the enabled bitmaps.
+ *
+ * @actions and @disabledBitmapsBase are untouched if no bitmaps need
+ * to be disabled.
+ */
+int
+qemuBlockBitmapsHandleCommitStart(virStorageSourcePtr top,
According to the documentation above and by symmetry with other changes in this
commit, shouldn't this parameter be actually called 'topsrc'?
+ virStorageSourcePtr basesrc,
+ virHashTablePtr blockNamedNodeData,
+ virJSONValuePtr *actions,
+ char ***disabledBitmapsBase)
+{
+ g_autoptr(virJSONValue) act = virJSONValueNewArray();
+ VIR_AUTOSTRINGLIST bitmaplist = NULL;
+ size_t curbitmapstr = 0;
+ qemuBlockNamedNodeDataPtr entry;
+ bool disable_bitmaps = true;
+ size_t i;
+
+ if (!(entry = virHashLookup(blockNamedNodeData, basesrc->nodeformat)))
+ return 0;
+
+ bitmaplist = g_new0(char *, entry->nbitmaps);
+
+ for (i = 0; i < entry->nbitmaps; i++) {
+ qemuBlockNamedNodeDataBitmapPtr bitmap = entry->bitmaps[i];
+
+ if (!bitmap->recording || bitmap->inconsistent ||
+ !qemuBlockBitmapChainIsValid(top, bitmap->name, blockNamedNodeData))
+ continue;
+
+ disable_bitmaps = true;
+
+ if (qemuMonitorTransactionBitmapDisable(act, basesrc->nodeformat,
+ bitmap->name) < 0)
+ return -1;
+
+ bitmaplist[curbitmapstr++] = g_strdup(bitmap->name);
+ }
+
+ if (disable_bitmaps) {
Can 'disable_bitmaps' actually be 'false' at this point? Perhaps it
should be
initialised to 'false' at the top of this function?
+ *actions = g_steal_pointer(&act);
+ *disabledBitmapsBase = g_steal_pointer(&bitmaplist);
+ }
+
+ return 0;
+}
+
+
+struct qemuBlockBitmapsHandleCommitData {
+ bool skip;
+ bool create;
+ bool enable;
+ const char *basenode;
+ virJSONValuePtr merge;
+ unsigned long long granularity;
+ bool persistent;
+};
+
+
+static void
+qemuBlockBitmapsHandleCommitDataFree(void *opaque)
+{
+ struct qemuBlockBitmapsHandleCommitData *data = opaque;
+
+ virJSONValueFree(data->merge);
+ g_free(data);
+}
+
+
+static int
+qemuBlockBitmapsHandleCommitFinishIterate(void *payload,
+ const void *entryname,
+ void *opaque)
+{
+ struct qemuBlockBitmapsHandleCommitData *data = payload;
+ const char *bitmapname = entryname;
+ virJSONValuePtr actions = opaque;
+
+ if (data->skip)
+ return 0;
+
+ if (data->create) {
+ if (qemuMonitorTransactionBitmapAdd(actions, data->basenode, bitmapname,
+ data->persistent, !data-> enable,
+ data->granularity) < 0)
+ return -1;
+ } else {
+ if (data->enable &&
+ qemuMonitorTransactionBitmapEnable(actions, data->basenode, bitmapname)
< 0)
+ return -1;
+ }
+
+ if (data->merge &&
+ qemuMonitorTransactionBitmapMerge(actions, data->basenode, bitmapname,
+ &data->merge) < 0)
+ return -1;
+
+ return 0;
+}
+
+
+/**
+ * @topsrc: virStorageSource representing 'top' of the job
+ * @basesrc: virStorageSource representing 'base' of the job
+ * @blockNamedNodeData: hash table containing data about bitmaps
+ * @actions: filled with arguments for a 'transaction' command
+ * @disabledBitmapsBase: bitmap names which were disabled
+ *
+ * Calculates the necessary bitmap merges/additions/enablements to properly
+ * handle commit of images from 'top' into 'base'. The necessary
operations
+ * in form of argumets of the 'transaction' command are filled into
'actions'
+ * if there is anything to do. Otherwise NULL is returned.
+ */
+int
+qemuBlockBitmapsHandleCommitFinish(virStorageSourcePtr topsrc,
+ virStorageSourcePtr basesrc,
+ virHashTablePtr blockNamedNodeData,
+ virJSONValuePtr *actions,
+ char **disabledBitmapsBase)
+{
+ g_autoptr(virJSONValue) act = virJSONValueNewArray();
+ virStorageSourcePtr n;
+ qemuBlockNamedNodeDataPtr entry;
+ g_autoptr(virHashTable) commitdata = NULL;
+ struct qemuBlockBitmapsHandleCommitData *bitmapdata;
+ size_t i;
+
+ commitdata = virHashNew(qemuBlockBitmapsHandleCommitDataFree);
+
+ for (n = topsrc; n != basesrc; n = n->backingStore) {
+ if (!(entry = virHashLookup(blockNamedNodeData, n->nodeformat)))
+ continue;
+
+ for (i = 0; i < entry->nbitmaps; i++) {
+ qemuBlockNamedNodeDataBitmapPtr bitmap = entry->bitmaps[i];
+
+ if (!(bitmapdata = virHashLookup(commitdata, bitmap->name))) {
+ bitmapdata = g_new0(struct qemuBlockBitmapsHandleCommitData, 1);
+
+ /* we must mirror the state of the topmost bitmap and merge
+ * everything else */
+ bitmapdata->create = true;
+ bitmapdata->enable = bitmap->recording;
+ bitmapdata->basenode = basesrc->nodeformat;
+ bitmapdata->merge = virJSONValueNewArray();
+ bitmapdata->granularity = bitmap->granularity;
+ bitmapdata->persistent = bitmap->persistent;
+
+ if (virHashAddEntry(commitdata, bitmap->name, bitmapdata) < 0) {
+ qemuBlockBitmapsHandleCommitDataFree(bitmapdata);
+ return -1;
+ }
+ }
+
+ if (bitmap->inconsistent ||
+ !qemuBlockBitmapChainIsValid(topsrc, bitmap->name,
blockNamedNodeData))
+ bitmapdata->skip = true;
+
+ if (qemuMonitorTransactionBitmapMergeSourceAddBitmap(bitmapdata->merge,
+ n->nodeformat,
+ bitmap->name) <
0)
+ return -1;
+ }
+ }
+
+ if ((entry = virHashLookup(blockNamedNodeData, basesrc->nodeformat))) {
+ /* note that all bitmaps in 'base' were disabled when commit was started
*/
+ for (i = 0; i < entry->nbitmaps; i++) {
+ qemuBlockNamedNodeDataBitmapPtr bitmap = entry->bitmaps[i];
+
+ if ((bitmapdata = virHashLookup(commitdata, bitmap->name))) {
+ bitmapdata->create = false;
+ } else {
+ char **disabledbitmaps = disabledBitmapsBase;
+
+ for (disabledbitmaps = disabledBitmapsBase; *disabledbitmaps;
disabledbitmaps++) {
+ if (STREQ(*disabledBitmapsBase, bitmap->name)) {
+ bitmapdata = g_new0(struct qemuBlockBitmapsHandleCommitData,
1);
+
+ bitmapdata->create = false;
+ bitmapdata->enable = true;
+ bitmapdata->basenode = basesrc->nodeformat;
+ bitmapdata->granularity = bitmap->granularity;
+ bitmapdata->persistent = bitmap->persistent;
+
+ if (virHashAddEntry(commitdata, bitmap->name, bitmapdata)
< 0) {
+ qemuBlockBitmapsHandleCommitDataFree(bitmapdata);
+ return -1;
+ }
+
+ break;
+ }
+ }
+ }
+ }
+ }
+
+ if (virHashForEach(commitdata, qemuBlockBitmapsHandleCommitFinishIterate, act) <
0)
+ return -1;
+
+ if (virJSONValueArraySize(act) > 0)
+ *actions = g_steal_pointer(&act);
+
+ return 0;
+}
+
+
/**
* qemuBlockReopenFormat:
* @vm: domain object
diff --git a/src/qemu/qemu_block.h b/src/qemu/qemu_block.h
index b3d7d0f876..cb408d2eee 100644
--- a/src/qemu/qemu_block.h
+++ b/src/qemu/qemu_block.h
@@ -229,6 +229,20 @@ qemuBlockBitmapsHandleBlockcopy(virStorageSourcePtr src,
bool shallow,
virJSONValuePtr *actions);
+int
+qemuBlockBitmapsHandleCommitStart(virStorageSourcePtr topsrc,
+ virStorageSourcePtr basesrc,
+ virHashTablePtr blockNamedNodeData,
+ virJSONValuePtr *actions,
+ char ***disabledBitmapsBase);
+
+int
+qemuBlockBitmapsHandleCommitFinish(virStorageSourcePtr topsrc,
+ virStorageSourcePtr basesrc,
+ virHashTablePtr blockNamedNodeData,
+ virJSONValuePtr *actions,
+ char **disabledBitmapsBase);
+
int
qemuBlockReopenFormat(virDomainObjPtr vm,
virStorageSourcePtr src,
--
2.24.1
11:26 a.m.
New subject: [PATCH 06/13] qemublocktest: Add tests for handling of bitmaps during block-commit
Add code for testing the two necessary steps of handling bitmaps during
block commit and excercise the code on the test data which we have for
bitmap handling.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
tests/qemublocktest.c | 95 ++++++++++++++
.../bitmapblockcommit/basic-1-2 | 119 ++++++++++++++++++
.../bitmapblockcommit/basic-1-3 | 119 ++++++++++++++++++
.../bitmapblockcommit/basic-2-3 | 2 +
4 files changed, 335 insertions(+)
create mode 100644 tests/qemublocktestdata/bitmapblockcommit/basic-1-2
create mode 100644 tests/qemublocktestdata/bitmapblockcommit/basic-1-3
create mode 100644 tests/qemublocktestdata/bitmapblockcommit/basic-2-3
diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c
index a6b6376c7d..3662fee42a 100644
--- a/tests/qemublocktest.c
+++ b/tests/qemublocktest.c
@@ -599,6 +599,21 @@ testQemuBackupIncrementalBitmapCalculateGetFakeChain(void)
}
+static virStorageSourcePtr
+testQemuBitmapGetFakeChainEntry(virStorageSourcePtr src,
+ size_t idx)
+{
+ virStorageSourcePtr n;
+
+ for (n = src; n; n = n->backingStore) {
+ if (n->id == idx)
+ return n;
+ }
+
+ return NULL;
+}
+
+
typedef virDomainMomentDefPtr testMomentList;
static void
@@ -853,6 +868,68 @@ testQemuBlockBitmapBlockcopy(const void *opaque)
return virTestCompareToFile(actual, expectpath);
}
+static const char *blockcommitPrefix = "qemublocktestdata/bitmapblockcommit/";
+
+struct testQemuBlockBitmapBlockcommitData {
+ const char *name;
+ virStorageSourcePtr top;
+ virStorageSourcePtr base;
+ virStorageSourcePtr chain;
+ const char *nodedatafile;
+};
+
+
+static int
+testQemuBlockBitmapBlockcommit(const void *opaque)
+{
+ const struct testQemuBlockBitmapBlockcommitData *data = opaque;
+
+ g_autofree char *actual = NULL;
+ g_autofree char *expectpath = NULL;
+ g_autoptr(virJSONValue) actionsDisable = NULL;
+ g_autoptr(virJSONValue) actionsMerge = NULL;
+ g_autoptr(virJSONValue) nodedatajson = NULL;
+ g_autoptr(virHashTable) nodedata = NULL;
+ g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
+ VIR_AUTOSTRINGLIST bitmapsDisable = NULL;
+
+ expectpath = g_strdup_printf("%s/%s%s", abs_srcdir,
+ blockcommitPrefix, data->name);
+
+ if (!(nodedatajson = virTestLoadFileJSON(bitmapDetectPrefix, data->nodedatafile,
+ ".json", NULL)))
+ return -1;
+
+ if (!(nodedata = qemuMonitorJSONBlockGetNamedNodeDataJSON(nodedatajson))) {
+ VIR_TEST_VERBOSE("failed to load nodedata JSON\n");
+ return -1;
+ }
+
+ if (qemuBlockBitmapsHandleCommitStart(data->top, data->base, nodedata,
+ &actionsDisable, &bitmapsDisable) <
0)
+ return -1;
+
+ virBufferAddLit(&buf, "pre job bitmap disable:\n");
+
+ if (actionsDisable &&
+ virJSONValueToBuffer(actionsDisable, &buf, true) < 0)
+ return -1;
+
+ virBufferAddLit(&buf, "merge bitmpas:\n");
+
+ if (qemuBlockBitmapsHandleCommitFinish(data->top, data->base, nodedata,
+ &actionsMerge, bitmapsDisable) < 0)
+ return -1;
+
+ if (actionsMerge &&
+ virJSONValueToBuffer(actionsMerge, &buf, true) < 0)
+ return -1;
+
+ actual = virBufferContentAndReset(&buf);
+
+ return virTestCompareToFile(actual, expectpath);
+}
+
static int
mymain(void)
@@ -866,6 +943,7 @@ mymain(void)
struct testQemuCheckpointDeleteMergeData checkpointdeletedata;
struct testQemuBlockBitmapValidateData blockbitmapvalidatedata;
struct testQemuBlockBitmapBlockcopyData blockbitmapblockcopydata;
+ struct testQemuBlockBitmapBlockcommitData blockbitmapblockcommitdata;
char *capslatest_x86_64 = NULL;
virQEMUCapsPtr caps_x86_64 = NULL;
g_autoptr(virStorageSource) bitmapSourceChain = NULL;
@@ -1196,6 +1274,23 @@ mymain(void)
TEST_BITMAP_BLOCKCOPY("snapshots-shallow", true, "snapshots");
TEST_BITMAP_BLOCKCOPY("snapshots-deep", false, "snapshots");
+
+#define TEST_BITMAP_BLOCKCOMMIT(testname, topimg, baseimg, ndf) \
+ do {\
+ blockbitmapblockcommitdata.name = testname; \
+ blockbitmapblockcommitdata.top =
testQemuBitmapGetFakeChainEntry(bitmapSourceChain, topimg); \
+ blockbitmapblockcommitdata.base =
testQemuBitmapGetFakeChainEntry(bitmapSourceChain, baseimg); \
+ blockbitmapblockcommitdata.nodedatafile = ndf; \
+ if (virTestRun("bitmap block commit " testname, \
+ testQemuBlockBitmapBlockcommit, \
+ &blockbitmapblockcommitdata) < 0) \
+ ret = -1; \
+ } while (0)
+
+ TEST_BITMAP_BLOCKCOMMIT("basic-1-2", 1, 2, "basic");
+ TEST_BITMAP_BLOCKCOMMIT("basic-1-3", 1, 3, "basic");
+ TEST_BITMAP_BLOCKCOMMIT("basic-2-3", 2, 3, "basic");
+
cleanup:
virHashFree(diskxmljsondata.schema);
qemuTestDriverFree(&driver);
diff --git a/tests/qemublocktestdata/bitmapblockcommit/basic-1-2
b/tests/qemublocktestdata/bitmapblockcommit/basic-1-2
new file mode 100644
index 0000000000..8eeb4c3a11
--- /dev/null
+++ b/tests/qemublocktestdata/bitmapblockcommit/basic-1-2
@@ -0,0 +1,119 @@
+pre job bitmap disable:
+merge bitmpas:
+[
+ {
+ "type": "block-dirty-bitmap-add",
+ "data": {
+ "node": "libvirt-2-format",
+ "name": "a",
+ "persistent": true,
+ "disabled": true,
+ "granularity": 65536
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-merge",
+ "data": {
+ "node": "libvirt-2-format",
+ "target": "a",
+ "bitmaps": [
+ {
+ "node": "libvirt-1-format",
+ "name": "a"
+ }
+ ]
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-add",
+ "data": {
+ "node": "libvirt-2-format",
+ "name": "b",
+ "persistent": true,
+ "disabled": true,
+ "granularity": 65536
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-merge",
+ "data": {
+ "node": "libvirt-2-format",
+ "target": "b",
+ "bitmaps": [
+ {
+ "node": "libvirt-1-format",
+ "name": "b"
+ }
+ ]
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-add",
+ "data": {
+ "node": "libvirt-2-format",
+ "name": "current",
+ "persistent": true,
+ "disabled": false,
+ "granularity": 65536
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-merge",
+ "data": {
+ "node": "libvirt-2-format",
+ "target": "current",
+ "bitmaps": [
+ {
+ "node": "libvirt-1-format",
+ "name": "current"
+ }
+ ]
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-add",
+ "data": {
+ "node": "libvirt-2-format",
+ "name": "c",
+ "persistent": true,
+ "disabled": true,
+ "granularity": 65536
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-merge",
+ "data": {
+ "node": "libvirt-2-format",
+ "target": "c",
+ "bitmaps": [
+ {
+ "node": "libvirt-1-format",
+ "name": "c"
+ }
+ ]
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-add",
+ "data": {
+ "node": "libvirt-2-format",
+ "name": "d",
+ "persistent": true,
+ "disabled": true,
+ "granularity": 65536
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-merge",
+ "data": {
+ "node": "libvirt-2-format",
+ "target": "d",
+ "bitmaps": [
+ {
+ "node": "libvirt-1-format",
+ "name": "d"
+ }
+ ]
+ }
+ }
+]
diff --git a/tests/qemublocktestdata/bitmapblockcommit/basic-1-3
b/tests/qemublocktestdata/bitmapblockcommit/basic-1-3
new file mode 100644
index 0000000000..71b48e31a5
--- /dev/null
+++ b/tests/qemublocktestdata/bitmapblockcommit/basic-1-3
@@ -0,0 +1,119 @@
+pre job bitmap disable:
+merge bitmpas:
+[
+ {
+ "type": "block-dirty-bitmap-add",
+ "data": {
+ "node": "libvirt-3-format",
+ "name": "a",
+ "persistent": true,
+ "disabled": true,
+ "granularity": 65536
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-merge",
+ "data": {
+ "node": "libvirt-3-format",
+ "target": "a",
+ "bitmaps": [
+ {
+ "node": "libvirt-1-format",
+ "name": "a"
+ }
+ ]
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-add",
+ "data": {
+ "node": "libvirt-3-format",
+ "name": "b",
+ "persistent": true,
+ "disabled": true,
+ "granularity": 65536
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-merge",
+ "data": {
+ "node": "libvirt-3-format",
+ "target": "b",
+ "bitmaps": [
+ {
+ "node": "libvirt-1-format",
+ "name": "b"
+ }
+ ]
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-add",
+ "data": {
+ "node": "libvirt-3-format",
+ "name": "current",
+ "persistent": true,
+ "disabled": false,
+ "granularity": 65536
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-merge",
+ "data": {
+ "node": "libvirt-3-format",
+ "target": "current",
+ "bitmaps": [
+ {
+ "node": "libvirt-1-format",
+ "name": "current"
+ }
+ ]
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-add",
+ "data": {
+ "node": "libvirt-3-format",
+ "name": "c",
+ "persistent": true,
+ "disabled": true,
+ "granularity": 65536
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-merge",
+ "data": {
+ "node": "libvirt-3-format",
+ "target": "c",
+ "bitmaps": [
+ {
+ "node": "libvirt-1-format",
+ "name": "c"
+ }
+ ]
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-add",
+ "data": {
+ "node": "libvirt-3-format",
+ "name": "d",
+ "persistent": true,
+ "disabled": true,
+ "granularity": 65536
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-merge",
+ "data": {
+ "node": "libvirt-3-format",
+ "target": "d",
+ "bitmaps": [
+ {
+ "node": "libvirt-1-format",
+ "name": "d"
+ }
+ ]
+ }
+ }
+]
diff --git a/tests/qemublocktestdata/bitmapblockcommit/basic-2-3
b/tests/qemublocktestdata/bitmapblockcommit/basic-2-3
new file mode 100644
index 0000000000..bfc58f994e
--- /dev/null
+++ b/tests/qemublocktestdata/bitmapblockcommit/basic-2-3
@@ -0,0 +1,2 @@
+pre job bitmap disable:
+merge bitmpas:
--
2.24.1
11:26 a.m.
New subject: [PATCH 07/13] qemublocktest: Add more tests for block-commit bitmap handling with snapshots
Test handling of more complex cases of merging bitmaps accross
snapshots.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
tests/qemublocktest.c | 15 ++
.../bitmapblockcommit/snapshots-1-2 | 49 +++++++
.../bitmapblockcommit/snapshots-1-3 | 76 ++++++++++
.../bitmapblockcommit/snapshots-1-4 | 126 +++++++++++++++++
.../bitmapblockcommit/snapshots-1-5 | 130 ++++++++++++++++++
.../bitmapblockcommit/snapshots-2-3 | 49 +++++++
.../bitmapblockcommit/snapshots-2-4 | 99 +++++++++++++
.../bitmapblockcommit/snapshots-2-5 | 103 ++++++++++++++
.../bitmapblockcommit/snapshots-3-4 | 72 ++++++++++
.../bitmapblockcommit/snapshots-3-5 | 76 ++++++++++
.../bitmapblockcommit/snapshots-4-4 | 11 ++
.../bitmapblockcommit/snapshots-4-5 | 33 +++++
12 files changed, 839 insertions(+)
create mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-1-2
create mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-1-3
create mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-1-4
create mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-1-5
create mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-2-3
create mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-2-4
create mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-2-5
create mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-3-4
create mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-3-5
create mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-4-4
create mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-4-5
diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c
index 3662fee42a..5eb38c3981 100644
--- a/tests/qemublocktest.c
+++ b/tests/qemublocktest.c
@@ -1291,6 +1291,21 @@ mymain(void)
TEST_BITMAP_BLOCKCOMMIT("basic-1-3", 1, 3, "basic");
TEST_BITMAP_BLOCKCOMMIT("basic-2-3", 2, 3, "basic");
+ TEST_BITMAP_BLOCKCOMMIT("snapshots-1-2", 1, 2, "snapshots");
+ TEST_BITMAP_BLOCKCOMMIT("snapshots-1-3", 1, 3, "snapshots");
+ TEST_BITMAP_BLOCKCOMMIT("snapshots-1-4", 1, 4, "snapshots");
+ TEST_BITMAP_BLOCKCOMMIT("snapshots-1-5", 1, 5, "snapshots");
+
+ TEST_BITMAP_BLOCKCOMMIT("snapshots-2-3", 2, 3, "snapshots");
+ TEST_BITMAP_BLOCKCOMMIT("snapshots-2-4", 2, 4, "snapshots");
+ TEST_BITMAP_BLOCKCOMMIT("snapshots-2-5", 2, 5, "snapshots");
+
+ TEST_BITMAP_BLOCKCOMMIT("snapshots-3-4", 3, 4, "snapshots");
+ TEST_BITMAP_BLOCKCOMMIT("snapshots-3-5", 3, 5, "snapshots");
+
+ TEST_BITMAP_BLOCKCOMMIT("snapshots-4-5", 4, 5, "snapshots");
+
+
cleanup:
virHashFree(diskxmljsondata.schema);
qemuTestDriverFree(&driver);
diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-1-2
b/tests/qemublocktestdata/bitmapblockcommit/snapshots-1-2
new file mode 100644
index 0000000000..0015b9ceb3
--- /dev/null
+++ b/tests/qemublocktestdata/bitmapblockcommit/snapshots-1-2
@@ -0,0 +1,49 @@
+pre job bitmap disable:
+[
+ {
+ "type": "block-dirty-bitmap-disable",
+ "data": {
+ "node": "libvirt-2-format",
+ "name": "d"
+ }
+ }
+]
+merge bitmpas:
+[
+ {
+ "type": "block-dirty-bitmap-add",
+ "data": {
+ "node": "libvirt-2-format",
+ "name": "current",
+ "persistent": true,
+ "disabled": false,
+ "granularity": 65536
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-merge",
+ "data": {
+ "node": "libvirt-2-format",
+ "target": "current",
+ "bitmaps": [
+ {
+ "node": "libvirt-1-format",
+ "name": "current"
+ }
+ ]
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-merge",
+ "data": {
+ "node": "libvirt-2-format",
+ "target": "d",
+ "bitmaps": [
+ {
+ "node": "libvirt-1-format",
+ "name": "d"
+ }
+ ]
+ }
+ }
+]
diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-1-3
b/tests/qemublocktestdata/bitmapblockcommit/snapshots-1-3
new file mode 100644
index 0000000000..5691b408aa
--- /dev/null
+++ b/tests/qemublocktestdata/bitmapblockcommit/snapshots-1-3
@@ -0,0 +1,76 @@
+pre job bitmap disable:
+[
+ {
+ "type": "block-dirty-bitmap-disable",
+ "data": {
+ "node": "libvirt-3-format",
+ "name": "c"
+ }
+ }
+]
+merge bitmpas:
+[
+ {
+ "type": "block-dirty-bitmap-add",
+ "data": {
+ "node": "libvirt-3-format",
+ "name": "current",
+ "persistent": true,
+ "disabled": false,
+ "granularity": 65536
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-merge",
+ "data": {
+ "node": "libvirt-3-format",
+ "target": "current",
+ "bitmaps": [
+ {
+ "node": "libvirt-1-format",
+ "name": "current"
+ }
+ ]
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-merge",
+ "data": {
+ "node": "libvirt-3-format",
+ "target": "c",
+ "bitmaps": [
+ {
+ "node": "libvirt-2-format",
+ "name": "c"
+ }
+ ]
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-add",
+ "data": {
+ "node": "libvirt-3-format",
+ "name": "d",
+ "persistent": true,
+ "disabled": true,
+ "granularity": 65536
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-merge",
+ "data": {
+ "node": "libvirt-3-format",
+ "target": "d",
+ "bitmaps": [
+ {
+ "node": "libvirt-1-format",
+ "name": "d"
+ },
+ {
+ "node": "libvirt-2-format",
+ "name": "d"
+ }
+ ]
+ }
+ }
+]
diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-1-4
b/tests/qemublocktestdata/bitmapblockcommit/snapshots-1-4
new file mode 100644
index 0000000000..454001531a
--- /dev/null
+++ b/tests/qemublocktestdata/bitmapblockcommit/snapshots-1-4
@@ -0,0 +1,126 @@
+pre job bitmap disable:
+[
+ {
+ "type": "block-dirty-bitmap-disable",
+ "data": {
+ "node": "libvirt-4-format",
+ "name": "a"
+ }
+ }
+]
+merge bitmpas:
+[
+ {
+ "type": "block-dirty-bitmap-merge",
+ "data": {
+ "node": "libvirt-4-format",
+ "target": "a",
+ "bitmaps": [
+ {
+ "node": "libvirt-3-format",
+ "name": "a"
+ }
+ ]
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-add",
+ "data": {
+ "node": "libvirt-4-format",
+ "name": "b",
+ "persistent": true,
+ "disabled": true,
+ "granularity": 65536
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-merge",
+ "data": {
+ "node": "libvirt-4-format",
+ "target": "b",
+ "bitmaps": [
+ {
+ "node": "libvirt-3-format",
+ "name": "b"
+ }
+ ]
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-add",
+ "data": {
+ "node": "libvirt-4-format",
+ "name": "current",
+ "persistent": true,
+ "disabled": false,
+ "granularity": 65536
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-merge",
+ "data": {
+ "node": "libvirt-4-format",
+ "target": "current",
+ "bitmaps": [
+ {
+ "node": "libvirt-1-format",
+ "name": "current"
+ }
+ ]
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-add",
+ "data": {
+ "node": "libvirt-4-format",
+ "name": "c",
+ "persistent": true,
+ "disabled": true,
+ "granularity": 65536
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-merge",
+ "data": {
+ "node": "libvirt-4-format",
+ "target": "c",
+ "bitmaps": [
+ {
+ "node": "libvirt-2-format",
+ "name": "c"
+ },
+ {
+ "node": "libvirt-3-format",
+ "name": "c"
+ }
+ ]
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-add",
+ "data": {
+ "node": "libvirt-4-format",
+ "name": "d",
+ "persistent": true,
+ "disabled": true,
+ "granularity": 65536
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-merge",
+ "data": {
+ "node": "libvirt-4-format",
+ "target": "d",
+ "bitmaps": [
+ {
+ "node": "libvirt-1-format",
+ "name": "d"
+ },
+ {
+ "node": "libvirt-2-format",
+ "name": "d"
+ }
+ ]
+ }
+ }
+]
diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-1-5
b/tests/qemublocktestdata/bitmapblockcommit/snapshots-1-5
new file mode 100644
index 0000000000..2fd43d7917
--- /dev/null
+++ b/tests/qemublocktestdata/bitmapblockcommit/snapshots-1-5
@@ -0,0 +1,130 @@
+pre job bitmap disable:
+[
+ {
+ "type": "block-dirty-bitmap-disable",
+ "data": {
+ "node": "libvirt-5-format",
+ "name": "a"
+ }
+ }
+]
+merge bitmpas:
+[
+ {
+ "type": "block-dirty-bitmap-merge",
+ "data": {
+ "node": "libvirt-5-format",
+ "target": "a",
+ "bitmaps": [
+ {
+ "node": "libvirt-3-format",
+ "name": "a"
+ },
+ {
+ "node": "libvirt-4-format",
+ "name": "a"
+ }
+ ]
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-add",
+ "data": {
+ "node": "libvirt-5-format",
+ "name": "b",
+ "persistent": true,
+ "disabled": true,
+ "granularity": 65536
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-merge",
+ "data": {
+ "node": "libvirt-5-format",
+ "target": "b",
+ "bitmaps": [
+ {
+ "node": "libvirt-3-format",
+ "name": "b"
+ }
+ ]
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-add",
+ "data": {
+ "node": "libvirt-5-format",
+ "name": "current",
+ "persistent": true,
+ "disabled": false,
+ "granularity": 65536
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-merge",
+ "data": {
+ "node": "libvirt-5-format",
+ "target": "current",
+ "bitmaps": [
+ {
+ "node": "libvirt-1-format",
+ "name": "current"
+ }
+ ]
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-add",
+ "data": {
+ "node": "libvirt-5-format",
+ "name": "c",
+ "persistent": true,
+ "disabled": true,
+ "granularity": 65536
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-merge",
+ "data": {
+ "node": "libvirt-5-format",
+ "target": "c",
+ "bitmaps": [
+ {
+ "node": "libvirt-2-format",
+ "name": "c"
+ },
+ {
+ "node": "libvirt-3-format",
+ "name": "c"
+ }
+ ]
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-add",
+ "data": {
+ "node": "libvirt-5-format",
+ "name": "d",
+ "persistent": true,
+ "disabled": true,
+ "granularity": 65536
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-merge",
+ "data": {
+ "node": "libvirt-5-format",
+ "target": "d",
+ "bitmaps": [
+ {
+ "node": "libvirt-1-format",
+ "name": "d"
+ },
+ {
+ "node": "libvirt-2-format",
+ "name": "d"
+ }
+ ]
+ }
+ }
+]
diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-2-3
b/tests/qemublocktestdata/bitmapblockcommit/snapshots-2-3
new file mode 100644
index 0000000000..d719a90bd7
--- /dev/null
+++ b/tests/qemublocktestdata/bitmapblockcommit/snapshots-2-3
@@ -0,0 +1,49 @@
+pre job bitmap disable:
+[
+ {
+ "type": "block-dirty-bitmap-disable",
+ "data": {
+ "node": "libvirt-3-format",
+ "name": "c"
+ }
+ }
+]
+merge bitmpas:
+[
+ {
+ "type": "block-dirty-bitmap-merge",
+ "data": {
+ "node": "libvirt-3-format",
+ "target": "c",
+ "bitmaps": [
+ {
+ "node": "libvirt-2-format",
+ "name": "c"
+ }
+ ]
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-add",
+ "data": {
+ "node": "libvirt-3-format",
+ "name": "d",
+ "persistent": true,
+ "disabled": false,
+ "granularity": 65536
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-merge",
+ "data": {
+ "node": "libvirt-3-format",
+ "target": "d",
+ "bitmaps": [
+ {
+ "node": "libvirt-2-format",
+ "name": "d"
+ }
+ ]
+ }
+ }
+]
diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-2-4
b/tests/qemublocktestdata/bitmapblockcommit/snapshots-2-4
new file mode 100644
index 0000000000..9e37962344
--- /dev/null
+++ b/tests/qemublocktestdata/bitmapblockcommit/snapshots-2-4
@@ -0,0 +1,99 @@
+pre job bitmap disable:
+[
+ {
+ "type": "block-dirty-bitmap-disable",
+ "data": {
+ "node": "libvirt-4-format",
+ "name": "a"
+ }
+ }
+]
+merge bitmpas:
+[
+ {
+ "type": "block-dirty-bitmap-merge",
+ "data": {
+ "node": "libvirt-4-format",
+ "target": "a",
+ "bitmaps": [
+ {
+ "node": "libvirt-3-format",
+ "name": "a"
+ }
+ ]
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-add",
+ "data": {
+ "node": "libvirt-4-format",
+ "name": "b",
+ "persistent": true,
+ "disabled": true,
+ "granularity": 65536
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-merge",
+ "data": {
+ "node": "libvirt-4-format",
+ "target": "b",
+ "bitmaps": [
+ {
+ "node": "libvirt-3-format",
+ "name": "b"
+ }
+ ]
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-add",
+ "data": {
+ "node": "libvirt-4-format",
+ "name": "c",
+ "persistent": true,
+ "disabled": true,
+ "granularity": 65536
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-merge",
+ "data": {
+ "node": "libvirt-4-format",
+ "target": "c",
+ "bitmaps": [
+ {
+ "node": "libvirt-2-format",
+ "name": "c"
+ },
+ {
+ "node": "libvirt-3-format",
+ "name": "c"
+ }
+ ]
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-add",
+ "data": {
+ "node": "libvirt-4-format",
+ "name": "d",
+ "persistent": true,
+ "disabled": false,
+ "granularity": 65536
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-merge",
+ "data": {
+ "node": "libvirt-4-format",
+ "target": "d",
+ "bitmaps": [
+ {
+ "node": "libvirt-2-format",
+ "name": "d"
+ }
+ ]
+ }
+ }
+]
diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-2-5
b/tests/qemublocktestdata/bitmapblockcommit/snapshots-2-5
new file mode 100644
index 0000000000..d6b20a5d05
--- /dev/null
+++ b/tests/qemublocktestdata/bitmapblockcommit/snapshots-2-5
@@ -0,0 +1,103 @@
+pre job bitmap disable:
+[
+ {
+ "type": "block-dirty-bitmap-disable",
+ "data": {
+ "node": "libvirt-5-format",
+ "name": "a"
+ }
+ }
+]
+merge bitmpas:
+[
+ {
+ "type": "block-dirty-bitmap-merge",
+ "data": {
+ "node": "libvirt-5-format",
+ "target": "a",
+ "bitmaps": [
+ {
+ "node": "libvirt-3-format",
+ "name": "a"
+ },
+ {
+ "node": "libvirt-4-format",
+ "name": "a"
+ }
+ ]
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-add",
+ "data": {
+ "node": "libvirt-5-format",
+ "name": "b",
+ "persistent": true,
+ "disabled": true,
+ "granularity": 65536
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-merge",
+ "data": {
+ "node": "libvirt-5-format",
+ "target": "b",
+ "bitmaps": [
+ {
+ "node": "libvirt-3-format",
+ "name": "b"
+ }
+ ]
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-add",
+ "data": {
+ "node": "libvirt-5-format",
+ "name": "c",
+ "persistent": true,
+ "disabled": true,
+ "granularity": 65536
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-merge",
+ "data": {
+ "node": "libvirt-5-format",
+ "target": "c",
+ "bitmaps": [
+ {
+ "node": "libvirt-2-format",
+ "name": "c"
+ },
+ {
+ "node": "libvirt-3-format",
+ "name": "c"
+ }
+ ]
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-add",
+ "data": {
+ "node": "libvirt-5-format",
+ "name": "d",
+ "persistent": true,
+ "disabled": false,
+ "granularity": 65536
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-merge",
+ "data": {
+ "node": "libvirt-5-format",
+ "target": "d",
+ "bitmaps": [
+ {
+ "node": "libvirt-2-format",
+ "name": "d"
+ }
+ ]
+ }
+ }
+]
diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-3-4
b/tests/qemublocktestdata/bitmapblockcommit/snapshots-3-4
new file mode 100644
index 0000000000..b96e8910d7
--- /dev/null
+++ b/tests/qemublocktestdata/bitmapblockcommit/snapshots-3-4
@@ -0,0 +1,72 @@
+pre job bitmap disable:
+[
+ {
+ "type": "block-dirty-bitmap-disable",
+ "data": {
+ "node": "libvirt-4-format",
+ "name": "a"
+ }
+ }
+]
+merge bitmpas:
+[
+ {
+ "type": "block-dirty-bitmap-merge",
+ "data": {
+ "node": "libvirt-4-format",
+ "target": "a",
+ "bitmaps": [
+ {
+ "node": "libvirt-3-format",
+ "name": "a"
+ }
+ ]
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-add",
+ "data": {
+ "node": "libvirt-4-format",
+ "name": "b",
+ "persistent": true,
+ "disabled": true,
+ "granularity": 65536
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-merge",
+ "data": {
+ "node": "libvirt-4-format",
+ "target": "b",
+ "bitmaps": [
+ {
+ "node": "libvirt-3-format",
+ "name": "b"
+ }
+ ]
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-add",
+ "data": {
+ "node": "libvirt-4-format",
+ "name": "c",
+ "persistent": true,
+ "disabled": false,
+ "granularity": 65536
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-merge",
+ "data": {
+ "node": "libvirt-4-format",
+ "target": "c",
+ "bitmaps": [
+ {
+ "node": "libvirt-3-format",
+ "name": "c"
+ }
+ ]
+ }
+ }
+]
diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-3-5
b/tests/qemublocktestdata/bitmapblockcommit/snapshots-3-5
new file mode 100644
index 0000000000..9570c34c40
--- /dev/null
+++ b/tests/qemublocktestdata/bitmapblockcommit/snapshots-3-5
@@ -0,0 +1,76 @@
+pre job bitmap disable:
+[
+ {
+ "type": "block-dirty-bitmap-disable",
+ "data": {
+ "node": "libvirt-5-format",
+ "name": "a"
+ }
+ }
+]
+merge bitmpas:
+[
+ {
+ "type": "block-dirty-bitmap-merge",
+ "data": {
+ "node": "libvirt-5-format",
+ "target": "a",
+ "bitmaps": [
+ {
+ "node": "libvirt-3-format",
+ "name": "a"
+ },
+ {
+ "node": "libvirt-4-format",
+ "name": "a"
+ }
+ ]
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-add",
+ "data": {
+ "node": "libvirt-5-format",
+ "name": "b",
+ "persistent": true,
+ "disabled": true,
+ "granularity": 65536
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-merge",
+ "data": {
+ "node": "libvirt-5-format",
+ "target": "b",
+ "bitmaps": [
+ {
+ "node": "libvirt-3-format",
+ "name": "b"
+ }
+ ]
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-add",
+ "data": {
+ "node": "libvirt-5-format",
+ "name": "c",
+ "persistent": true,
+ "disabled": false,
+ "granularity": 65536
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-merge",
+ "data": {
+ "node": "libvirt-5-format",
+ "target": "c",
+ "bitmaps": [
+ {
+ "node": "libvirt-3-format",
+ "name": "c"
+ }
+ ]
+ }
+ }
+]
diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-4-4
b/tests/qemublocktestdata/bitmapblockcommit/snapshots-4-4
new file mode 100644
index 0000000000..a445fd7c49
--- /dev/null
+++ b/tests/qemublocktestdata/bitmapblockcommit/snapshots-4-4
@@ -0,0 +1,11 @@
+pre job bitmap disable:
+[
+ {
+ "type": "block-dirty-bitmap-disable",
+ "data": {
+ "node": "libvirt-5-format",
+ "name": "a"
+ }
+ }
+]
+merge bitmpas:
diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-4-5
b/tests/qemublocktestdata/bitmapblockcommit/snapshots-4-5
new file mode 100644
index 0000000000..7e1020d96e
--- /dev/null
+++ b/tests/qemublocktestdata/bitmapblockcommit/snapshots-4-5
@@ -0,0 +1,33 @@
+pre job bitmap disable:
+[
+ {
+ "type": "block-dirty-bitmap-disable",
+ "data": {
+ "node": "libvirt-5-format",
+ "name": "a"
+ }
+ }
+]
+merge bitmpas:
+[
+ {
+ "type": "block-dirty-bitmap-enable",
+ "data": {
+ "node": "libvirt-5-format",
+ "name": "a"
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-merge",
+ "data": {
+ "node": "libvirt-5-format",
+ "target": "a",
+ "bitmaps": [
+ {
+ "node": "libvirt-4-format",
+ "name": "a"
+ }
+ ]
+ }
+ }
+]
--
2.24.1
11:26 a.m.
New subject: [PATCH 08/13] qemublocktest: Add tests of broken bitmap chain handling during block-commit
Use the 'snapshots-synthetic-broken' test data for block-commit.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
tests/qemublocktest.c | 13 ++++
.../snapshots-synthetic-broken-1-2 | 30 ++++++++
.../snapshots-synthetic-broken-1-3 | 66 ++++++++++++++++
.../snapshots-synthetic-broken-1-4 | 76 +++++++++++++++++++
.../snapshots-synthetic-broken-1-5 | 76 +++++++++++++++++++
.../snapshots-synthetic-broken-2-3 | 43 +++++++++++
.../snapshots-synthetic-broken-2-4 | 53 +++++++++++++
.../snapshots-synthetic-broken-2-5 | 53 +++++++++++++
.../snapshots-synthetic-broken-3-4 | 30 ++++++++
.../snapshots-synthetic-broken-3-5 | 30 ++++++++
.../snapshots-synthetic-broken-4-5 | 20 +++++
11 files changed, 490 insertions(+)
create mode 100644
tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-2
create mode 100644
tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-3
create mode 100644
tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-4
create mode 100644
tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-5
create mode 100644
tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-2-3
create mode 100644
tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-2-4
create mode 100644
tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-2-5
create mode 100644
tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-3-4
create mode 100644
tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-3-5
create mode 100644
tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-4-5
diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c
index 5eb38c3981..b782e7969d 100644
--- a/tests/qemublocktest.c
+++ b/tests/qemublocktest.c
@@ -1305,6 +1305,19 @@ mymain(void)
TEST_BITMAP_BLOCKCOMMIT("snapshots-4-5", 4, 5, "snapshots");
+ TEST_BITMAP_BLOCKCOMMIT("snapshots-synthetic-broken-1-2", 1, 2,
"snapshots-synthetic-broken");
+ TEST_BITMAP_BLOCKCOMMIT("snapshots-synthetic-broken-1-3", 1, 3,
"snapshots-synthetic-broken");
+ TEST_BITMAP_BLOCKCOMMIT("snapshots-synthetic-broken-1-4", 1, 4,
"snapshots-synthetic-broken");
+ TEST_BITMAP_BLOCKCOMMIT("snapshots-synthetic-broken-1-5", 1, 5,
"snapshots-synthetic-broken");
+
+ TEST_BITMAP_BLOCKCOMMIT("snapshots-synthetic-broken-2-3", 2, 3,
"snapshots-synthetic-broken");
+ TEST_BITMAP_BLOCKCOMMIT("snapshots-synthetic-broken-2-4", 2, 4,
"snapshots-synthetic-broken");
+ TEST_BITMAP_BLOCKCOMMIT("snapshots-synthetic-broken-2-5", 2, 5,
"snapshots-synthetic-broken");
+
+ TEST_BITMAP_BLOCKCOMMIT("snapshots-synthetic-broken-3-4", 3, 4,
"snapshots-synthetic-broken");
+ TEST_BITMAP_BLOCKCOMMIT("snapshots-synthetic-broken-3-5", 3, 5,
"snapshots-synthetic-broken");
+
+ TEST_BITMAP_BLOCKCOMMIT("snapshots-synthetic-broken-4-5", 4, 5,
"snapshots-synthetic-broken");
cleanup:
virHashFree(diskxmljsondata.schema);
diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-2
b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-2
new file mode 100644
index 0000000000..ab269d9256
--- /dev/null
+++ b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-2
@@ -0,0 +1,30 @@
+pre job bitmap disable:
+[
+
+]
+merge bitmpas:
+[
+ {
+ "type": "block-dirty-bitmap-add",
+ "data": {
+ "node": "libvirt-2-format",
+ "name": "current",
+ "persistent": true,
+ "disabled": false,
+ "granularity": 65536
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-merge",
+ "data": {
+ "node": "libvirt-2-format",
+ "target": "current",
+ "bitmaps": [
+ {
+ "node": "libvirt-1-format",
+ "name": "current"
+ }
+ ]
+ }
+ }
+]
diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-3
b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-3
new file mode 100644
index 0000000000..6eb14f927a
--- /dev/null
+++ b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-3
@@ -0,0 +1,66 @@
+pre job bitmap disable:
+[
+ {
+ "type": "block-dirty-bitmap-disable",
+ "data": {
+ "node": "libvirt-3-format",
+ "name": "b"
+ }
+ }
+]
+merge bitmpas:
+[
+ {
+ "type": "block-dirty-bitmap-enable",
+ "data": {
+ "node": "libvirt-3-format",
+ "name": "b"
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-add",
+ "data": {
+ "node": "libvirt-3-format",
+ "name": "current",
+ "persistent": true,
+ "disabled": false,
+ "granularity": 65536
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-merge",
+ "data": {
+ "node": "libvirt-3-format",
+ "target": "current",
+ "bitmaps": [
+ {
+ "node": "libvirt-1-format",
+ "name": "current"
+ }
+ ]
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-add",
+ "data": {
+ "node": "libvirt-3-format",
+ "name": "c",
+ "persistent": true,
+ "disabled": true,
+ "granularity": 65536
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-merge",
+ "data": {
+ "node": "libvirt-3-format",
+ "target": "c",
+ "bitmaps": [
+ {
+ "node": "libvirt-2-format",
+ "name": "c"
+ }
+ ]
+ }
+ }
+]
diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-4
b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-4
new file mode 100644
index 0000000000..fbf2bc0554
--- /dev/null
+++ b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-4
@@ -0,0 +1,76 @@
+pre job bitmap disable:
+[
+
+]
+merge bitmpas:
+[
+ {
+ "type": "block-dirty-bitmap-add",
+ "data": {
+ "node": "libvirt-4-format",
+ "name": "b",
+ "persistent": true,
+ "disabled": false,
+ "granularity": 65536
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-merge",
+ "data": {
+ "node": "libvirt-4-format",
+ "target": "b",
+ "bitmaps": [
+ {
+ "node": "libvirt-3-format",
+ "name": "b"
+ }
+ ]
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-add",
+ "data": {
+ "node": "libvirt-4-format",
+ "name": "current",
+ "persistent": true,
+ "disabled": false,
+ "granularity": 65536
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-merge",
+ "data": {
+ "node": "libvirt-4-format",
+ "target": "current",
+ "bitmaps": [
+ {
+ "node": "libvirt-1-format",
+ "name": "current"
+ }
+ ]
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-add",
+ "data": {
+ "node": "libvirt-4-format",
+ "name": "c",
+ "persistent": true,
+ "disabled": true,
+ "granularity": 65536
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-merge",
+ "data": {
+ "node": "libvirt-4-format",
+ "target": "c",
+ "bitmaps": [
+ {
+ "node": "libvirt-2-format",
+ "name": "c"
+ }
+ ]
+ }
+ }
+]
diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-5
b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-5
new file mode 100644
index 0000000000..477f921050
--- /dev/null
+++ b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-5
@@ -0,0 +1,76 @@
+pre job bitmap disable:
+[
+
+]
+merge bitmpas:
+[
+ {
+ "type": "block-dirty-bitmap-add",
+ "data": {
+ "node": "libvirt-5-format",
+ "name": "b",
+ "persistent": true,
+ "disabled": false,
+ "granularity": 65536
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-merge",
+ "data": {
+ "node": "libvirt-5-format",
+ "target": "b",
+ "bitmaps": [
+ {
+ "node": "libvirt-3-format",
+ "name": "b"
+ }
+ ]
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-add",
+ "data": {
+ "node": "libvirt-5-format",
+ "name": "current",
+ "persistent": true,
+ "disabled": false,
+ "granularity": 65536
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-merge",
+ "data": {
+ "node": "libvirt-5-format",
+ "target": "current",
+ "bitmaps": [
+ {
+ "node": "libvirt-1-format",
+ "name": "current"
+ }
+ ]
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-add",
+ "data": {
+ "node": "libvirt-5-format",
+ "name": "c",
+ "persistent": true,
+ "disabled": true,
+ "granularity": 65536
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-merge",
+ "data": {
+ "node": "libvirt-5-format",
+ "target": "c",
+ "bitmaps": [
+ {
+ "node": "libvirt-2-format",
+ "name": "c"
+ }
+ ]
+ }
+ }
+]
diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-2-3
b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-2-3
new file mode 100644
index 0000000000..d468e2b9d8
--- /dev/null
+++ b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-2-3
@@ -0,0 +1,43 @@
+pre job bitmap disable:
+[
+ {
+ "type": "block-dirty-bitmap-disable",
+ "data": {
+ "node": "libvirt-3-format",
+ "name": "b"
+ }
+ }
+]
+merge bitmpas:
+[
+ {
+ "type": "block-dirty-bitmap-enable",
+ "data": {
+ "node": "libvirt-3-format",
+ "name": "b"
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-add",
+ "data": {
+ "node": "libvirt-3-format",
+ "name": "c",
+ "persistent": true,
+ "disabled": true,
+ "granularity": 65536
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-merge",
+ "data": {
+ "node": "libvirt-3-format",
+ "target": "c",
+ "bitmaps": [
+ {
+ "node": "libvirt-2-format",
+ "name": "c"
+ }
+ ]
+ }
+ }
+]
diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-2-4
b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-2-4
new file mode 100644
index 0000000000..d5bce940d9
--- /dev/null
+++ b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-2-4
@@ -0,0 +1,53 @@
+pre job bitmap disable:
+[
+
+]
+merge bitmpas:
+[
+ {
+ "type": "block-dirty-bitmap-add",
+ "data": {
+ "node": "libvirt-4-format",
+ "name": "b",
+ "persistent": true,
+ "disabled": false,
+ "granularity": 65536
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-merge",
+ "data": {
+ "node": "libvirt-4-format",
+ "target": "b",
+ "bitmaps": [
+ {
+ "node": "libvirt-3-format",
+ "name": "b"
+ }
+ ]
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-add",
+ "data": {
+ "node": "libvirt-4-format",
+ "name": "c",
+ "persistent": true,
+ "disabled": true,
+ "granularity": 65536
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-merge",
+ "data": {
+ "node": "libvirt-4-format",
+ "target": "c",
+ "bitmaps": [
+ {
+ "node": "libvirt-2-format",
+ "name": "c"
+ }
+ ]
+ }
+ }
+]
diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-2-5
b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-2-5
new file mode 100644
index 0000000000..2da87865a1
--- /dev/null
+++ b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-2-5
@@ -0,0 +1,53 @@
+pre job bitmap disable:
+[
+
+]
+merge bitmpas:
+[
+ {
+ "type": "block-dirty-bitmap-add",
+ "data": {
+ "node": "libvirt-5-format",
+ "name": "b",
+ "persistent": true,
+ "disabled": false,
+ "granularity": 65536
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-merge",
+ "data": {
+ "node": "libvirt-5-format",
+ "target": "b",
+ "bitmaps": [
+ {
+ "node": "libvirt-3-format",
+ "name": "b"
+ }
+ ]
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-add",
+ "data": {
+ "node": "libvirt-5-format",
+ "name": "c",
+ "persistent": true,
+ "disabled": true,
+ "granularity": 65536
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-merge",
+ "data": {
+ "node": "libvirt-5-format",
+ "target": "c",
+ "bitmaps": [
+ {
+ "node": "libvirt-2-format",
+ "name": "c"
+ }
+ ]
+ }
+ }
+]
diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-3-4
b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-3-4
new file mode 100644
index 0000000000..feb54e1af4
--- /dev/null
+++ b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-3-4
@@ -0,0 +1,30 @@
+pre job bitmap disable:
+[
+
+]
+merge bitmpas:
+[
+ {
+ "type": "block-dirty-bitmap-add",
+ "data": {
+ "node": "libvirt-4-format",
+ "name": "b",
+ "persistent": true,
+ "disabled": false,
+ "granularity": 65536
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-merge",
+ "data": {
+ "node": "libvirt-4-format",
+ "target": "b",
+ "bitmaps": [
+ {
+ "node": "libvirt-3-format",
+ "name": "b"
+ }
+ ]
+ }
+ }
+]
diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-3-5
b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-3-5
new file mode 100644
index 0000000000..ced2a3751c
--- /dev/null
+++ b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-3-5
@@ -0,0 +1,30 @@
+pre job bitmap disable:
+[
+
+]
+merge bitmpas:
+[
+ {
+ "type": "block-dirty-bitmap-add",
+ "data": {
+ "node": "libvirt-5-format",
+ "name": "b",
+ "persistent": true,
+ "disabled": false,
+ "granularity": 65536
+ }
+ },
+ {
+ "type": "block-dirty-bitmap-merge",
+ "data": {
+ "node": "libvirt-5-format",
+ "target": "b",
+ "bitmaps": [
+ {
+ "node": "libvirt-3-format",
+ "name": "b"
+ }
+ ]
+ }
+ }
+]
diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-4-5
b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-4-5
new file mode 100644
index 0000000000..b1f10a8a24
--- /dev/null
+++ b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-4-5
@@ -0,0 +1,20 @@
+pre job bitmap disable:
+[
+ {
+ "type": "block-dirty-bitmap-disable",
+ "data": {
+ "node": "libvirt-5-format",
+ "name": "a"
+ }
+ }
+]
+merge bitmpas:
+[
+ {
+ "type": "block-dirty-bitmap-enable",
+ "data": {
+ "node": "libvirt-5-format",
+ "name": "a"
+ }
+ }
+]
--
2.24.1
11:26 a.m.
New subject: [PATCH 09/13] qemuBlockJobDiskNewCommit: Propagate 'disabledBitmapsBase'
Add an argument to qemuBlockJobDiskNewCommit to propagate the list of
disabled bitmaps into the job data structure.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_blockjob.c | 2 ++
src/qemu/qemu_blockjob.h | 1 +
src/qemu/qemu_driver.c | 2 +-
3 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c
index 71df0d1ab2..44c0dc2c16 100644
--- a/src/qemu/qemu_blockjob.c
+++ b/src/qemu/qemu_blockjob.c
@@ -285,6 +285,7 @@ qemuBlockJobDiskNewCommit(virDomainObjPtr vm,
virStorageSourcePtr topparent,
virStorageSourcePtr top,
virStorageSourcePtr base,
+ char ***disabledBitmapsBase,
bool delete_imgs,
unsigned int jobflags)
{
@@ -310,6 +311,7 @@ qemuBlockJobDiskNewCommit(virDomainObjPtr vm,
job->data.commit.top = top;
job->data.commit.base = base;
job->data.commit.deleteCommittedImages = delete_imgs;
+ job->data.commit.disabledBitmapsBase = g_steal_pointer(disabledBitmapsBase);
job->jobflags = jobflags;
if (qemuBlockJobRegister(job, vm, disk, true) < 0)
diff --git a/src/qemu/qemu_blockjob.h b/src/qemu/qemu_blockjob.h
index e2e28ca4d3..9264c70217 100644
--- a/src/qemu/qemu_blockjob.h
+++ b/src/qemu/qemu_blockjob.h
@@ -187,6 +187,7 @@ qemuBlockJobDiskNewCommit(virDomainObjPtr vm,
virStorageSourcePtr topparent,
virStorageSourcePtr top,
virStorageSourcePtr base,
+ char ***disabledBitmapsBase,
bool delete_imgs,
unsigned int jobflags);
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 79ce518c5b..ef1314835e 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -18544,7 +18544,7 @@ qemuDomainBlockCommit(virDomainPtr dom,
goto endjob;
if (!(job = qemuBlockJobDiskNewCommit(vm, disk, top_parent, topSource,
- baseSource,
+ baseSource, NULL,
flags & VIR_DOMAIN_BLOCK_COMMIT_DELETE,
flags)))
goto endjob;
--
2.24.1
11:26 a.m.
New subject: [PATCH 10/13] qemuDomainBlockCommit: Handle bitmaps on start of commit
On start of the commit job, we need to disable any active bitmap in the
base. Use qemuBlockBitmapsHandleCommitStart to calculate which and call
the appropriate QMP APIs. We use blockdev-reopen to make the 'base'
writable to disable the bitmaps.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_driver.c | 44 +++++++++++++++++++++++++++++++++++++++++-
1 file changed, 43 insertions(+), 1 deletion(-)
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index ef1314835e..85612f3281 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -18395,6 +18395,8 @@ qemuDomainBlockCommit(virDomainPtr dom,
const char *nodebase = NULL;
bool persistjob = false;
bool blockdev = false;
+ g_autoptr(virJSONValue) bitmapDisableActions = NULL;
+ VIR_AUTOSTRINGLIST bitmapDisableList = NULL;
virCheckFlags(VIR_DOMAIN_BLOCK_COMMIT_SHALLOW |
VIR_DOMAIN_BLOCK_COMMIT_ACTIVE |
@@ -18543,8 +18545,30 @@ qemuDomainBlockCommit(virDomainPtr dom,
qemuDomainStorageSourceAccessAllow(driver, vm, top_parent, false, false) <
0))
goto endjob;
+ if (blockdev &&
+ virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_INCREMENTAL_BACKUP)) {
+ g_autoptr(virHashTable) blockNamedNodeData = NULL;
+
+ if (!(blockNamedNodeData = qemuBlockGetNamedNodeData(vm, QEMU_ASYNC_JOB_NONE)))
+ goto endjob;
+
+ if (qemuBlockBitmapsHandleCommitStart(topSource, baseSource,
+ blockNamedNodeData,
+ &bitmapDisableActions,
+ &bitmapDisableList) < 0)
+ goto endjob;
+
+ /* if we don't have terminator on 'base' we can't reopen it */
+ if (bitmapDisableActions && !baseSource->backingStore) {
+ virReportError(VIR_ERR_OPERATION_UNSUPPORTED,
+ _("can't handle bitmaps on unterminated backing image
'%s'"),
+ base);
+ goto endjob;
+ }
+ }
+
if (!(job = qemuBlockJobDiskNewCommit(vm, disk, top_parent, topSource,
- baseSource, NULL,
+ baseSource, &bitmapDisableList,
flags & VIR_DOMAIN_BLOCK_COMMIT_DELETE,
flags)))
goto endjob;
@@ -18566,6 +18590,24 @@ qemuDomainBlockCommit(virDomainPtr dom,
if (!backingPath && top_parent &&
!(backingPath = qemuBlockGetBackingStoreString(baseSource)))
goto endjob;
+
+ if (bitmapDisableActions) {
+ int rc;
+
+ if (qemuBlockReopenReadWrite(vm, baseSource, QEMU_ASYNC_JOB_NONE) < 0)
+ goto endjob;
+
+ qemuDomainObjEnterMonitor(driver, vm);
+ rc = qemuMonitorTransaction(priv->mon, &bitmapDisableActions);
+ if (qemuDomainObjExitMonitor(driver, vm) < 0)
+ goto endjob;
+
+ if (qemuBlockReopenReadOnly(vm, baseSource, QEMU_ASYNC_JOB_NONE) < 0)
+ goto endjob;
+
+ if (rc < 0)
+ goto endjob;
+ }
} else {
device = job->name;
}
--
2.24.1
11:26 a.m.
New subject: [PATCH 11/13] qemuDomainBlockPivot: Handle merging of bitmaps when pivoting an active block-commit
Active layer block commit makes the 'base' image the new top image of
the disk after it finishes. This means that all bitmap operations need
to be handled prior to this happening as we'd lose writes otherwise.
The ideal place is to handle it when pivoting to the new image as only
guest-writes would be happening after this point.
Use qemuBlockBitmapsHandleCommitFinish to calculate the merging
transaction.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_driver.c | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 85612f3281..bc3e495064 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -17288,6 +17288,21 @@ qemuDomainBlockPivot(virQEMUDriverPtr driver,
break;
case QEMU_BLOCKJOB_TYPE_ACTIVE_COMMIT:
+ if (blockdev &&
+ virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_INCREMENTAL_BACKUP)) {
+ g_autoptr(virHashTable) blockNamedNodeData = NULL;
+
+ if (!(blockNamedNodeData = qemuBlockGetNamedNodeData(vm,
QEMU_ASYNC_JOB_NONE)))
+ return -1;
+
+ if (qemuBlockBitmapsHandleCommitFinish(job->data.commit.top,
+ job->data.commit.base,
+ blockNamedNodeData,
+ &actions,
+
job->data.commit.disabledBitmapsBase) < 0)
+ return -1;
+ }
+
break;
}
--
2.24.1
11:26 a.m.
New subject: [PATCH 12/13] qemu: blockjob: Handle bitmaps after finish of normal block-commit
Merge the bitmaps into base of the block commit after the job finishes.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_blockjob.c | 50 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 50 insertions(+)
diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c
index 44c0dc2c16..904c4c3f46 100644
--- a/src/qemu/qemu_blockjob.c
+++ b/src/qemu/qemu_blockjob.c
@@ -1049,6 +1049,53 @@ qemuBlockJobDeleteImages(virQEMUDriverPtr driver,
}
}
+
+/**
+ * qemuBlockJobProcessEventCompletedCommitBitmaps:
+ *
+ * Handles the bitmap changes after commit. This function shall return -1 on
+ * monitor failures.
+ */
+static int
+qemuBlockJobProcessEventCompletedCommitBitmaps(virDomainObjPtr vm,
+ qemuBlockJobDataPtr job,
+ qemuDomainAsyncJob asyncJob)
+{
+ qemuDomainObjPrivatePtr priv = vm->privateData;
+ g_autoptr(virHashTable) blockNamedNodeData = NULL;
+ g_autoptr(virJSONValue) actions = NULL;
+
+ if (!(blockNamedNodeData = qemuBlockGetNamedNodeData(vm, asyncJob)))
+ return -1;
+
+ if (qemuBlockBitmapsHandleCommitFinish(job->data.commit.top,
+ job->data.commit.base,
+ blockNamedNodeData,
+ &actions,
+ job->data.commit.disabledBitmapsBase) <
0)
+ return 0;
+
+ if (!actions)
+ return 0;
+
+ if (qemuBlockReopenReadWrite(vm, job->data.commit.base, asyncJob) < 0)
+ return -1;
+
+ if (qemuDomainObjEnterMonitorAsync(priv->driver, vm, asyncJob) < 0)
+ return -1;
+
+ qemuMonitorTransaction(priv->mon, &actions);
+
+ if (qemuDomainObjExitMonitor(priv->driver, vm) < 0)
+ return -1;
+
+ if (qemuBlockReopenReadOnly(vm, job->data.commit.base, asyncJob) < 0)
+ return -1;
+
+ return 0;
+}
+
+
/**
* qemuBlockJobProcessEventCompletedCommit:
* @driver: qemu driver object
@@ -1106,6 +1153,9 @@ qemuBlockJobProcessEventCompletedCommit(virQEMUDriverPtr driver,
if (!n)
return;
+ if (qemuBlockJobProcessEventCompletedCommitBitmaps(vm, job, asyncJob) < 0)
+ return;
+
/* revert access to images */
qemuDomainStorageSourceAccessAllow(driver, vm, job->data.commit.base, true,
false);
if (job->data.commit.topparent != job->disk->src)
--
2.24.1
11:26 a.m.
New subject: [PATCH 13/13] qemu: blockjob: Re-enable bitmaps after failed block-copy
If a block-copy fails we should at least re-enable the bitmaps so that
the operation can be re-tried.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_blockjob.c | 42 ++++++++++++++++++++++++++++++++++++++--
1 file changed, 40 insertions(+), 2 deletions(-)
diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c
index 904c4c3f46..5ac1cd8856 100644
--- a/src/qemu/qemu_blockjob.c
+++ b/src/qemu/qemu_blockjob.c
@@ -1341,6 +1341,40 @@ qemuBlockJobProcessEventFailedActiveCommit(virQEMUDriverPtr
driver,
}
+static void
+qemuBlockJobProcessEventFailedCommitCommon(virDomainObjPtr vm,
+ qemuBlockJobDataPtr job,
+ qemuDomainAsyncJob asyncJob)
+{
+ qemuDomainObjPrivatePtr priv = vm->privateData;
+ g_autoptr(virJSONValue) actions = virJSONValueNewArray();
+ char **disabledBitmaps = job->data.commit.disabledBitmapsBase;
+
+ if (!disabledBitmaps || !*disabledBitmaps)
+ return;
+
+ for (; *disabledBitmaps; disabledBitmaps++) {
+ qemuMonitorTransactionBitmapEnable(actions,
+ job->data.commit.base->nodeformat,
+ *disabledBitmaps);
+ }
+
+ if (qemuBlockReopenReadWrite(vm, job->data.commit.base, asyncJob) < 0)
+ return;
+
+ if (qemuDomainObjEnterMonitorAsync(priv->driver, vm, asyncJob) < 0)
+ return;
+
+ qemuMonitorTransaction(priv->mon, &actions);
+
+ if (qemuDomainObjExitMonitor(priv->driver, vm) < 0)
+ return;
+
+ if (qemuBlockReopenReadOnly(vm, job->data.commit.base, asyncJob) < 0)
+ return;
+}
+
+
static void
qemuBlockJobProcessEventConcludedCreate(virQEMUDriverPtr driver,
virDomainObjPtr vm,
@@ -1448,13 +1482,17 @@ qemuBlockJobEventProcessConcludedTransition(qemuBlockJobDataPtr
job,
case QEMU_BLOCKJOB_TYPE_COMMIT:
if (success)
qemuBlockJobProcessEventCompletedCommit(driver, vm, job, asyncJob);
+ else
+ qemuBlockJobProcessEventFailedCommitCommon(vm, job, asyncJob);
break;
case QEMU_BLOCKJOB_TYPE_ACTIVE_COMMIT:
- if (success)
+ if (success) {
qemuBlockJobProcessEventCompletedActiveCommit(driver, vm, job, asyncJob);
- else
+ } else {
qemuBlockJobProcessEventFailedActiveCommit(driver, vm, job);
+ qemuBlockJobProcessEventFailedCommitCommon(vm, job, asyncJob);
+ }
break;
case QEMU_BLOCKJOB_TYPE_CREATE:
--
2.24.1
1748
days inactive
1754
days old
18 comments
2 participants
participants (2)
-
Pavel Mores -
Peter Krempa