提交 ff6897c8 编写于 作者: J Jiri Denemark

cpu_x86: Use g_auto* in virCPUx86ExpandFeatures

Signed-off-by: NJiri Denemark <jdenemar@redhat.com>
Reviewed-by: NJán Tomko <jtomko@redhat.com>
上级 dff59020
...@@ -3055,30 +3055,29 @@ static int ...@@ -3055,30 +3055,29 @@ static int
virCPUx86ExpandFeatures(virCPUDefPtr cpu) virCPUx86ExpandFeatures(virCPUDefPtr cpu)
{ {
virCPUx86MapPtr map; virCPUx86MapPtr map;
virCPUDefPtr expanded = NULL; g_autoptr(virCPUDef) expanded = NULL;
virCPUx86ModelPtr model = NULL; g_autoptr(virCPUx86Model) model = NULL;
bool host = cpu->type == VIR_CPU_TYPE_HOST; bool host = cpu->type == VIR_CPU_TYPE_HOST;
size_t i; size_t i;
int ret = -1;
if (!(map = virCPUx86GetMap())) if (!(map = virCPUx86GetMap()))
goto cleanup; return -1;
if (!(expanded = virCPUDefCopy(cpu))) if (!(expanded = virCPUDefCopy(cpu)))
goto cleanup; return -1;
virCPUDefFreeFeatures(expanded); virCPUDefFreeFeatures(expanded);
if (!(model = x86ModelFind(map, cpu->model))) { if (!(model = x86ModelFind(map, cpu->model))) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("unknown CPU model %s"), cpu->model); _("unknown CPU model %s"), cpu->model);
goto cleanup; return -1;
} }
if (!(model = x86ModelCopy(model)) || if (!(model = x86ModelCopy(model)) ||
x86DataToCPUFeatures(expanded, host ? -1 : VIR_CPU_FEATURE_REQUIRE, x86DataToCPUFeatures(expanded, host ? -1 : VIR_CPU_FEATURE_REQUIRE,
&model->data, map) < 0) &model->data, map) < 0)
goto cleanup; return -1;
for (i = 0; i < cpu->nfeatures; i++) { for (i = 0; i < cpu->nfeatures; i++) {
virCPUFeatureDefPtr f = cpu->features + i; virCPUFeatureDefPtr f = cpu->features + i;
...@@ -3089,17 +3088,12 @@ virCPUx86ExpandFeatures(virCPUDefPtr cpu) ...@@ -3089,17 +3088,12 @@ virCPUx86ExpandFeatures(virCPUDefPtr cpu)
continue; continue;
if (virCPUDefUpdateFeature(expanded, f->name, f->policy) < 0) if (virCPUDefUpdateFeature(expanded, f->name, f->policy) < 0)
goto cleanup; return -1;
} }
virCPUDefFreeModel(cpu); virCPUDefFreeModel(cpu);
ret = virCPUDefCopyModel(cpu, expanded, false); return virCPUDefCopyModel(cpu, expanded, false);
cleanup:
virCPUDefFree(expanded);
x86ModelFree(model);
return ret;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册