|
 |
218e99 |
From 8328cafa2406bcfed728c236fce8e5121f6c0b6d Mon Sep 17 00:00:00 2001
|
|
|
218e99 |
From: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
218e99 |
Date: Tue, 5 Nov 2013 15:10:43 +0100
|
|
|
218e99 |
Subject: [PATCH 52/81] x86: fix migration from pre-version 12
|
|
|
218e99 |
|
|
|
218e99 |
RH-Author: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
218e99 |
Message-id: <1383664244-14818-2-git-send-email-pbonzini@redhat.com>
|
|
|
218e99 |
Patchwork-id: 55408
|
|
|
218e99 |
O-Subject: [RHEL 7.0 qemu-kvm PATCH 1/2] x86: fix migration from pre-version 12
|
|
|
218e99 |
Bugzilla: 1005695
|
|
|
218e99 |
RH-Acked-by: Alex Williamson <alex.williamson@redhat.com>
|
|
|
218e99 |
RH-Acked-by: Orit Wasserman <owasserm@redhat.com>
|
|
|
218e99 |
RH-Acked-by: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
218e99 |
|
|
|
218e99 |
On KVM, the KVM_SET_XSAVE would be executed with a 0 xstate_bv,
|
|
|
218e99 |
and not restore anything.
|
|
|
218e99 |
|
|
|
218e99 |
Since FP and SSE data are always valid, set them in xstate_bv at reset
|
|
|
218e99 |
time. In fact, that value is the same that KVM_GET_XSAVE returns on
|
|
|
218e99 |
pre-XSAVE hosts.
|
|
|
218e99 |
|
|
|
218e99 |
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
218e99 |
Signed-off-by: Gleb Natapov <gleb@redhat.com>
|
|
|
218e99 |
(cherry picked from commit c74f41bbcc83d12787ac42f2c74fc2be54e9f222)
|
|
|
218e99 |
---
|
|
|
218e99 |
target-i386/cpu.c | 1 +
|
|
|
218e99 |
target-i386/cpu.h | 4 ++++
|
|
|
218e99 |
2 files changed, 5 insertions(+)
|
|
|
218e99 |
|
|
|
218e99 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
218e99 |
---
|
|
|
218e99 |
target-i386/cpu.c | 1 +
|
|
|
218e99 |
target-i386/cpu.h | 4 ++++
|
|
|
218e99 |
2 files changed, 5 insertions(+), 0 deletions(-)
|
|
|
218e99 |
|
|
|
218e99 |
diff --git a/target-i386/cpu.c b/target-i386/cpu.c
|
|
|
218e99 |
index 170a46c..bc077ca 100644
|
|
|
218e99 |
--- a/target-i386/cpu.c
|
|
|
218e99 |
+++ b/target-i386/cpu.c
|
|
|
218e99 |
@@ -2269,6 +2269,7 @@ static void x86_cpu_reset(CPUState *s)
|
|
|
218e99 |
env->fpuc = 0x37f;
|
|
|
218e99 |
|
|
|
218e99 |
env->mxcsr = 0x1f80;
|
|
|
218e99 |
+ env->xstate_bv = XSTATE_FP | XSTATE_SSE;
|
|
|
218e99 |
|
|
|
218e99 |
env->pat = 0x0007040600070406ULL;
|
|
|
218e99 |
env->msr_ia32_misc_enable = MSR_IA32_MISC_ENABLE_DEFAULT;
|
|
|
218e99 |
diff --git a/target-i386/cpu.h b/target-i386/cpu.h
|
|
|
218e99 |
index 6aebc80..9c55953 100644
|
|
|
218e99 |
--- a/target-i386/cpu.h
|
|
|
218e99 |
+++ b/target-i386/cpu.h
|
|
|
218e99 |
@@ -379,6 +379,10 @@
|
|
|
218e99 |
|
|
|
218e99 |
#define MSR_VM_HSAVE_PA 0xc0010117
|
|
|
218e99 |
|
|
|
218e99 |
+#define XSTATE_FP 1
|
|
|
218e99 |
+#define XSTATE_SSE 2
|
|
|
218e99 |
+#define XSTATE_YMM 4
|
|
|
218e99 |
+
|
|
|
218e99 |
/* CPUID feature words */
|
|
|
218e99 |
typedef enum FeatureWord {
|
|
|
218e99 |
FEAT_1_EDX, /* CPUID[1].EDX */
|
|
|
218e99 |
--
|
|
|
218e99 |
1.7.1
|
|
|
218e99 |
|