Commit 542423b0 authored by Gleb Natapov's avatar Gleb Natapov Committed by Avi Kivity
Browse files

KVM: VMX: call vmx_load_host_state() only if msr is cached 



No need to call it before each kvm_(set|get)_msr_common()

Signed-off-by: default avatarGleb Natapov <gleb@redhat.com>
Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
parent e8a48342

arch/x86/kvm/vmx.c

+2 −2
Original line number Diff line number Diff line
@@ -1007,9 +1007,9 @@ static int vmx_get_msr(struct kvm_vcpu *vcpu, u32 msr_index, u64 *pdata) 
		data = vmcs_readl(GUEST_SYSENTER_ESP);

		break;

	default:

		vmx_load_host_state(to_vmx(vcpu));

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

		if (msr) {

			vmx_load_host_state(to_vmx(vcpu));

			data = msr->data;

			break;

		}
@@ -1066,9 +1066,9 @@ static int vmx_set_msr(struct kvm_vcpu *vcpu, u32 msr_index, u64 data) 
		}

		/* Otherwise falls through to kvm_set_msr_common */

	default:

		vmx_load_host_state(vmx);

		msr = find_msr_entry(vmx, msr_index);

		if (msr) {

			vmx_load_host_state(vmx);

			msr->data = data;

			break;

		}