Commit 503234b3 authored Sep 14, 2018 by Liran Alon Committed by Paolo Bonzini Oct 01, 2018

KVM: x86: Do not use kvm_x86_ops->mpx_supported() directly



Commit a87036ad ("KVM: x86: disable MPX if host did not enable
MPX XSAVE features") introduced kvm_mpx_supported() to return true
iff MPX is enabled in the host.

However, that commit seems to have missed replacing some calls to
kvm_x86_ops->mpx_supported() to kvm_mpx_supported().

Complete original commit by replacing remaining calls to
kvm_mpx_supported().

Fixes: a87036ad ("KVM: x86: disable MPX if host did not enable
MPX XSAVE features")

Suggested-by: Sean Christopherson <sean.j.christopherson@intel.com>
Signed-off-by: Liran Alon <liran.alon@oracle.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

parent 5f76f6f5

arch/x86/kvm/vmx.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -12036,7 +12036,7 @@ static void prepare_vmcs02_full(struct kvm_vcpu vcpu, struct vmcs12 vmcs12)

		set_cr4_guest_host_mask(vmx);

		if (vmx_mpx_supported())
		if (kvm_mpx_supported())
		vmcs_write64(GUEST_BNDCFGS, vmcs12->guest_bndcfgs);

		if (enable_vpid) {

arch/x86/kvm/x86.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -4698,7 +4698,7 @@ static void kvm_init_msr_list(void)
		*/
		switch (msrs_to_save[i]) {
		case MSR_IA32_BNDCFGS:
		if (!kvm_x86_ops->mpx_supported())
		if (!kvm_mpx_supported())
		continue;
		break;
		case MSR_TSC_AUX:

Admin message