arm: Remove irq field from pending_irq

Always identical to virt_id.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>

diff --git a/hypervisor/arch/arm/gic-v2.c b/hypervisor/arch/arm/gic-v2.c
index 88024b448edfdb1afe7909bd0d757c92d558d7a0..ce5a61c44b4f846a0f9213c6cbec899d3874fd69 100644 (file)
--- a/hypervisor/arch/arm/gic-v2.c
+++ b/hypervisor/arch/arm/gic-v2.c
@@ -267,7 +267,7 @@ static int gic_inject_irq(struct per_cpu *cpu_data, struct pending_irq *irq)
 
        if (!is_sgi(irq->virt_id)) {
                lr |= GICH_LR_HW_BIT;
-               lr |= irq->type.irq << GICH_LR_PHYS_ID_SHIFT;
+               lr |= irq->virt_id << GICH_LR_PHYS_ID_SHIFT;
        }
 
        gic_write_lr(first_free, lr);

diff --git a/hypervisor/arch/arm/gic-v3.c b/hypervisor/arch/arm/gic-v3.c
index 710813c3674d9a681630b23c65f7c857df2cf467..6beab34433d0c47fe8f2f28c5b9cb3ce71a1bb42 100644 (file)
--- a/hypervisor/arch/arm/gic-v3.c
+++ b/hypervisor/arch/arm/gic-v3.c
@@ -389,7 +389,7 @@ static int gic_inject_irq(struct per_cpu *cpu_data, struct pending_irq *irq)
        lr |= ICH_LR_PENDING;
        if (!is_sgi(irq->virt_id)) {
                lr |= ICH_LR_HW_BIT;
-               lr |= (u64)irq->type.irq << ICH_LR_PHYS_ID_SHIFT;
+               lr |= (u64)irq->virt_id << ICH_LR_PHYS_ID_SHIFT;
        }
 
        gic_write_lr(free_lr, lr);

diff --git a/hypervisor/arch/arm/include/asm/irqchip.h b/hypervisor/arch/arm/include/asm/irqchip.h
index 6d94c19f18d5db4adfed1e25f775e77058e7d5bf..65d4d4f1f052379c9ac3d2c8691976a4ca3120ee 100644 (file)
--- a/hypervisor/arch/arm/include/asm/irqchip.h
+++ b/hypervisor/arch/arm/include/asm/irqchip.h
@@ -64,11 +64,6 @@ struct irqchip_ops {
 struct pending_irq {
        u32     virt_id;
 
-       union {
-               /* Physical id, when hw is 1 */
-               u16 irq;
-       } type;
-
        struct pending_irq *next;
        struct pending_irq *prev;
 } __attribute__((packed));

diff --git a/hypervisor/arch/arm/irqchip.c b/hypervisor/arch/arm/irqchip.c
index d2dc44518b7171e0341d9dcb5d7a2f9b4bf48041..a4e2d9962530c3297a192d7150a33e072dc3fb14 100644 (file)
--- a/hypervisor/arch/arm/irqchip.c
+++ b/hypervisor/arch/arm/irqchip.c
@@ -135,10 +135,6 @@ int irqchip_set_pending(struct per_cpu *cpu_data, u32 irq_id, bool try_inject)
 
        pending.virt_id = irq_id;
 
-       if (!is_sgi(irq_id)) {
-               pending.type.irq = irq_id;
-       }
-
        if (try_inject && irqchip.inject_irq(cpu_data, &pending) == 0)
                return 0;