From: Aurelien Jarno <aurelien@aurel32.net>
Date: Thu, 24 Dec 2009 18:30:25 +0000 (+0100)
Subject: loader: more ignores for rom intended to be loaded by the bios
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f21a59c224a6fdf7b30c3fe551fd93043e537f6c;p=qmiga%2Fqemu.git

loader: more ignores for rom intended to be loaded by the bios

Similarly to what has been done in e405a2ba91b68817cae2a428de55fe9616a4cf37,
ignore rom intended to be loaded by the bios in find_rom() and rom_copy().

Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
---

diff --git a/hw/loader.c b/hw/loader.c
index eef385eb51..3aba47c6a7 100644
--- a/hw/loader.c
+++ b/hw/loader.c
@@ -695,6 +695,9 @@ static Rom *find_rom(target_phys_addr_t addr)
     Rom *rom;
 
     QTAILQ_FOREACH(rom, &roms, next) {
+        if (rom->fw_file) {
+            continue;
+        }
         if (rom->addr > addr)
             continue;
         if (rom->addr + rom->romsize < addr)
@@ -717,6 +720,9 @@ int rom_copy(uint8_t *dest, target_phys_addr_t addr, size_t size)
     Rom *rom;
 
     QTAILQ_FOREACH(rom, &roms, next) {
+        if (rom->fw_file) {
+            continue;
+        }
         if (rom->addr + rom->romsize < addr)
             continue;
         if (rom->addr > end)