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

Commit 707c0874 authored by Avi Kivity's avatar Avi Kivity
Browse files

KVM: Move some more msr mangling into vmx_save_host_state() 



Signed-off-by: default avatarAvi Kivity <avi@qumranet.com>
parent 33ed6329

drivers/kvm/vmx.c

+7 −7
Original line number Diff line number Diff line
@@ -290,6 +290,13 @@ static void vmx_save_host_state(struct kvm_vcpu *vcpu) 
	vmcs_writel(HOST_FS_BASE, segment_base(hs->fs_sel));

	vmcs_writel(HOST_GS_BASE, segment_base(hs->gs_sel));

#endif



#ifdef CONFIG_X86_64

	if (is_long_mode(vcpu)) {

		save_msrs(vcpu->host_msrs + msr_offset_kernel_gs_base, 1);

		load_msrs(vcpu->guest_msrs, NR_BAD_MSRS);

	}

#endif

}



static void vmx_load_host_state(struct kvm_vcpu *vcpu)
@@ -1903,13 +1910,6 @@ static int vmx_vcpu_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) 
	if (vcpu->guest_debug.enabled)

		kvm_guest_debug_pre(vcpu);



#ifdef CONFIG_X86_64

	if (is_long_mode(vcpu)) {

		save_msrs(vcpu->host_msrs + msr_offset_kernel_gs_base, 1);

		load_msrs(vcpu->guest_msrs, NR_BAD_MSRS);

	}

#endif



again:

	vmx_save_host_state(vcpu);

	kvm_load_guest_fpu(vcpu);