Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 197844
b: refs/heads/master
c: a3d204e
h: refs/heads/master
v: v3
  • Loading branch information
Sheng Yang authored and Avi Kivity committed May 19, 2010
1 parent bcf740d commit 499e9e0
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f78e917688edbf1f14c318d2e50dc8e7dad20445
refs/heads/master: a3d204e28579427609c3d15d2310127ebaa47d94
4 changes: 2 additions & 2 deletions trunk/arch/x86/kvm/x86.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 499e9e0

Please sign in to comment.