From a2faf9ee552bf7f0bbb7e03e0be05562763fcb01 Mon Sep 17 00:00:00 2001
From: Guido Trotter <ultrotter@google.com>
Date: Thu, 29 Jan 2009 15:47:21 +0000
Subject: [PATCH] KVM: add the HV_SERIAL_CONSOLE parameter
Up until now a KVM instance was forced to have a serial port.
With this change this is no longer mandatory, by default we'll use one,
but if the HV_SERIAL_CONSOLE parameter is set to False we'll do without.
Reviewed-by: iustinp
---
lib/constants.py | 3 +++
lib/hypervisor/hv_kvm.py | 41 ++++++++++++++++++++++++----------------
2 files changed, 28 insertions(+), 16 deletions(-)
diff --git a/lib/constants.py b/lib/constants.py
index 9d85e6193..7efb21d28 100644
--- a/lib/constants.py
+++ b/lib/constants.py
@@ -288,6 +288,7 @@ HV_PAE = "pae"
HV_KERNEL_PATH = "kernel_path"
HV_INITRD_PATH = "initrd_path"
HV_ROOT_PATH = "root_path"
+HV_SERIAL_CONSOLE = "serial_console"
HVS_PARAMETERS = frozenset([
HV_BOOT_ORDER,
@@ -300,6 +301,7 @@ HVS_PARAMETERS = frozenset([
HV_KERNEL_PATH,
HV_INITRD_PATH,
HV_ROOT_PATH,
+ HV_SERIAL_CONSOLE,
])
# BE parameter names
@@ -444,6 +446,7 @@ HVC_DEFAULTS = {
HV_INITRD_PATH: None,
HV_ROOT_PATH: '/dev/vda',
HV_ACPI: True,
+ HV_SERIAL_CONSOLE: True,
},
HT_FAKE: {
},
diff --git a/lib/hypervisor/hv_kvm.py b/lib/hypervisor/hv_kvm.py
index a2a258410..48a8850c9 100644
--- a/lib/hypervisor/hv_kvm.py
+++ b/lib/hypervisor/hv_kvm.py
@@ -53,6 +53,7 @@ class KVMHypervisor(hv_base.BaseHypervisor):
constants.HV_INITRD_PATH,
constants.HV_ROOT_PATH,
constants.HV_ACPI,
+ constants.HV_SERIAL_CONSOLE,
]
_MIGRATION_STATUS_RE = re.compile('Migration\s+status:\s+(\w+)',
@@ -244,8 +245,11 @@ class KVMHypervisor(hv_base.BaseHypervisor):
if initrd_path:
kvm_cmd.extend(['-initrd', initrd_path])
- root_path = instance.hvparams[constants.HV_ROOT_PATH]
- kvm_cmd.extend(['-append', 'console=ttyS0,38400 root=%s ro' % root_path])
+ root_append = 'root=%s ro' % instance.hvparams[constants.HV_ROOT_PATH]
+ if instance.hvparams[constants.HV_SERIAL_CONSOLE]:
+ kvm_cmd.extend(['-append', 'console=ttyS0,38400 %s' % root_append])
+ else:
+ kvm_cmd.extend(['-append', root_append])
#"hvm_boot_order",
#"hvm_cdrom_image_path",
@@ -258,8 +262,11 @@ class KVMHypervisor(hv_base.BaseHypervisor):
monitor_dev = 'unix:%s,server,nowait' % \
self._InstanceMonitor(instance.name)
kvm_cmd.extend(['-monitor', monitor_dev])
- serial_dev = 'unix:%s,server,nowait' % self._InstanceSerial(instance.name)
- kvm_cmd.extend(['-serial', serial_dev])
+ if instance.hvparams[constants.HV_SERIAL_CONSOLE]:
+ serial_dev = 'unix:%s,server,nowait' % self._InstanceSerial(instance.name)
+ kvm_cmd.extend(['-serial', serial_dev])
+ else:
+ kvm_cmd.extend(['-serial', 'none'])
# Save the current instance nics, but defer their expansion as parameters,
# as we'll need to generate executable temp files for them.
@@ -586,18 +593,20 @@ class KVMHypervisor(hv_base.BaseHypervisor):
"""Return a command for connecting to the console of an instance.
"""
- # 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.
- socat_shell = ("%s STDIO,echo=0,icanon=0 UNIX-CONNECT:%s" %
- (constants.SOCAT_PATH,
- utils.ShellQuote(cls._InstanceSerial(instance.name))))
-
- return socat_shell
+ if hvparams[constants.HV_SERIAL_CONSOLE]:
+ # 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" %
+ (constants.SOCAT_PATH,
+ utils.ShellQuote(cls._InstanceSerial(instance.name))))
+ else:
+ shell_command = "echo 'No serial shell for instance %s'" % instance.name
+ return shell_command
def Verify(self):
"""Verify the hypervisor.
--
GitLab