target/i386: Switch back XFRM value
PATCH v2 1/1 target/i386: Switch back XFRM value
The previous patch wrongly replaced FEAT_XSAVE_XCR0_{LO|HI} with FEAT_XSAVE_XSS_{LO|HI} in CPUID(EAX=12,ECX=1):{ECX,EDX}, which made SGX enclave only supported SSE and x87 feature(xfrm=0x3).
Fixes 301e90675c3f ("target/i386: Enable support for XSAVES based features")
Signed-off-by Yang Zhong <[email protected]>
--- target/i386/cpu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
target/i386/cpu.c +2 -2
@@ -5584,8 +5584,8 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count, }else { *eax &= env->features[FEAT_SGX_12_1_EAX ]; *ebx &=0 ;/* ebx reserve */ - *ecx &= env->features[FEAT_XSAVE_XSS_LO ]; - *edx &= env->features[FEAT_XSAVE_XSS_HI ]; + *ecx &= env->features[FEAT_XSAVE_XCR0_LO ]; + *edx &= env->features[FEAT_XSAVE_XCR0_HI ];/* FP and SSE are always allowed regardless of XSAVE/XCR0. */ *ecx |=XSTATE_FP_MASK |XSTATE_SSE_MASK ;
Signature · 1 line
2.30.2