External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-11 15:27:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

cpu_x86: Use g_auto* in virCPUx86ExpandFeatures

Browse Source 
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Jiri Denemark 2020-03-25 11:32:57 +01:00
parent dff5902018
commit ff6897c845
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/cpu/cpu_x86.c
View File

@ -3055,30 +3055,29 @@ static int
virCPUx86ExpandFeatures(virCPUDefPtr cpu)
{
virCPUx86MapPtr map;
virCPUDefPtr expanded = NULL;
virCPUx86ModelPtr model = NULL;
g_autoptr(virCPUDef) expanded = NULL;
g_autoptr(virCPUx86Model) model = NULL;
bool host = cpu->type == VIR_CPU_TYPE_HOST;
size_t i;
int ret = -1;
if (!(map = virCPUx86GetMap()))
goto cleanup;
return -1;
if (!(expanded = virCPUDefCopy(cpu)))
goto cleanup;
return -1;
virCPUDefFreeFeatures(expanded);
if (!(model = x86ModelFind(map, cpu->model))) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("unknown CPU model %s"), cpu->model);
goto cleanup;
return -1;
}
if (!(model = x86ModelCopy(model)) ||
x86DataToCPUFeatures(expanded, host ? -1 : VIR_CPU_FEATURE_REQUIRE,
&model->data, map) < 0)
goto cleanup;
return -1;
for (i = 0; i < cpu->nfeatures; i++) {
virCPUFeatureDefPtr f = cpu->features + i;
@ -3089,17 +3088,12 @@ virCPUx86ExpandFeatures(virCPUDefPtr cpu)
continue;
if (virCPUDefUpdateFeature(expanded, f->name, f->policy) < 0)
goto cleanup;
return -1;
}
virCPUDefFreeModel(cpu);
ret = virCPUDefCopyModel(cpu, expanded, false);
cleanup:
virCPUDefFree(expanded);
x86ModelFree(model);
return ret;
return virCPUDefCopyModel(cpu, expanded, false);
}