diff options
| author | Markus Armbruster <armbru@redhat.com> | 2016-06-29 15:29:06 +0200 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2016-07-12 16:20:46 +0200 |
| commit | 175de52487ce0b0c78daa4cdf41a5a465a168a25 (patch) | |
| tree | 2beed30befbec6d0d54a242f12817fdf5451bb20 | |
| parent | 2a6a4076e117113ebec97b1821071afccfdfbc96 (diff) | |
Clean up decorations and whitespace around header guards
Cleaned up with scripts/clean-header-guards.pl.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Richard Henderson <rth@twiddle.net>
111 files changed, 140 insertions, 126 deletions
diff --git a/audio/audio.h b/audio/audio.h index b41a97053d..11e56c9d17 100644 --- a/audio/audio.h +++ b/audio/audio.h @@ -21,6 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ + #ifndef QEMU_AUDIO_H #define QEMU_AUDIO_H @@ -162,4 +163,4 @@ static inline void *advance (void *p, int incr) int wav_start_capture (CaptureState *s, const char *path, int freq, int bits, int nchannels); -#endif /* audio.h */ +#endif /* QEMU_AUDIO_H */ diff --git a/audio/audio_int.h b/audio/audio_int.h index 566df5edf4..5bcb1c60e1 100644 --- a/audio/audio_int.h +++ b/audio/audio_int.h @@ -21,6 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ + #ifndef QEMU_AUDIO_INT_H #define QEMU_AUDIO_INT_H @@ -257,4 +258,4 @@ static inline int audio_ring_dist (int dst, int src, int len) #define AUDIO_FUNC __FILE__ ":" AUDIO_STRINGIFY (__LINE__) #endif -#endif /* audio_int.h */ +#endif /* QEMU_AUDIO_INT_H */ diff --git a/audio/audio_pt_int.h b/audio/audio_pt_int.h index 0dfff76aa3..4c0c15b9af 100644 --- a/audio/audio_pt_int.h +++ b/audio/audio_pt_int.h @@ -19,4 +19,4 @@ int audio_pt_wait (struct audio_pt *, const char *); int audio_pt_unlock_and_signal (struct audio_pt *, const char *); int audio_pt_join (struct audio_pt *, void **, const char *); -#endif /* audio_pt_int.h */ +#endif /* QEMU_AUDIO_PT_INT_H */ diff --git a/audio/mixeng.h b/audio/mixeng.h index 9de443b01d..b53a5ef99a 100644 --- a/audio/mixeng.h +++ b/audio/mixeng.h @@ -21,6 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ + #ifndef QEMU_MIXENG_H #define QEMU_MIXENG_H @@ -48,4 +49,4 @@ void st_rate_stop (void *opaque); void mixeng_clear (struct st_sample *buf, int len); void mixeng_volume (struct st_sample *buf, int len, struct mixeng_volume *vol); -#endif /* mixeng.h */ +#endif /* QEMU_MIXENG_H */ diff --git a/bsd-user/i386/target_syscall.h b/bsd-user/i386/target_syscall.h index 82d1c58ca5..8f201386af 100644 --- a/bsd-user/i386/target_syscall.h +++ b/bsd-user/i386/target_syscall.h @@ -162,4 +162,4 @@ struct target_vm86plus_struct { #define UNAME_MACHINE "i386" -#endif /* TARGET_SYSCALL_H */ +#endif /* TARGET_SYSCALL_H */ diff --git a/bsd-user/sparc/target_syscall.h b/bsd-user/sparc/target_syscall.h index c7eec6ba60..dfdf9f82f5 100644 --- a/bsd-user/sparc/target_syscall.h +++ b/bsd-user/sparc/target_syscall.h @@ -11,4 +11,4 @@ struct target_pt_regs { #define UNAME_MACHINE "sun4" -#endif /* TARGET_SYSCALL_H */ +#endif /* TARGET_SYSCALL_H */ diff --git a/bsd-user/sparc64/target_syscall.h b/bsd-user/sparc64/target_syscall.h index 2f06100ae5..3a9f4c2ef9 100644 --- a/bsd-user/sparc64/target_syscall.h +++ b/bsd-user/sparc64/target_syscall.h @@ -12,4 +12,4 @@ struct target_pt_regs { #define UNAME_MACHINE "sun4u" -#endif /* TARGET_SYSCALL_H */ +#endif /* TARGET_SYSCALL_H */ diff --git a/bsd-user/x86_64/target_syscall.h b/bsd-user/x86_64/target_syscall.h index 85a9766970..211ce29e90 100644 --- a/bsd-user/x86_64/target_syscall.h +++ b/bsd-user/x86_64/target_syscall.h @@ -118,4 +118,4 @@ struct target_msqid64_ds { #define TARGET_ARCH_GET_FS 0x1003 #define TARGET_ARCH_GET_GS 0x1004 -#endif /* TARGET_SYSCALL_H */ +#endif /* TARGET_SYSCALL_H */ diff --git a/hw/audio/gusemu.h b/hw/audio/gusemu.h index b7f0751268..9aec7bf8e7 100644 --- a/hw/audio/gusemu.h +++ b/hw/audio/gusemu.h @@ -101,4 +101,4 @@ void gus_irqgen(GUSEmuState *state, unsigned int elapsed_time); /* lower values won´t provide any benefit at all, higher values can cause audible timing delays */ /* note: masked timers are also calculated by this function, thus it might be needed even without any IRQs in use! */ -#endif /* gusemu.h */ +#endif /* GUSEMU_H */ diff --git a/hw/audio/gustate.h b/hw/audio/gustate.h index ece903abb9..d16297110d 100644 --- a/hw/audio/gustate.h +++ b/hw/audio/gustate.h @@ -129,4 +129,4 @@ #define gusdataend (VSRegsEnd+4) -#endif /* gustate.h */ +#endif /* GUSTATE_H */ diff --git a/hw/audio/lm4549.h b/hw/audio/lm4549.h index 812a7a4440..74c3ee8934 100644 --- a/hw/audio/lm4549.h +++ b/hw/audio/lm4549.h @@ -40,4 +40,4 @@ uint32_t lm4549_read(lm4549_state *s, hwaddr offset); void lm4549_write(lm4549_state *s, hwaddr offset, uint32_t value); uint32_t lm4549_write_samples(lm4549_state *s, uint32_t left, uint32_t right); -#endif /* #ifndef HW_LM4549_H */ +#endif /* HW_LM4549_H */ diff --git a/hw/audio/pl041.h b/hw/audio/pl041.h index 427ab6d6f8..515db4756b 100644 --- a/hw/audio/pl041.h +++ b/hw/audio/pl041.h @@ -132,4 +132,4 @@ enum { #define RXTOFEC3 (1 << 11) #define RXTOFEC4 (1 << 12) -#endif /* #ifndef HW_PL041_H */ +#endif /* HW_PL041_H */ diff --git a/hw/display/qxl.h b/hw/display/qxl.h index fdb619d4a7..d2d49dd933 100644 --- a/hw/display/qxl.h +++ b/hw/display/qxl.h @@ -1,5 +1,5 @@ #ifndef HW_QXL_H -#define HW_QXL_H 1 +#define HW_QXL_H #include "qemu-common.h" diff --git a/hw/display/vga_int.h b/hw/display/vga_int.h index 29a5c03826..dd6c958da3 100644 --- a/hw/display/vga_int.h +++ b/hw/display/vga_int.h @@ -21,8 +21,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ + #ifndef HW_VGA_INT_H -#define HW_VGA_INT_H 1 +#define HW_VGA_INT_H #include "hw/hw.h" #include "exec/memory.h" diff --git a/hw/intc/gic_internal.h b/hw/intc/gic_internal.h index 20c1e8a242..3f311740da 100644 --- a/hw/intc/gic_internal.h +++ b/hw/intc/gic_internal.h @@ -100,4 +100,4 @@ static inline bool gic_test_pending(GICState *s, int irq, int cm) } } -#endif /* !QEMU_ARM_GIC_INTERNAL_H */ +#endif /* QEMU_ARM_GIC_INTERNAL_H */ diff --git a/hw/intc/gicv3_internal.h b/hw/intc/gicv3_internal.h index 6ce5d49bde..8f3567edaa 100644 --- a/hw/intc/gicv3_internal.h +++ b/hw/intc/gicv3_internal.h @@ -328,4 +328,4 @@ static inline void gicv3_cache_all_target_cpustates(GICv3State *s) } } -#endif /* !QEMU_ARM_GIC_INTERNAL_H */ +#endif /* QEMU_ARM_GICV3_INTERNAL_H */ diff --git a/hw/lm32/lm32.h b/hw/lm32/lm32.h index e338bfeae5..db9eb29ea4 100644 --- a/hw/lm32/lm32.h +++ b/hw/lm32/lm32.h @@ -1,5 +1,5 @@ #ifndef HW_LM32_H -#define HW_LM32_H 1 +#define HW_LM32_H #include "hw/char/lm32_juart.h" diff --git a/hw/net/ne2000.h b/hw/net/ne2000.h index d022b28fc2..d213dccae3 100644 --- a/hw/net/ne2000.h +++ b/hw/net/ne2000.h @@ -1,5 +1,5 @@ #ifndef HW_NE2000_H -#define HW_NE2000_H 1 +#define HW_NE2000_H #define NE2000_PMEM_SIZE (32*1024) #define NE2000_PMEM_START (16*1024) diff --git a/hw/net/pcnet.h b/hw/net/pcnet.h index dec8de834c..40831a7845 100644 --- a/hw/net/pcnet.h +++ b/hw/net/pcnet.h @@ -1,5 +1,5 @@ #ifndef HW_PCNET_H -#define HW_PCNET_H 1 +#define HW_PCNET_H #define PCNET_IOPORT_SIZE 0x20 #define PCNET_PNPMMIO_SIZE 0x20 diff --git a/hw/pci-bridge/xio3130_upstream.h b/hw/pci-bridge/xio3130_upstream.h index 08c1d5f75b..d0ab7577e2 100644 --- a/hw/pci-bridge/xio3130_upstream.h +++ b/hw/pci-bridge/xio3130_upstream.h @@ -7,4 +7,4 @@ PCIEPort *xio3130_upstream_init(PCIBus *bus, int devfn, bool multifunction, const char *bus_name, pci_map_irq_fn map_irq, uint8_t port); -#endif /* QEMU_XIO3130_H */ +#endif /* QEMU_XIO3130_UPSTREAM_H */ diff --git a/hw/s390x/s390-virtio.h b/hw/s390x/s390-virtio.h index ffd014cb5b..f588b80a6e 100644 --- a/hw/s390x/s390-virtio.h +++ b/hw/s390x/s390-virtio.h @@ -10,7 +10,7 @@ */ #ifndef HW_S390_VIRTIO_H -#define HW_S390_VIRTIO_H 1 +#define HW_S390_VIRTIO_H #include "hw/nmi.h" #include "standard-headers/asm-s390/kvm_virtio.h" diff --git a/hw/xen/xen-host-pci-device.h b/hw/xen/xen-host-pci-device.h index 6acf36e13a..4d8d34ecb0 100644 --- a/hw/xen/xen-host-pci-device.h +++ b/hw/xen/xen-host-pci-device.h @@ -55,4 +55,4 @@ int xen_host_pci_set_block(XenHostPCIDevice *d, int pos, uint8_t *buf, int xen_host_pci_find_ext_cap_offset(XenHostPCIDevice *s, uint32_t cap); -#endif /* !XEN_HOST_PCI_DEVICE_H_ */ +#endif /* XEN_HOST_PCI_DEVICE_H */ diff --git a/hw/xen/xen_pt.h b/hw/xen/xen_pt.h index c2f8e1fc25..191d9caea1 100644 --- a/hw/xen/xen_pt.h +++ b/hw/xen/xen_pt.h @@ -332,4 +332,4 @@ int xen_pt_register_vga_regions(XenHostPCIDevice *dev); int xen_pt_unregister_vga_regions(XenHostPCIDevice *dev); void xen_pt_setup_vga(XenPCIPassthroughState *s, XenHostPCIDevice *dev, Error **errp); -#endif /* !XEN_PT_H */ +#endif /* XEN_PT_H */ diff --git a/hw/xenpv/xen_domainbuild.h b/hw/xenpv/xen_domainbuild.h index 29a91ea7b1..652d9b410f 100644 --- a/hw/xenpv/xen_domainbuild.h +++ b/hw/xenpv/xen_domainbuild.h @@ -1,5 +1,5 @@ #ifndef QEMU_HW_XEN_DOMAINBUILD_H -#define QEMU_HW_XEN_DOMAINBUILD_H 1 +#define QEMU_HW_XEN_DOMAINBUILD_H #include "hw/xen/xen_common.h" diff --git a/include/block/blockjob.h b/include/block/blockjob.h index 7dc720c82b..f7f5687cf4 100644 --- a/include/block/blockjob.h +++ b/include/block/blockjob.h @@ -22,8 +22,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ + #ifndef BLOCKJOB_H -#define BLOCKJOB_H 1 +#define BLOCKJOB_H #include "block/block.h" diff --git a/include/block/thread-pool.h b/include/block/thread-pool.h index 42eb5e8421..7dd7d730a0 100644 --- a/include/block/thread-pool.h +++ b/include/block/thread-pool.h @@ -16,7 +16,7 @@ */ #ifndef QEMU_THREAD_POOL_H -#define QEMU_THREAD_POOL_H 1 +#define QEMU_THREAD_POOL_H #include "block/block.h" diff --git a/include/exec/cpu-common.h b/include/exec/cpu-common.h index 9ac1eaf995..952bcfeb4c 100644 --- a/include/exec/cpu-common.h +++ b/include/exec/cpu-common.h @@ -1,5 +1,5 @@ #ifndef CPU_COMMON_H -#define CPU_COMMON_H 1 +#define CPU_COMMON_H /* CPU interfaces that are target independent. */ @@ -117,4 +117,4 @@ int qemu_ram_foreach_block(RAMBlockIterFunc func, void *opaque); #endif -#endif /* !CPU_COMMON_H */ +#endif /* CPU_COMMON_H */ diff --git a/include/exec/gen-icount.h b/include/exec/gen-icount.h index a011324b92..1af03d8f23 100644 --- a/include/exec/gen-icount.h +++ b/include/exec/gen-icount.h @@ -1,5 +1,5 @@ #ifndef GEN_ICOUNT_H -#define GEN_ICOUNT_H 1 +#define GEN_ICOUNT_H #include "qemu/timer.h" diff --git a/include/exec/helper-gen.h b/include/exec/helper-gen.h index be96254e5a..8239ffc77c 100644 --- a/include/exec/helper-gen.h +++ b/include/exec/helper-gen.h @@ -2,7 +2,7 @@ This one expands generation functions for tcg opcodes. */ #ifndef HELPER_GEN_H -#define HELPER_GEN_H 1 +#define HELPER_GEN_H #include "exec/helper-head.h" diff --git a/include/exec/helper-proto.h b/include/exec/helper-proto.h index 00901370ed..954bef85ce 100644 --- a/include/exec/helper-proto.h +++ b/include/exec/helper-proto.h @@ -2,7 +2,7 @@ This one expands prototypes for the helper functions. */ #ifndef HELPER_PROTO_H -#define HELPER_PROTO_H 1 +#define HELPER_PROTO_H #include "exec/helper-head.h" diff --git a/include/exec/helper-tcg.h b/include/exec/helper-tcg.h index 62d87a32d6..bb9287727c 100644 --- a/include/exec/helper-tcg.h +++ b/include/exec/helper-tcg.h @@ -2,7 +2,7 @@ This one defines data structures private to tcg.c. */ #ifndef HELPER_TCG_H -#define HELPER_TCG_H 1 +#define HELPER_TCG_H #include "exec/helper-head.h" diff --git a/include/exec/softmmu-semi.h b/include/exec/softmmu-semi.h index 3a58c3f087..7eefad8f39 100644 --- a/include/exec/softmmu-semi.h +++ b/include/exec/softmmu-semi.h @@ -6,8 +6,9 @@ * * This code is licensed under the GPL */ + #ifndef SOFTMMU_SEMI_H -#define SOFTMMU_SEMI_H 1 +#define SOFTMMU_SEMI_H static inline uint64_t softmmu_tget64(CPUArchState *env, target_ulong addr) { diff --git a/include/fpu/softfloat.h b/include/fpu/softfloat.h index 95a11032d1..0e57ee53c0 100644 --- a/include/fpu/softfloat.h +++ b/include/fpu/softfloat.h @@ -751,4 +751,4 @@ static inline int float128_is_any_nan(float128 a) *----------------------------------------------------------------------------*/ float128 float128_default_nan(float_status *status); -#endif /* !SOFTFLOAT_H */ +#endif /* SOFTFLOAT_H */ diff --git a/include/hw/acpi/acpi.h b/include/hw/acpi/acpi.h index c717f157fe..7b3d93cf0d 100644 --- a/include/hw/acpi/acpi.h +++ b/include/hw/acpi/acpi.h @@ -1,5 +1,6 @@ #ifndef QEMU_HW_ACPI_H #define QEMU_HW_ACPI_H + /* * Copyright (c) 2009 Isaku Yamahata <yamahata at valinux co jp> * VA Linux Systems Japan K.K. @@ -188,4 +189,4 @@ struct AcpiSlicOem { }; int acpi_get_slic_oem(AcpiSlicOem *oem); -#endif /* !QEMU_HW_ACPI_H */ +#endif /* QEMU_HW_ACPI_H */ diff --git a/include/hw/arm/pxa.h b/include/hw/arm/pxa.h index 074feacd03..dd1a48b0c1 100644 --- a/include/hw/arm/pxa.h +++ b/include/hw/arm/pxa.h @@ -6,8 +6,9 @@ * * This code is licensed under the GNU GPL v2. */ + #ifndef PXA_H -# define PXA_H "pxa.h" +#define PXA_H #include "exec/memory.h" #include "target-arm/cpu-qom.h" @@ -189,4 +190,4 @@ PXA2xxState *pxa270_init(MemoryRegion *address_space, unsigned int sdram_size, const char *revision); PXA2xxState *pxa255_init(MemoryRegion *address_space, unsigned int sdram_size); -#endif /* PXA_H */ +#endif /* PXA_H */ diff --git a/include/hw/arm/soc_dma.h b/include/hw/arm/soc_dma.h index 7379731afd..fae322997e 100644 --- a/include/hw/arm/soc_dma.h +++ b/include/hw/arm/soc_dma.h @@ -19,8 +19,7 @@ */ #ifndef HW_SOC_DMA_H -#define HW_SOC_DMA_H 1 - +#define HW_SOC_DMA_H #include "exec/memory.h" #include "hw/irq.h" diff --git a/include/hw/audio/pcspk.h b/include/hw/audio/pcspk.h index 33e46a53d0..172afbf146 100644 --- a/include/hw/audio/pcspk.h +++ b/include/hw/audio/pcspk.h @@ -44,4 +44,4 @@ static inline ISADevice *pcspk_init(ISABus *bus, ISADevice *pit) return isadev; } -#endif /* !HW_PCSPK_H */ +#endif /* HW_PCSPK_H */ diff --git a/include/hw/block/flash.h b/include/hw/block/flash.h index a088baa4e4..67c3aa329e 100644 --- a/include/hw/block/flash.h +++ b/include/hw/block/flash.h @@ -1,5 +1,5 @@ #ifndef HW_FLASH_H -#define HW_FLASH_H 1 +#define HW_FLASH_H /* NOR flash devices */ diff --git a/include/hw/bt.h b/include/hw/bt.h index c7c7909a37..185e79df2b 100644 --- a/include/hw/bt.h +++ b/include/hw/bt.h @@ -24,7 +24,7 @@ */ #ifndef HW_BT_H -#define HW_BT_H 1 +#define HW_BT_H #include "hw/irq.h" diff --git a/include/hw/char/escc.h b/include/hw/char/escc.h index 2742d70ea0..297e2ebcda 100644 --- a/include/hw/char/escc.h +++ b/include/hw/char/escc.h @@ -1,5 +1,5 @@ #ifndef HW_ESCC_H -#define HW_ESCC_H 1 +#define HW_ESCC_H /* escc.c */ #define TYPE_ESCC "escc" diff --git a/include/hw/char/lm32_juart.h b/include/hw/char/lm32_juart.h index 70dc416e9f..e7c6fb5a3b 100644 --- a/include/hw/char/lm32_juart.h +++ b/include/hw/char/lm32_juart.h @@ -10,4 +10,4 @@ uint32_t lm32_juart_get_jrx(DeviceState *d); void lm32_juart_set_jtx(DeviceState *d, uint32_t jtx); void lm32_juart_set_jrx(DeviceState *d, uint32_t jrx); -#endif /* QEMU_HW_LM32_JUART_H */ +#endif /* QEMU_HW_CHAR_LM32_JUART_H */ diff --git a/include/hw/char/serial.h b/include/hw/char/serial.h index 9feddc613c..a4fd3d559c 100644 --- a/include/hw/char/serial.h +++ b/include/hw/char/serial.h @@ -22,8 +22,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ + #ifndef HW_SERIAL_H -#define HW_SERIAL_H 1 +#define HW_SERIAL_H #include "hw/hw.h" #include "sysemu/sysemu.h" diff --git a/include/hw/cris/etraxfs_dma.h b/include/hw/cris/etraxfs_dma.h index 38104a67b5..f6f33e0980 100644 --- a/include/hw/cris/etraxfs_dma.h +++ b/include/hw/cris/etraxfs_dma.h @@ -1,5 +1,5 @@ #ifndef HW_ETRAXFS_DMA_H -#define HW_ETRAXFS_DMA_H 1 +#define HW_ETRAXFS_DMA_H struct dma_context_metadata { /* data descriptor md */ diff --git a/include/hw/display/dpcd.h b/include/hw/display/dpcd.h index 274dc2e42d..6880ee36a3 100644 --- a/include/hw/display/dpcd.h +++ b/include/hw/display/dpcd.h @@ -102,4 +102,4 @@ typedef struct DPCDState DPCDState; #define DPCD_SINK_STATUS 0x205 #define DPCD_RECEIVE_PORT_0_STATUS 0x01 -#endif /* !DPCD_H */ +#endif /* DPCD_H */ diff --git a/include/hw/dma/xlnx_dpdma.h b/include/hw/dma/xlnx_dpdma.h index ae571a0b2f..664df28ae6 100644 --- a/include/hw/dma/xlnx_dpdma.h +++ b/include/hw/dma/xlnx_dpdma.h @@ -82,4 +82,4 @@ void xlnx_dpdma_set_host_data_location(XlnxDPDMAState *s, uint8_t channel, */ void xlnx_dpdma_trigger_vsync_irq(XlnxDPDMAState *s); -#endif /* !XLNX_DPDMA_H */ +#endif /* XLNX_DPDMA_H */ diff --git a/include/hw/empty_slot.h b/include/hw/empty_slot.h index 6079602cdf..123a9f8989 100644 --- a/include/hw/empty_slot.h +++ b/include/hw/empty_slot.h @@ -1,5 +1,5 @@ #ifndef HW_EMPTY_SLOT_H -#define HW_EMPTY_SLOT_H 1 +#define HW_EMPTY_SLOT_H /* empty_slot.c */ void empty_slot_init(hwaddr addr, uint64_t slot_size); diff --git a/include/hw/fw-path-provider.h b/include/hw/fw-path-provider.h index 7afaec0b1d..050cb05d92 100644 --- a/include/hw/fw-path-provider.h +++ b/include/hw/fw-path-provider.h @@ -16,7 +16,7 @@ */ #ifndef FW_PATH_PROVIDER_H -#define FW_PATH_PROVIDER_H 1 +#define FW_PATH_PROVIDER_H #include "qemu-common.h" #include "qom/object.h" diff --git a/include/hw/i2c/pm_smbus.h b/include/hw/i2c/pm_smbus.h index 926603fdff..2a837afdcb 100644 --- a/include/hw/i2c/pm_smbus.h +++ b/include/hw/i2c/pm_smbus.h @@ -17,4 +17,4 @@ typedef struct PMSMBus { void pm_smbus_init(DeviceState *parent, PMSMBus *smb); -#endif /* !PM_SMBUS_H */ +#endif /* PM_SMBUS_H */ diff --git a/include/hw/i386/apic_internal.h b/include/hw/i386/apic_internal.h index 74fe935e8e..73ce71674f 100644 --- a/include/hw/i386/apic_internal.h +++ b/include/hw/i386/apic_internal.h @@ -17,6 +17,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, see <http://www.gnu.org/licenses/> */ + #ifndef QEMU_APIC_INTERNAL_H #define QEMU_APIC_INTERNAL_H @@ -222,4 +223,4 @@ static inline int apic_get_bit(uint32_t *tab, int index) return !!(tab[i] & mask); } -#endif /* !QEMU_APIC_INTERNAL_H */ +#endif /* QEMU_APIC_INTERNAL_H */ diff --git a/include/hw/i386/ioapic.h b/include/hw/i386/ioapic.h index 6245388c5d..9c8816f11f 100644 --- a/include/hw/i386/ioapic.h +++ b/include/hw/i386/ioapic.h @@ -25,4 +25,4 @@ void ioapic_eoi_broadcast(int vector); -#endif /* !HW_IOAPIC_H */ +#endif /* HW_IOAPIC_H */ diff --git a/include/hw/i386/ioapic_internal.h b/include/hw/i386/ioapic_internal.h index cab9e67ee7..0542aa1131 100644 --- a/include/hw/i386/ioapic_internal.h +++ b/include/hw/i386/ioapic_internal.h @@ -112,4 +112,4 @@ void ioapic_reset_common(DeviceState *dev); void ioapic_print_redtbl(Monitor *mon, IOAPICCommonState *s); -#endif /* !QEMU_IOAPIC_INTERNAL_H */ +#endif /* QEMU_IOAPIC_INTERNAL_H */ diff --git a/include/hw/input/ps2.h b/include/hw/input/ps2.h index 7c45ce7ced..b9ceee4154 100644 --- a/include/hw/input/ps2.h +++ b/include/hw/input/ps2.h @@ -35,4 +35,4 @@ void ps2_queue(void *, int b); void ps2_keyboard_set_translation(void *opaque, int mode); void ps2_mouse_fake_event(void *opaque); -#endif /* !HW_PS2_H */ +#endif /* HW_PS2_H */ diff --git a/include/hw/isa/i8257.h b/include/hw/isa/i8257.h index 8c44d36282..aa211c0df7 100644 --- a/include/hw/isa/i8257.h +++ b/include/hw/isa/i8257.h @@ -39,4 +39,3 @@ typedef struct I8257State { } I8257State; #endif - diff --git a/include/hw/isa/i8259_internal.h b/include/hw/isa/i8259_internal.h index cded509636..6954b6ec5f 100644 --- a/include/hw/isa/i8259_internal.h +++ b/include/hw/isa/i8259_internal.h @@ -80,4 +80,4 @@ void pic_reset_common(PICCommonState *s); ISADevice *i8259_init_chip(const char *name, ISABus *bus, bool master); -#endif /* !QEMU_I8259_INTERNAL_H */ +#endif /* QEMU_I8259_INTERNAL_H */ diff --git a/include/hw/nmi.h b/include/hw/nmi.h index b541772e1d..d092c684a1 100644 --- a/include/hw/nmi.h +++ b/include/hw/nmi.h @@ -20,7 +20,7 @@ */ #ifndef NMI_H -#define NMI_H 1 +#define NMI_H #include "qemu-common.h" #include "qom/object.h" diff --git a/include/hw/pci/pci_bridge.h b/include/hw/pci/pci_bridge.h index ed4aff6cd2..847fd7db33 100644 --- a/include/hw/pci/pci_bridge.h +++ b/include/hw/pci/pci_bridge.h @@ -67,4 +67,4 @@ void pci_bridge_map_irq(PCIBridge *br, const char* bus_name, #define PCI_BRIDGE_CTL_DISCARD_STATUS 0x400 /* Discard timer status */ #define PCI_BRIDGE_CTL_DISCARD_SERR 0x800 /* Discard timer SERR# enable */ -#endif /* QEMU_PCI_BRIDGE_H */ +#endif /* QEMU_PCI_BRIDGE_H */ diff --git a/include/hw/pci/pci_ids.h b/include/hw/pci/pci_ids.h index db85afa03e..d77ca60a0e 100644 --- a/include/hw/pci/pci_ids.h +++ b/include/hw/pci/pci_ids.h @@ -7,8 +7,9 @@ * * QEMU-specific definitions belong in pci.h */ + #ifndef HW_PCI_IDS_H -#define HW_PCI_IDS_H 1 +#define HW_PCI_IDS_H /* Device classes and subclasses */ diff --git a/include/hw/pcmcia.h b/include/hw/pcmcia.h index 98406ffbc9..79cac9c761 100644 --- a/include/hw/pcmcia.h +++ b/include/hw/pcmcia.h @@ -1,5 +1,5 @@ #ifndef HW_PCMCIA_H -#define HW_PCMCIA_H 1 +#define HW_PCMCIA_H /* PCMCIA/Cardbus */ diff --git a/include/hw/platform-bus.h b/include/hw/platform-bus.h index bd42b83809..a00775cba6 100644 --- a/include/hw/platform-bus.h +++ b/include/hw/platform-bus.h @@ -1,5 +1,5 @@ #ifndef HW_PLATFORM_BUS_H -#define HW_PLATFORM_BUS_H 1 +#define HW_PLATFORM_BUS_H /* * Platform Bus device to support dynamic Sysbus devices @@ -54,4 +54,4 @@ int platform_bus_get_irqn(PlatformBusDevice *platform_bus, SysBusDevice *sbdev, hwaddr platform_bus_get_mmio_addr(PlatformBusDevice *pbus, SysBusDevice *sbdev, int n); -#endif /* !HW_PLATFORM_BUS_H */ +#endif /* HW_PLATFORM_BUS_H */ diff --git a/include/hw/ppc/mac_dbdma.h b/include/hw/ppc/mac_dbdma.h index d15a6ccf3e..a8603877d7 100644 --- a/include/hw/ppc/mac_dbdma.h +++ b/include/hw/ppc/mac_dbdma.h @@ -19,8 +19,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ + #ifndef HW_MAC_DBDMA_H -#define HW_MAC_DBDMA_H 1 +#define HW_MAC_DBDMA_H #include "exec/memory.h" #include "qemu/iov.h" diff --git a/include/hw/ppc/ppc.h b/include/hw/ppc/ppc.h index 5617dc4a2c..520c72a08d 100644 --- a/include/hw/ppc/ppc.h +++ b/include/hw/ppc/ppc.h @@ -1,5 +1,5 @@ #ifndef HW_PPC_H -#define HW_PPC_H 1 +#define HW_PPC_H #include "target-ppc/cpu-qom.h" diff --git a/include/hw/smbios/smbios.h b/include/hw/smbios/smbios.h index ba3674609e..1cd53cc58c 100644 --- a/include/hw/smbios/smbios.h +++ b/include/hw/smbios/smbios.h @@ -1,5 +1,6 @@ #ifndef QEMU_SMBIOS_H #define QEMU_SMBIOS_H + /* * SMBIOS Support * @@ -266,4 +267,4 @@ void smbios_get_tables(const struct smbios_phys_mem_area *mem_array, const unsigned int mem_array_size, uint8_t **tables, size_t *tables_len, uint8_t **anchor, size_t *anchor_len); -#endif /*QEMU_SMBIOS_H */ +#endif /* QEMU_SMBIOS_H */ diff --git a/include/hw/stream.h b/include/hw/stream.h index 30ccc56203..c370ba0c66 100644 --- a/include/hw/stream.h +++ b/include/hw/stream.h @@ -1,5 +1,5 @@ #ifndef STREAM_H -#define STREAM_H 1 +#define STREAM_H #include "qemu-common.h" #include "qom/object.h" diff --git a/include/hw/sysbus.h b/include/hw/sysbus.h index a4959378d4..e73a5b21ac 100644 --- a/include/hw/sysbus.h +++ b/include/hw/sysbus.h @@ -1,5 +1,5 @@ #ifndef HW_SYSBUS_H -#define HW_SYSBUS_H 1 +#define HW_SYSBUS_H /* Devices attached directly to the main system bus. */ @@ -118,4 +118,4 @@ static inline DeviceState *sysbus_try_create_simple(const char *name, return sysbus_try_create_varargs(name, addr, irq, NULL); } -#endif /* !HW_SYSBUS_H */ +#endif /* HW_SYSBUS_H */ diff --git a/include/hw/timer/i8254.h b/include/hw/timer/i8254.h index 27a0fb6c51..5adae9fa44 100644 --- a/include/hw/timer/i8254.h +++ b/include/hw/timer/i8254.h @@ -80,4 +80,4 @@ static inline ISADevice *kvm_pit_init(ISABus *bus, int base) void pit_set_gate(ISADevice *dev, int channel, int val); void pit_get_channel_info(ISADevice *dev, int channel, PITChannelInfo *info); -#endif /* !HW_I8254_H */ +#endif /* HW_I8254_H */ diff --git a/include/hw/timer/i8254_internal.h b/include/hw/timer/i8254_internal.h index e7cb7573ca..dc09cc0467 100644 --- a/include/hw/timer/i8254_internal.h +++ b/include/hw/timer/i8254_internal.h @@ -73,4 +73,4 @@ void pit_get_channel_info_common(PITCommonState *s, PITChannelState *sc, PITChannelInfo *info); void pit_reset_common(PITCommonState *s); -#endif /* !QEMU_I8254_INTERNAL_H */ +#endif /* QEMU_I8254_INTERNAL_H */ diff --git a/include/hw/timer/mc146818rtc.h b/include/hw/timer/mc146818rtc.h index eaf649767f..7c8e64b203 100644 --- a/include/hw/timer/mc146818rtc.h +++ b/include/hw/timer/mc146818rtc.h @@ -10,4 +10,4 @@ ISADevice *rtc_init(ISABus *bus, int base_year, qemu_irq intercept_irq); void rtc_set_memory(ISADevice *dev, int addr, int val); int rtc_get_memory(ISADevice *dev, int addr); -#endif /* !MC146818RTC_H */ +#endif /* MC146818RTC_H */ diff --git a/include/hw/unicore32/puv3.h b/include/hw/unicore32/puv3.h index f37adcb665..5a4839f8df 100644 --- a/include/hw/unicore32/puv3.h +++ b/include/hw/unicore32/puv3.h @@ -8,6 +8,7 @@ * published by the Free Software Foundation, or any later version. * See the COPYING file in the top-level directory. */ + #ifndef QEMU_HW_PUV3_H #define QEMU_HW_PUV3_H @@ -46,4 +47,4 @@ #define DPRINTF(fmt, ...) do {} while (0) #endif -#endif /* !QEMU_HW_PUV3_H */ +#endif /* QEMU_HW_PUV3_H */ diff --git a/include/hw/usb/ehci-regs.h b/include/hw/usb/ehci-regs.h index 616f1b88cc..3e91b8e610 100644 --- a/include/hw/usb/ehci-regs.h +++ b/include/hw/usb/ehci-regs.h @@ -1,5 +1,5 @@ #ifndef HW_USB_EHCI_REGS_H -#define HW_USB_EHCI_REGS_H 1 +#define HW_USB_EHCI_REGS_H /* Capability Registers Base Address - section 2.2 */ #define CAPLENGTH 0x0000 /* 1-byte, 0x0001 reserved */ diff --git a/include/hw/usb/uhci-regs.h b/include/hw/usb/uhci-regs.h index c7315c5e1f..fd45d29db0 100644 --- a/include/hw/usb/uhci-regs.h +++ b/include/hw/usb/uhci-regs.h @@ -1,5 +1,5 @@ #ifndef HW_USB_UHCI_REGS_H -#define HW_USB_UHCI_REGS_H 1 +#define HW_USB_UHCI_REGS_H #define UHCI_CMD_FGR (1 << 4) #define UHCI_CMD_EGSM (1 << 3) diff --git a/include/hw/vfio/vfio-common.h b/include/hw/vfio/vfio-common.h index 07f7188df4..94dfae387a 100644 --- a/include/hw/vfio/vfio-common.h +++ b/include/hw/vfio/vfio-common.h @@ -17,6 +17,7 @@ * Copyright (C) 2008, Red Hat, Amit Shah (amit.shah@redhat.com) * Copyright (C) 2008, IBM, Muli Ben-Yehuda (muli@il.ibm.com) */ + #ifndef HW_VFIO_VFIO_COMMON_H #define HW_VFIO_VFIO_COMMON_H @@ -174,4 +175,4 @@ int vfio_spapr_create_window(VFIOContainer *container, int vfio_spapr_remove_window(VFIOContainer *container, hwaddr offset_within_address_space); -#endif /* !HW_VFIO_VFIO_COMMON_H */ +#endif /* HW_VFIO_VFIO_COMMON_H */ diff --git a/include/hw/vfio/vfio-platform.h b/include/hw/vfio/vfio-platform.h index b468f80b1e..9baaa2db09 100644 --- a/include/hw/vfio/vfio-platform.h +++ b/include/hw/vfio/vfio-platform.h @@ -74,4 +74,4 @@ typedef struct VFIOPlatformDeviceClass { #define VFIO_PLATFORM_DEVICE_GET_CLASS(obj) \ OBJECT_GET_CLASS(VFIOPlatformDeviceClass, (obj), TYPE_VFIO_PLATFORM) -#endif /*HW_VFIO_VFIO_PLATFORM_H*/ +#endif /* HW_VFIO_VFIO_PLATFORM_H */ diff --git a/include/hw/watchdog/wdt_diag288.h b/include/hw/watchdog/wdt_diag288.h index 7f3fd450dc..706d96b753 100644 --- a/include/hw/watchdog/wdt_diag288.h +++ b/include/hw/watchdog/wdt_diag288.h @@ -33,4 +33,4 @@ typedef struct DIAG288Class { uint64_t func, uint64_t timeout); } DIAG288Class; -#endif /* WDT_DIAG288_H */ +#endif /* WDT_DIAG288_H */ diff --git a/include/hw/xen/xen.h b/include/hw/xen/xen.h index b2cd992430..a8f3afb03b 100644 --- a/include/hw/xen/xen.h +++ b/include/hw/xen/xen.h @@ -1,5 +1,6 @@ #ifndef QEMU_HW_XEN_H -#define QEMU_HW_XEN_H 1 +#define QEMU_HW_XEN_H + /* * public xen header * stuff needed outside xen-*.c, i.e. interfaces to qemu. diff --git a/include/hw/xen/xen_backend.h b/include/hw/xen/xen_backend.h index 6e18a46a97..754c0a4ee6 100644 --- a/include/hw/xen/xen_backend.h +++ b/include/hw/xen/xen_backend.h @@ -1,5 +1,5 @@ #ifndef QEMU_HW_XEN_BACKEND_H -#define QEMU_HW_XEN_BACKEND_H 1 +#define QEMU_HW_XEN_BACKEND_H #include "hw/xen/xen_common.h" #include "sysemu/sysemu.h" diff --git a/include/hw/xen/xen_common.h b/include/hw/xen/xen_common.h index 5eabf37328..640c31e2c1 100644 --- a/include/hw/xen/xen_common.h +++ b/include/hw/xen/xen_common.h @@ -1,7 +1,5 @@ #ifndef QEMU_HW_XEN_COMMON_H -#define QEMU_HW_XEN_COMMON_H 1 - - +#define QEMU_HW_XEN_COMMON_H /* * If we have new enough libxenctrl then we do not want/need these compat diff --git a/include/migration/qemu-file.h b/include/migration/qemu-file.h index 2409a98967..abedd466c9 100644 --- a/include/migration/qemu-file.h +++ b/include/migration/qemu-file.h @@ -21,8 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ + #ifndef QEMU_FILE_H -#define QEMU_FILE_H 1 +#define QEMU_FILE_H + #include "qemu-common.h" #include "exec/cpu-common.h" #include "io/channel.h" diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h index 8e31b9b6ec..1638ee57f7 100644 --- a/include/migration/vmstate.h +++ b/include/migration/vmstate.h @@ -23,8 +23,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ + #ifndef QEMU_VMSTATE_H -#define QEMU_VMSTATE_H 1 +#define QEMU_VMSTATE_H #ifndef CONFIG_USER_ONLY #include "migration/qemu-file.h" diff --git a/include/monitor/monitor.h b/include/monitor/monitor.h index aa0f37320c..c5c9ea292f 100644 --- a/include/monitor/monitor.h +++ b/include/monitor/monitor.h @@ -51,4 +51,4 @@ int monitor_fdset_dup_fd_add(int64_t fdset_id, int dup_fd); void monitor_fdset_dup_fd_remove(int dup_fd); int monitor_fdset_dup_fd_find(int dup_fd); -#endif /* !MONITOR_H */ +#endif /* MONITOR_H */ diff --git a/include/qemu/bcd.h b/include/qemu/bcd.h index b4c9b64b8f..dfebacf1fc 100644 --- a/include/qemu/bcd.h +++ b/include/qemu/bcd.h @@ -1,5 +1,5 @@ #ifndef QEMU_BCD_H -#define QEMU_BCD_H 1 +#define QEMU_BCD_H /* Convert a byte between binary and BCD. */ static inline uint8_t to_bcd(uint8_t val) diff --git a/include/qemu/cutils.h b/include/qemu/cutils.h index db7adadcf9..3e4ea236f0 100644 --- a/include/qemu/cutils.h +++ b/include/qemu/cutils.h @@ -1,5 +1,5 @@ #ifndef QEMU_CUTILS_H -#define QEMU_CUTILS_H 1 +#define QEMU_CUTILS_H #include "qemu/fprintf-fn.h" diff --git a/include/qemu/fprintf-fn.h b/include/qemu/fprintf-fn.h index b6bad35b1b..9068a960b3 100644 --- a/include/qemu/fprintf-fn.h +++ b/include/qemu/fprintf-fn.h @@ -6,8 +6,7 @@ */ #ifndef QEMU_FPRINTF_FN_H -#define QEMU_FPRINTF_FN_H 1 - +#define QEMU_FPRINTF_FN_H typedef int (*fprintf_function)(FILE *f, const char *fmt, ...) GCC_FMT_ATTR(2, 3); diff --git a/include/qemu/hbitmap.h b/include/qemu/hbitmap.h index e29188c0ad..8ab721e5aa 100644 --- a/include/qemu/hbitmap.h +++ b/include/qemu/hbitmap.h @@ -10,7 +10,7 @@ */ #ifndef HBITMAP_H -#define HBITMAP_H 1 +#define HBITMAP_H #include "bitops.h" #include "host-utils.h" diff --git a/include/qemu/help_option.h b/include/qemu/help_option.h index e39a66e77b..328d2a89fd 100644 --- a/include/qemu/help_option.h +++ b/include/qemu/help_option.h @@ -1,5 +1,5 @@ #ifndef QEMU_HELP_OPTION_H -#define QEMU_HELP_OPTION_H 1 +#define QEMU_HELP_OPTION_H /** * is_help_option: diff --git a/include/qemu/host-utils.h b/include/qemu/host-utils.h index 3de7d4ec55..46187bbc7e 100644 --- a/include/qemu/host-utils.h +++ b/include/qemu/host-utils.h @@ -22,8 +22,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ + #ifndef HOST_UTILS_H -#define HOST_UTILS_H 1 +#define HOST_UTILS_H #include "qemu/bswap.h" diff --git a/include/qemu/id.h b/include/qemu/id.h index 7d90335afb..40c70103e4 100644 --- a/include/qemu/id.h +++ b/include/qemu/id.h @@ -1,5 +1,5 @@ #ifndef QEMU_ID_H -#define QEMU_ID_H 1 +#define QEMU_ID_H typedef enum IdSubSystems { ID_QDEV, diff --git a/include/qemu/main-loop.h b/include/qemu/main-loop.h index 19b5de3dd5..3fa7cfe574 100644 --- a/include/qemu/main-loop.h +++ b/include/qemu/main-loop.h @@ -23,7 +23,7 @@ */ #ifndef QEMU_MAIN_LOOP_H -#define QEMU_MAIN_LOOP_H 1 +#define QEMU_MAIN_LOOP_H #include "block/aio.h" diff --git a/include/qemu/path.h b/include/qemu/path.h index ed5fee086f..c6292a9709 100644 --- a/include/qemu/path.h +++ b/include/qemu/path.h @@ -1,5 +1,5 @@ #ifndef QEMU_PATH_H -#define QEMU_PATH_H 1 +#define QEMU_PATH_H void init_paths(const char *prefix); const char *path(const char *pathname); diff --git a/include/qemu/ratelimit.h b/include/qemu/ratelimit.h index d413a4a696..1e3cb13b28 100644 --- a/include/qemu/ratelimit.h +++ b/include/qemu/ratelimit.h @@ -12,7 +12,7 @@ */ #ifndef QEMU_RATELIMIT_H -#define QEMU_RATELIMIT_H 1 +#define QEMU_RATELIMIT_H typedef struct { int64_t next_slice_time; diff --git a/include/qemu/rcu_queue.h b/include/qemu/rcu_queue.h index 3aca7a57e3..01be77407b 100644 --- a/include/qemu/rcu_queue.h +++ b/include/qemu/rcu_queue.h @@ -131,4 +131,4 @@ extern "C" { #ifdef __cplusplus } #endif -#endif /* QEMU_RCU_QUEUE.H */ +#endif /* QEMU_RCU_QUEUE_H */ diff --git a/include/qemu/readline.h b/include/qemu/readline.h index 49efe4e39b..c08cf7400e 100644 --- a/include/qemu/readline.h +++ b/include/qemu/readline.h @@ -60,4 +60,4 @@ ReadLineState *readline_init(ReadLinePrintfFunc *printf_func, void *opaque, ReadLineCompletionFunc *completion_finder); -#endif /* !READLINE_H */ +#endif /* READLINE_H */ diff --git a/include/qemu/seqlock.h b/include/qemu/seqlock.h index 18eb3fda9d..2e2be4c4f0 100644 --- a/include/qemu/seqlock.h +++ b/include/qemu/seqlock.h @@ -10,8 +10,9 @@ * See the COPYING file in the top-level directory. * */ + #ifndef QEMU_SEQLOCK_H -#define QEMU_SEQLOCK_H 1 +#define QEMU_SEQLOCK_H #include "qemu/atomic.h" #include "qemu/thread.h" diff --git a/include/qemu/unicode.h b/include/qemu/unicode.h index d8731652d2..71c72db461 100644 --- a/include/qemu/unicode.h +++ b/include/qemu/unicode.h @@ -1,5 +1,5 @@ #ifndef QEMU_UNICODE_H -#define QEMU_UNICODE_H 1 +#define QEMU_UNICODE_H int mod_utf8_codepoint(const char *s, size_t n, char **end); diff --git a/include/sysemu/xen-mapcache.h b/include/sysemu/xen-mapcache.h index c849489fb2..b8c93b9bce 100644 --- a/include/sysemu/xen-mapcache.h +++ b/include/sysemu/xen-mapcache.h @@ -9,7 +9,6 @@ #ifndef XEN_MAPCACHE_H #define XEN_MAPCACHE_H - typedef hwaddr (*phys_offset_to_gaddr_t)(hwaddr start_addr, ram_addr_t size, void *opaque); @@ -52,4 +51,4 @@ static inline void xen_invalidate_map_cache(void) #endif -#endif /* !XEN_MAPCACHE_H */ +#endif /* XEN_MAPCACHE_H */ diff --git a/include/trace-tcg.h b/include/trace-tcg.h index 6f6bdbb44a..edab4b159c 100644 --- a/include/trace-tcg.h +++ b/include/trace-tcg.h @@ -4,4 +4,4 @@ #include "trace/generated-tcg-tracers.h" #include "trace/generated-events.h" -#endif /* TRACE_TCG_H */ +#endif /* TRACE_TCG_H */ diff --git a/include/trace.h b/include/trace.h index 44a1f1f8c7..9a01e4454b 100644 --- a/include/trace.h +++ b/include/trace.h @@ -4,4 +4,4 @@ #include "trace/generated-tracers.h" #include "trace/generated-events.h" -#endif /* TRACE_H */ +#endif /* TRACE_H */ diff --git a/linux-user/uname.h b/linux-user/uname.h index cc62e76cc1..4503094211 100644 --- a/linux-user/uname.h +++ b/linux-user/uname.h @@ -1,5 +1,5 @@ #ifndef UNAME_H -#define UNAME_H 1 +#define UNAME_H #include <sys/utsname.h> #include <linux/utsname.h> @@ -7,4 +7,4 @@ const char *cpu_to_uname_machine(void *cpu_env); int sys_uname(struct new_utsname *buf); -#endif /* UNAME _H */ +#endif /* UNAME_H */ diff --git a/net/tap-linux.h b/net/tap-linux.h index 1dc3a9f279..2f36d100fc 100644 --- a/net/tap-linux.h +++ b/net/tap-linux.h @@ -50,4 +50,4 @@ #define TUN_F_TSO_ECN 0x08 /* I can handle TSO with ECN bits. */ #define TUN_F_UFO 0x10 /* I can handle UFO packets */ -#endif /* QEMU_TAP_H */ +#endif /* QEMU_TAP_LINUX_H */ diff --git a/slirp/bootp.h b/slirp/bootp.h index ec3b68704c..394525733e 100644 --- a/slirp/bootp.h +++ b/slirp/bootp.h @@ -1,6 +1,7 @@ /* bootp/dhcp defines */ + #ifndef SLIRP_BOOTP_H -#define SLIRP_BOOTP_H 1 +#define SLIRP_BOOTP_H #define BOOTP_SERVER 67 #define BOOTP_CLIENT 68 diff --git a/slirp/main.h b/slirp/main.h index f2e58cfe2d..90053ce5ec 100644 --- a/slirp/main.h +++ b/slirp/main.h @@ -4,8 +4,9 @@ * Please read the file COPYRIGHT for the * terms and conditions of the copyright. */ + #ifndef SLIRP_MAIN_H -#define SLIRP_MAIN_H 1 +#define SLIRP_MAIN_H #ifdef HAVE_SYS_SELECT_H #include <sys/select.h> diff --git a/slirp/tftp.h b/slirp/tftp.h index 1cb1adf591..2cd276dec6 100644 --- a/slirp/tftp.h +++ b/slirp/tftp.h @@ -1,6 +1,7 @@ /* tftp defines */ + #ifndef SLIRP_TFTP_H -#define SLIRP_TFTP_H 1 +#define SLIRP_TFTP_H #define TFTP_SESSIONS_MAX 20 diff --git a/target-cris/crisv32-decode.h b/target-cris/crisv32-decode.h index cdba377817..cdc2f8cbe6 100644 --- a/target-cris/crisv32-decode.h +++ b/target-cris/crisv32-decode.h @@ -17,8 +17,9 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, see <http://www.gnu.org/licenses/>. */ + #ifndef CRISV32_DECODE_H -#define CRISV32_DECODE_H 1 +#define CRISV32_DECODE_H /* Convenient binary macros. */ #define HEX__(n) 0x##n##LU diff --git a/target-tricore/cpu-qom.h b/target-tricore/cpu-qom.h index 399c98f2d6..6a69756126 100644 --- a/target-tricore/cpu-qom.h +++ b/target-tricore/cpu-qom.h @@ -41,4 +41,4 @@ typedef struct TriCoreCPUClass { typedef struct TriCoreCPU TriCoreCPU; -#endif /*QEMU_TRICORE_CPU_QOM_H */ +#endif /* QEMU_TRICORE_CPU_QOM_H */ diff --git a/tcg/tci/tcg-target.h b/tcg/tci/tcg-target.h index 3942f9cccf..868228b2e7 100644 --- a/tcg/tci/tcg-target.h +++ b/tcg/tci/tcg-target.h @@ -37,10 +37,9 @@ * Therefore, we need both 32 and 64 bit virtual machines (interpreter). */ -#if !defined(TCG_TARGET_H) +#ifndef TCG_TARGET_H #define TCG_TARGET_H - #define TCG_TARGET_INTERPRETER 1 #define TCG_TARGET_INSN_UNIT_SIZE 1 #define TCG_TARGET_TLB_DISPLACEMENT_BITS 32 diff --git a/trace/control-internal.h b/trace/control-internal.h index dcf67f505a..deacc8f894 100644 --- a/trace/control-internal.h +++ b/trace/control-internal.h @@ -10,8 +10,6 @@ #ifndef TRACE__CONTROL_INTERNAL_H #define TRACE__CONTROL_INTERNAL_H - - extern TraceEvent trace_events[]; extern bool trace_events_dstate[]; extern int trace_events_enabled_count; @@ -72,4 +70,4 @@ static inline void trace_event_set_state_dynamic(TraceEvent *ev, bool state) trace_events_dstate[id] = state; } -#endif /* TRACE__CONTROL_INTERNAL_H */ +#endif /* TRACE__CONTROL_INTERNAL_H */ diff --git a/trace/control.h b/trace/control.h index a2dd3eaedf..452a800eb2 100644 --- a/trace/control.h +++ b/trace/control.h @@ -203,4 +203,4 @@ char *trace_opt_parse(const char *optarg); #include "trace/control-internal.h" -#endif /* TRACE__CONTROL_H */ +#endif /* TRACE__CONTROL_H */ diff --git a/trace/event-internal.h b/trace/event-internal.h index 86f6a511be..e4ea2e78a9 100644 --- a/trace/event-internal.h +++ b/trace/event-internal.h @@ -28,4 +28,4 @@ typedef struct TraceEvent { } TraceEvent; -#endif /* TRACE__EVENT_INTERNAL_H */ +#endif /* TRACE__EVENT_INTERNAL_H */ diff --git a/trace/ftrace.h b/trace/ftrace.h index 92372e3caa..cb5e35d217 100644 --- a/trace/ftrace.h +++ b/trace/ftrace.h @@ -1,8 +1,6 @@ #ifndef TRACE_FTRACE_H #define TRACE_FTRACE_H - - #define MAX_TRACE_STRLEN 512 #define _STR(x) #x #define STR(x) _STR(x) @@ -11,4 +9,4 @@ extern int trace_marker_fd; bool ftrace_init(void); -#endif /* ! TRACE_FTRACE_H */ +#endif /* TRACE_FTRACE_H */ diff --git a/trace/mem-internal.h b/trace/mem-internal.h index a75e0ff732..ddda934253 100644 --- a/trace/mem-internal.h +++ b/trace/mem-internal.h @@ -43,4 +43,4 @@ static inline uint8_t trace_mem_build_info( return res; } -#endif /* TRACE__MEM_INTERNAL_H */ +#endif /* TRACE__MEM_INTERNAL_H */ diff --git a/trace/mem.h b/trace/mem.h index c76a572689..9c88bcb4e6 100644 --- a/trace/mem.h +++ b/trace/mem.h @@ -31,4 +31,4 @@ static uint8_t trace_mem_build_info(TCGMemOp size, bool sign_extend, #include "trace/mem-internal.h" -#endif /* TRACE__MEM_H */ +#endif /* TRACE__MEM_H */ diff --git a/ui/curses_keys.h b/ui/curses_keys.h index f7467449b9..e39ef9e718 100644 --- a/ui/curses_keys.h +++ b/ui/curses_keys.h @@ -23,7 +23,7 @@ */ #ifndef QEMU_CURSES_KEYS_H -#define QEMU_CURSES_KEYS_H 1 +#define QEMU_CURSES_KEYS_H #include <curses.h> #include "keymaps.h" |