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 (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 15144846383881005.7658277193942; Thu, 28 Dec 2017 10:10:38 -0800 (PST) Received: from localhost ([::1]:60588 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eUcdJ-0000qA-In for importer@patchew.org; Thu, 28 Dec 2017 13:10:21 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54594) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eUcbQ-00083x-TP 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-000131-Nn 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]:41884) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eUcbP-0000yG-IK 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 5CE3C80504; Thu, 28 Dec 2017 13:08:16 -0500 (EST) From: Luke Shumaker To: qemu-devel@nongnu.org Date: Thu, 28 Dec 2017 13:08:05 -0500 Message-Id: <20171228180814.9749-3-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 02/10] linux-user: Rename validate_guest_space => init_guest_commpage 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 init_guest_commpage is a much more honest description of what the function does. validate_guest_space not only suggests that the function has no side-effects, but also introduces confusion as to why it is only needed on 32-bit ARM targets. Signed-off-by: Luke Shumaker Reviewed-by: Peter Maydell --- linux-user/elfload.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/linux-user/elfload.c b/linux-user/elfload.c index cac991159c..453394239c 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -362,8 +362,8 @@ enum { * The guest code may leave a page mapped and populate it if the * address is suitable. */ -static int validate_guest_space(unsigned long guest_base, - unsigned long guest_size) +static int init_guest_commpage(unsigned long guest_base, + unsigned long guest_size) { unsigned long real_start, test_page_addr; =20 @@ -1836,7 +1836,7 @@ unsigned long init_guest_space(unsigned long host_sta= rt, * address. */ if (host_start && !host_size) { #if defined(TARGET_ARM) && !defined(TARGET_AARCH64) - if (validate_guest_space(host_start, host_size) =3D=3D 1) { + if (init_guest_commpage(host_start, host_size) !=3D 1) { return (unsigned long)-1; } #endif @@ -1881,8 +1881,8 @@ unsigned long init_guest_space(unsigned long host_sta= rt, 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); + int valid =3D init_guest_commpage(real_start - guest_start, + real_size); if (valid =3D=3D 1) { break; } else if (valid =3D=3D -1) { --=20 2.15.1