mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 02:01:24 +01:00
xen/arm: move setting GIC_IRQ_GUEST_QUEUED earlier
It makes the code cleaner, especially with the following patches. Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Acked-by: Julien Grall <julien.grall@linaro.org> Acked-by: Ian Campbell <ian.campbell@citrix.com>
This commit is contained in:
1 parent
5b3a817ea3
commit
7c9bb3c25a
1 file changed
+8
-8
+8
-8
@@ -321,13 +321,6 @@ void vgic_vcpu_inject_irq(struct vcpu *v, unsigned int irq)
|
||||
|
||||
spin_lock_irqsave(&v->arch.vgic.lock, flags);
|
||||
|
||||
if ( !list_empty(&n->inflight) )
|
||||
{
|
||||
set_bit(GIC_IRQ_GUEST_QUEUED, &n->status);
|
||||
gic_raise_inflight_irq(v, irq);
|
||||
goto out;
|
||||
}
|
||||
|
||||
/* vcpu offline */
|
||||
if ( test_bit(_VPF_down, &v->pause_flags) )
|
||||
{
|
||||
@@ -335,10 +328,17 @@ void vgic_vcpu_inject_irq(struct vcpu *v, unsigned int irq)
|
||||
return;
|
||||
}
|
||||
|
||||
set_bit(GIC_IRQ_GUEST_QUEUED, &n->status);
|
||||
|
||||
if ( !list_empty(&n->inflight) )
|
||||
{
|
||||
gic_raise_inflight_irq(v, irq);
|
||||
goto out;
|
||||
}
|
||||
|
||||
priority = vgic_byte_read(rank->ipriority[REG_RANK_INDEX(8, irq, DABT_WORD)], 0, irq & 0x3);
|
||||
|
||||
n->irq = irq;
|
||||
set_bit(GIC_IRQ_GUEST_QUEUED, &n->status);
|
||||
n->priority = priority;
|
||||
|
||||
/* the irq is enabled */
|
||||
|
||||