From: Philippe Mathieu-Daudé <philmd@linaro.org>
Date: Thu, 16 Jan 2025 14:59:44 +0000 (+0100)
Subject: hw/arm/virt: Remove VirtMachineClass::no_highmem_ecam field
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=358a1bc71359f03bfb64154ed3238f7c571e7872;p=thirdparty%2Fqemu.git

hw/arm/virt: Remove VirtMachineClass::no_highmem_ecam field

The VirtMachineClass::no_highmem_ecam field was only
used by virt-2.12 machine, which got removed. Remove it
and simplify virt_instance_init().

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index d047983c80..bd1a68673a 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -3336,7 +3336,7 @@ static void virt_instance_init(Object *obj)
     vms->highmem_compact = !vmc->no_highmem_compact;
     vms->gic_version = VIRT_GIC_VERSION_NOSEL;
 
-    vms->highmem_ecam = !vmc->no_highmem_ecam;
+    vms->highmem_ecam = true;
     vms->highmem_mmio = true;
     vms->highmem_redists = true;
 
diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h
index b2cc012a40..9a1b0f53d2 100644
--- a/include/hw/arm/virt.h
+++ b/include/hw/arm/virt.h
@@ -119,7 +119,6 @@ struct VirtMachineClass {
     MachineClass parent;
     bool no_tcg_its;
     bool no_highmem_compact;
-    bool no_highmem_ecam;
     bool no_ged;   /* Machines < 4.2 have no support for ACPI GED device */
     bool kvm_no_adjvtime;
     bool no_kvm_steal_time;