@@ -641,6 +641,7 @@ static inline void gic_set_lr(struct vcpu *v, int lr, unsigned int irq,
set_bit(GIC_IRQ_GUEST_VISIBLE, &p->status);
clear_bit(GIC_IRQ_GUEST_PENDING, &p->status);
+ p->lr = lr;
}
static inline void gic_add_to_lr_pending(struct vcpu *v, unsigned int irq,
@@ -721,6 +722,7 @@ static void gic_clear_lrs(struct vcpu *v)
if ( p->desc != NULL )
p->desc->status &= ~IRQ_INPROGRESS;
clear_bit(GIC_IRQ_GUEST_VISIBLE, &p->status);
+ p->lr = nr_lrs;
if ( test_bit(GIC_IRQ_GUEST_PENDING, &p->status) &&
test_bit(GIC_IRQ_GUEST_ENABLED, &p->status))
{
@@ -984,12 +986,12 @@ void gic_dump_info(struct vcpu *v)
list_for_each_entry ( p, &v->arch.vgic.inflight_irqs, inflight )
{
- printk("Inflight irq=%d\n", p->irq);
+ printk("Inflight irq=%d lr=%u\n", p->irq, p->lr);
}
list_for_each_entry( p, &v->arch.vgic.lr_pending, lr_queue )
{
- printk("Pending irq=%d\n", p->irq);
+ printk("Pending irq=%d lr=%u\n", p->irq, p->lr);
}
}
@@ -59,6 +59,7 @@ struct pending_irq
#define GIC_IRQ_GUEST_VISIBLE 1
#define GIC_IRQ_GUEST_ENABLED 2
unsigned long status;
+ uint8_t lr;
struct irq_desc *desc; /* only set it the irq corresponds to a physical irq */
uint8_t priority;
/* inflight is used to append instances of pending_irq to
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> --- xen/arch/arm/gic.c | 6 ++++-- xen/include/asm-arm/domain.h | 1 + 2 files changed, 5 insertions(+), 2 deletions(-)