---

yaml --- r: 375271 b: refs/heads/master c: 8d76c49 h: refs/heads/master i: 375269: 792c1c9 375267: 5d8133a 375263: cf201db v: v3
git-mirror · May 9, 2013 · bdf4731 · bdf4731
1 parent 5506426
commit bdf4731
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7dac16c379a876e256bc7349cd80007e7f9f2b59
+refs/heads/master: 8d76c49e9ffeee839bc0b7a3278a23f99101263e
diff --git a/trunk/arch/x86/kvm/vmx.c b/trunk/arch/x86/kvm/vmx.c
@@ -5434,6 +5434,12 @@ static int handle_invalid_guest_state(struct kvm_vcpu *vcpu)
 			return 0;
 		}
 
+		if (vcpu->arch.halt_request) {
+			vcpu->arch.halt_request = 0;
+			ret = kvm_emulate_halt(vcpu);
+			goto out;
+		}
+
 		if (signal_pending(current))
 			goto out;
 		if (need_resched())