cpu_map: Add CET related CPU features

QEMU commit 2f25476ae7f3b4c28fde64584a04734b14c8fd37

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/src/cpu_map/sync_qemu_models_i386.py b/src/cpu_map/sync_qemu_models_i386.py
index e778f99c65cc71a67a22cdbd1a7e83567aef0dfa..36dadd8398bcb9d870b68b7bbca4cd0b96780c60 100755 (executable)
--- a/src/cpu_map/sync_qemu_models_i386.py
+++ b/src/cpu_map/sync_qemu_models_i386.py
@@ -83,6 +83,8 @@ def translate_feature(name, model):
         "CPUID_7_0_EDX_STIBP": "stibp",
         "CPUID_7_0_EDX_TSX_LDTRK": "tsx-ldtrk",
         "CPUID_7_0_EDX_AVX512_VP2INTERSECT": "avx512-vp2intersect",
+        "CPUID_7_0_ECX_CET_SHSTK": "cet-ss",
+        "CPUID_7_0_EDX_CET_IBT": "cet-ibt",
         "CPUID_7_1_EAX_AMX_FP16": "amx-fp16",
         "CPUID_7_1_EAX_AVX512_BF16": "avx512-bf16",
         "CPUID_7_1_EAX_AVX_IFMA": "avx-ifma",
@@ -317,6 +319,7 @@ def translate_feature(name, model):
         "VMX_VM_EXIT_CLEAR_BNDCFGS": "vmx-exit-clear-bndcfgs",
         "VMX_VM_EXIT_CLEAR_IA32_RTIT_CTL": "vmx-exit-clear-rtit-ctl",
         "VMX_VM_EXIT_LOAD_IA32_PKRS": "vmx-exit-load-pkrs",
+        "VMX_VM_EXIT_SAVE_CET": "vmx-exit-save-cet",
 
         # FEAT_VMX_ENTRY_CTLS
         "VMX_VM_ENTRY_LOAD_DEBUG_CONTROLS": "vmx-entry-noload-debugctl",
@@ -327,6 +330,7 @@ def translate_feature(name, model):
         "VMX_VM_ENTRY_LOAD_BNDCFGS": "vmx-entry-load-bndcfgs",
         "VMX_VM_ENTRY_LOAD_IA32_RTIT_CTL": "vmx-entry-load-rtit-ctl",
         "VMX_VM_ENTRY_LOAD_IA32_PKRS": "vmx-entry-load-pkrs",
+        "VMX_VM_ENTRY_LOAD_CET": "vmx-entry-load-cet",
 
         # FEAT_VMX_MISC
         "MSR_VMX_MISC_STORE_LMA": "vmx-store-lma",

diff --git a/src/cpu_map/x86_features.xml b/src/cpu_map/x86_features.xml
index 0eb6a5c32cf901242cd55612f2065c116f31d27c..69d908179b2dc2b695532d9402851171559d5bb1 100644 (file)
--- a/src/cpu_map/x86_features.xml
+++ b/src/cpu_map/x86_features.xml
@@ -317,6 +317,9 @@
   <feature name='avx512vbmi2'>
     <cpuid eax_in='0x00000007' ecx_in='0x00000000' ecx='0x00000040'/>
   </feature>
+  <feature name='cet-ss'>
+    <cpuid eax_in='0x00000007' ecx_in='0x00000000' ecx='0x00000080'/>
+  </feature>
   <feature name='gfni'>
     <cpuid eax_in='0x00000007' ecx_in='0x00000000' ecx='0x00000100'/>
   </feature>
@@ -389,6 +392,9 @@
   <feature name='arch-lbr'>
     <cpuid eax_in='0x00000007' ecx_in='0x00000000' edx='0x00080000'/>
   </feature>
+  <feature name='cet-ibt'>
+    <cpuid eax_in='0x00000007' ecx_in='0x00000000' edx='0x00100000'/>
+  </feature>
   <feature name='amx-bf16'>
     <cpuid eax_in='0x00000007' ecx_in='0x00000000' edx='0x00400000'/>
   </feature>
@@ -1244,6 +1250,9 @@
   <feature name='vmx-exit-clear-rtit-ctl'>
     <msr index='0x0000048f' edx='0x02000000' eax='0x00000000'/>
   </feature>
+  <feature name='vmx-exit-save-cet'>
+    <msr index='0x0000048f' edx='0x10000000' eax='0x00000000'/>
+  </feature>
   <feature name='vmx-exit-load-pkrs'>
     <msr index='0x0000048f' edx='0x20000000' eax='0x00000000'/>
   </feature>
@@ -1273,6 +1282,9 @@
   <feature name='vmx-entry-load-rtit-ctl'>
     <msr index='0x00000490' edx='0x00040000' eax='0x00000000'/>
   </feature>
+  <feature name='vmx-entry-load-cet'>
+    <msr index='0x00000490' edx='0x00100000' eax='0x00000000'/>
+  </feature>
   <feature name='vmx-entry-load-pkrs'>
     <msr index='0x00000490' edx='0x00400000' eax='0x00000000'/>
   </feature>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-1270P-disabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-1270P-disabled.xml
index 7b9e3383508dc406101a092a705fe789db5589b3..d34de3611827f449c55d3848bd946484c3c606ae 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-1270P-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-1270P-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='0x0800c1dc' edx='0xb0600000'/>
-  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x02000000' ecx='0x80000010' edx='0x400c0000'/>
+  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x02000000' ecx='0x80000090' edx='0x401c0000'/>
   <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
   <msr index='0xcf' edx='0x00000000' eax='0x00000020'/>
   <msr index='0x10a' edx='0x00000000' eax='0x00000100'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-1270P-guest.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-1270P-guest.xml
index 2253a90cdbc5d5746a30464cdb3dc9fbcb003e19..0f050525f4dd381f59baf4031cd10956dadfe915 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-1270P-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-1270P-guest.xml
@@ -33,6 +33,7 @@
   <feature policy='require' name='pku'/>
   <feature policy='require' name='ospke'/>
   <feature policy='require' name='waitpkg'/>
+  <feature policy='require' name='cet-ss'/>
   <feature policy='require' name='vaes'/>
   <feature policy='require' name='vpclmulqdq'/>
   <feature policy='require' name='rdpid'/>
@@ -42,6 +43,7 @@
   <feature policy='require' name='serialize'/>
   <feature policy='require' name='pconfig'/>
   <feature policy='require' name='arch-lbr'/>
+  <feature policy='require' name='cet-ibt'/>
   <feature policy='require' name='stibp'/>
   <feature policy='require' name='flush-l1d'/>
   <feature policy='require' name='avx-vnni'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-1270P-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-1270P-host.xml
index 9ede3ba04edc9d5294c2dd7c323197ff5231c6ea..765cc63fde2960f993ed2ab783267df6ec9fc5de 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-1270P-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-1270P-host.xml
@@ -30,6 +30,7 @@
   <feature name='pku'/>
   <feature name='ospke'/>
   <feature name='waitpkg'/>
+  <feature name='cet-ss'/>
   <feature name='gfni'/>
   <feature name='vaes'/>
   <feature name='vpclmulqdq'/>
@@ -42,6 +43,7 @@
   <feature name='serialize'/>
   <feature name='pconfig'/>
   <feature name='arch-lbr'/>
+  <feature name='cet-ibt'/>
   <feature name='stibp'/>
   <feature name='flush-l1d'/>
   <feature name='arch-capabilities'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-1365U-disabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-1365U-disabled.xml
index 23295d11219c33ecf6c5b8635f52d556df7ae46e..566c5d7e015fd1ba53ffedf8aa4563dda02ae6bb 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-1365U-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-1365U-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='0x80000010' edx='0x400c0000'/>
+  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x02000000' ecx='0x80000090' edx='0x401c0000'/>
   <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-1365U-guest.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-1365U-guest.xml
index b55acf9c962fd17b4160ba09e8ca13e66ebac6bc..3962353e7d6390975531634d25fd8462cfa368c5 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-1365U-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-1365U-guest.xml
@@ -33,6 +33,7 @@
   <feature policy='require' name='pku'/>
   <feature policy='require' name='ospke'/>
   <feature policy='require' name='waitpkg'/>
+  <feature policy='require' name='cet-ss'/>
   <feature policy='require' name='vaes'/>
   <feature policy='require' name='vpclmulqdq'/>
   <feature policy='require' name='rdpid'/>
@@ -42,6 +43,7 @@
   <feature policy='require' name='serialize'/>
   <feature policy='require' name='pconfig'/>
   <feature policy='require' name='arch-lbr'/>
+  <feature policy='require' name='cet-ibt'/>
   <feature policy='require' name='stibp'/>
   <feature policy='require' name='flush-l1d'/>
   <feature policy='require' name='avx-vnni'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-1365U-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-1365U-host.xml
index 6b77828ee6c3bf1683045f1b0fb01acb2ab44bef..ad0c6ba4a1261465b930be684706e976d0682105 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-1365U-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-1365U-host.xml
@@ -30,6 +30,7 @@
   <feature name='pku'/>
   <feature name='ospke'/>
   <feature name='waitpkg'/>
+  <feature name='cet-ss'/>
   <feature name='gfni'/>
   <feature name='vaes'/>
   <feature name='vpclmulqdq'/>
@@ -42,6 +43,7 @@
   <feature name='serialize'/>
   <feature name='pconfig'/>
   <feature name='arch-lbr'/>
+  <feature name='cet-ibt'/>
   <feature name='stibp'/>
   <feature name='flush-l1d'/>
   <feature name='arch-capabilities'/>

diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7713-64-Core-disabled.xml b/tests/cputestdata/x86_64-cpuid-EPYC-7713-64-Core-disabled.xml
index b6507fe6b71befa4e93c2cb351e02c18df6f06e6..ae64d1608298b70f61920436edefe207ff3f6943 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-EPYC-7713-64-Core-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-EPYC-7713-64-Core-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='0x08000008' edx='0x10000000'/>
-  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00001000' ecx='0x00000010' edx='0x00000000'/>
+  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00001000' ecx='0x00000090' edx='0x00000000'/>
   <cpuid eax_in='0x0000000f' ecx_in='0x01' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000006'/>
   <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x01423408' edx='0x00000000'/>
   <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000003' ecx='0x00000000' edx='0x00000100'/>

diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7713-64-Core-guest.xml b/tests/cputestdata/x86_64-cpuid-EPYC-7713-64-Core-guest.xml
index 42d9e148f71f569d0ec5fd60b37b5a2b84ecc79b..2c85282b54fc3ed6535bfb8a7e3cda9ee797448b 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-EPYC-7713-64-Core-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-EPYC-7713-64-Core-guest.xml
@@ -7,6 +7,7 @@
   <feature policy='require' name='ht'/>
   <feature policy='require' name='cmt'/>
   <feature policy='require' name='ospke'/>
+  <feature policy='require' name='cet-ss'/>
   <feature policy='require' name='vaes'/>
   <feature policy='require' name='vpclmulqdq'/>
   <feature policy='require' name='mbm_total'/>

diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7713-64-Core-host.xml b/tests/cputestdata/x86_64-cpuid-EPYC-7713-64-Core-host.xml
index db3d78dd5b5d58874ddaa62ec94cd25296961498..bd8186a8d680731a29b8502cd15dad7e97612adf 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-EPYC-7713-64-Core-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-EPYC-7713-64-Core-host.xml
@@ -9,6 +9,7 @@
   <feature name='ht'/>
   <feature name='cmt'/>
   <feature name='ospke'/>
+  <feature name='cet-ss'/>
   <feature name='mbm_total'/>
   <feature name='mbm_local'/>
   <feature name='cmp_legacy'/>

diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-9334-32-Core-disabled.xml b/tests/cputestdata/x86_64-cpuid-EPYC-9334-32-Core-disabled.xml
index 0f9c7000b9f222690c9419d6a40f308afc99a9d6..e04f1a86f63b5ab0130f19348da31160c127f656 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-EPYC-9334-32-Core-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-EPYC-9334-32-Core-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='0x08000008' edx='0x10000000'/>
-  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00001000' ecx='0x00000010' edx='0x00000000'/>
+  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00001000' ecx='0x00000090' edx='0x00000000'/>
   <cpuid eax_in='0x0000000f' ecx_in='0x01' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000006'/>
   <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x01423408' 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-EPYC-9334-32-Core-guest.xml b/tests/cputestdata/x86_64-cpuid-EPYC-9334-32-Core-guest.xml
index 07b1e59bc215664d72de37cb54dadca411871726..40b0f1a213d8514d2987c76b7f308aa81ef0c585 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-EPYC-9334-32-Core-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-EPYC-9334-32-Core-guest.xml
@@ -7,6 +7,7 @@
   <feature policy='require' name='ht'/>
   <feature policy='require' name='cmt'/>
   <feature policy='require' name='ospke'/>
+  <feature policy='require' name='cet-ss'/>
   <feature policy='require' name='flush-l1d'/>
   <feature policy='require' name='mbm_total'/>
   <feature policy='require' name='mbm_local'/>

diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-9334-32-Core-host.xml b/tests/cputestdata/x86_64-cpuid-EPYC-9334-32-Core-host.xml
index 70307f485586f51dc4c04c8753fc7edf466e6881..e884161f6c5d4d5aa0febd07e916bf183164ca0a 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-EPYC-9334-32-Core-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-EPYC-9334-32-Core-host.xml
@@ -9,6 +9,7 @@
   <feature name='ht'/>
   <feature name='cmt'/>
   <feature name='ospke'/>
+  <feature name='cet-ss'/>
   <feature name='flush-l1d'/>
   <feature name='mbm_total'/>
   <feature name='mbm_local'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Ryzen-9-9950X-16-Core-disabled.xml b/tests/cputestdata/x86_64-cpuid-Ryzen-9-9950X-16-Core-disabled.xml
index 60880acf30b881ebb178b2e4c745f07d5da951bd..1a23b22bf201947bdd85419df944c1a5b84a4335 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Ryzen-9-9950X-16-Core-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Ryzen-9-9950X-16-Core-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='0x08000008' edx='0x10000000'/>
-  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00001000' ecx='0x01000010' edx='0x00000000'/>
+  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00001000' ecx='0x01000090' edx='0x00000000'/>
   <cpuid eax_in='0x0000000f' ecx_in='0x01' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000006'/>
   <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x01423408' 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-Ryzen-9-9950X-16-Core-guest.xml b/tests/cputestdata/x86_64-cpuid-Ryzen-9-9950X-16-Core-guest.xml
index f405fed9955df3400ce596d0926df45605bcdce1..1cf862bfe67102e700b68496907e517892a7d88f 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Ryzen-9-9950X-16-Core-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Ryzen-9-9950X-16-Core-guest.xml
@@ -7,6 +7,7 @@
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='cmt'/>
   <feature policy='require' name='ospke'/>
+  <feature policy='require' name='cet-ss'/>
   <feature policy='require' name='bus-lock-detect'/>
   <feature policy='require' name='flush-l1d'/>
   <feature policy='require' name='mbm_total'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Ryzen-9-9950X-16-Core-host.xml b/tests/cputestdata/x86_64-cpuid-Ryzen-9-9950X-16-Core-host.xml
index 48e5e03f037b84f26a96407094975d4d172ca7ca..65cee66c71904cd3e0654494a9b4c315aa86055d 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Ryzen-9-9950X-16-Core-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Ryzen-9-9950X-16-Core-host.xml
@@ -20,6 +20,7 @@
   <feature name='pku'/>
   <feature name='ospke'/>
   <feature name='avx512vbmi2'/>
+  <feature name='cet-ss'/>
   <feature name='gfni'/>
   <feature name='vaes'/>
   <feature name='vpclmulqdq'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-6731E-disabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-6731E-disabled.xml
index bddd5488e1e7a0b2ef2d6b0a3413ac805ba51eb1..03f93587b1e8609ef3337586c37e865f18aaa0e7 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-6731E-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-6731E-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='0x080441d8' edx='0xb0400000'/>
-  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x02001004' ecx='0xc0000010' edx='0x400c0000'/>
+  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x02001004' ecx='0xc0000090' edx='0x401c0000'/>
   <cpuid eax_in='0x00000007' ecx_in='0x01' eax='0x00080000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
   <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'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-6731E-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-6731E-guest.xml
index b9481ff3d087aa527a9b718b9d93d5eb7288b0b9..62495fc60b9411a568f748d2516b891d3471b907 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-6731E-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-6731E-guest.xml
@@ -26,6 +26,7 @@
   <feature policy='require' name='intel-pt'/>
   <feature policy='require' name='ospke'/>
   <feature policy='require' name='waitpkg'/>
+  <feature policy='require' name='cet-ss'/>
   <feature policy='require' name='cldemote'/>
   <feature policy='require' name='movdiri'/>
   <feature policy='require' name='movdir64b'/>
@@ -34,6 +35,7 @@
   <feature policy='require' name='md-clear'/>
   <feature policy='require' name='pconfig'/>
   <feature policy='require' name='arch-lbr'/>
+  <feature policy='require' name='cet-ibt'/>
   <feature policy='require' name='stibp'/>
   <feature policy='require' name='flush-l1d'/>
   <feature policy='require' name='core-capability'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-6731E-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-6731E-host.xml
index f114f64c51044bec5ccffc8223d5a094dda2c634..04104058f2c0d97e6887b6d41e5ea98cdf2281d2 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-6731E-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-6731E-host.xml
@@ -38,6 +38,7 @@
   <feature name='pku'/>
   <feature name='ospke'/>
   <feature name='waitpkg'/>
+  <feature name='cet-ss'/>
   <feature name='vaes'/>
   <feature name='vpclmulqdq'/>
   <feature name='rdpid'/>
@@ -49,6 +50,7 @@
   <feature name='serialize'/>
   <feature name='pconfig'/>
   <feature name='arch-lbr'/>
+  <feature name='cet-ibt'/>
   <feature name='stibp'/>
   <feature name='flush-l1d'/>
   <feature name='avx-vnni'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-6788P-disabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-6788P-disabled.xml
index 5dd24f2d17009af8dc3741fe0fb9bb6b5343951c..ee206ede5d2a44ac7d8595f49b437cbaac8d0b83 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-6788P-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-6788P-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='0x080441d8' edx='0xb0400000'/>
-  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x02001004' ecx='0xc0000010' edx='0x400c0000'/>
+  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x02001004' ecx='0xc0000090' edx='0x401c0000'/>
   <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='0xcf' edx='0x00000000' eax='0x00000020'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-6788P-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-6788P-guest.xml
index f5d80aebf8a49d1fe0dfe6b40324f0f69276e0ce..889b7ab798f614f0c66e7966445846fbaea81a64 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-6788P-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-6788P-guest.xml
@@ -26,6 +26,7 @@
   <feature policy='require' name='intel-pt'/>
   <feature policy='require' name='ospke'/>
   <feature policy='require' name='waitpkg'/>
+  <feature policy='require' name='cet-ss'/>
   <feature policy='require' name='cldemote'/>
   <feature policy='require' name='movdiri'/>
   <feature policy='require' name='movdir64b'/>
@@ -34,6 +35,7 @@
   <feature policy='require' name='md-clear'/>
   <feature policy='require' name='pconfig'/>
   <feature policy='require' name='arch-lbr'/>
+  <feature policy='require' name='cet-ibt'/>
   <feature policy='require' name='stibp'/>
   <feature policy='require' name='flush-l1d'/>
   <feature policy='require' name='core-capability'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-6788P-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-6788P-host.xml
index 55fd746133482b69dbec34e026b306e8f4b48e42..54dd35dbd193d8d9addd613d836ac5e1b8d4fe82 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-6788P-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-6788P-host.xml
@@ -30,6 +30,7 @@
   <feature name='sha-ni'/>
   <feature name='ospke'/>
   <feature name='waitpkg'/>
+  <feature name='cet-ss'/>
   <feature name='rdpid'/>
   <feature name='bus-lock-detect'/>
   <feature name='cldemote'/>
@@ -43,6 +44,7 @@
   <feature name='tsx-ldtrk'/>
   <feature name='pconfig'/>
   <feature name='arch-lbr'/>
+  <feature name='cet-ibt'/>
   <feature name='amx-bf16'/>
   <feature name='avx512-fp16'/>
   <feature name='amx-tile'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Bronze-3408U-disabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Bronze-3408U-disabled.xml
index 718d8a325d052990a097b675380315523662b762..13b7a80ef3bcd4e905c63f16c48d99de73a50b0f 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Bronze-3408U-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Bronze-3408U-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='0x080441d0' edx='0xb0400000'/>
-  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x02001004' ecx='0xc0000010' edx='0x400c0000'/>
+  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x02001004' ecx='0xc0000090' edx='0x401c0000'/>
   <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='0xcf' edx='0x00000000' eax='0x00000020'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Bronze-3408U-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Bronze-3408U-guest.xml
index 65f9bc3641a4ef33315b053ab690677b30f203db..38d98d2eb742981e5e6af7a9bd50240e15931b15 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Bronze-3408U-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Bronze-3408U-guest.xml
@@ -25,6 +25,7 @@
   <feature policy='require' name='intel-pt'/>
   <feature policy='require' name='ospke'/>
   <feature policy='require' name='waitpkg'/>
+  <feature policy='require' name='cet-ss'/>
   <feature policy='require' name='cldemote'/>
   <feature policy='require' name='movdiri'/>
   <feature policy='require' name='movdir64b'/>
@@ -33,6 +34,7 @@
   <feature policy='require' name='md-clear'/>
   <feature policy='require' name='pconfig'/>
   <feature policy='require' name='arch-lbr'/>
+  <feature policy='require' name='cet-ibt'/>
   <feature policy='require' name='stibp'/>
   <feature policy='require' name='flush-l1d'/>
   <feature policy='require' name='core-capability'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Bronze-3408U-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Bronze-3408U-host.xml
index 4606d5552246957d234f4b4911612f0bcac8ea8d..4689d03ccb10c79ea52fa44203055bb84bd35539 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Bronze-3408U-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Bronze-3408U-host.xml
@@ -29,6 +29,7 @@
   <feature name='sha-ni'/>
   <feature name='ospke'/>
   <feature name='waitpkg'/>
+  <feature name='cet-ss'/>
   <feature name='rdpid'/>
   <feature name='bus-lock-detect'/>
   <feature name='cldemote'/>
@@ -42,6 +43,7 @@
   <feature name='tsx-ldtrk'/>
   <feature name='pconfig'/>
   <feature name='arch-lbr'/>
+  <feature name='cet-ibt'/>
   <feature name='avx512-fp16'/>
   <feature name='stibp'/>
   <feature name='flush-l1d'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6530-disabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6530-disabled.xml
index 7b2ee72deec318162993f3f4c3141fb90d8981d0..101a8b4f16a7e6e3a0924c5f190a3e8635b6d39b 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6530-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6530-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='0x080441d8' edx='0xb0400000'/>
-  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x02003044' ecx='0xc0000010' edx='0x400c0000'/>
+  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x02003044' ecx='0xc0000090' edx='0x401c0000'/>
   <cpuid eax_in='0x00000007' ecx_in='0x02' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x0000001f'/>
   <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-6530-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6530-guest.xml
index e3e22263617d04806cfda4c0c8a795bf76090d96..2f05ee0e91bad0a974ce27b8e7a74087d1ba8a44 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6530-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6530-guest.xml
@@ -26,6 +26,7 @@
   <feature policy='require' name='intel-pt'/>
   <feature policy='require' name='ospke'/>
   <feature policy='require' name='waitpkg'/>
+  <feature policy='require' name='cet-ss'/>
   <feature policy='require' name='cldemote'/>
   <feature policy='require' name='movdiri'/>
   <feature policy='require' name='movdir64b'/>
@@ -34,6 +35,7 @@
   <feature policy='require' name='md-clear'/>
   <feature policy='require' name='pconfig'/>
   <feature policy='require' name='arch-lbr'/>
+  <feature policy='require' name='cet-ibt'/>
   <feature policy='require' name='stibp'/>
   <feature policy='require' name='flush-l1d'/>
   <feature policy='require' name='core-capability'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6530-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6530-host.xml
index 18f9de15bce6e60ddb5febbf893585656220a315..b038a2c285fef4f8eb0618b097b72174a6113bb7 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6530-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6530-host.xml
@@ -30,6 +30,7 @@
   <feature name='sha-ni'/>
   <feature name='ospke'/>
   <feature name='waitpkg'/>
+  <feature name='cet-ss'/>
   <feature name='rdpid'/>
   <feature name='bus-lock-detect'/>
   <feature name='cldemote'/>
@@ -43,6 +44,7 @@
   <feature name='tsx-ldtrk'/>
   <feature name='pconfig'/>
   <feature name='arch-lbr'/>
+  <feature name='cet-ibt'/>
   <feature name='amx-bf16'/>
   <feature name='avx512-fp16'/>
   <feature name='amx-tile'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-w7-3465X-disabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-w7-3465X-disabled.xml
index ed220518bdb3f59ff0ad970e73b314020fdb8a32..08ecdcdf41fe97775d145adabae26cc02561c6f1 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-w7-3465X-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-w7-3465X-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='0x080441d8' edx='0xb0400000'/>
-  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x02003040' ecx='0x80000010' edx='0x400c0000'/>
+  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x02003040' ecx='0x80000090' edx='0x401c0000'/>
   <cpuid eax_in='0x00000007' ecx_in='0x02' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000017'/>
   <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-w7-3465X-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-w7-3465X-guest.xml
index 8a77c50cb60572252b0aff2704c2494e20070e1e..f48ffe26087e2568e04f45f59da58087b3dd8487 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-w7-3465X-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-w7-3465X-guest.xml
@@ -25,6 +25,7 @@
   <feature policy='require' name='intel-pt'/>
   <feature policy='require' name='ospke'/>
   <feature policy='require' name='waitpkg'/>
+  <feature policy='require' name='cet-ss'/>
   <feature policy='require' name='cldemote'/>
   <feature policy='require' name='movdiri'/>
   <feature policy='require' name='movdir64b'/>
@@ -32,6 +33,7 @@
   <feature policy='require' name='md-clear'/>
   <feature policy='require' name='pconfig'/>
   <feature policy='require' name='arch-lbr'/>
+  <feature policy='require' name='cet-ibt'/>
   <feature policy='require' name='stibp'/>
   <feature policy='require' name='flush-l1d'/>
   <feature policy='require' name='core-capability'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-w7-3465X-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-w7-3465X-host.xml
index d488c3f9711a9869232ad1811bf899365f1866fe..004af41565326bce00fe2d8dfe451a93713b80ee 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-w7-3465X-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-w7-3465X-host.xml
@@ -29,6 +29,7 @@
   <feature name='sha-ni'/>
   <feature name='ospke'/>
   <feature name='waitpkg'/>
+  <feature name='cet-ss'/>
   <feature name='rdpid'/>
   <feature name='bus-lock-detect'/>
   <feature name='cldemote'/>
@@ -41,6 +42,7 @@
   <feature name='tsx-ldtrk'/>
   <feature name='pconfig'/>
   <feature name='arch-lbr'/>
+  <feature name='cet-ibt'/>
   <feature name='amx-bf16'/>
   <feature name='avx512-fp16'/>
   <feature name='amx-tile'/>

diff --git a/tests/domaincapsdata/qemu_11.0.0-q35.x86_64+sgx.xml b/tests/domaincapsdata/qemu_11.0.0-q35.x86_64+sgx.xml
index 1d834a221e5486db0c8835595159f739b98895c3..83844c121b2f724092b6f42bf8b0716697bbff98 100644 (file)
--- a/tests/domaincapsdata/qemu_11.0.0-q35.x86_64+sgx.xml
+++ b/tests/domaincapsdata/qemu_11.0.0-q35.x86_64+sgx.xml
@@ -59,6 +59,7 @@
       <feature policy='require' name='tsc-deadline'/>
       <feature policy='require' name='hypervisor'/>
       <feature policy='require' name='tsc_adjust'/>
+      <feature policy='require' name='cet-ss'/>
       <feature policy='require' name='spec-ctrl'/>
       <feature policy='require' name='stibp'/>
       <feature policy='require' name='flush-l1d'/>

diff --git a/tests/domaincapsdata/qemu_11.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_11.0.0-q35.x86_64.xml
index 4b951a5ed4dc6042ebcc8a699cd0bc12e7943914..a6881fcc76fba5b03d22f05369728ecdf752e991 100644 (file)
--- a/tests/domaincapsdata/qemu_11.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_11.0.0-q35.x86_64.xml
@@ -59,6 +59,7 @@
       <feature policy='require' name='tsc-deadline'/>
       <feature policy='require' name='hypervisor'/>
       <feature policy='require' name='tsc_adjust'/>
+      <feature policy='require' name='cet-ss'/>
       <feature policy='require' name='spec-ctrl'/>
       <feature policy='require' name='stibp'/>
       <feature policy='require' name='flush-l1d'/>

diff --git a/tests/domaincapsdata/qemu_11.0.0.x86_64+sgx.xml b/tests/domaincapsdata/qemu_11.0.0.x86_64+sgx.xml
index 03b2d78fb54d7dbb5be8e059149a7ca1322537d6..9ab3a94fb69e6b9d7ffdcb18d054f0f7e34f22a5 100644 (file)
--- a/tests/domaincapsdata/qemu_11.0.0.x86_64+sgx.xml
+++ b/tests/domaincapsdata/qemu_11.0.0.x86_64+sgx.xml
@@ -56,6 +56,7 @@
       <feature policy='require' name='tsc-deadline'/>
       <feature policy='require' name='hypervisor'/>
       <feature policy='require' name='tsc_adjust'/>
+      <feature policy='require' name='cet-ss'/>
       <feature policy='require' name='spec-ctrl'/>
       <feature policy='require' name='stibp'/>
       <feature policy='require' name='flush-l1d'/>

diff --git a/tests/domaincapsdata/qemu_11.0.0.x86_64.xml b/tests/domaincapsdata/qemu_11.0.0.x86_64.xml
index 4648a3a071968dc7e89d5695b23c1eda1e218bc7..4c0d3d7692782674376ae0ab2452fb47775c9011 100644 (file)
--- a/tests/domaincapsdata/qemu_11.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_11.0.0.x86_64.xml
@@ -56,6 +56,7 @@
       <feature policy='require' name='tsc-deadline'/>
       <feature policy='require' name='hypervisor'/>
       <feature policy='require' name='tsc_adjust'/>
+      <feature policy='require' name='cet-ss'/>
       <feature policy='require' name='spec-ctrl'/>
       <feature policy='require' name='stibp'/>
       <feature policy='require' name='flush-l1d'/>

diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-11.0.0.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-11.0.0.args
index ed23d2bec43c1c3c0d434883bf5c070b69b9e13e..9b336f1bfb22cc55d973cb2be758e7a4e145a404 100644 (file)
--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-11.0.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-11.0.0.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-Turin,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,spec-ctrl=on,stibp=on,flush-l1d=on,ssbd=on,virt-ssbd=on,tsa-sq-no=on,tsa-l1-no=on,pcid=off,rdseed=off,la57=off \
+-cpu EPYC-Turin,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,cet-ss=on,spec-ctrl=on,stibp=on,flush-l1d=on,ssbd=on,virt-ssbd=on,tsa-sq-no=on,tsa-l1-no=on,pcid=off,rdseed=off,la57=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-fallback-kvm.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-latest.args
index ed23d2bec43c1c3c0d434883bf5c070b69b9e13e..9b336f1bfb22cc55d973cb2be758e7a4e145a404 100644 (file)
--- 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-Turin,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,spec-ctrl=on,stibp=on,flush-l1d=on,ssbd=on,virt-ssbd=on,tsa-sq-no=on,tsa-l1-no=on,pcid=off,rdseed=off,la57=off \
+-cpu EPYC-Turin,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,cet-ss=on,spec-ctrl=on,stibp=on,flush-l1d=on,ssbd=on,virt-ssbd=on,tsa-sq-no=on,tsa-l1-no=on,pcid=off,rdseed=off,la57=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 1c8f99c8d50e116e49eb44a1dbdc268a18176878..d6e95be750698d358a768adf5efeb909dce742c2 100644 (file)
--- 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-Turin,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,spec-ctrl=on,stibp=on,flush-l1d=on,ssbd=on,virt-ssbd=on,tsa-sq-no=on,tsa-l1-no=on,pcid=off,rdseed=off,la57=off,abm=on,ds=on,invtsc=off \
+-cpu EPYC-Turin,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,cet-ss=on,spec-ctrl=on,stibp=on,flush-l1d=on,ssbd=on,virt-ssbd=on,tsa-sq-no=on,tsa-l1-no=on,pcid=off,rdseed=off,la57=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-11.0.0.args b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-11.0.0.args
index df7407e32b0ec0bdb486962aba4332a7589adfdc..1a77a95efd05c4cc3f36b59f2b386177446e91c2 100644 (file)
--- a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-11.0.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-11.0.0.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-Turin,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,spec-ctrl=on,stibp=on,flush-l1d=on,ssbd=on,virt-ssbd=on,tsa-sq-no=on,tsa-l1-no=on,pcid=off,rdseed=off,la57=off \
+-cpu EPYC-Turin,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,cet-ss=on,spec-ctrl=on,stibp=on,flush-l1d=on,ssbd=on,virt-ssbd=on,tsa-sq-no=on,tsa-l1-no=on,pcid=off,rdseed=off,la57=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 df7407e32b0ec0bdb486962aba4332a7589adfdc..1a77a95efd05c4cc3f36b59f2b386177446e91c2 100644 (file)
--- 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-Turin,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,spec-ctrl=on,stibp=on,flush-l1d=on,ssbd=on,virt-ssbd=on,tsa-sq-no=on,tsa-l1-no=on,pcid=off,rdseed=off,la57=off \
+-cpu EPYC-Turin,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,cet-ss=on,spec-ctrl=on,stibp=on,flush-l1d=on,ssbd=on,virt-ssbd=on,tsa-sq-no=on,tsa-l1-no=on,pcid=off,rdseed=off,la57=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-11.0.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-11.0.0.args
index ed23d2bec43c1c3c0d434883bf5c070b69b9e13e..9b336f1bfb22cc55d973cb2be758e7a4e145a404 100644 (file)
--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-11.0.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-11.0.0.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-Turin,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,spec-ctrl=on,stibp=on,flush-l1d=on,ssbd=on,virt-ssbd=on,tsa-sq-no=on,tsa-l1-no=on,pcid=off,rdseed=off,la57=off \
+-cpu EPYC-Turin,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,cet-ss=on,spec-ctrl=on,stibp=on,flush-l1d=on,ssbd=on,virt-ssbd=on,tsa-sq-no=on,tsa-l1-no=on,pcid=off,rdseed=off,la57=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 ed23d2bec43c1c3c0d434883bf5c070b69b9e13e..9b336f1bfb22cc55d973cb2be758e7a4e145a404 100644 (file)
--- 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-Turin,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,spec-ctrl=on,stibp=on,flush-l1d=on,ssbd=on,virt-ssbd=on,tsa-sq-no=on,tsa-l1-no=on,pcid=off,rdseed=off,la57=off \
+-cpu EPYC-Turin,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,cet-ss=on,spec-ctrl=on,stibp=on,flush-l1d=on,ssbd=on,virt-ssbd=on,tsa-sq-no=on,tsa-l1-no=on,pcid=off,rdseed=off,la57=off \
 -m size=219136k \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
 -overcommit mem-lock=off \