mirrors/qemu
0
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2024-11-28 14:24:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

target-s390x: Move TCG initialization to S390CPU initfn

Browse Source 
Ensures that a QOM-created S390CPU is usable.

Acked-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Andreas Färber 2013-01-19 22:43:32 +01:00
parent 60925d2644
commit 2b7ac76729
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
target-s390x/cpu.c
View File

@ -112,6 +112,7 @@ static void s390_cpu_initfn(Object *obj)
{ {
S390CPU *cpu = S390_CPU(obj); S390CPU *cpu = S390_CPU(obj);
CPUS390XState *env = &cpu->env; CPUS390XState *env = &cpu->env;
static bool inited;
static int cpu_num = 0; static int cpu_num = 0;
#if !defined(CONFIG_USER_ONLY) #if !defined(CONFIG_USER_ONLY)
struct tm tm; struct tm tm;
@ -133,6 +134,11 @@ static void s390_cpu_initfn(Object *obj)
#endif #endif
env->cpu_num = cpu_num++; env->cpu_num = cpu_num++;
env->ext_index = -1; env->ext_index = -1;
if (tcg_enabled() && !inited) {
inited = true;
s390x_translate_init();
}
} }
static void s390_cpu_finalize(Object *obj) static void s390_cpu_finalize(Object *obj)

7
target-s390x/helper.c
View File

@ -74,16 +74,9 @@ S390CPU *cpu_s390x_init(const char *cpu_model)
{ {
S390CPU *cpu; S390CPU *cpu;
CPUS390XState *env; CPUS390XState *env;
static int inited;
cpu = S390_CPU(object_new(TYPE_S390_CPU)); cpu = S390_CPU(object_new(TYPE_S390_CPU));
env = &cpu->env; env = &cpu->env;
if (tcg_enabled() && !inited) {
inited = 1;
s390x_translate_init();
}
env->cpu_model_str = cpu_model; env->cpu_model_str = cpu_model;
object_property_set_bool(OBJECT(cpu), true, "realized", NULL); object_property_set_bool(OBJECT(cpu), true, "realized", NULL);