From: Claudio Fontana <cfontana@suse.de>
move init, realizefn and reset code into it.
Signed-off-by: Claudio Fontana <cfontana@suse.de>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
target/arm/tcg/tcg-cpu.h | 4 ++-
target/arm/cpu.c | 44 ++------------------------
target/arm/tcg/sysemu/tcg-cpu.c | 27 ++++++++++++++++
target/arm/tcg/tcg-cpu-models.c | 10 +++---
target/arm/tcg/tcg-cpu.c | 55 +++++++++++++++++++++++++++++++--
5 files changed, 92 insertions(+), 48 deletions(-)
diff --git a/target/arm/tcg/tcg-cpu.h b/target/arm/tcg/tcg-cpu.h
index d93c6a6749..dd08587949 100644
--- a/target/arm/tcg/tcg-cpu.h
+++ b/target/arm/tcg/tcg-cpu.h
@@ -22,15 +22,17 @@
#include "cpu.h"
#include "hw/core/tcg-cpu-ops.h"
+#include "hw/core/accel-cpu.h"
@@ -1467,7 +1429,7 @@ static void arm_cpu_class_init(ObjectClass *oc, void
*data)
cc->disas_set_info = arm_disas_set_info;
#ifdef CONFIG_TCG
- cc->tcg_ops = &arm_tcg_ops;
+ cc->init_accel_cpu = tcg_arm_init_accel_cpu;
#endif /* CONFIG_TCG */