From cad436926c92fc42caa24a2e6cfcc25f4e9d2bc1 Mon Sep 17 00:00:00 2001
From: Avi Kivity <avi@redhat.com>
Date: Sun, 10 Jun 2012 18:09:27 +0300
Subject: [PATCH] --- yaml --- r: 315883 b: refs/heads/master c:
 7c068e45587a83d4235dda55d35a7d305c58e0e5 h: refs/heads/master i:   315881:
 97e99acb20780f589339ebb2a6abf111338fb18f   315879:
 251f772780d72ae71e50bf7133eb5c9fa9f87c0e v: v3

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

diff --git a/[refs] b/[refs]
index 0c1f80fa3fe1..8c280ded8695 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bdea48e305389b3c8c0f786a317f9da984c16604
+refs/heads/master: 7c068e45587a83d4235dda55d35a7d305c58e0e5
diff --git a/trunk/arch/x86/kvm/vmx.c b/trunk/arch/x86/kvm/vmx.c
index 6cdb40457695..2e51e7c6d2a8 100644
--- a/trunk/arch/x86/kvm/vmx.c
+++ b/trunk/arch/x86/kvm/vmx.c
@@ -5002,7 +5002,7 @@ static int handle_invalid_guest_state(struct kvm_vcpu *vcpu)
 			schedule();
 	}
 
-	vmx->emulation_required = 0;
+	vmx->emulation_required = !guest_state_valid(vcpu);
 out:
 	return ret;
 }