From patchwork Tue Dec 22 09:25:13 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [master, stable-0.12] Don't load options roms intended to be loaded by the bios in qemu Date: Mon, 21 Dec 2009 23:25:13 -0000 From: Avi Kivity X-Patchwork-Id: 41602 Message-Id: <1261473913-28442-1-git-send-email-avi@redhat.com> To: Anthony Liguori , qemu-devel@nongnu.org Cc: 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 --- 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