From: John Ferlan <jferlan@redhat.com>
Date: Mon, 4 Apr 2016 19:23:07 +0000 (-0400)
Subject: qemu: Fix mis-merge of qemuBuildParallelsCommandLine
X-Git-Tag: v1.3.3~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6a97e35f827031daecd3258d72fa1d26a9c945e5;p=thirdparty%2Flibvirt.git

qemu: Fix mis-merge of qemuBuildParallelsCommandLine

Commit id '0e1e7ade' misapplied a merge of commit id '019244751'
to place the "-chardev" command after formatting the character
backend value.
---

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 774ca37dc5..d176526031 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -8436,12 +8436,12 @@ qemuBuildParallelsCommandLine(virLogManagerPtr logManager,
         /* Use -chardev with -device if they are available */
         if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_CHARDEV) &&
             virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) {
-            virCommandAddArg(cmd, "-chardev");
             if (!(devstr = qemuBuildChrChardevStr(logManager, cmd, def,
                                                   &parallel->source,
                                                   parallel->info.alias,
                                                   qemuCaps)))
                 return -1;
+            virCommandAddArg(cmd, "-chardev");
             virCommandAddArg(cmd, devstr);
             VIR_FREE(devstr);