From 094541c742437d9f1160dd5c5086a952a6dd7115 Mon Sep 17 00:00:00 2001 From: Gleb Natapov Date: Sun, 22 Mar 2009 12:37:05 +0200 Subject: [PATCH] --- yaml --- r: 146503 b: refs/heads/master c: 61c50edfcd40be9126579f9cec68c789b6089998 h: refs/heads/master i: 146501: 8f1b7365d06f60f7b5b85bcfd42b245bef4bf5c2 146499: b6dd3b2623aaa037b4f088fe169cb796160cc73c 146495: 3a9e2ad8d9a87c3470b13c6ef136a1c7e6e658c1 v: v3 --- [refs] | 2 +- trunk/arch/x86/kvm/svm.c | 10 +--------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index cbfd05340185..13398716f62d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7fe29e0faacb650d31b9e9f538203a157bec821d +refs/heads/master: 61c50edfcd40be9126579f9cec68c789b6089998 diff --git a/trunk/arch/x86/kvm/svm.c b/trunk/arch/x86/kvm/svm.c index 1f8510c51d6e..5b35ebd4ec88 100644 --- a/trunk/arch/x86/kvm/svm.c +++ b/trunk/arch/x86/kvm/svm.c @@ -2346,15 +2346,7 @@ static void kvm_reput_irq(struct vcpu_svm *svm) static void svm_do_inject_vector(struct vcpu_svm *svm) { - struct kvm_vcpu *vcpu = &svm->vcpu; - int word_index = __ffs(vcpu->arch.irq_summary); - int bit_index = __ffs(vcpu->arch.irq_pending[word_index]); - int irq = word_index * BITS_PER_LONG + bit_index; - - clear_bit(bit_index, &vcpu->arch.irq_pending[word_index]); - if (!vcpu->arch.irq_pending[word_index]) - clear_bit(word_index, &vcpu->arch.irq_summary); - svm_inject_irq(svm, irq); + svm_inject_irq(svm, pop_irq(&svm->vcpu)); } static void do_interrupt_requests(struct kvm_vcpu *vcpu,