Merge tag ‘kvmarm-fixes-for-5.1-2’ of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into kvm-master [Linux 5.1]

Merge tag ‘kvmarm-fixes-for-5.1-2’ of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into kvm-master [Linux 5.1]

This Linux kernel change "Merge tag ‘kvmarm-fixes-for-5.1-2’ of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into kvm-master" is included in the Linux 5.1 release. This change is authored by Paolo Bonzini <pbonzini [at] redhat.com> on Tue Apr 30 21:23:06 2019 +0200. The commit for this change in Linux stable tree is 6245242 (patch). Other info about this change: Merge: eba3afd 6bc2100

Merge tag 'kvmarm-fixes-for-5.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into kvm-master

KVM/ARM fixes for 5.1, take #2:

- Don't try to emulate timers on userspace access
- Fix unaligned huge mappings, again
- Properly reset a vcpu that fails to reset(!)
- Properly retire pending LPIs on reset
- Fix computation of emulated CNTP_TVAL

There is no are 0 lines of Linux source code added/deleted in this change. Code changes to Linux kernel are as follows.

 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 264425f..9a21e91 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;

Leave a Reply

Your email address will not be published. Required fields are marked *