[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GIT PULL 05/21] hw/loongarch/virt: Use machine_memory_devices_init()
From: |
David Hildenbrand |
Subject: |
[GIT PULL 05/21] hw/loongarch/virt: Use machine_memory_devices_init() |
Date: |
Wed, 12 Jul 2023 10:17:34 +0200 |
Let's use our new helper. While at it, use VIRT_HIGHMEM_BASE.
Cc: Xiaojuan Yang <yangxiaojuan@loongson.cn>
Cc: Song Gao <gaosong@loongson.cn>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Song Gao <gaosong@loongson.cn>
Signed-off-by: David Hildenbrand <david@redhat.com>
Message-Id: <20230623124553.400585-6-david@redhat.com>
Signed-off-by: David Hildenbrand <david@redhat.com>
---
hw/loongarch/virt.c | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c
index 51a453fa9a..e19b042ce8 100644
--- a/hw/loongarch/virt.c
+++ b/hw/loongarch/virt.c
@@ -857,8 +857,8 @@ static void loongarch_init(MachineState *machine)
/* initialize device memory address space */
if (machine->ram_size < machine->maxram_size) {
- machine->device_memory = g_malloc0(sizeof(*machine->device_memory));
ram_addr_t device_mem_size = machine->maxram_size - machine->ram_size;
+ hwaddr device_mem_base;
if (machine->ram_slots > ACPI_MAX_RAM_SLOTS) {
error_report("unsupported amount of memory slots: %"PRIu64,
@@ -873,14 +873,8 @@ static void loongarch_init(MachineState *machine)
exit(EXIT_FAILURE);
}
/* device memory base is the top of high memory address. */
- machine->device_memory->base = 0x90000000 + highram_size;
- machine->device_memory->base =
- ROUND_UP(machine->device_memory->base, 1 * GiB);
-
- memory_region_init(&machine->device_memory->mr, OBJECT(lams),
- "device-memory", device_mem_size);
- memory_region_add_subregion(address_space_mem,
machine->device_memory->base,
- &machine->device_memory->mr);
+ device_mem_base = ROUND_UP(VIRT_HIGHMEM_BASE + highram_size, 1 * GiB);
+ machine_memory_devices_init(machine, device_mem_base, device_mem_size);
}
/* Add isa io region */
--
2.41.0
- [GIT PULL 00/21] Host Memory Backends and Memory devices queue 2023-07-12, David Hildenbrand, 2023/07/12
- [GIT PULL 03/21] hw/arm/virt: Use machine_memory_devices_init(), David Hildenbrand, 2023/07/12
- [GIT PULL 01/21] memory-device: Unify enabled vs. supported error messages, David Hildenbrand, 2023/07/12
- [GIT PULL 02/21] memory-device: Introduce machine_memory_devices_init(), David Hildenbrand, 2023/07/12
- [GIT PULL 04/21] hw/ppc/spapr: Use machine_memory_devices_init(), David Hildenbrand, 2023/07/12
- [GIT PULL 05/21] hw/loongarch/virt: Use machine_memory_devices_init(),
David Hildenbrand <=
- [GIT PULL 06/21] hw/i386/pc: Use machine_memory_devices_init(), David Hildenbrand, 2023/07/12
- [GIT PULL 07/21] hw/i386/acpi-build: Rely on machine->device_memory when building SRAT, David Hildenbrand, 2023/07/12
- [GIT PULL 09/21] memory-device: Refactor memory_device_pre_plug(), David Hildenbrand, 2023/07/12
- [GIT PULL 08/21] hw/i386/pc: Remove PC_MACHINE_DEVMEM_REGION_SIZE, David Hildenbrand, 2023/07/12
- [GIT PULL 10/21] memory-device: Track used region size in DeviceMemoryState, David Hildenbrand, 2023/07/12
- [GIT PULL 11/21] softmmu/physmem: Warn with ram_block_discard_range() on MAP_PRIVATE file mapping, David Hildenbrand, 2023/07/12
- [GIT PULL 13/21] migration/ram: Expose ramblock_is_ignored() as migrate_ram_is_ignored(), David Hildenbrand, 2023/07/12
- [GIT PULL 12/21] virtio-mem: Skip most of virtio_mem_unplug_all() without plugged memory, David Hildenbrand, 2023/07/12
- [GIT PULL 15/21] virtio-md-pci: New parent type for virtio-mem-pci and virtio-pmem-pci, David Hildenbrand, 2023/07/12
- [GIT PULL 14/21] virtio-mem: Support "x-ignore-shared" migration, David Hildenbrand, 2023/07/12