diff options
| author | Andreas Färber | 2013-01-19 07:37:45 +0100 |
|---|---|---|
| committer | Andreas Färber | 2013-02-16 14:50:58 +0100 |
| commit | 79614b781df5096ffecf531992314781dbab54af (patch) | |
| tree | 7c781ec40afe10ba31eed252d420c35d0d6c9266 | |
| parent | target-xtensa: Introduce QOM realizefn for XtensaCPU (diff) | |
| download | qemu-79614b781df5096ffecf531992314781dbab54af.tar.gz qemu-79614b781df5096ffecf531992314781dbab54af.tar.xz qemu-79614b781df5096ffecf531992314781dbab54af.zip | |
target-arm: Move TCG initialization to ARMCPU initfn
Ensures that a QOM-created ARMCPU is usable.
Signed-off-by: Andreas Färber <afaerber@suse.de>
| -rw-r--r-- | target-arm/cpu.c | 6 | ||||
| -rw-r--r-- | target-arm/helper.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/target-arm/cpu.c b/target-arm/cpu.c index 9915172a1d..f54d20057d 100644 --- a/target-arm/cpu.c +++ b/target-arm/cpu.c @@ -135,10 +135,16 @@ static inline void set_feature(CPUARMState *env, int feature) static void arm_cpu_initfn(Object *obj) { ARMCPU *cpu = ARM_CPU(obj); + static bool inited; cpu_exec_init(&cpu->env); cpu->cp_regs = g_hash_table_new_full(g_int_hash, g_int_equal, g_free, g_free); + + if (tcg_enabled() && !inited) { + inited = true; + arm_translate_init(); + } } static void arm_cpu_finalizefn(Object *obj) diff --git a/target-arm/helper.c b/target-arm/helper.c index 4538a09445..e63da57a51 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -1263,7 +1263,6 @@ ARMCPU *cpu_arm_init(const char *cpu_model) ARMCPU *cpu; CPUARMState *env; ObjectClass *oc; - static int inited = 0; oc = cpu_class_by_name(TYPE_ARM_CPU, cpu_model); if (!oc) { @@ -1276,11 +1275,6 @@ ARMCPU *cpu_arm_init(const char *cpu_model) /* TODO this should be set centrally, once possible */ object_property_set_bool(OBJECT(cpu), true, "realized", NULL); - if (tcg_enabled() && !inited) { - inited = 1; - arm_translate_init(); - } - return cpu; } |