|
@@ -6710,7 +6710,7 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu)
|
|
|
|
|
|
bool req_immediate_exit = false;
|
|
|
|
|
|
- if (vcpu->requests) {
|
|
|
+ if (kvm_request_pending(vcpu)) {
|
|
|
if (kvm_check_request(KVM_REQ_MMU_RELOAD, vcpu))
|
|
|
kvm_mmu_unload(vcpu);
|
|
|
if (kvm_check_request(KVM_REQ_MIGRATE_TIMER, vcpu))
|
|
@@ -6874,7 +6874,7 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu)
|
|
|
kvm_x86_ops->sync_pir_to_irr(vcpu);
|
|
|
}
|
|
|
|
|
|
- if (vcpu->mode == EXITING_GUEST_MODE || vcpu->requests
|
|
|
+ if (vcpu->mode == EXITING_GUEST_MODE || kvm_request_pending(vcpu)
|
|
|
|| need_resched() || signal_pending(current)) {
|
|
|
vcpu->mode = OUTSIDE_GUEST_MODE;
|
|
|
smp_wmb();
|