From: Jiri Denemark <jdenemar@redhat.com>
Date: Thu, 6 Jun 2019 10:33:43 +0000 (+0200)
Subject: qemu_process: Drop cleanup label from qemuProcessUpdateGuestCPU
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=955fd6e7a2c8dc97e9e68d1bd9ba9d03c7d815b3;p=libvirt.git

qemu_process: Drop cleanup label from qemuProcessUpdateGuestCPU

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

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;
 }