---

yaml --- r: 315883 b: refs/heads/master c: 7c068e4 h: refs/heads/master i: 315881: 97e99ac 315879: 251f772 v: v3
git-mirror · Jul 9, 2012 · cad4369 · cad4369
1 parent e8a8b0d
commit cad4369
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;
 }