Commit 1fb0d709 authored by Stefano Garzarella's avatar Stefano Garzarella Committed by Paolo Bonzini
Browse files

hw/i386/pc: use PVH option rom 



Use pvh.bin option rom when we are booting an uncompressed
kernel using the x86/HVM direct boot ABI.

Signed-off-by: default avatarStefano Garzarella <sgarzare@redhat.com>
Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: default avatarLiam Merwick <liam.merwick@oracle.com>
Based-on: <1547554687-12687-1-git-send-email-liam.merwick@oracle.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 2785dc7b

hw/i386/pc.c

+5 −0
Original line number Diff line number Diff line
@@ -1261,6 +1261,10 @@ static void load_linux(PCMachineState *pcms, 
                                 initrd_size);

            }



            option_rom[nb_option_roms].bootindex = 0;

            option_rom[nb_option_roms].name = "pvh.bin";

            nb_option_roms++;



            return;

        }

        /* This looks like a multiboot kernel. If it is, let's stop
@@ -1712,6 +1716,7 @@ void xen_load_linux(PCMachineState *pcms) 
    for (i = 0; i < nb_option_roms; i++) {

        assert(!strcmp(option_rom[i].name, "linuxboot.bin") ||

               !strcmp(option_rom[i].name, "linuxboot_dma.bin") ||

               !strcmp(option_rom[i].name, "pvh.bin") ||

               !strcmp(option_rom[i].name, "multiboot.bin"));

        rom_add_option(option_rom[i].name, option_rom[i].bootindex);

    }