@@ -144,6 +144,7 @@ struct VirtMachineState {
bool highmem;
bool highmem_ecam;
bool highmem_mmio;
+ bool highmem_redists;
bool its;
bool tcg_its;
bool virt;
@@ -191,7 +192,8 @@ static inline int virt_gicv3_redist_region_count(VirtMachineState *vms)
assert(vms->gic_version == VIRT_GIC_VERSION_3);
- return MACHINE(vms)->smp.cpus > redist0_capacity ? 2 : 1;
+ return (MACHINE(vms)->smp.cpus > redist0_capacity &&
+ vms->highmem_redists) ? 2 : 1;
}
#endif /* QEMU_ARM_VIRT_H */
@@ -947,6 +947,8 @@ 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);
@@ -2113,6 +2113,7 @@ 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);
@@ -2902,6 +2903,7 @@ static void virt_instance_init(Object *obj)
vms->highmem_ecam = !vmc->no_highmem_ecam;
vms->highmem_mmio = true;
+ vms->highmem_redists = true;
if (vmc->no_its) {
vms->its = false;