summaryrefslogtreecommitdiff
path: root/target-lm32/cpu.c
diff options
context:
space:
mode:
authorAndreas Färber <afaerber@suse.de>2012-04-11 01:33:33 +0200
committerAndreas Färber <afaerber@suse.de>2012-04-12 01:07:59 +0200
commit8d7d505adda444220c93ee5ad09df4176b366bd7 (patch)
treeed2dc154e74062fcc693af482f96a109fc490781 /target-lm32/cpu.c
parentfc0ced2fbd8d40672fcdd2f655bbdcd3e278f3ab (diff)
downloadqemu-8d7d505adda444220c93ee5ad09df4176b366bd7.tar.gz
target-lm32: QOM'ify CPU init
Move code from cpu_lm32_init() to an initfn; call cpu_reset() instead of cpu_state_reset(). Signed-off-by: Andreas Färber <afaerber@suse.de> Acked-by: Michael Walle <michael@walle.cc>
Diffstat (limited to 'target-lm32/cpu.c')
-rw-r--r--target-lm32/cpu.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/target-lm32/cpu.c b/target-lm32/cpu.c
index 4ce7e3bf4c..70251d0544 100644
--- a/target-lm32/cpu.c
+++ b/target-lm32/cpu.c
@@ -34,6 +34,18 @@ static void lm32_cpu_reset(CPUState *s)
cpu_state_reset(env);
}
+static void lm32_cpu_initfn(Object *obj)
+{
+ LM32CPU *cpu = LM32_CPU(obj);
+ CPULM32State *env = &cpu->env;
+
+ cpu_exec_init(env);
+
+ env->flags = 0;
+
+ cpu_reset(CPU(cpu));
+}
+
static void lm32_cpu_class_init(ObjectClass *oc, void *data)
{
LM32CPUClass *lcc = LM32_CPU_CLASS(oc);
@@ -47,6 +59,7 @@ static const TypeInfo lm32_cpu_type_info = {
.name = TYPE_LM32_CPU,
.parent = TYPE_CPU,
.instance_size = sizeof(LM32CPU),
+ .instance_init = lm32_cpu_initfn,
.abstract = false,
.class_size = sizeof(LM32CPUClass),
.class_init = lm32_cpu_class_init,