Include qemu-common.h exactly where needed

No header includes qemu-common.h after this commit, as prescribed by qemu-common.h's file comment. Signed-off-by: Markus Armbruster <armbru@redhat.com> Message-Id: <20190523143508.25387-5-armbru@redhat.com> [Rebased with conflicts resolved automatically, except for include/hw/arm/xlnx-zynqmp.h hw/arm/nrf51_soc.c hw/arm/msf2-soc.c block/qcow2-refcount.c block/qcow2-cluster.c block/qcow2-cache.c target/arm/cpu.h target/lm32/cpu.h target/m68k/cpu.h target/mips/cpu.h target/moxie/cpu.h target/nios2/cpu.h target/openrisc/cpu.h target/riscv/cpu.h target/tilegx/cpu.h target/tricore/cpu.h target/unicore32/cpu.h target/xtensa/cpu.h; bsd-user/main.c and net/tap-bsd.c fixed up]
2025-08-01 14:53:54 -06:00 · 2019-05-23 16:35:08 +02:00 · 2019-05-23 16:35:08 +02:00 · a8d2532645
commit a8d2532645
parent 0b8fa32f55
485 changed files with 103 additions and 397 deletions
--- 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
--- a/include/hw/arm/allwinner-a10.h
+++ b/include/hw/arm/allwinner-a10.h
@ -1,6 +1,5 @@
 #ifndef ALLWINNER_H_

-#include "qemu-common.h"
 #include "qemu/error-report.h"
 #include "hw/char/serial.h"
 #include "hw/arm/boot.h"
--- 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"
--- 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"

--- 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"
--- a/include/hw/arm/xlnx-zynqmp.h
+++ b/include/hw/arm/xlnx-zynqmp.h
@ -17,7 +17,6 @@

 #ifndef XLNX_ZYNQMP_H

-#include "qemu-common.h"
 #include "hw/arm/boot.h"
 #include "hw/intc/arm_gic.h"
 #include "hw/net/cadence_gem.h"
--- 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 */
--- 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 {
--- 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"
--- 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"

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

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

--- 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);
--- 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"
--- 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
--- 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 {
--- 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
--- 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"
--- 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,
--- 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"
--- 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"

--- 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"
--- 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;
--- 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)
--- 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
--- 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.  */
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"