External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

cpu_arm.c: modernize virCPUarmUpdate

Browse Source 
Use automatic cleanup of variables.

Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Message-Id: <20200522195620.3843442-3-danielhb413@gmail.com>
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
This commit is contained in:
Daniel Henrique Barboza 2020-05-22 16:56:17 -03:00 committed by Jiri Denemark
parent 43da417b61
commit 05739fa1ad
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_arm.c
View File

@ -415,8 +415,7 @@ static int
virCPUarmUpdate(virCPUDefPtr guest, virCPUarmUpdate(virCPUDefPtr guest,
const virCPUDef *host) const virCPUDef *host)
{ {
int ret = -1; g_autoptr(virCPUDef) updated = NULL;
virCPUDefPtr updated = NULL;
if (guest->mode != VIR_CPU_MODE_HOST_MODEL) if (guest->mode != VIR_CPU_MODE_HOST_MODEL)
return 0; return 0;
@ -424,24 +423,21 @@ virCPUarmUpdate(virCPUDefPtr guest,
if (!host) { if (!host) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("unknown host CPU model")); _("unknown host CPU model"));
goto cleanup; return -1;
} }
if (!(updated = virCPUDefCopyWithoutModel(guest))) if (!(updated = virCPUDefCopyWithoutModel(guest)))
goto cleanup; return -1;
updated->mode = VIR_CPU_MODE_CUSTOM; updated->mode = VIR_CPU_MODE_CUSTOM;
if (virCPUDefCopyModel(updated, host, true) < 0) if (virCPUDefCopyModel(updated, host, true) < 0)
goto cleanup; return -1;
virCPUDefStealModel(guest, updated, false); virCPUDefStealModel(guest, updated, false);
guest->mode = VIR_CPU_MODE_CUSTOM; guest->mode = VIR_CPU_MODE_CUSTOM;
guest->match = VIR_CPU_MATCH_EXACT; guest->match = VIR_CPU_MATCH_EXACT;
ret = 0;
cleanup: return 0;
virCPUDefFree(updated);
return ret;
} }