7:23 a.m.
Jiri Denemark (7):
cpu_map: Add avx10* CPU features
cpu_map: Add GraniteRapids-v2 CPU model
cpu_map: Add sha512, sm3, and sm4 CPU features
cpu_map: Add fdp-excptn-only CPU feature
cpu_map: Add zero-fcs-fds CPU feature
cpu_map: Add ibpb-brtype CPU feature
cpu_map: Add missing CPU features
src/cpu_map/index.xml | 1 +
src/cpu_map/meson.build | 1 +
src/cpu_map/x86_GraniteRapids-v2.xml | 206 ++++++++++++++++++
src/cpu_map/x86_features.xml | 70 ++++++
.../x86_64-cpuid-Atom-P5362-disabled.xml | 2 +-
.../x86_64-cpuid-Atom-P5362-guest.xml | 2 +
.../x86_64-cpuid-Atom-P5362-host.xml | 2 +
.../x86_64-cpuid-Cooperlake-disabled.xml | 2 +-
.../x86_64-cpuid-Cooperlake-guest.xml | 2 +
.../x86_64-cpuid-Cooperlake-host.xml | 2 +
.../x86_64-cpuid-Core-i5-4670T-disabled.xml | 2 +-
.../x86_64-cpuid-Core-i5-4670T-guest.xml | 1 +
.../x86_64-cpuid-Core-i5-4670T-host.xml | 1 +
.../x86_64-cpuid-Core-i5-6600-disabled.xml | 2 +-
.../x86_64-cpuid-Core-i5-6600-guest.xml | 1 +
.../x86_64-cpuid-Core-i5-6600-host.xml | 1 +
.../x86_64-cpuid-Core-i7-4510U-disabled.xml | 1 +
.../x86_64-cpuid-Core-i7-4510U-guest.xml | 1 +
.../x86_64-cpuid-Core-i7-4510U-host.xml | 1 +
.../x86_64-cpuid-Core-i7-4600U-disabled.xml | 1 +
.../x86_64-cpuid-Core-i7-4600U-guest.xml | 1 +
.../x86_64-cpuid-Core-i7-4600U-host.xml | 1 +
...6_64-cpuid-Core-i7-5600U-arat-disabled.xml | 2 +-
.../x86_64-cpuid-Core-i7-5600U-arat-guest.xml | 1 +
.../x86_64-cpuid-Core-i7-5600U-arat-host.xml | 1 +
.../x86_64-cpuid-Core-i7-5600U-disabled.xml | 2 +-
.../x86_64-cpuid-Core-i7-5600U-guest.xml | 1 +
.../x86_64-cpuid-Core-i7-5600U-host.xml | 1 +
...6_64-cpuid-Core-i7-5600U-ibrs-disabled.xml | 2 +-
.../x86_64-cpuid-Core-i7-5600U-ibrs-guest.xml | 1 +
.../x86_64-cpuid-Core-i7-5600U-ibrs-host.xml | 1 +
.../x86_64-cpuid-Core-i7-7600U-disabled.xml | 2 +-
.../x86_64-cpuid-Core-i7-7600U-guest.xml | 1 +
.../x86_64-cpuid-Core-i7-7600U-host.xml | 1 +
.../x86_64-cpuid-Core-i7-7700-disabled.xml | 2 +-
.../x86_64-cpuid-Core-i7-7700-guest.xml | 1 +
.../x86_64-cpuid-Core-i7-7700-host.xml | 1 +
.../x86_64-cpuid-Core-i7-8550U-disabled.xml | 2 +-
.../x86_64-cpuid-Core-i7-8550U-guest.xml | 1 +
.../x86_64-cpuid-Core-i7-8550U-host.xml | 1 +
.../x86_64-cpuid-Core-i7-8700-disabled.xml | 2 +-
.../x86_64-cpuid-Core-i7-8700-guest.xml | 1 +
.../x86_64-cpuid-Core-i7-8700-host.xml | 1 +
.../x86_64-cpuid-Ice-Lake-Server-disabled.xml | 2 +-
.../x86_64-cpuid-Ice-Lake-Server-guest.xml | 2 +
.../x86_64-cpuid-Ice-Lake-Server-host.xml | 2 +
.../x86_64-cpuid-Xeon-E3-1225-v5-disabled.xml | 2 +-
.../x86_64-cpuid-Xeon-E3-1225-v5-guest.xml | 1 +
.../x86_64-cpuid-Xeon-E3-1225-v5-host.xml | 1 +
.../x86_64-cpuid-Xeon-E3-1245-v5-disabled.xml | 2 +-
.../x86_64-cpuid-Xeon-E3-1245-v5-guest.xml | 1 +
.../x86_64-cpuid-Xeon-E3-1245-v5-host.xml | 1 +
.../x86_64-cpuid-Xeon-E5-2609-v3-disabled.xml | 2 +-
.../x86_64-cpuid-Xeon-E5-2609-v3-guest.xml | 1 +
.../x86_64-cpuid-Xeon-E5-2609-v3-host.xml | 1 +
.../x86_64-cpuid-Xeon-E5-2623-v4-disabled.xml | 2 +-
.../x86_64-cpuid-Xeon-E5-2623-v4-guest.xml | 1 +
.../x86_64-cpuid-Xeon-E5-2623-v4-host.xml | 1 +
.../x86_64-cpuid-Xeon-E5-2630-v3-disabled.xml | 2 +-
.../x86_64-cpuid-Xeon-E5-2630-v3-guest.xml | 1 +
.../x86_64-cpuid-Xeon-E5-2630-v3-host.xml | 1 +
.../x86_64-cpuid-Xeon-E5-2630-v4-disabled.xml | 2 +-
.../x86_64-cpuid-Xeon-E5-2630-v4-guest.xml | 1 +
.../x86_64-cpuid-Xeon-E5-2630-v4-host.xml | 1 +
.../x86_64-cpuid-Xeon-E5-2650-v3-disabled.xml | 2 +-
.../x86_64-cpuid-Xeon-E5-2650-v3-guest.xml | 1 +
.../x86_64-cpuid-Xeon-E5-2650-v3-host.xml | 1 +
.../x86_64-cpuid-Xeon-E5-2650-v4-disabled.xml | 2 +-
.../x86_64-cpuid-Xeon-E5-2650-v4-guest.xml | 1 +
.../x86_64-cpuid-Xeon-E5-2650-v4-host.xml | 1 +
.../x86_64-cpuid-Xeon-E7-8890-v3-disabled.xml | 2 +-
.../x86_64-cpuid-Xeon-E7-8890-v3-guest.xml | 1 +
.../x86_64-cpuid-Xeon-E7-8890-v3-host.xml | 1 +
.../x86_64-cpuid-Xeon-Gold-5115-disabled.xml | 2 +-
.../x86_64-cpuid-Xeon-Gold-5115-guest.xml | 2 +
.../x86_64-cpuid-Xeon-Gold-5115-host.xml | 2 +
.../x86_64-cpuid-Xeon-Gold-6130-disabled.xml | 2 +-
.../x86_64-cpuid-Xeon-Gold-6130-guest.xml | 2 +
.../x86_64-cpuid-Xeon-Gold-6130-host.xml | 2 +
.../x86_64-cpuid-Xeon-Gold-6148-disabled.xml | 2 +-
.../x86_64-cpuid-Xeon-Gold-6148-guest.xml | 2 +
.../x86_64-cpuid-Xeon-Gold-6148-host.xml | 2 +
...6_64-cpuid-Xeon-Platinum-8268-disabled.xml | 2 +-
.../x86_64-cpuid-Xeon-Platinum-8268-guest.xml | 2 +
.../x86_64-cpuid-Xeon-Platinum-8268-host.xml | 2 +
...6_64-cpuid-Xeon-Platinum-9242-disabled.xml | 2 +-
.../x86_64-cpuid-Xeon-Platinum-9242-guest.xml | 2 +
.../x86_64-cpuid-Xeon-Platinum-9242-host.xml | 2 +
.../domaincapsdata/qemu_9.2.0-q35.x86_64.xml | 58 +++++
.../domaincapsdata/qemu_9.2.0-tcg.x86_64.xml | 47 ++++
tests/domaincapsdata/qemu_9.2.0.x86_64.xml | 58 +++++
...host-model-fallback-kvm.x86_64-latest.args | 2 +-
...cpu-host-model-features.x86_64-latest.args | 2 +-
.../cpu-host-model-kvm.x86_64-latest.args | 2 +-
...st-model-nofallback-kvm.x86_64-latest.args | 2 +-
95 files changed, 545 insertions(+), 30 deletions(-)
create mode 100644 src/cpu_map/x86_GraniteRapids-v2.xml
--
2.47.1
7:23 a.m.
New subject: [PATCH 1/7] cpu_map: Add avx10* CPU features
Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com>
---
src/cpu_map/x86_features.xml | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/src/cpu_map/x86_features.xml b/src/cpu_map/x86_features.xml
index 08bf014604..8be8fab42e 100644
--- a/src/cpu_map/x86_features.xml
+++ b/src/cpu_map/x86_features.xml
@@ -469,6 +469,9 @@
<feature name='prefetchiti'>
<cpuid eax_in='0x00000007' ecx_in='0x00000001'
edx='0x00004000'/>
</feature>
+ <feature name='avx10'>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000001'
edx='0x00080000'/>
+ </feature>
<!-- cpuid level 0x00000007, 0x0002 (edx) -->
<feature name='mcdt-no'>
@@ -541,6 +544,17 @@
<cpuid eax_in='0x00000014' ecx_in='0x00000000'
ecx='0x80000000'/>
</feature>
+ <!-- cpuid level 0x00000024, 0x0000 (ebx) -->
+ <feature name='avx10-128'>
+ <cpuid eax_in='0x00000024' ecx_in='0x00000000'
ebx='0x00010000'/>
+ </feature>
+ <feature name='avx10-256'>
+ <cpuid eax_in='0x00000024' ecx_in='0x00000000'
ebx='0x00020000'/>
+ </feature>
+ <feature name='avx10-512'>
+ <cpuid eax_in='0x00000024' ecx_in='0x00000000'
ebx='0x00040000'/>
+ </feature>
+
<!-- cpuid level 0x80000001 (ecx) -->
<feature name='lahf_lm'>
<alias name='lahf-lm' source='qemu'/>
--
2.47.1
7:23 a.m.
New subject: [PATCH 2/7] cpu_map: Add GraniteRapids-v2 CPU model
Introduced by QEMU 9.2.0
Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com>
---
src/cpu_map/index.xml | 1 +
src/cpu_map/meson.build | 1 +
src/cpu_map/x86_GraniteRapids-v2.xml | 206 ++++++++++++++++++
.../domaincapsdata/qemu_9.2.0-q35.x86_64.xml | 57 +++++
.../domaincapsdata/qemu_9.2.0-tcg.x86_64.xml | 47 ++++
tests/domaincapsdata/qemu_9.2.0.x86_64.xml | 57 +++++
6 files changed, 369 insertions(+)
create mode 100644 src/cpu_map/x86_GraniteRapids-v2.xml
diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml
index 8e74195312..dba2f21811 100644
--- a/src/cpu_map/index.xml
+++ b/src/cpu_map/index.xml
@@ -121,6 +121,7 @@
<include filename='x86_SapphireRapids-v3.xml'/>
<include filename='x86_GraniteRapids.xml'/>
<include filename='x86_GraniteRapids-v1.xml'/>
+ <include filename='x86_GraniteRapids-v2.xml'/>
<include filename='x86_SierraForest.xml'/>
<include filename='x86_SierraForest-v1.xml'/>
<include filename='x86_Denverton.xml'/>
diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build
index fa7faa4016..9a1c048620 100644
--- a/src/cpu_map/meson.build
+++ b/src/cpu_map/meson.build
@@ -77,6 +77,7 @@ cpumap_data = [
'x86_EPYC.xml',
'x86_features.xml',
'x86_GraniteRapids-v1.xml',
+ 'x86_GraniteRapids-v2.xml',
'x86_GraniteRapids.xml',
'x86_Haswell-IBRS.xml',
'x86_Haswell-noTSX-IBRS.xml',
diff --git a/src/cpu_map/x86_GraniteRapids-v2.xml b/src/cpu_map/x86_GraniteRapids-v2.xml
new file mode 100644
index 0000000000..855a43d4ad
--- /dev/null
+++ b/src/cpu_map/x86_GraniteRapids-v2.xml
@@ -0,0 +1,206 @@
+<cpus>
+ <model name='GraniteRapids-v2'>
+ <decode host='on' guest='off'/>
+ <signature family='6' model='173'/>
+ <vendor name='Intel'/>
+ <feature name='3dnowprefetch'/>
+ <feature name='abm'/>
+ <feature name='adx'/>
+ <feature name='aes'/>
+ <feature name='amx-bf16'/>
+ <feature name='amx-fp16'/>
+ <feature name='amx-int8'/>
+ <feature name='amx-tile'/>
+ <feature name='apic'/>
+ <feature name='arat'/>
+ <feature name='arch-capabilities'/>
+ <feature name='avx'/>
+ <feature name='avx-vnni'/>
+ <feature name='avx10'/>
+ <feature name='avx10-128'/>
+ <feature name='avx10-256'/>
+ <feature name='avx10-512'/>
+ <feature name='avx2'/>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512-fp16'/>
+ <feature name='avx512-vpopcntdq'/>
+ <feature name='avx512bitalg'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512ifma'/>
+ <feature name='avx512vbmi'/>
+ <feature name='avx512vbmi2'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='bmi1'/>
+ <feature name='bmi2'/>
+ <feature name='bus-lock-detect'/>
+ <feature name='cldemote'/>
+ <feature name='clflush'/>
+ <feature name='clflushopt'/>
+ <feature name='clwb'/>
+ <feature name='cmov'/>
+ <feature name='cx16'/>
+ <feature name='cx8'/>
+ <feature name='de'/>
+ <feature name='erms'/>
+ <feature name='f16c'/>
+ <feature name='fbsdp-no'/>
+ <feature name='fma'/>
+ <feature name='fpu'/>
+ <feature name='fsgsbase'/>
+ <feature name='fsrc'/>
+ <feature name='fsrm'/>
+ <feature name='fsrs'/>
+ <feature name='fxsr'/>
+ <feature name='fzrm'/>
+ <feature name='gfni'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='la57'/>
+ <feature name='lahf_lm'/>
+ <feature name='lm'/>
+ <feature name='mca'/>
+ <feature name='mcdt-no'/>
+ <feature name='mce'/>
+ <feature name='mds-no'/>
+ <feature name='mmx'/>
+ <feature name='movbe'/>
+ <feature name='movdir64b'/>
+ <feature name='movdiri'/>
+ <feature name='msr'/>
+ <feature name='mtrr'/>
+ <feature name='nx'/>
+ <feature name='pae'/>
+ <feature name='pat'/>
+ <feature name='pbrsb-no'/>
+ <feature name='pcid'/>
+ <feature name='pclmuldq'/>
+ <feature name='pdpe1gb'/>
+ <feature name='pge'/>
+ <feature name='pku'/>
+ <feature name='pni'/>
+ <feature name='popcnt'/>
+ <feature name='prefetchiti'/>
+ <feature name='pschange-mc-no'/>
+ <feature name='psdp-no'/>
+ <feature name='pse'/>
+ <feature name='pse36'/>
+ <feature name='rdctl-no'/>
+ <feature name='rdpid'/>
+ <feature name='rdrand'/>
+ <feature name='rdseed'/>
+ <feature name='rdtscp'/>
+ <feature name='rtm'/>
+ <feature name='sbdr-ssdp-no'/>
+ <feature name='sep'/>
+ <feature name='serialize'/>
+ <feature name='sha-ni'/>
+ <feature name='skip-l1dfl-vmentry'/>
+ <feature name='smap'/>
+ <feature name='smep'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ss'/>
+ <feature name='ssbd'/>
+ <feature name='sse'/>
+ <feature name='sse2'/>
+ <feature name='sse4.1'/>
+ <feature name='sse4.2'/>
+ <feature name='ssse3'/>
+ <feature name='syscall'/>
+ <feature name='taa-no'/>
+ <feature name='tsc'/>
+ <feature name='tsc-deadline'/>
+ <feature name='tsc_adjust'/>
+ <feature name='tsx-ldtrk'/>
+ <feature name='umip'/>
+ <feature name='vaes'/>
+ <feature name='vme'/>
+ <feature name='vmx-activity-hlt'/>
+ <feature name='vmx-apicv-register'/>
+ <feature name='vmx-apicv-vid'/>
+ <feature name='vmx-apicv-x2apic'/>
+ <feature name='vmx-apicv-xapic'/>
+ <feature name='vmx-cr3-load-noexit'/>
+ <feature name='vmx-cr3-store-noexit'/>
+ <feature name='vmx-cr8-load-exit'/>
+ <feature name='vmx-cr8-store-exit'/>
+ <feature name='vmx-desc-exit'/>
+ <feature name='vmx-entry-ia32e-mode'/>
+ <feature name='vmx-entry-load-efer'/>
+ <feature name='vmx-entry-load-pat'/>
+ <feature name='vmx-entry-load-perf-global-ctrl'/>
+ <feature name='vmx-entry-noload-debugctl'/>
+ <feature name='vmx-ept'/>
+ <feature name='vmx-ept-1gb'/>
+ <feature name='vmx-ept-2mb'/>
+ <feature name='vmx-ept-execonly'/>
+ <feature name='vmx-eptad'/>
+ <feature name='vmx-eptp-switching'/>
+ <feature name='vmx-exit-ack-intr'/>
+ <feature name='vmx-exit-load-efer'/>
+ <feature name='vmx-exit-load-pat'/>
+ <feature name='vmx-exit-load-perf-global-ctrl'/>
+ <feature name='vmx-exit-nosave-debugctl'/>
+ <feature name='vmx-exit-save-efer'/>
+ <feature name='vmx-exit-save-pat'/>
+ <feature name='vmx-exit-save-preemption-timer'/>
+ <feature name='vmx-flexpriority'/>
+ <feature name='vmx-hlt-exit'/>
+ <feature name='vmx-ins-outs'/>
+ <feature name='vmx-intr-exit'/>
+ <feature name='vmx-invept'/>
+ <feature name='vmx-invept-all-context'/>
+ <feature name='vmx-invept-single-context'/>
+ <feature name='vmx-invlpg-exit'/>
+ <feature name='vmx-invpcid-exit'/>
+ <feature name='vmx-invvpid-all-context'/>
+ <feature name='vmx-invvpid-single-addr'/>
+ <feature name='vmx-invvpid-single-context-noglobals'/>
+ <feature name='vmx-io-bitmap'/>
+ <feature name='vmx-io-exit'/>
+ <feature name='vmx-monitor-exit'/>
+ <feature name='vmx-movdr-exit'/>
+ <feature name='vmx-msr-bitmap'/>
+ <feature name='vmx-mtf'/>
+ <feature name='vmx-mwait-exit'/>
+ <feature name='vmx-nmi-exit'/>
+ <feature name='vmx-page-walk-4'/>
+ <feature name='vmx-page-walk-5'/>
+ <feature name='vmx-pause-exit'/>
+ <feature name='vmx-pml'/>
+ <feature name='vmx-posted-intr'/>
+ <feature name='vmx-preemption-timer'/>
+ <feature name='vmx-rdpmc-exit'/>
+ <feature name='vmx-rdrand-exit'/>
+ <feature name='vmx-rdseed-exit'/>
+ <feature name='vmx-rdtsc-exit'/>
+ <feature name='vmx-rdtscp-exit'/>
+ <feature name='vmx-secondary-ctls'/>
+ <feature name='vmx-shadow-vmcs'/>
+ <feature name='vmx-store-lma'/>
+ <feature name='vmx-true-ctls'/>
+ <feature name='vmx-tsc-offset'/>
+ <feature name='vmx-unrestricted-guest'/>
+ <feature name='vmx-vintr-pending'/>
+ <feature name='vmx-vmfunc'/>
+ <feature name='vmx-vmwrite-vmexit-fields'/>
+ <feature name='vmx-vnmi'/>
+ <feature name='vmx-vnmi-pending'/>
+ <feature name='vmx-vpid'/>
+ <feature name='vmx-wbinvd-exit'/>
+ <feature name='vmx-xsaves'/>
+ <feature name='vpclmulqdq'/>
+ <feature name='wbnoinvd'/>
+ <feature name='x2apic'/>
+ <feature name='xfd'/>
+ <feature name='xgetbv1'/>
+ <feature name='xsave'/>
+ <feature name='xsavec'/>
+ <feature name='xsaveopt'/>
+ <feature name='xsaves'/>
+ </model>
+</cpus>
diff --git a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
index 99445e5f44..d5db9af49e 100644
--- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
@@ -565,6 +565,63 @@
<feature name='xfd'/>
<feature name='xsaves'/>
</blockers>
+ <model usable='no'
vendor='Intel'>GraniteRapids-v2</model>
+ <blockers model='GraniteRapids-v2'>
+ <feature name='amx-bf16'/>
+ <feature name='amx-fp16'/>
+ <feature name='amx-int8'/>
+ <feature name='amx-tile'/>
+ <feature name='avx-vnni'/>
+ <feature name='avx10'/>
+ <feature name='avx10-128'/>
+ <feature name='avx10-256'/>
+ <feature name='avx10-512'/>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512-fp16'/>
+ <feature name='avx512-vpopcntdq'/>
+ <feature name='avx512bitalg'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512ifma'/>
+ <feature name='avx512vbmi'/>
+ <feature name='avx512vbmi2'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='bus-lock-detect'/>
+ <feature name='cldemote'/>
+ <feature name='erms'/>
+ <feature name='fbsdp-no'/>
+ <feature name='fsrc'/>
+ <feature name='fsrm'/>
+ <feature name='fsrs'/>
+ <feature name='fzrm'/>
+ <feature name='gfni'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='la57'/>
+ <feature name='mcdt-no'/>
+ <feature name='movdir64b'/>
+ <feature name='movdiri'/>
+ <feature name='pbrsb-no'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='prefetchiti'/>
+ <feature name='psdp-no'/>
+ <feature name='rtm'/>
+ <feature name='sbdr-ssdp-no'/>
+ <feature name='serialize'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ss'/>
+ <feature name='taa-no'/>
+ <feature name='tsx-ldtrk'/>
+ <feature name='vaes'/>
+ <feature name='vpclmulqdq'/>
+ <feature name='xfd'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='no' vendor='Intel'
canonical='Haswell-v1'>Haswell</model>
<blockers model='Haswell'>
<feature name='erms'/>
diff --git a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
index 8bf967c99f..7ccdc11412 100644
--- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
@@ -733,6 +733,53 @@
<feature name='xsavec'/>
<feature name='xsaves'/>
</blockers>
+ <model usable='no'
vendor='Intel'>GraniteRapids-v2</model>
+ <blockers model='GraniteRapids-v2'>
+ <feature name='amx-bf16'/>
+ <feature name='amx-fp16'/>
+ <feature name='amx-int8'/>
+ <feature name='amx-tile'/>
+ <feature name='arch-capabilities'/>
+ <feature name='avx-vnni'/>
+ <feature name='avx10'/>
+ <feature name='avx10-128'/>
+ <feature name='avx10-256'/>
+ <feature name='avx10-512'/>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512-fp16'/>
+ <feature name='avx512-vpopcntdq'/>
+ <feature name='avx512bitalg'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512ifma'/>
+ <feature name='avx512vbmi'/>
+ <feature name='avx512vbmi2'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='bus-lock-detect'/>
+ <feature name='cldemote'/>
+ <feature name='gfni'/>
+ <feature name='hle'/>
+ <feature name='invpcid'/>
+ <feature name='mcdt-no'/>
+ <feature name='movdir64b'/>
+ <feature name='movdiri'/>
+ <feature name='pcid'/>
+ <feature name='prefetchiti'/>
+ <feature name='rtm'/>
+ <feature name='serialize'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='tsc-deadline'/>
+ <feature name='tsc_adjust'/>
+ <feature name='tsx-ldtrk'/>
+ <feature name='vpclmulqdq'/>
+ <feature name='xfd'/>
+ <feature name='xsavec'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='no' vendor='Intel'
canonical='Haswell-v1'>Haswell</model>
<blockers model='Haswell'>
<feature name='hle'/>
diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
index 40aa971144..05a5ce4bee 100644
--- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
@@ -564,6 +564,63 @@
<feature name='xfd'/>
<feature name='xsaves'/>
</blockers>
+ <model usable='no'
vendor='Intel'>GraniteRapids-v2</model>
+ <blockers model='GraniteRapids-v2'>
+ <feature name='amx-bf16'/>
+ <feature name='amx-fp16'/>
+ <feature name='amx-int8'/>
+ <feature name='amx-tile'/>
+ <feature name='avx-vnni'/>
+ <feature name='avx10'/>
+ <feature name='avx10-128'/>
+ <feature name='avx10-256'/>
+ <feature name='avx10-512'/>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512-fp16'/>
+ <feature name='avx512-vpopcntdq'/>
+ <feature name='avx512bitalg'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512ifma'/>
+ <feature name='avx512vbmi'/>
+ <feature name='avx512vbmi2'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='bus-lock-detect'/>
+ <feature name='cldemote'/>
+ <feature name='erms'/>
+ <feature name='fbsdp-no'/>
+ <feature name='fsrc'/>
+ <feature name='fsrm'/>
+ <feature name='fsrs'/>
+ <feature name='fzrm'/>
+ <feature name='gfni'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='la57'/>
+ <feature name='mcdt-no'/>
+ <feature name='movdir64b'/>
+ <feature name='movdiri'/>
+ <feature name='pbrsb-no'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='prefetchiti'/>
+ <feature name='psdp-no'/>
+ <feature name='rtm'/>
+ <feature name='sbdr-ssdp-no'/>
+ <feature name='serialize'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ss'/>
+ <feature name='taa-no'/>
+ <feature name='tsx-ldtrk'/>
+ <feature name='vaes'/>
+ <feature name='vpclmulqdq'/>
+ <feature name='xfd'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='no' vendor='Intel'
canonical='Haswell-v1'>Haswell</model>
<blockers model='Haswell'>
<feature name='erms'/>
--
2.47.1
7:23 a.m.
New subject: [PATCH 3/7] cpu_map: Add sha512, sm3, and sm4 CPU features
Introduced by Clearwater Forest platform.
Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com>
---
src/cpu_map/x86_features.xml | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/src/cpu_map/x86_features.xml b/src/cpu_map/x86_features.xml
index 8be8fab42e..0e1fee6e98 100644
--- a/src/cpu_map/x86_features.xml
+++ b/src/cpu_map/x86_features.xml
@@ -416,6 +416,15 @@
</feature>
<!-- cpuid level 0x00000007, 0x0001 (eax) -->
+ <feature name='sha512'>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000001'
eax='0x00000001'/>
+ </feature>
+ <feature name='sm3'>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000001'
eax='0x00000002'/>
+ </feature>
+ <feature name='sm4'>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000001'
eax='0x00000004'/>
+ </feature>
<feature name='avx-vnni'>
<cpuid eax_in='0x00000007' ecx_in='0x00000001'
eax='0x00000010'/>
</feature>
--
2.47.1
7:23 a.m.
New subject: [PATCH 4/7] cpu_map: Add fdp-excptn-only CPU feature
Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com>
---
src/cpu_map/x86_features.xml | 3 +++
tests/cputestdata/x86_64-cpuid-Atom-P5362-disabled.xml | 2 +-
tests/cputestdata/x86_64-cpuid-Atom-P5362-guest.xml | 1 +
tests/cputestdata/x86_64-cpuid-Atom-P5362-host.xml | 1 +
tests/cputestdata/x86_64-cpuid-Cooperlake-disabled.xml | 2 +-
tests/cputestdata/x86_64-cpuid-Cooperlake-guest.xml | 1 +
tests/cputestdata/x86_64-cpuid-Cooperlake-host.xml | 1 +
tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-disabled.xml | 2 +-
tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-guest.xml | 1 +
tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml | 1 +
tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-disabled.xml | 2 +-
tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-guest.xml | 1 +
tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-host.xml | 1 +
tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-disabled.xml | 2 +-
tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-guest.xml | 1 +
tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-host.xml | 1 +
tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-disabled.xml | 2 +-
tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-guest.xml | 1 +
tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-host.xml | 1 +
tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-disabled.xml | 2 +-
tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-guest.xml | 1 +
tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-host.xml | 1 +
tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-disabled.xml | 2 +-
tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-guest.xml | 1 +
tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-host.xml | 1 +
25 files changed, 27 insertions(+), 8 deletions(-)
diff --git a/src/cpu_map/x86_features.xml b/src/cpu_map/x86_features.xml
index 0e1fee6e98..34cf157780 100644
--- a/src/cpu_map/x86_features.xml
+++ b/src/cpu_map/x86_features.xml
@@ -221,6 +221,9 @@
<feature name='avx2'>
<cpuid eax_in='0x00000007' ecx_in='0x00000000'
ebx='0x00000020'/>
</feature>
+ <feature name='fdp-excptn-only'>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000000'
ebx='0x00000040'/>
+ </feature>
<feature name='smep'>
<cpuid eax_in='0x00000007' ecx_in='0x00000000'
ebx='0x00000080'/>
</feature>
diff --git a/tests/cputestdata/x86_64-cpuid-Atom-P5362-disabled.xml
b/tests/cputestdata/x86_64-cpuid-Atom-P5362-disabled.xml
index fab2d4d85c..f6dd0ff97f 100644
--- a/tests/cputestdata/x86_64-cpuid-Atom-P5362-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Atom-P5362-disabled.xml
@@ -1,7 +1,7 @@
<!-- Features disabled by QEMU -->
<cpudata arch='x86'>
<cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000'
ebx='0x00000000' ecx='0x080041dc' edx='0xb0600000'/>
- <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000'
ebx='0x02001000' ecx='0x00000020' edx='0x50000000'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000'
ebx='0x02001040' ecx='0x00000020' edx='0x50000000'/>
<cpuid eax_in='0x0000000f' ecx_in='0x01' eax='0x00000000'
ebx='0x00000000' ecx='0x00000000' edx='0x00000006'/>
<cpuid eax_in='0x00000014' ecx_in='0x00' eax='0x00000000'
ebx='0x00000000' ecx='0x80000000' edx='0x00000000'/>
<cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000'
ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Atom-P5362-guest.xml
b/tests/cputestdata/x86_64-cpuid-Atom-P5362-guest.xml
index 9077b95178..f5d5bb6cf6 100644
--- a/tests/cputestdata/x86_64-cpuid-Atom-P5362-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Atom-P5362-guest.xml
@@ -18,6 +18,7 @@
<feature policy='require' name='tm'/>
<feature policy='require' name='pbe'/>
<feature policy='require' name='tsc_adjust'/>
+ <feature policy='require' name='fdp-excptn-only'/>
<feature policy='require' name='cmt'/>
<feature policy='require' name='intel-pt'/>
<feature policy='require' name='waitpkg'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Atom-P5362-host.xml
b/tests/cputestdata/x86_64-cpuid-Atom-P5362-host.xml
index 98718a36a5..74bd3642da 100644
--- a/tests/cputestdata/x86_64-cpuid-Atom-P5362-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Atom-P5362-host.xml
@@ -29,6 +29,7 @@
<feature name='arat'/>
<feature name='fsgsbase'/>
<feature name='tsc_adjust'/>
+ <feature name='fdp-excptn-only'/>
<feature name='smep'/>
<feature name='erms'/>
<feature name='cmt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Cooperlake-disabled.xml
b/tests/cputestdata/x86_64-cpuid-Cooperlake-disabled.xml
index 3b9ca13ad4..ad0f83dae9 100644
--- a/tests/cputestdata/x86_64-cpuid-Cooperlake-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Cooperlake-disabled.xml
@@ -1,7 +1,7 @@
<!-- Features disabled by QEMU -->
<cpudata arch='x86'>
<cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000'
ebx='0x00000000' ecx='0x0804c1dc' edx='0xb0600000'/>
- <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000'
ebx='0x02001000' ecx='0x00000010' edx='0x10000000'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000'
ebx='0x02001040' ecx='0x00000010' edx='0x10000000'/>
<cpuid eax_in='0x0000000f' ecx_in='0x01' eax='0x00000000'
ebx='0x00000000' ecx='0x00000000' edx='0x00000006'/>
<cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000'
ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
</cpudata>
diff --git a/tests/cputestdata/x86_64-cpuid-Cooperlake-guest.xml
b/tests/cputestdata/x86_64-cpuid-Cooperlake-guest.xml
index b878e13c62..c1338ab1c1 100644
--- a/tests/cputestdata/x86_64-cpuid-Cooperlake-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Cooperlake-guest.xml
@@ -19,6 +19,7 @@
<feature policy='require' name='tm'/>
<feature policy='require' name='pbe'/>
<feature policy='require' name='tsc_adjust'/>
+ <feature policy='require' name='fdp-excptn-only'/>
<feature policy='require' name='cmt'/>
<feature policy='require' name='mpx'/>
<feature policy='require' name='intel-pt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Cooperlake-host.xml
b/tests/cputestdata/x86_64-cpuid-Cooperlake-host.xml
index 0be098de80..bedb1400e7 100644
--- a/tests/cputestdata/x86_64-cpuid-Cooperlake-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Cooperlake-host.xml
@@ -21,6 +21,7 @@
<feature name='tm'/>
<feature name='pbe'/>
<feature name='tsc_adjust'/>
+ <feature name='fdp-excptn-only'/>
<feature name='cmt'/>
<feature name='mpx'/>
<feature name='intel-pt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-disabled.xml
b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-disabled.xml
index 2f15f36fd1..45e8183cb8 100644
--- a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-disabled.xml
@@ -1,7 +1,7 @@
<!-- Features disabled by QEMU -->
<cpudata arch='x86'>
<cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000'
ebx='0x00000000' ecx='0x0804c1fc' edx='0xb0600000'/>
- <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000'
ebx='0x02001004' ecx='0x40400010' edx='0x10000010'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000'
ebx='0x02001044' ecx='0x40400010' edx='0x10000010'/>
<cpuid eax_in='0x0000000f' ecx_in='0x01' eax='0x00000000'
ebx='0x00000000' ecx='0x00000000' edx='0x00000006'/>
<cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000'
ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
</cpudata>
diff --git a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-guest.xml
b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-guest.xml
index fe293599ef..5d5ed161fa 100644
--- a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-guest.xml
@@ -20,6 +20,7 @@
<feature policy='require' name='pbe'/>
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='sgx'/>
+ <feature policy='require' name='fdp-excptn-only'/>
<feature policy='require' name='cmt'/>
<feature policy='require' name='mpx'/>
<feature policy='require' name='avx512ifma'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml
b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml
index 443971b9f2..4c792e62f4 100644
--- a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml
@@ -22,6 +22,7 @@
<feature name='pbe'/>
<feature name='tsc_adjust'/>
<feature name='sgx'/>
+ <feature name='fdp-excptn-only'/>
<feature name='cmt'/>
<feature name='mpx'/>
<feature name='avx512ifma'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-disabled.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-disabled.xml
index c65c3caecf..8971cc2bad 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-disabled.xml
@@ -1,7 +1,7 @@
<!-- Features disabled by QEMU -->
<cpudata arch='x86'>
<cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000'
ebx='0x00000000' ecx='0x0804c1fc' edx='0xb0600000'/>
- <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000'
ebx='0x02001000' ecx='0x00000008' edx='0x08000000'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000'
ebx='0x02001040' ecx='0x00000008' edx='0x08000000'/>
<cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x00000008'
ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
<cpuid eax_in='0x0000000f' ecx_in='0x01' eax='0x00000000'
ebx='0x00000000' ecx='0x00000000' edx='0x00000006'/>
<cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000'
ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-guest.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-guest.xml
index 4f5922a7cf..84384fda81 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-guest.xml
@@ -19,6 +19,7 @@
<feature policy='require' name='tm'/>
<feature policy='require' name='pbe'/>
<feature policy='require' name='tsc_adjust'/>
+ <feature policy='require' name='fdp-excptn-only'/>
<feature policy='require' name='cmt'/>
<feature policy='require' name='mpx'/>
<feature policy='require' name='clflushopt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-host.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-host.xml
index d0f48997ec..4af85f2887 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-host.xml
@@ -21,6 +21,7 @@
<feature name='tm'/>
<feature name='pbe'/>
<feature name='tsc_adjust'/>
+ <feature name='fdp-excptn-only'/>
<feature name='cmt'/>
<feature name='mpx'/>
<feature name='clflushopt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-disabled.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-disabled.xml
index 3b9ca13ad4..ad0f83dae9 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-disabled.xml
@@ -1,7 +1,7 @@
<!-- Features disabled by QEMU -->
<cpudata arch='x86'>
<cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000'
ebx='0x00000000' ecx='0x0804c1dc' edx='0xb0600000'/>
- <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000'
ebx='0x02001000' ecx='0x00000010' edx='0x10000000'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000'
ebx='0x02001040' ecx='0x00000010' edx='0x10000000'/>
<cpuid eax_in='0x0000000f' ecx_in='0x01' eax='0x00000000'
ebx='0x00000000' ecx='0x00000000' edx='0x00000006'/>
<cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000'
ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
</cpudata>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-guest.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-guest.xml
index 814eca886d..6430b8532c 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-guest.xml
@@ -19,6 +19,7 @@
<feature policy='require' name='tm'/>
<feature policy='require' name='pbe'/>
<feature policy='require' name='tsc_adjust'/>
+ <feature policy='require' name='fdp-excptn-only'/>
<feature policy='require' name='cmt'/>
<feature policy='require' name='mpx'/>
<feature policy='require' name='clflushopt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-host.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-host.xml
index 71a53982bc..96b813f47a 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-host.xml
@@ -21,6 +21,7 @@
<feature name='tm'/>
<feature name='pbe'/>
<feature name='tsc_adjust'/>
+ <feature name='fdp-excptn-only'/>
<feature name='cmt'/>
<feature name='mpx'/>
<feature name='clflushopt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-disabled.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-disabled.xml
index 9b84b8fb47..926d15b522 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-disabled.xml
@@ -1,7 +1,7 @@
<!-- Features disabled by QEMU -->
<cpudata arch='x86'>
<cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000'
ebx='0x00000000' ecx='0x0804c1fc' edx='0xb0600000'/>
- <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000'
ebx='0x02001000' ecx='0x00000008' edx='0x00000000'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000'
ebx='0x02001040' ecx='0x00000008' edx='0x00000000'/>
<cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x00000008'
ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
<cpuid eax_in='0x0000000f' ecx_in='0x01' eax='0x00000000'
ebx='0x00000000' ecx='0x00000000' edx='0x00000006'/>
<cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000'
ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-guest.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-guest.xml
index 5fdf6e8297..45e58dc5e2 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-guest.xml
@@ -19,6 +19,7 @@
<feature policy='require' name='tm'/>
<feature policy='require' name='pbe'/>
<feature policy='require' name='tsc_adjust'/>
+ <feature policy='require' name='fdp-excptn-only'/>
<feature policy='require' name='cmt'/>
<feature policy='require' name='mpx'/>
<feature policy='require' name='clflushopt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-host.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-host.xml
index e2e5acdb60..18661472a2 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-host.xml
@@ -21,6 +21,7 @@
<feature name='tm'/>
<feature name='pbe'/>
<feature name='tsc_adjust'/>
+ <feature name='fdp-excptn-only'/>
<feature name='cmt'/>
<feature name='mpx'/>
<feature name='clflushopt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-disabled.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-disabled.xml
index 8e4e478cf1..b263130580 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-disabled.xml
@@ -1,7 +1,7 @@
<!-- Features disabled by QEMU -->
<cpudata arch='x86'>
<cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000'
ebx='0x00000000' ecx='0x0804c1fc' edx='0xb0600000'/>
- <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000'
ebx='0x02001000' ecx='0x00000010' edx='0x38000400'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000'
ebx='0x02001040' ecx='0x00000010' edx='0x38000400'/>
<cpuid eax_in='0x0000000f' ecx_in='0x01' eax='0x00000000'
ebx='0x00000000' ecx='0x00000000' edx='0x00000006'/>
<cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000'
ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
<msr index='0x10a' edx='0x00000000' eax='0x00000020'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-guest.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-guest.xml
index cd504f5b74..2660200972 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-guest.xml
@@ -19,6 +19,7 @@
<feature policy='require' name='tm'/>
<feature policy='require' name='pbe'/>
<feature policy='require' name='tsc_adjust'/>
+ <feature policy='require' name='fdp-excptn-only'/>
<feature policy='require' name='cmt'/>
<feature policy='require' name='mpx'/>
<feature policy='require' name='intel-pt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-host.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-host.xml
index f1eb50bae3..298f8d7629 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-host.xml
@@ -21,6 +21,7 @@
<feature name='tm'/>
<feature name='pbe'/>
<feature name='tsc_adjust'/>
+ <feature name='fdp-excptn-only'/>
<feature name='cmt'/>
<feature name='mpx'/>
<feature name='intel-pt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-disabled.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-disabled.xml
index 3b9ca13ad4..ad0f83dae9 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-disabled.xml
@@ -1,7 +1,7 @@
<!-- Features disabled by QEMU -->
<cpudata arch='x86'>
<cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000'
ebx='0x00000000' ecx='0x0804c1dc' edx='0xb0600000'/>
- <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000'
ebx='0x02001000' ecx='0x00000010' edx='0x10000000'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000'
ebx='0x02001040' ecx='0x00000010' edx='0x10000000'/>
<cpuid eax_in='0x0000000f' ecx_in='0x01' eax='0x00000000'
ebx='0x00000000' ecx='0x00000000' edx='0x00000006'/>
<cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000'
ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
</cpudata>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-guest.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-guest.xml
index 1abecfb508..f7faf1f7d4 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-guest.xml
@@ -19,6 +19,7 @@
<feature policy='require' name='tm'/>
<feature policy='require' name='pbe'/>
<feature policy='require' name='tsc_adjust'/>
+ <feature policy='require' name='fdp-excptn-only'/>
<feature policy='require' name='cmt'/>
<feature policy='require' name='mpx'/>
<feature policy='require' name='intel-pt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-host.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-host.xml
index 069becffe4..6c36f9c9f9 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-host.xml
@@ -21,6 +21,7 @@
<feature name='tm'/>
<feature name='pbe'/>
<feature name='tsc_adjust'/>
+ <feature name='fdp-excptn-only'/>
<feature name='cmt'/>
<feature name='mpx'/>
<feature name='intel-pt'/>
--
2.47.1
7:23 a.m.
New subject: [PATCH 5/7] cpu_map: Add zero-fcs-fds CPU feature
Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com>
---
src/cpu_map/x86_features.xml | 3 +++
tests/cputestdata/x86_64-cpuid-Atom-P5362-disabled.xml | 2 +-
tests/cputestdata/x86_64-cpuid-Atom-P5362-guest.xml | 1 +
tests/cputestdata/x86_64-cpuid-Atom-P5362-host.xml | 1 +
tests/cputestdata/x86_64-cpuid-Cooperlake-disabled.xml | 2 +-
tests/cputestdata/x86_64-cpuid-Cooperlake-guest.xml | 1 +
tests/cputestdata/x86_64-cpuid-Cooperlake-host.xml | 1 +
tests/cputestdata/x86_64-cpuid-Core-i5-4670T-disabled.xml | 2 +-
tests/cputestdata/x86_64-cpuid-Core-i5-4670T-guest.xml | 1 +
tests/cputestdata/x86_64-cpuid-Core-i5-4670T-host.xml | 1 +
tests/cputestdata/x86_64-cpuid-Core-i5-6600-disabled.xml | 2 +-
tests/cputestdata/x86_64-cpuid-Core-i5-6600-guest.xml | 1 +
tests/cputestdata/x86_64-cpuid-Core-i5-6600-host.xml | 1 +
tests/cputestdata/x86_64-cpuid-Core-i7-4510U-disabled.xml | 1 +
tests/cputestdata/x86_64-cpuid-Core-i7-4510U-guest.xml | 1 +
tests/cputestdata/x86_64-cpuid-Core-i7-4510U-host.xml | 1 +
tests/cputestdata/x86_64-cpuid-Core-i7-4600U-disabled.xml | 1 +
tests/cputestdata/x86_64-cpuid-Core-i7-4600U-guest.xml | 1 +
tests/cputestdata/x86_64-cpuid-Core-i7-4600U-host.xml | 1 +
tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-disabled.xml | 2 +-
tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-guest.xml | 1 +
tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-host.xml | 1 +
tests/cputestdata/x86_64-cpuid-Core-i7-5600U-disabled.xml | 2 +-
tests/cputestdata/x86_64-cpuid-Core-i7-5600U-guest.xml | 1 +
tests/cputestdata/x86_64-cpuid-Core-i7-5600U-host.xml | 1 +
tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-disabled.xml | 2 +-
tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-guest.xml | 1 +
tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-host.xml | 1 +
tests/cputestdata/x86_64-cpuid-Core-i7-7600U-disabled.xml | 2 +-
tests/cputestdata/x86_64-cpuid-Core-i7-7600U-guest.xml | 1 +
tests/cputestdata/x86_64-cpuid-Core-i7-7600U-host.xml | 1 +
tests/cputestdata/x86_64-cpuid-Core-i7-7700-disabled.xml | 2 +-
tests/cputestdata/x86_64-cpuid-Core-i7-7700-guest.xml | 1 +
tests/cputestdata/x86_64-cpuid-Core-i7-7700-host.xml | 1 +
tests/cputestdata/x86_64-cpuid-Core-i7-8550U-disabled.xml | 2 +-
tests/cputestdata/x86_64-cpuid-Core-i7-8550U-guest.xml | 1 +
tests/cputestdata/x86_64-cpuid-Core-i7-8550U-host.xml | 1 +
tests/cputestdata/x86_64-cpuid-Core-i7-8700-disabled.xml | 2 +-
tests/cputestdata/x86_64-cpuid-Core-i7-8700-guest.xml | 1 +
tests/cputestdata/x86_64-cpuid-Core-i7-8700-host.xml | 1 +
tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-disabled.xml | 2 +-
tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-guest.xml | 1 +
tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml | 1 +
tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-disabled.xml | 2 +-
tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml | 1 +
tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml | 1 +
tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-disabled.xml | 2 +-
tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-guest.xml | 1 +
tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-host.xml | 1 +
tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-disabled.xml | 2 +-
tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-guest.xml | 1 +
tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-host.xml | 1 +
tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-disabled.xml | 2 +-
tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-guest.xml | 1 +
tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-host.xml | 1 +
tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-disabled.xml | 2 +-
tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-guest.xml | 1 +
tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-host.xml | 1 +
tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-disabled.xml | 2 +-
tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-guest.xml | 1 +
tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-host.xml | 1 +
tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-disabled.xml | 2 +-
tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-guest.xml | 1 +
tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-host.xml | 1 +
tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-disabled.xml | 2 +-
tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-guest.xml | 1 +
tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-host.xml | 1 +
tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-disabled.xml | 2 +-
tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-guest.xml | 1 +
tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-host.xml | 1 +
tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-disabled.xml | 2 +-
tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-guest.xml | 1 +
tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-host.xml | 1 +
tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-disabled.xml | 2 +-
tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-guest.xml | 1 +
tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-host.xml | 1 +
tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-disabled.xml | 2 +-
tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-guest.xml | 1 +
tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-host.xml | 1 +
tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-disabled.xml | 2 +-
tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-guest.xml | 1 +
tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-host.xml | 1 +
tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-disabled.xml | 2 +-
tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-guest.xml | 1 +
tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-host.xml | 1 +
85 files changed, 87 insertions(+), 26 deletions(-)
diff --git a/src/cpu_map/x86_features.xml b/src/cpu_map/x86_features.xml
index 34cf157780..4cbe094cfd 100644
--- a/src/cpu_map/x86_features.xml
+++ b/src/cpu_map/x86_features.xml
@@ -243,6 +243,9 @@
<alias name='cqm' source='linux'/>
<cpuid eax_in='0x00000007' ecx_in='0x00000000'
ebx='0x00001000'/>
</feature>
+ <feature name='zero-fcs-fds'>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000000'
ebx='0x00002000'/>
+ </feature>
<feature name='mpx'>
<cpuid eax_in='0x00000007' ecx_in='0x00000000'
ebx='0x00004000'/>
</feature>
diff --git a/tests/cputestdata/x86_64-cpuid-Atom-P5362-disabled.xml
b/tests/cputestdata/x86_64-cpuid-Atom-P5362-disabled.xml
index f6dd0ff97f..d073361965 100644
--- a/tests/cputestdata/x86_64-cpuid-Atom-P5362-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Atom-P5362-disabled.xml
@@ -1,7 +1,7 @@
<!-- Features disabled by QEMU -->
<cpudata arch='x86'>
<cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000'
ebx='0x00000000' ecx='0x080041dc' edx='0xb0600000'/>
- <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000'
ebx='0x02001040' ecx='0x00000020' edx='0x50000000'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000'
ebx='0x02003040' ecx='0x00000020' edx='0x50000000'/>
<cpuid eax_in='0x0000000f' ecx_in='0x01' eax='0x00000000'
ebx='0x00000000' ecx='0x00000000' edx='0x00000006'/>
<cpuid eax_in='0x00000014' ecx_in='0x00' eax='0x00000000'
ebx='0x00000000' ecx='0x80000000' edx='0x00000000'/>
<cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000'
ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Atom-P5362-guest.xml
b/tests/cputestdata/x86_64-cpuid-Atom-P5362-guest.xml
index f5d5bb6cf6..0c8db656a1 100644
--- a/tests/cputestdata/x86_64-cpuid-Atom-P5362-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Atom-P5362-guest.xml
@@ -20,6 +20,7 @@
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='fdp-excptn-only'/>
<feature policy='require' name='cmt'/>
+ <feature policy='require' name='zero-fcs-fds'/>
<feature policy='require' name='intel-pt'/>
<feature policy='require' name='waitpkg'/>
<feature policy='require' name='rdpid'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Atom-P5362-host.xml
b/tests/cputestdata/x86_64-cpuid-Atom-P5362-host.xml
index 74bd3642da..06f8fe5c08 100644
--- a/tests/cputestdata/x86_64-cpuid-Atom-P5362-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Atom-P5362-host.xml
@@ -33,6 +33,7 @@
<feature name='smep'/>
<feature name='erms'/>
<feature name='cmt'/>
+ <feature name='zero-fcs-fds'/>
<feature name='rdseed'/>
<feature name='smap'/>
<feature name='clflushopt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Cooperlake-disabled.xml
b/tests/cputestdata/x86_64-cpuid-Cooperlake-disabled.xml
index ad0f83dae9..fda549b34d 100644
--- a/tests/cputestdata/x86_64-cpuid-Cooperlake-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Cooperlake-disabled.xml
@@ -1,7 +1,7 @@
<!-- Features disabled by QEMU -->
<cpudata arch='x86'>
<cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000'
ebx='0x00000000' ecx='0x0804c1dc' edx='0xb0600000'/>
- <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000'
ebx='0x02001040' ecx='0x00000010' edx='0x10000000'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000'
ebx='0x02003040' ecx='0x00000010' edx='0x10000000'/>
<cpuid eax_in='0x0000000f' ecx_in='0x01' eax='0x00000000'
ebx='0x00000000' ecx='0x00000000' edx='0x00000006'/>
<cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000'
ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
</cpudata>
diff --git a/tests/cputestdata/x86_64-cpuid-Cooperlake-guest.xml
b/tests/cputestdata/x86_64-cpuid-Cooperlake-guest.xml
index c1338ab1c1..70bffd1085 100644
--- a/tests/cputestdata/x86_64-cpuid-Cooperlake-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Cooperlake-guest.xml
@@ -21,6 +21,7 @@
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='fdp-excptn-only'/>
<feature policy='require' name='cmt'/>
+ <feature policy='require' name='zero-fcs-fds'/>
<feature policy='require' name='mpx'/>
<feature policy='require' name='intel-pt'/>
<feature policy='require' name='ospke'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Cooperlake-host.xml
b/tests/cputestdata/x86_64-cpuid-Cooperlake-host.xml
index bedb1400e7..4914b6bc36 100644
--- a/tests/cputestdata/x86_64-cpuid-Cooperlake-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Cooperlake-host.xml
@@ -23,6 +23,7 @@
<feature name='tsc_adjust'/>
<feature name='fdp-excptn-only'/>
<feature name='cmt'/>
+ <feature name='zero-fcs-fds'/>
<feature name='mpx'/>
<feature name='intel-pt'/>
<feature name='ospke'/>
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 0c6b68a57b..cd0257e8b5 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-disabled.xml
@@ -2,6 +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='0x00000007' ecx_in='0x00' eax='0x00000000'
ebx='0x00002810' 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-guest.xml
b/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-guest.xml
index e06bafe12a..b85d08980c 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-guest.xml
@@ -22,6 +22,7 @@
<feature policy='require' name='pbe'/>
<feature policy='require' name='arat'/>
<feature policy='require' name='tsc_adjust'/>
+ <feature policy='require' name='zero-fcs-fds'/>
<feature policy='require' name='abm'/>
<feature policy='require' name='pdpe1gb'/>
<feature policy='require' name='invtsc'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-host.xml
b/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-host.xml
index 7986162053..bba97d5c3e 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-host.xml
@@ -24,6 +24,7 @@
<feature name='pbe'/>
<feature name='arat'/>
<feature name='tsc_adjust'/>
+ <feature name='zero-fcs-fds'/>
<feature name='abm'/>
<feature name='pdpe1gb'/>
<feature name='invtsc'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-6600-disabled.xml
b/tests/cputestdata/x86_64-cpuid-Core-i5-6600-disabled.xml
index 040c0df183..8b88be91e0 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-6600-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-6600-disabled.xml
@@ -1,6 +1,6 @@
<!-- Features disabled by QEMU -->
<cpudata arch='x86'>
<cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000'
ebx='0x00000000' ecx='0x0800c1fc' edx='0xb0600000'/>
- <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000'
ebx='0x02000000' ecx='0x00000000' edx='0x00000000'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000'
ebx='0x02002000' 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-6600-guest.xml
b/tests/cputestdata/x86_64-cpuid-Core-i5-6600-guest.xml
index 2f8cd224ac..e274688c27 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-6600-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-6600-guest.xml
@@ -18,6 +18,7 @@
<feature policy='require' name='tm'/>
<feature policy='require' name='pbe'/>
<feature policy='require' name='tsc_adjust'/>
+ <feature policy='require' name='zero-fcs-fds'/>
<feature policy='require' name='mpx'/>
<feature policy='require' name='clflushopt'/>
<feature policy='require' name='intel-pt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-6600-host.xml
b/tests/cputestdata/x86_64-cpuid-Core-i5-6600-host.xml
index c43d9f2a21..83b030a81f 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-6600-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-6600-host.xml
@@ -20,6 +20,7 @@
<feature name='tm'/>
<feature name='pbe'/>
<feature name='tsc_adjust'/>
+ <feature name='zero-fcs-fds'/>
<feature name='mpx'/>
<feature name='clflushopt'/>
<feature name='intel-pt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-disabled.xml
b/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-disabled.xml
index dbc978e734..6ff4ce17ee 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-disabled.xml
@@ -1,5 +1,6 @@
<!-- Features disabled by QEMU -->
<cpudata arch='x86'>
<cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000'
ebx='0x00000000' ecx='0x0800c19c' edx='0xb0600000'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000'
ebx='0x00002000' 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-i7-4510U-guest.xml
b/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-guest.xml
index 618b266e41..5ff5b479dd 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-guest.xml
@@ -21,6 +21,7 @@
<feature policy='require' name='pbe'/>
<feature policy='require' name='arat'/>
<feature policy='require' name='tsc_adjust'/>
+ <feature policy='require' name='zero-fcs-fds'/>
<feature policy='require' name='xsaveopt'/>
<feature policy='require' name='abm'/>
<feature policy='require' name='pdpe1gb'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-host.xml
b/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-host.xml
index 43e0257a3f..d25f3d7d01 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-host.xml
@@ -37,6 +37,7 @@
<feature name='bmi2'/>
<feature name='erms'/>
<feature name='invpcid'/>
+ <feature name='zero-fcs-fds'/>
<feature name='xsaveopt'/>
<feature name='abm'/>
<feature name='pdpe1gb'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-disabled.xml
b/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-disabled.xml
index 4a0477f788..71cdda84f5 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-disabled.xml
@@ -1,5 +1,6 @@
<!-- Features disabled by QEMU -->
<cpudata arch='x86'>
<cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000'
ebx='0x00000000' ecx='0x0800c1dc' edx='0xb0600000'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000'
ebx='0x00002000' 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-i7-4600U-guest.xml
b/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-guest.xml
index a5cf3a8ebb..000bcf19ee 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-guest.xml
@@ -22,6 +22,7 @@
<feature policy='require' name='pbe'/>
<feature policy='require' name='arat'/>
<feature policy='require' name='tsc_adjust'/>
+ <feature policy='require' name='zero-fcs-fds'/>
<feature policy='require' name='xsaveopt'/>
<feature policy='require' name='abm'/>
<feature policy='require' name='pdpe1gb'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-host.xml
b/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-host.xml
index 41545483f2..feaaeffbcf 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-host.xml
@@ -24,6 +24,7 @@
<feature name='pbe'/>
<feature name='arat'/>
<feature name='tsc_adjust'/>
+ <feature name='zero-fcs-fds'/>
<feature name='xsaveopt'/>
<feature name='abm'/>
<feature name='pdpe1gb'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-disabled.xml
b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-disabled.xml
index edce01618a..749038d9c1 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-disabled.xml
@@ -2,6 +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='0x02000000' ecx='0x00000000' edx='0x00000000'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000'
ebx='0x02002000' 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-i7-5600U-arat-guest.xml
b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-guest.xml
index da6e4f8a9b..557964fcdc 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-guest.xml
@@ -22,6 +22,7 @@
<feature policy='require' name='pbe'/>
<feature policy='require' name='arat'/>
<feature policy='require' name='tsc_adjust'/>
+ <feature policy='require' name='zero-fcs-fds'/>
<feature policy='require' name='intel-pt'/>
<feature policy='require' name='xsaveopt'/>
<feature policy='require' name='abm'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-host.xml
b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-host.xml
index 872b531c0f..6b55c46844 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-host.xml
@@ -24,6 +24,7 @@
<feature name='pbe'/>
<feature name='arat'/>
<feature name='tsc_adjust'/>
+ <feature name='zero-fcs-fds'/>
<feature name='intel-pt'/>
<feature name='xsaveopt'/>
<feature name='abm'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-disabled.xml
b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-disabled.xml
index fa9571c29d..49ff47eb49 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-disabled.xml
@@ -1,6 +1,6 @@
<!-- Features disabled by QEMU -->
<cpudata arch='x86'>
<cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000'
ebx='0x00000000' ecx='0x0800c1dc' edx='0xb0600000'/>
- <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000'
ebx='0x02000000' ecx='0x00000000' edx='0x00000000'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000'
ebx='0x02002000' 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-i7-5600U-guest.xml
b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-guest.xml
index da6e4f8a9b..557964fcdc 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-guest.xml
@@ -22,6 +22,7 @@
<feature policy='require' name='pbe'/>
<feature policy='require' name='arat'/>
<feature policy='require' name='tsc_adjust'/>
+ <feature policy='require' name='zero-fcs-fds'/>
<feature policy='require' name='intel-pt'/>
<feature policy='require' name='xsaveopt'/>
<feature policy='require' name='abm'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-host.xml
b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-host.xml
index 872b531c0f..6b55c46844 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-host.xml
@@ -24,6 +24,7 @@
<feature name='pbe'/>
<feature name='arat'/>
<feature name='tsc_adjust'/>
+ <feature name='zero-fcs-fds'/>
<feature name='intel-pt'/>
<feature name='xsaveopt'/>
<feature name='abm'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-disabled.xml
b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-disabled.xml
index 91ae45d24b..f1b1f08eda 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-disabled.xml
@@ -1,6 +1,6 @@
<!-- Features disabled by QEMU -->
<cpudata arch='x86'>
<cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000'
ebx='0x00000000' ecx='0x0800c1dc' edx='0xb0600000'/>
- <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000'
ebx='0x02000000' ecx='0x00000000' edx='0x0c000000'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000'
ebx='0x02002000' ecx='0x00000000' edx='0x0c000000'/>
<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-i7-5600U-ibrs-guest.xml
b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-guest.xml
index 2fe2645ee3..881f95b348 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-guest.xml
@@ -22,6 +22,7 @@
<feature policy='require' name='pbe'/>
<feature policy='require' name='arat'/>
<feature policy='require' name='tsc_adjust'/>
+ <feature policy='require' name='zero-fcs-fds'/>
<feature policy='require' name='intel-pt'/>
<feature policy='require' name='stibp'/>
<feature policy='require' name='xsaveopt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-host.xml
b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-host.xml
index d99718d9f7..ce0913f368 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-host.xml
@@ -24,6 +24,7 @@
<feature name='pbe'/>
<feature name='arat'/>
<feature name='tsc_adjust'/>
+ <feature name='zero-fcs-fds'/>
<feature name='intel-pt'/>
<feature name='stibp'/>
<feature name='xsaveopt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-disabled.xml
b/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-disabled.xml
index 7eece82aff..64a7e2dfdf 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-disabled.xml
@@ -1,6 +1,6 @@
<!-- Features disabled by QEMU -->
<cpudata arch='x86'>
<cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000'
ebx='0x00000000' ecx='0x0800c1dc' edx='0xb0600000'/>
- <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000'
ebx='0x02000004' ecx='0x00000000' edx='0x18000000'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000'
ebx='0x02002004' ecx='0x00000000' edx='0x18000000'/>
<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-i7-7600U-guest.xml
b/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-guest.xml
index 2fa57c5341..c4ec3a8721 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-guest.xml
@@ -19,6 +19,7 @@
<feature policy='require' name='pbe'/>
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='sgx'/>
+ <feature policy='require' name='zero-fcs-fds'/>
<feature policy='require' name='mpx'/>
<feature policy='require' name='clflushopt'/>
<feature policy='require' name='intel-pt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-host.xml
b/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-host.xml
index 1234266ede..4df35fc0f5 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-host.xml
@@ -21,6 +21,7 @@
<feature name='pbe'/>
<feature name='tsc_adjust'/>
<feature name='sgx'/>
+ <feature name='zero-fcs-fds'/>
<feature name='mpx'/>
<feature name='clflushopt'/>
<feature name='intel-pt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-7700-disabled.xml
b/tests/cputestdata/x86_64-cpuid-Core-i7-7700-disabled.xml
index 9e83f4c534..a71df50220 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-7700-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-7700-disabled.xml
@@ -1,7 +1,7 @@
<!-- Features disabled by QEMU -->
<cpudata arch='x86'>
<cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000'
ebx='0x00000000' ecx='0x0800c1fc' edx='0xb0600000'/>
- <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000'
ebx='0x02000004' ecx='0x00000000' edx='0x00000000'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000'
ebx='0x02002004' ecx='0x00000000' edx='0x00000000'/>
<cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x00000008'
ebx='0x00000000' 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-i7-7700-guest.xml
b/tests/cputestdata/x86_64-cpuid-Core-i7-7700-guest.xml
index c19c773446..20856638cf 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-7700-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-7700-guest.xml
@@ -19,6 +19,7 @@
<feature policy='require' name='pbe'/>
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='sgx'/>
+ <feature policy='require' name='zero-fcs-fds'/>
<feature policy='require' name='mpx'/>
<feature policy='require' name='clflushopt'/>
<feature policy='require' name='intel-pt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-7700-host.xml
b/tests/cputestdata/x86_64-cpuid-Core-i7-7700-host.xml
index 0343a80dba..f8501270d8 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-7700-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-7700-host.xml
@@ -21,6 +21,7 @@
<feature name='pbe'/>
<feature name='tsc_adjust'/>
<feature name='sgx'/>
+ <feature name='zero-fcs-fds'/>
<feature name='mpx'/>
<feature name='clflushopt'/>
<feature name='intel-pt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-disabled.xml
b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-disabled.xml
index b6daaf2e50..20c86d2b3b 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-disabled.xml
@@ -1,6 +1,6 @@
<!-- Features disabled by QEMU -->
<cpudata arch='x86'>
<cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000'
ebx='0x00000000' ecx='0x0800c19c' edx='0xb0600000'/>
- <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000'
ebx='0x02000004' ecx='0x00000000' edx='0x10000000'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000'
ebx='0x02002004' ecx='0x00000000' edx='0x10000000'/>
<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-i7-8550U-guest.xml
b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-guest.xml
index 9ee8103b22..7bd3c5a927 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-guest.xml
@@ -18,6 +18,7 @@
<feature policy='require' name='pbe'/>
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='sgx'/>
+ <feature policy='require' name='zero-fcs-fds'/>
<feature policy='require' name='mpx'/>
<feature policy='require' name='clflushopt'/>
<feature policy='require' name='intel-pt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-host.xml
b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-host.xml
index c13f60d6fd..8939f42894 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-host.xml
@@ -20,6 +20,7 @@
<feature name='pbe'/>
<feature name='tsc_adjust'/>
<feature name='sgx'/>
+ <feature name='zero-fcs-fds'/>
<feature name='mpx'/>
<feature name='clflushopt'/>
<feature name='intel-pt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8700-disabled.xml
b/tests/cputestdata/x86_64-cpuid-Core-i7-8700-disabled.xml
index fd9b8435ab..e470f88ee2 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-8700-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8700-disabled.xml
@@ -1,6 +1,6 @@
<!-- Features disabled by QEMU -->
<cpudata arch='x86'>
<cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000'
ebx='0x00000000' ecx='0x0800c1fc' edx='0xb0600000'/>
- <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000'
ebx='0x02000004' ecx='0x40000000' edx='0x18000000'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000'
ebx='0x02002004' ecx='0x40000000' edx='0x18000000'/>
<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-i7-8700-guest.xml
b/tests/cputestdata/x86_64-cpuid-Core-i7-8700-guest.xml
index cacd587f13..7bba076fdc 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-8700-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8700-guest.xml
@@ -19,6 +19,7 @@
<feature policy='require' name='pbe'/>
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='sgx'/>
+ <feature policy='require' name='zero-fcs-fds'/>
<feature policy='require' name='mpx'/>
<feature policy='require' name='clflushopt'/>
<feature policy='require' name='intel-pt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8700-host.xml
b/tests/cputestdata/x86_64-cpuid-Core-i7-8700-host.xml
index 59115d36ae..0ce69ffcde 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-8700-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8700-host.xml
@@ -21,6 +21,7 @@
<feature name='pbe'/>
<feature name='tsc_adjust'/>
<feature name='sgx'/>
+ <feature name='zero-fcs-fds'/>
<feature name='mpx'/>
<feature name='clflushopt'/>
<feature name='intel-pt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-disabled.xml
b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-disabled.xml
index 45e8183cb8..5a44c56da5 100644
--- a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-disabled.xml
@@ -1,7 +1,7 @@
<!-- Features disabled by QEMU -->
<cpudata arch='x86'>
<cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000'
ebx='0x00000000' ecx='0x0804c1fc' edx='0xb0600000'/>
- <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000'
ebx='0x02001044' ecx='0x40400010' edx='0x10000010'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000'
ebx='0x02003044' ecx='0x40400010' edx='0x10000010'/>
<cpuid eax_in='0x0000000f' ecx_in='0x01' eax='0x00000000'
ebx='0x00000000' ecx='0x00000000' edx='0x00000006'/>
<cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000'
ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
</cpudata>
diff --git a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-guest.xml
b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-guest.xml
index 5d5ed161fa..6ab30dcd2b 100644
--- a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-guest.xml
@@ -22,6 +22,7 @@
<feature policy='require' name='sgx'/>
<feature policy='require' name='fdp-excptn-only'/>
<feature policy='require' name='cmt'/>
+ <feature policy='require' name='zero-fcs-fds'/>
<feature policy='require' name='mpx'/>
<feature policy='require' name='avx512ifma'/>
<feature policy='require' name='intel-pt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml
b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml
index 4c792e62f4..37157cbc2d 100644
--- a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml
@@ -24,6 +24,7 @@
<feature name='sgx'/>
<feature name='fdp-excptn-only'/>
<feature name='cmt'/>
+ <feature name='zero-fcs-fds'/>
<feature name='mpx'/>
<feature name='avx512ifma'/>
<feature name='intel-pt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-disabled.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-disabled.xml
index fb9a4988ad..28dd2acdef 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-disabled.xml
@@ -1,7 +1,7 @@
<!-- Features disabled by QEMU -->
<cpudata arch='x86'>
<cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000'
ebx='0x00000000' ecx='0x0800c1fc' edx='0xb0600000'/>
- <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000'
ebx='0x02000004' ecx='0x00000000' edx='0x10000000'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000'
ebx='0x02002004' ecx='0x00000000' edx='0x10000000'/>
<cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x00000008'
ebx='0x00000000' 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-Xeon-E3-1225-v5-guest.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml
index 628ac411fb..0e2efdcf5c 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml
@@ -19,6 +19,7 @@
<feature policy='require' name='pbe'/>
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='sgx'/>
+ <feature policy='require' name='zero-fcs-fds'/>
<feature policy='require' name='mpx'/>
<feature policy='require' name='clflushopt'/>
<feature policy='require' name='intel-pt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml
index 131674e449..f2a1f9cdfd 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml
@@ -21,6 +21,7 @@
<feature name='pbe'/>
<feature name='tsc_adjust'/>
<feature name='sgx'/>
+ <feature name='zero-fcs-fds'/>
<feature name='mpx'/>
<feature name='clflushopt'/>
<feature name='intel-pt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-disabled.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-disabled.xml
index 536354e641..275a7b5632 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-disabled.xml
@@ -1,6 +1,6 @@
<!-- Features disabled by QEMU -->
<cpudata arch='x86'>
<cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000'
ebx='0x00000000' ecx='0x0800c1dc' edx='0xb0600000'/>
- <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000'
ebx='0x02000004' ecx='0x00000000' edx='0x00000000'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000'
ebx='0x02002004' 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-Xeon-E3-1245-v5-guest.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-guest.xml
index c19c773446..20856638cf 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-guest.xml
@@ -19,6 +19,7 @@
<feature policy='require' name='pbe'/>
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='sgx'/>
+ <feature policy='require' name='zero-fcs-fds'/>
<feature policy='require' name='mpx'/>
<feature policy='require' name='clflushopt'/>
<feature policy='require' name='intel-pt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-host.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-host.xml
index b3fb527dac..4eb3739792 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-host.xml
@@ -21,6 +21,7 @@
<feature name='pbe'/>
<feature name='tsc_adjust'/>
<feature name='sgx'/>
+ <feature name='zero-fcs-fds'/>
<feature name='mpx'/>
<feature name='clflushopt'/>
<feature name='intel-pt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-disabled.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-disabled.xml
index ec299652f7..0a112caec3 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-disabled.xml
@@ -1,6 +1,6 @@
<!-- Features disabled by QEMU -->
<cpudata arch='x86'>
<cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000'
ebx='0x00000000' ecx='0x0804c1fc' edx='0xb0600000'/>
- <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000'
ebx='0x00001000' ecx='0x00000000' edx='0x08000000'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000'
ebx='0x00003000' ecx='0x00000000' edx='0x08000000'/>
<cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000'
ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
</cpudata>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-guest.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-guest.xml
index 9f7b0376b5..b7b397d70f 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-guest.xml
@@ -24,6 +24,7 @@
<feature policy='require' name='arat'/>
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='cmt'/>
+ <feature policy='require' name='zero-fcs-fds'/>
<feature policy='require' name='stibp'/>
<feature policy='require' name='xsaveopt'/>
<feature policy='require' name='abm'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-host.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-host.xml
index 9e57e13c7d..bb0f1b033e 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-host.xml
@@ -26,6 +26,7 @@
<feature name='arat'/>
<feature name='tsc_adjust'/>
<feature name='cmt'/>
+ <feature name='zero-fcs-fds'/>
<feature name='stibp'/>
<feature name='xsaveopt'/>
<feature name='abm'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-disabled.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-disabled.xml
index 40ee740aa8..a930f0b537 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-disabled.xml
@@ -1,7 +1,7 @@
<!-- Features disabled by QEMU -->
<cpudata arch='x86'>
<cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000'
ebx='0x00000000' ecx='0x0804c1fc' edx='0xb0600000'/>
- <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000'
ebx='0x02001000' ecx='0x00000000' edx='0x08000000'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000'
ebx='0x02003000' ecx='0x00000000' edx='0x08000000'/>
<cpuid eax_in='0x0000000f' ecx_in='0x01' eax='0x00000000'
ebx='0x00000000' ecx='0x00000000' edx='0x00000006'/>
<cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000'
ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
</cpudata>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-guest.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-guest.xml
index 49ed41e473..7b64b49d60 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-guest.xml
@@ -24,6 +24,7 @@
<feature policy='require' name='arat'/>
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='cmt'/>
+ <feature policy='require' name='zero-fcs-fds'/>
<feature policy='require' name='intel-pt'/>
<feature policy='require' name='stibp'/>
<feature policy='require' name='xsaveopt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-host.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-host.xml
index 6280bf46cc..5929b7a73a 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-host.xml
@@ -26,6 +26,7 @@
<feature name='arat'/>
<feature name='tsc_adjust'/>
<feature name='cmt'/>
+ <feature name='zero-fcs-fds'/>
<feature name='intel-pt'/>
<feature name='stibp'/>
<feature name='xsaveopt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-disabled.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-disabled.xml
index e6f4ce761d..b38e7b1449 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-disabled.xml
@@ -2,6 +2,6 @@
<cpudata arch='x86'>
<cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000'
ebx='0x00000000' ecx='0x0804c1fc' 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='0x00001000' ecx='0x00000000' edx='0x00000000'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000'
ebx='0x00003000' 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-Xeon-E5-2630-v3-guest.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-guest.xml
index 833b859048..e9d7c483d1 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-guest.xml
@@ -24,6 +24,7 @@
<feature policy='require' name='arat'/>
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='cmt'/>
+ <feature policy='require' name='zero-fcs-fds'/>
<feature policy='require' name='xsaveopt'/>
<feature policy='require' name='abm'/>
<feature policy='require' name='pdpe1gb'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-host.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-host.xml
index 44a435e71c..9ccab8b3c7 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-host.xml
@@ -26,6 +26,7 @@
<feature name='arat'/>
<feature name='tsc_adjust'/>
<feature name='cmt'/>
+ <feature name='zero-fcs-fds'/>
<feature name='xsaveopt'/>
<feature name='abm'/>
<feature name='pdpe1gb'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-disabled.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-disabled.xml
index 3ffb246167..697c33bd85 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-disabled.xml
@@ -1,7 +1,7 @@
<!-- Features disabled by QEMU -->
<cpudata arch='x86'>
<cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000'
ebx='0x00000000' ecx='0x0804c1fc' edx='0xb0600000'/>
- <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000'
ebx='0x02001000' ecx='0x00000000' edx='0x00000000'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000'
ebx='0x02003000' ecx='0x00000000' edx='0x00000000'/>
<cpuid eax_in='0x0000000f' ecx_in='0x01' eax='0x00000000'
ebx='0x00000000' ecx='0x00000000' edx='0x00000006'/>
<cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000'
ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
</cpudata>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-guest.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-guest.xml
index 2cd4308710..dd1b79c666 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-guest.xml
@@ -24,6 +24,7 @@
<feature policy='require' name='arat'/>
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='cmt'/>
+ <feature policy='require' name='zero-fcs-fds'/>
<feature policy='require' name='intel-pt'/>
<feature policy='require' name='xsaveopt'/>
<feature policy='require' name='mbm_total'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-host.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-host.xml
index 7b3c52f39a..00e22a597b 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-host.xml
@@ -26,6 +26,7 @@
<feature name='arat'/>
<feature name='tsc_adjust'/>
<feature name='cmt'/>
+ <feature name='zero-fcs-fds'/>
<feature name='intel-pt'/>
<feature name='xsaveopt'/>
<feature name='mbm_total'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-disabled.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-disabled.xml
index 9e25e6a94d..2520970420 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-disabled.xml
@@ -2,7 +2,7 @@
<cpudata arch='x86'>
<cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000'
ebx='0x00000000' ecx='0x0804c1dc' 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='0x00001002' ecx='0x00000000' edx='0x00000000'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000'
ebx='0x00003002' ecx='0x00000000' edx='0x00000000'/>
<cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x00000001'
ebx='0x00000000' 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-Xeon-E5-2650-v3-guest.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-guest.xml
index 833b859048..e9d7c483d1 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-guest.xml
@@ -24,6 +24,7 @@
<feature policy='require' name='arat'/>
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='cmt'/>
+ <feature policy='require' name='zero-fcs-fds'/>
<feature policy='require' name='xsaveopt'/>
<feature policy='require' name='abm'/>
<feature policy='require' name='pdpe1gb'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-host.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-host.xml
index 44a435e71c..9ccab8b3c7 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-host.xml
@@ -26,6 +26,7 @@
<feature name='arat'/>
<feature name='tsc_adjust'/>
<feature name='cmt'/>
+ <feature name='zero-fcs-fds'/>
<feature name='xsaveopt'/>
<feature name='abm'/>
<feature name='pdpe1gb'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-disabled.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-disabled.xml
index 3ffb246167..697c33bd85 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-disabled.xml
@@ -1,7 +1,7 @@
<!-- Features disabled by QEMU -->
<cpudata arch='x86'>
<cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000'
ebx='0x00000000' ecx='0x0804c1fc' edx='0xb0600000'/>
- <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000'
ebx='0x02001000' ecx='0x00000000' edx='0x00000000'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000'
ebx='0x02003000' ecx='0x00000000' edx='0x00000000'/>
<cpuid eax_in='0x0000000f' ecx_in='0x01' eax='0x00000000'
ebx='0x00000000' ecx='0x00000000' edx='0x00000006'/>
<cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000'
ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
</cpudata>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-guest.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-guest.xml
index 2cd4308710..dd1b79c666 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-guest.xml
@@ -24,6 +24,7 @@
<feature policy='require' name='arat'/>
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='cmt'/>
+ <feature policy='require' name='zero-fcs-fds'/>
<feature policy='require' name='intel-pt'/>
<feature policy='require' name='xsaveopt'/>
<feature policy='require' name='mbm_total'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-host.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-host.xml
index 7b3c52f39a..00e22a597b 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-host.xml
@@ -26,6 +26,7 @@
<feature name='arat'/>
<feature name='tsc_adjust'/>
<feature name='cmt'/>
+ <feature name='zero-fcs-fds'/>
<feature name='intel-pt'/>
<feature name='xsaveopt'/>
<feature name='mbm_total'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-disabled.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-disabled.xml
index aacc7a2b14..8443d705c9 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-disabled.xml
@@ -1,6 +1,6 @@
<!-- Features disabled by QEMU -->
<cpudata arch='x86'>
<cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000'
ebx='0x00000000' ecx='0x0804c1fc' edx='0xb0600000'/>
- <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000'
ebx='0x00001000' ecx='0x00000000' edx='0x00000000'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000'
ebx='0x00003000' 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-Xeon-E7-8890-v3-guest.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-guest.xml
index dc91fceaef..dfa07507cf 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-guest.xml
@@ -24,6 +24,7 @@
<feature policy='require' name='arat'/>
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='cmt'/>
+ <feature policy='require' name='zero-fcs-fds'/>
<feature policy='require' name='xsaveopt'/>
<feature policy='require' name='abm'/>
<feature policy='require' name='pdpe1gb'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-host.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-host.xml
index f5a846da27..84d1a948e8 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-host.xml
@@ -26,6 +26,7 @@
<feature name='arat'/>
<feature name='tsc_adjust'/>
<feature name='cmt'/>
+ <feature name='zero-fcs-fds'/>
<feature name='xsaveopt'/>
<feature name='abm'/>
<feature name='pdpe1gb'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-disabled.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-disabled.xml
index 8971cc2bad..d47889c6a8 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-disabled.xml
@@ -1,7 +1,7 @@
<!-- Features disabled by QEMU -->
<cpudata arch='x86'>
<cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000'
ebx='0x00000000' ecx='0x0804c1fc' edx='0xb0600000'/>
- <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000'
ebx='0x02001040' ecx='0x00000008' edx='0x08000000'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000'
ebx='0x02003040' ecx='0x00000008' edx='0x08000000'/>
<cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x00000008'
ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
<cpuid eax_in='0x0000000f' ecx_in='0x01' eax='0x00000000'
ebx='0x00000000' ecx='0x00000000' edx='0x00000006'/>
<cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000'
ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-guest.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-guest.xml
index 84384fda81..1a648331ce 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-guest.xml
@@ -21,6 +21,7 @@
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='fdp-excptn-only'/>
<feature policy='require' name='cmt'/>
+ <feature policy='require' name='zero-fcs-fds'/>
<feature policy='require' name='mpx'/>
<feature policy='require' name='clflushopt'/>
<feature policy='require' name='intel-pt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-host.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-host.xml
index 4af85f2887..ae04f54c40 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-host.xml
@@ -23,6 +23,7 @@
<feature name='tsc_adjust'/>
<feature name='fdp-excptn-only'/>
<feature name='cmt'/>
+ <feature name='zero-fcs-fds'/>
<feature name='mpx'/>
<feature name='clflushopt'/>
<feature name='intel-pt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-disabled.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-disabled.xml
index ad0f83dae9..fda549b34d 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-disabled.xml
@@ -1,7 +1,7 @@
<!-- Features disabled by QEMU -->
<cpudata arch='x86'>
<cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000'
ebx='0x00000000' ecx='0x0804c1dc' edx='0xb0600000'/>
- <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000'
ebx='0x02001040' ecx='0x00000010' edx='0x10000000'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000'
ebx='0x02003040' ecx='0x00000010' edx='0x10000000'/>
<cpuid eax_in='0x0000000f' ecx_in='0x01' eax='0x00000000'
ebx='0x00000000' ecx='0x00000000' edx='0x00000006'/>
<cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000'
ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
</cpudata>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-guest.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-guest.xml
index 6430b8532c..89b86b3391 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-guest.xml
@@ -21,6 +21,7 @@
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='fdp-excptn-only'/>
<feature policy='require' name='cmt'/>
+ <feature policy='require' name='zero-fcs-fds'/>
<feature policy='require' name='mpx'/>
<feature policy='require' name='clflushopt'/>
<feature policy='require' name='intel-pt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-host.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-host.xml
index 96b813f47a..b94eb3eb2a 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-host.xml
@@ -23,6 +23,7 @@
<feature name='tsc_adjust'/>
<feature name='fdp-excptn-only'/>
<feature name='cmt'/>
+ <feature name='zero-fcs-fds'/>
<feature name='mpx'/>
<feature name='clflushopt'/>
<feature name='intel-pt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-disabled.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-disabled.xml
index 926d15b522..4968a66c2f 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-disabled.xml
@@ -1,7 +1,7 @@
<!-- Features disabled by QEMU -->
<cpudata arch='x86'>
<cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000'
ebx='0x00000000' ecx='0x0804c1fc' edx='0xb0600000'/>
- <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000'
ebx='0x02001040' ecx='0x00000008' edx='0x00000000'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000'
ebx='0x02003040' ecx='0x00000008' edx='0x00000000'/>
<cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x00000008'
ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
<cpuid eax_in='0x0000000f' ecx_in='0x01' eax='0x00000000'
ebx='0x00000000' ecx='0x00000000' edx='0x00000006'/>
<cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000'
ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-guest.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-guest.xml
index 45e58dc5e2..549462f1a3 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-guest.xml
@@ -21,6 +21,7 @@
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='fdp-excptn-only'/>
<feature policy='require' name='cmt'/>
+ <feature policy='require' name='zero-fcs-fds'/>
<feature policy='require' name='mpx'/>
<feature policy='require' name='clflushopt'/>
<feature policy='require' name='intel-pt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-host.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-host.xml
index 18661472a2..34510d9396 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-host.xml
@@ -23,6 +23,7 @@
<feature name='tsc_adjust'/>
<feature name='fdp-excptn-only'/>
<feature name='cmt'/>
+ <feature name='zero-fcs-fds'/>
<feature name='mpx'/>
<feature name='clflushopt'/>
<feature name='intel-pt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-disabled.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-disabled.xml
index b263130580..19aa8272c4 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-disabled.xml
@@ -1,7 +1,7 @@
<!-- Features disabled by QEMU -->
<cpudata arch='x86'>
<cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000'
ebx='0x00000000' ecx='0x0804c1fc' edx='0xb0600000'/>
- <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000'
ebx='0x02001040' ecx='0x00000010' edx='0x38000400'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000'
ebx='0x02003040' ecx='0x00000010' edx='0x38000400'/>
<cpuid eax_in='0x0000000f' ecx_in='0x01' eax='0x00000000'
ebx='0x00000000' ecx='0x00000000' edx='0x00000006'/>
<cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000'
ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
<msr index='0x10a' edx='0x00000000' eax='0x00000020'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-guest.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-guest.xml
index 2660200972..51543732d8 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-guest.xml
@@ -21,6 +21,7 @@
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='fdp-excptn-only'/>
<feature policy='require' name='cmt'/>
+ <feature policy='require' name='zero-fcs-fds'/>
<feature policy='require' name='mpx'/>
<feature policy='require' name='intel-pt'/>
<feature policy='require' name='pku'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-host.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-host.xml
index 298f8d7629..2652c787d0 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-host.xml
@@ -23,6 +23,7 @@
<feature name='tsc_adjust'/>
<feature name='fdp-excptn-only'/>
<feature name='cmt'/>
+ <feature name='zero-fcs-fds'/>
<feature name='mpx'/>
<feature name='intel-pt'/>
<feature name='pku'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-disabled.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-disabled.xml
index ad0f83dae9..fda549b34d 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-disabled.xml
@@ -1,7 +1,7 @@
<!-- Features disabled by QEMU -->
<cpudata arch='x86'>
<cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000'
ebx='0x00000000' ecx='0x0804c1dc' edx='0xb0600000'/>
- <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000'
ebx='0x02001040' ecx='0x00000010' edx='0x10000000'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000'
ebx='0x02003040' ecx='0x00000010' edx='0x10000000'/>
<cpuid eax_in='0x0000000f' ecx_in='0x01' eax='0x00000000'
ebx='0x00000000' ecx='0x00000000' edx='0x00000006'/>
<cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000'
ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
</cpudata>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-guest.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-guest.xml
index f7faf1f7d4..1bee8605fb 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-guest.xml
@@ -21,6 +21,7 @@
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='fdp-excptn-only'/>
<feature policy='require' name='cmt'/>
+ <feature policy='require' name='zero-fcs-fds'/>
<feature policy='require' name='mpx'/>
<feature policy='require' name='intel-pt'/>
<feature policy='require' name='pku'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-host.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-host.xml
index 6c36f9c9f9..911458402e 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-host.xml
@@ -23,6 +23,7 @@
<feature name='tsc_adjust'/>
<feature name='fdp-excptn-only'/>
<feature name='cmt'/>
+ <feature name='zero-fcs-fds'/>
<feature name='mpx'/>
<feature name='intel-pt'/>
<feature name='pku'/>
--
2.47.1
7:23 a.m.
New subject: [PATCH 6/7] cpu_map: Add ibpb-brtype CPU feature
Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com>
---
src/cpu_map/x86_features.xml | 3 +++
tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml | 1 +
tests/domaincapsdata/qemu_9.2.0.x86_64.xml | 1 +
.../cpu-host-model-fallback-kvm.x86_64-latest.args | 2 +-
.../qemuxmlconfdata/cpu-host-model-features.x86_64-latest.args | 2 +-
tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-latest.args | 2 +-
.../cpu-host-model-nofallback-kvm.x86_64-latest.args | 2 +-
7 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/cpu_map/x86_features.xml b/src/cpu_map/x86_features.xml
index 4cbe094cfd..ef0c45927e 100644
--- a/src/cpu_map/x86_features.xml
+++ b/src/cpu_map/x86_features.xml
@@ -792,6 +792,9 @@
<feature name='auto-ibrs'>
<cpuid eax_in='0x80000021' eax='0x00000100'/>
</feature>
+ <feature name='ibpb-brtype'>
+ <cpuid eax_in='0x80000021' eax='0x10000000'/>
+ </feature>
<!-- msr 0x000000cf -->
<feature name='split-lock-detect'>
diff --git a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
index d5db9af49e..98c522f0fc 100644
--- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
@@ -68,6 +68,7 @@
<feature policy='require' name='svme-addr-chk'/>
<feature policy='require' name='lfence-always-serializing'/>
<feature policy='require' name='null-sel-clr-base'/>
+ <feature policy='require' name='ibpb-brtype'/>
<feature policy='require' name='rdctl-no'/>
<feature policy='require' name='skip-l1dfl-vmentry'/>
<feature policy='require' name='mds-no'/>
diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
index 05a5ce4bee..0b5162781e 100644
--- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
@@ -67,6 +67,7 @@
<feature policy='require' name='svme-addr-chk'/>
<feature policy='require' name='lfence-always-serializing'/>
<feature policy='require' name='null-sel-clr-base'/>
+ <feature policy='require' name='ibpb-brtype'/>
<feature policy='require' name='rdctl-no'/>
<feature policy='require' name='skip-l1dfl-vmentry'/>
<feature policy='require' name='mds-no'/>
diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-latest.args
b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-latest.args
index f4ea2d366e..a0247e4310 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-latest.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
-accel kvm \
--cpu
EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,cmp-legacy=on,overflow-recov=on,succor=on,amd-ssbd=on,virt-ssbd=on,lbrv=on,tsc-scale=on,vmcb-clean=on,flushbyasid=on,pause-filter=on,pfthreshold=on,v-vmsave-vmload=on,vgif=on,svme-addr-chk=on,lfence-always-serializing=on,null-sel-clr-base=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on,gds-no=on,rfds-no=on,xsaves=off
\
+-cpu
EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,cmp-legacy=on,overflow-recov=on,succor=on,amd-ssbd=on,virt-ssbd=on,lbrv=on,tsc-scale=on,vmcb-clean=on,flushbyasid=on,pause-filter=on,pfthreshold=on,v-vmsave-vmload=on,vgif=on,svme-addr-chk=on,lfence-always-serializing=on,null-sel-clr-base=on,ibpb-brtype=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on,gds-no=on,rfds-no=on,xsaves=off
\
-m size=219136k \
-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
-overcommit mem-lock=off \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-features.x86_64-latest.args
b/tests/qemuxmlconfdata/cpu-host-model-features.x86_64-latest.args
index cb9ace043d..a60ce4dee0 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-features.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-features.x86_64-latest.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
-accel kvm \
--cpu
EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,cmp-legacy=on,overflow-recov=on,succor=on,amd-ssbd=on,virt-ssbd=on,lbrv=on,tsc-scale=on,vmcb-clean=on,flushbyasid=on,pause-filter=on,pfthreshold=on,v-vmsave-vmload=on,vgif=on,svme-addr-chk=on,lfence-always-serializing=on,null-sel-clr-base=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on,gds-no=on,rfds-no=on,xsaves=off,abm=on,ds=on,invtsc=off
\
+-cpu
EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,cmp-legacy=on,overflow-recov=on,succor=on,amd-ssbd=on,virt-ssbd=on,lbrv=on,tsc-scale=on,vmcb-clean=on,flushbyasid=on,pause-filter=on,pfthreshold=on,v-vmsave-vmload=on,vgif=on,svme-addr-chk=on,lfence-always-serializing=on,null-sel-clr-base=on,ibpb-brtype=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on,gds-no=on,rfds-no=on,xsaves=off,abm=on,ds=on,invtsc=off
\
-m size=219136k \
-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
-overcommit mem-lock=off \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-latest.args
b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-latest.args
index 01c05d8c9c..e2e6d08246 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-latest.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine q35,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
-accel kvm \
--cpu
EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,cmp-legacy=on,overflow-recov=on,succor=on,amd-ssbd=on,virt-ssbd=on,lbrv=on,tsc-scale=on,vmcb-clean=on,flushbyasid=on,pause-filter=on,pfthreshold=on,v-vmsave-vmload=on,vgif=on,svme-addr-chk=on,lfence-always-serializing=on,null-sel-clr-base=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on,gds-no=on,rfds-no=on,xsaves=off
\
+-cpu
EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,cmp-legacy=on,overflow-recov=on,succor=on,amd-ssbd=on,virt-ssbd=on,lbrv=on,tsc-scale=on,vmcb-clean=on,flushbyasid=on,pause-filter=on,pfthreshold=on,v-vmsave-vmload=on,vgif=on,svme-addr-chk=on,lfence-always-serializing=on,null-sel-clr-base=on,ibpb-brtype=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on,gds-no=on,rfds-no=on,xsaves=off
\
-m size=219136k \
-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
-overcommit mem-lock=off \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-latest.args
b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-latest.args
index f4ea2d366e..a0247e4310 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-latest.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
-accel kvm \
--cpu
EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,cmp-legacy=on,overflow-recov=on,succor=on,amd-ssbd=on,virt-ssbd=on,lbrv=on,tsc-scale=on,vmcb-clean=on,flushbyasid=on,pause-filter=on,pfthreshold=on,v-vmsave-vmload=on,vgif=on,svme-addr-chk=on,lfence-always-serializing=on,null-sel-clr-base=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on,gds-no=on,rfds-no=on,xsaves=off
\
+-cpu
EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,cmp-legacy=on,overflow-recov=on,succor=on,amd-ssbd=on,virt-ssbd=on,lbrv=on,tsc-scale=on,vmcb-clean=on,flushbyasid=on,pause-filter=on,pfthreshold=on,v-vmsave-vmload=on,vgif=on,svme-addr-chk=on,lfence-always-serializing=on,null-sel-clr-base=on,ibpb-brtype=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on,gds-no=on,rfds-no=on,xsaves=off
\
-m size=219136k \
-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
-overcommit mem-lock=off \
--
2.47.1
7:23 a.m.
New subject: [PATCH 7/7] cpu_map: Add missing CPU features
Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com>
---
src/cpu_map/x86_features.xml | 38 ++++++++++++++++++++++++++++++++++++
1 file changed, 38 insertions(+)
diff --git a/src/cpu_map/x86_features.xml b/src/cpu_map/x86_features.xml
index ef0c45927e..d06d60e230 100644
--- a/src/cpu_map/x86_features.xml
+++ b/src/cpu_map/x86_features.xml
@@ -489,6 +489,21 @@
</feature>
<!-- cpuid level 0x00000007, 0x0002 (edx) -->
+ <feature name='intel-psfd'>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000002'
edx='0x00000001'/>
+ </feature>
+ <feature name='ipred-ctrl'>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000002'
edx='0x00000002'/>
+ </feature>
+ <feature name='rrsba-ctrl'>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000002'
edx='0x00000004'/>
+ </feature>
+ <feature name='ddpd-u'>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000002'
edx='0x00000008'/>
+ </feature>
+ <feature name='bhi-ctrl'>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000002'
edx='0x00000010'/>
+ </feature>
<feature name='mcdt-no'>
<cpuid eax_in='0x00000007' ecx_in='0x00000002'
edx='0x00000020'/>
</feature>
@@ -792,9 +807,26 @@
<feature name='auto-ibrs'>
<cpuid eax_in='0x80000021' eax='0x00000100'/>
</feature>
+ <feature name='eraps'>
+ <cpuid eax_in='0x80000021' eax='0x01000000'/>
+ </feature>
+ <feature name='sbpb'>
+ <cpuid eax_in='0x80000021' eax='0x08000000'/>
+ </feature>
<feature name='ibpb-brtype'>
<cpuid eax_in='0x80000021' eax='0x10000000'/>
</feature>
+ <feature name='srso-no'>
+ <cpuid eax_in='0x80000021' eax='0x20000000'/>
+ </feature>
+ <feature name='srso-user-kernel-no'>
+ <cpuid eax_in='0x80000021' eax='0x40000000'/>
+ </feature>
+
+ <!-- cpuid level 0x80000022 (eax) -->
+ <feature name='perfmon-v2'>
+ <cpuid eax_in='0x80000022' eax='0x00000001'/>
+ </feature>
<!-- msr 0x000000cf -->
<feature name='split-lock-detect'>
@@ -1123,6 +1155,9 @@
<feature name='vmx-exit-load-pkrs'>
<msr index='0x0000048f' edx='0x00000000'
eax='0x20000000'/>
</feature>
+ <feature name='vmx-exit-secondary-ctls'>
+ <msr index='0x0000048f' edx='0x00000000'
eax='0x80000000'/>
+ </feature>
<!-- msr 0x00000490 -->
<feature name='vmx-entry-noload-debugctl'>
@@ -1149,6 +1184,9 @@
<feature name='vmx-entry-load-pkrs'>
<msr index='0x00000490' edx='0x00000000'
eax='0x00400000'/>
</feature>
+ <feature name='vmx-entry-load-fred'>
+ <msr index='0x00000490' edx='0x00000000'
eax='0x00800000'/>
+ </feature>
<!-- msr 0x00000491 -->
<feature name='vmx-eptp-switching'>
--
2.47.1
7:34 a.m.
New subject: [PATCH 0/7] Add missing CPU features and GraniteRapids-v2 model
supported by QEMU 9.2.0
On 12/18/24 14:23, Jiri Denemark wrote:
Reviewed-by: Michal Privoznik <mprivozn(a)redhat.com>
Michal
Jiri Denemark (7):
cpu_map: Add avx10* CPU features
cpu_map: Add GraniteRapids-v2 CPU model
cpu_map: Add sha512, sm3, and sm4 CPU features
cpu_map: Add fdp-excptn-only CPU feature
cpu_map: Add zero-fcs-fds CPU feature
cpu_map: Add ibpb-brtype CPU feature
cpu_map: Add missing CPU features
95 files changed, 545 insertions(+), 30 deletions(-)
226
days inactive
226
days old
8 comments
2 participants
participants (2)
-
Jiri Denemark -
Michal Prívozník