On Tue, Apr 29, 2025 at 10:59 PM Daniel Henrique Barboza
<dbarb...@ventanamicro.com> wrote:
>
> Signed-off-by: Daniel Henrique Barboza <dbarb...@ventanamicro.com>
Reviewed-by: Alistair Francis <alistair.fran...@wdc.com>
Alistair
> ---
> hw/riscv/virt.c | 15 +++++++--------
> 1 file changed, 7 insertions(+), 8 deletions(-)
>
> diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c
> index b4a6916abb..f324777161 100644
> --- a/hw/riscv/virt.c
> +++ b/hw/riscv/virt.c
> @@ -1429,9 +1429,8 @@ static void virt_machine_done(Notifier *notifier, void
> *data)
> {
> RISCVVirtState *s = container_of(notifier, RISCVVirtState,
> machine_done);
> - const MemMapEntry *memmap = virt_memmap;
> MachineState *machine = MACHINE(s);
> - hwaddr start_addr = memmap[VIRT_DRAM].base;
> + hwaddr start_addr = s->memmap[VIRT_DRAM].base;
> target_ulong firmware_end_addr, kernel_start_addr;
> const char *firmware_name = riscv_default_firmware_name(&s->soc[0]);
> uint64_t fdt_load_addr;
> @@ -1475,14 +1474,14 @@ static void virt_machine_done(Notifier *notifier,
> void *data)
> * let's overwrite the address we jump to after reset to
> * the base of the flash.
> */
> - start_addr = virt_memmap[VIRT_FLASH].base;
> + start_addr = s->memmap[VIRT_FLASH].base;
> } else {
> /*
> * Pflash was supplied but either KVM guest or bios is not none.
> * In this case, base of the flash would contain S-mode payload.
> */
> riscv_setup_firmware_boot(machine);
> - kernel_entry = virt_memmap[VIRT_FLASH].base;
> + kernel_entry = s->memmap[VIRT_FLASH].base;
> }
> }
>
> @@ -1496,15 +1495,15 @@ static void virt_machine_done(Notifier *notifier,
> void *data)
> kernel_entry = boot_info.image_low_addr;
> }
>
> - fdt_load_addr = riscv_compute_fdt_addr(memmap[VIRT_DRAM].base,
> - memmap[VIRT_DRAM].size,
> + fdt_load_addr = riscv_compute_fdt_addr(s->memmap[VIRT_DRAM].base,
> + s->memmap[VIRT_DRAM].size,
> machine, &boot_info);
> riscv_load_fdt(fdt_load_addr, machine->fdt);
>
> /* load the reset vector */
> riscv_setup_rom_reset_vec(machine, &s->soc[0], start_addr,
> - virt_memmap[VIRT_MROM].base,
> - virt_memmap[VIRT_MROM].size, kernel_entry,
> + s->memmap[VIRT_MROM].base,
> + s->memmap[VIRT_MROM].size, kernel_entry,
> fdt_load_addr);
>
> /*
> --
> 2.49.0
>
>
