From: Peter Krempa <pkrempa@redhat.com>
Date: Thu, 16 Jul 2020 13:14:40 +0000 (+0200)
Subject: qemuDomainBlockPivot: Ignore failures of creating active layer bitmap
X-Git-Tag: v6.6.0-rc1~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=66dc4992fa8a51c4e774d32bcf75f26b1365e998;p=thirdparty%2Flibvirt.git

qemuDomainBlockPivot: Ignore failures of creating active layer bitmap

Ignore errors from creating "libvirt-tmp-activewrite" bitmap. This
prevents failures of finishing blockjobs if the bitmap already exists.

Note that if the bitmap exists, the worst case that can happen is that
more bits are marked as dirty in the resulting merge.

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

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 8de4fba1d3..e3927cd431 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -17415,7 +17415,7 @@ qemuDomainBlockPivot(virQEMUDriverPtr driver,
         }
 
         if (bitmapactions && rc == 0)
-            rc = qemuMonitorTransaction(priv->mon, &bitmapactions);
+            ignore_value(qemuMonitorTransaction(priv->mon, &bitmapactions));
 
         if (rc == 0)
             ret = qemuMonitorJobComplete(priv->mon, job->name);