On Thu, Feb 2, 2023 at 2:54 PM Sunil V L <suni...@ventanamicro.com> wrote: > > memmap needs to be exported outside of virt.c so that > modules like acpi can use it. Hence, add a pointer field > in RiscVVirtState structure and initialize it with the > memorymap. > > Signed-off-by: Sunil V L <suni...@ventanamicro.com>
Acked-by: Alistair Francis <alistair.fran...@wdc.com> Alistair > --- > hw/riscv/virt.c | 2 ++ > include/hw/riscv/virt.h | 1 + > 2 files changed, 3 insertions(+) > > diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c > index 84962962ff..26caea59ff 100644 > --- a/hw/riscv/virt.c > +++ b/hw/riscv/virt.c > @@ -1459,6 +1459,8 @@ static void virt_machine_init(MachineState *machine) > ROUND_UP(virt_high_pcie_memmap.base, virt_high_pcie_memmap.size); > } > > + s->memmap = virt_memmap; > + > /* register system main memory (actual RAM) */ > memory_region_add_subregion(system_memory, memmap[VIRT_DRAM].base, > machine->ram); > diff --git a/include/hw/riscv/virt.h b/include/hw/riscv/virt.h > index 62efebaa32..379501edcc 100644 > --- a/include/hw/riscv/virt.h > +++ b/include/hw/riscv/virt.h > @@ -59,6 +59,7 @@ struct RISCVVirtState { > char *oem_id; > char *oem_table_id; > OnOffAuto acpi; > + const MemMapEntry *memmap; > }; > > enum { > -- > 2.38.0 > >