diff options
author | Marc Zyngier <maz@kernel.org> | 2022-01-06 19:51:42 +0000 |
---|---|---|
committer | Marc Zyngier <maz@kernel.org> | 2022-01-14 13:28:23 +0000 |
commit | c2e340130bd5c0bd513b4d4cf9df4dff09745cf0 (patch) | |
tree | 1268280c3cbb2d5c9103be7de397ac48a90564eb | |
parent | b98bed23c9c41b49bac85e682d8436ecb36d0fa4 (diff) | |
download | qemu-ipa-space.tar.gz |
hw/arm/virt: Drop superfluous checks against highmemipa-space
Now that the devices present in the extended memory map are checked
against the available PA space and disabled when they don't fit,
there is no need to keep the same checks against highmem, as
highmem really is a shortcut for the PA space being 32bit.
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Signed-off-by: Marc Zyngier <maz@kernel.org>
-rw-r--r-- | hw/arm/virt-acpi-build.c | 2 | ||||
-rw-r--r-- | hw/arm/virt.c | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c index 0757c28f69c..449fab00805 100644 --- a/hw/arm/virt-acpi-build.c +++ b/hw/arm/virt-acpi-build.c @@ -947,8 +947,6 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables *tables) acpi_add_table(table_offsets, tables_blob); build_fadt_rev5(tables_blob, tables->linker, vms, dsdt); - vms->highmem_redists &= vms->highmem; - acpi_add_table(table_offsets, tables_blob); build_madt(tables_blob, tables->linker, vms); diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 053791cc44a..4524f3807d6 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -2171,9 +2171,6 @@ static void machvirt_init(MachineState *machine) virt_flash_fdt(vms, sysmem, secure_sysmem ?: sysmem); - vms->highmem_mmio &= vms->highmem; - vms->highmem_redists &= vms->highmem; - create_gic(vms, sysmem); virt_cpu_post_init(vms, sysmem); @@ -2192,7 +2189,7 @@ static void machvirt_init(MachineState *machine) machine->ram_size, "mach-virt.tag"); } - vms->highmem_ecam &= vms->highmem && (!firmware_loaded || aarch64); + vms->highmem_ecam &= (!firmware_loaded || aarch64); create_rtc(vms); |