]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
qemu: Fix mis-merge of qemuBuildSerialCommandLine
authorJohn Ferlan <jferlan@redhat.com>
Mon, 4 Apr 2016 19:21:57 +0000 (15:21 -0400)
committerJohn Ferlan <jferlan@redhat.com>
Mon, 4 Apr 2016 19:21:57 +0000 (15:21 -0400)
Commit id '5ab8640' misapplied a merge of commit id '019244751'
to place the "-chardev" command after formatting the character
backend value.

src/qemu/qemu_command.c

index 8236c9a32aef046d38f42a4b21aa7cdf4aac617a..774ca37dc550b580014b08267bf9625944bb70ce 100644 (file)
@@ -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);