Revision 14fd6c81 lib/hypervisor/hv_kvm.py

b/lib/hypervisor/hv_kvm.py
466 466 
    constants.HV_KERNEL_ARGS: hv_base.NO_CHECK,
467 467 
    constants.HV_ACPI: hv_base.NO_CHECK,
468 468 
    constants.HV_SERIAL_CONSOLE: hv_base.NO_CHECK,
469 
    constants.HV_SERIAL_SPEED: hv_base.NO_CHECK,
469 470 
    constants.HV_VNC_BIND_ADDRESS:
470 471 
      (False, lambda x: (netutils.IP4Address.IsValid(x) or
471 472 
                         utils.IsNormAbsPath(x)),
......
1135 1136 
      root_append = ["root=%s" % hvp[constants.HV_ROOT_PATH],
1136 1137 
                     hvp[constants.HV_KERNEL_ARGS]]
1137 1138 
      if hvp[constants.HV_SERIAL_CONSOLE]:
1138 
        root_append.append("console=ttyS0,38400")
1139 
        serial_speed = hvp[constants.HV_SERIAL_SPEED]
1140 
        root_append.append("console=ttyS0,%s" % serial_speed)
1139 1141 
      kvm_cmd.extend(["-append", " ".join(root_append)])
1140 1142 

  		





  1141
  1143
  
    
    mem_path = hvp[constants.HV_MEM_PATH]


  		





  ......




  1949
  1951
  
    
                                   (constants.HV_VNC_X509,


  		





  1950
  1952
  
    
                                    constants.HV_VNC_X509_VERIFY))


  		





  1951
  1953
  
    

  		





  
  1954
  
    
    if hvparams[constants.HV_SERIAL_CONSOLE]:


  		





  
  1955
  
    
      serial_speed = hvparams[constants.HV_SERIAL_SPEED]


  		





  
  1956
  
    
      valid_speeds = constants.VALID_SERIAL_SPEEDS


  		





  
  1957
  
    
      if not serial_speed or serial_speed not in valid_speeds:


  		





  
  1958
  
    
        raise errors.HypervisorError("Invalid serial console speed, must be"


  		





  
  1959
  
    
                                     " one of: %s" %


  		





  
  1960
  
    
                                     utils.CommaJoin(valid_speeds))


  		





  
  1961
  
    

  		





  1952
  1962
  
    
    boot_order = hvparams[constants.HV_BOOT_ORDER]


  		





  1953
  1963
  
    
    if (boot_order == constants.HT_BO_CDROM and


  		





  1954
  1964
  
    
        not hvparams[constants.HV_CDROM_IMAGE_PATH]):


  		












Also available in:
  Unified diff