forked from rpms/libvirt
161 lines
5.0 KiB
Diff
161 lines
5.0 KiB
Diff
From da1511d57b10d2cc1cb14d78c6911815ec7d9f64 Mon Sep 17 00:00:00 2001
|
|
Message-Id: <da1511d57b10d2cc1cb14d78c6911815ec7d9f64@dist-git>
|
|
From: Jiri Denemark <jdenemar@redhat.com>
|
|
Date: Tue, 26 May 2020 10:59:20 +0200
|
|
Subject: [PATCH] cpu_x86: Use g_auto* in virCPUx86Baseline
|
|
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 5efefe7d7eb129b72bcbbebfbba2d5750ffeeeff)
|
|
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=1840010
|
|
|
|
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
Message-Id: <d93fb6757fd9ecd9ffe8634c422cc613c8d03e84.1590483392.git.jdenemar@redhat.com>
|
|
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
|
---
|
|
src/cpu/cpu_x86.c | 46 +++++++++++++++++-----------------------------
|
|
1 file changed, 17 insertions(+), 29 deletions(-)
|
|
|
|
diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
|
|
index 1ade53a4a8..6e7311694d 100644
|
|
--- a/src/cpu/cpu_x86.c
|
|
+++ b/src/cpu/cpu_x86.c
|
|
@@ -2697,21 +2697,20 @@ virCPUx86Baseline(virCPUDefPtr *cpus,
|
|
bool migratable)
|
|
{
|
|
virCPUx86MapPtr map = NULL;
|
|
- virCPUx86ModelPtr base_model = NULL;
|
|
- virCPUDefPtr cpu = NULL;
|
|
+ g_autoptr(virCPUx86Model) base_model = NULL;
|
|
+ g_autoptr(virCPUDef) cpu = NULL;
|
|
size_t i;
|
|
virCPUx86VendorPtr vendor = NULL;
|
|
- virCPUx86ModelPtr model = NULL;
|
|
bool outputVendor = true;
|
|
const char *modelName;
|
|
bool matchingNames = true;
|
|
- virCPUDataPtr featData = NULL;
|
|
+ g_autoptr(virCPUData) featData = NULL;
|
|
|
|
if (!(map = virCPUx86GetMap()))
|
|
- goto error;
|
|
+ return NULL;
|
|
|
|
if (!(base_model = x86ModelFromCPU(cpus[0], map, -1)))
|
|
- goto error;
|
|
+ return NULL;
|
|
|
|
cpu = virCPUDefNew();
|
|
|
|
@@ -2723,11 +2722,12 @@ virCPUx86Baseline(virCPUDefPtr *cpus,
|
|
} else if (!(vendor = x86VendorFind(map, cpus[0]->vendor))) {
|
|
virReportError(VIR_ERR_OPERATION_FAILED,
|
|
_("Unknown CPU vendor %s"), cpus[0]->vendor);
|
|
- goto error;
|
|
+ return NULL;
|
|
}
|
|
|
|
modelName = cpus[0]->model;
|
|
for (i = 1; i < ncpus; i++) {
|
|
+ g_autoptr(virCPUx86Model) model = NULL;
|
|
const char *vn = NULL;
|
|
|
|
if (matchingNames && cpus[i]->model) {
|
|
@@ -2740,14 +2740,14 @@ virCPUx86Baseline(virCPUDefPtr *cpus,
|
|
}
|
|
|
|
if (!(model = x86ModelFromCPU(cpus[i], map, -1)))
|
|
- goto error;
|
|
+ return NULL;
|
|
|
|
if (cpus[i]->vendor && model->vendor &&
|
|
STRNEQ(cpus[i]->vendor, model->vendor->name)) {
|
|
virReportError(VIR_ERR_OPERATION_FAILED,
|
|
_("CPU vendor %s of model %s differs from vendor %s"),
|
|
model->vendor->name, model->name, cpus[i]->vendor);
|
|
- goto error;
|
|
+ return NULL;
|
|
}
|
|
|
|
if (cpus[i]->vendor) {
|
|
@@ -2763,30 +2763,28 @@ virCPUx86Baseline(virCPUDefPtr *cpus,
|
|
if (!(vendor = x86VendorFind(map, vn))) {
|
|
virReportError(VIR_ERR_OPERATION_FAILED,
|
|
_("Unknown CPU vendor %s"), vn);
|
|
- goto error;
|
|
+ return NULL;
|
|
}
|
|
} else if (STRNEQ(vendor->name, vn)) {
|
|
virReportError(VIR_ERR_OPERATION_FAILED,
|
|
"%s", _("CPU vendors do not match"));
|
|
- goto error;
|
|
+ return NULL;
|
|
}
|
|
}
|
|
|
|
x86DataIntersect(&base_model->data, &model->data);
|
|
- x86ModelFree(model);
|
|
- model = NULL;
|
|
}
|
|
|
|
if (features) {
|
|
virCPUx86FeaturePtr feat;
|
|
|
|
if (!(featData = virCPUDataNew(archs[0])))
|
|
- goto cleanup;
|
|
+ return NULL;
|
|
|
|
for (i = 0; features[i]; i++) {
|
|
if ((feat = x86FeatureFind(map, features[i])) &&
|
|
x86DataAdd(&featData->data.x86, &feat->data) < 0)
|
|
- goto cleanup;
|
|
+ return NULL;
|
|
}
|
|
|
|
x86DataIntersect(&base_model->data, &featData->data.x86);
|
|
@@ -2795,15 +2793,15 @@ virCPUx86Baseline(virCPUDefPtr *cpus,
|
|
if (x86DataIsEmpty(&base_model->data)) {
|
|
virReportError(VIR_ERR_OPERATION_FAILED,
|
|
"%s", _("CPUs are incompatible"));
|
|
- goto error;
|
|
+ return NULL;
|
|
}
|
|
|
|
if (vendor &&
|
|
virCPUx86DataAddItem(&base_model->data, &vendor->data) < 0)
|
|
- goto error;
|
|
+ return NULL;
|
|
|
|
if (x86Decode(cpu, &base_model->data, models, modelName, migratable) < 0)
|
|
- goto error;
|
|
+ return NULL;
|
|
|
|
if (STREQ_NULLABLE(cpu->model, modelName))
|
|
cpu->fallback = VIR_CPU_FALLBACK_FORBID;
|
|
@@ -2811,17 +2809,7 @@ virCPUx86Baseline(virCPUDefPtr *cpus,
|
|
if (!outputVendor)
|
|
VIR_FREE(cpu->vendor);
|
|
|
|
- cleanup:
|
|
- x86ModelFree(base_model);
|
|
- virCPUx86DataFree(featData);
|
|
-
|
|
- return cpu;
|
|
-
|
|
- error:
|
|
- x86ModelFree(model);
|
|
- virCPUDefFree(cpu);
|
|
- cpu = NULL;
|
|
- goto cleanup;
|
|
+ return g_steal_pointer(&cpu);
|
|
}
|
|
|
|
|
|
--
|
|
2.26.2
|
|
|