From nobody Mon Feb 9 11:46:42 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 ARC-Seal: i=1; a=rsa-sha256; t=1598627306; cv=none; d=zohomail.com; s=zohoarc; b=eLoCYq0rEKrwMFG3uCezt3iRZeKRqCpce6vsv9CnhiBWkA188weYPV5inFSNL2Fx1RbxAGfKFdEHQsaNG5v5E4OVtlRVpHnSTAhmI2YYRwMmIajhQsR5NOMMOLC5oKbuipRI0DL2HQeJcVbETRVJ7QXMvi5h84rfEZt2G4aWpqs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598627306; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=/7gEUCzpYUrtvIzlm7moelC32knxh8uc6WOmAU0TV9k=; b=I5wn+mAkGQceBksxNEygWmu4aQThidTasDxacJeQJM5IhtUqmdIyE7ZE+TF7uohqVDsm/t3s0l5cHcMaf98PCXAbYu1vxHU9g+eYNgbF7GlegMc+ERJCcXQvoK+e1a1ewAlo8LfyeuN7W/8hDEG8UcMygGQZ8DChW+pxI6wmwL4= ARC-Authentication-Results: i=1; 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 1598627306486950.5267317810327; Fri, 28 Aug 2020 08:08:26 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kBfz9-0004jg-0b; Fri, 28 Aug 2020 15:08:11 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kBfz7-0004eL-Hn for xen-devel@lists.xenproject.org; Fri, 28 Aug 2020 15:08:09 +0000 Received: from mx2.suse.de (unknown [195.135.220.15]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id a28c6cc9-13a5-4375-9d06-4751087d6f40; Fri, 28 Aug 2020 15:07:53 +0000 (UTC) Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 47DD8AF30; Fri, 28 Aug 2020 15:08:24 +0000 (UTC) X-Inumbo-ID: a28c6cc9-13a5-4375-9d06-4751087d6f40 X-Virus-Scanned: by amavisd-new at test-mx.suse.de From: Juergen Gross To: xen-devel@lists.xenproject.org Cc: Juergen Gross , Ian Jackson , Wei Liu Subject: [PATCH v4 08/31] tools/misc: replace PAGE_SIZE with XC_PAGE_SIZE in xen-mfndump.c Date: Fri, 28 Aug 2020 17:07:24 +0200 Message-Id: <20200828150747.25305-9-jgross@suse.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200828150747.25305-1-jgross@suse.com> References: <20200828150747.25305-1-jgross@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" Content-Type: text/plain; charset="utf-8" The definition of PAGE_SIZE comes from xc_private.h, which shouldn't be used by xen-mfndump.c. Replace PAGE_SIZE by XC_PAGE_SIZE, as xc_private.h contains: #define PAGE_SIZE XC_PAGE_SIZE For the same reason PAGE_SHIFT_X86 needs to replaced with XC_PAGE_SHIFT. Signed-off-by: Juergen Gross Acked-by: Wei Liu --- tools/misc/xen-mfndump.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/tools/misc/xen-mfndump.c b/tools/misc/xen-mfndump.c index cb15d08c7e..92bc954ce0 100644 --- a/tools/misc/xen-mfndump.c +++ b/tools/misc/xen-mfndump.c @@ -207,7 +207,7 @@ int dump_ptes_func(int argc, char *argv[]) goto out; } =20 - page =3D xc_map_foreign_range(xch, domid, PAGE_SIZE, PROT_READ, + page =3D xc_map_foreign_range(xch, domid, XC_PAGE_SIZE, PROT_READ, minfo.p2m_table[pfn]); if ( !page ) { @@ -216,7 +216,7 @@ int dump_ptes_func(int argc, char *argv[]) goto out; } =20 - pte_num =3D PAGE_SIZE / 8; + pte_num =3D XC_PAGE_SIZE / 8; =20 printf(" --- Dumping %d PTEs for domain %d ---\n", pte_num, domid); printf(" Guest Width: %u, PT Levels: %u P2M size: =3D %lu\n", @@ -252,7 +252,7 @@ int dump_ptes_func(int argc, char *argv[]) =20 out: if ( page ) - munmap(page, PAGE_SIZE); + munmap(page, XC_PAGE_SIZE); xc_unmap_domain_meminfo(xch, &minfo); munmap(m2p_table, M2P_SIZE(max_mfn)); return rc; @@ -290,7 +290,7 @@ int lookup_pte_func(int argc, char *argv[]) return -1; } =20 - pte_num =3D PAGE_SIZE / 8; + pte_num =3D XC_PAGE_SIZE / 8; =20 printf(" --- Lookig for PTEs mapping mfn 0x%lx for domain %d ---\n", mfn, domid); @@ -302,7 +302,7 @@ int lookup_pte_func(int argc, char *argv[]) if ( !(minfo.pfn_type[i] & XEN_DOMCTL_PFINFO_LTABTYPE_MASK) ) continue; =20 - page =3D xc_map_foreign_range(xch, domid, PAGE_SIZE, PROT_READ, + page =3D xc_map_foreign_range(xch, domid, XC_PAGE_SIZE, PROT_READ, minfo.p2m_table[i]); if ( !page ) continue; @@ -312,15 +312,15 @@ int lookup_pte_func(int argc, char *argv[]) uint64_t pte =3D ((const uint64_t*)page)[j]; =20 #define __MADDR_BITS_X86 ((minfo.guest_width =3D=3D 8) ? 52 : 44) -#define __MFN_MASK_X86 ((1ULL << (__MADDR_BITS_X86 - PAGE_SHIFT_X86)) -= 1) - if ( ((pte >> PAGE_SHIFT_X86) & __MFN_MASK_X86) =3D=3D mfn) +#define __MFN_MASK_X86 ((1ULL << (__MADDR_BITS_X86 - XC_PAGE_SHIFT)) - = 1) + if ( ((pte >> XC_PAGE_SHIFT) & __MFN_MASK_X86) =3D=3D mfn) printf(" 0x%lx <-- [0x%lx][%lu]: 0x%"PRIx64"\n", mfn, minfo.p2m_table[i], j, pte); #undef __MADDR_BITS_X86 #undef __MFN_MASK_X8 } =20 - munmap(page, PAGE_SIZE); + munmap(page, XC_PAGE_SIZE); page =3D NULL; } =20 @@ -355,8 +355,8 @@ int memcmp_mfns_func(int argc, char *argv[]) return -1; } =20 - page1 =3D xc_map_foreign_range(xch, domid1, PAGE_SIZE, PROT_READ, mfn1= ); - page2 =3D xc_map_foreign_range(xch, domid2, PAGE_SIZE, PROT_READ, mfn2= ); + page1 =3D xc_map_foreign_range(xch, domid1, XC_PAGE_SIZE, PROT_READ, m= fn1); + page2 =3D xc_map_foreign_range(xch, domid2, XC_PAGE_SIZE, PROT_READ, m= fn2); if ( !page1 || !page2 ) { ERROR("Failed to map either 0x%lx[dom %d] or 0x%lx[dom %d]\n", @@ -368,13 +368,13 @@ int memcmp_mfns_func(int argc, char *argv[]) printf(" --- Comparing the content of 2 MFNs ---\n"); printf(" 1: 0x%lx[dom %d], 2: 0x%lx[dom %d]\n", mfn1, domid1, mfn2, domid2); - printf(" memcpy(1, 2) =3D %d\n", memcmp(page1, page2, PAGE_SIZE)); + printf(" memcpy(1, 2) =3D %d\n", memcmp(page1, page2, XC_PAGE_SIZE)); =20 out: if ( page1 ) - munmap(page1, PAGE_SIZE); + munmap(page1, XC_PAGE_SIZE); if ( page2 ) - munmap(page2, PAGE_SIZE); + munmap(page2, XC_PAGE_SIZE); return rc; } =20 --=20 2.26.2