---

yaml --- r: 247983 b: refs/heads/master c: f4c63e5 h: refs/heads/master i: 247981: 2202342 247979: 1cd2345 247975: ae106f7 247967: 64d4f17 v: v3
git-mirror · May 11, 2011 · 6e679cb · 6e679cb
1 parent da5f80c
commit 6e679cb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6de12732c42c7070af42e3d6e42ecee2838fc920
+refs/heads/master: f4c63e5d5a356b652a3d984edbefca289176c40f
diff --git a/trunk/arch/x86/kvm/vmx.c b/trunk/arch/x86/kvm/vmx.c
@@ -2120,7 +2120,8 @@ static int vmx_get_cpl(struct kvm_vcpu *vcpu)
 	if (!is_protmode(vcpu))
 		return 0;
 
-	if (kvm_get_rflags(vcpu) & X86_EFLAGS_VM) /* if virtual 8086 */
+	if (!is_long_mode(vcpu)
+	    && (kvm_get_rflags(vcpu) & X86_EFLAGS_VM)) /* if virtual 8086 */
 		return 3;
 
 	return vmcs_read16(GUEST_CS_SELECTOR) & 3;