[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v6 56/79] mips/mips_mipssim: use memdev for RAM
From: |
Igor Mammedov |
Subject: |
[PATCH v6 56/79] mips/mips_mipssim: use memdev for RAM |
Date: |
Wed, 19 Feb 2020 11:09:30 -0500 |
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>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Tested-by: Philippe Mathieu-Daudé <address@hidden>
---
hw/mips/mips_mipssim.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/hw/mips/mips_mipssim.c b/hw/mips/mips_mipssim.c
index b934ca9d51..b2555ddb89 100644
--- a/hw/mips/mips_mipssim.c
+++ b/hw/mips/mips_mipssim.c
@@ -143,14 +143,12 @@ static void mipsnet_init(int base, qemu_irq irq, NICInfo
*nd)
static void
mips_mipssim_init(MachineState *machine)
{
- ram_addr_t ram_size = machine->ram_size;
const char *kernel_filename = machine->kernel_filename;
const char *kernel_cmdline = machine->kernel_cmdline;
const char *initrd_filename = machine->initrd_filename;
char *filename;
MemoryRegion *address_space_mem = get_system_memory();
MemoryRegion *isa = g_new(MemoryRegion, 1);
- MemoryRegion *ram = g_new(MemoryRegion, 1);
MemoryRegion *bios = g_new(MemoryRegion, 1);
MIPSCPU *cpu;
CPUMIPSState *env;
@@ -167,13 +165,11 @@ mips_mipssim_init(MachineState *machine)
qemu_register_reset(main_cpu_reset, reset_info);
/* Allocate RAM. */
- memory_region_allocate_system_memory(ram, NULL, "mips_mipssim.ram",
- ram_size);
memory_region_init_ram(bios, NULL, "mips_mipssim.bios", BIOS_SIZE,
&error_fatal);
memory_region_set_readonly(bios, true);
- memory_region_add_subregion(address_space_mem, 0, ram);
+ memory_region_add_subregion(address_space_mem, 0, machine->ram);
/* Map the BIOS / boot exception handler. */
memory_region_add_subregion(address_space_mem, 0x1fc00000LL, bios);
@@ -200,7 +196,7 @@ mips_mipssim_init(MachineState *machine)
}
if (kernel_filename) {
- loaderparams.ram_size = ram_size;
+ loaderparams.ram_size = machine->ram_size;
loaderparams.kernel_filename = kernel_filename;
loaderparams.kernel_cmdline = kernel_cmdline;
loaderparams.initrd_filename = initrd_filename;
@@ -245,6 +241,7 @@ static void mips_mipssim_machine_init(MachineClass *mc)
#else
mc->default_cpu_type = MIPS_CPU_TYPE_NAME("24Kf");
#endif
+ mc->default_ram_id = "mips_mipssim.ram";
}
DEFINE_MACHINE("mipssim", mips_mipssim_machine_init)
--
2.18.1
- [PATCH v6 45/79] lm32/milkymist: use memdev for RAM, (continued)
- [PATCH v6 45/79] lm32/milkymist: use memdev for RAM, Igor Mammedov, 2020/02/19
- [PATCH v6 44/79] lm32/lm32_boards: use memdev for RAM, Igor Mammedov, 2020/02/19
- [PATCH v6 48/79] m68k/mcf5208: use memdev for RAM, Igor Mammedov, 2020/02/19
- [PATCH v6 47/79] m68k/q800: use memdev for RAM, Igor Mammedov, 2020/02/19
- [PATCH v6 41/79] hppa: use memdev for RAM, Igor Mammedov, 2020/02/19
- [PATCH v6 50/79] mips/boston: use memdev for RAM, Igor Mammedov, 2020/02/19
- [PATCH v6 49/79] m68k/next-cube: use memdev for RAM, Igor Mammedov, 2020/02/19
- [PATCH v6 53/79] mips/mips_jazz: use memdev for RAM, Igor Mammedov, 2020/02/19
- [PATCH v6 51/79] mips/mips_fulong2e: drop RAM size fixup, Igor Mammedov, 2020/02/19
- [PATCH v6 55/79] mips/mips_malta: use memdev for RAM, Igor Mammedov, 2020/02/19
- [PATCH v6 56/79] mips/mips_mipssim: use memdev for RAM,
Igor Mammedov <=
- [PATCH v6 54/79] mips/mips_jazz: add max ram size check, Igor Mammedov, 2020/02/19
- [PATCH v6 59/79] ppc/e500: use memdev for RAM, Igor Mammedov, 2020/02/19
- [PATCH v6 61/79] ppc/mac_oldworld: use memdev for RAM, Igor Mammedov, 2020/02/19
- [PATCH v6 57/79] mips/mips_r4k: use memdev for RAM, Igor Mammedov, 2020/02/19
- [PATCH v6 58/79] ppc/e500: drop RAM size fixup, Igor Mammedov, 2020/02/19
- [PATCH v6 52/79] mips/mips_fulong2e: use memdev for RAM, Igor Mammedov, 2020/02/19
- [PATCH v6 63/79] ppc/ppc405_boards: add RAM size checks, Igor Mammedov, 2020/02/19
- [PATCH v6 67/79] ppc/spapr: use memdev for RAM, Igor Mammedov, 2020/02/19
- [PATCH v6 65/79] ppc/{ppc440_bamboo, sam460ex}: drop RAM size fixup, Igor Mammedov, 2020/02/19
- [PATCH v6 66/79] ppc/{ppc440_bamboo, sam460ex}: use memdev for RAM, Igor Mammedov, 2020/02/19