diff options
| author | Jason Wang <jasowang@redhat.com> | 2010-08-27 17:15:06 +0800 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2010-10-24 10:51:45 +0200 |
| commit | 23e7a7944f3779155e2f6bbc831b544eb925f387 (patch) | |
| tree | 8c8be289ae3fea799ebf94f363748ae97bd00994 | |
| parent | 989044ee0fdc6c22a11ea1d22e2a3d17463cb564 (diff) | |
| download | op-kernel-dev-23e7a7944f3779155e2f6bbc831b544eb925f387.zip op-kernel-dev-23e7a7944f3779155e2f6bbc831b544eb925f387.tar.gz | |
KVM: pit: Do not check pending pit timer in vcpu thread
Pit interrupt injection was done by workqueue, so no need to check
pending pit timer in vcpu thread which could lead unnecessary
unblocking of vcpu.
Signed-off-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
| -rw-r--r-- | arch/x86/kvm/i8254.c | 9 | ||||
| -rw-r--r-- | arch/x86/kvm/irq.c | 7 |
2 files changed, 1 insertions, 15 deletions
diff --git a/arch/x86/kvm/i8254.c b/arch/x86/kvm/i8254.c index ddeb231..2ad40a4 100644 --- a/arch/x86/kvm/i8254.c +++ b/arch/x86/kvm/i8254.c @@ -232,15 +232,6 @@ static void pit_latch_status(struct kvm *kvm, int channel) } } -int pit_has_pending_timer(struct kvm_vcpu *vcpu) -{ - struct kvm_pit *pit = vcpu->kvm->arch.vpit; - - if (pit && kvm_vcpu_is_bsp(vcpu) && pit->pit_state.irq_ack) - return atomic_read(&pit->pit_state.pit_timer.pending); - return 0; -} - static void kvm_pit_ack_irq(struct kvm_irq_ack_notifier *kian) { struct kvm_kpit_state *ps = container_of(kian, struct kvm_kpit_state, diff --git a/arch/x86/kvm/irq.c b/arch/x86/kvm/irq.c index 2095a04..f994da4 100644 --- a/arch/x86/kvm/irq.c +++ b/arch/x86/kvm/irq.c @@ -33,12 +33,7 @@ */ int kvm_cpu_has_pending_timer(struct kvm_vcpu *vcpu) { - int ret; - - ret = pit_has_pending_timer(vcpu); - ret |= apic_has_pending_timer(vcpu); - - return ret; + return apic_has_pending_timer(vcpu); } EXPORT_SYMBOL(kvm_cpu_has_pending_timer); |
