From nobody Tue Oct 28 12:17:37 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 1514484791054488.7198206282118; Thu, 28 Dec 2017 10:13:11 -0800 (PST) Received: from localhost ([::1]:60652 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eUcg2-0003MK-28 for importer@patchew.org; Thu, 28 Dec 2017 13:13:10 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54651) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eUcbR-00084b-UX for qemu-devel@nongnu.org; Thu, 28 Dec 2017 13:08:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eUcbQ-00013k-4B for qemu-devel@nongnu.org; Thu, 28 Dec 2017 13:08:25 -0500 Received: from mav.lukeshu.com ([2001:19f0:5c00:8069:5400:ff:fe26:6a86]:41960) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eUcbQ-000137-0J for qemu-devel@nongnu.org; Thu, 28 Dec 2017 13:08:24 -0500 Received: from build64-par (unknown [IPv6:2601:803:202:9275:da50:e6ff:fe00:4a5b]) by mav.lukeshu.com (Postfix) with ESMTPSA id E366580509; Thu, 28 Dec 2017 13:08:19 -0500 (EST) From: Luke Shumaker To: qemu-devel@nongnu.org Date: Thu, 28 Dec 2017 13:08:10 -0500 Message-Id: <20171228180814.9749-8-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 07/10] linux-user: init_guest_space: Clean up control flow a bit 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 doing if (check1) { if (check2) { success; } } retry; Do a clearer if (!check1) { goto try_again; } if (!check2) { goto try_again; } success; try_again: retry; Besides being clearer, this makes it easier to insert more checks that need to trigger a retry on check failure, or rearrange them, or anything like that. Because some indentation is changing, "ignore space change" may be useful for viewing this patch. Signed-off-by: Luke Shumaker Reviewed-by: Peter Maydell --- linux-user/elfload.c | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/linux-user/elfload.c b/linux-user/elfload.c index b560f5d6fe..5c0ad65611 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -1906,24 +1906,28 @@ unsigned long init_guest_space(unsigned long host_s= tart, } =20 /* Check to see if the address is valid. */ - if (!host_start || aligned_start =3D=3D current_start) { + if (host_start && aligned_start !=3D current_start) { + goto try_again; + } + #if defined(TARGET_ARM) && !defined(TARGET_AARCH64) - /* On 32-bit ARM, we need to also be able to map the commpage.= */ - int valid =3D init_guest_commpage(aligned_start - guest_start, - aligned_size + guest_start); - if (valid =3D=3D 1) { - break; - } else if (valid =3D=3D -1) { - munmap((void *)real_start, real_size); - return (unsigned long)-1; - } - /* valid =3D=3D 0, so try again. */ -#else - /* On other architectures, whatever we have here is fine. */ - break; -#endif + /* On 32-bit ARM, we need to also be able to map the commpage. */ + int valid =3D init_guest_commpage(aligned_start - guest_start, + aligned_size + guest_start); + if (valid =3D=3D -1) { + munmap((void *)real_start, real_size); + return (unsigned long)-1; + } else if (valid =3D=3D -1) { + goto try_again; } +#endif + + /* If nothing has said `return -1` or `goto try_again` yet, + * then the address we have is good. + */ + break; =20 + try_again: /* That address didn't work. Unmap and try a different one. * The address the host picked because is typically right at * the top of the host address space and leaves the guest with --=20 2.15.1