---

yaml --- r: 315888 b: refs/heads/master c: de87dcd h: refs/heads/master v: v3
git-mirror · Jul 9, 2012 · d65aed3 · d65aed3
1 parent 77beab0
commit d65aed3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 612e89f01569f562dfa76cd5b76310a42b34a214
+refs/heads/master: de87dcddc70ec6a90adfcc81f0ad7d84a892ffce
diff --git a/trunk/arch/x86/kvm/vmx.c b/trunk/arch/x86/kvm/vmx.c
@@ -4986,6 +4986,9 @@ static int handle_invalid_guest_state(struct kvm_vcpu *vcpu)
 		if (intr_window_requested && vmx_interrupt_allowed(vcpu))
 			return handle_interrupt_window(&vmx->vcpu);
 
+		if (test_bit(KVM_REQ_EVENT, &vcpu->requests))
+			return 1;
+
 		err = emulate_instruction(vcpu, 0);
 
 		if (err == EMULATE_DO_MMIO) {