* [PATCH] KVM: selftests: make hyperv_cpuid test pass on AMD
@ 2019-04-26 13:27 Vitaly Kuznetsov
2019-04-30 19:23 ` Paolo Bonzini
0 siblings, 1 reply; 2+ messages in thread
From: Vitaly Kuznetsov @ 2019-04-26 13:27 UTC (permalink / raw)
To: kvm; +Cc: linux-kernel, Paolo Bonzini, Radim Krčmář
Enlightened VMCS is only supported on Intel CPUs but the test shouldn't
fail completely.
Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
---
tools/testing/selftests/kvm/x86_64/hyperv_cpuid.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/tools/testing/selftests/kvm/x86_64/hyperv_cpuid.c b/tools/testing/selftests/kvm/x86_64/hyperv_cpuid.c
index 264425f75806..9a21e912097c 100644
--- a/tools/testing/selftests/kvm/x86_64/hyperv_cpuid.c
+++ b/tools/testing/selftests/kvm/x86_64/hyperv_cpuid.c
@@ -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)
@@ -151,6 +157,7 @@ int main(int argc, char *argv[])
free(hv_cpuid_entries);
+vm_free:
kvm_vm_free(vm);
return 0;
--
2.20.1
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [PATCH] KVM: selftests: make hyperv_cpuid test pass on AMD
2019-04-26 13:27 [PATCH] KVM: selftests: make hyperv_cpuid test pass on AMD Vitaly Kuznetsov
@ 2019-04-30 19:23 ` Paolo Bonzini
0 siblings, 0 replies; 2+ messages in thread
From: Paolo Bonzini @ 2019-04-30 19:23 UTC (permalink / raw)
To: Vitaly Kuznetsov, kvm; +Cc: linux-kernel, Radim Krčmář
On 26/04/19 15:27, Vitaly Kuznetsov wrote:
> Enlightened VMCS is only supported on Intel CPUs but the test shouldn't
> fail completely.
>
> Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
> ---
> tools/testing/selftests/kvm/x86_64/hyperv_cpuid.c | 9 ++++++++-
> 1 file changed, 8 insertions(+), 1 deletion(-)
>
> diff --git a/tools/testing/selftests/kvm/x86_64/hyperv_cpuid.c b/tools/testing/selftests/kvm/x86_64/hyperv_cpuid.c
> index 264425f75806..9a21e912097c 100644
> --- a/tools/testing/selftests/kvm/x86_64/hyperv_cpuid.c
> +++ b/tools/testing/selftests/kvm/x86_64/hyperv_cpuid.c
> @@ -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)
> @@ -151,6 +157,7 @@ int main(int argc, char *argv[])
>
> free(hv_cpuid_entries);
>
> +vm_free:
> kvm_vm_free(vm);
>
> return 0;
>
Queued, thanks.
Paolo
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-04-30 19:23 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-04-26 13:27 [PATCH] KVM: selftests: make hyperv_cpuid test pass on AMD Vitaly Kuznetsov
2019-04-30 19:23 ` Paolo Bonzini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®