From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NN0ze-0004oj-QQ for qemu-devel@nongnu.org; Tue, 22 Dec 2009 04:25:26 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NN0zZ-0004o9-A2 for qemu-devel@nongnu.org; Tue, 22 Dec 2009 04:25:25 -0500 Received: from [199.232.76.173] (port=54848 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NN0zZ-0004o6-2k for qemu-devel@nongnu.org; Tue, 22 Dec 2009 04:25:21 -0500 Received: from mx1.redhat.com ([209.132.183.28]:44738) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NN0zY-0007lV-N4 for qemu-devel@nongnu.org; Tue, 22 Dec 2009 04:25:20 -0500 From: Avi Kivity Date: Tue, 22 Dec 2009 11:25:13 +0200 Message-Id: <1261473913-28442-1-git-send-email-avi@redhat.com> Subject: [Qemu-devel] [PATCH master, stable-0.12] Don't load options roms intended to be loaded by the bios in qemu List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori , qemu-devel@nongnu.org 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 -- 1.6.5.3