From da71790bbdc1f9fa3d49ce8613253adf68c10ff1 Mon Sep 17 00:00:00 2001 From: Michal Privoznik Date: Mon, 1 Nov 2021 10:37:11 +0100 Subject: [PATCH] qemuConnectStealCPUModelFromInfo: Drop needless 'cleanup' label Previous commit rendered 'cleanup' label and @ret variable redundant. The same result can be achieved by returning 0/-1 directly. Signed-off-by: Michal Privoznik Reviewed-by: Tim Wiederhake --- src/qemu/qemu_driver.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index bf3b528c5f..d954635dde 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -12398,7 +12398,6 @@ qemuConnectStealCPUModelFromInfo(virCPUDef *dst, { g_autoptr(qemuMonitorCPUModelInfo) info = NULL; size_t i; - int ret = -1; virCPUDefFreeModel(dst); @@ -12413,13 +12412,10 @@ qemuConnectStealCPUModelFromInfo(virCPUDef *dst, continue; if (virCPUDefAddFeature(dst, name, VIR_CPU_FEATURE_REQUIRE) < 0) - goto cleanup; + return -1; } - ret = 0; - - cleanup: - return ret; + return 0; } -- 2.47.2