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

src/qemu/qemu_command.c

index 42eeef767a460176a2a6deaabe6c4d11e26ea4f9..9001d064ca6555718bccb34de2318758cbddf781 100644 (file)
@@ -8723,7 +8723,6 @@ qemuBuildRedirdevCommandLine(virLogManagerPtr logManager,
         virDomainRedirdevDefPtr redirdev = def->redirdevs[i];
         char *devstr;
 
-        virCommandAddArg(cmd, "-chardev");
         if (!(devstr = qemuBuildChrChardevStr(logManager, cmd, def,
                                               &redirdev->source.chr,
                                               redirdev->info.alias,
@@ -8731,6 +8730,7 @@ qemuBuildRedirdevCommandLine(virLogManagerPtr logManager,
             return -1;
         }
 
+        virCommandAddArg(cmd, "-chardev");
         virCommandAddArg(cmd, devstr);
         VIR_FREE(devstr);