diff options
author | Sheng Yang <sheng@linux.intel.com> | 2010-12-07 21:49:43 -0500 |
---|---|---|
committer | Avi Kivity <avi@redhat.com> | 2010-12-08 10:28:31 -0500 |
commit | 3ea3aa8cf67d3bbe00a19b6a4013d19efa7d0f41 (patch) | |
tree | c4184c1706a85fa14db668b80ee8114d408fd0df | |
parent | 6313e3c21743cc88bb5bd8aa72948ee1e83937b6 (diff) |
KVM: Fix OSXSAVE after migration
CPUID's OSXSAVE is a mirror of CR4.OSXSAVE bit. We need to update the CPUID
after migration.
KVM-Stable-Tag.
Signed-off-by: Sheng Yang <sheng@linux.intel.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
-rw-r--r-- | arch/x86/kvm/x86.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index cdac9e592aa5..eb5c83479d89 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c | |||
@@ -5522,6 +5522,8 @@ int kvm_arch_vcpu_ioctl_set_sregs(struct kvm_vcpu *vcpu, | |||
5522 | 5522 | ||
5523 | mmu_reset_needed |= kvm_read_cr4(vcpu) != sregs->cr4; | 5523 | mmu_reset_needed |= kvm_read_cr4(vcpu) != sregs->cr4; |
5524 | kvm_x86_ops->set_cr4(vcpu, sregs->cr4); | 5524 | kvm_x86_ops->set_cr4(vcpu, sregs->cr4); |
5525 | if (sregs->cr4 & X86_CR4_OSXSAVE) | ||
5526 | update_cpuid(vcpu); | ||
5525 | if (!is_long_mode(vcpu) && is_pae(vcpu)) { | 5527 | if (!is_long_mode(vcpu) && is_pae(vcpu)) { |
5526 | load_pdptrs(vcpu, vcpu->arch.walk_mmu, vcpu->arch.cr3); | 5528 | load_pdptrs(vcpu, vcpu->arch.walk_mmu, vcpu->arch.cr3); |
5527 | mmu_reset_needed = 1; | 5529 | mmu_reset_needed = 1; |