Revision 823bfa49 lib/hypervisor/hv_kvm.py

b/lib/hypervisor/hv_kvm.py
164 164 
    constants.HV_VNC_X509: hv_base.OPT_DIR_CHECK,
165 165 
    constants.HV_VNC_X509_VERIFY: hv_base.NO_CHECK,
166 166 
    constants.HV_VNC_PASSWORD_FILE: hv_base.OPT_FILE_CHECK,
167 
    constants.HV_CDROM_IMAGE_PATH: hv_base.OPT_FILE_CHECK,
167 
    constants.HV_CDROM_IMAGE_PATH: hv_base.OPT_FILE_OR_URL_CHECK,
168 168 
    constants.HV_BOOT_ORDER:
169 169 
      hv_base.ParamInSet(True, constants.HT_KVM_VALID_BO_TYPES),
170 170 
    constants.HV_NIC_TYPE:
......
567 567 

  		





  568
  568
  
    
    iso_image = hvp[constants.HV_CDROM_IMAGE_PATH]


  		





  569
  569
  
    
    if iso_image:


  		





  570
  
  
    
      options = ',format=raw,media=cdrom'


  		





  
  570
  
    
      options = ',media=cdrom'


  		





  
  571
  
    
      if not re.match(r'(https?|ftp)://', iso_image):


  		





  
  572
  
    
        options = "%s,format=raw" % options


  		





  571
  573
  
    
      if boot_cdrom:


  		





  572
  574
  
    
        kvm_cmd.extend(['-boot', 'd'])


  		





  573
  575
  
    
        if disk_type != constants.HT_DISK_IDE:


  		












Also available in:
  Unified diff