|
@@ -7023,6 +7023,9 @@ static inline int vcpu_block(struct kvm *kvm, struct kvm_vcpu *vcpu)
|
|
|
|
|
|
static inline bool kvm_vcpu_running(struct kvm_vcpu *vcpu)
|
|
|
{
|
|
|
+ if (is_guest_mode(vcpu) && kvm_x86_ops->check_nested_events)
|
|
|
+ kvm_x86_ops->check_nested_events(vcpu, false);
|
|
|
+
|
|
|
return (vcpu->arch.mp_state == KVM_MP_STATE_RUNNABLE &&
|
|
|
!vcpu->arch.apf.halted);
|
|
|
}
|
|
@@ -8389,9 +8392,6 @@ static inline bool kvm_vcpu_has_events(struct kvm_vcpu *vcpu)
|
|
|
|
|
|
int kvm_arch_vcpu_runnable(struct kvm_vcpu *vcpu)
|
|
|
{
|
|
|
- if (is_guest_mode(vcpu) && kvm_x86_ops->check_nested_events)
|
|
|
- kvm_x86_ops->check_nested_events(vcpu, false);
|
|
|
-
|
|
|
return kvm_vcpu_running(vcpu) || kvm_vcpu_has_events(vcpu);
|
|
|
}
|
|
|
|