mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up ill-advised or unusual header guards

Browse Source 
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>
Message-Id: <20190315145123.28030-7-armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
[Changes to slirp/ dropped, as we're about to spin it off]
This commit is contained in:
Markus Armbruster 2019-03-15 15:51:21 +01:00
parent 58ea30f514
commit a8b991b52d
38 changed files with 109 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
block/crypto.h
View File

@ -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 */

4
hw/i386/amd_iommu.h
View File

@ -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"

7
hw/tpm/tpm_ioctl.h
View File

@ -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 */

4
hw/xtensa/xtensa_memory.h
View File

@ -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"

7
include/authz/base.h
View File

@ -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 */

7
include/authz/list.h
View File

@ -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 */

7
include/authz/simple.h
View File

@ -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 */

4
include/chardev/spice.h
View File

@ -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"

7
include/hw/ppc/pnv.h
View File

@ -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 */

7
include/hw/ppc/pnv_core.h
View File

@ -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 */

7
include/hw/ppc/pnv_lpc.h
View File

@ -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 */

7
include/hw/ppc/pnv_occ.h
View File

@ -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 */

7
include/hw/ppc/pnv_psi.h
View File

@ -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 */

7
include/hw/ppc/pnv_xscom.h
View File

@ -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 */

7
include/hw/ppc/spapr_ovec.h
View File

@ -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 */

4
include/hw/timer/pl031.h
View File

@ -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"

6
include/hw/virtio/vhost-vsock.h
View File

@ -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 */

6
include/hw/virtio/virtio-crypto.h
View File

@ -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 */

6
include/hw/xen/start_info.h
View File

@ -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 */

4
include/hw/xtensa/mx_pic.h
View File

@ -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"

4
include/qemu/drm.h
View File

@ -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);

6
include/qemu/jhash.h
View File

@ -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 */

5
include/sysemu/hvf.h
View File

@ -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"

6
linux-user/xtensa/syscall_nr.h
View File

@ -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 */

4
linux-user/xtensa/target_structs.h
View File

@ -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. */

6
linux-user/xtensa/termbits.h
View File

@ -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 */

4
qga/vss-win32/vss-handles.h
View File

@ -1,5 +1,5 @@
#ifndef VSS_HANDLES
#define VSS_HANDLES
#ifndef VSS_HANDLES_H
#define VSS_HANDLES_H
/* Constants for QGA VSS Provider */

4
target/i386/hax-i386.h
View File

@ -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"

4
target/i386/hax-interface.h
View File

@ -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 {

4
target/i386/hvf/hvf-i386.h
View File

@ -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"

4
target/i386/hvf/vmcs.h
View File

@ -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>

5
target/i386/hvf/x86_emu.h
View File

@ -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"

7
target/i386/hvf/x86_flags.h
View File

@ -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 */

7
target/i386/hvf/x86_mmu.h
View File

@ -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 */

4
target/riscv/pmp.h
View File

@ -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,

6
target/sparc/asi.h
View File

@ -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 */

4
tests/libqos/e1000e.h
View File

@ -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"

4
tests/libqos/sdhci.h
View File

@ -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"