[Qemu-devel] [PATCH master, stable-0.12] Don't load options roms intended to be loaded by the bios in qemu

[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.

Signed-off-by: Avi Kivity <address@hidden>
---
 hw/loader.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/hw/loader.c b/hw/loader.c
index 2ceb8eb..c6bf0f1 100644
--- a/hw/loader.c
+++ b/hw/loader.c
@@ -654,6 +654,9 @@ int rom_load_all(void)
     Rom *rom;
 
     QTAILQ_FOREACH(rom, &roms, next) {
+        if (!rom->addr) {
+            continue;
+        }
         if (addr > rom->addr) {
             fprintf(stderr, "rom: requested regions overlap "
                     "(rom %s. free=0x" TARGET_FMT_plx
-- 
1.6.5.3