diff options
| author | Paolo Bonzini | 2013-09-13 15:55:57 +0200 |
|---|---|---|
| committer | Gleb Natapov | 2013-10-02 17:58:23 +0200 |
| commit | c74f41bbcc83d12787ac42f2c74fc2be54e9f222 (patch) | |
| tree | 39707633519f220b50df9934c888a6abd95eb10d | |
| parent | Merge remote-tracking branch 'kraxel/seabios-1.7.3.2' into staging (diff) | |
| download | qemu-c74f41bbcc83d12787ac42f2c74fc2be54e9f222.tar.gz qemu-c74f41bbcc83d12787ac42f2c74fc2be54e9f222.tar.xz qemu-c74f41bbcc83d12787ac42f2c74fc2be54e9f222.zip | |
x86: fix migration from pre-version 12
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 <pbonzini@redhat.com>
Signed-off-by: Gleb Natapov <gleb@redhat.com>
| -rw-r--r-- | target-i386/cpu.c | 1 | ||||
| -rw-r--r-- | target-i386/cpu.h | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/target-i386/cpu.c b/target-i386/cpu.c index b6828022bc..ea99b2692d 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -2405,6 +2405,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 5723eff9a8..ea373e82dc 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 */ |