| Message ID | 20190315145123.28030-7-armbru@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Clean up #include "..." vs "<...>" and header guards | expand |
On 3/15/19 3:51 PM, Markus Armbruster wrote: > Leading 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. > > Done with scripts/clean-header-guards.pl. > > Signed-off-by: Markus Armbruster <armbru@redhat.com> > --- > block/crypto.h | 6 +++--- > hw/i386/amd_iommu.h | 4 ++-- > hw/tpm/tpm_ioctl.h | 7 ++++--- > hw/xtensa/xtensa_memory.h | 4 ++-- > include/authz/base.h | 7 +++---- > include/authz/list.h | 7 +++---- > include/authz/simple.h | 7 +++---- > include/chardev/spice.h | 4 ++-- > include/hw/ppc/pnv.h | 7 ++++--- > include/hw/ppc/pnv_core.h | 7 ++++--- > include/hw/ppc/pnv_lpc.h | 7 ++++--- > include/hw/ppc/pnv_occ.h | 7 ++++--- > include/hw/ppc/pnv_psi.h | 7 ++++--- > include/hw/ppc/pnv_xscom.h | 7 ++++--- > include/hw/ppc/spapr_ovec.h | 7 ++++--- > include/hw/timer/pl031.h | 4 ++-- > include/hw/virtio/vhost-vsock.h | 6 +++--- > include/hw/virtio/virtio-crypto.h | 6 +++--- > include/hw/xen/start_info.h | 6 +++--- > include/hw/xtensa/mx_pic.h | 4 ++-- > include/qemu/drm.h | 4 ++-- > include/qemu/jhash.h | 6 +++--- > include/sysemu/hvf.h | 5 +++-- > linux-user/xtensa/syscall_nr.h | 6 +++--- > linux-user/xtensa/target_structs.h | 4 ++-- > linux-user/xtensa/termbits.h | 6 +++--- > qga/vss-win32/vss-handles.h | 4 ++-- > slirp/src/debug.h | 6 +++--- > slirp/src/stream.h | 6 +++--- > slirp/src/util.h | 5 +++-- > slirp/src/vmstate.h | 5 +++-- > target/i386/hax-i386.h | 4 ++-- > target/i386/hax-interface.h | 4 ++-- > target/i386/hvf/hvf-i386.h | 4 ++-- > target/i386/hvf/vmcs.h | 4 ++-- > target/i386/hvf/x86_emu.h | 5 +++-- > target/i386/hvf/x86_flags.h | 7 ++++--- > target/i386/hvf/x86_mmu.h | 7 ++++--- > target/riscv/pmp.h | 4 ++-- > target/sparc/asi.h | 6 +++--- > tests/libqos/e1000e.h | 4 ++-- > tests/libqos/sdhci.h | 4 ++-- > 42 files changed, 121 insertions(+), 110 deletions(-) > > diff --git a/block/crypto.h b/block/crypto.h > index dd7d47903c..b935695e79 100644 > --- a/block/crypto.h > +++ b/block/crypto.h > @@ -18,8 +18,8 @@ > * > */ > > -#ifndef BLOCK_CRYPTO_H__ > -#define BLOCK_CRYPTO_H__ > +#ifndef BLOCK_CRYPTO_H > +#define BLOCK_CRYPTO_H > > #define BLOCK_CRYPTO_OPT_DEF_KEY_SECRET(prefix, helpstr) \ > { \ > @@ -94,4 +94,4 @@ block_crypto_create_opts_init(QDict *opts, Error **errp); > QCryptoBlockOpenOptions * > block_crypto_open_opts_init(QDict *opts, Error **errp); > > -#endif /* BLOCK_CRYPTO_H__ */ > +#endif /* BLOCK_CRYPTO_H */ > diff --git a/hw/i386/amd_iommu.h b/hw/i386/amd_iommu.h > index 0ff9095f32..3a694b186b 100644 > --- a/hw/i386/amd_iommu.h > +++ b/hw/i386/amd_iommu.h > @@ -18,8 +18,8 @@ > * with this program; if not, see <http://www.gnu.org/licenses/>. > */ > > -#ifndef AMD_IOMMU_H_ > -#define AMD_IOMMU_H_ > +#ifndef AMD_IOMMU_H > +#define AMD_IOMMU_H > > #include "hw/hw.h" > #include "hw/pci/pci.h" > diff --git a/hw/tpm/tpm_ioctl.h b/hw/tpm/tpm_ioctl.h > index 59a0b0595d..f5f5c553a9 100644 > --- a/hw/tpm/tpm_ioctl.h > +++ b/hw/tpm/tpm_ioctl.h > @@ -5,8 +5,9 @@ > * > * This file is licensed under the terms of the 3-clause BSD license > */ > -#ifndef _TPM_IOCTL_H_ > -#define _TPM_IOCTL_H_ > + > +#ifndef TPM_IOCTL_H > +#define TPM_IOCTL_H > > #include <sys/uio.h> > #include <sys/ioctl.h> > @@ -267,4 +268,4 @@ enum { > CMD_SET_BUFFERSIZE, > }; > > -#endif /* _TPM_IOCTL_H */ > +#endif /* TPM_IOCTL_H */ > diff --git a/hw/xtensa/xtensa_memory.h b/hw/xtensa/xtensa_memory.h > index e9aa08749d..89125c4a0d 100644 > --- a/hw/xtensa/xtensa_memory.h > +++ b/hw/xtensa/xtensa_memory.h > @@ -25,8 +25,8 @@ > * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > */ > > -#ifndef _XTENSA_MEMORY_H > -#define _XTENSA_MEMORY_H > +#ifndef XTENSA_MEMORY_H > +#define XTENSA_MEMORY_H > > #include "qemu-common.h" > #include "cpu.h" > diff --git a/include/authz/base.h b/include/authz/base.h > index 77dcd54c4c..05f1df845c 100644 > --- a/include/authz/base.h > +++ b/include/authz/base.h > @@ -18,8 +18,8 @@ > * > */ > > -#ifndef QAUTHZ_BASE_H__ > -#define QAUTHZ_BASE_H__ > +#ifndef QAUTHZ_BASE_H > +#define QAUTHZ_BASE_H > > #include "qemu-common.h" > #include "qapi/error.h" > @@ -108,5 +108,4 @@ bool qauthz_is_allowed_by_id(const char *authzid, > const char *identity, > Error **errp); > > -#endif /* QAUTHZ_BASE_H__ */ > - > +#endif /* QAUTHZ_BASE_H */ > diff --git a/include/authz/list.h b/include/authz/list.h > index a7225a747c..49c2c6bf02 100644 > --- a/include/authz/list.h > +++ b/include/authz/list.h > @@ -18,8 +18,8 @@ > * > */ > > -#ifndef QAUTHZ_LIST_H__ > -#define QAUTHZ_LIST_H__ > +#ifndef QAUTHZ_LIST_H > +#define QAUTHZ_LIST_H > > #include "authz/base.h" > #include "qapi/qapi-types-authz.h" > @@ -102,5 +102,4 @@ ssize_t qauthz_list_delete_rule(QAuthZList *auth, > const char *match); > > > -#endif /* QAUTHZ_LIST_H__ */ > - > +#endif /* QAUTHZ_LIST_H */ > diff --git a/include/authz/simple.h b/include/authz/simple.h > index ef13958269..45abfa1a90 100644 > --- a/include/authz/simple.h > +++ b/include/authz/simple.h > @@ -18,8 +18,8 @@ > * > */ > > -#ifndef QAUTHZ_SIMPLE_H__ > -#define QAUTHZ_SIMPLE_H__ > +#ifndef QAUTHZ_SIMPLE_H > +#define QAUTHZ_SIMPLE_H > > #include "authz/base.h" > > @@ -80,5 +80,4 @@ QAuthZSimple *qauthz_simple_new(const char *id, > Error **errp); > > > -#endif /* QAUTHZ_SIMPLE_H__ */ > - > +#endif /* QAUTHZ_SIMPLE_H */ > diff --git a/include/chardev/spice.h b/include/chardev/spice.h > index 6431da3205..1f7339b649 100644 > --- a/include/chardev/spice.h > +++ b/include/chardev/spice.h > @@ -1,5 +1,5 @@ > -#ifndef CHARDEV_SPICE_H_ > -#define CHARDEV_SPICE_H_ > +#ifndef CHARDEV_SPICE_H > +#define CHARDEV_SPICE_H > > #include <spice.h> > #include "chardev/char-fe.h" > diff --git a/include/hw/ppc/pnv.h b/include/hw/ppc/pnv.h > index e5b00d373e..fc4678f757 100644 > --- a/include/hw/ppc/pnv.h > +++ b/include/hw/ppc/pnv.h > @@ -16,8 +16,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 _PPC_PNV_H > -#define _PPC_PNV_H > + > +#ifndef PPC_PNV_H > +#define PPC_PNV_H > > #include "hw/boards.h" > #include "hw/sysbus.h" > @@ -255,4 +256,4 @@ void pnv_bmc_powerdown(IPMIBmc *bmc); > #define PNV9_PSIHB_ESB_SIZE 0x0000000000010000ull > #define PNV9_PSIHB_ESB_BASE(chip) PNV9_CHIP_BASE(chip, 0x00060302031c0000ull) > > -#endif /* _PPC_PNV_H */ > +#endif /* PPC_PNV_H */ > diff --git a/include/hw/ppc/pnv_core.h b/include/hw/ppc/pnv_core.h > index 50cdb2b358..d0926454a9 100644 > --- a/include/hw/ppc/pnv_core.h > +++ b/include/hw/ppc/pnv_core.h > @@ -16,8 +16,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 _PPC_PNV_CORE_H > -#define _PPC_PNV_CORE_H > + > +#ifndef PPC_PNV_CORE_H > +#define PPC_PNV_CORE_H > > #include "hw/cpu/core.h" > > @@ -68,4 +69,4 @@ typedef struct PnvQuad { > uint32_t id; > MemoryRegion xscom_regs; > } PnvQuad; > -#endif /* _PPC_PNV_CORE_H */ > +#endif /* PPC_PNV_CORE_H */ > diff --git a/include/hw/ppc/pnv_lpc.h b/include/hw/ppc/pnv_lpc.h > index 413579792e..f659410716 100644 > --- a/include/hw/ppc/pnv_lpc.h > +++ b/include/hw/ppc/pnv_lpc.h > @@ -16,8 +16,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 _PPC_PNV_LPC_H > -#define _PPC_PNV_LPC_H > + > +#ifndef PPC_PNV_LPC_H > +#define PPC_PNV_LPC_H > > #include "hw/ppc/pnv_psi.h" > > @@ -98,4 +99,4 @@ struct PnvChip; > ISABus *pnv_lpc_isa_create(PnvLpcController *lpc, bool use_cpld, Error **errp); > int pnv_dt_lpc(struct PnvChip *chip, void *fdt, int root_offset); > > -#endif /* _PPC_PNV_LPC_H */ > +#endif /* PPC_PNV_LPC_H */ > diff --git a/include/hw/ppc/pnv_occ.h b/include/hw/ppc/pnv_occ.h > index d22b65a71a..ed0709bfc0 100644 > --- a/include/hw/ppc/pnv_occ.h > +++ b/include/hw/ppc/pnv_occ.h > @@ -16,8 +16,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 _PPC_PNV_OCC_H > -#define _PPC_PNV_OCC_H > + > +#ifndef PPC_PNV_OCC_H > +#define PPC_PNV_OCC_H > > #include "hw/ppc/pnv_psi.h" > > @@ -52,4 +53,4 @@ typedef struct PnvOCCClass { > int psi_irq; > } PnvOCCClass; > > -#endif /* _PPC_PNV_OCC_H */ > +#endif /* PPC_PNV_OCC_H */ > diff --git a/include/hw/ppc/pnv_psi.h b/include/hw/ppc/pnv_psi.h > index 2c1b27e865..e82df9709f 100644 > --- a/include/hw/ppc/pnv_psi.h > +++ b/include/hw/ppc/pnv_psi.h > @@ -16,8 +16,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 _PPC_PNV_PSI_H > -#define _PPC_PNV_PSI_H > + > +#ifndef PPC_PNV_PSI_H > +#define PPC_PNV_PSI_H > > #include "hw/sysbus.h" > #include "hw/ppc/xics.h" > @@ -118,4 +119,4 @@ void pnv_psi_irq_set(PnvPsi *psi, int irq, bool state); > > void pnv_psi_pic_print_info(Pnv9Psi *psi, Monitor *mon); > > -#endif /* _PPC_PNV_PSI_H */ > +#endif /* PPC_PNV_PSI_H */ > diff --git a/include/hw/ppc/pnv_xscom.h b/include/hw/ppc/pnv_xscom.h > index 68dfae0dfe..c842d950d2 100644 > --- a/include/hw/ppc/pnv_xscom.h > +++ b/include/hw/ppc/pnv_xscom.h > @@ -16,8 +16,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 _PPC_PNV_XSCOM_H > -#define _PPC_PNV_XSCOM_H > + > +#ifndef PPC_PNV_XSCOM_H > +#define PPC_PNV_XSCOM_H > > #include "qom/object.h" > > @@ -98,4 +99,4 @@ extern void pnv_xscom_region_init(MemoryRegion *mr, > const char *name, > uint64_t size); > > -#endif /* _PPC_PNV_XSCOM_H */ > +#endif /* PPC_PNV_XSCOM_H */ > diff --git a/include/hw/ppc/spapr_ovec.h b/include/hw/ppc/spapr_ovec.h > index 188a9367e2..5de5ecf5de 100644 > --- a/include/hw/ppc/spapr_ovec.h > +++ b/include/hw/ppc/spapr_ovec.h > @@ -33,8 +33,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 _SPAPR_OVEC_H > -#define _SPAPR_OVEC_H > + > +#ifndef SPAPR_OVEC_H > +#define SPAPR_OVEC_H > > #include "cpu.h" > #include "migration/vmstate.h" > @@ -80,4 +81,4 @@ int spapr_ovec_populate_dt(void *fdt, int fdt_offset, > /* migration */ > extern const VMStateDescription vmstate_spapr_ovec; > > -#endif /* !defined (_SPAPR_OVEC_H) */ > +#endif /* SPAPR_OVEC_H */ > diff --git a/include/hw/timer/pl031.h b/include/hw/timer/pl031.h > index 99416d8ba5..8857c24ca5 100644 > --- a/include/hw/timer/pl031.h > +++ b/include/hw/timer/pl031.h > @@ -11,8 +11,8 @@ > * GNU GPL, version 2 or (at your option) any later version. > */ > > -#ifndef HW_TIMER_PL031 > -#define HW_TIMER_PL031 > +#ifndef HW_TIMER_PL031_H > +#define HW_TIMER_PL031_H > > #include "hw/sysbus.h" > > diff --git a/include/hw/virtio/vhost-vsock.h b/include/hw/virtio/vhost-vsock.h > index 7b9205fe3f..d509d67c4a 100644 > --- a/include/hw/virtio/vhost-vsock.h > +++ b/include/hw/virtio/vhost-vsock.h > @@ -11,8 +11,8 @@ > * top-level directory. > */ > > -#ifndef _QEMU_VHOST_VSOCK_H > -#define _QEMU_VHOST_VSOCK_H > +#ifndef QEMU_VHOST_VSOCK_H > +#define QEMU_VHOST_VSOCK_H > > #include "hw/virtio/virtio.h" > #include "hw/virtio/vhost.h" > @@ -38,4 +38,4 @@ typedef struct { > /*< public >*/ > } VHostVSock; > > -#endif /* _QEMU_VHOST_VSOCK_H */ > +#endif /* QEMU_VHOST_VSOCK_H */ > diff --git a/include/hw/virtio/virtio-crypto.h b/include/hw/virtio/virtio-crypto.h > index ca3a04938e..ffe2391ece 100644 > --- a/include/hw/virtio/virtio-crypto.h > +++ b/include/hw/virtio/virtio-crypto.h > @@ -11,8 +11,8 @@ > * top-level directory. > */ > > -#ifndef _QEMU_VIRTIO_CRYPTO_H > -#define _QEMU_VIRTIO_CRYPTO_H > +#ifndef QEMU_VIRTIO_CRYPTO_H > +#define QEMU_VIRTIO_CRYPTO_H > > #include "standard-headers/linux/virtio_crypto.h" > #include "hw/virtio/virtio.h" > @@ -99,4 +99,4 @@ typedef struct VirtIOCrypto { > uint8_t vhost_started; > } VirtIOCrypto; > > -#endif /* _QEMU_VIRTIO_CRYPTO_H */ > +#endif /* QEMU_VIRTIO_CRYPTO_H */ > diff --git a/include/hw/xen/start_info.h b/include/hw/xen/start_info.h > index 348779eb10..6ed4877794 100644 > --- a/include/hw/xen/start_info.h > +++ b/include/hw/xen/start_info.h > @@ -20,8 +20,8 @@ > * Copyright (c) 2016, Citrix Systems, Inc. > */ > > -#ifndef __XEN_PUBLIC_ARCH_X86_HVM_START_INFO_H__ > -#define __XEN_PUBLIC_ARCH_X86_HVM_START_INFO_H__ > +#ifndef XEN_PUBLIC_ARCH_X86_HVM_START_INFO_H > +#define XEN_PUBLIC_ARCH_X86_HVM_START_INFO_H > > /* > * Start of day structure passed to PVH guests and to HVM guests in %ebx. > @@ -143,4 +143,4 @@ struct hvm_memmap_table_entry { > uint32_t reserved; > }; > > -#endif /* __XEN_PUBLIC_ARCH_X86_HVM_START_INFO_H__ */ > +#endif /* XEN_PUBLIC_ARCH_X86_HVM_START_INFO_H */ > diff --git a/include/hw/xtensa/mx_pic.h b/include/hw/xtensa/mx_pic.h > index e6cd8cf016..c9ea9e737c 100644 > --- a/include/hw/xtensa/mx_pic.h > +++ b/include/hw/xtensa/mx_pic.h > @@ -25,8 +25,8 @@ > * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > */ > > -#ifndef _XTENSA_MX_PIC_H > -#define _XTENSA_MX_PIC_H > +#ifndef XTENSA_MX_PIC_H > +#define XTENSA_MX_PIC_H > > #include "exec/memory.h" > #include "hw/irq.h" > diff --git a/include/qemu/drm.h b/include/qemu/drm.h > index 4c3e622f5c..fab74d4be9 100644 > --- a/include/qemu/drm.h > +++ b/include/qemu/drm.h > @@ -1,5 +1,5 @@ > -#ifndef QEMU_DRM_H_ > -#define QEMU_DRM_H_ > +#ifndef QEMU_DRM_H > +#define QEMU_DRM_H > > int qemu_drm_rendernode_open(const char *rendernode); > > diff --git a/include/qemu/jhash.h b/include/qemu/jhash.h > index 7222242615..84d14dc7f7 100644 > --- a/include/qemu/jhash.h > +++ b/include/qemu/jhash.h > @@ -21,8 +21,8 @@ > * Jozsef > */ > > -#ifndef QEMU_JHASH_H__ > -#define QEMU_JHASH_H__ > +#ifndef QEMU_JHASH_H > +#define QEMU_JHASH_H > > #include "qemu/bitops.h" > > @@ -56,4 +56,4 @@ > /* An arbitrary initial parameter */ > #define JHASH_INITVAL 0xdeadbeef > > -#endif /* QEMU_JHASH_H__ */ > +#endif /* QEMU_JHASH_H */ > diff --git a/include/sysemu/hvf.h b/include/sysemu/hvf.h > index aaa51d2c51..300bf3e9a8 100644 > --- a/include/sysemu/hvf.h > +++ b/include/sysemu/hvf.h > @@ -9,8 +9,9 @@ > */ > > /* header to be included in non-HVF-specific code */ > -#ifndef _HVF_H > -#define _HVF_H > + > +#ifndef HVF_H > +#define HVF_H > > #include "qemu-common.h" > #include "qemu/bitops.h" > diff --git a/linux-user/xtensa/syscall_nr.h b/linux-user/xtensa/syscall_nr.h > index cd5ef45f84..27645bea47 100644 > --- a/linux-user/xtensa/syscall_nr.h > +++ b/linux-user/xtensa/syscall_nr.h > @@ -8,8 +8,8 @@ > * Copyright (C) 2001 - 2009 Tensilica Inc. > */ > > -#ifndef _XTENSA_UNISTD_H > -#define _XTENSA_UNISTD_H > +#ifndef XTENSA_SYSCALL_NR_H > +#define XTENSA_SYSCALL_NR_H > > #define TARGET_NR_spill 0 > #define TARGET_NR_xtensa 1 > @@ -434,4 +434,4 @@ > > #define TARGET_NR_syscall_count 352 > > -#endif /* _XTENSA_UNISTD_H */ > +#endif /* XTENSA_SYSCALL_NR_H */ > diff --git a/linux-user/xtensa/target_structs.h b/linux-user/xtensa/target_structs.h > index 1b3d9ca314..9cde6844b8 100644 > --- a/linux-user/xtensa/target_structs.h > +++ b/linux-user/xtensa/target_structs.h > @@ -1,5 +1,5 @@ > -#ifndef XTENSA_TARGET_STRUCTS_T > -#define XTENSA_TARGET_STRUCTS_T > +#ifndef XTENSA_TARGET_STRUCTS_H > +#define XTENSA_TARGET_STRUCTS_H > > struct target_ipc_perm { > abi_int __key; /* Key. */ > diff --git a/linux-user/xtensa/termbits.h b/linux-user/xtensa/termbits.h > index eed8286de7..d1e09e61a6 100644 > --- a/linux-user/xtensa/termbits.h > +++ b/linux-user/xtensa/termbits.h > @@ -10,8 +10,8 @@ > * Copyright (C) 2001 - 2005 Tensilica Inc. > */ > > -#ifndef _XTENSA_TERMBITS_H > -#define _XTENSA_TERMBITS_H > +#ifndef XTENSA_TERMBITS_H > +#define XTENSA_TERMBITS_H > > #include <linux/posix_types.h> > > @@ -325,4 +325,4 @@ struct target_ktermios { > > #define TARGET_TIOCMIWAIT _IO('T', 92) /* wait for a change on serial input line(s) */ > #define TARGET_TIOCGICOUNT 0x545D /* read serial port inline interrupt counts */ > -#endif /* _XTENSA_TERMBITS_H */ > +#endif /* XTENSA_TERMBITS_H */ > diff --git a/qga/vss-win32/vss-handles.h b/qga/vss-win32/vss-handles.h > index ff399dd73a..0f8a741ad2 100644 > --- a/qga/vss-win32/vss-handles.h > +++ b/qga/vss-win32/vss-handles.h > @@ -1,5 +1,5 @@ > -#ifndef VSS_HANDLES > -#define VSS_HANDLES > +#ifndef VSS_HANDLES_H > +#define VSS_HANDLES_H > > /* Constants for QGA VSS Provider */ > > diff --git a/slirp/src/debug.h b/slirp/src/debug.h > index 44d922df37..bb83bafc1b 100644 > --- a/slirp/src/debug.h > +++ b/slirp/src/debug.h > @@ -5,8 +5,8 @@ > * terms and conditions of the copyright. > */ > > -#ifndef DEBUG_H_ > -#define DEBUG_H_ > +#ifndef DEBUG_H > +#define DEBUG_H > > #define DBG_CALL (1 << 0) > #define DBG_MISC (1 << 1) > @@ -45,4 +45,4 @@ extern int slirp_debug; > } \ > } while (0) > > -#endif /* DEBUG_H_ */ > +#endif /* DEBUG_H */ > diff --git a/slirp/src/stream.h b/slirp/src/stream.h > index 985334c043..a4cf870af9 100644 > --- a/slirp/src/stream.h > +++ b/slirp/src/stream.h > @@ -1,5 +1,5 @@ > -#ifndef STREAM_H_ > -#define STREAM_H_ > +#ifndef STREAM_H > +#define STREAM_H > > #include "libslirp.h" > > @@ -31,4 +31,4 @@ bool slirp_ostream_write_i16(SlirpOStream *f, int16_t b); > int32_t slirp_istream_read_i32(SlirpIStream *f); > bool slirp_ostream_write_i32(SlirpOStream *f, int32_t b); > > -#endif /* STREAM_H_ */ > +#endif /* STREAM_H */ > diff --git a/slirp/src/util.h b/slirp/src/util.h > index e94ee4e7f1..69b3f0a6bd 100644 > --- a/slirp/src/util.h > +++ b/slirp/src/util.h > @@ -20,8 +20,9 @@ > * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN > * THE SOFTWARE. > */ > -#ifndef UTIL_H_ > -#define UTIL_H_ > + > +#ifndef UTIL_H > +#define UTIL_H > > #include <stdlib.h> > #include <stdio.h> > diff --git a/slirp/src/vmstate.h b/slirp/src/vmstate.h > index cfa7b8c825..ca271f53ec 100644 > --- a/slirp/src/vmstate.h > +++ b/slirp/src/vmstate.h > @@ -23,8 +23,9 @@ > * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN > * THE SOFTWARE. > */ > -#ifndef VMSTATE_H_ > -#define VMSTATE_H_ > + > +#ifndef VMSTATE_H > +#define VMSTATE_H > > #include <unistd.h> > #include <stdint.h> > diff --git a/target/i386/hax-i386.h b/target/i386/hax-i386.h > index f13fa4638f..54e9d8b057 100644 > --- a/target/i386/hax-i386.h > +++ b/target/i386/hax-i386.h > @@ -10,8 +10,8 @@ > * > */ > > -#ifndef _HAX_I386_H > -#define _HAX_I386_H > +#ifndef HAX_I386_H > +#define HAX_I386_H > > #include "cpu.h" > #include "sysemu/hax.h" > diff --git a/target/i386/hax-interface.h b/target/i386/hax-interface.h > index 93d5fcb1dc..537ae084e9 100644 > --- a/target/i386/hax-interface.h > +++ b/target/i386/hax-interface.h > @@ -14,8 +14,8 @@ > > /* Interface with HAX kernel module */ > > -#ifndef _HAX_INTERFACE_H > -#define _HAX_INTERFACE_H > +#ifndef HAX_INTERFACE_H > +#define HAX_INTERFACE_H > > /* fx_layout has 3 formats table 3-56, 512bytes */ > struct fx_layout { > diff --git a/target/i386/hvf/hvf-i386.h b/target/i386/hvf/hvf-i386.h > index 2232501552..15ee4835cf 100644 > --- a/target/i386/hvf/hvf-i386.h > +++ b/target/i386/hvf/hvf-i386.h > @@ -13,8 +13,8 @@ > * > */ > > -#ifndef _HVF_I386_H > -#define _HVF_I386_H > +#ifndef HVF_I386_H > +#define HVF_I386_H > > #include "sysemu/hvf.h" > #include "cpu.h" > diff --git a/target/i386/hvf/vmcs.h b/target/i386/hvf/vmcs.h > index 2a8c0424a5..42de7ebc3a 100644 > --- a/target/i386/hvf/vmcs.h > +++ b/target/i386/hvf/vmcs.h > @@ -26,8 +26,8 @@ > * $FreeBSD$ > */ > > -#ifndef _VMCS_H_ > -#define _VMCS_H_ > +#ifndef VMCS_H > +#define VMCS_H Can we use HVF_VMCS_H? Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> > > #include <Hypervisor/hv.h> > #include <Hypervisor/hv_vmx.h> > diff --git a/target/i386/hvf/x86_emu.h b/target/i386/hvf/x86_emu.h > index fbb4832576..f92a9c54b5 100644 > --- a/target/i386/hvf/x86_emu.h > +++ b/target/i386/hvf/x86_emu.h > @@ -15,8 +15,9 @@ > * You should have received a copy of the GNU Lesser General Public > * License along with this program; if not, see <http://www.gnu.org/licenses/>. > */ > -#ifndef __X86_EMU_H__ > -#define __X86_EMU_H__ > + > +#ifndef X86_EMU_H > +#define X86_EMU_H Similarly HVF_... and so on. > > #include "x86.h" > #include "x86_decode.h" > diff --git a/target/i386/hvf/x86_flags.h b/target/i386/hvf/x86_flags.h > index 8942745988..785e80cfca 100644 > --- a/target/i386/hvf/x86_flags.h > +++ b/target/i386/hvf/x86_flags.h > @@ -20,8 +20,9 @@ > /* > * x86 eflags functions > */ > -#ifndef __X86_FLAGS_H__ > -#define __X86_FLAGS_H__ > + > +#ifndef X86_FLAGS_H > +#define X86_FLAGS_H > > #include "cpu.h" > void lflags_to_rflags(CPUX86State *env); > @@ -77,4 +78,4 @@ void SET_FLAGS_OSZAPC_LOGIC16(CPUX86State *env, uint16_t v1, uint16_t v2, > void SET_FLAGS_OSZAPC_LOGIC8(CPUX86State *env, uint8_t v1, uint8_t v2, > uint8_t diff); > > -#endif /* __X86_FLAGS_H__ */ > +#endif /* X86_FLAGS_H */ > diff --git a/target/i386/hvf/x86_mmu.h b/target/i386/hvf/x86_mmu.h > index 0bd1acc94f..cd6e137e79 100644 > --- a/target/i386/hvf/x86_mmu.h > +++ b/target/i386/hvf/x86_mmu.h > @@ -15,8 +15,9 @@ > * You should have received a copy of the GNU Lesser General Public > * License along with this program; if not, see <http://www.gnu.org/licenses/>. > */ > -#ifndef __X86_MMU_H__ > -#define __X86_MMU_H__ > + > +#ifndef X86_MMU_H > +#define X86_MMU_H > > #define PT_PRESENT (1 << 0) > #define PT_WRITE (1 << 1) > @@ -40,4 +41,4 @@ bool mmu_gva_to_gpa(struct CPUState *cpu, target_ulong gva, uint64_t *gpa); > void vmx_write_mem(struct CPUState *cpu, target_ulong gva, void *data, int bytes); > void vmx_read_mem(struct CPUState *cpu, void *data, target_ulong gva, int bytes); > > -#endif /* __X86_MMU_H__ */ > +#endif /* X86_MMU_H */ > diff --git a/target/riscv/pmp.h b/target/riscv/pmp.h > index e3953c885f..66790950eb 100644 > --- a/target/riscv/pmp.h > +++ b/target/riscv/pmp.h > @@ -19,8 +19,8 @@ > * this program. If not, see <http://www.gnu.org/licenses/>. > */ > > -#ifndef _RISCV_PMP_H_ > -#define _RISCV_PMP_H_ > +#ifndef RISCV_PMP_H > +#define RISCV_PMP_H > > typedef enum { > PMP_READ = 1 << 0, > diff --git a/target/sparc/asi.h b/target/sparc/asi.h > index d8d6284125..bb58735ddb 100644 > --- a/target/sparc/asi.h > +++ b/target/sparc/asi.h > @@ -1,5 +1,5 @@ > -#ifndef _SPARC_ASI_H > -#define _SPARC_ASI_H > +#ifndef SPARC_ASI_H > +#define SPARC_ASI_H > > /* asi.h: Address Space Identifier values for the sparc. > * > @@ -309,4 +309,4 @@ > * implicit, little-endian > */ > > -#endif /* _SPARC_ASI_H */ > +#endif /* SPARC_ASI_H */ > diff --git a/tests/libqos/e1000e.h b/tests/libqos/e1000e.h > index 9d37094f43..dc4ab10f58 100644 > --- a/tests/libqos/e1000e.h > +++ b/tests/libqos/e1000e.h > @@ -16,8 +16,8 @@ > * License along with this library; if not, see <http://www.gnu.org/licenses/> > */ > > -#ifndef QGRAPH_E1000E > -#define QGRAPH_E1000E > +#ifndef QGRAPH_E1000E_H > +#define QGRAPH_E1000E_H > > #include "libqos/qgraph.h" > #include "pci.h" > diff --git a/tests/libqos/sdhci.h b/tests/libqos/sdhci.h > index 032d815c38..a88b45ae9d 100644 > --- a/tests/libqos/sdhci.h > +++ b/tests/libqos/sdhci.h > @@ -16,8 +16,8 @@ > * License along with this library; if not, see <http://www.gnu.org/licenses/> > */ > > -#ifndef QGRAPH_QSDHCI > -#define QGRAPH_QSDHCI > +#ifndef QGRAPH_QSDHCI_H > +#define QGRAPH_QSDHCI_H > > #include "libqos/qgraph.h" > #include "pci.h" >
Philippe Mathieu-Daudé <philmd@redhat.com> writes: > On 3/15/19 3:51 PM, Markus Armbruster wrote: >> Leading 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. >> >> Done with scripts/clean-header-guards.pl. >> >> Signed-off-by: Markus Armbruster <armbru@redhat.com> >> --- >> block/crypto.h | 6 +++--- >> hw/i386/amd_iommu.h | 4 ++-- >> hw/tpm/tpm_ioctl.h | 7 ++++--- >> hw/xtensa/xtensa_memory.h | 4 ++-- >> include/authz/base.h | 7 +++---- >> include/authz/list.h | 7 +++---- >> include/authz/simple.h | 7 +++---- >> include/chardev/spice.h | 4 ++-- >> include/hw/ppc/pnv.h | 7 ++++--- >> include/hw/ppc/pnv_core.h | 7 ++++--- >> include/hw/ppc/pnv_lpc.h | 7 ++++--- >> include/hw/ppc/pnv_occ.h | 7 ++++--- >> include/hw/ppc/pnv_psi.h | 7 ++++--- >> include/hw/ppc/pnv_xscom.h | 7 ++++--- >> include/hw/ppc/spapr_ovec.h | 7 ++++--- >> include/hw/timer/pl031.h | 4 ++-- >> include/hw/virtio/vhost-vsock.h | 6 +++--- >> include/hw/virtio/virtio-crypto.h | 6 +++--- >> include/hw/xen/start_info.h | 6 +++--- >> include/hw/xtensa/mx_pic.h | 4 ++-- >> include/qemu/drm.h | 4 ++-- >> include/qemu/jhash.h | 6 +++--- >> include/sysemu/hvf.h | 5 +++-- >> linux-user/xtensa/syscall_nr.h | 6 +++--- >> linux-user/xtensa/target_structs.h | 4 ++-- >> linux-user/xtensa/termbits.h | 6 +++--- >> qga/vss-win32/vss-handles.h | 4 ++-- >> slirp/src/debug.h | 6 +++--- >> slirp/src/stream.h | 6 +++--- >> slirp/src/util.h | 5 +++-- >> slirp/src/vmstate.h | 5 +++-- >> target/i386/hax-i386.h | 4 ++-- >> target/i386/hax-interface.h | 4 ++-- >> target/i386/hvf/hvf-i386.h | 4 ++-- >> target/i386/hvf/vmcs.h | 4 ++-- >> target/i386/hvf/x86_emu.h | 5 +++-- >> target/i386/hvf/x86_flags.h | 7 ++++--- >> target/i386/hvf/x86_mmu.h | 7 ++++--- >> target/riscv/pmp.h | 4 ++-- >> target/sparc/asi.h | 6 +++--- >> tests/libqos/e1000e.h | 4 ++-- >> tests/libqos/sdhci.h | 4 ++-- >> 42 files changed, 121 insertions(+), 110 deletions(-) >> >> diff --git a/block/crypto.h b/block/crypto.h >> index dd7d47903c..b935695e79 100644 >> --- a/block/crypto.h >> +++ b/block/crypto.h >> @@ -18,8 +18,8 @@ >> * >> */ >> >> -#ifndef BLOCK_CRYPTO_H__ >> -#define BLOCK_CRYPTO_H__ >> +#ifndef BLOCK_CRYPTO_H >> +#define BLOCK_CRYPTO_H >> >> #define BLOCK_CRYPTO_OPT_DEF_KEY_SECRET(prefix, helpstr) \ >> { \ >> @@ -94,4 +94,4 @@ block_crypto_create_opts_init(QDict *opts, Error **errp); >> QCryptoBlockOpenOptions * >> block_crypto_open_opts_init(QDict *opts, Error **errp); >> >> -#endif /* BLOCK_CRYPTO_H__ */ >> +#endif /* BLOCK_CRYPTO_H */ >> diff --git a/hw/i386/amd_iommu.h b/hw/i386/amd_iommu.h >> index 0ff9095f32..3a694b186b 100644 >> --- a/hw/i386/amd_iommu.h >> +++ b/hw/i386/amd_iommu.h >> @@ -18,8 +18,8 @@ >> * with this program; if not, see <http://www.gnu.org/licenses/>. >> */ >> >> -#ifndef AMD_IOMMU_H_ >> -#define AMD_IOMMU_H_ >> +#ifndef AMD_IOMMU_H >> +#define AMD_IOMMU_H >> >> #include "hw/hw.h" >> #include "hw/pci/pci.h" >> diff --git a/hw/tpm/tpm_ioctl.h b/hw/tpm/tpm_ioctl.h >> index 59a0b0595d..f5f5c553a9 100644 >> --- a/hw/tpm/tpm_ioctl.h >> +++ b/hw/tpm/tpm_ioctl.h >> @@ -5,8 +5,9 @@ >> * >> * This file is licensed under the terms of the 3-clause BSD license >> */ >> -#ifndef _TPM_IOCTL_H_ >> -#define _TPM_IOCTL_H_ >> + >> +#ifndef TPM_IOCTL_H >> +#define TPM_IOCTL_H >> >> #include <sys/uio.h> >> #include <sys/ioctl.h> >> @@ -267,4 +268,4 @@ enum { >> CMD_SET_BUFFERSIZE, >> }; >> >> -#endif /* _TPM_IOCTL_H */ >> +#endif /* TPM_IOCTL_H */ >> diff --git a/hw/xtensa/xtensa_memory.h b/hw/xtensa/xtensa_memory.h >> index e9aa08749d..89125c4a0d 100644 >> --- a/hw/xtensa/xtensa_memory.h >> +++ b/hw/xtensa/xtensa_memory.h >> @@ -25,8 +25,8 @@ >> * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. >> */ >> >> -#ifndef _XTENSA_MEMORY_H >> -#define _XTENSA_MEMORY_H >> +#ifndef XTENSA_MEMORY_H >> +#define XTENSA_MEMORY_H >> >> #include "qemu-common.h" >> #include "cpu.h" >> diff --git a/include/authz/base.h b/include/authz/base.h >> index 77dcd54c4c..05f1df845c 100644 >> --- a/include/authz/base.h >> +++ b/include/authz/base.h >> @@ -18,8 +18,8 @@ >> * >> */ >> >> -#ifndef QAUTHZ_BASE_H__ >> -#define QAUTHZ_BASE_H__ >> +#ifndef QAUTHZ_BASE_H >> +#define QAUTHZ_BASE_H >> >> #include "qemu-common.h" >> #include "qapi/error.h" >> @@ -108,5 +108,4 @@ bool qauthz_is_allowed_by_id(const char *authzid, >> const char *identity, >> Error **errp); >> >> -#endif /* QAUTHZ_BASE_H__ */ >> - >> +#endif /* QAUTHZ_BASE_H */ >> diff --git a/include/authz/list.h b/include/authz/list.h >> index a7225a747c..49c2c6bf02 100644 >> --- a/include/authz/list.h >> +++ b/include/authz/list.h >> @@ -18,8 +18,8 @@ >> * >> */ >> >> -#ifndef QAUTHZ_LIST_H__ >> -#define QAUTHZ_LIST_H__ >> +#ifndef QAUTHZ_LIST_H >> +#define QAUTHZ_LIST_H >> >> #include "authz/base.h" >> #include "qapi/qapi-types-authz.h" >> @@ -102,5 +102,4 @@ ssize_t qauthz_list_delete_rule(QAuthZList *auth, >> const char *match); >> >> >> -#endif /* QAUTHZ_LIST_H__ */ >> - >> +#endif /* QAUTHZ_LIST_H */ >> diff --git a/include/authz/simple.h b/include/authz/simple.h >> index ef13958269..45abfa1a90 100644 >> --- a/include/authz/simple.h >> +++ b/include/authz/simple.h >> @@ -18,8 +18,8 @@ >> * >> */ >> >> -#ifndef QAUTHZ_SIMPLE_H__ >> -#define QAUTHZ_SIMPLE_H__ >> +#ifndef QAUTHZ_SIMPLE_H >> +#define QAUTHZ_SIMPLE_H >> >> #include "authz/base.h" >> >> @@ -80,5 +80,4 @@ QAuthZSimple *qauthz_simple_new(const char *id, >> Error **errp); >> >> >> -#endif /* QAUTHZ_SIMPLE_H__ */ >> - >> +#endif /* QAUTHZ_SIMPLE_H */ >> diff --git a/include/chardev/spice.h b/include/chardev/spice.h >> index 6431da3205..1f7339b649 100644 >> --- a/include/chardev/spice.h >> +++ b/include/chardev/spice.h >> @@ -1,5 +1,5 @@ >> -#ifndef CHARDEV_SPICE_H_ >> -#define CHARDEV_SPICE_H_ >> +#ifndef CHARDEV_SPICE_H >> +#define CHARDEV_SPICE_H >> >> #include <spice.h> >> #include "chardev/char-fe.h" >> diff --git a/include/hw/ppc/pnv.h b/include/hw/ppc/pnv.h >> index e5b00d373e..fc4678f757 100644 >> --- a/include/hw/ppc/pnv.h >> +++ b/include/hw/ppc/pnv.h >> @@ -16,8 +16,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 _PPC_PNV_H >> -#define _PPC_PNV_H >> + >> +#ifndef PPC_PNV_H >> +#define PPC_PNV_H >> >> #include "hw/boards.h" >> #include "hw/sysbus.h" >> @@ -255,4 +256,4 @@ void pnv_bmc_powerdown(IPMIBmc *bmc); >> #define PNV9_PSIHB_ESB_SIZE 0x0000000000010000ull >> #define PNV9_PSIHB_ESB_BASE(chip) PNV9_CHIP_BASE(chip, 0x00060302031c0000ull) >> >> -#endif /* _PPC_PNV_H */ >> +#endif /* PPC_PNV_H */ >> diff --git a/include/hw/ppc/pnv_core.h b/include/hw/ppc/pnv_core.h >> index 50cdb2b358..d0926454a9 100644 >> --- a/include/hw/ppc/pnv_core.h >> +++ b/include/hw/ppc/pnv_core.h >> @@ -16,8 +16,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 _PPC_PNV_CORE_H >> -#define _PPC_PNV_CORE_H >> + >> +#ifndef PPC_PNV_CORE_H >> +#define PPC_PNV_CORE_H >> >> #include "hw/cpu/core.h" >> >> @@ -68,4 +69,4 @@ typedef struct PnvQuad { >> uint32_t id; >> MemoryRegion xscom_regs; >> } PnvQuad; >> -#endif /* _PPC_PNV_CORE_H */ >> +#endif /* PPC_PNV_CORE_H */ >> diff --git a/include/hw/ppc/pnv_lpc.h b/include/hw/ppc/pnv_lpc.h >> index 413579792e..f659410716 100644 >> --- a/include/hw/ppc/pnv_lpc.h >> +++ b/include/hw/ppc/pnv_lpc.h >> @@ -16,8 +16,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 _PPC_PNV_LPC_H >> -#define _PPC_PNV_LPC_H >> + >> +#ifndef PPC_PNV_LPC_H >> +#define PPC_PNV_LPC_H >> >> #include "hw/ppc/pnv_psi.h" >> >> @@ -98,4 +99,4 @@ struct PnvChip; >> ISABus *pnv_lpc_isa_create(PnvLpcController *lpc, bool use_cpld, Error **errp); >> int pnv_dt_lpc(struct PnvChip *chip, void *fdt, int root_offset); >> >> -#endif /* _PPC_PNV_LPC_H */ >> +#endif /* PPC_PNV_LPC_H */ >> diff --git a/include/hw/ppc/pnv_occ.h b/include/hw/ppc/pnv_occ.h >> index d22b65a71a..ed0709bfc0 100644 >> --- a/include/hw/ppc/pnv_occ.h >> +++ b/include/hw/ppc/pnv_occ.h >> @@ -16,8 +16,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 _PPC_PNV_OCC_H >> -#define _PPC_PNV_OCC_H >> + >> +#ifndef PPC_PNV_OCC_H >> +#define PPC_PNV_OCC_H >> >> #include "hw/ppc/pnv_psi.h" >> >> @@ -52,4 +53,4 @@ typedef struct PnvOCCClass { >> int psi_irq; >> } PnvOCCClass; >> >> -#endif /* _PPC_PNV_OCC_H */ >> +#endif /* PPC_PNV_OCC_H */ >> diff --git a/include/hw/ppc/pnv_psi.h b/include/hw/ppc/pnv_psi.h >> index 2c1b27e865..e82df9709f 100644 >> --- a/include/hw/ppc/pnv_psi.h >> +++ b/include/hw/ppc/pnv_psi.h >> @@ -16,8 +16,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 _PPC_PNV_PSI_H >> -#define _PPC_PNV_PSI_H >> + >> +#ifndef PPC_PNV_PSI_H >> +#define PPC_PNV_PSI_H >> >> #include "hw/sysbus.h" >> #include "hw/ppc/xics.h" >> @@ -118,4 +119,4 @@ void pnv_psi_irq_set(PnvPsi *psi, int irq, bool state); >> >> void pnv_psi_pic_print_info(Pnv9Psi *psi, Monitor *mon); >> >> -#endif /* _PPC_PNV_PSI_H */ >> +#endif /* PPC_PNV_PSI_H */ >> diff --git a/include/hw/ppc/pnv_xscom.h b/include/hw/ppc/pnv_xscom.h >> index 68dfae0dfe..c842d950d2 100644 >> --- a/include/hw/ppc/pnv_xscom.h >> +++ b/include/hw/ppc/pnv_xscom.h >> @@ -16,8 +16,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 _PPC_PNV_XSCOM_H >> -#define _PPC_PNV_XSCOM_H >> + >> +#ifndef PPC_PNV_XSCOM_H >> +#define PPC_PNV_XSCOM_H >> >> #include "qom/object.h" >> >> @@ -98,4 +99,4 @@ extern void pnv_xscom_region_init(MemoryRegion *mr, >> const char *name, >> uint64_t size); >> >> -#endif /* _PPC_PNV_XSCOM_H */ >> +#endif /* PPC_PNV_XSCOM_H */ >> diff --git a/include/hw/ppc/spapr_ovec.h b/include/hw/ppc/spapr_ovec.h >> index 188a9367e2..5de5ecf5de 100644 >> --- a/include/hw/ppc/spapr_ovec.h >> +++ b/include/hw/ppc/spapr_ovec.h >> @@ -33,8 +33,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 _SPAPR_OVEC_H >> -#define _SPAPR_OVEC_H >> + >> +#ifndef SPAPR_OVEC_H >> +#define SPAPR_OVEC_H >> >> #include "cpu.h" >> #include "migration/vmstate.h" >> @@ -80,4 +81,4 @@ int spapr_ovec_populate_dt(void *fdt, int fdt_offset, >> /* migration */ >> extern const VMStateDescription vmstate_spapr_ovec; >> >> -#endif /* !defined (_SPAPR_OVEC_H) */ >> +#endif /* SPAPR_OVEC_H */ >> diff --git a/include/hw/timer/pl031.h b/include/hw/timer/pl031.h >> index 99416d8ba5..8857c24ca5 100644 >> --- a/include/hw/timer/pl031.h >> +++ b/include/hw/timer/pl031.h >> @@ -11,8 +11,8 @@ >> * GNU GPL, version 2 or (at your option) any later version. >> */ >> >> -#ifndef HW_TIMER_PL031 >> -#define HW_TIMER_PL031 >> +#ifndef HW_TIMER_PL031_H >> +#define HW_TIMER_PL031_H >> >> #include "hw/sysbus.h" >> >> diff --git a/include/hw/virtio/vhost-vsock.h b/include/hw/virtio/vhost-vsock.h >> index 7b9205fe3f..d509d67c4a 100644 >> --- a/include/hw/virtio/vhost-vsock.h >> +++ b/include/hw/virtio/vhost-vsock.h >> @@ -11,8 +11,8 @@ >> * top-level directory. >> */ >> >> -#ifndef _QEMU_VHOST_VSOCK_H >> -#define _QEMU_VHOST_VSOCK_H >> +#ifndef QEMU_VHOST_VSOCK_H >> +#define QEMU_VHOST_VSOCK_H >> >> #include "hw/virtio/virtio.h" >> #include "hw/virtio/vhost.h" >> @@ -38,4 +38,4 @@ typedef struct { >> /*< public >*/ >> } VHostVSock; >> >> -#endif /* _QEMU_VHOST_VSOCK_H */ >> +#endif /* QEMU_VHOST_VSOCK_H */ >> diff --git a/include/hw/virtio/virtio-crypto.h b/include/hw/virtio/virtio-crypto.h >> index ca3a04938e..ffe2391ece 100644 >> --- a/include/hw/virtio/virtio-crypto.h >> +++ b/include/hw/virtio/virtio-crypto.h >> @@ -11,8 +11,8 @@ >> * top-level directory. >> */ >> >> -#ifndef _QEMU_VIRTIO_CRYPTO_H >> -#define _QEMU_VIRTIO_CRYPTO_H >> +#ifndef QEMU_VIRTIO_CRYPTO_H >> +#define QEMU_VIRTIO_CRYPTO_H >> >> #include "standard-headers/linux/virtio_crypto.h" >> #include "hw/virtio/virtio.h" >> @@ -99,4 +99,4 @@ typedef struct VirtIOCrypto { >> uint8_t vhost_started; >> } VirtIOCrypto; >> >> -#endif /* _QEMU_VIRTIO_CRYPTO_H */ >> +#endif /* QEMU_VIRTIO_CRYPTO_H */ >> diff --git a/include/hw/xen/start_info.h b/include/hw/xen/start_info.h >> index 348779eb10..6ed4877794 100644 >> --- a/include/hw/xen/start_info.h >> +++ b/include/hw/xen/start_info.h >> @@ -20,8 +20,8 @@ >> * Copyright (c) 2016, Citrix Systems, Inc. >> */ >> >> -#ifndef __XEN_PUBLIC_ARCH_X86_HVM_START_INFO_H__ >> -#define __XEN_PUBLIC_ARCH_X86_HVM_START_INFO_H__ >> +#ifndef XEN_PUBLIC_ARCH_X86_HVM_START_INFO_H >> +#define XEN_PUBLIC_ARCH_X86_HVM_START_INFO_H >> >> /* >> * Start of day structure passed to PVH guests and to HVM guests in %ebx. >> @@ -143,4 +143,4 @@ struct hvm_memmap_table_entry { >> uint32_t reserved; >> }; >> >> -#endif /* __XEN_PUBLIC_ARCH_X86_HVM_START_INFO_H__ */ >> +#endif /* XEN_PUBLIC_ARCH_X86_HVM_START_INFO_H */ >> diff --git a/include/hw/xtensa/mx_pic.h b/include/hw/xtensa/mx_pic.h >> index e6cd8cf016..c9ea9e737c 100644 >> --- a/include/hw/xtensa/mx_pic.h >> +++ b/include/hw/xtensa/mx_pic.h >> @@ -25,8 +25,8 @@ >> * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. >> */ >> >> -#ifndef _XTENSA_MX_PIC_H >> -#define _XTENSA_MX_PIC_H >> +#ifndef XTENSA_MX_PIC_H >> +#define XTENSA_MX_PIC_H >> >> #include "exec/memory.h" >> #include "hw/irq.h" >> diff --git a/include/qemu/drm.h b/include/qemu/drm.h >> index 4c3e622f5c..fab74d4be9 100644 >> --- a/include/qemu/drm.h >> +++ b/include/qemu/drm.h >> @@ -1,5 +1,5 @@ >> -#ifndef QEMU_DRM_H_ >> -#define QEMU_DRM_H_ >> +#ifndef QEMU_DRM_H >> +#define QEMU_DRM_H >> >> int qemu_drm_rendernode_open(const char *rendernode); >> >> diff --git a/include/qemu/jhash.h b/include/qemu/jhash.h >> index 7222242615..84d14dc7f7 100644 >> --- a/include/qemu/jhash.h >> +++ b/include/qemu/jhash.h >> @@ -21,8 +21,8 @@ >> * Jozsef >> */ >> >> -#ifndef QEMU_JHASH_H__ >> -#define QEMU_JHASH_H__ >> +#ifndef QEMU_JHASH_H >> +#define QEMU_JHASH_H >> >> #include "qemu/bitops.h" >> >> @@ -56,4 +56,4 @@ >> /* An arbitrary initial parameter */ >> #define JHASH_INITVAL 0xdeadbeef >> >> -#endif /* QEMU_JHASH_H__ */ >> +#endif /* QEMU_JHASH_H */ >> diff --git a/include/sysemu/hvf.h b/include/sysemu/hvf.h >> index aaa51d2c51..300bf3e9a8 100644 >> --- a/include/sysemu/hvf.h >> +++ b/include/sysemu/hvf.h >> @@ -9,8 +9,9 @@ >> */ >> >> /* header to be included in non-HVF-specific code */ >> -#ifndef _HVF_H >> -#define _HVF_H >> + >> +#ifndef HVF_H >> +#define HVF_H >> >> #include "qemu-common.h" >> #include "qemu/bitops.h" >> diff --git a/linux-user/xtensa/syscall_nr.h b/linux-user/xtensa/syscall_nr.h >> index cd5ef45f84..27645bea47 100644 >> --- a/linux-user/xtensa/syscall_nr.h >> +++ b/linux-user/xtensa/syscall_nr.h >> @@ -8,8 +8,8 @@ >> * Copyright (C) 2001 - 2009 Tensilica Inc. >> */ >> >> -#ifndef _XTENSA_UNISTD_H >> -#define _XTENSA_UNISTD_H >> +#ifndef XTENSA_SYSCALL_NR_H >> +#define XTENSA_SYSCALL_NR_H >> >> #define TARGET_NR_spill 0 >> #define TARGET_NR_xtensa 1 >> @@ -434,4 +434,4 @@ >> >> #define TARGET_NR_syscall_count 352 >> >> -#endif /* _XTENSA_UNISTD_H */ >> +#endif /* XTENSA_SYSCALL_NR_H */ >> diff --git a/linux-user/xtensa/target_structs.h b/linux-user/xtensa/target_structs.h >> index 1b3d9ca314..9cde6844b8 100644 >> --- a/linux-user/xtensa/target_structs.h >> +++ b/linux-user/xtensa/target_structs.h >> @@ -1,5 +1,5 @@ >> -#ifndef XTENSA_TARGET_STRUCTS_T >> -#define XTENSA_TARGET_STRUCTS_T >> +#ifndef XTENSA_TARGET_STRUCTS_H >> +#define XTENSA_TARGET_STRUCTS_H >> >> struct target_ipc_perm { >> abi_int __key; /* Key. */ >> diff --git a/linux-user/xtensa/termbits.h b/linux-user/xtensa/termbits.h >> index eed8286de7..d1e09e61a6 100644 >> --- a/linux-user/xtensa/termbits.h >> +++ b/linux-user/xtensa/termbits.h >> @@ -10,8 +10,8 @@ >> * Copyright (C) 2001 - 2005 Tensilica Inc. >> */ >> >> -#ifndef _XTENSA_TERMBITS_H >> -#define _XTENSA_TERMBITS_H >> +#ifndef XTENSA_TERMBITS_H >> +#define XTENSA_TERMBITS_H >> >> #include <linux/posix_types.h> >> >> @@ -325,4 +325,4 @@ struct target_ktermios { >> >> #define TARGET_TIOCMIWAIT _IO('T', 92) /* wait for a change on serial input line(s) */ >> #define TARGET_TIOCGICOUNT 0x545D /* read serial port inline interrupt counts */ >> -#endif /* _XTENSA_TERMBITS_H */ >> +#endif /* XTENSA_TERMBITS_H */ >> diff --git a/qga/vss-win32/vss-handles.h b/qga/vss-win32/vss-handles.h >> index ff399dd73a..0f8a741ad2 100644 >> --- a/qga/vss-win32/vss-handles.h >> +++ b/qga/vss-win32/vss-handles.h >> @@ -1,5 +1,5 @@ >> -#ifndef VSS_HANDLES >> -#define VSS_HANDLES >> +#ifndef VSS_HANDLES_H >> +#define VSS_HANDLES_H >> >> /* Constants for QGA VSS Provider */ >> >> diff --git a/slirp/src/debug.h b/slirp/src/debug.h >> index 44d922df37..bb83bafc1b 100644 >> --- a/slirp/src/debug.h >> +++ b/slirp/src/debug.h >> @@ -5,8 +5,8 @@ >> * terms and conditions of the copyright. >> */ >> >> -#ifndef DEBUG_H_ >> -#define DEBUG_H_ >> +#ifndef DEBUG_H >> +#define DEBUG_H >> >> #define DBG_CALL (1 << 0) >> #define DBG_MISC (1 << 1) >> @@ -45,4 +45,4 @@ extern int slirp_debug; >> } \ >> } while (0) >> >> -#endif /* DEBUG_H_ */ >> +#endif /* DEBUG_H */ >> diff --git a/slirp/src/stream.h b/slirp/src/stream.h >> index 985334c043..a4cf870af9 100644 >> --- a/slirp/src/stream.h >> +++ b/slirp/src/stream.h >> @@ -1,5 +1,5 @@ >> -#ifndef STREAM_H_ >> -#define STREAM_H_ >> +#ifndef STREAM_H >> +#define STREAM_H >> >> #include "libslirp.h" >> >> @@ -31,4 +31,4 @@ bool slirp_ostream_write_i16(SlirpOStream *f, int16_t b); >> int32_t slirp_istream_read_i32(SlirpIStream *f); >> bool slirp_ostream_write_i32(SlirpOStream *f, int32_t b); >> >> -#endif /* STREAM_H_ */ >> +#endif /* STREAM_H */ >> diff --git a/slirp/src/util.h b/slirp/src/util.h >> index e94ee4e7f1..69b3f0a6bd 100644 >> --- a/slirp/src/util.h >> +++ b/slirp/src/util.h >> @@ -20,8 +20,9 @@ >> * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN >> * THE SOFTWARE. >> */ >> -#ifndef UTIL_H_ >> -#define UTIL_H_ >> + >> +#ifndef UTIL_H >> +#define UTIL_H >> >> #include <stdlib.h> >> #include <stdio.h> >> diff --git a/slirp/src/vmstate.h b/slirp/src/vmstate.h >> index cfa7b8c825..ca271f53ec 100644 >> --- a/slirp/src/vmstate.h >> +++ b/slirp/src/vmstate.h >> @@ -23,8 +23,9 @@ >> * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN >> * THE SOFTWARE. >> */ >> -#ifndef VMSTATE_H_ >> -#define VMSTATE_H_ >> + >> +#ifndef VMSTATE_H >> +#define VMSTATE_H >> >> #include <unistd.h> >> #include <stdint.h> >> diff --git a/target/i386/hax-i386.h b/target/i386/hax-i386.h >> index f13fa4638f..54e9d8b057 100644 >> --- a/target/i386/hax-i386.h >> +++ b/target/i386/hax-i386.h >> @@ -10,8 +10,8 @@ >> * >> */ >> >> -#ifndef _HAX_I386_H >> -#define _HAX_I386_H >> +#ifndef HAX_I386_H >> +#define HAX_I386_H >> >> #include "cpu.h" >> #include "sysemu/hax.h" >> diff --git a/target/i386/hax-interface.h b/target/i386/hax-interface.h >> index 93d5fcb1dc..537ae084e9 100644 >> --- a/target/i386/hax-interface.h >> +++ b/target/i386/hax-interface.h >> @@ -14,8 +14,8 @@ >> >> /* Interface with HAX kernel module */ >> >> -#ifndef _HAX_INTERFACE_H >> -#define _HAX_INTERFACE_H >> +#ifndef HAX_INTERFACE_H >> +#define HAX_INTERFACE_H >> >> /* fx_layout has 3 formats table 3-56, 512bytes */ >> struct fx_layout { >> diff --git a/target/i386/hvf/hvf-i386.h b/target/i386/hvf/hvf-i386.h >> index 2232501552..15ee4835cf 100644 >> --- a/target/i386/hvf/hvf-i386.h >> +++ b/target/i386/hvf/hvf-i386.h >> @@ -13,8 +13,8 @@ >> * >> */ >> >> -#ifndef _HVF_I386_H >> -#define _HVF_I386_H >> +#ifndef HVF_I386_H >> +#define HVF_I386_H >> >> #include "sysemu/hvf.h" >> #include "cpu.h" >> diff --git a/target/i386/hvf/vmcs.h b/target/i386/hvf/vmcs.h >> index 2a8c0424a5..42de7ebc3a 100644 >> --- a/target/i386/hvf/vmcs.h >> +++ b/target/i386/hvf/vmcs.h >> @@ -26,8 +26,8 @@ >> * $FreeBSD$ >> */ >> >> -#ifndef _VMCS_H_ >> -#define _VMCS_H_ >> +#ifndef VMCS_H >> +#define VMCS_H > > Can we use HVF_VMCS_H? Yes, but not in this patch. This one merely strips leading and trailing underscores, and normalizes to trailing _H. The previous patch renames the header guards that don't match the filename. VMCS_H matches, so a rename to HVF_VMCS_H doesn't fit there, either. Additional patches could do local header guard normalization, e.g. for i in target/i386/hvf/*.h, rename $i's header guard to HVF_${i^^}. > Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Thanks! >> >> #include <Hypervisor/hv.h> >> #include <Hypervisor/hv_vmx.h> >> diff --git a/target/i386/hvf/x86_emu.h b/target/i386/hvf/x86_emu.h >> index fbb4832576..f92a9c54b5 100644 >> --- a/target/i386/hvf/x86_emu.h >> +++ b/target/i386/hvf/x86_emu.h >> @@ -15,8 +15,9 @@ >> * You should have received a copy of the GNU Lesser General Public >> * License along with this program; if not, see <http://www.gnu.org/licenses/>. >> */ >> -#ifndef __X86_EMU_H__ >> -#define __X86_EMU_H__ >> + >> +#ifndef X86_EMU_H >> +#define X86_EMU_H > > Similarly HVF_... and so on. > >> >> #include "x86.h" >> #include "x86_decode.h" [...]
On Fri, Mar 15, 2019 at 7:16 AM Markus Armbruster <armbru@redhat.com> wrote: > > Philippe Mathieu-Daudé <philmd@redhat.com> writes: > > > On 3/15/19 3:51 PM, Markus Armbruster wrote: > >> Leading 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. > >> > >> Done with scripts/clean-header-guards.pl. > >> > >> Signed-off-by: Markus Armbruster <armbru@redhat.com> For the RISC-V patch: Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Alistair > >> --- > >> block/crypto.h | 6 +++--- > >> hw/i386/amd_iommu.h | 4 ++-- > >> hw/tpm/tpm_ioctl.h | 7 ++++--- > >> hw/xtensa/xtensa_memory.h | 4 ++-- > >> include/authz/base.h | 7 +++---- > >> include/authz/list.h | 7 +++---- > >> include/authz/simple.h | 7 +++---- > >> include/chardev/spice.h | 4 ++-- > >> include/hw/ppc/pnv.h | 7 ++++--- > >> include/hw/ppc/pnv_core.h | 7 ++++--- > >> include/hw/ppc/pnv_lpc.h | 7 ++++--- > >> include/hw/ppc/pnv_occ.h | 7 ++++--- > >> include/hw/ppc/pnv_psi.h | 7 ++++--- > >> include/hw/ppc/pnv_xscom.h | 7 ++++--- > >> include/hw/ppc/spapr_ovec.h | 7 ++++--- > >> include/hw/timer/pl031.h | 4 ++-- > >> include/hw/virtio/vhost-vsock.h | 6 +++--- > >> include/hw/virtio/virtio-crypto.h | 6 +++--- > >> include/hw/xen/start_info.h | 6 +++--- > >> include/hw/xtensa/mx_pic.h | 4 ++-- > >> include/qemu/drm.h | 4 ++-- > >> include/qemu/jhash.h | 6 +++--- > >> include/sysemu/hvf.h | 5 +++-- > >> linux-user/xtensa/syscall_nr.h | 6 +++--- > >> linux-user/xtensa/target_structs.h | 4 ++-- > >> linux-user/xtensa/termbits.h | 6 +++--- > >> qga/vss-win32/vss-handles.h | 4 ++-- > >> slirp/src/debug.h | 6 +++--- > >> slirp/src/stream.h | 6 +++--- > >> slirp/src/util.h | 5 +++-- > >> slirp/src/vmstate.h | 5 +++-- > >> target/i386/hax-i386.h | 4 ++-- > >> target/i386/hax-interface.h | 4 ++-- > >> target/i386/hvf/hvf-i386.h | 4 ++-- > >> target/i386/hvf/vmcs.h | 4 ++-- > >> target/i386/hvf/x86_emu.h | 5 +++-- > >> target/i386/hvf/x86_flags.h | 7 ++++--- > >> target/i386/hvf/x86_mmu.h | 7 ++++--- > >> target/riscv/pmp.h | 4 ++-- > >> target/sparc/asi.h | 6 +++--- > >> tests/libqos/e1000e.h | 4 ++-- > >> tests/libqos/sdhci.h | 4 ++-- > >> 42 files changed, 121 insertions(+), 110 deletions(-) > >> > >> diff --git a/block/crypto.h b/block/crypto.h > >> index dd7d47903c..b935695e79 100644 > >> --- a/block/crypto.h > >> +++ b/block/crypto.h > >> @@ -18,8 +18,8 @@ > >> * > >> */ > >> > >> -#ifndef BLOCK_CRYPTO_H__ > >> -#define BLOCK_CRYPTO_H__ > >> +#ifndef BLOCK_CRYPTO_H > >> +#define BLOCK_CRYPTO_H > >> > >> #define BLOCK_CRYPTO_OPT_DEF_KEY_SECRET(prefix, helpstr) \ > >> { \ > >> @@ -94,4 +94,4 @@ block_crypto_create_opts_init(QDict *opts, Error **errp); > >> QCryptoBlockOpenOptions * > >> block_crypto_open_opts_init(QDict *opts, Error **errp); > >> > >> -#endif /* BLOCK_CRYPTO_H__ */ > >> +#endif /* BLOCK_CRYPTO_H */ > >> diff --git a/hw/i386/amd_iommu.h b/hw/i386/amd_iommu.h > >> index 0ff9095f32..3a694b186b 100644 > >> --- a/hw/i386/amd_iommu.h > >> +++ b/hw/i386/amd_iommu.h > >> @@ -18,8 +18,8 @@ > >> * with this program; if not, see <http://www.gnu.org/licenses/>. > >> */ > >> > >> -#ifndef AMD_IOMMU_H_ > >> -#define AMD_IOMMU_H_ > >> +#ifndef AMD_IOMMU_H > >> +#define AMD_IOMMU_H > >> > >> #include "hw/hw.h" > >> #include "hw/pci/pci.h" > >> diff --git a/hw/tpm/tpm_ioctl.h b/hw/tpm/tpm_ioctl.h > >> index 59a0b0595d..f5f5c553a9 100644 > >> --- a/hw/tpm/tpm_ioctl.h > >> +++ b/hw/tpm/tpm_ioctl.h > >> @@ -5,8 +5,9 @@ > >> * > >> * This file is licensed under the terms of the 3-clause BSD license > >> */ > >> -#ifndef _TPM_IOCTL_H_ > >> -#define _TPM_IOCTL_H_ > >> + > >> +#ifndef TPM_IOCTL_H > >> +#define TPM_IOCTL_H > >> > >> #include <sys/uio.h> > >> #include <sys/ioctl.h> > >> @@ -267,4 +268,4 @@ enum { > >> CMD_SET_BUFFERSIZE, > >> }; > >> > >> -#endif /* _TPM_IOCTL_H */ > >> +#endif /* TPM_IOCTL_H */ > >> diff --git a/hw/xtensa/xtensa_memory.h b/hw/xtensa/xtensa_memory.h > >> index e9aa08749d..89125c4a0d 100644 > >> --- a/hw/xtensa/xtensa_memory.h > >> +++ b/hw/xtensa/xtensa_memory.h > >> @@ -25,8 +25,8 @@ > >> * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > >> */ > >> > >> -#ifndef _XTENSA_MEMORY_H > >> -#define _XTENSA_MEMORY_H > >> +#ifndef XTENSA_MEMORY_H > >> +#define XTENSA_MEMORY_H > >> > >> #include "qemu-common.h" > >> #include "cpu.h" > >> diff --git a/include/authz/base.h b/include/authz/base.h > >> index 77dcd54c4c..05f1df845c 100644 > >> --- a/include/authz/base.h > >> +++ b/include/authz/base.h > >> @@ -18,8 +18,8 @@ > >> * > >> */ > >> > >> -#ifndef QAUTHZ_BASE_H__ > >> -#define QAUTHZ_BASE_H__ > >> +#ifndef QAUTHZ_BASE_H > >> +#define QAUTHZ_BASE_H > >> > >> #include "qemu-common.h" > >> #include "qapi/error.h" > >> @@ -108,5 +108,4 @@ bool qauthz_is_allowed_by_id(const char *authzid, > >> const char *identity, > >> Error **errp); > >> > >> -#endif /* QAUTHZ_BASE_H__ */ > >> - > >> +#endif /* QAUTHZ_BASE_H */ > >> diff --git a/include/authz/list.h b/include/authz/list.h > >> index a7225a747c..49c2c6bf02 100644 > >> --- a/include/authz/list.h > >> +++ b/include/authz/list.h > >> @@ -18,8 +18,8 @@ > >> * > >> */ > >> > >> -#ifndef QAUTHZ_LIST_H__ > >> -#define QAUTHZ_LIST_H__ > >> +#ifndef QAUTHZ_LIST_H > >> +#define QAUTHZ_LIST_H > >> > >> #include "authz/base.h" > >> #include "qapi/qapi-types-authz.h" > >> @@ -102,5 +102,4 @@ ssize_t qauthz_list_delete_rule(QAuthZList *auth, > >> const char *match); > >> > >> > >> -#endif /* QAUTHZ_LIST_H__ */ > >> - > >> +#endif /* QAUTHZ_LIST_H */ > >> diff --git a/include/authz/simple.h b/include/authz/simple.h > >> index ef13958269..45abfa1a90 100644 > >> --- a/include/authz/simple.h > >> +++ b/include/authz/simple.h > >> @@ -18,8 +18,8 @@ > >> * > >> */ > >> > >> -#ifndef QAUTHZ_SIMPLE_H__ > >> -#define QAUTHZ_SIMPLE_H__ > >> +#ifndef QAUTHZ_SIMPLE_H > >> +#define QAUTHZ_SIMPLE_H > >> > >> #include "authz/base.h" > >> > >> @@ -80,5 +80,4 @@ QAuthZSimple *qauthz_simple_new(const char *id, > >> Error **errp); > >> > >> > >> -#endif /* QAUTHZ_SIMPLE_H__ */ > >> - > >> +#endif /* QAUTHZ_SIMPLE_H */ > >> diff --git a/include/chardev/spice.h b/include/chardev/spice.h > >> index 6431da3205..1f7339b649 100644 > >> --- a/include/chardev/spice.h > >> +++ b/include/chardev/spice.h > >> @@ -1,5 +1,5 @@ > >> -#ifndef CHARDEV_SPICE_H_ > >> -#define CHARDEV_SPICE_H_ > >> +#ifndef CHARDEV_SPICE_H > >> +#define CHARDEV_SPICE_H > >> > >> #include <spice.h> > >> #include "chardev/char-fe.h" > >> diff --git a/include/hw/ppc/pnv.h b/include/hw/ppc/pnv.h > >> index e5b00d373e..fc4678f757 100644 > >> --- a/include/hw/ppc/pnv.h > >> +++ b/include/hw/ppc/pnv.h > >> @@ -16,8 +16,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 _PPC_PNV_H > >> -#define _PPC_PNV_H > >> + > >> +#ifndef PPC_PNV_H > >> +#define PPC_PNV_H > >> > >> #include "hw/boards.h" > >> #include "hw/sysbus.h" > >> @@ -255,4 +256,4 @@ void pnv_bmc_powerdown(IPMIBmc *bmc); > >> #define PNV9_PSIHB_ESB_SIZE 0x0000000000010000ull > >> #define PNV9_PSIHB_ESB_BASE(chip) PNV9_CHIP_BASE(chip, 0x00060302031c0000ull) > >> > >> -#endif /* _PPC_PNV_H */ > >> +#endif /* PPC_PNV_H */ > >> diff --git a/include/hw/ppc/pnv_core.h b/include/hw/ppc/pnv_core.h > >> index 50cdb2b358..d0926454a9 100644 > >> --- a/include/hw/ppc/pnv_core.h > >> +++ b/include/hw/ppc/pnv_core.h > >> @@ -16,8 +16,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 _PPC_PNV_CORE_H > >> -#define _PPC_PNV_CORE_H > >> + > >> +#ifndef PPC_PNV_CORE_H > >> +#define PPC_PNV_CORE_H > >> > >> #include "hw/cpu/core.h" > >> > >> @@ -68,4 +69,4 @@ typedef struct PnvQuad { > >> uint32_t id; > >> MemoryRegion xscom_regs; > >> } PnvQuad; > >> -#endif /* _PPC_PNV_CORE_H */ > >> +#endif /* PPC_PNV_CORE_H */ > >> diff --git a/include/hw/ppc/pnv_lpc.h b/include/hw/ppc/pnv_lpc.h > >> index 413579792e..f659410716 100644 > >> --- a/include/hw/ppc/pnv_lpc.h > >> +++ b/include/hw/ppc/pnv_lpc.h > >> @@ -16,8 +16,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 _PPC_PNV_LPC_H > >> -#define _PPC_PNV_LPC_H > >> + > >> +#ifndef PPC_PNV_LPC_H > >> +#define PPC_PNV_LPC_H > >> > >> #include "hw/ppc/pnv_psi.h" > >> > >> @@ -98,4 +99,4 @@ struct PnvChip; > >> ISABus *pnv_lpc_isa_create(PnvLpcController *lpc, bool use_cpld, Error **errp); > >> int pnv_dt_lpc(struct PnvChip *chip, void *fdt, int root_offset); > >> > >> -#endif /* _PPC_PNV_LPC_H */ > >> +#endif /* PPC_PNV_LPC_H */ > >> diff --git a/include/hw/ppc/pnv_occ.h b/include/hw/ppc/pnv_occ.h > >> index d22b65a71a..ed0709bfc0 100644 > >> --- a/include/hw/ppc/pnv_occ.h > >> +++ b/include/hw/ppc/pnv_occ.h > >> @@ -16,8 +16,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 _PPC_PNV_OCC_H > >> -#define _PPC_PNV_OCC_H > >> + > >> +#ifndef PPC_PNV_OCC_H > >> +#define PPC_PNV_OCC_H > >> > >> #include "hw/ppc/pnv_psi.h" > >> > >> @@ -52,4 +53,4 @@ typedef struct PnvOCCClass { > >> int psi_irq; > >> } PnvOCCClass; > >> > >> -#endif /* _PPC_PNV_OCC_H */ > >> +#endif /* PPC_PNV_OCC_H */ > >> diff --git a/include/hw/ppc/pnv_psi.h b/include/hw/ppc/pnv_psi.h > >> index 2c1b27e865..e82df9709f 100644 > >> --- a/include/hw/ppc/pnv_psi.h > >> +++ b/include/hw/ppc/pnv_psi.h > >> @@ -16,8 +16,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 _PPC_PNV_PSI_H > >> -#define _PPC_PNV_PSI_H > >> + > >> +#ifndef PPC_PNV_PSI_H > >> +#define PPC_PNV_PSI_H > >> > >> #include "hw/sysbus.h" > >> #include "hw/ppc/xics.h" > >> @@ -118,4 +119,4 @@ void pnv_psi_irq_set(PnvPsi *psi, int irq, bool state); > >> > >> void pnv_psi_pic_print_info(Pnv9Psi *psi, Monitor *mon); > >> > >> -#endif /* _PPC_PNV_PSI_H */ > >> +#endif /* PPC_PNV_PSI_H */ > >> diff --git a/include/hw/ppc/pnv_xscom.h b/include/hw/ppc/pnv_xscom.h > >> index 68dfae0dfe..c842d950d2 100644 > >> --- a/include/hw/ppc/pnv_xscom.h > >> +++ b/include/hw/ppc/pnv_xscom.h > >> @@ -16,8 +16,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 _PPC_PNV_XSCOM_H > >> -#define _PPC_PNV_XSCOM_H > >> + > >> +#ifndef PPC_PNV_XSCOM_H > >> +#define PPC_PNV_XSCOM_H > >> > >> #include "qom/object.h" > >> > >> @@ -98,4 +99,4 @@ extern void pnv_xscom_region_init(MemoryRegion *mr, > >> const char *name, > >> uint64_t size); > >> > >> -#endif /* _PPC_PNV_XSCOM_H */ > >> +#endif /* PPC_PNV_XSCOM_H */ > >> diff --git a/include/hw/ppc/spapr_ovec.h b/include/hw/ppc/spapr_ovec.h > >> index 188a9367e2..5de5ecf5de 100644 > >> --- a/include/hw/ppc/spapr_ovec.h > >> +++ b/include/hw/ppc/spapr_ovec.h > >> @@ -33,8 +33,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 _SPAPR_OVEC_H > >> -#define _SPAPR_OVEC_H > >> + > >> +#ifndef SPAPR_OVEC_H > >> +#define SPAPR_OVEC_H > >> > >> #include "cpu.h" > >> #include "migration/vmstate.h" > >> @@ -80,4 +81,4 @@ int spapr_ovec_populate_dt(void *fdt, int fdt_offset, > >> /* migration */ > >> extern const VMStateDescription vmstate_spapr_ovec; > >> > >> -#endif /* !defined (_SPAPR_OVEC_H) */ > >> +#endif /* SPAPR_OVEC_H */ > >> diff --git a/include/hw/timer/pl031.h b/include/hw/timer/pl031.h > >> index 99416d8ba5..8857c24ca5 100644 > >> --- a/include/hw/timer/pl031.h > >> +++ b/include/hw/timer/pl031.h > >> @@ -11,8 +11,8 @@ > >> * GNU GPL, version 2 or (at your option) any later version. > >> */ > >> > >> -#ifndef HW_TIMER_PL031 > >> -#define HW_TIMER_PL031 > >> +#ifndef HW_TIMER_PL031_H > >> +#define HW_TIMER_PL031_H > >> > >> #include "hw/sysbus.h" > >> > >> diff --git a/include/hw/virtio/vhost-vsock.h b/include/hw/virtio/vhost-vsock.h > >> index 7b9205fe3f..d509d67c4a 100644 > >> --- a/include/hw/virtio/vhost-vsock.h > >> +++ b/include/hw/virtio/vhost-vsock.h > >> @@ -11,8 +11,8 @@ > >> * top-level directory. > >> */ > >> > >> -#ifndef _QEMU_VHOST_VSOCK_H > >> -#define _QEMU_VHOST_VSOCK_H > >> +#ifndef QEMU_VHOST_VSOCK_H > >> +#define QEMU_VHOST_VSOCK_H > >> > >> #include "hw/virtio/virtio.h" > >> #include "hw/virtio/vhost.h" > >> @@ -38,4 +38,4 @@ typedef struct { > >> /*< public >*/ > >> } VHostVSock; > >> > >> -#endif /* _QEMU_VHOST_VSOCK_H */ > >> +#endif /* QEMU_VHOST_VSOCK_H */ > >> diff --git a/include/hw/virtio/virtio-crypto.h b/include/hw/virtio/virtio-crypto.h > >> index ca3a04938e..ffe2391ece 100644 > >> --- a/include/hw/virtio/virtio-crypto.h > >> +++ b/include/hw/virtio/virtio-crypto.h > >> @@ -11,8 +11,8 @@ > >> * top-level directory. > >> */ > >> > >> -#ifndef _QEMU_VIRTIO_CRYPTO_H > >> -#define _QEMU_VIRTIO_CRYPTO_H > >> +#ifndef QEMU_VIRTIO_CRYPTO_H > >> +#define QEMU_VIRTIO_CRYPTO_H > >> > >> #include "standard-headers/linux/virtio_crypto.h" > >> #include "hw/virtio/virtio.h" > >> @@ -99,4 +99,4 @@ typedef struct VirtIOCrypto { > >> uint8_t vhost_started; > >> } VirtIOCrypto; > >> > >> -#endif /* _QEMU_VIRTIO_CRYPTO_H */ > >> +#endif /* QEMU_VIRTIO_CRYPTO_H */ > >> diff --git a/include/hw/xen/start_info.h b/include/hw/xen/start_info.h > >> index 348779eb10..6ed4877794 100644 > >> --- a/include/hw/xen/start_info.h > >> +++ b/include/hw/xen/start_info.h > >> @@ -20,8 +20,8 @@ > >> * Copyright (c) 2016, Citrix Systems, Inc. > >> */ > >> > >> -#ifndef __XEN_PUBLIC_ARCH_X86_HVM_START_INFO_H__ > >> -#define __XEN_PUBLIC_ARCH_X86_HVM_START_INFO_H__ > >> +#ifndef XEN_PUBLIC_ARCH_X86_HVM_START_INFO_H > >> +#define XEN_PUBLIC_ARCH_X86_HVM_START_INFO_H > >> > >> /* > >> * Start of day structure passed to PVH guests and to HVM guests in %ebx. > >> @@ -143,4 +143,4 @@ struct hvm_memmap_table_entry { > >> uint32_t reserved; > >> }; > >> > >> -#endif /* __XEN_PUBLIC_ARCH_X86_HVM_START_INFO_H__ */ > >> +#endif /* XEN_PUBLIC_ARCH_X86_HVM_START_INFO_H */ > >> diff --git a/include/hw/xtensa/mx_pic.h b/include/hw/xtensa/mx_pic.h > >> index e6cd8cf016..c9ea9e737c 100644 > >> --- a/include/hw/xtensa/mx_pic.h > >> +++ b/include/hw/xtensa/mx_pic.h > >> @@ -25,8 +25,8 @@ > >> * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > >> */ > >> > >> -#ifndef _XTENSA_MX_PIC_H > >> -#define _XTENSA_MX_PIC_H > >> +#ifndef XTENSA_MX_PIC_H > >> +#define XTENSA_MX_PIC_H > >> > >> #include "exec/memory.h" > >> #include "hw/irq.h" > >> diff --git a/include/qemu/drm.h b/include/qemu/drm.h > >> index 4c3e622f5c..fab74d4be9 100644 > >> --- a/include/qemu/drm.h > >> +++ b/include/qemu/drm.h > >> @@ -1,5 +1,5 @@ > >> -#ifndef QEMU_DRM_H_ > >> -#define QEMU_DRM_H_ > >> +#ifndef QEMU_DRM_H > >> +#define QEMU_DRM_H > >> > >> int qemu_drm_rendernode_open(const char *rendernode); > >> > >> diff --git a/include/qemu/jhash.h b/include/qemu/jhash.h > >> index 7222242615..84d14dc7f7 100644 > >> --- a/include/qemu/jhash.h > >> +++ b/include/qemu/jhash.h > >> @@ -21,8 +21,8 @@ > >> * Jozsef > >> */ > >> > >> -#ifndef QEMU_JHASH_H__ > >> -#define QEMU_JHASH_H__ > >> +#ifndef QEMU_JHASH_H > >> +#define QEMU_JHASH_H > >> > >> #include "qemu/bitops.h" > >> > >> @@ -56,4 +56,4 @@ > >> /* An arbitrary initial parameter */ > >> #define JHASH_INITVAL 0xdeadbeef > >> > >> -#endif /* QEMU_JHASH_H__ */ > >> +#endif /* QEMU_JHASH_H */ > >> diff --git a/include/sysemu/hvf.h b/include/sysemu/hvf.h > >> index aaa51d2c51..300bf3e9a8 100644 > >> --- a/include/sysemu/hvf.h > >> +++ b/include/sysemu/hvf.h > >> @@ -9,8 +9,9 @@ > >> */ > >> > >> /* header to be included in non-HVF-specific code */ > >> -#ifndef _HVF_H > >> -#define _HVF_H > >> + > >> +#ifndef HVF_H > >> +#define HVF_H > >> > >> #include "qemu-common.h" > >> #include "qemu/bitops.h" > >> diff --git a/linux-user/xtensa/syscall_nr.h b/linux-user/xtensa/syscall_nr.h > >> index cd5ef45f84..27645bea47 100644 > >> --- a/linux-user/xtensa/syscall_nr.h > >> +++ b/linux-user/xtensa/syscall_nr.h > >> @@ -8,8 +8,8 @@ > >> * Copyright (C) 2001 - 2009 Tensilica Inc. > >> */ > >> > >> -#ifndef _XTENSA_UNISTD_H > >> -#define _XTENSA_UNISTD_H > >> +#ifndef XTENSA_SYSCALL_NR_H > >> +#define XTENSA_SYSCALL_NR_H > >> > >> #define TARGET_NR_spill 0 > >> #define TARGET_NR_xtensa 1 > >> @@ -434,4 +434,4 @@ > >> > >> #define TARGET_NR_syscall_count 352 > >> > >> -#endif /* _XTENSA_UNISTD_H */ > >> +#endif /* XTENSA_SYSCALL_NR_H */ > >> diff --git a/linux-user/xtensa/target_structs.h b/linux-user/xtensa/target_structs.h > >> index 1b3d9ca314..9cde6844b8 100644 > >> --- a/linux-user/xtensa/target_structs.h > >> +++ b/linux-user/xtensa/target_structs.h > >> @@ -1,5 +1,5 @@ > >> -#ifndef XTENSA_TARGET_STRUCTS_T > >> -#define XTENSA_TARGET_STRUCTS_T > >> +#ifndef XTENSA_TARGET_STRUCTS_H > >> +#define XTENSA_TARGET_STRUCTS_H > >> > >> struct target_ipc_perm { > >> abi_int __key; /* Key. */ > >> diff --git a/linux-user/xtensa/termbits.h b/linux-user/xtensa/termbits.h > >> index eed8286de7..d1e09e61a6 100644 > >> --- a/linux-user/xtensa/termbits.h > >> +++ b/linux-user/xtensa/termbits.h > >> @@ -10,8 +10,8 @@ > >> * Copyright (C) 2001 - 2005 Tensilica Inc. > >> */ > >> > >> -#ifndef _XTENSA_TERMBITS_H > >> -#define _XTENSA_TERMBITS_H > >> +#ifndef XTENSA_TERMBITS_H > >> +#define XTENSA_TERMBITS_H > >> > >> #include <linux/posix_types.h> > >> > >> @@ -325,4 +325,4 @@ struct target_ktermios { > >> > >> #define TARGET_TIOCMIWAIT _IO('T', 92) /* wait for a change on serial input line(s) */ > >> #define TARGET_TIOCGICOUNT 0x545D /* read serial port inline interrupt counts */ > >> -#endif /* _XTENSA_TERMBITS_H */ > >> +#endif /* XTENSA_TERMBITS_H */ > >> diff --git a/qga/vss-win32/vss-handles.h b/qga/vss-win32/vss-handles.h > >> index ff399dd73a..0f8a741ad2 100644 > >> --- a/qga/vss-win32/vss-handles.h > >> +++ b/qga/vss-win32/vss-handles.h > >> @@ -1,5 +1,5 @@ > >> -#ifndef VSS_HANDLES > >> -#define VSS_HANDLES > >> +#ifndef VSS_HANDLES_H > >> +#define VSS_HANDLES_H > >> > >> /* Constants for QGA VSS Provider */ > >> > >> diff --git a/slirp/src/debug.h b/slirp/src/debug.h > >> index 44d922df37..bb83bafc1b 100644 > >> --- a/slirp/src/debug.h > >> +++ b/slirp/src/debug.h > >> @@ -5,8 +5,8 @@ > >> * terms and conditions of the copyright. > >> */ > >> > >> -#ifndef DEBUG_H_ > >> -#define DEBUG_H_ > >> +#ifndef DEBUG_H > >> +#define DEBUG_H > >> > >> #define DBG_CALL (1 << 0) > >> #define DBG_MISC (1 << 1) > >> @@ -45,4 +45,4 @@ extern int slirp_debug; > >> } \ > >> } while (0) > >> > >> -#endif /* DEBUG_H_ */ > >> +#endif /* DEBUG_H */ > >> diff --git a/slirp/src/stream.h b/slirp/src/stream.h > >> index 985334c043..a4cf870af9 100644 > >> --- a/slirp/src/stream.h > >> +++ b/slirp/src/stream.h > >> @@ -1,5 +1,5 @@ > >> -#ifndef STREAM_H_ > >> -#define STREAM_H_ > >> +#ifndef STREAM_H > >> +#define STREAM_H > >> > >> #include "libslirp.h" > >> > >> @@ -31,4 +31,4 @@ bool slirp_ostream_write_i16(SlirpOStream *f, int16_t b); > >> int32_t slirp_istream_read_i32(SlirpIStream *f); > >> bool slirp_ostream_write_i32(SlirpOStream *f, int32_t b); > >> > >> -#endif /* STREAM_H_ */ > >> +#endif /* STREAM_H */ > >> diff --git a/slirp/src/util.h b/slirp/src/util.h > >> index e94ee4e7f1..69b3f0a6bd 100644 > >> --- a/slirp/src/util.h > >> +++ b/slirp/src/util.h > >> @@ -20,8 +20,9 @@ > >> * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN > >> * THE SOFTWARE. > >> */ > >> -#ifndef UTIL_H_ > >> -#define UTIL_H_ > >> + > >> +#ifndef UTIL_H > >> +#define UTIL_H > >> > >> #include <stdlib.h> > >> #include <stdio.h> > >> diff --git a/slirp/src/vmstate.h b/slirp/src/vmstate.h > >> index cfa7b8c825..ca271f53ec 100644 > >> --- a/slirp/src/vmstate.h > >> +++ b/slirp/src/vmstate.h > >> @@ -23,8 +23,9 @@ > >> * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN > >> * THE SOFTWARE. > >> */ > >> -#ifndef VMSTATE_H_ > >> -#define VMSTATE_H_ > >> + > >> +#ifndef VMSTATE_H > >> +#define VMSTATE_H > >> > >> #include <unistd.h> > >> #include <stdint.h> > >> diff --git a/target/i386/hax-i386.h b/target/i386/hax-i386.h > >> index f13fa4638f..54e9d8b057 100644 > >> --- a/target/i386/hax-i386.h > >> +++ b/target/i386/hax-i386.h > >> @@ -10,8 +10,8 @@ > >> * > >> */ > >> > >> -#ifndef _HAX_I386_H > >> -#define _HAX_I386_H > >> +#ifndef HAX_I386_H > >> +#define HAX_I386_H > >> > >> #include "cpu.h" > >> #include "sysemu/hax.h" > >> diff --git a/target/i386/hax-interface.h b/target/i386/hax-interface.h > >> index 93d5fcb1dc..537ae084e9 100644 > >> --- a/target/i386/hax-interface.h > >> +++ b/target/i386/hax-interface.h > >> @@ -14,8 +14,8 @@ > >> > >> /* Interface with HAX kernel module */ > >> > >> -#ifndef _HAX_INTERFACE_H > >> -#define _HAX_INTERFACE_H > >> +#ifndef HAX_INTERFACE_H > >> +#define HAX_INTERFACE_H > >> > >> /* fx_layout has 3 formats table 3-56, 512bytes */ > >> struct fx_layout { > >> diff --git a/target/i386/hvf/hvf-i386.h b/target/i386/hvf/hvf-i386.h > >> index 2232501552..15ee4835cf 100644 > >> --- a/target/i386/hvf/hvf-i386.h > >> +++ b/target/i386/hvf/hvf-i386.h > >> @@ -13,8 +13,8 @@ > >> * > >> */ > >> > >> -#ifndef _HVF_I386_H > >> -#define _HVF_I386_H > >> +#ifndef HVF_I386_H > >> +#define HVF_I386_H > >> > >> #include "sysemu/hvf.h" > >> #include "cpu.h" > >> diff --git a/target/i386/hvf/vmcs.h b/target/i386/hvf/vmcs.h > >> index 2a8c0424a5..42de7ebc3a 100644 > >> --- a/target/i386/hvf/vmcs.h > >> +++ b/target/i386/hvf/vmcs.h > >> @@ -26,8 +26,8 @@ > >> * $FreeBSD$ > >> */ > >> > >> -#ifndef _VMCS_H_ > >> -#define _VMCS_H_ > >> +#ifndef VMCS_H > >> +#define VMCS_H > > > > Can we use HVF_VMCS_H? > > Yes, but not in this patch. This one merely strips leading and trailing > underscores, and normalizes to trailing _H. The previous patch renames > the header guards that don't match the filename. VMCS_H matches, so a > rename to HVF_VMCS_H doesn't fit there, either. > > Additional patches could do local header guard normalization, e.g. for i > in target/i386/hvf/*.h, rename $i's header guard to HVF_${i^^}. > > > Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> > > Thanks! > > >> > >> #include <Hypervisor/hv.h> > >> #include <Hypervisor/hv_vmx.h> > >> diff --git a/target/i386/hvf/x86_emu.h b/target/i386/hvf/x86_emu.h > >> index fbb4832576..f92a9c54b5 100644 > >> --- a/target/i386/hvf/x86_emu.h > >> +++ b/target/i386/hvf/x86_emu.h > >> @@ -15,8 +15,9 @@ > >> * You should have received a copy of the GNU Lesser General Public > >> * License along with this program; if not, see <http://www.gnu.org/licenses/>. > >> */ > >> -#ifndef __X86_EMU_H__ > >> -#define __X86_EMU_H__ > >> + > >> +#ifndef X86_EMU_H > >> +#define X86_EMU_H > > > > Similarly HVF_... and so on. > > > >> > >> #include "x86.h" > >> #include "x86_decode.h" > [...] >
diff --git a/block/crypto.h b/block/crypto.h index dd7d47903c..b935695e79 100644 --- a/block/crypto.h +++ b/block/crypto.h @@ -18,8 +18,8 @@ * */ -#ifndef BLOCK_CRYPTO_H__ -#define BLOCK_CRYPTO_H__ +#ifndef BLOCK_CRYPTO_H +#define BLOCK_CRYPTO_H #define BLOCK_CRYPTO_OPT_DEF_KEY_SECRET(prefix, helpstr) \ { \ @@ -94,4 +94,4 @@ block_crypto_create_opts_init(QDict *opts, Error **errp); QCryptoBlockOpenOptions * block_crypto_open_opts_init(QDict *opts, Error **errp); -#endif /* BLOCK_CRYPTO_H__ */ +#endif /* BLOCK_CRYPTO_H */ diff --git a/hw/i386/amd_iommu.h b/hw/i386/amd_iommu.h index 0ff9095f32..3a694b186b 100644 --- a/hw/i386/amd_iommu.h +++ b/hw/i386/amd_iommu.h @@ -18,8 +18,8 @@ * with this program; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef AMD_IOMMU_H_ -#define AMD_IOMMU_H_ +#ifndef AMD_IOMMU_H +#define AMD_IOMMU_H #include "hw/hw.h" #include "hw/pci/pci.h" diff --git a/hw/tpm/tpm_ioctl.h b/hw/tpm/tpm_ioctl.h index 59a0b0595d..f5f5c553a9 100644 --- a/hw/tpm/tpm_ioctl.h +++ b/hw/tpm/tpm_ioctl.h @@ -5,8 +5,9 @@ * * This file is licensed under the terms of the 3-clause BSD license */ -#ifndef _TPM_IOCTL_H_ -#define _TPM_IOCTL_H_ + +#ifndef TPM_IOCTL_H +#define TPM_IOCTL_H #include <sys/uio.h> #include <sys/ioctl.h> @@ -267,4 +268,4 @@ enum { CMD_SET_BUFFERSIZE, }; -#endif /* _TPM_IOCTL_H */ +#endif /* TPM_IOCTL_H */ diff --git a/hw/xtensa/xtensa_memory.h b/hw/xtensa/xtensa_memory.h index e9aa08749d..89125c4a0d 100644 --- a/hw/xtensa/xtensa_memory.h +++ b/hw/xtensa/xtensa_memory.h @@ -25,8 +25,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _XTENSA_MEMORY_H -#define _XTENSA_MEMORY_H +#ifndef XTENSA_MEMORY_H +#define XTENSA_MEMORY_H #include "qemu-common.h" #include "cpu.h" diff --git a/include/authz/base.h b/include/authz/base.h index 77dcd54c4c..05f1df845c 100644 --- a/include/authz/base.h +++ b/include/authz/base.h @@ -18,8 +18,8 @@ * */ -#ifndef QAUTHZ_BASE_H__ -#define QAUTHZ_BASE_H__ +#ifndef QAUTHZ_BASE_H +#define QAUTHZ_BASE_H #include "qemu-common.h" #include "qapi/error.h" @@ -108,5 +108,4 @@ bool qauthz_is_allowed_by_id(const char *authzid, const char *identity, Error **errp); -#endif /* QAUTHZ_BASE_H__ */ - +#endif /* QAUTHZ_BASE_H */ diff --git a/include/authz/list.h b/include/authz/list.h index a7225a747c..49c2c6bf02 100644 --- a/include/authz/list.h +++ b/include/authz/list.h @@ -18,8 +18,8 @@ * */ -#ifndef QAUTHZ_LIST_H__ -#define QAUTHZ_LIST_H__ +#ifndef QAUTHZ_LIST_H +#define QAUTHZ_LIST_H #include "authz/base.h" #include "qapi/qapi-types-authz.h" @@ -102,5 +102,4 @@ ssize_t qauthz_list_delete_rule(QAuthZList *auth, const char *match); -#endif /* QAUTHZ_LIST_H__ */ - +#endif /* QAUTHZ_LIST_H */ diff --git a/include/authz/simple.h b/include/authz/simple.h index ef13958269..45abfa1a90 100644 --- a/include/authz/simple.h +++ b/include/authz/simple.h @@ -18,8 +18,8 @@ * */ -#ifndef QAUTHZ_SIMPLE_H__ -#define QAUTHZ_SIMPLE_H__ +#ifndef QAUTHZ_SIMPLE_H +#define QAUTHZ_SIMPLE_H #include "authz/base.h" @@ -80,5 +80,4 @@ QAuthZSimple *qauthz_simple_new(const char *id, Error **errp); -#endif /* QAUTHZ_SIMPLE_H__ */ - +#endif /* QAUTHZ_SIMPLE_H */ diff --git a/include/chardev/spice.h b/include/chardev/spice.h index 6431da3205..1f7339b649 100644 --- a/include/chardev/spice.h +++ b/include/chardev/spice.h @@ -1,5 +1,5 @@ -#ifndef CHARDEV_SPICE_H_ -#define CHARDEV_SPICE_H_ +#ifndef CHARDEV_SPICE_H +#define CHARDEV_SPICE_H #include <spice.h> #include "chardev/char-fe.h" diff --git a/include/hw/ppc/pnv.h b/include/hw/ppc/pnv.h index e5b00d373e..fc4678f757 100644 --- a/include/hw/ppc/pnv.h +++ b/include/hw/ppc/pnv.h @@ -16,8 +16,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 _PPC_PNV_H -#define _PPC_PNV_H + +#ifndef PPC_PNV_H +#define PPC_PNV_H #include "hw/boards.h" #include "hw/sysbus.h" @@ -255,4 +256,4 @@ void pnv_bmc_powerdown(IPMIBmc *bmc); #define PNV9_PSIHB_ESB_SIZE 0x0000000000010000ull #define PNV9_PSIHB_ESB_BASE(chip) PNV9_CHIP_BASE(chip, 0x00060302031c0000ull) -#endif /* _PPC_PNV_H */ +#endif /* PPC_PNV_H */ diff --git a/include/hw/ppc/pnv_core.h b/include/hw/ppc/pnv_core.h index 50cdb2b358..d0926454a9 100644 --- a/include/hw/ppc/pnv_core.h +++ b/include/hw/ppc/pnv_core.h @@ -16,8 +16,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 _PPC_PNV_CORE_H -#define _PPC_PNV_CORE_H + +#ifndef PPC_PNV_CORE_H +#define PPC_PNV_CORE_H #include "hw/cpu/core.h" @@ -68,4 +69,4 @@ typedef struct PnvQuad { uint32_t id; MemoryRegion xscom_regs; } PnvQuad; -#endif /* _PPC_PNV_CORE_H */ +#endif /* PPC_PNV_CORE_H */ diff --git a/include/hw/ppc/pnv_lpc.h b/include/hw/ppc/pnv_lpc.h index 413579792e..f659410716 100644 --- a/include/hw/ppc/pnv_lpc.h +++ b/include/hw/ppc/pnv_lpc.h @@ -16,8 +16,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 _PPC_PNV_LPC_H -#define _PPC_PNV_LPC_H + +#ifndef PPC_PNV_LPC_H +#define PPC_PNV_LPC_H #include "hw/ppc/pnv_psi.h" @@ -98,4 +99,4 @@ struct PnvChip; ISABus *pnv_lpc_isa_create(PnvLpcController *lpc, bool use_cpld, Error **errp); int pnv_dt_lpc(struct PnvChip *chip, void *fdt, int root_offset); -#endif /* _PPC_PNV_LPC_H */ +#endif /* PPC_PNV_LPC_H */ diff --git a/include/hw/ppc/pnv_occ.h b/include/hw/ppc/pnv_occ.h index d22b65a71a..ed0709bfc0 100644 --- a/include/hw/ppc/pnv_occ.h +++ b/include/hw/ppc/pnv_occ.h @@ -16,8 +16,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 _PPC_PNV_OCC_H -#define _PPC_PNV_OCC_H + +#ifndef PPC_PNV_OCC_H +#define PPC_PNV_OCC_H #include "hw/ppc/pnv_psi.h" @@ -52,4 +53,4 @@ typedef struct PnvOCCClass { int psi_irq; } PnvOCCClass; -#endif /* _PPC_PNV_OCC_H */ +#endif /* PPC_PNV_OCC_H */ diff --git a/include/hw/ppc/pnv_psi.h b/include/hw/ppc/pnv_psi.h index 2c1b27e865..e82df9709f 100644 --- a/include/hw/ppc/pnv_psi.h +++ b/include/hw/ppc/pnv_psi.h @@ -16,8 +16,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 _PPC_PNV_PSI_H -#define _PPC_PNV_PSI_H + +#ifndef PPC_PNV_PSI_H +#define PPC_PNV_PSI_H #include "hw/sysbus.h" #include "hw/ppc/xics.h" @@ -118,4 +119,4 @@ void pnv_psi_irq_set(PnvPsi *psi, int irq, bool state); void pnv_psi_pic_print_info(Pnv9Psi *psi, Monitor *mon); -#endif /* _PPC_PNV_PSI_H */ +#endif /* PPC_PNV_PSI_H */ diff --git a/include/hw/ppc/pnv_xscom.h b/include/hw/ppc/pnv_xscom.h index 68dfae0dfe..c842d950d2 100644 --- a/include/hw/ppc/pnv_xscom.h +++ b/include/hw/ppc/pnv_xscom.h @@ -16,8 +16,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 _PPC_PNV_XSCOM_H -#define _PPC_PNV_XSCOM_H + +#ifndef PPC_PNV_XSCOM_H +#define PPC_PNV_XSCOM_H #include "qom/object.h" @@ -98,4 +99,4 @@ extern void pnv_xscom_region_init(MemoryRegion *mr, const char *name, uint64_t size); -#endif /* _PPC_PNV_XSCOM_H */ +#endif /* PPC_PNV_XSCOM_H */ diff --git a/include/hw/ppc/spapr_ovec.h b/include/hw/ppc/spapr_ovec.h index 188a9367e2..5de5ecf5de 100644 --- a/include/hw/ppc/spapr_ovec.h +++ b/include/hw/ppc/spapr_ovec.h @@ -33,8 +33,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 _SPAPR_OVEC_H -#define _SPAPR_OVEC_H + +#ifndef SPAPR_OVEC_H +#define SPAPR_OVEC_H #include "cpu.h" #include "migration/vmstate.h" @@ -80,4 +81,4 @@ int spapr_ovec_populate_dt(void *fdt, int fdt_offset, /* migration */ extern const VMStateDescription vmstate_spapr_ovec; -#endif /* !defined (_SPAPR_OVEC_H) */ +#endif /* SPAPR_OVEC_H */ diff --git a/include/hw/timer/pl031.h b/include/hw/timer/pl031.h index 99416d8ba5..8857c24ca5 100644 --- a/include/hw/timer/pl031.h +++ b/include/hw/timer/pl031.h @@ -11,8 +11,8 @@ * GNU GPL, version 2 or (at your option) any later version. */ -#ifndef HW_TIMER_PL031 -#define HW_TIMER_PL031 +#ifndef HW_TIMER_PL031_H +#define HW_TIMER_PL031_H #include "hw/sysbus.h" diff --git a/include/hw/virtio/vhost-vsock.h b/include/hw/virtio/vhost-vsock.h index 7b9205fe3f..d509d67c4a 100644 --- a/include/hw/virtio/vhost-vsock.h +++ b/include/hw/virtio/vhost-vsock.h @@ -11,8 +11,8 @@ * top-level directory. */ -#ifndef _QEMU_VHOST_VSOCK_H -#define _QEMU_VHOST_VSOCK_H +#ifndef QEMU_VHOST_VSOCK_H +#define QEMU_VHOST_VSOCK_H #include "hw/virtio/virtio.h" #include "hw/virtio/vhost.h" @@ -38,4 +38,4 @@ typedef struct { /*< public >*/ } VHostVSock; -#endif /* _QEMU_VHOST_VSOCK_H */ +#endif /* QEMU_VHOST_VSOCK_H */ diff --git a/include/hw/virtio/virtio-crypto.h b/include/hw/virtio/virtio-crypto.h index ca3a04938e..ffe2391ece 100644 --- a/include/hw/virtio/virtio-crypto.h +++ b/include/hw/virtio/virtio-crypto.h @@ -11,8 +11,8 @@ * top-level directory. */ -#ifndef _QEMU_VIRTIO_CRYPTO_H -#define _QEMU_VIRTIO_CRYPTO_H +#ifndef QEMU_VIRTIO_CRYPTO_H +#define QEMU_VIRTIO_CRYPTO_H #include "standard-headers/linux/virtio_crypto.h" #include "hw/virtio/virtio.h" @@ -99,4 +99,4 @@ typedef struct VirtIOCrypto { uint8_t vhost_started; } VirtIOCrypto; -#endif /* _QEMU_VIRTIO_CRYPTO_H */ +#endif /* QEMU_VIRTIO_CRYPTO_H */ diff --git a/include/hw/xen/start_info.h b/include/hw/xen/start_info.h index 348779eb10..6ed4877794 100644 --- a/include/hw/xen/start_info.h +++ b/include/hw/xen/start_info.h @@ -20,8 +20,8 @@ * Copyright (c) 2016, Citrix Systems, Inc. */ -#ifndef __XEN_PUBLIC_ARCH_X86_HVM_START_INFO_H__ -#define __XEN_PUBLIC_ARCH_X86_HVM_START_INFO_H__ +#ifndef XEN_PUBLIC_ARCH_X86_HVM_START_INFO_H +#define XEN_PUBLIC_ARCH_X86_HVM_START_INFO_H /* * Start of day structure passed to PVH guests and to HVM guests in %ebx. @@ -143,4 +143,4 @@ struct hvm_memmap_table_entry { uint32_t reserved; }; -#endif /* __XEN_PUBLIC_ARCH_X86_HVM_START_INFO_H__ */ +#endif /* XEN_PUBLIC_ARCH_X86_HVM_START_INFO_H */ diff --git a/include/hw/xtensa/mx_pic.h b/include/hw/xtensa/mx_pic.h index e6cd8cf016..c9ea9e737c 100644 --- a/include/hw/xtensa/mx_pic.h +++ b/include/hw/xtensa/mx_pic.h @@ -25,8 +25,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _XTENSA_MX_PIC_H -#define _XTENSA_MX_PIC_H +#ifndef XTENSA_MX_PIC_H +#define XTENSA_MX_PIC_H #include "exec/memory.h" #include "hw/irq.h" diff --git a/include/qemu/drm.h b/include/qemu/drm.h index 4c3e622f5c..fab74d4be9 100644 --- a/include/qemu/drm.h +++ b/include/qemu/drm.h @@ -1,5 +1,5 @@ -#ifndef QEMU_DRM_H_ -#define QEMU_DRM_H_ +#ifndef QEMU_DRM_H +#define QEMU_DRM_H int qemu_drm_rendernode_open(const char *rendernode); diff --git a/include/qemu/jhash.h b/include/qemu/jhash.h index 7222242615..84d14dc7f7 100644 --- a/include/qemu/jhash.h +++ b/include/qemu/jhash.h @@ -21,8 +21,8 @@ * Jozsef */ -#ifndef QEMU_JHASH_H__ -#define QEMU_JHASH_H__ +#ifndef QEMU_JHASH_H +#define QEMU_JHASH_H #include "qemu/bitops.h" @@ -56,4 +56,4 @@ /* An arbitrary initial parameter */ #define JHASH_INITVAL 0xdeadbeef -#endif /* QEMU_JHASH_H__ */ +#endif /* QEMU_JHASH_H */ diff --git a/include/sysemu/hvf.h b/include/sysemu/hvf.h index aaa51d2c51..300bf3e9a8 100644 --- a/include/sysemu/hvf.h +++ b/include/sysemu/hvf.h @@ -9,8 +9,9 @@ */ /* header to be included in non-HVF-specific code */ -#ifndef _HVF_H -#define _HVF_H + +#ifndef HVF_H +#define HVF_H #include "qemu-common.h" #include "qemu/bitops.h" diff --git a/linux-user/xtensa/syscall_nr.h b/linux-user/xtensa/syscall_nr.h index cd5ef45f84..27645bea47 100644 --- a/linux-user/xtensa/syscall_nr.h +++ b/linux-user/xtensa/syscall_nr.h @@ -8,8 +8,8 @@ * Copyright (C) 2001 - 2009 Tensilica Inc. */ -#ifndef _XTENSA_UNISTD_H -#define _XTENSA_UNISTD_H +#ifndef XTENSA_SYSCALL_NR_H +#define XTENSA_SYSCALL_NR_H #define TARGET_NR_spill 0 #define TARGET_NR_xtensa 1 @@ -434,4 +434,4 @@ #define TARGET_NR_syscall_count 352 -#endif /* _XTENSA_UNISTD_H */ +#endif /* XTENSA_SYSCALL_NR_H */ diff --git a/linux-user/xtensa/target_structs.h b/linux-user/xtensa/target_structs.h index 1b3d9ca314..9cde6844b8 100644 --- a/linux-user/xtensa/target_structs.h +++ b/linux-user/xtensa/target_structs.h @@ -1,5 +1,5 @@ -#ifndef XTENSA_TARGET_STRUCTS_T -#define XTENSA_TARGET_STRUCTS_T +#ifndef XTENSA_TARGET_STRUCTS_H +#define XTENSA_TARGET_STRUCTS_H struct target_ipc_perm { abi_int __key; /* Key. */ diff --git a/linux-user/xtensa/termbits.h b/linux-user/xtensa/termbits.h index eed8286de7..d1e09e61a6 100644 --- a/linux-user/xtensa/termbits.h +++ b/linux-user/xtensa/termbits.h @@ -10,8 +10,8 @@ * Copyright (C) 2001 - 2005 Tensilica Inc. */ -#ifndef _XTENSA_TERMBITS_H -#define _XTENSA_TERMBITS_H +#ifndef XTENSA_TERMBITS_H +#define XTENSA_TERMBITS_H #include <linux/posix_types.h> @@ -325,4 +325,4 @@ struct target_ktermios { #define TARGET_TIOCMIWAIT _IO('T', 92) /* wait for a change on serial input line(s) */ #define TARGET_TIOCGICOUNT 0x545D /* read serial port inline interrupt counts */ -#endif /* _XTENSA_TERMBITS_H */ +#endif /* XTENSA_TERMBITS_H */ diff --git a/qga/vss-win32/vss-handles.h b/qga/vss-win32/vss-handles.h index ff399dd73a..0f8a741ad2 100644 --- a/qga/vss-win32/vss-handles.h +++ b/qga/vss-win32/vss-handles.h @@ -1,5 +1,5 @@ -#ifndef VSS_HANDLES -#define VSS_HANDLES +#ifndef VSS_HANDLES_H +#define VSS_HANDLES_H /* Constants for QGA VSS Provider */ diff --git a/slirp/src/debug.h b/slirp/src/debug.h index 44d922df37..bb83bafc1b 100644 --- a/slirp/src/debug.h +++ b/slirp/src/debug.h @@ -5,8 +5,8 @@ * terms and conditions of the copyright. */ -#ifndef DEBUG_H_ -#define DEBUG_H_ +#ifndef DEBUG_H +#define DEBUG_H #define DBG_CALL (1 << 0) #define DBG_MISC (1 << 1) @@ -45,4 +45,4 @@ extern int slirp_debug; } \ } while (0) -#endif /* DEBUG_H_ */ +#endif /* DEBUG_H */ diff --git a/slirp/src/stream.h b/slirp/src/stream.h index 985334c043..a4cf870af9 100644 --- a/slirp/src/stream.h +++ b/slirp/src/stream.h @@ -1,5 +1,5 @@ -#ifndef STREAM_H_ -#define STREAM_H_ +#ifndef STREAM_H +#define STREAM_H #include "libslirp.h" @@ -31,4 +31,4 @@ bool slirp_ostream_write_i16(SlirpOStream *f, int16_t b); int32_t slirp_istream_read_i32(SlirpIStream *f); bool slirp_ostream_write_i32(SlirpOStream *f, int32_t b); -#endif /* STREAM_H_ */ +#endif /* STREAM_H */ diff --git a/slirp/src/util.h b/slirp/src/util.h index e94ee4e7f1..69b3f0a6bd 100644 --- a/slirp/src/util.h +++ b/slirp/src/util.h @@ -20,8 +20,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#ifndef UTIL_H_ -#define UTIL_H_ + +#ifndef UTIL_H +#define UTIL_H #include <stdlib.h> #include <stdio.h> diff --git a/slirp/src/vmstate.h b/slirp/src/vmstate.h index cfa7b8c825..ca271f53ec 100644 --- a/slirp/src/vmstate.h +++ b/slirp/src/vmstate.h @@ -23,8 +23,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#ifndef VMSTATE_H_ -#define VMSTATE_H_ + +#ifndef VMSTATE_H +#define VMSTATE_H #include <unistd.h> #include <stdint.h> diff --git a/target/i386/hax-i386.h b/target/i386/hax-i386.h index f13fa4638f..54e9d8b057 100644 --- a/target/i386/hax-i386.h +++ b/target/i386/hax-i386.h @@ -10,8 +10,8 @@ * */ -#ifndef _HAX_I386_H -#define _HAX_I386_H +#ifndef HAX_I386_H +#define HAX_I386_H #include "cpu.h" #include "sysemu/hax.h" diff --git a/target/i386/hax-interface.h b/target/i386/hax-interface.h index 93d5fcb1dc..537ae084e9 100644 --- a/target/i386/hax-interface.h +++ b/target/i386/hax-interface.h @@ -14,8 +14,8 @@ /* Interface with HAX kernel module */ -#ifndef _HAX_INTERFACE_H -#define _HAX_INTERFACE_H +#ifndef HAX_INTERFACE_H +#define HAX_INTERFACE_H /* fx_layout has 3 formats table 3-56, 512bytes */ struct fx_layout { diff --git a/target/i386/hvf/hvf-i386.h b/target/i386/hvf/hvf-i386.h index 2232501552..15ee4835cf 100644 --- a/target/i386/hvf/hvf-i386.h +++ b/target/i386/hvf/hvf-i386.h @@ -13,8 +13,8 @@ * */ -#ifndef _HVF_I386_H -#define _HVF_I386_H +#ifndef HVF_I386_H +#define HVF_I386_H #include "sysemu/hvf.h" #include "cpu.h" diff --git a/target/i386/hvf/vmcs.h b/target/i386/hvf/vmcs.h index 2a8c0424a5..42de7ebc3a 100644 --- a/target/i386/hvf/vmcs.h +++ b/target/i386/hvf/vmcs.h @@ -26,8 +26,8 @@ * $FreeBSD$ */ -#ifndef _VMCS_H_ -#define _VMCS_H_ +#ifndef VMCS_H +#define VMCS_H #include <Hypervisor/hv.h> #include <Hypervisor/hv_vmx.h> diff --git a/target/i386/hvf/x86_emu.h b/target/i386/hvf/x86_emu.h index fbb4832576..f92a9c54b5 100644 --- a/target/i386/hvf/x86_emu.h +++ b/target/i386/hvf/x86_emu.h @@ -15,8 +15,9 @@ * You should have received a copy of the GNU Lesser General Public * License along with this program; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef __X86_EMU_H__ -#define __X86_EMU_H__ + +#ifndef X86_EMU_H +#define X86_EMU_H #include "x86.h" #include "x86_decode.h" diff --git a/target/i386/hvf/x86_flags.h b/target/i386/hvf/x86_flags.h index 8942745988..785e80cfca 100644 --- a/target/i386/hvf/x86_flags.h +++ b/target/i386/hvf/x86_flags.h @@ -20,8 +20,9 @@ /* * x86 eflags functions */ -#ifndef __X86_FLAGS_H__ -#define __X86_FLAGS_H__ + +#ifndef X86_FLAGS_H +#define X86_FLAGS_H #include "cpu.h" void lflags_to_rflags(CPUX86State *env); @@ -77,4 +78,4 @@ void SET_FLAGS_OSZAPC_LOGIC16(CPUX86State *env, uint16_t v1, uint16_t v2, void SET_FLAGS_OSZAPC_LOGIC8(CPUX86State *env, uint8_t v1, uint8_t v2, uint8_t diff); -#endif /* __X86_FLAGS_H__ */ +#endif /* X86_FLAGS_H */ diff --git a/target/i386/hvf/x86_mmu.h b/target/i386/hvf/x86_mmu.h index 0bd1acc94f..cd6e137e79 100644 --- a/target/i386/hvf/x86_mmu.h +++ b/target/i386/hvf/x86_mmu.h @@ -15,8 +15,9 @@ * You should have received a copy of the GNU Lesser General Public * License along with this program; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef __X86_MMU_H__ -#define __X86_MMU_H__ + +#ifndef X86_MMU_H +#define X86_MMU_H #define PT_PRESENT (1 << 0) #define PT_WRITE (1 << 1) @@ -40,4 +41,4 @@ bool mmu_gva_to_gpa(struct CPUState *cpu, target_ulong gva, uint64_t *gpa); void vmx_write_mem(struct CPUState *cpu, target_ulong gva, void *data, int bytes); void vmx_read_mem(struct CPUState *cpu, void *data, target_ulong gva, int bytes); -#endif /* __X86_MMU_H__ */ +#endif /* X86_MMU_H */ diff --git a/target/riscv/pmp.h b/target/riscv/pmp.h index e3953c885f..66790950eb 100644 --- a/target/riscv/pmp.h +++ b/target/riscv/pmp.h @@ -19,8 +19,8 @@ * this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef _RISCV_PMP_H_ -#define _RISCV_PMP_H_ +#ifndef RISCV_PMP_H +#define RISCV_PMP_H typedef enum { PMP_READ = 1 << 0, diff --git a/target/sparc/asi.h b/target/sparc/asi.h index d8d6284125..bb58735ddb 100644 --- a/target/sparc/asi.h +++ b/target/sparc/asi.h @@ -1,5 +1,5 @@ -#ifndef _SPARC_ASI_H -#define _SPARC_ASI_H +#ifndef SPARC_ASI_H +#define SPARC_ASI_H /* asi.h: Address Space Identifier values for the sparc. * @@ -309,4 +309,4 @@ * implicit, little-endian */ -#endif /* _SPARC_ASI_H */ +#endif /* SPARC_ASI_H */ diff --git a/tests/libqos/e1000e.h b/tests/libqos/e1000e.h index 9d37094f43..dc4ab10f58 100644 --- a/tests/libqos/e1000e.h +++ b/tests/libqos/e1000e.h @@ -16,8 +16,8 @@ * License along with this library; if not, see <http://www.gnu.org/licenses/> */ -#ifndef QGRAPH_E1000E -#define QGRAPH_E1000E +#ifndef QGRAPH_E1000E_H +#define QGRAPH_E1000E_H #include "libqos/qgraph.h" #include "pci.h" diff --git a/tests/libqos/sdhci.h b/tests/libqos/sdhci.h index 032d815c38..a88b45ae9d 100644 --- a/tests/libqos/sdhci.h +++ b/tests/libqos/sdhci.h @@ -16,8 +16,8 @@ * License along with this library; if not, see <http://www.gnu.org/licenses/> */ -#ifndef QGRAPH_QSDHCI -#define QGRAPH_QSDHCI +#ifndef QGRAPH_QSDHCI_H +#define QGRAPH_QSDHCI_H #include "libqos/qgraph.h" #include "pci.h"
Leading 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. Done with scripts/clean-header-guards.pl. Signed-off-by: Markus Armbruster <armbru@redhat.com> --- block/crypto.h | 6 +++--- hw/i386/amd_iommu.h | 4 ++-- hw/tpm/tpm_ioctl.h | 7 ++++--- hw/xtensa/xtensa_memory.h | 4 ++-- include/authz/base.h | 7 +++---- include/authz/list.h | 7 +++---- include/authz/simple.h | 7 +++---- include/chardev/spice.h | 4 ++-- include/hw/ppc/pnv.h | 7 ++++--- include/hw/ppc/pnv_core.h | 7 ++++--- include/hw/ppc/pnv_lpc.h | 7 ++++--- include/hw/ppc/pnv_occ.h | 7 ++++--- include/hw/ppc/pnv_psi.h | 7 ++++--- include/hw/ppc/pnv_xscom.h | 7 ++++--- include/hw/ppc/spapr_ovec.h | 7 ++++--- include/hw/timer/pl031.h | 4 ++-- include/hw/virtio/vhost-vsock.h | 6 +++--- include/hw/virtio/virtio-crypto.h | 6 +++--- include/hw/xen/start_info.h | 6 +++--- include/hw/xtensa/mx_pic.h | 4 ++-- include/qemu/drm.h | 4 ++-- include/qemu/jhash.h | 6 +++--- include/sysemu/hvf.h | 5 +++-- linux-user/xtensa/syscall_nr.h | 6 +++--- linux-user/xtensa/target_structs.h | 4 ++-- linux-user/xtensa/termbits.h | 6 +++--- qga/vss-win32/vss-handles.h | 4 ++-- slirp/src/debug.h | 6 +++--- slirp/src/stream.h | 6 +++--- slirp/src/util.h | 5 +++-- slirp/src/vmstate.h | 5 +++-- target/i386/hax-i386.h | 4 ++-- target/i386/hax-interface.h | 4 ++-- target/i386/hvf/hvf-i386.h | 4 ++-- target/i386/hvf/vmcs.h | 4 ++-- target/i386/hvf/x86_emu.h | 5 +++-- target/i386/hvf/x86_flags.h | 7 ++++--- target/i386/hvf/x86_mmu.h | 7 ++++--- target/riscv/pmp.h | 4 ++-- target/sparc/asi.h | 6 +++--- tests/libqos/e1000e.h | 4 ++-- tests/libqos/sdhci.h | 4 ++-- 42 files changed, 121 insertions(+), 110 deletions(-)