]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemu: snapshot: Remove unused cleanup section in qemuDomainSnapshotCreateSingleDiskActive
authorPeter Krempa <pkrempa@redhat.com>
Wed, 5 Jun 2019 11:54:00 +0000 (13:54 +0200)
committerPeter Krempa <pkrempa@redhat.com>
Mon, 10 Jun 2019 12:01:08 +0000 (14:01 +0200)
After getting rid of pre-transaction qemu support the cleanup section is
unused.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
src/qemu/qemu_driver.c

index fad96053db316048d30f334596f531a19e6e52e7..97f7ad16bfa46049b3b07fa256673714f953823f 100644 (file)
@@ -15197,31 +15197,26 @@ qemuDomainSnapshotCreateSingleDiskActive(virQEMUDriverPtr driver,
                                          virJSONValuePtr actions,
                                          bool reuse)
 {
-    int ret = -1;
-
     if (qemuBlockSnapshotAddLegacy(actions, dd->disk, dd->src, reuse) < 0)
-        goto cleanup;
+        return -1;
 
     /* pre-create the image file so that we can label it before handing it to qemu */
     if (!reuse && dd->src->type != VIR_STORAGE_TYPE_BLOCK) {
         if (virStorageFileCreate(dd->src) < 0) {
             virReportSystemError(errno, _("failed to create image file '%s'"),
                                  NULLSTR(dd->src->path));
-            goto cleanup;
+            return -1;
         }
         dd->created = true;
     }
 
     /* set correct security, cgroup and locking options on the new image */
     if (qemuDomainStorageSourceAccessAllow(driver, vm, dd->src, false, true) < 0)
-        goto cleanup;
+        return -1;
 
     dd->prepared = true;
 
-    ret = 0;
-
- cleanup:
-    return ret;
+    return 0;
 }