Skip to contentSkip to conversation

Don't load options roms intended to be loaded by the bios in qemu

PATCH In review Avi Kivity 2 participants 3 messages Dec 22, 2009

lore
Share & tools
lore

Avi Kivity

author
#0 lore raw

PATCH v2 1/1 Don't load options roms intended to be loaded by the bios in qemu

The first such option rom will load at address 0, which isn't very nice, and the second will report a conflict and abort, which is horrible.

---

Changes from v1:
- use ->fw_file instead of ->addr to distinguish between host-loaded and firmware-loaded roms
- add the same check in a couple more places

 hw/loader.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)
hw/loader.c +7 -1
index 2ceb8eb..eef385e 100644
@@ -636,6 +636,9 @@ static void rom_reset(void *unused)
     Rom *rom;
 
     QTAILQ_FOREACH(rom, &roms, next) {
+        if (rom->fw_file) {
+            continue;
+        }
         if (rom->data == NULL)
             continue;
         cpu_physical_memory_write_rom(rom->addr, rom->data, rom->romsize);
@@ -654,6 +657,9 @@ int rom_load_all(void)
     Rom *rom;
 
     QTAILQ_FOREACH(rom, &roms, next) {
+        if (rom->fw_file) {
+            continue;
+        }
         if (addr > rom->addr) {
             fprintf(stderr, "rom: requested regions overlap "
                     "(rom %s. free=0x" TARGET_FMT_plx
@@ -752,7 +758,7 @@ void do_info_roms(Monitor *mon)
     Rom *rom;
 
     QTAILQ_FOREACH(rom, &roms, next) {
-        if (rom->addr) {
+        if (!rom->fw_file) {
             monitor_printf(mon, "addr=" TARGET_FMT_plx
                            " size=0x%06zx mem=%s name=\"%s\" \n",
                            rom->addr, rom->romsize,
Signature · 1 line
1.6.5.3
#1 lore raw
Quoted 5 lines · Avi Kivity

The first such option rom will load at address 0, which isn't very nice, and the second will report a conflict and abort, which is horrible.

This fixes extboot in qemu-kvm?

Regards,

Anthony Liguori

author
#2 lore raw
Quoted 7 lines · Anthony Liguori
Quoted 4 lines · Avi Kivity

The first such option rom will load at address 0, which isn't very nice, and the second will report a conflict and abort, which is horrible.

This fixes extboot in qemu-kvm?

Yes.

Signature · 1 line
error compiling committee.c: too many arguments to function