diff options
author | Anthony Liguori <aliguori@us.ibm.com> | 2012-12-19 17:15:39 -0600 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-12-19 17:15:39 -0600 |
commit | 27dd7730582be85c7d4f680f5f71146629809c86 (patch) | |
tree | 3a36db2e407711ed222de28b839744db48a75059 /translate-all.c | |
parent | 914606d26e654d4c01bd5186f4d05e3fd445e219 (diff) | |
parent | ec5e016c9a68588bd01be387416923c7dcafb951 (diff) |
Merge remote-tracking branch 'bonzini/header-dirs' into staging
* bonzini/header-dirs: (45 commits)
janitor: move remaining public headers to include/
hw: move executable format header files to hw/
fpu: move public header file to include/fpu
softmmu: move remaining include files to include/ subdirectories
softmmu: move include files to include/sysemu/
misc: move include files to include/qemu/
qom: move include files to include/qom/
migration: move include files to include/migration/
monitor: move include files to include/monitor/
exec: move include files to include/exec/
block: move include files to include/block/
qapi: move include files to include/qobject/
janitor: add guards to headers
qapi: make struct Visitor opaque
qapi: remove qapi/qapi-types-core.h
qapi: move inclusions of qemu-common.h from headers to .c files
ui: move files to ui/ and include/ui/
qemu-ga: move qemu-ga files to qga/
net: reorganize headers
net: move net.c to net/
...
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'translate-all.c')
-rw-r--r-- | translate-all.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/translate-all.c b/translate-all.c index 164870a68c..b621748ec0 100644 --- a/translate-all.c +++ b/translate-all.c @@ -33,11 +33,11 @@ #include "qemu-common.h" #define NO_CPU_IO_DEFS #include "cpu.h" -#include "disas.h" +#include "disas/disas.h" #include "tcg.h" -#include "qemu-timer.h" -#include "memory.h" -#include "exec-memory.h" +#include "qemu/timer.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 |