Ben-Ami Yassour wrote:> On Sat, 2008-07-05 at 14:05 +0300, Avi Kivity wrote:> >> Amit Shah wrote:>> >>> This function injects an interrupt into the guest given the kvm struct,>>> the (guest) irq number and the interrupt level.>>>>>> Signed-off-by: Amit Shah <amit.shah@xxxxxxxxxxxx>>>> --->>> arch/x86/kvm/irq.c | 11 +++++++++++>>> arch/x86/kvm/irq.h | 2 ++>>> 2 files changed, 13 insertions(+), 0 deletions(-)>>>>>> diff --git a/arch/x86/kvm/irq.c b/arch/x86/kvm/irq.c>>> index 76d736b..0d9e552 100644>>> --- a/arch/x86/kvm/irq.c>>> +++ b/arch/x86/kvm/irq.c>>> @@ -100,3 +100,14 @@ void __kvm_migrate_timers(struct kvm_vcpu *vcpu)>>> __kvm_migrate_apic_timer(vcpu);>>> __kvm_migrate_pit_timer(vcpu);>>> }>>> +>>> +/* This should be called with the kvm->lock mutex held */>>> +void kvm_set_irq(struct kvm *kvm, int irq, int level)>>> +{>>> + /* Not possible to detect if the guest uses the PIC or the>>> + * IOAPIC. So set the bit in both. The guest will ignore>>> + * writes to the unused one.>>> + */>>> + kvm_ioapic_set_irq(kvm->arch.vioapic, irq, level);>>> + kvm_pic_set_irq(pic_irqchip(kvm), irq, level);>>> +}>>> >>> >> pic supports only irqs 0-15.>>>> I guess instead of adding the check here, better move it into i8259.c >> and ioapic.c.>>>>>> >> Do you mean something like the patch below?> ( in the ioapic code there is already a check for the irq: if (irq >= 0 && irq < IOAPIC_NUM_PINS) )>> Thanks,> Ben>> diff --git a/arch/x86/kvm/i8259.c b/arch/x86/kvm/i8259.c> index 3ba5e5c..c2c4884 100644> --- a/arch/x86/kvm/i8259.c> +++ b/arch/x86/kvm/i8259.c> @@ -130,8 +130,10 @@ void kvm_pic_set_irq(void *opaque, int irq, int level)> {> struct kvm_pic *s = opaque;> > - pic_set_irq1(&s->pics[irq >> 3], irq & 7, level);> - pic_update_irq(s);> + if (irq >= 0 && irq < PIC_NUM_PINS) {> + pic_set_irq1(&s->pics[irq >> 3], irq & 7, level);> + pic_update_irq(s);> + }> }> > /*> diff --git a/arch/x86/kvm/irq.h b/arch/x86/kvm/irq.h> index bef9127..e9c7b3f 100644> --- a/arch/x86/kvm/irq.h> +++ b/arch/x86/kvm/irq.h> @@ -30,6 +30,8 @@> #include "ioapic.h"> #include "lapic.h"> > +#define PIC_NUM_PINS 15> +>
16
Also, needs signoff and changelog entry.
-- error compiling committee.c: too many arguments to function
_______________________________________________Virtualization mailing listVirtualization@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx://lists.linux-foundation.org/mailman/listinfo/virtualization
