@@ -4,7 +4,7 @@
#define I82596_IOPORT_SIZE 0x20
#include "exec/sysemu/memory.h"
-#include "exec/address-spaces.h"
+#include "exec/sysemu/address-spaces.h"
#define PORT_RESET 0x00 /* reset 82596 */
#define PORT_SELFTEST 0x01 /* selftest */
@@ -14,7 +14,7 @@
#define HW_S390_IPL_H
#include "cpu.h"
-#include "exec/address-spaces.h"
+#include "exec/sysemu/address-spaces.h"
#include "hw/qdev-core.h"
#include "qom/object.h"
@@ -12,7 +12,7 @@
#ifndef TPM_TPM_PPI_H
#define TPM_TPM_PPI_H
-#include "exec/address-spaces.h"
+#include "exec/sysemu/address-spaces.h"
typedef struct TPMPPI {
MemoryRegion ram;
similarity index 84%
rename from include/exec/address-spaces.h
rename to include/exec/sysemu/address-spaces.h
@@ -11,8 +11,12 @@
*
*/
-#ifndef EXEC_ADDRESS_SPACES_H
-#define EXEC_ADDRESS_SPACES_H
+#ifndef EXEC_SYSEMU_ADDRESS_SPACES_H
+#define EXEC_SYSEMU_ADDRESS_SPACES_H
+
+#ifdef CONFIG_USER_ONLY
+#error Cannot include sysemu specific header from user emulation
+#endif
/*
* Internal interfaces between memory.c/exec.c/vl.c. Do not #include unless
@@ -21,8 +25,6 @@
#include "exec/sysemu/memory.h"
-#ifndef CONFIG_USER_ONLY
-
/* Get the root memory region. This interface should only be used temporarily
* until a proper bus interface is available.
*/
@@ -37,5 +39,3 @@ extern AddressSpace address_space_memory;
extern AddressSpace address_space_io;
#endif
-
-#endif
@@ -10,7 +10,7 @@
#define HW_NUBUS_NUBUS_H
#include "hw/qdev-properties.h"
-#include "exec/address-spaces.h"
+#include "exec/sysemu/address-spaces.h"
#include "qom/object.h"
#define NUBUS_SUPER_SLOT_SIZE 0x10000000U
@@ -23,7 +23,7 @@
#include "hw/boards.h"
#include "hw/arm/boot.h"
#include "sysemu/sysemu.h"
-#include "exec/address-spaces.h"
+#include "exec/sysemu/address-spaces.h"
#include "qom/object.h"
#include "hw/tricore/tc27x_soc.h"
@@ -11,7 +11,7 @@
#define DMA_H
#include "exec/sysemu/memory.h"
-#include "exec/address-spaces.h"
+#include "exec/sysemu/address-spaces.h"
#include "block/block.h"
#include "block/accounting.h"
@@ -31,7 +31,7 @@
#include "cpu.h"
#include "x86.h"
-#include "exec/address-spaces.h"
+#include "exec/sysemu/address-spaces.h"
static inline uint64_t rreg(hv_vcpuid_t vcpu, hv_x86_reg_t reg)
{
@@ -30,7 +30,7 @@
#include "qemu.h"
#else
#include "hw/core/sysemu-cpu-ops.h"
-#include "exec/address-spaces.h"
+#include "exec/sysemu/address-spaces.h"
#endif
#include "sysemu/tcg.h"
#include "sysemu/kvm.h"
@@ -16,7 +16,7 @@
#include "strongarm.h"
#include "hw/arm/boot.h"
#include "hw/block/flash.h"
-#include "exec/address-spaces.h"
+#include "exec/sysemu/address-spaces.h"
#include "cpu.h"
#include "qom/object.h"
@@ -28,7 +28,7 @@
#include "hw/sysbus.h"
#include "net/net.h"
#include "hw/arm/boot.h"
-#include "exec/address-spaces.h"
+#include "exec/sysemu/address-spaces.h"
#include "hw/arm/exynos4210.h"
#include "hw/net/lan9118.h"
#include "hw/qdev-properties.h"
@@ -23,7 +23,7 @@
#include "qapi/error.h"
#include "hw/arm/fsl-imx31.h"
#include "sysemu/sysemu.h"
-#include "exec/address-spaces.h"
+#include "exec/sysemu/address-spaces.h"
#include "hw/qdev-properties.h"
#include "chardev/char.h"
@@ -41,7 +41,7 @@
#include "hw/block/flash.h"
#include "hw/net/smc91c111.h"
#include "hw/boards.h"
-#include "exec/address-spaces.h"
+#include "exec/sysemu/address-spaces.h"
#include "sysemu/qtest.h"
#include "cpu.h"
@@ -17,7 +17,7 @@
#include "hw/misc/arm_integrator_debug.h"
#include "hw/net/smc91c111.h"
#include "net/net.h"
-#include "exec/address-spaces.h"
+#include "exec/sysemu/address-spaces.h"
#include "sysemu/runstate.h"
#include "sysemu/sysemu.h"
#include "qemu/log.h"
@@ -18,7 +18,7 @@
#include "hw/arm/fsl-imx31.h"
#include "hw/boards.h"
#include "qemu/error-report.h"
-#include "exec/address-spaces.h"
+#include "exec/sysemu/address-spaces.h"
#include "net/net.h"
#include "hw/net/lan9118.h"
#include "hw/char/serial.h"
@@ -21,7 +21,7 @@
#include "hw/boards.h"
#include "hw/block/flash.h"
#include "hw/sysbus.h"
-#include "exec/address-spaces.h"
+#include "exec/sysemu/address-spaces.h"
#include "cpu.h"
/* Device addresses */
@@ -13,7 +13,7 @@
#include "hw/boards.h"
#include "hw/arm/boot.h"
#include "sysemu/sysemu.h"
-#include "exec/address-spaces.h"
+#include "exec/sysemu/address-spaces.h"
#include "hw/arm/nrf51_soc.h"
#include "hw/i2c/microbit_i2c.h"
@@ -53,7 +53,7 @@
#include "hw/arm/armv7m.h"
#include "hw/or-irq.h"
#include "hw/boards.h"
-#include "exec/address-spaces.h"
+#include "exec/sysemu/address-spaces.h"
#include "sysemu/sysemu.h"
#include "sysemu/reset.h"
#include "hw/misc/unimp.h"
@@ -33,7 +33,7 @@
#include "hw/arm/armv7m.h"
#include "hw/or-irq.h"
#include "hw/boards.h"
-#include "exec/address-spaces.h"
+#include "exec/sysemu/address-spaces.h"
#include "sysemu/sysemu.h"
#include "hw/misc/unimp.h"
#include "hw/char/cmsdk-apb-uart.h"
@@ -25,7 +25,7 @@
#include "qemu/osdep.h"
#include "qemu/units.h"
#include "qapi/error.h"
-#include "exec/address-spaces.h"
+#include "exec/sysemu/address-spaces.h"
#include "hw/char/serial.h"
#include "hw/arm/msf2-soc.h"
#include "hw/misc/unimp.h"
@@ -29,7 +29,7 @@
#include "hw/boards.h"
#include "hw/qdev-properties.h"
#include "hw/arm/boot.h"
-#include "exec/address-spaces.h"
+#include "exec/sysemu/address-spaces.h"
#include "hw/arm/msf2-soc.h"
#define DDR_BASE_ADDRESS 0xA0000000
@@ -22,7 +22,7 @@
#include "qemu/osdep.h"
#include "qemu/error-report.h"
#include "qapi/error.h"
-#include "exec/address-spaces.h"
+#include "exec/sysemu/address-spaces.h"
#include "sysemu/sysemu.h"
#include "hw/arm/boot.h"
#include "hw/arm/armsse.h"
@@ -23,7 +23,7 @@
#include "qapi/error.h"
#include "qemu-common.h"
#include "cpu.h"
-#include "exec/address-spaces.h"
+#include "exec/sysemu/address-spaces.h"
#include "hw/hw.h"
#include "hw/irq.h"
#include "hw/qdev-properties.h"
@@ -22,7 +22,7 @@
#include "qemu/error-report.h"
#include "qapi/error.h"
#include "cpu.h"
-#include "exec/address-spaces.h"
+#include "exec/sysemu/address-spaces.h"
#include "sysemu/blockdev.h"
#include "sysemu/qtest.h"
#include "sysemu/reset.h"
@@ -33,7 +33,7 @@
#include "hw/arm/boot.h"
#include "hw/block/flash.h"
#include "sysemu/qtest.h"
-#include "exec/address-spaces.h"
+#include "exec/sysemu/address-spaces.h"
#include "cpu.h"
#include "qemu/cutils.h"
@@ -19,7 +19,7 @@
#include "qemu/osdep.h"
#include "qemu/units.h"
-#include "exec/address-spaces.h"
+#include "exec/sysemu/address-spaces.h"
#include "qapi/error.h"
#include "hw/boards.h"
#include "hw/qdev-properties.h"
@@ -32,7 +32,7 @@
#include "hw/sysbus.h"
#include "hw/misc/max111x.h"
#include "migration/vmstate.h"
-#include "exec/address-spaces.h"
+#include "exec/sysemu/address-spaces.h"
#include "cpu.h"
#include "qom/object.h"
@@ -17,7 +17,7 @@
#include "net/net.h"
#include "hw/boards.h"
#include "qemu/log.h"
-#include "exec/address-spaces.h"
+#include "exec/sysemu/address-spaces.h"
#include "sysemu/sysemu.h"
#include "hw/arm/armv7m.h"
#include "hw/char/pl011.h"
@@ -26,7 +26,7 @@
#include "qapi/error.h"
#include "qemu/module.h"
#include "hw/arm/boot.h"
-#include "exec/address-spaces.h"
+#include "exec/sysemu/address-spaces.h"
#include "hw/arm/stm32f205_soc.h"
#include "hw/qdev-properties.h"
#include "sysemu/sysemu.h"
@@ -25,7 +25,7 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
#include "qemu-common.h"
-#include "exec/address-spaces.h"
+#include "exec/sysemu/address-spaces.h"
#include "sysemu/sysemu.h"
#include "hw/arm/stm32f405_soc.h"
#include "hw/misc/unimp.h"
@@ -25,7 +25,7 @@
#include "hw/ssi/ssi.h"
#include "hw/sysbus.h"
#include "hw/misc/led.h"
-#include "exec/address-spaces.h"
+#include "exec/sysemu/address-spaces.h"
#include "qom/object.h"
#define TOSA_RAM 0x04000000
@@ -23,7 +23,7 @@
#include "ui/console.h"
#include "hw/audio/wm8750.h"
#include "audio/audio.h"
-#include "exec/address-spaces.h"
+#include "exec/sysemu/address-spaces.h"
#include "cpu.h"
#include "qom/object.h"
@@ -13,7 +13,7 @@
#include "qemu/units.h"
#include "qapi/error.h"
#include "exec/sysemu/memory.h"
-#include "exec/address-spaces.h"
+#include "exec/sysemu/address-spaces.h"
#include "sysemu/sysemu.h"
#include "hw/qdev-properties.h"
#include "hw/sysbus.h"
@@ -15,7 +15,7 @@
#include "chardev/char-fe.h"
#include "qemu/log.h"
#include "trace.h"
-#include "exec/address-spaces.h"
+#include "exec/sysemu/address-spaces.h"
#include "hw/char/goldfish_tty.h"
#define GOLDFISH_TTY_VERSION 1
@@ -21,7 +21,7 @@
#include "chardev/char.h"
#include "hw/arm/omap.h"
#include "hw/char/serial.h"
-#include "exec/address-spaces.h"
+#include "exec/sysemu/address-spaces.h"
/* UARTs */
struct omap_uart_s {
@@ -14,7 +14,7 @@
#include "qemu/osdep.h"
#include "qemu/error-report.h"
#include "hw/boards.h"
-#include "exec/address-spaces.h"
+#include "exec/sysemu/address-spaces.h"
#include "hw/core/cpu.h"
static void machine_none_init(MachineState *mch)
@@ -22,7 +22,7 @@
#include "qemu/module.h"
#include "hw/sysbus.h"
#include "monitor/monitor.h"
-#include "exec/address-spaces.h"
+#include "exec/sysemu/address-spaces.h"
static void sysbus_dev_print(Monitor *mon, DeviceState *dev, int indent);
static char *sysbus_get_fw_dev_path(DeviceState *dev);
@@ -27,7 +27,7 @@
#include "hw/irq.h"
#include "qemu/main-loop.h"
#include "sysemu/runstate.h"
-#include "exec/address-spaces.h"
+#include "exec/sysemu/address-spaces.h"
#include "hw/cris/etraxfs_dma.h"
@@ -32,7 +32,7 @@
#include "qemu/timer.h"
#include "qemu/log.h"
#include "qemu/module.h"
-#include "exec/address-spaces.h"
+#include "exec/sysemu/address-spaces.h"
#include "trace.h"
#include "qom/object.h"
@@ -11,7 +11,7 @@
#include "qemu/main-loop.h"
#include "qemu/module.h"
#include "qapi/error.h"
-#include "exec/address-spaces.h"
+#include "exec/sysemu/address-spaces.h"
#include "sysemu/kvm.h"
#include "qemu/bitops.h"
#include "qemu/error-report.h"
@@ -28,7 +28,7 @@
#include "hw/input/lasips2.h"
#include "exec/sysemu/hwaddr.h"
#include "trace.h"
-#include "exec/address-spaces.h"
+#include "exec/sysemu/address-spaces.h"
#include "migration/vmstate.h"
#include "hw/irq.h"
@@ -36,7 +36,7 @@
#include "hw/boards.h"
#include "hw/char/serial.h"
#include "hw/qdev-properties.h"
-#include "exec/address-spaces.h"
+#include "exec/sysemu/address-spaces.h"
#include "hw/ssi/ssi.h"
#include "boot.h"
@@ -33,7 +33,7 @@
#include "sysemu/sysemu.h"
#include "hw/boards.h"
#include "hw/misc/unimp.h"
-#include "exec/address-spaces.h"
+#include "exec/sysemu/address-spaces.h"
#include "hw/char/xilinx_uartlite.h"
#include "boot.h"
@@ -17,7 +17,7 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "exec/address-spaces.h"
+#include "exec/sysemu/address-spaces.h"
#include "hw/boards.h"
#include "cpu.h"
#include "boot.h"
@@ -24,7 +24,7 @@
#include "migration/vmstate.h"
#include "qemu/log.h"
#include "qemu/module.h"
-#include "exec/address-spaces.h"
+#include "exec/sysemu/address-spaces.h"
#include "hw/qdev-properties.h"
#include "qapi/error.h"
#include "hw/misc/allwinner-h3-dramc.h"
@@ -24,7 +24,7 @@
#include "hw/block/flash.h"
#include "hw/arm/omap.h"
#include "exec/sysemu/memory.h"
-#include "exec/address-spaces.h"
+#include "exec/sysemu/address-spaces.h"
/* General-Purpose Memory Controller */
struct omap_gpmc_s {
@@ -31,7 +31,7 @@
#include "sysemu/sysemu.h"
#include "hw/boards.h"
#include "exec/sysemu/memory.h"
-#include "exec/address-spaces.h"
+#include "exec/sysemu/address-spaces.h"
#include "qemu/config-file.h"
#include "boot.h"
@@ -33,7 +33,7 @@
#include "hw/char/serial.h"
#include "hw/boards.h"
#include "exec/sysemu/memory.h"
-#include "exec/address-spaces.h"
+#include "exec/sysemu/address-spaces.h"
#include "qemu/config-file.h"
#include "boot.h"
@@ -19,7 +19,7 @@
#include "hw/irq.h"
#include "hw/intc/i8259.h"
#include "hw/qdev-properties.h"
-#include "exec/address-spaces.h"
+#include "exec/sysemu/address-spaces.h"
#include "qemu/log.h"
#include "qemu/error-report.h"
#include "trace.h"
@@ -30,7 +30,7 @@
#include "qemu/error-report.h"
#include "sysemu/kvm.h"
#include "kvm_ppc.h"
-#include "exec/address-spaces.h"
+#include "exec/sysemu/address-spaces.h"
#include "trace.h"
#include "qemu/datadir.h"
#include "sysemu/device_tree.h"
@@ -34,7 +34,7 @@
#include "qemu/timer.h"
#include "sysemu/reset.h"
#include "sysemu/sysemu.h"
-#include "exec/address-spaces.h"
+#include "exec/sysemu/address-spaces.h"
#include "hw/intc/ppc-uic.h"
#include "hw/qdev-properties.h"
#include "qapi/error.h"
@@ -32,7 +32,7 @@
#include "hw/intc/ppc-uic.h"
#include "hw/qdev-properties.h"
#include "qemu/log.h"
-#include "exec/address-spaces.h"
+#include "exec/sysemu/address-spaces.h"
#include "qemu/error-report.h"
#include "qapi/error.h"
@@ -28,7 +28,7 @@
#include "hw/isa/isa.h"
#include "hw/qdev-properties.h"
#include "migration/vmstate.h"
-#include "exec/address-spaces.h"
+#include "exec/sysemu/address-spaces.h"
#include "qom/object.h"
#include "qemu/error-report.h" /* for error_report() */
#include "qemu/module.h"
@@ -22,7 +22,7 @@
#include "hw/isa/isa.h"
#include "hw/qdev-properties.h"
#include "migration/vmstate.h"
-#include "exec/address-spaces.h"
+#include "exec/sysemu/address-spaces.h"
#include "qapi/error.h"
#include "trace.h"
#include "qom/object.h"
@@ -15,7 +15,7 @@
#include "hw/ppc/spapr_ovec.h"
#include "migration/vmstate.h"
#include "qemu/bitmap.h"
-#include "exec/address-spaces.h"
+#include "exec/sysemu/address-spaces.h"
#include "qemu/error-report.h"
#include "trace.h"
#include <libfdt.h>
@@ -24,7 +24,7 @@
#include "hw/intc/sifive_clint.h"
#include "sysemu/sysemu.h"
#include "hw/qdev-properties.h"
-#include "exec/address-spaces.h"
+#include "exec/sysemu/address-spaces.h"
#include "hw/riscv/boot.h"
@@ -14,7 +14,7 @@
#include "qapi/visitor.h"
#include "qemu/bitops.h"
#include "qemu/error-report.h"
-#include "exec/address-spaces.h"
+#include "exec/sysemu/address-spaces.h"
#include "hw/s390x/ioinst.h"
#include "hw/qdev-properties.h"
#include "hw/s390x/css.h"
@@ -29,7 +29,7 @@
#include "hw/sysbus.h"
#include "migration/vmstate.h"
#include "qemu/module.h"
-#include "exec/address-spaces.h"
+#include "exec/sysemu/address-spaces.h"
#include "trace.h"
/*
@@ -27,7 +27,7 @@
#include "qemu/osdep.h"
#include "hw/sysbus.h"
#include "hw/sparc/sun4u_iommu.h"
-#include "exec/address-spaces.h"
+#include "exec/sysemu/address-spaces.h"
#include "qemu/log.h"
#include "qemu/module.h"
#include "trace.h"
@@ -36,7 +36,7 @@
#include "hw/rtc/mc146818rtc_regs.h"
#include "migration/vmstate.h"
#include "hw/timer/i8254.h"
-#include "exec/address-spaces.h"
+#include "exec/sysemu/address-spaces.h"
#include "qom/object.h"
//#define HPET_DEBUG
@@ -25,7 +25,7 @@
#include "migration/vmstate.h"
#include "hw/qdev-properties.h"
#include "hw/s390x/ap-bridge.h"
-#include "exec/address-spaces.h"
+#include "exec/sysemu/address-spaces.h"
#include "qom/object.h"
#define TYPE_VFIO_AP_DEVICE "vfio-ap"
@@ -26,7 +26,7 @@
#include "hw/s390x/vfio-ccw.h"
#include "hw/qdev-properties.h"
#include "hw/s390x/ccw-device.h"
-#include "exec/address-spaces.h"
+#include "exec/sysemu/address-spaces.h"
#include "qemu/error-report.h"
#include "qemu/main-loop.h"
#include "qemu/module.h"
@@ -27,7 +27,7 @@
#include "hw/vfio/vfio-common.h"
#include "hw/vfio/vfio.h"
-#include "exec/address-spaces.h"
+#include "exec/sysemu/address-spaces.h"
#include "exec/sysemu/memory.h"
#include "exec/ram_addr.h"
#include "hw/hw.h"
@@ -27,7 +27,7 @@
#include "qemu/module.h"
#include "qemu/range.h"
#include "exec/sysemu/memory.h"
-#include "exec/address-spaces.h"
+#include "exec/sysemu/address-spaces.h"
#include "qemu/queue.h"
#include "hw/sysbus.h"
#include "trace.h"
@@ -23,7 +23,7 @@
#include "hw/boards.h"
#include "sysemu/balloon.h"
#include "hw/virtio/virtio-balloon.h"
-#include "exec/address-spaces.h"
+#include "exec/sysemu/address-spaces.h"
#include "qapi/error.h"
#include "qapi/qapi-events-machine.h"
#include "qapi/visitor.h"
@@ -28,7 +28,7 @@
#include "qapi/error.h"
#include "hw/virtio/virtio-bus.h"
#include "hw/virtio/virtio.h"
-#include "exec/address-spaces.h"
+#include "exec/sysemu/address-spaces.h"
/* #define DEBUG_VIRTIO_BUS */
@@ -144,7 +144,7 @@ typedef struct GuestFD {
static GArray *guestfd_array;
#ifndef CONFIG_USER_ONLY
-#include "exec/address-spaces.h"
+#include "exec/sysemu/address-spaces.h"
/*
* Find the base of a RAM region containing the specified address
*/
@@ -29,7 +29,7 @@
#include "cpu.h"
#include "exec/ioport.h"
#include "exec/sysemu/memory.h"
-#include "exec/address-spaces.h"
+#include "exec/sysemu/address-spaces.h"
#include "trace.h"
typedef struct MemoryRegionPortioList {
@@ -16,7 +16,7 @@
#include "sysemu/memory_mapping.h"
#include "exec/sysemu/memory.h"
-#include "exec/address-spaces.h"
+#include "exec/sysemu/address-spaces.h"
//#define DEBUG_GUEST_PHYS_REGION_ADD
@@ -28,7 +28,7 @@
#include "internals.h"
#include "hw/pci/pci.h"
#include "exec/memattrs.h"
-#include "exec/address-spaces.h"
+#include "exec/sysemu/address-spaces.h"
#include "hw/boards.h"
#include "hw/irq.h"
#include "qemu/log.h"
@@ -22,7 +22,7 @@
#include "cpu.h"
#include "hw/core/tcg-cpu-ops.h"
#include "exec/exec-all.h"
-#include "exec/address-spaces.h"
+#include "exec/sysemu/address-spaces.h"
#include "exec/helper-proto.h"
bool avr_cpu_exec_interrupt(CPUState *cs, int interrupt_request)
@@ -29,7 +29,7 @@
#include "qapi/qapi-commands-machine-target.h"
#include "hw/qdev-properties.h"
-#include "exec/address-spaces.h"
+#include "exec/sysemu/address-spaces.h"
#include "hw/i386/apic_internal.h"
#include "cpu-internal.h"
@@ -34,7 +34,7 @@
#include "hw/qdev-properties.h"
#include "hw/i386/topology.h"
#ifndef CONFIG_USER_ONLY
-#include "exec/address-spaces.h"
+#include "exec/sysemu/address-spaces.h"
#include "hw/boards.h"
#endif
@@ -25,7 +25,7 @@
#include "qemu/osdep.h"
#include "cpu.h"
-#include "exec/address-spaces.h"
+#include "exec/sysemu/address-spaces.h"
#include "qemu-common.h"
#include "qemu/accel.h"
@@ -10,7 +10,7 @@
#include "qemu/osdep.h"
#include "cpu.h"
-#include "exec/address-spaces.h"
+#include "exec/sysemu/address-spaces.h"
#include "qemu/error-report.h"
#include "hax-accel-ops.h"
@@ -9,7 +9,7 @@
#include "qemu/osdep.h"
#include "cpu.h"
-#include "exec/address-spaces.h"
+#include "exec/sysemu/address-spaces.h"
#include "exec/ioport.h"
#include "qemu-common.h"
#include "qemu/accel.h"
@@ -22,7 +22,7 @@
#include "cpu.h"
#include "exec/helper-proto.h"
#include "exec/cpu_ldst.h"
-#include "exec/address-spaces.h"
+#include "exec/sysemu/address-spaces.h"
#include "tcg/helper-tcg.h"
void helper_outb(CPUX86State *env, uint32_t port, uint32_t data)
@@ -23,7 +23,7 @@
#include "sysemu/sysemu.h"
#include "qemu/units.h"
-#include "exec/address-spaces.h"
+#include "exec/sysemu/address-spaces.h"
#include "tcg/tcg-cpu.h"
@@ -10,7 +10,7 @@
#include "qemu/osdep.h"
#include "cpu.h"
-#include "exec/address-spaces.h"
+#include "exec/sysemu/address-spaces.h"
#include "exec/ioport.h"
#include "qemu-common.h"
#include "qemu/accel.h"
@@ -26,9 +26,9 @@
#include "exec/exec-all.h"
#include "exec/cpu_ldst.h"
#include "hw/s390x/ioinst.h"
-#include "exec/address-spaces.h"
#include "tcg_s390x.h"
#ifndef CONFIG_USER_ONLY
+#include "exec/sysemu/address-spaces.h"
#include "hw/s390x/s390_flic.h"
#include "hw/boards.h"
#endif
@@ -17,7 +17,7 @@
#include "qemu/osdep.h"
#include "qemu/error-report.h"
-#include "exec/address-spaces.h"
+#include "exec/sysemu/address-spaces.h"
#include "cpu.h"
#include "internal.h"
#include "kvm_s390x.h"
@@ -13,7 +13,7 @@
#include "internal.h"
#include "sysemu/hw_accel.h"
#include "sysemu/runstate.h"
-#include "exec/address-spaces.h"
+#include "exec/sysemu/address-spaces.h"
#include "exec/exec-all.h"
#include "sysemu/tcg.h"
#include "trace.h"
@@ -31,7 +31,7 @@
#include "exec/helper-proto.h"
#include "qemu/host-utils.h"
#include "exec/exec-all.h"
-#include "exec/address-spaces.h"
+#include "exec/sysemu/address-spaces.h"
static void tb_invalidate_virtual_addr(CPUXtensaState *env, uint32_t vaddr)
{
To make it clearer the address-spaces.h header is sysemu specific, move it to the sysemu/ directory. Patch created mechanically using: $ sed -i s,exec/address-spaces.h,exec/sysemu/address-spaces.h, $(git grep -l exec/address-spaces.h) Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> --- hw/net/i82596.h | 2 +- hw/s390x/ipl.h | 2 +- hw/tpm/tpm_ppi.h | 2 +- include/exec/{ => sysemu}/address-spaces.h | 12 ++++++------ include/hw/nubus/nubus.h | 2 +- include/hw/tricore/triboard.h | 2 +- include/sysemu/dma.h | 2 +- target/i386/hvf/vmx.h | 2 +- cpu.c | 2 +- hw/arm/collie.c | 2 +- hw/arm/exynos4_boards.c | 2 +- hw/arm/fsl-imx31.c | 2 +- hw/arm/gumstix.c | 2 +- hw/arm/integratorcp.c | 2 +- hw/arm/kzm.c | 2 +- hw/arm/mainstone.c | 2 +- hw/arm/microbit.c | 2 +- hw/arm/mps2-tz.c | 2 +- hw/arm/mps2.c | 2 +- hw/arm/msf2-soc.c | 2 +- hw/arm/msf2-som.c | 2 +- hw/arm/musca.c | 2 +- hw/arm/omap1.c | 2 +- hw/arm/omap2.c | 2 +- hw/arm/omap_sx1.c | 2 +- hw/arm/orangepi.c | 2 +- hw/arm/spitz.c | 2 +- hw/arm/stellaris.c | 2 +- hw/arm/stm32f205_soc.c | 2 +- hw/arm/stm32f405_soc.c | 2 +- hw/arm/tosa.c | 2 +- hw/arm/z2.c | 2 +- hw/avr/atmega.c | 2 +- hw/char/goldfish_tty.c | 2 +- hw/char/omap_uart.c | 2 +- hw/core/null-machine.c | 2 +- hw/core/sysbus.c | 2 +- hw/dma/etraxfs_dma.c | 2 +- hw/dma/rc4030.c | 2 +- hw/hyperv/hyperv.c | 2 +- hw/input/lasips2.c | 2 +- hw/microblaze/petalogix_ml605_mmu.c | 2 +- hw/microblaze/petalogix_s3adsp1800_mmu.c | 2 +- hw/microblaze/xlnx-zynqmp-pmu.c | 2 +- hw/misc/allwinner-h3-dramc.c | 2 +- hw/misc/omap_gpmc.c | 2 +- hw/nios2/10m50_devboard.c | 2 +- hw/nios2/generic_nommu.c | 2 +- hw/pci-host/mv64361.c | 2 +- hw/ppc/pegasos2.c | 2 +- hw/ppc/ppc405_uc.c | 2 +- hw/ppc/ppc4xx_devs.c | 2 +- hw/ppc/prep_systemio.c | 2 +- hw/ppc/rs6000_mc.c | 2 +- hw/ppc/spapr_ovec.c | 2 +- hw/riscv/shakti_c.c | 2 +- hw/s390x/css.c | 2 +- hw/sparc/sun4m_iommu.c | 2 +- hw/sparc64/sun4u_iommu.c | 2 +- hw/timer/hpet.c | 2 +- hw/vfio/ap.c | 2 +- hw/vfio/ccw.c | 2 +- hw/vfio/common.c | 2 +- hw/vfio/platform.c | 2 +- hw/virtio/virtio-balloon.c | 2 +- hw/virtio/virtio-bus.c | 2 +- semihosting/arm-compat-semi.c | 2 +- softmmu/ioport.c | 2 +- softmmu/memory_mapping.c | 2 +- target/arm/kvm.c | 2 +- target/avr/helper.c | 2 +- target/i386/cpu-sysemu.c | 2 +- target/i386/cpu.c | 2 +- target/i386/hax/hax-all.c | 2 +- target/i386/hax/hax-mem.c | 2 +- target/i386/nvmm/nvmm-all.c | 2 +- target/i386/tcg/sysemu/misc_helper.c | 2 +- target/i386/tcg/sysemu/tcg-cpu.c | 2 +- target/i386/whpx/whpx-all.c | 2 +- target/s390x/excp_helper.c | 2 +- target/s390x/mmu_helper.c | 2 +- target/s390x/sigp.c | 2 +- target/xtensa/dbg_helper.c | 2 +- 83 files changed, 88 insertions(+), 88 deletions(-) rename include/exec/{ => sysemu}/address-spaces.h (84%)