From a1a2caac31456269d24af53874d9182a3ae9d125 Mon Sep 17 00:00:00 2001
From: Avi Kivity <avi@redhat.com>
Date: Tue, 12 Jun 2012 20:22:28 +0300
Subject: [PATCH] --- yaml --- r: 315889 b: refs/heads/master c:
 de5f70e0c65fcd0472a412a7a9690afcd3ee4526 h: refs/heads/master i:   315887:
 77beab01a46587dd199e2dcfeee5e5727aac9fc6 v: v3

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

diff --git a/[refs] b/[refs]
index e8728538fb82..ad1586f25327 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: de87dcddc70ec6a90adfcc81f0ad7d84a892ffce
+refs/heads/master: de5f70e0c65fcd0472a412a7a9690afcd3ee4526
diff --git a/trunk/arch/x86/kvm/vmx.c b/trunk/arch/x86/kvm/vmx.c
index a62f92ab1be2..c61eb34a39e7 100644
--- a/trunk/arch/x86/kvm/vmx.c
+++ b/trunk/arch/x86/kvm/vmx.c
@@ -4996,8 +4996,12 @@ static int handle_invalid_guest_state(struct kvm_vcpu *vcpu)
 			goto out;
 		}
 
-		if (err != EMULATE_DONE)
+		if (err != EMULATE_DONE) {
+			vcpu->run->exit_reason = KVM_EXIT_INTERNAL_ERROR;
+			vcpu->run->internal.suberror = KVM_INTERNAL_ERROR_EMULATION;
+			vcpu->run->internal.ndata = 0;
 			return 0;
+		}
 
 		if (signal_pending(current))
 			goto out;