qemuDomainFilterHotplugVcpuEntities: Refactor memory freeing to remove 'cleanup'...

After recent refactors the function can be refactored to remove the
'cleanup' label by using autoptr for the 'map' variable.

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

diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index 82845736b1b917bfd9e263d10fbe67e7400545e9..dbaf3b76664ea24bbaa35fcd56ad59376f4a07d7 100644 (file)
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -6419,13 +6419,10 @@ qemuDomainFilterHotplugVcpuEntities(virDomainDefPtr def,
 {
     qemuDomainVcpuPrivatePtr vcpupriv;
     virDomainVcpuDefPtr vcpu;
-    virBitmapPtr map = NULL;
-    virBitmapPtr ret = NULL;
+    g_autoptr(virBitmap) map = virBitmapNewCopy(vcpus);
     ssize_t next = -1;
     size_t i;
 
-    map = virBitmapNewCopy(vcpus);
-
     /* make sure that all selected vcpus are in the correct state */
     while ((next = virBitmapNextSetBit(map, next)) >= 0) {
         if (!(vcpu = virDomainDefGetVcpu(def, next)))
@@ -6434,13 +6431,13 @@ qemuDomainFilterHotplugVcpuEntities(virDomainDefPtr def,
         if (vcpu->online == state) {
             virReportError(VIR_ERR_INVALID_ARG,
                            _("vcpu '%zd' is already in requested state"), next);
-            goto cleanup;
+            return NULL;
         }
 
         if (vcpu->online && !vcpu->hotpluggable) {
             virReportError(VIR_ERR_INVALID_ARG,
                            _("vcpu '%zd' can't be hotunplugged"), next);
-            goto cleanup;
+            return NULL;
         }
     }
 
@@ -6457,7 +6454,7 @@ qemuDomainFilterHotplugVcpuEntities(virDomainDefPtr def,
             virReportError(VIR_ERR_INVALID_ARG,
                            _("vcpu '%zd' belongs to a larger hotpluggable entity, "
                              "but siblings were not selected"), next);
-            goto cleanup;
+            return NULL;
         }
 
         for (i = next + 1; i < next + vcpupriv->vcpus; i++) {
@@ -6467,7 +6464,7 @@ qemuDomainFilterHotplugVcpuEntities(virDomainDefPtr def,
                                  "hotpluggable entity '%zd-%zd' which was "
                                  "partially selected"),
                                i, next, next + vcpupriv->vcpus - 1);
-                goto cleanup;
+                return NULL;
             }
 
             /* clear the subthreads */
@@ -6475,11 +6472,7 @@ qemuDomainFilterHotplugVcpuEntities(virDomainDefPtr def,
         }
     }
 
-    ret = g_steal_pointer(&map);
-
- cleanup:
-    virBitmapFree(map);
-    return ret;
+    return g_steal_pointer(&map);
 }