From mboxrd@z Thu Jan 1 00:00:00 1970 From: Avi Kivity Subject: Re: [PATCH] KVM: x86: Use kvm_set_irq to inject interrupts Date: Mon, 18 Aug 2008 14:38:20 +0300 Message-ID: <48A95F2C.5050804@qumranet.com> References: <1219058461-13409-1-git-send-email-avi@qumranet.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: kvm@vger.kernel.org To: avi@qumranet.com, Amit Shah Return-path: Received: from il.qumranet.com ([212.179.150.194]:15883 "EHLO il.qumranet.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751921AbYHRLiY (ORCPT ); Mon, 18 Aug 2008 07:38:24 -0400 In-Reply-To: <1219058461-13409-1-git-send-email-avi@qumranet.com> Sender: kvm-owner@vger.kernel.org List-ID: Configuration problem? Avi Kivity doesn't think he wrote: > From: Amit Shah > > ... instead of using the pic and ioapic variants > > Signed-off-by: Amit Shah > --- > arch/x86/kvm/i8254.c | 6 ++---- > arch/x86/kvm/x86.c | 8 +------- > 2 files changed, 3 insertions(+), 11 deletions(-) > > diff --git a/arch/x86/kvm/i8254.c b/arch/x86/kvm/i8254.c > index 7d04dd3..c43894f 100644 > --- a/arch/x86/kvm/i8254.c > +++ b/arch/x86/kvm/i8254.c > @@ -596,10 +596,8 @@ void kvm_free_pit(struct kvm *kvm) > static void __inject_pit_timer_intr(struct kvm *kvm) > { > mutex_lock(&kvm->lock); > - kvm_ioapic_set_irq(kvm->arch.vioapic, 0, 1); > - kvm_ioapic_set_irq(kvm->arch.vioapic, 0, 0); > - kvm_pic_set_irq(pic_irqchip(kvm), 0, 1); > - kvm_pic_set_irq(pic_irqchip(kvm), 0, 0); > + kvm_set_irq(kvm, 0, 1); > + kvm_set_irq(kvm, 0, 0); > mutex_unlock(&kvm->lock); > } > > diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c > index ee005a6..4933f0c 100644 > --- a/arch/x86/kvm/x86.c > +++ b/arch/x86/kvm/x86.c > @@ -1951,13 +1951,7 @@ long kvm_arch_vm_ioctl(struct file *filp, > goto out; > if (irqchip_in_kernel(kvm)) { > mutex_lock(&kvm->lock); > - if (irq_event.irq < 16) > - kvm_pic_set_irq(pic_irqchip(kvm), > - irq_event.irq, > - irq_event.level); > - kvm_ioapic_set_irq(kvm->arch.vioapic, > - irq_event.irq, > - irq_event.level); > + kvm_set_irq(kvm, irq_event.irq, irq_event.level); > mutex_unlock(&kvm->lock); > r = 0; > } > -- error compiling committee.c: too many arguments to function