External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-30 21:47:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

cpu_x86: Use g_auto* in virCPUx86Update

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:09 +01:00
parent 2f9d15b495
commit e0244a786d
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/cpu/cpu_x86.c
View File

@ -2853,9 +2853,8 @@ static int
virCPUx86Update(virCPUDefPtr guest,
const virCPUDef *host)
{
virCPUx86ModelPtr model = NULL;
g_autoptr(virCPUx86Model) model = NULL;
virCPUx86MapPtr map;
int ret = -1;
size_t i;
if (!host) {
@ -2868,14 +2867,14 @@ virCPUx86Update(virCPUDefPtr guest,
return -1;
if (!(model = x86ModelFromCPU(host, map, -1)))
goto cleanup;
return -1;
for (i = 0; i < guest->nfeatures; i++) {
if (guest->features[i].policy == VIR_CPU_FEATURE_OPTIONAL) {
int supported = x86FeatureInData(guest->features[i].name,
&model->data, map);
if (supported < 0)
goto cleanup;
return -1;
else if (supported)
guest->features[i].policy = VIR_CPU_FEATURE_REQUIRE;
else
@ -2885,13 +2884,9 @@ virCPUx86Update(virCPUDefPtr guest,
if (guest->mode == VIR_CPU_MODE_HOST_MODEL ||
guest->match == VIR_CPU_MATCH_MINIMUM)
ret = x86UpdateHostModel(guest, host);
else
ret = 0;
return x86UpdateHostModel(guest, host);
cleanup:
x86ModelFree(model);
return ret;
return 0;
}