Skip to content

Commit

Permalink
KVM: selftests: make hyperv_cpuid test pass on AMD
Browse files Browse the repository at this point in the history
Enlightened VMCS is only supported on Intel CPUs but the test shouldn't
fail completely.

Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
  • Loading branch information
Vitaly Kuznetsov authored and Paolo Bonzini committed Apr 30, 2019
1 parent b904cb8 commit eba3afd
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion tools/testing/selftests/kvm/x86_64/hyperv_cpuid.c
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,13 @@ int main(int argc, char *argv[])

free(hv_cpuid_entries);

vcpu_ioctl(vm, VCPU_ID, KVM_ENABLE_CAP, &enable_evmcs_cap);
rv = _vcpu_ioctl(vm, VCPU_ID, KVM_ENABLE_CAP, &enable_evmcs_cap);

if (rv) {
fprintf(stderr,
"Enlightened VMCS is unsupported, skip related test\n");
goto vm_free;
}

hv_cpuid_entries = kvm_get_supported_hv_cpuid(vm);
if (!hv_cpuid_entries)
Expand All @@ -151,6 +157,7 @@ int main(int argc, char *argv[])

free(hv_cpuid_entries);

vm_free:
kvm_vm_free(vm);

return 0;
Expand Down

0 comments on commit eba3afd

Please sign in to comment.