diff --git a/accel/tcg/tcg-accel-ops-icount.h b/accel/tcg/tcg-accel-ops-icount.h
index d884aa2aaacb13f7db26854e9c5411c0900ddac2..1b6fd9c607513717421870f9519f0f305e623f4d 100644
--- a/accel/tcg/tcg-accel-ops-icount.h
+++ b/accel/tcg/tcg-accel-ops-icount.h
@@ -7,8 +7,8 @@
* See the COPYING file in the top-level directory.
*/
-#ifndef TCG_CPUS_ICOUNT_H
-#define TCG_CPUS_ICOUNT_H
+#ifndef TCG_ACCEL_OPS_ICOUNT_H
+#define TCG_ACCEL_OPS_ICOUNT_H
void icount_handle_deadline(void);
void icount_prepare_for_run(CPUState *cpu);
@@ -16,4 +16,4 @@ void icount_process_data(CPUState *cpu);
void icount_handle_interrupt(CPUState *cpu, int mask);
-#endif /* TCG_CPUS_ICOUNT_H */
+#endif /* TCG_ACCEL_OPS_ICOUNT_H */
diff --git a/accel/tcg/tcg-accel-ops-mttcg.h b/accel/tcg/tcg-accel-ops-mttcg.h
index 9fdc5a2ab5467a28576741fe0d7920abd8a04906..8ffa7a9a9fe0d23f0f166b595a967a9781086b44 100644
--- a/accel/tcg/tcg-accel-ops-mttcg.h
+++ b/accel/tcg/tcg-accel-ops-mttcg.h
@@ -7,8 +7,8 @@
* See the COPYING file in the top-level directory.
*/
-#ifndef TCG_CPUS_MTTCG_H
-#define TCG_CPUS_MTTCG_H
+#ifndef TCG_ACCEL_OPS_MTTCG_H
+#define TCG_ACCEL_OPS_MTTCG_H
/* kick MTTCG vCPU thread */
void mttcg_kick_vcpu_thread(CPUState *cpu);
@@ -16,4 +16,4 @@ void mttcg_kick_vcpu_thread(CPUState *cpu);
/* start an mttcg vCPU thread */
void mttcg_start_vcpu_thread(CPUState *cpu);
-#endif /* TCG_CPUS_MTTCG_H */
+#endif /* TCG_ACCEL_OPS_MTTCG_H */
diff --git a/accel/tcg/tcg-accel-ops-rr.h b/accel/tcg/tcg-accel-ops-rr.h
index 54f6ae6e867f9c28c23aad97e0f856cc673c2777..2a76a296127e81edc61f45a59785a89705daae90 100644
--- a/accel/tcg/tcg-accel-ops-rr.h
+++ b/accel/tcg/tcg-accel-ops-rr.h
@@ -7,8 +7,8 @@
* See the COPYING file in the top-level directory.
*/
-#ifndef TCG_CPUS_RR_H
-#define TCG_CPUS_RR_H
+#ifndef TCG_ACCEL_OPS_RR_H
+#define TCG_ACCEL_OPS_RR_H
#define TCG_KICK_PERIOD (NANOSECONDS_PER_SECOND / 10)
@@ -18,4 +18,4 @@ void rr_kick_vcpu_thread(CPUState *unused);
/* start the round robin vcpu thread */
void rr_start_vcpu_thread(CPUState *cpu);
-#endif /* TCG_CPUS_RR_H */
+#endif /* TCG_ACCEL_OPS_RR_H */
diff --git a/accel/tcg/tcg-accel-ops.h b/accel/tcg/tcg-accel-ops.h
index 6a5fcef889808c681ddb48060dd4dbf34bc34036..f9bc6330e2d0f401be59801e3c7f79466cb3557c 100644
--- a/accel/tcg/tcg-accel-ops.h
+++ b/accel/tcg/tcg-accel-ops.h
@@ -9,8 +9,8 @@
* See the COPYING file in the top-level directory.
*/
-#ifndef TCG_CPUS_H
-#define TCG_CPUS_H
+#ifndef TCG_ACCEL_OPS_H
+#define TCG_ACCEL_OPS_H
#include "sysemu/cpus.h"
@@ -19,4 +19,4 @@ int tcg_cpus_exec(CPUState *cpu);
void tcg_handle_interrupt(CPUState *cpu, int mask);
void tcg_cpu_init_cflags(CPUState *cpu, bool parallel);
-#endif /* TCG_CPUS_H */
+#endif /* TCG_ACCEL_OPS_H */
diff --git a/block/copy-on-read.h b/block/copy-on-read.h
index 7bf405dccd1f448a32abb25534c25e66a3e100de..1d8ad38c745fa24309524c1ac0988d663c024715 100644
--- a/block/copy-on-read.h
+++ b/block/copy-on-read.h
@@ -22,11 +22,11 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef BLOCK_COPY_ON_READ
-#define BLOCK_COPY_ON_READ
+#ifndef BLOCK_COPY_ON_READ_H
+#define BLOCK_COPY_ON_READ_H
#include "block/block_int.h"
void bdrv_cor_filter_drop(BlockDriverState *cor_filter_bs);
-#endif /* BLOCK_COPY_ON_READ */
+#endif /* BLOCK_COPY_ON_READ_H */
diff --git a/block/coroutines.h b/block/coroutines.h
index 8ea70d45f9a42714f80a566cb5f0a9fdbc8eaf9a..830ecaa733cc72eeff74e0209fa591d8e9b0dd5a 100644
--- a/block/coroutines.h
+++ b/block/coroutines.h
@@ -22,8 +22,8 @@
* THE SOFTWARE.
*/
-#ifndef BLOCK_COROUTINES_INT_H
-#define BLOCK_COROUTINES_INT_H
+#ifndef BLOCK_COROUTINES_H
+#define BLOCK_COROUTINES_H
#include "block/block_int.h"
@@ -129,4 +129,4 @@ blk_do_pdiscard(BlockBackend *blk, int64_t offset, int64_t bytes);
int generated_co_wrapper blk_do_flush(BlockBackend *blk);
-#endif /* BLOCK_COROUTINES_INT_H */
+#endif /* BLOCK_COROUTINES_H */
diff --git a/bsd-user/arm/target.h b/bsd-user/arm/target.h
index 419c039b68e13ab680a04f65ab461dfb6e1e8759..7c423ec5752d33e165cdc30ae5a36d96ff395467 100644
--- a/bsd-user/arm/target.h
+++ b/bsd-user/arm/target.h
@@ -17,5 +17,5 @@ static inline bool regpairs_aligned(void *cpu_env)
return true;
}
-#endif /* ! TARGET_H */
+#endif /* TARGET_H */
diff --git a/bsd-user/arm/target_arch.h b/bsd-user/arm/target_arch.h
index 93cfaea0986efcf5ced942c764e9ba9205c6bc69..561934bbd25923b41481d13c1e5e410cf1813c57 100644
--- a/bsd-user/arm/target_arch.h
+++ b/bsd-user/arm/target_arch.h
@@ -17,12 +17,12 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _TARGET_ARCH_H_
-#define _TARGET_ARCH_H_
+#ifndef TARGET_ARCH_H
+#define TARGET_ARCH_H
#include "qemu.h"
void target_cpu_set_tls(CPUARMState *env, target_ulong newtls);
target_ulong target_cpu_get_tls(CPUARMState *env);
-#endif /* !_TARGET_ARCH_H_ */
+#endif /* TARGET_ARCH_H */
diff --git a/bsd-user/arm/target_arch_cpu.h b/bsd-user/arm/target_arch_cpu.h
index afb7814a8d10c4bbd65f17f6bfd3a7f5de9cd949..517d0087644e11a30142988a8b3dfeb94dedf082 100644
--- a/bsd-user/arm/target_arch_cpu.h
+++ b/bsd-user/arm/target_arch_cpu.h
@@ -17,8 +17,8 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _TARGET_ARCH_CPU_H_
-#define _TARGET_ARCH_CPU_H_
+#ifndef TARGET_ARCH_CPU_H
+#define TARGET_ARCH_CPU_H
#include "target_arch.h"
#include "signal-common.h"
@@ -210,4 +210,4 @@ static inline void target_cpu_reset(CPUArchState *env)
{
}
-#endif /* !_TARGET_ARCH_CPU_H */
+#endif /* TARGET_ARCH_CPU_H */
diff --git a/bsd-user/arm/target_arch_elf.h b/bsd-user/arm/target_arch_elf.h
index 4a0215d02ed926dfe8abeb19a8011b9d0d5349b5..935bce347fc244b7cfe27c902e2a1b5b8b6a0534 100644
--- a/bsd-user/arm/target_arch_elf.h
+++ b/bsd-user/arm/target_arch_elf.h
@@ -16,8 +16,9 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _TARGET_ARCH_ELF_H_
-#define _TARGET_ARCH_ELF_H_
+
+#ifndef TARGET_ARCH_ELF_H
+#define TARGET_ARCH_ELF_H
#define ELF_START_MMAP 0x80000000
#define ELF_ET_DYN_LOAD_ADDR 0x500000
@@ -125,4 +126,4 @@ static uint32_t get_elf_hwcap2(void)
#undef GET_FEATURE
#undef GET_FEATURE_ID
-#endif /* _TARGET_ARCH_ELF_H_ */
+#endif /* TARGET_ARCH_ELF_H */
diff --git a/bsd-user/arm/target_arch_reg.h b/bsd-user/arm/target_arch_reg.h
index ef5ed5154f1c1b660973e6b1fdbc35fc5ba84f90..070fa24da123c9113c89bc89fa9e32d0b8718b65 100644
--- a/bsd-user/arm/target_arch_reg.h
+++ b/bsd-user/arm/target_arch_reg.h
@@ -17,8 +17,8 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _TARGET_ARCH_REG_H_
-#define _TARGET_ARCH_REG_H_
+#ifndef TARGET_ARCH_REG_H
+#define TARGET_ARCH_REG_H
/* See sys/arm/include/reg.h */
typedef struct target_reg {
@@ -57,4 +57,4 @@ static inline void target_copy_regs(target_reg_t *regs, const CPUARMState *env)
#undef tswapreg
-#endif /* !_TARGET_ARCH_REG_H_ */
+#endif /* TARGET_ARCH_REG_H */
diff --git a/bsd-user/arm/target_arch_signal.h b/bsd-user/arm/target_arch_signal.h
index f1844dbf2251713f034c789f6c9dea1b39af9c96..02b2b33e07aba370f1a01b81a218a46408f3af07 100644
--- a/bsd-user/arm/target_arch_signal.h
+++ b/bsd-user/arm/target_arch_signal.h
@@ -16,8 +16,9 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _TARGET_ARCH_SIGNAL_H_
-#define _TARGET_ARCH_SIGNAL_H_
+
+#ifndef TARGET_ARCH_SIGNAL_H
+#define TARGET_ARCH_SIGNAL_H
#include "cpu.h"
@@ -85,4 +86,4 @@ struct target_sigframe {
target_mcontext_vfp_t sf_vfp; /* actual saved VFP context */
};
-#endif /* !_TARGET_ARCH_SIGNAL_H_ */
+#endif /* TARGET_ARCH_SIGNAL_H */
diff --git a/bsd-user/arm/target_arch_sigtramp.h b/bsd-user/arm/target_arch_sigtramp.h
index 5d434a9e7e8069f70523258d88a17729ae58763e..06198045edf51b14f134ba0631b36c46ae7f164f 100644
--- a/bsd-user/arm/target_arch_sigtramp.h
+++ b/bsd-user/arm/target_arch_sigtramp.h
@@ -17,8 +17,8 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _TARGET_ARCH_SIGTRAMP_H_
-#define _TARGET_ARCH_SIGTRAMP_H_
+#ifndef TARGET_ARCH_SIGTRAMP_H
+#define TARGET_ARCH_SIGTRAMP_H
/* Compare to arm/arm/locore.S ENTRY_NP(sigcode) */
static inline abi_long setup_sigtramp(abi_ulong offset, unsigned sigf_uc,
@@ -46,4 +46,4 @@ static inline abi_long setup_sigtramp(abi_ulong offset, unsigned sigf_uc,
return memcpy_to_target(offset, sigtramp_code, TARGET_SZSIGCODE);
}
-#endif /* _TARGET_ARCH_SIGTRAMP_H_ */
+#endif /* TARGET_ARCH_SIGTRAMP_H */
diff --git a/bsd-user/arm/target_arch_sysarch.h b/bsd-user/arm/target_arch_sysarch.h
index 8cc6bff2077e98a8d1c92282c7786801b5a19cc6..5cb7864197d3ca0caf28938d6c6ef01af71acf05 100644
--- a/bsd-user/arm/target_arch_sysarch.h
+++ b/bsd-user/arm/target_arch_sysarch.h
@@ -17,8 +17,8 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _TARGET_ARCH_SYSARCH_H_
-#define _TARGET_ARCH_SYSARCH_H_
+#ifndef TARGET_ARCH_SYSARCH_H
+#define TARGET_ARCH_SYSARCH_H
#include "target_syscall.h"
#include "target_arch.h"
@@ -75,4 +75,4 @@ static inline void do_freebsd_arch_print_sysarch(
}
}
-#endif /*!_TARGET_ARCH_SYSARCH_H_ */
+#endif /* TARGET_ARCH_SYSARCH_H */
diff --git a/bsd-user/arm/target_arch_thread.h b/bsd-user/arm/target_arch_thread.h
index fcafca2408cf3c40c6b51f2a317b558ec007aa58..fd257f313d861c9e4e2777e6d2e442681112e322 100644
--- a/bsd-user/arm/target_arch_thread.h
+++ b/bsd-user/arm/target_arch_thread.h
@@ -16,8 +16,9 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _TARGET_ARCH_THREAD_H_
-#define _TARGET_ARCH_THREAD_H_
+
+#ifndef TARGET_ARCH_THREAD_H
+#define TARGET_ARCH_THREAD_H
/* Compare to arm/arm/vm_machdep.c cpu_set_upcall_kse() */
static inline void target_thread_set_upcall(CPUARMState *env, abi_ulong entry,
@@ -77,4 +78,4 @@ static inline void target_thread_init(struct target_pt_regs *regs,
*/
}
-#endif /* !_TARGET_ARCH_THREAD_H_ */
+#endif /* TARGET_ARCH_THREAD_H */
diff --git a/bsd-user/arm/target_arch_vmparam.h b/bsd-user/arm/target_arch_vmparam.h
index 4bbc04ddf5b8bff3a4d74cc4e263a4ac7f7888e3..3fb69aff51a8f2c4605d182a35501db50ef3f8f7 100644
--- a/bsd-user/arm/target_arch_vmparam.h
+++ b/bsd-user/arm/target_arch_vmparam.h
@@ -16,8 +16,9 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _TARGET_ARCH_VMPARAM_H_
-#define _TARGET_ARCH_VMPARAM_H_
+
+#ifndef TARGET_ARCH_VMPARAM_H
+#define TARGET_ARCH_VMPARAM_H
#include "cpu.h"
@@ -45,4 +46,4 @@ static inline void set_second_rval(CPUARMState *state, abi_ulong retval2)
state->regs[1] = retval2;
}
-#endif /* ! _TARGET_ARCH_VMPARAM_H_ */
+#endif /* TARGET_ARCH_VMPARAM_H */
diff --git a/bsd-user/arm/target_syscall.h b/bsd-user/arm/target_syscall.h
index a5f2bb4e0111ebd3474dc4b9ddeba8877bf68693..5804a535412c68c7a0d1691470a909edbd0351b6 100644
--- a/bsd-user/arm/target_syscall.h
+++ b/bsd-user/arm/target_syscall.h
@@ -17,8 +17,8 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _TARGET_ARCH_SYSCALL_H_
-#define _TARGET_ARCH_SYSCALL_H_
+#ifndef ARM_TARGET_SYSCALL_H
+#define ARM_TARGET_SYSCALL_H
struct target_pt_regs {
abi_long uregs[17];
@@ -52,4 +52,4 @@ struct target_pt_regs {
#define TARGET_HW_MACHINE "arm"
#define TARGET_HW_MACHINE_ARCH "armv7"
-#endif /* !_TARGET_ARCH_SYSCALL_H_ */
+#endif /* ARM_TARGET_SYSCALL_H */
diff --git a/bsd-user/bsd-file.h b/bsd-user/bsd-file.h
index f0c3f347ec0519aafdd460eb89ff7ef29de0df1d..a6bff3b8c26a0d58f77cf2aaf53a0b37a39c27df 100644
--- a/bsd-user/bsd-file.h
+++ b/bsd-user/bsd-file.h
@@ -17,8 +17,8 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef BSD_FILE_H_
-#define BSD_FILE_H_
+#ifndef BSD_FILE_H
+#define BSD_FILE_H
#include "qemu/path.h"
@@ -27,4 +27,4 @@ extern struct iovec *lock_iovec(int type, abi_ulong target_addr, int count,
extern void unlock_iovec(struct iovec *vec, abi_ulong target_addr, int count,
int copy);
-#endif /* !BSD_FILE_H_ */
+#endif /* BSD_FILE_H */
diff --git a/bsd-user/errno_defs.h b/bsd-user/errno_defs.h
index 73cfa24b7f5987ead62f9d1fdb1ea894ecd5299c..f3e8ac34883fef00aca58ba438a1f7279bc7fec3 100644
--- a/bsd-user/errno_defs.h
+++ b/bsd-user/errno_defs.h
@@ -34,8 +34,8 @@
* @(#)errno.h 8.5 (Berkeley) 1/21/94
*/
-#ifndef _ERRNO_DEFS_H_
-#define _ERRNO_DEFS_H_
+#ifndef ERRNO_DEFS_H
+#define ERRNO_DEFS_H
#define TARGET_EPERM 1 /* Operation not permitted */
#define TARGET_ENOENT 2 /* No such file or directory */
@@ -157,4 +157,4 @@
_Static_assert(TARGET_ERESTART == QEMU_ERESTARTSYS,
"TARGET_ERESTART and QEMU_ERESTARTSYS expected to match");
-#endif /* ! _ERRNO_DEFS_H_ */
+#endif /* ERRNO_DEFS_H */
diff --git a/bsd-user/freebsd/host-os.h b/bsd-user/freebsd/host-os.h
index dfb8344b7b6f0f0dfa4ed2e481079f6bc90e7e35..40cae72ec9a67d4e2e093fdd882faa0abaf3d46a 100644
--- a/bsd-user/freebsd/host-os.h
+++ b/bsd-user/freebsd/host-os.h
@@ -17,9 +17,9 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _HOST_OS_H_
-#define _HOST_OS_H_
+#ifndef HOST_OS_H
+#define HOST_OS_H
#define HOST_DEFAULT_BSD_TYPE target_freebsd
-#endif /*!_HOST_OS_H_ */
+#endif /* HOST_OS_H */
diff --git a/bsd-user/freebsd/target_os_elf.h b/bsd-user/freebsd/target_os_elf.h
index e5ac8e8e50118fd55ac6a818479aac8622017754..9df17d56d8a910b61ee2e8268c4934c89bf87a9d 100644
--- a/bsd-user/freebsd/target_os_elf.h
+++ b/bsd-user/freebsd/target_os_elf.h
@@ -16,8 +16,9 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _TARGET_OS_ELF_H_
-#define _TARGET_OS_ELF_H_
+
+#ifndef TARGET_OS_ELF_H
+#define TARGET_OS_ELF_H
#include "target_arch_elf.h"
#include "elf.h"
@@ -134,4 +135,4 @@ static abi_ulong target_create_elf_tables(abi_ulong p, int argc, int envc,
return sp;
}
-#endif /* _TARGET_OS_ELF_H_ */
+#endif /* TARGET_OS_ELF_H */
diff --git a/bsd-user/freebsd/target_os_siginfo.h b/bsd-user/freebsd/target_os_siginfo.h
index d50a3034a8877758ff715959086ec43b8ad2b7d1..4573738752d9c60b4b4942b7e1609f0928671176 100644
--- a/bsd-user/freebsd/target_os_siginfo.h
+++ b/bsd-user/freebsd/target_os_siginfo.h
@@ -16,8 +16,9 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _TARGET_OS_SIGINFO_H_
-#define _TARGET_OS_SIGINFO_H_
+
+#ifndef TARGET_OS_SIGINFO_H
+#define TARGET_OS_SIGINFO_H
#define TARGET_NSIG 128
#define TARGET_NSIG_BPW (sizeof(uint32_t) * 8)
@@ -155,4 +156,4 @@ struct target_sigevent {
#define TARGET_FPE_FLTINV (7) /* Invalid floating point operation. */
#define TARGET_FPE_FLTSUB (8) /* Subscript out of range. */
-#endif /* !_TARGET_OS_SIGINFO_H_ */
+#endif /* TARGET_OS_SIGINFO_H */
diff --git a/bsd-user/freebsd/target_os_signal.h b/bsd-user/freebsd/target_os_signal.h
index 43700d08f71a5d68a1192ec360d7f387c89e52db..5030abb52b75cd19d6090aa51a7963f3ae05eae3 100644
--- a/bsd-user/freebsd/target_os_signal.h
+++ b/bsd-user/freebsd/target_os_signal.h
@@ -1,5 +1,5 @@
-#ifndef _TARGET_OS_SIGNAL_H_
-#define _TARGET_OS_SIGNAL_H_
+#ifndef TARGET_OS_SIGNAL_H
+#define TARGET_OS_SIGNAL_H
#include "target_os_siginfo.h"
#include "target_arch_signal.h"
@@ -78,4 +78,4 @@ abi_long setup_sigframe_arch(CPUArchState *env, abi_ulong frame_addr,
#define TARGET_SS_ONSTACK 0x0001 /* take signals on alternate stack */
#define TARGET_SS_DISABLE 0x0004 /* disable taking signals on alternate stack*/
-#endif /* !_TARGET_OS_SIGNAL_H_ */
+#endif /* TARGET_OS_SIGNAL_H */
diff --git a/bsd-user/freebsd/target_os_stack.h b/bsd-user/freebsd/target_os_stack.h
index 1bb1a2bf569dfe623fc5fcf496672009d5417952..059013329153d9a7143a5d5deb76bcce72220132 100644
--- a/bsd-user/freebsd/target_os_stack.h
+++ b/bsd-user/freebsd/target_os_stack.h
@@ -17,8 +17,8 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _TARGET_OS_STACK_H_
-#define _TARGET_OS_STACK_H_
+#ifndef TARGET_OS_STACK_H
+#define TARGET_OS_STACK_H
#include <sys/param.h>
#include "target_arch_sigtramp.h"
@@ -178,4 +178,4 @@ static inline int setup_initial_stack(struct bsd_binprm *bprm,
return 0;
}
-#endif /* !_TARGET_OS_STACK_H_ */
+#endif /* TARGET_OS_STACK_H */
diff --git a/bsd-user/freebsd/target_os_thread.h b/bsd-user/freebsd/target_os_thread.h
index 77433acdff8d906e221cb6f64752900b0c88f032..1b32cebd26eeec9f8d2c30dd043c716326b84e2e 100644
--- a/bsd-user/freebsd/target_os_thread.h
+++ b/bsd-user/freebsd/target_os_thread.h
@@ -17,9 +17,9 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _TARGET_OS_THREAD_H_
-#define _TARGET_OS_THREAD_H_
+#ifndef TARGET_OS_THREAD_H
+#define TARGET_OS_THREAD_H
#include "target_arch_thread.h"
-#endif /* !_TARGET_OS_THREAD_H_ */
+#endif /* TARGET_OS_THREAD_H */
diff --git a/bsd-user/freebsd/target_os_user.h b/bsd-user/freebsd/target_os_user.h
index 19892c5071bbdb17b0cd249d718effaf733dd002..f036a323435bdce9cf298c230109da20a09ceec4 100644
--- a/bsd-user/freebsd/target_os_user.h
+++ b/bsd-user/freebsd/target_os_user.h
@@ -17,8 +17,8 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _TARGET_OS_USER_H_
-#define _TARGET_OS_USER_H_
+#ifndef TARGET_OS_USER_H
+#define TARGET_OS_USER_H
/*
* from sys/priority.h
@@ -326,4 +326,4 @@ struct target_kinfo_vmentry {
char kve_path[PATH_MAX]; /* Path to VM obj, if any. */
};
-#endif /* ! _TARGET_OS_USER_H_ */
+#endif /* TARGET_OS_USER_H */
diff --git a/bsd-user/freebsd/target_os_vmparam.h b/bsd-user/freebsd/target_os_vmparam.h
index 990300c619f97f2bc67027202cd51eb849c2be73..8457dd391396adab5e9e72e608607570af7d1bff 100644
--- a/bsd-user/freebsd/target_os_vmparam.h
+++ b/bsd-user/freebsd/target_os_vmparam.h
@@ -16,8 +16,9 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _TARGET_OS_VMPARAM_H_
-#define _TARGET_OS_VMPARAM_H_
+
+#ifndef TARGET_OS_VMPARAM_H
+#define TARGET_OS_VMPARAM_H
#include "target_arch_vmparam.h"
@@ -35,4 +36,4 @@ extern abi_ulong target_stksiz;
#define TARGET_PS_STRINGS ((target_stkbas + target_stksiz) - \
sizeof(struct target_ps_strings))
-#endif /* !TARGET_OS_VMPARAM_H_ */
+#endif /* TARGET_OS_VMPARAM_H */
diff --git a/bsd-user/i386/target.h b/bsd-user/i386/target.h
index 9b9df047a3b7da7d34f7469668d1790280ecd5c0..ddd3b8ec083002fed486dde7c6f59f3dc170012c 100644
--- a/bsd-user/i386/target.h
+++ b/bsd-user/i386/target.h
@@ -6,8 +6,8 @@
* SPDX-License-Identifier: GPL-2.0-or-later
*/
-#ifndef TARGET_ARCH_H
-#define TARGET_ARCH_H
+#ifndef TARGET_H
+#define TARGET_H
/*
* i386 doesn't 'lump' the registers for 64-bit args.
@@ -17,5 +17,4 @@ static inline bool regpairs_aligned(void *cpu_env)
return false;
}
-#endif /* ! TARGET_ARCH_H */
-
+#endif /* TARGET_H */
diff --git a/bsd-user/i386/target_arch.h b/bsd-user/i386/target_arch.h
index 73e9a028feb9b499360e22085dc6d6585cc0d1cc..9595e60f09f12ca4090a3c6d84776d055a1adceb 100644
--- a/bsd-user/i386/target_arch.h
+++ b/bsd-user/i386/target_arch.h
@@ -17,8 +17,8 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _TARGET_ARCH_H_
-#define _TARGET_ARCH_H_
+#ifndef TARGET_ARCH_H
+#define TARGET_ARCH_H
/* target_arch_cpu.c */
void bsd_i386_write_dt(void *ptr, unsigned long addr, unsigned long limit,
@@ -28,4 +28,4 @@ void bsd_i386_set_idt_base(uint64_t base);
#define target_cpu_set_tls(env, newtls)
-#endif /* ! _TARGET_ARCH_H_ */
+#endif /* TARGET_ARCH_H */
diff --git a/bsd-user/i386/target_arch_cpu.h b/bsd-user/i386/target_arch_cpu.h
index 9da22202d4849b2c9bfa661a7d62e813fbc23f11..d792dc720f9e0754a4bfd51c082b404089912ce3 100644
--- a/bsd-user/i386/target_arch_cpu.h
+++ b/bsd-user/i386/target_arch_cpu.h
@@ -16,8 +16,8 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _TARGET_ARCH_CPU_H_
-#define _TARGET_ARCH_CPU_H_
+#ifndef TARGET_ARCH_CPU_H
+#define TARGET_ARCH_CPU_H
#include "target_arch.h"
#include "signal-common.h"
@@ -195,4 +195,4 @@ static inline void target_cpu_reset(CPUArchState *env)
cpu_reset(env_cpu(env));
}
-#endif /* ! _TARGET_ARCH_CPU_H_ */
+#endif /* TARGET_ARCH_CPU_H */
diff --git a/bsd-user/i386/target_arch_elf.h b/bsd-user/i386/target_arch_elf.h
index eb760e07faa0886f58f1f961217cd2436127a831..cbcd1f08e2fe879c3be203798dd3d140ee21ac2f 100644
--- a/bsd-user/i386/target_arch_elf.h
+++ b/bsd-user/i386/target_arch_elf.h
@@ -16,8 +16,9 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _TARGET_ARCH_ELF_H_
-#define _TARGET_ARCH_ELF_H_
+
+#ifndef TARGET_ARCH_ELF_H
+#define TARGET_ARCH_ELF_H
#define ELF_START_MMAP 0x80000000
#define ELF_ET_DYN_LOAD_ADDR 0x01001000
@@ -32,4 +33,4 @@
#define USE_ELF_CORE_DUMP
#define ELF_EXEC_PAGESIZE 4096
-#endif /* _TARGET_ARCH_ELF_H_ */
+#endif /* TARGET_ARCH_ELF_H */
diff --git a/bsd-user/i386/target_arch_reg.h b/bsd-user/i386/target_arch_reg.h
index 1fce1daf01597a732023074ac6ab6b8cb93b6625..81231096972d9270692ed8c725ed7792220b305e 100644
--- a/bsd-user/i386/target_arch_reg.h
+++ b/bsd-user/i386/target_arch_reg.h
@@ -18,8 +18,8 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _TARGET_ARCH_REG_H_
-#define _TARGET_ARCH_REG_H_
+#ifndef TARGET_ARCH_REG_H
+#define TARGET_ARCH_REG_H
/* See sys/i386/include/reg.h */
typedef struct target_reg {
@@ -79,4 +79,4 @@ static inline void target_copy_regs(target_reg_t *regs, const CPUX86State *env)
regs->r_gs = env->segs[R_GS].selector & 0xffff;
}
-#endif /* !_TARGET_ARCH_REG_H_ */
+#endif /* TARGET_ARCH_REG_H */
diff --git a/bsd-user/i386/target_arch_sigtramp.h b/bsd-user/i386/target_arch_sigtramp.h
index cb4e89b0b0de6de85e5b3c85b904963308f17726..ef94cc864f2fecf41ecdf62f750bff1ad719e220 100644
--- a/bsd-user/i386/target_arch_sigtramp.h
+++ b/bsd-user/i386/target_arch_sigtramp.h
@@ -17,8 +17,8 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _TARGET_ARCH_SIGTRAMP_H_
-#define _TARGET_ARCH_SIGTRAMP_H_
+#ifndef TARGET_ARCH_SIGTRAMP_H
+#define TARGET_ARCH_SIGTRAMP_H
static inline abi_long setup_sigtramp(abi_ulong offset, unsigned sigf_uc,
unsigned sys_sigreturn)
@@ -26,4 +26,4 @@ static inline abi_long setup_sigtramp(abi_ulong offset, unsigned sigf_uc,
return 0;
}
-#endif /* _TARGET_ARCH_SIGTRAMP_H_ */
+#endif /* TARGET_ARCH_SIGTRAMP_H */
diff --git a/bsd-user/i386/target_arch_sysarch.h b/bsd-user/i386/target_arch_sysarch.h
index e9ab98ec3208946269d9b726e4399fdfcd55841f..db8fee6380a42ad0b38f359e42ef66298460bf13 100644
--- a/bsd-user/i386/target_arch_sysarch.h
+++ b/bsd-user/i386/target_arch_sysarch.h
@@ -17,8 +17,8 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef BSD_USER_ARCH_SYSARCH_H_
-#define BSD_USER_ARCH_SYSARCH_H_
+#ifndef TARGET_ARCH_SYSARCH_H
+#define TARGET_ARCH_SYSARCH_H
#include "target_syscall.h"
@@ -74,4 +74,4 @@ static inline void do_freebsd_arch_print_sysarch(
TARGET_ABI_FMT_lx ")", name->name, (int)arg1, arg2, arg3, arg4);
}
-#endif /* !BSD_USER_ARCH_SYSARCH_H_ */
+#endif /* TARGET_ARCH_SYSARCH_H */
diff --git a/bsd-user/i386/target_arch_thread.h b/bsd-user/i386/target_arch_thread.h
index e65e476f75779f1f6ba4bd423ba0f3b2455cbd23..cee2148d946dbebcdcf3aeb6412c3d512a8e7a39 100644
--- a/bsd-user/i386/target_arch_thread.h
+++ b/bsd-user/i386/target_arch_thread.h
@@ -16,8 +16,9 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _TARGET_ARCH_THREAD_H_
-#define _TARGET_ARCH_THREAD_H_
+
+#ifndef TARGET_ARCH_THREAD_H
+#define TARGET_ARCH_THREAD_H
/* Compare to vm_machdep.c cpu_set_upcall_kse() */
static inline void target_thread_set_upcall(CPUX86State *regs, abi_ulong entry,
@@ -44,4 +45,4 @@ static inline void target_thread_init(struct target_pt_regs *regs,
regs->edx = 0;
}
-#endif /* !_TARGET_ARCH_THREAD_H_ */
+#endif /* TARGET_ARCH_THREAD_H */
diff --git a/bsd-user/i386/target_arch_vmparam.h b/bsd-user/i386/target_arch_vmparam.h
index bb7718265b2a33ba43b77ed5e0ae71de92af6806..79db420e59290d6258546e7f810303398ee3d3c1 100644
--- a/bsd-user/i386/target_arch_vmparam.h
+++ b/bsd-user/i386/target_arch_vmparam.h
@@ -16,8 +16,9 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _TARGET_ARCH_VMPARAM_H_
-#define _TARGET_ARCH_VMPARAM_H_
+
+#ifndef TARGET_ARCH_VMPARAM_H
+#define TARGET_ARCH_VMPARAM_H
#include "cpu.h"
@@ -43,4 +44,4 @@ static inline void set_second_rval(CPUX86State *state, abi_ulong retval2)
state->regs[R_EDX] = retval2;
}
-#endif /* !_TARGET_ARCH_VMPARAM_H_ */
+#endif /* TARGET_ARCH_VMPARAM_H */
diff --git a/bsd-user/netbsd/host-os.h b/bsd-user/netbsd/host-os.h
index c0be51a7ef49586663dfd7935951b9690935fc2a..7c14b1ea7801021e4c08c9ab3d3d90b2f8afefb6 100644
--- a/bsd-user/netbsd/host-os.h
+++ b/bsd-user/netbsd/host-os.h
@@ -17,9 +17,9 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _HOST_OS_H_
-#define _HOST_OS_H_
+#ifndef HOST_OS_H
+#define HOST_OS_H
#define HOST_DEFAULT_BSD_TYPE target_netbsd
-#endif /*!_HOST_OS_H_ */
+#endif /* HOST_OS_H */
diff --git a/bsd-user/netbsd/target_os_elf.h b/bsd-user/netbsd/target_os_elf.h
index 21b475f458c2ca5d078241d5a4f24c74396d2530..2f3cb2087182352c695c0b18201fadfe9054965b 100644
--- a/bsd-user/netbsd/target_os_elf.h
+++ b/bsd-user/netbsd/target_os_elf.h
@@ -16,8 +16,9 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _TARGET_OS_ELF_H_
-#define _TARGET_OS_ELF_H_
+
+#ifndef TARGET_OS_ELF_H
+#define TARGET_OS_ELF_H
#include "target_arch_elf.h"
#include "elf.h"
@@ -143,4 +144,4 @@ static abi_ulong target_create_elf_tables(abi_ulong p, int argc, int envc,
return sp;
}
-#endif /* _TARGET_OS_ELF_H_ */
+#endif /* TARGET_OS_ELF_H */
diff --git a/bsd-user/netbsd/target_os_siginfo.h b/bsd-user/netbsd/target_os_siginfo.h
index 667c19cc7cee6630e186030646c819caba80c672..eb57e0a3098faa6ceff30c588069e1c61aa5748c 100644
--- a/bsd-user/netbsd/target_os_siginfo.h
+++ b/bsd-user/netbsd/target_os_siginfo.h
@@ -1,5 +1,5 @@
-#ifndef _TARGET_OS_SIGINFO_H_
-#define _TARGET_OS_SIGINFO_H_
+#ifndef TARGET_OS_SIGINFO_H
+#define TARGET_OS_SIGINFO_H
#define TARGET_NSIG 32 /* counting 0; could be 33 (mask is 1-32) */
#define TARGET_NSIG_BPW (sizeof(uint32_t) * 8)
@@ -79,4 +79,4 @@ typedef union target_siginfo {
#define TARGET_TRAP_TRACE 2
-#endif /* ! _TARGET_OS_SIGINFO_H_ */
+#endif /* TARGET_OS_SIGINFO_H */
diff --git a/bsd-user/netbsd/target_os_signal.h b/bsd-user/netbsd/target_os_signal.h
index a373922f7e8fa197bae17a557fdcc8ca85279d07..4ee4f768e0e1e75628c91f5a7ccfcd5b5e712f97 100644
--- a/bsd-user/netbsd/target_os_signal.h
+++ b/bsd-user/netbsd/target_os_signal.h
@@ -1,5 +1,5 @@
-#ifndef _TARGET_OS_SIGNAL_H_
-#define _TARGET_OS_SIGNAL_H_
+#ifndef TARGET_OS_SIGNAL_H
+#define TARGET_OS_SIGNAL_H
#include "target_os_siginfo.h"
#include "target_arch_signal.h"
@@ -66,4 +66,4 @@
#define TARGET_SS_ONSTACK 0x0001 /* take signals on alternate stack */
#define TARGET_SS_DISABLE 0x0004 /* disable taking signals on alternate stack */
-#endif /* !_TARGET_OS_SIGNAL_H_ */
+#endif /* TARGET_OS_SIGNAL_H */
diff --git a/bsd-user/netbsd/target_os_stack.h b/bsd-user/netbsd/target_os_stack.h
index 503279c1a904189a4ec9d7576e8aaf6f452b306b..8349e9149b89208c35052c994f1d0086bdb76633 100644
--- a/bsd-user/netbsd/target_os_stack.h
+++ b/bsd-user/netbsd/target_os_stack.h
@@ -17,8 +17,8 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _TARGET_OS_STACK_H_
-#define _TARGET_OS_STACK_H_
+#ifndef TARGET_OS_STACK_H
+#define TARGET_OS_STACK_H
#include "target_arch_sigtramp.h"
@@ -53,4 +53,4 @@ static inline int setup_initial_stack(struct bsd_binprm *bprm, abi_ulong *p,
return 0;
}
-#endif /* !_TARGET_OS_STACK_H_ */
+#endif /* TARGET_OS_STACK_H */
diff --git a/bsd-user/netbsd/target_os_thread.h b/bsd-user/netbsd/target_os_thread.h
index 904dd1bf782b6fdb15ec1f8cabafa692e7d74380..8ccfa16e4bed7ef5985bbe53ff8ea1f025781b6b 100644
--- a/bsd-user/netbsd/target_os_thread.h
+++ b/bsd-user/netbsd/target_os_thread.h
@@ -17,9 +17,9 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _TARGET_OS_THREAD_H_
-#define _TARGET_OS_THREAD_H_
+#ifndef TARGET_OS_THREAD_H
+#define TARGET_OS_THREAD_H
#include "target_arch_thread.h"
-#endif /* !_TARGET_OS_THREAD_H_ */
+#endif /* TARGET_OS_THREAD_H */
diff --git a/bsd-user/openbsd/host-os.h b/bsd-user/openbsd/host-os.h
index eb8fdf1567929af6f76bf097b00b1c237a891a06..b9222335d46eda63e5ee87fdef2f9d2fac8fb47e 100644
--- a/bsd-user/openbsd/host-os.h
+++ b/bsd-user/openbsd/host-os.h
@@ -17,9 +17,9 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _HOST_OS_H_
-#define _HOST_OS_H_
+#ifndef HOST_OS_H
+#define HOST_OS_H
#define HOST_DEFAULT_BSD_TYPE target_openbsd
-#endif /*!_HOST_OS_H_ */
+#endif /* HOST_OS_H */
diff --git a/bsd-user/openbsd/target_os_elf.h b/bsd-user/openbsd/target_os_elf.h
index a5cfcd3aff8dc449e1d15a56f2664a40503a9519..6dca9c5a8537d1a716700c6ed87d62e7084f6056 100644
--- a/bsd-user/openbsd/target_os_elf.h
+++ b/bsd-user/openbsd/target_os_elf.h
@@ -16,8 +16,9 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _TARGET_OS_ELF_H_
-#define _TARGET_OS_ELF_H_
+
+#ifndef TARGET_OS_ELF_H
+#define TARGET_OS_ELF_H
#include "target_arch_elf.h"
#include "elf.h"
@@ -143,4 +144,4 @@ static abi_ulong target_create_elf_tables(abi_ulong p, int argc, int envc,
return sp;
}
-#endif /* _TARGET_OS_ELF_H_ */
+#endif /* TARGET_OS_ELF_H */
diff --git a/bsd-user/openbsd/target_os_siginfo.h b/bsd-user/openbsd/target_os_siginfo.h
index baf646a5ab33cf43501faf5ebe2f818ab0ca6a42..732009a8201aab66d9567d9aedc80f3f591a567e 100644
--- a/bsd-user/openbsd/target_os_siginfo.h
+++ b/bsd-user/openbsd/target_os_siginfo.h
@@ -1,5 +1,5 @@
-#ifndef _TARGET_OS_SIGINFO_H_
-#define _TARGET_OS_SIGINFO_H_
+#ifndef TARGET_OS_SIGINFO_H
+#define TARGET_OS_SIGINFO_H
#define TARGET_NSIG 32 /* counting 0; could be 33 (mask is 1-32) */
#define TARGET_NSIG_BPW (sizeof(uint32_t) * 8)
@@ -79,4 +79,4 @@ typedef union target_siginfo {
#define TARGET_TRAP_TRACE 2
-#endif /* ! _TARGET_OS_SIGINFO_H_ */
+#endif /* TARGET_OS_SIGINFO_H */
diff --git a/bsd-user/openbsd/target_os_signal.h b/bsd-user/openbsd/target_os_signal.h
index a373922f7e8fa197bae17a557fdcc8ca85279d07..4ee4f768e0e1e75628c91f5a7ccfcd5b5e712f97 100644
--- a/bsd-user/openbsd/target_os_signal.h
+++ b/bsd-user/openbsd/target_os_signal.h
@@ -1,5 +1,5 @@
-#ifndef _TARGET_OS_SIGNAL_H_
-#define _TARGET_OS_SIGNAL_H_
+#ifndef TARGET_OS_SIGNAL_H
+#define TARGET_OS_SIGNAL_H
#include "target_os_siginfo.h"
#include "target_arch_signal.h"
@@ -66,4 +66,4 @@
#define TARGET_SS_ONSTACK 0x0001 /* take signals on alternate stack */
#define TARGET_SS_DISABLE 0x0004 /* disable taking signals on alternate stack */
-#endif /* !_TARGET_OS_SIGNAL_H_ */
+#endif /* TARGET_OS_SIGNAL_H */
diff --git a/bsd-user/openbsd/target_os_stack.h b/bsd-user/openbsd/target_os_stack.h
index 4b37955d3b1e3b7a880a23135eeb8bf231b08c12..264a6586089bbe4dd92aaf58bbf1f624092a9b28 100644
--- a/bsd-user/openbsd/target_os_stack.h
+++ b/bsd-user/openbsd/target_os_stack.h
@@ -17,8 +17,8 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _TARGET_OS_STACK_H_
-#define _TARGET_OS_STACK_H_
+#ifndef TARGET_OS_STACK_H
+#define TARGET_OS_STACK_H
#include "target_arch_sigtramp.h"
@@ -53,4 +53,4 @@ static inline int setup_initial_stack(struct bsd_binprm *bprm, abi_ulong *p,
return 0;
}
-#endif /* !_TARGET_OS_STACK_H_ */
+#endif /* TARGET_OS_STACK_H */
diff --git a/bsd-user/openbsd/target_os_thread.h b/bsd-user/openbsd/target_os_thread.h
index 01ed0d9fc86c3658a9a558d9d8331d51c3dfa746..c3adc6712fe59b70ffea2718f38add3dbcaee442 100644
--- a/bsd-user/openbsd/target_os_thread.h
+++ b/bsd-user/openbsd/target_os_thread.h
@@ -17,9 +17,9 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _TARGET_OS_THREAD_H_
-#define _TARGET_OS_THREAD_H_
+#ifndef TARGET_OS_THREAD_H
+#define TARGET_OS_THREAD_H
#include "target_arch_thread.h"
-#endif /* !_TARGET_OS_THREAD_H_ */
+#endif /* TARGET_OS_THREAD_H */
diff --git a/bsd-user/syscall_defs.h b/bsd-user/syscall_defs.h
index c3bf14f38f45f9b0360aafb44d2c60251078da8a..f5797b28e39b4832833191a38d9cf764cc728d6c 100644
--- a/bsd-user/syscall_defs.h
+++ b/bsd-user/syscall_defs.h
@@ -17,8 +17,8 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _SYSCALL_DEFS_H_
-#define _SYSCALL_DEFS_H_
+#ifndef SYSCALL_DEFS_H
+#define SYSCALL_DEFS_H
#include <sys/syscall.h>
#include <sys/resource.h>
@@ -226,4 +226,4 @@ type safe_##name(type1 arg1, type2 arg2, type3 arg3, type4 arg4, \
return safe_syscall(SYS_##name, arg1, arg2, arg3, arg4, arg5, arg6); \
}
-#endif /* ! _SYSCALL_DEFS_H_ */
+#endif /* SYSCALL_DEFS_H */
diff --git a/bsd-user/x86_64/target.h b/bsd-user/x86_64/target.h
index 8956631db1d51cf5f4a02b1a24c9b4c14d893f2c..0cf0e2a14abaef767befb95e29c26f526342c67d 100644
--- a/bsd-user/x86_64/target.h
+++ b/bsd-user/x86_64/target.h
@@ -17,5 +17,5 @@ static inline bool regpairs_aligned(void *cpu_env)
return false;
}
-#endif /* ! TARGET_H */
+#endif /* TARGET_H */
diff --git a/bsd-user/x86_64/target_arch.h b/bsd-user/x86_64/target_arch.h
index e558e1b956e2a61e080777d7e8fabc0cf7049307..09bd97488985019be70319d1e33b3b65922b7d73 100644
--- a/bsd-user/x86_64/target_arch.h
+++ b/bsd-user/x86_64/target_arch.h
@@ -17,8 +17,8 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _TARGET_ARCH_H_
-#define _TARGET_ARCH_H_
+#ifndef TARGET_ARCH_H
+#define TARGET_ARCH_H
/* target_arch_cpu.c */
void bsd_x86_64_write_dt(void *ptr, unsigned long addr, unsigned long limit,
@@ -28,4 +28,4 @@ void bsd_x86_64_set_idt_base(uint64_t base);
#define target_cpu_set_tls(env, newtls)
-#endif /* !_TARGET_ARCH_H_ */
+#endif /* TARGET_ARCH_H */
diff --git a/bsd-user/x86_64/target_arch_cpu.h b/bsd-user/x86_64/target_arch_cpu.h
index 5be2f02416ec510a03bd023a86ce4da64b08d750..4094d61da1af54c168353bedc3c5eb00f11d2987 100644
--- a/bsd-user/x86_64/target_arch_cpu.h
+++ b/bsd-user/x86_64/target_arch_cpu.h
@@ -16,8 +16,8 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _TARGET_ARCH_CPU_H_
-#define _TARGET_ARCH_CPU_H_
+#ifndef TARGET_ARCH_CPU_H
+#define TARGET_ARCH_CPU_H
#include "target_arch.h"
#include "signal-common.h"
@@ -174,4 +174,4 @@ static inline void target_cpu_reset(CPUArchState *env)
cpu_reset(env_cpu(env));
}
-#endif /* ! _TARGET_ARCH_CPU_H_ */
+#endif /* TARGET_ARCH_CPU_H */
diff --git a/bsd-user/x86_64/target_arch_elf.h b/bsd-user/x86_64/target_arch_elf.h
index c2f85539626e67a8baaf0d4531ef11b7fed1d3f3..b2447118883445c9e5a7787d2e305328d692b550 100644
--- a/bsd-user/x86_64/target_arch_elf.h
+++ b/bsd-user/x86_64/target_arch_elf.h
@@ -16,8 +16,9 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _TARGET_ARCH_ELF_H_
-#define _TARGET_ARCH_ELF_H_
+
+#ifndef TARGET_ARCH_ELF_H
+#define TARGET_ARCH_ELF_H
#define ELF_START_MMAP 0x2aaaaab000ULL
#define ELF_ET_DYN_LOAD_ADDR 0x01021000
@@ -32,4 +33,4 @@
#define USE_ELF_CORE_DUMP
#define ELF_EXEC_PAGESIZE 4096
-#endif /* _TARGET_ARCH_ELF_H_ */
+#endif /* TARGET_ARCH_ELF_H */
diff --git a/bsd-user/x86_64/target_arch_reg.h b/bsd-user/x86_64/target_arch_reg.h
index 00e96245178f8f1a9830e0e6c2d9002e01c46ed9..7a766de91850cd2dc3b93d84ea4a006460bbcb73 100644
--- a/bsd-user/x86_64/target_arch_reg.h
+++ b/bsd-user/x86_64/target_arch_reg.h
@@ -18,8 +18,8 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _TARGET_ARCH_REG_H_
-#define _TARGET_ARCH_REG_H_
+#ifndef TARGET_ARCH_REG_H
+#define TARGET_ARCH_REG_H
/* See sys/amd64/include/reg.h */
typedef struct target_reg {
@@ -89,4 +89,4 @@ static inline void target_copy_regs(target_reg_t *regs, const CPUX86State *env)
regs->r_ss = env->segs[R_SS].selector & 0xffff;
}
-#endif /* !_TARGET_ARCH_REG_H_ */
+#endif /* TARGET_ARCH_REG_H */
diff --git a/bsd-user/x86_64/target_arch_signal.h b/bsd-user/x86_64/target_arch_signal.h
index b4a0ebf2bd5fe4d1cdf4a6735426663398a72555..ca24bf1e7f705b0c05198741ba26fbf1c2411fdb 100644
--- a/bsd-user/x86_64/target_arch_signal.h
+++ b/bsd-user/x86_64/target_arch_signal.h
@@ -15,8 +15,9 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _TARGET_ARCH_SIGNAL_H_
-#define _TARGET_ARCH_SIGNAL_H_
+
+#ifndef TARGET_ARCH_SIGNAL_H
+#define TARGET_ARCH_SIGNAL_H
#include "cpu.h"
@@ -96,4 +97,4 @@ struct target_sigframe {
uint32_t __spare__[2];
};
-#endif /* !TARGET_ARCH_SIGNAL_H_ */
+#endif /* TARGET_ARCH_SIGNAL_H */
diff --git a/bsd-user/x86_64/target_arch_sigtramp.h b/bsd-user/x86_64/target_arch_sigtramp.h
index 29d4a8b55f3f916234e46e933cb195c773e0fdfa..01da614098a8cfce1d2aa3730abc7bbe879a47ea 100644
--- a/bsd-user/x86_64/target_arch_sigtramp.h
+++ b/bsd-user/x86_64/target_arch_sigtramp.h
@@ -17,8 +17,8 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _TARGET_ARCH_SIGTRAMP_H_
-#define _TARGET_ARCH_SIGTRAMP_H_
+#ifndef TARGET_ARCH_SIGTRAMP_H
+#define TARGET_ARCH_SIGTRAMP_H
static inline abi_long setup_sigtramp(abi_ulong offset, unsigned sigf_uc,
unsigned sys_sigreturn)
@@ -26,4 +26,4 @@ static inline abi_long setup_sigtramp(abi_ulong offset, unsigned sigf_uc,
return 0;
}
-#endif /* _TARGET_ARCH_SIGTRAMP_H_ */
+#endif /* TARGET_ARCH_SIGTRAMP_H */
diff --git a/bsd-user/x86_64/target_arch_sysarch.h b/bsd-user/x86_64/target_arch_sysarch.h
index 5c36fc0752061e0ade532a4424aa4023eacd23ab..152cb8bcb86f15a7fd34184e5ae6724aa7811215 100644
--- a/bsd-user/x86_64/target_arch_sysarch.h
+++ b/bsd-user/x86_64/target_arch_sysarch.h
@@ -16,8 +16,8 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef BSD_USER_ARCH_SYSARCH_H_
-#define BSD_USER_ARCH_SYSARCH_H_
+#ifndef TARGET_ARCH_SYSARCH_H
+#define TARGET_ARCH_SYSARCH_H
#include "target_syscall.h"
@@ -73,4 +73,4 @@ static inline void do_freebsd_arch_print_sysarch(
TARGET_ABI_FMT_lx ")", name->name, (int)arg1, arg2, arg3, arg4);
}
-#endif /*! BSD_USER_ARCH_SYSARCH_H_ */
+#endif /* TARGET_ARCH_SYSARCH_H */
diff --git a/bsd-user/x86_64/target_arch_thread.h b/bsd-user/x86_64/target_arch_thread.h
index b745d7ffeb7d9719ea55526a838bbfd1d02f2867..52c28906d6dd8335caebfcf376b95249d9757af0 100644
--- a/bsd-user/x86_64/target_arch_thread.h
+++ b/bsd-user/x86_64/target_arch_thread.h
@@ -16,8 +16,9 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _TARGET_ARCH_THREAD_H_
-#define _TARGET_ARCH_THREAD_H_
+
+#ifndef TARGET_ARCH_THREAD_H
+#define TARGET_ARCH_THREAD_H
/* Compare to vm_machdep.c cpu_set_upcall_kse() */
static inline void target_thread_set_upcall(CPUX86State *regs, abi_ulong entry,
@@ -35,4 +36,4 @@ static inline void target_thread_init(struct target_pt_regs *regs,
regs->rdi = infop->start_stack;
}
-#endif /* !_TARGET_ARCH_THREAD_H_ */
+#endif /* TARGET_ARCH_THREAD_H */
diff --git a/bsd-user/x86_64/target_arch_vmparam.h b/bsd-user/x86_64/target_arch_vmparam.h
index 81a915f2e5567473582388c15dc758c7d31a41d6..6797623a6ba29fa8834e8474d05f00b9756e8b46 100644
--- a/bsd-user/x86_64/target_arch_vmparam.h
+++ b/bsd-user/x86_64/target_arch_vmparam.h
@@ -16,8 +16,9 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _TARGET_ARCH_VMPARAM_H_
-#define _TARGET_ARCH_VMPARAM_H_
+
+#ifndef TARGET_ARCH_VMPARAM_H
+#define TARGET_ARCH_VMPARAM_H
#include "cpu.h"
@@ -43,4 +44,4 @@ static inline void set_second_rval(CPUX86State *state, abi_ulong retval2)
state->regs[R_EDX] = retval2;
}
-#endif /* !_TARGET_ARCH_VMPARAM_H_ */
+#endif /* TARGET_ARCH_VMPARAM_H */
diff --git a/chardev/chardev-internal.h b/chardev/chardev-internal.h
index aba0240759ebf938cf391d89edb88f84f94fa641..4e03af31476cb88cbe699dfafb23522503707002 100644
--- a/chardev/chardev-internal.h
+++ b/chardev/chardev-internal.h
@@ -21,6 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+
#ifndef CHARDEV_INTERNAL_H
#define CHARDEV_INTERNAL_H
@@ -64,4 +65,4 @@ void mux_chr_send_all_event(Chardev *chr, QEMUChrEvent event);
Object *get_chardevs_root(void);
-#endif /* CHAR_MUX_H */
+#endif /* CHARDEV_INTERNAL_H */
diff --git a/crypto/ivgen-plain.h b/crypto/ivgen-plain.h
index 43db898809a02a6ecca49e236f66a408c2f647a5..ebae6acd04055873f96fd2c4aeff331baaf90770 100644
--- a/crypto/ivgen-plain.h
+++ b/crypto/ivgen-plain.h
@@ -17,11 +17,11 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef QCRYPTO_IVGEN_PLAIN_H__
-#define QCRYPTO_IVGEN_PLAIN_H__
+#ifndef QCRYPTO_IVGEN_PLAIN_H
+#define QCRYPTO_IVGEN_PLAIN_H
#include "ivgenpriv.h"
extern struct QCryptoIVGenDriver qcrypto_ivgen_plain;
-#endif /* QCRYPTO_IVGEN_PLAIN_H__ */
+#endif /* QCRYPTO_IVGEN_PLAIN_H */
diff --git a/hw/i386/e820_memory_layout.h b/hw/i386/e820_memory_layout.h
index 2a0ceb8b9cc17e746e81baf083c0de1f445754ed..04f93780f9e3cd09e53c2f78b5085585815a9c55 100644
--- a/hw/i386/e820_memory_layout.h
+++ b/hw/i386/e820_memory_layout.h
@@ -6,8 +6,8 @@
* SPDX-License-Identifier: MIT
*/
-#ifndef HW_I386_E820_H
-#define HW_I386_E820_H
+#ifndef HW_I386_E820_MEMORY_LAYOUT_H
+#define HW_I386_E820_MEMORY_LAYOUT_H
/* e820 types */
#define E820_RAM 1
diff --git a/hw/net/can/ctu_can_fd_frame.h b/hw/net/can/ctu_can_fd_frame.h
index 04d956c84ee7386ee60063a2198181b21fc52477..459c4a0ada60bdd8a249c3145648145da366bb34 100644
--- a/hw/net/can/ctu_can_fd_frame.h
+++ b/hw/net/can/ctu_can_fd_frame.h
@@ -29,8 +29,8 @@
/* This file is autogenerated, DO NOT EDIT! */
-#ifndef __CTU_CAN_FD_CAN_FD_FRAME_FORMAT__
-#define __CTU_CAN_FD_CAN_FD_FRAME_FORMAT__
+#ifndef HW_CAN_CTU_CAN_FD_FRAME_H
+#define HW_CAN_CTU_CAN_FD_FRAME_H
/* CAN_Frame_format memory map */
enum ctu_can_fd_can_frame_format {
diff --git a/hw/net/can/ctu_can_fd_regs.h b/hw/net/can/ctu_can_fd_regs.h
index 450f4b9fb3c4157c3640ac6ffd4951f91160de0a..57859b87bc8e5410633d0ec5e502b17261c1de2e 100644
--- a/hw/net/can/ctu_can_fd_regs.h
+++ b/hw/net/can/ctu_can_fd_regs.h
@@ -29,8 +29,8 @@
/* This file is autogenerated, DO NOT EDIT! */
-#ifndef __CTU_CAN_FD_CAN_FD_REGISTER_MAP__
-#define __CTU_CAN_FD_CAN_FD_REGISTER_MAP__
+#ifndef HW_CAN_CTU_CAN_FD_REGS_H
+#define HW_CAN_CTU_CAN_FD_REGS_H
/* CAN_Registers memory map */
enum ctu_can_fd_can_registers {
diff --git a/hw/nvme/nvme.h b/hw/nvme/nvme.h
index 739c8b8f7962fa991f6151b2385e53f6617b5c56..677381932569e919a08a21b1c4885348de14fa28 100644
--- a/hw/nvme/nvme.h
+++ b/hw/nvme/nvme.h
@@ -15,8 +15,8 @@
* This code is licensed under the GNU GPL v2 or later.
*/
-#ifndef HW_NVME_INTERNAL_H
-#define HW_NVME_INTERNAL_H
+#ifndef HW_NVME_NVME_H
+#define HW_NVME_NVME_H
#include "qemu/uuid.h"
#include "hw/pci/pci.h"
@@ -519,4 +519,4 @@ void nvme_rw_complete_cb(void *opaque, int ret);
uint16_t nvme_map_dptr(NvmeCtrl *n, NvmeSg *sg, size_t len,
NvmeCmd *cmd);
-#endif /* HW_NVME_INTERNAL_H */
+#endif /* HW_NVME_NVME_H */
diff --git a/hw/usb/hcd-dwc2.h b/hw/usb/hcd-dwc2.h
index 6998b04706dac1e0c70726282bde36d9476d04f7..9c3d88ea14bb9f77f3b18e87240dcd4325be4f22 100644
--- a/hw/usb/hcd-dwc2.h
+++ b/hw/usb/hcd-dwc2.h
@@ -16,8 +16,8 @@
* GNU General Public License for more details.
*/
-#ifndef HW_USB_DWC2_H
-#define HW_USB_DWC2_H
+#ifndef HW_USB_HCD_DWC2_H
+#define HW_USB_HCD_DWC2_H
#include "qemu/timer.h"
#include "hw/irq.h"
diff --git a/include/block/block-hmp-cmds.h b/include/block/block-hmp-cmds.h
index 3412e108ca226ee69578d29bc4c6b9e2c30a3139..50ce0247c383f782adfae1e7462229ed6961a0fb 100644
--- a/include/block/block-hmp-cmds.h
+++ b/include/block/block-hmp-cmds.h
@@ -12,8 +12,8 @@
* the COPYING file in the top-level directory.
*/
-#ifndef BLOCK_HMP_COMMANDS_H
-#define BLOCK_HMP_COMMANDS_H
+#ifndef BLOCK_BLOCK_HMP_CMDS_H
+#define BLOCK_BLOCK_HMP_CMDS_H
void hmp_drive_add(Monitor *mon, const QDict *qdict);
diff --git a/include/block/block_int-global-state.h b/include/block/block_int-global-state.h
index 8b2e95f5ff183193aa6b5be23bee2fafe9ea15e1..b49f4eb35bf957abbac04f8a34b62f0678c03b3f 100644
--- a/include/block/block_int-global-state.h
+++ b/include/block/block_int-global-state.h
@@ -21,6 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+
#ifndef BLOCK_INT_GLOBAL_STATE_H
#define BLOCK_INT_GLOBAL_STATE_H
@@ -326,4 +327,4 @@ static inline void assert_bdrv_graph_writable(BlockDriverState *bs)
assert(qemu_in_main_thread());
}
-#endif /* BLOCK_INT_GLOBAL_STATE */
+#endif /* BLOCK_INT_GLOBAL_STATE_H */
diff --git a/include/chardev/char-socket.h b/include/chardev/char-socket.h
index 6b6e2ceba1d7d8be2148c6bcf321dc5f160cb826..0708ca6fa97fff9306c6c63ab09e07a8e0749320 100644
--- a/include/chardev/char-socket.h
+++ b/include/chardev/char-socket.h
@@ -21,8 +21,9 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
-#ifndef CHAR_SOCKET_H_
-#define CHAR_SOCKET_H_
+
+#ifndef CHAR_SOCKET_H
+#define CHAR_SOCKET_H
#include "io/channel-socket.h"
#include "io/channel-tls.h"
@@ -83,4 +84,4 @@ typedef struct SocketChardev SocketChardev;
DECLARE_INSTANCE_CHECKER(SocketChardev, SOCKET_CHARDEV,
TYPE_CHARDEV_SOCKET)
-#endif /* CHAR_SOCKET_H_ */
+#endif /* CHAR_SOCKET_H */
diff --git a/include/crypto/tls-cipher-suites.h b/include/crypto/tls-cipher-suites.h
index 7eb1b76122dbecef437defefdc370f481bad268f..3bd2003f32d1f498bc37fca0a55cd79f60b0cf68 100644
--- a/include/crypto/tls-cipher-suites.h
+++ b/include/crypto/tls-cipher-suites.h
@@ -8,8 +8,8 @@
* SPDX-License-Identifier: GPL-2.0-or-later
*/
-#ifndef QCRYPTO_TLSCIPHERSUITES_H
-#define QCRYPTO_TLSCIPHERSUITES_H
+#ifndef QCRYPTO_TLS_CIPHER_SUITES_H
+#define QCRYPTO_TLS_CIPHER_SUITES_H
#include "qom/object.h"
#include "crypto/tlscreds.h"
@@ -31,4 +31,4 @@ DECLARE_INSTANCE_CHECKER(QCryptoTLSCipherSuites, QCRYPTO_TLS_CIPHER_SUITES,
GByteArray *qcrypto_tls_cipher_suites_get_data(QCryptoTLSCipherSuites *obj,
Error **errp);
-#endif /* QCRYPTO_TLSCIPHERSUITES_H */
+#endif /* QCRYPTO_TLS_CIPHER_SUITES_H */
diff --git a/include/exec/memopidx.h b/include/exec/memopidx.h
index 83bce97874dd6305da792027b2d86c809a599e08..eb7f1591a37642e651a1c5e7030b38abb92bc43f 100644
--- a/include/exec/memopidx.h
+++ b/include/exec/memopidx.h
@@ -9,7 +9,7 @@
*/
#ifndef EXEC_MEMOPIDX_H
-#define EXEC_MEMOPIDX_H 1
+#define EXEC_MEMOPIDX_H
#include "exec/memop.h"
diff --git a/include/exec/translator.h b/include/exec/translator.h
index 31d3fa76ff6e16ebea201719087d0231f3244a29..7db684553564a147781e174a5d98ef7b55911852 100644
--- a/include/exec/translator.h
+++ b/include/exec/translator.h
@@ -187,4 +187,4 @@ FOR_EACH_TRANSLATOR_LD(GEN_TRANSLATOR_LD)
#undef GEN_TRANSLATOR_LD
-#endif /* EXEC__TRANSLATOR_H */
+#endif /* EXEC__TRANSLATOR_H */
diff --git a/include/fpu/softfloat-helpers.h b/include/fpu/softfloat-helpers.h
index a98d759cd3a5117668f2dfb023b8d94816fb5235..94cbe073ec5bb5d0cb3430691b32fe14576843fa 100644
--- a/include/fpu/softfloat-helpers.h
+++ b/include/fpu/softfloat-helpers.h
@@ -141,4 +141,4 @@ static inline bool get_default_nan_mode(float_status *status)
return status->default_nan_mode;
}
-#endif /* _SOFTFLOAT_HELPERS_H_ */
+#endif /* SOFTFLOAT_HELPERS_H */
diff --git a/include/hw/acpi/generic_event_device.h b/include/hw/acpi/generic_event_device.h
index d49217c445fbcc04664db41a87439386f71e190f..d831bbd889690efc17e9b38a3d801026bb165bf5 100644
--- a/include/hw/acpi/generic_event_device.h
+++ b/include/hw/acpi/generic_event_device.h
@@ -56,8 +56,8 @@
*
*/
-#ifndef HW_ACPI_GED_H
-#define HW_ACPI_GED_H
+#ifndef HW_ACPI_GENERIC_EVENT_DEVICE_H
+#define HW_ACPI_GENERIC_EVENT_DEVICE_H
#include "hw/sysbus.h"
#include "hw/acpi/memory_hotplug.h"
diff --git a/include/hw/gpio/aspeed_gpio.h b/include/hw/gpio/aspeed_gpio.h
index 801846befb3b6f7ef9e98dc422efc273699094de..6dee3cd438932eb1a686cec76162676b9402f3dc 100644
--- a/include/hw/gpio/aspeed_gpio.h
+++ b/include/hw/gpio/aspeed_gpio.h
@@ -93,4 +93,4 @@ struct AspeedGPIOState {
} sets[ASPEED_GPIO_MAX_NR_SETS];
};
-#endif /* _ASPEED_GPIO_H_ */
+#endif /* ASPEED_GPIO_H */
diff --git a/include/hw/i2c/arm_sbcon_i2c.h b/include/hw/i2c/arm_sbcon_i2c.h
index ad96781e7a8421ff6d359af7fbbf213e248126f8..f54d1e54135c191d5124ab34205249add2f9b41f 100644
--- a/include/hw/i2c/arm_sbcon_i2c.h
+++ b/include/hw/i2c/arm_sbcon_i2c.h
@@ -9,8 +9,9 @@
*
* SPDX-License-Identifier: GPL-2.0-or-later
*/
-#ifndef HW_I2C_ARM_SBCON_H
-#define HW_I2C_ARM_SBCON_H
+
+#ifndef HW_I2C_ARM_SBCON_I2C_H
+#define HW_I2C_ARM_SBCON_I2C_H
#include "hw/sysbus.h"
#include "hw/i2c/bitbang_i2c.h"
@@ -34,4 +35,4 @@ struct ArmSbconI2CState {
int in;
};
-#endif /* HW_I2C_ARM_SBCON_H */
+#endif /* HW_I2C_ARM_SBCON_I2C_H */
diff --git a/include/hw/i2c/i2c_mux_pca954x.h b/include/hw/i2c/i2c_mux_pca954x.h
index 8aaf9bbc39426be7a42da78a0dda75a5891dfe83..3dd25ec98309d3203200933b7b48f8d9b0b6249b 100644
--- a/include/hw/i2c/i2c_mux_pca954x.h
+++ b/include/hw/i2c/i2c_mux_pca954x.h
@@ -1,5 +1,5 @@
-#ifndef QEMU_I2C_MUX_PCA954X
-#define QEMU_I2C_MUX_PCA954X
+#ifndef QEMU_I2C_MUX_PCA954X_H
+#define QEMU_I2C_MUX_PCA954X_H
#include "hw/i2c/i2c.h"
diff --git a/include/hw/input/lm832x.h b/include/hw/input/lm832x.h
index 2a58ccf891631dd9adda89ddc009b25b4189f03c..e0e5d5ef20e1100fc7449c4602609c25314df9f4 100644
--- a/include/hw/input/lm832x.h
+++ b/include/hw/input/lm832x.h
@@ -18,8 +18,8 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef HW_INPUT_LM832X
-#define HW_INPUT_LM832X
+#ifndef HW_INPUT_LM832X_H
+#define HW_INPUT_LM832X_H
#define TYPE_LM8323 "lm8323"
diff --git a/include/hw/intc/exynos4210_combiner.h b/include/hw/intc/exynos4210_combiner.h
index 429844fed411b54a7121e4f09d68c2a350face6b..bd207a7e6e47e689dd6b2683fb330bbe0e5fe136 100644
--- a/include/hw/intc/exynos4210_combiner.h
+++ b/include/hw/intc/exynos4210_combiner.h
@@ -20,8 +20,8 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef HW_INTC_EXYNOS4210_COMBINER
-#define HW_INTC_EXYNOS4210_COMBINER
+#ifndef HW_INTC_EXYNOS4210_COMBINER_H
+#define HW_INTC_EXYNOS4210_COMBINER_H
#include "hw/sysbus.h"
diff --git a/include/hw/intc/nios2_vic.h b/include/hw/intc/nios2_vic.h
index af1517a967a8f7b9ad94acf5d089b72c0e812f52..ac507b9d74cae1a12ebcb4d0a85c99eeb5b37723 100644
--- a/include/hw/intc/nios2_vic.h
+++ b/include/hw/intc/nios2_vic.h
@@ -32,8 +32,8 @@
* THE SOFTWARE.
*/
-#ifndef HW_INTC_NIOS2_VIC
-#define HW_INTC_NIOS2_VIC
+#ifndef HW_INTC_NIOS2_VIC_H
+#define HW_INTC_NIOS2_VIC_H
#define TYPE_NIOS2_VIC "nios2-vic"
OBJECT_DECLARE_SIMPLE_TYPE(Nios2VIC, NIOS2_VIC)
@@ -61,4 +61,4 @@ struct Nios2VIC {
uint32_t vec_tbl_addr;
};
-#endif /* HW_INTC_NIOS2_VIC */
+#endif /* HW_INTC_NIOS2_VIC_H */
diff --git a/include/hw/intc/rx_icu.h b/include/hw/intc/rx_icu.h
index 7f5889b36f45ccf603a150513252d6a076124324..b23504f3dd19ee9935647c6055a98c812b5a191d 100644
--- a/include/hw/intc/rx_icu.h
+++ b/include/hw/intc/rx_icu.h
@@ -73,4 +73,4 @@ struct RXICUState {
#define TYPE_RX_ICU "rx-icu"
OBJECT_DECLARE_SIMPLE_TYPE(RXICUState, RX_ICU)
-#endif /* RX_ICU_H */
+#endif /* HW_INTC_RX_ICU_H */
diff --git a/include/hw/misc/aspeed_hace.h b/include/hw/misc/aspeed_hace.h
index 4f9ce179bf7b0561ea895b7528db82ef6b306a62..ecb1b67de816cc1cb4f5645a29c4d41174bfa5e0 100644
--- a/include/hw/misc/aspeed_hace.h
+++ b/include/hw/misc/aspeed_hace.h
@@ -47,4 +47,4 @@ struct AspeedHACEClass {
uint32_t hash_mask;
};
-#endif /* _ASPEED_HACE_H_ */
+#endif /* ASPEED_HACE_H */
diff --git a/include/hw/misc/aspeed_lpc.h b/include/hw/misc/aspeed_lpc.h
index df418cfcd36cbe3994de9964f8f92b9fb39e80ee..fd228731d2ff020bdd3180aa52829aefebed51e0 100644
--- a/include/hw/misc/aspeed_lpc.h
+++ b/include/hw/misc/aspeed_lpc.h
@@ -44,4 +44,4 @@ typedef struct AspeedLPCState {
uint32_t hicr7;
} AspeedLPCState;
-#endif /* _ASPEED_LPC_H_ */
+#endif /* ASPEED_LPC_H */
diff --git a/include/hw/misc/aspeed_sbc.h b/include/hw/misc/aspeed_sbc.h
index 651747e28f3abf00bff1d58b6f005ba0738a5595..67e43b53ecc3199a226796f9e578cf579d6e328a 100644
--- a/include/hw/misc/aspeed_sbc.h
+++ b/include/hw/misc/aspeed_sbc.h
@@ -29,4 +29,4 @@ struct AspeedSBCClass {
SysBusDeviceClass parent_class;
};
-#endif /* _ASPEED_SBC_H_ */
+#endif /* ASPEED_SBC_H */
diff --git a/include/hw/misc/bcm2835_cprman.h b/include/hw/misc/bcm2835_cprman.h
index 3df4ceedd2eb500abb0f560a4ee568a19741c4f9..0d380367280dfeaa7ffd55a1c8e88f3f9f51de7e 100644
--- a/include/hw/misc/bcm2835_cprman.h
+++ b/include/hw/misc/bcm2835_cprman.h
@@ -6,8 +6,8 @@
* SPDX-License-Identifier: GPL-2.0-or-later
*/
-#ifndef HW_MISC_CPRMAN_H
-#define HW_MISC_CPRMAN_H
+#ifndef HW_MISC_BCM2835_CPRMAN_H
+#define HW_MISC_BCM2835_CPRMAN_H
#include "hw/sysbus.h"
#include "hw/qdev-clock.h"
diff --git a/include/hw/misc/bcm2835_cprman_internals.h b/include/hw/misc/bcm2835_cprman_internals.h
index 339759b3071d58891de81771711fcfe9a3824978..7617aff96fdebaaf794b25307791e2be0ec0fe98 100644
--- a/include/hw/misc/bcm2835_cprman_internals.h
+++ b/include/hw/misc/bcm2835_cprman_internals.h
@@ -6,8 +6,8 @@
* SPDX-License-Identifier: GPL-2.0-or-later
*/
-#ifndef HW_MISC_CPRMAN_INTERNALS_H
-#define HW_MISC_CPRMAN_INTERNALS_H
+#ifndef HW_MISC_BCM2835_CPRMAN_INTERNALS_H
+#define HW_MISC_BCM2835_CPRMAN_INTERNALS_H
#include "hw/registerfields.h"
#include "hw/misc/bcm2835_cprman.h"
diff --git a/include/hw/misc/stm32f4xx_exti.h b/include/hw/misc/stm32f4xx_exti.h
index ea6b0097b0eb56c0504b6678d504cc1588ab6224..fc11c595fa46066028e92680089e333b47d09322 100644
--- a/include/hw/misc/stm32f4xx_exti.h
+++ b/include/hw/misc/stm32f4xx_exti.h
@@ -22,8 +22,8 @@
* THE SOFTWARE.
*/
-#ifndef HW_STM_EXTI_H
-#define HW_STM_EXTI_H
+#ifndef HW_STM32F4XX_EXTI_H
+#define HW_STM32F4XX_EXTI_H
#include "hw/sysbus.h"
#include "qom/object.h"
diff --git a/include/hw/misc/stm32f4xx_syscfg.h b/include/hw/misc/stm32f4xx_syscfg.h
index 6f8ca49228b64c658249afa19622254f7836bbbb..9fce67f4b481987066c8c280a9bd748d2b8b4f3c 100644
--- a/include/hw/misc/stm32f4xx_syscfg.h
+++ b/include/hw/misc/stm32f4xx_syscfg.h
@@ -22,8 +22,8 @@
* THE SOFTWARE.
*/
-#ifndef HW_STM_SYSCFG_H
-#define HW_STM_SYSCFG_H
+#ifndef HW_STM32F4XX_SYSCFG_H
+#define HW_STM32F4XX_SYSCFG_H
#include "hw/sysbus.h"
#include "qom/object.h"
diff --git a/include/hw/misc/xlnx-versal-pmc-iou-slcr.h b/include/hw/misc/xlnx-versal-pmc-iou-slcr.h
index ab4e4b4f185a9fc8eae99c40427dedd689bf60b5..2170420f01f71b253836c89a6731299fd1153599 100644
--- a/include/hw/misc/xlnx-versal-pmc-iou-slcr.h
+++ b/include/hw/misc/xlnx-versal-pmc-iou-slcr.h
@@ -51,8 +51,8 @@
* 1: OSPI direct access mode.
*/
-#ifndef XILINX_VERSAL_PMC_IOU_SLCR_H
-#define XILINX_VERSAL_PMC_IOU_SLCR_H
+#ifndef XLNX_VERSAL_PMC_IOU_SLCR_H
+#define XLNX_VERSAL_PMC_IOU_SLCR_H
#include "hw/register.h"
@@ -75,4 +75,4 @@ struct XlnxVersalPmcIouSlcr {
RegisterInfo regs_info[XILINX_VERSAL_PMC_IOU_SLCR_R_MAX];
};
-#endif /* XILINX_VERSAL_PMC_IOU_SLCR_H */
+#endif /* XLNX_VERSAL_PMC_IOU_SLCR_H */
diff --git a/include/hw/net/allwinner-sun8i-emac.h b/include/hw/net/allwinner-sun8i-emac.h
index 460a58f1ca7aa7b184c7b4a7c6a294fb0ac4b355..185895f4e131ebca3025e986d31d2a0042c987e7 100644
--- a/include/hw/net/allwinner-sun8i-emac.h
+++ b/include/hw/net/allwinner-sun8i-emac.h
@@ -101,4 +101,4 @@ struct AwSun8iEmacState {
};
-#endif /* HW_NET_ALLWINNER_SUN8I_H */
+#endif /* HW_NET_ALLWINNER_SUN8I_EMAC_H */
diff --git a/include/hw/net/mv88w8618_eth.h b/include/hw/net/mv88w8618_eth.h
index 8f4c746092f0e2cfd6ea47480354d8a9af30440e..41074940ec0dd5bd1c1a9b1e776c14cca553dfa7 100644
--- a/include/hw/net/mv88w8618_eth.h
+++ b/include/hw/net/mv88w8618_eth.h
@@ -4,8 +4,9 @@
*
* Copyright (c) 2008-2021 QEMU contributors
*/
-#ifndef HW_NET_MV88W8618_H
-#define HW_NET_MV88W8618_H
+
+#ifndef HW_NET_MV88W8618_ETH_H
+#define HW_NET_MV88W8618_ETH_H
#define TYPE_MV88W8618_ETH "mv88w8618_eth"
diff --git a/include/hw/nubus/mac-nubus-bridge.h b/include/hw/nubus/mac-nubus-bridge.h
index 70ab50ab2d673196be3502dfdaa6c203655d4335..be4dd83530510d688dabac059c8913171a3a3ed7 100644
--- a/include/hw/nubus/mac-nubus-bridge.h
+++ b/include/hw/nubus/mac-nubus-bridge.h
@@ -6,8 +6,8 @@
*
*/
-#ifndef HW_NUBUS_MAC_H
-#define HW_NUBUS_MAC_H
+#ifndef HW_NUBUS_MAC_NUBUS_BRIDGE_H
+#define HW_NUBUS_MAC_NUBUS_BRIDGE_H
#include "hw/nubus/nubus.h"
#include "qom/object.h"
diff --git a/include/hw/pci-host/remote.h b/include/hw/pci-host/remote.h
index 3dcf6aa51d1de79f0327c0f31e633cd36ea8d323..690a01f0fe9e00adccbcfda2f337bdfb88848d92 100644
--- a/include/hw/pci-host/remote.h
+++ b/include/hw/pci-host/remote.h
@@ -8,8 +8,8 @@
*
*/
-#ifndef REMOTE_PCIHOST_H
-#define REMOTE_PCIHOST_H
+#ifndef PCI_HOST_REMOTE_H
+#define PCI_HOST_REMOTE_H
#include "exec/memory.h"
#include "hw/pci/pcie_host.h"
diff --git a/include/hw/ppc/pnv_pnor.h b/include/hw/ppc/pnv_pnor.h
index 99f9a3adfb54140226fdf27ba2aa3704899b8030..bab2f798449db2eed65379f44994f167dceaef8b 100644
--- a/include/hw/ppc/pnv_pnor.h
+++ b/include/hw/ppc/pnv_pnor.h
@@ -6,8 +6,10 @@
* This code is licensed under the GPL version 2 or later. See the
* COPYING file in the top-level directory.
*/
-#ifndef _PPC_PNV_PNOR_H
-#define _PPC_PNV_PNOR_H
+
+#ifndef PPC_PNV_PNOR_H
+#define PPC_PNV_PNOR_H
+
#include "qom/object.h"
/*
@@ -28,4 +30,4 @@ struct PnvPnor {
MemoryRegion mmio;
};
-#endif /* _PPC_PNV_PNOR_H */
+#endif /* PPC_PNV_PNOR_H */
diff --git a/include/hw/riscv/boot_opensbi.h b/include/hw/riscv/boot_opensbi.h
index 0d5ddd6c3daf66f8ed342d729582793f082ca28b..c19cad4818b39a4d8463366320edb41fd9f63550 100644
--- a/include/hw/riscv/boot_opensbi.h
+++ b/include/hw/riscv/boot_opensbi.h
@@ -4,8 +4,9 @@
*
* Based on include/sbi/{fw_dynamic.h,sbi_scratch.h} from the OpenSBI project.
*/
-#ifndef OPENSBI_H
-#define OPENSBI_H
+
+#ifndef RISCV_BOOT_OPENSBI_H
+#define RISCV_BOOT_OPENSBI_H
/** Expected value of info magic ('OSBI' ascii string in hex) */
#define FW_DYNAMIC_INFO_MAGIC_VALUE 0x4942534f
diff --git a/include/hw/riscv/shakti_c.h b/include/hw/riscv/shakti_c.h
index 50a2b7908608892718847d86bd6140693893ebb0..daf0aae13f83ee0e894d85ebd2e5e912aa04c1d8 100644
--- a/include/hw/riscv/shakti_c.h
+++ b/include/hw/riscv/shakti_c.h
@@ -16,8 +16,8 @@
* this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef HW_SHAKTI_H
-#define HW_SHAKTI_H
+#ifndef HW_SHAKTI_C_H
+#define HW_SHAKTI_C_H
#include "hw/riscv/riscv_hart.h"
#include "hw/boards.h"
diff --git a/include/hw/rtc/m48t59.h b/include/hw/rtc/m48t59.h
index d9b45eb16128aa3067805c6d6d1cdc460fc665d8..c14937476c1c41ca00174d52d6fba61893aedb1d 100644
--- a/include/hw/rtc/m48t59.h
+++ b/include/hw/rtc/m48t59.h
@@ -47,4 +47,4 @@ struct NvramClass {
void (*toggle_lock)(Nvram *obj, int lock);
};
-#endif /* HW_M48T59_H */
+#endif /* HW_RTC_M48T59_H */
diff --git a/include/hw/rtc/mc146818rtc.h b/include/hw/rtc/mc146818rtc.h
index deef93f89a328154f4782e65304853fa4c6df1e4..33d85753c056810dd8b189fce8b9a2e880449949 100644
--- a/include/hw/rtc/mc146818rtc.h
+++ b/include/hw/rtc/mc146818rtc.h
@@ -56,4 +56,4 @@ ISADevice *mc146818_rtc_init(ISABus *bus, int base_year,
void rtc_set_memory(ISADevice *dev, int addr, int val);
int rtc_get_memory(ISADevice *dev, int addr);
-#endif /* MC146818RTC_H */
+#endif /* HW_RTC_MC146818RTC_H */
diff --git a/include/hw/rtc/sun4v-rtc.h b/include/hw/rtc/sun4v-rtc.h
index fd868f6ed2fa0c8a3f5280c3dc467acd0e7740f2..fc54dfcba47367d4578822993d1fa1d09168d759 100644
--- a/include/hw/rtc/sun4v-rtc.h
+++ b/include/hw/rtc/sun4v-rtc.h
@@ -9,8 +9,8 @@
* version.
*/
-#ifndef HW_RTC_SUN4V
-#define HW_RTC_SUN4V
+#ifndef HW_RTC_SUN4V_RTC_H
+#define HW_RTC_SUN4V_RTC_H
#include "exec/hwaddr.h"
diff --git a/include/hw/rtc/xlnx-zynqmp-rtc.h b/include/hw/rtc/xlnx-zynqmp-rtc.h
index 5f1ad0a9462fa7fa0b691b671e7f29ad72cedced..f0c6a2d78a84ecd230b28e707cc36f4654abd095 100644
--- a/include/hw/rtc/xlnx-zynqmp-rtc.h
+++ b/include/hw/rtc/xlnx-zynqmp-rtc.h
@@ -24,8 +24,8 @@
* THE SOFTWARE.
*/
-#ifndef HW_RTC_XLNX_ZYNQMP_H
-#define HW_RTC_XLNX_ZYNQMP_H
+#ifndef HW_RTC_XLNX_ZYNQMP_RTC_H
+#define HW_RTC_XLNX_ZYNQMP_RTC_H
#include "hw/register.h"
#include "hw/sysbus.h"
diff --git a/include/hw/rx/rx62n.h b/include/hw/rx/rx62n.h
index 3ed80dba0dd34d76eeaca8bf0b585ced3124e841..73ceeb58e55a1e0d1fb3690d75460465e2e09c37 100644
--- a/include/hw/rx/rx62n.h
+++ b/include/hw/rx/rx62n.h
@@ -21,8 +21,8 @@
* this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef HW_RX_RX62N_MCU_H
-#define HW_RX_RX62N_MCU_H
+#ifndef HW_RX_RX62N_H
+#define HW_RX_RX62N_H
#include "target/rx/cpu.h"
#include "hw/intc/rx_icu.h"
diff --git a/include/hw/s390x/s390-pci-clp.h b/include/hw/s390x/s390-pci-clp.h
index cc8c8662b89b206d102f69c2fce193c1fe9b2c93..03b7f9ba5f749abfe9b1accb884a71be1a3f1a40 100644
--- a/include/hw/s390x/s390-pci-clp.h
+++ b/include/hw/s390x/s390-pci-clp.h
@@ -9,8 +9,8 @@
* directory.
*/
-#ifndef HW_S390_PCI_CLP
-#define HW_S390_PCI_CLP
+#ifndef HW_S390_PCI_CLP_H
+#define HW_S390_PCI_CLP_H
/* CLP common request & response block size */
#define CLP_BLK_SIZE 4096
diff --git a/include/hw/sensor/emc141x_regs.h b/include/hw/sensor/emc141x_regs.h
index 0560fb7c5c1e50e50458283e6835b8e93774a08c..e509a43d55945c1471e1a038ed66c7a9669baa19 100644
--- a/include/hw/sensor/emc141x_regs.h
+++ b/include/hw/sensor/emc141x_regs.h
@@ -9,8 +9,8 @@
* later. See the COPYING file in the top-level directory.
*/
-#ifndef TMP105_REGS_H
-#define TMP105_REGS_H
+#ifndef EMC141X_REGS_H
+#define EMC141X_REGS_H
#define EMC1413_DEVICE_ID 0x21
#define EMC1414_DEVICE_ID 0x25
diff --git a/include/hw/ssi/xlnx-versal-ospi.h b/include/hw/ssi/xlnx-versal-ospi.h
index 14d12634979b2c6ab8fd9628154f0e028937b6ea..5d131d351d2f863c2a34065707308a29fbbab466 100644
--- a/include/hw/ssi/xlnx-versal-ospi.h
+++ b/include/hw/ssi/xlnx-versal-ospi.h
@@ -49,8 +49,8 @@
* + Property "indac-write-disabled": Disable indirect access writes.
*/
-#ifndef XILINX_VERSAL_OSPI_H
-#define XILINX_VERSAL_OSPI_H
+#ifndef XLNX_VERSAL_OSPI_H
+#define XLNX_VERSAL_OSPI_H
#include "hw/register.h"
#include "hw/ssi/ssi.h"
@@ -108,4 +108,4 @@ struct XlnxVersalOspi {
uint8_t stig_membank[512];
};
-#endif /* XILINX_VERSAL_OSPI_H */
+#endif /* XLNX_VERSAL_OSPI_H */
diff --git a/include/hw/timer/bcm2835_systmr.h b/include/hw/timer/bcm2835_systmr.h
index bd3097d746b2d54f94ea7e792ec38d59eb80e0e1..a8f605beeb67d0216e57404159506403b2d282ea 100644
--- a/include/hw/timer/bcm2835_systmr.h
+++ b/include/hw/timer/bcm2835_systmr.h
@@ -6,8 +6,8 @@
* SPDX-License-Identifier: GPL-2.0-or-later
*/
-#ifndef BCM2835_SYSTIMER_H
-#define BCM2835_SYSTIMER_H
+#ifndef BCM2835_SYSTMR_H
+#define BCM2835_SYSTMR_H
#include "hw/sysbus.h"
#include "hw/irq.h"
diff --git a/include/hw/tricore/tc27x_soc.h b/include/hw/tricore/tc27x_soc.h
index 6a7e5b54f51d9111a8e7f307defc5cb2844225fb..dd3a7485c85a2bf1380cef64666b7f1637d9f1e9 100644
--- a/include/hw/tricore/tc27x_soc.h
+++ b/include/hw/tricore/tc27x_soc.h
@@ -18,8 +18,8 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef TC27X_SoC_H
-#define TC27X_SoC_H
+#ifndef TC27X_SOC_H
+#define TC27X_SOC_H
#include "hw/sysbus.h"
#include "target/tricore/cpu.h"
diff --git a/include/hw/tricore/tricore_testdevice.h b/include/hw/tricore/tricore_testdevice.h
index 2c56c51bcb8acf7d12c9a39f8543cd1fa9f569a7..1e2b8942ac916b18eb2a9d0b33a3bddc857b84b5 100644
--- a/include/hw/tricore/tricore_testdevice.h
+++ b/include/hw/tricore/tricore_testdevice.h
@@ -15,9 +15,8 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-
-#ifndef HW_TRICORE_TESTDEV_H
-#define HW_TRICORE_TESTDEV_H
+#ifndef HW_TRICORE_TESTDEVICE_H
+#define HW_TRICORE_TESTDEVICE_H
#include "hw/sysbus.h"
#include "hw/hw.h"
diff --git a/include/hw/usb/dwc2-regs.h b/include/hw/usb/dwc2-regs.h
index a7eb53148543379843c7031c38b7def40b543d72..4015c1d69117e96eccedb21bef732461f936964f 100644
--- a/include/hw/usb/dwc2-regs.h
+++ b/include/hw/usb/dwc2-regs.h
@@ -39,8 +39,8 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef DWC2_HW_H
-#define DWC2_HW_H
+#ifndef DWC2_REGS_H
+#define DWC2_REGS_H
#define HSOTG_REG(x) (x)
@@ -896,4 +896,4 @@ struct dwc2_dma_desc {
#define MAX_DMA_DESC_NUM_GENERIC 64
#define MAX_DMA_DESC_NUM_HS_ISOC 256
-#endif /* __DWC2_HW_H__ */
+#endif /* DWC2_REGS_H */
diff --git a/include/hw/usb/hcd-musb.h b/include/hw/usb/hcd-musb.h
index c874b9f292f97c16c12403d52226337be821e254..f30a26f7f4031172d727cebd7a4f3d635cad61af 100644
--- a/include/hw/usb/hcd-musb.h
+++ b/include/hw/usb/hcd-musb.h
@@ -10,8 +10,8 @@
* SPDX-License-Identifier: GPL-2.0-or-later
*/
-#ifndef HW_USB_MUSB_H
-#define HW_USB_MUSB_H
+#ifndef HW_USB_HCD_MUSB_H
+#define HW_USB_HCD_MUSB_H
enum musb_irq_source_e {
musb_irq_suspend = 0,
diff --git a/include/hw/usb/xlnx-usb-subsystem.h b/include/hw/usb/xlnx-usb-subsystem.h
index 999e423951acfcc023c75b13cdff7e9f1a07ca77..5b730abd840a6d48cad25edbb694e10fae5068aa 100644
--- a/include/hw/usb/xlnx-usb-subsystem.h
+++ b/include/hw/usb/xlnx-usb-subsystem.h
@@ -22,8 +22,8 @@
* THE SOFTWARE.
*/
-#ifndef XLNX_VERSAL_USB_SUBSYSTEM_H
-#define XLNX_VERSAL_USB_SUBSYSTEM_H
+#ifndef XLNX_USB_SUBSYSTEM_H
+#define XLNX_USB_SUBSYSTEM_H
#include "hw/usb/xlnx-versal-usb2-ctrl-regs.h"
#include "hw/usb/hcd-dwc3.h"
diff --git a/include/hw/usb/xlnx-versal-usb2-ctrl-regs.h b/include/hw/usb/xlnx-versal-usb2-ctrl-regs.h
index b76dce04195761c98691b4b5a6fed1466fb6bbbc..633bf3013af25119328f3d8d0282f82d40010ff7 100644
--- a/include/hw/usb/xlnx-versal-usb2-ctrl-regs.h
+++ b/include/hw/usb/xlnx-versal-usb2-ctrl-regs.h
@@ -23,8 +23,8 @@
* THE SOFTWARE.
*/
-#ifndef XLNX_USB2_REGS_H
-#define XLNX_USB2_REGS_H
+#ifndef XLNX_VERSAL_USB2_CTRL_REGS_H
+#define XLNX_VERSAL_USB2_CTRL_REGS_H
#define TYPE_XILINX_VERSAL_USB2_CTRL_REGS "xlnx.versal-usb2-ctrl-regs"
diff --git a/include/hw/virtio/vhost-user-fs.h b/include/hw/virtio/vhost-user-fs.h
index 0d62834c25105ed5d1f3f43d13e9de466b4126ce..94c3aaa84edf30504138c80eb97163cfd9febe8e 100644
--- a/include/hw/virtio/vhost-user-fs.h
+++ b/include/hw/virtio/vhost-user-fs.h
@@ -11,8 +11,8 @@
* top-level directory.
*/
-#ifndef _QEMU_VHOST_USER_FS_H
-#define _QEMU_VHOST_USER_FS_H
+#ifndef QEMU_VHOST_USER_FS_H
+#define QEMU_VHOST_USER_FS_H
#include "hw/virtio/virtio.h"
#include "hw/virtio/vhost.h"
@@ -44,4 +44,4 @@ struct VHostUserFS {
/*< public >*/
};
-#endif /* _QEMU_VHOST_USER_FS_H */
+#endif /* QEMU_VHOST_USER_FS_H */
diff --git a/include/hw/virtio/vhost-user-i2c.h b/include/hw/virtio/vhost-user-i2c.h
index d8372f3b43ea9c3eaea145f19a31da345fc9b311..0f7acd40e3addee3fa76b1762e3175542e4863ca 100644
--- a/include/hw/virtio/vhost-user-i2c.h
+++ b/include/hw/virtio/vhost-user-i2c.h
@@ -6,8 +6,8 @@
* SPDX-License-Identifier: GPL-2.0-or-later
*/
-#ifndef _QEMU_VHOST_USER_I2C_H
-#define _QEMU_VHOST_USER_I2C_H
+#ifndef QEMU_VHOST_USER_I2C_H
+#define QEMU_VHOST_USER_I2C_H
#include "hw/virtio/vhost.h"
#include "hw/virtio/vhost-user.h"
@@ -28,4 +28,4 @@ struct VHostUserI2C {
/* Virtio Feature bits */
#define VIRTIO_I2C_F_ZERO_LENGTH_REQUEST 0
-#endif /* _QEMU_VHOST_USER_I2C_H */
+#endif /* QEMU_VHOST_USER_I2C_H */
diff --git a/include/hw/virtio/vhost-user-rng.h b/include/hw/virtio/vhost-user-rng.h
index 071539996d1dd1679c3f73c41981c7fd0330d8d4..ddd9f01eea6116a58d60e4d6c9e480115f147fc7 100644
--- a/include/hw/virtio/vhost-user-rng.h
+++ b/include/hw/virtio/vhost-user-rng.h
@@ -6,8 +6,8 @@
* SPDX-License-Identifier: GPL-2.0-or-later
*/
-#ifndef _QEMU_VHOST_USER_RNG_H
-#define _QEMU_VHOST_USER_RNG_H
+#ifndef QEMU_VHOST_USER_RNG_H
+#define QEMU_VHOST_USER_RNG_H
#include "hw/virtio/virtio.h"
#include "hw/virtio/vhost.h"
@@ -30,4 +30,4 @@ struct VHostUserRNG {
/*< public >*/
};
-#endif /* _QEMU_VHOST_USER_RNG_H */
+#endif /* QEMU_VHOST_USER_RNG_H */
diff --git a/include/hw/virtio/vhost-user-vsock.h b/include/hw/virtio/vhost-user-vsock.h
index 4cfd558245508204579f7778369d31e160d4231e..67aa46c95273960ee7ce45b8909af2c6218ebbe9 100644
--- a/include/hw/virtio/vhost-user-vsock.h
+++ b/include/hw/virtio/vhost-user-vsock.h
@@ -8,8 +8,8 @@
* top-level directory.
*/
-#ifndef _QEMU_VHOST_USER_VSOCK_H
-#define _QEMU_VHOST_USER_VSOCK_H
+#ifndef QEMU_VHOST_USER_VSOCK_H
+#define QEMU_VHOST_USER_VSOCK_H
#include "hw/virtio/vhost-vsock-common.h"
#include "hw/virtio/vhost-user.h"
@@ -33,4 +33,4 @@ struct VHostUserVSock {
/*< public >*/
};
-#endif /* _QEMU_VHOST_USER_VSOCK_H */
+#endif /* QEMU_VHOST_USER_VSOCK_H */
diff --git a/include/hw/virtio/vhost-vsock-common.h b/include/hw/virtio/vhost-vsock-common.h
index d8b565b4dac8d555a6aa92c04655744b7aef7c9c..456a9c23657f79c43a21d0bceb8975bded07bac4 100644
--- a/include/hw/virtio/vhost-vsock-common.h
+++ b/include/hw/virtio/vhost-vsock-common.h
@@ -8,8 +8,8 @@
* top-level directory.
*/
-#ifndef _QEMU_VHOST_VSOCK_COMMON_H
-#define _QEMU_VHOST_VSOCK_COMMON_H
+#ifndef QEMU_VHOST_VSOCK_COMMON_H
+#define QEMU_VHOST_VSOCK_COMMON_H
#include "hw/virtio/virtio.h"
#include "hw/virtio/vhost.h"
@@ -49,4 +49,4 @@ void vhost_vsock_common_unrealize(VirtIODevice *vdev);
uint64_t vhost_vsock_common_get_features(VirtIODevice *vdev, uint64_t features,
Error **errp);
-#endif /* _QEMU_VHOST_VSOCK_COMMON_H */
+#endif /* QEMU_VHOST_VSOCK_COMMON_H */
diff --git a/include/hw/watchdog/wdt_imx2.h b/include/hw/watchdog/wdt_imx2.h
index 023d83f48f6d7e81750420ff6ffafeb455fda447..600a552d2e22207946a8111d92177bacad8d7519 100644
--- a/include/hw/watchdog/wdt_imx2.h
+++ b/include/hw/watchdog/wdt_imx2.h
@@ -9,8 +9,8 @@
* See the COPYING file in the top-level directory.
*/
-#ifndef IMX2_WDT_H
-#define IMX2_WDT_H
+#ifndef WDT_IMX2_H
+#define WDT_IMX2_H
#include "qemu/bitops.h"
#include "hw/sysbus.h"
@@ -88,4 +88,4 @@ struct IMX2WdtState {
bool wcr_wdt_locked; /* affects WDT (never cleared) */
};
-#endif /* IMX2_WDT_H */
+#endif /* WDT_IMX2_H */
diff --git a/include/qemu/cpu-float.h b/include/qemu/cpu-float.h
index 911099499ffb586b828cc1540e9309bb6aa01c15..a26b9faf68508cac4d5494a8af3c9433b9e0752c 100644
--- a/include/qemu/cpu-float.h
+++ b/include/qemu/cpu-float.h
@@ -1,5 +1,5 @@
-#ifndef QEMU_CPU_FLOAT_H_
-#define QEMU_CPU_FLOAT_H_
+#ifndef QEMU_CPU_FLOAT_H
+#define QEMU_CPU_FLOAT_H
#include "fpu/softfloat-types.h"
@@ -61,4 +61,4 @@ typedef union {
#endif
} CPU_QuadU;
-#endif /* QEMU_CPU_FLOAT_H_ */
+#endif /* QEMU_CPU_FLOAT_H */
diff --git a/include/qemu/crc-ccitt.h b/include/qemu/crc-ccitt.h
index 06ee55b159b3eba53836fd4f44d698bbc3dc065b..d6eb49146dbc3ac1849b5e8d835133c08ff95bcb 100644
--- a/include/qemu/crc-ccitt.h
+++ b/include/qemu/crc-ccitt.h
@@ -11,8 +11,8 @@
* SPDX-License-Identifier: GPL-2.0
*/
-#ifndef _CRC_CCITT_H
-#define _CRC_CCITT_H
+#ifndef CRC_CCITT_H
+#define CRC_CCITT_H
extern uint16_t const crc_ccitt_table[256];
extern uint16_t const crc_ccitt_false_table[256];
@@ -30,4 +30,4 @@ static inline uint16_t crc_ccitt_false_byte(uint16_t crc, const uint8_t c)
return (crc << 8) ^ crc_ccitt_false_table[(crc >> 8) ^ c];
}
-#endif /* _CRC_CCITT_H */
+#endif /* CRC_CCITT_H */
diff --git a/include/qemu/help-texts.h b/include/qemu/help-texts.h
index ba32cc8b1f393688e80eb614b1e7aa97860716fc..4f265fed8df1787a697dfb98ab9570748596f31c 100644
--- a/include/qemu/help-texts.h
+++ b/include/qemu/help-texts.h
@@ -1,5 +1,5 @@
-#ifndef QEMU_COMMON_H
-#define QEMU_COMMON_H
+#ifndef QEMU_HELP_TEXTS_H
+#define QEMU_HELP_TEXTS_H
/* Copyright string for -version arguments, About dialogs, etc */
#define QEMU_COPYRIGHT "Copyright (c) 2003-2022 " \
diff --git a/include/qemu/keyval.h b/include/qemu/keyval.h
index 2d263286d7c555f1ce217432f8d3a2f359384bf3..1187b68303433becfeaa7f8e6d83d230b6e9b54e 100644
--- a/include/qemu/keyval.h
+++ b/include/qemu/keyval.h
@@ -2,8 +2,9 @@
* This work is licensed under the terms of the GNU GPL, version 2 or later.
* See the COPYING file in the top-level directory.
*/
-#ifndef KEYVAL_H_
-#define KEYVAL_H_
+
+#ifndef KEYVAL_H
+#define KEYVAL_H
QDict *keyval_parse_into(QDict *qdict, const char *params, const char *implied_key,
bool *p_help, Error **errp);
@@ -11,4 +12,4 @@ QDict *keyval_parse(const char *params, const char *implied_key,
bool *help, Error **errp);
void keyval_merge(QDict *old, const QDict *new, Error **errp);
-#endif /* KEYVAL_H_ */
+#endif /* KEYVAL_H */
diff --git a/include/qemu/plugin-memory.h b/include/qemu/plugin-memory.h
index 0f592267279da874653308e15a4105442b4cf698..8ad13c110c7341375b99e420fc8384c5cd9b02a9 100644
--- a/include/qemu/plugin-memory.h
+++ b/include/qemu/plugin-memory.h
@@ -37,4 +37,4 @@ struct qemu_plugin_hwaddr {
bool tlb_plugin_lookup(CPUState *cpu, target_ulong addr, int mmu_idx,
bool is_store, struct qemu_plugin_hwaddr *data);
-#endif /* _PLUGIN_MEMORY_H_ */
+#endif /* PLUGIN_MEMORY_H */
diff --git a/include/qemu/qemu-plugin.h b/include/qemu/qemu-plugin.h
index 535ddbf0ae30099d53bf653b36f5e0f88fbcb3a3..d0e9d03adfe34d6b243fd0574bbb372d4826d4eb 100644
--- a/include/qemu/qemu-plugin.h
+++ b/include/qemu/qemu-plugin.h
@@ -7,8 +7,9 @@
*
* SPDX-License-Identifier: GPL-2.0-or-later
*/
-#ifndef QEMU_PLUGIN_API_H
-#define QEMU_PLUGIN_API_H
+
+#ifndef QEMU_QEMU_PLUGIN_H
+#define QEMU_QEMU_PLUGIN_H
#include <inttypes.h>
#include <stdbool.h>
@@ -624,4 +625,4 @@ uint64_t qemu_plugin_end_code(void);
*/
uint64_t qemu_plugin_entry_code(void);
-#endif /* QEMU_PLUGIN_API_H */
+#endif /* QEMU_QEMU_PLUGIN_H */
diff --git a/include/qemu/selfmap.h b/include/qemu/selfmap.h
index 80cf920fbadbe2ed5f19ad5cc08f50f60df38da9..3479a2a61862d591f4e631ff653aadc97463e10b 100644
--- a/include/qemu/selfmap.h
+++ b/include/qemu/selfmap.h
@@ -41,4 +41,4 @@ GSList *read_self_maps(void);
*/
void free_self_maps(GSList *info);
-#endif /* _SELFMAP_H_ */
+#endif /* SELFMAP_H */
diff --git a/include/sysemu/block-backend-global-state.h b/include/sysemu/block-backend-global-state.h
index 2e93a746798eb4d29d048790104a84ee385b8343..415f0c91d7645bf3270f5aad20c1841d871851dd 100644
--- a/include/sysemu/block-backend-global-state.h
+++ b/include/sysemu/block-backend-global-state.h
@@ -10,8 +10,8 @@
* or later. See the COPYING.LIB file in the top-level directory.
*/
-#ifndef BLOCK_BACKEND_GS_H
-#define BLOCK_BACKEND_GS_H
+#ifndef BLOCK_BACKEND_GLOBAL_STATE_H
+#define BLOCK_BACKEND_GLOBAL_STATE_H
#include "block-backend-common.h"
@@ -113,4 +113,4 @@ const BdrvChild *blk_root(BlockBackend *blk);
int blk_make_empty(BlockBackend *blk, Error **errp);
-#endif /* BLOCK_BACKEND_GS_H */
+#endif /* BLOCK_BACKEND_GLOBAL_STATE_H */
diff --git a/include/tcg/tcg-ldst.h b/include/tcg/tcg-ldst.h
index 121a156933a5b53f9ca9ea3c78bdee0b22e50e80..2ba22bd5fe125d2e420dae158740bbc0ae62d34e 100644
--- a/include/tcg/tcg-ldst.h
+++ b/include/tcg/tcg-ldst.h
@@ -23,7 +23,7 @@
*/
#ifndef TCG_LDST_H
-#define TCG_LDST_H 1
+#define TCG_LDST_H
#ifdef CONFIG_SOFTMMU
diff --git a/include/ui/dbus-display.h b/include/ui/dbus-display.h
index 88f153c2371d5563973713830173d176d49386ee..7c9ec1a069e1321170d8b0c395647b705f9da8e3 100644
--- a/include/ui/dbus-display.h
+++ b/include/ui/dbus-display.h
@@ -1,5 +1,5 @@
-#ifndef DBUS_DISPLAY_H_
-#define DBUS_DISPLAY_H_
+#ifndef DBUS_DISPLAY_H
+#define DBUS_DISPLAY_H
#include "qapi/error.h"
#include "ui/dbus-module.h"
@@ -14,4 +14,4 @@ static inline bool qemu_using_dbus_display(Error **errp)
return true;
}
-#endif /* DBUS_DISPLAY_H_ */
+#endif /* DBUS_DISPLAY_H */
diff --git a/include/ui/dbus-module.h b/include/ui/dbus-module.h
index ace4a17a5c258c9f50de2a7972b915a6858a00d2..5442ee0bb6e0ab6185159191437b019f35298a50 100644
--- a/include/ui/dbus-module.h
+++ b/include/ui/dbus-module.h
@@ -1,5 +1,5 @@
-#ifndef DBUS_MODULE_H_
-#define DBUS_MODULE_H_
+#ifndef DBUS_MODULE_H
+#define DBUS_MODULE_H
struct QemuDBusDisplayOps {
bool (*add_client)(int csock, Error **errp);
@@ -8,4 +8,4 @@ struct QemuDBusDisplayOps {
extern int using_dbus_display;
extern struct QemuDBusDisplayOps qemu_dbus_display;
-#endif /* DBUS_MODULE_H_*/
+#endif /* DBUS_MODULE_H */
diff --git a/include/user/syscall-trace.h b/include/user/syscall-trace.h
index 614cfacfa5806a303802c93f74c021688693f32d..b4e53d3870976337a9e65394169f4b4a7f4bb26a 100644
--- a/include/user/syscall-trace.h
+++ b/include/user/syscall-trace.h
@@ -39,4 +39,4 @@ static inline void record_syscall_return(void *cpu, int num, abi_long ret)
}
-#endif /* _SYSCALL_TRACE_H_ */
+#endif /* SYSCALL_TRACE_H */
diff --git a/linux-user/hexagon/target_signal.h b/linux-user/hexagon/target_signal.h
index 193abac340c5441bd61e18ab98f0fbb4a52640e0..68fb71312ee21d4f65a5811d668cfd126aafdab8 100644
--- a/linux-user/hexagon/target_signal.h
+++ b/linux-user/hexagon/target_signal.h
@@ -22,4 +22,4 @@
#define TARGET_ARCH_HAS_SIGTRAMP_PAGE 1
-#endif /* TARGET_SIGNAL_H */
+#endif /* HEXAGON_TARGET_SIGNAL_H */
diff --git a/plugins/plugin.h b/plugins/plugin.h
index b13677d0dc24a3bde515ae07ffd93d1f83344251..5eb2fdbc85eb0811df7cf5d2bc15e8e52b3f20c0 100644
--- a/plugins/plugin.h
+++ b/plugins/plugin.h
@@ -9,8 +9,8 @@
* SPDX-License-Identifier: GPL-2.0-or-later
*/
-#ifndef PLUGIN_INTERNAL_H
-#define PLUGIN_INTERNAL_H
+#ifndef PLUGIN_H
+#define PLUGIN_H
#include <gmodule.h>
#include "qemu/qht.h"
@@ -97,4 +97,4 @@ void plugin_register_vcpu_mem_cb(GArray **arr,
void exec_inline_op(struct qemu_plugin_dyn_cb *cb);
-#endif /* _PLUGIN_INTERNAL_H_ */
+#endif /* PLUGIN_H */
diff --git a/target/alpha/cpu-param.h b/target/alpha/cpu-param.h
index 1153992e42adcdbf13a237d8994d2cb8598b242d..17cd14e5904211c860218e489e31a224302f28dc 100644
--- a/target/alpha/cpu-param.h
+++ b/target/alpha/cpu-param.h
@@ -6,7 +6,7 @@
*/
#ifndef ALPHA_CPU_PARAM_H
-#define ALPHA_CPU_PARAM_H 1
+#define ALPHA_CPU_PARAM_H
#define TARGET_LONG_BITS 64
#define TARGET_PAGE_BITS 13
diff --git a/target/arm/cpu-param.h b/target/arm/cpu-param.h
index b59d505761cb8ee363493e0918f048f48a87fce0..68ffb12427848ced275dfc89dccea0cb1aa8c654 100644
--- a/target/arm/cpu-param.h
+++ b/target/arm/cpu-param.h
@@ -6,7 +6,7 @@
*/
#ifndef ARM_CPU_PARAM_H
-#define ARM_CPU_PARAM_H 1
+#define ARM_CPU_PARAM_H
#ifdef TARGET_AARCH64
# define TARGET_LONG_BITS 64
diff --git a/target/arm/translate-a32.h b/target/arm/translate-a32.h
index 09010ad2dada74bec036e3a8a7764de43404b25c..78a84c14144218a06ad09b58ae06a582f26dfc68 100644
--- a/target/arm/translate-a32.h
+++ b/target/arm/translate-a32.h
@@ -17,8 +17,8 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef TARGET_ARM_TRANSLATE_A64_H
-#define TARGET_ARM_TRANSLATE_A64_H
+#ifndef TARGET_ARM_TRANSLATE_A32_H
+#define TARGET_ARM_TRANSLATE_A32_H
/* Prototypes for autogenerated disassembler functions */
bool disas_m_nocp(DisasContext *dc, uint32_t insn);
diff --git a/target/arm/vec_internal.h b/target/arm/vec_internal.h
index fb43a2380e21436988df0ec26782e784a9e9ac07..1d63402042f58faf722fcc367bc4ea0b996f9061 100644
--- a/target/arm/vec_internal.h
+++ b/target/arm/vec_internal.h
@@ -17,8 +17,8 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef TARGET_ARM_VEC_INTERNALS_H
-#define TARGET_ARM_VEC_INTERNALS_H
+#ifndef TARGET_ARM_VEC_INTERNAL_H
+#define TARGET_ARM_VEC_INTERNAL_H
/*
* Note that vector data is stored in host-endian 64-bit chunks,
@@ -217,4 +217,4 @@ uint64_t pmull_h(uint64_t op1, uint64_t op2);
*/
uint64_t pmull_w(uint64_t op1, uint64_t op2);
-#endif /* TARGET_ARM_VEC_INTERNALS_H */
+#endif /* TARGET_ARM_VEC_INTERNAL_H */
diff --git a/target/avr/cpu-qom.h b/target/avr/cpu-qom.h
index 32a1c762e6474dd0b41c5ffef1425021465d0a33..b5c3507d6d73e1146e3fdbb07ec4df9eb5c96c5c 100644
--- a/target/avr/cpu-qom.h
+++ b/target/avr/cpu-qom.h
@@ -18,8 +18,8 @@
* <http://www.gnu.org/licenses/lgpl-2.1.html>
*/
-#ifndef QEMU_AVR_QOM_H
-#define QEMU_AVR_QOM_H
+#ifndef TARGET_AVR_CPU_QOM_H
+#define TARGET_AVR_CPU_QOM_H
#include "hw/core/cpu.h"
#include "qom/object.h"
@@ -44,4 +44,4 @@ struct AVRCPUClass {
};
-#endif /* !defined (QEMU_AVR_CPU_QOM_H) */
+#endif /* TARGET_AVR_CPU_QOM_H */
diff --git a/target/avr/cpu.h b/target/avr/cpu.h
index 55497f851dc8784e194043ce246ef52dcc0090c5..d304f33301b02326e4d24e4cd280df8eb2e38503 100644
--- a/target/avr/cpu.h
+++ b/target/avr/cpu.h
@@ -247,4 +247,4 @@ bool avr_cpu_tlb_fill(CPUState *cs, vaddr address, int size,
#include "exec/cpu-all.h"
-#endif /* !defined (QEMU_AVR_CPU_H) */
+#endif /* QEMU_AVR_CPU_H */
diff --git a/target/cris/cpu-param.h b/target/cris/cpu-param.h
index 36a30587612608da3b9806f2e09bf7ec6c237270..12ec22d8df15da95e182db87890d0ec54c7d86c3 100644
--- a/target/cris/cpu-param.h
+++ b/target/cris/cpu-param.h
@@ -6,7 +6,7 @@
*/
#ifndef CRIS_CPU_PARAM_H
-#define CRIS_CPU_PARAM_H 1
+#define CRIS_CPU_PARAM_H
#define TARGET_LONG_BITS 32
#define TARGET_PAGE_BITS 13
diff --git a/target/hexagon/attribs.h b/target/hexagon/attribs.h
index 54576f4143b6bea16808da80ad3af9169f1aa18b..d51bb4f7325cb04647578889663578eec1912ce5 100644
--- a/target/hexagon/attribs.h
+++ b/target/hexagon/attribs.h
@@ -32,4 +32,4 @@ extern DECLARE_BITMAP(opcode_attribs[XX_LAST_OPCODE], A_ZZ_LASTATTRIB);
#define GET_ATTRIB(opcode, attrib) \
test_bit(attrib, opcode_attribs[opcode])
-#endif /* ATTRIBS_H */
+#endif /* HEXAGON_ATTRIBS_H */
diff --git a/target/hexagon/hex_arch_types.h b/target/hexagon/hex_arch_types.h
index 78ad607f538528a6938b9e9cb33bca4fe1816a0b..885f68f76054e53829387bc5dd87913a4707caec 100644
--- a/target/hexagon/hex_arch_types.h
+++ b/target/hexagon/hex_arch_types.h
@@ -15,8 +15,8 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef HEXAGON_ARCH_TYPES_H
-#define HEXAGON_ARCH_TYPES_H
+#ifndef HEXAGON_HEX_ARCH_TYPES_H
+#define HEXAGON_HEX_ARCH_TYPES_H
#include "qemu/osdep.h"
#include "mmvec/mmvec.h"
diff --git a/target/hexagon/hex_regs.h b/target/hexagon/hex_regs.h
index e1b3149b074e6e5fb8867633ae4fe595e14c76ac..a63c2c0fd548e833409d10bd436fe2c876fbb449 100644
--- a/target/hexagon/hex_regs.h
+++ b/target/hexagon/hex_regs.h
@@ -15,8 +15,8 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef HEXAGON_REGS_H
-#define HEXAGON_REGS_H
+#ifndef HEXAGON_HEX_REGS_H
+#define HEXAGON_HEX_REGS_H
enum {
HEX_REG_R00 = 0,
diff --git a/target/hppa/cpu-param.h b/target/hppa/cpu-param.h
index a97d1428dff4f659bbbecc89c7ad13695fa8efec..a48a2701ae4757b0a90e2187fe9a4c23dde13cdd 100644
--- a/target/hppa/cpu-param.h
+++ b/target/hppa/cpu-param.h
@@ -6,7 +6,7 @@
*/
#ifndef HPPA_CPU_PARAM_H
-#define HPPA_CPU_PARAM_H 1
+#define HPPA_CPU_PARAM_H
#ifdef TARGET_HPPA64
# define TARGET_LONG_BITS 64
diff --git a/target/i386/cpu-param.h b/target/i386/cpu-param.h
index 57abc64c0d888c733f3aeeaffdef452c9d2e8e9b..9740bd7abdb6fb561eea35f35cd522e1b08e1601 100644
--- a/target/i386/cpu-param.h
+++ b/target/i386/cpu-param.h
@@ -6,7 +6,7 @@
*/
#ifndef I386_CPU_PARAM_H
-#define I386_CPU_PARAM_H 1
+#define I386_CPU_PARAM_H
#ifdef TARGET_X86_64
# define TARGET_LONG_BITS 64
diff --git a/target/i386/hax/hax-accel-ops.h b/target/i386/hax/hax-accel-ops.h
index c7698519cd5e6f3489d7c091bbc8d9236f7d8ecd..9e357e7b4042a752efdbc59c8783d619302dc3a9 100644
--- a/target/i386/hax/hax-accel-ops.h
+++ b/target/i386/hax/hax-accel-ops.h
@@ -7,8 +7,8 @@
* See the COPYING file in the top-level directory.
*/
-#ifndef HAX_CPUS_H
-#define HAX_CPUS_H
+#ifndef TARGET_I386_HAX_ACCEL_OPS_H
+#define TARGET_I386_HAX_ACCEL_OPS_H
#include "sysemu/cpus.h"
@@ -28,4 +28,4 @@ int hax_vcpu_destroy(CPUState *cpu);
void hax_raise_event(CPUState *cpu);
void hax_reset_vcpu_state(void *opaque);
-#endif /* HAX_CPUS_H */
+#endif /* TARGET_I386_HAX_ACCEL_OPS_H */
diff --git a/target/i386/nvmm/nvmm-accel-ops.h b/target/i386/nvmm/nvmm-accel-ops.h
index 43e24adcaf98609672caaec0e1aafa9d4f23e4b7..7c5461bd759908133e0f4cd1d0d79b7b971cd90d 100644
--- a/target/i386/nvmm/nvmm-accel-ops.h
+++ b/target/i386/nvmm/nvmm-accel-ops.h
@@ -7,8 +7,8 @@
* See the COPYING file in the top-level directory.
*/
-#ifndef NVMM_CPUS_H
-#define NVMM_CPUS_H
+#ifndef TARGET_I386_NVMM_ACCEL_OPS_H
+#define TARGET_I386_NVMM_ACCEL_OPS_H
#include "sysemu/cpus.h"
@@ -21,4 +21,4 @@ void nvmm_cpu_synchronize_post_reset(CPUState *cpu);
void nvmm_cpu_synchronize_post_init(CPUState *cpu);
void nvmm_cpu_synchronize_pre_loadvm(CPUState *cpu);
-#endif /* NVMM_CPUS_H */
+#endif /* TARGET_I386_NVMM_ACCEL_OPS_H */
diff --git a/target/i386/sev.h b/target/i386/sev.h
index 83e82aa42c412c2ede0afca1dbb5d30ce7affc4e..7b1528248a5400d0983b340a5a99d6d48edfe2e9 100644
--- a/target/i386/sev.h
+++ b/target/i386/sev.h
@@ -11,8 +11,8 @@
*
*/
-#ifndef QEMU_SEV_I386_H
-#define QEMU_SEV_I386_H
+#ifndef I386_SEV_H
+#define I386_SEV_H
#ifndef CONFIG_USER_ONLY
#include CONFIG_DEVICES /* CONFIG_SEV */
diff --git a/target/i386/whpx/whpx-accel-ops.h b/target/i386/whpx/whpx-accel-ops.h
index b5102dd1ee8c202b5a3516684f4fd728d0315969..7a1bb1ab5753c71e7a4ff4317f1660f7fc3f4a41 100644
--- a/target/i386/whpx/whpx-accel-ops.h
+++ b/target/i386/whpx/whpx-accel-ops.h
@@ -7,8 +7,8 @@
* See the COPYING file in the top-level directory.
*/
-#ifndef WHPX_CPUS_H
-#define WHPX_CPUS_H
+#ifndef TARGET_I386_WHPX_ACCEL_OPS_H
+#define TARGET_I386_WHPX_ACCEL_OPS_H
#include "sysemu/cpus.h"
@@ -30,4 +30,4 @@ void whpx_cpu_synchronize_pre_resume(bool step_pending);
/* full state set, modified during initialization or on vmload */
#define WHPX_SET_FULL_STATE 3
-#endif /* WHPX_CPUS_H */
+#endif /* TARGET_I386_WHPX_ACCEL_OPS_H */
diff --git a/target/i386/whpx/whpx-internal.h b/target/i386/whpx/whpx-internal.h
index dbb7e7ba82222ed90638c55f129fb523dac7a5bc..06429d8ccd4c26b69eab60f4c974e3c6060ba445 100644
--- a/target/i386/whpx/whpx-internal.h
+++ b/target/i386/whpx/whpx-internal.h
@@ -1,5 +1,5 @@
-#ifndef WHP_INTERNAL_H
-#define WHP_INTERNAL_H
+#ifndef TARGET_I386_WHPX_INTERNAL_H
+#define TARGET_I386_WHPX_INTERNAL_H
#include <windows.h>
#include <WinHvPlatform.h>
@@ -116,4 +116,4 @@ typedef enum WHPFunctionList {
WINHV_PLATFORM_FNS_SUPPLEMENTAL
} WHPFunctionList;
-#endif /* WHP_INTERNAL_H */
+#endif /* TARGET_I386_WHPX_INTERNAL_H */
diff --git a/target/m68k/cpu-param.h b/target/m68k/cpu-param.h
index 06556dfbf3ee598f25a3bdcc848b201454fc1026..44a8d193f0b89dc979c186a14f23f35183af995e 100644
--- a/target/m68k/cpu-param.h
+++ b/target/m68k/cpu-param.h
@@ -6,7 +6,7 @@
*/
#ifndef M68K_CPU_PARAM_H
-#define M68K_CPU_PARAM_H 1
+#define M68K_CPU_PARAM_H
#define TARGET_LONG_BITS 32
/*
diff --git a/target/microblaze/cpu-param.h b/target/microblaze/cpu-param.h
index 4d8297fa94075be944637debb0f0f87fa71366b7..5e54ea010818ed7005d53dd2912b742b9dc022b0 100644
--- a/target/microblaze/cpu-param.h
+++ b/target/microblaze/cpu-param.h
@@ -6,7 +6,7 @@
*/
#ifndef MICROBLAZE_CPU_PARAM_H
-#define MICROBLAZE_CPU_PARAM_H 1
+#define MICROBLAZE_CPU_PARAM_H
/*
* While system mode can address up to 64 bits of address space,
diff --git a/target/mips/cpu-param.h b/target/mips/cpu-param.h
index 1aebd01df9c261b49f79952f32efe0bb5ccdf76a..f4c76994ea4be0ae1643c4db1f5273f8f6423650 100644
--- a/target/mips/cpu-param.h
+++ b/target/mips/cpu-param.h
@@ -5,7 +5,7 @@
*/
#ifndef MIPS_CPU_PARAM_H
-#define MIPS_CPU_PARAM_H 1
+#define MIPS_CPU_PARAM_H
#ifdef TARGET_MIPS64
# define TARGET_LONG_BITS 64
diff --git a/target/nios2/cpu-param.h b/target/nios2/cpu-param.h
index 38bedbfd617d23888ccdb38b9b7826dc81bb29b7..177d7208644664ac781996e5320b9118453b9685 100644
--- a/target/nios2/cpu-param.h
+++ b/target/nios2/cpu-param.h
@@ -6,7 +6,7 @@
*/
#ifndef NIOS2_CPU_PARAM_H
-#define NIOS2_CPU_PARAM_H 1
+#define NIOS2_CPU_PARAM_H
#define TARGET_LONG_BITS 32
#define TARGET_PAGE_BITS 12
diff --git a/target/openrisc/cpu-param.h b/target/openrisc/cpu-param.h
index 06ee64d1712c06943e5a6f61abc2311ffb5c9b5d..73be699f361b4a7a4a45de026d6b4a8c57043419 100644
--- a/target/openrisc/cpu-param.h
+++ b/target/openrisc/cpu-param.h
@@ -6,7 +6,7 @@
*/
#ifndef OPENRISC_CPU_PARAM_H
-#define OPENRISC_CPU_PARAM_H 1
+#define OPENRISC_CPU_PARAM_H
#define TARGET_LONG_BITS 32
#define TARGET_PAGE_BITS 13
diff --git a/target/ppc/cpu-param.h b/target/ppc/cpu-param.h
index 37b458d33d45bb6b35e44612bc9ed62700a81ce1..ea377b7d06449310de3df00ec01f268efa964928 100644
--- a/target/ppc/cpu-param.h
+++ b/target/ppc/cpu-param.h
@@ -6,7 +6,7 @@
*/
#ifndef PPC_CPU_PARAM_H
-#define PPC_CPU_PARAM_H 1
+#define PPC_CPU_PARAM_H
#ifdef TARGET_PPC64
# define TARGET_LONG_BITS 64
diff --git a/target/ppc/power8-pmu.h b/target/ppc/power8-pmu.h
index 256d90f523c9985c8c057a5992ca137cbdcb7b90..9692dd765e114cb08a49724f962f4a0d741da665 100644
--- a/target/ppc/power8-pmu.h
+++ b/target/ppc/power8-pmu.h
@@ -10,8 +10,8 @@
* See the COPYING file in the top-level directory.
*/
-#ifndef POWER8_PMU
-#define POWER8_PMU
+#ifndef POWER8_PMU_H
+#define POWER8_PMU_H
#if defined(TARGET_PPC64) && !defined(CONFIG_USER_ONLY)
void cpu_ppc_pmu_init(CPUPPCState *env);
diff --git a/target/riscv/cpu-param.h b/target/riscv/cpu-param.h
index 80eb615f93f49f3870559c691dfcb5a795610c82..ebaf26d26ddc1aeed66d7e64549aa0740db30fb4 100644
--- a/target/riscv/cpu-param.h
+++ b/target/riscv/cpu-param.h
@@ -6,7 +6,7 @@
*/
#ifndef RISCV_CPU_PARAM_H
-#define RISCV_CPU_PARAM_H 1
+#define RISCV_CPU_PARAM_H
#if defined(TARGET_RISCV64)
# define TARGET_LONG_BITS 64
diff --git a/target/riscv/sbi_ecall_interface.h b/target/riscv/sbi_ecall_interface.h
index fb1a3fa8f23f47be34560ce10d2aca13e7b420c9..77574ed4cb6df30472fb0ebd76cadf91eda01156 100644
--- a/target/riscv/sbi_ecall_interface.h
+++ b/target/riscv/sbi_ecall_interface.h
@@ -7,8 +7,8 @@
* Anup Patel <anup.patel@wdc.com>
*/
-#ifndef __SBI_ECALL_INTERFACE_H__
-#define __SBI_ECALL_INTERFACE_H__
+#ifndef SBI_ECALL_INTERFACE_H
+#define SBI_ECALL_INTERFACE_H
/* clang-format off */
diff --git a/target/s390x/cpu-param.h b/target/s390x/cpu-param.h
index 472db648d78058d14f678c3f74957b27957419c4..bf951a002e08dd03d4c038b0ac9dcb8adcbcf16c 100644
--- a/target/s390x/cpu-param.h
+++ b/target/s390x/cpu-param.h
@@ -6,7 +6,7 @@
*/
#ifndef S390_CPU_PARAM_H
-#define S390_CPU_PARAM_H 1
+#define S390_CPU_PARAM_H
#define TARGET_LONG_BITS 64
#define TARGET_PAGE_BITS 12
diff --git a/target/sh4/cpu-param.h b/target/sh4/cpu-param.h
index 81ace3503bc9ddd41e64871a61342f7f7a77e59d..98a02509bbbec8e1c0b7dbc03c872339692b23f2 100644
--- a/target/sh4/cpu-param.h
+++ b/target/sh4/cpu-param.h
@@ -6,7 +6,7 @@
*/
#ifndef SH4_CPU_PARAM_H
-#define SH4_CPU_PARAM_H 1
+#define SH4_CPU_PARAM_H
#define TARGET_LONG_BITS 32
#define TARGET_PAGE_BITS 12 /* 4k */
diff --git a/target/sparc/cpu-param.h b/target/sparc/cpu-param.h
index 4746d89411585c2164fa93d9d1940b2a77bfc642..72ddc4a34f09c8f3f6322a3cbe14886d18b6116c 100644
--- a/target/sparc/cpu-param.h
+++ b/target/sparc/cpu-param.h
@@ -5,7 +5,7 @@
*/
#ifndef SPARC_CPU_PARAM_H
-#define SPARC_CPU_PARAM_H 1
+#define SPARC_CPU_PARAM_H
#ifdef TARGET_SPARC64
# define TARGET_LONG_BITS 64
diff --git a/target/tricore/cpu-param.h b/target/tricore/cpu-param.h
index cf5d9af89d3faaa11bbfe6e421263d410b501036..27279130479f8c019b9bf2d1daa038bced7293c3 100644
--- a/target/tricore/cpu-param.h
+++ b/target/tricore/cpu-param.h
@@ -6,7 +6,7 @@
*/
#ifndef TRICORE_CPU_PARAM_H
-#define TRICORE_CPU_PARAM_H 1
+#define TRICORE_CPU_PARAM_H
#define TARGET_LONG_BITS 32
#define TARGET_PAGE_BITS 14
diff --git a/target/xtensa/core-de233_fpu/core-isa.h b/target/xtensa/core-de233_fpu/core-isa.h
index f125619e8de594b0fbcb398ae18b486eaa0ad8a8..40543b2c5e59e400bd05aebbbccf6cea14bb4c21 100644
--- a/target/xtensa/core-de233_fpu/core-isa.h
+++ b/target/xtensa/core-de233_fpu/core-isa.h
@@ -28,8 +28,8 @@
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
-#ifndef XTENSA_CORE_CONFIGURATION_H_
-#define XTENSA_CORE_CONFIGURATION_H_
+#ifndef XTENSA_CORE_DE233_FPU_CORE_ISA_H
+#define XTENSA_CORE_DE233_FPU_CORE_ISA_H
//depot/dev/Homewood/Xtensa/SWConfig/hal/core-common.h.tph#24 - edit change 444323 (text+ko)
@@ -723,5 +723,4 @@
#endif /* !XTENSA_HAL_NON_PRIVILEGED_ONLY */
-#endif /* XTENSA_CORE_CONFIGURATION_H_ */
-
+#endif /* XTENSA_CORE_DE233_FPU_CORE_ISA_H */
diff --git a/target/xtensa/core-de233_fpu/core-matmap.h b/target/xtensa/core-de233_fpu/core-matmap.h
index cca51c7af1b50b5915fda3ab8320e355cd139843..e99e7d31233131fddf401c00b8cba9ee2638c04f 100644
--- a/target/xtensa/core-de233_fpu/core-matmap.h
+++ b/target/xtensa/core-de233_fpu/core-matmap.h
@@ -43,11 +43,9 @@
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
-
#ifndef XTENSA_CONFIG_CORE_MATMAP_H
#define XTENSA_CONFIG_CORE_MATMAP_H
-
/*----------------------------------------------------------------------
CACHE (MEMORY ACCESS) ATTRIBUTES
----------------------------------------------------------------------*/
@@ -713,5 +711,5 @@
-#endif /*XTENSA_CONFIG_CORE_MATMAP_H*/
+#endif /* XTENSA_CONFIG_CORE_MATMAP_H */
diff --git a/target/xtensa/core-dsp3400/core-isa.h b/target/xtensa/core-dsp3400/core-isa.h
index 336b2467c6ac8c18bdbbd29f725c394f71b77dab..1499ef291400aba1e43ee0f8d175aa945f4e3de3 100644
--- a/target/xtensa/core-dsp3400/core-isa.h
+++ b/target/xtensa/core-dsp3400/core-isa.h
@@ -28,9 +28,8 @@
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
-#ifndef _XTENSA_CORE_CONFIGURATION_H
-#define _XTENSA_CORE_CONFIGURATION_H
-
+#ifndef XTENSA_CORE_DSP3400_CORE_ISA_H
+#define XTENSA_CORE_DSP3400_CORE_ISA_H
/****************************************************************************
Parameters Useful for Any Code, USER or PRIVILEGED
@@ -448,5 +447,4 @@
#endif /* !XTENSA_HAL_NON_PRIVILEGED_ONLY */
-#endif /* _XTENSA_CORE_CONFIGURATION_H */
-
+#endif /* XTENSA_CORE_DSP3400_CORE_ISA_H */
diff --git a/target/xtensa/core-dsp3400/core-matmap.h b/target/xtensa/core-dsp3400/core-matmap.h
index 8d1aa8336ec68b847c03526250ba85cf1665e114..692012f9f4a0ed37bbcd9700de42ca40d61ebb34 100644
--- a/target/xtensa/core-dsp3400/core-matmap.h
+++ b/target/xtensa/core-dsp3400/core-matmap.h
@@ -43,11 +43,9 @@
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
-
#ifndef XTENSA_CONFIG_CORE_MATMAP_H
#define XTENSA_CONFIG_CORE_MATMAP_H
-
/*----------------------------------------------------------------------
CACHE (MEMORY ACCESS) ATTRIBUTES
----------------------------------------------------------------------*/
@@ -308,5 +306,5 @@
-#endif /*XTENSA_CONFIG_CORE_MATMAP_H*/
+#endif /* XTENSA_CONFIG_CORE_MATMAP_H */
diff --git a/target/xtensa/cpu-param.h b/target/xtensa/cpu-param.h
index 4fde21b941b8d260cc2bf4c44c45a76fe07bf779..b53e9a3e08198b62ea820eda8b87b24d204058f9 100644
--- a/target/xtensa/cpu-param.h
+++ b/target/xtensa/cpu-param.h
@@ -6,7 +6,7 @@
*/
#ifndef XTENSA_CPU_PARAM_H
-#define XTENSA_CPU_PARAM_H 1
+#define XTENSA_CPU_PARAM_H
#define TARGET_LONG_BITS 32
#define TARGET_PAGE_BITS 12
diff --git a/tcg/tcg-internal.h b/tcg/tcg-internal.h
index 92c91dcde97bd0eb05cf4b41b62a2e5d2a561227..cc82088d52d6e2f2c4fb488bff81472baeb2681a 100644
--- a/tcg/tcg-internal.h
+++ b/tcg/tcg-internal.h
@@ -23,7 +23,7 @@
*/
#ifndef TCG_INTERNAL_H
-#define TCG_INTERNAL_H 1
+#define TCG_INTERNAL_H
#define TCG_HIGHWATER 1024
diff --git a/tests/qtest/fuzz/fuzz.h b/tests/qtest/fuzz/fuzz.h
index c5f0b7227a100d02f03fab269f6a1b1b7781730b..327c1c5a55b2881e3fb6fc534ec15ef9bdde304d 100644
--- a/tests/qtest/fuzz/fuzz.h
+++ b/tests/qtest/fuzz/fuzz.h
@@ -11,8 +11,8 @@
*
*/
-#ifndef FUZZER_H_
-#define FUZZER_H_
+#ifndef QTEST_FUZZ_H
+#define QTEST_FUZZ_H
#include "qemu/units.h"
#include "qapi/error.h"
@@ -122,4 +122,3 @@ int LLVMFuzzerTestOneInput(const unsigned char *Data, size_t Size);
int LLVMFuzzerInitialize(int *argc, char ***argv, char ***envp);
#endif
-
diff --git a/tests/qtest/libqmp.h b/tests/qtest/libqmp.h
index 94aa97328a1747eefca762b0394287119173ef3a..5cb7eeaa18b9838c717cf146a4d2e75a0d5e789b 100644
--- a/tests/qtest/libqmp.h
+++ b/tests/qtest/libqmp.h
@@ -14,8 +14,9 @@
* See the COPYING file in the top-level directory.
*
*/
-#ifndef LIBQMP_H_
-#define LIBQMP_H_
+
+#ifndef LIBQMP_H
+#define LIBQMP_H
#include "qapi/qmp/qdict.h"
@@ -47,4 +48,4 @@ bool qmp_rsp_is_err(QDict *rsp);
*/
void qmp_expect_error_and_unref(QDict *rsp, const char *class);
-#endif /* LIBQMP_H_ */
+#endif /* LIBQMP_H */
diff --git a/tests/qtest/migration-helpers.h b/tests/qtest/migration-helpers.h
index c7872e84421f0371a29aa1727ac9416d7295f8a6..2731399aaa884efa898e87ef18c078c719f4495a 100644
--- a/tests/qtest/migration-helpers.h
+++ b/tests/qtest/migration-helpers.h
@@ -9,8 +9,9 @@
* See the COPYING file in the top-level directory.
*
*/
-#ifndef MIGRATION_HELPERS_H_
-#define MIGRATION_HELPERS_H_
+
+#ifndef MIGRATION_HELPERS_H
+#define MIGRATION_HELPERS_H
#include "libqtest.h"
@@ -34,4 +35,4 @@ void wait_for_migration_complete(QTestState *who);
void wait_for_migration_fail(QTestState *from, bool allow_active);
-#endif /* MIGRATION_HELPERS_H_ */
+#endif /* MIGRATION_HELPERS_H */
diff --git a/tools/virtiofsd/passthrough_seccomp.h b/tools/virtiofsd/passthrough_seccomp.h
index a3ab073f08fab7ba8ac04353532dda20e8bf5483..12674fc05030a1ec2af28c5a048d279cb7b1196a 100644
--- a/tools/virtiofsd/passthrough_seccomp.h
+++ b/tools/virtiofsd/passthrough_seccomp.h
@@ -6,10 +6,9 @@
* SPDX-License-Identifier: GPL-2.0-or-later
*/
-#ifndef VIRTIOFSD_SECCOMP_H
-#define VIRTIOFSD_SECCOMP_H
-
+#ifndef VIRTIOFSD_PASSTHROUGH_SECCOMP_H
+#define VIRTIOFSD_PASSTHROUGH_SECCOMP_H
void setup_seccomp(bool enable_syslog);
-#endif /* VIRTIOFSD_SECCOMP_H */
+#endif /* VIRTIOFSD_PASSTHROUGH_SECCOMP_H */
diff --git a/ui/dbus.h b/ui/dbus.h
index 5f5c1f759c9b07241651c8a64ba89fb60554bc26..c001c11f70bafc0edeae9fa16fc6fd617cc22139 100644
--- a/ui/dbus.h
+++ b/ui/dbus.h
@@ -21,8 +21,9 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
-#ifndef UI_DBUS_H_
-#define UI_DBUS_H_
+
+#ifndef UI_DBUS_H
+#define UI_DBUS_H
#include "chardev/char-socket.h"
#include "qemu/dbus.h"
@@ -144,4 +145,4 @@ void dbus_chardev_init(DBusDisplay *dpy);
void dbus_clipboard_init(DBusDisplay *dpy);
-#endif /* UI_DBUS_H_ */
+#endif /* UI_DBUS_H */