提交 d9c27f00 编写于 作者: A Andreas Färber

target-unicore32: Move TCG initialization to UniCore32CPU initfn

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: NGuan Xuetao <gxt@mprc.pku.edu.cn>
Signed-off-by: NAndreas Färber <afaerber@suse.de>
上级 5266d20a
......@@ -95,6 +95,7 @@ static void uc32_cpu_initfn(Object *obj)
{
UniCore32CPU *cpu = UNICORE32_CPU(obj);
CPUUniCore32State *env = &cpu->env;
static bool inited;
cpu_exec_init(env);
......@@ -107,6 +108,11 @@ static void uc32_cpu_initfn(Object *obj)
#endif
tlb_flush(env, 1);
if (tcg_enabled() && !inited) {
inited = true;
uc32_translate_init();
}
}
static const VMStateDescription vmstate_uc32_cpu = {
......
......@@ -30,7 +30,6 @@ CPUUniCore32State *uc32_cpu_init(const char *cpu_model)
UniCore32CPU *cpu;
CPUUniCore32State *env;
ObjectClass *oc;
static int inited = 1;
oc = cpu_class_by_name(TYPE_UNICORE32_CPU, cpu_model);
if (oc == NULL) {
......@@ -40,11 +39,6 @@ CPUUniCore32State *uc32_cpu_init(const char *cpu_model)
env = &cpu->env;
env->cpu_model_str = cpu_model;
if (inited) {
inited = 0;
uc32_translate_init();
}
object_property_set_bool(OBJECT(cpu), true, "realized", NULL);
return env;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册