From: John Ferlan <jferlan@redhat.com>
Date: Mon, 4 Apr 2016 19:24:28 +0000 (-0400)
Subject: qemu: Fix mis-merge of qemuBuildChannelsCommandLine
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=48d5b3d81d06ed9b3441ddd5ad5d3f97b67a7126;p=libvirt.git

qemu: Fix mis-merge of qemuBuildChannelsCommandLine

Commit id '3cdcc910' 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 d176526031..9754693d9e 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -8483,12 +8483,12 @@ qemuBuildChannelsCommandLine(virLogManagerPtr logManager,
                 return -1;
             }
 
-            virCommandAddArg(cmd, "-chardev");
             if (!(devstr = qemuBuildChrChardevStr(logManager, cmd, def,
                                                   &channel->source,
                                                   channel->info.alias,
                                                   qemuCaps)))
                 return -1;
+            virCommandAddArg(cmd, "-chardev");
             virCommandAddArg(cmd, devstr);
             VIR_FREE(devstr);
 
@@ -8528,12 +8528,12 @@ qemuBuildChannelsCommandLine(virLogManagerPtr logManager,
                  * the newer -chardev interface.  */
                 ;
             } else {
-                virCommandAddArg(cmd, "-chardev");
                 if (!(devstr = qemuBuildChrChardevStr(logManager, cmd, def,
                                                       &channel->source,
                                                       channel->info.alias,
                                                       qemuCaps)))
                     return -1;
+                virCommandAddArg(cmd, "-chardev");
                 virCommandAddArg(cmd, devstr);
                 VIR_FREE(devstr);
             }