Re: [PATCH-4.5 1/4] xen/arm: remove unused virtual parameter from vgic_vcpu_inject_irq

[Julien Grall <julien.grall@linaro.org>]

On 07/02/14 18:56, Stefano Stabellini wrote:
> Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Acked-by: Julien Grall <julien.grall@linaro.org>

> ---
>   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 635a9a4..244738d 100644
> --- a/xen/arch/arm/domain.c
> +++ b/xen/arch/arm/domain.c
> @@ -791,7 +791,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 50b3a38..acf7195 100644
> --- a/xen/arch/arm/gic.c
> +++ b/xen/arch/arm/gic.c
> @@ -748,7 +748,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);
>       if (!gic_events_need_delivery())
> diff --git a/xen/arch/arm/irq.c b/xen/arch/arm/irq.c
> index 3e326b0..5daa269 100644
> --- a/xen/arch/arm/irq.c
> +++ b/xen/arch/arm/irq.c
> @@ -159,7 +159,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 68b939d..0548201 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);
>   }
>
>   /* Route timer's IRQ on this CPU */
> diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c
> index 90e9707..7d10227 100644
> --- a/xen/arch/arm/vgic.c
> +++ b/xen/arch/arm/vgic.c
> @@ -455,7 +455,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;
>   }
> @@ -683,7 +683,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 e325f78..87be11e 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 vcpu_domain_init(struct domain *d)
> diff --git a/xen/include/asm-arm/gic.h b/xen/include/asm-arm/gic.h
> index 071280b..6fce5c2 100644
> --- a/xen/include/asm-arm/gic.h
> +++ b/xen/include/asm-arm/gic.h
> @@ -162,7 +162,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);
>
>

-- 
Julien Grall