]> Git Repo - qemu.git/commitdiff
loader: more ignores for rom intended to be loaded by the bios
authorAurelien Jarno <[email protected]>
Thu, 24 Dec 2009 18:30:25 +0000 (19:30 +0100)
committerAurelien Jarno <[email protected]>
Thu, 24 Dec 2009 18:30:25 +0000 (19:30 +0100)
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 <[email protected]>
hw/loader.c

index eef385eb51fa1785991032b032af7b9eef757563..3aba47c6a7de281abbf4267b9804ba73f1ca2d34 100644 (file)
@@ -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)
This page took 0.024335 seconds and 4 git commands to generate.