| From 39a83d0c5579b897c8b72cd7a15320baca3df6ab Mon Sep 17 00:00:00 2001 |
| From: Sheng Yang <sheng@linux.intel.com> |
| Date: Wed, 12 May 2010 16:40:40 +0800 |
| Subject: KVM: x86: Check LMA bit before set_efer |
| |
| From: Sheng Yang <sheng@linux.intel.com> |
| |
| 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) |
| --- |
| arch/x86/kvm/x86.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- a/arch/x86/kvm/x86.c |
| +++ b/arch/x86/kvm/x86.c |
| @@ -516,11 +516,11 @@ static void set_efer(struct kvm_vcpu *vc |
| } |
| } |
| |
| - 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; |
