From 8d4a8142b645c6de76a3b30c4ec0d1dc350b5c78 Mon Sep 17 00:00:00 2001
From: Marcelo Tosatti <mtosatti@redhat.com>
Date: Tue, 6 May 2008 13:32:54 -0300
Subject: [PATCH] --- yaml --- r: 96917 b: refs/heads/master c:
 eedaa4e2af681a266c084c410238855bdfbc2787 h: refs/heads/master i:   96915:
 79b641a69c7acd489a20f1811bd8a5a4086459e6 v: v3

---
 [refs]                     | 2 +-
 trunk/arch/x86/kvm/i8254.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index cd9503631273..c12bd6ee076c 100644
--- 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
index 3324d90038e4..7c077a9d9777 100644
--- 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;