From: Peter Krempa <pkrempa@redhat.com>
Date: Wed, 28 Aug 2019 07:31:28 +0000 (+0200)
Subject: qemu: snapshot: Save status and config XMLs only on success
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=93a0f72ef4f8fc380558e5ec786bed01b994fe34;p=libvirt.git

qemu: snapshot: Save status and config XMLs only on success

We changed to always saving the status and config XMLs to simplify
code. After a few more refactors it's now possible to move it to the
appropriate place and save the XMLs only on success again.

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 c4b32a73a5..60f050e8b6 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -15557,17 +15557,17 @@ qemuDomainSnapshotCreateDiskActive(virQEMUDriverPtr driver,
     if (rc < 0)
         goto cleanup;
 
+    if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps) < 0 ||
+        (vm->newDef && virDomainSaveConfig(cfg->configDir, driver->caps,
+                                           vm->newDef) < 0))
+        goto cleanup;
+
     ret = 0;
 
  cleanup:
     if (ret < 0)
         virErrorPreserveLast(&orig_err);
 
-    if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps) < 0 ||
-        (vm->newDef && virDomainSaveConfig(cfg->configDir, driver->caps,
-                                           vm->newDef) < 0))
-        ret = -1;
-
     qemuDomainSnapshotDiskDataCleanup(diskdata, ndiskdata, driver, vm);
     virErrorRestore(&orig_err);