Revision 9cf4321f

b/lib/hypervisor/hv_kvm.py
424 424 
      # TODO: handle FD_LOOP and FD_BLKTAP (?)
425 425 
      if boot_disk:
426 426 
        kvm_cmd.extend(['-boot', 'c'])
427 
        boot_val = ',boot=on'
427 
        if disk_type != constants.HT_DISK_IDE:
428 
            boot_val = ',boot=on'
429 
        else:
430 
            boot_val = ''
428 431 
        # We only boot from the first disk
429 432 
        boot_disk = False
430 433 
      else:
......
439 442 
      options = ',format=raw,media=cdrom'
440 443 
      if boot_cdrom:
441 444 
        kvm_cmd.extend(['-boot', 'd'])
442 
        options = '%s,boot=on' % options
445 
        if disk_type != constants.HT_DISK_IDE:
446 
            options = '%s,boot=on' % options
443 447 
      else:
444 
        options = '%s,if=virtio' % options
448 
        if disk_type == constants.HT_DISK_PARAVIRTUAL:
449 
          if_val = ',if=virtio'
450 
        else:
451 
          if_val = ',if=%s' % disk_type
452 
        options = '%s%s' % (options, if_val)
445 453 
      drive_val = 'file=%s%s' % (iso_image, options)
446 454 
      kvm_cmd.extend(['-drive', drive_val])
447 455 

  		












Also available in:
  Unified diff