On 13/09/2017 13:04, Wanpeng Li wrote: > From: Wanpeng Li <wanpeng.li@xxxxxxxxxxx> > > Don't block vCPU if there is pending exception. > > Cc: Paolo Bonzini <pbonzini@xxxxxxxxxx> > Cc: Radim Krčmář <rkrcmar@xxxxxxxxxx> > Signed-off-by: Wanpeng Li <wanpeng.li@xxxxxxxxxxx> > --- > arch/x86/kvm/x86.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c > index 6069af8..1a0dce4 100644 > --- a/arch/x86/kvm/x86.c > +++ b/arch/x86/kvm/x86.c > @@ -8452,6 +8452,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))) > Ok for 4.14-rc. Reviewed-by: Paolo Bonzini <pbonzini@xxxxxxxxxx> Paolo
