]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
libxl: remove a now-unnecessary ret variable and cleanup: label.
authorLaine Stump <laine@redhat.com>
Fri, 8 Jan 2021 15:28:46 +0000 (10:28 -0500)
committerLaine Stump <laine@redhat.com>
Fri, 8 Jan 2021 16:35:04 +0000 (11:35 -0500)
Signed-off-by: Laine Stump <laine@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
src/libxl/libxl_domain.c

index c046fcb3f71790b150a335c4279ce587db09a4a2..afa21bf02ef47417ea97f00348e205eb8a451066 100644 (file)
@@ -1051,7 +1051,6 @@ libxlNetworkPrepareDevices(virDomainDefPtr def)
 {
     size_t i;
     g_autoptr(virConnect) conn = NULL;
-    int ret = -1;
 
     for (i = 0; i < def->nnets; i++) {
         virDomainNetDefPtr net = def->nets[i];
@@ -1063,9 +1062,9 @@ libxlNetworkPrepareDevices(virDomainDefPtr def)
          */
         if (net->type == VIR_DOMAIN_NET_TYPE_NETWORK) {
             if (!conn && !(conn = virGetConnectNetwork()))
-                goto cleanup;
+                return -1;
             if (virDomainNetAllocateActualDevice(conn, def, net) < 0)
-                goto cleanup;
+                return -1;
         }
 
         /* final validation now that actual type is known */
@@ -1090,13 +1089,11 @@ libxlNetworkPrepareDevices(virDomainDefPtr def)
                 pcisrc->backend = VIR_DOMAIN_HOSTDEV_PCI_BACKEND_XEN;
 
             if (virDomainHostdevInsert(def, hostdev) < 0)
-                goto cleanup;
+                return -1;
         }
     }
 
-    ret = 0;
- cleanup:
-    return ret;
+    return 0;
 }
 
 static void