Remove '#include "exec/address-spaces.h"' is done by:
git grep -w "exec\/address-spaces.h" | cut -d: -f1 |
xargs sed -i '/exec\/address-spaces.h/d'
Signed-off-by: Xuebing Wang <xbi...@gmail.com>
---
arch_init.c | 1 -
cputlb.c | 1 -
exec.c | 1 -
hw/acpi/ich9.c | 1 -
hw/acpi/pcihp.c | 1 -
hw/acpi/piix4.c | 1 -
hw/alpha/typhoon.c | 1 -
hw/arm/boot.c | 1 -
hw/arm/collie.c | 1 -
hw/arm/digic_boards.c | 1 -
hw/arm/exynos4_boards.c | 1 -
hw/arm/gumstix.c | 1 -
hw/arm/highbank.c | 1 -
hw/arm/integratorcp.c | 1 -
hw/arm/kzm.c | 1 -
hw/arm/mainstone.c | 1 -
hw/arm/musicpal.c | 1 -
hw/arm/nseries.c | 1 -
hw/arm/omap_sx1.c | 1 -
hw/arm/palm.c | 1 -
hw/arm/realview.c | 1 -
hw/arm/spitz.c | 1 -
hw/arm/stellaris.c | 1 -
hw/arm/tosa.c | 1 -
hw/arm/versatilepb.c | 1 -
hw/arm/vexpress.c | 1 -
hw/arm/virt.c | 1 -
hw/arm/xilinx_zynq.c | 1 -
hw/arm/z2.c | 1 -
hw/block/onenand.c | 1 -
hw/block/pflash_cfi01.c | 1 -
hw/block/pflash_cfi02.c | 1 -
hw/char/mcf_uart.c | 1 -
hw/char/omap_uart.c | 1 -
hw/char/serial.c | 1 -
hw/char/sh_serial.c | 1 -
hw/core/loader.c | 1 -
hw/core/sysbus.c | 1 -
hw/cris/axis_dev88.c | 1 -
hw/display/sm501.c | 1 -
hw/dma/etraxfs_dma.c | 1 -
hw/dma/pl080.c | 1 -
hw/dma/sun4m_iommu.c | 1 -
hw/i386/pc.c | 1 -
hw/i386/pc_piix.c | 1 -
hw/i386/pc_q35.c | 1 -
hw/intc/armv7m_nvic.c | 1 -
hw/intc/openpic_kvm.c | 1 -
hw/isa/isa-bus.c | 1 -
hw/isa/lpc_ich9.c | 1 -
hw/isa/vt82c686.c | 1 -
hw/lm32/lm32_boards.c | 1 -
hw/lm32/milkymist.c | 1 -
hw/m68k/an5206.c | 1 -
hw/m68k/dummy_m68k.c | 1 -
hw/m68k/mcf5206.c | 1 -
hw/m68k/mcf5208.c | 1 -
hw/m68k/mcf_intc.c | 1 -
hw/microblaze/petalogix_ml605_mmu.c | 1 -
hw/microblaze/petalogix_s3adsp1800_mmu.c | 1 -
hw/mips/gt64xxx_pci.c | 1 -
hw/mips/mips_fulong2e.c | 1 -
hw/mips/mips_jazz.c | 1 -
hw/mips/mips_malta.c | 1 -
hw/mips/mips_mipssim.c | 1 -
hw/mips/mips_r4k.c | 1 -
hw/misc/arm_integrator_debug.c | 1 -
hw/misc/omap_gpmc.c | 1 -
hw/misc/vfio.c | 1 -
hw/moxie/moxiesim.c | 1 -
hw/net/mcf_fec.c | 1 -
hw/net/ne2000-isa.c | 1 -
hw/openrisc/openrisc_sim.c | 1 -
hw/pci-host/apb.c | 1 -
hw/pci-host/bonito.c | 1 -
hw/pci-host/ppce500.c | 1 -
hw/pci-host/prep.c | 1 -
hw/pci-host/versatile.c | 1 -
hw/pci/pci.c | 1 -
hw/pci/pcie_host.c | 1 -
hw/ppc/e500.c | 1 -
hw/ppc/mac_newworld.c | 1 -
hw/ppc/mac_oldworld.c | 1 -
hw/ppc/ppc405_boards.c | 1 -
hw/ppc/ppc405_uc.c | 1 -
hw/ppc/ppc440_bamboo.c | 1 -
hw/ppc/ppc4xx_devs.c | 1 -
hw/ppc/ppc4xx_pci.c | 1 -
hw/ppc/prep.c | 1 -
hw/ppc/spapr.c | 1 -
hw/ppc/spapr_iommu.c | 1 -
hw/ppc/spapr_pci.c | 1 -
hw/ppc/virtex_ml507.c | 1 -
hw/s390x/css.c | 1 -
hw/s390x/s390-virtio-ccw.c | 1 -
hw/s390x/s390-virtio.c | 1 -
hw/sh4/r2d.c | 1 -
hw/sh4/sh7750.c | 1 -
hw/sh4/sh_pci.c | 1 -
hw/sh4/shix.c | 1 -
hw/sparc/leon3.c | 1 -
hw/sparc64/sun4u.c | 1 -
hw/timer/m48t59.c | 1 -
hw/timer/sh_timer.c | 1 -
hw/tpm/tpm_tis.c | 1 -
hw/unicore32/puv3.c | 1 -
hw/virtio/dataplane/vring.c | 1 -
hw/virtio/vhost.c | 1 -
hw/virtio/virtio-balloon.c | 1 -
hw/virtio/virtio.c | 1 -
hw/xen/xen_platform.c | 1 -
hw/xen/xen_pt.c | 1 -
hw/xtensa/xtensa_lx60.c | 1 -
hw/xtensa/xtensa_sim.c | 1 -
include/exec/address-spaces.h | 12 ------------
include/exec/softmmu_template.h | 1 -
include/hw/arm/allwinner-a10.h | 1 -
include/hw/sh4/sh_intc.h | 1 -
include/sysemu/dma.h | 1 -
ioport.c | 1 -
kvm-all.c | 1 -
memory.c | 1 -
memory_mapping.c | 1 -
target-sparc/mmu_helper.c | 1 -
target-xtensa/op_helper.c | 1 -
translate-all.c | 1 -
xen-all.c | 1 -
127 files changed, 138 deletions(-)
delete mode 100644 include/exec/address-spaces.h
diff --git a/arch_init.c b/arch_init.c
index 76e8630..a6d44b5 100644
--- a/arch_init.c
+++ b/arch_init.c
@@ -41,7 +41,6 @@
#include "sysemu/kvm.h"
#include "migration/migration.h"
#include "hw/i386/smbios.h"
-#include "exec/address-spaces.h"
#include "hw/audio/pcspk.h"
#include "migration/page_cache.h"
#include "qemu/config-file.h"
diff --git a/cputlb.c b/cputlb.c
index 3c6cb16..724bdda 100644
--- a/cputlb.c
+++ b/cputlb.c
@@ -25,7 +25,6 @@
#include "config.h"
#include "exec/exec-all.h"
#include "exec/memory.h"
-#include "exec/address-spaces.h"
#include "exec/cputlb.h"
diff --git a/exec.c b/exec.c
index 3df2ffc..ffbd26c 100644
--- a/exec.c
+++ b/exec.c
@@ -36,7 +36,6 @@
#include "qemu/config-file.h"
#include "exec/memory.h"
#include "sysemu/dma.h"
-#include "exec/address-spaces.h"
#if defined(CONFIG_USER_ONLY)
#include <qemu.h>
#else /* !CONFIG_USER_ONLY */
diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c
index 0afac42..644c6fe 100644
--- a/hw/acpi/ich9.c
+++ b/hw/acpi/ich9.c
@@ -31,7 +31,6 @@
#include "sysemu/sysemu.h"
#include "hw/acpi/acpi.h"
#include "sysemu/kvm.h"
-#include "exec/address-spaces.h"
#include "hw/i386/ich9.h"
diff --git a/hw/acpi/pcihp.c b/hw/acpi/pcihp.c
index f80c480..e62d5d0 100644
--- a/hw/acpi/pcihp.c
+++ b/hw/acpi/pcihp.c
@@ -33,7 +33,6 @@
#include "sysemu/sysemu.h"
#include "qemu/range.h"
#include "exec/ioport.h"
-#include "exec/address-spaces.h"
#include "hw/pci/pci_bus.h"
#include "qom/qom-qobject.h"
#include "qapi/qmp/qint.h"
diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c
index 67dc075..82ddbfd 100644
--- a/hw/acpi/piix4.c
+++ b/hw/acpi/piix4.c
@@ -28,7 +28,6 @@
#include "qemu/range.h"
#include "exec/ioport.h"
#include "hw/nvram/fw_cfg.h"
-#include "exec/address-spaces.h"
#include "hw/acpi/piix4.h"
#include "hw/acpi/pcihp.h"
#include "hw/acpi/cpu_hotplug.h"
diff --git a/hw/alpha/typhoon.c b/hw/alpha/typhoon.c
index 67a1070..89c42a8 100644
--- a/hw/alpha/typhoon.c
+++ b/hw/alpha/typhoon.c
@@ -11,7 +11,6 @@
#include "hw/devices.h"
#include "sysemu/sysemu.h"
#include "alpha_sys.h"
-#include "exec/address-spaces.h"
#define TYPE_TYPHOON_PCI_HOST_BRIDGE "typhoon-pcihost"
diff --git a/hw/arm/boot.c b/hw/arm/boot.c
index dc62918..96609a0 100644
--- a/hw/arm/boot.c
+++ b/hw/arm/boot.c
@@ -16,7 +16,6 @@
#include "elf.h"
#include "sysemu/device_tree.h"
#include "qemu/config-file.h"
-#include "exec/address-spaces.h"
/* Kernel boot protocol is specified in the kernel docs
* Documentation/arm/Booting and Documentation/arm64/booting.txt
diff --git a/hw/arm/collie.c b/hw/arm/collie.c
index 8878b0e..867b47b 100644
--- a/hw/arm/collie.c
+++ b/hw/arm/collie.c
@@ -16,7 +16,6 @@
#include "hw/arm/arm.h"
#include "hw/block/flash.h"
#include "sysemu/blockdev.h"
-#include "exec/address-spaces.h"
static struct arm_boot_info collie_binfo = {
.loader_start = SA_SDCS0,
diff --git a/hw/arm/digic_boards.c b/hw/arm/digic_boards.c
index 32fc30a..9c28137 100644
--- a/hw/arm/digic_boards.c
+++ b/hw/arm/digic_boards.c
@@ -24,7 +24,6 @@
*/
#include "hw/boards.h"
-#include "exec/address-spaces.h"
#include "qemu/error-report.h"
#include "hw/arm/digic.h"
#include "hw/block/flash.h"
diff --git a/hw/arm/exynos4_boards.c b/hw/arm/exynos4_boards.c
index 26cedec..73df49e 100644
--- a/hw/arm/exynos4_boards.c
+++ b/hw/arm/exynos4_boards.c
@@ -26,7 +26,6 @@
#include "hw/sysbus.h"
#include "net/net.h"
#include "hw/arm/arm.h"
-#include "exec/address-spaces.h"
#include "hw/arm/exynos4210.h"
#include "hw/boards.h"
diff --git a/hw/arm/gumstix.c b/hw/arm/gumstix.c
index aeea172..1b5e9af 100644
--- a/hw/arm/gumstix.c
+++ b/hw/arm/gumstix.c
@@ -41,7 +41,6 @@
#include "hw/devices.h"
#include "hw/boards.h"
#include "sysemu/blockdev.h"
-#include "exec/address-spaces.h"
#include "sysemu/qtest.h"
static const int sector_len = 128 * 1024;
diff --git a/hw/arm/highbank.c b/hw/arm/highbank.c
index f66d57b..6210c31 100644
--- a/hw/arm/highbank.c
+++ b/hw/arm/highbank.c
@@ -25,7 +25,6 @@
#include "sysemu/sysemu.h"
#include "hw/boards.h"
#include "sysemu/blockdev.h"
-#include "exec/address-spaces.h"
#include "qemu/error-report.h"
#define SMP_BOOT_ADDR 0x100
diff --git a/hw/arm/integratorcp.c b/hw/arm/integratorcp.c
index a759689..b4c1f40 100644
--- a/hw/arm/integratorcp.c
+++ b/hw/arm/integratorcp.c
@@ -13,7 +13,6 @@
#include "hw/arm/arm.h"
#include "hw/misc/arm_integrator_debug.h"
#include "net/net.h"
-#include "exec/address-spaces.h"
#include "sysemu/sysemu.h"
#define TYPE_INTEGRATOR_CM "integrator_core"
diff --git a/hw/arm/kzm.c b/hw/arm/kzm.c
index 99d33cb..1c78be9 100644
--- a/hw/arm/kzm.c
+++ b/hw/arm/kzm.c
@@ -14,7 +14,6 @@
*/
#include "hw/sysbus.h"
-#include "exec/address-spaces.h"
#include "hw/hw.h"
#include "hw/arm/arm.h"
#include "hw/devices.h"
diff --git a/hw/arm/mainstone.c b/hw/arm/mainstone.c
index d8e075e..a97114b 100644
--- a/hw/arm/mainstone.c
+++ b/hw/arm/mainstone.c
@@ -20,7 +20,6 @@
#include "hw/block/flash.h"
#include "sysemu/blockdev.h"
#include "hw/sysbus.h"
-#include "exec/address-spaces.h"
#include "sysemu/qtest.h"
/* Device addresses */
diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c
index cce7127..ca69e4c 100644
--- a/hw/arm/musicpal.c
+++ b/hw/arm/musicpal.c
@@ -23,7 +23,6 @@
#include "ui/console.h"
#include "hw/i2c/i2c.h"
#include "sysemu/blockdev.h"
-#include "exec/address-spaces.h"
#include "ui/pixel_ops.h"
#define MP_MISC_BASE 0x80002000
diff --git a/hw/arm/nseries.c b/hw/arm/nseries.c
index c28f895..25d535f 100644
--- a/hw/arm/nseries.c
+++ b/hw/arm/nseries.c
@@ -33,7 +33,6 @@
#include "hw/loader.h"
#include "sysemu/blockdev.h"
#include "hw/sysbus.h"
-#include "exec/address-spaces.h"
/* Nokia N8x0 support */
struct n800_s {
diff --git a/hw/arm/omap_sx1.c b/hw/arm/omap_sx1.c
index 3ba263a..81e93b1 100644
--- a/hw/arm/omap_sx1.c
+++ b/hw/arm/omap_sx1.c
@@ -33,7 +33,6 @@
#include "hw/block/flash.h"
#include "sysemu/blockdev.h"
#include "sysemu/qtest.h"
-#include "exec/address-spaces.h"
/*****************************************************************************/
/* Siemens SX1 Cellphone V1 */
diff --git a/hw/arm/palm.c b/hw/arm/palm.c
index fac4f69..dad4255 100644
--- a/hw/arm/palm.c
+++ b/hw/arm/palm.c
@@ -26,7 +26,6 @@
#include "hw/arm/arm.h"
#include "hw/devices.h"
#include "hw/loader.h"
-#include "exec/address-spaces.h"
static uint32_t static_readb(void *opaque, hwaddr offset)
{
diff --git a/hw/arm/realview.c b/hw/arm/realview.c
index 6ef7646..a1d8344 100644
--- a/hw/arm/realview.c
+++ b/hw/arm/realview.c
@@ -17,7 +17,6 @@
#include "hw/boards.h"
#include "hw/i2c/i2c.h"
#include "sysemu/blockdev.h"
-#include "exec/address-spaces.h"
#define SMP_BOOT_ADDR 0xe0000000
#define SMP_BOOTREG_ADDR 0x10000030
diff --git a/hw/arm/spitz.c b/hw/arm/spitz.c
index 2decff1..66ee98b 100644
--- a/hw/arm/spitz.c
+++ b/hw/arm/spitz.c
@@ -27,7 +27,6 @@
#include "hw/boards.h"
#include "sysemu/blockdev.h"
#include "hw/sysbus.h"
-#include "exec/address-spaces.h"
#undef REG_FMT
#define REG_FMT "0x%02lx"
diff --git a/hw/arm/stellaris.c b/hw/arm/stellaris.c
index d6cc77b..77d3865 100644
--- a/hw/arm/stellaris.c
+++ b/hw/arm/stellaris.c
@@ -15,7 +15,6 @@
#include "hw/i2c/i2c.h"
#include "net/net.h"
#include "hw/boards.h"
-#include "exec/address-spaces.h"
#define GPIO_A 0
#define GPIO_B 1
diff --git a/hw/arm/tosa.c b/hw/arm/tosa.c
index 2069f55..7389b53 100644
--- a/hw/arm/tosa.c
+++ b/hw/arm/tosa.c
@@ -23,7 +23,6 @@
#include "hw/ssi.h"
#include "sysemu/blockdev.h"
#include "hw/sysbus.h"
-#include "exec/address-spaces.h"
#define TOSA_RAM 0x04000000
#define TOSA_ROM 0x00800000
diff --git a/hw/arm/versatilepb.c b/hw/arm/versatilepb.c
index e5493b4..dd44d2b 100644
--- a/hw/arm/versatilepb.c
+++ b/hw/arm/versatilepb.c
@@ -16,7 +16,6 @@
#include "hw/i2c/i2c.h"
#include "hw/boards.h"
#include "sysemu/blockdev.h"
-#include "exec/address-spaces.h"
#include "hw/block/flash.h"
#define VERSATILE_FLASH_ADDR 0x34000000
diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c
index ef1707a..ae5a120 100644
--- a/hw/arm/vexpress.c
+++ b/hw/arm/vexpress.c
@@ -28,7 +28,6 @@
#include "net/net.h"
#include "sysemu/sysemu.h"
#include "hw/boards.h"
-#include "exec/address-spaces.h"
#include "sysemu/blockdev.h"
#include "hw/block/flash.h"
#include "sysemu/device_tree.h"
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 517f2fe..ab0165a 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -37,7 +37,6 @@
#include "sysemu/sysemu.h"
#include "sysemu/kvm.h"
#include "hw/boards.h"
-#include "exec/address-spaces.h"
#include "qemu/bitops.h"
#include "qemu/error-report.h"
diff --git a/hw/arm/xilinx_zynq.c b/hw/arm/xilinx_zynq.c
index 9ee21e7..32a4e1f 100644
--- a/hw/arm/xilinx_zynq.c
+++ b/hw/arm/xilinx_zynq.c
@@ -18,7 +18,6 @@
#include "hw/sysbus.h"
#include "hw/arm/arm.h"
#include "net/net.h"
-#include "exec/address-spaces.h"
#include "sysemu/sysemu.h"
#include "hw/boards.h"
#include "hw/block/flash.h"
diff --git a/hw/arm/z2.c b/hw/arm/z2.c
index 67c1be8..1cf4152 100644
--- a/hw/arm/z2.c
+++ b/hw/arm/z2.c
@@ -23,7 +23,6 @@
#include "sysemu/blockdev.h"
#include "ui/console.h"
#include "audio/audio.h"
-#include "exec/address-spaces.h"
#include "sysemu/qtest.h"
#ifdef DEBUG_Z2
diff --git a/hw/block/onenand.c b/hw/block/onenand.c
index aae9ee7..86068b0 100644
--- a/hw/block/onenand.c
+++ b/hw/block/onenand.c
@@ -24,7 +24,6 @@
#include "hw/irq.h"
#include "sysemu/blockdev.h"
#include "exec/memory.h"
-#include "exec/address-spaces.h"
#include "hw/sysbus.h"
#include "qemu/error-report.h"
diff --git a/hw/block/pflash_cfi01.c b/hw/block/pflash_cfi01.c
index 0c95d53..ae87e54 100644
--- a/hw/block/pflash_cfi01.c
+++ b/hw/block/pflash_cfi01.c
@@ -41,7 +41,6 @@
#include "block/block.h"
#include "qemu/timer.h"
#include "qemu/bitops.h"
-#include "exec/address-spaces.h"
#include "qemu/host-utils.h"
#include "hw/sysbus.h"
diff --git a/hw/block/pflash_cfi02.c b/hw/block/pflash_cfi02.c
index 8d4b828..986ba91 100644
--- a/hw/block/pflash_cfi02.c
+++ b/hw/block/pflash_cfi02.c
@@ -39,7 +39,6 @@
#include "hw/block/flash.h"
#include "qemu/timer.h"
#include "block/block.h"
-#include "exec/address-spaces.h"
#include "qemu/host-utils.h"
#include "hw/sysbus.h"
diff --git a/hw/char/mcf_uart.c b/hw/char/mcf_uart.c
index 98fd44e..5457f12 100644
--- a/hw/char/mcf_uart.c
+++ b/hw/char/mcf_uart.c
@@ -8,7 +8,6 @@
#include "hw/hw.h"
#include "hw/m68k/mcf.h"
#include "sysemu/char.h"
-#include "exec/address-spaces.h"
typedef struct {
MemoryRegion iomem;
diff --git a/hw/char/omap_uart.c b/hw/char/omap_uart.c
index 0b91693..8dee1be 100644
--- a/hw/char/omap_uart.c
+++ b/hw/char/omap_uart.c
@@ -21,7 +21,6 @@
#include "hw/hw.h"
#include "hw/arm/omap.h"
#include "hw/char/serial.h"
-#include "exec/address-spaces.h"
/* UARTs */
struct omap_uart_s {
diff --git a/hw/char/serial.c b/hw/char/serial.c
index 6d3b5af..3be462b 100644
--- a/hw/char/serial.c
+++ b/hw/char/serial.c
@@ -26,7 +26,6 @@
#include "hw/char/serial.h"
#include "sysemu/char.h"
#include "qemu/timer.h"
-#include "exec/address-spaces.h"
#include "qemu/error-report.h"
//#define DEBUG_SERIAL
diff --git a/hw/char/sh_serial.c b/hw/char/sh_serial.c
index 9328dd1..92dac4b 100644
--- a/hw/char/sh_serial.c
+++ b/hw/char/sh_serial.c
@@ -27,7 +27,6 @@
#include "hw/hw.h"
#include "hw/sh4/sh.h"
#include "sysemu/char.h"
-#include "exec/address-spaces.h"
//#define DEBUG_SERIAL
diff --git a/hw/core/loader.c b/hw/core/loader.c
index e1c3f3a..932f2d5 100644
--- a/hw/core/loader.c
+++ b/hw/core/loader.c
@@ -50,7 +50,6 @@
#include "hw/loader.h"
#include "hw/nvram/fw_cfg.h"
#include "exec/memory.h"
-#include "exec/address-spaces.h"
#include <zlib.h>
diff --git a/hw/core/sysbus.c b/hw/core/sysbus.c
index f4e760d..55994e4 100644
--- a/hw/core/sysbus.c
+++ b/hw/core/sysbus.c
@@ -19,7 +19,6 @@
#include "hw/sysbus.h"
#include "monitor/monitor.h"
-#include "exec/address-spaces.h"
static void sysbus_dev_print(Monitor *mon, DeviceState *dev, int indent);
static char *sysbus_get_fw_dev_path(DeviceState *dev);
diff --git a/hw/cris/axis_dev88.c b/hw/cris/axis_dev88.c
index 645e45c..a3a51e8 100644
--- a/hw/cris/axis_dev88.c
+++ b/hw/cris/axis_dev88.c
@@ -31,7 +31,6 @@
#include "elf.h"
#include "boot.h"
#include "sysemu/blockdev.h"
-#include "exec/address-spaces.h"
#include "sysemu/qtest.h"
#define D(x)
diff --git a/hw/display/sm501.c b/hw/display/sm501.c
index 0b5f993..c75d6ac 100644
--- a/hw/display/sm501.c
+++ b/hw/display/sm501.c
@@ -30,7 +30,6 @@
#include "hw/sysbus.h"
#include "qemu/range.h"
#include "ui/pixel_ops.h"
-#include "exec/address-spaces.h"
/*
* Status: 2010/05/07
diff --git a/hw/dma/etraxfs_dma.c b/hw/dma/etraxfs_dma.c
index 3599513..fed9994 100644
--- a/hw/dma/etraxfs_dma.c
+++ b/hw/dma/etraxfs_dma.c
@@ -24,7 +24,6 @@
#include <stdio.h>
#include <sys/time.h>
#include "hw/hw.h"
-#include "exec/address-spaces.h"
#include "qemu-common.h"
#include "sysemu/sysemu.h"
diff --git a/hw/dma/pl080.c b/hw/dma/pl080.c
index 741dd20..53695f3 100644
--- a/hw/dma/pl080.c
+++ b/hw/dma/pl080.c
@@ -8,7 +8,6 @@
*/
#include "hw/sysbus.h"
-#include "exec/address-spaces.h"
#define PL080_MAX_CHANNELS 8
#define PL080_CONF_E 0x1
diff --git a/hw/dma/sun4m_iommu.c b/hw/dma/sun4m_iommu.c
index 899d454..33fb033 100644
--- a/hw/dma/sun4m_iommu.c
+++ b/hw/dma/sun4m_iommu.c
@@ -24,7 +24,6 @@
#include "hw/sparc/sun4m.h"
#include "hw/sysbus.h"
-#include "exec/address-spaces.h"
#include "trace.h"
/*
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index e715a33..1482e2f 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -48,7 +48,6 @@
#include "hw/block/block.h"
#include "ui/qemu-spice.h"
#include "exec/memory.h"
-#include "exec/address-spaces.h"
#include "sysemu/arch_init.h"
#include "qemu/bitmap.h"
#include "qemu/config-file.h"
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index d5dc1ef..89f4456 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -45,7 +45,6 @@
#include "hw/i2c/smbus.h"
#include "hw/xen/xen.h"
#include "exec/memory.h"
-#include "exec/address-spaces.h"
#include "hw/acpi/acpi.h"
#include "cpu.h"
#ifdef CONFIG_XEN
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index a7f6260..203d5f2 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -37,7 +37,6 @@
#include "sysemu/kvm.h"
#include "hw/kvm/clock.h"
#include "hw/pci-host/q35.h"
-#include "exec/address-spaces.h"
#include "hw/i386/ich9.h"
#include "hw/i386/smbios.h"
#include "hw/ide/pci.h"
diff --git a/hw/intc/armv7m_nvic.c b/hw/intc/armv7m_nvic.c
index 6066fa6..6558020 100644
--- a/hw/intc/armv7m_nvic.c
+++ b/hw/intc/armv7m_nvic.c
@@ -13,7 +13,6 @@
#include "hw/sysbus.h"
#include "qemu/timer.h"
#include "hw/arm/arm.h"
-#include "exec/address-spaces.h"
#include "gic_internal.h"
typedef struct {
diff --git a/hw/intc/openpic_kvm.c b/hw/intc/openpic_kvm.c
index c7f7b84..98e69a2 100644
--- a/hw/intc/openpic_kvm.c
+++ b/hw/intc/openpic_kvm.c
@@ -23,7 +23,6 @@
*/
#include <sys/ioctl.h>
-#include "exec/address-spaces.h"
#include "hw/hw.h"
#include "hw/ppc/openpic.h"
#include "hw/pci/msi.h"
diff --git a/hw/isa/isa-bus.c b/hw/isa/isa-bus.c
index 55d0100..052fd84 100644
--- a/hw/isa/isa-bus.c
+++ b/hw/isa/isa-bus.c
@@ -21,7 +21,6 @@
#include "hw/sysbus.h"
#include "sysemu/sysemu.h"
#include "hw/isa/isa.h"
-#include "exec/address-spaces.h"
static ISABus *isabus;
hwaddr isa_mem_base = 0;
diff --git a/hw/isa/lpc_ich9.c b/hw/isa/lpc_ich9.c
index 51ce12d..e08b843 100644
--- a/hw/isa/lpc_ich9.c
+++ b/hw/isa/lpc_ich9.c
@@ -43,7 +43,6 @@
#include "hw/acpi/acpi.h"
#include "hw/acpi/ich9.h"
#include "hw/pci/pci_bus.h"
-#include "exec/address-spaces.h"
#include "sysemu/sysemu.h"
static int ich9_lpc_sci_irq(ICH9LPCState *lpc);
diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c
index 1a93afd..4373e18 100644
--- a/hw/isa/vt82c686.c
+++ b/hw/isa/vt82c686.c
@@ -24,7 +24,6 @@
#include "hw/i2c/pm_smbus.h"
#include "sysemu/sysemu.h"
#include "qemu/timer.h"
-#include "exec/address-spaces.h"
//#define DEBUG_VT82C686B
diff --git a/hw/lm32/lm32_boards.c b/hw/lm32/lm32_boards.c
index 5e22e9b..aad7527 100644
--- a/hw/lm32/lm32_boards.c
+++ b/hw/lm32/lm32_boards.c
@@ -27,7 +27,6 @@
#include "elf.h"
#include "lm32_hwsetup.h"
#include "lm32.h"
-#include "exec/address-spaces.h"
typedef struct {
LM32CPU *cpu;
diff --git a/hw/lm32/milkymist.c b/hw/lm32/milkymist.c
index baf234c..27de8e8 100644
--- a/hw/lm32/milkymist.c
+++ b/hw/lm32/milkymist.c
@@ -29,7 +29,6 @@
#include "sysemu/blockdev.h"
#include "milkymist-hw.h"
#include "lm32.h"
-#include "exec/address-spaces.h"
#define BIOS_FILENAME "mmone-bios.bin"
#define BIOS_OFFSET 0x00860000
diff --git a/hw/m68k/an5206.c b/hw/m68k/an5206.c
index 24f2068..4800d3f 100644
--- a/hw/m68k/an5206.c
+++ b/hw/m68k/an5206.c
@@ -11,7 +11,6 @@
#include "hw/boards.h"
#include "hw/loader.h"
#include "elf.h"
-#include "exec/address-spaces.h"
#include "sysemu/qtest.h"
#define KERNEL_LOAD_ADDR 0x10000
diff --git a/hw/m68k/dummy_m68k.c b/hw/m68k/dummy_m68k.c
index 86e2e6e..b8e04e3 100644
--- a/hw/m68k/dummy_m68k.c
+++ b/hw/m68k/dummy_m68k.c
@@ -10,7 +10,6 @@
#include "hw/boards.h"
#include "hw/loader.h"
#include "elf.h"
-#include "exec/address-spaces.h"
#define KERNEL_LOAD_ADDR 0x10000
diff --git a/hw/m68k/mcf5206.c b/hw/m68k/mcf5206.c
index 1727a46..8b185b0 100644
--- a/hw/m68k/mcf5206.c
+++ b/hw/m68k/mcf5206.c
@@ -10,7 +10,6 @@
#include "qemu/timer.h"
#include "hw/ptimer.h"
#include "sysemu/sysemu.h"
-#include "exec/address-spaces.h"
/* General purpose timer module. */
typedef struct {
diff --git a/hw/m68k/mcf5208.c b/hw/m68k/mcf5208.c
index 6e30c0b..12b2115 100644
--- a/hw/m68k/mcf5208.c
+++ b/hw/m68k/mcf5208.c
@@ -15,7 +15,6 @@
#include "hw/boards.h"
#include "hw/loader.h"
#include "elf.h"
-#include "exec/address-spaces.h"
#define SYS_FREQ 66000000
diff --git a/hw/m68k/mcf_intc.c b/hw/m68k/mcf_intc.c
index 621423c..a931f02 100644
--- a/hw/m68k/mcf_intc.c
+++ b/hw/m68k/mcf_intc.c
@@ -7,7 +7,6 @@
*/
#include "hw/hw.h"
#include "hw/m68k/mcf.h"
-#include "exec/address-spaces.h"
typedef struct {
MemoryRegion iomem;
diff --git a/hw/microblaze/petalogix_ml605_mmu.c
b/hw/microblaze/petalogix_ml605_mmu.c
index 40a9f5c..c3d9cad 100644
--- a/hw/microblaze/petalogix_ml605_mmu.c
+++ b/hw/microblaze/petalogix_ml605_mmu.c
@@ -34,7 +34,6 @@
#include "hw/boards.h"
#include "sysemu/blockdev.h"
#include "hw/char/serial.h"
-#include "exec/address-spaces.h"
#include "hw/ssi.h"
#include "boot.h"
diff --git a/hw/microblaze/petalogix_s3adsp1800_mmu.c
b/hw/microblaze/petalogix_s3adsp1800_mmu.c
index 6c45e20..4d9115d 100644
--- a/hw/microblaze/petalogix_s3adsp1800_mmu.c
+++ b/hw/microblaze/petalogix_s3adsp1800_mmu.c
@@ -31,7 +31,6 @@
#include "hw/devices.h"
#include "hw/boards.h"
#include "sysemu/blockdev.h"
-#include "exec/address-spaces.h"
#include "boot.h"
diff --git a/hw/mips/gt64xxx_pci.c b/hw/mips/gt64xxx_pci.c
index 6398514..3fc7bf2 100644
--- a/hw/mips/gt64xxx_pci.c
+++ b/hw/mips/gt64xxx_pci.c
@@ -27,7 +27,6 @@
#include "hw/pci/pci.h"
#include "hw/pci/pci_host.h"
#include "hw/i386/pc.h"
-#include "exec/address-spaces.h"
//#define DEBUG
diff --git a/hw/mips/mips_fulong2e.c b/hw/mips/mips_fulong2e.c
index e1551aa..23a673c 100644
--- a/hw/mips/mips_fulong2e.c
+++ b/hw/mips/mips_fulong2e.c
@@ -42,7 +42,6 @@
#include "hw/timer/mc146818rtc.h"
#include "hw/timer/i8254.h"
#include "sysemu/blockdev.h"
-#include "exec/address-spaces.h"
#include "sysemu/qtest.h"
#include "qemu/error-report.h"
diff --git a/hw/mips/mips_jazz.c b/hw/mips/mips_jazz.c
index 5f6dd9f..66fad2e 100644
--- a/hw/mips/mips_jazz.c
+++ b/hw/mips/mips_jazz.c
@@ -41,7 +41,6 @@
#include "hw/audio/pcspk.h"
#include "sysemu/blockdev.h"
#include "hw/sysbus.h"
-#include "exec/address-spaces.h"
#include "sysemu/qtest.h"
#include "qemu/error-report.h"
diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c
index ac5ec44..dea12b0 100644
--- a/hw/mips/mips_malta.c
+++ b/hw/mips/mips_malta.c
@@ -45,7 +45,6 @@
#include "hw/timer/mc146818rtc.h"
#include "hw/timer/i8254.h"
#include "sysemu/blockdev.h"
-#include "exec/address-spaces.h"
#include "hw/sysbus.h" /* SysBusDevice */
#include "qemu/host-utils.h"
#include "sysemu/qtest.h"
diff --git a/hw/mips/mips_mipssim.c b/hw/mips/mips_mipssim.c
index 239aa6a..8524c99 100644
--- a/hw/mips/mips_mipssim.c
+++ b/hw/mips/mips_mipssim.c
@@ -36,7 +36,6 @@
#include "hw/loader.h"
#include "elf.h"
#include "hw/sysbus.h"
-#include "exec/address-spaces.h"
#include "qemu/error-report.h"
#include "sysemu/qtest.h"
diff --git a/hw/mips/mips_r4k.c b/hw/mips/mips_r4k.c
index e94b543..f9967c4 100644
--- a/hw/mips/mips_r4k.c
+++ b/hw/mips/mips_r4k.c
@@ -25,7 +25,6 @@
#include "hw/timer/mc146818rtc.h"
#include "hw/timer/i8254.h"
#include "sysemu/blockdev.h"
-#include "exec/address-spaces.h"
#include "sysemu/qtest.h"
#define MAX_IDE_BUS 2
diff --git a/hw/misc/arm_integrator_debug.c b/hw/misc/arm_integrator_debug.c
index 99b720f..36ca7c7 100644
--- a/hw/misc/arm_integrator_debug.c
+++ b/hw/misc/arm_integrator_debug.c
@@ -16,7 +16,6 @@
#include "hw/hw.h"
#include "hw/sysbus.h"
-#include "exec/address-spaces.h"
#include "hw/misc/arm_integrator_debug.h"
#define INTEGRATOR_DEBUG(obj) \
diff --git a/hw/misc/omap_gpmc.c b/hw/misc/omap_gpmc.c
index 2047274..da490b1 100644
--- a/hw/misc/omap_gpmc.c
+++ b/hw/misc/omap_gpmc.c
@@ -22,7 +22,6 @@
#include "hw/block/flash.h"
#include "hw/arm/omap.h"
#include "exec/memory.h"
-#include "exec/address-spaces.h"
/* General-Purpose Memory Controller */
struct omap_gpmc_s {
diff --git a/hw/misc/vfio.c b/hw/misc/vfio.c
index c2c688c..ae1ca64 100644
--- a/hw/misc/vfio.c
+++ b/hw/misc/vfio.c
@@ -27,7 +27,6 @@
#include <unistd.h>
#include "config.h"
-#include "exec/address-spaces.h"
#include "exec/memory.h"
#include "hw/pci/msi.h"
#include "hw/pci/msix.h"
diff --git a/hw/moxie/moxiesim.c b/hw/moxie/moxiesim.c
index ef4f3a8..2667d79 100644
--- a/hw/moxie/moxiesim.c
+++ b/hw/moxie/moxiesim.c
@@ -33,7 +33,6 @@
#include "hw/boards.h"
#include "hw/loader.h"
#include "hw/char/serial.h"
-#include "exec/address-spaces.h"
#define PHYS_MEM_BASE 0x80000000
diff --git a/hw/net/mcf_fec.c b/hw/net/mcf_fec.c
index 4bff3de..f2b9ebb 100644
--- a/hw/net/mcf_fec.c
+++ b/hw/net/mcf_fec.c
@@ -10,7 +10,6 @@
#include "hw/m68k/mcf.h"
/* For crc32 */
#include <zlib.h>
-#include "exec/address-spaces.h"
//#define DEBUG_FEC 1
diff --git a/hw/net/ne2000-isa.c b/hw/net/ne2000-isa.c
index c660e58..795f13d 100644
--- a/hw/net/ne2000-isa.c
+++ b/hw/net/ne2000-isa.c
@@ -27,7 +27,6 @@
#include "hw/qdev.h"
#include "net/net.h"
#include "ne2000.h"
-#include "exec/address-spaces.h"
#define TYPE_ISA_NE2000 "ne2k_isa"
#define ISA_NE2000(obj) OBJECT_CHECK(ISANE2000State, (obj), TYPE_ISA_NE2000)
diff --git a/hw/openrisc/openrisc_sim.c b/hw/openrisc/openrisc_sim.c
index 8e1af8b..12ba3e5 100644
--- a/hw/openrisc/openrisc_sim.c
+++ b/hw/openrisc/openrisc_sim.c
@@ -24,7 +24,6 @@
#include "hw/char/serial.h"
#include "net/net.h"
#include "hw/loader.h"
-#include "exec/address-spaces.h"
#include "sysemu/sysemu.h"
#include "hw/sysbus.h"
#include "sysemu/qtest.h"
diff --git a/hw/pci-host/apb.c b/hw/pci-host/apb.c
index 1b399dd..7c756cd 100644
--- a/hw/pci-host/apb.c
+++ b/hw/pci-host/apb.c
@@ -34,7 +34,6 @@
#include "hw/pci/pci_bus.h"
#include "hw/pci-host/apb.h"
#include "sysemu/sysemu.h"
-#include "exec/address-spaces.h"
/* debug APB */
//#define DEBUG_APB
diff --git a/hw/pci-host/bonito.c b/hw/pci-host/bonito.c
index 902441f..dc4445f 100644
--- a/hw/pci-host/bonito.c
+++ b/hw/pci-host/bonito.c
@@ -45,7 +45,6 @@
#include "hw/mips/mips.h"
#include "hw/pci/pci_host.h"
#include "sysemu/sysemu.h"
-#include "exec/address-spaces.h"
//#define DEBUG_BONITO
diff --git a/hw/pci-host/ppce500.c b/hw/pci-host/ppce500.c
index c80b7cb..fb3227a 100644
--- a/hw/pci-host/ppce500.c
+++ b/hw/pci-host/ppce500.c
@@ -317,7 +317,6 @@ static const VMStateDescription vmstate_ppce500_pci = {
}
};
-#include "exec/address-spaces.h"
static int e500_pcihost_bridge_initfn(PCIDevice *d)
{
diff --git a/hw/pci-host/prep.c b/hw/pci-host/prep.c
index 0c948e2..05ed065 100644
--- a/hw/pci-host/prep.c
+++ b/hw/pci-host/prep.c
@@ -28,7 +28,6 @@
#include "hw/pci/pci_bus.h"
#include "hw/pci/pci_host.h"
#include "hw/i386/pc.h"
-#include "exec/address-spaces.h"
#define TYPE_RAVEN_PCI_DEVICE "raven"
#define TYPE_RAVEN_PCI_HOST_BRIDGE "raven-pcihost"
diff --git a/hw/pci-host/versatile.c b/hw/pci-host/versatile.c
index 71ff0de..f55a607 100644
--- a/hw/pci-host/versatile.c
+++ b/hw/pci-host/versatile.c
@@ -11,7 +11,6 @@
#include "hw/pci/pci.h"
#include "hw/pci/pci_bus.h"
#include "hw/pci/pci_host.h"
-#include "exec/address-spaces.h"
/* Old and buggy versions of QEMU used the wrong mapping from
* PCI IRQs to system interrupt lines. Unfortunately the Linux
diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index 4e0701d..d9d8f56 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -34,7 +34,6 @@
#include "qmp-commands.h"
#include "hw/pci/msi.h"
#include "hw/pci/msix.h"
-#include "exec/address-spaces.h"
#include "hw/hotplug.h"
//#define DEBUG_PCI
diff --git a/hw/pci/pcie_host.c b/hw/pci/pcie_host.c
index c6e1b57..2b8538a 100644
--- a/hw/pci/pcie_host.c
+++ b/hw/pci/pcie_host.c
@@ -22,7 +22,6 @@
#include "hw/hw.h"
#include "hw/pci/pci.h"
#include "hw/pci/pcie_host.h"
-#include "exec/address-spaces.h"
/* a helper function to get a PCIDevice for a given mmconfig address */
static inline PCIDevice *pcie_dev_find_by_mmcfg_addr(PCIBus *s,
diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c
index b37ce9d..de51b1a 100644
--- a/hw/ppc/e500.c
+++ b/hw/ppc/e500.c
@@ -33,7 +33,6 @@
#include "hw/loader.h"
#include "elf.h"
#include "hw/sysbus.h"
-#include "exec/address-spaces.h"
#include "qemu/host-utils.h"
#include "hw/pci-host/ppce500.h"
diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c
index 5e79575..34d0321 100644
--- a/hw/ppc/mac_newworld.c
+++ b/hw/ppc/mac_newworld.c
@@ -66,7 +66,6 @@
#include "kvm_ppc.h"
#include "hw/usb.h"
#include "sysemu/blockdev.h"
-#include "exec/address-spaces.h"
#include "hw/sysbus.h"
#define MAX_IDE_BUS 2
diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c
index 2f27754..87e3295 100644
--- a/hw/ppc/mac_oldworld.c
+++ b/hw/ppc/mac_oldworld.c
@@ -41,7 +41,6 @@
#include "sysemu/kvm.h"
#include "kvm_ppc.h"
#include "sysemu/blockdev.h"
-#include "exec/address-spaces.h"
#define MAX_IDE_BUS 2
#define CFG_ADDR 0xf0000510
diff --git a/hw/ppc/ppc405_boards.c b/hw/ppc/ppc405_boards.c
index f1a8f67..4b9bb5a 100644
--- a/hw/ppc/ppc405_boards.c
+++ b/hw/ppc/ppc405_boards.c
@@ -34,7 +34,6 @@
#include "qemu/error-report.h"
#include "hw/loader.h"
#include "sysemu/blockdev.h"
-#include "exec/address-spaces.h"
#define BIOS_FILENAME "ppc405_rom.bin"
#define BIOS_SIZE (2048 * 1024)
diff --git a/hw/ppc/ppc405_uc.c b/hw/ppc/ppc405_uc.c
index ca520e8..e5f804e 100644
--- a/hw/ppc/ppc405_uc.c
+++ b/hw/ppc/ppc405_uc.c
@@ -28,7 +28,6 @@
#include "qemu/timer.h"
#include "sysemu/sysemu.h"
#include "qemu/log.h"
-#include "exec/address-spaces.h"
//#define DEBUG_OPBA
//#define DEBUG_SDRAM
diff --git a/hw/ppc/ppc440_bamboo.c b/hw/ppc/ppc440_bamboo.c
index ec15bab..39bb7f7 100644
--- a/hw/ppc/ppc440_bamboo.c
+++ b/hw/ppc/ppc440_bamboo.c
@@ -22,7 +22,6 @@
#include "sysemu/device_tree.h"
#include "hw/loader.h"
#include "elf.h"
-#include "exec/address-spaces.h"
#include "hw/char/serial.h"
#include "hw/ppc/ppc.h"
#include "ppc405.h"
diff --git a/hw/ppc/ppc4xx_devs.c b/hw/ppc/ppc4xx_devs.c
index 9160ee7..11468cd 100644
--- a/hw/ppc/ppc4xx_devs.c
+++ b/hw/ppc/ppc4xx_devs.c
@@ -25,7 +25,6 @@
#include "hw/ppc/ppc.h"
#include "hw/ppc/ppc4xx.h"
#include "qemu/log.h"
-#include "exec/address-spaces.h"
#define DEBUG_UIC
diff --git a/hw/ppc/ppc4xx_pci.c b/hw/ppc/ppc4xx_pci.c
index 4cb7851..4d20732 100644
--- a/hw/ppc/ppc4xx_pci.c
+++ b/hw/ppc/ppc4xx_pci.c
@@ -24,7 +24,6 @@
#include "hw/ppc/ppc4xx.h"
#include "hw/pci/pci.h"
#include "hw/pci/pci_host.h"
-#include "exec/address-spaces.h"
#undef DEBUG
#ifdef DEBUG
diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c
index 9f8538c..79f6878 100644
--- a/hw/ppc/prep.c
+++ b/hw/ppc/prep.c
@@ -41,7 +41,6 @@
#include "sysemu/blockdev.h"
#include "sysemu/arch_init.h"
#include "sysemu/qtest.h"
-#include "exec/address-spaces.h"
#include "elf.h"
//#define HARD_DEBUG_PPC_IO
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 93d02c1..870ccbf 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -46,7 +46,6 @@
#include "hw/pci/pci.h"
-#include "exec/address-spaces.h"
#include "hw/usb.h"
#include "qemu/config-file.h"
diff --git a/hw/ppc/spapr_iommu.c b/hw/ppc/spapr_iommu.c
index ef45f4f..fca5fae 100644
--- a/hw/ppc/spapr_iommu.c
+++ b/hw/ppc/spapr_iommu.c
@@ -21,7 +21,6 @@
#include "hw/qdev.h"
#include "kvm_ppc.h"
#include "sysemu/dma.h"
-#include "exec/address-spaces.h"
#include "trace.h"
#include "hw/ppc/spapr.h"
diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c
index 4c7c3ae..8efb738 100644
--- a/hw/ppc/spapr_pci.c
+++ b/hw/ppc/spapr_pci.c
@@ -29,7 +29,6 @@
#include "hw/pci/pci_host.h"
#include "hw/ppc/spapr.h"
#include "hw/pci-host/spapr.h"
-#include "exec/address-spaces.h"
#include <libfdt.h>
#include "trace.h"
diff --git a/hw/ppc/virtex_ml507.c b/hw/ppc/virtex_ml507.c
index 85a0e53..387ee28 100644
--- a/hw/ppc/virtex_ml507.c
+++ b/hw/ppc/virtex_ml507.c
@@ -33,7 +33,6 @@
#include "hw/loader.h"
#include "elf.h"
#include "qemu/log.h"
-#include "exec/address-spaces.h"
#include "hw/ppc/ppc.h"
#include "hw/ppc/ppc4xx.h"
diff --git a/hw/s390x/css.c b/hw/s390x/css.c
index 75b04b4..bdb3ccb 100644
--- a/hw/s390x/css.c
+++ b/hw/s390x/css.c
@@ -11,7 +11,6 @@
#include <hw/qdev.h>
#include "qemu/bitops.h"
-#include "exec/address-spaces.h"
#include "cpu.h"
#include "ioinst.h"
#include "css.h"
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index 733d988..6bcfa35 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -10,7 +10,6 @@
*/
#include "hw/boards.h"
-#include "exec/address-spaces.h"
#include "s390-virtio.h"
#include "hw/s390x/sclp.h"
#include "ioinst.h"
diff --git a/hw/s390x/s390-virtio.c b/hw/s390x/s390-virtio.c
index 9eeda97..32ed091 100644
--- a/hw/s390x/s390-virtio.c
+++ b/hw/s390x/s390-virtio.c
@@ -32,7 +32,6 @@
#include "hw/virtio/virtio.h"
#include "hw/sysbus.h"
#include "sysemu/kvm.h"
-#include "exec/address-spaces.h"
#include "hw/s390x/s390-virtio-bus.h"
#include "hw/s390x/sclp.h"
diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c
index eaeb7ed..b86e000 100644
--- a/hw/sh4/r2d.c
+++ b/hw/sh4/r2d.c
@@ -37,7 +37,6 @@
#include "hw/usb.h"
#include "hw/block/flash.h"
#include "sysemu/blockdev.h"
-#include "exec/address-spaces.h"
#define FLASH_BASE 0x00000000
#define FLASH_SIZE 0x02000000
diff --git a/hw/sh4/sh7750.c b/hw/sh4/sh7750.c
index 1439ba4..c019489 100644
--- a/hw/sh4/sh7750.c
+++ b/hw/sh4/sh7750.c
@@ -30,7 +30,6 @@
#include "sh7750_regnames.h"
#include "hw/sh4/sh_intc.h"
#include "cpu.h"
-#include "exec/address-spaces.h"
#define NB_DEVICES 4
diff --git a/hw/sh4/sh_pci.c b/hw/sh4/sh_pci.c
index a2f6d9e..9e6e29e 100644
--- a/hw/sh4/sh_pci.c
+++ b/hw/sh4/sh_pci.c
@@ -26,7 +26,6 @@
#include "hw/pci/pci.h"
#include "hw/pci/pci_host.h"
#include "qemu/bswap.h"
-#include "exec/address-spaces.h"
#define TYPE_SH_PCI_HOST_BRIDGE "sh_pci"
diff --git a/hw/sh4/shix.c b/hw/sh4/shix.c
index 904a966..3b2a611 100644
--- a/hw/sh4/shix.c
+++ b/hw/sh4/shix.c
@@ -33,7 +33,6 @@
#include "sysemu/qtest.h"
#include "hw/boards.h"
#include "hw/loader.h"
-#include "exec/address-spaces.h"
#include "qemu/error-report.h"
#define BIOS_FILENAME "shix_bios.bin"
diff --git a/hw/sparc/leon3.c b/hw/sparc/leon3.c
index c16e9e4..b150e47 100644
--- a/hw/sparc/leon3.c
+++ b/hw/sparc/leon3.c
@@ -31,7 +31,6 @@
#include "hw/loader.h"
#include "elf.h"
#include "trace.h"
-#include "exec/address-spaces.h"
#include "hw/sparc/grlib.h"
diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c
index 6f271d9..b1b87b5 100644
--- a/hw/sparc64/sun4u.c
+++ b/hw/sparc64/sun4u.c
@@ -39,7 +39,6 @@
#include "hw/loader.h"
#include "elf.h"
#include "sysemu/blockdev.h"
-#include "exec/address-spaces.h"
//#define DEBUG_IRQ
//#define DEBUG_EBUS
diff --git a/hw/timer/m48t59.c b/hw/timer/m48t59.c
index 7cf8684..655fe36 100644
--- a/hw/timer/m48t59.c
+++ b/hw/timer/m48t59.c
@@ -27,7 +27,6 @@
#include "sysemu/sysemu.h"
#include "hw/sysbus.h"
#include "hw/isa/isa.h"
-#include "exec/address-spaces.h"
//#define DEBUG_NVRAM
diff --git a/hw/timer/sh_timer.c b/hw/timer/sh_timer.c
index 07f0670..492d9e3 100644
--- a/hw/timer/sh_timer.c
+++ b/hw/timer/sh_timer.c
@@ -12,7 +12,6 @@
#include "hw/sh4/sh.h"
#include "qemu/timer.h"
#include "qemu/main-loop.h"
-#include "exec/address-spaces.h"
#include "hw/ptimer.h"
//#define DEBUG_TIMER
diff --git a/hw/tpm/tpm_tis.c b/hw/tpm/tpm_tis.c
index 6f0a4d2..a0b1001 100644
--- a/hw/tpm/tpm_tis.c
+++ b/hw/tpm/tpm_tis.c
@@ -22,7 +22,6 @@
#include "sysemu/tpm_backend.h"
#include "tpm_int.h"
#include "block/block.h"
-#include "exec/address-spaces.h"
#include "hw/hw.h"
#include "hw/i386/pc.h"
#include "hw/pci/pci_ids.h"
diff --git a/hw/unicore32/puv3.c b/hw/unicore32/puv3.c
index e05cbc1..48cb984 100644
--- a/hw/unicore32/puv3.c
+++ b/hw/unicore32/puv3.c
@@ -12,7 +12,6 @@
#include "qemu-common.h"
#include "ui/console.h"
#include "elf.h"
-#include "exec/address-spaces.h"
#include "hw/sysbus.h"
#include "hw/boards.h"
#include "hw/loader.h"
diff --git a/hw/virtio/dataplane/vring.c b/hw/virtio/dataplane/vring.c
index 665a1ff..0780d1f 100644
--- a/hw/virtio/dataplane/vring.c
+++ b/hw/virtio/dataplane/vring.c
@@ -17,7 +17,6 @@
#include "trace.h"
#include "hw/hw.h"
#include "exec/memory.h"
-#include "exec/address-spaces.h"
#include "hw/virtio/dataplane/vring.h"
#include "qemu/error-report.h"
diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c
index 9e336ad..12e1e75 100644
--- a/hw/virtio/vhost.c
+++ b/hw/virtio/vhost.c
@@ -19,7 +19,6 @@
#include "qemu/atomic.h"
#include "qemu/range.h"
#include <linux/vhost.h>
-#include "exec/address-spaces.h"
#include "hw/virtio/virtio-bus.h"
static void vhost_dev_sync_region(struct vhost_dev *dev,
diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c
index a470a0b..be5c96e 100644
--- a/hw/virtio/virtio-balloon.c
+++ b/hw/virtio/virtio-balloon.c
@@ -22,7 +22,6 @@
#include "sysemu/balloon.h"
#include "hw/virtio/virtio-balloon.h"
#include "sysemu/kvm.h"
-#include "exec/address-spaces.h"
#include "qapi/visitor.h"
#if defined(__linux__)
diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c
index aeabf3a..9133e80 100644
--- a/hw/virtio/virtio.c
+++ b/hw/virtio/virtio.c
@@ -14,7 +14,6 @@
#include <inttypes.h>
#include "trace.h"
-#include "exec/address-spaces.h"
#include "qemu/error-report.h"
#include "hw/virtio/virtio.h"
#include "qemu/atomic.h"
diff --git a/hw/xen/xen_platform.c b/hw/xen/xen_platform.c
index 1d9d0e9..99d6052 100644
--- a/hw/xen/xen_platform.c
+++ b/hw/xen/xen_platform.c
@@ -33,7 +33,6 @@
#include "hw/xen/xen_common.h"
#include "hw/xen/xen_backend.h"
#include "trace.h"
-#include "exec/address-spaces.h"
#include <xenguest.h>
diff --git a/hw/xen/xen_pt.c b/hw/xen/xen_pt.c
index be4220b..c4410ea 100644
--- a/hw/xen/xen_pt.c
+++ b/hw/xen/xen_pt.c
@@ -59,7 +59,6 @@
#include "hw/xen/xen_backend.h"
#include "xen_pt.h"
#include "qemu/range.h"
-#include "exec/address-spaces.h"
#define XEN_PT_NR_IRQS (256)
static uint8_t xen_pt_mapped_machine_irq[XEN_PT_NR_IRQS] = {0};
diff --git a/hw/xtensa/xtensa_lx60.c b/hw/xtensa/xtensa_lx60.c
index 49c58d1..e5ac2f5 100644
--- a/hw/xtensa/xtensa_lx60.c
+++ b/hw/xtensa/xtensa_lx60.c
@@ -30,7 +30,6 @@
#include "hw/loader.h"
#include "elf.h"
#include "exec/memory.h"
-#include "exec/address-spaces.h"
#include "hw/char/serial.h"
#include "net/net.h"
#include "hw/sysbus.h"
diff --git a/hw/xtensa/xtensa_sim.c b/hw/xtensa/xtensa_sim.c
index 1192ce7..42ece0e 100644
--- a/hw/xtensa/xtensa_sim.c
+++ b/hw/xtensa/xtensa_sim.c
@@ -30,7 +30,6 @@
#include "hw/loader.h"
#include "elf.h"
#include "exec/memory.h"
-#include "exec/address-spaces.h"
static uint64_t translate_phys_addr(void *opaque, uint64_t addr)
{
diff --git a/include/exec/address-spaces.h b/include/exec/address-spaces.h
deleted file mode 100644
index c6e5d51..0000000
--- a/include/exec/address-spaces.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * Internal memory management interfaces
- *
- * Copyright 2011 Red Hat, Inc. and/or its affiliates
- *
- * Authors:
- * Avi Kivity <a...@redhat.com>
- *
- * This work is licensed under the terms of the GNU GPL, version 2. See
- * the COPYING file in the top-level directory.
- *
- */
diff --git a/include/exec/softmmu_template.h b/include/exec/softmmu_template.h
index c14a04d..b7689ec 100644
--- a/include/exec/softmmu_template.h
+++ b/include/exec/softmmu_template.h
@@ -22,7 +22,6 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
#include "qemu/timer.h"
-#include "exec/address-spaces.h"
#include "exec/memory.h"
#define DATA_SIZE (1 << SHIFT)
diff --git a/include/hw/arm/allwinner-a10.h b/include/hw/arm/allwinner-a10.h
index 01a189b..5f3d378 100644
--- a/include/hw/arm/allwinner-a10.h
+++ b/include/hw/arm/allwinner-a10.h
@@ -9,7 +9,6 @@
#include "hw/net/allwinner_emac.h"
#include "sysemu/sysemu.h"
-#include "exec/address-spaces.h"
#define AW_A10_PIC_REG_BASE 0x01c20400
diff --git a/include/hw/sh4/sh_intc.h b/include/hw/sh4/sh_intc.h
index 644acb7..79c26d0 100644
--- a/include/hw/sh4/sh_intc.h
+++ b/include/hw/sh4/sh_intc.h
@@ -3,7 +3,6 @@
#include "qemu-common.h"
#include "hw/irq.h"
-#include "exec/address-spaces.h"
#include "exec/memory.h"
typedef unsigned char intc_enum;
diff --git a/include/sysemu/dma.h b/include/sysemu/dma.h
index 00f21f3..b894b3a 100644
--- a/include/sysemu/dma.h
+++ b/include/sysemu/dma.h
@@ -12,7 +12,6 @@
#include <stdio.h>
#include "exec/memory.h"
-#include "exec/address-spaces.h"
#include "hw/hw.h"
#include "block/block.h"
#include "sysemu/kvm.h"
diff --git a/ioport.c b/ioport.c
index 3d91e79..014713b 100644
--- a/ioport.c
+++ b/ioport.c
@@ -28,7 +28,6 @@
#include "exec/ioport.h"
#include "trace.h"
#include "exec/memory.h"
-#include "exec/address-spaces.h"
//#define DEBUG_IOPORT
diff --git a/kvm-all.c b/kvm-all.c
index fd8157a..425fc5f 100644
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -32,7 +32,6 @@
#include "qemu/bswap.h"
#include "exec/memory.h"
#include "exec/ram_addr.h"
-#include "exec/address-spaces.h"
#include "qemu/event_notifier.h"
#include "trace.h"
diff --git a/memory.c b/memory.c
index 59ecc28..6d39b48 100644
--- a/memory.c
+++ b/memory.c
@@ -14,7 +14,6 @@
*/
#include "exec/memory.h"
-#include "exec/address-spaces.h"
#include "exec/ioport.h"
#include "qemu/bitops.h"
#include "qom/object.h"
diff --git a/memory_mapping.c b/memory_mapping.c
index b17eea1..88f2da7 100644
--- a/memory_mapping.c
+++ b/memory_mapping.c
@@ -16,7 +16,6 @@
#include "qemu-common.h"
#include "exec/cpu-common.h" /* for ram_addr_t */
#include "exec/memory.h"
-#include "exec/address-spaces.h"
#include "sysemu/memory_mapping.h"
//#define DEBUG_GUEST_PHYS_REGION_ADD
diff --git a/target-sparc/mmu_helper.c b/target-sparc/mmu_helper.c
index 5fc2fd6..11d2d74 100644
--- a/target-sparc/mmu_helper.c
+++ b/target-sparc/mmu_helper.c
@@ -19,7 +19,6 @@
#include "cpu.h"
#include "trace.h"
-#include "exec/address-spaces.h"
/* Sparc MMU emulation */
diff --git a/target-xtensa/op_helper.c b/target-xtensa/op_helper.c
index 509ba49..34bc6a1 100644
--- a/target-xtensa/op_helper.c
+++ b/target-xtensa/op_helper.c
@@ -29,7 +29,6 @@
#include "helper.h"
#include "qemu/host-utils.h"
#include "exec/softmmu_exec.h"
-#include "exec/address-spaces.h"
static void do_unaligned_access(CPUXtensaState *env,
target_ulong addr, int is_write, int is_user, uintptr_t retaddr);
diff --git a/translate-all.c b/translate-all.c
index be220fb..98e215f 100644
--- a/translate-all.c
+++ b/translate-all.c
@@ -58,7 +58,6 @@
#endif
#endif
#else
-#include "exec/address-spaces.h"
#endif
#include "exec/cputlb.h"
diff --git a/xen-all.c b/xen-all.c
index 4a594bd..07652f5 100644
--- a/xen-all.c
+++ b/xen-all.c
@@ -20,7 +20,6 @@
#include "qemu/range.h"
#include "sysemu/xen-mapcache.h"
#include "trace.h"
-#include "exec/address-spaces.h"
#include <xen/hvm/ioreq.h>
#include <xen/hvm/params.h>
--
1.7.9.5
