libvirt/SOURCES/libvirt-cpu_x86-Use-glib-allocation-for-virCPUx86Feature.patch
2021-09-10 11:57:33 +00:00

75 lines
1.9 KiB
Diff

From 9810efd43b52070c20fe41b41175b0afff6710aa Mon Sep 17 00:00:00 2001
Message-Id: <9810efd43b52070c20fe41b41175b0afff6710aa@dist-git>
From: Jiri Denemark <jdenemar@redhat.com>
Date: Tue, 26 May 2020 10:59:02 +0200
Subject: [PATCH] cpu_x86: Use glib allocation for virCPUx86Feature
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
(cherry picked from commit 51b6e9c1000151cc515804134a00ccb0d7b3e44a)
https://bugzilla.redhat.com/show_bug.cgi?id=1840010
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Message-Id: <4c4090765c01f7359c521cb09d247b1694afbe9c.1590483392.git.jdenemar@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---
src/cpu/cpu_x86.c | 22 ++++------------------
1 file changed, 4 insertions(+), 18 deletions(-)
diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
index aa66309b21..3a598e35d2 100644
--- a/src/cpu/cpu_x86.c
+++ b/src/cpu/cpu_x86.c
@@ -893,28 +893,17 @@ x86VendorParse(xmlXPathContextPtr ctxt,
}
-static virCPUx86FeaturePtr
-x86FeatureNew(void)
-{
- virCPUx86FeaturePtr feature;
-
- if (VIR_ALLOC(feature) < 0)
- return NULL;
-
- return feature;
-}
-
-
static void
x86FeatureFree(virCPUx86FeaturePtr feature)
{
if (!feature)
return;
- VIR_FREE(feature->name);
+ g_free(feature->name);
virCPUx86DataClear(&feature->data);
- VIR_FREE(feature);
+ g_free(feature);
}
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(virCPUx86Feature, x86FeatureFree);
static int
@@ -1056,11 +1045,8 @@ x86FeatureParse(xmlXPathContextPtr ctxt,
char *str = NULL;
int ret = -1;
- if (!(feature = x86FeatureNew()))
- goto cleanup;
-
+ feature = g_new0(virCPUx86Feature, 1);
feature->migratable = true;
-
feature->name = g_strdup(name);
if (x86FeatureFind(map, feature->name)) {
--
2.26.2