diff options
| author | Avi Kivity <avi@qumranet.com> | 2007-12-09 10:27:52 -0500 |
|---|---|---|
| committer | Avi Kivity <avi@qumranet.com> | 2008-01-30 10:53:20 -0500 |
| commit | b4ab019ce71efe30790b5aaa396549a16bb20608 (patch) | |
| tree | f502e79d39cce0af0514d6f03fe09aa2d9ceed43 | |
| parent | 41074d07c78b086b18fc2af590caef05dbcca568 (diff) | |
KVM: MMU: No need to pick up nx bit from guest pte
We already set it according to cumulative access permissions.
Signed-off-by: Avi Kivity <avi@qumranet.com>
| -rw-r--r-- | drivers/kvm/paging_tmpl.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/kvm/paging_tmpl.h b/drivers/kvm/paging_tmpl.h index 211fef83be5d..179ce9e8145e 100644 --- a/drivers/kvm/paging_tmpl.h +++ b/drivers/kvm/paging_tmpl.h | |||
| @@ -258,7 +258,6 @@ static void FNAME(set_pte)(struct kvm_vcpu *vcpu, pt_element_t gpte, | |||
| 258 | * demand paging). | 258 | * demand paging). |
| 259 | */ | 259 | */ |
| 260 | spte = PT_PRESENT_MASK | PT_DIRTY_MASK; | 260 | spte = PT_PRESENT_MASK | PT_DIRTY_MASK; |
| 261 | spte |= gpte & PT64_NX_MASK; | ||
| 262 | if (!dirty) | 261 | if (!dirty) |
| 263 | pte_access &= ~ACC_WRITE_MASK; | 262 | pte_access &= ~ACC_WRITE_MASK; |
| 264 | if (!(pte_access & ACC_EXEC_MASK)) | 263 | if (!(pte_access & ACC_EXEC_MASK)) |