From 6e679cbd4c6a15748a4d1a864c786a82a8bb7035 Mon Sep 17 00:00:00 2001
From: Avi Kivity <avi@redhat.com>
Date: Mon, 7 Mar 2011 14:54:28 +0200
Subject: [PATCH] --- yaml --- r: 247983 b: refs/heads/master c:
 f4c63e5d5a356b652a3d984edbefca289176c40f h: refs/heads/master i:   247981:
 22023427fd2b20e66a62023da38295df47ff277d   247979:
 1cd2345dad2d2b2648965ed994e1b338ffc52a69   247975:
 ae106f75082de41a6bff8c1637532643c5c1c97e   247967:
 64d4f17cbf759fd66560f356ec306808fb084ccf v: v3

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

diff --git a/[refs] b/[refs]
index 5e9b951b8136..f8fb2a710bfe 100644
--- 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
index 4d117072acf8..e8a35ee00735 100644
--- 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;