From c64010d3e84fba13c4ee7f8e211831a27fb7ce45 Mon Sep 17 00:00:00 2001
From: Peter Krempa <pkrempa@redhat.com>
Date: Mon, 24 Jun 2019 15:48:59 +0200
Subject: [PATCH] qemu: command: get rid of 'cleanup' in
 qemuBuildDiskSourceCommandLine
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---
 src/qemu/qemu_command.c | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 0baae43339..85d1e3b7b0 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -2563,43 +2563,37 @@ qemuBuildDiskSourceCommandLine(virCommandPtr cmd,
     VIR_AUTOPTR(virJSONValue) copyOnReadProps = NULL;
     VIR_AUTOFREE(char *) copyOnReadPropsStr = NULL;
     size_t i;
-    int ret = -1;
 
     if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCKDEV)) {
-        if (virStorageSourceIsEmpty(disk->src)) {
-            ret = 0;
-            goto cleanup;
-        }
+        if (virStorageSourceIsEmpty(disk->src))
+            return 0;
 
         if (!(data = qemuBuildStorageSourceChainAttachPrepareBlockdev(disk->src,
                                                                       qemuCaps)))
-            goto cleanup;
+            return -1;
 
         if (disk->copy_on_read == VIR_TRISTATE_SWITCH_ON &&
             !(copyOnReadProps = qemuBlockStorageGetCopyOnReadProps(disk)))
-            goto cleanup;
+            return -1;
     } else {
         if (!(data = qemuBuildStorageSourceChainAttachPrepareDrive(disk, qemuCaps)))
-            goto cleanup;
+            return -1;
     }
 
     for (i = data->nsrcdata; i > 0; i--) {
         if (qemuBuildBlockStorageSourceAttachDataCommandline(cmd,
                                                              data->srcdata[i - 1]) < 0)
-            goto cleanup;
+            return -1;
     }
 
     if (copyOnReadProps) {
         if (!(copyOnReadPropsStr = virJSONValueToString(copyOnReadProps, false)))
-            goto cleanup;
+            return -1;
 
         virCommandAddArgList(cmd, "-blockdev", copyOnReadPropsStr, NULL);
     }
 
-    ret = 0;
-
- cleanup:
-    return ret;
+    return 0;
 }
 
 
-- 
2.47.2