diff options
author | Marcelo Tosatti <mtosatti@redhat.com> | 2008-04-11 14:53:26 -0300 |
---|---|---|
committer | Avi Kivity <avi@qumranet.com> | 2008-04-27 12:04:11 +0300 |
commit | 3d80840d96127401ba6aeadd813c3a15b84e70fe (patch) | |
tree | b3e083c651f09fee362d88f0d1fc140194f2431d /arch/ia64 | |
parent | 3564990af1b9f77a63692c1079e9c41af229f066 (diff) | |
download | op-kernel-dev-3d80840d96127401ba6aeadd813c3a15b84e70fe.zip op-kernel-dev-3d80840d96127401ba6aeadd813c3a15b84e70fe.tar.gz |
KVM: hlt emulation should take in-kernel APIC/PIT timers into account
Timers that fire between guest hlt and vcpu_block's add_wait_queue() are
ignored, possibly resulting in hangs.
Also make sure that atomic_inc and waitqueue_active tests happen in the
specified order, otherwise the following race is open:
CPU0 CPU1
if (waitqueue_active(wq))
add_wait_queue()
if (!atomic_read(pit_timer->pending))
schedule()
atomic_inc(pit_timer->pending)
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>
Diffstat (limited to 'arch/ia64')
-rw-r--r-- | arch/ia64/kvm/kvm-ia64.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/ia64/kvm/kvm-ia64.c b/arch/ia64/kvm/kvm-ia64.c index 9c56b64..ca1cfb1 100644 --- a/arch/ia64/kvm/kvm-ia64.c +++ b/arch/ia64/kvm/kvm-ia64.c @@ -1778,6 +1778,11 @@ int kvm_cpu_has_interrupt(struct kvm_vcpu *vcpu) return 0; } +int kvm_cpu_has_pending_timer(struct kvm_vcpu *vcpu) +{ + return 0; +} + gfn_t unalias_gfn(struct kvm *kvm, gfn_t gfn) { return gfn; |