From 9adc6c8a4450e5eab78d7a8abd14b0e460d23a08 Mon Sep 17 00:00:00 2001 Message-Id: <9adc6c8a4450e5eab78d7a8abd14b0e460d23a08@dist-git> From: Jiri Denemark Date: Tue, 26 May 2020 10:59:04 +0200 Subject: [PATCH] cpu_x86: Use glib allocation for virCPUx86Map MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jiri Denemark Reviewed-by: Ján Tomko (cherry picked from commit 247e115e2753bde7957cc07a20d5a48a8a6632b0) https://bugzilla.redhat.com/show_bug.cgi?id=1840010 Signed-off-by: Jiri Denemark Message-Id: <0e3dc412e6e755f75e39a9ec22b2b5549c82930e.1590483392.git.jdenemar@redhat.com> Reviewed-by: Ján Tomko --- src/cpu/cpu_x86.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index 373c34a834..3711e03b3f 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -1566,23 +1566,24 @@ x86MapFree(virCPUx86MapPtr map) for (i = 0; i < map->nfeatures; i++) x86FeatureFree(map->features[i]); - VIR_FREE(map->features); + g_free(map->features); for (i = 0; i < map->nmodels; i++) x86ModelFree(map->models[i]); - VIR_FREE(map->models); + g_free(map->models); for (i = 0; i < map->nvendors; i++) x86VendorFree(map->vendors[i]); - VIR_FREE(map->vendors); + g_free(map->vendors); /* migrate_blockers only points to the features from map->features list, * which were already freed above */ - VIR_FREE(map->migrate_blockers); + g_free(map->migrate_blockers); - VIR_FREE(map); + g_free(map); } +G_DEFINE_AUTOPTR_CLEANUP_FUNC(virCPUx86Map, x86MapFree); static virCPUx86MapPtr @@ -1590,8 +1591,7 @@ virCPUx86LoadMap(void) { virCPUx86MapPtr map; - if (VIR_ALLOC(map) < 0) - return NULL; + map = g_new0(virCPUx86Map, 1); if (cpuMapLoad("x86", x86VendorParse, x86FeatureParse, x86ModelParse, map) < 0) goto error; -- 2.26.2