From patchwork Wed Dec 8 02:49:43 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sheng Yang X-Patchwork-Id: 389512 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oB82kxEP025018 for ; Wed, 8 Dec 2010 02:46:59 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754844Ab0LHCq4 (ORCPT ); Tue, 7 Dec 2010 21:46:56 -0500 Received: from mga11.intel.com ([192.55.52.93]:32231 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754712Ab0LHCqz (ORCPT ); Tue, 7 Dec 2010 21:46:55 -0500 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga102.fm.intel.com with ESMTP; 07 Dec 2010 18:46:54 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.59,314,1288594800"; d="scan'208";a="865709516" Received: from syang10-desktop.sh.intel.com (HELO syang10-desktop) ([10.239.13.1]) by fmsmga001.fm.intel.com with ESMTP; 07 Dec 2010 18:46:53 -0800 Received: from yasker by syang10-desktop with local (Exim 4.72) (envelope-from ) id 1PQA6B-0002bP-7N; Wed, 08 Dec 2010 10:49:43 +0800 From: Sheng Yang To: Avi Kivity , Marcelo Tosatti Cc: kvm@vger.kernel.org, Sheng Yang , stable@kernel.org Subject: [PATCH] KVM: Fix OSXSAVE after migration Date: Wed, 8 Dec 2010 10:49:43 +0800 Message-Id: <1291776583-9979-1-git-send-email-sheng@linux.intel.com> X-Mailer: git-send-email 1.7.1 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Wed, 08 Dec 2010 02:46:59 +0000 (UTC) diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index ed373ba..51a2bce 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -5585,6 +5585,8 @@ int kvm_arch_vcpu_ioctl_set_sregs(struct kvm_vcpu *vcpu, mmu_reset_needed |= kvm_read_cr4(vcpu) != sregs->cr4; kvm_x86_ops->set_cr4(vcpu, sregs->cr4); + if (sregs->cr4 & X86_CR4_OSXSAVE) + update_cpuid(vcpu); if (!is_long_mode(vcpu) && is_pae(vcpu)) { load_pdptrs(vcpu, vcpu->arch.walk_mmu, vcpu->arch.cr3); mmu_reset_needed = 1;