[PATCH 3/3] virCapabilitiesHostNUMAInitReal: Drop cleanup label

Michal Privoznik mprivozn at redhat.com
Wed May 12 13:23:31 UTC 2021


This label is no longer needed after previous cleanup.

Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 src/conf/capabilities.c | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c
index 4c50f5d52a..e6caac9eff 100644
--- a/src/conf/capabilities.c
+++ b/src/conf/capabilities.c
@@ -1609,11 +1609,10 @@ static int
 virCapabilitiesHostNUMAInitReal(virCapsHostNUMA *caps)
 {
     int n;
-    int ret = -1;
     int max_node;
 
     if ((max_node = virNumaGetMaxNode()) < 0)
-        goto cleanup;
+        return -1;
 
     for (n = 0; n <= max_node; n++) {
         g_autoptr(virBitmap) cpumap = NULL;
@@ -1630,7 +1629,7 @@ virCapabilitiesHostNUMAInitReal(virCapsHostNUMA *caps)
             if (ncpus == -2)
                 continue;
 
-            goto cleanup;
+            return -1;
         }
 
         cpus = virCapsHostNUMACellCPUNew(ncpus);
@@ -1640,17 +1639,17 @@ virCapabilitiesHostNUMAInitReal(virCapsHostNUMA *caps)
                 virCapsHostNUMACellCPU cpu = { 0 };
 
                 if (virCapabilitiesFillCPUInfo(i, &cpu) < 0)
-                    goto cleanup;
+                    return -1;
 
                 g_array_append_val(cpus, cpu);
             }
         }
 
         if (virCapabilitiesGetNUMASiblingInfo(n, &siblings, &nsiblings) < 0)
-            goto cleanup;
+            return -1;
 
         if (virCapabilitiesGetNUMAPagesInfo(n, &pageinfo, &npageinfo) < 0)
-            goto cleanup;
+            return -1;
 
         /* Detect the amount of memory in the numa cell in KiB */
         virNumaGetNodeMemory(n, &memory, NULL);
@@ -1662,10 +1661,7 @@ virCapabilitiesHostNUMAInitReal(virCapsHostNUMA *caps)
                                        npageinfo, &pageinfo);
     }
 
-    ret = 0;
-
- cleanup:
-    return ret;
+    return 0;
 }
 
 
-- 
2.26.3




More information about the libvir-list mailing list