diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2015-10-13 10:19:35 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-27 09:53:40 +0900 |
| commit | 0c2d5845347acbb2c140bd3e75baa8cd4a368949 (patch) | |
| tree | 7ce4fb75592afccd2f9a2cb612861d044d14f2f3 /arch | |
| parent | ea83b307d539fe48c25cbfc8e1705673de21edc6 (diff) | |
KVM: x86: fix SMI to halted VCPU
commit 73917739334c6509833b0403b81d4a04a8784bdf upstream.
An SMI to a halted VCPU must wake it up, hence a VCPU with a pending
SMI must be considered runnable.
Fixes: 64d6067057d9658acb8675afcfba549abdb7fc16
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kvm/x86.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index f0cd0b8ae352..373328b71599 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -8030,6 +8030,9 @@ static inline bool kvm_vcpu_has_events(struct kvm_vcpu *vcpu) if (atomic_read(&vcpu->arch.nmi_queued)) return true; + if (test_bit(KVM_REQ_SMI, &vcpu->requests)) + return true; + if (kvm_arch_interrupt_allowed(vcpu) && kvm_cpu_has_interrupt(vcpu)) return true; |