diff options
author | Jan Kiszka <jan.kiszka@siemens.com> | 2008-09-26 03:30:53 -0400 |
---|---|---|
committer | Avi Kivity <avi@redhat.com> | 2008-12-31 09:51:42 -0500 |
commit | 0496fbb973ccc9477082e859ed0faab5acb805ba (patch) | |
tree | 2706b5f714d5b20f892e9fc985c33d6f7377393a /arch/x86/kvm/x86.c | |
parent | 23930f9521c9c4d4aa96cdb9d1e1703f3782bb94 (diff) |
KVM: x86: VCPU with pending NMI is runnabled
Ensure that a VCPU with pending NMIs is considered runnable.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/x86/kvm/x86.c')
-rw-r--r-- | arch/x86/kvm/x86.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 1a71f6735593..1fa9a6db633d 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c | |||
@@ -4130,7 +4130,8 @@ void kvm_arch_flush_shadow(struct kvm *kvm) | |||
4130 | int kvm_arch_vcpu_runnable(struct kvm_vcpu *vcpu) | 4130 | int kvm_arch_vcpu_runnable(struct kvm_vcpu *vcpu) |
4131 | { | 4131 | { |
4132 | return vcpu->arch.mp_state == KVM_MP_STATE_RUNNABLE | 4132 | return vcpu->arch.mp_state == KVM_MP_STATE_RUNNABLE |
4133 | || vcpu->arch.mp_state == KVM_MP_STATE_SIPI_RECEIVED; | 4133 | || vcpu->arch.mp_state == KVM_MP_STATE_SIPI_RECEIVED |
4134 | || vcpu->arch.nmi_pending; | ||
4134 | } | 4135 | } |
4135 | 4136 | ||
4136 | static void vcpu_kick_intr(void *info) | 4137 | static void vcpu_kick_intr(void *info) |