[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 053/136] mips/mips_jazz: use memdev for RAM
From: |
Paolo Bonzini |
Subject: |
[PULL 053/136] mips/mips_jazz: use memdev for RAM |
Date: |
Tue, 25 Feb 2020 12:49:43 +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: 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 = {
--
1.8.3.1
- [PULL 050/136] mips/boston: use memdev for RAM, (continued)
- [PULL 050/136] mips/boston: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 056/136] mips/mips_mipssim: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 055/136] mips/mips_malta: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 054/136] mips/mips_jazz: add max ram size check, Paolo Bonzini, 2020/02/25
- [PULL 052/136] mips/mips_fulong2e: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 057/136] mips/mips_r4k: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 051/136] mips/mips_fulong2e: drop RAM size fixup, Paolo Bonzini, 2020/02/25
- [PULL 067/136] ppc/spapr: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 064/136] ppc/ppc405_boards: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 049/136] m68k/next-cube: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 053/136] mips/mips_jazz: use memdev for RAM,
Paolo Bonzini <=
- [PULL 059/136] ppc/e500: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 063/136] ppc/ppc405_boards: add RAM size checks, Paolo Bonzini, 2020/02/25
- [PULL 062/136] ppc/pnv: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 058/136] ppc/e500: drop RAM size fixup, Paolo Bonzini, 2020/02/25
- [PULL 065/136] ppc/{ppc440_bamboo, sam460ex}: drop RAM size fixup, Paolo Bonzini, 2020/02/25
- [PULL 066/136] ppc/{ppc440_bamboo, sam460ex}: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 061/136] ppc/mac_oldworld: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 060/136] ppc/mac_newworld: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 071/136] sparc/niagara: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 069/136] sparc/leon3: use memdev for RAM, Paolo Bonzini, 2020/02/25