KVM: selftests: use X86_MEMTYPE_WB instead of VMX_BASIC_MEM_TYPE_WB
PATCH 1/1 KVM: selftests: use X86_MEMTYPE_WB instead of VMX_BASIC_MEM_TYPE_WB
In 08a7d2525511 ("tools arch x86: Sync the msr-index.h copy with the kernel sources"), VMX_BASIC_MEM_TYPE_WB was removed. Use X86_MEMTYPE_WB instead.
kernel sources")
--- tools/testing/selftests/kvm/lib/x86_64/vmx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/kvm/lib/x86_64/vmx.c +1 -1
@@ -200,7 +200,7 @@ static inline void init_vmcs_control_fields(struct vmx_pages *vmx)if (vmx->eptp_gpa) {uint64_t ept_paddr;struct eptPageTablePointer eptp = { - .memory_type =VMX_BASIC_MEM_TYPE_WB , + .memory_type =X86_MEMTYPE_WB , .page_walk_length =3 ,/* + 1 */ .ad_enabled =ept_vpid_cap_supported (VMX_EPT_VPID_CAP_AD_BITS ), .address = vmx->eptp_gpa >>PAGE_SHIFT_4K ,
Signature · 1 line
2.47.0.277.g8800431eea-goog
Quoted 3 lines · John Sperbeck
In
08a7d2525511("tools arch x86: Sync themsr-index.hcopy with the kernel sources"),VMX_BASIC_MEM_TYPE_WBwas removed. UseX86_MEMTYPE_WBinstead.
Drat. For all my talk about KVM selftests not caring about kernel headers, that's obviously not entirely true. Most of the selftests code is standalone, e.g. CR4 and xfeature bits are all manually defined. But redefining the myriad MSR #defines does seem like a complete waste of time and effort.
Quoted 2 lines
Fixes 08a7d2525511 ("tools arch x86: Sync the msr-index.h copy with thekernel sources")
Unnecessary newline, i.e. don't wrap metadata tags.
Quoted 1 line
Signed-off-by John Sperbeck <[email protected]>
Paolo, can you grab this for 6.12-rc7? And fixup the Fixes. I'll mention this again in the pull request I have planned for later today.
Quoted 20 lines
--- tools/testing/selftests/kvm/lib/x86_64/vmx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)tools/testing/selftests/kvm/lib/x86_64/vmx.c +1
-1@@ -200,7 +200,7 @@ static inline void init_vmcs_control_fields(struct vmx_pages *vmx)if (vmx->eptp_gpa) {uint64_t ept_paddr;struct eptPageTablePointer eptp = { - .memory_type =VMX_BASIC_MEM_TYPE_WB , + .memory_type =X86_MEMTYPE_WB , .page_walk_length =3 ,/* + 1 */ .ad_enabled =ept_vpid_cap_supported (VMX_EPT_VPID_CAP_AD_BITS ), .address = vmx->eptp_gpa >>PAGE_SHIFT_4K ,Signature · 1 line
2.47.0.277.g8800431eea-goog
Queued, thanks.
Paolo