diff options
| author | Andreas Färber | 2012-04-11 18:24:50 +0200 |
|---|---|---|
| committer | Max Filippov | 2012-04-14 01:48:08 +0200 |
| commit | e554bbc6892394e506f5995ff4e0ca21cfe04a25 (patch) | |
| tree | fae0ac266a9c4f7fe005136e1f816ae2ce49911a /target-xtensa | |
| parent | target-xtensa: QOM'ify CPU reset (diff) | |
| download | qemu-e554bbc6892394e506f5995ff4e0ca21cfe04a25.tar.gz qemu-e554bbc6892394e506f5995ff4e0ca21cfe04a25.tar.xz qemu-e554bbc6892394e506f5995ff4e0ca21cfe04a25.zip | |
target-xtensa: Start QOM'ifying CPU init
Move XtensaConfig-independent code from cpu_xtensa_init() into a
QOM initfn, as a start.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
Diffstat (limited to 'target-xtensa')
| -rw-r--r-- | target-xtensa/cpu.c | 9 | ||||
| -rw-r--r-- | target-xtensa/helper.c | 1 |
2 files changed, 9 insertions, 1 deletions
diff --git a/target-xtensa/cpu.c b/target-xtensa/cpu.c index 55d2dea266..97deacb478 100644 --- a/target-xtensa/cpu.c +++ b/target-xtensa/cpu.c @@ -53,6 +53,14 @@ static void xtensa_cpu_reset(CPUState *s) reset_mmu(env); } +static void xtensa_cpu_initfn(Object *obj) +{ + XtensaCPU *cpu = XTENSA_CPU(obj); + CPUXtensaState *env = &cpu->env; + + cpu_exec_init(env); +} + static void xtensa_cpu_class_init(ObjectClass *oc, void *data) { CPUClass *cc = CPU_CLASS(oc); @@ -66,6 +74,7 @@ static const TypeInfo xtensa_cpu_type_info = { .name = TYPE_XTENSA_CPU, .parent = TYPE_CPU, .instance_size = sizeof(XtensaCPU), + .instance_init = xtensa_cpu_initfn, .abstract = false, .class_size = sizeof(XtensaCPUClass), .class_init = xtensa_cpu_class_init, diff --git a/target-xtensa/helper.c b/target-xtensa/helper.c index 000f965d7b..2094227843 100644 --- a/target-xtensa/helper.c +++ b/target-xtensa/helper.c @@ -102,7 +102,6 @@ CPUXtensaState *cpu_xtensa_init(const char *cpu_model) cpu = XTENSA_CPU(object_new(TYPE_XTENSA_CPU)); env = &cpu->env; env->config = config; - cpu_exec_init(env); if (!tcg_inited) { tcg_inited = 1; |