[libvirt] [PATCH 02/24] qemu_process: Drop cleanup label from qemuProcessUpdateGuestCPU
Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com>
---
src/qemu/qemu_process.c | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 1626796c19..144328c148 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -5893,8 +5893,6 @@ qemuProcessUpdateGuestCPU(virDomainDefPtr def,
virCapsPtr caps,
unsigned int flags)
{
- int ret = -1;
-
if (!def->cpu)
return 0;
@@ -5943,17 +5941,14 @@ qemuProcessUpdateGuestCPU(virDomainDefPtr def,
if (virCPUUpdate(def->os.arch, def->cpu,
virQEMUCapsGetHostModel(qemuCaps, def->virtType,
VIR_QEMU_CAPS_HOST_CPU_MIGRATABLE)) < 0)
- goto cleanup;
+ return -1;
if (virCPUTranslate(def->os.arch, def->cpu,
virQEMUCapsGetCPUDefinitions(qemuCaps, def->virtType)) <
0)
- goto cleanup;
+ return -1;
def->cpu->fallback = VIR_CPU_FALLBACK_FORBID;
- ret = 0;
-
- cleanup:
- return ret;
+ return 0;
}
--
2.22.0