From: Wanpeng Li <wanpeng...@hotmail.com>

Use kvm_event_needs_reinjection() encapsulation.

Cc: Paolo Bonzini <pbonz...@redhat.com>
Cc: Radim Krčmář <rkrc...@redhat.com>
Signed-off-by: Wanpeng Li <wanpeng...@hotmail.com>
---
 arch/x86/kvm/vmx.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index c2e7c4b..a56e7f3 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -10931,9 +10931,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)) &&
-- 
2.7.4

Reply via email to