mirror of
https://github.com/xemu-project/xemu.git
synced 2024-11-27 21:40:49 +00:00
ppc/pnv: use memdev for RAM
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 <imammedo@redhat.com> Acked-by: David Gibson <david@gibson.dropbear.id.au> Reviewed-by: Cédric Le Goater <clg@kaod.org> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Message-Id: <20200219160953.13771-63-imammedo@redhat.com>
This commit is contained in:
parent
8ee06e4ccb
commit
173a36d8d1
@ -690,7 +690,6 @@ static void pnv_init(MachineState *machine)
|
||||
{
|
||||
PnvMachineState *pnv = PNV_MACHINE(machine);
|
||||
MachineClass *mc = MACHINE_GET_CLASS(machine);
|
||||
MemoryRegion *ram;
|
||||
char *fw_filename;
|
||||
long fw_size;
|
||||
int i;
|
||||
@ -702,11 +701,7 @@ static void pnv_init(MachineState *machine)
|
||||
if (machine->ram_size < (1 * GiB)) {
|
||||
warn_report("skiboot may not work with < 1GB of RAM");
|
||||
}
|
||||
|
||||
ram = g_new(MemoryRegion, 1);
|
||||
memory_region_allocate_system_memory(ram, NULL, "pnv.ram",
|
||||
machine->ram_size);
|
||||
memory_region_add_subregion(get_system_memory(), 0, ram);
|
||||
memory_region_add_subregion(get_system_memory(), 0, machine->ram);
|
||||
|
||||
/*
|
||||
* Create our simple PNOR device
|
||||
@ -1976,6 +1971,7 @@ static void pnv_machine_class_init(ObjectClass *oc, void *data)
|
||||
* enough to fit the maximum initrd size at it's load address
|
||||
*/
|
||||
mc->default_ram_size = INITRD_LOAD_ADDR + INITRD_MAX_SIZE;
|
||||
mc->default_ram_id = "pnv.ram";
|
||||
ispc->print_info = pnv_pic_print_info;
|
||||
|
||||
object_class_property_add_bool(oc, "hb-mode",
|
||||
|
Loading…
Reference in New Issue
Block a user