The VirtMachineClass::no_tcg_its field was only used by the virt-6.1 machine, which got removed. Remove it as now unused, along with the VirtMachineState::tcg_its field.
Signed-off-by: Philippe Mathieu-Daudé <[email protected]> --- include/hw/arm/virt.h | 2 -- hw/arm/virt.c | 12 ++++-------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h index c5ccd6ec9ea..21d91a43d8b 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_tcg_its; bool no_highmem_compact; /* Machines < 6.2 have no support for describing cpu topology to guest */ bool no_cpu_topology; @@ -144,7 +143,6 @@ struct VirtMachineState { bool highmem_mmio; bool highmem_redists; bool its; - bool tcg_its; bool virt; bool ras; bool mte; diff --git a/hw/arm/virt.c b/hw/arm/virt.c index f23283e6ddd..3e7858d6e11 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -735,7 +735,7 @@ static void create_its(VirtMachineState *vms) DeviceState *dev; assert(vms->its); - if (!kvm_irqchip_in_kernel() && !vms->tcg_its) { + if (!kvm_irqchip_in_kernel()) { /* * Do nothing if ITS is neither supported by the host nor emulated by * the machine. @@ -857,11 +857,9 @@ static void create_gic(VirtMachineState *vms, MemoryRegion *mem) redist_region_count); if (!kvm_irqchip_in_kernel()) { - if (vms->tcg_its) { - object_property_set_link(OBJECT(vms->gic), "sysmem", - OBJECT(mem), &error_fatal); - qdev_prop_set_bit(vms->gic, "has-lpi", true); - } + object_property_set_link(OBJECT(vms->gic), "sysmem", + OBJECT(mem), &error_fatal); + qdev_prop_set_bit(vms->gic, "has-lpi", true); } else if (vms->virt) { qdev_prop_set_uint32(vms->gic, "maintenance-interrupt-id", ARCH_GIC_MAINT_IRQ); @@ -3471,8 +3469,6 @@ static void virt_instance_init(Object *obj) /* Default allows ITS instantiation */ vms->its = true; - /* Allow ITS emulation if the machine version supports it */ - vms->tcg_its = !vmc->no_tcg_its; /* Default disallows iommu instantiation */ vms->iommu = VIRT_IOMMU_NONE; -- 2.51.0
