From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42994) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VHZGf-0000Z3-Nu for qemu-devel@nongnu.org; Thu, 05 Sep 2013 09:06:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VHZGX-0004IC-6P for qemu-devel@nongnu.org; Thu, 05 Sep 2013 09:06:37 -0400 Received: from mail-ea0-x22a.google.com ([2a00:1450:4013:c01::22a]:46002) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VHZGW-0004I7-Vj for qemu-devel@nongnu.org; Thu, 05 Sep 2013 09:06:29 -0400 Received: by mail-ea0-f170.google.com with SMTP id h14so896927eak.15 for ; Thu, 05 Sep 2013 06:06:28 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Thu, 5 Sep 2013 15:06:21 +0200 Message-Id: <1378386382-415-2-git-send-email-pbonzini@redhat.com> In-Reply-To: <1378386382-415-1-git-send-email-pbonzini@redhat.com> References: <1378386382-415-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 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: ehabkost@redhat.com, gleb@redhat.com, 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 | 5 +++++ 2 files changed, 6 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..a153078 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -380,6 +380,11 @@ #define MSR_VM_HSAVE_PA 0xc0010117 +#define XSTATE_SUPPORTED (XSTATE_FP|XSTATE_SSE|XSTATE_YMM) +#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