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

cpu_x86: Use g_auto* in virCPUx86Update

Signed-off-by: NJiri Denemark <jdenemar@redhat.com>
Reviewed-by: NJán Tomko <jtomko@redhat.com>
上级 2f9d15b4
...@@ -2853,9 +2853,8 @@ static int ...@@ -2853,9 +2853,8 @@ static int
virCPUx86Update(virCPUDefPtr guest, virCPUx86Update(virCPUDefPtr guest,
const virCPUDef *host) const virCPUDef *host)
{ {
virCPUx86ModelPtr model = NULL; g_autoptr(virCPUx86Model) model = NULL;
virCPUx86MapPtr map; virCPUx86MapPtr map;
int ret = -1;
size_t i; size_t i;
if (!host) { if (!host) {
...@@ -2868,14 +2867,14 @@ virCPUx86Update(virCPUDefPtr guest, ...@@ -2868,14 +2867,14 @@ virCPUx86Update(virCPUDefPtr guest,
return -1; return -1;
if (!(model = x86ModelFromCPU(host, map, -1))) if (!(model = x86ModelFromCPU(host, map, -1)))
goto cleanup; return -1;
for (i = 0; i < guest->nfeatures; i++) { for (i = 0; i < guest->nfeatures; i++) {
if (guest->features[i].policy == VIR_CPU_FEATURE_OPTIONAL) { if (guest->features[i].policy == VIR_CPU_FEATURE_OPTIONAL) {
int supported = x86FeatureInData(guest->features[i].name, int supported = x86FeatureInData(guest->features[i].name,
&model->data, map); &model->data, map);
if (supported < 0) if (supported < 0)
goto cleanup; return -1;
else if (supported) else if (supported)
guest->features[i].policy = VIR_CPU_FEATURE_REQUIRE; guest->features[i].policy = VIR_CPU_FEATURE_REQUIRE;
else else
...@@ -2885,13 +2884,9 @@ virCPUx86Update(virCPUDefPtr guest, ...@@ -2885,13 +2884,9 @@ virCPUx86Update(virCPUDefPtr guest,
if (guest->mode == VIR_CPU_MODE_HOST_MODEL || if (guest->mode == VIR_CPU_MODE_HOST_MODEL ||
guest->match == VIR_CPU_MATCH_MINIMUM) guest->match == VIR_CPU_MATCH_MINIMUM)
ret = x86UpdateHostModel(guest, host); return x86UpdateHostModel(guest, host);
else
ret = 0;
cleanup: return 0;
x86ModelFree(model);
return ret;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册