---

yaml --- r: 356873 b: refs/heads/master c: 286da41 h: refs/heads/master i: 356871: d1aa0a8 v: v3
git-mirror · Jan 24, 2013 · 68d9f8f · 68d9f8f
1 parent 3efa503
commit 68d9f8f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c5e97c80b5ddd6139bdadcbd44e263c2a3e7fae6
+refs/heads/master: 286da4156dc65c8a054580fdd96b7709132dce8d
diff --git a/trunk/arch/x86/kvm/vmx.c b/trunk/arch/x86/kvm/vmx.c
@@ -4035,9 +4035,6 @@ static int vmx_vcpu_reset(struct kvm_vcpu *vcpu)
 
 	ret = 0;
 
-	/* HACK: Don't enable emulation on guest boot/reset */
-	vmx->emulation_required = 0;
-
 	return ret;
 }