The VirtMachineClass::no_highmem_compact field was only used by virt-7.1 machine, which got removed. Remove it as now unused.
Signed-off-by: Philippe Mathieu-Daudé <[email protected]> --- include/hw/arm/virt.h | 1 - hw/arm/virt.c | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h index ddbd2d78209..0d2a951cf08 100644 --- a/include/hw/arm/virt.h +++ b/include/hw/arm/virt.h @@ -121,7 +121,6 @@ typedef enum VirtGICType { struct VirtMachineClass { MachineClass parent; - bool no_highmem_compact; bool no_ns_el2_virt_timer_irq; bool no_nested_smmu; }; diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 4a8a2a91b07..651ad4b5f63 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -3438,7 +3438,6 @@ static void virt_machine_class_init(ObjectClass *oc, const void *data) static void virt_instance_init(Object *obj) { VirtMachineState *vms = VIRT_MACHINE(obj); - VirtMachineClass *vmc = VIRT_MACHINE_GET_CLASS(vms); /* EL3 is disabled by default on virt: this makes us consistent * between KVM and TCG for this board, and it also allows us to @@ -3451,7 +3450,7 @@ static void virt_instance_init(Object *obj) /* High memory is enabled by default */ vms->highmem = true; - vms->highmem_compact = !vmc->no_highmem_compact; + vms->highmem_compact = true; vms->gic_version = VIRT_GIC_VERSION_NOSEL; vms->highmem_ecam = true; -- 2.51.0
