aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorSheng Yang <sheng@linux.intel.com>2010-02-09 03:41:53 -0500
committerMarcelo Tosatti <mtosatti@redhat.com>2010-03-01 10:36:09 -0500
commita19a6d1131c77822ae55f84a1bd6d62327e99287 (patch)
treea7bb115957c3d6cc829e97aca231bed8c7a8d9d8 /arch
parent90bb6fc556ab255abd798bcf4ff5769690ab2eea (diff)
KVM: VMX: Rename VMX_EPT_IGMT_BIT to VMX_EPT_IPAT_BIT
Following the new SDM. Now the bit is named "Ignore PAT memory type". Signed-off-by: Sheng Yang <sheng@linux.intel.com> Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/include/asm/vmx.h2
-rw-r--r--arch/x86/kvm/vmx.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/include/asm/vmx.h b/arch/x86/include/asm/vmx.h
index 43f1e9b45917..fb9a080740ec 100644
--- a/arch/x86/include/asm/vmx.h
+++ b/arch/x86/include/asm/vmx.h
@@ -377,7 +377,7 @@ enum vmcs_field {
377#define VMX_EPT_READABLE_MASK 0x1ull 377#define VMX_EPT_READABLE_MASK 0x1ull
378#define VMX_EPT_WRITABLE_MASK 0x2ull 378#define VMX_EPT_WRITABLE_MASK 0x2ull
379#define VMX_EPT_EXECUTABLE_MASK 0x4ull 379#define VMX_EPT_EXECUTABLE_MASK 0x4ull
380#define VMX_EPT_IGMT_BIT (1ull << 6) 380#define VMX_EPT_IPAT_BIT (1ull << 6)
381 381
382#define VMX_EPT_IDENTITY_PAGETABLE_ADDR 0xfffbc000ul 382#define VMX_EPT_IDENTITY_PAGETABLE_ADDR 0xfffbc000ul
383 383
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index b400be06c8cd..f82b0723afa5 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -4001,7 +4001,7 @@ static u64 vmx_get_mt_mask(struct kvm_vcpu *vcpu, gfn_t gfn, bool is_mmio)
4001 * b. VT-d with snooping control feature: snooping control feature of 4001 * b. VT-d with snooping control feature: snooping control feature of
4002 * VT-d engine can guarantee the cache correctness. Just set it 4002 * VT-d engine can guarantee the cache correctness. Just set it
4003 * to WB to keep consistent with host. So the same as item 3. 4003 * to WB to keep consistent with host. So the same as item 3.
4004 * 3. EPT without VT-d: always map as WB and set IGMT=1 to keep 4004 * 3. EPT without VT-d: always map as WB and set IPAT=1 to keep
4005 * consistent with host MTRR 4005 * consistent with host MTRR
4006 */ 4006 */
4007 if (is_mmio) 4007 if (is_mmio)
@@ -4012,7 +4012,7 @@ static u64 vmx_get_mt_mask(struct kvm_vcpu *vcpu, gfn_t gfn, bool is_mmio)
4012 VMX_EPT_MT_EPTE_SHIFT; 4012 VMX_EPT_MT_EPTE_SHIFT;
4013 else 4013 else
4014 ret = (MTRR_TYPE_WRBACK << VMX_EPT_MT_EPTE_SHIFT) 4014 ret = (MTRR_TYPE_WRBACK << VMX_EPT_MT_EPTE_SHIFT)
4015 | VMX_EPT_IGMT_BIT; 4015 | VMX_EPT_IPAT_BIT;
4016 4016
4017 return ret; 4017 return ret;
4018} 4018}