diff options
| author | Daniel Henrique Barboza <dbarboza@ventanamicro.com> | 2025-04-29 09:58:06 -0300 |
|---|---|---|
| committer | Alistair Francis <alistair.francis@wdc.com> | 2025-05-19 13:42:56 +1000 |
| commit | 6418ff383d53e5872f2746d490885f0a551385a4 (patch) | |
| tree | 3f8567fd486a1c5fb15b4946f2c9d1bac5ca629e | |
| parent | 47e51e5d12740ebdcd797e4771b467ba8c2aba82 (diff) | |
| download | qemu-6418ff383d53e5872f2746d490885f0a551385a4.zip qemu-6418ff383d53e5872f2746d490885f0a551385a4.tar.gz qemu-6418ff383d53e5872f2746d490885f0a551385a4.tar.bz2 | |
hw/riscv/virt.c: add 'base' arg in create_fw_cfg()
The function can receive the value via s->memmap[VIRT_FW_CFG].base from
the caller, avoiding the use of virt_memmap.
Signed-off-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Message-ID: <20250429125811.224803-5-dbarboza@ventanamicro.com>
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
| -rw-r--r-- | hw/riscv/virt.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index b349b2b..3d547f7 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -1262,9 +1262,8 @@ static inline DeviceState *gpex_pcie_init(MemoryRegion *sys_mem, return dev; } -static FWCfgState *create_fw_cfg(const MachineState *ms) +static FWCfgState *create_fw_cfg(const MachineState *ms, hwaddr base) { - hwaddr base = virt_memmap[VIRT_FW_CFG].base; FWCfgState *fw_cfg; fw_cfg = fw_cfg_init_mem_wide(base + 8, base, 8, base + 16, @@ -1677,7 +1676,7 @@ static void virt_machine_init(MachineState *machine) * Init fw_cfg. Must be done before riscv_load_fdt, otherwise the * device tree cannot be altered and we get FDT_ERR_NOSPACE. */ - s->fw_cfg = create_fw_cfg(machine); + s->fw_cfg = create_fw_cfg(machine, s->memmap[VIRT_FW_CFG].base); rom_set_fw(s->fw_cfg); /* SiFive Test MMIO device */ |