[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 42/80] x86/microvm: use memdev for RAM
From: |
Igor Mammedov |
Subject: |
[PATCH v4 42/80] x86/microvm: use memdev for RAM |
Date: |
Fri, 31 Jan 2020 16:09:12 +0100 |
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 <address@hidden>
---
CC: address@hidden
CC: address@hidden
CC: address@hidden
CC: address@hidden
CC: address@hidden
---
hw/i386/microvm.c | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/hw/i386/microvm.c b/hw/i386/microvm.c
index d234851..38d8e51 100644
--- a/hw/i386/microvm.c
+++ b/hw/i386/microvm.c
@@ -167,7 +167,7 @@ static void microvm_memory_init(MicrovmMachineState *mms)
{
MachineState *machine = MACHINE(mms);
X86MachineState *x86ms = X86_MACHINE(mms);
- MemoryRegion *ram, *ram_below_4g, *ram_above_4g;
+ MemoryRegion *ram_below_4g, *ram_above_4g;
MemoryRegion *system_memory = get_system_memory();
FWCfgState *fw_cfg;
ram_addr_t lowmem;
@@ -214,12 +214,8 @@ static void microvm_memory_init(MicrovmMachineState *mms)
x86ms->below_4g_mem_size = machine->ram_size;
}
- ram = g_malloc(sizeof(*ram));
- memory_region_allocate_system_memory(ram, NULL, "microvm.ram",
- machine->ram_size);
-
ram_below_4g = g_malloc(sizeof(*ram_below_4g));
- memory_region_init_alias(ram_below_4g, NULL, "ram-below-4g", ram,
+ memory_region_init_alias(ram_below_4g, NULL, "ram-below-4g", machine->ram,
0, x86ms->below_4g_mem_size);
memory_region_add_subregion(system_memory, 0, ram_below_4g);
@@ -227,7 +223,8 @@ static void microvm_memory_init(MicrovmMachineState *mms)
if (x86ms->above_4g_mem_size > 0) {
ram_above_4g = g_malloc(sizeof(*ram_above_4g));
- memory_region_init_alias(ram_above_4g, NULL, "ram-above-4g", ram,
+ memory_region_init_alias(ram_above_4g, NULL, "ram-above-4g",
+ machine->ram,
x86ms->below_4g_mem_size,
x86ms->above_4g_mem_size);
memory_region_add_subregion(system_memory, 0x100000000ULL,
@@ -502,6 +499,7 @@ static void microvm_class_init(ObjectClass *oc, void *data)
mc->auto_enable_numa_with_memhp = false;
mc->default_cpu_type = TARGET_DEFAULT_CPU_TYPE;
mc->nvdimm_supported = false;
+ mc->default_ram_id = "microvm.ram";
/* Avoid relying too much on kernel components */
mc->default_kernel_irqchip_split = true;
--
2.7.4
- [PATCH v4 31/80] arm/versatilepb: use memdev for RAM, (continued)
- [PATCH v4 31/80] arm/versatilepb: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 36/80] arm/xlnx-versal-virt: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 35/80] arm/xilinx_zynq: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 37/80] arm/xlnx-zcu102: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 33/80] arm/virt: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 39/80] null-machine: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 34/80] arm/xilinx_zynq: drop RAM size fixup, Igor Mammedov, 2020/01/31
- [PATCH v4 38/80] s390x/s390-virtio-ccw: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 40/80] cris/axis_dev88: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 41/80] hppa: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 42/80] x86/microvm: use memdev for RAM,
Igor Mammedov <=
- [PATCH v4 43/80] x86/pc: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 45/80] lm32/milkymist: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 49/80] m68k/next-cube: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 50/80] mips/boston: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 44/80] lm32/lm32_boards: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 46/80] m68k/an5206: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 47/80] m68k/q800: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 48/80] m68k/mcf5208: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 51/80] mips/mips_fulong2e: drop RAM size fixup, Igor Mammedov, 2020/01/31
- [PATCH v4 55/80] mips/mips_mipssim: use memdev for RAM, Igor Mammedov, 2020/01/31