From: Ján Tomko <jtomko@redhat.com>
Date: Fri, 24 Jan 2020 18:34:07 +0000 (+0100)
Subject: qemu: eliminate ret variable in qemuExtTPMStartEmulator
X-Git-Tag: v6.1.0-rc1~381
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=06160f6708d3cd07eec89fbe5b3adf123ca878a4;p=thirdparty%2Flibvirt.git

qemu: eliminate ret variable in qemuExtTPMStartEmulator

Now that the cleanup section is empty, eliminate the cleanup
label as well as the 'ret' variable.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
---

diff --git a/src/qemu/qemu_tpm.c b/src/qemu/qemu_tpm.c
index c2132250eb..21792f6992 100644
--- a/src/qemu/qemu_tpm.c
+++ b/src/qemu/qemu_tpm.c
@@ -793,7 +793,6 @@ qemuExtTPMStartEmulator(virQEMUDriverPtr driver,
                         virDomainObjPtr vm,
                         bool incomingMigration)
 {
-    int ret = -1;
     g_autoptr(virCommand) cmd = NULL;
     int exitstatus = 0;
     g_autofree char *errbuf = NULL;
@@ -817,23 +816,23 @@ qemuExtTPMStartEmulator(virQEMUDriverPtr driver,
                                             cfg->swtpm_group,
                                             cfg->swtpmStateDir, shortName,
                                             incomingMigration)))
-        goto cleanup;
+        return -1;
 
     if (qemuExtDeviceLogCommand(driver, vm, cmd, "TPM Emulator") < 0)
-        goto cleanup;
+        return -1;
 
     virCommandSetErrorBuffer(cmd, &errbuf);
 
     if (qemuSecurityStartTPMEmulator(driver, vm, cmd,
                                      cfg->swtpm_user, cfg->swtpm_group,
                                      &exitstatus, &cmdret) < 0)
-        goto cleanup;
+        return -1;
 
     if (cmdret < 0 || exitstatus != 0) {
         virReportError(VIR_ERR_INTERNAL_ERROR,
                        _("Could not start 'swtpm'. exitstatus: %d, "
                          "error: %s"), exitstatus, errbuf);
-        goto cleanup;
+        return -1;
     }
 
     /* check that the swtpm has written its pid into the file */
@@ -852,15 +851,12 @@ qemuExtTPMStartEmulator(virQEMUDriverPtr driver,
     if (timeout <= 0)
         goto error;
 
-    ret = 0;
-
- cleanup:
-    return ret;
+    return 0;
 
  error:
     virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
                    _("swtpm failed to start"));
-    goto cleanup;
+    return -1;
 }