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

qemu: Fix mis-merge of qemuBuildSerialCommandLine

Commit id '5ab8640' 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 8236c9a32a..774ca37dc5 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -8388,12 +8388,12 @@ qemuBuildSerialCommandLine(virLogManagerPtr logManager,
 
         /* Use -chardev with -device if they are available */
         if (virQEMUCapsSupportsChardev(def, qemuCaps, serial)) {
-            virCommandAddArg(cmd, "-chardev");
             if (!(devstr = qemuBuildChrChardevStr(logManager, cmd, def,
                                                   &serial->source,
                                                   serial->info.alias,
                                                   qemuCaps)))
                 return -1;
+            virCommandAddArg(cmd, "-chardev");
             virCommandAddArg(cmd, devstr);
             VIR_FREE(devstr);