52 lines
2.1 KiB
Diff
52 lines
2.1 KiB
Diff
|
From cbf2d9410c289757cc0607ece2aafd5ea8e6c219 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Peter Krempa <pkrempa@redhat.com>
|
||
|
|
Date: Tue, 8 Dec 2020 16:16:08 +0100
|
||
|
|
Subject: [PATCH 023/108] qemuDomainCheckpointLoad: Don't align disks when
|
||
|
|
restoring config from disk
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
The alignment step is not really necessary once we've done it already
|
||
|
|
since we fully populate the definition. In case of checkpoints it was a
|
||
|
|
relic necessary for populating the 'idx' to match checkpoint disk to
|
||
|
|
definition disk, but that was already removed.
|
||
|
|
|
||
|
|
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
|
||
|
|
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
||
|
|
(cherry picked from commit f40a72a32e47c248d5002a765913fa8f547960de)
|
||
|
|
---
|
||
|
|
src/qemu/qemu_driver.c | 15 ++++-----------
|
||
|
|
1 file changed, 4 insertions(+), 11 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
|
||
|
|
index 196b301751..7be84c88b2 100644
|
||
|
|
--- a/src/qemu/qemu_driver.c
|
||
|
|
+++ b/src/qemu/qemu_driver.c
|
||
|
|
@@ -539,18 +539,11 @@ qemuDomainCheckpointLoad(virDomainObjPtr vm,
|
||
|
|
continue;
|
||
|
|
}
|
||
|
|
|
||
|
|
- def = virDomainCheckpointDefParseString(xmlStr,
|
||
|
|
- qemu_driver->xmlopt,
|
||
|
|
- priv->qemuCaps,
|
||
|
|
- flags);
|
||
|
|
- if (!def || virDomainCheckpointAlignDisks(def) < 0) {
|
||
|
|
- /* Nothing we can do here, skip this one */
|
||
|
|
- virReportError(VIR_ERR_INTERNAL_ERROR,
|
||
|
|
- _("Failed to parse checkpoint XML from file '%s'"),
|
||
|
|
- fullpath);
|
||
|
|
- virObjectUnref(def);
|
||
|
|
+ if (!(def = virDomainCheckpointDefParseString(xmlStr,
|
||
|
|
+ qemu_driver->xmlopt,
|
||
|
|
+ priv->qemuCaps,
|
||
|
|
+ flags)))
|
||
|
|
continue;
|
||
|
|
- }
|
||
|
|
|
||
|
|
chk = virDomainCheckpointAssignDef(vm->checkpoints, def);
|
||
|
|
if (chk == NULL)
|
||
|
|
--
|
||
|
|
2.33.0
|
||
|
|
|