After guest_timer initialization is added, irq_nr needs to be determined
using cpu_has_lvz(), which relys on CPUCFG LVZ bit. So move it for
preparation.

Signed-off-by: SignKirigami <[email protected]>
Signed-off-by: Hengyu Yu <[email protected]>
---
 target/loongarch/cpu.c | 37 +++++++++++++++----------------------
 1 file changed, 15 insertions(+), 22 deletions(-)

diff --git a/target/loongarch/cpu.c b/target/loongarch/cpu.c
index d8f3af4f31..fc432cfda0 100644
--- a/target/loongarch/cpu.c
+++ b/target/loongarch/cpu.c
@@ -721,6 +721,21 @@ static void loongarch_cpu_realizefn(DeviceState *dev, 
Error **errp)
     CPUState *cs = CPU(dev);
     LoongArchCPUClass *lacc = LOONGARCH_CPU_GET_CLASS(dev);
     Error *local_err = NULL;
+    CPULoongArchState *env = cpu_env(cs);
+
+#ifdef CONFIG_TCG
+    CPUTimerState *timer;
+#endif
+
+    env->irq_nr = N_IRQS;
+    qdev_init_gpio_in(dev, loongarch_cpu_set_irq, env->irq_nr);
+#ifdef CONFIG_TCG
+    timer = env_timer(env);
+    timer->irq = IRQ_TIMER;
+    timer->cs  = cs;
+    timer_init_ns(&timer->timer, QEMU_CLOCK_VIRTUAL,
+                  &cpu_loongarch_timer_cb, timer);
+#endif
 
     cpu_common_realize(cs, &local_err);
     if (local_err != NULL) {
@@ -748,27 +763,6 @@ static void loongarch_cpu_unrealizefn(DeviceState *dev)
     lacc->parent_unrealize(dev);
 }
 
-static void loongarch_cpu_init(Object *obj)
-{
-#ifndef CONFIG_USER_ONLY
-    LoongArchCPU *cpu = LOONGARCH_CPU(obj);
-    CPULoongArchState *env = &cpu->env;
-#ifdef CONFIG_TCG
-    CPUTimerState *timer;
-#endif
-
-    env->irq_nr = N_IRQS;
-    qdev_init_gpio_in(DEVICE(cpu), loongarch_cpu_set_irq, env->irq_nr);
-#ifdef CONFIG_TCG
-    timer = env_timer(env);
-    timer->irq = IRQ_TIMER;
-    timer->cs  = CPU(obj);
-    timer_init_ns(&timer->timer, QEMU_CLOCK_VIRTUAL,
-                  &cpu_loongarch_timer_cb, timer);
-#endif
-#endif
-}
-
 static ObjectClass *loongarch_cpu_class_by_name(const char *cpu_model)
 {
     ObjectClass *oc;
@@ -1002,7 +996,6 @@ static const TypeInfo loongarch_cpu_type_infos[] = {
         .parent = TYPE_CPU,
         .instance_size = sizeof(LoongArchCPU),
         .instance_align = __alignof(LoongArchCPU),
-        .instance_init = loongarch_cpu_init,
 
         .abstract = true,
         .class_size = sizeof(LoongArchCPUClass),
-- 
2.56.0


Reply via email to