[libvirt] [PATCH] qemu: Emit bootindex even for direct boot

[Eric Blake]

On 01/24/2012 03:53 PM, Jiri Denemark wrote:
> Direct boot (using kernel, initrd, and command line) is used by
> virt-install/virt-manager for network install. While any bootindex has
> no direct effect since -kernel is always first, we need it as a hint for
> SeaBIOS to present disks in the same order as they will be presented
> during normal boot.
> ---
>  src/qemu/qemu_command.c |    3 +--
>  1 files changed, 1 insertions(+), 2 deletions(-)
> 
> diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
> index aaccf62..9b69ad0 100644
> --- a/src/qemu/qemu_command.c
> +++ b/src/qemu/qemu_command.c
> @@ -4334,8 +4334,7 @@ qemuBuildCommandLine(virConnectPtr conn,
>      if (qemuCapsGet(qemuCaps, QEMU_CAPS_DRIVE)) {
>          int bootCD = 0, bootFloppy = 0, bootDisk = 0;
>  
> -        if ((qemuCapsGet(qemuCaps, QEMU_CAPS_DRIVE_BOOT) || emitBootindex) &&
> -            !def->os.kernel) {
> +        if ((qemuCapsGet(qemuCaps, QEMU_CAPS_DRIVE_BOOT) || emitBootindex)) {

ACK.

-- 
Eric Blake   eblake at redhat.com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 620 bytes
Desc: OpenPGP digital signature
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20120124/f48107e1/attachment-0001.sig>