On Tue, Jan 15, 2019 at 11:00:58AM +0100, Stefano Garzarella wrote: > Use pvh.bin option rom when we are booting an uncompressed > kernel using the x86/HVM direct boot ABI. > > Signed-off-by: Stefano Garzarella <sgarz...@redhat.com> > Based-on: <1545422632-24444-5-git-send-email-liam.merw...@oracle.com>
I don't think this is a great way to give attribution. Can you pls include the author name and the S.O.B from there as well? > --- > hw/i386/pc.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/hw/i386/pc.c b/hw/i386/pc.c > index 06bce6a101..7564ba51d2 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -1005,6 +1005,10 @@ static void load_linux(PCMachineState *pcms, > fw_cfg_add_bytes(fw_cfg, FW_CFG_SETUP_DATA, > header, sizeof(header)); > > + 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 > @@ -1456,6 +1460,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); > } OK but this is guest visible so needs to be guarded by the new machine type. > -- > 2.20.1