motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-29 13:01:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
The VirtMachineClass::no_its field was only used by
virt-2.7 machine, which got removed. Remove it and
simplify virt_instance_init() and virt_acpi_build().

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>
This commit is contained in:
Philippe Mathieu-Daudé 2025-01-16 15:59:36 +01:00 • committed by Peter Maydell
parent 390becbf7f
commit 8d23b1df72
3 changed files with 8 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

5
hw/arm/virt-acpi-build.c
View file

@ -670,7 +670,6 @@ static void
build_madt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) build_madt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)
{ {
int i; int i;
VirtMachineClass *vmc = VIRT_MACHINE_GET_CLASS(vms);
const MemMapEntry *memmap = vms->memmap; const MemMapEntry *memmap = vms->memmap;
AcpiTable table = { .sig = "APIC", .rev = 4, .oem_id = vms->oem_id, AcpiTable table = { .sig = "APIC", .rev = 4, .oem_id = vms->oem_id,
.oem_table_id = vms->oem_table_id }; .oem_table_id = vms->oem_table_id };
@ -741,7 +740,7 @@ build_madt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)
memmap[VIRT_HIGH_GIC_REDIST2].size); memmap[VIRT_HIGH_GIC_REDIST2].size);
} }
if (its_class_name() && !vmc->no_its) { if (its_class_name()) {
/* /*
* ACPI spec, Revision 6.0 Errata A * ACPI spec, Revision 6.0 Errata A
* (original 6.0 definition has invalid Length) * (original 6.0 definition has invalid Length)
@ -973,7 +972,7 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables *tables)
vms->oem_table_id); vms->oem_table_id);
} }
if (its_class_name() && !vmc->no_its) { if (its_class_name()) {
acpi_add_table(table_offsets, tables_blob); acpi_add_table(table_offsets, tables_blob);
build_iort(tables_blob, tables->linker, vms); build_iort(tables_blob, tables->linker, vms);
} }

4
hw/arm/virt.c
View file

@ -3347,9 +3347,6 @@ static void virt_instance_init(Object *obj)
vms->highmem_mmio = true; vms->highmem_mmio = true;
vms->highmem_redists = true; vms->highmem_redists = true;
if (vmc->no_its) {
vms->its = false;
} else {
/* Default allows ITS instantiation */ /* Default allows ITS instantiation */
vms->its = true; vms->its = true;
@ -3358,7 +3355,6 @@ static void virt_instance_init(Object *obj)
} else { } else {
vms->tcg_its = true; vms->tcg_its = true;
} }
}
/* Default disallows iommu instantiation */ /* Default disallows iommu instantiation */
vms->iommu = VIRT_IOMMU_NONE; vms->iommu = VIRT_IOMMU_NONE;

1
include/hw/arm/virt.h
View file

@ -117,7 +117,6 @@ typedef enum VirtGICType {
struct VirtMachineClass { struct VirtMachineClass {
MachineClass parent; MachineClass parent;
bool no_its;
bool no_tcg_its; bool no_tcg_its;
bool claim_edge_triggered_timers; bool claim_edge_triggered_timers;
bool smbios_old_sys_ver; bool smbios_old_sys_ver;