| From d151191af331a2127aa6b2126d15e2afd19e548d Mon Sep 17 00:00:00 2001 |
| Message-Id: <d151191af331a2127aa6b2126d15e2afd19e548d@dist-git> |
| From: Jiri Denemark <jdenemar@redhat.com> |
| Date: Tue, 26 May 2020 10:59:01 +0200 |
| Subject: [PATCH] cpu_x86: Use glib allocation for virCPUx86Vendor |
| 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 8a41417b23dda97eb09bcd2921c1ab0d5fbce1b6) |
| |
| https://bugzilla.redhat.com/show_bug.cgi?id=1840010 |
| |
| Signed-off-by: Jiri Denemark <jdenemar@redhat.com> |
| Message-Id: <f5811f02d9c0cce74d007f5986454b8d89b2f548.1590483392.git.jdenemar@redhat.com> |
| Reviewed-by: Ján Tomko <jtomko@redhat.com> |
| |
| src/cpu/cpu_x86.c | 9 ++++----- |
| 1 file changed, 4 insertions(+), 5 deletions(-) |
| |
| diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c |
| index 4d82d85746..aa66309b21 100644 |
| |
| |
| @@ -830,9 +830,10 @@ x86VendorFree(virCPUx86VendorPtr vendor) |
| if (!vendor) |
| return; |
| |
| - VIR_FREE(vendor->name); |
| - VIR_FREE(vendor); |
| + g_free(vendor->name); |
| + g_free(vendor); |
| } |
| +G_DEFINE_AUTOPTR_CLEANUP_FUNC(virCPUx86Vendor, x86VendorFree); |
| |
| |
| static virCPUx86VendorPtr |
| @@ -860,9 +861,7 @@ x86VendorParse(xmlXPathContextPtr ctxt, |
| char *string = NULL; |
| int ret = -1; |
| |
| - if (VIR_ALLOC(vendor) < 0) |
| - goto cleanup; |
| - |
| + vendor = g_new0(virCPUx86Vendor, 1); |
| vendor->name = g_strdup(name); |
| |
| if (x86VendorFind(map, vendor->name)) { |
| -- |
| 2.26.2 |
| |