summaryrefslogtreecommitdiffstats
path: root/arch/x86/kvm/irq.c
diff options
context:
space:
mode:
authorGleb Natapov <gleb@redhat.com>2009-05-11 13:35:48 +0300
committerAvi Kivity <avi@redhat.com>2009-06-10 11:48:57 +0300
commit923c61bbc6413e87e5f6b0bae663d202a8de0537 (patch)
treea4ae8262a60f343bedb29f06be8510a21ef11dc8 /arch/x86/kvm/irq.c
parentfa9726b0733461781933ab7180aca45e46d0a891 (diff)
downloadop-kernel-dev-923c61bbc6413e87e5f6b0bae663d202a8de0537.zip
op-kernel-dev-923c61bbc6413e87e5f6b0bae663d202a8de0537.tar.gz
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.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kvm/irq.c b/arch/x86/kvm/irq.c
index 11c2757..96dfbb6 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) {
OpenPOWER on IntegriCloud