aboutsummaryrefslogtreecommitdiff
path: root/hw/multiboot.c
diff options
context:
space:
mode:
authorGleb Natapov <gleb@redhat.com>2010-12-08 13:35:07 +0200
committerBlue Swirl <blauwirbel@gmail.com>2010-12-11 21:32:47 +0000
commit2e55e84282c545aeab8f5c9dd52a8073deaf3dbc (patch)
tree7fdff0cb2027337a402dfb2f1687840c552a8e76 /hw/multiboot.c
parentde1f34cb6351c028ebcc61fea9fa78008ca1a529 (diff)
Add bootindex for option roms.
Extend -option-rom command to have additional parameter ,bootindex=. Signed-off-by: Gleb Natapov <gleb@redhat.com> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Diffstat (limited to 'hw/multiboot.c')
-rw-r--r--hw/multiboot.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/multiboot.c b/hw/multiboot.c
index e710bbb948..7cc3055359 100644
--- a/hw/multiboot.c
+++ b/hw/multiboot.c
@@ -331,7 +331,8 @@ int load_multiboot(void *fw_cfg,
fw_cfg_add_bytes(fw_cfg, FW_CFG_INITRD_DATA, mb_bootinfo_data,
sizeof(bootinfo));
- option_rom[nb_option_roms] = "multiboot.bin";
+ option_rom[nb_option_roms].name = "multiboot.bin";
+ option_rom[nb_option_roms].bootindex = 0;
nb_option_roms++;
return 1; /* yes, we are multiboot */