[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 51/86] m68k:next-cube: use memdev for RAM
From: |
Igor Mammedov |
Subject: |
[PATCH v2 51/86] m68k:next-cube: use memdev for RAM |
Date: |
Wed, 15 Jan 2020 16:07:06 +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>
Acked-by: Thomas Huth <address@hidden>
---
hw/m68k/next-cube.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/hw/m68k/next-cube.c b/hw/m68k/next-cube.c
index e534334..cd93d9e 100644
--- a/hw/m68k/next-cube.c
+++ b/hw/m68k/next-cube.c
@@ -860,7 +860,6 @@ static void next_cube_init(MachineState *machine)
{
M68kCPU *cpu;
CPUM68KState *env;
- MemoryRegion *ram = g_new(MemoryRegion, 1);
MemoryRegion *rom = g_new(MemoryRegion, 1);
MemoryRegion *mmiomem = g_new(MemoryRegion, 1);
MemoryRegion *scrmem = g_new(MemoryRegion, 1);
@@ -893,8 +892,7 @@ static void next_cube_init(MachineState *machine)
memcpy(ns->rtc.ram, rtc_ram2, 32);
/* 64MB RAM starting at 0x04000000 */
- memory_region_allocate_system_memory(ram, NULL, "next.ram", ram_size);
- memory_region_add_subregion(sysmem, 0x04000000, ram);
+ memory_region_add_subregion(sysmem, 0x04000000, machine->ram);
/* Framebuffer */
dev = qdev_create(NULL, TYPE_NEXTFB);
@@ -967,6 +965,7 @@ static void next_machine_class_init(ObjectClass *oc, void
*data)
mc->desc = "NeXT Cube";
mc->init = next_cube_init;
mc->default_ram_size = RAM_SIZE;
+ mc->default_ram_id = "next.ram";
mc->default_cpu_type = M68K_CPU_TYPE_NAME("m68040");
}
--
2.7.4
- [PATCH v2 41/86] hw/hppa/machine: Correctly check the firmware is in PDC range, (continued)
- [PATCH v2 46/86] x86:pc: use memdev for RAM, Igor Mammedov, 2020/01/15
- [PATCH v2 47/86] lm32:lm32_boards: use memdev for RAM, Igor Mammedov, 2020/01/15
- [PATCH v2 49/86] m68k:an5206: use memdev for RAM, Igor Mammedov, 2020/01/15
- [PATCH v2 48/86] lm32:milkymist: use memdev for RAM, Igor Mammedov, 2020/01/15
- [PATCH v2 50/86] m68k:mcf5208: use memdev for RAM, Igor Mammedov, 2020/01/15
- [PATCH v2 51/86] m68k:next-cube: use memdev for RAM,
Igor Mammedov <=
- [PATCH v2 52/86] mips:boston-cube: use memdev for RAM, Igor Mammedov, 2020/01/15
- [PATCH v2 53/86] mips:mips_fulong2e: drop RAM size fixup, Igor Mammedov, 2020/01/15
- [PATCH v2 55/86] mips:mips_jazz: use memdev for RAM, Igor Mammedov, 2020/01/15
- [PATCH v2 54/86] mips:mips_fulong2e: use memdev for RAM, Igor Mammedov, 2020/01/15
- [PATCH v2 56/86] mips:mips_malta: use memdev for RAM, Igor Mammedov, 2020/01/15
- [PATCH v2 57/86] mips:mips_mipssim: use memdev for RAM, Igor Mammedov, 2020/01/15
- [PATCH v2 59/86] ppc:e500: drop RAM size fixup, Igor Mammedov, 2020/01/15