Commit 7bf662bb authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini
Browse files

KVM: VMX: Rename "vmx_set_guest_msr" to "vmx_set_guest_uret_msr" 



Add "uret" to vmx_set_guest_msr() to explicitly associate it with the
guest_uret_msrs array, and to differentiate it from vmx_set_msr() as
well as VMX's load/store MSRs.

No functional change intended.

Signed-off-by: default avatarSean Christopherson <sean.j.christopherson@intel.com>
Message-Id: <20200923180409.32255-14-sean.j.christopherson@intel.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent d85a8034

arch/x86/kvm/vmx/vmx.c

+4 −3
Original line number Diff line number Diff line
@@ -631,7 +631,8 @@ struct vmx_uret_msr *vmx_find_uret_msr(struct vcpu_vmx *vmx, u32 msr) 
	return NULL;

}



static int vmx_set_guest_msr(struct vcpu_vmx *vmx, struct vmx_uret_msr *msr, u64 data)

static int vmx_set_guest_uret_msr(struct vcpu_vmx *vmx,

				  struct vmx_uret_msr *msr, u64 data)

{

	int ret = 0;
@@ -2132,7 +2133,7 @@ static int vmx_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info) 
	find_uret_msr:

		msr = vmx_find_uret_msr(vmx, msr_index);

		if (msr)

			ret = vmx_set_guest_msr(vmx, msr, data);

			ret = vmx_set_guest_uret_msr(vmx, msr, data);

		else

			ret = kvm_set_msr_common(vcpu, msr_info);

	}
@@ -7111,7 +7112,7 @@ static void vmx_vcpu_after_set_cpuid(struct kvm_vcpu *vcpu) 
		msr = vmx_find_uret_msr(vmx, MSR_IA32_TSX_CTRL);

		if (msr) {

			bool enabled = guest_cpuid_has(vcpu, X86_FEATURE_RTM);

			vmx_set_guest_msr(vmx, msr, enabled ? 0 : TSX_CTRL_RTM_DISABLE);

			vmx_set_guest_uret_msr(vmx, msr, enabled ? 0 : TSX_CTRL_RTM_DISABLE);

		}

	}

}