diff options
| author | Gleb Natapov <gleb@qumranet.com> | 2008-09-22 14:28:53 +0300 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2008-10-15 14:25:09 +0200 |
| commit | af2152f5457448bd90cb019c108e0a85e716fdbe (patch) | |
| tree | 49d04ee98da457e29be09b3143361212b982f898 /arch/x86 | |
| parent | 9ea1de4ea4b04d5132eb74917ecea77dda13ce76 (diff) | |
| download | linux-3.10-af2152f5457448bd90cb019c108e0a85e716fdbe.tar.gz linux-3.10-af2152f5457448bd90cb019c108e0a85e716fdbe.tar.bz2 linux-3.10-af2152f5457448bd90cb019c108e0a85e716fdbe.zip | |
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>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/kvm/x86.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); |