Skip to content

Commit 1fb0d70

Browse files
stefano-garzarellabonzini
authored andcommitted
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: Stefano Garzarella <[email protected]> Reviewed-by: Stefan Hajnoczi <[email protected]> Reviewed-by: Liam Merwick <[email protected]> Based-on: <[email protected]> Signed-off-by: Paolo Bonzini <[email protected]>
1 parent 2785dc7 commit 1fb0d70

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

hw/i386/pc.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1261,6 +1261,10 @@ static void load_linux(PCMachineState *pcms,
12611261
initrd_size);
12621262
}
12631263

1264+
option_rom[nb_option_roms].bootindex = 0;
1265+
option_rom[nb_option_roms].name = "pvh.bin";
1266+
nb_option_roms++;
1267+
12641268
return;
12651269
}
12661270
/* This looks like a multiboot kernel. If it is, let's stop
@@ -1712,6 +1716,7 @@ void xen_load_linux(PCMachineState *pcms)
17121716
for (i = 0; i < nb_option_roms; i++) {
17131717
assert(!strcmp(option_rom[i].name, "linuxboot.bin") ||
17141718
!strcmp(option_rom[i].name, "linuxboot_dma.bin") ||
1719+
!strcmp(option_rom[i].name, "pvh.bin") ||
17151720
!strcmp(option_rom[i].name, "multiboot.bin"));
17161721
rom_add_option(option_rom[i].name, option_rom[i].bootindex);
17171722
}

0 commit comments

Comments
 (0)