Export the cpu nodes and sockets from Xen
[ganeti-local] / lib / hypervisor / hv_kvm.py
index b3b8940..c3d1db5 100644 (file)
@@ -27,33 +27,82 @@ import os
 import os.path
 import re
 import tempfile
+import time
+import logging
 from cStringIO import StringIO
 
 from ganeti import utils
 from ganeti import constants
 from ganeti import errors
+from ganeti import serializer
+from ganeti import objects
 from ganeti.hypervisor import hv_base
 
 
 class KVMHypervisor(hv_base.BaseHypervisor):
-  """Fake hypervisor interface.
+  """KVM hypervisor interface"""
 
-  This can be used for testing the ganeti code without having to have
-  a real virtualisation software installed.
-
-  """
   _ROOT_DIR = constants.RUN_GANETI_DIR + "/kvm-hypervisor"
-  _PIDS_DIR = _ROOT_DIR + "/pid"
-  _CTRL_DIR = _ROOT_DIR + "/ctrl"
-  _DIRS = [_ROOT_DIR, _PIDS_DIR, _CTRL_DIR]
+  _PIDS_DIR = _ROOT_DIR + "/pid" # contains live instances pids
+  _CTRL_DIR = _ROOT_DIR + "/ctrl" # contains instances control sockets
+  _CONF_DIR = _ROOT_DIR + "/conf" # contains instances startup data
+  _DIRS = [_ROOT_DIR, _PIDS_DIR, _CTRL_DIR, _CONF_DIR]
+
+  PARAMETERS = [
+    constants.HV_KERNEL_PATH,
+    constants.HV_INITRD_PATH,
+    constants.HV_ROOT_PATH,
+    constants.HV_ACPI,
+    constants.HV_SERIAL_CONSOLE,
+    constants.HV_VNC_BIND_ADDRESS,
+    constants.HV_VNC_TLS,
+    constants.HV_VNC_X509,
+    constants.HV_VNC_X509_VERIFY,
+    constants.HV_CDROM_IMAGE_PATH,
+    constants.HV_BOOT_ORDER,
+    ]
+
+  _MIGRATION_STATUS_RE = re.compile('Migration\s+status:\s+(\w+)',
+                                    re.M | re.I)
 
   def __init__(self):
     hv_base.BaseHypervisor.__init__(self)
     # Let's make sure the directories we need exist, even if the RUN_DIR lives
     # in a tmpfs filesystem or has been otherwise wiped out.
-    for dir in self._DIRS:
-      if not os.path.exists(dir):
-        os.mkdir(dir)
+    for mydir in self._DIRS:
+      if not os.path.exists(mydir):
+        os.mkdir(mydir)
+
+  def _InstancePidAlive(self, instance_name):
+    """Returns the instance pid and pidfile
+
+    """
+    pidfile = "%s/%s" % (self._PIDS_DIR, instance_name)
+    pid = utils.ReadPidFile(pidfile)
+    alive = utils.IsProcessAlive(pid)
+
+    return (pidfile, pid, alive)
+
+  @classmethod
+  def _InstanceMonitor(cls, instance_name):
+    """Returns the instance monitor socket name
+
+    """
+    return '%s/%s.monitor' % (cls._CTRL_DIR, instance_name)
+
+  @classmethod
+  def _InstanceSerial(cls, instance_name):
+    """Returns the instance serial socket name
+
+    """
+    return '%s/%s.serial' % (cls._CTRL_DIR, instance_name)
+
+  @classmethod
+  def _InstanceKVMRuntime(cls, instance_name):
+    """Returns the instance KVM runtime filename
+
+    """
+    return '%s/%s.runtime' % (cls._CONF_DIR, instance_name)
 
   def _WriteNetScript(self, instance, seq, nic):
     """Write a script to connect a net interface to the proper bridge.
@@ -99,29 +148,27 @@ class KVMHypervisor(hv_base.BaseHypervisor):
   def ListInstances(self):
     """Get the list of running instances.
 
-    We can do this by listing our live instances directory and checking whether
-    the associated kvm process is still alive.
+    We can do this by listing our live instances directory and
+    checking whether the associated kvm process is still alive.
 
     """
     result = []
     for name in os.listdir(self._PIDS_DIR):
-      file = "%s/%s" % (self._PIDS_DIR, name)
-      if utils.IsProcessAlive(utils.ReadPidFile(file)):
+      filename = "%s/%s" % (self._PIDS_DIR, name)
+      if utils.IsProcessAlive(utils.ReadPidFile(filename)):
         result.append(name)
     return result
 
   def GetInstanceInfo(self, instance_name):
     """Get instance properties.
 
-    Args:
-      instance_name: the instance name
+    @param instance_name: the instance name
+
+    @return: tuple (name, id, memory, vcpus, stat, times)
 
-    Returns:
-      (name, id, memory, vcpus, stat, times)
     """
-    pidfile = "%s/%s" % (self._PIDS_DIR, instance_name)
-    pid = utils.ReadPidFile(pidfile)
-    if not utils.IsProcessAlive(pid):
+    pidfile, pid, alive = self._InstancePidAlive(instance_name)
+    if not alive:
       return None
 
     cmdline_file = "/proc/%s/cmdline" % pid
@@ -131,7 +178,7 @@ class KVMHypervisor(hv_base.BaseHypervisor):
         cmdline = fh.read()
       finally:
         fh.close()
-    except IOError, err:
+    except EnvironmentError, err:
       raise errors.HypervisorError("Failed to list instance %s: %s" %
                                    (instance_name, err))
 
@@ -153,110 +200,203 @@ class KVMHypervisor(hv_base.BaseHypervisor):
   def GetAllInstancesInfo(self):
     """Get properties of all instances.
 
-    Returns:
-      [(name, id, memory, vcpus, stat, times),...]
+    @return: list of tuples (name, id, memory, vcpus, stat, times)
+
     """
     data = []
     for name in os.listdir(self._PIDS_DIR):
-      file = "%s/%s" % (self._PIDS_DIR, name)
-      if utils.IsProcessAlive(utils.ReadPidFile(file)):
-        data.append(self.GetInstanceInfo(name))
+      filename = "%s/%s" % (self._PIDS_DIR, name)
+      if utils.IsProcessAlive(utils.ReadPidFile(filename)):
+        try:
+          info = self.GetInstanceInfo(name)
+        except errors.HypervisorError, err:
+          continue
+        if info:
+          data.append(info)
 
     return data
 
-  def StartInstance(self, instance, block_devices, extra_args):
-    """Start an instance.
+  def _GenerateKVMRuntime(self, instance, block_devices, extra_args):
+    """Generate KVM information to start an instance.
 
     """
-    temp_files = []
-    pidfile = self._PIDS_DIR + "/%s" % instance.name
-    if utils.IsProcessAlive(utils.ReadPidFile(pidfile)):
-      raise errors.HypervisorError("Failed to start instance %s: %s" %
-                                   (instance.name, "already running"))
-
+    pidfile, pid, alive = self._InstancePidAlive(instance.name)
     kvm = constants.KVM_PATH
     kvm_cmd = [kvm]
-    kvm_cmd.extend(['-m', instance.memory])
-    kvm_cmd.extend(['-smp', instance.vcpus])
+    kvm_cmd.extend(['-m', instance.beparams[constants.BE_MEMORY]])
+    kvm_cmd.extend(['-smp', instance.beparams[constants.BE_VCPUS]])
     kvm_cmd.extend(['-pidfile', pidfile])
     # used just by the vnc server, if enabled
     kvm_cmd.extend(['-name', instance.name])
     kvm_cmd.extend(['-daemonize'])
-    if not instance.hvm_acpi:
+    if not instance.hvparams[constants.HV_ACPI]:
       kvm_cmd.extend(['-no-acpi'])
-    if not instance.nics:
-      kvm_cmd.extend(['-net', 'none'])
-    else:
-      nic_seq = 0
-      for nic in instance.nics:
-        script = self._WriteNetScript(instance, nic_seq, nic)
-        # FIXME: handle other models
-        nic_val = "nic,macaddr=%s,model=virtio" % nic.mac
-        kvm_cmd.extend(['-net', nic_val])
-        kvm_cmd.extend(['-net', 'tap,script=%s' % script])
-        temp_files.append(script)
-        nic_seq += 1
 
-    boot_drive = True
-    for cfdev, rldev in block_devices:
+    boot_disk = (instance.hvparams[constants.HV_BOOT_ORDER] == "disk")
+    boot_cdrom = (instance.hvparams[constants.HV_BOOT_ORDER] == "cdrom")
+    for cfdev, dev_path in block_devices:
+      if cfdev.mode != constants.DISK_RDWR:
+        raise errors.HypervisorError("Instance has read-only disks which"
+                                     " are not supported by KVM")
       # TODO: handle FD_LOOP and FD_BLKTAP (?)
-      if boot_drive:
+      if boot_disk:
+        kvm_cmd.extend(['-boot', 'c'])
         boot_val = ',boot=on'
-        boot_drive = False
+        boot_disk = False
       else:
         boot_val = ''
 
       # TODO: handle different if= types
       if_val = ',if=virtio'
 
-      drive_val = 'file=%s,format=raw%s%s' % (rldev.dev_path, if_val, boot_val)
+      drive_val = 'file=%s,format=raw%s%s' % (dev_path, if_val, boot_val)
       kvm_cmd.extend(['-drive', drive_val])
 
-    # kernel handling
-    if instance.kernel_path in (None, constants.VALUE_DEFAULT):
-      kpath = constants.XEN_KERNEL # FIXME: other name??
-    else:
-      if not os.path.exists(instance.kernel_path):
-        raise errors.HypervisorError("The kernel %s for instance %s is"
-                                     " missing" % (instance.kernel_path,
-                                                   instance.name))
-      kpath = instance.kernel_path
-
-    kvm_cmd.extend(['-kernel', kpath])
-
-    # initrd handling
-    if instance.initrd_path in (None, constants.VALUE_DEFAULT):
-      if os.path.exists(constants.XEN_INITRD):
-        initrd_path = constants.XEN_INITRD
+    iso_image = instance.hvparams[constants.HV_CDROM_IMAGE_PATH]
+    if iso_image:
+      options = ',format=raw,media=cdrom'
+      if boot_cdrom:
+        kvm_cmd.extend(['-boot', 'd'])
+        options = '%s,boot=on' % options
+      else:
+        options = '%s,if=virtio' % options
+      drive_val = 'file=%s%s' % (iso_image, options)
+      kvm_cmd.extend(['-drive', drive_val])
+
+    kernel_path = instance.hvparams[constants.HV_KERNEL_PATH]
+    if kernel_path:
+      kvm_cmd.extend(['-kernel', kernel_path])
+      initrd_path = instance.hvparams[constants.HV_INITRD_PATH]
+      if initrd_path:
+        kvm_cmd.extend(['-initrd', initrd_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])
+
+    # FIXME: handle vnc password
+    vnc_bind_address = instance.hvparams[constants.HV_VNC_BIND_ADDRESS]
+    if vnc_bind_address:
+      kvm_cmd.extend(['-usbdevice', 'tablet'])
+      if utils.IsValidIP(vnc_bind_address):
+        if instance.network_port > constants.HT_HVM_VNC_BASE_PORT:
+          display = instance.network_port - constants.HT_HVM_VNC_BASE_PORT
+          if vnc_bind_address == '0.0.0.0':
+            vnc_arg = ':%d' % (display)
+          else:
+            vnc_arg = '%s:%d' % (constants.HV_VNC_BIND_ADDRESS, display)
+        else:
+          logging.error("Network port is not a valid VNC display (%d < %d)."
+                        " Not starting VNC" %
+                        (instance.network_port,
+                         constants.HT_HVM_VNC_BASE_PORT))
+          vnc_arg = 'none'
+
+        # Only allow tls and other option when not binding to a file, for now.
+        # kvm/qemu gets confused otherwise about the filename to use.
+        vnc_append = ''
+        if instance.hvparams[constants.HV_VNC_TLS]:
+          vnc_append = '%s,tls' % vnc_append
+          if instance.hvparams[constants.HV_VNC_X509_VERIFY]:
+            vnc_append = '%s,x509verify=%s' % (vnc_append,
+              instance.hvparams[constants.HV_VNC_X509])
+          elif instance.hvparams[constants.HV_VNC_X509]:
+            vnc_append = '%s,x509=%s' % (vnc_append,
+              instance.hvparams[constants.HV_VNC_X509])
+        vnc_arg = '%s%s' % (vnc_arg, vnc_append)
+
       else:
-        initrd_path = None
-    elif instance.initrd_path == constants.VALUE_NONE:
-      initrd_path = None
+        vnc_arg = 'unix:%s/%s.vnc' % (vnc_bind_address, instance.name)
+
+      kvm_cmd.extend(['-vnc', vnc_arg])
     else:
-      if not os.path.exists(instance.initrd_path):
-        raise errors.HypervisorError("The initrd %s for instance %s is"
-                                     " missing" % (instance.initrd_path,
-                                                   instance.name))
-      initrd_path = instance.initrd_path
-
-    if initrd_path:
-      kvm_cmd.extend(['-initrd', initrd_path])
-
-    kvm_cmd.extend(['-append', 'console=ttyS0,38400 root=/dev/vda'])
-
-    #"hvm_boot_order",
-    #"hvm_cdrom_image_path",
-
-    kvm_cmd.extend(['-nographic'])
-    # FIXME: handle vnc, if needed
-    # How do we decide whether to have it or not?? :(
-    #"vnc_bind_address",
-    #"network_port"
-    base_control = '%s/%s' % (self._CTRL_DIR, instance.name)
-    monitor_dev = 'unix:%s.monitor,server,nowait' % base_control
+      kvm_cmd.extend(['-nographic'])
+
+    monitor_dev = 'unix:%s,server,nowait' % \
+      self._InstanceMonitor(instance.name)
     kvm_cmd.extend(['-monitor', monitor_dev])
-    serial_dev = 'unix:%s.serial,server,nowait' % base_control
-    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.
+    kvm_nics = instance.nics
+
+    return (kvm_cmd, kvm_nics)
+
+  def _WriteKVMRuntime(self, instance_name, data):
+    """Write an instance's KVM runtime
+
+    """
+    try:
+      utils.WriteFile(self._InstanceKVMRuntime(instance_name),
+                      data=data)
+    except EnvironmentError, err:
+      raise errors.HypervisorError("Failed to save KVM runtime file: %s" % err)
+
+  def _ReadKVMRuntime(self, instance_name):
+    """Read an instance's KVM runtime
+
+    """
+    try:
+      file_content = utils.ReadFile(self._InstanceKVMRuntime(instance_name))
+    except EnvironmentError, err:
+      raise errors.HypervisorError("Failed to load KVM runtime file: %s" % err)
+    return file_content
+
+  def _SaveKVMRuntime(self, instance, kvm_runtime):
+    """Save an instance's KVM runtime
+
+    """
+    kvm_cmd, kvm_nics = kvm_runtime
+    serialized_nics = [nic.ToDict() for nic in kvm_nics]
+    serialized_form = serializer.Dump((kvm_cmd, serialized_nics))
+    self._WriteKVMRuntime(instance.name, serialized_form)
+
+  def _LoadKVMRuntime(self, instance, serialized_runtime=None):
+    """Load an instance's KVM runtime
+
+    """
+    if not serialized_runtime:
+      serialized_runtime = self._ReadKVMRuntime(instance.name)
+    loaded_runtime = serializer.Load(serialized_runtime)
+    kvm_cmd, serialized_nics = loaded_runtime
+    kvm_nics = [objects.NIC.FromDict(snic) for snic in serialized_nics]
+    return (kvm_cmd, kvm_nics)
+
+  def _ExecuteKVMRuntime(self, instance, kvm_runtime, incoming=None):
+    """Execute a KVM cmd, after completing it with some last minute data
+
+    @type incoming: tuple of strings
+    @param incoming: (target_host_ip, port)
+
+    """
+    pidfile, pid, alive = self._InstancePidAlive(instance.name)
+    if alive:
+      raise errors.HypervisorError("Failed to start instance %s: %s" %
+                                   (instance.name, "already running"))
+
+    temp_files = []
+
+    kvm_cmd, kvm_nics = kvm_runtime
+
+    if not kvm_nics:
+      kvm_cmd.extend(['-net', 'none'])
+    else:
+      for nic_seq, nic in enumerate(kvm_nics):
+        nic_val = "nic,macaddr=%s,model=virtio" % nic.mac
+        script = self._WriteNetScript(instance, nic_seq, nic)
+        kvm_cmd.extend(['-net', nic_val])
+        kvm_cmd.extend(['-net', 'tap,script=%s' % script])
+        temp_files.append(script)
+
+    if incoming:
+      target, port = incoming
+      kvm_cmd.extend(['-incoming', 'tcp:%s:%s' % (target, port)])
 
     result = utils.RunCmd(kvm_cmd)
     if result.failed:
@@ -268,30 +408,72 @@ class KVMHypervisor(hv_base.BaseHypervisor):
       raise errors.HypervisorError("Failed to start instance %s: %s" %
                                    (instance.name))
 
-    for file in temp_files:
-      utils.RemoveFile(file)
+    for filename in temp_files:
+      utils.RemoveFile(filename)
+
+  def StartInstance(self, instance, block_devices, extra_args):
+    """Start an instance.
+
+    """
+    pidfile, pid, alive = self._InstancePidAlive(instance.name)
+    if alive:
+      raise errors.HypervisorError("Failed to start instance %s: %s" %
+                                   (instance.name, "already running"))
+
+    kvm_runtime = self._GenerateKVMRuntime(instance, block_devices, extra_args)
+    self._SaveKVMRuntime(instance, kvm_runtime)
+    self._ExecuteKVMRuntime(instance, kvm_runtime)
+
+  def _CallMonitorCommand(self, instance_name, command):
+    """Invoke a command on the instance monitor.
+
+    """
+    socat = ("echo %s | %s STDIO UNIX-CONNECT:%s" %
+             (utils.ShellQuote(command),
+              constants.SOCAT_PATH,
+              utils.ShellQuote(self._InstanceMonitor(instance_name))))
+    result = utils.RunCmd(socat)
+    if result.failed:
+      msg = ("Failed to send command '%s' to instance %s."
+             " output: %s, error: %s, fail_reason: %s" %
+             (instance.name, result.stdout, result.stderr, result.fail_reason))
+      raise errors.HypervisorError(msg)
+
+    return result
+
+  def _RetryInstancePowerdown(self, instance, pid, timeout=30):
+    """Wait for an instance  to power down.
+
+    """
+    # Wait up to $timeout seconds
+    end = time.time() + timeout
+    wait = 1
+    while time.time() < end and utils.IsProcessAlive(pid):
+      self._CallMonitorCommand(instance.name, 'system_powerdown')
+      time.sleep(wait)
+      # Make wait time longer for next try
+      if wait < 5:
+        wait *= 1.3
 
   def StopInstance(self, instance, force=False):
     """Stop an instance.
 
     """
-    pid_file = self._PIDS_DIR + "/%s" % instance.name
-    pid = utils.ReadPidFile(pid_file)
-    if pid > 0 and utils.IsProcessAlive(pid):
-      if force or not instance.hvm_acpi:
+    pidfile, pid, alive = self._InstancePidAlive(instance.name)
+    if pid > 0 and alive:
+      if force or not instance.hvparams[constants.HV_ACPI]:
         utils.KillProcess(pid)
       else:
-        # This only works if the instance os has acpi support
-        monitor_socket = '%s/%s.monitor'  % (self._CTRL_DIR, instance.name)
-        socat = 'socat -u STDIN UNIX-CONNECT:%s' % monitor_socket
-        command = "echo 'system_powerdown' | %s" % socat
-        result = utils.RunCmd(command)
-        if result.failed:
-          raise errors.HypervisorError("Failed to stop instance %s: %s" %
-                                       (instance.name, result.fail_reason))
+        self._RetryInstancePowerdown(instance, pid)
 
     if not utils.IsProcessAlive(pid):
-      utils.RemoveFile(pid_file)
+      utils.RemoveFile(pidfile)
+      utils.RemoveFile(self._InstanceMonitor(instance.name))
+      utils.RemoveFile(self._InstanceSerial(instance.name))
+      utils.RemoveFile(self._InstanceKVMRuntime(instance.name))
+      return True
+    else:
+      return False
 
   def RebootInstance(self, instance):
     """Reboot an instance.
@@ -300,17 +482,121 @@ class KVMHypervisor(hv_base.BaseHypervisor):
     # For some reason if we do a 'send-key ctrl-alt-delete' to the control
     # socket the instance will stop, but now power up again. So we'll resort
     # to shutdown and restart.
-    self.StopInstance(instance)
-    self.StartInstance(instance)
+    pidfile, pid, alive = self._InstancePidAlive(instance.name)
+    if not alive:
+      raise errors.HypervisorError("Failed to reboot instance %s: not running" %
+                                             (instance.name))
+    # StopInstance will delete the saved KVM runtime so:
+    # ...first load it...
+    kvm_runtime = self._LoadKVMRuntime(instance)
+    # ...now we can safely call StopInstance...
+    if not self.StopInstance(instance):
+      self.StopInstance(instance, force=True)
+    # ...and finally we can save it again, and execute it...
+    self._SaveKVMRuntime(instance, kvm_runtime)
+    self._ExecuteKVMRuntime(instance, kvm_runtime)
+
+  def MigrationInfo(self, instance):
+    """Get instance information to perform a migration.
+
+    @type instance: L{objects.Instance}
+    @param instance: instance to be migrated
+    @rtype: string
+    @return: content of the KVM runtime file
+
+    """
+    return self._ReadKVMRuntime(instance.name)
+
+  def AcceptInstance(self, instance, info, target):
+    """Prepare to accept an instance.
+
+    @type instance: L{objects.Instance}
+    @param instance: instance to be accepted
+    @type info: string
+    @param info: content of the KVM runtime file on the source node
+    @type target: string
+    @param target: target host (usually ip), on this node
+
+    """
+    kvm_runtime = self._LoadKVMRuntime(instance, serialized_runtime=info)
+    incoming_address = (target, constants.KVM_MIGRATION_PORT)
+    self._ExecuteKVMRuntime(instance, kvm_runtime, incoming=incoming_address)
+
+  def FinalizeMigration(self, instance, info, success):
+    """Finalize an instance migration.
+
+    Stop the incoming mode KVM.
+
+    @type instance: L{objects.Instance}
+    @param instance: instance whose migration is being aborted
+
+    """
+    if success:
+      self._WriteKVMRuntime(instance.name, info)
+    else:
+      self.StopInstance(instance, force=True)
+
+  def MigrateInstance(self, instance_name, target, live):
+    """Migrate an instance to a target node.
+
+    The migration will not be attempted if the instance is not
+    currently running.
+
+    @type instance_name: string
+    @param instance_name: name of the instance to be migrated
+    @type target: string
+    @param target: ip address of the target node
+    @type live: boolean
+    @param live: perform a live migration
+
+    """
+    pidfile, pid, alive = self._InstancePidAlive(instance_name)
+    if not alive:
+      raise errors.HypervisorError("Instance not running, cannot migrate")
+
+    if not live:
+      self._CallMonitorCommand(instance_name, 'stop')
+
+    migrate_command = ('migrate -d tcp:%s:%s' %
+                       (target, constants.KVM_MIGRATION_PORT))
+    self._CallMonitorCommand(instance_name, migrate_command)
+
+    info_command = 'info migrate'
+    done = False
+    while not done:
+      result = self._CallMonitorCommand(instance_name, info_command)
+      match = self._MIGRATION_STATUS_RE.search(result.stdout)
+      if not match:
+        raise errors.HypervisorError("Unknown 'info migrate' result: %s" %
+                                     result.stdout)
+      else:
+        status = match.group(1)
+        if status == 'completed':
+          done = True
+        elif status == 'active':
+          time.sleep(2)
+        elif status == 'failed' or status == 'cancelled':
+          if not live:
+            self._CallMonitorCommand(instance_name, 'cont')
+          raise errors.HypervisorError("Migration %s at the kvm level" %
+                                       status)
+        else:
+          logging.info("KVM: unknown migration status '%s'" % status)
+          time.sleep(2)
+
+    utils.KillProcess(pid)
+    utils.RemoveFile(pidfile)
+    utils.RemoveFile(self._InstanceMonitor(instance_name))
+    utils.RemoveFile(self._InstanceSerial(instance_name))
+    utils.RemoveFile(self._InstanceKVMRuntime(instance_name))
 
   def GetNodeInfo(self):
     """Return information about the node.
 
-    The return value is a dict, which has to have the following items:
-      (all values in MiB)
-      - memory_total: the total memory size on the node
-      - memory_free: the available memory on the node for instances
-      - memory_dom0: the memory used by the node itself, if available
+    @return: a dict with the following keys (values in MiB):
+          - memory_total: the total memory size on the node
+          - memory_free: the available memory on the node for instances
+          - memory_dom0: the memory used by the node itself, if available
 
     """
     # global ram usage from the xm info command
@@ -323,7 +609,7 @@ class KVMHypervisor(hv_base.BaseHypervisor):
         data = fh.readlines()
       finally:
         fh.close()
-    except IOError, err:
+    except EnvironmentError, err:
       raise errors.HypervisorError("Failed to list node info: %s" % err)
 
     result = {}
@@ -353,16 +639,42 @@ class KVMHypervisor(hv_base.BaseHypervisor):
     except EnvironmentError, err:
       raise errors.HypervisorError("Failed to list node info: %s" % err)
     result['cpu_total'] = cpu_total
+    # FIXME: export correct data here
+    result['cpu_nodes'] = 1
+    result['cpu_sockets'] = 1
 
     return result
 
-  @staticmethod
-  def GetShellCommandForConsole(instance):
+  @classmethod
+  def GetShellCommandForConsole(cls, instance, hvparams, beparams):
     """Return a command for connecting to the console of an instance.
 
     """
-    # TODO: we can either try the serial socket or suggest vnc
-    return "echo Console not available for the kvm hypervisor yet"
+    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
+
+    vnc_bind_address = hvparams[constants.HV_VNC_BIND_ADDRESS]
+    if vnc_bind_address:
+      if instance.network_port > constants.HT_HVM_VNC_BASE_PORT:
+        display = instance.network_port - constants.HT_HVM_VNC_BASE_PORT
+        vnc_command = ("echo 'Instance has VNC listening on %s:%d"
+                       " (display: %d)'" % (vnc_bind_address,
+                                            instance.network_port,
+                                            display))
+        shell_command = "%s; %s" % (vnc_command, shell_command)
+
+    return shell_command
 
   def Verify(self):
     """Verify the hypervisor.
@@ -372,4 +684,101 @@ class KVMHypervisor(hv_base.BaseHypervisor):
     """
     if not os.path.exists(constants.KVM_PATH):
       return "The kvm binary ('%s') does not exist." % constants.KVM_PATH
+    if not os.path.exists(constants.SOCAT_PATH):
+      return "The socat binary ('%s') does not exist." % constants.SOCAT_PATH
+
+
+  @classmethod
+  def CheckParameterSyntax(cls, hvparams):
+    """Check the given parameters for validity.
+
+    For the KVM hypervisor, this only check the existence of the
+    kernel.
 
+    @type hvparams:  dict
+    @param hvparams: dictionary with parameter names/value
+    @raise errors.HypervisorError: when a parameter is not valid
+
+    """
+    super(KVMHypervisor, cls).CheckParameterSyntax(hvparams)
+
+    kernel_path = hvparams[constants.HV_KERNEL_PATH]
+    if kernel_path:
+      if not os.path.isabs(hvparams[constants.HV_KERNEL_PATH]):
+        raise errors.HypervisorError("The kernel path must be an absolute path"
+                                     ", if defined")
+
+      if not hvparams[constants.HV_ROOT_PATH]:
+        raise errors.HypervisorError("Need a root partition for the instance"
+                                     ", if a kernel is defined")
+
+    if hvparams[constants.HV_INITRD_PATH]:
+      if not os.path.isabs(hvparams[constants.HV_INITRD_PATH]):
+        raise errors.HypervisorError("The initrd path must an absolute path"
+                                     ", if defined")
+
+    vnc_bind_address = hvparams[constants.HV_VNC_BIND_ADDRESS]
+    if vnc_bind_address:
+      if not utils.IsValidIP(vnc_bind_address):
+        if not os.path.isabs(vnc_bind_address):
+          raise errors.HypervisorError("The VNC bind address must be either"
+                                       " a valid IP address or an absolute"
+                                       " pathname. '%s' given" %
+                                       vnc_bind_address)
+
+    if hvparams[constants.HV_VNC_X509_VERIFY] and \
+      not hvparams[constants.HV_VNC_X509]:
+        raise errors.HypervisorError("%s must be defined, if %s is" %
+                                     (constants.HV_VNC_X509,
+                                      constants.HV_VNC_X509_VERIFY))
+
+    if hvparams[constants.HV_VNC_X509]:
+      if not os.path.isabs(hvparams[constants.HV_VNC_X509]):
+        raise errors.HypervisorError("The vnc x509 path must an absolute path"
+                                     ", if defined")
+
+    iso_path = hvparams[constants.HV_CDROM_IMAGE_PATH]
+    if iso_path and not os.path.isabs(iso_path):
+      raise errors.HypervisorError("The path to the CDROM image must be"
+                                   " an absolute path, if defined")
+
+    boot_order = hvparams[constants.HV_BOOT_ORDER]
+    if boot_order not in ('cdrom', 'disk'):
+      raise errors.HypervisorError("The boot order must be 'cdrom' or 'disk'")
+
+    if boot_order == 'cdrom' and not iso_path:
+      raise errors.HypervisorError("Cannot boot from cdrom without an ISO path")
+
+  def ValidateParameters(self, hvparams):
+    """Check the given parameters for validity.
+
+    For the KVM hypervisor, this checks the existence of the
+    kernel.
+
+    """
+    super(KVMHypervisor, self).ValidateParameters(hvparams)
+
+    kernel_path = hvparams[constants.HV_KERNEL_PATH]
+    if kernel_path and not os.path.isfile(kernel_path):
+      raise errors.HypervisorError("Instance kernel '%s' not found or"
+                                   " not a file" % kernel_path)
+    initrd_path = hvparams[constants.HV_INITRD_PATH]
+    if initrd_path and not os.path.isfile(initrd_path):
+      raise errors.HypervisorError("Instance initrd '%s' not found or"
+                                   " not a file" % initrd_path)
+
+    vnc_bind_address = hvparams[constants.HV_VNC_BIND_ADDRESS]
+    if vnc_bind_address and not utils.IsValidIP(vnc_bind_address) and \
+       not os.path.isdir(vnc_bind_address):
+       raise errors.HypervisorError("Instance vnc bind address must be either"
+                                    " an ip address or an existing directory")
+
+    vnc_x509 = hvparams[constants.HV_VNC_X509]
+    if vnc_x509 and not os.path.isdir(vnc_x509):
+      raise errors.HypervisorError("Instance vnc x509 path '%s' not found"
+                                   " or not a directory" % vnc_x509)
+
+    iso_path = hvparams[constants.HV_CDROM_IMAGE_PATH]
+    if iso_path and not os.path.isfile(iso_path):
+      raise errors.HypervisorError("Instance cdrom image '%s' not found or"
+                                   " not a file" % iso_path)