diff options
-rw-r--r-- | hw/audio/lm4549.h | 1 | ||||
-rw-r--r-- | hw/display/edid-region.c | 1 | ||||
-rw-r--r-- | hw/display/tc6393xb.c | 1 | ||||
-rw-r--r-- | hw/net/can/can_sja1000.h | 1 | ||||
-rw-r--r-- | hw/net/ne2000.c | 1 | ||||
-rw-r--r-- | hw/xtensa/xtensa_memory.h | 1 | ||||
-rw-r--r-- | include/hw/arm/boot.h | 1 | ||||
-rw-r--r-- | include/hw/arm/fsl-imx7.h | 1 | ||||
-rw-r--r-- | include/hw/arm/soc_dma.h | 2 | ||||
-rw-r--r-- | include/hw/block/flash.h | 2 | ||||
-rw-r--r-- | include/hw/boards.h | 1 | ||||
-rw-r--r-- | include/hw/char/parallel.h | 1 | ||||
-rw-r--r-- | include/hw/display/milkymist_tmu2.h | 1 | ||||
-rw-r--r-- | include/hw/display/tc6393xb.h | 2 | ||||
-rw-r--r-- | include/hw/display/vga.h | 2 | ||||
-rw-r--r-- | include/hw/hw.h | 1 | ||||
-rw-r--r-- | include/hw/i2c/pm_smbus.h | 1 | ||||
-rw-r--r-- | include/hw/i2c/smbus_eeprom.h | 1 | ||||
-rw-r--r-- | include/hw/misc/auxbus.h | 1 | ||||
-rw-r--r-- | include/hw/ppc/xics.h | 1 | ||||
-rw-r--r-- | include/hw/usb.h | 1 | ||||
-rw-r--r-- | include/hw/virtio/virtio.h | 1 | ||||
-rw-r--r-- | migration/colo.c | 1 | ||||
-rw-r--r-- | migration/migration.h | 1 | ||||
-rw-r--r-- | migration/postcopy-ram.c | 1 | ||||
-rw-r--r-- | migration/rdma.c | 1 |
26 files changed, 20 insertions, 10 deletions
diff --git a/hw/audio/lm4549.h b/hw/audio/lm4549.h index 74c3ee8934..aba9bb5b07 100644 --- a/hw/audio/lm4549.h +++ b/hw/audio/lm4549.h @@ -13,6 +13,7 @@ #define HW_LM4549_H #include "audio/audio.h" +#include "exec/hwaddr.h" typedef void (*lm4549_callback)(void *opaque); diff --git a/hw/display/edid-region.c b/hw/display/edid-region.c index d0d31bad3d..675429dc18 100644 --- a/hw/display/edid-region.c +++ b/hw/display/edid-region.c @@ -1,4 +1,5 @@ #include "qemu/osdep.h" +#include "exec/memory.h" #include "hw/display/edid.h" static uint64_t edid_region_read(void *ptr, hwaddr addr, unsigned size) diff --git a/hw/display/tc6393xb.c b/hw/display/tc6393xb.c index 10e7f74c74..74a77eb43b 100644 --- a/hw/display/tc6393xb.c +++ b/hw/display/tc6393xb.c @@ -17,6 +17,7 @@ #include "hw/hw.h" #include "hw/irq.h" #include "hw/display/tc6393xb.h" +#include "exec/memory.h" #include "hw/block/flash.h" #include "ui/console.h" #include "ui/pixel_ops.h" diff --git a/hw/net/can/can_sja1000.h b/hw/net/can/can_sja1000.h index 4731cbbd2a..220a622087 100644 --- a/hw/net/can/can_sja1000.h +++ b/hw/net/can/can_sja1000.h @@ -27,6 +27,7 @@ #ifndef HW_CAN_SJA1000_H #define HW_CAN_SJA1000_H +#include "exec/hwaddr.h" #include "net/can_emu.h" #define CAN_SJA_MEM_SIZE 128 diff --git a/hw/net/ne2000.c b/hw/net/ne2000.c index 7731b5acd1..a1a1046494 100644 --- a/hw/net/ne2000.c +++ b/hw/net/ne2000.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include "net/eth.h" #include "qemu/module.h" +#include "exec/memory.h" #include "hw/irq.h" #include "migration/vmstate.h" #include "ne2000.h" diff --git a/hw/xtensa/xtensa_memory.h b/hw/xtensa/xtensa_memory.h index d50a3cccc0..af7e8025e3 100644 --- a/hw/xtensa/xtensa_memory.h +++ b/hw/xtensa/xtensa_memory.h @@ -29,7 +29,6 @@ #define XTENSA_MEMORY_H #include "cpu.h" -#include "exec/memory.h" void xtensa_create_memory_regions(const XtensaMemory *memory, const char *name, diff --git a/include/hw/arm/boot.h b/include/hw/arm/boot.h index 350d4b0498..5714dea1a2 100644 --- a/include/hw/arm/boot.h +++ b/include/hw/arm/boot.h @@ -11,7 +11,6 @@ #ifndef HW_ARM_BOOT_H #define HW_ARM_BOOT_H -#include "exec/memory.h" #include "target/arm/cpu-qom.h" #include "qemu/notify.h" diff --git a/include/hw/arm/fsl-imx7.h b/include/hw/arm/fsl-imx7.h index 8003d45d1e..706aef2e7e 100644 --- a/include/hw/arm/fsl-imx7.h +++ b/include/hw/arm/fsl-imx7.h @@ -38,7 +38,6 @@ #include "hw/net/imx_fec.h" #include "hw/pci-host/designware.h" #include "hw/usb/chipidea.h" -#include "exec/memory.h" #include "cpu.h" #define TYPE_FSL_IMX7 "fsl,imx7" diff --git a/include/hw/arm/soc_dma.h b/include/hw/arm/soc_dma.h index 7886291d54..e93a7499a8 100644 --- a/include/hw/arm/soc_dma.h +++ b/include/hw/arm/soc_dma.h @@ -21,7 +21,7 @@ #ifndef HW_SOC_DMA_H #define HW_SOC_DMA_H -#include "exec/memory.h" +#include "exec/hwaddr.h" struct soc_dma_s; struct soc_dma_ch_s; diff --git a/include/hw/block/flash.h b/include/hw/block/flash.h index 1acaf7de80..2136a2d5e4 100644 --- a/include/hw/block/flash.h +++ b/include/hw/block/flash.h @@ -3,7 +3,7 @@ /* NOR flash devices */ -#include "exec/memory.h" +#include "exec/hwaddr.h" /* pflash_cfi01.c */ diff --git a/include/hw/boards.h b/include/hw/boards.h index a71d1a53a5..3a0be3131a 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -3,6 +3,7 @@ #ifndef HW_BOARDS_H #define HW_BOARDS_H +#include "exec/memory.h" #include "sysemu/blockdev.h" #include "sysemu/accel.h" #include "hw/qdev.h" diff --git a/include/hw/char/parallel.h b/include/hw/char/parallel.h index d6dd62fb9f..0a23c0f57e 100644 --- a/include/hw/char/parallel.h +++ b/include/hw/char/parallel.h @@ -1,7 +1,6 @@ #ifndef HW_PARALLEL_H #define HW_PARALLEL_H -#include "exec/memory.h" #include "hw/isa/isa.h" #include "chardev/char.h" diff --git a/include/hw/display/milkymist_tmu2.h b/include/hw/display/milkymist_tmu2.h index 148a119a1d..1fd978dcc5 100644 --- a/include/hw/display/milkymist_tmu2.h +++ b/include/hw/display/milkymist_tmu2.h @@ -27,6 +27,7 @@ #ifndef HW_DISPLAY_MILKYMIST_TMU2_H #define HW_DISPLAY_MILKYMIST_TMU2_H +#include "exec/hwaddr.h" #include "hw/qdev.h" #if defined(CONFIG_X11) && defined(CONFIG_OPENGL) diff --git a/include/hw/display/tc6393xb.h b/include/hw/display/tc6393xb.h index c653ef717b..f9263bf98a 100644 --- a/include/hw/display/tc6393xb.h +++ b/include/hw/display/tc6393xb.h @@ -12,8 +12,6 @@ #ifndef HW_DISPLAY_TC6393XB_H #define HW_DISPLAY_TC6393XB_H -#include "exec/memory.h" - typedef struct TC6393xbState TC6393xbState; TC6393xbState *tc6393xb_init(struct MemoryRegion *sysmem, diff --git a/include/hw/display/vga.h b/include/hw/display/vga.h index 0401a3a292..ca0003dbfd 100644 --- a/include/hw/display/vga.h +++ b/include/hw/display/vga.h @@ -9,7 +9,7 @@ #ifndef QEMU_HW_DISPLAY_VGA_H #define QEMU_HW_DISPLAY_VGA_H -#include "exec/memory.h" +#include "exec/hwaddr.h" enum vga_retrace_method { VGA_RETRACE_DUMB, diff --git a/include/hw/hw.h b/include/hw/hw.h index e547008b17..8e18358e6a 100644 --- a/include/hw/hw.h +++ b/include/hw/hw.h @@ -7,7 +7,6 @@ #endif #include "qom/object.h" -#include "exec/memory.h" void QEMU_NORETURN hw_error(const char *fmt, ...) GCC_FMT_ATTR(1, 2); diff --git a/include/hw/i2c/pm_smbus.h b/include/hw/i2c/pm_smbus.h index fb55c44444..0d74207efb 100644 --- a/include/hw/i2c/pm_smbus.h +++ b/include/hw/i2c/pm_smbus.h @@ -1,6 +1,7 @@ #ifndef PM_SMBUS_H #define PM_SMBUS_H +#include "exec/memory.h" #include "hw/i2c/smbus_master.h" #define PM_SMBUS_MAX_MSG_SIZE 32 diff --git a/include/hw/i2c/smbus_eeprom.h b/include/hw/i2c/smbus_eeprom.h index 0f96836bab..15e2151b50 100644 --- a/include/hw/i2c/smbus_eeprom.h +++ b/include/hw/i2c/smbus_eeprom.h @@ -23,6 +23,7 @@ #ifndef HW_SMBUS_EEPROM_H #define HW_SMBUS_EEPROM_H +#include "exec/cpu-common.h" #include "hw/i2c/i2c.h" void smbus_eeprom_init_one(I2CBus *bus, uint8_t address, uint8_t *eeprom_buf); diff --git a/include/hw/misc/auxbus.h b/include/hw/misc/auxbus.h index c15b444748..ee0ca3dd51 100644 --- a/include/hw/misc/auxbus.h +++ b/include/hw/misc/auxbus.h @@ -25,6 +25,7 @@ #ifndef HW_MISC_AUXBUS_H #define HW_MISC_AUXBUS_H +#include "exec/memory.h" #include "hw/qdev.h" typedef struct AUXBus AUXBus; diff --git a/include/hw/ppc/xics.h b/include/hw/ppc/xics.h index 1eb7b5cd68..457aa98f81 100644 --- a/include/hw/ppc/xics.h +++ b/include/hw/ppc/xics.h @@ -28,6 +28,7 @@ #ifndef XICS_H #define XICS_H +#include "exec/memory.h" #include "hw/qdev.h" #define XICS_IPI 0x2 diff --git a/include/hw/usb.h b/include/hw/usb.h index c21f41c8a9..96971a4c26 100644 --- a/include/hw/usb.h +++ b/include/hw/usb.h @@ -25,6 +25,7 @@ * THE SOFTWARE. */ +#include "exec/memory.h" #include "hw/qdev.h" #include "qemu/iov.h" #include "qemu/queue.h" diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h index 5da749e2b0..e6a2a0a6e0 100644 --- a/include/hw/virtio/virtio.h +++ b/include/hw/virtio/virtio.h @@ -14,6 +14,7 @@ #ifndef QEMU_VIRTIO_H #define QEMU_VIRTIO_H +#include "exec/memory.h" #include "hw/hw.h" #include "net/net.h" #include "hw/qdev.h" diff --git a/migration/colo.c b/migration/colo.c index 9f84b1fa3c..0b5b620391 100644 --- a/migration/colo.c +++ b/migration/colo.c @@ -23,6 +23,7 @@ #include "io/channel-buffer.h" #include "trace.h" #include "qemu/error-report.h" +#include "qemu/rcu.h" #include "migration/failover.h" #ifdef CONFIG_REPLICATION #include "replication.h" diff --git a/migration/migration.h b/migration/migration.h index 26f01d00f6..a7882af67a 100644 --- a/migration/migration.h +++ b/migration/migration.h @@ -14,6 +14,7 @@ #ifndef QEMU_MIGRATION_H #define QEMU_MIGRATION_H +#include "exec/cpu-common.h" #include "qapi/qapi-types-migration.h" #include "qemu/thread.h" #include "qemu/coroutine_int.h" diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c index 9faacacc9e..56054d0a73 100644 --- a/migration/postcopy-ram.c +++ b/migration/postcopy-ram.c @@ -25,6 +25,7 @@ #include "ram.h" #include "qapi/error.h" #include "qemu/notify.h" +#include "qemu/rcu.h" #include "sysemu/sysemu.h" #include "sysemu/balloon.h" #include "qemu/error-report.h" diff --git a/migration/rdma.c b/migration/rdma.c index 3036221ee8..b0e27b6174 100644 --- a/migration/rdma.c +++ b/migration/rdma.c @@ -25,6 +25,7 @@ #include "qemu/error-report.h" #include "qemu/main-loop.h" #include "qemu/module.h" +#include "qemu/rcu.h" #include "qemu/sockets.h" #include "qemu/bitmap.h" #include "qemu/coroutine.h" |