From f40a72a32e47c248d5002a765913fa8f547960de Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Tue, 8 Dec 2020 16:16:08 +0100 Subject: [PATCH] qemuDomainCheckpointLoad: Don't align disks when restoring config from disk MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 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 Reviewed-by: Ján Tomko --- 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.47.2