[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 033/136] arm/virt: use memdev for RAM
From: |
Paolo Bonzini |
Subject: |
[PULL 033/136] arm/virt: use memdev for RAM |
Date: |
Tue, 25 Feb 2020 12:49:23 +0100 |
From: Igor Mammedov <address@hidden>
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 <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Tested-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Andrew Jones <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
Message-Id: <address@hidden>
---
hw/arm/virt.c | 7 +++----
1 file 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)
--
1.8.3.1
- [PULL 021/136] arm/mcimx7d-sabre: use memdev for RAM, (continued)
- [PULL 021/136] arm/mcimx7d-sabre: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 028/136] arm/sabrelite: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 032/136] arm/vexpress: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 026/136] arm/omap_sx1: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 031/136] arm/versatilepb: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 029/136] arm/raspi: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 035/136] arm/xilinx_zynq: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 039/136] null-machine: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 034/136] arm/xilinx_zynq: drop RAM size fixup, Paolo Bonzini, 2020/02/25
- [PULL 038/136] s390x/s390-virtio-ccw: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 033/136] arm/virt: use memdev for RAM,
Paolo Bonzini <=
- [PULL 030/136] arm/sbsa-ref: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 042/136] x86/microvm: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 044/136] lm32/lm32_boards: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 037/136] arm/xlnx-zcu102: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 041/136] hppa: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 043/136] x86/pc: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 036/136] arm/xlnx-versal-virt: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 040/136] cris/axis_dev88: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 046/136] m68k/an5206: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 045/136] lm32/milkymist: use memdev for RAM, Paolo Bonzini, 2020/02/25