From: Peter Krempa <pkrempa@redhat.com>
Date: Tue, 7 Dec 2021 16:22:26 +0000 (+0100)
Subject: qemuDomainSetVcpusInternal: Refactor cleanup
X-Git-Tag: v8.0.0-rc1~320
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=44797bae448c446e06bb6922f242d8ee054051b7;p=thirdparty%2Flibvirt.git

qemuDomainSetVcpusInternal: Refactor cleanup

Use automatic memory freeing for the temporary bitmap and remove the
pointless 'cleanup' section.

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 f307420ac1..b4c8536b47 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -6665,16 +6665,15 @@ qemuDomainSetVcpusInternal(virQEMUDriver *driver,
                            bool hotpluggable)
 {
     g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
-    virBitmap *vcpumap = NULL;
+    g_autoptr(virBitmap) vcpumap = NULL;
     bool enable;
-    int ret = -1;
 
     if (def && nvcpus > virDomainDefGetVcpusMax(def)) {
         virReportError(VIR_ERR_INVALID_ARG,
                        _("requested vcpus is greater than max allowable"
                          " vcpus for the live domain: %u > %u"),
                        nvcpus, virDomainDefGetVcpusMax(def));
-        goto cleanup;
+        return -1;
     }
 
     if (persistentDef && nvcpus > virDomainDefGetVcpusMax(persistentDef)) {
@@ -6682,30 +6681,26 @@ qemuDomainSetVcpusInternal(virQEMUDriver *driver,
                        _("requested vcpus is greater than max allowable"
                          " vcpus for the persistent domain: %u > %u"),
                        nvcpus, virDomainDefGetVcpusMax(persistentDef));
-        goto cleanup;
+        return -1;
     }
 
     if (def) {
         if (!(vcpumap = qemuDomainSelectHotplugVcpuEntities(vm->def, nvcpus,
                                                             &enable)))
-            goto cleanup;
+            return -1;
 
         if (qemuDomainSetVcpusLive(driver, cfg, vm, vcpumap, enable) < 0)
-            goto cleanup;
+            return -1;
     }
 
     if (persistentDef) {
         qemuDomainSetVcpusConfig(persistentDef, nvcpus, hotpluggable);
 
         if (virDomainDefSave(persistentDef, driver->xmlopt, cfg->configDir) < 0)
-            goto cleanup;
+            return -1;
     }
 
-    ret = 0;
-
- cleanup:
-    virBitmapFree(vcpumap);
-    return ret;
+    return 0;
 }