[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 3/3] target-cris: Start QOM'ifying CPU init
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH v2 3/3] target-cris: Start QOM'ifying CPU init |
Date: |
Thu, 12 Apr 2012 01:00:10 +0200 |
Move VR-independent code from cpu_cris_init() into an initfn.
Signed-off-by: Andreas Färber <address@hidden>
---
target-cris/cpu.c | 9 +++++++++
target-cris/translate.c | 2 +-
2 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/target-cris/cpu.c b/target-cris/cpu.c
index 1355044..44bf457 100644
--- a/target-cris/cpu.c
+++ b/target-cris/cpu.c
@@ -55,6 +55,14 @@ static void cris_cpu_reset(CPUState *s)
#endif
}
+static void cris_cpu_initfn(Object *obj)
+{
+ CRISCPU *cpu = CRIS_CPU(obj);
+ CPUCRISState *env = &cpu->env;
+
+ cpu_exec_init(env);
+}
+
static void cris_cpu_class_init(ObjectClass *oc, void *data)
{
CPUClass *cc = CPU_CLASS(oc);
@@ -68,6 +76,7 @@ static const TypeInfo cris_cpu_type_info = {
.name = TYPE_CRIS_CPU,
.parent = TYPE_CPU,
.instance_size = sizeof(CRISCPU),
+ .instance_init = cris_cpu_initfn,
.abstract = false,
.class_size = sizeof(CRISCPUClass),
.class_init = cris_cpu_class_init,
diff --git a/target-cris/translate.c b/target-cris/translate.c
index d3dbac2..e353ea3 100644
--- a/target-cris/translate.c
+++ b/target-cris/translate.c
@@ -3514,7 +3514,7 @@ CPUCRISState *cpu_cris_init (const char *cpu_model)
env = &cpu->env;
env->pregs[PR_VR] = vr_by_name(cpu_model);
- cpu_exec_init(env);
+
cpu_reset(CPU(cpu));
qemu_init_vcpu(env);
--
1.7.7