+3 -3

crypto/blockpriv.h

··· 18 18 * 19 19 */ 20 20 21 21 - #ifndef QCRYPTO_BLOCK_PRIV_H__ 22 22 - #define QCRYPTO_BLOCK_PRIV_H__ 21 21 + #ifndef QCRYPTO_BLOCKPRIV_H 22 22 + #define QCRYPTO_BLOCKPRIV_H 23 23 24 24 #include "crypto/block.h" 25 25 ··· 89 89 size_t len, 90 90 Error **errp); 91 91 92 92 - #endif /* QCRYPTO_BLOCK_PRIV_H__ */ 92 92 + #endif /* QCRYPTO_BLOCKPRIV_H */

+3 -3

crypto/ivgenpriv.h

··· 18 18 * 19 19 */ 20 20 21 21 - #ifndef QCRYPTO_IVGEN_PRIV_H__ 22 22 - #define QCRYPTO_IVGEN_PRIV_H__ 21 21 + #ifndef QCRYPTO_IVGENPRIV_H 22 22 + #define QCRYPTO_IVGENPRIV_H 23 23 24 24 #include "crypto/ivgen.h" 25 25 ··· 46 46 }; 47 47 48 48 49 49 - #endif /* QCRYPTO_IVGEN_PRIV_H__ */ 49 49 + #endif /* QCRYPTO_IVGENPRIV_H */

+3 -4

crypto/tlscredspriv.h

··· 18 18 * 19 19 */ 20 20 21 21 - #ifndef QCRYPTO_TLSCRED_PRIV_H__ 22 22 - #define QCRYPTO_TLSCRED_PRIV_H__ 21 21 + #ifndef QCRYPTO_TLSCREDSPRIV_H 22 22 + #define QCRYPTO_TLSCREDSPRIV_H 23 23 24 24 #include "crypto/tlscreds.h" 25 25 ··· 38 38 39 39 #endif 40 40 41 41 - #endif /* QCRYPTO_TLSCRED_PRIV_H__ */ 42 42 - 41 41 + #endif /* QCRYPTO_TLSCREDSPRIV_H */

+4 -2

fsdev/file-op-9p.h

··· 10 10 * the COPYING file in the top-level directory. 11 11 * 12 12 */ 13 13 - #ifndef _FILEOP_H 14 14 - #define _FILEOP_H 13 13 + 14 14 + #ifndef FILE_OP_9P_H 15 15 + #define FILE_OP_9P_H 16 16 + 15 17 #include <dirent.h> 16 18 #include <utime.h> 17 19 #include <sys/vfs.h>

+2 -2

hw/9pfs/9p-synth.h

··· 10 10 * the COPYING file in the top-level directory. 11 11 * 12 12 */ 13 13 - #ifndef HW_9PFS_SYNTH_H 14 14 - #define HW_9PFS_SYNTH_H 1 15 13 14 14 + #ifndef QEMU_9P_SYNTH_H 15 15 + #define QEMU_9P_SYNTH_H 16 16 17 17 typedef struct V9fsSynthNode V9fsSynthNode; 18 18 typedef ssize_t (*v9fs_synth_read)(void *buf, int len, off_t offset,

+2 -2

hw/alpha/alpha_sys.h

··· 1 1 /* Alpha cores and system support chips. */ 2 2 3 3 - #ifndef HW_ALPHA_H 4 4 - #define HW_ALPHA_H 1 3 3 + #ifndef HW_ALPHA_SYS_H 4 4 + #define HW_ALPHA_SYS_H 5 5 6 6 #include "target-alpha/cpu-qom.h" 7 7 #include "hw/pci/pci.h"

+3 -3

hw/lm32/milkymist-hw.h

··· 1 1 - #ifndef QEMU_HW_MILKYMIST_H 2 2 - #define QEMU_HW_MILKYMIST_H 1 1 + #ifndef QEMU_HW_MILKYMIST_HW_H 2 2 + #define QEMU_HW_MILKYMIST_HW_H 3 3 4 4 #include "hw/qdev.h" 5 5 #include "net/net.h" ··· 203 203 return dev; 204 204 } 205 205 206 206 - #endif /* QEMU_HW_MILKYMIST_H */ 206 206 + #endif /* QEMU_HW_MILKYMIST_HW_H */

+3 -4

hw/net/e1000_regs.h

··· 29 29 * Structures, enums, and macros for the MAC 30 30 */ 31 31 32 32 - #ifndef _E1000_HW_H_ 33 33 - #define _E1000_HW_H_ 34 34 - 32 32 + #ifndef HW_E1000_REGS_H 33 33 + #define HW_E1000_REGS_H 35 34 36 35 /* PCI Device IDs */ 37 36 #define E1000_DEV_ID_82542 0x1000 ··· 1248 1247 #define E1000_IOADDR 0x00 1249 1248 #define E1000_IODATA 0x04 1250 1249 1251 1251 - #endif /* _E1000_HW_H_ */ 1250 1250 + #endif /* HW_E1000_REGS_H */

+2 -2

hw/pci-bridge/dec.h

··· 1 1 - #ifndef DEC_PCI_H 2 2 - #define DEC_PCI_H 1 1 + #ifndef HW_PCI_BRIDGE_DEC_H 2 2 + #define HW_PCI_BRIDGE_DEC_H 3 3 4 4 #include "qemu-common.h" 5 5

+3 -3

hw/ppc/ppc405.h

··· 22 22 * THE SOFTWARE. 23 23 */ 24 24 25 25 - #if !defined(PPC_405_H) 26 26 - #define PPC_405_H 25 25 + #ifndef PPC405_H 26 26 + #define PPC405_H 27 27 28 28 #include "hw/ppc/ppc4xx.h" 29 29 ··· 78 78 uint32_t sysclk, qemu_irq **picp, 79 79 ram_addr_t *offsetp); 80 80 81 81 - #endif /* !defined(PPC_405_H) */ 81 81 + #endif /* PPC405_H */

+3 -3

hw/scsi/mfi.h

··· 30 30 * SUCH DAMAGE. 31 31 */ 32 32 33 33 - #ifndef MFI_REG_H 34 34 - #define MFI_REG_H 33 33 + #ifndef SCSI_MFI_H 34 34 + #define SCSI_MFI_H 35 35 36 36 /* 37 37 * MegaRAID SAS MFI firmware definitions ··· 1269 1269 #define MFI_SCSI_MAX_CMDS 8 1270 1270 #define MFI_SCSI_MAX_CDB_LEN 16 1271 1271 1272 1272 - #endif /* MFI_REG_H */ 1272 1272 + #endif /* SCSI_MFI_H */

+4 -3

hw/tpm/tpm_util.h

··· 18 18 * You should have received a copy of the GNU Lesser General Public 19 19 * License along with this library; if not, see <http://www.gnu.org/licenses/> 20 20 */ 21 21 - #ifndef TPM_TPM_UTILS_H 22 22 - #define TPM_TPM_UTILS_H 21 21 + 22 22 + #ifndef TPM_TPM_UTIL_H 23 23 + #define TPM_TPM_UTIL_H 23 24 24 25 #include "sysemu/tpm_backend.h" 25 26 26 27 int tpm_util_test_tpmdev(int tpm_fd, TPMVersion *tpm_version); 27 28 28 28 - #endif /* TPM_TPM_UTILS_H */ 29 29 + #endif /* TPM_TPM_UTIL_H */

+3 -2

hw/usb/hcd-ehci.h

··· 14 14 * You should have received a copy of the GNU General Public License 15 15 * along with this program; if not, see <http://www.gnu.org/licenses/>. 16 16 */ 17 17 - #ifndef HW_USB_EHCI_H 18 18 - #define HW_USB_EHCI_H 1 17 17 + 18 18 + #ifndef HW_USB_HCD_EHCI_H 19 19 + #define HW_USB_HCD_EHCI_H 19 20 20 21 #include "hw/hw.h" 21 22 #include "qemu/timer.h"

+3 -2

include/block/scsi.h

··· 19 19 * This header file contains public constants and structures used by 20 20 * the scsi code for linux. 21 21 */ 22 22 - #ifndef HW_SCSI_DEFS_H 23 23 - #define HW_SCSI_DEFS_H 1 22 22 + 23 23 + #ifndef BLOCK_SCSI_H 24 24 + #define BLOCK_SCSI_H 24 25 25 26 /* 26 27 * SCSI opcodes

+3 -2

include/crypto/desrfb.h

··· 9 9 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. 11 11 */ 12 12 - #ifndef D3DES_H 13 13 - #define D3DES_H 1 12 12 + 13 13 + #ifndef QCRYPTO_DESRFB_H 14 14 + #define QCRYPTO_DESRFB_H 14 15 15 16 /* d3des.h - 16 17 *

+3 -4

include/crypto/tlscreds.h

··· 18 18 * 19 19 */ 20 20 21 21 - #ifndef QCRYPTO_TLSCRED_H__ 22 22 - #define QCRYPTO_TLSCRED_H__ 21 21 + #ifndef QCRYPTO_TLSCREDS_H 22 22 + #define QCRYPTO_TLSCREDS_H 23 23 24 24 #include "qom/object.h" 25 25 ··· 63 63 }; 64 64 65 65 66 66 - #endif /* QCRYPTO_TLSCRED_H__ */ 67 67 - 66 66 + #endif /* QCRYPTO_TLSCREDS_H */

+3 -4

include/crypto/tlscredsanon.h

··· 18 18 * 19 19 */ 20 20 21 21 - #ifndef QCRYPTO_TLSCRED_ANON_H__ 22 22 - #define QCRYPTO_TLSCRED_ANON_H__ 21 21 + #ifndef QCRYPTO_TLSCREDSANON_H 22 22 + #define QCRYPTO_TLSCREDSANON_H 23 23 24 24 #include "crypto/tlscreds.h" 25 25 ··· 108 108 }; 109 109 110 110 111 111 - #endif /* QCRYPTO_TLSCRED_H__ */ 112 112 - 111 111 + #endif /* QCRYPTO_TLSCREDSANON_H */

+3 -4

include/crypto/tlscredsx509.h

··· 18 18 * 19 19 */ 20 20 21 21 - #ifndef QCRYPTO_TLSCRED_X509_H__ 22 22 - #define QCRYPTO_TLSCRED_X509_H__ 21 21 + #ifndef QCRYPTO_TLSCREDSX509_H 22 22 + #define QCRYPTO_TLSCREDSX509_H 23 23 24 24 #include "crypto/tlscreds.h" 25 25 ··· 110 110 }; 111 111 112 112 113 113 - #endif /* QCRYPTO_TLSCRED_X509_H__ */ 114 114 - 113 113 + #endif /* QCRYPTO_TLSCREDSX509_H */

+3 -3

include/crypto/tlssession.h

··· 18 18 * 19 19 */ 20 20 21 21 - #ifndef QCRYPTO_TLS_SESSION_H__ 22 22 - #define QCRYPTO_TLS_SESSION_H__ 21 21 + #ifndef QCRYPTO_TLSSESSION_H 22 22 + #define QCRYPTO_TLSSESSION_H 23 23 24 24 #include "crypto/tlscreds.h" 25 25 ··· 319 319 */ 320 320 char *qcrypto_tls_session_get_peer_name(QCryptoTLSSession *sess); 321 321 322 322 - #endif /* QCRYPTO_TLS_SESSION_H__ */ 322 322 + #endif /* QCRYPTO_TLSSESSION_H */

+3 -3

include/disas/bfd.h

··· 6 6 interface, for making instruction-processing programs more independent 7 7 of the instruction set being processed. */ 8 8 9 9 - #ifndef DIS_ASM_H 10 10 - #define DIS_ASM_H 9 9 + #ifndef DISAS_BFD_H 10 10 + #define DISAS_BFD_H 11 11 12 12 #include "qemu-common.h" 13 13 ··· 489 489 bfd_vma bfd_getb16 (const bfd_byte *addr); 490 490 typedef bool bfd_boolean; 491 491 492 492 - #endif /* ! defined (DIS_ASM_H) */ 492 492 + #endif /* DISAS_BFD_H */

+2 -2

include/exec/address-spaces.h

··· 11 11 * 12 12 */ 13 13 14 14 - #ifndef EXEC_MEMORY_H 15 15 - #define EXEC_MEMORY_H 14 14 + #ifndef EXEC_ADDRESS_SPACES_H 15 15 + #define EXEC_ADDRESS_SPACES_H 16 16 17 17 /* 18 18 * Internal interfaces between memory.c/exec.c/vl.c. Do not #include unless

+3 -4

include/exec/helper-head.h

··· 15 15 GEN_HELPER 2 to do runtime registration helper functions. 16 16 */ 17 17 18 18 - #ifndef DEF_HELPER_H 19 19 - #define DEF_HELPER_H 1 20 20 - 18 18 + #ifndef EXEC_HELPER_HEAD_H 19 19 + #define EXEC_HELPER_HEAD_H 21 20 22 21 #define HELPER(name) glue(helper_, name) 23 22 ··· 133 132 134 133 /* MAX_OPC_PARAM_IARGS must be set to n if last entry is DEF_HELPER_FLAGS_n. */ 135 134 136 136 - #endif /* DEF_HELPER_H */ 135 135 + #endif /* EXEC_HELPER_HEAD_H */

+3 -2

include/exec/user/abitypes.h

··· 1 1 - #ifndef QEMU_TYPES_H 2 2 - #define QEMU_TYPES_H 1 1 + #ifndef EXEC_USER_ABITYPES_H 2 2 + #define EXEC_USER_ABITYPES_H 3 3 + 3 4 #include "cpu.h" 4 5 5 6 #ifdef TARGET_ABI32

+2 -2

include/hw/acpi/aml-build.h

··· 1 1 - #ifndef HW_ACPI_GEN_UTILS_H 2 2 - #define HW_ACPI_GEN_UTILS_H 1 1 + #ifndef HW_ACPI_AML_BUILD_H 2 2 + #define HW_ACPI_AML_BUILD_H 3 3 4 4 #include "hw/acpi/acpi-defs.h" 5 5 #include "hw/acpi/bios-linker-loader.h"

+3 -2

include/hw/acpi/cpu_hotplug.h

··· 9 9 * This work is licensed under the terms of the GNU GPL, version 2 or later. 10 10 * See the COPYING file in the top-level directory. 11 11 */ 12 12 - #ifndef ACPI_HOTPLUG_H 13 13 - #define ACPI_HOTPLUG_H 12 12 + 13 13 + #ifndef HW_ACPI_CPU_HOTPLUG_H 14 14 + #define HW_ACPI_CPU_HOTPLUG_H 14 15 15 16 #include "hw/acpi/acpi.h" 16 17 #include "hw/acpi/pc-hotplug.h"

+3 -3

include/hw/arm/arm.h

··· 8 8 * 9 9 */ 10 10 11 11 - #ifndef ARM_MISC_H 12 12 - #define ARM_MISC_H 1 11 11 + #ifndef HW_ARM_H 12 12 + #define HW_ARM_H 13 13 14 14 #include "exec/memory.h" 15 15 #include "target-arm/cpu-qom.h" ··· 140 140 ticks. */ 141 141 extern int system_clock_scale; 142 142 143 143 - #endif /* !ARM_MISC_H */ 143 143 + #endif /* HW_ARM_H */

+2 -2

include/hw/arm/stm32f205_soc.h

··· 22 22 * THE SOFTWARE. 23 23 */ 24 24 25 25 - #ifndef HW_ARM_STM32F205SOC_H 26 26 - #define HW_ARM_STM32F205SOC_H 25 25 + #ifndef HW_ARM_STM32F205_SOC_H 26 26 + #define HW_ARM_STM32F205_SOC_H 27 27 28 28 #include "hw/misc/stm32f2xx_syscfg.h" 29 29 #include "hw/timer/stm32f2xx_timer.h"

+2 -2

include/hw/audio/audio.h

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

+2 -2

include/hw/block/block.h

··· 8 8 * later. See the COPYING file in the top-level directory. 9 9 */ 10 10 11 11 - #ifndef HW_BLOCK_COMMON_H 12 12 - #define HW_BLOCK_COMMON_H 11 11 + #ifndef HW_BLOCK_H 12 12 + #define HW_BLOCK_H 13 13 14 14 #include "qemu-common.h" 15 15

+2 -2

include/hw/char/pl011.h

··· 12 12 * this program. If not, see <http://www.gnu.org/licenses/>. 13 13 */ 14 14 15 15 - #ifndef PL011_UART_H 16 16 - #define PL011_UART_H 15 15 + #ifndef HW_PL011_H 16 16 + #define HW_PL011_H 17 17 18 18 static inline DeviceState *pl011_create(hwaddr addr, 19 19 qemu_irq irq,

+2 -2

include/hw/cris/etraxfs.h

··· 22 22 * THE SOFTWARE. 23 23 */ 24 24 25 25 - #ifndef HW_EXTRAXFS_H 26 26 - #define HW_EXTRAXFS_H 1 25 25 + #ifndef HW_ETRAXFS_H 26 26 + #define HW_ETRAXFS_H 27 27 28 28 #include "net/net.h" 29 29 #include "hw/cris/etraxfs_dma.h"

+2 -2

include/hw/intc/allwinner-a10-pic.h

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

+3 -2

include/hw/misc/arm_integrator_debug.h

··· 10 10 * This work is licensed under the terms of the GNU GPL, version 2 or later. 11 11 * See the COPYING file in the top-level directory. 12 12 */ 13 13 - #ifndef QEMU_INTEGRATOR_DEBUG_H 14 14 - #define QEMU_INTEGRATOR_DEBUG_H 13 13 + 14 14 + #ifndef ARM_INTEGRATOR_DEBUG_H 15 15 + #define ARM_INTEGRATOR_DEBUG_H 15 16 16 17 #define TYPE_INTEGRATOR_DEBUG "integrator_debug" 17 18

+3 -3

include/hw/misc/auxbus.h

··· 22 22 * 23 23 */ 24 24 25 25 - #ifndef QEMU_AUX_H 26 26 - #define QEMU_AUX_H 25 25 + #ifndef HW_MISC_AUXBUS_H 26 26 + #define HW_MISC_AUXBUS_H 27 27 28 28 #include "hw/qdev.h" 29 29 ··· 125 125 126 126 DeviceState *aux_create_slave(AUXBus *bus, const char *name, uint32_t addr); 127 127 128 128 - #endif /* !QEMU_AUX_H */ 128 128 + #endif /* HW_MISC_AUXBUS_H */

+3 -3

include/hw/misc/mips_cmgcr.h

··· 7 7 * 8 8 */ 9 9 10 10 - #ifndef _MIPS_GCR_H 11 11 - #define _MIPS_GCR_H 10 10 + #ifndef MIPS_CMGCR_H 11 11 + #define MIPS_CMGCR_H 12 12 13 13 #define TYPE_MIPS_GCR "mips-gcr" 14 14 #define MIPS_GCR(obj) OBJECT_CHECK(MIPSGCRState, (obj), TYPE_MIPS_GCR) ··· 83 83 MIPSGCRVPState *vps; 84 84 }; 85 85 86 86 - #endif /* _MIPS_GCR_H */ 86 86 + #endif /* MIPS_CMGCR_H */

+3 -2

include/hw/misc/tmp105_regs.h

··· 11 11 * This work is licensed under the terms of the GNU GPL, version 2 or 12 12 * later. See the COPYING file in the top-level directory. 13 13 */ 14 14 - #ifndef QEMU_TMP105_MSGS_H 15 15 - #define QEMU_TMP105_MSGS_H 14 14 + 15 15 + #ifndef TMP105_REGS_H 16 16 + #define TMP105_REGS_H 16 17 17 18 /** 18 19 * TMP105Reg:

+3 -2

include/hw/net/allwinner_emac.h

··· 19 19 * GNU General Public License for more details. 20 20 * 21 21 */ 22 22 - #ifndef AW_EMAC_H 23 23 - #define AW_EMAC_H 22 22 + 23 23 + #ifndef ALLWINNER_EMAC_H 24 24 + #define ALLWINNER_EMAC_H 24 25 25 26 #include "net/net.h" 26 27 #include "qemu/fifo8.h"

+3 -3

include/hw/nvram/openbios_firmware_abi.h

··· 1 1 - #ifndef FIRMWARE_ABI_H 2 2 - #define FIRMWARE_ABI_H 1 1 + #ifndef OPENBIOS_FIRMWARE_ABI_H 2 2 + #define OPENBIOS_FIRMWARE_ABI_H 3 3 4 4 /* OpenBIOS NVRAM partition */ 5 5 struct OpenBIOS_nvpart_v1 { ··· 72 72 73 73 header->checksum = tmp; 74 74 } 75 75 - #endif /* FIRMWARE_ABI_H */ 75 75 + #endif /* OPENBIOS_FIRMWARE_ABI_H */

+2 -2

include/hw/pci-host/apb.h

··· 1 1 - #ifndef APB_PCI_H 2 2 - #define APB_PCI_H 1 1 + #ifndef PCI_HOST_APB_H 2 2 + #define PCI_HOST_APB_H 3 3 4 4 #include "qemu-common.h" 5 5

+2 -2

include/hw/pci-host/ppce500.h

··· 1 1 - #ifndef PPCE500_PCI_H 2 2 - #define PPCE500_PCI_H 1 1 + #ifndef PCI_HOST_PPCE500_H 2 2 + #define PCI_HOST_PPCE500_H 3 3 4 4 static inline int ppce500_pci_map_irq_slot(int devno, int irq_num) 5 5 {

+3 -3

include/hw/pci-host/spapr.h

··· 17 17 * License along with this library; if not, see <http://www.gnu.org/licenses/>. 18 18 */ 19 19 20 20 - #if !defined(__HW_SPAPR_PCI_H__) 21 21 - #define __HW_SPAPR_PCI_H__ 20 20 + #ifndef PCI_HOST_SPAPR_H 21 21 + #define PCI_HOST_SPAPR_H 22 22 23 23 #include "hw/ppc/spapr.h" 24 24 #include "hw/pci/pci.h" ··· 153 153 154 154 void spapr_phb_dma_reset(sPAPRPHBState *sphb); 155 155 156 156 - #endif /* __HW_SPAPR_PCI_H__ */ 156 156 + #endif /* PCI_HOST_SPAPR_H */

+3 -3

include/hw/ppc/ppc4xx.h

··· 22 22 * THE SOFTWARE. 23 23 */ 24 24 25 25 - #if !defined(PPC_4XX_H) 26 26 - #define PPC_4XX_H 25 25 + #ifndef PPC4XX_H 26 26 + #define PPC4XX_H 27 27 28 28 #include "hw/pci/pci.h" 29 29 ··· 61 61 hwaddr special_cycle, 62 62 hwaddr registers); 63 63 64 64 - #endif /* !defined(PPC_4XX_H) */ 64 64 + #endif /* PPC4XX_H */

+2 -2

include/hw/s390x/ioinst.h

··· 9 9 * directory. 10 10 */ 11 11 12 12 - #ifndef IOINST_S390X_H 13 13 - #define IOINST_S390X_H 12 12 + #ifndef S390X_IOINST_H 13 13 + #define S390X_IOINST_H 14 14 15 15 /* 16 16 * Channel I/O related definitions, as defined in the Principles

+3 -3

include/hw/ssi/xilinx_spips.h

··· 22 22 * THE SOFTWARE. 23 23 */ 24 24 25 25 - #ifndef XLNX_SPIPS_H 26 26 - #define XLNX_SPIPS_H 25 25 + #ifndef XILINX_SPIPS_H 26 26 + #define XILINX_SPIPS_H 27 27 28 28 #include "hw/ssi/ssi.h" 29 29 #include "qemu/fifo8.h" ··· 69 69 #define XILINX_QSPIPS(obj) \ 70 70 OBJECT_CHECK(XilinxQSPIPS, (obj), TYPE_XILINX_QSPIPS) 71 71 72 72 - #endif /* XLNX_SPIPS_H */ 72 72 + #endif /* XILINX_SPIPS_H */

+3 -3

include/hw/timer/a9gtimer.h

··· 20 20 * with this program; if not, see <http://www.gnu.org/licenses/>. 21 21 */ 22 22 23 23 - #ifndef HW_TIMER_A9_GTIMER_H_H 24 24 - #define HW_TIMER_A9_GTIMER_H_H 23 23 + #ifndef A9GTIMER_H 24 24 + #define A9GTIMER_H 25 25 26 26 #include "hw/sysbus.h" 27 27 ··· 94 94 uint64_t new; 95 95 } A9GTimerUpdate; 96 96 97 97 - #endif /* #ifdef HW_TIMER_A9_GTIMER_H_H */ 97 97 + #endif /* A9GTIMER_H */

+2 -2

include/hw/timer/allwinner-a10-pit.h

··· 1 1 - #ifndef AW_A10_PIT_H 2 2 - #define AW_A10_PIT_H 1 1 + #ifndef ALLWINNER_A10_PIT_H 2 2 + #define ALLWINNER_A10_PIT_H 3 3 4 4 #include "hw/ptimer.h" 5 5

+3 -2

include/hw/timer/hpet.h

··· 10 10 * the COPYING file in the top-level directory. 11 11 * 12 12 */ 13 13 - #ifndef QEMU_HPET_EMUL_H 14 14 - #define QEMU_HPET_EMUL_H 13 13 + 14 14 + #ifndef HW_HPET_H 15 15 + #define HW_HPET_H 15 16 16 17 #include "qom/object.h" 17 18

+3 -3

include/hw/timer/m48t59.h

··· 1 1 - #ifndef NVRAM_H 2 2 - #define NVRAM_H 1 1 + #ifndef HW_M48T59_H 2 2 + #define HW_M48T59_H 3 3 4 4 #include "qemu-common.h" 5 5 #include "qom/object.h" ··· 31 31 uint32_t io_base, uint16_t size, int base_year, 32 32 int type); 33 33 34 34 - #endif /* !NVRAM_H */ 34 34 + #endif /* HW_M48T59_H */

+3 -2

include/hw/timer/mc146818rtc_regs.h

··· 21 21 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN 22 22 * THE SOFTWARE. 23 23 */ 24 24 - #ifndef RTC_REGS_H 25 25 - #define RTC_REGS_H 24 24 + 25 25 + #ifndef MC146818RTC_REGS_H 26 26 + #define MC146818RTC_REGS_H 26 27 27 28 #define RTC_ISA_IRQ 8 28 29

+2 -2

include/hw/tricore/tricore.h

··· 1 1 - #ifndef TRICORE_MISC_H 2 2 - #define TRICORE_MISC_H 1 1 1 + #ifndef HW_TRICORE_H 2 2 + #define HW_TRICORE_H 3 3 4 4 #include "exec/memory.h" 5 5 #include "hw/irq.h"

+2 -2

include/hw/vfio/vfio.h

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

+2 -2

include/hw/virtio/virtio-gpu.h

··· 11 11 * See the COPYING file in the top-level directory. 12 12 */ 13 13 14 14 - #ifndef _QEMU_VIRTIO_VGA_H 15 15 - #define _QEMU_VIRTIO_VGA_H 14 14 + #ifndef HW_VIRTIO_GPU_H 15 15 + #define HW_VIRTIO_GPU_H 16 16 17 17 #include "qemu/queue.h" 18 18 #include "ui/qemu-pixman.h"

+3 -2

include/libdecnumber/decNumberLocal.h

··· 37 37 /* decNumber.h or one of decDouble (etc.) must be included first. */ 38 38 /* ------------------------------------------------------------------ */ 39 39 40 40 - #if !defined(DECNUMBERLOC) 41 41 - #define DECNUMBERLOC 40 40 + #ifndef DECNUMBERLOCAL_H 41 41 + #define DECNUMBERLOCAL_H 42 42 + 42 43 #define DECVERSION "decNumber 3.53" /* Package Version [16 max.] */ 43 44 #define DECNLAUTHOR "Mike Cowlishaw" /* Who to blame */ 44 45

+3 -3

include/migration/block.h

··· 11 11 * 12 12 */ 13 13 14 14 - #ifndef BLOCK_MIGRATION_H 15 15 - #define BLOCK_MIGRATION_H 14 14 + #ifndef MIGRATION_BLOCK_H 15 15 + #define MIGRATION_BLOCK_H 16 16 17 17 void blk_mig_init(void); 18 18 int blk_mig_active(void); ··· 20 20 uint64_t blk_mig_bytes_remaining(void); 21 21 uint64_t blk_mig_bytes_total(void); 22 22 23 23 - #endif /* BLOCK_MIGRATION_H */ 23 23 + #endif /* MIGRATION_BLOCK_H */

+4 -3

include/monitor/hmp-target.h

··· 21 21 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN 22 22 * THE SOFTWARE. 23 23 */ 24 24 - #ifndef MONITOR_COMMON_H 25 25 - #define MONITOR_COMMON_H 24 24 + 25 25 + #ifndef MONITOR_HMP_TARGET_H 26 26 + #define MONITOR_HMP_TARGET_H 26 27 27 28 #define MD_TLONG 0 28 29 #define MD_I32 1 ··· 46 47 void hmp_info_local_apic(Monitor *mon, const QDict *qdict); 47 48 void hmp_info_io_apic(Monitor *mon, const QDict *qdict); 48 49 49 49 - #endif /* MONITOR_COMMON */ 50 50 + #endif /* MONITOR_HMP_TARGET_H */

+2 -2

include/monitor/qdev.h

··· 1 1 - #ifndef QEMU_QDEV_MONITOR_H 2 2 - #define QEMU_QDEV_MONITOR_H 1 1 + #ifndef MONITOR_QDEV_H 2 2 + #define MONITOR_QDEV_H 3 3 4 4 #include "hw/qdev-core.h" 5 5

+2 -3

include/qapi/qmp/dispatch.h

··· 11 11 * 12 12 */ 13 13 14 14 - #ifndef QMP_CORE_H 15 15 - #define QMP_CORE_H 14 14 + #ifndef QAPI_QMP_DISPATCH_H 15 15 + #define QAPI_QMP_DISPATCH_H 16 16 17 17 #include "qapi/qmp/qobject.h" 18 18 #include "qapi/qmp/qdict.h" ··· 48 48 void qmp_for_each_command(qmp_cmd_callback_fn fn, void *opaque); 49 49 50 50 #endif 51 51 -

+3 -3

include/qapi/qmp/types.h

··· 10 10 * See the COPYING.LIB file in the top-level directory. 11 11 */ 12 12 13 13 - #ifndef QEMU_OBJECTS_H 14 14 - #define QEMU_OBJECTS_H 13 13 + #ifndef QAPI_QMP_TYPES_H 14 14 + #define QAPI_QMP_TYPES_H 15 15 16 16 #include "qapi/qmp/qobject.h" 17 17 #include "qapi/qmp/qint.h" ··· 21 21 #include "qapi/qmp/qdict.h" 22 22 #include "qapi/qmp/qlist.h" 23 23 24 24 - #endif /* QEMU_OBJECTS_H */ 24 24 + #endif /* QAPI_QMP_TYPES_H */

+3 -2

include/qapi/visitor.h

··· 11 11 * See the COPYING.LIB file in the top-level directory. 12 12 * 13 13 */ 14 14 - #ifndef QAPI_VISITOR_CORE_H 15 15 - #define QAPI_VISITOR_CORE_H 14 14 + 15 15 + #ifndef QAPI_VISITOR_H 16 16 + #define QAPI_VISITOR_H 16 17 17 18 #include "qapi/qmp/qobject.h" 18 19

+3 -3

include/qemu/config-file.h

··· 1 1 - #ifndef QEMU_CONFIG_H 2 2 - #define QEMU_CONFIG_H 1 1 + #ifndef QEMU_CONFIG_FILE_H 2 2 + #define QEMU_CONFIG_FILE_H 3 3 4 4 #include "qemu/option.h" 5 5 #include "qapi/qmp/qdict.h" ··· 27 27 */ 28 28 int qemu_read_default_config_files(bool userconfig); 29 29 30 30 - #endif /* QEMU_CONFIG_H */ 30 30 + #endif /* QEMU_CONFIG_FILE_H */

+2 -3

include/qemu/error-report.h

··· 10 10 * See the COPYING file in the top-level directory. 11 11 */ 12 12 13 13 - #ifndef QEMU_ERROR_H 14 14 - #define QEMU_ERROR_H 15 15 - 13 13 + #ifndef QEMU_ERROR_REPORT_H 14 14 + #define QEMU_ERROR_REPORT_H 16 15 17 16 typedef struct Location { 18 17 /* all members are private to qemu-error.c */

+3 -3

include/qemu/fifo8.h

··· 1 1 - #ifndef FIFO_H 2 2 - #define FIFO_H 1 1 + #ifndef QEMU_FIFO8_H 2 2 + #define QEMU_FIFO8_H 3 3 4 4 #include "migration/vmstate.h" 5 5 ··· 157 157 .offset = vmstate_offset_value(_state, _field, Fifo8), \ 158 158 } 159 159 160 160 - #endif /* FIFO_H */ 160 160 + #endif /* QEMU_FIFO8_H */

+2 -2

include/qemu/option.h

··· 23 23 * THE SOFTWARE. 24 24 */ 25 25 26 26 - #ifndef QEMU_OPTIONS_H 27 27 - #define QEMU_OPTIONS_H 26 26 + #ifndef QEMU_OPTION_H 27 27 + #define QEMU_OPTION_H 28 28 29 29 #include "qemu/queue.h" 30 30 #include "qapi/qmp/qdict.h"

+2 -2

include/qemu/option_int.h

··· 23 23 * THE SOFTWARE. 24 24 */ 25 25 26 26 - #ifndef QEMU_OPTIONS_INTERNAL_H 27 27 - #define QEMU_OPTIONS_INTERNAL_H 26 26 + #ifndef QEMU_OPTION_INT_H 27 27 + #define QEMU_OPTION_INT_H 28 28 29 29 #include "qemu/option.h" 30 30 #include "qemu/error-report.h"

+5 -3

include/qemu/sockets.h

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

+2 -2

include/sysemu/bt.h

··· 1 1 - #ifndef BT_HOST_H 2 2 - #define BT_HOST_H 1 1 + #ifndef SYSEMU_BT_H 2 2 + #define SYSEMU_BT_H 3 3 4 4 /* BT HCI info */ 5 5

+3 -2

include/sysemu/hostmem.h

··· 9 9 * This work is licensed under the terms of the GNU GPL, version 2 or later. 10 10 * See the COPYING file in the top-level directory. 11 11 */ 12 12 - #ifndef QEMU_RAM_H 13 13 - #define QEMU_RAM_H 12 12 + 13 13 + #ifndef SYSEMU_HOSTMEM_H 14 14 + #define SYSEMU_HOSTMEM_H 14 15 15 16 #include "sysemu/sysemu.h" /* for MAX_NODES */ 16 17 #include "qom/object.h"

+2 -2

include/sysemu/tpm_backend.h

··· 10 10 * See the COPYING file in the top-level directory. 11 11 */ 12 12 13 13 - #ifndef _QEMU_TPM_H 14 14 - #define _QEMU_TPM_H 13 13 + #ifndef TPM_BACKEND_H 14 14 + #define TPM_BACKEND_H 15 15 16 16 #include "qom/object.h" 17 17 #include "qemu-common.h"

+3 -4

include/sysemu/tpm_backend_int.h

··· 19 19 * License along with this library; if not, see <http://www.gnu.org/licenses/> 20 20 */ 21 21 22 22 - #ifndef TPM_TPM_BACKEND_H 23 23 - #define TPM_TPM_BACKEND_H 24 24 - 22 22 + #ifndef TPM_BACKEND_INT_H 23 23 + #define TPM_BACKEND_INT_H 25 24 26 25 typedef struct TPMBackendThread { 27 26 GThreadPool *pool; ··· 39 38 TPM_BACKEND_CMD_TPM_RESET, 40 39 } TPMBackendCmd; 41 40 42 42 - #endif /* TPM_TPM_BACKEND_H */ 41 41 + #endif /* TPM_BACKEND_INT_H */

+3 -3

net/tap_int.h

··· 23 23 * THE SOFTWARE. 24 24 */ 25 25 26 26 - #ifndef QEMU_TAP_H 27 27 - #define QEMU_TAP_H 26 26 + #ifndef NET_TAP_INT_H 27 27 + #define NET_TAP_INT_H 28 28 29 29 #include "qemu-common.h" 30 30 #include "qapi-types.h" ··· 46 46 int tap_fd_disable(int fd); 47 47 int tap_fd_get_ifname(int fd, char *ifname); 48 48 49 49 - #endif /* QEMU_TAP_H */ 49 49 + #endif /* NET_TAP_INT_H */

+3 -2

qga/service-win32.h

··· 10 10 * This work is licensed under the terms of the GNU GPL, version 2 or later. 11 11 * See the COPYING file in the top-level directory. 12 12 */ 13 13 - #ifndef QGA_SERVICE_H 14 14 - #define QGA_SERVICE_H 13 13 + 14 14 + #ifndef QGA_SERVICE_WIN32_H 15 15 + #define QGA_SERVICE_WIN32_H 15 16 16 17 #include <windows.h> 17 18

+2 -2

qga/vss-win32/vss-common.h

··· 10 10 * See the COPYING file in the top-level directory. 11 11 */ 12 12 13 13 - #ifndef VSS_WIN32_H 14 14 - #define VSS_WIN32_H 13 13 + #ifndef VSS_COMMON_H 14 14 + #define VSS_COMMON_H 15 15 16 16 #define __MIDL_user_allocate_free_DEFINED__ 17 17 #include <windows.h>

+2 -2

slirp/ip6_icmp.h

··· 3 3 * Guillaume Subiron, Yann Bordenave, Serigne Modou Wagne. 4 4 */ 5 5 6 6 - #ifndef SLIRP_NETINET_ICMP6_H_ 7 7 - #define SLIRP_NETINET_ICMP6_H_ 6 6 + #ifndef SLIRP_IP6_ICMP_H 7 7 + #define SLIRP_IP6_ICMP_H 8 8 9 9 /* 10 10 * Interface Control Message Protocol version 6 Definitions.

+2 -2

slirp/slirp.h

··· 1 1 - #ifndef __COMMON_H__ 2 2 - #define __COMMON_H__ 1 1 + #ifndef SLIRP_H 2 2 + #define SLIRP_H 3 3 4 4 #include "qemu/host-utils.h" 5 5 #include "slirp_config.h"

+2 -2

target-i386/hyperv.h

··· 11 11 * 12 12 */ 13 13 14 14 - #ifndef HYPERV_I386_H 15 15 - #define HYPERV_I386_H 14 14 + #ifndef TARGET_I386_HYPERV_H 15 15 + #define TARGET_I386_HYPERV_H 16 16 17 17 #include "cpu.h" 18 18 #include "sysemu/kvm.h"

+3 -3

target-openrisc/exception.h

··· 17 17 * License along with this library; if not, see <http://www.gnu.org/licenses/>. 18 18 */ 19 19 20 20 - #ifndef QEMU_OPENRISC_EXCP_H 21 21 - #define QEMU_OPENRISC_EXCP_H 20 20 + #ifndef TARGET_OPENRISC_EXCEPTION_H 21 21 + #define TARGET_OPENRISC_EXCEPTION_H 22 22 23 23 #include "cpu.h" 24 24 #include "qemu-common.h" 25 25 26 26 void QEMU_NORETURN raise_exception(OpenRISCCPU *cpu, uint32_t excp); 27 27 28 28 - #endif /* QEMU_OPENRISC_EXCP_H */ 28 28 + #endif /* TARGET_OPENRISC_EXCEPTION_H */

+3 -3

target-tilegx/opcode_tilegx.h

··· 18 18 * 19 19 */ 20 20 21 21 - #ifndef __ARCH_OPCODE_H__ 22 22 - #define __ARCH_OPCODE_H__ 21 21 + #ifndef OPCODE_TILEGX_H 22 22 + #define OPCODE_TILEGX_H 23 23 24 24 #ifndef __ASSEMBLER__ 25 25 ··· 1403 1403 1404 1404 #endif /* __ASSEMBLER__ */ 1405 1405 1406 1406 - #endif /* __ARCH_OPCODE_H__ */ 1406 1406 + #endif /* OPCODE_TILEGX_H */

+3 -4

target-xtensa/core-dc232b/core-isa.h

··· 8 8 * Copyright (c) 1999-2007 Tensilica Inc. 9 9 */ 10 10 11 11 - #ifndef _XTENSA_CORE_CONFIGURATION_H 12 12 - #define _XTENSA_CORE_CONFIGURATION_H 13 13 - 11 11 + #ifndef XTENSA_DC232B_CORE_ISA_H 12 12 + #define XTENSA_DC232B_CORE_ISA_H 14 13 15 14 /**************************************************************************** 16 15 Parameters Useful for Any Code, USER or PRIVILEGED ··· 420 419 #endif /* !XTENSA_HAL_NON_PRIVILEGED_ONLY */ 421 420 422 421 423 423 - #endif /* _XTENSA_CORE_CONFIGURATION_H */ 422 422 + #endif /* XTENSA_DC232B_CORE_ISA_H */

+3 -4

target-xtensa/core-dc233c/core-isa.h

··· 28 28 TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE 29 29 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ 30 30 31 31 - #ifndef _XTENSA_CORE_CONFIGURATION_H 32 32 - #define _XTENSA_CORE_CONFIGURATION_H 33 33 - 31 31 + #ifndef XTENSA_DC233C_CORE_ISA_H 32 32 + #define XTENSA_DC233C_CORE_ISA_H 34 33 35 34 /**************************************************************************** 36 35 Parameters Useful for Any Code, USER or PRIVILEGED ··· 471 470 #endif /* !XTENSA_HAL_NON_PRIVILEGED_ONLY */ 472 471 473 472 474 474 - #endif /* _XTENSA_CORE_CONFIGURATION_H */ 473 473 + #endif /* XTENSA_DC233C_CORE_ISA_H */

+3 -4

target-xtensa/core-fsf/core-isa.h

··· 8 8 * Copyright (C) 1999-2006 Tensilica Inc. 9 9 */ 10 10 11 11 - #ifndef _XTENSA_CORE_H 12 12 - #define _XTENSA_CORE_H 13 13 - 11 11 + #ifndef XTENSA_FSF_CORE_ISA_H 12 12 + #define XTENSA_FSF_CORE_ISA_H 14 13 15 14 /**************************************************************************** 16 15 Parameters Useful for Any Code, USER or PRIVILEGED ··· 358 357 #endif /* !XTENSA_HAL_NON_PRIVILEGED_ONLY */ 359 358 360 359 361 361 - #endif /* _XTENSA_CORE_CONFIGURATION_H */ 360 360 + #endif /* XTENSA_FSF_CORE_ISA_H */

+3 -3

ui/vnc-enc-tight.h

··· 27 27 * THE SOFTWARE. 28 28 */ 29 29 30 30 - #ifndef VNC_ENCODING_TIGHT_H 31 31 - #define VNC_ENCODING_TIGHT_H 30 30 + #ifndef VNC_ENC_TIGHT_H 31 31 + #define VNC_ENC_TIGHT_H 32 32 33 33 /*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 34 34 * Tight Encoding. ··· 180 180 #define VNC_TIGHT_DETECT_MIN_WIDTH 8 181 181 #define VNC_TIGHT_DETECT_MIN_HEIGHT 8 182 182 183 183 - #endif /* VNC_ENCODING_TIGHT_H */ 183 183 + #endif /* VNC_ENC_TIGHT_H */

+2 -2

ui/vnc-enc-zrle.h

··· 26 26 * THE SOFTWARE. 27 27 */ 28 28 29 29 - #ifndef VNC_ENCODING_ZRLE_H 30 30 - #define VNC_ENCODING_ZRLE_H 29 29 + #ifndef VNC_ENC_ZRLE_H 30 30 + #define VNC_ENC_ZRLE_H 31 31 32 32 /*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 33 33 * ZRLE - encoding combining Zlib compression, tiling, palettisation and

+2 -2

ui/vnc-enc-zywrle.h

··· 41 41 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 42 42 ********************************************************************/ 43 43 44 44 - #ifndef VNC_ENCODING_ZYWRLE_H 45 45 - #define VNC_ENCODING_ZYWRLE_H 44 44 + #ifndef VNC_ENC_ZYWRLE_H 45 45 + #define VNC_ENC_ZYWRLE_H 46 46 47 47 /* Tables for Coefficients filtering. */ 48 48 #ifndef ZYWRLE_QUANTIZE