From: Peter Krempa <pkrempa@redhat.com>
Date: Wed, 5 Jun 2019 13:33:53 +0000 (+0200)
Subject: qemu: snapshot: Unify 'cleanup' and 'error' in qemuDomainSnapshotCreateDiskActive
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=0325d42668c22adb7e6f62d00665211719d6750c;p=libvirt.git

qemu: snapshot: Unify 'cleanup' and 'error' in qemuDomainSnapshotCreateDiskActive

All cases taking the 'cleanup' path can take the original 'error' path.

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 c1f0ad0207..0b4cc49f9c 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -15267,7 +15267,7 @@ qemuDomainSnapshotCreateDiskActive(virQEMUDriverPtr driver,
         if (qemuDomainSnapshotCreateSingleDiskActive(driver, vm,
                                                      &diskdata[i],
                                                      actions, reuse) < 0)
-            goto error;
+            goto cleanup;
 
         do_transaction = true;
     }
@@ -15291,12 +15291,12 @@ qemuDomainSnapshotCreateDiskActive(virQEMUDriverPtr driver,
         }
 
         if (rc < 0)
-            goto error;
+            goto cleanup;
     }
 
     ret = 0;
 
- error:
+ cleanup:
     if (ret < 0) {
         virErrorPreserveLast(&orig_err);
     } else {
@@ -15320,7 +15320,6 @@ qemuDomainSnapshotCreateDiskActive(virQEMUDriverPtr driver,
                                            vm->newDef) < 0))
         ret = -1;
 
- cleanup:
     qemuDomainSnapshotDiskDataCleanup(diskdata, ndiskdata, driver, vm);
     virErrorRestore(&orig_err);