Skip to content

Commit b6c086d

Browse files
dmatlackbonzini
authored andcommitted
KVM: selftests: Move VMX_EPT_VPID_CAP_AD_BITS to vmx.h
This is a VMX-related macro so move it to vmx.h. While here, open code the mask like the rest of the VMX bitmask macros. No functional change intended. Reviewed-by: Peter Xu <peterx@redhat.com> Signed-off-by: David Matlack <dmatlack@google.com> Message-Id: <20220520233249.3776001-6-dmatlack@google.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
1 parent ce690e9 commit b6c086d

2 files changed

Lines changed: 2 additions & 3 deletions

File tree

tools/testing/selftests/kvm/include/x86_64/processor.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -511,9 +511,6 @@ void __virt_pg_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr, int level)
511511
#define X86_CR0_CD (1UL<<30) /* Cache Disable */
512512
#define X86_CR0_PG (1UL<<31) /* Paging */
513513

514-
/* VMX_EPT_VPID_CAP bits */
515-
#define VMX_EPT_VPID_CAP_AD_BITS (1ULL << 21)
516-
517514
#define XSTATE_XTILE_CFG_BIT 17
518515
#define XSTATE_XTILE_DATA_BIT 18
519516

tools/testing/selftests/kvm/include/x86_64/vmx.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,8 @@
9696
#define VMX_MISC_PREEMPTION_TIMER_RATE_MASK 0x0000001f
9797
#define VMX_MISC_SAVE_EFER_LMA 0x00000020
9898

99+
#define VMX_EPT_VPID_CAP_AD_BITS 0x00200000
100+
99101
#define EXIT_REASON_FAILED_VMENTRY 0x80000000
100102
#define EXIT_REASON_EXCEPTION_NMI 0
101103
#define EXIT_REASON_EXTERNAL_INTERRUPT 1

0 commit comments

Comments
 (0)