diff options
| author | Gleb Natapov <gleb@redhat.com> | 2009-03-22 12:37:05 +0200 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2009-03-22 13:10:49 +0200 |
| commit | b984041127958ff8bc044126083aeb33e42358e7 (patch) | |
| tree | 5bfed22a95694b18daa5a92f5cee4d4aa004dcc8 | |
| parent | 4f7623153da786a5a79ff4c59d29c220a3bfe60d (diff) | |
KVM: SVM: Remove duplicate code in svm_do_inject_vector()kvm-85rc1
svm_do_inject_vector() reimplements pop_irq().
Signed-off-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
| -rw-r--r-- | arch/x86/kvm/svm.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c index 1821c2078199..da23fd334074 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c @@ -2344,15 +2344,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, |