On 2024-07-01 16:09, Marek Marczykowski-Górecki wrote:
On Mon, Jul 01, 2024 at 03:36:01PM +0200, Alessandro Zucchelli wrote:
From: Simone Ballarin <[email protected]>
Add inclusion guard to address violations of
MISRA C:2012 Directive 4.10 ("Precautions shall be taken in order
to prevent the contents of a header file being included more than
once").
Mechanical change.
Signed-off-by: Simone Ballarin <[email protected]>
Signed-off-by: Maria Celeste Cesario
<[email protected]>
Signed-off-by: Nicola Vetrini <[email protected]>
Signed-off-by: Alessandro Zucchelli <[email protected]>
---
Changes in v4:
- Modified inclusion guard.
Changes in v3:
- remove trailing underscores
- change inclusion guard name to adhere to the new standard
Changes in v2:
- remove changes in "xen/arch/x86/efi/efi-boot.h"
Note:
Changes in efi-boot.h have been removed since the file is
intenteded to be included by common/efi/boot.c only. This motivation
is not enough to raise a deviation record, so the violation is
still present.
I'm confused by this comment. It says changes in efi-boot.h have been
removed, yet the patch does include them.
The note referes to the "Changes in v2".
You can ignore it.
---
xen/arch/x86/efi/efi-boot.h | 7 +++++++
xen/arch/x86/efi/runtime.h | 5 +++++
2 files changed, 12 insertions(+)
diff --git a/xen/arch/x86/efi/efi-boot.h b/xen/arch/x86/efi/efi-boot.h
index f282358435..c6be744f2b 100644
--- a/xen/arch/x86/efi/efi-boot.h
+++ b/xen/arch/x86/efi/efi-boot.h
@@ -3,6 +3,11 @@
* is intended to be included by common/efi/boot.c _only_, and
* therefore can define arch specific global variables.
*/
+
+#ifndef X86_EFI_EFI_BOOT_H
+#define X86_EFI_EFI_BOOT_H
+
+
#include <xen/vga.h>
#include <asm/e820.h>
#include <asm/edd.h>
@@ -912,6 +917,8 @@ void asmlinkage __init efi_multiboot2(EFI_HANDLE
ImageHandle,
efi_exit_boot(ImageHandle, SystemTable);
}
+#endif /* X86_EFI_EFI_BOOT_H */
+
/*
* Local variables:
* mode: C
diff --git a/xen/arch/x86/efi/runtime.h b/xen/arch/x86/efi/runtime.h
index 77866c5f21..88ab5651e9 100644
--- a/xen/arch/x86/efi/runtime.h
+++ b/xen/arch/x86/efi/runtime.h
@@ -1,3 +1,6 @@
+#ifndef X86_EFI_RUNTIME_H
+#define X86_EFI_RUNTIME_H
+
#include <xen/domain_page.h>
#include <xen/mm.h>
#include <asm/atomic.h>
@@ -17,3 +20,5 @@ void efi_update_l4_pgtable(unsigned int l4idx,
l4_pgentry_t l4e)
}
}
#endif
+
+#endif /* X86_EFI_RUNTIME_H */
--
2.34.1
--
Alessandro Zucchelli, B.Sc.
Software Engineer, BUGSENG (https://bugseng.com)
