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

src/qemu/qemu_command.c

index 9754693d9e22f7411f561b2fa448e731d0640fa4..42eeef767a460176a2a6deaabe6c4d11e26ea4f9 100644 (file)
@@ -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);