From: Peter Krempa <pkrempa@redhat.com>
Date: Wed, 5 Jun 2019 11:59:32 +0000 (+0200)
Subject: qemu: snapshot: Always save status and config after qemuDomainSnapshotCreateDiskActive
X-Git-Tag: v5.5.0-rc1~318
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=999e450c2611e9c61c94b82430a9706c8bf2f2a7;p=thirdparty%2Flibvirt.git

qemu: snapshot: Always save status and config after qemuDomainSnapshotCreateDiskActive

The error path is unlikely thus saving the status XML even if we didn't
modify it does not add much burden.

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

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 97f7ad16bf..40ba50c8c0 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -15327,12 +15327,10 @@ qemuDomainSnapshotCreateDiskActive(virQEMUDriverPtr driver,
         }
     }
 
-    if (ret == 0 || !do_transaction) {
-        if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps) < 0 ||
-            (persist && virDomainSaveConfig(cfg->configDir, driver->caps,
-                                            vm->newDef) < 0))
-            ret = -1;
-    }
+    if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps) < 0 ||
+        (persist && virDomainSaveConfig(cfg->configDir, driver->caps,
+                                        vm->newDef) < 0))
+        ret = -1;
 
  cleanup:
     qemuDomainSnapshotDiskDataFree(diskdata, snapdef->ndisks, driver, vm);