diff options
| author | Philippe Mathieu-Daudé | 2017-09-20 21:49:32 +0200 |
|---|---|---|
| committer | Yongbok Kim | 2017-09-21 14:25:27 +0200 |
| commit | df4dc10284e1d871db8adb512816a561473ffe3e (patch) | |
| tree | 4b77161013b5bbb2f6a1beac379a5c8d7056b4ee | |
| parent | mips: split cpu_mips_realize_env() out of cpu_mips_init() (diff) | |
| download | qemu-df4dc10284e1d871db8adb512816a561473ffe3e.tar.gz qemu-df4dc10284e1d871db8adb512816a561473ffe3e.tar.xz qemu-df4dc10284e1d871db8adb512816a561473ffe3e.zip | |
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: Philippe Mathieu-Daudé <f4bug@amsat.org>
Tested-by: Igor Mammedov <imammedo@redhat.com>
Tested-by: James Hogan <james.hogan@imgtec.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Yongbok Kim <yongbok.kim@imgtec.com>
| -rw-r--r-- | target/mips/cpu.c | 3 | ||||
| -rw-r--r-- | target/mips/translate.c | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/target/mips/cpu.c b/target/mips/cpu.c index 68bf423e9d..e3ef835599 100644 --- a/target/mips/cpu.c +++ b/target/mips/cpu.c @@ -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); diff --git a/target/mips/translate.c b/target/mips/translate.c index 5fc7979ac5..94c38e8755 100644 --- a/target/mips/translate.c +++ b/target/mips/translate.c @@ -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); |