Commit 1b48f7af authored by Iustin Pop's avatar Iustin Pop
Browse files

Revert "kvm console: use socat raw mode with escape"

This reverts commit ce0eb669, since it depends
on 37fc2cf5

 which will be reverted too.
Signed-off-by: default avatarIustin Pop <>
Reviewed-by: default avatarMichael Hanselmann <>
parent d2231b8c
......@@ -165,8 +165,6 @@ XEN_INITRD = _autoconf.XEN_INITRD
KVM_PATH = _autoconf.KVM_PATH
VALUE_DEFAULT = "default"
......@@ -114,18 +114,6 @@ class KVMHypervisor(hv_base.BaseHypervisor):
return '%s/%s.serial' % (cls._CTRL_DIR, instance_name)
def _SocatUnixConsoleParams():
"""Returns the correct parameters for socat
If we have a new-enough socat we can use raw mode with an escape character.
if constants.SOCAT_ESCAPE:
return "raw,echo=0,escape=%s" % constants.SOCAT_ESCAPE_CODE
return "echo=0,icanon=0"
def _InstanceKVMRuntime(cls, instance_name):
"""Returns the instance KVM runtime filename
......@@ -690,8 +678,15 @@ class KVMHypervisor(hv_base.BaseHypervisor):
if hvparams[constants.HV_SERIAL_CONSOLE]:
shell_command = ("%s STDIO,%s UNIX-CONNECT:%s" %
(constants.SOCAT_PATH, cls._SocatUnixConsoleParams(),
# FIXME: The socat shell is not perfect. In particular the way we start
# it ctrl+c will close it, rather than being passed to the other end.
# On the other hand if we pass the option 'raw' (or ignbrk=1) there
# will be no way of exiting socat (except killing it from another shell)
# and ctrl+c doesn't work anyway, printing ^C rather than being
# interpreted by kvm. For now we'll leave it this way, which at least
# allows a minimal interaction and changes on the machine.
shell_command = ("%s STDIO,echo=0,icanon=0 UNIX-CONNECT:%s" %
shell_command = "echo 'No serial shell for instance %s'" %
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment