From: Ján Tomko <jtomko@redhat.com>
Date: Mon, 23 Aug 2021 14:23:47 +0000 (+0200)
Subject: qemu: refactor virQEMUCapsInit
X-Git-Tag: v7.7.0-rc1~53
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=37574d5f17d788ee42f8464f0c35db0aa2a0e2ea;p=thirdparty%2Flibvirt.git

qemu: refactor virQEMUCapsInit

Use g_auto and remove pointless labels.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Kristina Hanicova <khanicov@redhat.com>
---

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index a80c172d71..380d0a5694 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -1111,13 +1111,13 @@ virQEMUCapsProbeHostCPU(virArch hostArch,
 virCaps *
 virQEMUCapsInit(virFileCache *cache)
 {
-    virCaps *caps;
+    g_autoptr(virCaps) caps = NULL;
     size_t i;
     virArch hostarch = virArchFromHost();
 
     if ((caps = virCapabilitiesNew(hostarch,
                                    true, true)) == NULL)
-        goto error;
+        return NULL;
 
     if (virCapabilitiesInitCaches(caps) < 0)
         VIR_WARN("Failed to get host CPU cache info");
@@ -1145,13 +1145,9 @@ virQEMUCapsInit(virFileCache *cache)
         if (virQEMUCapsInitGuest(caps, cache,
                                  hostarch,
                                  i) < 0)
-            goto error;
-
-    return caps;
+            return NULL;
 
- error:
-    virObjectUnref(caps);
-    return NULL;
+    return g_steal_pointer(&caps);
 }