On Mon, 28 Aug 2023, Simone Ballarin wrote:
> Add inclusion guards 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").
>
> Also C files, if included somewhere, need to comply with the guideline.
>
> Mechanical change.
>
> Signed-off-by: Simone Ballarin <simone.balla...@bugseng.com>
Reviewed-by: Stefano Stabellini <sstabell...@kernel.org>
> ---
> xen/common/compat/grant_table.c | 7 +++++++
> xen/common/coverage/gcc_4_7.c | 5 +++++
> xen/common/decompress.h | 5 +++++
> xen/common/event_channel.h | 5 +++++
> xen/common/multicall.c | 5 +++++
> 5 files changed, 27 insertions(+)
>
> diff --git a/xen/common/compat/grant_table.c b/xen/common/compat/grant_table.c
> index f8177c84c0..614ad71a59 100644
> --- a/xen/common/compat/grant_table.c
> +++ b/xen/common/compat/grant_table.c
> @@ -3,6 +3,10 @@
> *
> */
>
> +
> +#ifndef __COMMON_COMPAT_GRANT_TABLE_C__
> +#define __COMMON_COMPAT_GRANT_TABLE_C__
> +
> #include <xen/hypercall.h>
> #include <compat/grant_table.h>
>
> @@ -331,6 +335,9 @@ int compat_grant_table_op(
> return rc;
> }
>
> +
> +#endif /* __COMMON_COMPAT_GRANT_TABLE_C__ */
> +
> /*
> * Local variables:
> * mode: C
> diff --git a/xen/common/coverage/gcc_4_7.c b/xen/common/coverage/gcc_4_7.c
> index 25b4a8bcdc..12e4ec8cbb 100644
> --- a/xen/common/coverage/gcc_4_7.c
> +++ b/xen/common/coverage/gcc_4_7.c
> @@ -14,6 +14,9 @@
> * Wei Liu <wei.l...@citrix.com>
> */
>
> +#ifndef __COMMON_COVERAGE_GCC_4_7_C__
> +#define __COMMON_COVERAGE_GCC_4_7_C__
> +
> #include <xen/string.h>
>
> #include "gcov.h"
> @@ -193,6 +196,8 @@ size_t gcov_info_to_gcda(char *buffer, const struct
> gcov_info *info)
> return pos;
> }
>
> +#endif /* __COMMON_COVERAGE_GCC_4_7_C__ */
> +
> /*
> * Local variables:
> * mode: C
> diff --git a/xen/common/decompress.h b/xen/common/decompress.h
> index e8195b353a..da3c3abb6a 100644
> --- a/xen/common/decompress.h
> +++ b/xen/common/decompress.h
> @@ -1,3 +1,6 @@
> +#ifndef __COMMON_DECOMPRESS_H__
> +#define __COMMON_DECOMPRESS_H__
> +
> #ifdef __XEN__
>
> #include <xen/cache.h>
> @@ -23,3 +26,5 @@
> #define large_free free
>
> #endif
> +
> +#endif /* __COMMON_DECOMPRESS_H__ */
> diff --git a/xen/common/event_channel.h b/xen/common/event_channel.h
> index 45219ca67c..040bad77f9 100644
> --- a/xen/common/event_channel.h
> +++ b/xen/common/event_channel.h
> @@ -1,5 +1,8 @@
> /* Event channel handling private header. */
>
> +#ifndef __COMMON_EVENT_CHANNEL_H__
> +#define __COMMON_EVENT_CHANNEL_H__
> +
> #include <xen/event.h>
>
> static inline unsigned int max_evtchns(const struct domain *d)
> @@ -52,6 +55,8 @@ int evtchn_fifo_init_control(struct evtchn_init_control
> *init_control);
> int evtchn_fifo_expand_array(const struct evtchn_expand_array *expand_array);
> void evtchn_fifo_destroy(struct domain *d);
>
> +#endif /* __COMMON_EVENT_CHANNEL_H__ */
> +
> /*
> * Local variables:
> * mode: C
> diff --git a/xen/common/multicall.c b/xen/common/multicall.c
> index 1f0cc4cb26..421bb25b70 100644
> --- a/xen/common/multicall.c
> +++ b/xen/common/multicall.c
> @@ -2,6 +2,9 @@
> * multicall.c
> */
>
> +#ifndef __COMMON_MULTICALL_C__
> +#define __COMMON_MULTICALL_C__
> +
> #include <xen/types.h>
> #include <xen/lib.h>
> #include <xen/mm.h>
> @@ -124,6 +127,8 @@ ret_t do_multicall(
> __HYPERVISOR_multicall, "hi", call_list, nr_calls-i);
> }
>
> +#endif /* __COMMON_MULTICALL_C__ */
> +
> /*
> * Local variables:
> * mode: C
> --
> 2.34.1
>
