mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 10:11:27 +01:00
xen/arm: s/gic_set_guest_irq/gic_raise_guest_irq
Rename gic_set_guest_irq to gic_raise_guest_irq and remove the state parameter. 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
46e3e62ef0
commit
68dcdf9423
3 files changed
+8
-8
No files matched your search
+4
-4
@@ -598,8 +598,8 @@ void gic_remove_from_queues(struct vcpu *v, unsigned int virtual_irq)
|
||||
spin_unlock_irqrestore(&gic.lock, flags);
|
||||
}
|
||||
|
||||
void gic_set_guest_irq(struct vcpu *v, unsigned int virtual_irq,
|
||||
unsigned int state, unsigned int priority)
|
||||
void gic_raise_guest_irq(struct vcpu *v, unsigned int virtual_irq,
|
||||
unsigned int priority)
|
||||
{
|
||||
int i;
|
||||
unsigned long flags;
|
||||
@@ -611,7 +611,7 @@ void gic_set_guest_irq(struct vcpu *v, unsigned int virtual_irq,
|
||||
i = find_first_zero_bit(&this_cpu(lr_mask), nr_lrs);
|
||||
if (i < nr_lrs) {
|
||||
set_bit(i, &this_cpu(lr_mask));
|
||||
gic_set_lr(i, irq_to_pending(v, virtual_irq), state);
|
||||
gic_set_lr(i, irq_to_pending(v, virtual_irq), GICH_LR_PENDING);
|
||||
goto out;
|
||||
}
|
||||
}
|
||||
@@ -645,7 +645,7 @@ static void gic_update_one_lr(struct vcpu *v, int i)
|
||||
p->lr = GIC_INVALID_LR;
|
||||
if ( test_bit(GIC_IRQ_GUEST_PENDING, &p->status) &&
|
||||
test_bit(GIC_IRQ_GUEST_ENABLED, &p->status))
|
||||
gic_set_guest_irq(v, irq, GICH_LR_PENDING, p->priority);
|
||||
gic_raise_guest_irq(v, irq, p->priority);
|
||||
else
|
||||
list_del_init(&p->inflight);
|
||||
}
|
||||
|
||||
+2
-2
@@ -405,7 +405,7 @@ static void vgic_enable_irqs(struct vcpu *v, uint32_t r, int n)
|
||||
p = irq_to_pending(v, irq);
|
||||
set_bit(GIC_IRQ_GUEST_ENABLED, &p->status);
|
||||
if ( !list_empty(&p->inflight) && !test_bit(GIC_IRQ_GUEST_VISIBLE, &p->status) )
|
||||
gic_set_guest_irq(v, irq, GICH_LR_PENDING, p->priority);
|
||||
gic_raise_guest_irq(v, irq, p->priority);
|
||||
if ( p->desc != NULL )
|
||||
{
|
||||
spin_lock_irqsave(&p->desc->lock, flags);
|
||||
@@ -738,7 +738,7 @@ void vgic_vcpu_inject_irq(struct vcpu *v, unsigned int irq)
|
||||
|
||||
/* the irq is enabled */
|
||||
if ( test_bit(GIC_IRQ_GUEST_ENABLED, &n->status) )
|
||||
gic_set_guest_irq(v, irq, GICH_LR_PENDING, priority);
|
||||
gic_raise_guest_irq(v, irq, priority);
|
||||
|
||||
list_for_each_entry ( iter, &v->arch.vgic.inflight_irqs, inflight )
|
||||
{
|
||||
|
||||
@@ -179,8 +179,8 @@ extern void gic_clear_pending_irqs(struct vcpu *v);
|
||||
extern int gic_events_need_delivery(void);
|
||||
|
||||
extern void __cpuinit init_maintenance_interrupt(void);
|
||||
extern void gic_set_guest_irq(struct vcpu *v, unsigned int irq,
|
||||
unsigned int state, unsigned int priority);
|
||||
extern void gic_raise_guest_irq(struct vcpu *v, unsigned int irq,
|
||||
unsigned int priority);
|
||||
extern void gic_remove_from_queues(struct vcpu *v, unsigned int virtual_irq);
|
||||
|
||||
/* Accept an interrupt from the GIC and dispatch its handler */
|
||||
|
||||