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.  Offenders found with
scripts/clean-header-guards.pl -vn.

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>
Reviewed-by: Richard Henderson <rth@twiddle.net>
This commit is contained in:
Markus Armbruster 2016-06-29 10:12:57 +02:00
parent 85aad98a0e
commit 121d07125b
83 changed files with 223 additions and 215 deletions

View File

@ -18,8 +18,8 @@
* *
*/ */
#ifndef QCRYPTO_BLOCK_PRIV_H__ #ifndef QCRYPTO_BLOCKPRIV_H
#define QCRYPTO_BLOCK_PRIV_H__ #define QCRYPTO_BLOCKPRIV_H
#include "crypto/block.h" #include "crypto/block.h"
@ -89,4 +89,4 @@ int qcrypto_block_encrypt_helper(QCryptoCipher *cipher,
size_t len, size_t len,
Error **errp); Error **errp);
#endif /* QCRYPTO_BLOCK_PRIV_H__ */ #endif /* QCRYPTO_BLOCKPRIV_H */

View File

@ -18,8 +18,8 @@
* *
*/ */
#ifndef QCRYPTO_IVGEN_PRIV_H__ #ifndef QCRYPTO_IVGENPRIV_H
#define QCRYPTO_IVGEN_PRIV_H__ #define QCRYPTO_IVGENPRIV_H
#include "crypto/ivgen.h" #include "crypto/ivgen.h"
@ -46,4 +46,4 @@ struct QCryptoIVGen {
}; };
#endif /* QCRYPTO_IVGEN_PRIV_H__ */ #endif /* QCRYPTO_IVGENPRIV_H */

View File

@ -18,8 +18,8 @@
* *
*/ */
#ifndef QCRYPTO_TLSCRED_PRIV_H__ #ifndef QCRYPTO_TLSCREDSPRIV_H
#define QCRYPTO_TLSCRED_PRIV_H__ #define QCRYPTO_TLSCREDSPRIV_H
#include "crypto/tlscreds.h" #include "crypto/tlscreds.h"
@ -38,5 +38,4 @@ int qcrypto_tls_creds_get_dh_params_file(QCryptoTLSCreds *creds,
#endif #endif
#endif /* QCRYPTO_TLSCRED_PRIV_H__ */ #endif /* QCRYPTO_TLSCREDSPRIV_H */

View File

@ -10,8 +10,10 @@
* the COPYING file in the top-level directory. * the COPYING file in the top-level directory.
* *
*/ */
#ifndef _FILEOP_H
#define _FILEOP_H #ifndef FILE_OP_9P_H
#define FILE_OP_9P_H
#include <dirent.h> #include <dirent.h>
#include <utime.h> #include <utime.h>
#include <sys/vfs.h> #include <sys/vfs.h>

View File

@ -10,9 +10,9 @@
* the COPYING file in the top-level directory. * the COPYING file in the top-level directory.
* *
*/ */
#ifndef HW_9PFS_SYNTH_H
#define HW_9PFS_SYNTH_H 1
#ifndef QEMU_9P_SYNTH_H
#define QEMU_9P_SYNTH_H
typedef struct V9fsSynthNode V9fsSynthNode; typedef struct V9fsSynthNode V9fsSynthNode;
typedef ssize_t (*v9fs_synth_read)(void *buf, int len, off_t offset, typedef ssize_t (*v9fs_synth_read)(void *buf, int len, off_t offset,

View File

@ -1,7 +1,7 @@
/* Alpha cores and system support chips. */ /* Alpha cores and system support chips. */
#ifndef HW_ALPHA_H #ifndef HW_ALPHA_SYS_H
#define HW_ALPHA_H 1 #define HW_ALPHA_SYS_H
#include "target-alpha/cpu-qom.h" #include "target-alpha/cpu-qom.h"
#include "hw/pci/pci.h" #include "hw/pci/pci.h"

View File

@ -1,5 +1,5 @@
#ifndef QEMU_HW_MILKYMIST_H #ifndef QEMU_HW_MILKYMIST_HW_H
#define QEMU_HW_MILKYMIST_H #define QEMU_HW_MILKYMIST_HW_H
#include "hw/qdev.h" #include "hw/qdev.h"
#include "net/net.h" #include "net/net.h"
@ -203,4 +203,4 @@ static inline DeviceState *milkymist_softusb_create(hwaddr base,
return dev; return dev;
} }
#endif /* QEMU_HW_MILKYMIST_H */ #endif /* QEMU_HW_MILKYMIST_HW_H */

View File

@ -29,9 +29,8 @@
* Structures, enums, and macros for the MAC * Structures, enums, and macros for the MAC
*/ */
#ifndef _E1000_HW_H_ #ifndef HW_E1000_REGS_H
#define _E1000_HW_H_ #define HW_E1000_REGS_H
/* PCI Device IDs */ /* PCI Device IDs */
#define E1000_DEV_ID_82542 0x1000 #define E1000_DEV_ID_82542 0x1000
@ -1248,4 +1247,4 @@ struct e1000_data_desc {
#define E1000_IOADDR 0x00 #define E1000_IOADDR 0x00
#define E1000_IODATA 0x04 #define E1000_IODATA 0x04
#endif /* _E1000_HW_H_ */ #endif /* HW_E1000_REGS_H */

View File

@ -1,5 +1,5 @@
#ifndef DEC_PCI_H #ifndef HW_PCI_BRIDGE_DEC_H
#define DEC_PCI_H #define HW_PCI_BRIDGE_DEC_H
#include "qemu-common.h" #include "qemu-common.h"

View File

@ -22,8 +22,8 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#if !defined(PPC_405_H) #ifndef PPC405_H
#define PPC_405_H #define PPC405_H
#include "hw/ppc/ppc4xx.h" #include "hw/ppc/ppc4xx.h"
@ -78,4 +78,4 @@ CPUPPCState *ppc_stb025_init (MemoryRegion ram_memories[2],
uint32_t sysclk, qemu_irq **picp, uint32_t sysclk, qemu_irq **picp,
ram_addr_t *offsetp); ram_addr_t *offsetp);
#endif /* !defined(PPC_405_H) */ #endif /* PPC405_H */

View File

@ -30,8 +30,8 @@
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
#ifndef MFI_REG_H #ifndef SCSI_MFI_H
#define MFI_REG_H #define SCSI_MFI_H
/* /*
* MegaRAID SAS MFI firmware definitions * MegaRAID SAS MFI firmware definitions
@ -1269,4 +1269,4 @@ struct mfi_config_data {
#define MFI_SCSI_MAX_CMDS 8 #define MFI_SCSI_MAX_CMDS 8
#define MFI_SCSI_MAX_CDB_LEN 16 #define MFI_SCSI_MAX_CDB_LEN 16
#endif /* MFI_REG_H */ #endif /* SCSI_MFI_H */

View File

@ -18,11 +18,12 @@
* You should have received a copy of the GNU Lesser General Public * 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/> * License along with this library; if not, see <http://www.gnu.org/licenses/>
*/ */
#ifndef TPM_TPM_UTILS_H
#define TPM_TPM_UTILS_H #ifndef TPM_TPM_UTIL_H
#define TPM_TPM_UTIL_H
#include "sysemu/tpm_backend.h" #include "sysemu/tpm_backend.h"
int tpm_util_test_tpmdev(int tpm_fd, TPMVersion *tpm_version); int tpm_util_test_tpmdev(int tpm_fd, TPMVersion *tpm_version);
#endif /* TPM_TPM_UTILS_H */ #endif /* TPM_TPM_UTIL_H */

View File

@ -14,8 +14,9 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>. * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef HW_USB_EHCI_H
#define HW_USB_EHCI_H 1 #ifndef HW_USB_HCD_EHCI_H
#define HW_USB_HCD_EHCI_H
#include "hw/hw.h" #include "hw/hw.h"
#include "qemu/timer.h" #include "qemu/timer.h"

View File

@ -19,8 +19,9 @@
* This header file contains public constants and structures used by * This header file contains public constants and structures used by
* the scsi code for linux. * the scsi code for linux.
*/ */
#ifndef HW_SCSI_DEFS_H
#define HW_SCSI_DEFS_H 1 #ifndef BLOCK_SCSI_H
#define BLOCK_SCSI_H
/* /*
* SCSI opcodes * SCSI opcodes

View File

@ -9,8 +9,9 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*/ */
#ifndef D3DES_H
#define D3DES_H 1 #ifndef QCRYPTO_DESRFB_H
#define QCRYPTO_DESRFB_H
/* d3des.h - /* d3des.h -
* *

View File

@ -18,8 +18,8 @@
* *
*/ */
#ifndef QCRYPTO_TLSCRED_H__ #ifndef QCRYPTO_TLSCREDS_H
#define QCRYPTO_TLSCRED_H__ #define QCRYPTO_TLSCREDS_H
#include "qom/object.h" #include "qom/object.h"
@ -63,5 +63,4 @@ struct QCryptoTLSCredsClass {
}; };
#endif /* QCRYPTO_TLSCRED_H__ */ #endif /* QCRYPTO_TLSCREDS_H */

View File

@ -18,8 +18,8 @@
* *
*/ */
#ifndef QCRYPTO_TLSCRED_ANON_H__ #ifndef QCRYPTO_TLSCREDSANON_H
#define QCRYPTO_TLSCRED_ANON_H__ #define QCRYPTO_TLSCREDSANON_H
#include "crypto/tlscreds.h" #include "crypto/tlscreds.h"
@ -108,5 +108,4 @@ struct QCryptoTLSCredsAnonClass {
}; };
#endif /* QCRYPTO_TLSCRED_H__ */ #endif /* QCRYPTO_TLSCREDSANON_H */

View File

@ -18,8 +18,8 @@
* *
*/ */
#ifndef QCRYPTO_TLSCRED_X509_H__ #ifndef QCRYPTO_TLSCREDSX509_H
#define QCRYPTO_TLSCRED_X509_H__ #define QCRYPTO_TLSCREDSX509_H
#include "crypto/tlscreds.h" #include "crypto/tlscreds.h"
@ -110,5 +110,4 @@ struct QCryptoTLSCredsX509Class {
}; };
#endif /* QCRYPTO_TLSCRED_X509_H__ */ #endif /* QCRYPTO_TLSCREDSX509_H */

View File

@ -18,8 +18,8 @@
* *
*/ */
#ifndef QCRYPTO_TLS_SESSION_H__ #ifndef QCRYPTO_TLSSESSION_H
#define QCRYPTO_TLS_SESSION_H__ #define QCRYPTO_TLSSESSION_H
#include "crypto/tlscreds.h" #include "crypto/tlscreds.h"
@ -319,4 +319,4 @@ int qcrypto_tls_session_get_key_size(QCryptoTLSSession *sess,
*/ */
char *qcrypto_tls_session_get_peer_name(QCryptoTLSSession *sess); char *qcrypto_tls_session_get_peer_name(QCryptoTLSSession *sess);
#endif /* QCRYPTO_TLS_SESSION_H__ */ #endif /* QCRYPTO_TLSSESSION_H */

View File

@ -6,8 +6,8 @@
interface, for making instruction-processing programs more independent interface, for making instruction-processing programs more independent
of the instruction set being processed. */ of the instruction set being processed. */
#ifndef DIS_ASM_H #ifndef DISAS_BFD_H
#define DIS_ASM_H #define DISAS_BFD_H
#include "qemu-common.h" #include "qemu-common.h"
@ -489,4 +489,4 @@ bfd_vma bfd_getl16 (const bfd_byte *addr);
bfd_vma bfd_getb16 (const bfd_byte *addr); bfd_vma bfd_getb16 (const bfd_byte *addr);
typedef bool bfd_boolean; typedef bool bfd_boolean;
#endif /* ! defined (DIS_ASM_H) */ #endif /* DISAS_BFD_H */

View File

@ -11,8 +11,8 @@
* *
*/ */
#ifndef EXEC_MEMORY_H #ifndef EXEC_ADDRESS_SPACES_H
#define EXEC_MEMORY_H #define EXEC_ADDRESS_SPACES_H
/* /*
* Internal interfaces between memory.c/exec.c/vl.c. Do not #include unless * Internal interfaces between memory.c/exec.c/vl.c. Do not #include unless

View File

@ -15,9 +15,8 @@
GEN_HELPER 2 to do runtime registration helper functions. GEN_HELPER 2 to do runtime registration helper functions.
*/ */
#ifndef DEF_HELPER_H #ifndef EXEC_HELPER_HEAD_H
#define DEF_HELPER_H 1 #define EXEC_HELPER_HEAD_H
#define HELPER(name) glue(helper_, name) #define HELPER(name) glue(helper_, name)
@ -133,4 +132,4 @@
/* MAX_OPC_PARAM_IARGS must be set to n if last entry is DEF_HELPER_FLAGS_n. */ /* MAX_OPC_PARAM_IARGS must be set to n if last entry is DEF_HELPER_FLAGS_n. */
#endif /* DEF_HELPER_H */ #endif /* EXEC_HELPER_HEAD_H */

View File

@ -1,5 +1,6 @@
#ifndef QEMU_TYPES_H #ifndef EXEC_USER_ABITYPES_H
#define QEMU_TYPES_H #define EXEC_USER_ABITYPES_H
#include "cpu.h" #include "cpu.h"
#ifdef TARGET_ABI32 #ifdef TARGET_ABI32

View File

@ -1,5 +1,5 @@
#ifndef HW_ACPI_GEN_UTILS_H #ifndef HW_ACPI_AML_BUILD_H
#define HW_ACPI_GEN_UTILS_H #define HW_ACPI_AML_BUILD_H
#include "hw/acpi/acpi-defs.h" #include "hw/acpi/acpi-defs.h"
#include "hw/acpi/bios-linker-loader.h" #include "hw/acpi/bios-linker-loader.h"

View File

@ -9,8 +9,9 @@
* This work is licensed under the terms of the GNU GPL, version 2 or later. * This work is licensed under the terms of the GNU GPL, version 2 or later.
* See the COPYING file in the top-level directory. * See the COPYING file in the top-level directory.
*/ */
#ifndef ACPI_HOTPLUG_H
#define ACPI_HOTPLUG_H #ifndef HW_ACPI_CPU_HOTPLUG_H
#define HW_ACPI_CPU_HOTPLUG_H
#include "hw/acpi/acpi.h" #include "hw/acpi/acpi.h"
#include "hw/acpi/pc-hotplug.h" #include "hw/acpi/pc-hotplug.h"

View File

@ -8,8 +8,8 @@
* *
*/ */
#ifndef ARM_MISC_H #ifndef HW_ARM_H
#define ARM_MISC_H 1 #define HW_ARM_H
#include "exec/memory.h" #include "exec/memory.h"
#include "target-arm/cpu-qom.h" #include "target-arm/cpu-qom.h"
@ -140,4 +140,4 @@ void arm_write_secure_board_setup_dummy_smc(ARMCPU *cpu,
ticks. */ ticks. */
extern int system_clock_scale; extern int system_clock_scale;
#endif /* !ARM_MISC_H */ #endif /* HW_ARM_H */

View File

@ -22,8 +22,8 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#ifndef HW_ARM_STM32F205SOC_H #ifndef HW_ARM_STM32F205_SOC_H
#define HW_ARM_STM32F205SOC_H #define HW_ARM_STM32F205_SOC_H
#include "hw/misc/stm32f2xx_syscfg.h" #include "hw/misc/stm32f2xx_syscfg.h"
#include "hw/timer/stm32f2xx_timer.h" #include "hw/timer/stm32f2xx_timer.h"

View File

@ -1,5 +1,5 @@
#ifndef HW_AUDIODEV_H #ifndef HW_AUDIO_H
#define HW_AUDIODEV_H 1 #define HW_AUDIO_H
void isa_register_soundhw(const char *name, const char *descr, void isa_register_soundhw(const char *name, const char *descr,
int (*init_isa)(ISABus *bus)); int (*init_isa)(ISABus *bus));

View File

@ -8,8 +8,8 @@
* later. See the COPYING file in the top-level directory. * later. See the COPYING file in the top-level directory.
*/ */
#ifndef HW_BLOCK_COMMON_H #ifndef HW_BLOCK_H
#define HW_BLOCK_COMMON_H #define HW_BLOCK_H
#include "qemu-common.h" #include "qemu-common.h"

View File

@ -12,8 +12,8 @@
* this program. If not, see <http://www.gnu.org/licenses/>. * this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef PL011_UART_H #ifndef HW_PL011_H
#define PL011_UART_H #define HW_PL011_H
static inline DeviceState *pl011_create(hwaddr addr, static inline DeviceState *pl011_create(hwaddr addr,
qemu_irq irq, qemu_irq irq,

View File

@ -22,8 +22,8 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#ifndef HW_EXTRAXFS_H #ifndef HW_ETRAXFS_H
#define HW_EXTRAXFS_H 1 #define HW_ETRAXFS_H
#include "net/net.h" #include "net/net.h"
#include "hw/cris/etraxfs_dma.h" #include "hw/cris/etraxfs_dma.h"

View File

@ -1,5 +1,5 @@
#ifndef AW_A10_PIC_H #ifndef ALLWINNER_A10_PIC_H
#define AW_A10_PIC_H #define ALLWINNER_A10_PIC_H
#define TYPE_AW_A10_PIC "allwinner-a10-pic" #define TYPE_AW_A10_PIC "allwinner-a10-pic"
#define AW_A10_PIC(obj) OBJECT_CHECK(AwA10PICState, (obj), TYPE_AW_A10_PIC) #define AW_A10_PIC(obj) OBJECT_CHECK(AwA10PICState, (obj), TYPE_AW_A10_PIC)

View File

@ -10,8 +10,9 @@
* This work is licensed under the terms of the GNU GPL, version 2 or later. * This work is licensed under the terms of the GNU GPL, version 2 or later.
* See the COPYING file in the top-level directory. * See the COPYING file in the top-level directory.
*/ */
#ifndef QEMU_INTEGRATOR_DEBUG_H
#define QEMU_INTEGRATOR_DEBUG_H #ifndef ARM_INTEGRATOR_DEBUG_H
#define ARM_INTEGRATOR_DEBUG_H
#define TYPE_INTEGRATOR_DEBUG "integrator_debug" #define TYPE_INTEGRATOR_DEBUG "integrator_debug"

View File

@ -22,8 +22,8 @@
* *
*/ */
#ifndef QEMU_AUX_H #ifndef HW_MISC_AUXBUS_H
#define QEMU_AUX_H #define HW_MISC_AUXBUS_H
#include "hw/qdev.h" #include "hw/qdev.h"
@ -125,4 +125,4 @@ void aux_init_mmio(AUXSlave *aux_slave, MemoryRegion *mmio);
DeviceState *aux_create_slave(AUXBus *bus, const char *name, uint32_t addr); DeviceState *aux_create_slave(AUXBus *bus, const char *name, uint32_t addr);
#endif /* !QEMU_AUX_H */ #endif /* HW_MISC_AUXBUS_H */

View File

@ -7,8 +7,8 @@
* *
*/ */
#ifndef _MIPS_GCR_H #ifndef MIPS_CMGCR_H
#define _MIPS_GCR_H #define MIPS_CMGCR_H
#define TYPE_MIPS_GCR "mips-gcr" #define TYPE_MIPS_GCR "mips-gcr"
#define MIPS_GCR(obj) OBJECT_CHECK(MIPSGCRState, (obj), TYPE_MIPS_GCR) #define MIPS_GCR(obj) OBJECT_CHECK(MIPSGCRState, (obj), TYPE_MIPS_GCR)
@ -83,4 +83,4 @@ struct MIPSGCRState {
MIPSGCRVPState *vps; MIPSGCRVPState *vps;
}; };
#endif /* _MIPS_GCR_H */ #endif /* MIPS_CMGCR_H */

View File

@ -11,8 +11,9 @@
* This work is licensed under the terms of the GNU GPL, version 2 or * This work is licensed under the terms of the GNU GPL, version 2 or
* later. See the COPYING file in the top-level directory. * later. See the COPYING file in the top-level directory.
*/ */
#ifndef QEMU_TMP105_MSGS_H
#define QEMU_TMP105_MSGS_H #ifndef TMP105_REGS_H
#define TMP105_REGS_H
/** /**
* TMP105Reg: * TMP105Reg:

View File

@ -19,8 +19,9 @@
* GNU General Public License for more details. * GNU General Public License for more details.
* *
*/ */
#ifndef AW_EMAC_H
#define AW_EMAC_H #ifndef ALLWINNER_EMAC_H
#define ALLWINNER_EMAC_H
#include "net/net.h" #include "net/net.h"
#include "qemu/fifo8.h" #include "qemu/fifo8.h"

View File

@ -1,5 +1,5 @@
#ifndef FIRMWARE_ABI_H #ifndef OPENBIOS_FIRMWARE_ABI_H
#define FIRMWARE_ABI_H #define OPENBIOS_FIRMWARE_ABI_H
/* OpenBIOS NVRAM partition */ /* OpenBIOS NVRAM partition */
struct OpenBIOS_nvpart_v1 { struct OpenBIOS_nvpart_v1 {
@ -72,4 +72,4 @@ Sun_init_header(struct Sun_nvram *header, const uint8_t *macaddr, int machine_id
header->checksum = tmp; header->checksum = tmp;
} }
#endif /* FIRMWARE_ABI_H */ #endif /* OPENBIOS_FIRMWARE_ABI_H */

View File

@ -1,5 +1,5 @@
#ifndef APB_PCI_H #ifndef PCI_HOST_APB_H
#define APB_PCI_H #define PCI_HOST_APB_H
#include "qemu-common.h" #include "qemu-common.h"

View File

@ -1,5 +1,5 @@
#ifndef PPCE500_PCI_H #ifndef PCI_HOST_PPCE500_H
#define PPCE500_PCI_H #define PCI_HOST_PPCE500_H
static inline int ppce500_pci_map_irq_slot(int devno, int irq_num) static inline int ppce500_pci_map_irq_slot(int devno, int irq_num)
{ {

View File

@ -17,8 +17,8 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>. * License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/ */
#if !defined(__HW_SPAPR_PCI_H__) #ifndef PCI_HOST_SPAPR_H
#define __HW_SPAPR_PCI_H__ #define PCI_HOST_SPAPR_H
#include "hw/ppc/spapr.h" #include "hw/ppc/spapr.h"
#include "hw/pci/pci.h" #include "hw/pci/pci.h"
@ -153,4 +153,4 @@ static inline void spapr_phb_vfio_reset(DeviceState *qdev)
void spapr_phb_dma_reset(sPAPRPHBState *sphb); void spapr_phb_dma_reset(sPAPRPHBState *sphb);
#endif /* __HW_SPAPR_PCI_H__ */ #endif /* PCI_HOST_SPAPR_H */

View File

@ -22,8 +22,8 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#if !defined(PPC_4XX_H) #ifndef PPC4XX_H
#define PPC_4XX_H #define PPC4XX_H
#include "hw/pci/pci.h" #include "hw/pci/pci.h"
@ -61,4 +61,4 @@ PCIBus *ppc4xx_pci_init(CPUPPCState *env, qemu_irq pci_irqs[4],
hwaddr special_cycle, hwaddr special_cycle,
hwaddr registers); hwaddr registers);
#endif /* !defined(PPC_4XX_H) */ #endif /* PPC4XX_H */

View File

@ -9,8 +9,8 @@
* directory. * directory.
*/ */
#ifndef IOINST_S390X_H #ifndef S390X_IOINST_H
#define IOINST_S390X_H #define S390X_IOINST_H
/* /*
* Channel I/O related definitions, as defined in the Principles * Channel I/O related definitions, as defined in the Principles

View File

@ -22,8 +22,8 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#ifndef XLNX_SPIPS_H #ifndef XILINX_SPIPS_H
#define XLNX_SPIPS_H #define XILINX_SPIPS_H
#include "hw/ssi/ssi.h" #include "hw/ssi/ssi.h"
#include "qemu/fifo8.h" #include "qemu/fifo8.h"
@ -69,4 +69,4 @@ struct XilinxSPIPS {
#define XILINX_QSPIPS(obj) \ #define XILINX_QSPIPS(obj) \
OBJECT_CHECK(XilinxQSPIPS, (obj), TYPE_XILINX_QSPIPS) OBJECT_CHECK(XilinxQSPIPS, (obj), TYPE_XILINX_QSPIPS)
#endif /* XLNX_SPIPS_H */ #endif /* XILINX_SPIPS_H */

View File

@ -20,8 +20,8 @@
* with this program; if not, see <http://www.gnu.org/licenses/>. * with this program; if not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef HW_TIMER_A9_GTIMER_H_H #ifndef A9GTIMER_H
#define HW_TIMER_A9_GTIMER_H_H #define A9GTIMER_H
#include "hw/sysbus.h" #include "hw/sysbus.h"
@ -94,4 +94,4 @@ typedef struct A9GTimerUpdate {
uint64_t new; uint64_t new;
} A9GTimerUpdate; } A9GTimerUpdate;
#endif /* #ifdef HW_TIMER_A9_GTIMER_H_H */ #endif /* A9GTIMER_H */

View File

@ -1,5 +1,5 @@
#ifndef AW_A10_PIT_H #ifndef ALLWINNER_A10_PIT_H
#define AW_A10_PIT_H #define ALLWINNER_A10_PIT_H
#include "hw/ptimer.h" #include "hw/ptimer.h"

View File

@ -10,8 +10,9 @@
* the COPYING file in the top-level directory. * the COPYING file in the top-level directory.
* *
*/ */
#ifndef QEMU_HPET_EMUL_H
#define QEMU_HPET_EMUL_H #ifndef HW_HPET_H
#define HW_HPET_H
#include "qom/object.h" #include "qom/object.h"

View File

@ -1,5 +1,5 @@
#ifndef NVRAM_H #ifndef HW_M48T59_H
#define NVRAM_H #define HW_M48T59_H
#include "qemu-common.h" #include "qemu-common.h"
#include "qom/object.h" #include "qom/object.h"
@ -31,4 +31,4 @@ Nvram *m48t59_init(qemu_irq IRQ, hwaddr mem_base,
uint32_t io_base, uint16_t size, int base_year, uint32_t io_base, uint16_t size, int base_year,
int type); int type);
#endif /* !NVRAM_H */ #endif /* HW_M48T59_H */

View File

@ -21,8 +21,9 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#ifndef RTC_REGS_H
#define RTC_REGS_H #ifndef MC146818RTC_REGS_H
#define MC146818RTC_REGS_H
#define RTC_ISA_IRQ 8 #define RTC_ISA_IRQ 8

View File

@ -1,5 +1,5 @@
#ifndef TRICORE_MISC_H #ifndef HW_TRICORE_H
#define TRICORE_MISC_H 1 #define HW_TRICORE_H
#include "exec/memory.h" #include "exec/memory.h"
#include "hw/irq.h" #include "hw/irq.h"

View File

@ -1,5 +1,5 @@
#ifndef VFIO_API_H #ifndef HW_VFIO_H
#define VFIO_API_H #define HW_VFIO_H
bool vfio_eeh_as_ok(AddressSpace *as); bool vfio_eeh_as_ok(AddressSpace *as);
int vfio_eeh_as_op(AddressSpace *as, uint32_t op); int vfio_eeh_as_op(AddressSpace *as, uint32_t op);

View File

@ -11,8 +11,8 @@
* See the COPYING file in the top-level directory. * See the COPYING file in the top-level directory.
*/ */
#ifndef _QEMU_VIRTIO_VGA_H #ifndef HW_VIRTIO_GPU_H
#define _QEMU_VIRTIO_VGA_H #define HW_VIRTIO_GPU_H
#include "qemu/queue.h" #include "qemu/queue.h"
#include "ui/qemu-pixman.h" #include "ui/qemu-pixman.h"

View File

@ -37,8 +37,9 @@
/* decNumber.h or one of decDouble (etc.) must be included first. */ /* decNumber.h or one of decDouble (etc.) must be included first. */
/* ------------------------------------------------------------------ */ /* ------------------------------------------------------------------ */
#if !defined(DECNUMBERLOC) #ifndef DECNUMBERLOCAL_H
#define DECNUMBERLOC #define DECNUMBERLOCAL_H
#define DECVERSION "decNumber 3.53" /* Package Version [16 max.] */ #define DECVERSION "decNumber 3.53" /* Package Version [16 max.] */
#define DECNLAUTHOR "Mike Cowlishaw" /* Who to blame */ #define DECNLAUTHOR "Mike Cowlishaw" /* Who to blame */

View File

@ -11,8 +11,8 @@
* *
*/ */
#ifndef BLOCK_MIGRATION_H #ifndef MIGRATION_BLOCK_H
#define BLOCK_MIGRATION_H #define MIGRATION_BLOCK_H
void blk_mig_init(void); void blk_mig_init(void);
int blk_mig_active(void); int blk_mig_active(void);
@ -20,4 +20,4 @@ uint64_t blk_mig_bytes_transferred(void);
uint64_t blk_mig_bytes_remaining(void); uint64_t blk_mig_bytes_remaining(void);
uint64_t blk_mig_bytes_total(void); uint64_t blk_mig_bytes_total(void);
#endif /* BLOCK_MIGRATION_H */ #endif /* MIGRATION_BLOCK_H */

View File

@ -21,8 +21,9 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#ifndef MONITOR_COMMON_H
#define MONITOR_COMMON_H #ifndef MONITOR_HMP_TARGET_H
#define MONITOR_HMP_TARGET_H
#define MD_TLONG 0 #define MD_TLONG 0
#define MD_I32 1 #define MD_I32 1
@ -46,4 +47,4 @@ void hmp_mce(Monitor *mon, const QDict *qdict);
void hmp_info_local_apic(Monitor *mon, const QDict *qdict); void hmp_info_local_apic(Monitor *mon, const QDict *qdict);
void hmp_info_io_apic(Monitor *mon, const QDict *qdict); void hmp_info_io_apic(Monitor *mon, const QDict *qdict);
#endif /* MONITOR_COMMON */ #endif /* MONITOR_HMP_TARGET_H */

View File

@ -1,5 +1,5 @@
#ifndef QEMU_QDEV_MONITOR_H #ifndef MONITOR_QDEV_H
#define QEMU_QDEV_MONITOR_H #define MONITOR_QDEV_H
#include "hw/qdev-core.h" #include "hw/qdev-core.h"

View File

@ -11,8 +11,8 @@
* *
*/ */
#ifndef QMP_CORE_H #ifndef QAPI_QMP_DISPATCH_H
#define QMP_CORE_H #define QAPI_QMP_DISPATCH_H
#include "qapi/qmp/qobject.h" #include "qapi/qmp/qobject.h"
#include "qapi/qmp/qdict.h" #include "qapi/qmp/qdict.h"
@ -48,4 +48,3 @@ typedef void (*qmp_cmd_callback_fn)(QmpCommand *cmd, void *opaque);
void qmp_for_each_command(qmp_cmd_callback_fn fn, void *opaque); void qmp_for_each_command(qmp_cmd_callback_fn fn, void *opaque);
#endif #endif

View File

@ -10,8 +10,8 @@
* See the COPYING.LIB file in the top-level directory. * See the COPYING.LIB file in the top-level directory.
*/ */
#ifndef QEMU_OBJECTS_H #ifndef QAPI_QMP_TYPES_H
#define QEMU_OBJECTS_H #define QAPI_QMP_TYPES_H
#include "qapi/qmp/qobject.h" #include "qapi/qmp/qobject.h"
#include "qapi/qmp/qint.h" #include "qapi/qmp/qint.h"
@ -21,4 +21,4 @@
#include "qapi/qmp/qdict.h" #include "qapi/qmp/qdict.h"
#include "qapi/qmp/qlist.h" #include "qapi/qmp/qlist.h"
#endif /* QEMU_OBJECTS_H */ #endif /* QAPI_QMP_TYPES_H */

View File

@ -11,8 +11,9 @@
* See the COPYING.LIB file in the top-level directory. * See the COPYING.LIB file in the top-level directory.
* *
*/ */
#ifndef QAPI_VISITOR_CORE_H
#define QAPI_VISITOR_CORE_H #ifndef QAPI_VISITOR_H
#define QAPI_VISITOR_H
#include "qapi/qmp/qobject.h" #include "qapi/qmp/qobject.h"

View File

@ -1,5 +1,5 @@
#ifndef QEMU_CONFIG_H #ifndef QEMU_CONFIG_FILE_H
#define QEMU_CONFIG_H #define QEMU_CONFIG_FILE_H
#include "qemu/option.h" #include "qemu/option.h"
#include "qapi/qmp/qdict.h" #include "qapi/qmp/qdict.h"
@ -27,4 +27,4 @@ void qemu_config_parse_qdict(QDict *options, QemuOptsList **lists,
*/ */
int qemu_read_default_config_files(bool userconfig); int qemu_read_default_config_files(bool userconfig);
#endif /* QEMU_CONFIG_H */ #endif /* QEMU_CONFIG_FILE_H */

View File

@ -10,9 +10,8 @@
* See the COPYING file in the top-level directory. * See the COPYING file in the top-level directory.
*/ */
#ifndef QEMU_ERROR_H #ifndef QEMU_ERROR_REPORT_H
#define QEMU_ERROR_H #define QEMU_ERROR_REPORT_H
typedef struct Location { typedef struct Location {
/* all members are private to qemu-error.c */ /* all members are private to qemu-error.c */

View File

@ -1,5 +1,5 @@
#ifndef FIFO_H #ifndef QEMU_FIFO8_H
#define FIFO_H #define QEMU_FIFO8_H
#include "migration/vmstate.h" #include "migration/vmstate.h"
@ -157,4 +157,4 @@ extern const VMStateDescription vmstate_fifo8;
.offset = vmstate_offset_value(_state, _field, Fifo8), \ .offset = vmstate_offset_value(_state, _field, Fifo8), \
} }
#endif /* FIFO_H */ #endif /* QEMU_FIFO8_H */

View File

@ -23,8 +23,8 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#ifndef QEMU_OPTIONS_H #ifndef QEMU_OPTION_H
#define QEMU_OPTIONS_H #define QEMU_OPTION_H
#include "qemu/queue.h" #include "qemu/queue.h"
#include "qapi/qmp/qdict.h" #include "qapi/qmp/qdict.h"

View File

@ -23,8 +23,8 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#ifndef QEMU_OPTIONS_INTERNAL_H #ifndef QEMU_OPTION_INT_H
#define QEMU_OPTIONS_INTERNAL_H #define QEMU_OPTION_INT_H
#include "qemu/option.h" #include "qemu/option.h"
#include "qemu/error-report.h" #include "qemu/error-report.h"

View File

@ -1,6 +1,7 @@
/* headers to use the BSD sockets */ /* headers to use the BSD sockets */
#ifndef QEMU_SOCKET_H
#define QEMU_SOCKET_H #ifndef QEMU_SOCKETS_H
#define QEMU_SOCKETS_H
#ifdef _WIN32 #ifdef _WIN32
@ -121,4 +122,5 @@ SocketAddress *socket_remote_address(int fd, Error **errp);
* Returns: the socket address in string format, or NULL on error * Returns: the socket address in string format, or NULL on error
*/ */
char *socket_address_to_string(struct SocketAddress *addr, Error **errp); char *socket_address_to_string(struct SocketAddress *addr, Error **errp);
#endif /* QEMU_SOCKET_H */
#endif /* QEMU_SOCKETS_H */

View File

@ -1,5 +1,5 @@
#ifndef BT_HOST_H #ifndef SYSEMU_BT_H
#define BT_HOST_H #define SYSEMU_BT_H
/* BT HCI info */ /* BT HCI info */

View File

@ -9,8 +9,9 @@
* This work is licensed under the terms of the GNU GPL, version 2 or later. * This work is licensed under the terms of the GNU GPL, version 2 or later.
* See the COPYING file in the top-level directory. * See the COPYING file in the top-level directory.
*/ */
#ifndef QEMU_RAM_H
#define QEMU_RAM_H #ifndef SYSEMU_HOSTMEM_H
#define SYSEMU_HOSTMEM_H
#include "sysemu/sysemu.h" /* for MAX_NODES */ #include "sysemu/sysemu.h" /* for MAX_NODES */
#include "qom/object.h" #include "qom/object.h"

View File

@ -10,8 +10,8 @@
* See the COPYING file in the top-level directory. * See the COPYING file in the top-level directory.
*/ */
#ifndef _QEMU_TPM_H #ifndef TPM_BACKEND_H
#define _QEMU_TPM_H #define TPM_BACKEND_H
#include "qom/object.h" #include "qom/object.h"
#include "qemu-common.h" #include "qemu-common.h"

View File

@ -19,9 +19,8 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/> * License along with this library; if not, see <http://www.gnu.org/licenses/>
*/ */
#ifndef TPM_TPM_BACKEND_H #ifndef TPM_BACKEND_INT_H
#define TPM_TPM_BACKEND_H #define TPM_BACKEND_INT_H
typedef struct TPMBackendThread { typedef struct TPMBackendThread {
GThreadPool *pool; GThreadPool *pool;
@ -39,4 +38,4 @@ typedef enum TPMBackendCmd {
TPM_BACKEND_CMD_TPM_RESET, TPM_BACKEND_CMD_TPM_RESET,
} TPMBackendCmd; } TPMBackendCmd;
#endif /* TPM_TPM_BACKEND_H */ #endif /* TPM_BACKEND_INT_H */

View File

@ -23,8 +23,8 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#ifndef QEMU_TAP_H #ifndef NET_TAP_INT_H
#define QEMU_TAP_H #define NET_TAP_INT_H
#include "qemu-common.h" #include "qemu-common.h"
#include "qapi-types.h" #include "qapi-types.h"
@ -46,4 +46,4 @@ int tap_fd_enable(int fd);
int tap_fd_disable(int fd); int tap_fd_disable(int fd);
int tap_fd_get_ifname(int fd, char *ifname); int tap_fd_get_ifname(int fd, char *ifname);
#endif /* QEMU_TAP_H */ #endif /* NET_TAP_INT_H */

View File

@ -10,8 +10,9 @@
* This work is licensed under the terms of the GNU GPL, version 2 or later. * This work is licensed under the terms of the GNU GPL, version 2 or later.
* See the COPYING file in the top-level directory. * See the COPYING file in the top-level directory.
*/ */
#ifndef QGA_SERVICE_H
#define QGA_SERVICE_H #ifndef QGA_SERVICE_WIN32_H
#define QGA_SERVICE_WIN32_H
#include <windows.h> #include <windows.h>

View File

@ -10,8 +10,8 @@
* See the COPYING file in the top-level directory. * See the COPYING file in the top-level directory.
*/ */
#ifndef VSS_WIN32_H #ifndef VSS_COMMON_H
#define VSS_WIN32_H #define VSS_COMMON_H
#define __MIDL_user_allocate_free_DEFINED__ #define __MIDL_user_allocate_free_DEFINED__
#include <windows.h> #include <windows.h>

View File

@ -3,8 +3,8 @@
* Guillaume Subiron, Yann Bordenave, Serigne Modou Wagne. * Guillaume Subiron, Yann Bordenave, Serigne Modou Wagne.
*/ */
#ifndef SLIRP_NETINET_ICMP6_H_ #ifndef SLIRP_IP6_ICMP_H
#define SLIRP_NETINET_ICMP6_H_ #define SLIRP_IP6_ICMP_H
/* /*
* Interface Control Message Protocol version 6 Definitions. * Interface Control Message Protocol version 6 Definitions.

View File

@ -1,5 +1,5 @@
#ifndef __COMMON_H__ #ifndef SLIRP_H
#define __COMMON_H__ #define SLIRP_H
#include "qemu/host-utils.h" #include "qemu/host-utils.h"
#include "slirp_config.h" #include "slirp_config.h"

View File

@ -11,8 +11,8 @@
* *
*/ */
#ifndef HYPERV_I386_H #ifndef TARGET_I386_HYPERV_H
#define HYPERV_I386_H #define TARGET_I386_HYPERV_H
#include "cpu.h" #include "cpu.h"
#include "sysemu/kvm.h" #include "sysemu/kvm.h"

View File

@ -17,12 +17,12 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>. * License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef QEMU_OPENRISC_EXCP_H #ifndef TARGET_OPENRISC_EXCEPTION_H
#define QEMU_OPENRISC_EXCP_H #define TARGET_OPENRISC_EXCEPTION_H
#include "cpu.h" #include "cpu.h"
#include "qemu-common.h" #include "qemu-common.h"
void QEMU_NORETURN raise_exception(OpenRISCCPU *cpu, uint32_t excp); void QEMU_NORETURN raise_exception(OpenRISCCPU *cpu, uint32_t excp);
#endif /* QEMU_OPENRISC_EXCP_H */ #endif /* TARGET_OPENRISC_EXCEPTION_H */

View File

@ -18,8 +18,8 @@
* *
*/ */
#ifndef __ARCH_OPCODE_H__ #ifndef OPCODE_TILEGX_H
#define __ARCH_OPCODE_H__ #define OPCODE_TILEGX_H
#ifndef __ASSEMBLER__ #ifndef __ASSEMBLER__
@ -1403,4 +1403,4 @@ enum
#endif /* __ASSEMBLER__ */ #endif /* __ASSEMBLER__ */
#endif /* __ARCH_OPCODE_H__ */ #endif /* OPCODE_TILEGX_H */

View File

@ -8,9 +8,8 @@
* Copyright (c) 1999-2007 Tensilica Inc. * Copyright (c) 1999-2007 Tensilica Inc.
*/ */
#ifndef _XTENSA_CORE_CONFIGURATION_H #ifndef XTENSA_DC232B_CORE_ISA_H
#define _XTENSA_CORE_CONFIGURATION_H #define XTENSA_DC232B_CORE_ISA_H
/**************************************************************************** /****************************************************************************
Parameters Useful for Any Code, USER or PRIVILEGED Parameters Useful for Any Code, USER or PRIVILEGED
@ -420,4 +419,4 @@
#endif /* !XTENSA_HAL_NON_PRIVILEGED_ONLY */ #endif /* !XTENSA_HAL_NON_PRIVILEGED_ONLY */
#endif /* _XTENSA_CORE_CONFIGURATION_H */ #endif /* XTENSA_DC232B_CORE_ISA_H */

View File

@ -28,9 +28,8 @@
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
#ifndef _XTENSA_CORE_CONFIGURATION_H #ifndef XTENSA_DC233C_CORE_ISA_H
#define _XTENSA_CORE_CONFIGURATION_H #define XTENSA_DC233C_CORE_ISA_H
/**************************************************************************** /****************************************************************************
Parameters Useful for Any Code, USER or PRIVILEGED Parameters Useful for Any Code, USER or PRIVILEGED
@ -471,4 +470,4 @@ usable for an MMU-based OS */
#endif /* !XTENSA_HAL_NON_PRIVILEGED_ONLY */ #endif /* !XTENSA_HAL_NON_PRIVILEGED_ONLY */
#endif /* _XTENSA_CORE_CONFIGURATION_H */ #endif /* XTENSA_DC233C_CORE_ISA_H */

View File

@ -8,9 +8,8 @@
* Copyright (C) 1999-2006 Tensilica Inc. * Copyright (C) 1999-2006 Tensilica Inc.
*/ */
#ifndef _XTENSA_CORE_H #ifndef XTENSA_FSF_CORE_ISA_H
#define _XTENSA_CORE_H #define XTENSA_FSF_CORE_ISA_H
/**************************************************************************** /****************************************************************************
Parameters Useful for Any Code, USER or PRIVILEGED Parameters Useful for Any Code, USER or PRIVILEGED
@ -358,4 +357,4 @@
#endif /* !XTENSA_HAL_NON_PRIVILEGED_ONLY */ #endif /* !XTENSA_HAL_NON_PRIVILEGED_ONLY */
#endif /* _XTENSA_CORE_CONFIGURATION_H */ #endif /* XTENSA_FSF_CORE_ISA_H */

View File

@ -27,8 +27,8 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#ifndef VNC_ENCODING_TIGHT_H #ifndef VNC_ENC_TIGHT_H
#define VNC_ENCODING_TIGHT_H #define VNC_ENC_TIGHT_H
/*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - /*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
* Tight Encoding. * Tight Encoding.
@ -180,4 +180,4 @@
#define VNC_TIGHT_DETECT_MIN_WIDTH 8 #define VNC_TIGHT_DETECT_MIN_WIDTH 8
#define VNC_TIGHT_DETECT_MIN_HEIGHT 8 #define VNC_TIGHT_DETECT_MIN_HEIGHT 8
#endif /* VNC_ENCODING_TIGHT_H */ #endif /* VNC_ENC_TIGHT_H */

View File

@ -26,8 +26,8 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#ifndef VNC_ENCODING_ZRLE_H #ifndef VNC_ENC_ZRLE_H
#define VNC_ENCODING_ZRLE_H #define VNC_ENC_ZRLE_H
/*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - /*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
* ZRLE - encoding combining Zlib compression, tiling, palettisation and * ZRLE - encoding combining Zlib compression, tiling, palettisation and

View File

@ -41,8 +41,8 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
********************************************************************/ ********************************************************************/
#ifndef VNC_ENCODING_ZYWRLE_H #ifndef VNC_ENC_ZYWRLE_H
#define VNC_ENCODING_ZYWRLE_H #define VNC_ENC_ZYWRLE_H
/* Tables for Coefficients filtering. */ /* Tables for Coefficients filtering. */
#ifndef ZYWRLE_QUANTIZE #ifndef ZYWRLE_QUANTIZE