david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

target-unicore32: Move TCG initialization to UniCore32CPU initfn

Browse Source 
Normalize the "inited" logic and add a tcg_enabled() check to suppress
it for qtest.

Ensures that a QOM-created UniCore32CPU is usable.

Acked-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Andreas Färber 2013-01-20 01:36:47 +01:00
parent 5266d20a12
commit d9c27f00b1
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
target-unicore32/cpu.c
View File

@ -95,6 +95,7 @@ static void uc32_cpu_initfn(Object *obj)
{ {
UniCore32CPU *cpu = UNICORE32_CPU(obj); UniCore32CPU *cpu = UNICORE32_CPU(obj);
CPUUniCore32State *env = &cpu->env; CPUUniCore32State *env = &cpu->env;
static bool inited;
cpu_exec_init(env); cpu_exec_init(env);
@ -107,6 +108,11 @@ static void uc32_cpu_initfn(Object *obj)
#endif #endif
tlb_flush(env, 1); tlb_flush(env, 1);
if (tcg_enabled() && !inited) {
inited = true;
uc32_translate_init();
}
} }
static const VMStateDescription vmstate_uc32_cpu = { static const VMStateDescription vmstate_uc32_cpu = {

6
target-unicore32/helper.c
View File

@ -30,7 +30,6 @@ CPUUniCore32State *uc32_cpu_init(const char *cpu_model)
UniCore32CPU *cpu; UniCore32CPU *cpu;
CPUUniCore32State *env; CPUUniCore32State *env;
ObjectClass *oc; ObjectClass *oc;
static int inited = 1;
oc = cpu_class_by_name(TYPE_UNICORE32_CPU, cpu_model); oc = cpu_class_by_name(TYPE_UNICORE32_CPU, cpu_model);
if (oc == NULL) { if (oc == NULL) {
@ -40,11 +39,6 @@ CPUUniCore32State *uc32_cpu_init(const char *cpu_model)
env = &cpu->env; env = &cpu->env;
env->cpu_model_str = cpu_model; env->cpu_model_str = cpu_model;
if (inited) {
inited = 0;
uc32_translate_init();
}
object_property_set_bool(OBJECT(cpu), true, "realized", NULL); object_property_set_bool(OBJECT(cpu), true, "realized", NULL);
return env; return env;