[libvirt] [PATCH 12/14] cputest: Disable TSX on broken models
Commit v3.1.0-26-gd60012b4e started filtering hle and rtm features from
broken Intel Haswell CPUs. QEMU implemented similar functionality and
thus it doesn't report rtm and hle features as enabled for Core i5-4670T
CPU anymore.
Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com>
---
tests/cputestdata/x86_64-cpuid-Core-i5-4670T-disabled.xml | 1 +
tests/cputestdata/x86_64-cpuid-Core-i5-4670T-enabled.xml | 2 +-
tests/cputestdata/x86_64-cpuid-Core-i5-4670T.json | 4 ++--
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-disabled.xml
b/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-disabled.xml
index 601554a81..0c6b68a57 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-disabled.xml
@@ -2,5 +2,6 @@
<cpudata arch='x86'>
<cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000'
ebx='0x00000000' ecx='0x0800c1dc' edx='0xb0600000'/>
<cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000004'
ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000'
ebx='0x00000810' ecx='0x00000000' edx='0x00000000'/>
<cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000'
ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
</cpudata>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-enabled.xml
b/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-enabled.xml
index 8a714379c..31893c0b8 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-enabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-enabled.xml
@@ -1,7 +1,7 @@
<!-- Features enabled by QEMU -->
<cpudata arch='x86'>
<cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000'
ebx='0x00000000' ecx='0xf7fa3223' edx='0x0f8bfbff'/>
- <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000'
ebx='0x00000fbb' ecx='0x00000000' edx='0x00000000'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000'
ebx='0x000007ab' ecx='0x00000000' edx='0x00000000'/>
<cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x00000001'
ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
<cpuid eax_in='0x40000001' ecx_in='0x00' eax='0x010000fa'
ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
<cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000'
ebx='0x00000000' ecx='0x00000021' edx='0x2c100800'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-4670T.json
b/tests/cputestdata/x86_64-cpuid-Core-i5-4670T.json
index bfcfcfd46..58b1d0369 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-4670T.json
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-4670T.json
@@ -5,7 +5,7 @@
"props": {
"pfthreshold": false,
"pku": false,
- "rtm": true,
+ "rtm": false,
"tsc_adjust": true,
"tsc-deadline": true,
"xstore-en": false,
@@ -69,7 +69,7 @@
"avx512-4vnniw": false,
"xsave": true,
"erms": true,
- "hle": true,
+ "hle": false,
"nodeid_msr": false,
"est": false,
"svm_lock": false,
--
2.12.0