KVM: VMX: use kvm_event_needs_reinjection

Use kvm_event_needs_reinjection() encapsulation.

Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Radim Krčmář <rkrcmar@redhat.com>
Signed-off-by: Wanpeng Li <wanpeng.li@hotmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 31ab27ea23186cac67b93e74d0dedcec1bac6a06..1ee5fe7ea5ffc425dfa38e5e9b3b41b888216c31 100644 (file)
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -11012,9 +11012,7 @@ static int vmx_check_nested_events(struct kvm_vcpu *vcpu, bool external_intr)
 {
        struct vcpu_vmx *vmx = to_vmx(vcpu);
 
-       if (vcpu->arch.exception.pending ||
-               vcpu->arch.nmi_injected ||
-               vcpu->arch.interrupt.pending)
+       if (kvm_event_needs_reinjection(vcpu))
                return -EBUSY;
 
        if (nested_cpu_has_preemption_timer(get_vmcs12(vcpu)) &&