From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marcelo Tosatti Subject: Re: [PATCH] KVM: ARM: Fix kvm_vm_ioctl_irq_line Date: Tue, 16 Apr 2013 18:16:24 -0300 Message-ID: <20130416211624.GA21244@amt.cnet> References: <1366132901-23461-1-git-send-email-agraf@suse.de> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: Alexander Graf , "kvm@vger.kernel.org mailing list" , Yang Zhang , Gleb Natapov To: Christoffer Dall Return-path: Received: from mx1.redhat.com ([209.132.183.28]:62625 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965219Ab3DPVTB (ORCPT ); Tue, 16 Apr 2013 17:19:01 -0400 Content-Disposition: inline In-Reply-To: Sender: kvm-owner@vger.kernel.org List-ID: On Tue, Apr 16, 2013 at 11:07:40AM -0700, Christoffer Dall wrote: > On Tue, Apr 16, 2013 at 10:21 AM, Alexander Graf 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 > > --- > > 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 Applied, thanks.