60 lines
2.2 KiB
Diff
60 lines
2.2 KiB
Diff
|
From 3d1a4ab1ce9fce88a759e11532b6891903f86a4a Mon Sep 17 00:00:00 2001
|
||
|
|
Message-Id: <3d1a4ab1ce9fce88a759e11532b6891903f86a4a@dist-git>
|
||
|
|
From: Peter Krempa <pkrempa@redhat.com>
|
||
|
|
Date: Fri, 3 Apr 2020 14:32:57 +0200
|
||
|
|
Subject: [PATCH] qemu: checkpoint: Allow checkpoint redefine for offline VMs
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
Skip the liveness and capability checks when redefining checkpoints as
|
||
|
|
we don't need qemu interactions to update the metadata.
|
||
|
|
|
||
|
|
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
|
||
|
|
Reviewed-by: Eric Blake <eblake@redhat.com>
|
||
|
|
(cherry picked from commit 135a0b3f7142a8d4f591bb24b3ae7d0f36877bf7)
|
||
|
|
|
||
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=1819755
|
||
|
|
|
||
|
|
Message-Id: <f1d392d78abde1ffbe1c0244d442bc0ec6aa18a6.1585916255.git.pkrempa@redhat.com>
|
||
|
|
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
||
|
|
---
|
||
|
|
src/qemu/qemu_checkpoint.c | 20 +++++++++++---------
|
||
|
|
1 file changed, 11 insertions(+), 9 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/qemu/qemu_checkpoint.c b/src/qemu/qemu_checkpoint.c
|
||
|
|
index 16480518fa..34cf122eb3 100644
|
||
|
|
--- a/src/qemu/qemu_checkpoint.c
|
||
|
|
+++ b/src/qemu/qemu_checkpoint.c
|
||
|
|
@@ -649,16 +649,18 @@ qemuCheckpointCreateXML(virDomainPtr domain,
|
||
|
|
update_current = false;
|
||
|
|
}
|
||
|
|
|
||
|
|
- if (!virDomainObjIsActive(vm)) {
|
||
|
|
- virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
|
||
|
|
- _("cannot create checkpoint for inactive domain"));
|
||
|
|
- return NULL;
|
||
|
|
- }
|
||
|
|
+ if (!redefine) {
|
||
|
|
+ if (!virDomainObjIsActive(vm)) {
|
||
|
|
+ virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
|
||
|
|
+ _("cannot create checkpoint for inactive domain"));
|
||
|
|
+ return NULL;
|
||
|
|
+ }
|
||
|
|
|
||
|
|
- if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_INCREMENTAL_BACKUP)) {
|
||
|
|
- virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
|
||
|
|
- _("incremental backup is not supported yet"));
|
||
|
|
- return NULL;
|
||
|
|
+ if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_INCREMENTAL_BACKUP)) {
|
||
|
|
+ virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
|
||
|
|
+ _("incremental backup is not supported yet"));
|
||
|
|
+ return NULL;
|
||
|
|
+ }
|
||
|
|
}
|
||
|
|
|
||
|
|
if (!(def = virDomainCheckpointDefParseString(xmlDesc, driver->xmlopt,
|
||
|
|
--
|
||
|
|
2.26.0
|
||
|
|
|