Revision 2b846304

b/lib/hypervisor/hv_kvm.py
551 551
      kvm_cmd.extend(["-no-reboot"])
552 552

  
553 553
    hvp = instance.hvparams
554
    boot_disk = hvp[constants.HV_BOOT_ORDER] == constants.HT_BO_DISK
555
    boot_cdrom = hvp[constants.HV_BOOT_ORDER] == constants.HT_BO_CDROM
556
    boot_floppy = hvp[constants.HV_BOOT_ORDER] == constants.HT_BO_FLOPPY
557
    boot_network = hvp[constants.HV_BOOT_ORDER] == constants.HT_BO_NETWORK
554
    kernel_path = hvp[constants.HV_KERNEL_PATH]
555
    if kernel_path:
556
      boot_disk = boot_cdrom = boot_floppy = boot_network = False
557
    else:
558
      boot_disk = hvp[constants.HV_BOOT_ORDER] == constants.HT_BO_DISK
559
      boot_cdrom = hvp[constants.HV_BOOT_ORDER] == constants.HT_BO_CDROM
560
      boot_floppy = hvp[constants.HV_BOOT_ORDER] == constants.HT_BO_FLOPPY
561
      boot_network = hvp[constants.HV_BOOT_ORDER] == constants.HT_BO_NETWORK
558 562

  
559 563
    self.ValidateParameters(hvp)
560 564

  
......
645 649
      drive_val = "file=%s%s" % (floppy_image, options)
646 650
      kvm_cmd.extend(["-drive", drive_val])
647 651

  
648
    kernel_path = hvp[constants.HV_KERNEL_PATH]
649 652
    if kernel_path:
650 653
      kvm_cmd.extend(["-kernel", kernel_path])
651 654
      initrd_path = hvp[constants.HV_INITRD_PATH]
b/man/gnt-instance.rst
175 175
    as 'dc'.
176 176

  
177 177
    For KVM the boot order is either "floppy", "cdrom", "disk" or
178
    "network".  Please note that older versions of KVM couldn't
179
    netboot from virtio interfaces. This has been fixed in more recent
180
    versions and is confirmed to work at least with qemu-kvm 0.11.1.
178
    "network".  Please note that older versions of KVM couldn't netboot
179
    from virtio interfaces. This has been fixed in more recent versions
180
    and is confirmed to work at least with qemu-kvm 0.11.1. Also note
181
    that if you have set the ``kernel_path`` option, that will be used
182
    for booting, and this setting will be silently ignored.
181 183

  
182 184
blockdev\_prefix
183 185
    Valid for the Xen HVM and PVM hypervisors.
......
326 328
    Valid for the Xen PVM and KVM hypervisors.
327 329

  
328 330
    This option specifies the path (on the node) to the kernel to boot
329
    the instance with. Xen PVM instances always require this, while
330
    for KVM if this option is empty, it will cause the machine to load
331
    the kernel from its disks.
331
    the instance with. Xen PVM instances always require this, while for
332
    KVM if this option is empty, it will cause the machine to load the
333
    kernel from its disks (and the boot will be done accordingly to
334
    ``boot_order``).
332 335

  
333 336
kernel\_args
334 337
    Valid for the Xen PVM and KVM hypervisors.

Also available in: Unified diff