[PATCH v2 4/9] cpu_map: Add versioned Intel Cascadelake CPUs

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Signed-off-by: Jonathon Jongsma <jjongsma@xxxxxxxxxx>
---
 src/cpu_map/index.xml                         |  3 +
 src/cpu_map/meson.build                       |  3 +
 src/cpu_map/x86_Cascadelake-Server-v2.xml     | 93 +++++++++++++++++++
 src/cpu_map/x86_Cascadelake-Server-v4.xml     | 91 ++++++++++++++++++
 src/cpu_map/x86_Cascadelake-Server-v5.xml     | 92 ++++++++++++++++++
 .../x86_64-cpuid-Xeon-Platinum-8268-guest.xml |  9 +-
 .../x86_64-cpuid-Xeon-Platinum-8268-host.xml  |  9 +-
 .../x86_64-cpuid-Xeon-Platinum-9242-guest.xml |  9 +-
 .../x86_64-cpuid-Xeon-Platinum-9242-host.xml  |  9 +-
 .../x86_64-cpuid-Xeon-Platinum-9242-json.xml  |  9 +-
 ..._64-cpuid-baseline-Cascadelake+Icelake.xml |  9 +-
 ...-cpuid-baseline-Cooperlake+Cascadelake.xml |  9 +-
 ...6_64-cpuid-baseline-Cooperlake+Icelake.xml |  9 +-
 .../domaincapsdata/qemu_4.2.0-q35.x86_64.xml  |  1 +
 .../domaincapsdata/qemu_4.2.0-tcg.x86_64.xml  |  1 +
 tests/domaincapsdata/qemu_4.2.0.x86_64.xml    |  1 +
 .../domaincapsdata/qemu_5.0.0-q35.x86_64.xml  |  1 +
 .../domaincapsdata/qemu_5.0.0-tcg.x86_64.xml  |  1 +
 tests/domaincapsdata/qemu_5.0.0.x86_64.xml    |  1 +
 .../domaincapsdata/qemu_5.1.0-q35.x86_64.xml  |  2 +
 .../domaincapsdata/qemu_5.1.0-tcg.x86_64.xml  |  2 +
 tests/domaincapsdata/qemu_5.1.0.x86_64.xml    |  2 +
 .../domaincapsdata/qemu_5.2.0-q35.x86_64.xml  |  2 +
 .../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml  |  2 +
 tests/domaincapsdata/qemu_5.2.0.x86_64.xml    |  2 +
 .../domaincapsdata/qemu_6.0.0-q35.x86_64.xml  |  2 +
 .../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml  |  2 +
 tests/domaincapsdata/qemu_6.0.0.x86_64.xml    |  2 +
 .../domaincapsdata/qemu_6.1.0-q35.x86_64.xml  |  3 +
 .../domaincapsdata/qemu_6.1.0-tcg.x86_64.xml  |  3 +
 tests/domaincapsdata/qemu_6.1.0.x86_64.xml    |  3 +
 .../domaincapsdata/qemu_6.2.0-q35.x86_64.xml  |  3 +
 .../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml  |  3 +
 tests/domaincapsdata/qemu_6.2.0.x86_64.xml    |  3 +
 .../domaincapsdata/qemu_7.0.0-q35.x86_64.xml  |  3 +
 .../domaincapsdata/qemu_7.0.0-tcg.x86_64.xml  |  3 +
 tests/domaincapsdata/qemu_7.0.0.x86_64.xml    |  3 +
 .../domaincapsdata/qemu_7.1.0-q35.x86_64.xml  |  3 +
 .../domaincapsdata/qemu_7.1.0-tcg.x86_64.xml  |  3 +
 tests/domaincapsdata/qemu_7.1.0.x86_64.xml    |  3 +
 .../domaincapsdata/qemu_7.2.0-q35.x86_64.xml  |  3 +
 .../qemu_7.2.0-tcg.x86_64+hvf.xml             |  3 +
 .../domaincapsdata/qemu_7.2.0-tcg.x86_64.xml  |  3 +
 tests/domaincapsdata/qemu_7.2.0.x86_64.xml    |  3 +
 .../domaincapsdata/qemu_8.0.0-q35.x86_64.xml  |  3 +
 .../domaincapsdata/qemu_8.0.0-tcg.x86_64.xml  |  3 +
 tests/domaincapsdata/qemu_8.0.0.x86_64.xml    |  3 +
 .../domaincapsdata/qemu_8.1.0-q35.x86_64.xml  |  3 +
 .../domaincapsdata/qemu_8.1.0-tcg.x86_64.xml  |  3 +
 tests/domaincapsdata/qemu_8.1.0.x86_64.xml    |  3 +
 .../domaincapsdata/qemu_8.2.0-q35.x86_64.xml  |  3 +
 .../domaincapsdata/qemu_8.2.0-tcg.x86_64.xml  |  3 +
 tests/domaincapsdata/qemu_8.2.0.x86_64.xml    |  3 +
 53 files changed, 399 insertions(+), 54 deletions(-)
 create mode 100644 src/cpu_map/x86_Cascadelake-Server-v2.xml
 create mode 100644 src/cpu_map/x86_Cascadelake-Server-v4.xml
 create mode 100644 src/cpu_map/x86_Cascadelake-Server-v5.xml

diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml
index a4fe2ec781..ad6361ee51 100644
--- a/src/cpu_map/index.xml
+++ b/src/cpu_map/index.xml
@@ -53,6 +53,9 @@
     <include filename='x86_Skylake-Server-v5.xml'/>
     <include filename='x86_Cascadelake-Server.xml'/>
     <include filename='x86_Cascadelake-Server-noTSX.xml'/>
+    <include filename='x86_Cascadelake-Server-v2.xml'/>
+    <include filename='x86_Cascadelake-Server-v4.xml'/>
+    <include filename='x86_Cascadelake-Server-v5.xml'/>
     <include filename='x86_Icelake-Client.xml'/>
     <include filename='x86_Icelake-Client-noTSX.xml'/>
     <include filename='x86_Icelake-Server.xml'/>
diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build
index f6b95863b3..7a3712280a 100644
--- a/src/cpu_map/meson.build
+++ b/src/cpu_map/meson.build
@@ -29,6 +29,9 @@ cpumap_data = [
   'x86_Broadwell-noTSX.xml',
   'x86_Broadwell.xml',
   'x86_Cascadelake-Server-noTSX.xml',
+  'x86_Cascadelake-Server-v2.xml',
+  'x86_Cascadelake-Server-v4.xml',
+  'x86_Cascadelake-Server-v5.xml',
   'x86_Cascadelake-Server.xml',
   'x86_Conroe.xml',
   'x86_Cooperlake.xml',
diff --git a/src/cpu_map/x86_Cascadelake-Server-v2.xml b/src/cpu_map/x86_Cascadelake-Server-v2.xml
new file mode 100644
index 0000000000..5152f0390b
--- /dev/null
+++ b/src/cpu_map/x86_Cascadelake-Server-v2.xml
@@ -0,0 +1,93 @@
+<!-- extra info from qemu:
+  'model.level': '0xd'
+  'model.stepping': '6'
+  'model.xlevel': '0x80000008'
+  'model.model_id': 'Intel Xeon Processor (Cascadelake)'
+  'version.note': 'ARCH_CAPABILITIES'
+-->
+<cpus>
+  <model name='Cascadelake-Server-v2'>
+    <decode host='on' guest='on'/>
+    <signature family='6' model='85'/>
+    <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='avx2'/>
+    <feature name='avx512bw'/>
+    <feature name='avx512cd'/>
+    <feature name='avx512dq'/>
+    <feature name='avx512f'/>
+    <feature name='avx512vl'/>
+    <feature name='avx512vnni'/>
+    <feature name='bmi1'/>
+    <feature name='bmi2'/>
+    <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='fma'/>
+    <feature name='fpu'/>
+    <feature name='fsgsbase'/>
+    <feature name='fxsr'/>
+    <feature name='hle'/>
+    <feature name='ibrs-all'/>
+    <feature name='invpcid'/>
+    <feature name='lahf_lm'/>
+    <feature name='lm'/>
+    <feature name='mca'/>
+    <feature name='mce'/>
+    <feature name='mds-no'/>
+    <feature name='mmx'/>
+    <feature name='movbe'/>
+    <feature name='msr'/>
+    <feature name='mtrr'/>
+    <feature name='nx'/>
+    <feature name='pae'/>
+    <feature name='pat'/>
+    <feature name='pcid'/>
+    <feature name='pclmuldq'/>
+    <feature name='pdpe1gb'/>
+    <feature name='pge'/>
+    <feature name='pku'/>
+    <feature name='pni'/>
+    <feature name='popcnt'/>
+    <feature name='pse'/>
+    <feature name='pse36'/>
+    <feature name='rdctl-no'/>
+    <feature name='rdrand'/>
+    <feature name='rdseed'/>
+    <feature name='rdtscp'/>
+    <feature name='rtm'/>
+    <feature name='sep'/>
+    <feature name='skip-l1dfl-vmentry'/>
+    <feature name='smap'/>
+    <feature name='smep'/>
+    <feature name='spec-ctrl'/>
+    <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='vme'/>
+    <feature name='x2apic'/>
+    <feature name='xgetbv1'/>
+    <feature name='xsave'/>
+    <feature name='xsavec'/>
+    <feature name='xsaveopt'/>
+  </model>
+</cpus>
diff --git a/src/cpu_map/x86_Cascadelake-Server-v4.xml b/src/cpu_map/x86_Cascadelake-Server-v4.xml
new file mode 100644
index 0000000000..b2173d1308
--- /dev/null
+++ b/src/cpu_map/x86_Cascadelake-Server-v4.xml
@@ -0,0 +1,91 @@
+<!-- extra info from qemu:
+  'model.level': '0xd'
+  'model.stepping': '6'
+  'model.xlevel': '0x80000008'
+  'model.model_id': 'Intel Xeon Processor (Cascadelake)'
+  'version.note': 'ARCH_CAPABILITIES, no TSX'
+-->
+<cpus>
+  <model name='Cascadelake-Server-v4'>
+    <decode host='on' guest='on'/>
+    <signature family='6' model='85'/>
+    <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='avx2'/>
+    <feature name='avx512bw'/>
+    <feature name='avx512cd'/>
+    <feature name='avx512dq'/>
+    <feature name='avx512f'/>
+    <feature name='avx512vl'/>
+    <feature name='avx512vnni'/>
+    <feature name='bmi1'/>
+    <feature name='bmi2'/>
+    <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='fma'/>
+    <feature name='fpu'/>
+    <feature name='fsgsbase'/>
+    <feature name='fxsr'/>
+    <feature name='ibrs-all'/>
+    <feature name='invpcid'/>
+    <feature name='lahf_lm'/>
+    <feature name='lm'/>
+    <feature name='mca'/>
+    <feature name='mce'/>
+    <feature name='mds-no'/>
+    <feature name='mmx'/>
+    <feature name='movbe'/>
+    <feature name='msr'/>
+    <feature name='mtrr'/>
+    <feature name='nx'/>
+    <feature name='pae'/>
+    <feature name='pat'/>
+    <feature name='pcid'/>
+    <feature name='pclmuldq'/>
+    <feature name='pdpe1gb'/>
+    <feature name='pge'/>
+    <feature name='pku'/>
+    <feature name='pni'/>
+    <feature name='popcnt'/>
+    <feature name='pse'/>
+    <feature name='pse36'/>
+    <feature name='rdctl-no'/>
+    <feature name='rdrand'/>
+    <feature name='rdseed'/>
+    <feature name='rdtscp'/>
+    <feature name='sep'/>
+    <feature name='skip-l1dfl-vmentry'/>
+    <feature name='smap'/>
+    <feature name='smep'/>
+    <feature name='spec-ctrl'/>
+    <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='vme'/>
+    <feature name='x2apic'/>
+    <feature name='xgetbv1'/>
+    <feature name='xsave'/>
+    <feature name='xsavec'/>
+    <feature name='xsaveopt'/>
+  </model>
+</cpus>
diff --git a/src/cpu_map/x86_Cascadelake-Server-v5.xml b/src/cpu_map/x86_Cascadelake-Server-v5.xml
new file mode 100644
index 0000000000..f5d15cadb6
--- /dev/null
+++ b/src/cpu_map/x86_Cascadelake-Server-v5.xml
@@ -0,0 +1,92 @@
+<!-- extra info from qemu:
+  'model.level': '0xd'
+  'model.stepping': '6'
+  'model.xlevel': '0x80000008'
+  'model.model_id': 'Intel Xeon Processor (Cascadelake)'
+  'version.note': 'ARCH_CAPABILITIES, EPT switching, XSAVES, no TSX'
+-->
+<cpus>
+  <model name='Cascadelake-Server-v5'>
+    <decode host='on' guest='on'/>
+    <signature family='6' model='85'/>
+    <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='avx2'/>
+    <feature name='avx512bw'/>
+    <feature name='avx512cd'/>
+    <feature name='avx512dq'/>
+    <feature name='avx512f'/>
+    <feature name='avx512vl'/>
+    <feature name='avx512vnni'/>
+    <feature name='bmi1'/>
+    <feature name='bmi2'/>
+    <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='fma'/>
+    <feature name='fpu'/>
+    <feature name='fsgsbase'/>
+    <feature name='fxsr'/>
+    <feature name='ibrs-all'/>
+    <feature name='invpcid'/>
+    <feature name='lahf_lm'/>
+    <feature name='lm'/>
+    <feature name='mca'/>
+    <feature name='mce'/>
+    <feature name='mds-no'/>
+    <feature name='mmx'/>
+    <feature name='movbe'/>
+    <feature name='msr'/>
+    <feature name='mtrr'/>
+    <feature name='nx'/>
+    <feature name='pae'/>
+    <feature name='pat'/>
+    <feature name='pcid'/>
+    <feature name='pclmuldq'/>
+    <feature name='pdpe1gb'/>
+    <feature name='pge'/>
+    <feature name='pku'/>
+    <feature name='pni'/>
+    <feature name='popcnt'/>
+    <feature name='pse'/>
+    <feature name='pse36'/>
+    <feature name='rdctl-no'/>
+    <feature name='rdrand'/>
+    <feature name='rdseed'/>
+    <feature name='rdtscp'/>
+    <feature name='sep'/>
+    <feature name='skip-l1dfl-vmentry'/>
+    <feature name='smap'/>
+    <feature name='smep'/>
+    <feature name='spec-ctrl'/>
+    <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='vme'/>
+    <feature name='x2apic'/>
+    <feature name='xgetbv1'/>
+    <feature name='xsave'/>
+    <feature name='xsavec'/>
+    <feature name='xsaveopt'/>
+    <feature name='xsaves'/>
+  </model>
+</cpus>
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 8fd1611842..9cd04b3f9a 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-guest.xml
@@ -1,5 +1,5 @@
 <cpu mode='custom' match='exact'>
-  <model fallback='forbid'>Cascadelake-Server</model>
+  <model fallback='forbid'>Cascadelake-Server-v2</model>
   <vendor>Intel</vendor>
   <feature policy='require' name='ds'/>
   <feature policy='require' name='acpi'/>
@@ -20,19 +20,14 @@
   <feature policy='require' name='osxsave'/>
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='cmt'/>
+  <feature policy='require' name='mpx'/>
   <feature policy='require' name='intel-pt'/>
-  <feature policy='require' name='pku'/>
   <feature policy='require' name='ospke'/>
   <feature policy='require' name='md-clear'/>
   <feature policy='require' name='stibp'/>
   <feature policy='require' name='flush-l1d'/>
-  <feature policy='require' name='arch-capabilities'/>
   <feature policy='require' name='xsaves'/>
   <feature policy='require' name='mbm_total'/>
   <feature policy='require' name='mbm_local'/>
   <feature policy='require' name='invtsc'/>
-  <feature policy='require' name='rdctl-no'/>
-  <feature policy='require' name='ibrs-all'/>
-  <feature policy='require' name='skip-l1dfl-vmentry'/>
-  <feature policy='require' name='mds-no'/>
 </cpu>
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 7055c72112..b143b792f6 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-host.xml
@@ -1,6 +1,6 @@
 <cpu>
   <arch>x86_64</arch>
-  <model>Cascadelake-Server</model>
+  <model>Cascadelake-Server-v2</model>
   <vendor>Intel</vendor>
   <signature family='6' model='85' stepping='6'/>
   <feature name='ds'/>
@@ -22,19 +22,14 @@
   <feature name='osxsave'/>
   <feature name='tsc_adjust'/>
   <feature name='cmt'/>
+  <feature name='mpx'/>
   <feature name='intel-pt'/>
-  <feature name='pku'/>
   <feature name='ospke'/>
   <feature name='md-clear'/>
   <feature name='stibp'/>
   <feature name='flush-l1d'/>
-  <feature name='arch-capabilities'/>
   <feature name='xsaves'/>
   <feature name='mbm_total'/>
   <feature name='mbm_local'/>
   <feature name='invtsc'/>
-  <feature name='rdctl-no'/>
-  <feature name='ibrs-all'/>
-  <feature name='skip-l1dfl-vmentry'/>
-  <feature name='mds-no'/>
 </cpu>
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 88c2d84d65..d14d8a325f 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-guest.xml
@@ -1,5 +1,5 @@
 <cpu mode='custom' match='exact'>
-  <model fallback='forbid'>Cascadelake-Server</model>
+  <model fallback='forbid'>Cascadelake-Server-v2</model>
   <vendor>Intel</vendor>
   <feature policy='require' name='ds'/>
   <feature policy='require' name='acpi'/>
@@ -20,20 +20,15 @@
   <feature policy='require' name='osxsave'/>
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='cmt'/>
+  <feature policy='require' name='mpx'/>
   <feature policy='require' name='intel-pt'/>
-  <feature policy='require' name='pku'/>
   <feature policy='require' name='ospke'/>
   <feature policy='require' name='md-clear'/>
   <feature policy='require' name='stibp'/>
   <feature policy='require' name='flush-l1d'/>
-  <feature policy='require' name='arch-capabilities'/>
   <feature policy='require' name='xsaves'/>
   <feature policy='require' name='mbm_total'/>
   <feature policy='require' name='mbm_local'/>
   <feature policy='require' name='invtsc'/>
-  <feature policy='require' name='rdctl-no'/>
-  <feature policy='require' name='ibrs-all'/>
-  <feature policy='require' name='skip-l1dfl-vmentry'/>
-  <feature policy='require' name='mds-no'/>
   <feature policy='require' name='tsx-ctrl'/>
 </cpu>
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 5e59520919..332507b4c6 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-host.xml
@@ -1,6 +1,6 @@
 <cpu>
   <arch>x86_64</arch>
-  <model>Cascadelake-Server</model>
+  <model>Cascadelake-Server-v2</model>
   <vendor>Intel</vendor>
   <signature family='6' model='85' stepping='7'/>
   <feature name='ds'/>
@@ -22,20 +22,15 @@
   <feature name='osxsave'/>
   <feature name='tsc_adjust'/>
   <feature name='cmt'/>
+  <feature name='mpx'/>
   <feature name='intel-pt'/>
-  <feature name='pku'/>
   <feature name='ospke'/>
   <feature name='md-clear'/>
   <feature name='stibp'/>
   <feature name='flush-l1d'/>
-  <feature name='arch-capabilities'/>
   <feature name='xsaves'/>
   <feature name='mbm_total'/>
   <feature name='mbm_local'/>
   <feature name='invtsc'/>
-  <feature name='rdctl-no'/>
-  <feature name='ibrs-all'/>
-  <feature name='skip-l1dfl-vmentry'/>
-  <feature name='mds-no'/>
   <feature name='tsx-ctrl'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-json.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-json.xml
index ac0e520767..035959858e 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-json.xml
@@ -1,22 +1,17 @@
 <cpu mode='custom' match='exact'>
-  <model fallback='forbid'>Cascadelake-Server</model>
+  <model fallback='forbid'>Cascadelake-Server-v2</model>
   <vendor>Intel</vendor>
   <feature policy='require' name='ss'/>
   <feature policy='require' name='vmx'/>
   <feature policy='require' name='hypervisor'/>
   <feature policy='require' name='tsc_adjust'/>
+  <feature policy='require' name='mpx'/>
   <feature policy='require' name='umip'/>
-  <feature policy='require' name='pku'/>
   <feature policy='require' name='md-clear'/>
   <feature policy='require' name='stibp'/>
-  <feature policy='require' name='arch-capabilities'/>
   <feature policy='require' name='xsaves'/>
   <feature policy='require' name='ibpb'/>
   <feature policy='require' name='amd-ssbd'/>
-  <feature policy='require' name='rdctl-no'/>
-  <feature policy='require' name='ibrs-all'/>
-  <feature policy='require' name='skip-l1dfl-vmentry'/>
-  <feature policy='require' name='mds-no'/>
   <feature policy='require' name='pschange-mc-no'/>
   <feature policy='require' name='tsx-ctrl'/>
   <feature policy='require' name='vmx-ins-outs'/>
diff --git a/tests/cputestdata/x86_64-cpuid-baseline-Cascadelake+Icelake.xml b/tests/cputestdata/x86_64-cpuid-baseline-Cascadelake+Icelake.xml
index 071c799ba2..3e1f526c7b 100644
--- a/tests/cputestdata/x86_64-cpuid-baseline-Cascadelake+Icelake.xml
+++ b/tests/cputestdata/x86_64-cpuid-baseline-Cascadelake+Icelake.xml
@@ -1,15 +1,12 @@
 <cpu mode='custom' match='exact'>
-  <model fallback='allow'>Cascadelake-Server</model>
+  <model fallback='allow'>Cascadelake-Server-v2</model>
   <vendor>Intel</vendor>
   <feature policy='require' name='ss'/>
   <feature policy='require' name='hypervisor'/>
   <feature policy='require' name='tsc_adjust'/>
+  <feature policy='require' name='mpx'/>
   <feature policy='require' name='umip'/>
-  <feature policy='require' name='pku'/>
   <feature policy='require' name='stibp'/>
-  <feature policy='require' name='arch-capabilities'/>
   <feature policy='require' name='xsaves'/>
-  <feature policy='require' name='rdctl-no'/>
-  <feature policy='require' name='ibrs-all'/>
-  <feature policy='require' name='skip-l1dfl-vmentry'/>
+  <feature policy='disable' name='mds-no'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Cascadelake.xml b/tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Cascadelake.xml
index f9e9c476b5..010071e634 100644
--- a/tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Cascadelake.xml
+++ b/tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Cascadelake.xml
@@ -1,22 +1,17 @@
 <cpu mode='custom' match='exact'>
-  <model fallback='allow'>Cascadelake-Server</model>
+  <model fallback='allow'>Cascadelake-Server-v2</model>
   <vendor>Intel</vendor>
   <feature policy='require' name='ss'/>
   <feature policy='require' name='vmx'/>
   <feature policy='require' name='hypervisor'/>
   <feature policy='require' name='tsc_adjust'/>
+  <feature policy='require' name='mpx'/>
   <feature policy='require' name='umip'/>
-  <feature policy='require' name='pku'/>
   <feature policy='require' name='md-clear'/>
   <feature policy='require' name='stibp'/>
-  <feature policy='require' name='arch-capabilities'/>
   <feature policy='require' name='xsaves'/>
   <feature policy='require' name='ibpb'/>
   <feature policy='require' name='amd-ssbd'/>
-  <feature policy='require' name='rdctl-no'/>
-  <feature policy='require' name='ibrs-all'/>
-  <feature policy='require' name='skip-l1dfl-vmentry'/>
-  <feature policy='require' name='mds-no'/>
   <feature policy='require' name='pschange-mc-no'/>
   <feature policy='require' name='tsx-ctrl'/>
   <feature policy='require' name='vmx-ins-outs'/>
diff --git a/tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Icelake.xml b/tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Icelake.xml
index 071c799ba2..3e1f526c7b 100644
--- a/tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Icelake.xml
+++ b/tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Icelake.xml
@@ -1,15 +1,12 @@
 <cpu mode='custom' match='exact'>
-  <model fallback='allow'>Cascadelake-Server</model>
+  <model fallback='allow'>Cascadelake-Server-v2</model>
   <vendor>Intel</vendor>
   <feature policy='require' name='ss'/>
   <feature policy='require' name='hypervisor'/>
   <feature policy='require' name='tsc_adjust'/>
+  <feature policy='require' name='mpx'/>
   <feature policy='require' name='umip'/>
-  <feature policy='require' name='pku'/>
   <feature policy='require' name='stibp'/>
-  <feature policy='require' name='arch-capabilities'/>
   <feature policy='require' name='xsaves'/>
-  <feature policy='require' name='rdctl-no'/>
-  <feature policy='require' name='ibrs-all'/>
-  <feature policy='require' name='skip-l1dfl-vmentry'/>
+  <feature policy='disable' name='mds-no'/>
 </cpu>
diff --git a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
index 152f201ff9..fa42d6eca4 100644
--- a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
@@ -174,6 +174,7 @@
       <model usable='no' vendor='AMD'>EPYC</model>
       <model usable='no' vendor='Hygon'>Dhyana</model>
       <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server</model>
       <model usable='yes' vendor='Intel'>Broadwell-noTSX-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml
index cea9377cfe..1efdd0aa97 100644
--- a/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml
@@ -119,6 +119,7 @@
       <model usable='no' vendor='AMD'>EPYC</model>
       <model usable='no' vendor='Hygon'>Dhyana</model>
       <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
index 8b7cf44d6d..d83a7f112d 100644
--- a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
@@ -173,6 +173,7 @@
       <model usable='no' vendor='AMD'>EPYC</model>
       <model usable='no' vendor='Hygon'>Dhyana</model>
       <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server</model>
       <model usable='yes' vendor='Intel'>Broadwell-noTSX-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
index 60f65fdffe..5de4260314 100644
--- a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
@@ -177,6 +177,7 @@
       <model usable='no' vendor='Hygon'>Dhyana</model>
       <model usable='no' vendor='Intel'>Cooperlake</model>
       <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server</model>
       <model usable='yes' vendor='Intel'>Broadwell-noTSX-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml
index 01906a6277..4eb1986759 100644
--- a/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml
@@ -122,6 +122,7 @@
       <model usable='no' vendor='Hygon'>Dhyana</model>
       <model usable='no' vendor='Intel'>Cooperlake</model>
       <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
index 12a5d8f66e..f84b220e8e 100644
--- a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
@@ -176,6 +176,7 @@
       <model usable='no' vendor='Hygon'>Dhyana</model>
       <model usable='no' vendor='Intel'>Cooperlake</model>
       <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server</model>
       <model usable='yes' vendor='Intel'>Broadwell-noTSX-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml
index b12748fdd0..cb94e1e1c8 100644
--- a/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml
@@ -111,6 +111,8 @@
       <model usable='yes' vendor='Hygon'>Dhyana</model>
       <model usable='no' vendor='Intel'>Cooperlake</model>
       <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml
index 484c5e96d5..3f30474a73 100644
--- a/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml
@@ -123,6 +123,8 @@
       <model usable='no' vendor='Hygon'>Dhyana</model>
       <model usable='no' vendor='Intel'>Cooperlake</model>
       <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_5.1.0.x86_64.xml b/tests/domaincapsdata/qemu_5.1.0.x86_64.xml
index bf636b4b7f..eaad6e8cca 100644
--- a/tests/domaincapsdata/qemu_5.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.1.0.x86_64.xml
@@ -110,6 +110,8 @@
       <model usable='yes' vendor='Hygon'>Dhyana</model>
       <model usable='no' vendor='Intel'>Cooperlake</model>
       <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
index 3a21985040..c2043d7f08 100644
--- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
@@ -111,6 +111,8 @@
       <model usable='yes' vendor='Hygon'>Dhyana</model>
       <model usable='no' vendor='Intel'>Cooperlake</model>
       <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
index fcff1c2748..7c9b66939a 100644
--- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
@@ -123,6 +123,8 @@
       <model usable='no' vendor='Hygon'>Dhyana</model>
       <model usable='no' vendor='Intel'>Cooperlake</model>
       <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
index fb3d0d9509..d86f352621 100644
--- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
@@ -110,6 +110,8 @@
       <model usable='yes' vendor='Hygon'>Dhyana</model>
       <model usable='no' vendor='Intel'>Cooperlake</model>
       <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
index d5ce19b1ab..0ff9c7eba2 100644
--- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
@@ -113,6 +113,8 @@
       <model usable='yes' vendor='Hygon'>Dhyana</model>
       <model usable='no' vendor='Intel'>Cooperlake</model>
       <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
index b50ea993ae..78eb7fcbc6 100644
--- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
@@ -126,6 +126,8 @@
       <model usable='no' vendor='Hygon'>Dhyana</model>
       <model usable='no' vendor='Intel'>Cooperlake</model>
       <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
index 927ac1a36a..dce08a5a1c 100644
--- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
@@ -112,6 +112,8 @@
       <model usable='yes' vendor='Hygon'>Dhyana</model>
       <model usable='no' vendor='Intel'>Cooperlake</model>
       <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
index 7244db6d2a..5d19c3a90b 100644
--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
@@ -116,6 +116,9 @@
       <model usable='yes' vendor='Hygon'>Dhyana</model>
       <model usable='no' vendor='Intel'>Cooperlake</model>
       <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v5</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
index 4628fba179..1b4cc4864f 100644
--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
@@ -128,6 +128,9 @@
       <model usable='no' vendor='Hygon'>Dhyana</model>
       <model usable='no' vendor='Intel'>Cooperlake</model>
       <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v5</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
index 9e3c5cd9f1..31f3758a55 100644
--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
@@ -115,6 +115,9 @@
       <model usable='yes' vendor='Hygon'>Dhyana</model>
       <model usable='no' vendor='Intel'>Cooperlake</model>
       <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v5</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
index 647c455cff..5576cdf6c8 100644
--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
@@ -116,6 +116,9 @@
       <model usable='yes' vendor='Hygon'>Dhyana</model>
       <model usable='no' vendor='Intel'>Cooperlake</model>
       <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v5</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
index 39d4b24087..fd9d5579b5 100644
--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
@@ -130,6 +130,9 @@
       <model usable='no' vendor='Hygon'>Dhyana</model>
       <model usable='no' vendor='Intel'>Cooperlake</model>
       <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v5</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
index 9b58adbf79..f0353dd8f6 100644
--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
@@ -115,6 +115,9 @@
       <model usable='yes' vendor='Hygon'>Dhyana</model>
       <model usable='no' vendor='Intel'>Cooperlake</model>
       <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v5</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
index 4f11b288ec..620f0fb599 100644
--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
@@ -117,6 +117,9 @@
       <model usable='yes' vendor='Hygon'>Dhyana</model>
       <model usable='no' vendor='Intel'>Cooperlake</model>
       <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v5</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
index b235b3ab7d..3f02ef2c6a 100644
--- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
@@ -131,6 +131,9 @@
       <model usable='no' vendor='Hygon'>Dhyana</model>
       <model usable='no' vendor='Intel'>Cooperlake</model>
       <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v5</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
index 16b0bc952f..dac66dd7db 100644
--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
@@ -116,6 +116,9 @@
       <model usable='yes' vendor='Hygon'>Dhyana</model>
       <model usable='no' vendor='Intel'>Cooperlake</model>
       <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v5</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
index 4f697b85fb..b4b77472a3 100644
--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
@@ -116,6 +116,9 @@
       <model usable='yes' vendor='Hygon'>Dhyana</model>
       <model usable='no' vendor='Intel'>Cooperlake</model>
       <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v5</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
index 7ef47f9618..4f6bd7150d 100644
--- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
@@ -129,6 +129,9 @@
       <model usable='no' vendor='Hygon'>Dhyana</model>
       <model usable='no' vendor='Intel'>Cooperlake</model>
       <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v5</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
index 035335fa43..4fc18217b8 100644
--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
@@ -115,6 +115,9 @@
       <model usable='yes' vendor='Hygon'>Dhyana</model>
       <model usable='no' vendor='Intel'>Cooperlake</model>
       <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v5</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
index 1a28924082..6980a3bb98 100644
--- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
@@ -121,6 +121,9 @@
       <model usable='yes' vendor='Hygon'>Dhyana</model>
       <model usable='no' vendor='Intel'>Cooperlake</model>
       <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v5</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml
index defb547029..0b4eef2e3d 100644
--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml
@@ -118,6 +118,9 @@
       <model usable='no' vendor='Hygon'>Dhyana</model>
       <model usable='no' vendor='Intel'>Cooperlake</model>
       <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v5</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
index defb547029..0b4eef2e3d 100644
--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
@@ -118,6 +118,9 @@
       <model usable='no' vendor='Hygon'>Dhyana</model>
       <model usable='no' vendor='Intel'>Cooperlake</model>
       <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v5</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
index cbb99f747e..bbca4704a9 100644
--- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
@@ -120,6 +120,9 @@
       <model usable='yes' vendor='Hygon'>Dhyana</model>
       <model usable='no' vendor='Intel'>Cooperlake</model>
       <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v5</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
index 52b1f41b8e..2271fd3b9a 100644
--- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
@@ -122,6 +122,9 @@
       <model usable='yes' vendor='Hygon'>Dhyana</model>
       <model usable='no' vendor='Intel'>Cooperlake</model>
       <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v5</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
index 6b778d16be..57265614a3 100644
--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
@@ -123,6 +123,9 @@
       <model usable='no' vendor='Hygon'>Dhyana</model>
       <model usable='no' vendor='Intel'>Cooperlake</model>
       <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v5</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
index cbd557b0f1..122a363d29 100644
--- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
@@ -121,6 +121,9 @@
       <model usable='yes' vendor='Hygon'>Dhyana</model>
       <model usable='no' vendor='Intel'>Cooperlake</model>
       <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v5</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
index af8cf93f0a..c80f817963 100644
--- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
@@ -128,6 +128,9 @@
       <model usable='yes' vendor='Hygon'>Dhyana</model>
       <model usable='no' vendor='Intel'>Cooperlake</model>
       <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v5</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
index 8edbcf5e97..4806b18901 100644
--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
@@ -129,6 +129,9 @@
       <model usable='no' vendor='Hygon'>Dhyana</model>
       <model usable='no' vendor='Intel'>Cooperlake</model>
       <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v5</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
index c048ca0a7c..7a61de39c3 100644
--- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
@@ -127,6 +127,9 @@
       <model usable='yes' vendor='Hygon'>Dhyana</model>
       <model usable='no' vendor='Intel'>Cooperlake</model>
       <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v5</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
index d9552ecf2b..cd068f19e2 100644
--- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
@@ -129,6 +129,9 @@
       <model usable='yes' vendor='Hygon'>Dhyana</model>
       <model usable='no' vendor='Intel'>Cooperlake</model>
       <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v5</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
index fd65a4479a..5416f5e6b1 100644
--- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
@@ -128,6 +128,9 @@
       <model usable='no' vendor='Hygon'>Dhyana</model>
       <model usable='no' vendor='Intel'>Cooperlake</model>
       <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v5</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
index d211300033..c11ffd3015 100644
--- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
@@ -128,6 +128,9 @@
       <model usable='yes' vendor='Hygon'>Dhyana</model>
       <model usable='no' vendor='Intel'>Cooperlake</model>
       <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v5</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
       <model usable='no' vendor='Intel'>Cascadelake-Server</model>
       <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
-- 
2.41.0
_______________________________________________
Devel mailing list -- devel@xxxxxxxxxxxxxxxxx
To unsubscribe send an email to devel-leave@xxxxxxxxxxxxxxxxx




[Index of Archives]     [Virt Tools]     [Libvirt Users]     [Lib OS Info]     [Fedora Users]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]     [Fedora Tools]

  Powered by Linux