From nobody Tue Oct 28 12:17:38 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 1514484777361223.7932604399209; Thu, 28 Dec 2017 10:12:57 -0800 (PST) Received: from localhost ([::1]:60648 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eUcfo-00039u-9D for importer@patchew.org; Thu, 28 Dec 2017 13:12:56 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54599) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eUcbR-000842-03 for qemu-devel@nongnu.org; Thu, 28 Dec 2017 13:08:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eUcbP-00012t-My for qemu-devel@nongnu.org; Thu, 28 Dec 2017 13:08:24 -0500 Received: from mav.lukeshu.com ([2001:19f0:5c00:8069:5400:ff:fe26:6a86]:41874) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eUcbP-0000xm-8F for qemu-devel@nongnu.org; Thu, 28 Dec 2017 13:08:23 -0500 Received: from build64-par (unknown [IPv6:2601:803:202:9275:da50:e6ff:fe00:4a5b]) by mav.lukeshu.com (Postfix) with ESMTPSA id 6041D80503; Thu, 28 Dec 2017 13:08:15 -0500 (EST) From: Luke Shumaker To: qemu-devel@nongnu.org Date: Thu, 28 Dec 2017 13:08:04 -0500 Message-Id: <20171228180814.9749-2-lukeshu@lukeshu.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20171228180814.9749-1-lukeshu@lukeshu.com> References: <20171228180814.9749-1-lukeshu@lukeshu.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2001:19f0:5c00:8069:5400:ff:fe26:6a86 Subject: [Qemu-devel] [PATCH 01/10] linux-user: Use #if to only call validate_guest_space for 32-bit ARM target 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: , Cc: Luke Shumaker , Riku Voipio , Laurent Vivier 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" From: Luke Shumaker Instead of defining a bogus validate_guest_space that always returns 1 on targets other than 32-bit ARM, use #if blocks to only call it on 32-bit ARM targets. This makes the "normal" flow control clearer. Signed-off-by: Luke Shumaker Reviewed-by: Peter Maydell --- linux-user/elfload.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/linux-user/elfload.c b/linux-user/elfload.c index 20f3d8c2c3..cac991159c 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -354,7 +354,6 @@ enum { =20 /* The commpage only exists for 32 bit kernels */ =20 -#define TARGET_HAS_VALIDATE_GUEST_SPACE /* Return 1 if the proposed guest space is suitable for the guest. * Return 0 if the proposed guest space isn't suitable, but another * address space should be tried. @@ -1823,15 +1822,6 @@ static abi_ulong create_elf_tables(abi_ulong p, int = argc, int envc, return sp; } =20 -#ifndef TARGET_HAS_VALIDATE_GUEST_SPACE -/* If the guest doesn't have a validation function just agree */ -static int validate_guest_space(unsigned long guest_base, - unsigned long guest_size) -{ - return 1; -} -#endif - unsigned long init_guest_space(unsigned long host_start, unsigned long host_size, unsigned long guest_start, @@ -1845,11 +1835,12 @@ unsigned long init_guest_space(unsigned long host_s= tart, /* If just a starting address is given, then just verify that * address. */ if (host_start && !host_size) { +#if defined(TARGET_ARM) && !defined(TARGET_AARCH64) if (validate_guest_space(host_start, host_size) =3D=3D 1) { - return host_start; - } else { return (unsigned long)-1; } +#endif + return host_start; } =20 /* Setup the initial flags and start address. */ @@ -1888,6 +1879,8 @@ unsigned long init_guest_space(unsigned long host_sta= rt, =20 /* Check to see if the address is valid. */ if (!host_start || real_start =3D=3D current_start) { +#if defined(TARGET_ARM) && !defined(TARGET_AARCH64) + /* On 32-bit ARM, we need to also be able to map the commpage.= */ int valid =3D validate_guest_space(real_start - guest_start, real_size); if (valid =3D=3D 1) { @@ -1896,6 +1889,10 @@ unsigned long init_guest_space(unsigned long host_st= art, return (unsigned long)-1; } /* valid =3D=3D 0, so try again. */ +#else + /* On other architectures, whatever we have here is fine. */ + break; +#endif } =20 /* That address didn't work. Unmap and try a different one. --=20 2.15.1