From: Jiri Denemark <jdenemar@redhat.com>
Date: Wed, 25 Mar 2020 13:52:01 +0000 (+0100)
Subject: cpu_x86: Use g_auto* in virCPUx86LoadMap
X-Git-Tag: v6.3.0-rc1~195
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3c650a8f7a89046b925fb5ddc78c4b6669ed76ef;p=thirdparty%2Flibvirt.git

cpu_x86: Use g_auto* in virCPUx86LoadMap

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
index 983730f0c2..c41c7da594 100644
--- a/src/cpu/cpu_x86.c
+++ b/src/cpu/cpu_x86.c
@@ -1559,18 +1559,14 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(virCPUx86Map, x86MapFree);
 static virCPUx86MapPtr
 virCPUx86LoadMap(void)
 {
-    virCPUx86MapPtr map;
+    g_autoptr(virCPUx86Map) map = NULL;
 
     map = g_new0(virCPUx86Map, 1);
 
     if (cpuMapLoad("x86", x86VendorParse, x86FeatureParse, x86ModelParse, map) < 0)
-        goto error;
-
-    return map;
+        return NULL;
 
- error:
-    x86MapFree(map);
-    return NULL;
+    return g_steal_pointer(&map);
 }