From: Peter Krempa <pkrempa@redhat.com>
Date: Wed, 28 Aug 2019 07:33:27 +0000 (+0200)
Subject: qemu: snapshot: Move error preservation to qemuDomainSnapshotDiskDataCleanup
X-Git-Tag: v5.8.0-rc1~285
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e1b61f2cd58f1f267bc3d1249ad38002b325d4a5;p=thirdparty%2Flibvirt.git

qemu: snapshot: Move error preservation to qemuDomainSnapshotDiskDataCleanup

Make qemuDomainSnapshotDiskDataCleanup cleanup section friendly by
moving the error preservation code inside it.

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 60f050e8b6..91f908f119 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -15271,11 +15271,14 @@ qemuDomainSnapshotDiskDataCleanup(qemuDomainSnapshotDiskDataPtr data,
                                   virQEMUDriverPtr driver,
                                   virDomainObjPtr vm)
 {
+    virErrorPtr orig_err;
     size_t i;
 
     if (!data)
         return;
 
+    virErrorPreserveLast(&orig_err);
+
     for (i = 0; i < ndata; i++) {
         /* on success of the snapshot the 'src' and 'persistsrc' properties will
          * be set to NULL by qemuDomainSnapshotUpdateDiskSources */
@@ -15299,6 +15302,7 @@ qemuDomainSnapshotDiskDataCleanup(qemuDomainSnapshotDiskDataPtr data,
     }
 
     VIR_FREE(data);
+    virErrorRestore(&orig_err);
 }
 
 
@@ -15506,7 +15510,6 @@ qemuDomainSnapshotCreateDiskActive(virQEMUDriverPtr driver,
     bool reuse = (flags & VIR_DOMAIN_SNAPSHOT_CREATE_REUSE_EXT) != 0;
     qemuDomainSnapshotDiskDataPtr diskdata = NULL;
     size_t ndiskdata = 0;
-    virErrorPtr orig_err = NULL;
 
     if (virDomainObjCheckActive(vm) < 0)
         return -1;
@@ -15565,12 +15568,7 @@ qemuDomainSnapshotCreateDiskActive(virQEMUDriverPtr driver,
     ret = 0;
 
  cleanup:
-    if (ret < 0)
-        virErrorPreserveLast(&orig_err);
-
     qemuDomainSnapshotDiskDataCleanup(diskdata, ndiskdata, driver, vm);
-    virErrorRestore(&orig_err);
-
     return ret;
 }