Signed-off-by: Philippe Mathieu-Daudé <phi...@redhat.com> --- hw/ppc/e500.c | 3 ++- hw/ppc/mac_newworld.c | 3 ++- hw/ppc/mac_oldworld.c | 2 +- hw/ppc/pnv.c | 2 +- hw/ppc/ppc405_boards.c | 6 +++--- hw/ppc/prep.c | 3 ++- hw/ppc/spapr.c | 2 +- hw/ppc/virtex_ml507.c | 2 +- 8 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c index 91cd4c26f9..9c7be26248 100644 --- a/hw/ppc/e500.c +++ b/hw/ppc/e500.c @@ -912,7 +912,8 @@ void ppce500_init(MachineState *machine) machine->ram_size = ram_size; /* Register Memory */ - memory_region_allocate_system_memory(ram, NULL, "mpc8544ds.ram", ram_size); + memory_region_allocate_system_memory(ram, machine, "mpc8544ds.ram", + ram_size); memory_region_add_subregion(address_space_mem, 0, ram); dev = qdev_create(NULL, "e500-ccsr"); diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c index c5bbcc7433..8409114eed 100644 --- a/hw/ppc/mac_newworld.c +++ b/hw/ppc/mac_newworld.c @@ -152,7 +152,8 @@ static void ppc_core99_init(MachineState *machine) } /* allocate RAM */ - memory_region_allocate_system_memory(ram, NULL, "ppc_core99.ram", ram_size); + memory_region_allocate_system_memory(ram, machine, "ppc_core99.ram", + ram_size); memory_region_add_subregion(get_system_memory(), 0, ram); /* allocate and load BIOS */ diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c index 0fa680b749..9dd645476a 100644 --- a/hw/ppc/mac_oldworld.c +++ b/hw/ppc/mac_oldworld.c @@ -127,7 +127,7 @@ static void ppc_heathrow_init(MachineState *machine) exit(1); } - memory_region_allocate_system_memory(ram, NULL, "ppc_heathrow.ram", + memory_region_allocate_system_memory(ram, machine, "ppc_heathrow.ram", ram_size); memory_region_add_subregion(sysmem, 0, ram); diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c index 7cf64b6d25..ac731c4f88 100644 --- a/hw/ppc/pnv.c +++ b/hw/ppc/pnv.c @@ -640,7 +640,7 @@ static void pnv_init(MachineState *machine) } ram = g_new(MemoryRegion, 1); - memory_region_allocate_system_memory(ram, NULL, "pnv.ram", + memory_region_allocate_system_memory(ram, machine, "pnv.ram", machine->ram_size); memory_region_add_subregion(get_system_memory(), 0, ram); diff --git a/hw/ppc/ppc405_boards.c b/hw/ppc/ppc405_boards.c index 388cae0b43..8a2d2f4511 100644 --- a/hw/ppc/ppc405_boards.c +++ b/hw/ppc/ppc405_boards.c @@ -162,8 +162,8 @@ static void ref405ep_init(MachineState *machine) MemoryRegion *sysmem = get_system_memory(); /* XXX: fix this */ - memory_region_allocate_system_memory(&ram_memories[0], NULL, "ef405ep.ram", - 0x08000000); + memory_region_allocate_system_memory(&ram_memories[0], machine, + "ef405ep.ram", 128 * MiB); ram_bases[0] = 0; ram_sizes[0] = 0x08000000; memory_region_init(&ram_memories[1], NULL, "ef405ep.ram1", 0); @@ -427,7 +427,7 @@ static void taihu_405ep_init(MachineState *machine) /* RAM is soldered to the board so the size cannot be changed */ ram_size = 0x08000000; - memory_region_allocate_system_memory(ram, NULL, "taihu_405ep.ram", + memory_region_allocate_system_memory(ram, machine, "taihu_405ep.ram", ram_size); ram_bases[0] = 0; diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c index 4f3c6bf190..54b00805e0 100644 --- a/hw/ppc/prep.c +++ b/hw/ppc/prep.c @@ -445,7 +445,8 @@ static void ppc_prep_init(MachineState *machine) } /* allocate RAM */ - memory_region_allocate_system_memory(ram, NULL, "ppc_prep.ram", ram_size); + memory_region_allocate_system_memory(ram, machine, "ppc_prep.ram", + ram_size); memory_region_add_subregion(sysmem, 0, ram); if (linux_boot) { diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 4eb97d3a9b..1f168edd43 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -2840,7 +2840,7 @@ static void spapr_machine_init(MachineState *machine) } /* allocate RAM */ - memory_region_allocate_system_memory(ram, NULL, "ppc_spapr.ram", + memory_region_allocate_system_memory(ram, machine, "ppc_spapr.ram", machine->ram_size); memory_region_add_subregion(sysmem, 0, ram); diff --git a/hw/ppc/virtex_ml507.c b/hw/ppc/virtex_ml507.c index 68625522d8..86c9273dc0 100644 --- a/hw/ppc/virtex_ml507.c +++ b/hw/ppc/virtex_ml507.c @@ -224,7 +224,7 @@ static void virtex_init(MachineState *machine) qemu_register_reset(main_cpu_reset, cpu); - memory_region_allocate_system_memory(phys_ram, NULL, "ram", ram_size); + memory_region_allocate_system_memory(phys_ram, machine, "ram", ram_size); memory_region_add_subregion(address_space_mem, ram_base, phys_ram); dinfo = drive_get(IF_PFLASH, 0, 0); -- 2.21.0