diff options
| author | Igor Mammedov <imammedo@redhat.com> | 2020-02-19 11:09:07 -0500 |
|---|---|---|
| committer | Patchew Importer <importer@patchew.org> | 2020-02-19 16:49:57 +0000 |
| commit | a72f6805f30ceeb635d0fb04b3125d453f1045e8 (patch) | |
| tree | 7558686a28c100f2ca1014009247e93921cc2c12 /hw | |
| parent | 08b8ba04c9d018fbbd64121da70ac9c68529cca0 (diff) | |
| download | qemu-a72f6805f30ceeb635d0fb04b3125d453f1045e8.zip qemu-a72f6805f30ceeb635d0fb04b3125d453f1045e8.tar.gz qemu-a72f6805f30ceeb635d0fb04b3125d453f1045e8.tar.bz2 | |
arm/virt: 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 then map memory region provided by
MachineState::ram_memdev
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Andrew Jones <drjones@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20200219160953.13771-34-imammedo@redhat.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/arm/virt.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/hw/arm/virt.c b/hw/arm/virt.c index f788fe2..e591a12 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1512,7 +1512,6 @@ static void machvirt_init(MachineState *machine) MemoryRegion *sysmem = get_system_memory(); MemoryRegion *secure_sysmem = NULL; int n, virt_max_cpus; - MemoryRegion *ram = g_new(MemoryRegion, 1); bool firmware_loaded; bool aarch64 = true; bool has_ged = !vmc->no_ged; @@ -1706,9 +1705,8 @@ static void machvirt_init(MachineState *machine) } } - memory_region_allocate_system_memory(ram, NULL, "mach-virt.ram", - machine->ram_size); - memory_region_add_subregion(sysmem, vms->memmap[VIRT_MEM].base, ram); + memory_region_add_subregion(sysmem, vms->memmap[VIRT_MEM].base, + machine->ram); if (machine->device_memory) { memory_region_add_subregion(sysmem, machine->device_memory->base, &machine->device_memory->mr); @@ -2058,6 +2056,7 @@ static void virt_machine_class_init(ObjectClass *oc, void *data) hc->unplug_request = virt_machine_device_unplug_request_cb; mc->numa_mem_supported = true; mc->auto_enable_numa_with_memhp = true; + mc->default_ram_id = "mach-virt.ram"; } static void virt_instance_init(Object *obj) |