diff options
| author | Sheng Yang <sheng@linux.intel.com> | 2010-05-12 16:40:40 +0800 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2010-05-19 11:41:09 +0300 |
| commit | a3d204e28579427609c3d15d2310127ebaa47d94 (patch) | |
| tree | d4da68fd9437dab5b1444766c7367f81496ea4e1 /arch/x86 | |
| parent | f78e917688edbf1f14c318d2e50dc8e7dad20445 (diff) | |
| download | linux-stable-a3d204e28579427609c3d15d2310127ebaa47d94.tar.gz linux-stable-a3d204e28579427609c3d15d2310127ebaa47d94.tar.bz2 linux-stable-a3d204e28579427609c3d15d2310127ebaa47d94.zip | |
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>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/kvm/x86.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index fa1c51925597..f0846d2aa956 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -709,11 +709,11 @@ static int set_efer(struct kvm_vcpu *vcpu, u64 efer) return 1; } - kvm_x86_ops->set_efer(vcpu, efer); - efer &= ~EFER_LMA; efer |= vcpu->arch.efer & EFER_LMA; + kvm_x86_ops->set_efer(vcpu, efer); + vcpu->arch.efer = efer; vcpu->arch.mmu.base_role.nxe = (efer & EFER_NX) && !tdp_enabled; |