Skip to contentSkip to conversation

qemu-kvm: Restore VAPIC option ROM installation

PATCH In review Jan Kiszka 1 participant 2 messages Oct 7, 2011 KVM

lore
Share & tools
lore

Jan Kiszka

author
#0 lore raw

PATCH 1/1 qemu-kvm: Restore VAPIC option ROM installation

Still needed but was accidentally removed by 8bc62bc6be.

Signed-off-by Jan Kiszka <[email protected]>

---

As the guilty patch is only in next so far, you may also fold this one in.

 hw/pc.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
hw/pc.c +4 -0
index a616029..70e0d08 100644
@@ -1049,6 +1049,10 @@ void pc_memory_init(MemoryRegion *system_memory,
                                 (uint32_t)(-bios_size),
                                 bios);
 
+    option_rom[nb_option_roms].name = g_strdup(VAPIC_FILENAME);
+    option_rom[nb_option_roms].bootindex = -1;
+    nb_option_roms++;
+
     fw_cfg = bochs_bios_init();
     rom_set_fw(fw_cfg);
Signature · 1 line
1.7.3.4
author
#1 lore raw
Quoted 16 lines · Jan Kiszka

Still needed but was accidentally removed by 8bc62bc6be.

Signed-off-by Jan Kiszka <[email protected]>

---

As the guilty patch is only in next so far, you may also fold this one in.

 hw/pc.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
hw/pc.c +0 -0
index a616029..70e0d08 100644

hw/pc.c void pc_memory_init(MemoryRegion *system_memory, · line 1058

Quoted 10 lines
hw/pc.c +4 -0
@@ -1049,6 +1049,10 @@ void pc_memory_init(MemoryRegion *system_memory,
                                 (uint32_t)(-bios_size),
                                 bios);
 
+    option_rom[nb_option_roms].name = g_strdup(VAPIC_FILENAME);
+    option_rom[nb_option_roms].bootindex = -1;
+    nb_option_roms++;
+
     fw_cfg = bochs_bios_init();
     rom_set_fw(fw_cfg);

Oops. This obviously belongs on the kvm list.

Jan

Signature · 2 lines
Siemens AG, Corporate Technology, CT T DE IT 1
Corporate Competence Center Embedded Linux