qemu: block: Remove 'active-write' bitmap even if there are no bitmaps to merge

The 'libvirt-tmp-activewrite' bitmap is added during the 'pivot'
operation of block copy and active layer block commit operations
regardless of whether there are any bitmaps to merge, but was not
removed unless a bitmap was merged. This meant that subsequent attempts
to merge into the same image would fail.

Fix it by checking whether the 'libvirt-tmp-activewrite' would be used
by the code and don't skip the code which would delete it.

This is a regression introduced when we switched to the new code for
block commit in <20a7abc2d2d> and for block copy in <7bfff40fdfe5>. The
actual bug originates from <4fa8654ece>.

https://bugzilla.redhat.com/show_bug.cgi?id=1857735

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>

diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
index d4ff37ced64884888c8c31173091b8f365d569fa..26c1b42428a7711410f102f98ce31e2db39d4175 100644 (file)
--- a/src/qemu/qemu_block.c
+++ b/src/qemu/qemu_block.c
@@ -2981,7 +2981,7 @@ qemuBlockGetBitmapMergeActions(virStorageSourcePtr topsrc,
 
     if (!(bitmaps = qemuBlockGetBitmapMergeActionsGetBitmaps(topsrc, bitmapname,
                                                              blockNamedNodeData)))
-        return 0;
+        goto done;
 
     for (next = bitmaps; next; next = next->next) {
         const char *curbitmap = next->data;
@@ -3038,6 +3038,7 @@ qemuBlockGetBitmapMergeActions(virStorageSourcePtr topsrc,
             return -1;
     }
 
+ done:
     if (writebitmapsrc &&
         qemuMonitorTransactionBitmapRemove(act, writebitmapsrc->nodeformat,
                                            "libvirt-tmp-activewrite") < 0)

diff --git a/tests/qemublocktestdata/bitmapblockcommit/empty b/tests/qemublocktestdata/bitmapblockcommit/empty
index 9260011852d0e115ec70bbb024d6ed3f7d94409b..eddef0ddcd6956d8c1e6a2a8b6778aeaf725446d 100644 (file)
--- a/tests/qemublocktestdata/bitmapblockcommit/empty
+++ b/tests/qemublocktestdata/bitmapblockcommit/empty
@@ -1 +1,10 @@
 merge bitmpas:
+[
+  {
+    "type": "block-dirty-bitmap-remove",
+    "data": {
+      "node": "libvirt-2-format",
+      "name": "libvirt-tmp-activewrite"
+    }
+  }
+]

diff --git a/tests/qemublocktestdata/bitmapblockcopy/empty-deep-out.json b/tests/qemublocktestdata/bitmapblockcopy/empty-deep-out.json
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..99f2589ed4689255b37efcaef10961c6fe71ba6c 100644 (file)
--- a/tests/qemublocktestdata/bitmapblockcopy/empty-deep-out.json
+++ b/tests/qemublocktestdata/bitmapblockcopy/empty-deep-out.json
@@ -0,0 +1,9 @@
+[
+  {
+    "type": "block-dirty-bitmap-remove",
+    "data": {
+      "node": "mirror-format-node",
+      "name": "libvirt-tmp-activewrite"
+    }
+  }
+]

diff --git a/tests/qemublocktestdata/bitmapblockcopy/empty-shallow-out.json b/tests/qemublocktestdata/bitmapblockcopy/empty-shallow-out.json
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..99f2589ed4689255b37efcaef10961c6fe71ba6c 100644 (file)
--- a/tests/qemublocktestdata/bitmapblockcopy/empty-shallow-out.json
+++ b/tests/qemublocktestdata/bitmapblockcopy/empty-shallow-out.json
@@ -0,0 +1,9 @@
+[
+  {
+    "type": "block-dirty-bitmap-remove",
+    "data": {
+      "node": "mirror-format-node",
+      "name": "libvirt-tmp-activewrite"
+    }
+  }
+]