39 lines
1.3 KiB
Diff
39 lines
1.3 KiB
Diff
|
From c952c9acfab98a83122b4e6d406f4a7a0dfe871f Mon Sep 17 00:00:00 2001
|
||
|
|
From: Xiaoyao Li <xiaoyao.li@intel.com>
|
||
|
|
Date: Mon, 15 Jan 2024 04:13:24 -0500
|
||
|
|
Subject: [PATCH] i386/cpu: Clear FEAT_XSAVE_XSS_LO/HI leafs when
|
||
|
|
CPUID_EXT_XSAVE is not available
|
||
|
|
|
||
|
|
commit 81f5cad3858f27623b1b14467926032d229b76cc upstream.
|
||
|
|
|
||
|
|
Leaf FEAT_XSAVE_XSS_LO and FEAT_XSAVE_XSS_HI also need to be cleared
|
||
|
|
when CPUID_EXT_XSAVE is not set.
|
||
|
|
|
||
|
|
Fixes: 301e90675c3f ("target/i386: Enable support for XSAVES based features")
|
||
|
|
Signed-off-by: Xiaoyao Li <xiaoyao.li@intel.com>
|
||
|
|
Reviewed-by: Yang Weijiang <weijiang.yang@intel.com>
|
||
|
|
Message-ID: <20240115091325.1904229-2-xiaoyao.li@intel.com>
|
||
|
|
Cc: qemu-stable@nongnu.org
|
||
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
||
|
|
Signed-off-by: Jason Zeng <jason.zeng@intel.com>
|
||
|
|
---
|
||
|
|
target/i386/cpu.c | 2 ++
|
||
|
|
1 file changed, 2 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
|
||
|
|
index cd16cb893d..8b9ef218d3 100644
|
||
|
|
--- a/target/i386/cpu.c
|
||
|
|
+++ b/target/i386/cpu.c
|
||
|
|
@@ -6927,6 +6927,8 @@ static void x86_cpu_enable_xsave_components(X86CPU *cpu)
|
||
|
|
if (!(env->features[FEAT_1_ECX] & CPUID_EXT_XSAVE)) {
|
||
|
|
env->features[FEAT_XSAVE_XCR0_LO] = 0;
|
||
|
|
env->features[FEAT_XSAVE_XCR0_HI] = 0;
|
||
|
|
+ env->features[FEAT_XSAVE_XSS_LO] = 0;
|
||
|
|
+ env->features[FEAT_XSAVE_XSS_HI] = 0;
|
||
|
|
return;
|
||
|
|
}
|
||
|
|
|
||
|
|
--
|
||
|
|
2.27.0
|
||
|
|
|