Clean up header guards again
Subsystems (11)
cover Clean up header guards again
Our use of header guards is rather sloppy. Sloppiness there can lead to confusing compilation errors. This series cleans up existing header guards. In particular, it normalizes guard symbols to follow a common pattern, in the hope of making clashes less likely. It doesn't add new header guards. We have more than 250 headers without a recognizable header guard. A few of them are for multiple inclusion, a few more don't need header guards because they don't do anything but include, but the majority probably should have one. Left for another day.
Previously cleaned up in merge commit 01807c8b0e9 (2019) and merge commit ca3d87d4c84 (2016).
Markus Armbruster (4):
Clean up header guards that don't match their file name Clean up ill-advised or unusual header guards Normalize header guard symbol definition
Clean up decorations and whitespace around header guards
accel/tcg/tcg-accel-ops-icount.h | 6 +++--- accel/tcg/tcg-accel-ops-mttcg.h | 6 +++--- accel/tcg/tcg-accel-ops-rr.h | 6 +++--- accel/tcg/tcg-accel-ops.h | 6 +++--- block/copy-on-read.h | 6 +++--- block/coroutines.h | 6 +++--- bsd-user/arm/target.h | 2 +- bsd-user/arm/target_arch.h | 6 +++--- bsd-user/arm/target_arch_cpu.h | 6 +++--- bsd-user/arm/target_arch_elf.h | 7 ++++--- bsd-user/arm/target_arch_reg.h | 6 +++--- bsd-user/arm/target_arch_signal.h | 7 ++++--- bsd-user/arm/target_arch_sigtramp.h | 6 +++--- bsd-user/arm/target_arch_sysarch.h | 6 +++--- bsd-user/arm/target_arch_thread.h | 7 ++++--- bsd-user/arm/target_arch_vmparam.h | 7 ++++--- bsd-user/arm/target_syscall.h | 6 +++--- bsd-user/bsd-file.h | 6 +++--- bsd-user/errno_defs.h | 6 +++--- bsd-user/freebsd/host-os.h | 6 +++--- bsd-user/freebsd/target_os_elf.h | 7 ++++--- bsd-user/freebsd/target_os_siginfo.h | 7 ++++--- bsd-user/freebsd/target_os_signal.h | 6 +++--- bsd-user/freebsd/target_os_stack.h | 6 +++--- bsd-user/freebsd/target_os_thread.h | 6 +++--- bsd-user/freebsd/target_os_user.h | 6 +++--- bsd-user/freebsd/target_os_vmparam.h | 7 ++++--- bsd-user/i386/target.h | 7 +++---- bsd-user/i386/target_arch.h | 6 +++--- bsd-user/i386/target_arch_cpu.h | 6 +++--- bsd-user/i386/target_arch_elf.h | 7 ++++--- bsd-user/i386/target_arch_reg.h | 6 +++--- bsd-user/i386/target_arch_sigtramp.h | 6 +++--- bsd-user/i386/target_arch_sysarch.h | 6 +++--- bsd-user/i386/target_arch_thread.h | 7 ++++--- bsd-user/i386/target_arch_vmparam.h | 7 ++++--- bsd-user/netbsd/host-os.h | 6 +++--- bsd-user/netbsd/target_os_elf.h | 7 ++++--- bsd-user/netbsd/target_os_siginfo.h | 6 +++--- bsd-user/netbsd/target_os_signal.h | 6 +++--- bsd-user/netbsd/target_os_stack.h | 6 +++--- bsd-user/netbsd/target_os_thread.h | 6 +++--- bsd-user/openbsd/host-os.h | 6 +++--- bsd-user/openbsd/target_os_elf.h | 7 ++++--- bsd-user/openbsd/target_os_siginfo.h | 6 +++--- bsd-user/openbsd/target_os_signal.h | 6 +++--- bsd-user/openbsd/target_os_stack.h | 6 +++--- bsd-user/openbsd/target_os_thread.h | 6 +++--- bsd-user/syscall_defs.h | 6 +++--- bsd-user/x86_64/target.h | 2 +- bsd-user/x86_64/target_arch.h | 6 +++--- bsd-user/x86_64/target_arch_cpu.h | 6 +++--- bsd-user/x86_64/target_arch_elf.h | 7 ++++--- bsd-user/x86_64/target_arch_reg.h | 6 +++--- bsd-user/x86_64/target_arch_signal.h | 7 ++++--- bsd-user/x86_64/target_arch_sigtramp.h | 6 +++--- bsd-user/x86_64/target_arch_sysarch.h | 6 +++--- bsd-user/x86_64/target_arch_thread.h | 7 ++++--- bsd-user/x86_64/target_arch_vmparam.h | 7 ++++--- chardev/chardev-internal.h | 3 ++- crypto/ivgen-plain.h | 6 +++--- ebpf/rss.bpf.skeleton.h | 7 ++++--- hw/i386/e820_memory_layout.h | 4 ++-- hw/net/can/ctu_can_fd_frame.h | 4 ++-- hw/net/can/ctu_can_fd_regs.h | 4 ++-- hw/nvme/nvme.h | 6 +++--- hw/usb/hcd-dwc2.h | 4 ++-- include/block/block-hmp-cmds.h | 4 ++-- include/block/block_int-global-state.h | 3 ++- include/chardev/char-socket.h | 7 ++++--- include/crypto/tls-cipher-suites.h | 6 +++--- include/exec/memopidx.h | 2 +- include/exec/translator.h | 2 +- include/fpu/softfloat-helpers.h | 2 +- include/hw/acpi/generic_event_device.h | 4 ++-- include/hw/gpio/aspeed_gpio.h | 2 +- include/hw/i2c/arm_sbcon_i2c.h | 7 ++++--- include/hw/i2c/i2c_mux_pca954x.h | 4 ++-- include/hw/input/lm832x.h | 4 ++-- include/hw/intc/exynos4210_combiner.h | 4 ++-- include/hw/intc/nios2_vic.h | 6 +++--- include/hw/intc/rx_icu.h | 2 +- include/hw/misc/aspeed_hace.h | 2 +- include/hw/misc/aspeed_lpc.h | 2 +- include/hw/misc/aspeed_sbc.h | 2 +- include/hw/misc/bcm2835_cprman.h | 4 ++-- include/hw/misc/bcm2835_cprman_internals.h | 4 ++-- include/hw/misc/stm32f4xx_exti.h | 4 ++-- include/hw/misc/stm32f4xx_syscfg.h | 4 ++-- include/hw/misc/xlnx-versal-pmc-iou-slcr.h | 6 +++--- include/hw/net/allwinner-sun8i-emac.h | 2 +- include/hw/net/mv88w8618_eth.h | 5 +++-- include/hw/nubus/mac-nubus-bridge.h | 4 ++-- include/hw/pci-host/remote.h | 4 ++-- include/hw/ppc/pnv_pnor.h | 8 +++++--- include/hw/riscv/boot_opensbi.h | 5 +++-- include/hw/riscv/shakti_c.h | 4 ++-- include/hw/rtc/m48t59.h | 2 +- include/hw/rtc/mc146818rtc.h | 2 +- include/hw/rtc/sun4v-rtc.h | 4 ++-- include/hw/rtc/xlnx-zynqmp-rtc.h | 4 ++-- include/hw/rx/rx62n.h | 4 ++-- include/hw/s390x/s390-pci-clp.h | 4 ++-- include/hw/sensor/emc141x_regs.h | 4 ++-- include/hw/ssi/xlnx-versal-ospi.h | 6 +++--- include/hw/timer/bcm2835_systmr.h | 4 ++-- include/hw/tricore/tc27x_soc.h | 4 ++-- include/hw/tricore/tricore_testdevice.h | 5 ++--- include/hw/usb/dwc2-regs.h | 6 +++--- include/hw/usb/hcd-musb.h | 4 ++-- include/hw/usb/xlnx-usb-subsystem.h | 4 ++-- include/hw/usb/xlnx-versal-usb2-ctrl-regs.h | 4 ++-- include/hw/virtio/vhost-user-fs.h | 6 +++--- include/hw/virtio/vhost-user-i2c.h | 6 +++--- include/hw/virtio/vhost-user-rng.h | 6 +++--- include/hw/virtio/vhost-user-vsock.h | 6 +++--- include/hw/virtio/vhost-vsock-common.h | 6 +++--- include/hw/watchdog/wdt_imx2.h | 6 +++--- include/qemu/cpu-float.h | 6 +++--- include/qemu/crc-ccitt.h | 6 +++--- include/qemu/help-texts.h | 4 ++-- include/qemu/keyval.h | 7 ++++--- include/qemu/plugin-memory.h | 2 +- include/qemu/qemu-plugin.h | 7 ++++--- include/qemu/selfmap.h | 2 +- include/sysemu/block-backend-global-state.h | 6 +++--- include/tcg/tcg-ldst.h | 2 +- include/ui/dbus-display.h | 6 +++--- include/ui/dbus-module.h | 6 +++--- include/user/syscall-trace.h | 2 +- linux-user/hexagon/target_signal.h | 2 +- plugins/plugin.h | 6 +++--- target/alpha/cpu-param.h | 2 +- target/arm/cpu-param.h | 2 +- target/arm/translate-a32.h | 4 ++-- target/arm/vec_internal.h | 6 +++--- target/avr/cpu-qom.h | 6 +++--- target/avr/cpu.h | 2 +- target/cris/cpu-param.h | 2 +- target/hexagon/attribs.h | 2 +- target/hexagon/hex_arch_types.h | 4 ++-- target/hexagon/hex_regs.h | 4 ++-- target/hppa/cpu-param.h | 2 +- target/i386/cpu-param.h | 2 +- target/i386/hax/hax-accel-ops.h | 6 +++--- target/i386/nvmm/nvmm-accel-ops.h | 6 +++--- target/i386/sev.h | 4 ++-- target/i386/whpx/whpx-accel-ops.h | 6 +++--- target/i386/whpx/whpx-internal.h | 6 +++--- target/m68k/cpu-param.h | 2 +- target/microblaze/cpu-param.h | 2 +- target/mips/cpu-param.h | 2 +- target/nios2/cpu-param.h | 2 +- target/openrisc/cpu-param.h | 2 +- target/ppc/cpu-param.h | 2 +- target/ppc/power8-pmu.h | 4 ++-- target/riscv/cpu-param.h | 2 +- target/riscv/sbi_ecall_interface.h | 4 ++-- target/s390x/cpu-param.h | 2 +- target/sh4/cpu-param.h | 2 +- target/sparc/cpu-param.h | 2 +- target/tricore/cpu-param.h | 2 +- target/xtensa/core-de233_fpu/core-isa.h | 7 +++---- target/xtensa/core-de233_fpu/core-matmap.h | 4 +--- target/xtensa/core-dsp3400/core-isa.h | 8 +++----- target/xtensa/core-dsp3400/core-matmap.h | 4 +--- target/xtensa/cpu-param.h | 2 +- tcg/tcg-internal.h | 2 +- tests/qtest/fuzz/fuzz.h | 5 ++--- tests/qtest/libqmp.h | 7 ++++--- tests/qtest/migration-helpers.h | 7 ++++--- tools/virtiofsd/passthrough_seccomp.h | 7 +++---- ui/dbus.h | 7 ++++--- 173 files changed, 428 insertions(+), 409 deletions(-)
Signature · 1 line
2.35.1
PATCH 1/4 Clean up header guards that don't match their file name
Header guard symbols should match their file name to make guard collisions less likely.
Cleaned up with scripts/clean-header-guards.pl, followed by some renaming of new guard symbols picked by the script to better ones.
--- accel/tcg/tcg-accel-ops-icount.h | 6 +++--- accel/tcg/tcg-accel-ops-mttcg.h | 6 +++--- accel/tcg/tcg-accel-ops-rr.h | 6 +++--- accel/tcg/tcg-accel-ops.h | 6 +++--- block/coroutines.h | 6 +++--- bsd-user/arm/target_syscall.h | 6 +++--- bsd-user/i386/target.h | 7 +++---- bsd-user/i386/target_arch_sysarch.h | 6 +++--- bsd-user/x86_64/target_arch_sysarch.h | 6 +++--- ebpf/rss.bpf.skeleton.h | 7 ++++--- hw/i386/e820_memory_layout.h | 4 ++-- hw/net/can/ctu_can_fd_frame.h | 4 ++-- hw/net/can/ctu_can_fd_regs.h | 4 ++-- hw/nvme/nvme.h | 6 +++--- hw/usb/hcd-dwc2.h | 4 ++-- include/block/block-hmp-cmds.h | 4 ++-- include/crypto/tls-cipher-suites.h | 6 +++--- include/hw/acpi/generic_event_device.h | 4 ++-- include/hw/i2c/arm_sbcon_i2c.h | 7 ++++--- include/hw/misc/bcm2835_cprman.h | 4 ++-- include/hw/misc/bcm2835_cprman_internals.h | 4 ++-- include/hw/misc/stm32f4xx_exti.h | 4 ++-- include/hw/misc/stm32f4xx_syscfg.h | 4 ++-- include/hw/misc/xlnx-versal-pmc-iou-slcr.h | 6 +++--- include/hw/net/mv88w8618_eth.h | 5 +++-- include/hw/nubus/mac-nubus-bridge.h | 4 ++-- include/hw/pci-host/remote.h | 4 ++-- include/hw/riscv/boot_opensbi.h | 5 +++-- include/hw/riscv/shakti_c.h | 4 ++-- include/hw/rtc/sun4v-rtc.h | 4 ++-- include/hw/rtc/xlnx-zynqmp-rtc.h | 4 ++-- include/hw/rx/rx62n.h | 4 ++-- include/hw/sensor/emc141x_regs.h | 4 ++-- include/hw/ssi/xlnx-versal-ospi.h | 6 +++--- include/hw/timer/bcm2835_systmr.h | 4 ++-- include/hw/tricore/tricore_testdevice.h | 5 ++--- include/hw/usb/dwc2-regs.h | 6 +++--- include/hw/usb/hcd-musb.h | 4 ++-- include/hw/usb/xlnx-usb-subsystem.h | 4 ++-- include/hw/usb/xlnx-versal-usb2-ctrl-regs.h | 4 ++-- include/hw/watchdog/wdt_imx2.h | 6 +++--- include/qemu/help-texts.h | 4 ++-- include/qemu/qemu-plugin.h | 7 ++++--- include/sysemu/block-backend-global-state.h | 6 +++--- plugins/plugin.h | 6 +++--- target/arm/translate-a32.h | 4 ++-- target/arm/vec_internal.h | 6 +++--- target/avr/cpu-qom.h | 6 +++--- target/hexagon/hex_arch_types.h | 4 ++-- target/hexagon/hex_regs.h | 4 ++-- target/i386/hax/hax-accel-ops.h | 6 +++--- target/i386/nvmm/nvmm-accel-ops.h | 6 +++--- target/i386/sev.h | 4 ++-- target/i386/whpx/whpx-accel-ops.h | 6 +++--- target/i386/whpx/whpx-internal.h | 6 +++--- target/xtensa/core-de233_fpu/core-isa.h | 7 +++---- target/xtensa/core-dsp3400/core-isa.h | 8 +++----- tests/qtest/fuzz/fuzz.h | 5 ++--- tools/virtiofsd/passthrough_seccomp.h | 7 +++---- 59 files changed, 152 insertions(+), 154 deletions(-)
accel/tcg/tcg-accel-ops-icount.h +3 -3
@@ -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 */
accel/tcg/tcg-accel-ops-mttcg.h +3 -3
@@ -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 */
accel/tcg/tcg-accel-ops-rr.h +3 -3
@@ -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 */
accel/tcg/tcg-accel-ops.h +3 -3
@@ -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 */
block/coroutines.h +3 -3
@@ -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 */
bsd-user/arm/target_syscall.h +3 -3
@@ -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 */
bsd-user/i386/target.h +3 -4
@@ -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 */
bsd-user/i386/target_arch_sysarch.h +3 -3
@@ -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 */
bsd-user/x86_64/target_arch_sysarch.h +3 -3
@@ -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 */
ebpf/rss.bpf.skeleton.h +4 -3
@@ -1,8 +1,9 @@/* SPDX-License-Identifier: (LGPL-2.1 OR BSD-2-Clause) */ /* THIS FILE IS AUTOGENERATED! */ -#ifndef __RSS_BPF_SKEL_H__ -#define __RSS_BPF_SKEL_H__ + +#ifndef EBPF_RSS_BPF_SKELETON_H +#define EBPF_RSS_BPF_SKELETON_H #include <stdlib.h> #include <bpf/libbpf.h>
@@ -428,4 +429,4 @@ err: return -1; } -#endif /* __RSS_BPF_SKEL_H__ */ +#endif /* EBPF_RSS_BPF_SKELETON_H */
hw/i386/e820_memory_layout.h +2 -2
@@ -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
hw/net/can/ctu_can_fd_frame.h +2 -2
@@ -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 {
hw/net/can/ctu_can_fd_regs.h +2 -2
@@ -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 {
hw/nvme/nvme.h +3 -3
@@ -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 */
hw/usb/hcd-dwc2.h +2 -2
@@ -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"
include/block/block-hmp-cmds.h +2 -2
@@ -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);
include/crypto/tls-cipher-suites.h +3 -3
@@ -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 */
include/hw/acpi/generic_event_device.h +2 -2
@@ -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"
include/hw/i2c/arm_sbcon_i2c.h +4 -3
@@ -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 */
include/hw/misc/bcm2835_cprman.h +2 -2
@@ -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"
include/hw/misc/bcm2835_cprman_internals.h +2 -2
@@ -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"
include/hw/misc/stm32f4xx_exti.h +2 -2
@@ -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"
include/hw/misc/stm32f4xx_syscfg.h +2 -2
@@ -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"
include/hw/misc/xlnx-versal-pmc-iou-slcr.h +3 -3
@@ -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 */
include/hw/net/mv88w8618_eth.h +3 -2
@@ -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"
include/hw/nubus/mac-nubus-bridge.h +2 -2
@@ -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"
include/hw/pci-host/remote.h +2 -2
@@ -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"
include/hw/riscv/boot_opensbi.h +3 -2
@@ -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
include/hw/riscv/shakti_c.h +2 -2
@@ -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"
include/hw/rtc/sun4v-rtc.h +2 -2
@@ -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"
include/hw/rtc/xlnx-zynqmp-rtc.h +2 -2
@@ -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"
include/hw/rx/rx62n.h +2 -2
@@ -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"
include/hw/sensor/emc141x_regs.h +2 -2
@@ -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
include/hw/ssi/xlnx-versal-ospi.h +3 -3
@@ -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 */
include/hw/timer/bcm2835_systmr.h +2 -2
@@ -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"
include/hw/tricore/tricore_testdevice.h +2 -3
@@ -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"
include/hw/usb/dwc2-regs.h +3 -3
@@ -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 */
include/hw/usb/hcd-musb.h +2 -2
@@ -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,
include/hw/usb/xlnx-usb-subsystem.h +2 -2
@@ -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"
include/hw/usb/xlnx-versal-usb2-ctrl-regs.h +2 -2
@@ -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"
include/hw/watchdog/wdt_imx2.h +3 -3
@@ -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 */
include/qemu/help-texts.h +2 -2
@@ -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 " \
include/qemu/qemu-plugin.h +4 -3
@@ -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 */
include/sysemu/block-backend-global-state.h +3 -3
@@ -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 */
plugins/plugin.h +3 -3
@@ -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 */
target/arm/translate-a32.h +2 -2
@@ -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);
target/arm/vec_internal.h +3 -3
@@ -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 */
target/avr/cpu-qom.h +3 -3
@@ -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 */
target/hexagon/hex_arch_types.h +2 -2
@@ -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"
target/hexagon/hex_regs.h +2 -2
@@ -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,
target/i386/hax/hax-accel-ops.h +3 -3
@@ -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 */
target/i386/nvmm/nvmm-accel-ops.h +3 -3
@@ -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 */
target/i386/sev.h +2 -2
@@ -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 */
target/i386/whpx/whpx-accel-ops.h +3 -3
@@ -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 */
target/i386/whpx/whpx-internal.h +3 -3
@@ -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>
@@ -113,4 +113,4 @@ typedef enum WHPFunctionList {WINHV_PLATFORM_FNS_SUPPLEMENTAL } WHPFunctionList; -#endif /* WHP_INTERNAL_H */ +#endif /* TARGET_I386_WHPX_INTERNAL_H */
target/xtensa/core-de233_fpu/core-isa.h +3 -4
@@ -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 */
target/xtensa/core-dsp3400/core-isa.h +3 -5
@@ -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 */
tests/qtest/fuzz/fuzz.h +2 -3
@@ -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 -
tools/virtiofsd/passthrough_seccomp.h +3 -4
@@ -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 */
Signature · 1 line
2.35.1
Re: [PATCH 1/4] Clean up header guards that don't match their file name
Quoted 7 lines · Markus Armbruster
Header guard symbols should match their file name to make guard collisions less likely.
Cleaned up with
scripts/clean-header-guards.pl, followed by some renaming of new guard symbols picked by the script to better ones.Signed-off-by Markus Armbruster <[email protected]>
[...]
Quoted 17 lines
ebpf/rss.bpf.skeleton.h +3
-2@@ -1,8 +1,9 @@/* SPDX-License-Identifier: (LGPL-2.1 OR BSD-2-Clause) */ /* THIS FILE IS AUTOGENERATED! */ -#ifndef __RSS_BPF_SKEL_H__ -#define __RSS_BPF_SKEL_H__ + +#ifndef EBPF_RSS_BPF_SKELETON_H +#define EBPF_RSS_BPF_SKELETON_H #include <stdlib.h> #include <bpf/libbpf.h>
ebpf/rss.bpf.skeleton.h err: · line 432
Quoted 5 lines
ebpf/rss.bpf.skeleton.h +1
-1@@ -428,4 +429,4 @@ err: return -1; } -#endif /* __RSS_BPF_SKEL_H__ */ +#endif /* EBPF_RSS_BPF_SKELETON_H */
Dropping this one because it's actually generated from tools/ebpf/rss.bpf.c. See
https://lists.nongnu.org/archive/html/qemu-devel/2022-05/msg01392.html Message-ID: <CACGkMEvoug0H10H+4=7yjB7UyRK+1Ugyq3xgGpC1a2wWy4jX_Q@mail.gmail.com>
[...]
PATCH 2/4 Clean up ill-advised or unusual header guards
In reply to Markus ArmbrusterLeading underscores are ill-advised because such identifiers are reserved. Trailing underscores are merely ugly. Strip both.
Our header guards commonly end in _H. Normalize the exceptions.
Macros should be ALL_CAPS. Normalize the exception.
Done with scripts/clean-header-guards.pl.
include/hw/xen/interface/ and tools/virtiofsd/ left alone, because these were imported from Xen and libfuse respectively.
--- block/copy-on-read.h | 6 +++--- bsd-user/arm/target_arch.h | 6 +++--- bsd-user/arm/target_arch_cpu.h | 6 +++--- bsd-user/arm/target_arch_elf.h | 7 ++++--- bsd-user/arm/target_arch_reg.h | 6 +++--- bsd-user/arm/target_arch_signal.h | 7 ++++--- bsd-user/arm/target_arch_sigtramp.h | 6 +++--- bsd-user/arm/target_arch_sysarch.h | 6 +++--- bsd-user/arm/target_arch_thread.h | 7 ++++--- bsd-user/arm/target_arch_vmparam.h | 7 ++++--- bsd-user/bsd-file.h | 6 +++--- bsd-user/errno_defs.h | 6 +++--- bsd-user/freebsd/host-os.h | 6 +++--- bsd-user/freebsd/target_os_elf.h | 7 ++++--- bsd-user/freebsd/target_os_siginfo.h | 7 ++++--- bsd-user/freebsd/target_os_signal.h | 6 +++--- bsd-user/freebsd/target_os_stack.h | 6 +++--- bsd-user/freebsd/target_os_thread.h | 6 +++--- bsd-user/freebsd/target_os_user.h | 6 +++--- bsd-user/freebsd/target_os_vmparam.h | 7 ++++--- bsd-user/i386/target_arch.h | 6 +++--- bsd-user/i386/target_arch_cpu.h | 6 +++--- bsd-user/i386/target_arch_elf.h | 7 ++++--- bsd-user/i386/target_arch_reg.h | 6 +++--- bsd-user/i386/target_arch_sigtramp.h | 6 +++--- bsd-user/i386/target_arch_thread.h | 7 ++++--- bsd-user/i386/target_arch_vmparam.h | 7 ++++--- bsd-user/netbsd/host-os.h | 6 +++--- bsd-user/netbsd/target_os_elf.h | 7 ++++--- bsd-user/netbsd/target_os_siginfo.h | 6 +++--- bsd-user/netbsd/target_os_signal.h | 6 +++--- bsd-user/netbsd/target_os_stack.h | 6 +++--- bsd-user/netbsd/target_os_thread.h | 6 +++--- bsd-user/openbsd/host-os.h | 6 +++--- bsd-user/openbsd/target_os_elf.h | 7 ++++--- bsd-user/openbsd/target_os_siginfo.h | 6 +++--- bsd-user/openbsd/target_os_signal.h | 6 +++--- bsd-user/openbsd/target_os_stack.h | 6 +++--- bsd-user/openbsd/target_os_thread.h | 6 +++--- bsd-user/syscall_defs.h | 6 +++--- bsd-user/x86_64/target_arch.h | 6 +++--- bsd-user/x86_64/target_arch_cpu.h | 6 +++--- bsd-user/x86_64/target_arch_elf.h | 7 ++++--- bsd-user/x86_64/target_arch_reg.h | 6 +++--- bsd-user/x86_64/target_arch_signal.h | 7 ++++--- bsd-user/x86_64/target_arch_sigtramp.h | 6 +++--- bsd-user/x86_64/target_arch_thread.h | 7 ++++--- bsd-user/x86_64/target_arch_vmparam.h | 7 ++++--- crypto/ivgen-plain.h | 6 +++--- include/chardev/char-socket.h | 7 ++++--- include/hw/i2c/i2c_mux_pca954x.h | 4 ++-- include/hw/input/lm832x.h | 4 ++-- include/hw/intc/exynos4210_combiner.h | 4 ++-- include/hw/intc/nios2_vic.h | 6 +++--- include/hw/ppc/pnv_pnor.h | 8 +++++--- include/hw/s390x/s390-pci-clp.h | 4 ++-- include/hw/tricore/tc27x_soc.h | 4 ++-- include/hw/virtio/vhost-user-fs.h | 6 +++--- include/hw/virtio/vhost-user-i2c.h | 6 +++--- include/hw/virtio/vhost-user-rng.h | 6 +++--- include/hw/virtio/vhost-user-vsock.h | 6 +++--- include/hw/virtio/vhost-vsock-common.h | 6 +++--- include/qemu/cpu-float.h | 6 +++--- include/qemu/crc-ccitt.h | 6 +++--- include/qemu/keyval.h | 7 ++++--- include/ui/dbus-display.h | 6 +++--- include/ui/dbus-module.h | 6 +++--- target/ppc/power8-pmu.h | 4 ++-- target/riscv/sbi_ecall_interface.h | 4 ++-- tests/qtest/libqmp.h | 7 ++++--- tests/qtest/migration-helpers.h | 7 ++++--- ui/dbus.h | 7 ++++--- 72 files changed, 232 insertions(+), 209 deletions(-)
block/copy-on-read.h +3 -3
@@ -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 */
bsd-user/arm/target_arch.h +3 -3
@@ -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 */
bsd-user/arm/target_arch_cpu.h +3 -3
@@ -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 */
bsd-user/arm/target_arch_elf.h +4 -3
@@ -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 */
bsd-user/arm/target_arch_reg.h +3 -3
@@ -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 */
bsd-user/arm/target_arch_signal.h +4 -3
@@ -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 */
bsd-user/arm/target_arch_sigtramp.h +3 -3
@@ -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 */
bsd-user/arm/target_arch_sysarch.h +3 -3
@@ -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 */
bsd-user/arm/target_arch_thread.h +4 -3
@@ -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 */
bsd-user/arm/target_arch_vmparam.h +4 -3
@@ -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 */
bsd-user/bsd-file.h +3 -3
@@ -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 */
bsd-user/errno_defs.h +3 -3
@@ -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 */
bsd-user/freebsd/host-os.h +3 -3
@@ -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 */
bsd-user/freebsd/target_os_elf.h +4 -3
@@ -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 */
bsd-user/freebsd/target_os_siginfo.h +4 -3
@@ -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 */
bsd-user/freebsd/target_os_signal.h +3 -3
@@ -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 */
bsd-user/freebsd/target_os_stack.h +3 -3
@@ -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 */
bsd-user/freebsd/target_os_thread.h +3 -3
@@ -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 */
bsd-user/freebsd/target_os_user.h +3 -3
@@ -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 */
bsd-user/freebsd/target_os_vmparam.h +4 -3
@@ -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 */
bsd-user/i386/target_arch.h +3 -3
@@ -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 */
bsd-user/i386/target_arch_cpu.h +3 -3
@@ -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 */
bsd-user/i386/target_arch_elf.h +4 -3
@@ -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 */
bsd-user/i386/target_arch_reg.h +3 -3
@@ -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 */
bsd-user/i386/target_arch_sigtramp.h +3 -3
@@ -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 */
bsd-user/i386/target_arch_thread.h +4 -3
@@ -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 */
bsd-user/i386/target_arch_vmparam.h +4 -3
@@ -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 */
bsd-user/netbsd/host-os.h +3 -3
@@ -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 */
bsd-user/netbsd/target_os_elf.h +4 -3
@@ -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 */
bsd-user/netbsd/target_os_siginfo.h +3 -3
@@ -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 */
bsd-user/netbsd/target_os_signal.h +3 -3
@@ -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 */
bsd-user/netbsd/target_os_stack.h +3 -3
@@ -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 */
bsd-user/netbsd/target_os_thread.h +3 -3
@@ -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 */
bsd-user/openbsd/host-os.h +3 -3
@@ -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 */
bsd-user/openbsd/target_os_elf.h +4 -3
@@ -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 */
bsd-user/openbsd/target_os_siginfo.h +3 -3
@@ -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 */
bsd-user/openbsd/target_os_signal.h +3 -3
@@ -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 */
bsd-user/openbsd/target_os_stack.h +3 -3
@@ -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 */
bsd-user/openbsd/target_os_thread.h +3 -3
@@ -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 */
bsd-user/syscall_defs.h +3 -3
@@ -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 */
bsd-user/x86_64/target_arch.h +3 -3
@@ -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 */
bsd-user/x86_64/target_arch_cpu.h +3 -3
@@ -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 */
bsd-user/x86_64/target_arch_elf.h +4 -3
@@ -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 */
bsd-user/x86_64/target_arch_reg.h +3 -3
@@ -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 */
bsd-user/x86_64/target_arch_signal.h +4 -3
@@ -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 */
bsd-user/x86_64/target_arch_sigtramp.h +3 -3
@@ -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 */
bsd-user/x86_64/target_arch_thread.h +4 -3
@@ -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 */
bsd-user/x86_64/target_arch_vmparam.h +4 -3
@@ -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 */
crypto/ivgen-plain.h +3 -3
@@ -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 */
include/chardev/char-socket.h +4 -3
@@ -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 */
include/hw/i2c/i2c_mux_pca954x.h +2 -2
@@ -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"
include/hw/input/lm832x.h +2 -2
@@ -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"
include/hw/intc/exynos4210_combiner.h +2 -2
@@ -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"
include/hw/intc/nios2_vic.h +3 -3
@@ -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 */
include/hw/ppc/pnv_pnor.h +5 -3
@@ -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 */
include/hw/s390x/s390-pci-clp.h +2 -2
@@ -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
include/hw/tricore/tc27x_soc.h +2 -2
@@ -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"
include/hw/virtio/vhost-user-fs.h +3 -3
@@ -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 */
include/hw/virtio/vhost-user-i2c.h +3 -3
@@ -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 */
include/hw/virtio/vhost-user-rng.h +3 -3
@@ -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 */
include/hw/virtio/vhost-user-vsock.h +3 -3
@@ -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 */
include/hw/virtio/vhost-vsock-common.h +3 -3
@@ -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 */
include/qemu/cpu-float.h +3 -3
@@ -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 */
include/qemu/crc-ccitt.h +3 -3
@@ -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 */
include/qemu/keyval.h +4 -3
@@ -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 */
include/ui/dbus-display.h +3 -3
@@ -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 */
include/ui/dbus-module.h +3 -3
@@ -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 */
target/ppc/power8-pmu.h +2 -2
@@ -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);
target/riscv/sbi_ecall_interface.h +2 -2
@@ -7,8 +7,8 @@* Anup Patel <[email protected]> */ -#ifndef __SBI_ECALL_INTERFACE_H__ -#define __SBI_ECALL_INTERFACE_H__ +#ifndef SBI_ECALL_INTERFACE_H +#define SBI_ECALL_INTERFACE_H /* clang-format off */
tests/qtest/libqmp.h +4 -3
@@ -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 */
tests/qtest/migration-helpers.h +4 -3
@@ -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 */
ui/dbus.h +4 -3
@@ -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 */
Signature · 1 line
2.35.1
PATCH 3/4 Normalize header guard symbol definition
In reply to Markus ArmbrusterWe commonly define the header guard symbol without an explicit value. Normalize the exceptions.
Done with scripts/clean-header-guards.pl.
--- include/exec/memopidx.h | 2 +- include/tcg/tcg-ldst.h | 2 +- target/alpha/cpu-param.h | 2 +- target/arm/cpu-param.h | 2 +- target/cris/cpu-param.h | 2 +- target/hppa/cpu-param.h | 2 +- target/i386/cpu-param.h | 2 +- target/m68k/cpu-param.h | 2 +- target/microblaze/cpu-param.h | 2 +- target/mips/cpu-param.h | 2 +- target/nios2/cpu-param.h | 2 +- target/openrisc/cpu-param.h | 2 +- target/ppc/cpu-param.h | 2 +- target/riscv/cpu-param.h | 2 +- target/s390x/cpu-param.h | 2 +- target/sh4/cpu-param.h | 2 +- target/sparc/cpu-param.h | 2 +- target/tricore/cpu-param.h | 2 +- target/xtensa/cpu-param.h | 2 +- tcg/tcg-internal.h | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-)
include/exec/memopidx.h +1 -1
@@ -9,7 +9,7 @@*/ #ifndef EXEC_MEMOPIDX_H -#define EXEC_MEMOPIDX_H 1 +#define EXEC_MEMOPIDX_H #include "exec/memop.h"
include/tcg/tcg-ldst.h +1 -1
@@ -23,7 +23,7 @@*/ #ifndef TCG_LDST_H -#define TCG_LDST_H 1 +#define TCG_LDST_H #ifdef CONFIG_SOFTMMU
target/alpha/cpu-param.h +1 -1
@@ -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
target/arm/cpu-param.h +1 -1
@@ -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
target/cris/cpu-param.h +1 -1
@@ -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
target/hppa/cpu-param.h +1 -1
@@ -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
target/i386/cpu-param.h +1 -1
@@ -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
target/m68k/cpu-param.h +1 -1
@@ -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/*
target/microblaze/cpu-param.h +1 -1
@@ -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,
target/mips/cpu-param.h +1 -1
@@ -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
target/nios2/cpu-param.h +1 -1
@@ -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
target/openrisc/cpu-param.h +1 -1
@@ -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
target/ppc/cpu-param.h +1 -1
@@ -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
target/riscv/cpu-param.h +1 -1
@@ -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
target/s390x/cpu-param.h +1 -1
@@ -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
target/sh4/cpu-param.h +1 -1
@@ -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 */
target/sparc/cpu-param.h +1 -1
@@ -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
target/tricore/cpu-param.h +1 -1
@@ -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
target/xtensa/cpu-param.h +1 -1
@@ -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
tcg/tcg-internal.h +1 -1
@@ -23,7 +23,7 @@*/ #ifndef TCG_INTERNAL_H -#define TCG_INTERNAL_H 1 +#define TCG_INTERNAL_H #define TCG_HIGHWATER 1024
Signature · 1 line
2.35.1
PATCH 4/4 Clean up decorations and whitespace around header guards
In reply to Markus ArmbrusterCleaned up with scripts/clean-header-guards.pl.
--- bsd-user/arm/target.h | 2 +- bsd-user/x86_64/target.h | 2 +- chardev/chardev-internal.h | 3 ++- include/block/block_int-global-state.h | 3 ++- include/exec/translator.h | 2 +- include/fpu/softfloat-helpers.h | 2 +- include/hw/gpio/aspeed_gpio.h | 2 +- include/hw/intc/rx_icu.h | 2 +- include/hw/misc/aspeed_hace.h | 2 +- include/hw/misc/aspeed_lpc.h | 2 +- include/hw/misc/aspeed_sbc.h | 2 +- include/hw/net/allwinner-sun8i-emac.h | 2 +- include/hw/rtc/m48t59.h | 2 +- include/hw/rtc/mc146818rtc.h | 2 +- include/qemu/plugin-memory.h | 2 +- include/qemu/selfmap.h | 2 +- include/user/syscall-trace.h | 2 +- linux-user/hexagon/target_signal.h | 2 +- target/avr/cpu.h | 2 +- target/hexagon/attribs.h | 2 +- target/xtensa/core-de233_fpu/core-matmap.h | 4 +--- target/xtensa/core-dsp3400/core-matmap.h | 4 +--- 22 files changed, 24 insertions(+), 26 deletions(-)
bsd-user/arm/target.h +1 -1
@@ -17,5 +17,5 @@ static inline bool regpairs_aligned(void *cpu_env) return true; } -#endif /* ! TARGET_H */ +#endif /* TARGET_H */
bsd-user/x86_64/target.h +1 -1
@@ -17,5 +17,5 @@ static inline bool regpairs_aligned(void *cpu_env) return false; } -#endif /* ! TARGET_H */ +#endif /* TARGET_H */
chardev/chardev-internal.h +2 -1
@@ -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 */
include/block/block_int-global-state.h +2 -1
@@ -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 */
include/exec/translator.h +1 -1
@@ -187,4 +187,4 @@ FOR_EACH_TRANSLATOR_LD(GEN_TRANSLATOR_LD)#undef GEN_TRANSLATOR_LD -#endif /* EXEC__TRANSLATOR_H */ +#endif /* EXEC__TRANSLATOR_H */
include/fpu/softfloat-helpers.h +1 -1
@@ -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 */
include/hw/gpio/aspeed_gpio.h +1 -1
@@ -93,4 +93,4 @@ struct AspeedGPIOState { } sets[ASPEED_GPIO_MAX_NR_SETS]; }; -#endif /* _ASPEED_GPIO_H_ */ +#endif /* ASPEED_GPIO_H */
include/hw/intc/rx_icu.h +1 -1
@@ -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 */
include/hw/misc/aspeed_hace.h +1 -1
@@ -47,4 +47,4 @@ struct AspeedHACEClass { uint32_t hash_mask; }; -#endif /* _ASPEED_HACE_H_ */ +#endif /* ASPEED_HACE_H */
include/hw/misc/aspeed_lpc.h +1 -1
@@ -44,4 +44,4 @@ typedef struct AspeedLPCState { uint32_t hicr7; } AspeedLPCState; -#endif /* _ASPEED_LPC_H_ */ +#endif /* ASPEED_LPC_H */
include/hw/misc/aspeed_sbc.h +1 -1
@@ -29,4 +29,4 @@ struct AspeedSBCClass { SysBusDeviceClass parent_class; }; -#endif /* _ASPEED_SBC_H_ */ +#endif /* ASPEED_SBC_H */
include/hw/net/allwinner-sun8i-emac.h +1 -1
@@ -101,4 +101,4 @@ struct AwSun8iEmacState { }; -#endif /* HW_NET_ALLWINNER_SUN8I_H */ +#endif /* HW_NET_ALLWINNER_SUN8I_EMAC_H */
include/hw/rtc/m48t59.h +1 -1
@@ -47,4 +47,4 @@ struct NvramClass { void (*toggle_lock)(Nvram *obj, int lock); }; -#endif /* HW_M48T59_H */ +#endif /* HW_RTC_M48T59_H */
include/hw/rtc/mc146818rtc.h +1 -1
@@ -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 */
include/qemu/plugin-memory.h +1 -1
@@ -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 */
include/qemu/selfmap.h +1 -1
@@ -41,4 +41,4 @@ GSList *read_self_maps(void);*/ void free_self_maps (GSList *info); -#endif /* _SELFMAP_H_ */ +#endif /* SELFMAP_H */
include/user/syscall-trace.h +1 -1
@@ -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 */
linux-user/hexagon/target_signal.h +1 -1
@@ -22,4 +22,4 @@#define TARGET_ARCH_HAS_SIGTRAMP_PAGE 1 -#endif /* TARGET_SIGNAL_H */ +#endif /* HEXAGON_TARGET_SIGNAL_H */
target/avr/cpu.h +1 -1
@@ -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 */
target/hexagon/attribs.h +1 -1
@@ -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 */
target/xtensa/core-de233_fpu/core-matmap.h +1 -3
@@ -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 */
target/xtensa/core-dsp3400/core-matmap.h +1 -3
@@ -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 */
Signature · 1 line
2.35.1
Quoted 5 lines · Markus Armbruster
Markus Armbruster (4):
Clean up header guards that don't match their file name Clean up ill-advised or unusual header guards Normalize header guard symbol definition
Clean up decorations and whitespace around header guards
r~