Commit 2963d782 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/mcayland/tags/qemu-sparc-signed' into staging 



qemu-sparc update

# gpg: Signature made Tue 27 Feb 2018 19:03:28 GMT
# gpg:                using RSA key 5BC2C56FAE0F321F
# gpg: Good signature from "Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>"
# Primary key fingerprint: CC62 1AB9 8E82 200D 915C  C9C4 5BC2 C56F AE0F 321F

* remotes/mcayland/tags/qemu-sparc-signed:
  loader: don't perform overlapping address check for memory region ROM images

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 5116c331 ca316c11

hw/core/loader.c

+11 −9
Original line number Diff line number Diff line
@@ -1104,6 +1104,7 @@ int rom_check_and_register_reset(void) 
        if (rom->fw_file) {

            continue;

        }

        if (!rom->mr) {

            if ((addr > rom->addr) && (as == rom->as)) {

                fprintf(stderr, "rom: requested regions overlap "

                        "(rom %s. free=0x" TARGET_FMT_plx
@@ -1113,11 +1114,12 @@ int rom_check_and_register_reset(void) 
            }

            addr  = rom->addr;

            addr += rom->romsize;

            as = rom->as;

        }

        section = memory_region_find(rom->mr ? rom->mr : get_system_memory(),

                                     rom->addr, 1);

        rom->isrom = int128_nz(section.size) && memory_region_is_rom(section.mr);

        memory_region_unref(section.mr);

        as = rom->as;

    }

    qemu_register_reset(rom_reset, NULL);

    roms_loaded = 1;