@@ -437,7 +437,7 @@ void riscv_setup_direct_kernel(hwaddr kernel_addr, hwaddr fdt_addr)
{
CPUState *cs;
- for (cs = first_cpu; cs; cs = CPU_NEXT(cs)) {
+ for (cs = qemu_get_cpu(0, TYPE_RISCV_CPU); cs; cs = CPU_NEXT(cs)) {
RISCVCPU *riscv_cpu = RISCV_CPU(cs);
riscv_cpu->env.kernel_addr = kernel_addr;
riscv_cpu->env.fdt_addr = fdt_addr;
@@ -167,10 +167,10 @@ int cpu_get_dump_info(ArchDumpInfo *info,
RISCVCPU *cpu;
CPURISCVState *env;
- if (first_cpu == NULL) {
+ if (qemu_get_cpu(0, TYPE_RISCV_CPU) == NULL) {
return -1;
}
- cpu = RISCV_CPU(first_cpu);
+ cpu = RISCV_CPU(qemu_get_cpu(0, TYPE_RISCV_CPU));
env = &cpu->env;
info->d_machine = EM_RISCV;
Mechanical change using the following coccinelle script: @@ @@ - first_cpu + qemu_get_cpu(0, TYPE_RISCV_CPU) Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- hw/riscv/boot.c | 2 +- target/riscv/arch_dump.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)