exec: move include files to include/exec/

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/arch_init.c b/arch_init.c
index e479a2566cc57f1c71fc4b3a725fdd7852b1c5f4..e15cedad04cd689be92b4c578d4adcc65b6f09f9 100644 (file)
--- a/arch_init.c
+++ b/arch_init.c
@@ -40,9 +40,9 @@
 #include "hw/audiodev.h"
 #include "kvm.h"
 #include "migration.h"
-#include "gdbstub.h"
+#include "exec/gdbstub.h"
 #include "hw/smbios.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 #include "hw/pcspk.h"
 #include "qemu/page_cache.h"
 #include "qemu-config.h"

diff --git a/balloon.c b/balloon.c
index 610fe6d6268f80dff695484547edc724db45bde5..c24458b5f9cebcbecdba0a2bb07f13e44bc5f44c 100644 (file)
--- a/balloon.c
+++ b/balloon.c
@@ -25,7 +25,7 @@
  */
 
 #include "monitor.h"
-#include "cpu-common.h"
+#include "exec/cpu-common.h"
 #include "kvm.h"
 #include "balloon.h"
 #include "trace.h"

diff --git a/bsd-user/qemu.h b/bsd-user/qemu.h
index d2688995bdf203c5f992c8b8672296273d92a73c..c64c3ccca3dfc430cbbde9de5fc444a2b51aa8ca 100644 (file)
--- a/bsd-user/qemu.h
+++ b/bsd-user/qemu.h
@@ -11,7 +11,7 @@
 #include <stdlib.h>
 #endif /* DEBUG_REMAP */
 
-#include "qemu-user-types.h"
+#include "exec/user/abitypes.h"
 
 enum BSDType {
     target_freebsd,
@@ -23,7 +23,7 @@ extern enum BSDType bsd_type;
 #include "syscall_defs.h"
 #include "syscall.h"
 #include "target_signal.h"
-#include "gdbstub.h"
+#include "exec/gdbstub.h"
 
 #if defined(CONFIG_USE_NPTL)
 #define THREAD __thread

diff --git a/cpus.c b/cpus.c
index d9c332fcb8b4744a1ca3b5fa220ba43e29b63b1a..8926873ad1b7af668f8c175213fa6c0960068532 100644 (file)
--- a/cpus.c
+++ b/cpus.c
@@ -27,7 +27,7 @@
 
 #include "monitor.h"
 #include "sysemu.h"
-#include "gdbstub.h"
+#include "exec/gdbstub.h"
 #include "dma.h"
 #include "kvm.h"
 #include "qmp-commands.h"

diff --git a/cputlb.c b/cputlb.c
index d6d037261554598302a3fdd0aabd474726422341..88239c494ab541ab24fe4385a7c60237eb84b1e6 100644 (file)
--- a/cputlb.c
+++ b/cputlb.c
@@ -19,13 +19,13 @@
 
 #include "config.h"
 #include "cpu.h"
-#include "exec-all.h"
-#include "memory.h"
-#include "exec-memory.h"
+#include "exec/exec-all.h"
+#include "exec/memory.h"
+#include "exec/address-spaces.h"
 
-#include "cputlb.h"
+#include "exec/cputlb.h"
 
-#include "memory-internal.h"
+#include "exec/memory-internal.h"
 
 //#define DEBUG_TLB
 //#define DEBUG_TLB_CHECK
@@ -347,15 +347,15 @@ tb_page_addr_t get_page_addr_code(CPUArchState *env1, target_ulong addr)
 #define SOFTMMU_CODE_ACCESS
 
 #define SHIFT 0
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
 
 #define SHIFT 1
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
 
 #define SHIFT 2
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
 
 #define SHIFT 3
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
 
 #undef env

diff --git a/dma.h b/dma.h
index 40280365ce921cf734ec1f0dae8b5192c7f7eba5..fd68f74c5bf1a3d2ac2cee9eed04561b7aa4438e 100644 (file)
--- a/dma.h
+++ b/dma.h
@@ -11,7 +11,7 @@
 #define DMA_H
 
 #include <stdio.h>
-#include "memory.h"
+#include "exec/memory.h"
 #include "hw/hw.h"
 #include "block/block.h"
 #include "kvm.h"

diff --git a/dump.c b/dump.c
index 7b45b53a8fc9fc8f2103bd4e4ec1061e61a509aa..e70e0f3b21500b9635aa66546b5dca39dc8487b5 100644 (file)
--- a/dump.c
+++ b/dump.c
@@ -14,8 +14,8 @@
 #include "qemu-common.h"
 #include "elf.h"
 #include "cpu.h"
-#include "cpu-all.h"
-#include "hwaddr.h"
+#include "exec/cpu-all.h"
+#include "exec/hwaddr.h"
 #include "monitor.h"
 #include "kvm.h"
 #include "dump.h"
@@ -23,7 +23,7 @@
 #include "memory_mapping.h"
 #include "qapi/error.h"
 #include "qmp-commands.h"
-#include "gdbstub.h"
+#include "exec/gdbstub.h"
 
 static uint16_t cpu_convert_to_target16(uint16_t val, int endian)
 {

diff --git a/exec.c b/exec.c
index 986084146ce602a2c8960ce76aedc1c406199029..17fc7cf854b4022068aa42f71e606342d7aada2e 100644 (file)
--- a/exec.c
+++ b/exec.c
@@ -34,9 +34,9 @@
 #include "hw/xen.h"
 #include "qemu-timer.h"
 #include "qemu-config.h"
-#include "memory.h"
+#include "exec/memory.h"
 #include "dma.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 #if defined(CONFIG_USER_ONLY)
 #include <qemu.h>
 #else /* !CONFIG_USER_ONLY */
@@ -44,10 +44,10 @@
 #include "trace.h"
 #endif
 
-#include "cputlb.h"
+#include "exec/cputlb.h"
 #include "translate-all.h"
 
-#include "memory-internal.h"
+#include "exec/memory-internal.h"
 
 //#define DEBUG_UNASSIGNED
 //#define DEBUG_SUBPAGE

diff --git a/gdbstub.c b/gdbstub.c
index d02ec75384c4ee943173cd9951084405027dd23f..70ad79a748f11dd949e7315a9db7a7234be5630e 100644 (file)
--- a/gdbstub.c
+++ b/gdbstub.c
@@ -32,7 +32,7 @@
 #include "monitor.h"
 #include "qemu-char.h"
 #include "sysemu.h"
-#include "gdbstub.h"
+#include "exec/gdbstub.h"
 #endif
 
 #define MAX_PACKET_LENGTH 4096

diff --git a/hw/acpi_ich9.c b/hw/acpi_ich9.c
index 755fa050f79242d40aa8e094a2e5b075decc0e17..92af3a554cdaf84da93ecb9c18df590996641690 100644 (file)
--- a/hw/acpi_ich9.c
+++ b/hw/acpi_ich9.c
@@ -30,7 +30,7 @@
 #include "sysemu.h"
 #include "acpi.h"
 #include "kvm.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 
 #include "ich9.h"
 

diff --git a/hw/acpi_piix4.c b/hw/acpi_piix4.c
index 46f9843891c21e1c441fa20a474d9aa020f46595..4f43f6e070318ac103b7aabcabf4c9db38f8fe77 100644 (file)
--- a/hw/acpi_piix4.c
+++ b/hw/acpi_piix4.c
@@ -26,9 +26,9 @@
 #include "acpi.h"
 #include "sysemu.h"
 #include "range.h"
-#include "ioport.h"
+#include "exec/ioport.h"
 #include "fw_cfg.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 
 //#define DEBUG
 

diff --git a/hw/alpha_typhoon.c b/hw/alpha_typhoon.c
index 9b16d9661221730aabbe5e0757803729eb70419f..d61b2f483c40bc4c552bb579b4e16dfb9435aba1 100644 (file)
--- a/hw/alpha_typhoon.c
+++ b/hw/alpha_typhoon.c
@@ -7,12 +7,12 @@
  */
 
 #include "cpu.h"
-#include "exec-all.h"
+#include "exec/exec-all.h"
 #include "hw.h"
 #include "devices.h"
 #include "sysemu.h"
 #include "alpha_sys.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 
 
 #define TYPE_TYPHOON_PCI_HOST_BRIDGE "typhoon-pcihost"

diff --git a/hw/an5206.c b/hw/an5206.c
index d887c0e7eb748ec049239801a478114644dfdc44..dcfe34b3ae2d3e140b5739b24810dc0b5e9635d1 100644 (file)
--- a/hw/an5206.c
+++ b/hw/an5206.c
@@ -11,7 +11,7 @@
 #include "boards.h"
 #include "loader.h"
 #include "elf.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 
 #define KERNEL_LOAD_ADDR 0x10000
 #define AN5206_MBAR_ADDR 0x10000000

diff --git a/hw/apb_pci.c b/hw/apb_pci.c
index fb7a07de375714876f7925df36b1092cb7ab9aeb..144a7cc8d39386fb73293f4d07562f7be87d0390 100644 (file)
--- a/hw/apb_pci.c
+++ b/hw/apb_pci.c
@@ -33,7 +33,7 @@
 #include "pci/pci_bus.h"
 #include "apb_pci.h"
 #include "sysemu.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 
 /* debug APB */
 //#define DEBUG_APB

diff --git a/hw/apic_internal.h b/hw/apic_internal.h
index 79e2de2243fd7cd5ffc9e0de1ef54a4a3d8b37e4..fea95654cabca7fb7fa7976dd1ede8901c511f9b 100644 (file)
--- a/hw/apic_internal.h
+++ b/hw/apic_internal.h
@@ -20,7 +20,7 @@
 #ifndef QEMU_APIC_INTERNAL_H
 #define QEMU_APIC_INTERNAL_H
 
-#include "memory.h"
+#include "exec/memory.h"
 #include "sysbus.h"
 #include "qemu-timer.h"
 

diff --git a/hw/apm.h b/hw/apm.h
index 5431b6d7c854f82c3c247e29cae1081edad83f79..9abb47f99ff208d1695a338c794248f01a26268d 100644 (file)
--- a/hw/apm.h
+++ b/hw/apm.h
@@ -4,7 +4,7 @@
 #include <stdint.h>
 #include "qemu-common.h"
 #include "hw.h"
-#include "memory.h"
+#include "exec/memory.h"
 
 typedef void (*apm_ctrl_changed_t)(uint32_t val, void *arg);
 

diff --git a/hw/arm-misc.h b/hw/arm-misc.h
index d129678b26183ada2f68040f80160b24c742ef2a..cba7553039bd23623229a85ae66ba6c12a9ddd64 100644 (file)
--- a/hw/arm-misc.h
+++ b/hw/arm-misc.h
@@ -11,7 +11,7 @@
 #ifndef ARM_MISC_H
 #define ARM_MISC_H 1
 
-#include "memory.h"
+#include "exec/memory.h"
 #include "hw/irq.h"
 
 /* The CPU is also modeled as an interrupt controller.  */

diff --git a/hw/armv7m_nvic.c b/hw/armv7m_nvic.c
index 4963678bf1290b7fd8be6f07e792528cde32231a..270c30771708cb134c38f033d500998b867e1ead 100644 (file)
--- a/hw/armv7m_nvic.c
+++ b/hw/armv7m_nvic.c
@@ -13,7 +13,7 @@
 #include "sysbus.h"
 #include "qemu-timer.h"
 #include "arm-misc.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 #include "arm_gic_internal.h"
 
 typedef struct {

diff --git a/hw/axis_dev88.c b/hw/axis_dev88.c
index 50ddbc920ddfd77977d86400f8e0359f0071852e..e537aecc785483d7fea02858a6174aa8622606fa 100644 (file)
--- a/hw/axis_dev88.c
+++ b/hw/axis_dev88.c
@@ -31,7 +31,7 @@
 #include "elf.h"
 #include "cris-boot.h"
 #include "blockdev.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 
 #define D(x)
 #define DNAND(x)

diff --git a/hw/bonito.c b/hw/bonito.c
index a1fc38c7841677076bcc30a8770138bf2a3f670b..78e264ccc05b0d9e5a94ec0c48c405c2fd98fe46 100644 (file)
--- a/hw/bonito.c
+++ b/hw/bonito.c
@@ -45,7 +45,7 @@
 #include "mips.h"
 #include "pci/pci_host.h"
 #include "sysemu.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 
 //#define DEBUG_BONITO
 

diff --git a/hw/collie.c b/hw/collie.c
index 695982a99fef93befc0f28af373d9db05c75e243..faf5ac9ac7d9fcf2602366b4162b62ce31caba46 100644 (file)
--- a/hw/collie.c
+++ b/hw/collie.c
@@ -16,7 +16,7 @@
 #include "arm-misc.h"
 #include "flash.h"
 #include "blockdev.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 
 static struct arm_boot_info collie_binfo = {
     .loader_start = SA_SDCS0,

diff --git a/hw/dummy_m68k.c b/hw/dummy_m68k.c
index 20f790b1a60a5e240692fa7b677026d1b8cc9687..7878cc3e15559eb76888466b916f67b16b0f71ba 100644 (file)
--- a/hw/dummy_m68k.c
+++ b/hw/dummy_m68k.c
@@ -10,7 +10,7 @@
 #include "boards.h"
 #include "loader.h"
 #include "elf.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 
 #define KERNEL_LOAD_ADDR 0x10000
 

diff --git a/hw/etraxfs_dma.c b/hw/etraxfs_dma.c
index 49221abc1a01508a717b8993c32c5adf5fabfd3f..089267fcc1d1bcaf400b4f0a2e81e795afcf1fcb 100644 (file)
--- a/hw/etraxfs_dma.c
+++ b/hw/etraxfs_dma.c
@@ -24,7 +24,7 @@
 #include <stdio.h>
 #include <sys/time.h>
 #include "hw.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 #include "qemu-common.h"
 #include "sysemu.h"
 

diff --git a/hw/exynos4210.h b/hw/exynos4210.h
index 777f0f5b2faf5ad8b2615ebd2590303094beb9cb..bb9a1dddc8db0d0c1ad3df2c74129764a0e4ac6f 100644 (file)
--- a/hw/exynos4210.h
+++ b/hw/exynos4210.h
@@ -27,7 +27,7 @@
 #define EXYNOS4210_H_
 
 #include "qemu-common.h"
-#include "memory.h"
+#include "exec/memory.h"
 
 #define EXYNOS4210_NCPUS                    2
 

diff --git a/hw/exynos4210_fimd.c b/hw/exynos4210_fimd.c
index 3ef0847271d1ac6b259dd57ff5859d55902867d0..cfca72ab676a3cfbff99de2641c80ed356a90f87 100644 (file)
--- a/hw/exynos4210_fimd.c
+++ b/hw/exynos4210_fimd.c
@@ -23,7 +23,7 @@
  */
 
 #include "qemu-common.h"
-#include "cpu-all.h"
+#include "exec/cpu-all.h"
 #include "sysbus.h"
 #include "ui/console.h"
 #include "ui/pixel_ops.h"

diff --git a/hw/exynos4_boards.c b/hw/exynos4_boards.c
index c375f16479eb7cc7b1d689cc4b24ffa25075c429..5dd296145959af736b34b6aecbd54984ead8c084 100644 (file)
--- a/hw/exynos4_boards.c
+++ b/hw/exynos4_boards.c
@@ -25,7 +25,7 @@
 #include "sysbus.h"
 #include "net/net.h"
 #include "arm-misc.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 #include "exynos4210.h"
 #include "boards.h"
 

diff --git a/hw/flash.h b/hw/flash.h
index bda2158c13ed5bed1c3f4aec92df1add23751a41..920d7596e3669567507cabcdfb12fcddbfffa07f 100644 (file)
--- a/hw/flash.h
+++ b/hw/flash.h
@@ -3,7 +3,7 @@
 
 /* NOR flash devices */
 
-#include "memory.h"
+#include "exec/memory.h"
 
 typedef struct pflash_t pflash_t;
 

diff --git a/hw/framebuffer.h b/hw/framebuffer.h
index 46e375b5ecb74e87baebd585ff00ab1eb23838fc..11f53edec0545b836435ceb0e0513edb1c268254 100644 (file)
--- a/hw/framebuffer.h
+++ b/hw/framebuffer.h
@@ -1,7 +1,7 @@
 #ifndef QEMU_FRAMEBUFFER_H
 #define QEMU_FRAMEBUFFER_H
 
-#include "memory.h"
+#include "exec/memory.h"
 
 /* Framebuffer device helper routines.  */
 

diff --git a/hw/gt64xxx.c b/hw/gt64xxx.c
index 5aa49c614838b4279dd52fc3e1954fcb45329c4e..977a2c5e692e1f6e310067073e921754fcfd9a4f 100644 (file)
--- a/hw/gt64xxx.c
+++ b/hw/gt64xxx.c
@@ -27,7 +27,7 @@
 #include "pci/pci.h"
 #include "pci/pci_host.h"
 #include "pc.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 
 //#define DEBUG
 

diff --git a/hw/gumstix.c b/hw/gumstix.c
index 545b92fd954eb0188adaaf5eb626535c23f51e08..4acb32c2a93ebdb6390e20937cdea0a0fe9c895d 100644 (file)
--- a/hw/gumstix.c
+++ b/hw/gumstix.c
@@ -41,7 +41,7 @@
 #include "devices.h"
 #include "boards.h"
 #include "blockdev.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 
 static const int sector_len = 128 * 1024;
 

diff --git a/hw/highbank.c b/hw/highbank.c
index 90f7cb5ef20b067e909b65f5ee583df6e3339d76..6f5f2a9d9dca6c23d07ca8c4b0ac16d9be235bd9 100644 (file)
--- a/hw/highbank.c
+++ b/hw/highbank.c
@@ -26,7 +26,7 @@
 #include "boards.h"
 #include "sysbus.h"
 #include "blockdev.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 
 #define SMP_BOOT_ADDR 0x100
 #define SMP_BOOT_REG  0x40

diff --git a/hw/hw.h b/hw/hw.h
index 003d974866115a95232efe3ffc7b312a9e7420cf..7368470bb1356fe8f269771aedd5e09adf867bbb 100644 (file)
--- a/hw/hw.h
+++ b/hw/hw.h
@@ -5,10 +5,10 @@
 #include "qemu-common.h"
 
 #if !defined(CONFIG_USER_ONLY) && !defined(NEED_CPU_H)
-#include "cpu-common.h"
+#include "exec/cpu-common.h"
 #endif
 
-#include "ioport.h"
+#include "exec/ioport.h"
 #include "irq.h"
 #include "block/aio.h"
 #include "qemu-file.h"

diff --git a/hw/ide.h b/hw/ide.h
index 081c710d56df16255c8dda1e982d3323e2d7a522..7e23cda8e07dd6b341366c8fd4ea49a0c1972a67 100644 (file)
--- a/hw/ide.h
+++ b/hw/ide.h
@@ -3,7 +3,7 @@
 
 #include "isa.h"
 #include "pci/pci.h"
-#include "memory.h"
+#include "exec/memory.h"
 
 #define MAX_IDE_DEVS   2
 

diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c
index 2ea64bd316c574a4b2f0ffb7d70dfeb596a7ab17..f32a84761d8a275fc4b1fa23f805c9f065413f2c 100644 (file)
--- a/hw/ide/ahci.c
+++ b/hw/ide/ahci.c
@@ -29,7 +29,7 @@
 
 #include "monitor.h"
 #include "dma.h"
-#include "cpu-common.h"
+#include "exec/cpu-common.h"
 #include "internal.h"
 #include <hw/ide/pci.h>
 #include <hw/ide/ahci.h>

diff --git a/hw/ide/internal.h b/hw/ide/internal.h
index bf7d313cf401f68412b62888f2e1221547f49c50..c5016f0ceacabab751c216212f8c647e71eaa4d8 100644 (file)
--- a/hw/ide/internal.h
+++ b/hw/ide/internal.h
@@ -8,7 +8,7 @@
  */
 #include <hw/ide.h>
 #include <hw/isa.h>
-#include "iorange.h"
+#include "exec/iorange.h"
 #include "dma.h"
 #include "sysemu.h"
 #include "hw/block-common.h"

diff --git a/hw/integratorcp.c b/hw/integratorcp.c
index 2b59fea9f166a916c26f3865f80a210e647e30b3..c995dc724f322dfe1826314d607f3dc29a0a598d 100644 (file)
--- a/hw/integratorcp.c
+++ b/hw/integratorcp.c
@@ -12,7 +12,7 @@
 #include "boards.h"
 #include "arm-misc.h"
 #include "net/net.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 #include "sysemu.h"
 
 typedef struct {

diff --git a/hw/ioapic_internal.h b/hw/ioapic_internal.h
index e04c9f3c12c66162952597f3f2e49f0bf0033651..c8447d7f3ba8d15bcae38c9d1fbc2bd71100276a 100644 (file)
--- a/hw/ioapic_internal.h
+++ b/hw/ioapic_internal.h
@@ -23,7 +23,7 @@
 #define QEMU_IOAPIC_INTERNAL_H
 
 #include "hw.h"
-#include "memory.h"
+#include "exec/memory.h"
 #include "sysbus.h"
 
 #define MAX_IOAPICS                     1

diff --git a/hw/isa-bus.c b/hw/isa-bus.c
index 144a88e27263e765cd89821af841d001dc128277..8f409741667d3cda9a1e5202ba4d0afe13caed41 100644 (file)
--- a/hw/isa-bus.c
+++ b/hw/isa-bus.c
@@ -21,7 +21,7 @@
 #include "sysbus.h"
 #include "sysemu.h"
 #include "isa.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 
 static ISABus *isabus;
 hwaddr isa_mem_base = 0;

diff --git a/hw/isa.h b/hw/isa.h
index 9d719fa3c85b0621bb169833f4b4abb6a4d4fff2..62e89d3bcdb07975315d8d8341daf8a4a9420b2f 100644 (file)
--- a/hw/isa.h
+++ b/hw/isa.h
@@ -3,8 +3,8 @@
 
 /* ISA bus */
 
-#include "ioport.h"
-#include "memory.h"
+#include "exec/ioport.h"
+#include "exec/memory.h"
 #include "qdev.h"
 
 #define ISA_NUM_IRQS 16

diff --git a/hw/isa_mmio.c b/hw/isa_mmio.c
index 14053960cbf4e72ada097c7a2ffcf77f5e5d6d86..487cf6a8fb70675bffe49be27c83771252966c4e 100644 (file)
--- a/hw/isa_mmio.c
+++ b/hw/isa_mmio.c
@@ -24,7 +24,7 @@
 
 #include "hw.h"
 #include "isa.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 
 static void isa_mmio_writeb (void *opaque, hwaddr addr,
                                   uint32_t val)

diff --git a/hw/kzm.c b/hw/kzm.c
index a27ecbba840780f0acc2343164a337af3be3d71b..9f92d309282b10b93a40849cefa846b02569c914 100644 (file)
--- a/hw/kzm.c
+++ b/hw/kzm.c
@@ -14,7 +14,7 @@
  */
 
 #include "sysbus.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 #include "hw.h"
 #include "arm-misc.h"
 #include "devices.h"

diff --git a/hw/leon3.c b/hw/leon3.c
index ef83dffd85b06f714f974f0ccf2b3e64b3560b2f..e8d54e5d06e9f1d60c437e5d82e8e1b3fcf3d7a8 100644 (file)
--- a/hw/leon3.c
+++ b/hw/leon3.c
@@ -30,7 +30,7 @@
 #include "loader.h"
 #include "elf.h"
 #include "trace.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 
 #include "grlib.h"
 

diff --git a/hw/lm32_boards.c b/hw/lm32_boards.c
index f59d3bfef8d83f9a37187c5c3a8d512bacaabd12..81afdf675cd67abab010dd532587fabc52713f76 100644 (file)
--- a/hw/lm32_boards.c
+++ b/hw/lm32_boards.c
@@ -27,7 +27,7 @@
 #include "elf.h"
 #include "lm32_hwsetup.h"
 #include "lm32.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 
 typedef struct {
     LM32CPU *cpu;

diff --git a/hw/loader.c b/hw/loader.c
index 52f0940778656cacfaf128fcceef06bac78904b6..03f0318d9141524387170bcdc5a26c8f05b0979e 100644 (file)
--- a/hw/loader.c
+++ b/hw/loader.c
@@ -49,8 +49,8 @@
 #include "uboot_image.h"
 #include "loader.h"
 #include "fw_cfg.h"
-#include "memory.h"
-#include "exec-memory.h"
+#include "exec/memory.h"
+#include "exec/address-spaces.h"
 
 #include <zlib.h>
 

diff --git a/hw/lpc_ich9.c b/hw/lpc_ich9.c
index 30505789f88eb510df87e8f2dbe22988af490bc2..e2256937216ff9fb8f187944dabb50bb23685eea 100644 (file)
--- a/hw/lpc_ich9.c
+++ b/hw/lpc_ich9.c
@@ -43,7 +43,7 @@
 #include "acpi_ich9.h"
 #include "pam.h"
 #include "pci/pci_bus.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 #include "sysemu.h"
 
 static int ich9_lpc_sci_irq(ICH9LPCState *lpc);

diff --git a/hw/m48t59.c b/hw/m48t59.c
index 7da7e7c822cebf379e9f5ac630ab47890ad5eab6..491d433ae7e69f5b21156a5ecfbf0b8a9752078d 100644 (file)
--- a/hw/m48t59.c
+++ b/hw/m48t59.c
@@ -27,7 +27,7 @@
 #include "sysemu.h"
 #include "sysbus.h"
 #include "isa.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 
 //#define DEBUG_NVRAM
 

diff --git a/hw/mac_dbdma.h b/hw/mac_dbdma.h
index e596837f46461f5dc59cb40a52a01f3b94e0fd66..691263eedef212410ab3bde31a38ebdb8a822863 100644 (file)
--- a/hw/mac_dbdma.h
+++ b/hw/mac_dbdma.h
@@ -22,7 +22,7 @@
 #ifndef HW_MAC_DBDMA_H
 #define HW_MAC_DBDMA_H 1
 
-#include "memory.h"
+#include "exec/memory.h"
 
 typedef struct DBDMA_io DBDMA_io;
 

diff --git a/hw/mainstone.c b/hw/mainstone.c
index 58c8b0748eb5772cfffd77967e4982a9d76f25f4..80d6a9d54dfc7f4ba3676ca527fdbe8e9ec21d72 100644 (file)
--- a/hw/mainstone.c
+++ b/hw/mainstone.c
@@ -20,7 +20,7 @@
 #include "flash.h"
 #include "blockdev.h"
 #include "sysbus.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 
 /* Device addresses */
 #define MST_FPGA_PHYS  0x08000000

diff --git a/hw/mcf5206.c b/hw/mcf5206.c
index 510d77047ec38a27fecd297b30f0440e0313dbed..5edc931abd50873fc938570d91ef22b9263f04cf 100644 (file)
--- a/hw/mcf5206.c
+++ b/hw/mcf5206.c
@@ -10,7 +10,7 @@
 #include "qemu-timer.h"
 #include "ptimer.h"
 #include "sysemu.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 
 /* General purpose timer module.  */
 typedef struct {

diff --git a/hw/mcf5208.c b/hw/mcf5208.c
index 6326624111e98787a921c7b66356b9389ed3ca29..997b34847c7db52435f036599a329eccd8e70ef7 100644 (file)
--- a/hw/mcf5208.c
+++ b/hw/mcf5208.c
@@ -14,7 +14,7 @@
 #include "boards.h"
 #include "loader.h"
 #include "elf.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 
 #define SYS_FREQ 66000000
 

diff --git a/hw/mcf_fec.c b/hw/mcf_fec.c
index b5fb18f67f2bbaade047f73e09c5a6ddc72a4228..2423f64bf640bca922e7a1a1b57cd8dc1fd65ede 100644 (file)
--- a/hw/mcf_fec.c
+++ b/hw/mcf_fec.c
@@ -10,7 +10,7 @@
 #include "mcf.h"
 /* For crc32 */
 #include <zlib.h>
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 
 //#define DEBUG_FEC 1
 

diff --git a/hw/mcf_intc.c b/hw/mcf_intc.c
index 6ef6dac93189341ffd57255f0367bf97a09927c4..3bed3a2e4c0cf297ffccd92e1b457bec1d51f82a 100644 (file)
--- a/hw/mcf_intc.c
+++ b/hw/mcf_intc.c
@@ -7,7 +7,7 @@
  */
 #include "hw.h"
 #include "mcf.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 
 typedef struct {
     MemoryRegion iomem;

diff --git a/hw/mcf_uart.c b/hw/mcf_uart.c
index d1655f8f2cf90a0ca76a2911efc5cc48df92150b..2eca2c6ae93d1f61fb3bf9903a06b616c9432f26 100644 (file)
--- a/hw/mcf_uart.c
+++ b/hw/mcf_uart.c
@@ -8,7 +8,7 @@
 #include "hw.h"
 #include "mcf.h"
 #include "qemu-char.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 
 typedef struct {
     MemoryRegion iomem;

diff --git a/hw/milkymist.c b/hw/milkymist.c
index c26ea4aed26475f8778490a81c0287c5bd90f769..588522260bac027be33be60b95e24b799db00cdb 100644 (file)
--- a/hw/milkymist.c
+++ b/hw/milkymist.c
@@ -28,7 +28,7 @@
 #include "blockdev.h"
 #include "milkymist-hw.h"
 #include "lm32.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 
 #define BIOS_FILENAME    "mmone-bios.bin"
 #define BIOS_OFFSET      0x00860000

diff --git a/hw/mips.h b/hw/mips.h
index f7e9b7e2c13e595d05c0ca5aa1eb1915ebed8b89..291e85f6b92442102acd92d1b654e1fca5ce43a8 100644 (file)
--- a/hw/mips.h
+++ b/hw/mips.h
@@ -2,7 +2,7 @@
 #define HW_MIPS_H
 /* Definitions for mips board emulation.  */
 
-#include "memory.h"
+#include "exec/memory.h"
 
 /* gt64xxx.c */
 PCIBus *gt64120_register(qemu_irq *pic);

diff --git a/hw/mips_fulong2e.c b/hw/mips_fulong2e.c
index b46f7fdcb1c7a76a20b2c06fec6e8e2a2ff2da65..34619b7e3ed548f6500f6fb20b3ce563ef7b5ad3 100644 (file)
--- a/hw/mips_fulong2e.c
+++ b/hw/mips_fulong2e.c
@@ -42,7 +42,7 @@
 #include "mc146818rtc.h"
 #include "i8254.h"
 #include "blockdev.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 
 #define DEBUG_FULONG2E_INIT
 

diff --git a/hw/mips_jazz.c b/hw/mips_jazz.c
index 8e5e8ef1afaec0d832cc072f505a39cb63017344..0befc99210b332e814a02b88711d7bf94744d8d0 100644 (file)
--- a/hw/mips_jazz.c
+++ b/hw/mips_jazz.c
@@ -41,7 +41,7 @@
 #include "pcspk.h"
 #include "blockdev.h"
 #include "sysbus.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 
 enum jazz_model_e
 {

diff --git a/hw/mips_malta.c b/hw/mips_malta.c
index 60f237987f9c49bc52f8e4b4ab4d5305b43b37ba..d65d1256fdd20b7881b2ecf5ddebe0b94a58edf7 100644 (file)
--- a/hw/mips_malta.c
+++ b/hw/mips_malta.c
@@ -46,7 +46,7 @@
 #include "mc146818rtc.h"
 #include "i8254.h"
 #include "blockdev.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 #include "sysbus.h"             /* SysBusDevice */
 
 //#define DEBUG_BOARD_INIT

diff --git a/hw/mips_mipssim.c b/hw/mips_mipssim.c
index 78317426a710e2b3db574c6f2b6da5d5fc90cf2f..ac7dfa9b74426ffbf4e4b68a0adc80e7d72d59a1 100644 (file)
--- a/hw/mips_mipssim.c
+++ b/hw/mips_mipssim.c
@@ -36,7 +36,7 @@
 #include "loader.h"
 #include "elf.h"
 #include "sysbus.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 
 static struct _loaderparams {
     int ram_size;

diff --git a/hw/mips_r4k.c b/hw/mips_r4k.c
index ec99d7d6a6154f5ee7bd118edfc7d968692fd0c2..05494b9b4090ab04af1637e36d35f241bb46b08f 100644 (file)
--- a/hw/mips_r4k.c
+++ b/hw/mips_r4k.c
@@ -25,7 +25,7 @@
 #include "mc146818rtc.h"
 #include "i8254.h"
 #include "blockdev.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 
 #define MAX_IDE_BUS 2
 

diff --git a/hw/musicpal.c b/hw/musicpal.c
index d7672e92a560d92309ff31fffce1e5e64b474817..436b3f7c3743874191b66100a6a211e76ef4dc20 100644 (file)
--- a/hw/musicpal.c
+++ b/hw/musicpal.c
@@ -23,7 +23,7 @@
 #include "ui/console.h"
 #include "i2c.h"
 #include "blockdev.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 #include "ui/pixel_ops.h"
 
 #define MP_MISC_BASE            0x80002000

diff --git a/hw/ne2000-isa.c b/hw/ne2000-isa.c
index 99477a412acdbf41b0777d9b4fbbfab0c0e485ba..c2c00c215fcf1cd37453e43922299b8411874564 100644 (file)
--- a/hw/ne2000-isa.c
+++ b/hw/ne2000-isa.c
@@ -27,7 +27,7 @@
 #include "qdev.h"
 #include "net/net.h"
 #include "ne2000.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 
 typedef struct ISANE2000State {
     ISADevice dev;

diff --git a/hw/nseries.c b/hw/nseries.c
index dcd3dc97d0147502c398f2f9eb6b04862d80ffe8..83adb97211a2240f5d84bcc6949552497d065336 100644 (file)
--- a/hw/nseries.c
+++ b/hw/nseries.c
@@ -33,7 +33,7 @@
 #include "loader.h"
 #include "blockdev.h"
 #include "sysbus.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 
 /* Nokia N8x0 support */
 struct n800_s {

diff --git a/hw/omap.h b/hw/omap.h
index 2b383ffc44477e8f6bd9530d4eaa5f2d676ef2c0..188cda8771ee89a7387e32e177ec9e1aab6795fa 100644 (file)
--- a/hw/omap.h
+++ b/hw/omap.h
@@ -17,7 +17,7 @@
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef hw_omap_h
-#include "memory.h"
+#include "exec/memory.h"
 # define hw_omap_h             "omap.h"
 #include "hw/irq.h"
 

diff --git a/hw/omap_gpmc.c b/hw/omap_gpmc.c
index 1f7c5bc5f35a444faeb7ca2d876c86dc8d93262d..02ab0ab568627583dc67944463a96e949102ce5d 100644 (file)
--- a/hw/omap_gpmc.c
+++ b/hw/omap_gpmc.c
@@ -21,8 +21,8 @@
 #include "hw.h"
 #include "flash.h"
 #include "omap.h"
-#include "memory.h"
-#include "exec-memory.h"
+#include "exec/memory.h"
+#include "exec/address-spaces.h"
 
 /* General-Purpose Memory Controller */
 struct omap_gpmc_s {

diff --git a/hw/omap_sx1.c b/hw/omap_sx1.c
index 918a6f6a045c1604b7e2ed441051390990788e58..ca6eb9ddebc2cedcc546b10596b31b83d0c0074a 100644 (file)
--- a/hw/omap_sx1.c
+++ b/hw/omap_sx1.c
@@ -32,7 +32,7 @@
 #include "arm-misc.h"
 #include "flash.h"
 #include "blockdev.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 
 /*****************************************************************************/
 /* Siemens SX1 Cellphone V1 */

diff --git a/hw/omap_uart.c b/hw/omap_uart.c
index 92f27021bba1913ba7dd93b3e6e916c0c5586b1d..159b2d1cddd8c352274ee3dd9ff24abc425a58a6 100644 (file)
--- a/hw/omap_uart.c
+++ b/hw/omap_uart.c
@@ -21,7 +21,7 @@
 #include "hw.h"
 #include "omap.h"
 #include "serial.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 
 /* UARTs */
 struct omap_uart_s {

diff --git a/hw/onenand.c b/hw/onenand.c
index 1803e4c264c167d5e77b4a7a3f27caca37bce60b..7d255c563ffdafd85b16174ce18137680148b805 100644 (file)
--- a/hw/onenand.c
+++ b/hw/onenand.c
@@ -23,8 +23,8 @@
 #include "flash.h"
 #include "irq.h"
 #include "blockdev.h"
-#include "memory.h"
-#include "exec-memory.h"
+#include "exec/memory.h"
+#include "exec/address-spaces.h"
 #include "sysbus.h"
 #include "qemu-error.h"
 

diff --git a/hw/openrisc_sim.c b/hw/openrisc_sim.c
index a879fb0dd01e26cc90fb8c07e14891760310a91a..c12097e12bec566151b62b504b78bd44befc62b4 100644 (file)
--- a/hw/openrisc_sim.c
+++ b/hw/openrisc_sim.c
@@ -24,7 +24,7 @@
 #include "serial.h"
 #include "net/net.h"
 #include "loader.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 #include "sysemu.h"
 #include "sysbus.h"
 #include "qtest.h"

diff --git a/hw/palm.c b/hw/palm.c
index 5aaeb07460ba3b43d9038f113152cc9dd83b88ad..e091bbcfc1e708364b07e9a0bbc9c5bff59869a1 100644 (file)
--- a/hw/palm.c
+++ b/hw/palm.c
@@ -25,7 +25,7 @@
 #include "arm-misc.h"
 #include "devices.h"
 #include "loader.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 
 static uint32_t static_readb(void *opaque, hwaddr offset)
 {

diff --git a/hw/pam.h b/hw/pam.h
index 2d77ebe0d9860618c097b74b464bb1a41ef8c86c..8e9e349b1d0dbc65c1c3084462a021a9c749c928 100644 (file)
--- a/hw/pam.h
+++ b/hw/pam.h
@@ -51,7 +51,7 @@
  */
 
 #include "qemu-common.h"
-#include "memory.h"
+#include "exec/memory.h"
 
 #define SMRAM_C_BASE    0xa0000
 #define SMRAM_C_END     0xc0000

diff --git a/hw/pc.c b/hw/pc.c
index d1b102c879c792db792c77d6291bf49dc5eea77b..2452fd42147f79dd3aad37e326dfe3cf96e40e02 100644 (file)
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -47,8 +47,8 @@
 #include "blockdev.h"
 #include "hw/block-common.h"
 #include "ui/qemu-spice.h"
-#include "memory.h"
-#include "exec-memory.h"
+#include "exec/memory.h"
+#include "exec/address-spaces.h"
 #include "arch_init.h"
 #include "bitmap.h"
 

diff --git a/hw/pc.h b/hw/pc.h
index 5e4d1038133f9d6b83fa06272ed8eb705bee3100..a73e3e7b5b7e34d3fa4b57cf1274a2043125bcbb 100644 (file)
--- a/hw/pc.h
+++ b/hw/pc.h
@@ -2,12 +2,12 @@
 #define HW_PC_H
 
 #include "qemu-common.h"
-#include "memory.h"
-#include "ioport.h"
+#include "exec/memory.h"
+#include "exec/ioport.h"
 #include "isa.h"
 #include "fdc.h"
 #include "net/net.h"
-#include "memory.h"
+#include "exec/memory.h"
 #include "ioapic.h"
 
 /* PC-style peripherals (also used by other machines).  */

diff --git a/hw/pc_piix.c b/hw/pc_piix.c
index 7268dcd944d16664dfeaee5833b9c043e2e66293..0d011348f2df74978686577e6149d8c1e0126f59 100644 (file)
--- a/hw/pc_piix.c
+++ b/hw/pc_piix.c
@@ -41,8 +41,8 @@
 #include "blockdev.h"
 #include "smbus.h"
 #include "xen.h"
-#include "memory.h"
-#include "exec-memory.h"
+#include "exec/memory.h"
+#include "exec/address-spaces.h"
 #include "cpu.h"
 #ifdef CONFIG_XEN
 #  include <xen/hvm/hvm_info_table.h>

diff --git a/hw/pc_q35.c b/hw/pc_q35.c
index 3429a9ae8f916577099bb8fb260e146d8787427d..2580d5ff343c2883d78ae9ad96aca9d559ccbca9 100644 (file)
--- a/hw/pc_q35.c
+++ b/hw/pc_q35.c
@@ -36,7 +36,7 @@
 #include "kvm.h"
 #include "kvm/clock.h"
 #include "q35.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 #include "ich9.h"
 #include "hw/ide/pci.h"
 #include "hw/ide/ahci.h"

diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index 105fe9560e8aac163c6110fb41e0e46b4f6b5ece..fa0f08eb0aa7fcedd6f42e9965802ea128a6fde4 100644 (file)
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -33,7 +33,7 @@
 #include "qmp-commands.h"
 #include "hw/pci/msi.h"
 #include "hw/pci/msix.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 
 //#define DEBUG_PCI
 #ifdef DEBUG_PCI

diff --git a/hw/pci/pci.h b/hw/pci/pci.h
index 41e5ddd1c48244c881c29d231d45ff5286841a43..d6ef4f65743a83abdd99df68c6d6b147b3965179 100644 (file)
--- a/hw/pci/pci.h
+++ b/hw/pci/pci.h
@@ -4,7 +4,7 @@
 #include "qemu-common.h"
 
 #include "hw/qdev.h"
-#include "memory.h"
+#include "exec/memory.h"
 #include "dma.h"
 
 /* PCI includes legacy ISA access.  */

diff --git a/hw/pci/pcie_host.c b/hw/pci/pcie_host.c
index ab8d251de6f2ae1251cbf3eb849e153ce489ade3..b2d942bce1b59b72bce54bed06715670644f8956 100644 (file)
--- a/hw/pci/pcie_host.c
+++ b/hw/pci/pcie_host.c
@@ -22,7 +22,7 @@
 #include "hw/hw.h"
 #include "hw/pci/pci.h"
 #include "hw/pci/pcie_host.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 
 /*
  * PCI express mmcfig address

diff --git a/hw/pci/pcie_host.h b/hw/pci/pcie_host.h
index 150bef97360f8f4ce64c567f5e70fb7e1199ebc2..1228e36cb260106c9c4133f2c6e51ccbfa2aa633 100644 (file)
--- a/hw/pci/pcie_host.h
+++ b/hw/pci/pcie_host.h
@@ -22,7 +22,7 @@
 #define PCIE_HOST_H
 
 #include "hw/pci/pci_host.h"
-#include "memory.h"
+#include "exec/memory.h"
 
 #define TYPE_PCIE_HOST_BRIDGE "pcie-host-bridge"
 #define PCIE_HOST_BRIDGE(obj) \

diff --git a/hw/pci/shpc.h b/hw/pci/shpc.h
index 130b71df301d03775db534f9964903f135a9f38f..6374e68bdb04d271bae151fe9910e7670da87069 100644 (file)
--- a/hw/pci/shpc.h
+++ b/hw/pci/shpc.h
@@ -2,7 +2,7 @@
 #define SHPC_H
 
 #include "qemu-common.h"
-#include "memory.h"
+#include "exec/memory.h"
 #include "vmstate.h"
 
 struct SHPCDevice {

diff --git a/hw/pci_bridge_dev.c b/hw/pci_bridge_dev.c
index dbb4b3b433261b2ed512c1a1c157312e38d9f55c..7818dcc35045ef218d02eeb1bb91aeecab0fa902 100644 (file)
--- a/hw/pci_bridge_dev.c
+++ b/hw/pci_bridge_dev.c
@@ -24,7 +24,7 @@
 #include "pci/msi.h"
 #include "pci/shpc.h"
 #include "pci/slotid_cap.h"
-#include "memory.h"
+#include "exec/memory.h"
 #include "pci/pci_bus.h"
 
 #define REDHAT_PCI_VENDOR_ID 0x1b36

diff --git a/hw/pcnet.h b/hw/pcnet.h
index 96643117a02d48f2911e4c89c9e1fd9ed7860c04..9dee6f3e2c5570666157059f91a949191bf2e23b 100644 (file)
--- a/hw/pcnet.h
+++ b/hw/pcnet.h
@@ -7,7 +7,7 @@
 #define PCNET_LOOPTEST_CRC     1
 #define PCNET_LOOPTEST_NOCRC   2
 
-#include "memory.h"
+#include "exec/memory.h"
 
 /* BUS CONFIGURATION REGISTERS */
 #define BCR_MSRDA    0

diff --git a/hw/petalogix_ml605_mmu.c b/hw/petalogix_ml605_mmu.c
index df51a74450cae54bbb00bbd3b2818e0259f4b549..4eab0f2d8bd9b2eb4d8bce539bc2b093b18da7e8 100644 (file)
--- a/hw/petalogix_ml605_mmu.c
+++ b/hw/petalogix_ml605_mmu.c
@@ -35,7 +35,7 @@
 #include "xilinx.h"
 #include "blockdev.h"
 #include "serial.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 #include "ssi.h"
 
 #include "microblaze_boot.h"

diff --git a/hw/petalogix_s3adsp1800_mmu.c b/hw/petalogix_s3adsp1800_mmu.c
index 37b0d5595a852ca57975095133c25620c731520e..124a88eeda452e7d1277b66aad59c57c3721b25c 100644 (file)
--- a/hw/petalogix_s3adsp1800_mmu.c
+++ b/hw/petalogix_s3adsp1800_mmu.c
@@ -32,7 +32,7 @@
 #include "boards.h"
 #include "xilinx.h"
 #include "blockdev.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 
 #include "microblaze_boot.h"
 #include "microblaze_pic_cpu.h"

diff --git a/hw/pflash_cfi01.c b/hw/pflash_cfi01.c
index a2f636083887cc395111ee706ca4ce8c1169e08c..36af4647df43db56d69b666ab5b8f54e4e575764 100644 (file)
--- a/hw/pflash_cfi01.c
+++ b/hw/pflash_cfi01.c
@@ -40,7 +40,7 @@
 #include "flash.h"
 #include "block/block.h"
 #include "qemu-timer.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 #include "host-utils.h"
 #include "sysbus.h"
 

diff --git a/hw/pflash_cfi02.c b/hw/pflash_cfi02.c
index beab67fc8724b0c053eec4044a865f0a8353c994..c689cc9f42a02a3adff62577b12d72b785acd2a1 100644 (file)
--- a/hw/pflash_cfi02.c
+++ b/hw/pflash_cfi02.c
@@ -39,7 +39,7 @@
 #include "flash.h"
 #include "qemu-timer.h"
 #include "block/block.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 #include "host-utils.h"
 #include "sysbus.h"
 

diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c
index 4690bd8b00872c56b28f364a2b5a4666e2bb24c9..798e67cedf02a2aaea1ed588ad40abf002daf6ae 100644 (file)
--- a/hw/ppc/e500.c
+++ b/hw/ppc/e500.c
@@ -33,7 +33,7 @@
 #include "hw/loader.h"
 #include "elf.h"
 #include "hw/sysbus.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 #include "host-utils.h"
 #include "hw/ppce500_pci.h"
 

diff --git a/hw/ppc405_boards.c b/hw/ppc405_boards.c
index b875e3b6154145134651869a87ce02b570de6ace..5a0e0260e6820d447ed16e36ad1b830b0ef392c4 100644 (file)
--- a/hw/ppc405_boards.c
+++ b/hw/ppc405_boards.c
@@ -32,7 +32,7 @@
 #include "qemu-log.h"
 #include "loader.h"
 #include "blockdev.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 
 #define BIOS_FILENAME "ppc405_rom.bin"
 #define BIOS_SIZE (2048 * 1024)

diff --git a/hw/ppc405_uc.c b/hw/ppc405_uc.c
index 0f458ef772ff02d422f030a4967c592de3160577..aabb2efb486f494d2072fdf28f50a11089be398a 100644 (file)
--- a/hw/ppc405_uc.c
+++ b/hw/ppc405_uc.c
@@ -28,7 +28,7 @@
 #include "qemu-timer.h"
 #include "sysemu.h"
 #include "qemu-log.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 
 #define DEBUG_OPBA
 #define DEBUG_SDRAM

diff --git a/hw/ppc440_bamboo.c b/hw/ppc440_bamboo.c
index 5193a0c4beb641948faa242472a0e0087ee0776d..591d7b0088a6c5c08a0a17ce8b9f6b384ee61587 100644 (file)
--- a/hw/ppc440_bamboo.c
+++ b/hw/ppc440_bamboo.c
@@ -22,7 +22,7 @@
 #include "device_tree.h"
 #include "loader.h"
 #include "elf.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 #include "serial.h"
 #include "ppc.h"
 #include "ppc405.h"

diff --git a/hw/ppc4xx_devs.c b/hw/ppc4xx_devs.c
index bac8d8769ac754c10b61ebe8baa76bf8ac033597..3b9dc0671606174039cb8791ee991a50eed157ab 100644 (file)
--- a/hw/ppc4xx_devs.c
+++ b/hw/ppc4xx_devs.c
@@ -25,7 +25,7 @@
 #include "ppc.h"
 #include "ppc4xx.h"
 #include "qemu-log.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 
 //#define DEBUG_MMIO
 //#define DEBUG_UNASSIGNED

diff --git a/hw/ppc4xx_pci.c b/hw/ppc4xx_pci.c
index 3e8af11f08b0b1c94b182889868a9105fd4aee6f..ba2d669b8346306bd159c323bee88e2f083a8a46 100644 (file)
--- a/hw/ppc4xx_pci.c
+++ b/hw/ppc4xx_pci.c
@@ -24,7 +24,7 @@
 #include "ppc4xx.h"
 #include "pci/pci.h"
 #include "pci/pci_host.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 
 #undef DEBUG
 #ifdef DEBUG

diff --git a/hw/ppc_mac.h b/hw/ppc_mac.h
index 524b2368a4d9bec904a87066b2bc13b5e5c643fe..89c7d6638630b90345162833b17e62a1e97f8c85 100644 (file)
--- a/hw/ppc_mac.h
+++ b/hw/ppc_mac.h
@@ -25,7 +25,7 @@
 #if !defined(__PPC_MAC_H__)
 #define __PPC_MAC_H__
 
-#include "memory.h"
+#include "exec/memory.h"
 
 /* SMP is not enabled, for now */
 #define MAX_CPUS 1

diff --git a/hw/ppc_newworld.c b/hw/ppc_newworld.c
index 657f405f1ba4731901b9fb8f0ee06ef2eb097499..b2d02eaff25357a175591b76f0b8aeb550515867 100644 (file)
--- a/hw/ppc_newworld.c
+++ b/hw/ppc_newworld.c
@@ -66,7 +66,7 @@
 #include "kvm_ppc.h"
 #include "hw/usb.h"
 #include "blockdev.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 #include "sysbus.h"
 
 #define MAX_IDE_BUS 2

diff --git a/hw/ppc_oldworld.c b/hw/ppc_oldworld.c
index a149306cc918ece25bf22fa0e8cac9722f404689..7a8a039d7e795ac3adad85165b0a0c9ec36c3ffb 100644 (file)
--- a/hw/ppc_oldworld.c
+++ b/hw/ppc_oldworld.c
@@ -42,7 +42,7 @@
 #include "kvm.h"
 #include "kvm_ppc.h"
 #include "blockdev.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 
 #define MAX_IDE_BUS 2
 #define CFG_ADDR 0xf0000510

diff --git a/hw/ppc_prep.c b/hw/ppc_prep.c
index 25cc0490f936ab67c90b8a370506d4acb13efab4..aa46cc6f55cec5ab952784722d2f0d88182c0594 100644 (file)
--- a/hw/ppc_prep.c
+++ b/hw/ppc_prep.c
@@ -39,7 +39,7 @@
 #include "mc146818rtc.h"
 #include "blockdev.h"
 #include "arch_init.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 
 //#define HARD_DEBUG_PPC_IO
 //#define DEBUG_PPC_IO

diff --git a/hw/ppce500_pci.c b/hw/ppce500_pci.c
index 9bffbb9f870d5bba9c7117139b37e22e06339cc3..feefc6596ba0ab7c31e2a39edae0a63974e3d7e1 100644 (file)
--- a/hw/ppce500_pci.c
+++ b/hw/ppce500_pci.c
@@ -317,7 +317,7 @@ static const VMStateDescription vmstate_ppce500_pci = {
     }
 };
 
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 
 static int e500_pcihost_bridge_initfn(PCIDevice *d)
 {

diff --git a/hw/prep_pci.c b/hw/prep_pci.c
index 5f22de647aa7899acf5a77274864e30f4297884c..212a2ac4f1efb8dc6fe8f5782fb9263a0ea8ef41 100644 (file)
--- a/hw/prep_pci.c
+++ b/hw/prep_pci.c
@@ -26,7 +26,7 @@
 #include "pci/pci.h"
 #include "pci/pci_host.h"
 #include "pc.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 
 #define TYPE_RAVEN_PCI_HOST_BRIDGE "raven-pcihost"
 

diff --git a/hw/puv3.c b/hw/puv3.c
index 9f8e294ad504818ad5d40ac770a09dbf9f999a22..7814bc50512eb39d0d5f22a800c4c6829935c933 100644 (file)
--- a/hw/puv3.c
+++ b/hw/puv3.c
@@ -12,7 +12,7 @@
 #include "qemu-common.h"
 #include "ui/console.h"
 #include "elf.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 #include "sysbus.h"
 #include "boards.h"
 #include "loader.h"

diff --git a/hw/pxa.h b/hw/pxa.h
index 49ac820ea268315a385bd05e783bce0993d032c2..c2577d1d94a20377bfd43df7a80a3a832dd023d4 100644 (file)
--- a/hw/pxa.h
+++ b/hw/pxa.h
@@ -9,7 +9,7 @@
 #ifndef PXA_H
 # define PXA_H                 "pxa.h"
 
-#include "memory.h"
+#include "exec/memory.h"
 
 /* Interrupt numbers */
 # define PXA2XX_PIC_SSP3       0

diff --git a/hw/qdev-addr.c b/hw/qdev-addr.c
index 552ee21f823c42011cd3ae37ac88968262386d47..3bfe101d79969aae6dd59de57f51b353886f53df 100644 (file)
--- a/hw/qdev-addr.c
+++ b/hw/qdev-addr.c
@@ -1,6 +1,6 @@
 #include "qdev.h"
 #include "qdev-addr.h"
-#include "hwaddr.h"
+#include "exec/hwaddr.h"
 #include "qapi/visitor.h"
 
 /* --- target physical address --- */

diff --git a/hw/r2d.c b/hw/r2d.c
index b1c278f73f1e852068cb4ea6cfc9bdb19bce4745..d7a26bf3982e4b49a81eec70bbdbe5c2ed83a873 100644 (file)
--- a/hw/r2d.c
+++ b/hw/r2d.c
@@ -37,7 +37,7 @@
 #include "usb.h"
 #include "flash.h"
 #include "blockdev.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 
 #define FLASH_BASE 0x00000000
 #define FLASH_SIZE 0x02000000

diff --git a/hw/realview.c b/hw/realview.c
index 17d1ba2266106191f085286114e4635743540208..9c55bf29b7e8b61e27d081892d8020a501e0954e 100644 (file)
--- a/hw/realview.c
+++ b/hw/realview.c
@@ -17,7 +17,7 @@
 #include "boards.h"
 #include "i2c.h"
 #include "blockdev.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 
 #define SMP_BOOT_ADDR 0xe0000000
 #define SMP_BOOTREG_ADDR 0x10000030

diff --git a/hw/s390-virtio.c b/hw/s390-virtio.c
index b732bccef83c2f85c9cf2116d981442dc5d81436..0a15625b73f36ae902a731d504e0d011e6145401 100644 (file)
--- a/hw/s390-virtio.c
+++ b/hw/s390-virtio.c
@@ -29,7 +29,7 @@
 #include "hw/virtio.h"
 #include "hw/sysbus.h"
 #include "kvm.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 
 #include "hw/s390-virtio-bus.h"
 #include "hw/s390x/sclp.h"

diff --git a/hw/s390x/sclp.c b/hw/s390x/sclp.c
index 5c274fa03d848325f80c0f5b593cf9553c57730b..bc9b0aeb008e43046b4251db8c061f4de4cf9f0c 100644 (file)
--- a/hw/s390x/sclp.c
+++ b/hw/s390x/sclp.c
@@ -14,7 +14,7 @@
 
 #include "cpu.h"
 #include "kvm.h"
-#include "memory.h"
+#include "exec/memory.h"
 
 #include "sclp.h"
 

diff --git a/hw/serial.c b/hw/serial.c
index 07a2a11931d39595d321425a9094a3c86ba3c2da..3968c4fc462512b304cc22976de1c14805fa957b 100644 (file)
--- a/hw/serial.c
+++ b/hw/serial.c
@@ -26,7 +26,7 @@
 #include "serial.h"
 #include "qemu-char.h"
 #include "qemu-timer.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 
 //#define DEBUG_SERIAL
 

diff --git a/hw/serial.h b/hw/serial.h
index 2d7d614e09c391fe7a2096ebadcb4d4a142d11b7..5722f8a35337784f92f9157a7e4f79f0051363d9 100644 (file)
--- a/hw/serial.h
+++ b/hw/serial.h
@@ -27,7 +27,7 @@
 
 #include "hw.h"
 #include "sysemu.h"
-#include "memory.h"
+#include "exec/memory.h"
 
 #define UART_FIFO_LENGTH    16      /* 16550A Fifo Length */
 

diff --git a/hw/sh7750.c b/hw/sh7750.c
index 8bcf0df96fafa582c81880eb3b6c3dcba915da18..08945750c46e482a321c38ad16d6e433f8802ba7 100644 (file)
--- a/hw/sh7750.c
+++ b/hw/sh7750.c
@@ -30,7 +30,7 @@
 #include "sh7750_regnames.h"
 #include "sh_intc.h"
 #include "cpu.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 
 #define NB_DEVICES 4
 

diff --git a/hw/sh_intc.h b/hw/sh_intc.h
index 80c943057788ade1ae9a8df8941c379ac44c9943..6f11beedddb1b95ec4bf2eb2b24972bae008d966 100644 (file)
--- a/hw/sh_intc.h
+++ b/hw/sh_intc.h
@@ -3,7 +3,7 @@
 
 #include "qemu-common.h"
 #include "irq.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 
 typedef unsigned char intc_enum;
 

diff --git a/hw/sh_pci.c b/hw/sh_pci.c
index 9ea08c8f8eb70fca2a4ad587151ead17a8a035ac..d5218420a3fb706d817e852e97f25bec9a65029b 100644 (file)
--- a/hw/sh_pci.c
+++ b/hw/sh_pci.c
@@ -26,7 +26,7 @@
 #include "pci/pci.h"
 #include "pci/pci_host.h"
 #include "bswap.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 
 typedef struct SHPCIState {
     SysBusDevice busdev;

diff --git a/hw/sh_serial.c b/hw/sh_serial.c
index 9da5d08fee353b5186c8cc2835d22868ace215d8..63723496f18d00096b50f61c7c35353c71113ff8 100644 (file)
--- a/hw/sh_serial.c
+++ b/hw/sh_serial.c
@@ -27,7 +27,7 @@
 #include "hw.h"
 #include "sh.h"
 #include "qemu-char.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 
 //#define DEBUG_SERIAL
 

diff --git a/hw/sh_timer.c b/hw/sh_timer.c
index c0365b114268892c81bfbe8d4ffdf6ca5f3ab0e0..da6689f36919eb1633124c9323f4501b9f795116 100644 (file)
--- a/hw/sh_timer.c
+++ b/hw/sh_timer.c
@@ -11,7 +11,7 @@
 #include "hw.h"
 #include "sh.h"
 #include "qemu-timer.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 #include "ptimer.h"
 
 //#define DEBUG_TIMER

diff --git a/hw/shix.c b/hw/shix.c
index b56dd54f75b395483802fae792bd4e4c0f027cb4..821196e84c8f81a5871c6d79449a0118f3c8b717 100644 (file)
--- a/hw/shix.c
+++ b/hw/shix.c
@@ -32,7 +32,7 @@
 #include "sysemu.h"
 #include "boards.h"
 #include "loader.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 
 #define BIOS_FILENAME "shix_bios.bin"
 #define BIOS_ADDRESS 0xA0000000

diff --git a/hw/soc_dma.h b/hw/soc_dma.h
index 6ca4166184ed3595a8d3a81a1421d111f76492ee..7379731afd793215e9819d6e831541a19e8abedc 100644 (file)
--- a/hw/soc_dma.h
+++ b/hw/soc_dma.h
@@ -22,7 +22,7 @@
 #define HW_SOC_DMA_H 1
 
 
-#include "memory.h"
+#include "exec/memory.h"
 #include "hw/irq.h"
 
 struct soc_dma_s;

diff --git a/hw/spapr.c b/hw/spapr.c
index 395c4ac69b4b351b5a7b0c13fed80ed8d264fed1..d1252fc68c461c77a47255586aaa8599ca52410f 100644 (file)
--- a/hw/spapr.c
+++ b/hw/spapr.c
@@ -47,7 +47,7 @@
 #include "kvm_ppc.h"
 #include "pci/pci.h"
 
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 #include "hw/usb.h"
 #include "qemu-config.h"
 

diff --git a/hw/spapr_iommu.c b/hw/spapr_iommu.c
index 3011b251d3dcc0193ce12e3d9277f75be4560b4c..fb968b250be2894f1dbb38affcb39416589ba492 100644 (file)
--- a/hw/spapr_iommu.c
+++ b/hw/spapr_iommu.c
@@ -21,7 +21,7 @@
 #include "qdev.h"
 #include "kvm_ppc.h"
 #include "dma.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 
 #include "hw/spapr.h"
 

diff --git a/hw/spapr_pci.c b/hw/spapr_pci.c
index 786f6f42227b44c90655b77bb650c132fec1796e..27b3ad3d60a68deb2b65bda11028f88e558c7f26 100644 (file)
--- a/hw/spapr_pci.c
+++ b/hw/spapr_pci.c
@@ -29,7 +29,7 @@
 #include "pci/pci_host.h"
 #include "hw/spapr.h"
 #include "hw/spapr_pci.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 #include <libfdt.h>
 #include "trace.h"
 

diff --git a/hw/spitz.c b/hw/spitz.c
index 1500161d44aab081ca36691e41cdcc26d0cf4714..48668a0f108b2c57838711961edbf6700932117f 100644 (file)
--- a/hw/spitz.c
+++ b/hw/spitz.c
@@ -27,7 +27,7 @@
 #include "boards.h"
 #include "blockdev.h"
 #include "sysbus.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 
 #undef REG_FMT
 #define REG_FMT                        "0x%02lx"

diff --git a/hw/stellaris.c b/hw/stellaris.c
index f3eb4bbc01c4021af7183c4ddfe3418882a07d64..368f8a5e73a15a6177d917fd512158c81eb9254b 100644 (file)
--- a/hw/stellaris.c
+++ b/hw/stellaris.c
@@ -15,7 +15,7 @@
 #include "i2c.h"
 #include "net/net.h"
 #include "boards.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 
 #define GPIO_A 0
 #define GPIO_B 1

diff --git a/hw/strongarm.h b/hw/strongarm.h
index d30dd6ac5e44991e0f6fe9f85c9c869da8ad6d21..2893f94445d9b398bc2da28704c5d33213e65c59 100644 (file)
--- a/hw/strongarm.h
+++ b/hw/strongarm.h
@@ -1,7 +1,7 @@
 #ifndef _STRONGARM_H
 #define _STRONGARM_H
 
-#include "memory.h"
+#include "exec/memory.h"
 
 #define SA_CS0          0x00000000
 #define SA_CS1          0x08000000

diff --git a/hw/sun4u.c b/hw/sun4u.c
index d9e752fe83ee817218fa4277085977d286274492..000f6118e1403ad57402b353e155ca3e182a5901 100644 (file)
--- a/hw/sun4u.c
+++ b/hw/sun4u.c
@@ -39,7 +39,7 @@
 #include "loader.h"
 #include "elf.h"
 #include "blockdev.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 
 //#define DEBUG_IRQ
 //#define DEBUG_EBUS

diff --git a/hw/sysbus.c b/hw/sysbus.c
index ef8ffb6603bde98dedb522b9c9b1fc19b83663c4..7ab250463cbfe6707f8aa4b3a5eef76c1b54ac9b 100644 (file)
--- a/hw/sysbus.c
+++ b/hw/sysbus.c
@@ -19,7 +19,7 @@
 
 #include "sysbus.h"
 #include "monitor.h"
-#include "exec-memory.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/sysbus.h b/hw/sysbus.h
index e58baaae36960915fc46639be332809bf20058fd..669cf87ae9e12ad7e76c13e15fb7b0635cee427e 100644 (file)
--- a/hw/sysbus.h
+++ b/hw/sysbus.h
@@ -4,7 +4,7 @@
 /* Devices attached directly to the main system bus.  */
 
 #include "qdev.h"
-#include "memory.h"
+#include "exec/memory.h"
 
 #define QDEV_MAX_MMIO 32
 #define QDEV_MAX_PIO 32

diff --git a/hw/tosa.c b/hw/tosa.c
index 3991a909b512a4c7710a9e6c7642277bd9a0192c..6fdbec53ee6d4f1f1b1a0959d333604fa04ac789 100644 (file)
--- a/hw/tosa.c
+++ b/hw/tosa.c
@@ -23,7 +23,7 @@
 #include "ssi.h"
 #include "blockdev.h"
 #include "sysbus.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 
 #define TOSA_RAM    0x04000000
 #define TOSA_ROM       0x00800000

diff --git a/hw/usb/libhw.c b/hw/usb/libhw.c
index 24d3cad3a2a18c01bbc43381e030441f6b1f7c11..672d7a5598e775998cf6290f0fcdc4732e3859f5 100644 (file)
--- a/hw/usb/libhw.c
+++ b/hw/usb/libhw.c
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 #include "qemu-common.h"
-#include "cpu-common.h"
+#include "exec/cpu-common.h"
 #include "hw/usb.h"
 #include "dma.h"
 

diff --git a/hw/versatile_pci.c b/hw/versatile_pci.c
index 7a543b47d06fea74628dfffae80fb6e83f8669bd..1f4d66934cbb73be7994c85aa0e2948e86117ac0 100644 (file)
--- a/hw/versatile_pci.c
+++ b/hw/versatile_pci.c
@@ -10,7 +10,7 @@
 #include "sysbus.h"
 #include "pci/pci.h"
 #include "pci/pci_host.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 
 typedef struct {
     SysBusDevice busdev;

diff --git a/hw/versatilepb.c b/hw/versatilepb.c
index af398d9cca6ad87b5707846cc87ee27c1d5d6a2b..bd9c01564af3a2a35f1003be8680bf01b6c2a541 100644 (file)
--- a/hw/versatilepb.c
+++ b/hw/versatilepb.c
@@ -16,7 +16,7 @@
 #include "i2c.h"
 #include "boards.h"
 #include "blockdev.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 #include "flash.h"
 
 #define VERSATILE_FLASH_ADDR 0x34000000

diff --git a/hw/vexpress.c b/hw/vexpress.c
index 5c9c08b99123b3c8146bf84d16295cb2a6e6ec23..e7b9e93852af86bbb8c456169e14ea27dd4747b0 100644 (file)
--- a/hw/vexpress.c
+++ b/hw/vexpress.c
@@ -28,7 +28,7 @@
 #include "net/net.h"
 #include "sysemu.h"
 #include "boards.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 #include "blockdev.h"
 #include "flash.h"
 

diff --git a/hw/vfio_pci.c b/hw/vfio_pci.c
index 264e58a68b7f60ae15e0ab5fc7fa6b54169e72ff..096621cdbdb894cb5a860e25ace9f39ef10a0203 100644 (file)
--- a/hw/vfio_pci.c
+++ b/hw/vfio_pci.c
@@ -28,9 +28,9 @@
 
 #include "config.h"
 #include "event_notifier.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 #include "kvm.h"
-#include "memory.h"
+#include "exec/memory.h"
 #include "pci/msi.h"
 #include "pci/msix.h"
 #include "pci/pci.h"

diff --git a/hw/vga_int.h b/hw/vga_int.h
index 5efaee81d99907df40a8ef22f96fe4746aa228d5..8d496ea9bf2e05c6290abf273ab24ca422288e1d 100644 (file)
--- a/hw/vga_int.h
+++ b/hw/vga_int.h
@@ -26,7 +26,7 @@
 
 #include <hw/hw.h>
 #include "qapi/error.h"
-#include "memory.h"
+#include "exec/memory.h"
 
 #define ST01_V_RETRACE      0x08
 #define ST01_DISP_ENABLE    0x01

diff --git a/hw/vhost.c b/hw/vhost.c
index 16322a14f4f019329c3504c73ae72fb601be73c0..feaff64c15031668653a6fa787c99db816fac19d 100644 (file)
--- a/hw/vhost.c
+++ b/hw/vhost.c
@@ -18,7 +18,7 @@
 #include "hw/hw.h"
 #include "range.h"
 #include <linux/vhost.h>
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 
 static void vhost_dev_sync_region(struct vhost_dev *dev,
                                   MemoryRegionSection *section,

diff --git a/hw/vhost.h b/hw/vhost.h
index 0c47229f91b0cb14409e321cc5f3819d7e45bad9..6f6a906f4f8d527ab5ad08fd0b2c4317ee3655c1 100644 (file)
--- a/hw/vhost.h
+++ b/hw/vhost.h
@@ -3,7 +3,7 @@
 
 #include "hw/hw.h"
 #include "hw/virtio.h"
-#include "memory.h"
+#include "exec/memory.h"
 
 /* Generic structures common for any vhost based device. */
 struct vhost_virtqueue {

diff --git a/hw/virtex_ml507.c b/hw/virtex_ml507.c
index 1fdbc497cc0b12d1be9e5f01cc241f4c2b897cec..0f27c2b41485c337c3ddd9483069f6ea9d4a007a 100644 (file)
--- a/hw/virtex_ml507.c
+++ b/hw/virtex_ml507.c
@@ -33,7 +33,7 @@
 #include "loader.h"
 #include "elf.h"
 #include "qemu-log.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 
 #include "ppc.h"
 #include "ppc4xx.h"

diff --git a/hw/virtio-balloon.c b/hw/virtio-balloon.c
index dd1a6506cf2a13d594bfbe7d51a16d56a3e899c2..97d3a932d95a45d97bdb6441fd5a7e51ac9f981a 100644 (file)
--- a/hw/virtio-balloon.c
+++ b/hw/virtio-balloon.c
@@ -21,7 +21,7 @@
 #include "balloon.h"
 #include "virtio-balloon.h"
 #include "kvm.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 
 #if defined(__linux__)
 #include <sys/mman.h>

diff --git a/hw/vt82c686.c b/hw/vt82c686.c
index f96391211221408a8092741f07f1e764cad1675a..edceb5a01d461246a9f072f595e730f1228d4f95 100644 (file)
--- a/hw/vt82c686.c
+++ b/hw/vt82c686.c
@@ -24,7 +24,7 @@
 #include "pm_smbus.h"
 #include "sysemu.h"
 #include "qemu-timer.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 
 typedef uint32_t pci_addr_t;
 #include "pci/pci_host.h"

diff --git a/hw/xen_platform.c b/hw/xen_platform.c
index 023499eb5527eb09c2e66ea8bf791269e0c79a49..e7611bb35309f1100b7a3981cae373e9dc466c52 100644 (file)
--- a/hw/xen_platform.c
+++ b/hw/xen_platform.c
@@ -32,7 +32,7 @@
 #include "xen_common.h"
 #include "xen_backend.h"
 #include "trace.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 
 #include <xenguest.h>
 

diff --git a/hw/xen_pt.c b/hw/xen_pt.c
index c782cdb283d6c0374434623b145ea2d90247a03f..5c50d562d9dadd16e5a796c45e2821a6aed6b315 100644 (file)
--- a/hw/xen_pt.c
+++ b/hw/xen_pt.c
@@ -59,7 +59,7 @@
 #include "xen_backend.h"
 #include "xen_pt.h"
 #include "range.h"
-#include "exec-memory.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/xilinx_zynq.c b/hw/xilinx_zynq.c
index 67adc52725d4573a9eb007f355cd5f9c993bb33d..156648a5d1ce3fb569490a974dccfbd2c3472643 100644 (file)
--- a/hw/xilinx_zynq.c
+++ b/hw/xilinx_zynq.c
@@ -18,7 +18,7 @@
 #include "sysbus.h"
 #include "arm-misc.h"
 #include "net/net.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 #include "sysemu.h"
 #include "boards.h"
 #include "flash.h"

diff --git a/hw/xtensa_lx60.c b/hw/xtensa_lx60.c
index 0399de777e08d19b7dacf48f9c030a6521091f83..c6c880eba570f78d0f6f13ba27ced5da8e7bb068 100644 (file)
--- a/hw/xtensa_lx60.c
+++ b/hw/xtensa_lx60.c
@@ -29,8 +29,8 @@
 #include "boards.h"
 #include "loader.h"
 #include "elf.h"
-#include "memory.h"
-#include "exec-memory.h"
+#include "exec/memory.h"
+#include "exec/address-spaces.h"
 #include "serial.h"
 #include "net/net.h"
 #include "sysbus.h"

diff --git a/hw/xtensa_sim.c b/hw/xtensa_sim.c
index 0d633e4724e71e6e01cd6a08ab808b7cf40c0f68..29b5f22a184a70cf1dd218f14cf51774a59152d0 100644 (file)
--- a/hw/xtensa_sim.c
+++ b/hw/xtensa_sim.c
@@ -29,8 +29,8 @@
 #include "boards.h"
 #include "loader.h"
 #include "elf.h"
-#include "memory.h"
-#include "exec-memory.h"
+#include "exec/memory.h"
+#include "exec/address-spaces.h"
 
 static uint64_t translate_phys_addr(void *env, uint64_t addr)
 {

diff --git a/hw/z2.c b/hw/z2.c
index d46186430f5d1b7c5535f3b598132790ba910f26..ec35f3e44491bb8640690ca9c1c74e6999f1f1a1 100644 (file)
--- a/hw/z2.c
+++ b/hw/z2.c
@@ -23,7 +23,7 @@
 #include "blockdev.h"
 #include "ui/console.h"
 #include "audio/audio.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 
 #ifdef DEBUG_Z2
 #define DPRINTF(fmt, ...) \

diff --git a/exec-memory.h b/include/exec/address-spaces.h
similarity index 97%
rename from exec-memory.h
rename to include/exec/address-spaces.h
index ac1d07dfe4dcf0d453e41026df41d3a37d166633..3d12cddeec18a86a5c02bb51fe2eba8a66cd8c6b 100644 (file)
--- a/exec-memory.h
+++ b/include/exec/address-spaces.h
@@ -19,7 +19,7 @@
  * you're one of them.
  */
 
-#include "memory.h"
+#include "exec/memory.h"
 
 #ifndef CONFIG_USER_ONLY
 

diff --git a/cpu-all.h b/include/exec/cpu-all.h
similarity index 99%
rename from cpu-all.h
rename to include/exec/cpu-all.h
index d6b2b19743ed55b30c5b74c6c7e002a452ed41d7..bec04e2008c2044e93ca4975ae74ebc1b13dc242 100644 (file)
--- a/cpu-all.h
+++ b/include/exec/cpu-all.h
@@ -21,7 +21,7 @@
 
 #include "qemu-common.h"
 #include "qemu-tls.h"
-#include "cpu-common.h"
+#include "exec/cpu-common.h"
 
 /* some important defines:
  *
@@ -180,7 +180,7 @@ static inline void tswap64s(uint64_t *s)
 
 #if defined(CONFIG_USER_ONLY)
 #include <assert.h>
-#include "qemu-user-types.h"
+#include "exec/user/abitypes.h"
 
 /* On some host systems the guest address space is reserved on the host.
  * This allows the guest address space to be offset to a convenient location.

diff --git a/cpu-common.h b/include/exec/cpu-common.h
similarity index 98%
rename from cpu-common.h
rename to include/exec/cpu-common.h
index d2fbafac9c5a62c68ceb937c14a67cace81bdc9a..f83d6180f3e1220bd9ff03beee0c1c2bc459e81f 100644 (file)
--- a/cpu-common.h
+++ b/include/exec/cpu-common.h
@@ -3,10 +3,10 @@
 
 /* CPU interfaces that are target independent.  */
 
-#include "hwaddr.h"
+#include "exec/hwaddr.h"
 
 #ifndef NEED_CPU_H
-#include "poison.h"
+#include "exec/poison.h"
 #endif
 
 #include "bswap.h"

diff --git a/cpu-defs.h b/include/exec/cpu-defs.h
similarity index 99%
rename from cpu-defs.h
rename to include/exec/cpu-defs.h
index 3669241fafb956987046f633ae4d29a588cde47b..8d2230e50eae1c1f8fcc670120555572070887cb 100644 (file)
--- a/cpu-defs.h
+++ b/include/exec/cpu-defs.h
@@ -29,7 +29,7 @@
 #include <signal.h>
 #include "osdep.h"
 #include "qemu-queue.h"
-#include "hwaddr.h"
+#include "exec/hwaddr.h"
 
 #ifndef TARGET_LONG_BITS
 #error TARGET_LONG_BITS must be defined before including this header

diff --git a/cputlb.h b/include/exec/cputlb.h
similarity index 100%
rename from cputlb.h
rename to include/exec/cputlb.h

diff --git a/def-helper.h b/include/exec/def-helper.h
similarity index 100%
rename from def-helper.h
rename to include/exec/def-helper.h

diff --git a/exec-all.h b/include/exec/exec-all.h
similarity index 98%
rename from exec-all.h
rename to include/exec/exec-all.h
index e9b07cd9865700d27d23a04397f7c066d9537e02..2ae8aae3d6c9f826ac1028a32b56508411fb4ecb 100644 (file)
--- a/exec-all.h
+++ b/include/exec/exec-all.h
@@ -275,7 +275,7 @@ static inline void tb_add_jump(TranslationBlock *tb, int n,
     }
 }
 
-#include "qemu-lock.h"
+#include "exec/spinlock.h"
 
 extern spinlock_t tb_lock;
 
@@ -353,22 +353,22 @@ void io_mem_write(struct MemoryRegion *mr, hwaddr addr,
 void tlb_fill(CPUArchState *env1, target_ulong addr, int is_write, int mmu_idx,
               uintptr_t retaddr);
 
-#include "softmmu_defs.h"
+#include "exec/softmmu_defs.h"
 
 #define ACCESS_TYPE (NB_MMU_MODES + 1)
 #define MEMSUFFIX _code
 
 #define DATA_SIZE 1
-#include "softmmu_header.h"
+#include "exec/softmmu_header.h"
 
 #define DATA_SIZE 2
-#include "softmmu_header.h"
+#include "exec/softmmu_header.h"
 
 #define DATA_SIZE 4
-#include "softmmu_header.h"
+#include "exec/softmmu_header.h"
 
 #define DATA_SIZE 8
-#include "softmmu_header.h"
+#include "exec/softmmu_header.h"
 
 #undef ACCESS_TYPE
 #undef MEMSUFFIX

diff --git a/gdbstub.h b/include/exec/gdbstub.h
similarity index 100%
rename from gdbstub.h
rename to include/exec/gdbstub.h

diff --git a/gen-icount.h b/include/exec/gen-icount.h
similarity index 100%
rename from gen-icount.h
rename to include/exec/gen-icount.h

diff --git a/hwaddr.h b/include/exec/hwaddr.h
similarity index 100%
rename from hwaddr.h
rename to include/exec/hwaddr.h

diff --git a/ioport.h b/include/exec/ioport.h
similarity index 99%
rename from ioport.h
rename to include/exec/ioport.h
index 23441cba088d3e865e7d49889100df1714cc5565..fc28350a3cc5a0037f6d7e065e77bf5790a64e8d 100644 (file)
--- a/ioport.h
+++ b/include/exec/ioport.h
@@ -25,7 +25,7 @@
 #define IOPORT_H
 
 #include "qemu-common.h"
-#include "iorange.h"
+#include "exec/iorange.h"
 
 typedef uint32_t pio_addr_t;
 #define FMT_pioaddr     PRIx32

diff --git a/iorange.h b/include/exec/iorange.h
similarity index 100%
rename from iorange.h
rename to include/exec/iorange.h

diff --git a/memory-internal.h b/include/exec/memory-internal.h
similarity index 100%
rename from memory-internal.h
rename to include/exec/memory-internal.h

diff --git a/memory.h b/include/exec/memory.h
similarity index 99%
rename from memory.h
rename to include/exec/memory.h
index 9462bfd3ad182712c4b2b0e905a517c4f5d71d0f..b0c474584f108bc02d2cc42638a81f24cb2c88d1 100644 (file)
--- a/memory.h
+++ b/include/exec/memory.h
@@ -19,11 +19,11 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include "qemu-common.h"
-#include "cpu-common.h"
-#include "hwaddr.h"
+#include "exec/cpu-common.h"
+#include "exec/hwaddr.h"
 #include "qemu-queue.h"
-#include "iorange.h"
-#include "ioport.h"
+#include "exec/iorange.h"
+#include "exec/ioport.h"
 #include "int128.h"
 
 typedef struct MemoryRegionOps MemoryRegionOps;

diff --git a/poison.h b/include/exec/poison.h
similarity index 100%
rename from poison.h
rename to include/exec/poison.h

diff --git a/softmmu-semi.h b/include/exec/softmmu-semi.h
similarity index 100%
rename from softmmu-semi.h
rename to include/exec/softmmu-semi.h

diff --git a/softmmu_defs.h b/include/exec/softmmu_defs.h
similarity index 100%
rename from softmmu_defs.h
rename to include/exec/softmmu_defs.h

diff --git a/softmmu_exec.h b/include/exec/softmmu_exec.h
similarity index 72%
rename from softmmu_exec.h
rename to include/exec/softmmu_exec.h
index 8c73985599f8ba5371c245c4e69b474010c91cc6..3e4e886a30d4598fe51679ea59c49977d23b1d6d 100644 (file)
--- a/softmmu_exec.h
+++ b/include/exec/softmmu_exec.h
@@ -19,37 +19,37 @@
 #define ldul_executive  ldl_executive
 #define ldul_supervisor ldl_supervisor
 
-#include "softmmu_defs.h"
+#include "exec/softmmu_defs.h"
 
 #define ACCESS_TYPE 0
 #define MEMSUFFIX MMU_MODE0_SUFFIX
 #define DATA_SIZE 1
-#include "softmmu_header.h"
+#include "exec/softmmu_header.h"
 
 #define DATA_SIZE 2
-#include "softmmu_header.h"
+#include "exec/softmmu_header.h"
 
 #define DATA_SIZE 4
-#include "softmmu_header.h"
+#include "exec/softmmu_header.h"
 
 #define DATA_SIZE 8
-#include "softmmu_header.h"
+#include "exec/softmmu_header.h"
 #undef ACCESS_TYPE
 #undef MEMSUFFIX
 
 #define ACCESS_TYPE 1
 #define MEMSUFFIX MMU_MODE1_SUFFIX
 #define DATA_SIZE 1
-#include "softmmu_header.h"
+#include "exec/softmmu_header.h"
 
 #define DATA_SIZE 2
-#include "softmmu_header.h"
+#include "exec/softmmu_header.h"
 
 #define DATA_SIZE 4
-#include "softmmu_header.h"
+#include "exec/softmmu_header.h"
 
 #define DATA_SIZE 8
-#include "softmmu_header.h"
+#include "exec/softmmu_header.h"
 #undef ACCESS_TYPE
 #undef MEMSUFFIX
 
@@ -58,16 +58,16 @@
 #define ACCESS_TYPE 2
 #define MEMSUFFIX MMU_MODE2_SUFFIX
 #define DATA_SIZE 1
-#include "softmmu_header.h"
+#include "exec/softmmu_header.h"
 
 #define DATA_SIZE 2
-#include "softmmu_header.h"
+#include "exec/softmmu_header.h"
 
 #define DATA_SIZE 4
-#include "softmmu_header.h"
+#include "exec/softmmu_header.h"
 
 #define DATA_SIZE 8
-#include "softmmu_header.h"
+#include "exec/softmmu_header.h"
 #undef ACCESS_TYPE
 #undef MEMSUFFIX
 #endif /* (NB_MMU_MODES >= 3) */
@@ -77,16 +77,16 @@
 #define ACCESS_TYPE 3
 #define MEMSUFFIX MMU_MODE3_SUFFIX
 #define DATA_SIZE 1
-#include "softmmu_header.h"
+#include "exec/softmmu_header.h"
 
 #define DATA_SIZE 2
-#include "softmmu_header.h"
+#include "exec/softmmu_header.h"
 
 #define DATA_SIZE 4
-#include "softmmu_header.h"
+#include "exec/softmmu_header.h"
 
 #define DATA_SIZE 8
-#include "softmmu_header.h"
+#include "exec/softmmu_header.h"
 #undef ACCESS_TYPE
 #undef MEMSUFFIX
 #endif /* (NB_MMU_MODES >= 4) */
@@ -96,16 +96,16 @@
 #define ACCESS_TYPE 4
 #define MEMSUFFIX MMU_MODE4_SUFFIX
 #define DATA_SIZE 1
-#include "softmmu_header.h"
+#include "exec/softmmu_header.h"
 
 #define DATA_SIZE 2
-#include "softmmu_header.h"
+#include "exec/softmmu_header.h"
 
 #define DATA_SIZE 4
-#include "softmmu_header.h"
+#include "exec/softmmu_header.h"
 
 #define DATA_SIZE 8
-#include "softmmu_header.h"
+#include "exec/softmmu_header.h"
 #undef ACCESS_TYPE
 #undef MEMSUFFIX
 #endif /* (NB_MMU_MODES >= 5) */
@@ -115,16 +115,16 @@
 #define ACCESS_TYPE 5
 #define MEMSUFFIX MMU_MODE5_SUFFIX
 #define DATA_SIZE 1
-#include "softmmu_header.h"
+#include "exec/softmmu_header.h"
 
 #define DATA_SIZE 2
-#include "softmmu_header.h"
+#include "exec/softmmu_header.h"
 
 #define DATA_SIZE 4
-#include "softmmu_header.h"
+#include "exec/softmmu_header.h"
 
 #define DATA_SIZE 8
-#include "softmmu_header.h"
+#include "exec/softmmu_header.h"
 #undef ACCESS_TYPE
 #undef MEMSUFFIX
 #endif /* (NB_MMU_MODES >= 6) */
@@ -137,16 +137,16 @@
 #define ACCESS_TYPE (NB_MMU_MODES)
 #define MEMSUFFIX _data
 #define DATA_SIZE 1
-#include "softmmu_header.h"
+#include "exec/softmmu_header.h"
 
 #define DATA_SIZE 2
-#include "softmmu_header.h"
+#include "exec/softmmu_header.h"
 
 #define DATA_SIZE 4
-#include "softmmu_header.h"
+#include "exec/softmmu_header.h"
 
 #define DATA_SIZE 8
-#include "softmmu_header.h"
+#include "exec/softmmu_header.h"
 #undef ACCESS_TYPE
 #undef MEMSUFFIX
 

diff --git a/softmmu_header.h b/include/exec/softmmu_header.h
similarity index 100%
rename from softmmu_header.h
rename to include/exec/softmmu_header.h

diff --git a/softmmu_template.h b/include/exec/softmmu_template.h
similarity index 99%
rename from softmmu_template.h
rename to include/exec/softmmu_template.h
index ce30d8bddcdf0e7e7b69b764591a1755e5254a87..15d4c519eef0ade58e27be6d0fbc4cf8e9872c99 100644 (file)
--- a/softmmu_template.h
+++ b/include/exec/softmmu_template.h
@@ -22,7 +22,7 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 #include "qemu-timer.h"
-#include "memory.h"
+#include "exec/memory.h"
 
 #define DATA_SIZE (1 << SHIFT)
 

diff --git a/qemu-lock.h b/include/exec/spinlock.h
similarity index 100%
rename from qemu-lock.h
rename to include/exec/spinlock.h

diff --git a/qemu-user-types.h b/include/exec/user/abitypes.h
similarity index 100%
rename from qemu-user-types.h
rename to include/exec/user/abitypes.h

diff --git a/thunk.h b/include/exec/user/thunk.h
similarity index 100%
rename from thunk.h
rename to include/exec/user/thunk.h

diff --git a/ioport.c b/ioport.c
index 6e4ca0dd9115c22fd3abd09980ecdfbef4f38178..a0ac2a0a4145adbaf5d7a04b690a9ab31408614d 100644 (file)
--- a/ioport.c
+++ b/ioport.c
@@ -25,9 +25,9 @@
  * splitted out ioport related stuffs from vl.c.
  */
 
-#include "ioport.h"
+#include "exec/ioport.h"
 #include "trace.h"
-#include "memory.h"
+#include "exec/memory.h"
 
 /***********************************************************/
 /* IO Port */

diff --git a/kvm-all.c b/kvm-all.c
index 759ef17ab0f2df34974208bb4411e3fbdd6bf621..c2588594e1f96edacc7e46116c1b67bc1d5a3c34 100644 (file)
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -27,11 +27,11 @@
 #include "sysemu.h"
 #include "hw/hw.h"
 #include "hw/pci/msi.h"
-#include "gdbstub.h"
+#include "exec/gdbstub.h"
 #include "kvm.h"
 #include "bswap.h"
-#include "memory.h"
-#include "exec-memory.h"
+#include "exec/memory.h"
+#include "exec/address-spaces.h"
 #include "event_notifier.h"
 
 /* This check must be after config-host.h is included */

diff --git a/kvm-stub.c b/kvm-stub.c
index d65fd045076d7921bc9648703cf29587648e1760..8de8ebd3d2c139ef735b323bbd354c029449a9eb 100644 (file)
--- a/kvm-stub.c
+++ b/kvm-stub.c
@@ -14,7 +14,7 @@
 #include "hw/hw.h"
 #include "hw/pci/msi.h"
 #include "cpu.h"
-#include "gdbstub.h"
+#include "exec/gdbstub.h"
 #include "kvm.h"
 
 KVMState *kvm_state;

diff --git a/linux-user/qemu.h b/linux-user/qemu.h
index ceddb3ce726fb56d5f45cd6a224fcc3f921adc9f..2af883bf74086a020d3e60fb347d915347a56793 100644 (file)
--- a/linux-user/qemu.h
+++ b/linux-user/qemu.h
@@ -11,13 +11,13 @@
 #include <stdlib.h>
 #endif /* DEBUG_REMAP */
 
-#include "qemu-user-types.h"
+#include "exec/user/abitypes.h"
 
-#include "thunk.h"
+#include "exec/user/thunk.h"
 #include "syscall_defs.h"
 #include "syscall.h"
 #include "target_signal.h"
-#include "gdbstub.h"
+#include "exec/gdbstub.h"
 #include "qemu-queue.h"
 
 #if defined(CONFIG_USE_NPTL)

diff --git a/memory.c b/memory.c
index 741985385ca9de6b4d8c3d37f362b6e14e2ca7f5..d40193d4740e834c9467c4d901997d32556eedc7 100644 (file)
--- a/memory.c
+++ b/memory.c
@@ -13,14 +13,14 @@
  * GNU GPL, version 2 or (at your option) any later version.
  */
 
-#include "memory.h"
-#include "exec-memory.h"
-#include "ioport.h"
+#include "exec/memory.h"
+#include "exec/address-spaces.h"
+#include "exec/ioport.h"
 #include "bitops.h"
 #include "kvm.h"
 #include <assert.h>
 
-#include "memory-internal.h"
+#include "exec/memory-internal.h"
 
 static unsigned memory_region_transaction_depth;
 static bool memory_region_update_pending;

diff --git a/memory_mapping-stub.c b/memory_mapping-stub.c
index 76be34d89fd355c3c64f0d833157cbefa9540172..5f5fb99c58283b698898c344aa991e2137f8c40d 100644 (file)
--- a/memory_mapping-stub.c
+++ b/memory_mapping-stub.c
@@ -12,7 +12,7 @@
  */
 
 #include "cpu.h"
-#include "cpu-all.h"
+#include "exec/cpu-all.h"
 #include "memory_mapping.h"
 
 int qemu_get_guest_memory_mapping(MemoryMappingList *list)

diff --git a/memory_mapping.c b/memory_mapping.c
index a82e190cabe973f82522612ffc30c4733752163f..c829a9fa34c26c0120cb35aa5ce1ac787a923bfc 100644 (file)
--- a/memory_mapping.c
+++ b/memory_mapping.c
@@ -12,7 +12,7 @@
  */
 
 #include "cpu.h"
-#include "cpu-all.h"
+#include "exec/cpu-all.h"
 #include "memory_mapping.h"
 
 static void memory_mapping_list_add_mapping_sorted(MemoryMappingList *list,

diff --git a/monitor.c b/monitor.c
index 7d5c8a622c3f5d787183280b9a2fb17920174571..a3e010968e44223a1971901ae3b496d343ff7e72 100644 (file)
--- a/monitor.c
+++ b/monitor.c
@@ -30,7 +30,7 @@
 #include "hw/pci/pci.h"
 #include "hw/watchdog.h"
 #include "hw/loader.h"
-#include "gdbstub.h"
+#include "exec/gdbstub.h"
 #include "net/net.h"
 #include "net/slirp.h"
 #include "qemu-char.h"
@@ -63,7 +63,7 @@
 #include "trace/simple.h"
 #endif
 #include "ui/qemu-spice.h"
-#include "memory.h"
+#include "exec/memory.h"
 #include "qmp-commands.h"
 #include "hmp.h"
 #include "qemu-thread.h"

diff --git a/qtest.c b/qtest.c
index fbfab4e1a7720c9be61cf78a62a56b19351bfc09..ebe3963167dfb199bd33c1e5afa26928a47a7b44 100644 (file)
--- a/qtest.c
+++ b/qtest.c
@@ -14,8 +14,8 @@
 #include "qtest.h"
 #include "hw/qdev.h"
 #include "qemu-char.h"
-#include "ioport.h"
-#include "memory.h"
+#include "exec/ioport.h"
+#include "exec/memory.h"
 #include "hw/irq.h"
 #include "sysemu.h"
 #include "cpus.h"

diff --git a/savevm.c b/savevm.c
index ae8787868fffded1e3d606fe97da9702101d9a9e..cb33501ecc482e7e2d6fc778e542ef3f02d9f2f8 100644 (file)
--- a/savevm.c
+++ b/savevm.c
@@ -82,7 +82,7 @@
 #include "qemu-queue.h"
 #include "qemu-timer.h"
 #include "cpus.h"
-#include "memory.h"
+#include "exec/memory.h"
 #include "qmp-commands.h"
 #include "trace.h"
 #include "bitops.h"

diff --git a/scripts/feature_to_c.sh b/scripts/feature_to_c.sh
index b62da8a0bd76672d237e6c23c32a499d8494dd4b..888548e58b9a11a9e19233355016b34c5b2e97b2 100644 (file)
--- a/scripts/feature_to_c.sh
+++ b/scripts/feature_to_c.sh
@@ -38,7 +38,7 @@ for input; do
   ${AWK:-awk} 'BEGIN { n = 0
       printf "#include \"config.h\"\n"
       printf "#include \"qemu-common.h\"\n"
-      printf "#include \"gdbstub.h\"\n"
+      printf "#include \"exec/gdbstub.h\"\n"
       print "static const char '$arrayname'[] = {"
       for (i = 0; i < 255; i++)
         _ord_[sprintf("%c", i)] = i

diff --git a/target-alpha/cpu.h b/target-alpha/cpu.h
index 9939d61ca8b748b7e28d1093a81b32c162acfa75..137703f6d7818344a9d7a615dea561fdcab46085 100644 (file)
--- a/target-alpha/cpu.h
+++ b/target-alpha/cpu.h
@@ -27,7 +27,7 @@
 
 #define CPUArchState struct CPUAlphaState
 
-#include "cpu-defs.h"
+#include "exec/cpu-defs.h"
 
 #include "softfloat.h"
 
@@ -295,7 +295,7 @@ struct CPUAlphaState {
 #define cpu_gen_code cpu_alpha_gen_code
 #define cpu_signal_handler cpu_alpha_signal_handler
 
-#include "cpu-all.h"
+#include "exec/cpu-all.h"
 #include "cpu-qom.h"
 
 enum {
@@ -520,7 +520,7 @@ static inline bool cpu_has_work(CPUState *cpu)
                                      | CPU_INTERRUPT_MCHK);
 }
 
-#include "exec-all.h"
+#include "exec/exec-all.h"
 
 static inline void cpu_pc_from_tb(CPUAlphaState *env, TranslationBlock *tb)
 {

diff --git a/target-alpha/helper.h b/target-alpha/helper.h
index dd55f89aad4bbb501579fc8f1f6b7d6a551ebac6..eac3041b879339020a2b7f653275659d922d2524 100644 (file)
--- a/target-alpha/helper.h
+++ b/target-alpha/helper.h
@@ -1,4 +1,4 @@
-#include "def-helper.h"
+#include "exec/def-helper.h"
 
 DEF_HELPER_3(excp, noreturn, env, int, int)
 DEF_HELPER_FLAGS_1(load_pcc, TCG_CALL_NO_RWG_SE, i64, env)
@@ -119,4 +119,4 @@ DEF_HELPER_FLAGS_0(get_time, TCG_CALL_NO_RWG, i64)
 DEF_HELPER_FLAGS_2(set_alarm, TCG_CALL_NO_RWG, void, env, i64)
 #endif
 
-#include "def-helper.h"
+#include "exec/def-helper.h"

diff --git a/target-alpha/mem_helper.c b/target-alpha/mem_helper.c
index 64b33f6518f5da05ed43f9a63cbcbaa057f19a73..3d2cd61358efdf8f3ad7ccd6ea6d96612088c7cf 100644 (file)
--- a/target-alpha/mem_helper.c
+++ b/target-alpha/mem_helper.c
@@ -117,22 +117,22 @@ void cpu_unassigned_access(CPUAlphaState *env, hwaddr addr,
     dynamic_excp(env, 0, EXCP_MCHK, 0);
 }
 
-#include "softmmu_exec.h"
+#include "exec/softmmu_exec.h"
 
 #define MMUSUFFIX _mmu
 #define ALIGNED_ONLY
 
 #define SHIFT 0
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
 
 #define SHIFT 1
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
 
 #define SHIFT 2
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
 
 #define SHIFT 3
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
 
 /* try to fill the TLB and return an exception if error. If retaddr is
    NULL, it means that the function was called in C code (i.e. not

diff --git a/target-alpha/translate.c b/target-alpha/translate.c
index f57c8fd91fe236edbb2d2ebd6ac165684a41c1a8..2d0d891128e00fe4885f615c2b0b0123efd94d93 100644 (file)
--- a/target-alpha/translate.c
+++ b/target-alpha/translate.c
@@ -88,7 +88,7 @@ static TCGv cpu_usp;
 /* register names */
 static char cpu_reg_names[10*4+21*5 + 10*5+21*6];
 
-#include "gen-icount.h"
+#include "exec/gen-icount.h"
 
 static void alpha_translate_init(void)
 {

diff --git a/target-arm/arm-semi.c b/target-arm/arm-semi.c
index 7743d67010223b1f9915aca88bb02a0db21967d4..847318d1f428aefe4f3e785e2e3f8934d08bdd8a 100644 (file)
--- a/target-arm/arm-semi.c
+++ b/target-arm/arm-semi.c
@@ -33,7 +33,7 @@
 #define ARM_ANGEL_HEAP_SIZE (128 * 1024 * 1024)
 #else
 #include "qemu-common.h"
-#include "gdbstub.h"
+#include "exec/gdbstub.h"
 #include "hw/arm-misc.h"
 #endif
 
@@ -113,7 +113,7 @@ static inline uint32_t set_swi_errno(CPUARMState *env, uint32_t code)
     return code;
 }
 
-#include "softmmu-semi.h"
+#include "exec/softmmu-semi.h"
 #endif
 
 static target_ulong arm_semi_syscall_len;

diff --git a/target-arm/cpu.h b/target-arm/cpu.h
index e4ff918fa46e98b97503c8e6784fddbf7436aabc..7f87efa7d94d29147bdf60dc58cacbbd9d1b26f5 100644 (file)
--- a/target-arm/cpu.h
+++ b/target-arm/cpu.h
@@ -27,7 +27,7 @@
 
 #include "config.h"
 #include "qemu-common.h"
-#include "cpu-defs.h"
+#include "exec/cpu-defs.h"
 
 #include "softfloat.h"
 
@@ -659,7 +659,7 @@ static inline void cpu_clone_regs(CPUARMState *env, target_ulong newsp)
 }
 #endif
 
-#include "cpu-all.h"
+#include "exec/cpu-all.h"
 
 /* Bit usage in the TB flags field: */
 #define ARM_TBFLAG_THUMB_SHIFT      0
@@ -726,7 +726,7 @@ static inline bool cpu_has_work(CPUState *cpu)
         (CPU_INTERRUPT_FIQ | CPU_INTERRUPT_HARD | CPU_INTERRUPT_EXITTB);
 }
 
-#include "exec-all.h"
+#include "exec/exec-all.h"
 
 static inline void cpu_pc_from_tb(CPUARMState *env, TranslationBlock *tb)
 {

diff --git a/target-arm/helper.c b/target-arm/helper.c
index ab8b73493307ec3302210d4a70b3db53ac4ccf27..1f7a3c04c3924465c9625dfdc671e6680352f175 100644 (file)
--- a/target-arm/helper.c
+++ b/target-arm/helper.c
@@ -1,5 +1,5 @@
 #include "cpu.h"
-#include "gdbstub.h"
+#include "exec/gdbstub.h"
 #include "helper.h"
 #include "host-utils.h"
 #include "sysemu.h"

diff --git a/target-arm/helper.h b/target-arm/helper.h
index 3d23ceb257cf20988c633981c0ae4ac4dd900c16..8544f82a94458bcf0e9240cfd502e98a6774867a 100644 (file)
--- a/target-arm/helper.h
+++ b/target-arm/helper.h
@@ -1,4 +1,4 @@
-#include "def-helper.h"
+#include "exec/def-helper.h"
 
 DEF_HELPER_FLAGS_1(clz, TCG_CALL_NO_RWG_SE, i32, i32)
 DEF_HELPER_FLAGS_1(sxtb16, TCG_CALL_NO_RWG_SE, i32, i32)
@@ -463,4 +463,4 @@ DEF_HELPER_3(neon_qzip8, void, env, i32, i32)
 DEF_HELPER_3(neon_qzip16, void, env, i32, i32)
 DEF_HELPER_3(neon_qzip32, void, env, i32, i32)
 
-#include "def-helper.h"
+#include "exec/def-helper.h"

diff --git a/target-arm/iwmmxt_helper.c b/target-arm/iwmmxt_helper.c
index 1dd8d1a3af46f5f6b0d01f5c5727a8912ee0d377..7953b53f7e062234f57bbd58799b4f4812da3a94 100644 (file)
--- a/target-arm/iwmmxt_helper.c
+++ b/target-arm/iwmmxt_helper.c
@@ -23,7 +23,7 @@
 #include <stdio.h>
 
 #include "cpu.h"
-#include "exec-all.h"
+#include "exec/exec-all.h"
 #include "helper.h"
 
 /* iwMMXt macros extracted from GNU gdb.  */

diff --git a/target-arm/neon_helper.c b/target-arm/neon_helper.c
index 89280b6eeb35d01c677323e909a51ac2389d7b7b..b028cc2c93b2eacdd3d2210297a17c1101aed430 100644 (file)
--- a/target-arm/neon_helper.c
+++ b/target-arm/neon_helper.c
@@ -10,7 +10,7 @@
 #include <stdio.h>
 
 #include "cpu.h"
-#include "exec-all.h"
+#include "exec/exec-all.h"
 #include "helper.h"
 
 #define SIGNBIT (uint32_t)0x80000000

diff --git a/target-arm/op_helper.c b/target-arm/op_helper.c
index 1fcc975945e44b0e0f842ad012bf4722ecf2777e..99610d77348e516f0ffa465195a7f7b3199fe198 100644 (file)
--- a/target-arm/op_helper.c
+++ b/target-arm/op_helper.c
@@ -52,21 +52,21 @@ uint32_t HELPER(neon_tbl)(CPUARMState *env, uint32_t ireg, uint32_t def,
 
 #if !defined(CONFIG_USER_ONLY)
 
-#include "softmmu_exec.h"
+#include "exec/softmmu_exec.h"
 
 #define MMUSUFFIX _mmu
 
 #define SHIFT 0
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
 
 #define SHIFT 1
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
 
 #define SHIFT 2
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
 
 #define SHIFT 3
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
 
 /* try to fill the TLB and return an exception if error. If retaddr is
    NULL, it means that the function was called in C code (i.e. not

diff --git a/target-arm/translate.c b/target-arm/translate.c
index 10c548d5ba47a310438c3b62934a4ccf0e64df4a..988b5428d4f0f5f5ffb56d5435d7b93d30283567 100644 (file)
--- a/target-arm/translate.c
+++ b/target-arm/translate.c
@@ -98,7 +98,7 @@ static TCGv_i32 cpu_exclusive_info;
 static TCGv cpu_F0s, cpu_F1s;
 static TCGv_i64 cpu_F0d, cpu_F1d;
 
-#include "gen-icount.h"
+#include "exec/gen-icount.h"
 
 static const char *regnames[] =
     { "r0", "r1", "r2", "r3", "r4", "r5", "r6", "r7",

diff --git a/target-cris/cpu.h b/target-cris/cpu.h
index 2c27506d0dc699fee6f362fcdaad2103ed1518cc..63e6234f117a3b92062eee004c191bf291410ad1 100644 (file)
--- a/target-cris/cpu.h
+++ b/target-cris/cpu.h
@@ -27,7 +27,7 @@
 
 #define CPUArchState struct CPUCRISState
 
-#include "cpu-defs.h"
+#include "exec/cpu-defs.h"
 
 #define TARGET_HAS_ICE 1
 
@@ -270,7 +270,7 @@ static inline void cpu_set_tls(CPUCRISState *env, target_ulong newtls)
 #define SFR_RW_MM_TLB_LO   env->pregs[PR_SRS]][5
 #define SFR_RW_MM_TLB_HI   env->pregs[PR_SRS]][6
 
-#include "cpu-all.h"
+#include "exec/cpu-all.h"
 
 static inline void cpu_get_tb_cpu_state(CPUCRISState *env, target_ulong *pc,
                                         target_ulong *cs_base, int *flags)
@@ -292,7 +292,7 @@ static inline bool cpu_has_work(CPUState *cpu)
     return env->interrupt_request & (CPU_INTERRUPT_HARD | CPU_INTERRUPT_NMI);
 }
 
-#include "exec-all.h"
+#include "exec/exec-all.h"
 
 static inline void cpu_pc_from_tb(CPUCRISState *env, TranslationBlock *tb)
 {

diff --git a/target-cris/helper.h b/target-cris/helper.h
index fe12083a169a2f6bb34a289f01c1de31bb3f25ab..8e8365cf69cd63fd7cd83f65f7a048b43e81d78f 100644 (file)
--- a/target-cris/helper.h
+++ b/target-cris/helper.h
@@ -1,4 +1,4 @@
-#include "def-helper.h"
+#include "exec/def-helper.h"
 
 DEF_HELPER_2(raise_exception, void, env, i32)
 DEF_HELPER_2(tlb_flush_pid, void, env, i32)
@@ -26,4 +26,4 @@ DEF_HELPER_FLAGS_3(evaluate_flags_move_2, TCG_CALL_NO_SE, i32, env, i32, i32)
 DEF_HELPER_1(evaluate_flags, void, env)
 DEF_HELPER_1(top_evaluate_flags, void, env)
 
-#include "def-helper.h"
+#include "exec/def-helper.h"

diff --git a/target-cris/op_helper.c b/target-cris/op_helper.c
index 31db42494da4eaece98f743e12d4020c0a275d41..cd0e17e099878752c4a661e1e3f69de5bd866338 100644 (file)
--- a/target-cris/op_helper.c
+++ b/target-cris/op_helper.c
@@ -35,21 +35,21 @@
 #endif
 
 #if !defined(CONFIG_USER_ONLY)
-#include "softmmu_exec.h"
+#include "exec/softmmu_exec.h"
 
 #define MMUSUFFIX _mmu
 
 #define SHIFT 0
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
 
 #define SHIFT 1
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
 
 #define SHIFT 2
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
 
 #define SHIFT 3
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
 
 /* Try to fill the TLB and return an exception if error. If retaddr is
    NULL, it means that the function was called in C code (i.e. not

diff --git a/target-cris/translate.c b/target-cris/translate.c
index 2a92727843d4d7372d99a16675b71c483f828720..09e6011ea4751ffc4a0317a8e9c3a6a62b4100a3 100644 (file)
--- a/target-cris/translate.c
+++ b/target-cris/translate.c
@@ -70,7 +70,7 @@ static TCGv env_btaken;
 static TCGv env_btarget;
 static TCGv env_pc;
 
-#include "gen-icount.h"
+#include "exec/gen-icount.h"
 
 /* This is the state at translation time.  */
 typedef struct DisasContext {

diff --git a/target-i386/arch_dump.c b/target-i386/arch_dump.c
index 4240278eddbd3263f942951bd3de4ef924cfe039..50d866f4c60cab268266c0d4dc80b0f4c92ac940 100644 (file)
--- a/target-i386/arch_dump.c
+++ b/target-i386/arch_dump.c
@@ -12,7 +12,7 @@
  */
 
 #include "cpu.h"
-#include "cpu-all.h"
+#include "exec/cpu-all.h"
 #include "dump.h"
 #include "elf.h"
 

diff --git a/target-i386/arch_memory_mapping.c b/target-i386/arch_memory_mapping.c
index 41f9d1c3e3877de02822545b0f64941dc5faf103..6dfb0f3f56b9399cb1258027f3d63ec2e42dc635 100644 (file)
--- a/target-i386/arch_memory_mapping.c
+++ b/target-i386/arch_memory_mapping.c
@@ -12,7 +12,7 @@
  */
 
 #include "cpu.h"
-#include "cpu-all.h"
+#include "exec/cpu-all.h"
 #include "memory_mapping.h"
 
 /* PAE Paging or IA-32e Paging */

diff --git a/target-i386/cpu.h b/target-i386/cpu.h
index 386c4f6d98882203283d31d2932f314b56b31a1a..f3f50a0499f5e3b0f65c7c92c95449e6a63460a1 100644 (file)
--- a/target-i386/cpu.h
+++ b/target-i386/cpu.h
@@ -44,7 +44,7 @@
 
 #define CPUArchState struct CPUX86State
 
-#include "cpu-defs.h"
+#include "exec/cpu-defs.h"
 
 #include "softfloat.h"
 
@@ -1117,7 +1117,7 @@ static inline void cpu_clone_regs(CPUX86State *env, target_ulong newsp)
 }
 #endif
 
-#include "cpu-all.h"
+#include "exec/cpu-all.h"
 #include "svm.h"
 
 #if !defined(CONFIG_USER_ONLY)
@@ -1137,7 +1137,7 @@ static inline bool cpu_has_work(CPUState *cpu)
                                       CPU_INTERRUPT_MCE));
 }
 
-#include "exec-all.h"
+#include "exec/exec-all.h"
 
 static inline void cpu_pc_from_tb(CPUX86State *env, TranslationBlock *tb)
 {

diff --git a/target-i386/fpu_helper.c b/target-i386/fpu_helper.c
index dfc34a6253f5beb5b3b55e653f7c970e65856db9..44f3d2794455c75b15e84413ee3b0b5fb5ce301a 100644 (file)
--- a/target-i386/fpu_helper.c
+++ b/target-i386/fpu_helper.c
@@ -22,7 +22,7 @@
 #include "helper.h"
 
 #if !defined(CONFIG_USER_ONLY)
-#include "softmmu_exec.h"
+#include "exec/softmmu_exec.h"
 #endif /* !defined(CONFIG_USER_ONLY) */
 
 #define FPU_RC_MASK         0xc00

diff --git a/target-i386/helper.h b/target-i386/helper.h
index 970fcd98fff0abb98ff9bf0e92073d99f0a39521..9ed720d0ed85e2b1accbba73b5760e07621cff45 100644 (file)
--- a/target-i386/helper.h
+++ b/target-i386/helper.h
@@ -1,4 +1,4 @@
-#include "def-helper.h"
+#include "exec/def-helper.h"
 
 DEF_HELPER_FLAGS_2(cc_compute_all, TCG_CALL_NO_SE, i32, env, int)
 DEF_HELPER_FLAGS_2(cc_compute_c, TCG_CALL_NO_SE, i32, env, int)
@@ -220,4 +220,4 @@ DEF_HELPER_3(rclq, tl, env, tl, tl)
 DEF_HELPER_3(rcrq, tl, env, tl, tl)
 #endif
 
-#include "def-helper.h"
+#include "exec/def-helper.h"

diff --git a/target-i386/ioport-user.c b/target-i386/ioport-user.c
index 03fac22d22b2b3decbf6e1a2f75bd783bd22aa95..f7636e0a870ca49ba56dc5678d10dcd5f79453fb 100644 (file)
--- a/target-i386/ioport-user.c
+++ b/target-i386/ioport-user.c
@@ -21,7 +21,7 @@
 
 #include "qemu.h"
 #include "qemu-common.h"
-#include "ioport.h"
+#include "exec/ioport.h"
 
 void cpu_outb(pio_addr_t addr, uint8_t val)
 {

diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index 824930c749ec16bf410425976050cdb7d0488801..f7c95d54247847b953d0f7ae836dc02a547a95d9 100644 (file)
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -25,12 +25,12 @@
 #include "kvm.h"
 #include "kvm_i386.h"
 #include "cpu.h"
-#include "gdbstub.h"
+#include "exec/gdbstub.h"
 #include "host-utils.h"
 #include "qemu-config.h"
 #include "hw/pc.h"
 #include "hw/apic.h"
-#include "ioport.h"
+#include "exec/ioport.h"
 #include "hyperv.h"
 #include "hw/pci/pci.h"
 

diff --git a/target-i386/mem_helper.c b/target-i386/mem_helper.c
index d0be77b1ed20b2be478d0c7821a34fcbb94d6012..6cf9ba076e837db60cb529ced659bc7a29330c12 100644 (file)
--- a/target-i386/mem_helper.c
+++ b/target-i386/mem_helper.c
@@ -21,7 +21,7 @@
 #include "helper.h"
 
 #if !defined(CONFIG_USER_ONLY)
-#include "softmmu_exec.h"
+#include "exec/softmmu_exec.h"
 #endif /* !defined(CONFIG_USER_ONLY) */
 
 /* broken thread support */
@@ -114,16 +114,16 @@ void helper_boundl(CPUX86State *env, target_ulong a0, int v)
 #define MMUSUFFIX _mmu
 
 #define SHIFT 0
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
 
 #define SHIFT 1
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
 
 #define SHIFT 2
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
 
 #define SHIFT 3
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
 
 #endif
 

diff --git a/target-i386/misc_helper.c b/target-i386/misc_helper.c
index a02037963f3f8abee2a3de2dbf8e3fee6601b0d0..db3126b79bb56c10ec2ce265c4d48bf02592f35a 100644 (file)
--- a/target-i386/misc_helper.c
+++ b/target-i386/misc_helper.c
@@ -18,11 +18,11 @@
  */
 
 #include "cpu.h"
-#include "ioport.h"
+#include "exec/ioport.h"
 #include "helper.h"
 
 #if !defined(CONFIG_USER_ONLY)
-#include "softmmu_exec.h"
+#include "exec/softmmu_exec.h"
 #endif /* !defined(CONFIG_USER_ONLY) */
 
 /* check if Port I/O is allowed in TSS */

diff --git a/target-i386/seg_helper.c b/target-i386/seg_helper.c
index ff9337441ba6a9f4f19be10ddf21976e9ce6a1eb..be795d71eb3a2f8e596dc13f0b3fa4a87f013816 100644 (file)
--- a/target-i386/seg_helper.c
+++ b/target-i386/seg_helper.c
@@ -25,7 +25,7 @@
 //#define DEBUG_PCALL
 
 #if !defined(CONFIG_USER_ONLY)
-#include "softmmu_exec.h"
+#include "exec/softmmu_exec.h"
 #endif /* !defined(CONFIG_USER_ONLY) */
 
 #ifdef DEBUG_PCALL

diff --git a/target-i386/svm_helper.c b/target-i386/svm_helper.c
index a238d95a555a08f6d1389b8ce377e84ab63b3062..3f246e907394d0b3f503e0fb6ea088013606ce80 100644 (file)
--- a/target-i386/svm_helper.c
+++ b/target-i386/svm_helper.c
@@ -18,11 +18,11 @@
  */
 
 #include "cpu.h"
-#include "cpu-all.h"
+#include "exec/cpu-all.h"
 #include "helper.h"
 
 #if !defined(CONFIG_USER_ONLY)
-#include "softmmu_exec.h"
+#include "exec/softmmu_exec.h"
 #endif /* !defined(CONFIG_USER_ONLY) */
 
 /* Secure Virtual Machine helpers */

diff --git a/target-i386/translate.c b/target-i386/translate.c
index 026201e98e233a2bf19e7e107969892c0e33c976..32d21f52d02afb2661319f94d4b16168bc0f84b5 100644 (file)
--- a/target-i386/translate.c
+++ b/target-i386/translate.c
@@ -65,7 +65,7 @@ static TCGv cpu_tmp5;
 
 static uint8_t gen_opc_cc_op[OPC_BUF_SIZE];
 
-#include "gen-icount.h"
+#include "exec/gen-icount.h"
 
 #ifdef TARGET_X86_64
 static int x86_64_hregs;

diff --git a/target-lm32/cpu.h b/target-lm32/cpu.h
index 7243b4f7c715d3dc644e5a1b599d7ac8333bea8e..4e202db32c2ea5920d4274efafcd3a3db2e7b4dd 100644 (file)
--- a/target-lm32/cpu.h
+++ b/target-lm32/cpu.h
@@ -26,7 +26,7 @@
 
 #include "config.h"
 #include "qemu-common.h"
-#include "cpu-defs.h"
+#include "exec/cpu-defs.h"
 struct CPULM32State;
 typedef struct CPULM32State CPULM32State;
 
@@ -238,7 +238,7 @@ static inline int cpu_interrupts_enabled(CPULM32State *env)
     return env->ie & IE_IE;
 }
 
-#include "cpu-all.h"
+#include "exec/cpu-all.h"
 
 static inline target_ulong cpu_get_pc(CPULM32State *env)
 {
@@ -260,7 +260,7 @@ static inline bool cpu_has_work(CPUState *cpu)
     return env->interrupt_request & CPU_INTERRUPT_HARD;
 }
 
-#include "exec-all.h"
+#include "exec/exec-all.h"
 
 static inline void cpu_pc_from_tb(CPULM32State *env, TranslationBlock *tb)
 {

diff --git a/target-lm32/helper.h b/target-lm32/helper.h
index 07f5670172d2d3de233f077bda978ffe258678c7..3ea15a6e8013bfd921e081eaf65dfaae4f359ca3 100644 (file)
--- a/target-lm32/helper.h
+++ b/target-lm32/helper.h
@@ -1,4 +1,4 @@
-#include "def-helper.h"
+#include "exec/def-helper.h"
 
 DEF_HELPER_2(raise_exception, void, env, i32)
 DEF_HELPER_1(hlt, void, env)
@@ -11,4 +11,4 @@ DEF_HELPER_1(rcsr_ip, i32, env)
 DEF_HELPER_1(rcsr_jtx, i32, env)
 DEF_HELPER_1(rcsr_jrx, i32, env)
 
-#include "def-helper.h"
+#include "exec/def-helper.h"

diff --git a/target-lm32/op_helper.c b/target-lm32/op_helper.c
index 97b9625c1a90793839197f9fbeafa592b73024a4..27b3cef25c205e6d2db3ebd225727b88cfb5aba5 100644 (file)
--- a/target-lm32/op_helper.c
+++ b/target-lm32/op_helper.c
@@ -9,13 +9,13 @@
 #if !defined(CONFIG_USER_ONLY)
 #define MMUSUFFIX _mmu
 #define SHIFT 0
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
 #define SHIFT 1
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
 #define SHIFT 2
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
 #define SHIFT 3
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
 
 void helper_raise_exception(CPULM32State *env, uint32_t index)
 {

diff --git a/target-lm32/translate.c b/target-lm32/translate.c
index 9683b9a4b5469b88cd1a7bb892b164ce1cc0055a..6b873401747e1e75a4825785f27c48aa74f83684 100644 (file)
--- a/target-lm32/translate.c
+++ b/target-lm32/translate.c
@@ -53,7 +53,7 @@ static TCGv cpu_deba;
 static TCGv cpu_bp[4];
 static TCGv cpu_wp[4];
 
-#include "gen-icount.h"
+#include "exec/gen-icount.h"
 
 enum {
     OP_FMT_RI,

diff --git a/target-m68k/cpu.h b/target-m68k/cpu.h
index f4fcdeee7ae51fcb3ba3134348f5ad252196fe17..b37af1fffd112d2d14f6073ef3b738c3fc32af5b 100644 (file)
--- a/target-m68k/cpu.h
+++ b/target-m68k/cpu.h
@@ -26,7 +26,7 @@
 
 #include "config.h"
 #include "qemu-common.h"
-#include "cpu-defs.h"
+#include "exec/cpu-defs.h"
 
 #include "softfloat.h"
 
@@ -242,7 +242,7 @@ static inline void cpu_clone_regs(CPUM68KState *env, target_ulong newsp)
 }
 #endif
 
-#include "cpu-all.h"
+#include "exec/cpu-all.h"
 
 static inline void cpu_get_tb_cpu_state(CPUM68KState *env, target_ulong *pc,
                                         target_ulong *cs_base, int *flags)
@@ -261,7 +261,7 @@ static inline bool cpu_has_work(CPUState *cpu)
     return env->interrupt_request & CPU_INTERRUPT_HARD;
 }
 
-#include "exec-all.h"
+#include "exec/exec-all.h"
 
 static inline void cpu_pc_from_tb(CPUM68KState *env, TranslationBlock *tb)
 {

diff --git a/target-m68k/helper.c b/target-m68k/helper.c
index a5d0100473f7800c8a364fa768d387f05dadc45d..a9a277865f963c718ee5ef54cc6240af6e29d6f3 100644 (file)
--- a/target-m68k/helper.c
+++ b/target-m68k/helper.c
@@ -19,7 +19,7 @@
  */
 
 #include "cpu.h"
-#include "gdbstub.h"
+#include "exec/gdbstub.h"
 
 #include "helpers.h"
 

diff --git a/target-m68k/helpers.h b/target-m68k/helpers.h
index 8112b44a58f08219f9cbc0d9519ccb7ea7bc22af..2b024502ba8abaf67932d23815c183fce7671766 100644 (file)
--- a/target-m68k/helpers.h
+++ b/target-m68k/helpers.h
@@ -1,4 +1,4 @@
-#include "def-helper.h"
+#include "exec/def-helper.h"
 
 DEF_HELPER_1(bitrev, i32, i32)
 DEF_HELPER_1(ff1, i32, i32)
@@ -51,4 +51,4 @@ DEF_HELPER_3(set_mac_extu, void, env, i32, i32)
 DEF_HELPER_2(flush_flags, void, env, i32)
 DEF_HELPER_2(raise_exception, void, env, i32)
 
-#include "def-helper.h"
+#include "exec/def-helper.h"

diff --git a/target-m68k/m68k-semi.c b/target-m68k/m68k-semi.c
index 9f7a24cdb4294b15563cb6578cd99f0a4129463d..e6c7dd2f9b4a1c1755409ef1a6ddac1d843f2138 100644 (file)
--- a/target-m68k/m68k-semi.c
+++ b/target-m68k/m68k-semi.c
@@ -33,8 +33,8 @@
 #define SEMIHOSTING_HEAP_SIZE (128 * 1024 * 1024)
 #else
 #include "qemu-common.h"
-#include "gdbstub.h"
-#include "softmmu-semi.h"
+#include "exec/gdbstub.h"
+#include "exec/softmmu-semi.h"
 #endif
 #include "sysemu.h"
 

diff --git a/target-m68k/op_helper.c b/target-m68k/op_helper.c
index b97ba5e28f00f690250bc8bb0c3ba98c7a332a6e..16df24c0caa56ebbe6146f7ce2ff6ab517080e0c 100644 (file)
--- a/target-m68k/op_helper.c
+++ b/target-m68k/op_helper.c
@@ -34,21 +34,21 @@ void do_interrupt_m68k_hardirq(CPUM68KState *env)
 
 extern int semihosting_enabled;
 
-#include "softmmu_exec.h"
+#include "exec/softmmu_exec.h"
 
 #define MMUSUFFIX _mmu
 
 #define SHIFT 0
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
 
 #define SHIFT 1
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
 
 #define SHIFT 2
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
 
 #define SHIFT 3
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
 
 /* Try to fill the TLB and return an exception if error. If retaddr is
    NULL, it means that the function was called in C code (i.e. not

diff --git a/target-m68k/translate.c b/target-m68k/translate.c
index d955c7a4093606b1fca43cdd5b2939a191e48941..1c9b5ec8d4cac469dbf750fc085addb06466e086 100644 (file)
--- a/target-m68k/translate.c
+++ b/target-m68k/translate.c
@@ -61,7 +61,7 @@ static TCGv NULL_QREG;
 /* Used to distinguish stores from bad addressing modes.  */
 static TCGv store_dummy;
 
-#include "gen-icount.h"
+#include "exec/gen-icount.h"
 
 void m68k_tcg_init(void)
 {

diff --git a/target-microblaze/cpu.h b/target-microblaze/cpu.h
index 585bbd6dbc5d607e817a383e5410e85afd144480..5358941ae45d8a0f5ff5d8f6bedd0d7828c62a1d 100644 (file)
--- a/target-microblaze/cpu.h
+++ b/target-microblaze/cpu.h
@@ -26,7 +26,7 @@
 
 #define CPUArchState struct CPUMBState
 
-#include "cpu-defs.h"
+#include "exec/cpu-defs.h"
 #include "softfloat.h"
 struct CPUMBState;
 typedef struct CPUMBState CPUMBState;
@@ -353,7 +353,7 @@ static inline int cpu_interrupts_enabled(CPUMBState *env)
     return env->sregs[SR_MSR] & MSR_IE;
 }
 
-#include "cpu-all.h"
+#include "exec/cpu-all.h"
 
 static inline target_ulong cpu_get_pc(CPUMBState *env)
 {
@@ -381,7 +381,7 @@ static inline bool cpu_has_work(CPUState *cpu)
     return env->interrupt_request & (CPU_INTERRUPT_HARD | CPU_INTERRUPT_NMI);
 }
 
-#include "exec-all.h"
+#include "exec/exec-all.h"
 
 static inline void cpu_pc_from_tb(CPUMBState *env, TranslationBlock *tb)
 {

diff --git a/target-microblaze/helper.h b/target-microblaze/helper.h
index a667122e917a48555e398997622f178f69c77e80..4e51429498380a37cb24b7fc3fd70007a1a10480 100644 (file)
--- a/target-microblaze/helper.h
+++ b/target-microblaze/helper.h
@@ -1,4 +1,4 @@
-#include "def-helper.h"
+#include "exec/def-helper.h"
 
 DEF_HELPER_2(raise_exception, void, env, i32)
 DEF_HELPER_1(debug, void, env)
@@ -38,4 +38,4 @@ DEF_HELPER_2(stackprot, void, env, i32)
 DEF_HELPER_2(get, i32, i32, i32)
 DEF_HELPER_3(put, void, i32, i32, i32)
 
-#include "def-helper.h"
+#include "exec/def-helper.h"

diff --git a/target-microblaze/op_helper.c b/target-microblaze/op_helper.c
index 75935170947a4ba428c4602645c028553239c718..343dcc15e7b72aad47ca5060e71b953f4dac174a 100644 (file)
--- a/target-microblaze/op_helper.c
+++ b/target-microblaze/op_helper.c
@@ -26,17 +26,17 @@
 #define D(x)
 
 #if !defined(CONFIG_USER_ONLY)
-#include "softmmu_exec.h"
+#include "exec/softmmu_exec.h"
 
 #define MMUSUFFIX _mmu
 #define SHIFT 0
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
 #define SHIFT 1
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
 #define SHIFT 2
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
 #define SHIFT 3
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
 
 /* Try to fill the TLB and return an exception if error. If retaddr is
    NULL, it means that the function was called in C code (i.e. not

diff --git a/target-microblaze/translate.c b/target-microblaze/translate.c
index 5946a5ba5c576b60a7237416c5e2d8600900b67b..58ce71267d05a4fdaf2445066c3d98d5d6fd3a6d 100644 (file)
--- a/target-microblaze/translate.c
+++ b/target-microblaze/translate.c
@@ -50,7 +50,7 @@ static TCGv env_btaken;
 static TCGv env_btarget;
 static TCGv env_iflags;
 
-#include "gen-icount.h"
+#include "exec/gen-icount.h"
 
 /* This is the state at translation time.  */
 typedef struct DisasContext {

diff --git a/target-mips/cpu.h b/target-mips/cpu.h
index aebb2d5b79b232c9c8eefddc1d9796671583d56b..183ba9fbd89d89e10e90b299ee3b3d0ffc1ac2d5 100644 (file)
--- a/target-mips/cpu.h
+++ b/target-mips/cpu.h
@@ -12,7 +12,7 @@
 #include "config.h"
 #include "qemu-common.h"
 #include "mips-defs.h"
-#include "cpu-defs.h"
+#include "exec/cpu-defs.h"
 #include "softfloat.h"
 
 struct CPUMIPSState;
@@ -560,7 +560,7 @@ static inline int cpu_mips_hw_interrupts_pending(CPUMIPSState *env)
     return r;
 }
 
-#include "cpu-all.h"
+#include "exec/cpu-all.h"
 
 /* Memory access type :
  * may be needed for precise access rights control and precise exceptions.
@@ -738,7 +738,7 @@ static inline bool cpu_has_work(CPUState *cpu)
     return has_work;
 }
 
-#include "exec-all.h"
+#include "exec/exec-all.h"
 
 static inline void cpu_pc_from_tb(CPUMIPSState *env, TranslationBlock *tb)
 {

diff --git a/target-mips/helper.h b/target-mips/helper.h
index acf9ebd75950cb3b9f21464fbec3deee2e04e0d8..9ea60ec1bb758b42429e18a6d5e94b22aa05048d 100644 (file)
--- a/target-mips/helper.h
+++ b/target-mips/helper.h
@@ -1,4 +1,4 @@
-#include "def-helper.h"
+#include "exec/def-helper.h"
 
 DEF_HELPER_3(raise_exception_err, noreturn, env, i32, int)
 DEF_HELPER_2(raise_exception, noreturn, env, i32)
@@ -707,4 +707,4 @@ DEF_HELPER_FLAGS_2(rddsp, 0, tl, tl, env)
 
 
 
-#include "def-helper.h"
+#include "exec/def-helper.h"

diff --git a/target-mips/op_helper.c b/target-mips/op_helper.c
index 2972ae3f0a567029bd905cd8558a173c016e4133..157f59e6bf0014903cdbe4000d22deb1b4186227 100644 (file)
--- a/target-mips/op_helper.c
+++ b/target-mips/op_helper.c
@@ -23,7 +23,7 @@
 #include "helper.h"
 
 #if !defined(CONFIG_USER_ONLY)
-#include "softmmu_exec.h"
+#include "exec/softmmu_exec.h"
 #endif /* !defined(CONFIG_USER_ONLY) */
 
 #ifndef CONFIG_USER_ONLY
@@ -2116,16 +2116,16 @@ static void QEMU_NORETURN do_unaligned_access(CPUMIPSState *env,
 #define ALIGNED_ONLY
 
 #define SHIFT 0
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
 
 #define SHIFT 1
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
 
 #define SHIFT 2
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
 
 #define SHIFT 3
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
 
 static void do_unaligned_access(CPUMIPSState *env, target_ulong addr,
                                 int is_write, int is_user, uintptr_t retaddr)

diff --git a/target-mips/translate.c b/target-mips/translate.c
index 44e7617395a965b948bcb003c8b1031e86ca915b..e81ff384766906731aa62ee835ddc8451f860f22 100644 (file)
--- a/target-mips/translate.c
+++ b/target-mips/translate.c
@@ -1017,7 +1017,7 @@ static TCGv_i64 fpu_f64[32];
 static uint32_t gen_opc_hflags[OPC_BUF_SIZE];
 static target_ulong gen_opc_btarget[OPC_BUF_SIZE];
 
-#include "gen-icount.h"
+#include "exec/gen-icount.h"
 
 #define gen_helper_0e0i(name, arg) do {                           \
     TCGv_i32 helper_tmp = tcg_const_i32(arg);                     \

diff --git a/target-openrisc/cpu.h b/target-openrisc/cpu.h
index c7b17501532b812ce0cf61c3cf3dc111bafe3c17..8dc56c2873b08b23f3040ea9ea88e2fcf487ce75 100644 (file)
--- a/target-openrisc/cpu.h
+++ b/target-openrisc/cpu.h
@@ -30,7 +30,7 @@ struct OpenRISCCPU;
 
 #include "config.h"
 #include "qemu-common.h"
-#include "cpu-defs.h"
+#include "exec/cpu-defs.h"
 #include "softfloat.h"
 #include "qemu/cpu.h"
 #include "qapi/error.h"
@@ -398,7 +398,7 @@ static inline void cpu_clone_regs(CPUOpenRISCState *env, target_ulong newsp)
 }
 #endif
 
-#include "cpu-all.h"
+#include "exec/cpu-all.h"
 
 static inline void cpu_get_tb_cpu_state(CPUOpenRISCState *env,
                                         target_ulong *pc,
@@ -427,7 +427,7 @@ static inline bool cpu_has_work(CPUState *cpu)
                                      CPU_INTERRUPT_TIMER);
 }
 
-#include "exec-all.h"
+#include "exec/exec-all.h"
 
 static inline target_ulong cpu_get_pc(CPUOpenRISCState *env)
 {

diff --git a/target-openrisc/helper.h b/target-openrisc/helper.h
index 404d46447faa7254379f773932d1fbd88bbb5fe7..2af97901ce88903fe2135547d54c91d6ca4ae1d6 100644 (file)
--- a/target-openrisc/helper.h
+++ b/target-openrisc/helper.h
@@ -17,7 +17,7 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "def-helper.h"
+#include "exec/def-helper.h"
 
 /* exception */
 DEF_HELPER_FLAGS_2(exception, 0, void, env, i32)
@@ -67,4 +67,4 @@ DEF_HELPER_FLAGS_1(rfe, 0, void, env)
 DEF_HELPER_FLAGS_4(mtspr, 0, void, env, tl, tl, tl)
 DEF_HELPER_FLAGS_4(mfspr, 0, tl, env, tl, tl, tl)
 
-#include "def-helper.h"
+#include "exec/def-helper.h"

diff --git a/target-openrisc/interrupt.c b/target-openrisc/interrupt.c
index 642da7de49e757e98211af3c496ab200bab60c2b..226ce435132ae2831587aea07636b35010fc9f0c 100644 (file)
--- a/target-openrisc/interrupt.c
+++ b/target-openrisc/interrupt.c
@@ -19,7 +19,7 @@
 
 #include "cpu.h"
 #include "qemu-common.h"
-#include "gdbstub.h"
+#include "exec/gdbstub.h"
 #include "host-utils.h"
 #ifndef CONFIG_USER_ONLY
 #include "hw/loader.h"

diff --git a/target-openrisc/mmu.c b/target-openrisc/mmu.c
index f2a6523cfb021af3d4e1f578ffed80b407f1d22c..4eee44434f6b21bf7e153f170c79fafc42c30f34 100644 (file)
--- a/target-openrisc/mmu.c
+++ b/target-openrisc/mmu.c
@@ -20,7 +20,7 @@
 
 #include "cpu.h"
 #include "qemu-common.h"
-#include "gdbstub.h"
+#include "exec/gdbstub.h"
 #include "host-utils.h"
 #ifndef CONFIG_USER_ONLY
 #include "hw/loader.h"

diff --git a/target-openrisc/mmu_helper.c b/target-openrisc/mmu_helper.c
index d2edebcb497dc4bd6afc07b0ddc1d2e5f3c0c1ca..e46b09298477441045f990082e02cfa175f1b404 100644 (file)
--- a/target-openrisc/mmu_helper.c
+++ b/target-openrisc/mmu_helper.c
@@ -21,20 +21,20 @@
 #include "cpu.h"
 
 #ifndef CONFIG_USER_ONLY
-#include "softmmu_exec.h"
+#include "exec/softmmu_exec.h"
 #define MMUSUFFIX _mmu
 
 #define SHIFT 0
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
 
 #define SHIFT 1
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
 
 #define SHIFT 2
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
 
 #define SHIFT 3
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
 
 void tlb_fill(CPUOpenRISCState *env, target_ulong addr, int is_write,
               int mmu_idx, uintptr_t retaddr)

diff --git a/target-openrisc/translate.c b/target-openrisc/translate.c
index 2cb9d69826cb5d7b04f759b4b3bafa9572b883ca..5883347fa73da2193b19cf39d557ae6ecabee2ea 100644 (file)
--- a/target-openrisc/translate.c
+++ b/target-openrisc/translate.c
@@ -19,7 +19,7 @@
  */
 
 #include "cpu.h"
-#include "exec-all.h"
+#include "exec/exec-all.h"
 #include "disas/disas.h"
 #include "tcg-op.h"
 #include "qemu-common.h"
@@ -61,7 +61,7 @@ static TCGv_i32 fpcsr;
 static TCGv machi, maclo;
 static TCGv fpmaddhi, fpmaddlo;
 static TCGv_i32 env_flags;
-#include "gen-icount.h"
+#include "exec/gen-icount.h"
 
 void openrisc_translate_init(void)
 {

diff --git a/target-ppc/cpu.h b/target-ppc/cpu.h
index 742d4f8ae31feef51256765449c4934418b917d5..610bcd544bb60b46cb6d7efbe28e778f4f9c01a8 100644 (file)
--- a/target-ppc/cpu.h
+++ b/target-ppc/cpu.h
@@ -73,7 +73,7 @@
 
 #define CPUArchState struct CPUPPCState
 
-#include "cpu-defs.h"
+#include "exec/cpu-defs.h"
 
 #include "softfloat.h"
 
@@ -1251,7 +1251,7 @@ static inline void cpu_clone_regs(CPUPPCState *env, target_ulong newsp)
 }
 #endif
 
-#include "cpu-all.h"
+#include "exec/cpu-all.h"
 
 /*****************************************************************************/
 /* CRF definitions */
@@ -2224,7 +2224,7 @@ static inline bool cpu_has_work(CPUState *cpu)
     return msr_ee && (env->interrupt_request & CPU_INTERRUPT_HARD);
 }
 
-#include "exec-all.h"
+#include "exec/exec-all.h"
 
 static inline void cpu_pc_from_tb(CPUPPCState *env, TranslationBlock *tb)
 {

diff --git a/target-ppc/helper.h b/target-ppc/helper.h
index e588370e2951130bd6af3020a37c6ef10733d2f2..d2e9a55f287fac1bce12606cbd9e2f12d64013f5 100644 (file)
--- a/target-ppc/helper.h
+++ b/target-ppc/helper.h
@@ -1,4 +1,4 @@
-#include "def-helper.h"
+#include "exec/def-helper.h"
 
 DEF_HELPER_3(raise_exception_err, void, env, i32, i32)
 DEF_HELPER_2(raise_exception, void, env, i32)
@@ -414,4 +414,4 @@ DEF_HELPER_3(store_601_batl, void, env, i32, tl)
 DEF_HELPER_3(store_601_batu, void, env, i32, tl)
 #endif
 
-#include "def-helper.h"
+#include "exec/def-helper.h"

diff --git a/target-ppc/kvm_ppc.h b/target-ppc/kvm_ppc.h
index baad6eb75ba0a1ea0e3f27995b4627fd19a36dd1..83f98729a222238deaed00f51b5673e0e300a60b 100644 (file)
--- a/target-ppc/kvm_ppc.h
+++ b/target-ppc/kvm_ppc.h
@@ -9,7 +9,7 @@
 #ifndef __KVM_PPC_H__
 #define __KVM_PPC_H__
 
-#include "memory.h"
+#include "exec/memory.h"
 
 void kvmppc_init(void);
 

diff --git a/target-ppc/mem_helper.c b/target-ppc/mem_helper.c
index 04c01445f9edb13f0c5ba52d1c233c7965d23943..2d7a349c32012d78472f6a353ac576e4b3c1cae9 100644 (file)
--- a/target-ppc/mem_helper.c
+++ b/target-ppc/mem_helper.c
@@ -23,7 +23,7 @@
 #include "helper_regs.h"
 
 #if !defined(CONFIG_USER_ONLY)
-#include "softmmu_exec.h"
+#include "exec/softmmu_exec.h"
 #endif /* !defined(CONFIG_USER_ONLY) */
 
 //#define DEBUG_OP
@@ -257,16 +257,16 @@ STVE(stvewx, cpu_stl_data, bswap32, u32)
 #define MMUSUFFIX _mmu
 
 #define SHIFT 0
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
 
 #define SHIFT 1
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
 
 #define SHIFT 2
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
 
 #define SHIFT 3
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
 
 /* try to fill the TLB and return an exception if error. If retaddr is
    NULL, it means that the function was called in C code (i.e. not

diff --git a/target-ppc/translate.c b/target-ppc/translate.c
index 8a53105f89b7ffcff48feb4a02ef3beb5dcce3e9..a74d76b5a630e269b6ff8c6a195dee093db27d2e 100644 (file)
--- a/target-ppc/translate.c
+++ b/target-ppc/translate.c
@@ -71,7 +71,7 @@ static TCGv cpu_reserve;
 static TCGv cpu_fpscr;
 static TCGv_i32 cpu_access_type;
 
-#include "gen-icount.h"
+#include "exec/gen-icount.h"
 
 void ppc_translate_init(void)
 {

diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c
index 984ca9fc63c9a2033341fe15fcbadd70209c278e..cca63abf5d22ccb96917dd382bd3ff98a15ce47c 100644 (file)
--- a/target-ppc/translate_init.c
+++ b/target-ppc/translate_init.c
@@ -24,7 +24,7 @@
  */
 
 #include "disas/bfd.h"
-#include "gdbstub.h"
+#include "exec/gdbstub.h"
 #include <kvm.h>
 #include "kvm_ppc.h"
 #include "arch_init.h"

diff --git a/target-s390x/cpu.h b/target-s390x/cpu.h
index 0f9a1f7340333d9893c8be99928726f9b921a6cf..acb8c7317436831005cfcd08508197febfd991fb 100644 (file)
--- a/target-s390x/cpu.h
+++ b/target-s390x/cpu.h
@@ -28,13 +28,13 @@
 
 #define CPUArchState struct CPUS390XState
 
-#include "cpu-defs.h"
+#include "exec/cpu-defs.h"
 #define TARGET_PAGE_BITS 12
 
 #define TARGET_PHYS_ADDR_SPACE_BITS 64
 #define TARGET_VIRT_ADDR_SPACE_BITS 64
 
-#include "cpu-all.h"
+#include "exec/cpu-all.h"
 
 #include "softfloat.h"
 
@@ -350,7 +350,7 @@ static inline void cpu_set_tls(CPUS390XState *env, target_ulong newtls)
 #define cpu_gen_code cpu_s390x_gen_code
 #define cpu_signal_handler cpu_s390x_signal_handler
 
-#include "exec-all.h"
+#include "exec/exec-all.h"
 
 #ifdef CONFIG_USER_ONLY
 

diff --git a/target-s390x/fpu_helper.c b/target-s390x/fpu_helper.c
index ee9420d446f47316cd563d34420489fde30637da..173f820428afad6a94da067c5231544004e2c0a5 100644 (file)
--- a/target-s390x/fpu_helper.c
+++ b/target-s390x/fpu_helper.c
@@ -22,7 +22,7 @@
 #include "helper.h"
 
 #if !defined(CONFIG_USER_ONLY)
-#include "softmmu_exec.h"
+#include "exec/softmmu_exec.h"
 #endif
 
 /* #define DEBUG_HELPER */

diff --git a/target-s390x/helper.c b/target-s390x/helper.c
index b7b812a7e6cf0f8ceae6a38a9cbed9a36dc5c54d..6e9b20971309b0eb1861f895c0afb1f047170085 100644 (file)
--- a/target-s390x/helper.c
+++ b/target-s390x/helper.c
@@ -19,7 +19,7 @@
  */
 
 #include "cpu.h"
-#include "gdbstub.h"
+#include "exec/gdbstub.h"
 #include "qemu-timer.h"
 #ifndef CONFIG_USER_ONLY
 #include "sysemu.h"

diff --git a/target-s390x/helper.h b/target-s390x/helper.h
index ac44eabd53b0d0023a611a1599384a00ed778dba..c4926c52ade51b19da361cf9072cd18e9e994169 100644 (file)
--- a/target-s390x/helper.h
+++ b/target-s390x/helper.h
@@ -1,4 +1,4 @@
-#include "def-helper.h"
+#include "exec/def-helper.h"
 
 DEF_HELPER_2(exception, void, env, i32)
 DEF_HELPER_4(nc, i32, env, i32, i64, i64)
@@ -149,4 +149,4 @@ DEF_HELPER_3(cksm, void, env, i32, i32)
 DEF_HELPER_FLAGS_5(calc_cc, TCG_CALL_NO_RWG_SE,
                    i32, env, i32, i64, i64, i64)
 
-#include "def-helper.h"
+#include "exec/def-helper.h"

diff --git a/target-s390x/mem_helper.c b/target-s390x/mem_helper.c
index 91b25e309dc8ec0755e8d2a6ea40d8466ca24e00..bed21e6e1cae0a6f249935bce419ef3a191f4e10 100644 (file)
--- a/target-s390x/mem_helper.c
+++ b/target-s390x/mem_helper.c
@@ -24,21 +24,21 @@
 /*****************************************************************************/
 /* Softmmu support */
 #if !defined(CONFIG_USER_ONLY)
-#include "softmmu_exec.h"
+#include "exec/softmmu_exec.h"
 
 #define MMUSUFFIX _mmu
 
 #define SHIFT 0
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
 
 #define SHIFT 1
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
 
 #define SHIFT 2
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
 
 #define SHIFT 3
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
 
 /* try to fill the TLB and return an exception if error. If retaddr is
    NULL, it means that the function was called in C code (i.e. not

diff --git a/target-s390x/misc_helper.c b/target-s390x/misc_helper.c
index 38d8f2a627bae7bf9958ec9c1f9848dd362edf1d..a3336e16b071b6cfe1d5f2b3d3b37a583e0cb2d2 100644 (file)
--- a/target-s390x/misc_helper.c
+++ b/target-s390x/misc_helper.c
@@ -19,7 +19,7 @@
  */
 
 #include "cpu.h"
-#include "memory.h"
+#include "exec/memory.h"
 #include "host-utils.h"
 #include "helper.h"
 #include <string.h>
@@ -30,7 +30,7 @@
 #endif
 
 #if !defined(CONFIG_USER_ONLY)
-#include "softmmu_exec.h"
+#include "exec/softmmu_exec.h"
 #include "sysemu.h"
 #endif
 

diff --git a/target-s390x/translate.c b/target-s390x/translate.c
index 6e144a67a2faa8a9129c6cfb27f14b1d2df230fb..28e61c54b8368b3ff0489ea847ee553cb9d5eabd 100644 (file)
--- a/target-s390x/translate.c
+++ b/target-s390x/translate.c
@@ -37,7 +37,7 @@
 /* global register indexes */
 static TCGv_ptr cpu_env;
 
-#include "gen-icount.h"
+#include "exec/gen-icount.h"
 #include "helper.h"
 #define GEN_HELPER 1
 #include "helper.h"

diff --git a/target-sh4/cpu.h b/target-sh4/cpu.h
index 9a0e72b1fb7f1dcf127b7b56dae2f42f8e53558a..7c50c798b87cf55299f1770496c6c0e72e6b6fee 100644 (file)
--- a/target-sh4/cpu.h
+++ b/target-sh4/cpu.h
@@ -39,7 +39,7 @@
 
 #define CPUArchState struct CPUSH4State
 
-#include "cpu-defs.h"
+#include "exec/cpu-defs.h"
 
 #include "softfloat.h"
 
@@ -264,7 +264,7 @@ static inline void cpu_clone_regs(CPUSH4State *env, target_ulong newsp)
 }
 #endif
 
-#include "cpu-all.h"
+#include "exec/cpu-all.h"
 
 /* Memory access type */
 enum {
@@ -378,7 +378,7 @@ static inline bool cpu_has_work(CPUState *cpu)
     return env->interrupt_request & CPU_INTERRUPT_HARD;
 }
 
-#include "exec-all.h"
+#include "exec/exec-all.h"
 
 static inline void cpu_pc_from_tb(CPUSH4State *env, TranslationBlock *tb)
 {

diff --git a/target-sh4/helper.h b/target-sh4/helper.h
index 304b77ba3fabfaf8f49356a3c6ec8f12919a0d70..7162448497f7468c6d286a6ca9054e6766b6f3ad 100644 (file)
--- a/target-sh4/helper.h
+++ b/target-sh4/helper.h
@@ -1,4 +1,4 @@
-#include "def-helper.h"
+#include "exec/def-helper.h"
 
 DEF_HELPER_1(ldtlb, void, env)
 DEF_HELPER_1(raise_illegal_instruction, noreturn, env)
@@ -47,4 +47,4 @@ DEF_HELPER_2(ftrc_DT, i32, env, f64)
 DEF_HELPER_3(fipr, void, env, i32, i32)
 DEF_HELPER_2(ftrv, void, env, i32)
 
-#include "def-helper.h"
+#include "exec/def-helper.h"

diff --git a/target-sh4/op_helper.c b/target-sh4/op_helper.c
index e8e87f51529fd69181e74bcf94a6a4be374ef5a9..09e3d23aff1c49d5cc380625822ceb5d26fe7381 100644 (file)
--- a/target-sh4/op_helper.c
+++ b/target-sh4/op_helper.c
@@ -22,21 +22,21 @@
 #include "helper.h"
 
 #ifndef CONFIG_USER_ONLY
-#include "softmmu_exec.h"
+#include "exec/softmmu_exec.h"
 
 #define MMUSUFFIX _mmu
 
 #define SHIFT 0
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
 
 #define SHIFT 1
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
 
 #define SHIFT 2
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
 
 #define SHIFT 3
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
 
 void tlb_fill(CPUSH4State *env, target_ulong addr, int is_write, int mmu_idx,
               uintptr_t retaddr)

diff --git a/target-sh4/translate.c b/target-sh4/translate.c
index 41d53e5c514ec241a88366a6aa5d0c08d0bc112a..260aaab5596194b638c7c67e9aa6aa06b65c1214 100644 (file)
--- a/target-sh4/translate.c
+++ b/target-sh4/translate.c
@@ -69,7 +69,7 @@ static TCGv cpu_flags, cpu_delayed_pc;
 
 static uint32_t gen_opc_hflags[OPC_BUF_SIZE];
 
-#include "gen-icount.h"
+#include "exec/gen-icount.h"
 
 static void sh4_translate_init(void)
 {

diff --git a/target-sparc/cpu.h b/target-sparc/cpu.h
index 013ecbd0635e014b5f4c0ea27336d8c1336fcfff..0ed511a399e803f7aab8494aa61ceab76310ab9d 100644 (file)
--- a/target-sparc/cpu.h
+++ b/target-sparc/cpu.h
@@ -25,7 +25,7 @@
 
 #define CPUArchState struct CPUSPARCState
 
-#include "cpu-defs.h"
+#include "exec/cpu-defs.h"
 
 #include "softfloat.h"
 
@@ -701,7 +701,7 @@ static inline void cpu_clone_regs(CPUSPARCState *env, target_ulong newsp)
 }
 #endif
 
-#include "cpu-all.h"
+#include "exec/cpu-all.h"
 
 #ifdef TARGET_SPARC64
 /* sun4u.c */
@@ -767,7 +767,7 @@ static inline bool cpu_has_work(CPUState *cpu)
            cpu_interrupts_enabled(env1);
 }
 
-#include "exec-all.h"
+#include "exec/exec-all.h"
 
 static inline void cpu_pc_from_tb(CPUSPARCState *env, TranslationBlock *tb)
 {

diff --git a/target-sparc/helper.h b/target-sparc/helper.h
index 098c482216ff97defd2ce838de94de0098e17445..cfcdab1ea4f916139ba58f13e37af4db878276f0 100644 (file)
--- a/target-sparc/helper.h
+++ b/target-sparc/helper.h
@@ -1,4 +1,4 @@
-#include "def-helper.h"
+#include "exec/def-helper.h"
 
 #ifndef TARGET_SPARC64
 DEF_HELPER_1(rett, void, env)
@@ -173,4 +173,4 @@ VIS_CMPHELPER(cmpne);
 DEF_HELPER_1(compute_psr, void, env);
 DEF_HELPER_1(compute_C_icc, i32, env);
 
-#include "def-helper.h"
+#include "exec/def-helper.h"

diff --git a/target-sparc/ldst_helper.c b/target-sparc/ldst_helper.c
index 8d815e503899a3190fd71730502dffe62295be1d..cf1bddf2db46beccddd06822f8539968eb3ccbbc 100644 (file)
--- a/target-sparc/ldst_helper.c
+++ b/target-sparc/ldst_helper.c
@@ -68,21 +68,21 @@
 static void QEMU_NORETURN do_unaligned_access(CPUSPARCState *env,
                                               target_ulong addr, int is_write,
                                               int is_user, uintptr_t retaddr);
-#include "softmmu_exec.h"
+#include "exec/softmmu_exec.h"
 #define MMUSUFFIX _mmu
 #define ALIGNED_ONLY
 
 #define SHIFT 0
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
 
 #define SHIFT 1
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
 
 #define SHIFT 2
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
 
 #define SHIFT 3
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
 #endif
 
 #if defined(TARGET_SPARC64) && !defined(CONFIG_USER_ONLY)

diff --git a/target-sparc/mmu_helper.c b/target-sparc/mmu_helper.c
index 2c89b20b680075316a7cdacf8492af5d2bcce568..a9649ae064eead5fc8769d70d66e3ae9be34a110 100644 (file)
--- a/target-sparc/mmu_helper.c
+++ b/target-sparc/mmu_helper.c
@@ -19,7 +19,7 @@
 
 #include "cpu.h"
 #include "trace.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 
 /* Sparc MMU emulation */
 

diff --git a/target-sparc/translate.c b/target-sparc/translate.c
index 88802b84867dad83f3aaa9ccfabe7a90e37145c4..ca75e1aa4845aa5523d5cae5b23ca7120c7d8ff6 100644 (file)
--- a/target-sparc/translate.c
+++ b/target-sparc/translate.c
@@ -64,7 +64,7 @@ static TCGv_i64 cpu_fpr[TARGET_DPREGS];
 static target_ulong gen_opc_npc[OPC_BUF_SIZE];
 static target_ulong gen_opc_jump_pc[2];
 
-#include "gen-icount.h"
+#include "exec/gen-icount.h"
 
 typedef struct DisasContext {
     target_ulong pc;    /* current Program Counter: integer or DYNAMIC_PC */

diff --git a/target-unicore32/cpu.h b/target-unicore32/cpu.h
index 676c5d9d9995b4ba16ff77ff66ccd32405ee00d4..cd8f73075667ccbde52aa927ca04dd67256666b8 100644 (file)
--- a/target-unicore32/cpu.h
+++ b/target-unicore32/cpu.h
@@ -23,7 +23,7 @@
 
 #include "config.h"
 #include "qemu-common.h"
-#include "cpu-defs.h"
+#include "exec/cpu-defs.h"
 #include "softfloat.h"
 
 #define NB_MMU_MODES            2
@@ -157,9 +157,9 @@ static inline void cpu_set_tls(CPUUniCore32State *env, target_ulong newtls)
     env->regs[16] = newtls;
 }
 
-#include "cpu-all.h"
+#include "exec/cpu-all.h"
 #include "cpu-qom.h"
-#include "exec-all.h"
+#include "exec/exec-all.h"
 
 static inline void cpu_pc_from_tb(CPUUniCore32State *env, TranslationBlock *tb)
 {

diff --git a/target-unicore32/helper.c b/target-unicore32/helper.c
index 4b6856137d5136bea51f03470fca6c0208b3298d..2adbd1675dc893e0201ea767bbacc9fd85399a88 100644 (file)
--- a/target-unicore32/helper.c
+++ b/target-unicore32/helper.c
@@ -10,7 +10,7 @@
  */
 
 #include "cpu.h"
-#include "gdbstub.h"
+#include "exec/gdbstub.h"
 #include "helper.h"
 #include "host-utils.h"
 #include "ui/console.h"

diff --git a/target-unicore32/helper.h b/target-unicore32/helper.h
index a4b81494aaa026975ddadd233e2deb2b7b51ce4c..e85ce6c201692ac301de2092a21e23fa70c18f92 100644 (file)
--- a/target-unicore32/helper.h
+++ b/target-unicore32/helper.h
@@ -6,7 +6,7 @@
  * published by the Free Software Foundation, or (at your option) any
  * later version. See the COPYING file in the top-level directory.
  */
-#include "def-helper.h"
+#include "exec/def-helper.h"
 
 #ifndef CONFIG_USER_ONLY
 DEF_HELPER_4(cp0_set, void, env, i32, i32, i32)
@@ -65,4 +65,4 @@ DEF_HELPER_2(ucf64_si2df, f64, f32, env)
 DEF_HELPER_2(ucf64_sf2si, f32, f32, env)
 DEF_HELPER_2(ucf64_df2si, f32, f64, env)
 
-#include "def-helper.h"
+#include "exec/def-helper.h"

diff --git a/target-unicore32/op_helper.c b/target-unicore32/op_helper.c
index b8172ba6823e7cc03ec8a93d1b8ccba980f08fcc..6443ffec1c4b78a4ae4c3bd6ad4fad4e18088ea0 100644 (file)
--- a/target-unicore32/op_helper.c
+++ b/target-unicore32/op_helper.c
@@ -242,16 +242,16 @@ uint32_t HELPER(ror_cc)(CPUUniCore32State *env, uint32_t x, uint32_t i)
 #define MMUSUFFIX _mmu
 
 #define SHIFT 0
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
 
 #define SHIFT 1
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
 
 #define SHIFT 2
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
 
 #define SHIFT 3
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
 
 void tlb_fill(CPUUniCore32State *env, target_ulong addr, int is_write,
               int mmu_idx, uintptr_t retaddr)

diff --git a/target-unicore32/translate.c b/target-unicore32/translate.c
index 8c49f4d7016f8be1af2c9b7ad4957f8d4028c9cc..218e95eaca964cbc288b5fa66e4107f1896d1354 100644 (file)
--- a/target-unicore32/translate.c
+++ b/target-unicore32/translate.c
@@ -55,7 +55,7 @@ static TCGv_i32 cpu_R[32];
 static TCGv cpu_F0s, cpu_F1s;
 static TCGv_i64 cpu_F0d, cpu_F1d;
 
-#include "gen-icount.h"
+#include "exec/gen-icount.h"
 
 static const char *regnames[] = {
       "r00", "r01", "r02", "r03", "r04", "r05", "r06", "r07",

diff --git a/target-xtensa/core-dc232b.c b/target-xtensa/core-dc232b.c
index 804fdef56a0a8f03511348a8c1a5b63a02368a8a..d1a594cda220cb3770a852b124ad6d0cfdcc9c0a 100644 (file)
--- a/target-xtensa/core-dc232b.c
+++ b/target-xtensa/core-dc232b.c
@@ -26,8 +26,8 @@
  */
 
 #include "cpu.h"
-#include "exec-all.h"
-#include "gdbstub.h"
+#include "exec/exec-all.h"
+#include "exec/gdbstub.h"
 #include "host-utils.h"
 
 #include "core-dc232b/core-isa.h"

diff --git a/target-xtensa/core-dc233c.c b/target-xtensa/core-dc233c.c
index d643f41d37341d9e2f07da237ec38fcaa8f7d590..ead6b3b128902860fff3cf883b2448f298de41c9 100644 (file)
--- a/target-xtensa/core-dc233c.c
+++ b/target-xtensa/core-dc233c.c
@@ -26,8 +26,8 @@
  */
 
 #include "cpu.h"
-#include "exec-all.h"
-#include "gdbstub.h"
+#include "exec/exec-all.h"
+#include "exec/gdbstub.h"
 #include "qemu-common.h"
 #include "host-utils.h"
 

diff --git a/target-xtensa/core-fsf.c b/target-xtensa/core-fsf.c
index e36b0de9d529f0cb95db88b1fbccf45e91c9b736..a387aeeca5fd2fa86dbfa67460e2b3a425979d30 100644 (file)
--- a/target-xtensa/core-fsf.c
+++ b/target-xtensa/core-fsf.c
@@ -26,8 +26,8 @@
  */
 
 #include "cpu.h"
-#include "exec-all.h"
-#include "gdbstub.h"
+#include "exec/exec-all.h"
+#include "exec/gdbstub.h"
 #include "host-utils.h"
 
 #include "core-fsf/core-isa.h"

diff --git a/target-xtensa/cpu.h b/target-xtensa/cpu.h
index 08fd5bc3952b8e0df645614555164947419da191..5acf78c692bc60e669e9a83c4313c9575c6a095d 100644 (file)
--- a/target-xtensa/cpu.h
+++ b/target-xtensa/cpu.h
@@ -35,7 +35,7 @@
 
 #include "config.h"
 #include "qemu-common.h"
-#include "cpu-defs.h"
+#include "exec/cpu-defs.h"
 #include "fpu/softfloat.h"
 
 #define TARGET_HAS_ICE 1
@@ -512,8 +512,8 @@ static inline void cpu_get_tb_cpu_state(CPUXtensaState *env, target_ulong *pc,
     }
 }
 
-#include "cpu-all.h"
-#include "exec-all.h"
+#include "exec/cpu-all.h"
+#include "exec/exec-all.h"
 
 static inline int cpu_has_work(CPUState *cpu)
 {

diff --git a/target-xtensa/helper.c b/target-xtensa/helper.c
index bf05575eb5570e83d4d8a1116c015d8d96ce55cf..3d7a3990084897842778e55ea43d4b6dc9d25b8f 100644 (file)
--- a/target-xtensa/helper.c
+++ b/target-xtensa/helper.c
@@ -26,8 +26,8 @@
  */
 
 #include "cpu.h"
-#include "exec-all.h"
-#include "gdbstub.h"
+#include "exec/exec-all.h"
+#include "exec/gdbstub.h"
 #include "host-utils.h"
 #if !defined(CONFIG_USER_ONLY)
 #include "hw/loader.h"

diff --git a/target-xtensa/helper.h b/target-xtensa/helper.h
index 5b4cd2700f872e8918cfb8724a2546892569836d..38d7157f34b6d907aa3a11710387e37b353d51a9 100644 (file)
--- a/target-xtensa/helper.h
+++ b/target-xtensa/helper.h
@@ -1,4 +1,4 @@
-#include "def-helper.h"
+#include "exec/def-helper.h"
 
 DEF_HELPER_2(exception, noreturn, env, i32)
 DEF_HELPER_3(exception_cause, noreturn, env, i32, i32)
@@ -58,4 +58,4 @@ DEF_HELPER_4(ult_s, void, env, i32, f32, f32)
 DEF_HELPER_4(ole_s, void, env, i32, f32, f32)
 DEF_HELPER_4(ule_s, void, env, i32, f32, f32)
 
-#include "def-helper.h"
+#include "exec/def-helper.h"

diff --git a/target-xtensa/op_helper.c b/target-xtensa/op_helper.c
index 84f0449f79eb6bccf497925d9e12b3fa9f237eeb..a93abcb1dd9e42e2c97a91b908552f817bcb3240 100644 (file)
--- a/target-xtensa/op_helper.c
+++ b/target-xtensa/op_helper.c
@@ -36,16 +36,16 @@ static void do_unaligned_access(CPUXtensaState *env,
 #define MMUSUFFIX _mmu
 
 #define SHIFT 0
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
 
 #define SHIFT 1
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
 
 #define SHIFT 2
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
 
 #define SHIFT 3
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
 
 static void do_unaligned_access(CPUXtensaState *env,
         target_ulong addr, int is_write, int is_user, uintptr_t retaddr)

diff --git a/target-xtensa/translate.c b/target-xtensa/translate.c
index 4e81cbd9ecc7dc8ce22f3b45551810f18ddc2ca5..3c2d1853d6681c7427dcfaeae5837e1805ce257b 100644 (file)
--- a/target-xtensa/translate.c
+++ b/target-xtensa/translate.c
@@ -31,7 +31,7 @@
 #include <stdio.h>
 
 #include "cpu.h"
-#include "exec-all.h"
+#include "exec/exec-all.h"
 #include "disas/disas.h"
 #include "tcg-op.h"
 #include "qemu-log.h"
@@ -76,7 +76,7 @@ static TCGv_i32 cpu_FR[16];
 static TCGv_i32 cpu_SR[256];
 static TCGv_i32 cpu_UR[256];
 
-#include "gen-icount.h"
+#include "exec/gen-icount.h"
 
 typedef struct XtensaReg {
     const char *name;

diff --git a/tcg/arm/tcg-target.c b/tcg/arm/tcg-target.c
index 47612fe26008649280cef64460929ab31f8d4f29..c3ac85e05442c5f6bcc23e7e3968dde351679694 100644 (file)
--- a/tcg/arm/tcg-target.c
+++ b/tcg/arm/tcg-target.c
@@ -992,7 +992,7 @@ static inline void tcg_out_goto_label(TCGContext *s, int cond, int label_index)
 
 #ifdef CONFIG_SOFTMMU
 
-#include "../../softmmu_defs.h"
+#include "exec/softmmu_defs.h"
 
 /* helper signature: helper_ld_mmu(CPUState *env, target_ulong addr,
    int mmu_idx) */

diff --git a/tcg/hppa/tcg-target.c b/tcg/hppa/tcg-target.c
index de500ae181f03ad54c1ab42612c4f86584873ae4..5b27cf6f124aaff719b8e4a13b7f62b8c6e43a4b 100644 (file)
--- a/tcg/hppa/tcg-target.c
+++ b/tcg/hppa/tcg-target.c
@@ -906,7 +906,7 @@ static void tcg_out_movcond(TCGContext *s, int cond, TCGArg ret,
 }
 
 #if defined(CONFIG_SOFTMMU)
-#include "../../softmmu_defs.h"
+#include "exec/softmmu_defs.h"
 
 /* helper signature: helper_ld_mmu(CPUState *env, target_ulong addr,
    int mmu_idx) */

diff --git a/tcg/i386/tcg-target.c b/tcg/i386/tcg-target.c
index 6f3ad3ceab08e27a5464179b68b1faf50b2ac254..ae8274652a2845330b7925938ed398eb7ca909dd 100644 (file)
--- a/tcg/i386/tcg-target.c
+++ b/tcg/i386/tcg-target.c
@@ -982,7 +982,7 @@ static void tcg_out_jmp(TCGContext *s, tcg_target_long dest)
 
 #if defined(CONFIG_SOFTMMU)
 
-#include "../../softmmu_defs.h"
+#include "exec/softmmu_defs.h"
 
 /* helper signature: helper_ld_mmu(CPUState *env, target_ulong addr,
    int mmu_idx) */

diff --git a/tcg/ia64/tcg-target.c b/tcg/ia64/tcg-target.c
index 06570bea384d979de788c0f5432d92c8f246a977..2373d9ef79a7f09e7b63510591e67fcf3c20f2b8 100644 (file)
--- a/tcg/ia64/tcg-target.c
+++ b/tcg/ia64/tcg-target.c
@@ -1491,7 +1491,7 @@ static inline void tcg_out_movcond(TCGContext *s, TCGCond cond, TCGArg ret,
 
 #if defined(CONFIG_SOFTMMU)
 
-#include "../../softmmu_defs.h"
+#include "exec/softmmu_defs.h"
 
 /* Load and compare a TLB entry, and return the result in (p6, p7).
    R2 is loaded with the address of the addend TLB entry.

diff --git a/tcg/mips/tcg-target.c b/tcg/mips/tcg-target.c
index ae2b274d85b0fb436c2ec0e1d9dbc9f3aab08455..bd8c85898910e7d9aa893d11972d89ed85601fc2 100644 (file)
--- a/tcg/mips/tcg-target.c
+++ b/tcg/mips/tcg-target.c
@@ -920,7 +920,7 @@ static void tcg_out_setcond2(TCGContext *s, TCGCond cond, TCGReg ret,
 
 #if defined(CONFIG_SOFTMMU)
 
-#include "../../softmmu_defs.h"
+#include "exec/softmmu_defs.h"
 
 /* helper signature: helper_ld_mmu(CPUState *env, target_ulong addr,
    int mmu_idx) */

diff --git a/tcg/ppc/tcg-target.c b/tcg/ppc/tcg-target.c
index d72d396270b0625ff7e17dca08684c72fadcc3cf..29ca934e66ef344b72b93272702479af0dea1a2c 100644 (file)
--- a/tcg/ppc/tcg-target.c
+++ b/tcg/ppc/tcg-target.c
@@ -549,7 +549,7 @@ static void add_qemu_ldst_label (TCGContext *s,
     label->label_ptr[0] = label_ptr;
 }
 
-#include "../../softmmu_defs.h"
+#include "exec/softmmu_defs.h"
 
 /* helper signature: helper_ld_mmu(CPUState *env, target_ulong addr,
    int mmu_idx) */

diff --git a/tcg/ppc64/tcg-target.c b/tcg/ppc64/tcg-target.c
index 5403fc1f91b50f5e6a18539f0d071f099f87bbf9..833fe0c10b9b44389dffa72c1ba62d09f0e6f2b6 100644 (file)
--- a/tcg/ppc64/tcg-target.c
+++ b/tcg/ppc64/tcg-target.c
@@ -546,7 +546,7 @@ static void tcg_out_ldsta (TCGContext *s, int ret, int addr,
 
 #if defined (CONFIG_SOFTMMU)
 
-#include "../../softmmu_defs.h"
+#include "exec/softmmu_defs.h"
 
 /* helper signature: helper_ld_mmu(CPUState *env, target_ulong addr,
    int mmu_idx) */

diff --git a/tcg/s390/tcg-target.c b/tcg/s390/tcg-target.c
index fd9286f52d9d29fe038decc633af058907576931..e12a15221a1a68f69a4891ea891a0afdd0886695 100644 (file)
--- a/tcg/s390/tcg-target.c
+++ b/tcg/s390/tcg-target.c
@@ -299,7 +299,7 @@ static const uint8_t tcg_cond_to_ltr_cond[] = {
 
 #ifdef CONFIG_SOFTMMU
 
-#include "../../softmmu_defs.h"
+#include "exec/softmmu_defs.h"
 
 /* helper signature: helper_ld_mmu(CPUState *env, target_ulong addr,
    int mmu_idx) */

diff --git a/tcg/sparc/tcg-target.c b/tcg/sparc/tcg-target.c
index f146647874ffdfbb9ec12dddbfeb7a23ee34b631..03db514a1de0aedd3129ddf48607071156c1373f 100644 (file)
--- a/tcg/sparc/tcg-target.c
+++ b/tcg/sparc/tcg-target.c
@@ -831,7 +831,7 @@ static void tcg_target_qemu_prologue(TCGContext *s)
 
 #if defined(CONFIG_SOFTMMU)
 
-#include "../../softmmu_defs.h"
+#include "exec/softmmu_defs.h"
 
 /* helper signature: helper_ld_mmu(CPUState *env, target_ulong addr,
    int mmu_idx) */

diff --git a/tci.c b/tci.c
index 54cf1d9524bb9357aab91e18192f3444944f3eb9..2b2c11f25960a60e9b55dceb27396377d7bac293 100644 (file)
--- a/tci.c
+++ b/tci.c
@@ -25,7 +25,7 @@
 #endif
 
 #include "qemu-common.h"
-#include "exec-all.h"           /* MAX_OPC_PARAM_IARGS */
+#include "exec/exec-all.h"           /* MAX_OPC_PARAM_IARGS */
 #include "tcg-op.h"
 
 /* Marker for missing code. */

diff --git a/thunk.c b/thunk.c
index 8ebbbb46b68686aacdf6d6b723ad3afae5823282..3cca047509e7483da2f45701b16055eb9f028cf6 100644 (file)
--- a/thunk.c
+++ b/thunk.c
@@ -21,7 +21,7 @@
 #include <stdarg.h>
 
 #include "qemu.h"
-#include "thunk.h"
+#include "exec/user/thunk.h"
 
 //#define DEBUG
 

diff --git a/translate-all.c b/translate-all.c
index bbe06db6eb421bbbe6742553227998e8956d397e..e0cdad38c7bb05bd4a944cba3c2280aebefdf19f 100644 (file)
--- a/translate-all.c
+++ b/translate-all.c
@@ -36,8 +36,8 @@
 #include "disas/disas.h"
 #include "tcg.h"
 #include "qemu-timer.h"
-#include "memory.h"
-#include "exec-memory.h"
+#include "exec/memory.h"
+#include "exec/address-spaces.h"
 #if defined(CONFIG_USER_ONLY)
 #include "qemu.h"
 #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
@@ -57,7 +57,7 @@
 #endif
 #endif
 
-#include "cputlb.h"
+#include "exec/cputlb.h"
 #include "translate-all.h"
 
 //#define DEBUG_TB_INVALIDATE

diff --git a/vl.c b/vl.c
index 975767a44b621a81a7fd4362a7245bd61b603001..015f0a4757d15e50907c0c98c496a6c2179e45ac 100644 (file)
--- a/vl.c
+++ b/vl.c
@@ -132,7 +132,7 @@ int main(int argc, char **argv)
 #include "monitor.h"
 #include "ui/console.h"
 #include "sysemu.h"
-#include "gdbstub.h"
+#include "exec/gdbstub.h"
 #include "qemu-timer.h"
 #include "qemu-char.h"
 #include "cache-utils.h"

diff --git a/xen-all.c b/xen-all.c
index e3a51ccc81eaf7775af9ee26768fb7ab0732ea55..95d383f41fffc8e1db8c7a2b26ed23df0838ea54 100644 (file)
--- a/xen-all.c
+++ b/xen-all.c
@@ -19,7 +19,7 @@
 #include "range.h"
 #include "xen-mapcache.h"
 #include "trace.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 
 #include <xen/hvm/ioreq.h>
 #include <xen/hvm/params.h>

diff --git a/xen-stub.c b/xen-stub.c
index 921439263ada7a6f20893ba145b130f344d9efc4..1ee841137e2443c64d5c96ec89fb2819b0891559 100644 (file)
--- a/xen-stub.c
+++ b/xen-stub.c
@@ -10,7 +10,7 @@
 
 #include "qemu-common.h"
 #include "hw/xen.h"
-#include "memory.h"
+#include "exec/memory.h"
 #include "qmp-commands.h"
 
 void xenstore_store_pv_console_info(int i, CharDriverState *chr)