[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 41/79] hppa: use memdev for RAM
From: |
Igor Mammedov |
Subject: |
[PATCH v5 41/79] hppa: use memdev for RAM |
Date: |
Mon, 17 Feb 2020 12:34:14 -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>
---
CC: address@hidden
CC: address@hidden
---
hw/hppa/machine.c | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c
index d8755ec422..67181e75ba 100644
--- a/hw/hppa/machine.c
+++ b/hw/hppa/machine.c
@@ -71,14 +71,11 @@ static void machine_hppa_init(MachineState *machine)
uint64_t kernel_entry = 0, kernel_low, kernel_high;
MemoryRegion *addr_space = get_system_memory();
MemoryRegion *rom_region;
- MemoryRegion *ram_region;
MemoryRegion *cpu_region;
long i;
unsigned int smp_cpus = machine->smp.cpus;
SysBusDevice *s;
- ram_size = machine->ram_size;
-
/* Create CPUs. */
for (i = 0; i < smp_cpus; i++) {
char *name = g_strdup_printf("cpu%ld-io-eir", i);
@@ -97,10 +94,8 @@ static void machine_hppa_init(MachineState *machine)
error_report("RAM size is currently restricted to 3GB");
exit(EXIT_FAILURE);
}
- ram_region = g_new(MemoryRegion, 1);
- memory_region_allocate_system_memory(ram_region, OBJECT(machine),
- "ram", ram_size);
- memory_region_add_subregion_overlap(addr_space, 0, ram_region, -1);
+ memory_region_add_subregion_overlap(addr_space, 0, machine->ram, -1);
+
/* Init Lasi chip */
lasi_init(addr_space);
@@ -298,6 +293,7 @@ static void machine_hppa_machine_init(MachineClass *mc)
mc->is_default = 1;
mc->default_ram_size = 512 * MiB;
mc->default_boot_order = "cd";
+ mc->default_ram_id = "ram";
}
DEFINE_MACHINE("hppa", machine_hppa_machine_init)
--
2.18.1
- [PATCH v5 39/79] null-machine: use memdev for RAM, (continued)
- [PATCH v5 39/79] null-machine: use memdev for RAM, Igor Mammedov, 2020/02/17
- [PATCH v5 30/79] arm/sbsa-ref: use memdev for RAM, Igor Mammedov, 2020/02/17
- [PATCH v5 32/79] arm/vexpress: use memdev for RAM, Igor Mammedov, 2020/02/17
- [PATCH v5 37/79] arm/xlnx-zcu102: use memdev for RAM, Igor Mammedov, 2020/02/17
- [PATCH v5 40/79] cris/axis_dev88: use memdev for RAM, Igor Mammedov, 2020/02/17
- [PATCH v5 41/79] hppa: use memdev for RAM,
Igor Mammedov <=
- [PATCH v5 38/79] s390x/s390-virtio-ccw: use memdev for RAM, Igor Mammedov, 2020/02/17
- [PATCH v5 35/79] arm/xilinx_zynq: use memdev for RAM, Igor Mammedov, 2020/02/17
- [PATCH v5 42/79] x86/microvm: use memdev for RAM, Igor Mammedov, 2020/02/17
- [PATCH v5 43/79] x86/pc: use memdev for RAM, Igor Mammedov, 2020/02/17