From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefano Stabellini Subject: [PATCH v9 02/12] xen/arm: remove unused virtual parameter from vgic_vcpu_inject_irq Date: Tue, 10 Jun 2014 15:07:10 +0100 Message-ID: <1402409240-28114-2-git-send-email-stefano.stabellini@eu.citrix.com> References: Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xensource.com Cc: julien.grall@citrix.com, Ian.Campbell@citrix.com, Stefano Stabellini List-Id: xen-devel@lists.xenproject.org Signed-off-by: Stefano Stabellini Acked-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/domain.c | 2 +- xen/arch/arm/gic.c | 2 +- xen/arch/arm/irq.c | 2 +- xen/arch/arm/time.c | 2 +- xen/arch/arm/vgic.c | 4 ++-- xen/arch/arm/vtimer.c | 4 ++-- xen/include/asm-arm/gic.h | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index 40f1c3a..33141e3 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -769,7 +769,7 @@ void vcpu_mark_events_pending(struct vcpu *v) if ( already_pending ) return; - vgic_vcpu_inject_irq(v, v->domain->arch.evtchn_irq, 1); + vgic_vcpu_inject_irq(v, v->domain->arch.evtchn_irq); } /* diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index a449ef3..6d917a0 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -652,7 +652,7 @@ int gic_events_need_delivery(void) void gic_inject(void) { if ( vcpu_info(current, evtchn_upcall_pending) ) - vgic_vcpu_inject_irq(current, current->domain->arch.evtchn_irq, 1); + vgic_vcpu_inject_irq(current, current->domain->arch.evtchn_irq); gic_restore_pending_irqs(current); } diff --git a/xen/arch/arm/irq.c b/xen/arch/arm/irq.c index 44696e7..a33c797 100644 --- a/xen/arch/arm/irq.c +++ b/xen/arch/arm/irq.c @@ -176,7 +176,7 @@ void do_IRQ(struct cpu_user_regs *regs, unsigned int irq, int is_fiq) desc->arch.eoi_cpu = smp_processor_id(); /* XXX: inject irq into all guest vcpus */ - vgic_vcpu_inject_irq(d->vcpu[0], irq, 0); + vgic_vcpu_inject_irq(d->vcpu[0], irq); goto out_no_end; } diff --git a/xen/arch/arm/time.c b/xen/arch/arm/time.c index d04c97a..6e8d1f3 100644 --- a/xen/arch/arm/time.c +++ b/xen/arch/arm/time.c @@ -215,7 +215,7 @@ static void vtimer_interrupt(int irq, void *dev_id, struct cpu_user_regs *regs) { current->arch.virt_timer.ctl = READ_SYSREG32(CNTV_CTL_EL0); WRITE_SYSREG32(current->arch.virt_timer.ctl | CNTx_CTL_MASK, CNTV_CTL_EL0); - vgic_vcpu_inject_irq(current, current->arch.virt_timer.irq, 1); + vgic_vcpu_inject_irq(current, current->arch.virt_timer.irq); } /* Set up the timer interrupt on this CPU */ diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c index 4cf6470..9838ce5 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -476,7 +476,7 @@ static int vgic_to_sgi(struct vcpu *v, register_t sgir) sgir, vcpu_mask); continue; } - vgic_vcpu_inject_irq(d->vcpu[vcpuid], virtual_irq, 1); + vgic_vcpu_inject_irq(d->vcpu[vcpuid], virtual_irq); } return 1; } @@ -704,7 +704,7 @@ void vgic_clear_pending_irqs(struct vcpu *v) spin_unlock_irqrestore(&v->arch.vgic.lock, flags); } -void vgic_vcpu_inject_irq(struct vcpu *v, unsigned int irq, int virtual) +void vgic_vcpu_inject_irq(struct vcpu *v, unsigned int irq) { int idx = irq >> 2, byte = irq & 0x3; uint8_t priority; diff --git a/xen/arch/arm/vtimer.c b/xen/arch/arm/vtimer.c index b93153e..b751692 100644 --- a/xen/arch/arm/vtimer.c +++ b/xen/arch/arm/vtimer.c @@ -34,14 +34,14 @@ static void phys_timer_expired(void *data) struct vtimer *t = data; t->ctl |= CNTx_CTL_PENDING; if ( !(t->ctl & CNTx_CTL_MASK) ) - vgic_vcpu_inject_irq(t->v, t->irq, 1); + vgic_vcpu_inject_irq(t->v, t->irq); } static void virt_timer_expired(void *data) { struct vtimer *t = data; t->ctl |= CNTx_CTL_MASK; - vgic_vcpu_inject_irq(t->v, t->irq, 1); + vgic_vcpu_inject_irq(t->v, t->irq); } int domain_vtimer_init(struct domain *d) diff --git a/xen/include/asm-arm/gic.h b/xen/include/asm-arm/gic.h index b750b17..b1b4fd5 100644 --- a/xen/include/asm-arm/gic.h +++ b/xen/include/asm-arm/gic.h @@ -163,7 +163,7 @@ extern void domain_vgic_free(struct domain *d); extern int vcpu_vgic_init(struct vcpu *v); -extern void vgic_vcpu_inject_irq(struct vcpu *v, unsigned int irq,int virtual); +extern void vgic_vcpu_inject_irq(struct vcpu *v, unsigned int irq); extern void vgic_clear_pending_irqs(struct vcpu *v); extern struct pending_irq *irq_to_pending(struct vcpu *v, unsigned int irq); -- 1.7.10.4