Commit df4dc102 authored by Philippe Mathieu-Daudé's avatar Philippe Mathieu-Daudé Committed by Yongbok Kim
Browse files

mips: call cpu_mips_realize_env() from mips_cpu_realizefn() 



This changes the order between cpu_mips_realize_env() and
cpu_exec_initfn(), but cpu_exec_initfn() don't have anything that
depends on cpu_mips_realize_env() being called first.

Signed-off-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Tested-by: default avatarIgor Mammedov <imammedo@redhat.com>
Tested-by: default avatarJames Hogan <james.hogan@imgtec.com>
Reviewed-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Signed-off-by: default avatarYongbok Kim <yongbok.kim@imgtec.com>
parent 27e38392

target/mips/cpu.c

+3 −0
Original line number Diff line number Diff line
@@ -123,6 +123,7 @@ static void mips_cpu_disas_set_info(CPUState *s, disassemble_info *info) { 
static void mips_cpu_realizefn(DeviceState *dev, Error **errp)

{

    CPUState *cs = CPU(dev);

    MIPSCPU *cpu = MIPS_CPU(dev);

    MIPSCPUClass *mcc = MIPS_CPU_GET_CLASS(dev);

    Error *local_err = NULL;
@@ -132,6 +133,8 @@ static void mips_cpu_realizefn(DeviceState *dev, Error **errp) 
        return;

    }



    cpu_mips_realize_env(&cpu->env);



    cpu_reset(cs);

    qemu_init_vcpu(cs);

target/mips/translate.c

+0 −1
Original line number Diff line number Diff line
@@ -20535,7 +20535,6 @@ MIPSCPU *cpu_mips_init(const char *cpu_model) 
    cpu = MIPS_CPU(object_new(TYPE_MIPS_CPU));

    env = &cpu->env;

    env->cpu_model = def;

    cpu_mips_realize_env(env);









    object_property_set_bool(OBJECT(cpu), true, "realized", NULL);