@@ -41,7 +41,7 @@
#include "sysemu/kvm.h"
#include "migration/migration.h"
#include "hw/i386/smbios.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#include "hw/audio/pcspk.h"
#include "migration/page_cache.h"
#include "qemu/config-file.h"
@@ -20,8 +20,8 @@
#include "config.h"
#include "cpu.h"
#include "exec/exec-all.h"
-#include "exec/memory.h"
-#include "exec/address-spaces.h"
+#include "hw/memory.h"
+#include "hw/address-spaces.h"
#include "exec/cputlb.h"
@@ -34,9 +34,9 @@
#include "hw/xen/xen.h"
#include "qemu/timer.h"
#include "qemu/config-file.h"
-#include "exec/memory.h"
+#include "hw/memory.h"
#include "sysemu/dma.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#if defined(CONFIG_USER_ONLY)
#include <qemu.h>
#else /* !CONFIG_USER_ONLY */
@@ -30,7 +30,7 @@
#include "sysemu/sysemu.h"
#include "hw/acpi/acpi.h"
#include "sysemu/kvm.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#include "hw/i386/ich9.h"
@@ -26,9 +26,9 @@
#include "hw/acpi/acpi.h"
#include "sysemu/sysemu.h"
#include "qemu/range.h"
-#include "exec/ioport.h"
+#include "hw/ioport.h"
#include "hw/nvram/fw_cfg.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
//#define DEBUG
@@ -11,7 +11,7 @@
#include "hw/devices.h"
#include "sysemu/sysemu.h"
#include "alpha_sys.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#define TYPE_TYPHOON_PCI_HOST_BRIDGE "typhoon-pcihost"
@@ -16,7 +16,7 @@
#include "hw/arm/arm.h"
#include "hw/block/flash.h"
#include "sysemu/blockdev.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
static struct arm_boot_info collie_binfo = {
.loader_start = SA_SDCS0,
@@ -25,7 +25,7 @@
#include "hw/sysbus.h"
#include "net/net.h"
#include "hw/arm/arm.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#include "hw/arm/exynos4210.h"
#include "hw/boards.h"
@@ -41,7 +41,7 @@
#include "hw/devices.h"
#include "hw/boards.h"
#include "sysemu/blockdev.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
static const int sector_len = 128 * 1024;
@@ -26,7 +26,7 @@
#include "hw/boards.h"
#include "hw/sysbus.h"
#include "sysemu/blockdev.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#define SMP_BOOT_ADDR 0x100
#define SMP_BOOT_REG 0x40
@@ -12,7 +12,7 @@
#include "hw/boards.h"
#include "hw/arm/arm.h"
#include "net/net.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#include "sysemu/sysemu.h"
typedef struct {
@@ -14,7 +14,7 @@
*/
#include "hw/sysbus.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#include "hw/hw.h"
#include "hw/arm/arm.h"
#include "hw/devices.h"
@@ -20,7 +20,7 @@
#include "hw/block/flash.h"
#include "sysemu/blockdev.h"
#include "hw/sysbus.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
/* Device addresses */
#define MST_FPGA_PHYS 0x08000000
@@ -23,7 +23,7 @@
#include "ui/console.h"
#include "hw/i2c/i2c.h"
#include "sysemu/blockdev.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#include "ui/pixel_ops.h"
#define MP_MISC_BASE 0x80002000
@@ -33,7 +33,7 @@
#include "hw/loader.h"
#include "sysemu/blockdev.h"
#include "hw/sysbus.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
/* Nokia N8x0 support */
struct n800_s {
@@ -32,7 +32,7 @@
#include "hw/arm/arm.h"
#include "hw/block/flash.h"
#include "sysemu/blockdev.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
/*****************************************************************************/
/* Siemens SX1 Cellphone V1 */
@@ -25,7 +25,7 @@
#include "hw/arm/arm.h"
#include "hw/devices.h"
#include "hw/loader.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
static uint32_t static_readb(void *opaque, hwaddr offset)
{
@@ -17,7 +17,7 @@
#include "hw/boards.h"
#include "hw/i2c/i2c.h"
#include "sysemu/blockdev.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#define SMP_BOOT_ADDR 0xe0000000
#define SMP_BOOTREG_ADDR 0x10000030
@@ -27,7 +27,7 @@
#include "hw/boards.h"
#include "sysemu/blockdev.h"
#include "hw/sysbus.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#undef REG_FMT
#define REG_FMT "0x%02lx"
@@ -15,7 +15,7 @@
#include "hw/i2c/i2c.h"
#include "net/net.h"
#include "hw/boards.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#define GPIO_A 0
#define GPIO_B 1
@@ -1,7 +1,7 @@
#ifndef _STRONGARM_H
#define _STRONGARM_H
-#include "exec/memory.h"
+#include "hw/memory.h"
#define SA_CS0 0x00000000
#define SA_CS1 0x08000000
@@ -23,7 +23,7 @@
#include "hw/ssi.h"
#include "sysemu/blockdev.h"
#include "hw/sysbus.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#define TOSA_RAM 0x04000000
#define TOSA_ROM 0x00800000
@@ -16,7 +16,7 @@
#include "hw/i2c/i2c.h"
#include "hw/boards.h"
#include "sysemu/blockdev.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#include "hw/block/flash.h"
#define VERSATILE_FLASH_ADDR 0x34000000
@@ -28,7 +28,7 @@
#include "net/net.h"
#include "sysemu/sysemu.h"
#include "hw/boards.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#include "sysemu/blockdev.h"
#include "hw/block/flash.h"
@@ -18,7 +18,7 @@
#include "hw/sysbus.h"
#include "hw/arm/arm.h"
#include "net/net.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#include "sysemu/sysemu.h"
#include "hw/boards.h"
#include "hw/block/flash.h"
@@ -23,7 +23,7 @@
#include "sysemu/blockdev.h"
#include "ui/console.h"
#include "audio/audio.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#ifdef DEBUG_Z2
#define DPRINTF(fmt, ...) \
@@ -23,8 +23,8 @@
#include "hw/block/flash.h"
#include "hw/irq.h"
#include "sysemu/blockdev.h"
-#include "exec/memory.h"
-#include "exec/address-spaces.h"
+#include "hw/memory.h"
+#include "hw/address-spaces.h"
#include "hw/sysbus.h"
#include "qemu/error-report.h"
@@ -40,7 +40,7 @@
#include "hw/block/flash.h"
#include "block/block.h"
#include "qemu/timer.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#include "qemu/host-utils.h"
#include "hw/sysbus.h"
@@ -39,7 +39,7 @@
#include "hw/block/flash.h"
#include "qemu/timer.h"
#include "block/block.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#include "qemu/host-utils.h"
#include "hw/sysbus.h"
@@ -8,7 +8,7 @@
#include "hw/hw.h"
#include "hw/m68k/mcf.h"
#include "sysemu/char.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
typedef struct {
MemoryRegion iomem;
@@ -21,7 +21,7 @@
#include "hw/hw.h"
#include "hw/arm/omap.h"
#include "hw/char/serial.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
/* UARTs */
struct omap_uart_s {
@@ -26,7 +26,7 @@
#include "hw/char/serial.h"
#include "sysemu/char.h"
#include "qemu/timer.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
//#define DEBUG_SERIAL
@@ -27,7 +27,7 @@
#include "hw/hw.h"
#include "hw/sh4/sh.h"
#include "sysemu/char.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
//#define DEBUG_SERIAL
@@ -49,8 +49,8 @@
#include "uboot_image.h"
#include "hw/loader.h"
#include "hw/nvram/fw_cfg.h"
-#include "exec/memory.h"
-#include "exec/address-spaces.h"
+#include "hw/memory.h"
+#include "hw/address-spaces.h"
#include <zlib.h>
@@ -19,7 +19,7 @@
#include "hw/sysbus.h"
#include "monitor/monitor.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
static void sysbus_dev_print(Monitor *mon, DeviceState *dev, int indent);
static char *sysbus_get_fw_dev_path(DeviceState *dev);
@@ -31,7 +31,7 @@
#include "elf.h"
#include "boot.h"
#include "sysemu/blockdev.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#define D(x)
#define DNAND(x)
@@ -1,7 +1,7 @@
#ifndef QEMU_FRAMEBUFFER_H
#define QEMU_FRAMEBUFFER_H
-#include "exec/memory.h"
+#include "hw/memory.h"
/* Framebuffer device helper routines. */
@@ -26,7 +26,7 @@
#include <hw/hw.h>
#include "qapi/error.h"
-#include "exec/memory.h"
+#include "hw/memory.h"
#define ST01_V_RETRACE 0x08
#define ST01_DISP_ENABLE 0x01
@@ -24,7 +24,7 @@
#include <stdio.h>
#include <sys/time.h>
#include "hw/hw.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#include "qemu-common.h"
#include "sysemu/sysemu.h"
@@ -47,8 +47,8 @@
#include "sysemu/blockdev.h"
#include "hw/block/block.h"
#include "ui/qemu-spice.h"
-#include "exec/memory.h"
-#include "exec/address-spaces.h"
+#include "hw/memory.h"
+#include "hw/address-spaces.h"
#include "sysemu/arch_init.h"
#include "qemu/bitmap.h"
#include "qemu/config-file.h"
@@ -41,8 +41,8 @@
#include "sysemu/blockdev.h"
#include "hw/i2c/smbus.h"
#include "hw/xen/xen.h"
-#include "exec/memory.h"
-#include "exec/address-spaces.h"
+#include "hw/memory.h"
+#include "hw/address-spaces.h"
#include "cpu.h"
#ifdef CONFIG_XEN
# include <xen/hvm/hvm_info_table.h>
@@ -36,7 +36,7 @@
#include "sysemu/kvm.h"
#include "hw/kvm/clock.h"
#include "hw/pci-host/q35.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#include "hw/i386/ich9.h"
#include "hw/ide/pci.h"
#include "hw/ide/ahci.h"
@@ -13,7 +13,7 @@
#include "hw/sysbus.h"
#include "qemu/timer.h"
#include "hw/arm/arm.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#include "gic_internal.h"
typedef struct {
@@ -21,7 +21,7 @@
#include "hw/sysbus.h"
#include "sysemu/sysemu.h"
#include "hw/isa/isa.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
static ISABus *isabus;
hwaddr isa_mem_base = 0;
@@ -24,7 +24,7 @@
#include "hw/hw.h"
#include "hw/isa/isa.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
static void isa_mmio_writeb (void *opaque, hwaddr addr,
uint32_t val)
@@ -42,7 +42,7 @@
#include "hw/acpi/acpi.h"
#include "hw/acpi/ich9.h"
#include "hw/pci/pci_bus.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#include "sysemu/sysemu.h"
static int ich9_lpc_sci_irq(ICH9LPCState *lpc);
@@ -24,7 +24,7 @@
#include "hw/i2c/pm_smbus.h"
#include "sysemu/sysemu.h"
#include "qemu/timer.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
//#define DEBUG_VT82C686B
@@ -27,7 +27,7 @@
#include "elf.h"
#include "lm32_hwsetup.h"
#include "lm32.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
typedef struct {
LM32CPU *cpu;
@@ -28,7 +28,7 @@
#include "sysemu/blockdev.h"
#include "milkymist-hw.h"
#include "lm32.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#define BIOS_FILENAME "mmone-bios.bin"
#define BIOS_OFFSET 0x00860000
@@ -11,7 +11,7 @@
#include "hw/boards.h"
#include "hw/loader.h"
#include "elf.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#define KERNEL_LOAD_ADDR 0x10000
#define AN5206_MBAR_ADDR 0x10000000
@@ -10,7 +10,7 @@
#include "hw/boards.h"
#include "hw/loader.h"
#include "elf.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#define KERNEL_LOAD_ADDR 0x10000
@@ -10,7 +10,7 @@
#include "qemu/timer.h"
#include "hw/ptimer.h"
#include "sysemu/sysemu.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
/* General purpose timer module. */
typedef struct {
@@ -14,7 +14,7 @@
#include "hw/boards.h"
#include "hw/loader.h"
#include "elf.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#define SYS_FREQ 66000000
@@ -7,7 +7,7 @@
*/
#include "hw/hw.h"
#include "hw/m68k/mcf.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
typedef struct {
MemoryRegion iomem;
@@ -35,7 +35,7 @@
#include "hw/xilinx.h"
#include "sysemu/blockdev.h"
#include "hw/char/serial.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#include "hw/ssi.h"
#include "boot.h"
@@ -32,7 +32,7 @@
#include "hw/boards.h"
#include "hw/xilinx.h"
#include "sysemu/blockdev.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#include "boot.h"
#include "pic_cpu.h"
@@ -27,7 +27,7 @@
#include "hw/pci/pci.h"
#include "hw/pci/pci_host.h"
#include "hw/i386/pc.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
//#define DEBUG
@@ -42,7 +42,7 @@
#include "hw/timer/mc146818rtc.h"
#include "hw/timer/i8254.h"
#include "sysemu/blockdev.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#define DEBUG_FULONG2E_INIT
@@ -41,7 +41,7 @@
#include "hw/audio/pcspk.h"
#include "sysemu/blockdev.h"
#include "hw/sysbus.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
enum jazz_model_e
{
@@ -46,7 +46,7 @@
#include "hw/timer/mc146818rtc.h"
#include "hw/timer/i8254.h"
#include "sysemu/blockdev.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#include "hw/sysbus.h" /* SysBusDevice */
//#define DEBUG_BOARD_INIT
@@ -36,7 +36,7 @@
#include "hw/loader.h"
#include "elf.h"
#include "hw/sysbus.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
static struct _loaderparams {
int ram_size;
@@ -25,7 +25,7 @@
#include "hw/timer/mc146818rtc.h"
#include "hw/timer/i8254.h"
#include "sysemu/blockdev.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#define MAX_IDE_BUS 2
@@ -21,8 +21,8 @@
#include "hw/hw.h"
#include "hw/block/flash.h"
#include "hw/arm/omap.h"
-#include "exec/memory.h"
-#include "exec/address-spaces.h"
+#include "hw/memory.h"
+#include "hw/address-spaces.h"
/* General-Purpose Memory Controller */
struct omap_gpmc_s {
@@ -27,8 +27,8 @@
#include <unistd.h>
#include "config.h"
-#include "exec/address-spaces.h"
-#include "exec/memory.h"
+#include "hw/address-spaces.h"
+#include "hw/memory.h"
#include "hw/pci/msi.h"
#include "hw/pci/msix.h"
#include "hw/pci/pci.h"
@@ -33,7 +33,7 @@
#include "hw/boards.h"
#include "hw/loader.h"
#include "hw/char/serial.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#define PHYS_MEM_BASE 0x80000000
@@ -10,7 +10,7 @@
#include "hw/m68k/mcf.h"
/* For crc32 */
#include <zlib.h>
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
//#define DEBUG_FEC 1
@@ -27,7 +27,7 @@
#include "hw/qdev.h"
#include "net/net.h"
#include "ne2000.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
typedef struct ISANE2000State {
ISADevice dev;
@@ -7,7 +7,7 @@
#define PCNET_LOOPTEST_CRC 1
#define PCNET_LOOPTEST_NOCRC 2
-#include "exec/memory.h"
+#include "hw/memory.h"
/* BUS CONFIGURATION REGISTERS */
#define BCR_MSRDA 0
@@ -24,7 +24,7 @@
#include "hw/char/serial.h"
#include "net/net.h"
#include "hw/loader.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#include "sysemu/sysemu.h"
#include "hw/sysbus.h"
#include "sysemu/qtest.h"
@@ -24,7 +24,7 @@
#include "hw/pci/msi.h"
#include "hw/pci/shpc.h"
#include "hw/pci/slotid_cap.h"
-#include "exec/memory.h"
+#include "hw/memory.h"
#include "hw/pci/pci_bus.h"
struct PCIBridgeDev {
@@ -33,7 +33,7 @@
#include "hw/pci/pci_bus.h"
#include "hw/pci-host/apb.h"
#include "sysemu/sysemu.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
/* debug APB */
//#define DEBUG_APB
@@ -45,7 +45,7 @@
#include "hw/mips/mips.h"
#include "hw/pci/pci_host.h"
#include "sysemu/sysemu.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
//#define DEBUG_BONITO
@@ -317,7 +317,7 @@ static const VMStateDescription vmstate_ppce500_pci = {
}
};
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
static int e500_pcihost_bridge_initfn(PCIDevice *d)
{
@@ -28,7 +28,7 @@
#include "hw/pci/pci_bus.h"
#include "hw/pci/pci_host.h"
#include "hw/i386/pc.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#define TYPE_RAVEN_PCI_DEVICE "raven"
#define TYPE_RAVEN_PCI_HOST_BRIDGE "raven-pcihost"
@@ -10,7 +10,7 @@
#include "hw/sysbus.h"
#include "hw/pci/pci.h"
#include "hw/pci/pci_host.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
typedef struct {
SysBusDevice busdev;
@@ -33,7 +33,7 @@
#include "qmp-commands.h"
#include "hw/pci/msi.h"
#include "hw/pci/msix.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
//#define DEBUG_PCI
#ifdef DEBUG_PCI
@@ -22,7 +22,7 @@
#include "hw/hw.h"
#include "hw/pci/pci.h"
#include "hw/pci/pcie_host.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
/*
* PCI express mmcfig address
@@ -33,7 +33,7 @@
#include "hw/loader.h"
#include "elf.h"
#include "hw/sysbus.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#include "qemu/host-utils.h"
#include "hw/pci-host/ppce500.h"
@@ -25,7 +25,7 @@
#if !defined(__PPC_MAC_H__)
#define __PPC_MAC_H__
-#include "exec/memory.h"
+#include "hw/memory.h"
#include "hw/sysbus.h"
#include "hw/ide/internal.h"
#include "hw/input/adb.h"
@@ -66,7 +66,7 @@
#include "kvm_ppc.h"
#include "hw/usb.h"
#include "sysemu/blockdev.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#include "hw/sysbus.h"
#define MAX_IDE_BUS 2
@@ -41,7 +41,7 @@
#include "sysemu/kvm.h"
#include "kvm_ppc.h"
#include "sysemu/blockdev.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#define MAX_IDE_BUS 2
#define CFG_ADDR 0xf0000510
@@ -32,7 +32,7 @@
#include "qemu/log.h"
#include "hw/loader.h"
#include "sysemu/blockdev.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#define BIOS_FILENAME "ppc405_rom.bin"
#define BIOS_SIZE (2048 * 1024)
@@ -28,7 +28,7 @@
#include "qemu/timer.h"
#include "sysemu/sysemu.h"
#include "qemu/log.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#define DEBUG_OPBA
#define DEBUG_SDRAM
@@ -22,7 +22,7 @@
#include "sysemu/device_tree.h"
#include "hw/loader.h"
#include "elf.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#include "hw/char/serial.h"
#include "hw/ppc/ppc.h"
#include "ppc405.h"
@@ -25,7 +25,7 @@
#include "hw/ppc/ppc.h"
#include "hw/ppc/ppc4xx.h"
#include "qemu/log.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
//#define DEBUG_MMIO
//#define DEBUG_UNASSIGNED
@@ -24,7 +24,7 @@
#include "hw/ppc/ppc4xx.h"
#include "hw/pci/pci.h"
#include "hw/pci/pci_host.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#undef DEBUG
#ifdef DEBUG
@@ -40,7 +40,7 @@
#include "hw/isa/pc87312.h"
#include "sysemu/blockdev.h"
#include "sysemu/arch_init.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
//#define HARD_DEBUG_PPC_IO
//#define DEBUG_PPC_IO
@@ -47,7 +47,7 @@
#include "kvm_ppc.h"
#include "hw/pci/pci.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#include "hw/usb.h"
#include "qemu/config-file.h"
@@ -21,7 +21,7 @@
#include "hw/qdev.h"
#include "kvm_ppc.h"
#include "sysemu/dma.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#include "hw/ppc/spapr.h"
@@ -29,7 +29,7 @@
#include "hw/pci/pci_host.h"
#include "hw/ppc/spapr.h"
#include "hw/pci-host/spapr.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#include <libfdt.h>
#include "trace.h"
@@ -33,7 +33,7 @@
#include "hw/loader.h"
#include "elf.h"
#include "qemu/log.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#include "hw/ppc/ppc.h"
#include "hw/ppc/ppc4xx.h"
@@ -10,7 +10,7 @@
*/
#include "hw/boards.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#include "s390-virtio.h"
#include "hw/s390x/sclp.h"
#include "ioinst.h"
@@ -32,7 +32,7 @@
#include "hw/virtio/virtio.h"
#include "hw/sysbus.h"
#include "sysemu/kvm.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#include "hw/s390x/s390-virtio-bus.h"
#include "hw/s390x/sclp.h"
@@ -14,7 +14,7 @@
#include "cpu.h"
#include "sysemu/kvm.h"
-#include "exec/memory.h"
+#include "hw/memory.h"
#include "hw/s390x/sclp.h"
@@ -37,7 +37,7 @@
#include "hw/usb.h"
#include "hw/block/flash.h"
#include "sysemu/blockdev.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#define FLASH_BASE 0x00000000
#define FLASH_SIZE 0x02000000
@@ -30,7 +30,7 @@
#include "sh7750_regnames.h"
#include "hw/sh4/sh_intc.h"
#include "cpu.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#define NB_DEVICES 4
@@ -26,7 +26,7 @@
#include "hw/pci/pci.h"
#include "hw/pci/pci_host.h"
#include "qemu/bswap.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
typedef struct SHPCIState {
SysBusDevice busdev;
@@ -32,7 +32,7 @@
#include "sysemu/sysemu.h"
#include "hw/boards.h"
#include "hw/loader.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#define BIOS_FILENAME "shix_bios.bin"
#define BIOS_ADDRESS 0xA0000000
@@ -30,7 +30,7 @@
#include "hw/loader.h"
#include "elf.h"
#include "trace.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#include "hw/sparc/grlib.h"
@@ -39,7 +39,7 @@
#include "hw/loader.h"
#include "elf.h"
#include "sysemu/blockdev.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
//#define DEBUG_IRQ
//#define DEBUG_EBUS
@@ -27,7 +27,7 @@
#include "sysemu/sysemu.h"
#include "hw/sysbus.h"
#include "hw/isa/isa.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
//#define DEBUG_NVRAM
@@ -11,7 +11,7 @@
#include "hw/hw.h"
#include "hw/sh4/sh.h"
#include "qemu/timer.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#include "hw/ptimer.h"
//#define DEBUG_TIMER
@@ -12,7 +12,7 @@
#ifndef TPM_TPM_INT_H
#define TPM_TPM_INT_H
-#include "exec/memory.h"
+#include "hw/memory.h"
#include "tpm_tis.h"
/* overall state of the TPM interface */
@@ -22,7 +22,7 @@
#include "sysemu/tpm_backend.h"
#include "tpm_int.h"
#include "block/block.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#include "hw/hw.h"
#include "hw/i386/pc.h"
#include "hw/pci/pci_ids.h"
@@ -12,7 +12,7 @@
#include "qemu-common.h"
#include "ui/console.h"
#include "elf.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#include "hw/sysbus.h"
#include "hw/boards.h"
#include "hw/loader.h"
@@ -11,7 +11,7 @@
*
*/
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#include "hw/virtio/dataplane/hostmem.h"
static int hostmem_lookup_cmp(const void *phys_, const void *region_)
@@ -18,7 +18,7 @@
#include "hw/hw.h"
#include "qemu/range.h"
#include <linux/vhost.h>
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
static void vhost_dev_sync_region(struct vhost_dev *dev,
MemoryRegionSection *section,
@@ -22,7 +22,7 @@
#include "sysemu/balloon.h"
#include "hw/virtio/virtio-balloon.h"
#include "sysemu/kvm.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#include "qapi/visitor.h"
#if defined(__linux__)
@@ -32,7 +32,7 @@
#include "hw/xen/xen_common.h"
#include "hw/xen/xen_backend.h"
#include "trace.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#include <xenguest.h>
@@ -59,7 +59,7 @@
#include "hw/xen/xen_backend.h"
#include "xen_pt.h"
#include "qemu/range.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#define XEN_PT_NR_IRQS (256)
static uint8_t xen_pt_mapped_machine_irq[XEN_PT_NR_IRQS] = {0};
@@ -29,8 +29,8 @@
#include "hw/boards.h"
#include "hw/loader.h"
#include "elf.h"
-#include "exec/memory.h"
-#include "exec/address-spaces.h"
+#include "hw/memory.h"
+#include "hw/address-spaces.h"
#include "hw/char/serial.h"
#include "net/net.h"
#include "hw/sysbus.h"
@@ -29,8 +29,8 @@
#include "hw/boards.h"
#include "hw/loader.h"
#include "elf.h"
-#include "exec/memory.h"
-#include "exec/address-spaces.h"
+#include "hw/memory.h"
+#include "hw/address-spaces.h"
static uint64_t translate_phys_addr(void *env, uint64_t addr)
{
@@ -22,7 +22,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
#include "qemu/timer.h"
-#include "exec/memory.h"
+#include "hw/memory.h"
#define DATA_SIZE (1 << SHIFT)
similarity index 97%
rename from include/exec/address-spaces.h
rename to include/hw/address-spaces.h
@@ -19,7 +19,7 @@
* you're one of them.
*/
-#include "exec/memory.h"
+#include "hw/memory.h"
#ifndef CONFIG_USER_ONLY
@@ -11,7 +11,7 @@
#ifndef ARM_MISC_H
#define ARM_MISC_H 1
-#include "exec/memory.h"
+#include "hw/memory.h"
#include "hw/irq.h"
/* The CPU is also modelled as an interrupt controller. */
@@ -27,7 +27,7 @@
#define EXYNOS4210_H_
#include "qemu-common.h"
-#include "exec/memory.h"
+#include "hw/memory.h"
#define EXYNOS4210_NCPUS 2
@@ -17,7 +17,7 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#ifndef hw_omap_h
-#include "exec/memory.h"
+#include "hw/memory.h"
# define hw_omap_h "omap.h"
#include "hw/irq.h"
@@ -9,7 +9,7 @@
#ifndef PXA_H
# define PXA_H "pxa.h"
-#include "exec/memory.h"
+#include "hw/memory.h"
/* Interrupt numbers */
# define PXA2XX_PIC_SSP3 0
@@ -22,7 +22,7 @@
#define HW_SOC_DMA_H 1
-#include "exec/memory.h"
+#include "hw/memory.h"
#include "hw/irq.h"
struct soc_dma_s;
@@ -3,7 +3,7 @@
/* NOR flash devices */
-#include "exec/memory.h"
+#include "hw/memory.h"
typedef struct pflash_t pflash_t;
@@ -27,7 +27,7 @@
#include "hw/hw.h"
#include "sysemu/sysemu.h"
-#include "exec/memory.h"
+#include "hw/memory.h"
#define UART_FIFO_LENGTH 16 /* 16550A Fifo Length */
@@ -8,7 +8,7 @@
#include "exec/cpu-common.h"
#endif
-#include "exec/ioport.h"
+#include "hw/ioport.h"
#include "hw/irq.h"
#include "block/aio.h"
#include "migration/qemu-file.h"
@@ -20,7 +20,7 @@
#ifndef QEMU_APIC_INTERNAL_H
#define QEMU_APIC_INTERNAL_H
-#include "exec/memory.h"
+#include "hw/memory.h"
#include "hw/sysbus.h"
#include "qemu/timer.h"
@@ -23,7 +23,7 @@
#define QEMU_IOAPIC_INTERNAL_H
#include "hw/hw.h"
-#include "exec/memory.h"
+#include "hw/memory.h"
#include "hw/sysbus.h"
#define MAX_IOAPICS 1
@@ -2,12 +2,12 @@
#define HW_PC_H
#include "qemu-common.h"
-#include "exec/memory.h"
-#include "exec/ioport.h"
+#include "hw/memory.h"
+#include "hw/ioport.h"
#include "hw/isa/isa.h"
#include "hw/block/fdc.h"
#include "net/net.h"
-#include "exec/memory.h"
+#include "hw/memory.h"
#include "hw/i386/ioapic.h"
/* PC-style peripherals (also used by other machines). */
@@ -3,7 +3,7 @@
#include "hw/isa/isa.h"
#include "hw/pci/pci.h"
-#include "exec/memory.h"
+#include "hw/memory.h"
#define MAX_IDE_DEVS 2
similarity index 99%
rename from include/exec/ioport.h
rename to include/hw/ioport.h
@@ -25,7 +25,7 @@
#define IOPORT_H
#include "qemu-common.h"
-#include "exec/iorange.h"
+#include "hw/iorange.h"
typedef uint32_t pio_addr_t;
#define FMT_pioaddr PRIx32
similarity index 100%
rename from include/exec/iorange.h
rename to include/hw/iorange.h
@@ -4,7 +4,7 @@
#include <stdint.h>
#include "qemu-common.h"
#include "hw/hw.h"
-#include "exec/memory.h"
+#include "hw/memory.h"
typedef void (*apm_ctrl_changed_t)(uint32_t val, void *arg);
@@ -3,8 +3,8 @@
/* ISA bus */
-#include "exec/ioport.h"
-#include "exec/memory.h"
+#include "hw/ioport.h"
+#include "hw/memory.h"
#include "hw/qdev.h"
#define ISA_NUM_IRQS 16
similarity index 99%
rename from include/exec/memory.h
rename to include/hw/memory.h
@@ -22,8 +22,8 @@
#include "exec/cpu-common.h"
#include "exec/hwaddr.h"
#include "qemu/queue.h"
-#include "exec/iorange.h"
-#include "exec/ioport.h"
+#include "hw/iorange.h"
+#include "hw/ioport.h"
#include "qemu/int128.h"
typedef struct MemoryRegionOps MemoryRegionOps;
@@ -2,7 +2,7 @@
#define HW_MIPS_H
/* Definitions for mips board emulation. */
-#include "exec/memory.h"
+#include "hw/memory.h"
/* gt64xxx.c */
PCIBus *gt64120_register(qemu_irq *pic);
@@ -51,7 +51,7 @@
*/
#include "qemu-common.h"
-#include "exec/memory.h"
+#include "hw/memory.h"
#define SMRAM_C_BASE 0xa0000
#define SMRAM_C_END 0xc0000
@@ -4,7 +4,7 @@
#include "qemu-common.h"
#include "hw/qdev.h"
-#include "exec/memory.h"
+#include "hw/memory.h"
#include "sysemu/dma.h"
/* PCI includes legacy ISA access. */
@@ -22,7 +22,7 @@
#define PCIE_HOST_H
#include "hw/pci/pci_host.h"
-#include "exec/memory.h"
+#include "hw/memory.h"
#define TYPE_PCIE_HOST_BRIDGE "pcie-host-bridge"
#define PCIE_HOST_BRIDGE(obj) \
@@ -2,7 +2,7 @@
#define SHPC_H
#include "qemu-common.h"
-#include "exec/memory.h"
+#include "hw/memory.h"
#include "migration/vmstate.h"
struct SHPCDevice {
@@ -22,7 +22,7 @@
#ifndef HW_MAC_DBDMA_H
#define HW_MAC_DBDMA_H 1
-#include "exec/memory.h"
+#include "hw/memory.h"
typedef struct DBDMA_io DBDMA_io;
@@ -3,7 +3,7 @@
#include "qemu-common.h"
#include "hw/irq.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
typedef unsigned char intc_enum;
@@ -4,7 +4,7 @@
/* Devices attached directly to the main system bus. */
#include "hw/qdev.h"
-#include "exec/memory.h"
+#include "hw/memory.h"
#define QDEV_MAX_MMIO 32
#define QDEV_MAX_PIO 32
@@ -14,7 +14,7 @@
#ifndef HOSTMEM_H
#define HOSTMEM_H
-#include "exec/memory.h"
+#include "hw/memory.h"
#include "qemu/thread.h"
typedef struct {
@@ -3,7 +3,7 @@
#include "hw/hw.h"
#include "hw/virtio/virtio.h"
-#include "exec/memory.h"
+#include "hw/memory.h"
/* Generic structures common for any vhost based device. */
struct vhost_virtqueue {
@@ -11,7 +11,7 @@
#define DMA_H
#include <stdio.h>
-#include "exec/memory.h"
+#include "hw/memory.h"
#include "hw/hw.h"
#include "block/block.h"
#include "sysemu/kvm.h"
@@ -25,9 +25,9 @@
* splitted out ioport related stuffs from vl.c.
*/
-#include "exec/ioport.h"
+#include "hw/ioport.h"
#include "trace.h"
-#include "exec/memory.h"
+#include "hw/memory.h"
/***********************************************************/
/* IO Port */
@@ -30,8 +30,8 @@
#include "exec/gdbstub.h"
#include "sysemu/kvm.h"
#include "qemu/bswap.h"
-#include "exec/memory.h"
-#include "exec/address-spaces.h"
+#include "hw/memory.h"
+#include "hw/address-spaces.h"
#include "qemu/event_notifier.h"
/* This check must be after config-host.h is included */
@@ -13,9 +13,9 @@
* GNU GPL, version 2 or (at your option) any later version.
*/
-#include "exec/memory.h"
-#include "exec/address-spaces.h"
-#include "exec/ioport.h"
+#include "hw/memory.h"
+#include "hw/address-spaces.h"
+#include "hw/ioport.h"
#include "qemu/bitops.h"
#include "sysemu/kvm.h"
#include <assert.h>
@@ -64,7 +64,7 @@
#include "trace/simple.h"
#endif
#include "ui/qemu-spice.h"
-#include "exec/memory.h"
+#include "hw/memory.h"
#include "qmp-commands.h"
#include "hmp.h"
#include "qemu/thread.h"
@@ -14,8 +14,8 @@
#include "sysemu/qtest.h"
#include "hw/qdev.h"
#include "sysemu/char.h"
-#include "exec/ioport.h"
-#include "exec/memory.h"
+#include "hw/ioport.h"
+#include "hw/memory.h"
#include "hw/irq.h"
#include "sysemu/sysemu.h"
#include "sysemu/cpus.h"
@@ -35,7 +35,7 @@
#include "qemu/sockets.h"
#include "qemu/queue.h"
#include "sysemu/cpus.h"
-#include "exec/memory.h"
+#include "hw/memory.h"
#include "qmp-commands.h"
#include "trace.h"
#include "qemu/bitops.h"
@@ -12,7 +12,7 @@
#define QEMU_KVM_ARM_H
#include "sysemu/kvm.h"
-#include "exec/memory.h"
+#include "hw/memory.h"
/**
* kvm_arm_register_device:
@@ -21,7 +21,7 @@
#include "qemu.h"
#include "qemu-common.h"
-#include "exec/ioport.h"
+#include "hw/ioport.h"
void cpu_outb(pio_addr_t addr, uint8_t val)
{
@@ -30,7 +30,7 @@
#include "qemu/config-file.h"
#include "hw/i386/pc.h"
#include "hw/i386/apic.h"
-#include "exec/ioport.h"
+#include "hw/ioport.h"
#include "hyperv.h"
#include "hw/pci/pci.h"
@@ -18,7 +18,7 @@
*/
#include "cpu.h"
-#include "exec/ioport.h"
+#include "hw/ioport.h"
#include "helper.h"
#if !defined(CONFIG_USER_ONLY)
@@ -19,7 +19,7 @@
*/
#include "cpu.h"
-#include "exec/memory.h"
+#include "hw/memory.h"
#include "qemu/host-utils.h"
#include "helper.h"
#include <string.h>
@@ -19,7 +19,7 @@
#include "cpu.h"
#include "trace.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
/* Sparc MMU emulation */
@@ -53,7 +53,7 @@
#endif
#endif
#else
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#endif
#include "exec/cputlb.h"
@@ -20,7 +20,7 @@
#include "qemu/range.h"
#include "sysemu/xen-mapcache.h"
#include "trace.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#include <xen/hvm/ioreq.h>
#include <xen/hvm/params.h>
@@ -10,7 +10,7 @@
#include "qemu-common.h"
#include "hw/xen/xen.h"
-#include "exec/memory.h"
+#include "hw/memory.h"
#include "qmp-commands.h"
void xenstore_store_pv_console_info(int i, CharDriverState *chr)
These are the only parts of include/exec/ that is used in hardware models. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> --- arch_init.c | 2 +- cputlb.c | 4 ++-- exec.c | 4 ++-- hw/acpi/ich9.c | 2 +- hw/acpi/piix4.c | 4 ++-- hw/alpha/typhoon.c | 2 +- hw/arm/collie.c | 2 +- hw/arm/exynos4_boards.c | 2 +- hw/arm/gumstix.c | 2 +- hw/arm/highbank.c | 2 +- hw/arm/integratorcp.c | 2 +- hw/arm/kzm.c | 2 +- hw/arm/mainstone.c | 2 +- hw/arm/musicpal.c | 2 +- hw/arm/nseries.c | 2 +- hw/arm/omap_sx1.c | 2 +- hw/arm/palm.c | 2 +- hw/arm/realview.c | 2 +- hw/arm/spitz.c | 2 +- hw/arm/stellaris.c | 2 +- hw/arm/strongarm.h | 2 +- hw/arm/tosa.c | 2 +- hw/arm/versatilepb.c | 2 +- hw/arm/vexpress.c | 2 +- hw/arm/xilinx_zynq.c | 2 +- hw/arm/z2.c | 2 +- hw/block/onenand.c | 4 ++-- hw/block/pflash_cfi01.c | 2 +- hw/block/pflash_cfi02.c | 2 +- hw/char/mcf_uart.c | 2 +- hw/char/omap_uart.c | 2 +- hw/char/serial.c | 2 +- hw/char/sh_serial.c | 2 +- hw/core/loader.c | 4 ++-- hw/core/sysbus.c | 2 +- hw/cris/axis_dev88.c | 2 +- hw/display/framebuffer.h | 2 +- hw/display/vga_int.h | 2 +- hw/dma/etraxfs_dma.c | 2 +- hw/i386/pc.c | 4 ++-- hw/i386/pc_piix.c | 4 ++-- hw/i386/pc_q35.c | 2 +- hw/intc/armv7m_nvic.c | 2 +- hw/isa/isa-bus.c | 2 +- hw/isa/isa_mmio.c | 2 +- hw/isa/lpc_ich9.c | 2 +- hw/isa/vt82c686.c | 2 +- hw/lm32/lm32_boards.c | 2 +- hw/lm32/milkymist.c | 2 +- hw/m68k/an5206.c | 2 +- hw/m68k/dummy_m68k.c | 2 +- hw/m68k/mcf5206.c | 2 +- hw/m68k/mcf5208.c | 2 +- hw/m68k/mcf_intc.c | 2 +- hw/microblaze/petalogix_ml605_mmu.c | 2 +- hw/microblaze/petalogix_s3adsp1800_mmu.c | 2 +- hw/mips/gt64xxx_pci.c | 2 +- hw/mips/mips_fulong2e.c | 2 +- hw/mips/mips_jazz.c | 2 +- hw/mips/mips_malta.c | 2 +- hw/mips/mips_mipssim.c | 2 +- hw/mips/mips_r4k.c | 2 +- hw/misc/omap_gpmc.c | 4 ++-- hw/misc/vfio.c | 4 ++-- hw/moxie/moxiesim.c | 2 +- hw/net/mcf_fec.c | 2 +- hw/net/ne2000-isa.c | 2 +- hw/net/pcnet.h | 2 +- hw/openrisc/openrisc_sim.c | 2 +- hw/pci-bridge/pci_bridge_dev.c | 2 +- hw/pci-host/apb.c | 2 +- hw/pci-host/bonito.c | 2 +- hw/pci-host/ppce500.c | 2 +- hw/pci-host/prep.c | 2 +- hw/pci-host/versatile.c | 2 +- hw/pci/pci.c | 2 +- hw/pci/pcie_host.c | 2 +- hw/ppc/e500.c | 2 +- hw/ppc/mac.h | 2 +- hw/ppc/mac_newworld.c | 2 +- hw/ppc/mac_oldworld.c | 2 +- hw/ppc/ppc405_boards.c | 2 +- hw/ppc/ppc405_uc.c | 2 +- hw/ppc/ppc440_bamboo.c | 2 +- hw/ppc/ppc4xx_devs.c | 2 +- hw/ppc/ppc4xx_pci.c | 2 +- hw/ppc/prep.c | 2 +- hw/ppc/spapr.c | 2 +- hw/ppc/spapr_iommu.c | 2 +- hw/ppc/spapr_pci.c | 2 +- hw/ppc/virtex_ml507.c | 2 +- hw/s390x/s390-virtio-ccw.c | 2 +- hw/s390x/s390-virtio.c | 2 +- hw/s390x/sclp.c | 2 +- hw/sh4/r2d.c | 2 +- hw/sh4/sh7750.c | 2 +- hw/sh4/sh_pci.c | 2 +- hw/sh4/shix.c | 2 +- hw/sparc/leon3.c | 2 +- hw/sparc64/sun4u.c | 2 +- hw/timer/m48t59.c | 2 +- hw/timer/sh_timer.c | 2 +- hw/tpm/tpm_int.h | 2 +- hw/tpm/tpm_tis.c | 2 +- hw/unicore32/puv3.c | 2 +- hw/virtio/dataplane/hostmem.c | 2 +- hw/virtio/vhost.c | 2 +- hw/virtio/virtio-balloon.c | 2 +- hw/xen/xen_platform.c | 2 +- hw/xen/xen_pt.c | 2 +- hw/xtensa/xtensa_lx60.c | 4 ++-- hw/xtensa/xtensa_sim.c | 4 ++-- include/exec/softmmu_template.h | 2 +- include/{exec => hw}/address-spaces.h | 2 +- include/hw/arm/arm.h | 2 +- include/hw/arm/exynos4210.h | 2 +- include/hw/arm/omap.h | 2 +- include/hw/arm/pxa.h | 2 +- include/hw/arm/soc_dma.h | 2 +- include/hw/block/flash.h | 2 +- include/hw/char/serial.h | 2 +- include/hw/hw.h | 2 +- include/hw/i386/apic_internal.h | 2 +- include/hw/i386/ioapic_internal.h | 2 +- include/hw/i386/pc.h | 6 +++--- include/hw/ide.h | 2 +- include/{exec => hw}/ioport.h | 2 +- include/{exec => hw}/iorange.h | 0 include/hw/isa/apm.h | 2 +- include/hw/isa/isa.h | 4 ++-- include/{exec => hw}/memory.h | 4 ++-- include/hw/mips/mips.h | 2 +- include/hw/pci-host/pam.h | 2 +- include/hw/pci/pci.h | 2 +- include/hw/pci/pcie_host.h | 2 +- include/hw/pci/shpc.h | 2 +- include/hw/ppc/mac_dbdma.h | 2 +- include/hw/sh4/sh_intc.h | 2 +- include/hw/sysbus.h | 2 +- include/hw/virtio/dataplane/hostmem.h | 2 +- include/hw/virtio/vhost.h | 2 +- include/sysemu/dma.h | 2 +- ioport.c | 4 ++-- kvm-all.c | 4 ++-- memory.c | 6 +++--- monitor.c | 2 +- qtest.c | 4 ++-- savevm.c | 2 +- target-arm/kvm_arm.h | 2 +- target-i386/ioport-user.c | 2 +- target-i386/kvm.c | 2 +- target-i386/misc_helper.c | 2 +- target-s390x/misc_helper.c | 2 +- target-sparc/mmu_helper.c | 2 +- translate-all.c | 2 +- xen-all.c | 2 +- xen-stub.c | 2 +- 157 files changed, 176 insertions(+), 176 deletions(-) rename include/{exec => hw}/address-spaces.h (97%) rename include/{exec => hw}/ioport.h (99%) rename include/{exec => hw}/iorange.h (100%) rename include/{exec => hw}/memory.h (99%)