[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 4/6] mips: call cpu_mips_realize_env() from mips_
From: |
Philippe Mathieu-Daudé |
Subject: |
[Qemu-devel] [PATCH v4 4/6] mips: call cpu_mips_realize_env() from mips_cpu_realizefn() |
Date: |
Wed, 20 Sep 2017 16:49:32 -0300 |
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é <address@hidden>
Tested-by: Igor Mammedov <address@hidden>
Tested-by: James Hogan <address@hidden>
Reviewed-by: Eduardo Habkost <address@hidden>
---
target/mips/cpu.c | 3 +++
target/mips/translate.c | 1 -
2 files changed, 3 insertions(+), 1 deletion(-)
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);
--
2.14.1
- [Qemu-devel] [PATCH v4 0/6] QOMify MIPS cpu, Philippe Mathieu-Daudé, 2017/09/20
- [Qemu-devel] [PATCH v4 1/6] mips: move hw/mips/cputimer.c to target/mips/, Philippe Mathieu-Daudé, 2017/09/20
- [Qemu-devel] [PATCH v4 3/6] mips: split cpu_mips_realize_env() out of cpu_mips_init(), Philippe Mathieu-Daudé, 2017/09/20
- [Qemu-devel] [PATCH v4 4/6] mips: call cpu_mips_realize_env() from mips_cpu_realizefn(),
Philippe Mathieu-Daudé <=
- [Qemu-devel] [PATCH v4 2/6] mips: introduce internal.h and cleanup cpu.h, Philippe Mathieu-Daudé, 2017/09/20
- [Qemu-devel] [PATCH v4 5/6] mips: MIPSCPU model subclasses, Philippe Mathieu-Daudé, 2017/09/20
- [Qemu-devel] [PATCH v4 6/6] mips: replace cpu_mips_init() with cpu_generic_init(), Philippe Mathieu-Daudé, 2017/09/20
- Re: [Qemu-devel] [PATCH v4 0/6] QOMify MIPS cpu, no-reply, 2017/09/20