From: Michal Privoznik <mprivozn@redhat.com>
Date: Mon, 20 May 2019 12:18:17 +0000 (+0200)
Subject: Revert "qemu: Do not override config XML in case of snapshot revert"
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=da04eab95346a154aa50c4f158b40333d939dc01;p=libvirt.git

Revert "qemu: Do not override config XML in case of snapshot revert"

This reverts commit dfd70ca1ebc623fcda788c414a472107b37b2bb8.

Pushed by a mistake, sorry. There's still some discussion going
on upstream.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
---

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 06d8cb2471..9c0796b0a4 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -16243,7 +16243,6 @@ qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot,
     qemuDomainObjPrivatePtr priv;
     int rc;
     virDomainDefPtr config = NULL;
-    virDomainDefPtr inactiveConfig = NULL;
     virQEMUDriverConfigPtr cfg = NULL;
     virCapsPtr caps = NULL;
     bool was_stopped = false;
@@ -16458,7 +16457,7 @@ qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot,
                 goto endjob;
             }
             if (config) {
-                virDomainObjAssignDef(vm, config, false, &inactiveConfig);
+                virDomainObjAssignDef(vm, config, false, NULL);
                 virCPUDefFree(priv->origCPU);
                 VIR_STEAL_PTR(priv->origCPU, origCPU);
             }
@@ -16467,7 +16466,7 @@ qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot,
         load:
             was_stopped = true;
             if (config)
-                virDomainObjAssignDef(vm, config, false, &inactiveConfig);
+                virDomainObjAssignDef(vm, config, false, NULL);
 
             /* No cookie means libvirt which saved the domain was too old to
              * mess up the CPU definitions.
@@ -16526,9 +16525,6 @@ qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot,
                                                  detail);
             }
         }
-        if (inactiveConfig)
-            VIR_STEAL_PTR(vm->newDef, inactiveConfig);
-
         break;
 
     case VIR_DOMAIN_SNAPSHOT_SHUTDOWN:
@@ -16556,11 +16552,8 @@ qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot,
             qemuProcessEndJob(driver, vm);
             goto cleanup;
         }
-        if (config) {
-            virDomainObjAssignDef(vm, config, false, &inactiveConfig);
-            if (inactiveConfig)
-                VIR_STEAL_PTR(vm->newDef, inactiveConfig);
-        }
+        if (config)
+            virDomainObjAssignDef(vm, config, false, NULL);
 
         if (flags & (VIR_DOMAIN_SNAPSHOT_REVERT_RUNNING |
                      VIR_DOMAIN_SNAPSHOT_REVERT_PAUSED)) {