From 229a9df3f216554ce5ec717b9f468ab539716efc Mon Sep 17 00:00:00 2001 From: Julien Grall Date: Tue, 22 Apr 2014 13:58:41 +0100 Subject: [PATCH] xen/arm: IRQ Introduce irq_get_domain This function retrieves a domain from an IRQ. It will be used in several places (such as do_IRQ) to avoid duplicated code when multiple action will be supported. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/irq.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/xen/arch/arm/irq.c b/xen/arch/arm/irq.c index f3a30bdb1b..26574ca348 100644 --- a/xen/arch/arm/irq.c +++ b/xen/arch/arm/irq.c @@ -98,6 +98,18 @@ void __cpuinit init_secondary_IRQ(void) BUG_ON(init_local_irq_data() < 0); } +static inline struct domain *irq_get_domain(struct irq_desc *desc) +{ + ASSERT(spin_is_locked(&desc->lock)); + + if ( !(desc->status & IRQ_GUEST) ) + return dom_xen; + + ASSERT(desc->action != NULL); + + return desc->action->dev_id; +} + int request_dt_irq(const struct dt_irq *irq, void (*handler)(int, void *, struct cpu_user_regs *), const char *devname, void *dev_id) @@ -156,7 +168,7 @@ void do_IRQ(struct cpu_user_regs *regs, unsigned int irq, int is_fiq) if ( desc->status & IRQ_GUEST ) { - struct domain *d = action->dev_id; + struct domain *d = irq_get_domain(desc); desc->handler->end(desc); -- 2.30.2