rx_gdbsim_init() has access to the single CPU via:

  RxGdbSimMachineState {
    RX62NState {
      RXCPU cpu;
      ...
    } mcu;
  } s;

Directly use that instead of the &first_cpu global.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 hw/rx/rx-gdbsim.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/rx/rx-gdbsim.c b/hw/rx/rx-gdbsim.c
index 02fdbdf824b..88c8f12c101 100644
--- a/hw/rx/rx-gdbsim.c
+++ b/hw/rx/rx-gdbsim.c
@@ -127,7 +127,7 @@ static void rx_gdbsim_init(MachineState *machine)
          * the latter half of the SDRAM space.
          */
         kernel_offset = machine->ram_size / 2;
-        rx_load_image(RX_CPU(first_cpu), kernel_filename,
+        rx_load_image(&s->mcu.cpu, kernel_filename,
                       SDRAM_BASE + kernel_offset, kernel_offset);
         if (dtb_filename) {
             ram_addr_t dtb_offset;
@@ -153,7 +153,7 @@ static void rx_gdbsim_init(MachineState *machine)
             qemu_register_reset_nosnapshotload(qemu_fdt_randomize_seeds,
                                 rom_ptr(SDRAM_BASE + dtb_offset, dtb_size));
             /* Set dtb address to R1 */
-            RX_CPU(first_cpu)->env.regs[1] = SDRAM_BASE + dtb_offset;
+            s->mcu.cpu.env.regs[1] = SDRAM_BASE + dtb_offset;
         }
     }
 }
-- 
2.47.1

On 1/10/25 10:04, Philippe Mathieu-Daudé wrote:
> rx_gdbsim_init() has access to the single CPU via:
> 
>    RxGdbSimMachineState {
>      RX62NState {
>        RXCPU cpu;
>        ...
>      } mcu;
>    } s;
> 
> Directly use that instead of the &first_cpu global.
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

r~

> ---
>   hw/rx/rx-gdbsim.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/hw/rx/rx-gdbsim.c b/hw/rx/rx-gdbsim.c
> index 02fdbdf824b..88c8f12c101 100644
> --- a/hw/rx/rx-gdbsim.c
> +++ b/hw/rx/rx-gdbsim.c
> @@ -127,7 +127,7 @@ static void rx_gdbsim_init(MachineState *machine)
>            * the latter half of the SDRAM space.
>            */
>           kernel_offset = machine->ram_size / 2;
> -        rx_load_image(RX_CPU(first_cpu), kernel_filename,
> +        rx_load_image(&s->mcu.cpu, kernel_filename,
>                         SDRAM_BASE + kernel_offset, kernel_offset);
>           if (dtb_filename) {
>               ram_addr_t dtb_offset;
> @@ -153,7 +153,7 @@ static void rx_gdbsim_init(MachineState *machine)
>               qemu_register_reset_nosnapshotload(qemu_fdt_randomize_seeds,
>                                   rom_ptr(SDRAM_BASE + dtb_offset, dtb_size));
>               /* Set dtb address to R1 */
> -            RX_CPU(first_cpu)->env.regs[1] = SDRAM_BASE + dtb_offset;
> +            s->mcu.cpu.env.regs[1] = SDRAM_BASE + dtb_offset;
>           }
>       }
>   }