arm/sbsa-ref: 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> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Message-Id: <20200219160953.13771-31-imammedo@redhat.com>
This commit is contained in:
parent
a4317ae8ba
commit
3818ed92dc
@ -593,7 +593,6 @@ static void sbsa_ref_init(MachineState *machine)
|
||||
MachineClass *mc = MACHINE_GET_CLASS(machine);
|
||||
MemoryRegion *sysmem = get_system_memory();
|
||||
MemoryRegion *secure_sysmem = g_new(MemoryRegion, 1);
|
||||
MemoryRegion *ram = g_new(MemoryRegion, 1);
|
||||
bool firmware_loaded;
|
||||
const CPUArchIdList *possible_cpus;
|
||||
int n, sbsa_max_cpus;
|
||||
@ -685,9 +684,8 @@ static void sbsa_ref_init(MachineState *machine)
|
||||
object_unref(cpuobj);
|
||||
}
|
||||
|
||||
memory_region_allocate_system_memory(ram, NULL, "sbsa-ref.ram",
|
||||
machine->ram_size);
|
||||
memory_region_add_subregion(sysmem, sbsa_ref_memmap[SBSA_MEM].base, ram);
|
||||
memory_region_add_subregion(sysmem, sbsa_ref_memmap[SBSA_MEM].base,
|
||||
machine->ram);
|
||||
|
||||
create_fdt(sms);
|
||||
|
||||
@ -785,6 +783,7 @@ static void sbsa_ref_class_init(ObjectClass *oc, void *data)
|
||||
mc->block_default_type = IF_IDE;
|
||||
mc->no_cdrom = 1;
|
||||
mc->default_ram_size = 1 * GiB;
|
||||
mc->default_ram_id = "sbsa-ref.ram";
|
||||
mc->default_cpus = 4;
|
||||
mc->possible_cpu_arch_ids = sbsa_ref_possible_cpu_arch_ids;
|
||||
mc->cpu_index_to_instance_props = sbsa_ref_cpu_index_to_props;
|
||||
|
Loading…
Reference in New Issue
Block a user