Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 46199f33 authored by Gleb Natapov's avatar Gleb Natapov Committed by Avi Kivity
Browse files

KVM: VMX: remove unneeded vmx_load_host_state() calls. 



vmx_load_host_state() does not handle msrs switching (except
MSR_KERNEL_GS_BASE) since commit 26bb0981. Remove call to it
where it is no longer make sense.

Signed-off-by: default avatarGleb Natapov <gleb@redhat.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 95d4c16c

arch/x86/kvm/vmx.c

+0 −5
Original line number Diff line number Diff line
@@ -1747,7 +1747,6 @@ static void setup_msrs(struct vcpu_vmx *vmx) 
	int save_nmsrs, index;

	unsigned long *msr_bitmap;



	vmx_load_host_state(vmx);

	save_nmsrs = 0;

#ifdef CONFIG_X86_64

	if (is_long_mode(&vmx->vcpu)) {
@@ -2142,12 +2141,10 @@ static int vmx_get_msr(struct kvm_vcpu *vcpu, u32 msr_index, u64 *pdata) 
			return 1;

		/* Otherwise falls through */

	default:

		vmx_load_host_state(to_vmx(vcpu));

		if (vmx_get_vmx_msr(vcpu, msr_index, pdata))

			return 0;

		msr = find_msr_entry(to_vmx(vcpu), msr_index);

		if (msr) {

			vmx_load_host_state(to_vmx(vcpu));

			data = msr->data;

			break;

		}
@@ -2171,7 +2168,6 @@ static int vmx_set_msr(struct kvm_vcpu *vcpu, u32 msr_index, u64 data) 


	switch (msr_index) {

	case MSR_EFER:

		vmx_load_host_state(vmx);

		ret = kvm_set_msr_common(vcpu, msr_index, data);

		break;

#ifdef CONFIG_X86_64
@@ -2220,7 +2216,6 @@ static int vmx_set_msr(struct kvm_vcpu *vcpu, u32 msr_index, u64 data) 
			break;

		msr = find_msr_entry(vmx, msr_index);

		if (msr) {

			vmx_load_host_state(vmx);

			msr->data = data;

			break;

		}