diff options
author | Linus Torvalds | 2019-08-21 20:48:38 +0200 |
---|---|---|
committer | Linus Torvalds | 2019-08-21 20:48:38 +0200 |
commit | bb7ba8069de933d69cb45dd0a5806b61033796a3 (patch) | |
tree | a6efe79c2ec068f0445206aedde6bbc839c9dca0 /tools/testing/selftests/kvm/x86_64/platform_info_test.c | |
parent | Merge tag 'nfsd-5.3-1' of git://linux-nfs.org/~bfields/linux (diff) | |
parent | selftests/kvm: make platform_info_test pass on AMD (diff) | |
download | kernel-qcow2-linux-master.tar.gz kernel-qcow2-linux-master.tar.xz kernel-qcow2-linux-master.zip |
Pull KVM fixes from Paolo Bonzini:
"A couple bugfixes, and mostly selftests changes"
* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
selftests/kvm: make platform_info_test pass on AMD
Revert "KVM: x86/mmu: Zap only the relevant pages when removing a memslot"
selftests: kvm: fix state save/load on processors without XSAVE
selftests: kvm: fix vmx_set_nested_state_test
selftests: kvm: provide common function to enable eVMCS
selftests: kvm: do not try running the VM in vmx_set_nested_state_test
KVM: x86: svm: remove redundant assignment of var new_entry
MAINTAINERS: add KVM x86 reviewers
MAINTAINERS: change list for KVM/s390
kvm: x86: skip populating logical dest map if apic is not sw enabled
Diffstat (limited to 'tools/testing/selftests/kvm/x86_64/platform_info_test.c')
-rw-r--r-- | tools/testing/selftests/kvm/x86_64/platform_info_test.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/testing/selftests/kvm/x86_64/platform_info_test.c b/tools/testing/selftests/kvm/x86_64/platform_info_test.c index 40050e44ec0a..f9334bd3cce9 100644 --- a/tools/testing/selftests/kvm/x86_64/platform_info_test.c +++ b/tools/testing/selftests/kvm/x86_64/platform_info_test.c @@ -99,8 +99,8 @@ int main(int argc, char *argv[]) msr_platform_info = vcpu_get_msr(vm, VCPU_ID, MSR_PLATFORM_INFO); vcpu_set_msr(vm, VCPU_ID, MSR_PLATFORM_INFO, msr_platform_info | MSR_PLATFORM_INFO_MAX_TURBO_RATIO); - test_msr_platform_info_disabled(vm); test_msr_platform_info_enabled(vm); + test_msr_platform_info_disabled(vm); vcpu_set_msr(vm, VCPU_ID, MSR_PLATFORM_INFO, msr_platform_info); kvm_vm_free(vm); |