---

yaml --- r: 96917 b: refs/heads/master c: eedaa4e h: refs/heads/master i: 96915: 79b641a v: v3
git-mirror · May 18, 2008 · 8d4a814 · 8d4a814
1 parent 7abecb7
commit 8d4a814
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5ca9fd54e3d75489ff9c70d7af6e0b9a390dd656
+refs/heads/master: eedaa4e2af681a266c084c410238855bdfbc2787
diff --git a/trunk/arch/x86/kvm/i8254.c b/trunk/arch/x86/kvm/i8254.c
@@ -216,7 +216,7 @@ int pit_has_pending_timer(struct kvm_vcpu *vcpu)
 {
 	struct kvm_pit *pit = vcpu->kvm->arch.vpit;
 
-	if (pit && vcpu->vcpu_id == 0)
+	if (pit && vcpu->vcpu_id == 0 && pit->pit_state.inject_pending)
 		return atomic_read(&pit->pit_state.pit_timer.pending);
 
 	return 0;