diff options
| author | Wanpeng Li <wanpeng.li@hotmail.com> | 2017-09-13 04:04:01 -0700 |
|---|---|---|
| committer | Radim Krčmář <rkrcmar@redhat.com> | 2017-09-14 17:16:14 +0200 |
| commit | a5f01f8e9756b40a56e351f98b3fae6d235b834f (patch) | |
| tree | 2e15eadc23de86ec505536de89b8d30090e494c6 | |
| parent | 67034bb9dd5ecc0171bdacfbd31ebf7c2634df98 (diff) | |
| download | linux-a5f01f8e9756b40a56e351f98b3fae6d235b834f.tar.bz2 | |
KVM: X86: Don't block vCPU if there is pending exception
Don't block vCPU if there is pending exception.
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Radim Krčmář <rkrcmar@redhat.com>
Signed-off-by: Wanpeng Li <wanpeng.li@hotmail.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
| -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 f4a978e36030..bfda79fb102c 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -8461,6 +8461,9 @@ static inline bool kvm_vcpu_has_events(struct kvm_vcpu *vcpu) if (vcpu->arch.pv.pv_unhalted) return true; + if (vcpu->arch.exception.pending) + return true; + if (kvm_test_request(KVM_REQ_NMI, vcpu) || (vcpu->arch.nmi_pending && kvm_x86_ops->nmi_allowed(vcpu))) |