External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-10 23:07:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Fix mis-merge of qemuBuildChannelsCommandLine

Browse Source 
Commit id '3cdcc910' misapplied a merge of commit id '019244751'
to place the "-chardev" command after formatting the character
backend value.
This commit is contained in:
John Ferlan 2016-04-04 15:24:28 -04:00
parent 6a97e35f82
commit 48d5b3d81d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/qemu/qemu_command.c
View File

@ -8483,12 +8483,12 @@ qemuBuildChannelsCommandLine(virLogManagerPtr logManager,
return -1; return -1;
} }
virCommandAddArg(cmd, "-chardev");
if (!(devstr = qemuBuildChrChardevStr(logManager, cmd, def, if (!(devstr = qemuBuildChrChardevStr(logManager, cmd, def,
&channel->source, &channel->source,
channel->info.alias, channel->info.alias,
qemuCaps))) qemuCaps)))
return -1; return -1;
virCommandAddArg(cmd, "-chardev");
virCommandAddArg(cmd, devstr); virCommandAddArg(cmd, devstr);
VIR_FREE(devstr); VIR_FREE(devstr);
@ -8528,12 +8528,12 @@ qemuBuildChannelsCommandLine(virLogManagerPtr logManager,
* the newer -chardev interface. */ * the newer -chardev interface. */
; ;
} else { } else {
virCommandAddArg(cmd, "-chardev");
if (!(devstr = qemuBuildChrChardevStr(logManager, cmd, def, if (!(devstr = qemuBuildChrChardevStr(logManager, cmd, def,
&channel->source, &channel->source,
channel->info.alias, channel->info.alias,
qemuCaps))) qemuCaps)))
return -1; return -1;
virCommandAddArg(cmd, "-chardev");
virCommandAddArg(cmd, devstr); virCommandAddArg(cmd, devstr);
VIR_FREE(devstr); VIR_FREE(devstr);
} }