From: Sheng Yang <sheng@linux.intel.com>
Date: Wed, 12 May 2010 08:40:40 +0000 (+0800)
Subject: KVM: x86: Check LMA bit before set_efer
X-Git-Tag: firefly_0821_release~10186^2~1447
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e4a13296e7e92ddd73fa078906744d73f7d470ff;p=firefly-linux-kernel-4.4.55.git

KVM: x86: Check LMA bit before set_efer

kvm_x86_ops->set_efer() would execute vcpu->arch.efer = efer, so the
checking of LMA bit didn't work.

Signed-off-by: Sheng Yang <sheng@linux.intel.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
(cherry picked from commit a3d204e28579427609c3d15d2310127ebaa47d94)
---

diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index fa536e8db69e..3f83a30d1802 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -516,11 +516,11 @@ static void set_efer(struct kvm_vcpu *vcpu, u64 efer)
 		}
 	}
 
-	kvm_x86_ops->set_efer(vcpu, efer);
-
 	efer &= ~EFER_LMA;
 	efer |= vcpu->arch.shadow_efer & EFER_LMA;
 
+	kvm_x86_ops->set_efer(vcpu, efer);
+
 	vcpu->arch.shadow_efer = efer;
 
 	vcpu->arch.mmu.base_role.nxe = (efer & EFER_NX) && !tdp_enabled;