qemu: Always revert internal snapshots via QMP rather than '-loadvm'

As all supported qemu versions now support the QMP internal snapshot
commands (QEMU_CAPS_SNAPSHOT_INTERNAL_QMP is always present) we can
remove the code for loading snapshots during startup via '-loadvm'.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 86eb52f197405b8fe3e4a7b5803c856b3784836f..e6d308534f87bb5c2f40158d24b802b70cdc98a2 100644 (file)
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -10685,12 +10685,6 @@ qemuBuildCommandLine(virDomainObj *vm,
     if (qemuBuildSecCommandLine(vm, cmd, def->sec) < 0)
         return NULL;
 
-    /* Internal snapshot reversion happens via QMP command after startup if
-     * supported */
-    if (snapshot &&
-        !virQEMUCapsGet(qemuCaps, QEMU_CAPS_SNAPSHOT_INTERNAL_QMP))
-        virCommandAddArgList(cmd, "-loadvm", snapshot->def->name, NULL);
-
     if (def->namespaceData) {
         qemuDomainXmlNsDef *qemuxmlns;
         GStrv n;

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 842f55943924578e2ddf7864826fcb87e2237a1c..015a98d035dbff12d04f73248b8b0f4806c41e59 100644 (file)
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -8239,8 +8239,7 @@ qemuProcessLaunch(virConnectPtr conn,
 
     qemuDomainVcpuPersistOrder(vm->def);
 
-    if (snapshot &&
-        virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_SNAPSHOT_INTERNAL_QMP)) {
+    if (snapshot) {
         VIR_DEBUG("reverting internal snapshot via QMP");
         if (qemuSnapshotInternalRevert(vm, snapshot, asyncJob) < 0)
             goto cleanup;