From nobody Sun Feb 8 22:18:10 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1701359346182766.2815341853575; Thu, 30 Nov 2023 07:49:06 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.645011.1006733 (Exim 4.92) (envelope-from ) id 1r8jHK-0006bl-Hc; Thu, 30 Nov 2023 15:48:38 +0000 Received: by outflank-mailman (output) from mailman id 645011.1006733; Thu, 30 Nov 2023 15:48:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1r8jHK-0006be-F0; Thu, 30 Nov 2023 15:48:38 +0000 Received: by outflank-mailman (input) for mailman id 645011; Thu, 30 Nov 2023 15:48:36 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1r8jHI-0006a5-Sc for xen-devel@lists.xenproject.org; Thu, 30 Nov 2023 15:48:36 +0000 Received: from support.bugseng.com (mail.bugseng.com [162.55.131.47]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id ebb3c753-8f97-11ee-98e4-6d05b1d4d9a1; Thu, 30 Nov 2023 16:48:35 +0100 (CET) Received: from Dell.homenet.telecomitalia.it (host-82-59-158-146.retail.telecomitalia.it [82.59.158.146]) by support.bugseng.com (Postfix) with ESMTPSA id 085594EE073C; Thu, 30 Nov 2023 16:48:35 +0100 (CET) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: ebb3c753-8f97-11ee-98e4-6d05b1d4d9a1 From: Federico Serafini To: xen-devel@lists.xenproject.org Cc: consulting@bugseng.com, Federico Serafini Subject: [XEN PATCH 1/2] x86/p2m: preparation work for xenmem_add_to_physmap_one() Date: Thu, 30 Nov 2023 16:48:21 +0100 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1701359348201000003 Content-Type: text/plain; charset="utf-8" The objective is to use parameter name "gfn" for xenmem_add_to_physmap_one(). Since the name "gfn" is currently used as identifier for a local variable, bad things could happen if new uses of such variable are committed while a renaming patch is waiting for the approval. To avoid such danger, as first thing rename the local variable from "gfn" to "gmfn". No functional change. Signed-off-by: Federico Serafini Reviewed-by: Jan Beulich --- xen/arch/x86/mm/p2m.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index fe9ccabb87..42508e1e7e 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -2417,7 +2417,7 @@ int xenmem_add_to_physmap_one( gfn_t gpfn) { struct page_info *page =3D NULL; - unsigned long gfn =3D 0 /* gcc ... */, old_gpfn; + unsigned long gmfn =3D 0 /* gcc ... */, old_gpfn; mfn_t prev_mfn; int rc =3D 0; mfn_t mfn =3D INVALID_MFN; @@ -2440,12 +2440,12 @@ int xenmem_add_to_physmap_one( =20 case XENMAPSPACE_gmfn: { - gfn =3D idx; - mfn =3D get_gfn_unshare(d, gfn, &p2mt); + gmfn =3D idx; + mfn =3D get_gfn_unshare(d, gmfn, &p2mt); /* If the page is still shared, exit early */ if ( p2m_is_shared(p2mt) ) { - put_gfn(d, gfn); + put_gfn(d, gmfn); return -ENOMEM; } page =3D get_page_from_mfn(mfn, d); @@ -2480,7 +2480,7 @@ int xenmem_add_to_physmap_one( /* XENMAPSPACE_gmfn: Check if the MFN is associated with another GFN. = */ old_gpfn =3D get_gpfn_from_mfn(mfn_x(mfn)); ASSERT(!SHARED_M2P(old_gpfn)); - if ( space =3D=3D XENMAPSPACE_gmfn && old_gpfn !=3D gfn ) + if ( space =3D=3D XENMAPSPACE_gmfn && old_gpfn !=3D gmfn ) { rc =3D -EXDEV; goto put_all; @@ -2518,7 +2518,7 @@ int xenmem_add_to_physmap_one( */ if ( space =3D=3D XENMAPSPACE_gmfn ) { - put_gfn(d, gfn); + put_gfn(d, gmfn); if ( !rc && extra.ppage ) { *extra.ppage =3D page; --=20 2.34.1