From: Peter Krempa <pkrempa@redhat.com>
Date: Mon, 3 Jun 2019 15:46:33 +0000 (+0200)
Subject: qemu: Use virErrorPreserveLast in qemuDomainSnapshotCreateDiskActive
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=77f71c45ad9826d5e41a4a795a5531c576d183cc;p=libvirt.git

qemu: Use virErrorPreserveLast in qemuDomainSnapshotCreateDiskActive

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 8093b27656..65b54b7511 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -15301,7 +15301,7 @@ qemuDomainSnapshotCreateDiskActive(virQEMUDriverPtr driver,
 
  error:
     if (ret < 0) {
-        orig_err = virSaveLastError();
+        virErrorPreserveLast(&orig_err);
         for (i = 0; i < snapdef->ndisks; i++) {
             if (!diskdata[i].src)
                 continue;
@@ -15341,11 +15341,7 @@ qemuDomainSnapshotCreateDiskActive(virQEMUDriverPtr driver,
 
  cleanup:
     qemuDomainSnapshotDiskDataFree(diskdata, snapdef->ndisks, driver, vm);
-
-    if (orig_err) {
-        virSetError(orig_err);
-        virFreeError(orig_err);
-    }
+    virErrorRestore(&orig_err);
 
     return ret;
 }