diff options
| author | Jan Kiszka <jan.kiszka@siemens.com> | 2008-09-26 09:30:53 +0200 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2008-12-31 15:51:42 +0100 |
| commit | 0496fbb973ccc9477082e859ed0faab5acb805ba (patch) | |
| tree | 2706b5f714d5b20f892e9fc985c33d6f7377393a /arch/x86/kvm/x86.c | |
| parent | KVM: x86: Enable NMI Watchdog via in-kernel PIT source (diff) | |
| download | linux-0496fbb973ccc9477082e859ed0faab5acb805ba.tar.xz linux-0496fbb973ccc9477082e859ed0faab5acb805ba.zip | |
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 '')
| -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) int kvm_arch_vcpu_runnable(struct kvm_vcpu *vcpu) { return vcpu->arch.mp_state == KVM_MP_STATE_RUNNABLE - || vcpu->arch.mp_state == KVM_MP_STATE_SIPI_RECEIVED; + || vcpu->arch.mp_state == KVM_MP_STATE_SIPI_RECEIVED + || vcpu->arch.nmi_pending; } static void vcpu_kick_intr(void *info) |