Make sure both the highmem PCIe and GICv3 regions are disabled when they don't fully fit in the PA range. Signed-off-by: Marc Zyngier <maz@xxxxxxxxxx> --- hw/arm/virt.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index a572e0c9d9..756f67b6c8 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1673,6 +1673,9 @@ static void virt_set_memmap(VirtMachineState *vms, int pa_bits) if (base <= BIT_ULL(pa_bits)) { vms->highest_gpa = base -1; } else { + /* Advertise that we have disabled the highmem devices */ + vms->highmem_ecam = false; + vms->highmem_redists = false; vms->highest_gpa = memtop - 1; } -- 2.30.2