[libvirt PATCH 05/14] qemu_snapshot: revert: remove cleanup label

Pavel Hrdina phrdina at redhat.com
Thu Dec 2 13:33:12 UTC 2021


Now the cleanup label is not necessary so we can drop it.

Signed-off-by: Pavel Hrdina <phrdina at redhat.com>
---
 src/qemu/qemu_snapshot.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c
index 8191733a6d..beeb012431 100644
--- a/src/qemu/qemu_snapshot.c
+++ b/src/qemu/qemu_snapshot.c
@@ -1967,13 +1967,13 @@ qemuSnapshotRevert(virDomainObj *vm,
     if (qemuDomainHasBlockjob(vm, false)) {
         virReportError(VIR_ERR_OPERATION_INVALID, "%s",
                        _("domain has active block job"));
-        goto cleanup;
+        return -1;
     }
 
     if (qemuProcessBeginJob(driver, vm,
                             VIR_DOMAIN_JOB_OPERATION_SNAPSHOT_REVERT,
                             flags) < 0)
-        goto cleanup;
+        return -1;
 
     if (!(snap = qemuSnapObjFromSnapshot(vm, snapshot)))
         goto endjob;
@@ -2210,7 +2210,6 @@ qemuSnapshotRevert(virDomainObj *vm,
  endjob:
     qemuProcessEndJob(driver, vm);
 
- cleanup:
     if (ret == 0) {
         qemuSnapshotSetCurrent(vm, snap);
         if (qemuDomainSnapshotWriteMetadata(vm, snap,
-- 
2.31.1




More information about the libvir-list mailing list