From nobody Tue May 21 07:25:38 2024 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 17104018807311000.1704866128551; Thu, 14 Mar 2024 00:38:00 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.692946.1080699 (Exim 4.92) (envelope-from ) id 1rkfel-0000dA-Sv; Thu, 14 Mar 2024 07:37:39 +0000 Received: by outflank-mailman (output) from mailman id 692946.1080699; Thu, 14 Mar 2024 07:37:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rkfel-0000d3-Px; Thu, 14 Mar 2024 07:37:39 +0000 Received: by outflank-mailman (input) for mailman id 692946; Thu, 14 Mar 2024 07:37:39 +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 1rkfel-0000cv-72 for xen-devel@lists.xenproject.org; Thu, 14 Mar 2024 07:37:39 +0000 Received: from support.bugseng.com (mail.bugseng.com [162.55.131.47]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id bac60428-e1d5-11ee-afdd-a90da7624cb6; Thu, 14 Mar 2024 08:37:37 +0100 (CET) Received: from truciono.bugseng.com (unknown [78.209.96.112]) by support.bugseng.com (Postfix) with ESMTPSA id 8EE514EE0739; Thu, 14 Mar 2024 08:37: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: bac60428-e1d5-11ee-afdd-a90da7624cb6 From: Federico Serafini To: xen-devel@lists.xenproject.org Cc: consulting@bugseng.com, Federico Serafini , Jan Beulich , Paul Durrant , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Andrew Cooper , George Dunlap , Julien Grall , Stefano Stabellini , Wei Liu Subject: [XEN PATCH v2] xen: avoid grep fodder define and undef Date: Thu, 14 Mar 2024 08:37:28 +0100 Message-Id: <1f41883b6688d669d912f9358beccca016bd7ba8.1710401549.git.federico.serafini@bugseng.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1710401881960100001 Content-Type: text/plain; charset="utf-8" Place an "#if 0" before grep fodder #define-s and remove the #undef-s. This addresses violations of MISRA C:2012 Rules 20.5 ("#undef should not be used") and 5.5 ("Identifiers shall be distinct from macro names"). No functional change. Signed-off-by: Federico Serafini Acked-by: Andrew Cooper --- xen/include/xen/iommu.h | 5 +---- xen/include/xen/mm-frame.h | 15 +++------------ 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/xen/include/xen/iommu.h b/xen/include/xen/iommu.h index 9621459c63..ef57f31417 100644 --- a/xen/include/xen/iommu.h +++ b/xen/include/xen/iommu.h @@ -33,13 +33,10 @@ TYPE_SAFE(uint64_t, dfn); #define PRI_dfn PRIx64 #define INVALID_DFN _dfn(~0ULL) =20 -#ifndef dfn_t +#if 0 #define dfn_t /* Grep fodder: dfn_t, _dfn() and dfn_x() are defined above = */ #define _dfn #define dfn_x -#undef dfn_t -#undef _dfn -#undef dfn_x #endif =20 static inline dfn_t __must_check dfn_add(dfn_t dfn, unsigned long i) diff --git a/xen/include/xen/mm-frame.h b/xen/include/xen/mm-frame.h index c25e836f25..d973aec901 100644 --- a/xen/include/xen/mm-frame.h +++ b/xen/include/xen/mm-frame.h @@ -14,13 +14,10 @@ TYPE_SAFE(unsigned long, mfn); */ #define INVALID_MFN_INITIALIZER { INVALID_MFN_RAW } =20 -#ifndef mfn_t +#if 0 #define mfn_t /* Grep fodder: mfn_t, _mfn() and mfn_x() are defined above = */ #define _mfn #define mfn_x -#undef mfn_t -#undef _mfn -#undef mfn_x #endif =20 static inline mfn_t __must_check mfn_add(mfn_t mfn, unsigned long i) @@ -53,13 +50,10 @@ TYPE_SAFE(unsigned long, gfn); */ #define INVALID_GFN_INITIALIZER { INVALID_GFN_RAW } =20 -#ifndef gfn_t +#if 0 #define gfn_t /* Grep fodder: gfn_t, _gfn() and gfn_x() are defined above = */ #define _gfn #define gfn_x -#undef gfn_t -#undef _gfn -#undef gfn_x #endif =20 static inline gfn_t __must_check gfn_add(gfn_t gfn, unsigned long i) @@ -85,13 +79,10 @@ static inline bool gfn_eq(gfn_t x, gfn_t y) TYPE_SAFE(unsigned long, pfn); #define PRI_pfn "05lx" =20 -#ifndef pfn_t +#if 0 #define pfn_t /* Grep fodder: pfn_t, _pfn() and pfn_x() are defined above = */ #define _pfn #define pfn_x -#undef pfn_t -#undef _pfn -#undef pfn_x #endif =20 #endif /* __XEN_FRAME_NUM_H__ */ --=20 2.34.1