Include exec/memory.h slightly less

Drop unnecessary inclusions from headers.  Downgrade a few more to
exec/hwaddr.h.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20190812052359.30071-17-armbru@redhat.com>

diff --git a/hw/audio/lm4549.h b/hw/audio/lm4549.h
index 74c3ee89341a49172b45baf31997b885ae7f7183..aba9bb5b077c48895ea344dfe8496df94987b603 100644 (file)
--- 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 d0d31bad3db69af2d9a76fb8901040a8467fc50a..675429dc18bb7244e1f04f89fdfcfe57cc63b7ec 100644 (file)
--- 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 10e7f74c742ad6a5900d52570cf1279f685dfa75..74a77eb43b48c55ef62e61af5aa53a9c28ef6282 100644 (file)
--- 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 4731cbbd2a8b789021f6f893889fecb24189fdfc..220a622087fbc95c8fbce2b5014f089fe40bae38 100644 (file)
--- 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 7731b5acd1f689a3401fce3d3b4dbb11315a6577..a1a1046494cdf90c2d4f39986b5492ed94eeb90b 100644 (file)
--- 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 d50a3cccc01187712b76a8a10ff4f24ade0a7862..af7e8025e3c9e11506bb69dc3d43b7342179d962 100644 (file)
--- 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 350d4b049870eef8c9f2147dd680bde0735b4690..5714dea1a2298a79a3352419ef570eea8659851b 100644 (file)
--- 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 8003d45d1e51b7292d943b7f5db560257d56b833..706aef2e7e078b3f5ecccc89f5a3794423197295 100644 (file)
--- 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 7886291d54e7b0986c9398a992b82c592913e86c..e93a7499a804f4698758f73e936e5d75ff9853ee 100644 (file)
--- 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 1acaf7de80219cca8b9689fccbca5ea101d6a810..2136a2d5e4cd2bfde657f2dddcd3c96f17dea632 100644 (file)
--- 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 a71d1a53a5c03b73b2949ef5be53a5feec02692d..3a0be3131ac5fa1928715b4067c6d9130c833b25 100644 (file)
--- 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 d6dd62fb9f1c7859667e65a410b082c3fec06b70..0a23c0f57e05c93ee8cb97872e000813cb4d39c3 100644 (file)
--- 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 148a119a1db37f06c85800fd4fc8978dff42d3aa..1fd978dcc55c98ef8bf371e3f92348ac88099e83 100644 (file)
--- 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 c653ef717b5b5146994fb313adc295bcc068cb3e..f9263bf98a6357f70ea950121cd0f4155933541e 100644 (file)
--- 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 0401a3a292297056bcde56e1e939404d8081ed58..ca0003dbfd92e9a39bdf400d7aee5dedbfaffd40 100644 (file)
--- 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 e547008b178c96f3153f5e020f9611e7e43c5a1d..8e18358e6ac44ef91d7963343091be30fa9eae4f 100644 (file)
--- 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 fb55c444447771328b7e79dc3e3f00842a5f27af..0d74207efb5a8fbf129f3369dcba6ac980a853c9 100644 (file)
--- 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 0f96836bab186bec1f2ff7bb2d50fc126ea883da..15e2151b5054a9f2e90b19300943faebd02ac3e8 100644 (file)
--- 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 c15b44474805b9f1cdecc41d11f7ff6c10b233bc..ee0ca3dd515d8c83e8f9dcc8535bbb9dff30d695 100644 (file)
--- 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 1eb7b5cd6847a7a607395ae071dd447e611479b4..457aa98f81540623a7a985900cd7087433a9d84d 100644 (file)
--- 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 c21f41c8a9410c5c4e9d7aef0fa3d88450c3963b..96971a4c26ba6c0cc1be9f0afd219adb3774ab64 100644 (file)
--- 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 5da749e2b0282db2aedee9e6d2695c6b210fa0d2..e6a2a0a6e061254087aead6a1f2773ac0c905c06 100644 (file)
--- 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 9f84b1fa3c0fc30cef355aaa831101834906bc5a..0b5b62039168263e8c78cda2d739135a24412297 100644 (file)
--- 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 26f01d00f6957e2f80454288c4d21719f8c24952..a7882af67aa5bd5595fef0e19f3bdd171d85ada8 100644 (file)
--- 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 9faacacc9eb72c16f8212f678c9fc7fb63c0676b..56054d0a732db8d0f820a3a0712f68af2f2a1bd7 100644 (file)
--- 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 3036221ee826172eabd11c1d8e42f46325d8228e..b0e27b617427e8327dafe4d4ba7b55205bdd815f 100644 (file)
--- 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"