From nobody Tue Feb 10 06:07:34 2026 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 152096427197342.423536652245616; Tue, 13 Mar 2018 11:04:31 -0700 (PDT) Received: from localhost ([::1]:41715 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evoHn-0001BL-5F for importer@patchew.org; Tue, 13 Mar 2018 14:04:31 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55504) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evnoe-0008WU-Jp for qemu-devel@nongnu.org; Tue, 13 Mar 2018 13:34:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1evnod-0007vY-IA for qemu-devel@nongnu.org; Tue, 13 Mar 2018 13:34:24 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:51751) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1evnod-0007ti-3Z for qemu-devel@nongnu.org; Tue, 13 Mar 2018 13:34:23 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue005 [212.227.15.167]) with ESMTPSA (Nemesis) id 0Lbevf-1eCadY0kGJ-00lDhD; Tue, 13 Mar 2018 18:34:07 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Tue, 13 Mar 2018 18:33:47 +0100 Message-Id: <20180313173355.4468-11-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180313173355.4468-1-laurent@vivier.eu> References: <20180313173355.4468-1-laurent@vivier.eu> X-Provags-ID: V03:K0:So1HKpNWn6W2dwRkqKtJo1JBOK/6ax5hDUW36gwnDSNQGOQSz5g dyTvdQnb3IBuXvDXGcKk+LHnlBcaAl1TBwPMfNPioEpUWgsOOEd+VtlXUGYrXavAlI4M225 Q532QnhSSWSFDd10MfzChOr0WvZr+OfZtEMU/R9aF/5x8tBoa7xGo76oy6LCbwXXVn36umf ghhc6naokxw5mYQMz9bXQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:XKZt9SLJPe0=:0WbK+FpS7X4WYfZ5iOv0Qi KbN6jAS3TvR9z0f6qu9RbARETHO7kUDB0/2y7bvbt8iO1NdxwgbIRQAPS1BU+hMtdaZqbtk49 o5tWinnge8HJmVPBuAzgrVlvdfPgs8LOf78MlaFSYgJzhOspZnwZd/QeCvVlp+gOn1gnRfSe4 TQqrTVQrazHbIHWBvKq+rLBj9FJr141ydpE/ZO3LJfiqfesxxYfZMv3V85APAc8h0IpmdDbs8 4MKa2HAVsas/hzrk/b+DI8hPAF80UsrH4DL9J1a/pygxCPXRgKOOq4xtUBG/aqXJKeaQZ6ZL4 WCgRtBhcaHww+/oYW8XdOsQqX/k7Ee5O1u/vEW4bseDpdKzAhdYjTlh8pPPB6WGSbvFFBz5BT odJNnV0GhC186UlnCCvgQh+PIfPE3rnhkG9cszij0ffhy8lqvC07yn7aBEGWWK4wGl/C5Tclq xJSG6WRfivehQhaCp3pbB3qTS4PaPhbSE7nQ88e2sLmEOXSPBSp77Tt981EDChdzBgY+XgHQx LqTffU0QgXEp/ElS7ptM0VGUpcRC6IU9GtLQdKockEu+xG/hcRUMCfRiXCOobrWzNi+9uFxc1 97HOttFqQVxYa67SPpe5g94Z8OO8ejcfGXLfaWRnXIyy1E/4zisEjQ3bD8oMcr4dcroRB3sVO 4MNxJPIyKyc0JXLT2Iu17B9Q2YLlxqUexz+ydCV7vtusX2F33cI8FYitymlnpZ3mCiLm/baVu C2oUCV6qaRno7NMW4LOyhMhVQ5pvM9dJDQRHUw== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.187 Subject: [Qemu-devel] [PULL 10/18] 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 Message-Id: <20171228180814.9749-2-lukeshu@lukeshu.com> Reviewed-by: Peter Maydell [lv: fix condition to "!=3D 1" as requested by Peter] Signed-off-by: Laurent Vivier --- linux-user/elfload.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/linux-user/elfload.c b/linux-user/elfload.c index 85462d30db..7aebc21c04 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. @@ -1797,15 +1796,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, @@ -1819,11 +1809,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 (validate_guest_space(host_start, host_size) =3D=3D 1) { - return host_start; - } else { +#if defined(TARGET_ARM) && !defined(TARGET_AARCH64) + if (validate_guest_space(host_start, host_size) !=3D 1) { return (unsigned long)-1; } +#endif + return host_start; } =20 /* Setup the initial flags and start address. */ @@ -1862,6 +1853,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) { @@ -1870,6 +1863,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.14.3