From: Philippe Mathieu-Daudé <philmd@linaro.org>
Date: Tue, 14 Apr 2026 11:12:16 +0000 (+0200)
Subject: target/riscv: Iterate vCPUs using CPU_FOREACH() macro
X-Git-Tag: v11.1.0-rc0~134^2~14
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ea6904ce603d90f4dcfb12f1ce448ff2d779930b;p=thirdparty%2Fqemu.git

target/riscv: Iterate vCPUs using CPU_FOREACH() macro

Most code iterates over vCPUs using the CPU_FOREACH()
macro. Prefer cpu_env(cpu) over &cpu->env.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com>
Message-Id: <20260415215539.92629-9-philmd@linaro.org>
---

diff --git a/hw/riscv/boot.c b/hw/riscv/boot.c
index 9086793b7a7..ae2f86c7ceb 100644
--- a/hw/riscv/boot.c
+++ b/hw/riscv/boot.c
@@ -505,10 +505,11 @@ void riscv_setup_direct_kernel(hwaddr kernel_addr, hwaddr fdt_addr)
 {
     CPUState *cs;
 
-    for (cs = first_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;
+    CPU_FOREACH(cs) {
+        CPURISCVState *env = cpu_env(cs);
+
+        env->kernel_addr = kernel_addr;
+        env->fdt_addr = fdt_addr;
     }
 }