From: Gleb Natapov <gleb@qumranet.com>
Date: Mon, 22 Sep 2008 11:28:53 +0000 (+0300)
Subject: KVM: don't enter guest after SIPI was received by a CPU
X-Git-Tag: v2.6.28-rc1~269^2~30
X-Git-Url: http://pilppa.org/gitweb/?a=commitdiff_plain;h=af2152f5457448bd90cb019c108e0a85e716fdbe;p=linux-2.6-omap-h63xx.git

KVM: don't enter guest after SIPI was received by a CPU

The vcpu should process pending SIPI message before entering guest mode again.
kvm_arch_vcpu_runnable() returns true if the vcpu is in SIPI state, so
we can't call it here.

Signed-off-by: Gleb Natapov <gleb@qumranet.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
---

diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 1b738cb0283..08edeabf15e 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -3233,7 +3233,7 @@ static int __vcpu_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
 
 	r = 1;
 	while (r > 0) {
-		if (kvm_arch_vcpu_runnable(vcpu))
+		if (vcpu->arch.mp_state == KVM_MP_STATE_RUNNABLE)
 			r = vcpu_enter_guest(vcpu, kvm_run);
 		else {
 			up_read(&vcpu->kvm->slots_lock);