[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v2 4/7] mips/mips_jazz: use memdev for RAM
From: |
Aleksandar Markovic |
Subject: |
[PULL v2 4/7] mips/mips_jazz: use memdev for RAM |
Date: |
Fri, 24 Jan 2020 19:07:46 +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 using MachineState::ram instead of manually initializing
RAM memory region.
Signed-off-by: Aleksandar Markovic <address@hidden>
Signed-off-by: Igor Mammedov <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
---
hw/mips/mips_jazz.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/hw/mips/mips_jazz.c b/hw/mips/mips_jazz.c
index 66fd4d8..85d49cf 100644
--- a/hw/mips/mips_jazz.c
+++ b/hw/mips/mips_jazz.c
@@ -159,7 +159,6 @@ static void mips_jazz_init(MachineState *machine,
ISABus *isa_bus;
ISADevice *pit;
DriveInfo *fds[MAX_FD];
- MemoryRegion *ram = g_new(MemoryRegion, 1);
MemoryRegion *bios = g_new(MemoryRegion, 1);
MemoryRegion *bios2 = g_new(MemoryRegion, 1);
SysBusESPState *sysbus_esp;
@@ -191,9 +190,7 @@ static void mips_jazz_init(MachineState *machine,
cc->do_transaction_failed = mips_jazz_do_transaction_failed;
/* allocate RAM */
- memory_region_allocate_system_memory(ram, NULL, "mips_jazz.ram",
- machine->ram_size);
- memory_region_add_subregion(address_space, 0, ram);
+ memory_region_add_subregion(address_space, 0, machine->ram);
memory_region_init_ram(bios, NULL, "mips_jazz.bios", MAGNUM_BIOS_SIZE,
&error_fatal);
@@ -393,6 +390,7 @@ static void mips_magnum_class_init(ObjectClass *oc, void
*data)
mc->init = mips_magnum_init;
mc->block_default_type = IF_SCSI;
mc->default_cpu_type = MIPS_CPU_TYPE_NAME("R4000");
+ mc->default_ram_id = "mips_jazz.ram";
}
static const TypeInfo mips_magnum_type = {
@@ -409,6 +407,7 @@ static void mips_pica61_class_init(ObjectClass *oc, void
*data)
mc->init = mips_pica61_init;
mc->block_default_type = IF_SCSI;
mc->default_cpu_type = MIPS_CPU_TYPE_NAME("R4000");
+ mc->default_ram_id = "mips_jazz.ram";
}
static const TypeInfo mips_pica61_type = {
--
2.7.4
- [PULL v2 0/7] MIPS queue for Jan 24th, 2020, Aleksandar Markovic, 2020/01/24
- [PULL v2 4/7] mips/mips_jazz: use memdev for RAM,
Aleksandar Markovic <=
- [PULL v2 6/7] mips/mips_mipssim: use memdev for RAM, Aleksandar Markovic, 2020/01/24
- [PULL v2 2/7] disas: Add a field for target-dependant data, Aleksandar Markovic, 2020/01/24
- [PULL v2 3/7] mips-semi.c: remove 'uhi_done' label in helper_do_semihosting(), Aleksandar Markovic, 2020/01/24
- [PULL v2 7/7] mips/mips_r4k: use memdev for RAM, Aleksandar Markovic, 2020/01/24
- [PULL v2 1/7] target/mips: Rectify documentation on deprecating r4k machine, Aleksandar Markovic, 2020/01/24
- [PULL v2 5/7] mips/mips_malta: use memdev for RAM, Aleksandar Markovic, 2020/01/24
- Re: [PULL v2 0/7] MIPS queue for Jan 24th, 2020, Peter Maydell, 2020/01/24