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

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

Browse source 
The VirtMachineClass::claim_edge_triggered_timers field
was only used by virt-2.8 machine, which got removed.
Remove it and simplify fdt_add_timer_nodes() and build_gtdt().

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:38 +01:00 • committed by Peter Maydell
parent f54854f984
commit 2d53ca0b22
3 changed files with 1 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -537,15 +537,12 @@ build_srat(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)
static void static void
build_gtdt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) build_gtdt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)
{ {
VirtMachineClass *vmc = VIRT_MACHINE_GET_CLASS(vms);
/* /*
* Table 5-117 Flag Definitions * Table 5-117 Flag Definitions
* set only "Timer interrupt Mode" and assume "Timer Interrupt * set only "Timer interrupt Mode" and assume "Timer Interrupt
* polarity" bit as '0: Interrupt is Active high' * polarity" bit as '0: Interrupt is Active high'
*/ */
uint32_t irqflags = vmc->claim_edge_triggered_timers ? const uint32_t irqflags = 0; /* Interrupt is Level triggered */
1 : /* Interrupt is Edge triggered */
0; /* Interrupt is Level triggered */
AcpiTable table = { .sig = "GTDT", .rev = 3, .oem_id = vms->oem_id, AcpiTable table = { .sig = "GTDT", .rev = 3, .oem_id = vms->oem_id,
.oem_table_id = vms->oem_table_id }; .oem_table_id = vms->oem_table_id };

5
hw/arm/virt.c
View file

@ -370,14 +370,9 @@ static void fdt_add_timer_nodes(const VirtMachineState *vms)
* the correct information. * the correct information.
*/ */
ARMCPU *armcpu; ARMCPU *armcpu;
VirtMachineClass *vmc = VIRT_MACHINE_GET_CLASS(vms);
uint32_t irqflags = GIC_FDT_IRQ_FLAGS_LEVEL_HI; uint32_t irqflags = GIC_FDT_IRQ_FLAGS_LEVEL_HI;
MachineState *ms = MACHINE(vms); MachineState *ms = MACHINE(vms);
if (vmc->claim_edge_triggered_timers) {
irqflags = GIC_FDT_IRQ_FLAGS_EDGE_LO_HI;
}
if (vms->gic_version == VIRT_GIC_VERSION_2) { if (vms->gic_version == VIRT_GIC_VERSION_2) {
irqflags = deposit32(irqflags, GIC_FDT_IRQ_PPI_CPU_START, irqflags = deposit32(irqflags, GIC_FDT_IRQ_PPI_CPU_START,
GIC_FDT_IRQ_PPI_CPU_WIDTH, GIC_FDT_IRQ_PPI_CPU_WIDTH,

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

@ -118,7 +118,6 @@ typedef enum VirtGICType {
struct VirtMachineClass { struct VirtMachineClass {
MachineClass parent; MachineClass parent;
bool no_tcg_its; bool no_tcg_its;
bool claim_edge_triggered_timers;
bool smbios_old_sys_ver; bool smbios_old_sys_ver;
bool no_highmem_compact; bool no_highmem_compact;
bool no_highmem_ecam; bool no_highmem_ecam;