diff options
author | David Hildenbrand <david@redhat.com> | 2023-06-23 14:45:46 +0200 |
---|---|---|
committer | David Hildenbrand <david@redhat.com> | 2023-07-12 09:25:37 +0200 |
commit | 176d073029083dd52e28e92c5712d0535a83c34d (patch) | |
tree | 01a4893e30b1ad2433d4bd6e2aa4678d15aa2dc2 | |
parent | cc0afd8a72996352e9f3f11b1cdde49b08aa11b6 (diff) | |
download | qemu-176d073029083dd52e28e92c5712d0535a83c34d.zip qemu-176d073029083dd52e28e92c5712d0535a83c34d.tar.gz qemu-176d073029083dd52e28e92c5712d0535a83c34d.tar.bz2 |
hw/arm/virt: Use machine_memory_devices_init()
Let's use our new helper. We'll add the subregion to system RAM now
earlier. That shouldn't matter, because the system RAM memory region should
already be alive at that point.
Cc: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: David Hildenbrand <david@redhat.com>
Message-Id: <20230623124553.400585-4-david@redhat.com>
Signed-off-by: David Hildenbrand <david@redhat.com>
-rw-r--r-- | hw/arm/virt.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 8a4c663..0546e43 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1813,10 +1813,7 @@ static void virt_set_memmap(VirtMachineState *vms, int pa_bits) virt_set_high_memmap(vms, base, pa_bits); if (device_memory_size > 0) { - ms->device_memory = g_malloc0(sizeof(*ms->device_memory)); - ms->device_memory->base = device_memory_base; - memory_region_init(&ms->device_memory->mr, OBJECT(vms), - "device-memory", device_memory_size); + machine_memory_devices_init(ms, device_memory_base, device_memory_size); } } @@ -2257,10 +2254,6 @@ static void machvirt_init(MachineState *machine) memory_region_add_subregion(sysmem, vms->memmap[VIRT_MEM].base, machine->ram); - if (machine->device_memory) { - memory_region_add_subregion(sysmem, machine->device_memory->base, - &machine->device_memory->mr); - } virt_flash_fdt(vms, sysmem, secure_sysmem ?: sysmem); |