Browse Source

Clean up header guards that don't match their file name

Header guard symbols should match their file name to make guard
collisions less likely.

Cleaned up with scripts/clean-header-guards.pl, followed by some
renaming of new guard symbols picked by the script to better ones.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20190315145123.28030-6-armbru@redhat.com>
[Rebase to master: update include/hw/net/ne2000-isa.h]
tags/v4.1.0-rc0
Markus Armbruster 6 months ago
parent
commit
58ea30f514

+ 3
- 3
contrib/elf2dmp/qemu_elf.h View File

@@ -5,8 +5,8 @@
*
*/

#ifndef ELF2DMP_ELF_H
#define ELF2DMP_ELF_H
#ifndef EMPF2DMP_QEMU_ELF_H
#define EMPF2DMP_QEMU_ELF_H

#include "elf.h"

@@ -47,4 +47,4 @@ void QEMU_Elf_exit(QEMU_Elf *qe);
Elf64_Phdr *elf64_getphdr(void *map);
Elf64_Half elf_getphdrnum(void *map);

#endif /* ELF2DMP_ELF_H */
#endif /* ELF2DMP_QEMU_ELF_H */

+ 2
- 2
disas/nanomips.h View File

@@ -20,8 +20,8 @@
*
*/

#ifndef NANOMIPS_DISASSEMBLER_H
#define NANOMIPS_DISASSEMBLER_H
#ifndef DISAS_NANOMIPS_H
#define DISAS_NANOMIPS_H

#include <string>


+ 4
- 3
fsdev/qemu-fsdev-throttle.h View File

@@ -12,8 +12,8 @@
*
*/

#ifndef _FSDEV_THROTTLE_H
#define _FSDEV_THROTTLE_H
#ifndef QEMU_FSDEV_THROTTLE_H
#define QEMU_FSDEV_THROTTLE_H

#include "block/aio.h"
#include "qemu/main-loop.h"
@@ -35,4 +35,5 @@ void coroutine_fn fsdev_co_throttle_request(FsThrottle *, bool ,
struct iovec *, int);

void fsdev_throttle_cleanup(FsThrottle *);
#endif /* _FSDEV_THROTTLE_H */

#endif /* QEMU_FSDEV_THROTTLE_H */

+ 2
- 2
hw/arm/smmuv3-internal.h View File

@@ -18,8 +18,8 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/

#ifndef HW_ARM_SMMU_V3_INTERNAL_H
#define HW_ARM_SMMU_V3_INTERNAL_H
#ifndef HW_ARM_SMMUV3_INTERNAL_H
#define HW_ARM_SMMUV3_INTERNAL_H

#include "hw/arm/smmu-common.h"


+ 3
- 3
hw/display/vga_regs.h View File

@@ -14,8 +14,8 @@
*
*/

#ifndef LINUX_VIDEO_VGA_H
#define LINUX_VIDEO_VGA_H
#ifndef HW_VGA_REGS_H
#define HW_VGA_REGS_H

/* Some of the code below is taken from SVGAlib. The original,
unmodified copyright notice for that code is below. */
@@ -156,4 +156,4 @@
/* VGA graphics controller bit masks */
#define VGA_GR06_GRAPHICS_MODE 0x01

#endif /* LINUX_VIDEO_VGA_H */
#endif /* HW_VGA_REGS_H */

+ 2
- 2
hw/rdma/vmw/pvrdma_qp_ops.h View File

@@ -13,8 +13,8 @@
*
*/

#ifndef PVRDMA_QP_H
#define PVRDMA_QP_H
#ifndef PVRDMA_QP_OPS_H
#define PVRDMA_QP_OPS_H

#include "pvrdma.h"


+ 3
- 2
hw/sd/sdmmc-internal.h View File

@@ -7,8 +7,9 @@
* See the COPYING file in the top-level directory.
* SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef SD_INTERNAL_H
#define SD_INTERNAL_H

#ifndef SDMMC_INTERNAL_H
#define SDMMC_INTERNAL_H

#define SDMMC_CMD_MAX 64


+ 3
- 5
include/authz/listfile.h View File

@@ -18,8 +18,8 @@
*
*/

#ifndef QAUTHZ_LIST_FILE_H__
#define QAUTHZ_LIST_FILE_H__
#ifndef QAUTHZ_LISTFILE_H
#define QAUTHZ_LISTFILE_H

#include "authz/list.h"
#include "qapi/qapi-types-authz.h"
@@ -106,6 +106,4 @@ QAuthZListFile *qauthz_list_file_new(const char *id,
bool refresh,
Error **errp);


#endif /* QAUTHZ_LIST_FILE_H__ */

#endif /* QAUTHZ_LISTFILE_H */

+ 3
- 4
include/authz/pamacct.h View File

@@ -18,8 +18,8 @@
*
*/

#ifndef QAUTHZ_PAM_H__
#define QAUTHZ_PAM_H__
#ifndef QAUTHZ_PAMACCT_H
#define QAUTHZ_PAMACCT_H

#include "authz/base.h"

@@ -96,5 +96,4 @@ QAuthZPAM *qauthz_pam_new(const char *id,
const char *service,
Error **errp);


#endif /* QAUTHZ_PAM_H__ */
#endif /* QAUTHZ_PAMACCT_H */

+ 2
- 2
include/hw/audio/soundhw.h View File

@@ -1,5 +1,5 @@
#ifndef HW_AUDIO_H
#define HW_AUDIO_H
#ifndef HW_SOUNDHW_H
#define HW_SOUNDHW_H

void isa_register_soundhw(const char *name, const char *descr,
int (*init_isa)(ISABus *bus));

+ 2
- 2
include/hw/i386/x86-iommu.h View File

@@ -17,8 +17,8 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/

#ifndef IOMMU_COMMON_H
#define IOMMU_COMMON_H
#ifndef HW_I386_X86_IOMMU_H
#define HW_I386_X86_IOMMU_H

#include "hw/sysbus.h"
#include "hw/pci/pci.h"

+ 3
- 3
include/hw/intc/heathrow_pic.h View File

@@ -23,8 +23,8 @@
* THE SOFTWARE.
*/

#ifndef HEATHROW_H
#define HEATHROW_H
#ifndef HW_INTC_HEATHROW_PIC_H
#define HW_INTC_HEATHROW_PIC_H

#define TYPE_HEATHROW "heathrow"
#define HEATHROW(obj) OBJECT_CHECK(HeathrowState, (obj), TYPE_HEATHROW)
@@ -46,4 +46,4 @@ typedef struct HeathrowState {

#define HEATHROW_NUM_IRQS 64

#endif /* HEATHROW_H */
#endif /* HW_INTC_HEATHROW_PIC_H */

+ 3
- 3
include/hw/intc/xlnx-pmu-iomod-intc.h View File

@@ -22,8 +22,8 @@
* THE SOFTWARE.
*/

#ifndef XLNX_PMU_IO_INTC_H
#define XLNX_PMU_IO_INTC_H
#ifndef HW_INTC_XLNX_PMU_IOMOD_INTC_H
#define HW_INTC_XLNX_PMU_IOMOD_INTC_H

#include "hw/sysbus.h"
#include "hw/register.h"
@@ -54,4 +54,4 @@ typedef struct XlnxPMUIOIntc {
RegisterInfo regs_info[XLNXPMUIOINTC_R_MAX];
} XlnxPMUIOIntc;

#endif /* XLNX_PMU_IO_INTC_H */
#endif /* HW_INTC_XLNX_PMU_IOMOD_INTC_H */

+ 2
- 2
include/hw/misc/armsse-mhu.h View File

@@ -20,8 +20,8 @@
* + sysbus IRQ 1: interrupt for CPU 1
*/

#ifndef HW_MISC_SSE_MHU_H
#define HW_MISC_SSE_MHU_H
#ifndef HW_MISC_ARMSSE_MHU_H
#define HW_MISC_ARMSSE_MHU_H

#include "hw/sysbus.h"


+ 2
- 2
include/hw/net/ne2000-isa.h View File

@@ -7,8 +7,8 @@
* See the COPYING file in the top-level directory.
*/

#ifndef HW_NET_NE2K_ISA_H
#define HW_NET_NE2K_ISA_H
#ifndef HW_NET_NE2000_ISA_H
#define HW_NET_NE2000_ISA_H

#include "hw/hw.h"
#include "hw/qdev.h"

+ 2
- 2
include/hw/pci-host/sabre.h View File

@@ -1,5 +1,5 @@
#ifndef PCI_HOST_APB_H
#define PCI_HOST_APB_H
#ifndef HW_PCI_HOST_SABRE_H
#define HW_PCI_HOST_SABRE_H

#include "hw/sparc/sun4u_iommu.h"


+ 4
- 3
include/hw/watchdog/wdt_aspeed.h View File

@@ -6,8 +6,9 @@
* This code is licensed under the GPL version 2 or later. See the
* COPYING file in the top-level directory.
*/
#ifndef ASPEED_WDT_H
#define ASPEED_WDT_H

#ifndef WDT_ASPEED_H
#define WDT_ASPEED_H

#include "hw/sysbus.h"

@@ -31,4 +32,4 @@ typedef struct AspeedWDTState {
uint32_t ext_pulse_width_mask;
} AspeedWDTState;

#endif /* ASPEED_WDT_H */
#endif /* WDT_ASPEED_H */

+ 3
- 3
include/hw/xen/xen-legacy-backend.h View File

@@ -1,5 +1,5 @@
#ifndef QEMU_HW_XEN_BACKEND_H
#define QEMU_HW_XEN_BACKEND_H
#ifndef HW_XEN_LEGACY_BACKEND_H
#define HW_XEN_LEGACY_BACKEND_H

#include "hw/xen/xen_common.h"
#include "hw/xen/xen_pvdev.h"
@@ -101,4 +101,4 @@ int xen_config_dev_vfb(int vdev, const char *type);
int xen_config_dev_vkbd(int vdev);
int xen_config_dev_console(int vdev);

#endif /* QEMU_HW_XEN_BACKEND_H */
#endif /* HW_XEN_LEGACY_BACKEND_H */

+ 3
- 3
include/hw/xtensa/xtensa-isa.h View File

@@ -22,8 +22,8 @@
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/

#ifndef XTENSA_LIBISA_H
#define XTENSA_LIBISA_H
#ifndef HW_XTENSA_XTENSA_ISA_H
#define HW_XTENSA_XTENSA_ISA_H

#ifdef __cplusplus
extern "C" {
@@ -833,4 +833,4 @@ int xtensa_funcUnit_num_copies(xtensa_isa isa, xtensa_funcUnit fun);
#ifdef __cplusplus
}
#endif
#endif /* XTENSA_LIBISA_H */
#endif /* HW_XTENSA_XTENSA_ISA_H */

+ 2
- 2
include/migration/qemu-file-types.h View File

@@ -22,8 +22,8 @@
* THE SOFTWARE.
*/

#ifndef QEMU_FILE_H
#define QEMU_FILE_H
#ifndef MIGRATION_QEMU_FILE_TYPES_H
#define MIGRATION_QEMU_FILE_TYPES_H

int qemu_file_get_error(QEMUFile *f);


+ 3
- 3
include/qemu/filemonitor.h View File

@@ -18,8 +18,8 @@
*
*/

#ifndef QEMU_FILE_MONITOR_H
#define QEMU_FILE_MONITOR_H
#ifndef QEMU_FILEMONITOR_H
#define QEMU_FILEMONITOR_H

#include "qemu-common.h"

@@ -125,4 +125,4 @@ void qemu_file_monitor_remove_watch(QFileMonitor *mon,
const char *dirpath,
int64_t id);

#endif /* QEMU_FILE_MONITOR_H */
#endif /* QEMU_FILEMONITOR_H */

+ 2
- 2
include/scsi/constants.h View File

@@ -20,8 +20,8 @@
* the scsi code for linux.
*/

#ifndef BLOCK_SCSI_H
#define BLOCK_SCSI_H
#ifndef SCSI_CONSTANTS_H
#define SCSI_CONSTANTS_H

/*
* SCSI opcodes

+ 3
- 3
net/colo.h View File

@@ -12,8 +12,8 @@
* later. See the COPYING file in the top-level directory.
*/

#ifndef QEMU_COLO_PROXY_H
#define QEMU_COLO_PROXY_H
#ifndef NET_COLO_H
#define NET_COLO_H

#include "qemu/jhash.h"
#include "qemu/timer.h"
@@ -103,4 +103,4 @@ void connection_hashtable_reset(GHashTable *connection_track_table);
Packet *packet_new(const void *data, int size, int vnet_hdr_len);
void packet_destroy(void *opaque, void *user_data);

#endif /* QEMU_COLO_PROXY_H */
#endif /* NET_COLO_H */

+ 3
- 3
target/i386/hax-posix.h View File

@@ -12,8 +12,8 @@
*
*/

#ifndef TARGET_I386_HAX_DARWIN_H
#define TARGET_I386_HAX_DARWIN_H
#ifndef TARGET_I386_HAX_POSIX_H
#define TARGET_I386_HAX_POSIX_H

#include <sys/ioctl.h>

@@ -58,4 +58,4 @@ static inline void hax_close_fd(hax_fd fd)
#define HAX_VCPU_SET_REGS _IOWR(0, 0xc7, struct vcpu_state_t)
#define HAX_VCPU_GET_REGS _IOWR(0, 0xc8, struct vcpu_state_t)

#endif /* TARGET_I386_HAX_DARWIN_H */
#endif /* TARGET_I386_HAX_POSIX_H */

+ 4
- 2
target/i386/hvf/x86_task.h View File

@@ -11,8 +11,10 @@
* You should have received a copy of the GNU General Public License along
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#ifndef HVF_TASK
#define HVF_TASK

#ifndef HVF_X86_TASK_H
#define HVF_X86_TASK_H

void vmx_handle_task_switch(CPUState *cpu, x68_segment_selector tss_sel,
int reason, bool gate_valid, uint8_t gate, uint64_t gate_type);
#endif

+ 4
- 3
target/nios2/cpu.h View File

@@ -17,8 +17,9 @@
* License along with this library; if not, see
* <http://www.gnu.org/licenses/lgpl-2.1.html>
*/
#ifndef CPU_NIOS2_H
#define CPU_NIOS2_H

#ifndef NIOS2_CPU_H
#define NIOS2_CPU_H

#include "qemu-common.h"

@@ -270,4 +271,4 @@ static inline void cpu_get_tb_cpu_state(CPUNios2State *env, target_ulong *pc,
*flags = (env->regs[CR_STATUS] & (CR_STATUS_EH | CR_STATUS_U));
}

#endif /* CPU_NIOS2_H */
#endif /* NIOS2_CPU_H */

+ 4
- 3
target/nios2/mmu.h View File

@@ -17,8 +17,9 @@
* License along with this library; if not, see
* <http://www.gnu.org/licenses/lgpl-2.1.html>
*/
#ifndef MMU_NIOS2_H
#define MMU_NIOS2_H

#ifndef NIOS2_MMU_H
#define NIOS2_MMU_H

typedef struct Nios2TLBEntry {
target_ulong tag;
@@ -47,4 +48,4 @@ void mmu_read_debug(CPUNios2State *env, uint32_t rn);
void mmu_write(CPUNios2State *env, uint32_t rn, uint32_t v);
void mmu_init(CPUNios2State *env);

#endif /* MMU_NIOS2_H */
#endif /* NIOS2_MMU_H */

+ 3
- 3
target/ppc/mmu-book3s-v3.h View File

@@ -17,8 +17,8 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/

#ifndef MMU_BOOOK3S_V3_H
#define MMU_BOOOK3S_V3_H
#ifndef PPC_MMU_BOOK3S_V3_H
#define PPC_MMU_BOOK3S_V3_H

#include "mmu-hash64.h"

@@ -118,4 +118,4 @@ static inline hwaddr ppc_hash64_hpt_mask(PowerPCCPU *cpu)

#endif /* CONFIG_USER_ONLY */

#endif /* MMU_BOOOK3S_V3_H */
#endif /* PPC_MMU_BOOK3S_V3_H */

+ 2
- 2
tests/libqos/qgraph_internal.h View File

@@ -16,8 +16,8 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>
*/

#ifndef QGRAPH_EXTRA_H
#define QGRAPH_EXTRA_H
#ifndef QGRAPH_INTERNAL_H
#define QGRAPH_INTERNAL_H

/* This header is declaring additional helper functions defined in
* libqos/qgraph.c

+ 4
- 3
tests/migration/migration-test.h View File

@@ -4,8 +4,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 _TEST_MIGRATION_H_
#define _TEST_MIGRATION_H_

#ifndef MIGRATION_TEST_H
#define MIGRATION_TEST_H

/* Common */
#define TEST_MEM_PAGE_SIZE 4096
@@ -31,4 +32,4 @@
*/
#define ARM_TEST_MAX_KERNEL_SIZE (512 * 1024)

#endif /* _TEST_MIGRATION_H_ */
#endif /* _MIGRATION_TEST_H */

Loading…
Cancel
Save