Revision 7238edb5 lib/hypervisor/hv_kvm.py

b/lib/hypervisor/hv_kvm.py
908 908

  
909 909
    """
910 910
    self._CheckDown(instance.name)
911
    kvm_runtime = self._GenerateKVMRuntime(instance, block_devices, startup_paused)
911
    kvm_runtime = self._GenerateKVMRuntime(instance, block_devices,
912
                                           startup_paused)
912 913
    self._SaveKVMRuntime(instance, kvm_runtime)
913 914
    self._ExecuteKVMRuntime(instance, kvm_runtime)
914 915

  
......
1140 1141

  
1141 1142
    """
1142 1143
    if hvparams[constants.HV_SERIAL_CONSOLE]:
1143
      cmd = [constants.KVM_CONSOLE_WRAPPER,
1144
             utils.ShellQuote(instance.name), constants.SOCAT_PATH,
1145
             utils.ShellQuote(cls._InstanceMonitor(instance.name)),
1144
      cmd = [constants.SOCAT_PATH,
1146 1145
             "STDIO,%s" % cls._SocatUnixConsoleParams(),
1147 1146
             "UNIX-CONNECT:%s" % cls._InstanceSerial(instance.name)]
1148 1147
      return objects.InstanceConsole(instance=instance.name,

Also available in: Unified diff