On Wed, Jan 15, 2020 at 04:07:16PM +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
Acked-by: David Gibson
> ---
> CC: da...@gibson.dropbear.id.au
> CC: qemu-...@nongnu.org
> CC: mark.cave-ayl...@ilande.co.uk
> ---
> hw/ppc/mac_newworld.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c
> index 3594517..2546d33 100644
> --- a/hw/ppc/mac_newworld.c
> +++ b/hw/ppc/mac_newworld.c
> @@ -118,7 +118,7 @@ static void ppc_core99_init(MachineState *machine)
> char *filename;
> IrqLines *openpic_irqs;
> int linux_boot, i, j, k;
> -MemoryRegion *ram = g_new(MemoryRegion, 1), *bios = g_new(MemoryRegion,
> 1);
> +MemoryRegion *bios = g_new(MemoryRegion, 1);
> hwaddr kernel_base, initrd_base, cmdline_base = 0;
> long kernel_size, initrd_size;
> UNINHostState *uninorth_pci;
> @@ -152,8 +152,7 @@ static void ppc_core99_init(MachineState *machine)
> }
>
> /* allocate RAM */
> -memory_region_allocate_system_memory(ram, NULL, "ppc_core99.ram",
> ram_size);
> -memory_region_add_subregion(get_system_memory(), 0, ram);
> +memory_region_add_subregion(get_system_memory(), 0, machine->ram);
>
> /* allocate and load BIOS */
> memory_region_init_ram(bios, NULL, "ppc_core99.bios", BIOS_SIZE,
> @@ -586,6 +585,7 @@ static void core99_machine_class_init(ObjectClass *oc,
> void *data)
> #else
> mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("7400_v2.9");
> #endif
> +mc->default_ram_id = "ppc_core99.ram";
> mc->ignore_boot_device_suffixes = true;
> fwc->get_dev_path = core99_fw_dev_path;
> }
--
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
