From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41909) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VKTr0-0004gT-76 for qemu-devel@nongnu.org; Fri, 13 Sep 2013 09:56:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VKTqr-00060j-Hy for qemu-devel@nongnu.org; Fri, 13 Sep 2013 09:56:10 -0400 Received: from mail-ea0-x22f.google.com ([2a00:1450:4013:c01::22f]:58939) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VKTqr-00060N-4e for qemu-devel@nongnu.org; Fri, 13 Sep 2013 09:56:01 -0400 Received: by mail-ea0-f175.google.com with SMTP id m14so590309eaj.20 for ; Fri, 13 Sep 2013 06:55:59 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Fri, 13 Sep 2013 15:55:57 +0200 Message-Id: <1379080558-16499-2-git-send-email-pbonzini@redhat.com> In-Reply-To: <1379080558-16499-1-git-send-email-pbonzini@redhat.com> References: <1379080558-16499-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH v2 uq/master 1/2] x86: fix migration from pre-version 12 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kvm@vger.kernel.org On KVM, the KVM_SET_XSAVE would be executed with a 0 xstate_bv, and not restore anything. Since FP and SSE data are always valid, set them in xstate_bv at reset time. In fact, that value is the same that KVM_GET_XSAVE returns on pre-XSAVE hosts. Signed-off-by: Paolo Bonzini --- target-i386/cpu.c | 1 + target-i386/cpu.h | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index c36345e..ac83106 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -2386,6 +2386,7 @@ static void x86_cpu_reset(CPUState *s) env->fpuc = 0x37f; env->mxcsr = 0x1f80; + env->xstate_bv = XSTATE_FP | XSTATE_SSE; env->pat = 0x0007040600070406ULL; env->msr_ia32_misc_enable = MSR_IA32_MISC_ENABLE_DEFAULT; diff --git a/target-i386/cpu.h b/target-i386/cpu.h index 5723eff..d46ebdd 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -380,6 +380,10 @@ #define MSR_VM_HSAVE_PA 0xc0010117 +#define XSTATE_FP 1 +#define XSTATE_SSE 2 +#define XSTATE_YMM 4 + /* CPUID feature words */ typedef enum FeatureWord { FEAT_1_EDX, /* CPUID[1].EDX */ -- 1.8.3.1