summaryrefslogtreecommitdiff
path: root/target-m68k
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2016-03-15 13:18:37 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2016-05-19 16:42:29 +0200
commit63c915526d6a54a95919ebece83fa9ca631b2508 (patch)
tree3da979d15acebf6368cd77913a05616229c3381a /target-m68k
parent00f6da6a1a5d1ce085334eccbb50ec899ceed513 (diff)
downloadqemu-63c915526d6a54a95919ebece83fa9ca631b2508.tar.gz
cpu: move exec-all.h inclusion out of cpu.h
exec-all.h contains TCG-specific definitions. It is not needed outside TCG-specific files such as translate.c, exec.c or *helper.c. One generic function had snuck into include/exec/exec-all.h; move it to include/qom/cpu.h. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'target-m68k')
-rw-r--r--target-m68k/cpu.c1
-rw-r--r--target-m68k/cpu.h2
-rw-r--r--target-m68k/helper.c1
-rw-r--r--target-m68k/m68k-semi.c1
-rw-r--r--target-m68k/op_helper.c1
-rw-r--r--target-m68k/translate.c1
6 files changed, 5 insertions, 2 deletions
diff --git a/target-m68k/cpu.c b/target-m68k/cpu.c
index 0b5f9a581e..116b784e63 100644
--- a/target-m68k/cpu.c
+++ b/target-m68k/cpu.c
@@ -23,6 +23,7 @@
#include "cpu.h"
#include "qemu-common.h"
#include "migration/vmstate.h"
+#include "exec/exec-all.h"
static void m68k_cpu_set_pc(CPUState *cs, vaddr value)
diff --git a/target-m68k/cpu.h b/target-m68k/cpu.h
index 86a1ff0d80..008a057a97 100644
--- a/target-m68k/cpu.h
+++ b/target-m68k/cpu.h
@@ -271,6 +271,4 @@ static inline void cpu_get_tb_cpu_state(CPUM68KState *env, target_ulong *pc,
| ((env->macsr >> 4) & 0xf); /* Bits 0-3 */
}
-#include "exec/exec-all.h"
-
#endif
diff --git a/target-m68k/helper.c b/target-m68k/helper.c
index a8f6d9d6a6..427cbedfd5 100644
--- a/target-m68k/helper.c
+++ b/target-m68k/helper.c
@@ -20,6 +20,7 @@
#include "qemu/osdep.h"
#include "cpu.h"
+#include "exec/exec-all.h"
#include "exec/gdbstub.h"
#include "exec/helper-proto.h"
diff --git a/target-m68k/m68k-semi.c b/target-m68k/m68k-semi.c
index f360ef3e17..1402145c8f 100644
--- a/target-m68k/m68k-semi.c
+++ b/target-m68k/m68k-semi.c
@@ -28,6 +28,7 @@
#include "exec/gdbstub.h"
#include "exec/softmmu-semi.h"
#endif
+#include "qemu/log.h"
#include "sysemu/sysemu.h"
#define HOSTED_EXIT 0
diff --git a/target-m68k/op_helper.c b/target-m68k/op_helper.c
index 17d0a11914..ff32e35461 100644
--- a/target-m68k/op_helper.c
+++ b/target-m68k/op_helper.c
@@ -19,6 +19,7 @@
#include "qemu/osdep.h"
#include "cpu.h"
#include "exec/helper-proto.h"
+#include "exec/exec-all.h"
#include "exec/cpu_ldst.h"
#include "exec/semihost.h"
diff --git a/target-m68k/translate.c b/target-m68k/translate.c
index e46356e44c..f90187ff96 100644
--- a/target-m68k/translate.c
+++ b/target-m68k/translate.c
@@ -21,6 +21,7 @@
#include "qemu/osdep.h"
#include "cpu.h"
#include "disas/disas.h"
+#include "exec/exec-all.h"
#include "tcg-op.h"
#include "qemu/log.h"
#include "exec/cpu_ldst.h"