From 868e2824276cbe6ef2e202c05c4eb3a3a19d3ee0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.de>
Date: Sun, 20 Jan 2013 00:05:12 +0100
Subject: [PATCH] target-lm32: Move TCG initialization to LM32CPU initfn
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Andreas Färber <afaerber@suse.de>
---
target-lm32/cpu.c | 6 ++++++
target-lm32/helper.c | 6 ------
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/target-lm32/cpu.c b/target-lm32/cpu.c
index 6a84f51bf9..5f167340e4 100644
--- a/target-lm32/cpu.c
+++ b/target-lm32/cpu.c
@@ -58,10 +58,16 @@ static void lm32_cpu_initfn(Object *obj)
{
LM32CPU *cpu = LM32_CPU(obj);
CPULM32State *env = &cpu->env;
+ static bool tcg_initialized;
cpu_exec_init(env);
env->flags = 0;
+
+ if (tcg_enabled() && !tcg_initialized) {
+ tcg_initialized = true;
+ lm32_translate_init();
+ }
}
static void lm32_cpu_class_init(ObjectClass *oc, void *data)
diff --git a/target-lm32/helper.c b/target-lm32/helper.c
index a6691addba..47ae7e775a 100644
--- a/target-lm32/helper.c
+++ b/target-lm32/helper.c
@@ -197,7 +197,6 @@ LM32CPU *cpu_lm32_init(const char *cpu_model)
LM32CPU *cpu;
CPULM32State *env;
const LM32Def *def;
- static int tcg_initialized;
def = cpu_lm32_find_by_name(cpu_model);
if (!def) {
@@ -212,11 +211,6 @@ LM32CPU *cpu_lm32_init(const char *cpu_model)
env->num_wps = def->num_watchpoints;
env->cfg = cfg_by_def(def);
- if (tcg_enabled() && !tcg_initialized) {
- tcg_initialized = 1;
- lm32_translate_init();
- }
-
object_property_set_bool(OBJECT(cpu), true, "realized", NULL);
return cpu;