KVM: selftests: Don't probe KVM_CAP_HYPERV_ENLIGHTENED_VMCS when nested VMX is unsupp...

KVM_CAP_HYPERV_ENLIGHTENED_VMCS will be reported as supported even when
nested VMX is not, fix evmcs_test/hyperv_cpuid tests to check for both.

Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Message-Id: <20200610135847.754289-3-vkuznets@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/tools/testing/selftests/kvm/x86_64/evmcs_test.c b/tools/testing/selftests/kvm/x86_64/evmcs_test.c
index e6e62e5e75b2cd199efeb67f6dc2e69b2b22e3f4..757928199f19a8bfe91abc52adad6f506678fbef 100644 (file)
--- a/tools/testing/selftests/kvm/x86_64/evmcs_test.c
+++ b/tools/testing/selftests/kvm/x86_64/evmcs_test.c
@@ -94,9 +94,10 @@ int main(int argc, char *argv[])
 
        vcpu_set_cpuid(vm, VCPU_ID, kvm_get_supported_cpuid());
 
-       if (!kvm_check_cap(KVM_CAP_NESTED_STATE) ||
+       if (!nested_vmx_supported() ||
+           !kvm_check_cap(KVM_CAP_NESTED_STATE) ||
            !kvm_check_cap(KVM_CAP_HYPERV_ENLIGHTENED_VMCS)) {
-               print_skip("capabilities not available");
+               print_skip("Enlightened VMCS is unsupported");
                exit(KSFT_SKIP);
        }
 

diff --git a/tools/testing/selftests/kvm/x86_64/hyperv_cpuid.c b/tools/testing/selftests/kvm/x86_64/hyperv_cpuid.c
index 4a7967cca281a4a75106d7e8aa743e597fa3ef81..745b708c2d3bbbfb1cc1fc9b703cb7d5bbfee7b4 100644 (file)
--- a/tools/testing/selftests/kvm/x86_64/hyperv_cpuid.c
+++ b/tools/testing/selftests/kvm/x86_64/hyperv_cpuid.c
@@ -170,7 +170,8 @@ int main(int argc, char *argv[])
                case 1:
                        break;
                case 2:
-                       if (!kvm_check_cap(KVM_CAP_HYPERV_ENLIGHTENED_VMCS)) {
+                       if (!nested_vmx_supported() ||
+                           !kvm_check_cap(KVM_CAP_HYPERV_ENLIGHTENED_VMCS)) {
                                print_skip("Enlightened VMCS is unsupported");
                                continue;
                        }