[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 037/136] arm/xlnx-zcu102: use memdev for RAM
From: |
Paolo Bonzini |
Subject: |
[PULL 037/136] arm/xlnx-zcu102: use memdev for RAM |
Date: |
Tue, 25 Feb 2020 12:49:27 +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: Alistair Francis <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
Message-Id: <address@hidden>
---
hw/arm/xlnx-zcu102.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/hw/arm/xlnx-zcu102.c b/hw/arm/xlnx-zcu102.c
index 53cfe7c..bd645ad 100644
--- a/hw/arm/xlnx-zcu102.c
+++ b/hw/arm/xlnx-zcu102.c
@@ -28,7 +28,6 @@ typedef struct XlnxZCU102 {
MachineState parent_obj;
XlnxZynqMPState soc;
- MemoryRegion ddr_ram;
bool secure;
bool virt;
@@ -87,13 +86,10 @@ static void xlnx_zcu102_init(MachineState *machine)
ram_size);
}
- memory_region_allocate_system_memory(&s->ddr_ram, NULL, "ddr-ram",
- ram_size);
-
object_initialize_child(OBJECT(machine), "soc", &s->soc, sizeof(s->soc),
TYPE_XLNX_ZYNQMP, &error_abort, NULL);
- object_property_set_link(OBJECT(&s->soc), OBJECT(&s->ddr_ram),
+ object_property_set_link(OBJECT(&s->soc), OBJECT(machine->ram),
"ddr-ram", &error_abort);
object_property_set_bool(OBJECT(&s->soc), s->secure, "secure",
&error_fatal);
@@ -211,6 +207,7 @@ static void xlnx_zcu102_machine_class_init(ObjectClass *oc,
void *data)
mc->ignore_memory_transaction_failures = true;
mc->max_cpus = XLNX_ZYNQMP_NUM_APU_CPUS + XLNX_ZYNQMP_NUM_RPU_CPUS;
mc->default_cpus = XLNX_ZYNQMP_NUM_APU_CPUS;
+ mc->default_ram_id = "ddr-ram";
}
static const TypeInfo xlnx_zcu102_machine_init_typeinfo = {
--
1.8.3.1
- [PULL 031/136] arm/versatilepb: use memdev for RAM, (continued)
- [PULL 031/136] arm/versatilepb: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 029/136] arm/raspi: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 035/136] arm/xilinx_zynq: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 039/136] null-machine: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [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 <=
- [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, 2020/02/25
- [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