From nobody Wed Oct 22 13:03:24 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1519385504894910.5734110582633; Fri, 23 Feb 2018 03:31:44 -0800 (PST) Received: from localhost ([::1]:43780 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1epBZg-0002x0-T3 for importer@patchew.org; Fri, 23 Feb 2018 06:31:36 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34164) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1epBYL-0002JH-VA for qemu-devel@nongnu.org; Fri, 23 Feb 2018 06:30:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1epBYG-0000cT-Vf for qemu-devel@nongnu.org; Fri, 23 Feb 2018 06:30:14 -0500 Received: from chuckie.co.uk ([82.165.15.123]:48657 helo=s16892447.onlinehome-server.info) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1epBYG-0000NR-PC; Fri, 23 Feb 2018 06:30:08 -0500 Received: from host109-155-37-99.range109-155.btcentralplus.com ([109.155.37.99] helo=kentang.home) by s16892447.onlinehome-server.info with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1epBYK-0003EH-Lj; Fri, 23 Feb 2018 11:30:13 +0000 From: Mark Cave-Ayland To: peter.maydell@linaro.org, qemu-devel@nongnu.org, qemu-stable@nongnu.org Date: Fri, 23 Feb 2018 11:29:33 +0000 Message-Id: <20180223112933.4135-1-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.11.0 X-SA-Exim-Connect-IP: 109.155.37.99 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk X-SA-Exim-Version: 4.2.1 (built Sun, 08 Jan 2012 02:45:44 +0000) X-SA-Exim-Scanned: Yes (on s16892447.onlinehome-server.info) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 82.165.15.123 Subject: [Qemu-devel] [PATCH] loader: don't perform overlapping address check for memory region ROM images X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" All memory region ROM images have a base address of 0 which causes the over= lapping 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 par= ticular this fixes the "rom: requested regions overlap" error on startup when tryin= g to run qemu-system-sparc with a -kernel image since commit 7497638642: "tcx: s= witch to load_image_mr() and remove prom_addr hack". Suggested-by: Peter Maydell Signed-off-by: Mark Cave-Ayland Reviewed-by: Peter Maydell --- hw/core/loader.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/hw/core/loader.c b/hw/core/loader.c index 91669d65aa..c08f130461 100644 --- a/hw/core/loader.c +++ b/hw/core/loader.c @@ -1104,20 +1104,22 @@ int rom_check_and_register_reset(void) if (rom->fw_file) { continue; } - if ((addr > rom->addr) && (as =3D=3D rom->as)) { - fprintf(stderr, "rom: requested regions overlap " - "(rom %s. free=3D0x" TARGET_FMT_plx - ", addr=3D0x" TARGET_FMT_plx ")\n", - rom->name, addr, rom->addr); - return -1; + if (!rom->mr) { + if ((addr > rom->addr) && (as =3D=3D rom->as)) { + fprintf(stderr, "rom: requested regions overlap " + "(rom %s. free=3D0x" TARGET_FMT_plx + ", addr=3D0x" TARGET_FMT_plx ")\n", + rom->name, addr, rom->addr); + return -1; + } + addr =3D rom->addr; + addr +=3D rom->romsize; + as =3D rom->as; } - addr =3D rom->addr; - addr +=3D rom->romsize; section =3D memory_region_find(rom->mr ? rom->mr : get_system_memo= ry(), rom->addr, 1); rom->isrom =3D int128_nz(section.size) && memory_region_is_rom(sec= tion.mr); memory_region_unref(section.mr); - as =3D rom->as; } qemu_register_reset(rom_reset, NULL); roms_loaded =3D 1; --=20 2.11.0