Move headers to include/exec/
Change-Id: Ife43f9cd12a02aa98f408043b0cccb9fe45a9ff7
diff --git a/Makefile.target b/Makefile.target
index e21a507..f30d73b 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -333,7 +333,6 @@
disas.c \
dma-helpers.c \
gdbstub.c \
- keymaps.c \
loader.c \
monitor.c \
qemu-timer.c \
@@ -348,7 +347,8 @@
android/protocol/user-events-impl.c \
android/protocol/ui-commands-proxy.c \
android/protocol/core-commands-impl.c \
- android/protocol/core-commands-qemu.c
+ android/protocol/core-commands-qemu.c \
+ ui/keymaps.c \
$(call gen-hx-header,qemu-monitor.hx,qemu-monitor.h,monitor.c)
$(call gen-hx-header,qemu-options.hx,qemu-options.def,vl-android.c qemu-options.h)
@@ -413,7 +413,6 @@
disas.c \
dma-helpers.c \
gdbstub.c \
- keymaps.c \
loader.c \
monitor.c \
qemu-timer.c \
@@ -430,7 +429,7 @@
android/opengles.c \
android/protocol/core-commands-qemu.c \
android/protocol/ui-commands-qemu.c \
- android/
+ ui/keymaps.c \
# The following files cannot be in static libraries because they contain
diff --git a/arch_init.c b/arch_init.c
index 7285d27..ba92c87 100644
--- a/arch_init.c
+++ b/arch_init.c
@@ -39,7 +39,7 @@
#include "kvm.h"
#include "migration.h"
#include "net.h"
-#include "gdbstub.h"
+#include "exec/gdbstub.h"
#include "hw/smbios.h"
#ifdef TARGET_SPARC
diff --git a/arm-semi.c b/arm-semi.c
index 421d41a..a3eafa5 100644
--- a/arm-semi.c
+++ b/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"
#endif
#define SYS_OPEN 0x01
@@ -112,7 +112,7 @@
return code;
}
-#include "softmmu-semi.h"
+#include "exec/softmmu-semi.h"
#endif
static target_ulong arm_semi_syscall_len;
diff --git a/balloon.h b/balloon.h
index 60b4a5d..eceaaad 100644
--- a/balloon.h
+++ b/balloon.h
@@ -14,7 +14,7 @@
#ifndef _QEMU_BALLOON_H
#define _QEMU_BALLOON_H
-#include "cpu-defs.h"
+#include "exec/cpu-defs.h"
typedef ram_addr_t (QEMUBalloonEvent)(void *opaque, ram_addr_t target);
diff --git a/cpus.c b/cpus.c
index 585a6b3..73d5f2d 100644
--- a/cpus.c
+++ b/cpus.c
@@ -25,7 +25,7 @@
#include "monitor.h"
#include "sysemu.h"
-#include "gdbstub.h"
+#include "exec/gdbstub.h"
#include "dma.h"
#include "kvm.h"
#include "hax.h"
diff --git a/disas.c b/disas.c
index 6007916..96b2551 100644
--- a/disas.c
+++ b/disas.c
@@ -5,7 +5,7 @@
#include <errno.h>
#include "cpu.h"
-#include "exec-all.h"
+#include "exec/exec-all.h"
#include "disas.h"
/* Filled in by elfload.c. Simplistic, but will do for now. */
diff --git a/exec.c b/exec.c
index 7165d13..6b1b054 100644
--- a/exec.c
+++ b/exec.c
@@ -33,7 +33,7 @@
#include <inttypes.h>
#include "cpu.h"
-#include "exec-all.h"
+#include "exec/exec-all.h"
#include "qemu-common.h"
#include "tcg.h"
#include "hw/hw.h"
@@ -3951,16 +3951,16 @@
#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/gdbstub.c b/gdbstub.c
index 0235720..1c0b793 100644
--- 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/isa.h b/hw/isa.h
index 2f527c0..1b45e8e 100644
--- a/hw/isa.h
+++ b/hw/isa.h
@@ -3,7 +3,7 @@
/* ISA bus */
-#include "ioport.h"
+#include "exec/ioport.h"
#include "qdev.h"
extern target_phys_addr_t isa_mem_base;
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 e27d292..2535d5b2 100644
--- a/cpu-all.h
+++ b/include/exec/cpu-all.h
@@ -20,7 +20,7 @@
#define CPU_ALL_H
#include "qemu-common.h"
-#include "cpu-common.h"
+#include "exec/cpu-common.h"
/* some important defines:
*
@@ -896,7 +896,7 @@
int cpu_str_to_log_mask(const char *str);
/* IO ports API */
-#include "ioport.h"
+#include "exec/ioport.h"
/* Return the physical page corresponding to a virtual one. Use it
only for debugging because no protection checks are done. Return -1
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 53f63fe..74a5a76 100644
--- a/cpu-common.h
+++ b/include/exec/cpu-common.h
@@ -12,7 +12,7 @@
#endif
#ifndef NEED_CPU_H
-#include "poison.h"
+#include "exec/poison.h"
#endif
#include "qemu/bswap.h"
diff --git a/cpu-defs.h b/include/exec/cpu-defs.h
similarity index 100%
rename from cpu-defs.h
rename to include/exec/cpu-defs.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 1c69176..ddbb5ee 100644
--- a/exec-all.h
+++ b/include/exec/exec-all.h
@@ -353,23 +353,23 @@
void tlb_fill(target_ulong addr, int is_write, int mmu_idx,
void *retaddr);
-#include "softmmu_defs.h"
+#include "exec/softmmu_defs.h"
#define ACCESS_TYPE (NB_MMU_MODES + 1)
#define MEMSUFFIX _code
#define env cpu_single_env
#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/ioport.h b/include/exec/ioport.h
similarity index 100%
rename from ioport.h
rename to include/exec/ioport.h
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 70%
rename from softmmu_exec.h
rename to include/exec/softmmu_exec.h
index 28d1d53..861b107 100644
--- a/softmmu_exec.h
+++ b/include/exec/softmmu_exec.h
@@ -9,37 +9,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
@@ -48,16 +48,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) */
@@ -67,16 +67,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) */
@@ -86,16 +86,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) */
@@ -105,16 +105,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) */
@@ -127,16 +127,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_outside_jit.h b/include/exec/softmmu_outside_jit.h
similarity index 91%
rename from softmmu_outside_jit.h
rename to include/exec/softmmu_outside_jit.h
index 21ead05..716f79b 100644
--- a/softmmu_outside_jit.h
+++ b/include/exec/softmmu_outside_jit.h
@@ -57,16 +57,16 @@
#define ACCESS_TYPE 1
#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 MEMSUFFIX
#undef ACCESS_TYPE
@@ -78,16 +78,16 @@
#define ACCESS_TYPE 0
#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 MEMSUFFIX
#undef ACCESS_TYPE
diff --git a/softmmu_template.h b/include/exec/softmmu_template.h
similarity index 100%
rename from softmmu_template.h
rename to include/exec/softmmu_template.h
diff --git a/ioport-user.c b/ioport-user.c
index 03fac22..f7636e0 100644
--- a/ioport-user.c
+++ b/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/ioport.c b/ioport.c
index 53dd87a..b67a929 100644
--- a/ioport.c
+++ b/ioport.c
@@ -25,7 +25,7 @@
* splitted out ioport related stuffs from vl.c.
*/
-#include "ioport.h"
+#include "exec/ioport.h"
/***********************************************************/
/* IO Port */
diff --git a/kqemu.c b/kqemu.c
index 250df00..aa0ab22 100644
--- a/kqemu.c
+++ b/kqemu.c
@@ -38,7 +38,7 @@
#include <inttypes.h>
#include "cpu.h"
-#include "exec-all.h"
+#include "exec/exec-all.h"
#include "qemu-common.h"
#ifdef CONFIG_KQEMU
diff --git a/kvm-all.c b/kvm-all.c
index 2865b2f..1592de3 100644
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -23,7 +23,7 @@
#include "qemu-common.h"
#include "sysemu.h"
#include "hw/hw.h"
-#include "gdbstub.h"
+#include "exec/gdbstub.h"
#include "kvm.h"
/* KVM uses PAGE_SIZE in it's definition of COALESCED_MMIO_MAX */
diff --git a/monitor.c b/monitor.c
index bfc0084..9f2a63d 100644
--- a/monitor.c
+++ b/monitor.c
@@ -29,7 +29,7 @@
#include "hw/pc.h"
#include "hw/pci.h"
#include "hw/watchdog.h"
-#include "gdbstub.h"
+#include "exec/gdbstub.h"
#include "net.h"
#include "qemu-char.h"
#include "sysemu.h"
@@ -44,7 +44,7 @@
#include "migration.h"
#include "kvm.h"
#include "qemu/acl.h"
-#include "exec-all.h"
+#include "exec/exec-all.h"
//#define DEBUG
//#define DEBUG_COMPLETION
diff --git a/softmmu_outside_jit.c b/softmmu_outside_jit.c
index 9f4352b..b72ca0f 100644
--- a/softmmu_outside_jit.c
+++ b/softmmu_outside_jit.c
@@ -22,7 +22,7 @@
#include "qemu-common.h"
#include "cpu.h"
-#include "exec-all.h"
+#include "exec/exec-all.h"
#define OUTSIDE_JIT
#define MMUSUFFIX _outside_jit
@@ -32,16 +32,16 @@
#define CPU_MMU_INDEX (cpu_mmu_index(env))
#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 CPU_MMU_INDEX
#undef ACCESS_TYPE
diff --git a/target-arm/cpu.h b/target-arm/cpu.h
index b842c52..2aadfdb 100644
--- 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"
@@ -484,7 +484,7 @@
}
#endif
-#include "cpu-all.h"
+#include "exec/cpu-all.h"
/* Bit usage in the TB flags field: */
#define ARM_TBFLAG_THUMB_SHIFT 0
diff --git a/target-arm/exec.h b/target-arm/exec.h
index 43bfaa9..400d133 100644
--- a/target-arm/exec.h
+++ b/target-arm/exec.h
@@ -22,7 +22,7 @@
GLOBAL_REGISTER_VARIABLE_DECL struct CPUARMState *env asm(AREG0);
#include "cpu.h"
-#include "exec-all.h"
+#include "exec/exec-all.h"
static inline void env_to_regs(void)
{
@@ -52,7 +52,7 @@
}
#if !defined(CONFIG_USER_ONLY)
-#include "softmmu_exec.h"
+#include "exec/softmmu_exec.h"
#endif
void raise_exception(int);
diff --git a/target-arm/helper-android.c b/target-arm/helper-android.c
index d5f3b52..b99a22d 100644
--- a/target-arm/helper-android.c
+++ b/target-arm/helper-android.c
@@ -3,9 +3,9 @@
#include <string.h>
#include "cpu.h"
-#include "exec-all.h"
-#include "gdbstub.h"
-#include "def-helper.h"
+#include "exec/exec-all.h"
+#include "exec/gdbstub.h"
+#include "exec/def-helper.h"
#include "helper-android.h"
#include "qemu-common.h"
diff --git a/target-arm/helper-android.h b/target-arm/helper-android.h
index 5342d1d..9e3f055 100644
--- a/target-arm/helper-android.h
+++ b/target-arm/helper-android.h
@@ -25,4 +25,4 @@
*/
DEF_HELPER_1(on_ret, void, i32)
#endif // CONFIG_MEMCHECK
-#include "def-helper.h"
+#include "exec/def-helper.h"
diff --git a/target-arm/helper.c b/target-arm/helper.c
index 1b9df28..f1ea877 100644
--- a/target-arm/helper.c
+++ b/target-arm/helper.c
@@ -3,8 +3,8 @@
#include <string.h>
#include "cpu.h"
-#include "exec-all.h"
-#include "gdbstub.h"
+#include "exec/exec-all.h"
+#include "exec/gdbstub.h"
#include "helper.h"
#include "qemu-common.h"
#include "qemu/host-utils.h"
diff --git a/target-arm/helper.h b/target-arm/helper.h
index 850e3d0..b40bdb0 100644
--- 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_1(clz, i32, i32)
DEF_HELPER_1(sxtb16, i32, i32)
@@ -474,4 +474,4 @@
DEF_HELPER_1(neon_vldst_all, void, i32)
#include "helper-android.h"
-#include "def-helper.h"
+#include "exec/def-helper.h"
diff --git a/target-arm/op_helper.c b/target-arm/op_helper.c
index ec6e5cc..16608e0 100644
--- a/target-arm/op_helper.c
+++ b/target-arm/op_helper.c
@@ -55,16 +55,16 @@
#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 05712b8..3f9baa2 100644
--- a/target-arm/translate.c
+++ b/target-arm/translate.c
@@ -25,7 +25,7 @@
#include <inttypes.h>
#include "cpu.h"
-#include "exec-all.h"
+#include "exec/exec-all.h"
#include "disas.h"
#include "tcg-op.h"
#include "qemu-log.h"
@@ -103,7 +103,7 @@
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-i386/cpu.h b/target-i386/cpu.h
index adf91cb..9124235 100644
--- a/target-i386/cpu.h
+++ b/target-i386/cpu.h
@@ -44,7 +44,7 @@
#define CPUState struct CPUX86State
-#include "cpu-defs.h"
+#include "exec/cpu-defs.h"
#include "softfloat.h"
@@ -897,8 +897,8 @@
}
#endif
-#include "cpu-all.h"
-#include "exec-all.h"
+#include "exec/cpu-all.h"
+#include "exec/exec-all.h"
#include "svm.h"
diff --git a/target-i386/exec.h b/target-i386/exec.h
index 5d04b7f..3ab94b8 100644
--- a/target-i386/exec.h
+++ b/target-i386/exec.h
@@ -27,7 +27,7 @@
#define TARGET_LONG_BITS 32
#endif
-#include "cpu-defs.h"
+#include "exec/cpu-defs.h"
GLOBAL_REGISTER_VARIABLE_DECL struct CPUX86State *env asm(AREG0);
@@ -56,7 +56,7 @@
#define ST1 ST(1)
#include "cpu.h"
-#include "exec-all.h"
+#include "exec/exec-all.h"
/* op_helper.c */
void do_interrupt(int intno, int is_int, int error_code,
@@ -85,7 +85,7 @@
#if !defined(CONFIG_USER_ONLY)
-#include "softmmu_exec.h"
+#include "exec/softmmu_exec.h"
#endif /* !defined(CONFIG_USER_ONLY) */
diff --git a/target-i386/helper.c b/target-i386/helper.c
index 7e2ac4e..d1382ec 100644
--- a/target-i386/helper.c
+++ b/target-i386/helper.c
@@ -25,7 +25,7 @@
#include <signal.h>
#include "cpu.h"
-#include "exec-all.h"
+#include "exec/exec-all.h"
#include "qemu-common.h"
#include "kvm.h"
#include "hax.h"
diff --git a/target-i386/helper.h b/target-i386/helper.h
index 68d57b1..d03e00e 100644
--- 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_1(cc_compute_all, TCG_CALL_PURE, i32, int)
DEF_HELPER_FLAGS_1(cc_compute_c, TCG_CALL_PURE, i32, int)
@@ -215,4 +215,4 @@
DEF_HELPER_2(rcrq, tl, tl, tl)
#endif
-#include "def-helper.h"
+#include "exec/def-helper.h"
diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index 00e01fe..8d3dd9c 100644
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -24,7 +24,7 @@
#include "sysemu.h"
#include "kvm.h"
#include "cpu.h"
-#include "gdbstub.h"
+#include "exec/gdbstub.h"
#ifdef CONFIG_KVM_GS_RESTORE
#include "kvm-gs-restore.h"
diff --git a/target-i386/machine.c b/target-i386/machine.c
index 7b366c4..75677b2 100644
--- a/target-i386/machine.c
+++ b/target-i386/machine.c
@@ -3,7 +3,7 @@
#include "hw/pc.h"
#include "hw/isa.h"
-#include "exec-all.h"
+#include "exec/exec-all.h"
#include "kvm.h"
static void cpu_put_seg(QEMUFile *f, SegmentCache *dt)
diff --git a/target-i386/op_helper.c b/target-i386/op_helper.c
index f8c0fbb..a43023a 100644
--- a/target-i386/op_helper.c
+++ b/target-i386/op_helper.c
@@ -19,7 +19,7 @@
*/
#define CPU_NO_GLOBAL_REGS
#include "exec.h"
-#include "exec-all.h"
+#include "exec/exec-all.h"
#include "qemu/host-utils.h"
//#define DEBUG_PCALL
@@ -4809,16 +4809,16 @@
#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/translate.c b/target-i386/translate.c
index e05cdac..5fbe09d 100644
--- a/target-i386/translate.c
+++ b/target-i386/translate.c
@@ -25,7 +25,7 @@
#include <signal.h>
#include "cpu.h"
-#include "exec-all.h"
+#include "exec/exec-all.h"
#include "disas.h"
#include "tcg-op.h"
@@ -73,7 +73,7 @@
static TCGv_i64 cpu_tmp1_i64;
static TCGv cpu_tmp5, cpu_tmp6;
-#include "gen-icount.h"
+#include "exec/gen-icount.h"
#ifdef TARGET_X86_64
static int x86_64_hregs;
diff --git a/target-mips/cpu.h b/target-mips/cpu.h
index 46519e3..3fe52ce 100644
--- a/target-mips/cpu.h
+++ b/target-mips/cpu.h
@@ -9,7 +9,7 @@
#include "config.h"
#include "mips-defs.h"
-#include "cpu-defs.h"
+#include "exec/cpu-defs.h"
#include "softfloat.h"
// uint_fast8_t and uint_fast16_t not in <sys/int_types.h>
@@ -548,8 +548,8 @@
return r;
}
-#include "cpu-all.h"
-#include "exec-all.h"
+#include "exec/cpu-all.h"
+#include "exec/exec-all.h"
/* Memory access type :
* may be needed for precise access rights control and precise exceptions.
diff --git a/target-mips/exec.h b/target-mips/exec.h
index 0d55790..3590748 100644
--- a/target-mips/exec.h
+++ b/target-mips/exec.h
@@ -6,15 +6,15 @@
#include "config.h"
#include "mips-defs.h"
#include "dyngen-exec.h"
-#include "cpu-defs.h"
+#include "exec/cpu-defs.h"
GLOBAL_REGISTER_VARIABLE_DECL struct CPUMIPSState *env asm(AREG0);
#include "cpu.h"
-#include "exec-all.h"
+#include "exec/exec-all.h"
#if !defined(CONFIG_USER_ONLY)
-#include "softmmu_exec.h"
+#include "exec/softmmu_exec.h"
#endif /* !defined(CONFIG_USER_ONLY) */
void dump_fpu(CPUState *env);
diff --git a/target-mips/helper.c b/target-mips/helper.c
index c69a8bd..6179159 100644
--- a/target-mips/helper.c
+++ b/target-mips/helper.c
@@ -24,7 +24,7 @@
#include <signal.h>
#include "cpu.h"
-#include "exec-all.h"
+#include "exec/exec-all.h"
enum {
TLBRET_DIRTY = -4,
diff --git a/target-mips/helper.h b/target-mips/helper.h
index ab47b1a..d0041d9 100644
--- 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_2(raise_exception_err, void, i32, int)
DEF_HELPER_1(raise_exception, void, i32)
@@ -279,4 +279,4 @@
DEF_HELPER_1(pmon, void, int)
DEF_HELPER_0(wait, void)
-#include "def-helper.h"
+#include "exec/def-helper.h"
diff --git a/target-mips/machine.c b/target-mips/machine.c
index 04985b1..714be20 100644
--- a/target-mips/machine.c
+++ b/target-mips/machine.c
@@ -1,7 +1,7 @@
#include "hw/hw.h"
#include "hw/boards.h"
-#include "exec-all.h"
+#include "exec/exec-all.h"
static void save_tc(QEMUFile *f, TCState *tc)
{
diff --git a/target-mips/op_helper.c b/target-mips/op_helper.c
index f0f98a8..4a393f6 100644
--- a/target-mips/op_helper.c
+++ b/target-mips/op_helper.c
@@ -1886,16 +1886,16 @@
#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 (target_ulong addr, int is_write, int is_user, void *retaddr)
{
diff --git a/target-mips/translate.c b/target-mips/translate.c
index ebbebc8..c2d6805 100755
--- a/target-mips/translate.c
+++ b/target-mips/translate.c
@@ -26,7 +26,7 @@
#include <inttypes.h>
#include "cpu.h"
-#include "exec-all.h"
+#include "exec/exec-all.h"
#include "disas.h"
#include "tcg-op.h"
#include "qemu-common.h"
@@ -433,7 +433,7 @@
static TCGv_i32 hflags;
static TCGv_i32 fpu_fcr0, fpu_fcr31;
-#include "gen-icount.h"
+#include "exec/gen-icount.h"
#define gen_helper_0i(name, arg) do { \
TCGv_i32 helper_tmp = tcg_const_i32(arg); \
diff --git a/tcg/i386/tcg-target.c b/tcg/i386/tcg-target.c
index 09a5c55..6f4b537 100644
--- a/tcg/i386/tcg-target.c
+++ b/tcg/i386/tcg-target.c
@@ -960,7 +960,7 @@
#if defined(CONFIG_SOFTMMU)
-#include "../../softmmu_defs.h"
+#include "exec/softmmu_defs.h"
static void *qemu_ld_helpers[4] = {
__ldb_mmu,
diff --git a/tcg/tcg.c b/tcg/tcg.c
index f952416..1d6a191 100644
--- a/tcg/tcg.c
+++ b/tcg/tcg.c
@@ -54,7 +54,7 @@
instructions */
#define NO_CPU_IO_DEFS
#include "cpu.h"
-#include "exec-all.h"
+#include "exec/exec-all.h"
#include "tcg-op.h"
#include "elf.h"
diff --git a/trace.c b/trace.c
index caf5878..fabfed5 100644
--- a/trace.c
+++ b/trace.c
@@ -21,7 +21,7 @@
#include <sys/time.h>
#include <time.h>
#include "cpu.h"
-#include "exec-all.h"
+#include "exec/exec-all.h"
#include "android-trace.h"
#include "varint.h"
#include "android/utils/path.h"
diff --git a/translate-all.c b/translate-all.c
index e1013aa..902abeb 100644
--- a/translate-all.c
+++ b/translate-all.c
@@ -26,7 +26,7 @@
#define NO_CPU_IO_DEFS
#include "cpu.h"
-#include "exec-all.h"
+#include "exec/exec-all.h"
#include "disas.h"
#include "tcg.h"
#include "qemu/timer.h"
diff --git a/curses.c b/ui/curses.c
similarity index 100%
rename from curses.c
rename to ui/curses.c
diff --git a/curses_keys.h b/ui/curses_keys.h
similarity index 100%
rename from curses_keys.h
rename to ui/curses_keys.h
diff --git a/keymaps.c b/ui/keymaps.c
similarity index 100%
rename from keymaps.c
rename to ui/keymaps.c
diff --git a/keymaps.h b/ui/keymaps.h
similarity index 100%
rename from keymaps.h
rename to ui/keymaps.h
diff --git a/sdl_keysym.h b/ui/sdl_keysym.h
similarity index 100%
rename from sdl_keysym.h
rename to ui/sdl_keysym.h
diff --git a/vl-android.c b/vl-android.c
index b33a958..f2dce01 100644
--- a/vl-android.c
+++ b/vl-android.c
@@ -40,7 +40,7 @@
#include "net.h"
#include "ui/console.h"
#include "sysemu.h"
-#include "gdbstub.h"
+#include "exec/gdbstub.h"
#include "qemu/timer.h"
#include "qemu-char.h"
#include "blockdev.h"
@@ -191,7 +191,7 @@
#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 "qemu/cache-utils.h"
diff --git a/vl.c b/vl.c
index c0c35a5..21c11b5 100644
--- a/vl.c
+++ b/vl.c
@@ -149,7 +149,7 @@
#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 "qemu/cache-utils.h"
@@ -163,7 +163,7 @@
#include "disas.h"
-#include "exec-all.h"
+#include "exec/exec-all.h"
#include "qemu_socket.h"
