diff options
| -rw-r--r-- | target/riscv/cpu.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index 89a1a25812..9f2c8fa7c6 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -1294,13 +1294,6 @@ static void riscv_cpu_realize(DeviceState *dev, Error **errp) return; } - -#ifndef CONFIG_USER_ONLY - if (cpu->cfg.ext_sstc) { - riscv_timer_init(cpu); - } -#endif /* CONFIG_USER_ONLY */ - riscv_cpu_validate_set_extensions(cpu, &local_err); if (local_err != NULL) { error_propagate(errp, local_err); @@ -1308,6 +1301,10 @@ static void riscv_cpu_realize(DeviceState *dev, Error **errp) } #ifndef CONFIG_USER_ONLY + if (cpu->cfg.ext_sstc) { + riscv_timer_init(cpu); + } + if (cpu->cfg.pmu_num) { if (!riscv_pmu_init(cpu, cpu->cfg.pmu_num) && cpu->cfg.ext_sscofpmf) { cpu->pmu_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, |