diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2020-05-27 13:10:29 -0400 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2020-05-27 13:10:29 -0400 |
| commit | 7529e767c2a94b33a689ff9c1293e351ecc234ee (patch) | |
| tree | 6e1728c2270378a1fcde485d1d10a86f255c339a /arch/x86/kvm/x86.c | |
| parent | 4c7ccc3bf746c625cfb352a1d6082f6460cbbce0 (diff) | |
| parent | e7581caca4c105d81a490a3e15cf46d6407e3fa7 (diff) | |
Merge branch 'kvm-master' into HEAD
Merge AMD fixes before doing more development work.
Diffstat (limited to 'arch/x86/kvm/x86.c')
| -rw-r--r-- | arch/x86/kvm/x86.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 471fccf7f850..8ac69c16f153 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -3799,7 +3799,7 @@ static int kvm_vcpu_ioctl_x86_setup_mce(struct kvm_vcpu *vcpu, unsigned bank_num = mcg_cap & 0xff, bank; r = -EINVAL; - if (!bank_num || bank_num >= KVM_MAX_MCE_BANKS) + if (!bank_num || bank_num > KVM_MAX_MCE_BANKS) goto out; if (mcg_cap & ~(kvm_mce_cap_supported | 0xff | 0xff0000)) goto out; @@ -5282,6 +5282,10 @@ static void kvm_init_msr_list(void) if (!kvm_cpu_cap_has(X86_FEATURE_RDTSCP)) continue; break; + case MSR_IA32_UMWAIT_CONTROL: + if (!kvm_cpu_cap_has(X86_FEATURE_WAITPKG)) + continue; + break; case MSR_IA32_RTIT_CTL: case MSR_IA32_RTIT_STATUS: if (!kvm_cpu_cap_has(X86_FEATURE_INTEL_PT)) |