[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 57/79] mips/mips_r4k: use memdev for RAM
From: |
Igor Mammedov |
Subject: |
[PATCH v5 57/79] mips/mips_r4k: use memdev for RAM |
Date: |
Mon, 17 Feb 2020 12:34: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>
---
hw/mips/mips_r4k.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/hw/mips/mips_r4k.c b/hw/mips/mips_r4k.c
index b2aec434c3..258cd91578 100644
--- a/hw/mips/mips_r4k.c
+++ b/hw/mips/mips_r4k.c
@@ -171,13 +171,11 @@ static const int sector_len = 32 * KiB;
static
void mips_r4k_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 *ram = g_new(MemoryRegion, 1);
MemoryRegion *bios;
MemoryRegion *iomem = g_new(MemoryRegion, 1);
MemoryRegion *isa_io = g_new(MemoryRegion, 1);
@@ -203,14 +201,12 @@ void mips_r4k_init(MachineState *machine)
qemu_register_reset(main_cpu_reset, reset_info);
/* allocate RAM */
- if (ram_size > 256 * MiB) {
+ if (machine->ram_size > 256 * MiB) {
error_report("Too much memory for this machine: %" PRId64 "MB,"
" maximum 256MB", ram_size / MiB);
exit(1);
}
- memory_region_allocate_system_memory(ram, NULL, "mips_r4k.ram", ram_size);
-
- memory_region_add_subregion(address_space_mem, 0, ram);
+ memory_region_add_subregion(address_space_mem, 0, machine->ram);
memory_region_init_io(iomem, NULL, &mips_qemu_ops,
NULL, "mips-qemu", 0x10000);
@@ -261,7 +257,7 @@ void mips_r4k_init(MachineState *machine)
g_free(filename);
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;
@@ -316,7 +312,7 @@ static void mips_machine_init(MachineClass *mc)
#else
mc->default_cpu_type = MIPS_CPU_TYPE_NAME("24Kf");
#endif
-
+ mc->default_ram_id = "mips_r4k.ram";
}
DEFINE_MACHINE("mips", mips_machine_init)
--
2.18.1
- [PATCH v5 52/79] mips/mips_fulong2e: use memdev for RAM, (continued)
- [PATCH v5 52/79] mips/mips_fulong2e: use memdev for RAM, Igor Mammedov, 2020/02/17
- [PATCH v5 51/79] mips/mips_fulong2e: drop RAM size fixup, Igor Mammedov, 2020/02/17
- [PATCH v5 53/79] mips/mips_jazz: use memdev for RAM, Igor Mammedov, 2020/02/17
- [PATCH v5 54/79] mips/mips_jazz: add max ram size check, Igor Mammedov, 2020/02/17
- [PATCH v5 55/79] mips/mips_malta: use memdev for RAM, Igor Mammedov, 2020/02/17
- [PATCH v5 56/79] mips/mips_mipssim: use memdev for RAM, Igor Mammedov, 2020/02/17
- [PATCH v5 58/79] ppc/e500: drop RAM size fixup, Igor Mammedov, 2020/02/17
- [PATCH v5 57/79] mips/mips_r4k: use memdev for RAM,
Igor Mammedov <=
- [PATCH v5 59/79] ppc/e500: use memdev for RAM, Igor Mammedov, 2020/02/17
- [PATCH v5 62/79] ppc/pnv: use memdev for RAM, Igor Mammedov, 2020/02/17
- [PATCH v5 60/79] ppc/mac_newworld: use memdev for RAM, Igor Mammedov, 2020/02/17
- [PATCH v5 61/79] ppc/mac_oldworld: use memdev for RAM, Igor Mammedov, 2020/02/17