OS-745 system hung doing crosscalls

1 files changed, 2 insertions, 3 deletions

diff --git a/kvm_x86.c b/kvm_x86.c
index b27521e..3c4839a 100644
--- a/kvm_x86.c
+++ b/kvm_x86.c
@@ -3417,13 +3417,10 @@ vcpu_enter_guest(struct kvm_vcpu *vcpu)
 	if (vcpu->fpu_active)
 		kvm_load_guest_fpu(vcpu);
 
-	cli();
-
 	clear_bit(KVM_REQ_KICK, &vcpu->requests);
 
 	if (vcpu->requests || issig(JUSTLOOKING)) {
 		set_bit(KVM_REQ_KICK, &vcpu->requests);
-		sti();
 		kpreempt_enable();
 		r = 1;
 		goto out;
@@ -3431,6 +3428,8 @@ vcpu_enter_guest(struct kvm_vcpu *vcpu)
 
 	inject_pending_event(vcpu);
 
+	cli();
+
 	/* enable NMI/IRQ window open exits if needed */
 	if (vcpu->arch.nmi_pending)
 		kvm_x86_ops->enable_nmi_window(vcpu);