External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-03 02:15:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

cpu_x86: Use g_auto* in x86DataToCPU

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 10:29:39 +01:00
parent e43e2ff7f5
commit 4f2fdad36d
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/cpu/cpu_x86.c
View File

@ -771,9 +771,9 @@ x86DataToCPU(const virCPUx86Data *data,
virCPUx86MapPtr map, virCPUx86MapPtr map,
virDomainCapsCPUModelPtr hvModel) virDomainCapsCPUModelPtr hvModel)
{ {
virCPUDefPtr cpu; g_autoptr(virCPUDef) cpu = NULL;
virCPUx86Data copy = VIR_CPU_X86_DATA_INIT; g_auto(virCPUx86Data) copy = VIR_CPU_X86_DATA_INIT;
virCPUx86Data modelData = VIR_CPU_X86_DATA_INIT; g_auto(virCPUx86Data) modelData = VIR_CPU_X86_DATA_INIT;
virCPUx86VendorPtr vendor; virCPUx86VendorPtr vendor;
cpu = virCPUDefNew(); cpu = virCPUDefNew();
@ -801,7 +801,7 @@ x86DataToCPU(const virCPUx86Data *data,
if ((feature = x86FeatureFind(map, *blocker)) && if ((feature = x86FeatureFind(map, *blocker)) &&
!x86DataIsSubset(&copy, &feature->data)) !x86DataIsSubset(&copy, &feature->data))
if (x86DataAdd(&modelData, &feature->data) < 0) if (x86DataAdd(&modelData, &feature->data) < 0)
goto error; return NULL;
} }
} }
@ -810,17 +810,9 @@ x86DataToCPU(const virCPUx86Data *data,
if (x86DataToCPUFeatures(cpu, VIR_CPU_FEATURE_REQUIRE, &copy, map) || if (x86DataToCPUFeatures(cpu, VIR_CPU_FEATURE_REQUIRE, &copy, map) ||
x86DataToCPUFeatures(cpu, VIR_CPU_FEATURE_DISABLE, &modelData, map)) x86DataToCPUFeatures(cpu, VIR_CPU_FEATURE_DISABLE, &modelData, map))
goto error; return NULL;
cleanup: return g_steal_pointer(&cpu);
virCPUx86DataClear(&modelData);
virCPUx86DataClear(&copy);
return cpu;
error:
virCPUDefFree(cpu);
cpu = NULL;
goto cleanup;
} }