提交 05739fa1 编写于 作者: D Daniel Henrique Barboza 提交者: Jiri Denemark

cpu_arm.c: modernize virCPUarmUpdate

Use automatic cleanup of variables.
Signed-off-by: NDaniel Henrique Barboza <danielhb413@gmail.com>
Message-Id: <20200522195620.3843442-3-danielhb413@gmail.com>
Reviewed-by: NJiri Denemark <jdenemar@redhat.com>
上级 43da417b
......@@ -415,8 +415,7 @@ static int
virCPUarmUpdate(virCPUDefPtr guest,
const virCPUDef *host)
{
int ret = -1;
virCPUDefPtr updated = NULL;
g_autoptr(virCPUDef) updated = NULL;
if (guest->mode != VIR_CPU_MODE_HOST_MODEL)
return 0;
......@@ -424,24 +423,21 @@ virCPUarmUpdate(virCPUDefPtr guest,
if (!host) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("unknown host CPU model"));
goto cleanup;
return -1;
}
if (!(updated = virCPUDefCopyWithoutModel(guest)))
goto cleanup;
return -1;
updated->mode = VIR_CPU_MODE_CUSTOM;
if (virCPUDefCopyModel(updated, host, true) < 0)
goto cleanup;
return -1;
virCPUDefStealModel(guest, updated, false);
guest->mode = VIR_CPU_MODE_CUSTOM;
guest->match = VIR_CPU_MATCH_EXACT;
ret = 0;
cleanup:
virCPUDefFree(updated);
return ret;
return 0;
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册