diff options
| author |   Aurelien Jarno <aurelien@aurel32.net> | 2009-12-24 19:30:25 +0100 |
|---|---|---|
| committer |   Anthony Liguori <aliguori@us.ibm.com> | 2010-01-12 14:44:50 -0600 |
| commit | be7398ec06d69f04b2ba303cb525e6e40ef134c2 (patch) | |
| tree | 5629e8604098ea948a942c788a4dc21915fc81f7 | |
| parent | vnc_refresh: return if vd->timer is NULL (diff) | |
| download | qemu-kvm-be7398ec06d69f04b2ba303cb525e6e40ef134c2.tar.gz qemu-kvm-be7398ec06d69f04b2ba303cb525e6e40ef134c2.tar.bz2 qemu-kvm-be7398ec06d69f04b2ba303cb525e6e40ef134c2.zip | |
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>
(cherry picked from commit f21a59c224a6fdf7b30c3fe551fd93043e537f6c)
| -rw-r--r-- | hw/loader.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/hw/loader.c b/hw/loader.c index eef385eb5..3aba47c6a 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) |