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

qemu: Fix mis-merge of qemuBuildConsoleCommandLine

Commit id 'e6944a52' 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 9754693d9e..42eeef767a 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -8575,12 +8575,12 @@ qemuBuildConsoleCommandLine(virLogManagerPtr logManager,
                 return -1;
             }
 
-            virCommandAddArg(cmd, "-chardev");
             if (!(devstr = qemuBuildChrChardevStr(logManager, cmd, def,
                                                   &console->source,
                                                   console->info.alias,
                                                   qemuCaps)))
                 return -1;
+            virCommandAddArg(cmd, "-chardev");
             virCommandAddArg(cmd, devstr);
             VIR_FREE(devstr);
 
@@ -8595,12 +8595,12 @@ qemuBuildConsoleCommandLine(virLogManagerPtr logManager,
                 return -1;
             }
 
-            virCommandAddArg(cmd, "-chardev");
             if (!(devstr = qemuBuildChrChardevStr(logManager, cmd, def,
                                                   &console->source,
                                                   console->info.alias,
                                                   qemuCaps)))
                 return -1;
+            virCommandAddArg(cmd, "-chardev");
             virCommandAddArg(cmd, devstr);
             VIR_FREE(devstr);