diff options
| author | Gleb Natapov <gleb@redhat.com> | 2009-05-11 12:35:48 +0200 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2009-06-10 10:48:57 +0200 |
| commit | 923c61bbc6413e87e5f6b0bae663d202a8de0537 (patch) | |
| tree | a4ae8262a60f343bedb29f06be8510a21ef11dc8 /arch/x86/kvm/irq.c | |
| parent | KVM: Do not allow interrupt injection from userspace if there is a pending ev... (diff) | |
| download | linux-923c61bbc6413e87e5f6b0bae663d202a8de0537.tar.xz linux-923c61bbc6413e87e5f6b0bae663d202a8de0537.zip | |
KVM: Remove irq_pending bitmap
Only one interrupt vector can be injected from userspace irqchip at
any given time so no need to store it in a bitmap. Put it into interrupt
queue directly.
Signed-off-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/x86/kvm/irq.c')
| -rw-r--r-- | arch/x86/kvm/irq.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kvm/irq.c b/arch/x86/kvm/irq.c index 11c2757b808f..96dfbb6ad2a9 100644 --- a/arch/x86/kvm/irq.c +++ b/arch/x86/kvm/irq.c @@ -50,7 +50,7 @@ int kvm_cpu_has_interrupt(struct kvm_vcpu *v) struct kvm_pic *s; if (!irqchip_in_kernel(v->kvm)) - return v->arch.irq_summary; + return v->arch.interrupt.pending; if (kvm_apic_has_interrupt(v) == -1) { /* LAPIC */ if (kvm_apic_accept_pic_intr(v)) { @@ -72,7 +72,7 @@ int kvm_cpu_get_interrupt(struct kvm_vcpu *v) int vector; if (!irqchip_in_kernel(v->kvm)) - return kvm_pop_irq(v); + return v->arch.interrupt.nr; vector = kvm_get_apic_interrupt(v); /* APIC */ if (vector == -1) { |