The VirtMachineClass::acpi_expose_flash field was only used by the virt-5.0 machine, which got removed (see commit 2c1fb4d5c01 "hw/arm/virt-acpi-build: Only expose flash on older machine types" for more context). Remove it as now unused.
Signed-off-by: Philippe Mathieu-Daudé <[email protected]> --- include/hw/arm/virt.h | 1 - hw/arm/virt-acpi-build.c | 28 ---------------------------- 2 files changed, 29 deletions(-) diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h index c77a33f6df2..ba16acb8626 100644 --- a/include/hw/arm/virt.h +++ b/include/hw/arm/virt.h @@ -124,7 +124,6 @@ struct VirtMachineClass { bool no_tcg_its; bool no_highmem_compact; bool no_kvm_steal_time; - bool acpi_expose_flash; bool no_secure_gpio; /* Machines < 6.2 have no support for describing cpu topology to guest */ bool no_cpu_topology; diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c index 8bb6b605154..5db5baa7cf3 100644 --- a/hw/arm/virt-acpi-build.c +++ b/hw/arm/virt-acpi-build.c @@ -99,30 +99,6 @@ static void acpi_dsdt_add_uart(Aml *scope, const MemMapEntry *uart_memmap, aml_append(scope, dev); } -static void acpi_dsdt_add_flash(Aml *scope, const MemMapEntry *flash_memmap) -{ - Aml *dev, *crs; - hwaddr base = flash_memmap->base; - hwaddr size = flash_memmap->size / 2; - - dev = aml_device("FLS0"); - aml_append(dev, aml_name_decl("_HID", aml_string("LNRO0015"))); - aml_append(dev, aml_name_decl("_UID", aml_int(0))); - - crs = aml_resource_template(); - aml_append(crs, aml_memory32_fixed(base, size, AML_READ_WRITE)); - aml_append(dev, aml_name_decl("_CRS", crs)); - aml_append(scope, dev); - - dev = aml_device("FLS1"); - aml_append(dev, aml_name_decl("_HID", aml_string("LNRO0015"))); - aml_append(dev, aml_name_decl("_UID", aml_int(1))); - crs = aml_resource_template(); - aml_append(crs, aml_memory32_fixed(base + size, size, AML_READ_WRITE)); - aml_append(dev, aml_name_decl("_CRS", crs)); - aml_append(scope, dev); -} - static void build_acpi0017(Aml *table) { Aml *dev, *scope, *method; @@ -1011,7 +987,6 @@ static void build_fadt_rev6(GArray *table_data, BIOSLinker *linker, static void build_dsdt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) { - VirtMachineClass *vmc = VIRT_MACHINE_GET_CLASS(vms); Aml *scope, *dsdt; MachineState *ms = MACHINE(vms); const MemMapEntry *memmap = vms->memmap; @@ -1036,9 +1011,6 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) acpi_dsdt_add_uart(scope, &memmap[VIRT_UART1], (irqmap[VIRT_UART1] + ARM_SPI_BASE), 1); } - if (vmc->acpi_expose_flash) { - acpi_dsdt_add_flash(scope, &memmap[VIRT_FLASH]); - } fw_cfg_acpi_dsdt_add(scope, &memmap[VIRT_FW_CFG]); virtio_acpi_dsdt_add(scope, memmap[VIRT_MMIO].base, memmap[VIRT_MMIO].size, (irqmap[VIRT_MMIO] + ARM_SPI_BASE), -- 2.51.0
