43 lines
1.5 KiB
Diff
43 lines
1.5 KiB
Diff
|
From 0084cc867b6de11a1b5ac1207ada57a3cc43acaf Mon Sep 17 00:00:00 2001
|
||
|
|
Message-Id: <0084cc867b6de11a1b5ac1207ada57a3cc43acaf@dist-git>
|
||
|
|
From: Peter Krempa <pkrempa@redhat.com>
|
||
|
|
Date: Tue, 21 Jul 2020 13:56:25 +0200
|
||
|
|
Subject: [PATCH] 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>
|
||
|
|
(cherry picked from commit 66dc4992fa8a51c4e774d32bcf75f26b1365e998)
|
||
|
|
|
||
|
|
rhel-8.3: https://bugzilla.redhat.com/show_bug.cgi?id=1857779
|
||
|
|
rhel-av-8.2.1: not cloned yet
|
||
|
|
Message-Id: <9cec292732836005d59b50a0701acb804ed1dda5.1595332476.git.pkrempa@redhat.com>
|
||
|
|
|
||
|
|
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
|
||
|
|
---
|
||
|
|
src/qemu/qemu_driver.c | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
|
||
|
|
index 454d7b1c16..b5df0c63d4 100644
|
||
|
|
--- a/src/qemu/qemu_driver.c
|
||
|
|
+++ b/src/qemu/qemu_driver.c
|
||
|
|
@@ -17659,7 +17659,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);
|
||
|
|
--
|
||
|
|
2.27.0
|
||
|
|
|