| Message ID | f72155cb1cc5d3bb09b7939df6170628c06cc1b7.1710145041.git.simone.ballarin@bugseng.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | xen: address violation of MISRA C:2012 Directive 4.10 | expand |
On Mon, 11 Mar 2024, Simone Ballarin wrote: > From: Maria Celeste Cesario <maria.celeste.cesario@bugseng.com> > > Add or modify 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"). > Mechanical change. > --- > Commit introduced in v3 > > Signed-off-by: Maria Celeste Cesario <maria.celeste.cesario@bugseng.com> > Signed-off-by: Simone Ballarin <simone.ballarin@bugseng.com> > --- > xen/arch/arm/include/asm/domain.h | 6 +++--- > xen/arch/arm/include/asm/efibind.h | 5 +++++ > xen/arch/arm/include/asm/event.h | 6 +++--- > xen/arch/arm/include/asm/grant_table.h | 6 +++--- > xen/arch/arm/include/asm/io.h | 6 +++--- > xen/arch/arm/include/asm/irq.h | 6 +++--- > xen/arch/arm/include/asm/smp.h | 6 +++--- > xen/arch/arm/include/asm/spinlock.h | 6 +++--- > xen/arch/arm/include/asm/system.h | 6 +++--- > 9 files changed, 29 insertions(+), 24 deletions(-) > > diff --git a/xen/arch/arm/include/asm/domain.h b/xen/arch/arm/include/asm/domain.h > index 8218afb862..b7dc023a25 100644 > --- a/xen/arch/arm/include/asm/domain.h > +++ b/xen/arch/arm/include/asm/domain.h > @@ -1,5 +1,5 @@ > -#ifndef __ASM_DOMAIN_H__ > -#define __ASM_DOMAIN_H__ > +#ifndef ASM_ARM_DOMAIN_H > +#define ASM_ARM_DOMAIN_H > > #include <xen/cache.h> > #include <xen/timer.h> > @@ -312,7 +312,7 @@ static inline void update_guest_memory_policy(struct vcpu *v, > struct guest_memory_policy *gmp) > {} > > -#endif /* __ASM_DOMAIN_H__ */ > +#endif /* ASM_ARM_DOMAIN_H */ > > /* > * Local variables: > diff --git a/xen/arch/arm/include/asm/efibind.h b/xen/arch/arm/include/asm/efibind.h > index 09dca7a8c9..689bf63232 100644 > --- a/xen/arch/arm/include/asm/efibind.h > +++ b/xen/arch/arm/include/asm/efibind.h > @@ -1,2 +1,7 @@ > +#ifndef ASM_ARM_EFI_BIND_H This should be ASM_ARM_EFIBIND_H ? Everything else looks fine to me
diff --git a/xen/arch/arm/include/asm/domain.h b/xen/arch/arm/include/asm/domain.h index 8218afb862..b7dc023a25 100644 --- a/xen/arch/arm/include/asm/domain.h +++ b/xen/arch/arm/include/asm/domain.h @@ -1,5 +1,5 @@ -#ifndef __ASM_DOMAIN_H__ -#define __ASM_DOMAIN_H__ +#ifndef ASM_ARM_DOMAIN_H +#define ASM_ARM_DOMAIN_H #include <xen/cache.h> #include <xen/timer.h> @@ -312,7 +312,7 @@ static inline void update_guest_memory_policy(struct vcpu *v, struct guest_memory_policy *gmp) {} -#endif /* __ASM_DOMAIN_H__ */ +#endif /* ASM_ARM_DOMAIN_H */ /* * Local variables: diff --git a/xen/arch/arm/include/asm/efibind.h b/xen/arch/arm/include/asm/efibind.h index 09dca7a8c9..689bf63232 100644 --- a/xen/arch/arm/include/asm/efibind.h +++ b/xen/arch/arm/include/asm/efibind.h @@ -1,2 +1,7 @@ +#ifndef ASM_ARM_EFI_BIND_H +#define ASM_ARM_EFI_BIND_H + #include <xen/types.h> #include <asm/arm64/efibind.h> + +#endif /* ASM_ARM_EFI_BIND_H */ diff --git a/xen/arch/arm/include/asm/event.h b/xen/arch/arm/include/asm/event.h index b14c166ad6..db5d5ea37a 100644 --- a/xen/arch/arm/include/asm/event.h +++ b/xen/arch/arm/include/asm/event.h @@ -1,5 +1,5 @@ -#ifndef __ASM_EVENT_H__ -#define __ASM_EVENT_H__ +#ifndef ASM_ARM_EVENT_H +#define ASM_ARM_EVENT_H #include <asm/domain.h> @@ -52,7 +52,7 @@ static inline bool arch_virq_is_global(unsigned int virq) return true; } -#endif +#endif /* ASM_ARM_EVENT_H */ /* * Local variables: * mode: C diff --git a/xen/arch/arm/include/asm/grant_table.h b/xen/arch/arm/include/asm/grant_table.h index d3c518a926..0363c6aa1e 100644 --- a/xen/arch/arm/include/asm/grant_table.h +++ b/xen/arch/arm/include/asm/grant_table.h @@ -1,5 +1,5 @@ -#ifndef __ASM_GRANT_TABLE_H__ -#define __ASM_GRANT_TABLE_H__ +#ifndef ASM_ARM_GRANT_TABLE_H +#define ASM_ARM_GRANT_TABLE_H #include <xen/grant_table.h> #include <xen/kernel.h> @@ -76,7 +76,7 @@ int replace_grant_host_mapping(uint64_t gpaddr, mfn_t frame, #define gnttab_need_iommu_mapping(d) \ (is_domain_direct_mapped(d) && is_iommu_enabled(d)) -#endif /* __ASM_GRANT_TABLE_H__ */ +#endif /* ASM_ARM_GRANT_TABLE_H */ /* * Local variables: * mode: C diff --git a/xen/arch/arm/include/asm/io.h b/xen/arch/arm/include/asm/io.h index e426804424..8b5f811ec8 100644 --- a/xen/arch/arm/include/asm/io.h +++ b/xen/arch/arm/include/asm/io.h @@ -1,5 +1,5 @@ -#ifndef _ASM_IO_H -#define _ASM_IO_H +#ifndef ASM_ARM_IO_H +#define ASM_ARM_IO_H #if defined(CONFIG_ARM_32) # include <asm/arm32/io.h> @@ -9,7 +9,7 @@ # error "unknown ARM variant" #endif -#endif +#endif /* ASM_ARM_IO_H */ /* * Local variables: * mode: C diff --git a/xen/arch/arm/include/asm/irq.h b/xen/arch/arm/include/asm/irq.h index c8044b0371..48b46de51f 100644 --- a/xen/arch/arm/include/asm/irq.h +++ b/xen/arch/arm/include/asm/irq.h @@ -1,5 +1,5 @@ -#ifndef _ASM_HW_IRQ_H -#define _ASM_HW_IRQ_H +#ifndef ASM_ARM_IRQ_H +#define ASM_ARM_IRQ_H #include <xen/device_tree.h> #include <public/device_tree_defs.h> @@ -99,7 +99,7 @@ void irq_set_affinity(struct irq_desc *desc, const cpumask_t *mask); */ bool irq_type_set_by_domain(const struct domain *d); -#endif /* _ASM_HW_IRQ_H */ +#endif /* ASM_ARM_IRQ_H */ /* * Local variables: * mode: C diff --git a/xen/arch/arm/include/asm/smp.h b/xen/arch/arm/include/asm/smp.h index e99a3a3f53..44e4183470 100644 --- a/xen/arch/arm/include/asm/smp.h +++ b/xen/arch/arm/include/asm/smp.h @@ -1,5 +1,5 @@ -#ifndef __ASM_SMP_H -#define __ASM_SMP_H +#ifndef ASM_ARM_SMP_H +#define ASM_ARM_SMP_H #ifndef __ASSEMBLY__ #include <xen/cpumask.h> @@ -39,7 +39,7 @@ extern unsigned int smp_get_max_cpus(void); #define cpu_physical_id(cpu) cpu_logical_map(cpu) -#endif +#endif /* ASM_ARM_SMP_H */ /* * Local variables: diff --git a/xen/arch/arm/include/asm/spinlock.h b/xen/arch/arm/include/asm/spinlock.h index 42b0f584fe..326005c39a 100644 --- a/xen/arch/arm/include/asm/spinlock.h +++ b/xen/arch/arm/include/asm/spinlock.h @@ -1,5 +1,5 @@ -#ifndef __ASM_SPINLOCK_H -#define __ASM_SPINLOCK_H +#ifndef ASM_ARM_SPINLOCK_H +#define ASM_ARM_SPINLOCK_H #define arch_lock_acquire_barrier() smp_mb() #define arch_lock_release_barrier() smp_mb() @@ -12,4 +12,4 @@ #define arch_lock_signal_wmb() arch_lock_signal() -#endif /* __ASM_SPINLOCK_H */ +#endif /* ASM_ARM_SPINLOCK_H */ diff --git a/xen/arch/arm/include/asm/system.h b/xen/arch/arm/include/asm/system.h index 65d5c8e423..faf9227f53 100644 --- a/xen/arch/arm/include/asm/system.h +++ b/xen/arch/arm/include/asm/system.h @@ -1,6 +1,6 @@ /* Portions taken from Linux arch arm */ -#ifndef __ASM_SYSTEM_H -#define __ASM_SYSTEM_H +#ifndef ASM_ARM_SYSTEM_H +#define ASM_ARM_SYSTEM_H #include <xen/lib.h> #include <public/arch-arm.h> @@ -62,7 +62,7 @@ static inline int local_abort_is_enabled(void) extern struct vcpu *__context_switch(struct vcpu *prev, struct vcpu *next); -#endif +#endif /* ASM_ARM_SYSTEM_H */ /* * Local variables: * mode: C