From: Jiri Denemark <jdenemar@redhat.com>
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
---
src/cpu_map/index.xml | 1 +
src/cpu_map/meson.build | 1 +
src/cpu_map/sync_qemu_models_i386.py | 7 +
src/cpu_map/x86_SierraForest-v2.xml | 186 ++++++++++++++++++
.../qemu_10.0.0-q35.x86_64+amdsev.xml | 26 +++
.../domaincapsdata/qemu_10.0.0-q35.x86_64.xml | 36 ++++
.../qemu_10.0.0-tcg.x86_64+amdsev.xml | 29 +++
.../domaincapsdata/qemu_10.0.0-tcg.x86_64.xml | 29 +++
.../qemu_10.0.0.x86_64+amdsev.xml | 26 +++
tests/domaincapsdata/qemu_10.0.0.x86_64.xml | 36 ++++
.../qemu_10.1.0-q35.x86_64+inteltdx.xml | 16 ++
.../domaincapsdata/qemu_10.1.0-q35.x86_64.xml | 37 ++++
.../qemu_10.1.0-tcg.x86_64+inteltdx.xml | 29 +++
.../domaincapsdata/qemu_10.1.0-tcg.x86_64.xml | 29 +++
.../qemu_10.1.0.x86_64+inteltdx.xml | 16 ++
tests/domaincapsdata/qemu_10.1.0.x86_64.xml | 37 ++++
.../domaincapsdata/qemu_10.2.0-q35.x86_64.xml | 24 +++
.../domaincapsdata/qemu_10.2.0-tcg.x86_64.xml | 29 +++
tests/domaincapsdata/qemu_10.2.0.x86_64.xml | 24 +++
19 files changed, 618 insertions(+)
create mode 100644 src/cpu_map/x86_SierraForest-v2.xml
diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml
index 790c3b2f83..fd9811d3f6 100644
--- a/src/cpu_map/index.xml
+++ b/src/cpu_map/index.xml
@@ -124,6 +124,7 @@
<include filename='x86_GraniteRapids-v2.xml'/>
<include filename='x86_SierraForest.xml'/>
<include filename='x86_SierraForest-v1.xml'/>
+ <include filename='x86_SierraForest-v2.xml'/>
<include filename='x86_Denverton.xml'/>
<include filename='x86_Denverton-v1.xml'/>
<include filename='x86_Denverton-v2.xml'/>
diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build
index 1499fd1ba3..aa7c79c969 100644
--- a/src/cpu_map/meson.build
+++ b/src/cpu_map/meson.build
@@ -151,6 +151,7 @@ cpumap_data = [
'x86_SapphireRapids-v3.xml',
'x86_SapphireRapids.xml',
'x86_SierraForest-v1.xml',
+ 'x86_SierraForest-v2.xml',
'x86_SierraForest.xml',
'x86_Skylake-Client-IBRS.xml',
'x86_Skylake-Client-noTSX-IBRS.xml',
diff --git a/src/cpu_map/sync_qemu_models_i386.py b/src/cpu_map/sync_qemu_models_i386.py
index 0f43d9e14a..6eb7afb7d9 100755
--- a/src/cpu_map/sync_qemu_models_i386.py
+++ b/src/cpu_map/sync_qemu_models_i386.py
@@ -89,12 +89,17 @@ def translate_feature(name, model):
"CPUID_7_1_EAX_FSRC": "fsrc",
"CPUID_7_1_EAX_FSRS": "fsrs",
"CPUID_7_1_EAX_FZRM": "fzrm",
+ "CPUID_7_1_EAX_LAM": "lam",
"CPUID_7_1_ECX_MSR_IMM": "msr-imm",
"CPUID_7_1_EDX_AVX_NE_CONVERT": "avx-ne-convert",
"CPUID_7_1_EDX_AVX_VNNI_INT8": "avx-vnni-int8",
"CPUID_7_1_EDX_PREFETCHITI": "prefetchiti",
"CPUID_7_1_EDX_AVX10": "avx10",
"CPUID_7_2_EDX_MCDT_NO": "mcdt-no",
+ "CPUID_7_2_EDX_PSFD": "intel-psfd",
+ "CPUID_7_2_EDX_IPRED_CTRL": "ipred-ctrl",
+ "CPUID_7_2_EDX_RRSBA_CTRL": "rrsba-ctrl",
+ "CPUID_7_2_EDX_BHI_CTRL": "bhi-ctrl",
"CPUID_24_0_EBX_AVX10_128": "avx10-128",
"CPUID_24_0_EBX_AVX10_256": "avx10-256",
"CPUID_24_0_EBX_AVX10_512": "avx10-512",
@@ -200,6 +205,8 @@ def translate_feature(name, model):
"MSR_ARCH_CAP_TAA_NO": "taa-no",
"MSR_ARCH_CAP_BHI_NO": "bhi-no",
"MSR_CORE_CAP_SPLIT_LOCK_DETECT": "split-lock-detect",
+ "MSR_ARCH_CAP_GDS_NO": "gds-no",
+ "MSR_ARCH_CAP_RFDS_NO": "rfds-no",
# FEAT_VMX_PROCBASED_CTLS
"VMX_CPU_BASED_VIRTUAL_INTR_PENDING": "vmx-vintr-pending",
diff --git a/src/cpu_map/x86_SierraForest-v2.xml b/src/cpu_map/x86_SierraForest-v2.xml
new file mode 100644
index 0000000000..c683389564
--- /dev/null
+++ b/src/cpu_map/x86_SierraForest-v2.xml
@@ -0,0 +1,186 @@
+<cpus>
+ <model name='SierraForest-v2'>
+ <decode host='on' guest='off'/>
+ <signature family='6' model='175'/>
+ <vendor name='Intel'/>
+ <feature name='3dnowprefetch'/>
+ <feature name='abm'/>
+ <feature name='adx'/>
+ <feature name='aes'/>
+ <feature name='apic'/>
+ <feature name='arat'/>
+ <feature name='arch-capabilities'/>
+ <feature name='avx'/>
+ <feature name='avx-ifma'/>
+ <feature name='avx-ne-convert'/>
+ <feature name='avx-vnni'/>
+ <feature name='avx-vnni-int8'/>
+ <feature name='avx2'/>
+ <feature name='bhi-ctrl'/>
+ <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='cmpccxadd'/>
+ <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='fsrm'/>
+ <feature name='fsrs'/>
+ <feature name='fxsr'/>
+ <feature name='gds-no'/>
+ <feature name='gfni'/>
+ <feature name='ibrs-all'/>
+ <feature name='intel-psfd'/>
+ <feature name='invpcid'/>
+ <feature name='ipred-ctrl'/>
+ <feature name='lahf_lm'/>
+ <feature name='lam'/>
+ <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='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='rfds-no'/>
+ <feature name='rrsba-ctrl'/>
+ <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='tsc'/>
+ <feature name='tsc-deadline'/>
+ <feature name='tsc_adjust'/>
+ <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-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='xgetbv1'/>
+ <feature name='xsave'/>
+ <feature name='xsavec'/>
+ <feature name='xsaveopt'/>
+ <feature name='xsaves'/>
+ </model>
+</cpus>
diff --git a/tests/domaincapsdata/qemu_10.0.0-q35.x86_64+amdsev.xml b/tests/domaincapsdata/qemu_10.0.0-q35.x86_64+amdsev.xml
index ec2944d380..1dda94330c 100644
--- a/tests/domaincapsdata/qemu_10.0.0-q35.x86_64+amdsev.xml
+++ b/tests/domaincapsdata/qemu_10.0.0-q35.x86_64+amdsev.xml
@@ -514,6 +514,32 @@
<feature name='sbdr-ssdp-no'/>
<feature name='serialize'/>
</blockers>
+ <model usable='no' vendor='Intel'>SierraForest-v2</model>
+ <blockers model='SierraForest-v2'>
+ <feature name='avx-ifma'/>
+ <feature name='avx-ne-convert'/>
+ <feature name='avx-vnni'/>
+ <feature name='avx-vnni-int8'/>
+ <feature name='bhi-ctrl'/>
+ <feature name='bus-lock-detect'/>
+ <feature name='cldemote'/>
+ <feature name='cmpccxadd'/>
+ <feature name='fbsdp-no'/>
+ <feature name='fsrs'/>
+ <feature name='ibrs-all'/>
+ <feature name='intel-psfd'/>
+ <feature name='ipred-ctrl'/>
+ <feature name='lam'/>
+ <feature name='mcdt-no'/>
+ <feature name='movdir64b'/>
+ <feature name='movdiri'/>
+ <feature name='pbrsb-no'/>
+ <feature name='psdp-no'/>
+ <feature name='rrsba-ctrl'/>
+ <feature name='sbdr-ssdp-no'/>
+ <feature name='serialize'/>
+ <feature name='ss'/>
+ </blockers>
<model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model>
<blockers model='Skylake-Client'>
<feature name='hle'/>
diff --git a/tests/domaincapsdata/qemu_10.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_10.0.0-q35.x86_64.xml
index abe4536c18..e12709b70b 100644
--- a/tests/domaincapsdata/qemu_10.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_10.0.0-q35.x86_64.xml
@@ -1232,6 +1232,42 @@
<feature name='vpclmulqdq'/>
<feature name='xsaves'/>
</blockers>
+ <model usable='no' vendor='Intel'>SierraForest-v2</model>
+ <blockers model='SierraForest-v2'>
+ <feature name='avx-ifma'/>
+ <feature name='avx-ne-convert'/>
+ <feature name='avx-vnni'/>
+ <feature name='avx-vnni-int8'/>
+ <feature name='bhi-ctrl'/>
+ <feature name='bus-lock-detect'/>
+ <feature name='cldemote'/>
+ <feature name='cmpccxadd'/>
+ <feature name='erms'/>
+ <feature name='fbsdp-no'/>
+ <feature name='fsrm'/>
+ <feature name='fsrs'/>
+ <feature name='gfni'/>
+ <feature name='ibrs-all'/>
+ <feature name='intel-psfd'/>
+ <feature name='invpcid'/>
+ <feature name='ipred-ctrl'/>
+ <feature name='lam'/>
+ <feature name='mcdt-no'/>
+ <feature name='movdir64b'/>
+ <feature name='movdiri'/>
+ <feature name='pbrsb-no'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='psdp-no'/>
+ <feature name='rrsba-ctrl'/>
+ <feature name='sbdr-ssdp-no'/>
+ <feature name='serialize'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ss'/>
+ <feature name='vaes'/>
+ <feature name='vpclmulqdq'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model>
<blockers model='Skylake-Client'>
<feature name='erms'/>
diff --git a/tests/domaincapsdata/qemu_10.0.0-tcg.x86_64+amdsev.xml b/tests/domaincapsdata/qemu_10.0.0-tcg.x86_64+amdsev.xml
index 481092d7b1..cbc4d3b57b 100644
--- a/tests/domaincapsdata/qemu_10.0.0-tcg.x86_64+amdsev.xml
+++ b/tests/domaincapsdata/qemu_10.0.0-tcg.x86_64+amdsev.xml
@@ -1347,6 +1347,35 @@
<feature name='xsavec'/>
<feature name='xsaves'/>
</blockers>
+ <model usable='no' vendor='Intel'>SierraForest-v2</model>
+ <blockers model='SierraForest-v2'>
+ <feature name='arch-capabilities'/>
+ <feature name='avx-ifma'/>
+ <feature name='avx-ne-convert'/>
+ <feature name='avx-vnni'/>
+ <feature name='avx-vnni-int8'/>
+ <feature name='bhi-ctrl'/>
+ <feature name='bus-lock-detect'/>
+ <feature name='cldemote'/>
+ <feature name='gfni'/>
+ <feature name='intel-psfd'/>
+ <feature name='invpcid'/>
+ <feature name='ipred-ctrl'/>
+ <feature name='lam'/>
+ <feature name='mcdt-no'/>
+ <feature name='movdir64b'/>
+ <feature name='movdiri'/>
+ <feature name='pcid'/>
+ <feature name='rrsba-ctrl'/>
+ <feature name='serialize'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='tsc-deadline'/>
+ <feature name='tsc_adjust'/>
+ <feature name='vpclmulqdq'/>
+ <feature name='xsavec'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model>
<blockers model='Skylake-Client'>
<feature name='hle'/>
diff --git a/tests/domaincapsdata/qemu_10.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_10.0.0-tcg.x86_64.xml
index 3bec568edf..6cd562e10a 100644
--- a/tests/domaincapsdata/qemu_10.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_10.0.0-tcg.x86_64.xml
@@ -1347,6 +1347,35 @@
<feature name='xsavec'/>
<feature name='xsaves'/>
</blockers>
+ <model usable='no' vendor='Intel'>SierraForest-v2</model>
+ <blockers model='SierraForest-v2'>
+ <feature name='arch-capabilities'/>
+ <feature name='avx-ifma'/>
+ <feature name='avx-ne-convert'/>
+ <feature name='avx-vnni'/>
+ <feature name='avx-vnni-int8'/>
+ <feature name='bhi-ctrl'/>
+ <feature name='bus-lock-detect'/>
+ <feature name='cldemote'/>
+ <feature name='gfni'/>
+ <feature name='intel-psfd'/>
+ <feature name='invpcid'/>
+ <feature name='ipred-ctrl'/>
+ <feature name='lam'/>
+ <feature name='mcdt-no'/>
+ <feature name='movdir64b'/>
+ <feature name='movdiri'/>
+ <feature name='pcid'/>
+ <feature name='rrsba-ctrl'/>
+ <feature name='serialize'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='tsc-deadline'/>
+ <feature name='tsc_adjust'/>
+ <feature name='vpclmulqdq'/>
+ <feature name='xsavec'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model>
<blockers model='Skylake-Client'>
<feature name='hle'/>
diff --git a/tests/domaincapsdata/qemu_10.0.0.x86_64+amdsev.xml b/tests/domaincapsdata/qemu_10.0.0.x86_64+amdsev.xml
index 818876eb89..33790c78ed 100644
--- a/tests/domaincapsdata/qemu_10.0.0.x86_64+amdsev.xml
+++ b/tests/domaincapsdata/qemu_10.0.0.x86_64+amdsev.xml
@@ -513,6 +513,32 @@
<feature name='sbdr-ssdp-no'/>
<feature name='serialize'/>
</blockers>
+ <model usable='no' vendor='Intel'>SierraForest-v2</model>
+ <blockers model='SierraForest-v2'>
+ <feature name='avx-ifma'/>
+ <feature name='avx-ne-convert'/>
+ <feature name='avx-vnni'/>
+ <feature name='avx-vnni-int8'/>
+ <feature name='bhi-ctrl'/>
+ <feature name='bus-lock-detect'/>
+ <feature name='cldemote'/>
+ <feature name='cmpccxadd'/>
+ <feature name='fbsdp-no'/>
+ <feature name='fsrs'/>
+ <feature name='ibrs-all'/>
+ <feature name='intel-psfd'/>
+ <feature name='ipred-ctrl'/>
+ <feature name='lam'/>
+ <feature name='mcdt-no'/>
+ <feature name='movdir64b'/>
+ <feature name='movdiri'/>
+ <feature name='pbrsb-no'/>
+ <feature name='psdp-no'/>
+ <feature name='rrsba-ctrl'/>
+ <feature name='sbdr-ssdp-no'/>
+ <feature name='serialize'/>
+ <feature name='ss'/>
+ </blockers>
<model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model>
<blockers model='Skylake-Client'>
<feature name='hle'/>
diff --git a/tests/domaincapsdata/qemu_10.0.0.x86_64.xml b/tests/domaincapsdata/qemu_10.0.0.x86_64.xml
index c9c89b202b..a0f6b24b99 100644
--- a/tests/domaincapsdata/qemu_10.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_10.0.0.x86_64.xml
@@ -1231,6 +1231,42 @@
<feature name='vpclmulqdq'/>
<feature name='xsaves'/>
</blockers>
+ <model usable='no' vendor='Intel'>SierraForest-v2</model>
+ <blockers model='SierraForest-v2'>
+ <feature name='avx-ifma'/>
+ <feature name='avx-ne-convert'/>
+ <feature name='avx-vnni'/>
+ <feature name='avx-vnni-int8'/>
+ <feature name='bhi-ctrl'/>
+ <feature name='bus-lock-detect'/>
+ <feature name='cldemote'/>
+ <feature name='cmpccxadd'/>
+ <feature name='erms'/>
+ <feature name='fbsdp-no'/>
+ <feature name='fsrm'/>
+ <feature name='fsrs'/>
+ <feature name='gfni'/>
+ <feature name='ibrs-all'/>
+ <feature name='intel-psfd'/>
+ <feature name='invpcid'/>
+ <feature name='ipred-ctrl'/>
+ <feature name='lam'/>
+ <feature name='mcdt-no'/>
+ <feature name='movdir64b'/>
+ <feature name='movdiri'/>
+ <feature name='pbrsb-no'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='psdp-no'/>
+ <feature name='rrsba-ctrl'/>
+ <feature name='sbdr-ssdp-no'/>
+ <feature name='serialize'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ss'/>
+ <feature name='vaes'/>
+ <feature name='vpclmulqdq'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model>
<blockers model='Skylake-Client'>
<feature name='erms'/>
diff --git a/tests/domaincapsdata/qemu_10.1.0-q35.x86_64+inteltdx.xml b/tests/domaincapsdata/qemu_10.1.0-q35.x86_64+inteltdx.xml
index e7b1e4d1ae..085f91ca05 100644
--- a/tests/domaincapsdata/qemu_10.1.0-q35.x86_64+inteltdx.xml
+++ b/tests/domaincapsdata/qemu_10.1.0-q35.x86_64+inteltdx.xml
@@ -491,6 +491,22 @@
<feature name='psdp-no'/>
<feature name='sbdr-ssdp-no'/>
</blockers>
+ <model usable='no' vendor='Intel'>SierraForest-v2</model>
+ <blockers model='SierraForest-v2'>
+ <feature name='avx-ifma'/>
+ <feature name='avx-ne-convert'/>
+ <feature name='avx-vnni-int8'/>
+ <feature name='bhi-ctrl'/>
+ <feature name='cmpccxadd'/>
+ <feature name='fbsdp-no'/>
+ <feature name='ipred-ctrl'/>
+ <feature name='lam'/>
+ <feature name='mcdt-no'/>
+ <feature name='pbrsb-no'/>
+ <feature name='psdp-no'/>
+ <feature name='rrsba-ctrl'/>
+ <feature name='sbdr-ssdp-no'/>
+ </blockers>
<model usable='yes' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model>
<model usable='yes' vendor='Intel' canonical='Skylake-Client-v2'>Skylake-Client-IBRS</model>
<model usable='yes' vendor='Intel' canonical='Skylake-Client-v3'>Skylake-Client-noTSX-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_10.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_10.1.0-q35.x86_64.xml
index 9c832a7bfd..1d1ce3b786 100644
--- a/tests/domaincapsdata/qemu_10.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_10.1.0-q35.x86_64.xml
@@ -1251,6 +1251,43 @@
<feature name='vpclmulqdq'/>
<feature name='xsaves'/>
</blockers>
+ <model usable='no' vendor='Intel'>SierraForest-v2</model>
+ <blockers model='SierraForest-v2'>
+ <feature name='arch-capabilities'/>
+ <feature name='avx-ifma'/>
+ <feature name='avx-ne-convert'/>
+ <feature name='avx-vnni'/>
+ <feature name='avx-vnni-int8'/>
+ <feature name='bhi-ctrl'/>
+ <feature name='bus-lock-detect'/>
+ <feature name='cldemote'/>
+ <feature name='cmpccxadd'/>
+ <feature name='erms'/>
+ <feature name='fbsdp-no'/>
+ <feature name='fsrm'/>
+ <feature name='fsrs'/>
+ <feature name='gfni'/>
+ <feature name='ibrs-all'/>
+ <feature name='intel-psfd'/>
+ <feature name='invpcid'/>
+ <feature name='ipred-ctrl'/>
+ <feature name='lam'/>
+ <feature name='mcdt-no'/>
+ <feature name='movdir64b'/>
+ <feature name='movdiri'/>
+ <feature name='pbrsb-no'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='psdp-no'/>
+ <feature name='rrsba-ctrl'/>
+ <feature name='sbdr-ssdp-no'/>
+ <feature name='serialize'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ss'/>
+ <feature name='vaes'/>
+ <feature name='vpclmulqdq'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model>
<blockers model='Skylake-Client'>
<feature name='erms'/>
diff --git a/tests/domaincapsdata/qemu_10.1.0-tcg.x86_64+inteltdx.xml b/tests/domaincapsdata/qemu_10.1.0-tcg.x86_64+inteltdx.xml
index b0eb35c6c8..c4e1491ace 100644
--- a/tests/domaincapsdata/qemu_10.1.0-tcg.x86_64+inteltdx.xml
+++ b/tests/domaincapsdata/qemu_10.1.0-tcg.x86_64+inteltdx.xml
@@ -1344,6 +1344,35 @@
<feature name='xsavec'/>
<feature name='xsaves'/>
</blockers>
+ <model usable='no' vendor='Intel'>SierraForest-v2</model>
+ <blockers model='SierraForest-v2'>
+ <feature name='arch-capabilities'/>
+ <feature name='avx-ifma'/>
+ <feature name='avx-ne-convert'/>
+ <feature name='avx-vnni'/>
+ <feature name='avx-vnni-int8'/>
+ <feature name='bhi-ctrl'/>
+ <feature name='bus-lock-detect'/>
+ <feature name='cldemote'/>
+ <feature name='gfni'/>
+ <feature name='intel-psfd'/>
+ <feature name='invpcid'/>
+ <feature name='ipred-ctrl'/>
+ <feature name='lam'/>
+ <feature name='mcdt-no'/>
+ <feature name='movdir64b'/>
+ <feature name='movdiri'/>
+ <feature name='pcid'/>
+ <feature name='rrsba-ctrl'/>
+ <feature name='serialize'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='tsc-deadline'/>
+ <feature name='tsc_adjust'/>
+ <feature name='vpclmulqdq'/>
+ <feature name='xsavec'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model>
<blockers model='Skylake-Client'>
<feature name='hle'/>
diff --git a/tests/domaincapsdata/qemu_10.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_10.1.0-tcg.x86_64.xml
index fb6540b94a..e973ba77f6 100644
--- a/tests/domaincapsdata/qemu_10.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_10.1.0-tcg.x86_64.xml
@@ -1344,6 +1344,35 @@
<feature name='xsavec'/>
<feature name='xsaves'/>
</blockers>
+ <model usable='no' vendor='Intel'>SierraForest-v2</model>
+ <blockers model='SierraForest-v2'>
+ <feature name='arch-capabilities'/>
+ <feature name='avx-ifma'/>
+ <feature name='avx-ne-convert'/>
+ <feature name='avx-vnni'/>
+ <feature name='avx-vnni-int8'/>
+ <feature name='bhi-ctrl'/>
+ <feature name='bus-lock-detect'/>
+ <feature name='cldemote'/>
+ <feature name='gfni'/>
+ <feature name='intel-psfd'/>
+ <feature name='invpcid'/>
+ <feature name='ipred-ctrl'/>
+ <feature name='lam'/>
+ <feature name='mcdt-no'/>
+ <feature name='movdir64b'/>
+ <feature name='movdiri'/>
+ <feature name='pcid'/>
+ <feature name='rrsba-ctrl'/>
+ <feature name='serialize'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='tsc-deadline'/>
+ <feature name='tsc_adjust'/>
+ <feature name='vpclmulqdq'/>
+ <feature name='xsavec'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model>
<blockers model='Skylake-Client'>
<feature name='hle'/>
diff --git a/tests/domaincapsdata/qemu_10.1.0.x86_64+inteltdx.xml b/tests/domaincapsdata/qemu_10.1.0.x86_64+inteltdx.xml
index 468dc22ce9..29559caebc 100644
--- a/tests/domaincapsdata/qemu_10.1.0.x86_64+inteltdx.xml
+++ b/tests/domaincapsdata/qemu_10.1.0.x86_64+inteltdx.xml
@@ -490,6 +490,22 @@
<feature name='psdp-no'/>
<feature name='sbdr-ssdp-no'/>
</blockers>
+ <model usable='no' vendor='Intel'>SierraForest-v2</model>
+ <blockers model='SierraForest-v2'>
+ <feature name='avx-ifma'/>
+ <feature name='avx-ne-convert'/>
+ <feature name='avx-vnni-int8'/>
+ <feature name='bhi-ctrl'/>
+ <feature name='cmpccxadd'/>
+ <feature name='fbsdp-no'/>
+ <feature name='ipred-ctrl'/>
+ <feature name='lam'/>
+ <feature name='mcdt-no'/>
+ <feature name='pbrsb-no'/>
+ <feature name='psdp-no'/>
+ <feature name='rrsba-ctrl'/>
+ <feature name='sbdr-ssdp-no'/>
+ </blockers>
<model usable='yes' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model>
<model usable='yes' vendor='Intel' canonical='Skylake-Client-v2'>Skylake-Client-IBRS</model>
<model usable='yes' vendor='Intel' canonical='Skylake-Client-v3'>Skylake-Client-noTSX-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_10.1.0.x86_64.xml b/tests/domaincapsdata/qemu_10.1.0.x86_64.xml
index df171bb5d7..66b8bec3e9 100644
--- a/tests/domaincapsdata/qemu_10.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_10.1.0.x86_64.xml
@@ -1250,6 +1250,43 @@
<feature name='vpclmulqdq'/>
<feature name='xsaves'/>
</blockers>
+ <model usable='no' vendor='Intel'>SierraForest-v2</model>
+ <blockers model='SierraForest-v2'>
+ <feature name='arch-capabilities'/>
+ <feature name='avx-ifma'/>
+ <feature name='avx-ne-convert'/>
+ <feature name='avx-vnni'/>
+ <feature name='avx-vnni-int8'/>
+ <feature name='bhi-ctrl'/>
+ <feature name='bus-lock-detect'/>
+ <feature name='cldemote'/>
+ <feature name='cmpccxadd'/>
+ <feature name='erms'/>
+ <feature name='fbsdp-no'/>
+ <feature name='fsrm'/>
+ <feature name='fsrs'/>
+ <feature name='gfni'/>
+ <feature name='ibrs-all'/>
+ <feature name='intel-psfd'/>
+ <feature name='invpcid'/>
+ <feature name='ipred-ctrl'/>
+ <feature name='lam'/>
+ <feature name='mcdt-no'/>
+ <feature name='movdir64b'/>
+ <feature name='movdiri'/>
+ <feature name='pbrsb-no'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='psdp-no'/>
+ <feature name='rrsba-ctrl'/>
+ <feature name='sbdr-ssdp-no'/>
+ <feature name='serialize'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ss'/>
+ <feature name='vaes'/>
+ <feature name='vpclmulqdq'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model>
<blockers model='Skylake-Client'>
<feature name='erms'/>
diff --git a/tests/domaincapsdata/qemu_10.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_10.2.0-q35.x86_64.xml
index 4c358dba4c..b71cf46741 100644
--- a/tests/domaincapsdata/qemu_10.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_10.2.0-q35.x86_64.xml
@@ -602,6 +602,30 @@
<feature name='sbdr-ssdp-no'/>
<feature name='serialize'/>
</blockers>
+ <model usable='no' vendor='Intel'>SierraForest-v2</model>
+ <blockers model='SierraForest-v2'>
+ <feature name='avx-ifma'/>
+ <feature name='avx-ne-convert'/>
+ <feature name='avx-vnni-int8'/>
+ <feature name='bhi-ctrl'/>
+ <feature name='bus-lock-detect'/>
+ <feature name='cldemote'/>
+ <feature name='cmpccxadd'/>
+ <feature name='fbsdp-no'/>
+ <feature name='fsrs'/>
+ <feature name='ibrs-all'/>
+ <feature name='intel-psfd'/>
+ <feature name='ipred-ctrl'/>
+ <feature name='lam'/>
+ <feature name='mcdt-no'/>
+ <feature name='pbrsb-no'/>
+ <feature name='pcid'/>
+ <feature name='psdp-no'/>
+ <feature name='rrsba-ctrl'/>
+ <feature name='sbdr-ssdp-no'/>
+ <feature name='serialize'/>
+ <feature name='ss'/>
+ </blockers>
<model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model>
<blockers model='Skylake-Client'>
<feature name='hle'/>
diff --git a/tests/domaincapsdata/qemu_10.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_10.2.0-tcg.x86_64.xml
index c43f7eb9ce..6107008b5f 100644
--- a/tests/domaincapsdata/qemu_10.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_10.2.0-tcg.x86_64.xml
@@ -1344,6 +1344,35 @@
<feature name='xsavec'/>
<feature name='xsaves'/>
</blockers>
+ <model usable='no' vendor='Intel'>SierraForest-v2</model>
+ <blockers model='SierraForest-v2'>
+ <feature name='arch-capabilities'/>
+ <feature name='avx-ifma'/>
+ <feature name='avx-ne-convert'/>
+ <feature name='avx-vnni'/>
+ <feature name='avx-vnni-int8'/>
+ <feature name='bhi-ctrl'/>
+ <feature name='bus-lock-detect'/>
+ <feature name='cldemote'/>
+ <feature name='gfni'/>
+ <feature name='intel-psfd'/>
+ <feature name='invpcid'/>
+ <feature name='ipred-ctrl'/>
+ <feature name='lam'/>
+ <feature name='mcdt-no'/>
+ <feature name='movdir64b'/>
+ <feature name='movdiri'/>
+ <feature name='pcid'/>
+ <feature name='rrsba-ctrl'/>
+ <feature name='serialize'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='tsc-deadline'/>
+ <feature name='tsc_adjust'/>
+ <feature name='vpclmulqdq'/>
+ <feature name='xsavec'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model>
<blockers model='Skylake-Client'>
<feature name='hle'/>
diff --git a/tests/domaincapsdata/qemu_10.2.0.x86_64.xml b/tests/domaincapsdata/qemu_10.2.0.x86_64.xml
index 491ae36d63..e91c1cd528 100644
--- a/tests/domaincapsdata/qemu_10.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_10.2.0.x86_64.xml
@@ -601,6 +601,30 @@
<feature name='sbdr-ssdp-no'/>
<feature name='serialize'/>
</blockers>
+ <model usable='no' vendor='Intel'>SierraForest-v2</model>
+ <blockers model='SierraForest-v2'>
+ <feature name='avx-ifma'/>
+ <feature name='avx-ne-convert'/>
+ <feature name='avx-vnni-int8'/>
+ <feature name='bhi-ctrl'/>
+ <feature name='bus-lock-detect'/>
+ <feature name='cldemote'/>
+ <feature name='cmpccxadd'/>
+ <feature name='fbsdp-no'/>
+ <feature name='fsrs'/>
+ <feature name='ibrs-all'/>
+ <feature name='intel-psfd'/>
+ <feature name='ipred-ctrl'/>
+ <feature name='lam'/>
+ <feature name='mcdt-no'/>
+ <feature name='pbrsb-no'/>
+ <feature name='pcid'/>
+ <feature name='psdp-no'/>
+ <feature name='rrsba-ctrl'/>
+ <feature name='sbdr-ssdp-no'/>
+ <feature name='serialize'/>
+ <feature name='ss'/>
+ </blockers>
<model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model>
<blockers model='Skylake-Client'>
<feature name='hle'/>
--
2.51.0© 2016 - 2025 Red Hat, Inc.