summaryrefslogtreecommitdiff
path: root/tools/testing/selftests/kvm/x86_64/vmx_set_nested_state_test.c
diff options
context:
space:
mode:
authorVitaly Kuznetsov <vkuznets@redhat.com>2019-10-08 21:43:37 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2019-10-22 13:31:16 +0200
commit9143613ef0ba9f88d2fef9038930637a0909d35a (patch)
tree459a449bd9f6747d5eeaa598ca032ac6f0e04ea5 /tools/testing/selftests/kvm/x86_64/vmx_set_nested_state_test.c
parent700c17d9cec8712f4091692488fb63e2680f7a5d (diff)
selftests: kvm: consolidate VMX support checks
vmx_* tests require VMX and three of them implement the same check. Move it to vmx library. Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'tools/testing/selftests/kvm/x86_64/vmx_set_nested_state_test.c')
-rw-r--r--tools/testing/selftests/kvm/x86_64/vmx_set_nested_state_test.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/tools/testing/selftests/kvm/x86_64/vmx_set_nested_state_test.c b/tools/testing/selftests/kvm/x86_64/vmx_set_nested_state_test.c
index a6d85614ae4d..9ef7fab39d48 100644
--- a/tools/testing/selftests/kvm/x86_64/vmx_set_nested_state_test.c
+++ b/tools/testing/selftests/kvm/x86_64/vmx_set_nested_state_test.c
@@ -224,7 +224,6 @@ int main(int argc, char *argv[])
{
struct kvm_vm *vm;
struct kvm_nested_state state;
- struct kvm_cpuid_entry2 *entry = kvm_get_supported_cpuid_entry(1);
have_evmcs = kvm_check_cap(KVM_CAP_HYPERV_ENLIGHTENED_VMCS);
@@ -237,10 +236,7 @@ int main(int argc, char *argv[])
* AMD currently does not implement set_nested_state, so for now we
* just early out.
*/
- if (!(entry->ecx & CPUID_VMX)) {
- fprintf(stderr, "nested VMX not enabled, skipping test\n");
- exit(KSFT_SKIP);
- }
+ nested_vmx_check_supported();
vm = vm_create_default(VCPU_ID, 0, 0);