Revision 9dd363eb lib/hypervisor/hv_kvm.py

b/lib/hypervisor/hv_kvm.py
240 240 
                                     " are not supported by KVM")
241 241 
      # TODO: handle FD_LOOP and FD_BLKTAP (?)
242 242 
      if boot_disk:
243 
        kvm_cmd.extend(['-boot', 'c'])
243 244 
        boot_val = ',boot=on'
244 245 
        boot_disk = False
245 246 
      else:
......
253 254 

  		





  254
  255
  
    
    iso_image = instance.hvparams[constants.HV_CDROM_IMAGE_PATH]


  		





  255
  256
  
    
    if iso_image:


  		





  256
  
  
    
      options = ',format=raw,if=virtio,media=cdrom'


  		





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


  		





  257
  258
  
    
      if boot_cdrom:


  		





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


  		





  258
  260
  
    
        options = '%s,boot=on' % options


  		





  
  261
  
    
      else:


  		





  
  262
  
    
        options = '%s,if=virtio' % options


  		





  259
  263
  
    
      drive_val = 'file=%s%s' % (iso_image, options)


  		





  260
  264
  
    
      kvm_cmd.extend(['-drive', drive_val])


  		





  261
  265
  
    

  		












Also available in:
  Unified diff