116 lines
3.5 KiB
Diff
116 lines
3.5 KiB
Diff
From 39dea7f80de53e9f7fb8f298d1f9f7f32f20fc29 Mon Sep 17 00:00:00 2001
|
|
Message-Id: <39dea7f80de53e9f7fb8f298d1f9f7f32f20fc29@dist-git>
|
|
From: Jiri Denemark <jdenemar@redhat.com>
|
|
Date: Tue, 26 May 2020 10:59:08 +0200
|
|
Subject: [PATCH] cpu_x86: Use g_auto* in x86FeatureParse
|
|
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 3125688f78f6289e51bfdaa196addb230b0de4e1)
|
|
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=1840010
|
|
|
|
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
Message-Id: <14cf6ca6816ee8bda3e195aa5218162b280715b5.1590483392.git.jdenemar@redhat.com>
|
|
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
|
---
|
|
src/cpu/cpu_x86.c | 31 ++++++++++++-------------------
|
|
1 file changed, 12 insertions(+), 19 deletions(-)
|
|
|
|
diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
|
|
index 3ffddf0342..10c5fbacf7 100644
|
|
--- a/src/cpu/cpu_x86.c
|
|
+++ b/src/cpu/cpu_x86.c
|
|
@@ -1023,13 +1023,12 @@ x86FeatureParse(xmlXPathContextPtr ctxt,
|
|
void *data)
|
|
{
|
|
virCPUx86MapPtr map = data;
|
|
- xmlNodePtr *nodes = NULL;
|
|
- virCPUx86FeaturePtr feature;
|
|
+ g_autofree xmlNodePtr *nodes = NULL;
|
|
+ g_autoptr(virCPUx86Feature) feature = NULL;
|
|
virCPUx86DataItem item;
|
|
size_t i;
|
|
int n;
|
|
- char *str = NULL;
|
|
- int ret = -1;
|
|
+ g_autofree char *str = NULL;
|
|
|
|
feature = g_new0(virCPUx86Feature, 1);
|
|
feature->migratable = true;
|
|
@@ -1038,7 +1037,7 @@ x86FeatureParse(xmlXPathContextPtr ctxt,
|
|
if (x86FeatureFind(map, feature->name)) {
|
|
virReportError(VIR_ERR_INTERNAL_ERROR,
|
|
_("CPU feature %s already defined"), feature->name);
|
|
- goto cleanup;
|
|
+ return -1;
|
|
}
|
|
|
|
str = virXPathString("string(@migratable)", ctxt);
|
|
@@ -1047,13 +1046,13 @@ x86FeatureParse(xmlXPathContextPtr ctxt,
|
|
|
|
n = virXPathNodeSet("./cpuid|./msr", ctxt, &nodes);
|
|
if (n < 0)
|
|
- goto cleanup;
|
|
+ return -1;
|
|
|
|
if (n == 0) {
|
|
virReportError(VIR_ERR_INTERNAL_ERROR,
|
|
_("Missing cpuid or msr element in feature %s"),
|
|
feature->name);
|
|
- goto cleanup;
|
|
+ return -1;
|
|
}
|
|
|
|
for (i = 0; i < n; i++) {
|
|
@@ -1063,37 +1062,31 @@ x86FeatureParse(xmlXPathContextPtr ctxt,
|
|
virReportError(VIR_ERR_INTERNAL_ERROR,
|
|
_("Invalid cpuid[%zu] in %s feature"),
|
|
i, feature->name);
|
|
- goto cleanup;
|
|
+ return -1;
|
|
}
|
|
} else {
|
|
if (x86ParseMSR(ctxt, &item) < 0) {
|
|
virReportError(VIR_ERR_INTERNAL_ERROR,
|
|
_("Invalid msr[%zu] in %s feature"),
|
|
i, feature->name);
|
|
- goto cleanup;
|
|
+ return -1;
|
|
}
|
|
}
|
|
|
|
if (virCPUx86DataAddItem(&feature->data, &item))
|
|
- goto cleanup;
|
|
+ return -1;
|
|
}
|
|
|
|
if (!feature->migratable &&
|
|
VIR_APPEND_ELEMENT_COPY(map->migrate_blockers,
|
|
map->nblockers,
|
|
feature) < 0)
|
|
- goto cleanup;
|
|
+ return -1;
|
|
|
|
if (VIR_APPEND_ELEMENT(map->features, map->nfeatures, feature) < 0)
|
|
- goto cleanup;
|
|
-
|
|
- ret = 0;
|
|
+ return -1;
|
|
|
|
- cleanup:
|
|
- x86FeatureFree(feature);
|
|
- VIR_FREE(nodes);
|
|
- VIR_FREE(str);
|
|
- return ret;
|
|
+ return 0;
|
|
}
|
|
|
|
|
|
--
|
|
2.26.2
|
|
|