]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemu: Fix mis-merge of qemuBuildParallelsCommandLine
authorJohn Ferlan <jferlan@redhat.com>
Mon, 4 Apr 2016 19:23:07 +0000 (15:23 -0400)
committerJohn Ferlan <jferlan@redhat.com>
Mon, 4 Apr 2016 19:23:07 +0000 (15:23 -0400)
Commit id '0e1e7ade' misapplied a merge of commit id '019244751'
to place the "-chardev" command after formatting the character
backend value.

src/qemu/qemu_command.c

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