public inbox for kvm@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] KVM: ARM: Fix kvm_vm_ioctl_irq_line
@ 2013-04-16 17:21 Alexander Graf
  2013-04-16 18:07 ` Christoffer Dall
  0 siblings, 1 reply; 3+ messages in thread
From: Alexander Graf @ 2013-04-16 17:21 UTC (permalink / raw)
  To: kvm@vger.kernel.org mailing list
  Cc: Yang Zhang, Gleb Natapov, Marcelo Tosatti, Christoffer Dall

Commit aa2fbe6d broke the ARM KVM target by introducing a new parameter
to irq handling functions.

Fix the function prototype to get things compiling again and ignore the
parameter just like we did before

Signed-off-by: Alexander Graf <agraf@suse.de>
---
 arch/arm/kvm/arm.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c
index e4ad0bb..678596f 100644
--- a/arch/arm/kvm/arm.c
+++ b/arch/arm/kvm/arm.c
@@ -805,7 +805,8 @@ static int vcpu_interrupt_line(struct kvm_vcpu *vcpu, int number, bool level)
 	return 0;
 }
 
-int kvm_vm_ioctl_irq_line(struct kvm *kvm, struct kvm_irq_level *irq_level)
+int kvm_vm_ioctl_irq_line(struct kvm *kvm, struct kvm_irq_level *irq_level,
+			  bool line_status)
 {
 	u32 irq = irq_level->irq;
 	unsigned int irq_type, vcpu_idx, irq_num;
-- 
1.6.0.2


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH] KVM: ARM: Fix kvm_vm_ioctl_irq_line
  2013-04-16 17:21 [PATCH] KVM: ARM: Fix kvm_vm_ioctl_irq_line Alexander Graf
@ 2013-04-16 18:07 ` Christoffer Dall
  2013-04-16 21:16   ` Marcelo Tosatti
  0 siblings, 1 reply; 3+ messages in thread
From: Christoffer Dall @ 2013-04-16 18:07 UTC (permalink / raw)
  To: Alexander Graf
  Cc: kvm@vger.kernel.org mailing list, Yang Zhang, Gleb Natapov,
	Marcelo Tosatti

On Tue, Apr 16, 2013 at 10:21 AM, Alexander Graf <agraf@suse.de> wrote:
> Commit aa2fbe6d broke the ARM KVM target by introducing a new parameter
> to irq handling functions.
>
> Fix the function prototype to get things compiling again and ignore the
> parameter just like we did before
>
> Signed-off-by: Alexander Graf <agraf@suse.de>
> ---
>  arch/arm/kvm/arm.c |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c
> index e4ad0bb..678596f 100644
> --- a/arch/arm/kvm/arm.c
> +++ b/arch/arm/kvm/arm.c
> @@ -805,7 +805,8 @@ static int vcpu_interrupt_line(struct kvm_vcpu *vcpu, int number, bool level)
>         return 0;
>  }
>
> -int kvm_vm_ioctl_irq_line(struct kvm *kvm, struct kvm_irq_level *irq_level)
> +int kvm_vm_ioctl_irq_line(struct kvm *kvm, struct kvm_irq_level *irq_level,
> +                         bool line_status)
>  {
>         u32 irq = irq_level->irq;
>         unsigned int irq_type, vcpu_idx, irq_num;
> --
> 1.6.0.2
>

Acked-by: Christoffer Dall <cdall@cs.columbia.edu>

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] KVM: ARM: Fix kvm_vm_ioctl_irq_line
  2013-04-16 18:07 ` Christoffer Dall
@ 2013-04-16 21:16   ` Marcelo Tosatti
  0 siblings, 0 replies; 3+ messages in thread
From: Marcelo Tosatti @ 2013-04-16 21:16 UTC (permalink / raw)
  To: Christoffer Dall
  Cc: Alexander Graf, kvm@vger.kernel.org mailing list, Yang Zhang,
	Gleb Natapov

On Tue, Apr 16, 2013 at 11:07:40AM -0700, Christoffer Dall wrote:
> On Tue, Apr 16, 2013 at 10:21 AM, Alexander Graf <agraf@suse.de> wrote:
> > Commit aa2fbe6d broke the ARM KVM target by introducing a new parameter
> > to irq handling functions.
> >
> > Fix the function prototype to get things compiling again and ignore the
> > parameter just like we did before
> >
> > Signed-off-by: Alexander Graf <agraf@suse.de>
> > ---
> >  arch/arm/kvm/arm.c |    3 ++-
> >  1 files changed, 2 insertions(+), 1 deletions(-)
> >
> > diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c
> > index e4ad0bb..678596f 100644
> > --- a/arch/arm/kvm/arm.c
> > +++ b/arch/arm/kvm/arm.c
> > @@ -805,7 +805,8 @@ static int vcpu_interrupt_line(struct kvm_vcpu *vcpu, int number, bool level)
> >         return 0;
> >  }
> >
> > -int kvm_vm_ioctl_irq_line(struct kvm *kvm, struct kvm_irq_level *irq_level)
> > +int kvm_vm_ioctl_irq_line(struct kvm *kvm, struct kvm_irq_level *irq_level,
> > +                         bool line_status)
> >  {
> >         u32 irq = irq_level->irq;
> >         unsigned int irq_type, vcpu_idx, irq_num;
> > --
> > 1.6.0.2
> >
> 
> Acked-by: Christoffer Dall <cdall@cs.columbia.edu>

Applied, thanks.


^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2013-04-16 21:19 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-04-16 17:21 [PATCH] KVM: ARM: Fix kvm_vm_ioctl_irq_line Alexander Graf
2013-04-16 18:07 ` Christoffer Dall
2013-04-16 21:16   ` Marcelo Tosatti

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox