From bdf473175b06499d5b01edc1109b5b18f835998f Mon Sep 17 00:00:00 2001
From: Gleb Natapov <gleb@redhat.com>
Date: Wed, 8 May 2013 18:38:44 +0300
Subject: [PATCH] --- yaml --- r: 375271 b: refs/heads/master c:
 8d76c49e9ffeee839bc0b7a3278a23f99101263e h: refs/heads/master i:   375269:
 792c1c998128bf16a78ffbf8912df00af5ee5b00   375267:
 5d8133ad10a47e9340180c04fddf1a0e5cd7cfab   375263:
 cf201dbf85d5fb713ba666d59b8db0a32f584ef2 v: v3

---
 [refs]                   | 2 +-
 trunk/arch/x86/kvm/vmx.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index afd494efbcd4..6301bfb06b32 100644
--- 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
index 25a791ed21c8..260a91939555 100644
--- 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())