Skip to content

L
linux-davinci-2.6.23
Commit 707c0874 authored by Avi Kivity's avatar Avi Kivity
Browse files
Options

KVM: Move some more msr mangling into vmx_save_host_state() 

Signed-off-by: default avatarAvi Kivity <avi@qumranet.com>
parent 33ed6329
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 7 deletions
drivers/kvm/vmx.c
View file @ 707c0874
...@@ -290,6 +290,13 @@ static void vmx_save_host_state(struct kvm_vcpu *vcpu) ...@@ -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_FS_BASE, segment_base(hs->fs_sel));
vmcs_writel(HOST_GS_BASE, segment_base(hs->gs_sel)); vmcs_writel(HOST_GS_BASE, segment_base(hs->gs_sel));
#endif #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) static void vmx_load_host_state(struct kvm_vcpu *vcpu)
...@@ -1903,13 +1910,6 @@ preempted: ...@@ -1903,13 +1910,6 @@ preempted:
if (vcpu->guest_debug.enabled) if (vcpu->guest_debug.enabled)
kvm_guest_debug_pre(vcpu); 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: again:
vmx_save_host_state(vcpu); vmx_save_host_state(vcpu);
kvm_load_guest_fpu(vcpu); kvm_load_guest_fpu(vcpu);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment