]> git.ipfire.org Git - thirdparty/qemu.git/commit
loader: don't perform overlapping address check for memory region ROM images
authorMark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Fri, 23 Feb 2018 11:10:17 +0000 (11:10 +0000)
committerMichael Roth <mdroth@linux.vnet.ibm.com>
Thu, 21 Jun 2018 01:44:58 +0000 (20:44 -0500)
commit1f4637953e29bd01360dbb97ee2312e8e72f2a9d
tree5ec6a3c244be14fac8268b85876f9d7ea9c950e2
parente2fc495b4a8378d9bde17d0bc7293b5c66c4970b
loader: don't perform overlapping address check for memory region ROM images

All memory region ROM images have a base address of 0 which causes the overlapping
address check to fail if more than one memory region ROM image is present, or an
existing ROM image is loaded at address 0.

Make sure that we ignore the overlapping address check in
rom_check_and_register_reset() if this is a memory region ROM image. In particular
this fixes the "rom: requested regions overlap" error on startup when trying to
run qemu-system-sparc with a -kernel image since commit 7497638642: "tcx: switch to
load_image_mr() and remove prom_addr hack".

Suggested-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
(cherry picked from commit ca316c11526a1bc221fb542bdce6bac7238dde69)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
hw/core/loader.c