diff options
Diffstat (limited to 'include/hw')
54 files changed, 68 insertions, 58 deletions
diff --git a/include/hw/acpi/tco.h b/include/hw/acpi/tco.h index 52ad767ddd..d19dd59353 100644 --- a/include/hw/acpi/tco.h +++ b/include/hw/acpi/tco.h @@ -9,7 +9,6 @@ #ifndef HW_ACPI_TCO_H #define HW_ACPI_TCO_H -#include "qemu-common.h" /* As per ICH9 spec, the internal timer has an error of ~0.6s on every tick */ #define TCO_TICK_NSEC 600000000LL diff --git a/include/hw/arm/allwinner-a10.h b/include/hw/arm/allwinner-a10.h index 6305b9c586..e99fe2ea2e 100644 --- a/include/hw/arm/allwinner-a10.h +++ b/include/hw/arm/allwinner-a10.h @@ -1,6 +1,6 @@ -#ifndef ALLWINNER_H_ +#ifndef HW_ARM_ALLWINNER_A10_H +#define HW_ARM_ALLWINNER_A10_H -#include "qemu-common.h" #include "qemu/error-report.h" #include "hw/char/serial.h" #include "hw/arm/boot.h" @@ -38,5 +38,4 @@ typedef struct AwA10State { MemoryRegion sram_a; } AwA10State; -#define ALLWINNER_H_ #endif diff --git a/include/hw/arm/bcm2835_peripherals.h b/include/hw/arm/bcm2835_peripherals.h index e79c21771f..6b17f6a382 100644 --- a/include/hw/arm/bcm2835_peripherals.h +++ b/include/hw/arm/bcm2835_peripherals.h @@ -11,7 +11,6 @@ #ifndef BCM2835_PERIPHERALS_H #define BCM2835_PERIPHERALS_H -#include "qemu-common.h" #include "hw/sysbus.h" #include "hw/char/pl011.h" #include "hw/char/bcm2835_aux.h" diff --git a/include/hw/arm/exynos4210.h b/include/hw/arm/exynos4210.h index 27c684e851..aa137271c0 100644 --- a/include/hw/arm/exynos4210.h +++ b/include/hw/arm/exynos4210.h @@ -25,7 +25,6 @@ #ifndef EXYNOS4210_H #define EXYNOS4210_H -#include "qemu-common.h" #include "exec/memory.h" #include "target/arm/cpu-qom.h" diff --git a/include/hw/arm/omap.h b/include/hw/arm/omap.h index 9de867daa4..d21e418242 100644 --- a/include/hw/arm/omap.h +++ b/include/hw/arm/omap.h @@ -16,9 +16,11 @@ * 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 hw_omap_h + +#ifndef HW_ARM_OMAP_H +#define HW_ARM_OMAP_H + #include "exec/memory.h" -# define hw_omap_h "omap.h" #include "hw/irq.h" #include "hw/input/tsc2xxx.h" #include "target/arm/cpu-qom.h" @@ -991,4 +993,4 @@ enum { # define OMAP_MPUI_REG_MASK 0x000007ff -#endif /* hw_omap_h */ +#endif diff --git a/include/hw/arm/raspi_platform.h b/include/hw/arm/raspi_platform.h index 6467e88ae6..10083d33df 100644 --- a/include/hw/arm/raspi_platform.h +++ b/include/hw/arm/raspi_platform.h @@ -22,6 +22,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#ifndef HW_ARM_RASPI_PLATFORM_H +#define HW_ARM_RASPI_PLATFORM_H + #define MCORE_OFFSET 0x0000 /* Fake frame buffer device * (the multicore sync block) */ #define IC0_OFFSET 0x2000 @@ -126,3 +129,5 @@ #define INTERRUPT_VPU1_HALTED 5 #define INTERRUPT_ILLEGAL_TYPE0 6 #define INTERRUPT_ILLEGAL_TYPE1 7 + +#endif diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h index 73005f05ae..a72094204e 100644 --- a/include/hw/arm/virt.h +++ b/include/hw/arm/virt.h @@ -30,7 +30,6 @@ #ifndef QEMU_ARM_VIRT_H #define QEMU_ARM_VIRT_H -#include "qemu-common.h" #include "exec/hwaddr.h" #include "qemu/notify.h" #include "hw/boards.h" diff --git a/include/hw/arm/xlnx-zynqmp.h b/include/hw/arm/xlnx-zynqmp.h index cd90b04310..35804ea80a 100644 --- a/include/hw/arm/xlnx-zynqmp.h +++ b/include/hw/arm/xlnx-zynqmp.h @@ -16,8 +16,8 @@ */ #ifndef XLNX_ZYNQMP_H +#define XLNX_ZYNQMP_H -#include "qemu-common.h" #include "hw/arm/boot.h" #include "hw/intc/arm_gic.h" #include "hw/net/cadence_gem.h" @@ -114,5 +114,4 @@ typedef struct XlnxZynqMPState { bool has_rpu; } XlnxZynqMPState; -#define XLNX_ZYNQMP_H #endif diff --git a/include/hw/block/fdc.h b/include/hw/block/fdc.h index 3b813c7f7d..8cece84326 100644 --- a/include/hw/block/fdc.h +++ b/include/hw/block/fdc.h @@ -1,7 +1,6 @@ #ifndef HW_FDC_H #define HW_FDC_H -#include "qemu-common.h" #include "qapi/qapi-types-block.h" /* fdc.c */ diff --git a/include/hw/boards.h b/include/hw/boards.h index 6ff02bf3e4..b7362af3f1 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -6,6 +6,7 @@ #include "sysemu/blockdev.h" #include "sysemu/accel.h" #include "hw/qdev.h" +#include "qemu/module.h" #include "qom/object.h" #include "qom/cpu.h" diff --git a/include/hw/char/cadence_uart.h b/include/hw/char/cadence_uart.h index 118e3f10de..e1cf33e94c 100644 --- a/include/hw/char/cadence_uart.h +++ b/include/hw/char/cadence_uart.h @@ -17,6 +17,7 @@ */ #ifndef CADENCE_UART_H +#define CADENCE_UART_H #include "hw/sysbus.h" #include "chardev/char-fe.h" @@ -66,5 +67,4 @@ static inline DeviceState *cadence_uart_create(hwaddr addr, return dev; } -#define CADENCE_UART_H #endif diff --git a/include/hw/display/xlnx_dp.h b/include/hw/display/xlnx_dp.h index 45a805033a..ab0dd250cc 100644 --- a/include/hw/display/xlnx_dp.h +++ b/include/hw/display/xlnx_dp.h @@ -19,9 +19,11 @@ * * 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 XLNX_DP_H +#define XLNX_DP_H + #include "hw/sysbus.h" #include "ui/console.h" #include "hw/misc/auxbus.h" @@ -33,9 +35,6 @@ #include "hw/dma/xlnx_dpdma.h" #include "audio/audio.h" -#ifndef XLNX_DP_H -#define XLNX_DP_H - #define AUD_CHBUF_MAX_DEPTH (32 * KiB) #define MAX_QEMU_BUFFER_SIZE (4 * KiB) @@ -107,4 +106,4 @@ typedef struct XlnxDPState { #define TYPE_XLNX_DP "xlnx.v-dp" #define XLNX_DP(obj) OBJECT_CHECK(XlnxDPState, (obj), TYPE_XLNX_DP) -#endif /* !XLNX_DP_H */ +#endif diff --git a/include/hw/dma/bcm2835_dma.h b/include/hw/dma/bcm2835_dma.h index 60138f4d31..91ed8d05d1 100644 --- a/include/hw/dma/bcm2835_dma.h +++ b/include/hw/dma/bcm2835_dma.h @@ -6,7 +6,6 @@ #ifndef BCM2835_DMA_H #define BCM2835_DMA_H -#include "qemu-common.h" #include "hw/sysbus.h" typedef struct { diff --git a/include/hw/dma/xlnx-zynq-devcfg.h b/include/hw/dma/xlnx-zynq-devcfg.h index 9f5119a89a..1d3969d91f 100644 --- a/include/hw/dma/xlnx-zynq-devcfg.h +++ b/include/hw/dma/xlnx-zynq-devcfg.h @@ -25,6 +25,7 @@ */ #ifndef XLNX_ZYNQ_DEVCFG_H +#define XLNX_ZYNQ_DEVCFG_H #include "hw/register.h" #include "hw/sysbus.h" @@ -58,5 +59,4 @@ typedef struct XlnxZynqDevcfg { RegisterInfo regs_info[XLNX_ZYNQ_DEVCFG_R_MAX]; } XlnxZynqDevcfg; -#define XLNX_ZYNQ_DEVCFG_H #endif diff --git a/include/hw/fw-path-provider.h b/include/hw/fw-path-provider.h index 5df893a3d8..10d1bd4959 100644 --- a/include/hw/fw-path-provider.h +++ b/include/hw/fw-path-provider.h @@ -18,7 +18,6 @@ #ifndef FW_PATH_PROVIDER_H #define FW_PATH_PROVIDER_H -#include "qemu-common.h" #include "qom/object.h" #define TYPE_FW_PATH_PROVIDER "fw-path-provider" diff --git a/include/hw/hw.h b/include/hw/hw.h index ab4950c312..b1b79964b5 100644 --- a/include/hw/hw.h +++ b/include/hw/hw.h @@ -12,7 +12,6 @@ #include "hw/irq.h" #include "migration/vmstate.h" #include "migration/qemu-file-types.h" -#include "qemu/module.h" #include "sysemu/reset.h" void QEMU_NORETURN hw_error(const char *fmt, ...) GCC_FMT_ATTR(1, 2); diff --git a/include/hw/i2c/ppc4xx_i2c.h b/include/hw/i2c/ppc4xx_i2c.h index b3450bacf7..aa2a2bf9de 100644 --- a/include/hw/i2c/ppc4xx_i2c.h +++ b/include/hw/i2c/ppc4xx_i2c.h @@ -27,7 +27,6 @@ #ifndef PPC4XX_I2C_H #define PPC4XX_I2C_H -#include "qemu-common.h" #include "hw/sysbus.h" #include "hw/i2c/i2c.h" diff --git a/include/hw/i386/apic.h b/include/hw/i386/apic.h index a9f6c0aa33..da1d2fe155 100644 --- a/include/hw/i386/apic.h +++ b/include/hw/i386/apic.h @@ -1,7 +1,6 @@ #ifndef APIC_H #define APIC_H -#include "qemu-common.h" /* apic.c */ void apic_deliver_irq(uint8_t dest, uint8_t dest_mode, uint8_t delivery_mode, diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 5d5636241e..a7d0b87166 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -1,7 +1,6 @@ #ifndef HW_PC_H #define HW_PC_H -#include "qemu-common.h" #include "exec/memory.h" #include "hw/boards.h" #include "hw/isa/isa.h" @@ -12,6 +11,7 @@ #include "qemu/range.h" #include "qemu/bitmap.h" +#include "qemu/module.h" #include "sysemu/sysemu.h" #include "hw/pci/pci.h" #include "hw/mem/pc-dimm.h" diff --git a/include/hw/ipmi/ipmi.h b/include/hw/ipmi/ipmi.h index 99661d2bf0..011faf22e9 100644 --- a/include/hw/ipmi/ipmi.h +++ b/include/hw/ipmi/ipmi.h @@ -26,7 +26,6 @@ #define HW_IPMI_H #include "exec/memory.h" -#include "qemu-common.h" #include "hw/qdev.h" #define MAX_IPMI_MSG_SIZE 300 diff --git a/include/hw/isa/apm.h b/include/hw/isa/apm.h index b7098bf7ca..0f93602936 100644 --- a/include/hw/isa/apm.h +++ b/include/hw/isa/apm.h @@ -1,7 +1,6 @@ #ifndef APM_H #define APM_H -#include "qemu-common.h" #include "hw/hw.h" #include "exec/memory.h" diff --git a/include/hw/isa/superio.h b/include/hw/isa/superio.h index 345f006081..b151dcd753 100644 --- a/include/hw/isa/superio.h +++ b/include/hw/isa/superio.h @@ -10,7 +10,6 @@ #ifndef HW_ISA_SUPERIO_H #define HW_ISA_SUPERIO_H -#include "qemu-common.h" #include "sysemu/sysemu.h" #include "hw/isa/isa.h" diff --git a/include/hw/kvm/clock.h b/include/hw/kvm/clock.h index 252ea13461..81c66b2302 100644 --- a/include/hw/kvm/clock.h +++ b/include/hw/kvm/clock.h @@ -8,9 +8,11 @@ * * This work is licensed under the terms of the GNU GPL version 2. * See the COPYING file in the top-level directory. - * */ +#ifndef HW_KVM_CLOCK_H +#define HW_KVM_CLOCK_H + #ifdef CONFIG_KVM void kvmclock_create(void); @@ -22,3 +24,5 @@ static inline void kvmclock_create(void) } #endif /* !CONFIG_KVM */ + +#endif diff --git a/include/hw/lm32/lm32_pic.h b/include/hw/lm32/lm32_pic.h index e6479b8f63..9e5e038437 100644 --- a/include/hw/lm32/lm32_pic.h +++ b/include/hw/lm32/lm32_pic.h @@ -1,7 +1,6 @@ #ifndef QEMU_HW_LM32_PIC_H #define QEMU_HW_LM32_PIC_H -#include "qemu-common.h" uint32_t lm32_pic_get_ip(DeviceState *d); uint32_t lm32_pic_get_im(DeviceState *d); diff --git a/include/hw/m68k/mcf_fec.h b/include/hw/m68k/mcf_fec.h index 7f029f7b59..eeb471f9c9 100644 --- a/include/hw/m68k/mcf_fec.h +++ b/include/hw/m68k/mcf_fec.h @@ -7,7 +7,12 @@ * (at your option) any later version. */ +#ifndef HW_M68K_MCF_FEC_H +#define HW_M68K_MCF_FEC_H + #define TYPE_MCF_FEC_NET "mcf-fec" #define MCF_FEC_NET(obj) OBJECT_CHECK(mcf_fec_state, (obj), TYPE_MCF_FEC_NET) #define FEC_NUM_IRQ 13 + +#endif diff --git a/include/hw/mips/bios.h b/include/hw/mips/bios.h index d67ef33e83..c03007999a 100644 --- a/include/hw/mips/bios.h +++ b/include/hw/mips/bios.h @@ -1,3 +1,6 @@ +#ifndef HW_MIPS_BIOS_H +#define HW_MIPS_BIOS_H + #include "qemu/units.h" #include "cpu.h" @@ -7,3 +10,5 @@ #else #define BIOS_FILENAME "mipsel_bios.bin" #endif + +#endif diff --git a/include/hw/net/cadence_gem.h b/include/hw/net/cadence_gem.h index 5426961d91..5c83036ade 100644 --- a/include/hw/net/cadence_gem.h +++ b/include/hw/net/cadence_gem.h @@ -23,6 +23,7 @@ */ #ifndef CADENCE_GEM_H +#define CADENCE_GEM_H #define TYPE_CADENCE_GEM "cadence_gem" #define CADENCE_GEM(obj) OBJECT_CHECK(CadenceGEMState, (obj), TYPE_CADENCE_GEM) @@ -84,5 +85,4 @@ typedef struct CadenceGEMState { bool sar_active[4]; } CadenceGEMState; -#define CADENCE_GEM_H #endif diff --git a/include/hw/nmi.h b/include/hw/nmi.h index ad857f3832..a1e128724e 100644 --- a/include/hw/nmi.h +++ b/include/hw/nmi.h @@ -22,7 +22,6 @@ #ifndef NMI_H #define NMI_H -#include "qemu-common.h" #include "qom/object.h" #define TYPE_NMI "nmi" diff --git a/include/hw/pci-bridge/simba.h b/include/hw/pci-bridge/simba.h index e13ba27d0b..d8649973ee 100644 --- a/include/hw/pci-bridge/simba.h +++ b/include/hw/pci-bridge/simba.h @@ -24,6 +24,9 @@ * THE SOFTWARE. */ +#ifndef HW_PCI_BRIDGE_SIMBA_H +#define HW_PCI_BRIDGE_SIMBA_H + #include "hw/pci/pci_bridge.h" @@ -35,3 +38,5 @@ typedef struct SimbaPCIBridge { #define TYPE_SIMBA_PCI_BRIDGE "pbm-bridge" #define SIMBA_PCI_BRIDGE(obj) \ OBJECT_CHECK(SimbaPCIBridge, (obj), TYPE_SIMBA_PCI_BRIDGE) + +#endif diff --git a/include/hw/pci-host/pam.h b/include/hw/pci-host/pam.h index 6116c638f9..fec5cd35d6 100644 --- a/include/hw/pci-host/pam.h +++ b/include/hw/pci-host/pam.h @@ -50,7 +50,6 @@ * 0xf0000 - 0xfffff System BIOS Area Memory Segments */ -#include "qemu-common.h" #include "exec/memory.h" #define SMRAM_C_BASE 0xa0000 diff --git a/include/hw/pci/msi.h b/include/hw/pci/msi.h index 8440eaee11..4087688486 100644 --- a/include/hw/pci/msi.h +++ b/include/hw/pci/msi.h @@ -21,7 +21,6 @@ #ifndef QEMU_MSI_H #define QEMU_MSI_H -#include "qemu-common.h" #include "hw/pci/pci.h" struct MSIMessage { diff --git a/include/hw/pci/msix.h b/include/hw/pci/msix.h index 08acfa836e..4c4a60c739 100644 --- a/include/hw/pci/msix.h +++ b/include/hw/pci/msix.h @@ -1,7 +1,6 @@ #ifndef QEMU_MSIX_H #define QEMU_MSIX_H -#include "qemu-common.h" #include "hw/pci/pci.h" #define MSIX_CAP_LENGTH 12 diff --git a/include/hw/pci/pci_regs.h b/include/hw/pci/pci_regs.h index 7a83142578..77ba64b931 100644 --- a/include/hw/pci/pci_regs.h +++ b/include/hw/pci/pci_regs.h @@ -1,3 +1,8 @@ +#ifndef HW_PCI_PCI_REGS_H +#define HW_PCI_PCI_REGS_H + #include "standard-headers/linux/pci_regs.h" #define PCI_PM_CAP_VER_1_1 0x0002 /* PCI PM spec ver. 1.1 */ + +#endif diff --git a/include/hw/pci/shpc.h b/include/hw/pci/shpc.h index 18f6ec1cd5..bd8204f64e 100644 --- a/include/hw/pci/shpc.h +++ b/include/hw/pci/shpc.h @@ -1,7 +1,6 @@ #ifndef SHPC_H #define SHPC_H -#include "qemu-common.h" #include "exec/memory.h" #include "hw/hotplug.h" #include "hw/pci/pci.h" diff --git a/include/hw/pci/slotid_cap.h b/include/hw/pci/slotid_cap.h index a777ea0e49..8b4dc0ce83 100644 --- a/include/hw/pci/slotid_cap.h +++ b/include/hw/pci/slotid_cap.h @@ -1,7 +1,6 @@ #ifndef PCI_SLOTID_CAP_H #define PCI_SLOTID_CAP_H -#include "qemu-common.h" int slotid_cap_init(PCIDevice *dev, int nslots, uint8_t chassis, diff --git a/include/hw/ppc/openpic.h b/include/hw/ppc/openpic.h index dad08fe9be..7642a8ea1d 100644 --- a/include/hw/ppc/openpic.h +++ b/include/hw/ppc/openpic.h @@ -1,7 +1,6 @@ #ifndef OPENPIC_H #define OPENPIC_H -#include "qemu-common.h" #include "hw/sysbus.h" #include "hw/qdev-core.h" #include "qom/cpu.h" diff --git a/include/hw/ptimer.h b/include/hw/ptimer.h index 0731d9aef1..2b866902aa 100644 --- a/include/hw/ptimer.h +++ b/include/hw/ptimer.h @@ -8,7 +8,6 @@ #ifndef PTIMER_H #define PTIMER_H -#include "qemu-common.h" #include "qemu/timer.h" #include "migration/vmstate.h" diff --git a/include/hw/qdev-dma.h b/include/hw/qdev-dma.h index 8cfb0f348e..b00391aa0c 100644 --- a/include/hw/qdev-dma.h +++ b/include/hw/qdev-dma.h @@ -6,5 +6,11 @@ * 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 HW_QDEV_DMA_H +#define HW_QDEV_DMA_H + #define DEFINE_PROP_DMAADDR(_n, _s, _f, _d) \ DEFINE_PROP_UINT64(_n, _s, _f, _d) + +#endif diff --git a/include/hw/sd/sdhci.h b/include/hw/sd/sdhci.h index f321767c56..cbf415e43a 100644 --- a/include/hw/sd/sdhci.h +++ b/include/hw/sd/sdhci.h @@ -25,7 +25,6 @@ #ifndef SDHCI_H #define SDHCI_H -#include "qemu-common.h" #include "hw/pci/pci.h" #include "hw/sysbus.h" #include "hw/sd/sd.h" diff --git a/include/hw/semihosting/console.h b/include/hw/semihosting/console.h index 30e66ae20a..9eb45b7c53 100644 --- a/include/hw/semihosting/console.h +++ b/include/hw/semihosting/console.h @@ -6,8 +6,8 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ -#ifndef _SEMIHOST_CONSOLE_H_ -#define _SEMIHOST_CONSOLE_H_ +#ifndef SEMIHOST_CONSOLE_H +#define SEMIHOST_CONSOLE_H /** * qemu_semihosting_console_out: @@ -35,4 +35,4 @@ int qemu_semihosting_console_out(CPUArchState *env, target_ulong s, int len); */ int qemu_semihosting_log_out(const char *s, int len); -#endif /* _SEMIHOST_CONSOLE_H_ */ +#endif /* SEMIHOST_CONSOLE_H */ diff --git a/include/hw/sh4/sh_intc.h b/include/hw/sh4/sh_intc.h index adfedb2efc..b7c2404334 100644 --- a/include/hw/sh4/sh_intc.h +++ b/include/hw/sh4/sh_intc.h @@ -1,7 +1,6 @@ #ifndef SH_INTC_H #define SH_INTC_H -#include "qemu-common.h" #include "hw/irq.h" typedef unsigned char intc_enum; diff --git a/include/hw/sparc/sparc64.h b/include/hw/sparc/sparc64.h index 5af4344459..21ab79e343 100644 --- a/include/hw/sparc/sparc64.h +++ b/include/hw/sparc/sparc64.h @@ -1,6 +1,10 @@ +#ifndef HW_SPARC_SPARC64_H +#define HW_SPARC_SPARC64_H #define IVEC_MAX 0x40 SPARCCPU *sparc64_cpu_devinit(const char *cpu_type, uint64_t prom_addr); void sparc64_cpu_set_ivec_irq(void *opaque, int irq, int level); + +#endif diff --git a/include/hw/sparc/sun4m_iommu.h b/include/hw/sparc/sun4m_iommu.h index 938937eb04..482266c6a7 100644 --- a/include/hw/sparc/sun4m_iommu.h +++ b/include/hw/sparc/sun4m_iommu.h @@ -25,7 +25,6 @@ #ifndef SUN4M_IOMMU_H #define SUN4M_IOMMU_H -#include "qemu-common.h" #include "hw/sysbus.h" #define IOMMU_NREGS (4 * 4096 / 4) diff --git a/include/hw/sparc/sun4u_iommu.h b/include/hw/sparc/sun4u_iommu.h index a760172e8e..5472d489cf 100644 --- a/include/hw/sparc/sun4u_iommu.h +++ b/include/hw/sparc/sun4u_iommu.h @@ -27,7 +27,6 @@ #ifndef SUN4U_IOMMU_H #define SUN4U_IOMMU_H -#include "qemu-common.h" #include "hw/sysbus.h" #define IOMMU_NREGS 3 diff --git a/include/hw/stream.h b/include/hw/stream.h index 15774f07ab..d02f62ca89 100644 --- a/include/hw/stream.h +++ b/include/hw/stream.h @@ -1,7 +1,6 @@ #ifndef STREAM_H #define STREAM_H -#include "qemu-common.h" #include "qom/object.h" /* stream slave. Used until qdev provides a generic way. */ diff --git a/include/hw/timer/m48t59.h b/include/hw/timer/m48t59.h index 6f8db04fce..43efc91f56 100644 --- a/include/hw/timer/m48t59.h +++ b/include/hw/timer/m48t59.h @@ -1,7 +1,6 @@ #ifndef HW_M48T59_H #define HW_M48T59_H -#include "qemu-common.h" #include "qom/object.h" #define TYPE_NVRAM "nvram" diff --git a/include/hw/timer/xlnx-zynqmp-rtc.h b/include/hw/timer/xlnx-zynqmp-rtc.h index 5ba4d8bc4a..6e9134edf6 100644 --- a/include/hw/timer/xlnx-zynqmp-rtc.h +++ b/include/hw/timer/xlnx-zynqmp-rtc.h @@ -24,6 +24,9 @@ * THE SOFTWARE. */ +#ifndef HW_TIMER_XLNX_ZYNQMP_RTC_H +#define HW_TIMER_XLNX_ZYNQMP_RTC_H + #include "hw/register.h" #define TYPE_XLNX_ZYNQMP_RTC "xlnx-zynmp.rtc" @@ -84,3 +87,5 @@ typedef struct XlnxZynqMPRTC { uint32_t regs[XLNX_ZYNQMP_RTC_R_MAX]; RegisterInfo regs_info[XLNX_ZYNQMP_RTC_R_MAX]; } XlnxZynqMPRTC; + +#endif diff --git a/include/hw/vfio/vfio-common.h b/include/hw/vfio/vfio-common.h index 1155b79678..e05bc09794 100644 --- a/include/hw/vfio/vfio-common.h +++ b/include/hw/vfio/vfio-common.h @@ -21,7 +21,6 @@ #ifndef HW_VFIO_VFIO_COMMON_H #define HW_VFIO_VFIO_COMMON_H -#include "qemu-common.h" #include "exec/memory.h" #include "qemu/queue.h" #include "qemu/notify.h" diff --git a/include/hw/virtio/vhost-scsi-common.h b/include/hw/virtio/vhost-scsi-common.h index 4eab767ee8..54357164f0 100644 --- a/include/hw/virtio/vhost-scsi-common.h +++ b/include/hw/virtio/vhost-scsi-common.h @@ -14,7 +14,6 @@ #ifndef VHOST_SCSI_COMMON_H #define VHOST_SCSI_COMMON_H -#include "qemu-common.h" #include "hw/qdev.h" #include "hw/virtio/virtio-scsi.h" #include "hw/virtio/vhost.h" diff --git a/include/hw/virtio/vhost-scsi.h b/include/hw/virtio/vhost-scsi.h index 04658d14f5..df5bfdb188 100644 --- a/include/hw/virtio/vhost-scsi.h +++ b/include/hw/virtio/vhost-scsi.h @@ -14,7 +14,6 @@ #ifndef VHOST_SCSI_H #define VHOST_SCSI_H -#include "qemu-common.h" #include "hw/qdev.h" #include "hw/virtio/virtio-scsi.h" #include "hw/virtio/vhost.h" diff --git a/include/hw/virtio/vhost-user-blk.h b/include/hw/virtio/vhost-user-blk.h index 51457fb857..8dbf11c6f0 100644 --- a/include/hw/virtio/vhost-user-blk.h +++ b/include/hw/virtio/vhost-user-blk.h @@ -16,7 +16,6 @@ #define VHOST_USER_BLK_H #include "standard-headers/linux/virtio_blk.h" -#include "qemu-common.h" #include "hw/qdev.h" #include "hw/block/block.h" #include "chardev/char-fe.h" diff --git a/include/hw/virtio/vhost-user-scsi.h b/include/hw/virtio/vhost-user-scsi.h index 738f9288bd..1b332ea910 100644 --- a/include/hw/virtio/vhost-user-scsi.h +++ b/include/hw/virtio/vhost-user-scsi.h @@ -17,7 +17,6 @@ #ifndef VHOST_USER_SCSI_H #define VHOST_USER_SCSI_H -#include "qemu-common.h" #include "hw/qdev.h" #include "hw/virtio/virtio-scsi.h" #include "hw/virtio/vhost.h" diff --git a/include/hw/xen/io/ring.h b/include/hw/xen/io/ring.h index 1adacf09f9..62abfd7a6e 100644 --- a/include/hw/xen/io/ring.h +++ b/include/hw/xen/io/ring.h @@ -24,8 +24,8 @@ * Tim Deegan and Andrew Warfield November 2004. */ -#ifndef __XEN_PUBLIC_IO_RING_H__ -#define __XEN_PUBLIC_IO_RING_H__ +#ifndef XEN_PUBLIC_IO_RING_H +#define XEN_PUBLIC_IO_RING_H /* * When #include'ing this header, you need to provide the following @@ -469,7 +469,7 @@ struct name##_data_intf { \ }; \ DEFINE_XEN_FLEX_RING(name) -#endif /* __XEN_PUBLIC_IO_RING_H__ */ +#endif /* XEN_PUBLIC_IO_RING_H */ /* * Local variables: diff --git a/include/hw/xen/xen.h b/include/hw/xen/xen.h index ba039c146d..9c7b5f78dc 100644 --- a/include/hw/xen/xen.h +++ b/include/hw/xen/xen.h @@ -8,7 +8,6 @@ * /usr/include/xen, so it can be included unconditionally. */ -#include "qemu-common.h" #include "exec/cpu-common.h" #include "hw/irq.h" |