From patchwork Tue Mar 13 17:33:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 885379 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40139f3KXDz9sSN for ; Wed, 14 Mar 2018 05:22:30 +1100 (AEDT) Received: from localhost ([::1]:41853 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evoZA-00005k-4k for incoming@patchwork.ozlabs.org; Tue, 13 Mar 2018 14:22:28 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55550) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evnog-000068-DC 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-0007vt-Pr for qemu-devel@nongnu.org; Tue, 13 Mar 2018 13:34:26 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:36561) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1evnod-0007th-Gw 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 0MaXEr-1fBXHC2oVF-00KAgT; Tue, 13 Mar 2018 18:34:07 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Tue, 13 Mar 2018 18:33:48 +0100 Message-Id: <20180313173355.4468-12-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:8grY5U5MprlHGk/joS1gdYZ6Zc9i+vwSMJ6fDFY74I8X7hmtQ7B 4pwHLcwUF2iHaB4IewV7aSzrpyVf3/QBroyp9n3p1RXt79YOC6VH3WE2KgWb7RoZ3xptAiI G9pMf8PGuzCwl/UzJpemTlJXeo4kk3ATrMJ19gm6bFkgIpF0PFzlFn4piUzJTE7NHSqO61K 31R6YRygYYnr5zFRzcA5A== X-UI-Out-Filterresults: notjunk:1; V01:K0:yNz7P3FUAFI=:OV3YwSNRv4dvktN5PVqPZ1 Zeps4yEVXPH8XbDUmlsOwYiZvnpWMIlrWPAlvOftyUzPoEI8fjOgw1JBhBALUX8p75oBuc8T7 Y4MbINfR9q4W7/d9CtJvjcRRP/W1ebtnJIcn8oa6adtSX4b0HwZxkN986A3ylUgQF4D9CP3HK fLo8rCkisHJLREpcWlvBAoTfKpQVXMk8/kS8oyMcAgW/PVtzCJEsyK+kCGqC8Dsf6pTbO+Ki0 LnuHnbLYIDJn4yJ9n28nIc/vILUthCHyvNdvInyYs7GEWu0nzgkYEDonO72J9JBYf8yoQP1VT WsDAO6Luq63KO2wKXLSy5EHEv0HejUMBDo2QR7a7EIPPTCsw0gAPA23N4Pb4NEuhiOitKNg74 sq8nhlE/5E2eEavaL7zAfCFcihWRPbCJmviz5bsTylRh/9W+vqW7sHb0sCowlQZR4L+Xkj0k7 NRZ7C/4XZ+ZHMuY2Q/7M3pZVn3qq9GnpU0avoCK+RJPcJ+FOzV3wO1WV69VjbOV5SvePNSHib 0p+pYW0mDap+lXTwf5Gjg2Ce5qSZ0tH3796is5iCTaHtU/Of/NuTh7XCbvi74dJXdqzoMqZYY pA3eq6UXnW96/RgjuudY+Kmw1e+bzfG3KFtJzzeF6wW3OzOAVsYW4/I8p8c8n3bYjDCJsfY7P OUJboBvg9dv6H5ByrPeQdnC00vr0UDde0bDAZKCsq8XVlhdCI1wEjRMgtPrb2g7/XuKVRCzCf QsVhj73v0e3WiZ7oyQquSgzdUgLV8L2gLaFpnQ== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.131 Subject: [Qemu-devel] [PULL 11/18] 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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 Message-Id: <20171228180814.9749-3-lukeshu@lukeshu.com> Reviewed-by: Peter Maydell Signed-off-by: Laurent Vivier --- 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 7aebc21c04..eaa52afe79 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; @@ -1810,7 +1810,7 @@ unsigned long init_guest_space(unsigned long host_start, * address. */ if (host_start && !host_size) { #if defined(TARGET_ARM) && !defined(TARGET_AARCH64) - if (validate_guest_space(host_start, host_size) != 1) { + if (init_guest_commpage(host_start, host_size) != 1) { return (unsigned long)-1; } #endif @@ -1855,8 +1855,8 @@ unsigned long init_guest_space(unsigned long host_start, if (!host_start || real_start == 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 = validate_guest_space(real_start - guest_start, - real_size); + int valid = init_guest_commpage(real_start - guest_start, + real_size); if (valid == 1) { break; } else if (valid == -1) {