NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

cpu_x86: Use g_auto* in x86ModelFromCPU

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:29:14 +01:00
parent 3125688f78
commit 93f173adbe
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/cpu/cpu_x86.c
View File

@ -1173,7 +1173,7 @@ x86ModelFromCPU(const virCPUDef *cpu,
virCPUx86MapPtr map, virCPUx86MapPtr map,
int policy) int policy)
{ {
virCPUx86ModelPtr model = NULL; g_autoptr(virCPUx86Model) model = NULL;
size_t i; size_t i;
/* host CPU only contains required features; requesting other features /* host CPU only contains required features; requesting other features
@ -1216,7 +1216,7 @@ x86ModelFromCPU(const virCPUDef *cpu,
if (!(feature = x86FeatureFind(map, cpu->features[i].name))) { if (!(feature = x86FeatureFind(map, cpu->features[i].name))) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("Unknown CPU feature %s"), cpu->features[i].name); _("Unknown CPU feature %s"), cpu->features[i].name);
goto error; return NULL;
} }
if (policy == -1) { if (policy == -1) {
@ -1224,7 +1224,7 @@ x86ModelFromCPU(const virCPUDef *cpu,
case VIR_CPU_FEATURE_FORCE: case VIR_CPU_FEATURE_FORCE:
case VIR_CPU_FEATURE_REQUIRE: case VIR_CPU_FEATURE_REQUIRE:
if (x86DataAdd(&model->data, &feature->data) < 0) if (x86DataAdd(&model->data, &feature->data) < 0)
goto error; return NULL;
break; break;
case VIR_CPU_FEATURE_DISABLE: case VIR_CPU_FEATURE_DISABLE:
@ -1238,15 +1238,11 @@ x86ModelFromCPU(const virCPUDef *cpu,
break; break;
} }
} else if (x86DataAdd(&model->data, &feature->data) < 0) { } else if (x86DataAdd(&model->data, &feature->data) < 0) {
goto error; return NULL;
} }
} }
return model; return g_steal_pointer(&model);
error:
x86ModelFree(model);
return NULL;
} }