[PATCH 1/2] qemuDomainCheckpointLoad: Don't align disks when restoring config from disk
Peter Krempa
pkrempa at redhat.com
Tue Dec 8 15:34:41 UTC 2020
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 at redhat.com>
---
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 7093fc619b..0e5d7423dc 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -512,18 +512,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.29.2
More information about the libvir-list
mailing list