On Wed, Jan 15, 2020 at 04:07:24PM +0100, Igor Mammedov wrote: > memory_region_allocate_system_memory() API is going away, so > replace it with memdev allocated MemoryRegion. The later is > initialized by generic code, so board only needs to opt in > to memdev scheme by providing > MachineClass::default_ram_id > and using MachineState::ram instead of manually initializing > RAM memory region. > > Signed-off-by: Igor Mammedov <imamm...@redhat.com>
Acked-by: David Gibson <da...@gibson.dropbear.id.au> > --- > CC: da...@gibson.dropbear.id.au > CC: qemu-...@nongnu.org > --- > hw/ppc/spapr.c | 8 +++----- > 1 file changed, 3 insertions(+), 5 deletions(-) > > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index 30a5fbd..bcbe1f1 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -2587,7 +2587,6 @@ static void spapr_machine_init(MachineState *machine) > PCIHostState *phb; > int i; > MemoryRegion *sysmem = get_system_memory(); > - MemoryRegion *ram = g_new(MemoryRegion, 1); > hwaddr node0_size = spapr_node0_size(machine); > long load_limit, fw_size; > char *filename; > @@ -2766,10 +2765,8 @@ static void spapr_machine_init(MachineState *machine) > kvmppc_enable_h_page_init(); > } > > - /* allocate RAM */ > - memory_region_allocate_system_memory(ram, NULL, "ppc_spapr.ram", > - machine->ram_size); > - memory_region_add_subregion(sysmem, 0, ram); > + /* map RAM */ > + memory_region_add_subregion(sysmem, 0, machine->ram); > > /* always allocate the device memory information */ > machine->device_memory = g_malloc0(sizeof(*machine->device_memory)); > @@ -4344,6 +4341,7 @@ static void spapr_machine_class_init(ObjectClass *oc, > void *data) > mc->no_parallel = 1; > mc->default_boot_order = ""; > mc->default_ram_size = 512 * MiB; > + mc->default_ram_id = "ppc_spapr.ram"; > mc->default_display = "std"; > mc->kvm_type = spapr_kvm_type; > machine_class_allow_dynamic_sysbus_dev(mc, TYPE_SPAPR_PCI_HOST_BRIDGE); -- David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson
signature.asc
Description: PGP signature