提交 dde91ab9 编写于 作者: J Jan Kiszka 提交者: Eric Blake

Do not enforce source type of console[0]

If console[0] is an alias for serial[0], do not enforce the former to
have a PTY source type. This breaks serial consoles on stdio and makes
no sense.
Signed-off-by: NJan Kiszka <jan.kiszka@siemens.com>
上级 10c31135
...@@ -231,6 +231,7 @@ Patches have also been contributed by: ...@@ -231,6 +231,7 @@ Patches have also been contributed by:
Ilja Livenson <ilja.livenson@gmail.com> Ilja Livenson <ilja.livenson@gmail.com>
Stefan Bader <stefan.bader@canonical.com> Stefan Bader <stefan.bader@canonical.com>
MATSUDA Daiki <matsudadik@intellilink.co.jp> MATSUDA Daiki <matsudadik@intellilink.co.jp>
Jan Kiszka <jan.kiszka@siemens.com>
[....send patches to get your name here....] [....send patches to get your name here....]
......
...@@ -1497,7 +1497,6 @@ qemuProcessFindCharDevicePTYs(virDomainObjPtr vm, ...@@ -1497,7 +1497,6 @@ qemuProcessFindCharDevicePTYs(virDomainObjPtr vm,
if ((ret = virDomainChrSourceDefCopy(&chr->source, if ((ret = virDomainChrSourceDefCopy(&chr->source,
&((vm->def->serials[0])->source))) != 0) &((vm->def->serials[0])->source))) != 0)
return ret; return ret;
chr->source.type = VIR_DOMAIN_CHR_TYPE_PTY;
} else { } else {
if (chr->source.type == VIR_DOMAIN_CHR_TYPE_PTY && if (chr->source.type == VIR_DOMAIN_CHR_TYPE_PTY &&
chr->targetType == VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_VIRTIO) { chr->targetType == VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_VIRTIO) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册