diff options
| author | Vitaly Kuznetsov <vkuznets@redhat.com> | 2020-06-10 15:58:46 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2020-06-11 12:35:17 -0400 |
| commit | 41a23ab336fbf4d01036e1aa6369d7364aa29b4c (patch) | |
| tree | d0b517861b6f56ea33b5a6ac1694bc731e12f906 /tools/testing/selftests/kvm/include/x86_64 | |
| parent | 77f81f37fb1fdce76304cc7858e91b223bfcef72 (diff) | |
| download | linux-41a23ab336fbf4d01036e1aa6369d7364aa29b4c.tar.gz linux-41a23ab336fbf4d01036e1aa6369d7364aa29b4c.tar.bz2 linux-41a23ab336fbf4d01036e1aa6369d7364aa29b4c.zip | |
KVM: selftests: do not substitute SVM/VMX check with KVM_CAP_NESTED_STATE check
state_test/smm_test use KVM_CAP_NESTED_STATE check as an indicator for
nested VMX/SVM presence and this is incorrect. Check for the required
features dirrectly.
Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Message-Id: <20200610135847.754289-2-vkuznets@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'tools/testing/selftests/kvm/include/x86_64')
| -rw-r--r-- | tools/testing/selftests/kvm/include/x86_64/svm_util.h | 1 | ||||
| -rw-r--r-- | tools/testing/selftests/kvm/include/x86_64/vmx.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/tools/testing/selftests/kvm/include/x86_64/svm_util.h b/tools/testing/selftests/kvm/include/x86_64/svm_util.h index 674151d24fcf..b7531c83b8ae 100644 --- a/tools/testing/selftests/kvm/include/x86_64/svm_util.h +++ b/tools/testing/selftests/kvm/include/x86_64/svm_util.h @@ -33,6 +33,7 @@ struct svm_test_data { struct svm_test_data *vcpu_alloc_svm(struct kvm_vm *vm, vm_vaddr_t *p_svm_gva); void generic_svm_setup(struct svm_test_data *svm, void *guest_rip, void *guest_rsp); void run_guest(struct vmcb *vmcb, uint64_t vmcb_gpa); +bool nested_svm_supported(void); void nested_svm_check_supported(void); static inline bool cpu_has_svm(void) diff --git a/tools/testing/selftests/kvm/include/x86_64/vmx.h b/tools/testing/selftests/kvm/include/x86_64/vmx.h index 766af9944294..16fa21ebb99c 100644 --- a/tools/testing/selftests/kvm/include/x86_64/vmx.h +++ b/tools/testing/selftests/kvm/include/x86_64/vmx.h @@ -603,6 +603,7 @@ bool prepare_for_vmx_operation(struct vmx_pages *vmx); void prepare_vmcs(struct vmx_pages *vmx, void *guest_rip, void *guest_rsp); bool load_vmcs(struct vmx_pages *vmx); +bool nested_vmx_supported(void); void nested_vmx_check_supported(void); void nested_pg_map(struct vmx_pages *vmx, struct kvm_vm *vm, |