The object creation will be moved to cpu.c, with all the rest of the CPU model handling.
Signed-off-by: Eduardo Habkost <[email protected]> --- target-i386/helper.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/target-i386/helper.c b/target-i386/helper.c index b748d90..5a7eb56 100644 --- a/target-i386/helper.c +++ b/target-i386/helper.c @@ -1157,10 +1157,6 @@ X86CPU *cpu_x86_init(const char *cpu_model) CPUX86State *env; static int inited; - cpu = X86_CPU(object_new(TYPE_X86_CPU)); - env = &cpu->env; - env->cpu_model_str = cpu_model; - /* init various static tables used in TCG mode */ if (tcg_enabled() && !inited) { inited = 1; @@ -1170,6 +1166,10 @@ X86CPU *cpu_x86_init(const char *cpu_model) cpu_set_debug_excp_handler(breakpoint_handler); #endif } + + cpu = X86_CPU(object_new(TYPE_X86_CPU)); + env = &cpu->env; + env->cpu_model_str = cpu_model; if (cpu_x86_register(cpu, cpu_model) < 0) { object_delete(OBJECT(cpu)); return NULL; -- 1.7.11.2
