From: Ján Tomko <jtomko@redhat.com>
Date: Tue, 16 Jul 2019 08:35:44 +0000 (+0200)
Subject: qemu: command: re-introduce qemuBuildFSDevCommandLine
X-Git-Tag: v5.6.0-rc1~195
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da0f5aab3ee2395596467a4f1d8a27c0398f9098;p=thirdparty%2Flibvirt.git

qemu: command: re-introduce qemuBuildFSDevCommandLine

This time it only builds one device.

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

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 9d5d54fd6e..02a6642207 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -2801,6 +2801,33 @@ qemuBuildFSDevStr(const virDomainDef *def,
 }
 
 
+static int
+qemuBuildFSDevCommandLine(virCommandPtr cmd,
+                          virDomainFSDefPtr fs,
+                          const virDomainDef *def,
+                          virQEMUCapsPtr qemuCaps)
+{
+    char *optstr;
+
+    virCommandAddArg(cmd, "-fsdev");
+    if (!(optstr = qemuBuildFSStr(fs)))
+        return -1;
+    virCommandAddArg(cmd, optstr);
+    VIR_FREE(optstr);
+
+    if (qemuCommandAddExtDevice(cmd, &fs->info) < 0)
+        return -1;
+
+    virCommandAddArg(cmd, "-device");
+    if (!(optstr = qemuBuildFSDevStr(def, fs, qemuCaps)))
+        return -1;
+    virCommandAddArg(cmd, optstr);
+    VIR_FREE(optstr);
+
+    return 0;
+}
+
+
 static int
 qemuBuildFilesystemCommandLine(virCommandPtr cmd,
                                const virDomainDef *def,
@@ -2809,23 +2836,8 @@ qemuBuildFilesystemCommandLine(virCommandPtr cmd,
     size_t i;
 
     for (i = 0; i < def->nfss; i++) {
-        char *optstr;
-        virDomainFSDefPtr fs = def->fss[i];
-
-        virCommandAddArg(cmd, "-fsdev");
-        if (!(optstr = qemuBuildFSStr(fs)))
-            return -1;
-        virCommandAddArg(cmd, optstr);
-        VIR_FREE(optstr);
-
-        if (qemuCommandAddExtDevice(cmd, &fs->info) < 0)
-            return -1;
-
-        virCommandAddArg(cmd, "-device");
-        if (!(optstr = qemuBuildFSDevStr(def, fs, qemuCaps)))
+        if (qemuBuildFSDevCommandLine(cmd, def->fss[i], def, qemuCaps) < 0)
             return -1;
-        virCommandAddArg(cmd, optstr);
-        VIR_FREE(optstr);
     }
 
     return 0;