diff options
| author | Avi Kivity <avi@redhat.com> | 2009-12-22 11:57:02 +0200 |
|---|---|---|
| committer | Aurelien Jarno <aurelien@aurel32.net> | 2009-12-24 08:33:03 +0100 |
| commit | e405a2ba91b68817cae2a428de55fe9616a4cf37 (patch) | |
| tree | 93e24abb5470cfa7aa4cc598e725ebd1b5628e8b | |
| parent | 502e64fe23f19c086d42f6178cdda19e58996080 (diff) | |
| download | qemu-e405a2ba91b68817cae2a428de55fe9616a4cf37.zip qemu-e405a2ba91b68817cae2a428de55fe9616a4cf37.tar.gz qemu-e405a2ba91b68817cae2a428de55fe9616a4cf37.tar.bz2 | |
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.
Signed-off-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
| -rw-r--r-- | hw/loader.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/hw/loader.c b/hw/loader.c index 2ceb8eb..eef385e 100644 --- a/hw/loader.c +++ b/hw/loader.c @@ -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, |