[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH 5/6] x86/asm: refactor inclusion guards


  • To: <xen-devel@xxxxxxxxxxxxxxxxxxxx>
  • From: Stefano Stabellini <stefano.stabellini@xxxxxxx>
  • Date: Fri, 16 May 2025 16:21:29 -0700
  • Arc-authentication-results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.xenproject.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0)
  • Arc-message-signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=DK+KHWKqgLBHIw14tu9e6rDx3z6/no2a/sVRmU5bVsQ=; b=MWB/cqI9w8folzAL5D1YgY1GgMxC+u4FcHVyczq6bxtdDH2gr5xZqTKEn8hju4nQyKx5ziEX19Y5/b33Wt2Qg7EnuY51zghpOTRwzTaLh9bZBsDvnE7VUKeS4kG0cvDOOaZ3kTTj7E3Wb+zYpNagrPMkQg72n2rZZCtpfbmrDfNxNjTda/SIxDit01jMrB+ygbzg0r1eHW93ojSaZxN7PdClbW80MSpVTQ9m/71H/1ziuAhPy3oyKPVW3YWZep28ajC2snN7Z4DUiEJwt5N8QYLr1e7fQz4+MhnvjouyJ476skxj6QgSg1XjA1NsfzWEwV2FM9rJaM59nXIfCzu6Ng==
  • Arc-seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=eVQKfLMh5iuSxX7mG4fUMwovR6UhXUUhvjuA8rXPOmL4BHVE2j7NGiXKK6zqz5nuJmcK2v0xHDwVwsHSxgS54ibdgxTTSv30o5TyEuW92IDFdJxxUocdSFWVizlOUKeNU/kRdQbgtBz2MHb+DNbLRBi0PZa/NWW5kgiSHol4EQ4ZDJAH3JxELhKdzIbTHARINwmYONhHcFC0Frkxjxdfl14xZgfeAbijEUUy24AyhLzu/MC/eUTe8y6IfCHbehyc2LaEW9Tc5sFA+PvgTqKJKSE9ZopWhCtC8TTnrj0jHgFw08orGjSP3jujDOKoTXeuBPFfIEv06OxWFGtEEia0Lg==
  • Cc: <andrew.cooper3@xxxxxxxxxx>, <michal.orzel@xxxxxxx>, <jbeulich@xxxxxxxx>, <julien@xxxxxxx>, <roger.pau@xxxxxxxxxx>, <sstabellini@xxxxxxxxxx>, <bertrand.marquis@xxxxxxx>, Federico Serafini <federico.serafini@xxxxxxxxxxx>, Stefano Stabellini <stefano.stabellini@xxxxxxx>
  • Delivery-date: Fri, 16 May 2025 23:21:59 +0000
  • List-id: Xen developer discussion <xen-devel.lists.xenproject.org>

From: Federico Serafini <federico.serafini@xxxxxxxxxxx>

MISRA C Directive 4.10 states that "Precautions shall be taken in order
to prevent the contents of a header file being included more than
once".

Refactor inclusion guards to address a violation of Directive 4.10
and follow CODING_STYLE.

Signed-off-by: Federico Serafini <federico.serafini@xxxxxxxxxxx>
Signed-off-by: Stefano Stabellini <stefano.stabellini@xxxxxxx>
---
 xen/arch/x86/Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile
index bedb97cbee..ce724a9daa 100644
--- a/xen/arch/x86/Makefile
+++ b/xen/arch/x86/Makefile
@@ -261,17 +261,17 @@ $(objtree)/arch/x86/include/asm/asm-macros.h: 
$(obj)/asm-macros.i $(src)/Makefil
        $(call filechk,asm-macros.h)
 
 define filechk_asm-macros.h
+    echo '#ifndef X86_MACROS_H'; \
+    echo '#define X86_MACROS_H'; \
     echo '#if 0'; \
     echo '.if 0'; \
     echo '#endif'; \
-    echo '#ifndef __ASM_MACROS_H__'; \
-    echo '#define __ASM_MACROS_H__'; \
     echo 'asm ( ".include \"$@\"" );'; \
-    echo '#endif /* __ASM_MACROS_H__ */'; \
     echo '#if 0'; \
     echo '.endif'; \
     cat $<; \
-    echo '#endif'
+    echo '#endif'; \
+    echo '#endif /* X86_MACROS_H */'
 endef
 
 $(obj)/efi.lds: AFLAGS-y += -DEFI
-- 
2.25.1




 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.