[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 040/136] cris/axis_dev88: use memdev for RAM
From: |
Paolo Bonzini |
Subject: |
[PULL 040/136] cris/axis_dev88: use memdev for RAM |
Date: |
Tue, 25 Feb 2020 12:49:30 +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>
Reviewed-by: Richard Henderson <address@hidden>
Message-Id: <address@hidden>
---
hw/cris/axis_dev88.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/hw/cris/axis_dev88.c b/hw/cris/axis_dev88.c
index be77604..cf6790f 100644
--- a/hw/cris/axis_dev88.c
+++ b/hw/cris/axis_dev88.c
@@ -249,7 +249,6 @@ static struct cris_load_info li;
static
void axisdev88_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;
CRISCPU *cpu;
@@ -261,16 +260,12 @@ void axisdev88_init(MachineState *machine)
struct etraxfs_dma_client *dma_eth;
int i;
MemoryRegion *address_space_mem = get_system_memory();
- MemoryRegion *phys_ram = g_new(MemoryRegion, 1);
MemoryRegion *phys_intmem = g_new(MemoryRegion, 1);
/* init CPUs */
cpu = CRIS_CPU(cpu_create(machine->cpu_type));
- /* allocate RAM */
- memory_region_allocate_system_memory(phys_ram, NULL, "axisdev88.ram",
- ram_size);
- memory_region_add_subregion(address_space_mem, 0x40000000, phys_ram);
+ memory_region_add_subregion(address_space_mem, 0x40000000, machine->ram);
/* The ETRAX-FS has 128Kb on chip ram, the docs refer to it as the
internal memory. */
@@ -351,6 +346,7 @@ static void axisdev88_machine_init(MachineClass *mc)
mc->init = axisdev88_init;
mc->is_default = 1;
mc->default_cpu_type = CRIS_CPU_TYPE_NAME("crisv32");
+ mc->default_ram_id = "axisdev88.ram";
}
DEFINE_MACHINE("axis-dev88", axisdev88_machine_init)
--
1.8.3.1
- [PULL 034/136] arm/xilinx_zynq: drop RAM size fixup, (continued)
- [PULL 034/136] arm/xilinx_zynq: drop RAM size fixup, Paolo Bonzini, 2020/02/25
- [PULL 038/136] s390x/s390-virtio-ccw: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 033/136] arm/virt: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 030/136] arm/sbsa-ref: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 042/136] x86/microvm: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 044/136] lm32/lm32_boards: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 037/136] arm/xlnx-zcu102: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 041/136] hppa: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 043/136] x86/pc: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 036/136] arm/xlnx-versal-virt: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 040/136] cris/axis_dev88: use memdev for RAM,
Paolo Bonzini <=
- [PULL 046/136] m68k/an5206: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 045/136] lm32/milkymist: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 048/136] m68k/mcf5208: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 047/136] m68k/q800: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [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