From 4d96a4fe2ac08cc93f2e7eca56120792363cb950 Mon Sep 17 00:00:00 2001 From: Xenia Ragiadakou Date: Mon, 1 Aug 2022 15:21:18 +0300 Subject: [PATCH] xen/efi: efibind: fix MISRA C 2012 Directive 4.10 violation Prevent header file from being included more than once by adding ifndef guard. In order to be close to gnu-efi code - for x86_64, use the same guard - for arm64, that there is no guard in gnu-efi, for consistency, use a similar format and position to the x86_64 guard Signed-off-by: Xenia Ragiadakou Acked-by: Jan Beulich Reviewed-by: Bertrand Marquis --- xen/arch/arm/include/asm/arm64/efibind.h | 5 ++++- xen/arch/x86/include/asm/x86_64/efibind.h | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/include/asm/arm64/efibind.h b/xen/arch/arm/include/asm/arm64/efibind.h index 2b0bf40bf2..8b43bb8495 100644 --- a/xen/arch/arm/include/asm/arm64/efibind.h +++ b/xen/arch/arm/include/asm/arm64/efibind.h @@ -16,7 +16,8 @@ Abstract: Revision History --*/ - +#ifndef AARCH64_EFI_BIND +#define AARCH64_EFI_BIND #ifndef __GNUC__ #pragma pack() #endif @@ -205,6 +206,8 @@ typedef uint64_t UINTN; #endif +#endif + /* * Local variables: * mode: C diff --git a/xen/arch/x86/include/asm/x86_64/efibind.h b/xen/arch/x86/include/asm/x86_64/efibind.h index ddcfae07ec..e23cd16cb6 100644 --- a/xen/arch/x86/include/asm/x86_64/efibind.h +++ b/xen/arch/x86/include/asm/x86_64/efibind.h @@ -16,7 +16,8 @@ Abstract: Revision History --*/ - +#ifndef X86_64_EFI_BIND +#define X86_64_EFI_BIND #ifndef __GNUC__ #pragma pack() #endif @@ -278,3 +279,4 @@ typedef uint64_t UINTN; #pragma warning ( disable : 4731 ) // Suppress warnings about modification of EBP #endif +#endif -- 2.30.2