提交 48d5b3d8 编写于 作者: J John Ferlan

qemu: Fix mis-merge of qemuBuildChannelsCommandLine

Commit id '3cdcc910' misapplied a merge of commit id '01924475'
to place the "-chardev" command after formatting the character
backend value.
上级 6a97e35f
...@@ -8483,12 +8483,12 @@ qemuBuildChannelsCommandLine(virLogManagerPtr logManager, ...@@ -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, ...@@ -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);
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册