Patchwork [RFC,qom-cpu,v2,24/28] target-s390x: Move TCG initialization to S390CPU initfn

login
register
mail settings
Submitter Andreas Färber
Date Jan. 20, 2013, 7:22 a.m.
Message ID <1358666571-1737-25-git-send-email-afaerber@suse.de>
Download mbox | patch
Permalink /patch/213930/
State New
Headers show

Comments

Andreas Färber - Jan. 20, 2013, 7:22 a.m.
Ensures that a QOM-created S390CPU is usable.

Signed-off-by: Andreas Färber <afaerber@suse.de>
---
 target-s390x/cpu.c    |    6 ++++++
 target-s390x/helper.c |    7 -------
 2 Dateien geändert, 6 Zeilen hinzugefügt(+), 7 Zeilen entfernt(-)
Richard Henderson - Jan. 21, 2013, 3:30 p.m.
On 2013-01-19 23:22, Andreas Färber wrote:
> Ensures that a QOM-created S390CPU is usable.
>
> Signed-off-by: Andreas Färber<afaerber@suse.de>
> ---
>   target-s390x/cpu.c    |    6 ++++++
>   target-s390x/helper.c |    7 -------
>   2 Dateien geändert, 6 Zeilen hinzugefügt(+), 7 Zeilen entfernt(-)

Acked-by: Richard Henderson <rth@twiddle.net>


r~

Patch

diff --git a/target-s390x/cpu.c b/target-s390x/cpu.c
index 60f71fc..109777e 100644
--- a/target-s390x/cpu.c
+++ b/target-s390x/cpu.c
@@ -112,6 +112,7 @@  static void s390_cpu_initfn(Object *obj)
 {
     S390CPU *cpu = S390_CPU(obj);
     CPUS390XState *env = &cpu->env;
+    static bool inited;
     static int cpu_num = 0;
 #if !defined(CONFIG_USER_ONLY)
     struct tm tm;
@@ -133,6 +134,11 @@  static void s390_cpu_initfn(Object *obj)
 #endif
     env->cpu_num = cpu_num++;
     env->ext_index = -1;
+
+    if (tcg_enabled() && !inited) {
+        inited = true;
+        s390x_translate_init();
+    }
 }
 
 static void s390_cpu_finalize(Object *obj)
diff --git a/target-s390x/helper.c b/target-s390x/helper.c
index 45020b2..bad0683 100644
--- a/target-s390x/helper.c
+++ b/target-s390x/helper.c
@@ -74,16 +74,9 @@  S390CPU *cpu_s390x_init(const char *cpu_model)
 {
     S390CPU *cpu;
     CPUS390XState *env;
-    static int inited;
 
     cpu = S390_CPU(object_new(TYPE_S390_CPU));
     env = &cpu->env;
-
-    if (tcg_enabled() && !inited) {
-        inited = 1;
-        s390x_translate_init();
-    }
-
     env->cpu_model_str = cpu_model;
 
     object_property_set_bool(OBJECT(cpu), true, "realized", NULL);