From 2545e373c4a5b08836742742960244ece2586545 Mon Sep 17 00:00:00 2001 Message-Id: <2545e373c4a5b08836742742960244ece2586545@dist-git> From: Jiri Denemark Date: Tue, 26 May 2020 10:59:21 +0200 Subject: [PATCH] cpu_x86: Use g_auto* in x86UpdateHostModel MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jiri Denemark Reviewed-by: Ján Tomko (cherry picked from commit 2f9d15b495efdd9e63c07cd6fda611701e71ee46) https://bugzilla.redhat.com/show_bug.cgi?id=1840010 Signed-off-by: Jiri Denemark Message-Id: Reviewed-by: Ján Tomko --- src/cpu/cpu_x86.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index 6e7311694d..98f7863b6f 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -2817,17 +2817,16 @@ static int x86UpdateHostModel(virCPUDefPtr guest, const virCPUDef *host) { - virCPUDefPtr updated = NULL; + g_autoptr(virCPUDef) updated = NULL; size_t i; - int ret = -1; if (!(updated = virCPUDefCopyWithoutModel(host))) - goto cleanup; + return -1; updated->type = VIR_CPU_TYPE_GUEST; updated->mode = VIR_CPU_MODE_CUSTOM; if (virCPUDefCopyModel(updated, host, true) < 0) - goto cleanup; + return -1; if (guest->vendor_id) { VIR_FREE(updated->vendor_id); @@ -2838,18 +2837,15 @@ x86UpdateHostModel(virCPUDefPtr guest, if (virCPUDefUpdateFeature(updated, guest->features[i].name, guest->features[i].policy) < 0) - goto cleanup; + return -1; } virCPUDefStealModel(guest, updated, guest->mode == VIR_CPU_MODE_CUSTOM); guest->mode = VIR_CPU_MODE_CUSTOM; guest->match = VIR_CPU_MATCH_EXACT; - ret = 0; - cleanup: - virCPUDefFree(updated); - return ret; + return 0; } -- 2.26.2