From: Peter Krempa <pkrempa@redhat.com>
Date: Thu, 7 Jun 2018 10:25:02 +0000 (+0200)
Subject: qemu: command: Split out formatting of disk source commandline
X-Git-Tag: v4.6.0-rc1~279
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=35582d112505419a6873831e1fba9dae8b45b0b8;p=thirdparty%2Flibvirt.git

qemu: command: Split out formatting of disk source commandline

Further split qemuBuildDiskCommandLine to separate formatting of the
source part.

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

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index d94308e5b3..1c162603e5 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -2231,27 +2231,42 @@ qemuBuildBlockStorageSourceAttachDataCommandline(virCommandPtr cmd,
 
 
 static int
-qemuBuildDiskCommandLine(virCommandPtr cmd,
-                         const virDomainDef *def,
-                         virDomainDiskDefPtr disk,
-                         virQEMUCapsPtr qemuCaps,
-                         unsigned int bootindex,
-                         bool driveBoot)
+qemuBuildDiskSourceCommandLine(virCommandPtr cmd,
+                               virDomainDiskDefPtr disk,
+                               virQEMUCapsPtr qemuCaps,
+                               bool driveBoot)
 {
     qemuBlockStorageSourceAttachDataPtr data = NULL;
-    char *optstr;
+    int ret = -1;
 
     if (!(data = qemuBuildStorageSourceAttachPrepareDrive(disk, qemuCaps,
                                                           driveBoot)))
         return -1;
 
     if (qemuBuildStorageSourceAttachPrepareCommon(disk->src, data, qemuCaps) < 0 ||
-        qemuBuildBlockStorageSourceAttachDataCommandline(cmd, data) < 0) {
-        qemuBlockStorageSourceAttachDataFree(data);
-        return -1;
-    }
+        qemuBuildBlockStorageSourceAttachDataCommandline(cmd, data) < 0)
+        goto cleanup;
 
+    ret = 0;
+
+ cleanup:
     qemuBlockStorageSourceAttachDataFree(data);
+    return ret;
+}
+
+
+static int
+qemuBuildDiskCommandLine(virCommandPtr cmd,
+                         const virDomainDef *def,
+                         virDomainDiskDefPtr disk,
+                         virQEMUCapsPtr qemuCaps,
+                         unsigned int bootindex,
+                         bool driveBoot)
+{
+    char *optstr;
+
+    if (qemuBuildDiskSourceCommandLine(cmd, disk, qemuCaps, driveBoot) < 0)
+        return -1;
 
     if (!qemuDiskBusNeedsDriveArg(disk->bus)) {
         if (disk->bus == VIR_DOMAIN_DISK_BUS_FDC) {