Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
---
Notes:
Version 2:
- Cascadelake-Server-v3 defined as Cascadelake-Server-noTSX
- <decode host='on' guest='off'/> for all versioned models
- canonical CPU models in domain capabilities
src/cpu_map/index.xml | 5 +
src/cpu_map/meson.build | 5 +
src/cpu_map/x86_Cascadelake-Server-v1.xml | 6 +
src/cpu_map/x86_Cascadelake-Server-v2.xml | 157 +++++++++++++++++
src/cpu_map/x86_Cascadelake-Server-v3.xml | 6 +
src/cpu_map/x86_Cascadelake-Server-v4.xml | 156 +++++++++++++++++
src/cpu_map/x86_Cascadelake-Server-v5.xml | 158 ++++++++++++++++++
.../x86_64-cpuid-Xeon-Platinum-8268-host.xml | 2 +-
.../x86_64-cpuid-Xeon-Platinum-9242-host.xml | 2 +-
.../domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 67 +++++++-
.../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 111 +++++++++++-
tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 67 +++++++-
.../domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 67 +++++++-
.../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 111 +++++++++++-
tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 67 +++++++-
.../domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 82 ++++++++-
.../domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 139 ++++++++++++++-
tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 82 ++++++++-
.../domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 82 ++++++++-
.../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 139 ++++++++++++++-
tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 82 ++++++++-
.../domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 82 ++++++++-
.../domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 139 ++++++++++++++-
tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 82 ++++++++-
.../domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 82 ++++++++-
.../domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 139 ++++++++++++++-
tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 82 ++++++++-
.../domaincapsdata/qemu_7.2.0-q35.x86_64.xml | 82 ++++++++-
.../qemu_7.2.0-tcg.x86_64+hvf.xml | 119 ++++++++++++-
.../domaincapsdata/qemu_7.2.0-tcg.x86_64.xml | 119 ++++++++++++-
tests/domaincapsdata/qemu_7.2.0.x86_64.xml | 82 ++++++++-
.../domaincapsdata/qemu_8.0.0-q35.x86_64.xml | 82 ++++++++-
.../domaincapsdata/qemu_8.0.0-tcg.x86_64.xml | 119 ++++++++++++-
tests/domaincapsdata/qemu_8.0.0.x86_64.xml | 82 ++++++++-
.../domaincapsdata/qemu_8.1.0-q35.x86_64.xml | 83 ++++++++-
.../domaincapsdata/qemu_8.1.0-tcg.x86_64.xml | 93 ++++++++++-
tests/domaincapsdata/qemu_8.1.0.x86_64.xml | 83 ++++++++-
.../domaincapsdata/qemu_8.2.0-q35.x86_64.xml | 83 ++++++++-
.../domaincapsdata/qemu_8.2.0-tcg.x86_64.xml | 93 ++++++++++-
tests/domaincapsdata/qemu_8.2.0.x86_64.xml | 83 ++++++++-
.../domaincapsdata/qemu_9.0.0-q35.x86_64.xml | 83 ++++++++-
.../domaincapsdata/qemu_9.0.0-tcg.x86_64.xml | 88 +++++++++-
tests/domaincapsdata/qemu_9.0.0.x86_64.xml | 83 ++++++++-
.../domaincapsdata/qemu_9.1.0-q35.x86_64.xml | 83 ++++++++-
.../domaincapsdata/qemu_9.1.0-tcg.x86_64.xml | 88 +++++++++-
tests/domaincapsdata/qemu_9.1.0.x86_64.xml | 83 ++++++++-
.../domaincapsdata/qemu_9.2.0-q35.x86_64.xml | 83 ++++++++-
.../domaincapsdata/qemu_9.2.0-tcg.x86_64.xml | 88 +++++++++-
tests/domaincapsdata/qemu_9.2.0.x86_64.xml | 83 ++++++++-
49 files changed, 4082 insertions(+), 82 deletions(-)
create mode 100644 src/cpu_map/x86_Cascadelake-Server-v1.xml
create mode 100644 src/cpu_map/x86_Cascadelake-Server-v2.xml
create mode 100644 src/cpu_map/x86_Cascadelake-Server-v3.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 be39f356f1..e874a45b15 100644
--- a/src/cpu_map/index.xml
+++ b/src/cpu_map/index.xml
@@ -53,6 +53,11 @@
<include filename='x86_Skylake-Server-noTSX-IBRS.xml'/>
<include filename='x86_Cascadelake-Server.xml'/>
<include filename='x86_Cascadelake-Server-noTSX.xml'/>
+ <include filename='x86_Cascadelake-Server-v1.xml'/>
+ <include filename='x86_Cascadelake-Server-v2.xml'/>
+ <include filename='x86_Cascadelake-Server-v3.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 87617101aa..55f9e99283 100644
--- a/src/cpu_map/meson.build
+++ b/src/cpu_map/meson.build
@@ -29,6 +29,11 @@ cpumap_data = [
'x86_Broadwell-noTSX.xml',
'x86_Broadwell.xml',
'x86_Cascadelake-Server-noTSX.xml',
+ 'x86_Cascadelake-Server-v1.xml',
+ 'x86_Cascadelake-Server-v2.xml',
+ 'x86_Cascadelake-Server-v3.xml',
+ 'x86_Cascadelake-Server-v4.xml',
+ 'x86_Cascadelake-Server-v5.xml',
'x86_Cascadelake-Server.xml',
'x86_Conroe.xml',
'x86_Cooperlake-v1.xml',
diff --git a/src/cpu_map/x86_Cascadelake-Server-v1.xml b/src/cpu_map/x86_Cascadelake-Server-v1.xml
new file mode 100644
index 0000000000..fd89fbace9
--- /dev/null
+++ b/src/cpu_map/x86_Cascadelake-Server-v1.xml
@@ -0,0 +1,6 @@
+<cpus>
+ <model name='Cascadelake-Server-v1'>
+ <decode host='on' guest='off'/>
+ <model name='Cascadelake-Server'/>
+ </model>
+</cpus>
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..75b3d3ef66
--- /dev/null
+++ b/src/cpu_map/x86_Cascadelake-Server-v2.xml
@@ -0,0 +1,157 @@
+<cpus>
+ <model name='Cascadelake-Server-v2'>
+ <decode host='on' guest='off'/>
+ <signature family='6' model='85' stepping='5-7'/>
+ <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='vmx-activity-hlt'/>
+ <feature name='vmx-apicv-register'/>
+ <feature name='vmx-apicv-vid'/>
+ <feature name='vmx-apicv-x2apic'/>
+ <feature name='vmx-apicv-xapic'/>
+ <feature name='vmx-cr3-load-noexit'/>
+ <feature name='vmx-cr3-store-noexit'/>
+ <feature name='vmx-cr8-load-exit'/>
+ <feature name='vmx-cr8-store-exit'/>
+ <feature name='vmx-desc-exit'/>
+ <feature name='vmx-entry-ia32e-mode'/>
+ <feature name='vmx-entry-load-efer'/>
+ <feature name='vmx-entry-load-pat'/>
+ <feature name='vmx-entry-load-perf-global-ctrl'/>
+ <feature name='vmx-entry-noload-debugctl'/>
+ <feature name='vmx-ept'/>
+ <feature name='vmx-ept-1gb'/>
+ <feature name='vmx-ept-2mb'/>
+ <feature name='vmx-ept-execonly'/>
+ <feature name='vmx-eptad'/>
+ <feature name='vmx-exit-ack-intr'/>
+ <feature name='vmx-exit-load-efer'/>
+ <feature name='vmx-exit-load-pat'/>
+ <feature name='vmx-exit-load-perf-global-ctrl'/>
+ <feature name='vmx-exit-nosave-debugctl'/>
+ <feature name='vmx-exit-save-efer'/>
+ <feature name='vmx-exit-save-pat'/>
+ <feature name='vmx-exit-save-preemption-timer'/>
+ <feature name='vmx-flexpriority'/>
+ <feature name='vmx-hlt-exit'/>
+ <feature name='vmx-ins-outs'/>
+ <feature name='vmx-intr-exit'/>
+ <feature name='vmx-invept'/>
+ <feature name='vmx-invept-all-context'/>
+ <feature name='vmx-invept-single-context'/>
+ <feature name='vmx-invlpg-exit'/>
+ <feature name='vmx-invpcid-exit'/>
+ <feature name='vmx-invvpid-all-context'/>
+ <feature name='vmx-invvpid-single-addr'/>
+ <feature name='vmx-invvpid-single-context-noglobals'/>
+ <feature name='vmx-io-bitmap'/>
+ <feature name='vmx-io-exit'/>
+ <feature name='vmx-monitor-exit'/>
+ <feature name='vmx-movdr-exit'/>
+ <feature name='vmx-msr-bitmap'/>
+ <feature name='vmx-mtf'/>
+ <feature name='vmx-mwait-exit'/>
+ <feature name='vmx-nmi-exit'/>
+ <feature name='vmx-page-walk-4'/>
+ <feature name='vmx-pause-exit'/>
+ <feature name='vmx-pml'/>
+ <feature name='vmx-posted-intr'/>
+ <feature name='vmx-preemption-timer'/>
+ <feature name='vmx-rdpmc-exit'/>
+ <feature name='vmx-rdrand-exit'/>
+ <feature name='vmx-rdseed-exit'/>
+ <feature name='vmx-rdtsc-exit'/>
+ <feature name='vmx-rdtscp-exit'/>
+ <feature name='vmx-secondary-ctls'/>
+ <feature name='vmx-shadow-vmcs'/>
+ <feature name='vmx-store-lma'/>
+ <feature name='vmx-true-ctls'/>
+ <feature name='vmx-tsc-offset'/>
+ <feature name='vmx-unrestricted-guest'/>
+ <feature name='vmx-vintr-pending'/>
+ <feature name='vmx-vmfunc'/>
+ <feature name='vmx-vmwrite-vmexit-fields'/>
+ <feature name='vmx-vnmi'/>
+ <feature name='vmx-vnmi-pending'/>
+ <feature name='vmx-vpid'/>
+ <feature name='vmx-wbinvd-exit'/>
+ <feature name='x2apic'/>
+ <feature name='xgetbv1'/>
+ <feature name='xsave'/>
+ <feature name='xsavec'/>
+ <feature name='xsaveopt'/>
+ </model>
+</cpus>
diff --git a/src/cpu_map/x86_Cascadelake-Server-v3.xml b/src/cpu_map/x86_Cascadelake-Server-v3.xml
new file mode 100644
index 0000000000..582a5ec95a
--- /dev/null
+++ b/src/cpu_map/x86_Cascadelake-Server-v3.xml
@@ -0,0 +1,6 @@
+<cpus>
+ <model name='Cascadelake-Server-v3'>
+ <decode host='on' guest='off'/>
+ <model name='Cascadelake-Server-noTSX'/>
+ </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..716fd81f79
--- /dev/null
+++ b/src/cpu_map/x86_Cascadelake-Server-v4.xml
@@ -0,0 +1,156 @@
+<cpus>
+ <model name='Cascadelake-Server-v4'>
+ <decode host='on' guest='off'/>
+ <signature family='6' model='85' stepping='5-7'/>
+ <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='vmx-activity-hlt'/>
+ <feature name='vmx-apicv-register'/>
+ <feature name='vmx-apicv-vid'/>
+ <feature name='vmx-apicv-x2apic'/>
+ <feature name='vmx-apicv-xapic'/>
+ <feature name='vmx-cr3-load-noexit'/>
+ <feature name='vmx-cr3-store-noexit'/>
+ <feature name='vmx-cr8-load-exit'/>
+ <feature name='vmx-cr8-store-exit'/>
+ <feature name='vmx-desc-exit'/>
+ <feature name='vmx-entry-ia32e-mode'/>
+ <feature name='vmx-entry-load-efer'/>
+ <feature name='vmx-entry-load-pat'/>
+ <feature name='vmx-entry-load-perf-global-ctrl'/>
+ <feature name='vmx-entry-noload-debugctl'/>
+ <feature name='vmx-ept'/>
+ <feature name='vmx-ept-1gb'/>
+ <feature name='vmx-ept-2mb'/>
+ <feature name='vmx-ept-execonly'/>
+ <feature name='vmx-eptad'/>
+ <feature name='vmx-eptp-switching'/>
+ <feature name='vmx-exit-ack-intr'/>
+ <feature name='vmx-exit-load-efer'/>
+ <feature name='vmx-exit-load-pat'/>
+ <feature name='vmx-exit-load-perf-global-ctrl'/>
+ <feature name='vmx-exit-nosave-debugctl'/>
+ <feature name='vmx-exit-save-efer'/>
+ <feature name='vmx-exit-save-pat'/>
+ <feature name='vmx-exit-save-preemption-timer'/>
+ <feature name='vmx-flexpriority'/>
+ <feature name='vmx-hlt-exit'/>
+ <feature name='vmx-ins-outs'/>
+ <feature name='vmx-intr-exit'/>
+ <feature name='vmx-invept'/>
+ <feature name='vmx-invept-all-context'/>
+ <feature name='vmx-invept-single-context'/>
+ <feature name='vmx-invlpg-exit'/>
+ <feature name='vmx-invpcid-exit'/>
+ <feature name='vmx-invvpid-all-context'/>
+ <feature name='vmx-invvpid-single-addr'/>
+ <feature name='vmx-invvpid-single-context-noglobals'/>
+ <feature name='vmx-io-bitmap'/>
+ <feature name='vmx-io-exit'/>
+ <feature name='vmx-monitor-exit'/>
+ <feature name='vmx-movdr-exit'/>
+ <feature name='vmx-msr-bitmap'/>
+ <feature name='vmx-mtf'/>
+ <feature name='vmx-mwait-exit'/>
+ <feature name='vmx-nmi-exit'/>
+ <feature name='vmx-page-walk-4'/>
+ <feature name='vmx-pause-exit'/>
+ <feature name='vmx-pml'/>
+ <feature name='vmx-posted-intr'/>
+ <feature name='vmx-preemption-timer'/>
+ <feature name='vmx-rdpmc-exit'/>
+ <feature name='vmx-rdrand-exit'/>
+ <feature name='vmx-rdseed-exit'/>
+ <feature name='vmx-rdtsc-exit'/>
+ <feature name='vmx-rdtscp-exit'/>
+ <feature name='vmx-secondary-ctls'/>
+ <feature name='vmx-shadow-vmcs'/>
+ <feature name='vmx-store-lma'/>
+ <feature name='vmx-true-ctls'/>
+ <feature name='vmx-tsc-offset'/>
+ <feature name='vmx-unrestricted-guest'/>
+ <feature name='vmx-vintr-pending'/>
+ <feature name='vmx-vmfunc'/>
+ <feature name='vmx-vmwrite-vmexit-fields'/>
+ <feature name='vmx-vnmi'/>
+ <feature name='vmx-vnmi-pending'/>
+ <feature name='vmx-vpid'/>
+ <feature name='vmx-wbinvd-exit'/>
+ <feature name='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..e331fc9684
--- /dev/null
+++ b/src/cpu_map/x86_Cascadelake-Server-v5.xml
@@ -0,0 +1,158 @@
+<cpus>
+ <model name='Cascadelake-Server-v5'>
+ <decode host='on' guest='off'/>
+ <signature family='6' model='85' stepping='5-7'/>
+ <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='vmx-activity-hlt'/>
+ <feature name='vmx-apicv-register'/>
+ <feature name='vmx-apicv-vid'/>
+ <feature name='vmx-apicv-x2apic'/>
+ <feature name='vmx-apicv-xapic'/>
+ <feature name='vmx-cr3-load-noexit'/>
+ <feature name='vmx-cr3-store-noexit'/>
+ <feature name='vmx-cr8-load-exit'/>
+ <feature name='vmx-cr8-store-exit'/>
+ <feature name='vmx-desc-exit'/>
+ <feature name='vmx-entry-ia32e-mode'/>
+ <feature name='vmx-entry-load-efer'/>
+ <feature name='vmx-entry-load-pat'/>
+ <feature name='vmx-entry-load-perf-global-ctrl'/>
+ <feature name='vmx-entry-noload-debugctl'/>
+ <feature name='vmx-ept'/>
+ <feature name='vmx-ept-1gb'/>
+ <feature name='vmx-ept-2mb'/>
+ <feature name='vmx-ept-execonly'/>
+ <feature name='vmx-eptad'/>
+ <feature name='vmx-eptp-switching'/>
+ <feature name='vmx-exit-ack-intr'/>
+ <feature name='vmx-exit-load-efer'/>
+ <feature name='vmx-exit-load-pat'/>
+ <feature name='vmx-exit-load-perf-global-ctrl'/>
+ <feature name='vmx-exit-nosave-debugctl'/>
+ <feature name='vmx-exit-save-efer'/>
+ <feature name='vmx-exit-save-pat'/>
+ <feature name='vmx-exit-save-preemption-timer'/>
+ <feature name='vmx-flexpriority'/>
+ <feature name='vmx-hlt-exit'/>
+ <feature name='vmx-ins-outs'/>
+ <feature name='vmx-intr-exit'/>
+ <feature name='vmx-invept'/>
+ <feature name='vmx-invept-all-context'/>
+ <feature name='vmx-invept-single-context'/>
+ <feature name='vmx-invlpg-exit'/>
+ <feature name='vmx-invpcid-exit'/>
+ <feature name='vmx-invvpid-all-context'/>
+ <feature name='vmx-invvpid-single-addr'/>
+ <feature name='vmx-invvpid-single-context-noglobals'/>
+ <feature name='vmx-io-bitmap'/>
+ <feature name='vmx-io-exit'/>
+ <feature name='vmx-monitor-exit'/>
+ <feature name='vmx-movdr-exit'/>
+ <feature name='vmx-msr-bitmap'/>
+ <feature name='vmx-mtf'/>
+ <feature name='vmx-mwait-exit'/>
+ <feature name='vmx-nmi-exit'/>
+ <feature name='vmx-page-walk-4'/>
+ <feature name='vmx-pause-exit'/>
+ <feature name='vmx-pml'/>
+ <feature name='vmx-posted-intr'/>
+ <feature name='vmx-preemption-timer'/>
+ <feature name='vmx-rdpmc-exit'/>
+ <feature name='vmx-rdrand-exit'/>
+ <feature name='vmx-rdseed-exit'/>
+ <feature name='vmx-rdtsc-exit'/>
+ <feature name='vmx-rdtscp-exit'/>
+ <feature name='vmx-secondary-ctls'/>
+ <feature name='vmx-shadow-vmcs'/>
+ <feature name='vmx-store-lma'/>
+ <feature name='vmx-true-ctls'/>
+ <feature name='vmx-tsc-offset'/>
+ <feature name='vmx-unrestricted-guest'/>
+ <feature name='vmx-vintr-pending'/>
+ <feature name='vmx-vmfunc'/>
+ <feature name='vmx-vmwrite-vmexit-fields'/>
+ <feature name='vmx-vnmi'/>
+ <feature name='vmx-vnmi-pending'/>
+ <feature name='vmx-vpid'/>
+ <feature name='vmx-wbinvd-exit'/>
+ <feature name='vmx-xsaves'/>
+ <feature name='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-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-host.xml
index 28e428aeb8..f1eb50bae3 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-v1</model>
<vendor>Intel</vendor>
<signature family='6' model='85' stepping='6'/>
<feature name='dtes64'/>
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 a0bdd7f87d..069becffe4 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-v1</model>
<vendor>Intel</vendor>
<signature family='6' model='85' stepping='7'/>
<feature name='dtes64'/>
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 0f4ee36d0d..57b4a6069a 100644
--- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
@@ -93,7 +93,7 @@
<feature name='pcid'/>
<feature name='spec-ctrl'/>
</blockers>
- <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+ <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model>
<blockers model='Cascadelake-Server'>
<feature name='avx512bw'/>
<feature name='avx512cd'/>
@@ -109,7 +109,7 @@
<feature name='rtm'/>
<feature name='spec-ctrl'/>
</blockers>
- <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+ <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v3'>Cascadelake-Server-noTSX</model>
<blockers model='Cascadelake-Server-noTSX'>
<feature name='avx512bw'/>
<feature name='avx512cd'/>
@@ -124,6 +124,69 @@
<feature name='pku'/>
<feature name='spec-ctrl'/>
</blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v1</model>
+ <blockers model='Cascadelake-Server-v1'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
+ <blockers model='Cascadelake-Server-v2'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v3</model>
+ <blockers model='Cascadelake-Server-v3'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+ <blockers model='Cascadelake-Server-v4'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
<model usable='yes' vendor='Intel'>Conroe</model>
<model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
<blockers model='Cooperlake'>
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 a365cd9db5..6358b8f227 100644
--- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
@@ -133,7 +133,7 @@
<feature name='tsc-deadline'/>
<feature name='x2apic'/>
</blockers>
- <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+ <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model>
<blockers model='Cascadelake-Server'>
<feature name='3dnowprefetch'/>
<feature name='avx'/>
@@ -157,7 +157,7 @@
<feature name='x2apic'/>
<feature name='xsavec'/>
</blockers>
- <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+ <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v3'>Cascadelake-Server-noTSX</model>
<blockers model='Cascadelake-Server-noTSX'>
<feature name='3dnowprefetch'/>
<feature name='arch-capabilities'/>
@@ -184,6 +184,113 @@
<feature name='x2apic'/>
<feature name='xsavec'/>
</blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v1</model>
+ <blockers model='Cascadelake-Server-v1'>
+ <feature name='3dnowprefetch'/>
+ <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='f16c'/>
+ <feature name='fma'/>
+ <feature name='hle'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='rdseed'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='tsc-deadline'/>
+ <feature name='x2apic'/>
+ <feature name='xsavec'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
+ <blockers model='Cascadelake-Server-v2'>
+ <feature name='3dnowprefetch'/>
+ <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='f16c'/>
+ <feature name='fma'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='mds-no'/>
+ <feature name='pcid'/>
+ <feature name='rdctl-no'/>
+ <feature name='rdseed'/>
+ <feature name='rtm'/>
+ <feature name='skip-l1dfl-vmentry'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='tsc-deadline'/>
+ <feature name='x2apic'/>
+ <feature name='xsavec'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v3</model>
+ <blockers model='Cascadelake-Server-v3'>
+ <feature name='3dnowprefetch'/>
+ <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='f16c'/>
+ <feature name='fma'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='mds-no'/>
+ <feature name='pcid'/>
+ <feature name='rdctl-no'/>
+ <feature name='rdseed'/>
+ <feature name='skip-l1dfl-vmentry'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='tsc-deadline'/>
+ <feature name='x2apic'/>
+ <feature name='xsavec'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+ <blockers model='Cascadelake-Server-v4'>
+ <feature name='3dnowprefetch'/>
+ <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='f16c'/>
+ <feature name='fma'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='mds-no'/>
+ <feature name='pcid'/>
+ <feature name='rdctl-no'/>
+ <feature name='rdseed'/>
+ <feature name='skip-l1dfl-vmentry'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='tsc-deadline'/>
+ <feature name='x2apic'/>
+ <feature name='xsavec'/>
+ </blockers>
<model usable='yes' vendor='Intel'>Conroe</model>
<model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
<blockers model='Cooperlake'>
diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
index e7457b3433..48c89a0ad6 100644
--- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
@@ -92,7 +92,7 @@
<feature name='pcid'/>
<feature name='spec-ctrl'/>
</blockers>
- <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+ <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model>
<blockers model='Cascadelake-Server'>
<feature name='avx512bw'/>
<feature name='avx512cd'/>
@@ -108,7 +108,7 @@
<feature name='rtm'/>
<feature name='spec-ctrl'/>
</blockers>
- <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+ <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v3'>Cascadelake-Server-noTSX</model>
<blockers model='Cascadelake-Server-noTSX'>
<feature name='avx512bw'/>
<feature name='avx512cd'/>
@@ -123,6 +123,69 @@
<feature name='pku'/>
<feature name='spec-ctrl'/>
</blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v1</model>
+ <blockers model='Cascadelake-Server-v1'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
+ <blockers model='Cascadelake-Server-v2'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v3</model>
+ <blockers model='Cascadelake-Server-v3'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+ <blockers model='Cascadelake-Server-v4'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
<model usable='yes' vendor='Intel'>Conroe</model>
<model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
<blockers model='Cooperlake'>
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 56e8aeda5f..7955a18190 100644
--- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
@@ -93,7 +93,7 @@
<feature name='pcid'/>
<feature name='spec-ctrl'/>
</blockers>
- <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+ <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model>
<blockers model='Cascadelake-Server'>
<feature name='avx512bw'/>
<feature name='avx512cd'/>
@@ -109,7 +109,7 @@
<feature name='rtm'/>
<feature name='spec-ctrl'/>
</blockers>
- <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+ <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v3'>Cascadelake-Server-noTSX</model>
<blockers model='Cascadelake-Server-noTSX'>
<feature name='avx512bw'/>
<feature name='avx512cd'/>
@@ -124,6 +124,69 @@
<feature name='pku'/>
<feature name='spec-ctrl'/>
</blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v1</model>
+ <blockers model='Cascadelake-Server-v1'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
+ <blockers model='Cascadelake-Server-v2'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v3</model>
+ <blockers model='Cascadelake-Server-v3'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+ <blockers model='Cascadelake-Server-v4'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
<model usable='yes' vendor='Intel'>Conroe</model>
<model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
<blockers model='Cooperlake'>
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 e5c5dadd5c..94b4aeb166 100644
--- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
@@ -134,7 +134,7 @@
<feature name='tsc-deadline'/>
<feature name='x2apic'/>
</blockers>
- <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+ <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model>
<blockers model='Cascadelake-Server'>
<feature name='3dnowprefetch'/>
<feature name='avx'/>
@@ -158,7 +158,7 @@
<feature name='x2apic'/>
<feature name='xsavec'/>
</blockers>
- <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+ <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v3'>Cascadelake-Server-noTSX</model>
<blockers model='Cascadelake-Server-noTSX'>
<feature name='3dnowprefetch'/>
<feature name='arch-capabilities'/>
@@ -185,6 +185,113 @@
<feature name='x2apic'/>
<feature name='xsavec'/>
</blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v1</model>
+ <blockers model='Cascadelake-Server-v1'>
+ <feature name='3dnowprefetch'/>
+ <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='f16c'/>
+ <feature name='fma'/>
+ <feature name='hle'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='rdseed'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='tsc-deadline'/>
+ <feature name='x2apic'/>
+ <feature name='xsavec'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
+ <blockers model='Cascadelake-Server-v2'>
+ <feature name='3dnowprefetch'/>
+ <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='f16c'/>
+ <feature name='fma'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='mds-no'/>
+ <feature name='pcid'/>
+ <feature name='rdctl-no'/>
+ <feature name='rdseed'/>
+ <feature name='rtm'/>
+ <feature name='skip-l1dfl-vmentry'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='tsc-deadline'/>
+ <feature name='x2apic'/>
+ <feature name='xsavec'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v3</model>
+ <blockers model='Cascadelake-Server-v3'>
+ <feature name='3dnowprefetch'/>
+ <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='f16c'/>
+ <feature name='fma'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='mds-no'/>
+ <feature name='pcid'/>
+ <feature name='rdctl-no'/>
+ <feature name='rdseed'/>
+ <feature name='skip-l1dfl-vmentry'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='tsc-deadline'/>
+ <feature name='x2apic'/>
+ <feature name='xsavec'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+ <blockers model='Cascadelake-Server-v4'>
+ <feature name='3dnowprefetch'/>
+ <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='f16c'/>
+ <feature name='fma'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='mds-no'/>
+ <feature name='pcid'/>
+ <feature name='rdctl-no'/>
+ <feature name='rdseed'/>
+ <feature name='skip-l1dfl-vmentry'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='tsc-deadline'/>
+ <feature name='x2apic'/>
+ <feature name='xsavec'/>
+ </blockers>
<model usable='yes' vendor='Intel'>Conroe</model>
<model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
<blockers model='Cooperlake'>
diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
index 4661ca8fc3..73a47cea6b 100644
--- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
@@ -92,7 +92,7 @@
<feature name='pcid'/>
<feature name='spec-ctrl'/>
</blockers>
- <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+ <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model>
<blockers model='Cascadelake-Server'>
<feature name='avx512bw'/>
<feature name='avx512cd'/>
@@ -108,7 +108,7 @@
<feature name='rtm'/>
<feature name='spec-ctrl'/>
</blockers>
- <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+ <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v3'>Cascadelake-Server-noTSX</model>
<blockers model='Cascadelake-Server-noTSX'>
<feature name='avx512bw'/>
<feature name='avx512cd'/>
@@ -123,6 +123,69 @@
<feature name='pku'/>
<feature name='spec-ctrl'/>
</blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v1</model>
+ <blockers model='Cascadelake-Server-v1'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
+ <blockers model='Cascadelake-Server-v2'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v3</model>
+ <blockers model='Cascadelake-Server-v3'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+ <blockers model='Cascadelake-Server-v4'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
<model usable='yes' vendor='Intel'>Conroe</model>
<model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
<blockers model='Cooperlake'>
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 c9785bf41a..8d41090780 100644
--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
@@ -94,7 +94,7 @@
<feature name='pcid'/>
<feature name='spec-ctrl'/>
</blockers>
- <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+ <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model>
<blockers model='Cascadelake-Server'>
<feature name='avx512bw'/>
<feature name='avx512cd'/>
@@ -110,7 +110,7 @@
<feature name='rtm'/>
<feature name='spec-ctrl'/>
</blockers>
- <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+ <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v3'>Cascadelake-Server-noTSX</model>
<blockers model='Cascadelake-Server-noTSX'>
<feature name='avx512bw'/>
<feature name='avx512cd'/>
@@ -125,6 +125,84 @@
<feature name='pku'/>
<feature name='spec-ctrl'/>
</blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v1</model>
+ <blockers model='Cascadelake-Server-v1'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
+ <blockers model='Cascadelake-Server-v2'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v3</model>
+ <blockers model='Cascadelake-Server-v3'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+ <blockers model='Cascadelake-Server-v4'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v5</model>
+ <blockers model='Cascadelake-Server-v5'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
<model usable='yes' vendor='Intel'>Conroe</model>
<model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
<blockers model='Cooperlake'>
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 323f372ae1..8ad064a22c 100644
--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
@@ -134,7 +134,7 @@
<feature name='tsc-deadline'/>
<feature name='x2apic'/>
</blockers>
- <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+ <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model>
<blockers model='Cascadelake-Server'>
<feature name='3dnowprefetch'/>
<feature name='avx'/>
@@ -158,7 +158,7 @@
<feature name='x2apic'/>
<feature name='xsavec'/>
</blockers>
- <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+ <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v3'>Cascadelake-Server-noTSX</model>
<blockers model='Cascadelake-Server-noTSX'>
<feature name='3dnowprefetch'/>
<feature name='arch-capabilities'/>
@@ -185,6 +185,141 @@
<feature name='x2apic'/>
<feature name='xsavec'/>
</blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v1</model>
+ <blockers model='Cascadelake-Server-v1'>
+ <feature name='3dnowprefetch'/>
+ <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='f16c'/>
+ <feature name='fma'/>
+ <feature name='hle'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='rdseed'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='tsc-deadline'/>
+ <feature name='x2apic'/>
+ <feature name='xsavec'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
+ <blockers model='Cascadelake-Server-v2'>
+ <feature name='3dnowprefetch'/>
+ <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='f16c'/>
+ <feature name='fma'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='mds-no'/>
+ <feature name='pcid'/>
+ <feature name='rdctl-no'/>
+ <feature name='rdseed'/>
+ <feature name='rtm'/>
+ <feature name='skip-l1dfl-vmentry'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='tsc-deadline'/>
+ <feature name='x2apic'/>
+ <feature name='xsavec'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v3</model>
+ <blockers model='Cascadelake-Server-v3'>
+ <feature name='3dnowprefetch'/>
+ <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='f16c'/>
+ <feature name='fma'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='mds-no'/>
+ <feature name='pcid'/>
+ <feature name='rdctl-no'/>
+ <feature name='rdseed'/>
+ <feature name='skip-l1dfl-vmentry'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='tsc-deadline'/>
+ <feature name='x2apic'/>
+ <feature name='xsavec'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+ <blockers model='Cascadelake-Server-v4'>
+ <feature name='3dnowprefetch'/>
+ <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='f16c'/>
+ <feature name='fma'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='mds-no'/>
+ <feature name='pcid'/>
+ <feature name='rdctl-no'/>
+ <feature name='rdseed'/>
+ <feature name='skip-l1dfl-vmentry'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='tsc-deadline'/>
+ <feature name='x2apic'/>
+ <feature name='xsavec'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v5</model>
+ <blockers model='Cascadelake-Server-v5'>
+ <feature name='3dnowprefetch'/>
+ <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='f16c'/>
+ <feature name='fma'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='mds-no'/>
+ <feature name='pcid'/>
+ <feature name='rdctl-no'/>
+ <feature name='rdseed'/>
+ <feature name='skip-l1dfl-vmentry'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='tsc-deadline'/>
+ <feature name='x2apic'/>
+ <feature name='xsavec'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='yes' vendor='Intel'>Conroe</model>
<model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
<blockers model='Cooperlake'>
diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
index bb4f0ae925..83ae31017b 100644
--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
@@ -93,7 +93,7 @@
<feature name='pcid'/>
<feature name='spec-ctrl'/>
</blockers>
- <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+ <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model>
<blockers model='Cascadelake-Server'>
<feature name='avx512bw'/>
<feature name='avx512cd'/>
@@ -109,7 +109,7 @@
<feature name='rtm'/>
<feature name='spec-ctrl'/>
</blockers>
- <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+ <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v3'>Cascadelake-Server-noTSX</model>
<blockers model='Cascadelake-Server-noTSX'>
<feature name='avx512bw'/>
<feature name='avx512cd'/>
@@ -124,6 +124,84 @@
<feature name='pku'/>
<feature name='spec-ctrl'/>
</blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v1</model>
+ <blockers model='Cascadelake-Server-v1'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
+ <blockers model='Cascadelake-Server-v2'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v3</model>
+ <blockers model='Cascadelake-Server-v3'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+ <blockers model='Cascadelake-Server-v4'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v5</model>
+ <blockers model='Cascadelake-Server-v5'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
<model usable='yes' vendor='Intel'>Conroe</model>
<model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
<blockers model='Cooperlake'>
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 4f40568023..fa2a3c71b7 100644
--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
@@ -94,7 +94,7 @@
<feature name='pcid'/>
<feature name='spec-ctrl'/>
</blockers>
- <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+ <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model>
<blockers model='Cascadelake-Server'>
<feature name='avx512bw'/>
<feature name='avx512cd'/>
@@ -110,7 +110,7 @@
<feature name='rtm'/>
<feature name='spec-ctrl'/>
</blockers>
- <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+ <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v3'>Cascadelake-Server-noTSX</model>
<blockers model='Cascadelake-Server-noTSX'>
<feature name='avx512bw'/>
<feature name='avx512cd'/>
@@ -125,6 +125,84 @@
<feature name='pku'/>
<feature name='spec-ctrl'/>
</blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v1</model>
+ <blockers model='Cascadelake-Server-v1'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
+ <blockers model='Cascadelake-Server-v2'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v3</model>
+ <blockers model='Cascadelake-Server-v3'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+ <blockers model='Cascadelake-Server-v4'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v5</model>
+ <blockers model='Cascadelake-Server-v5'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
<model usable='yes' vendor='Intel'>Conroe</model>
<model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
<blockers model='Cooperlake'>
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 48e40883a0..0e8730b1ca 100644
--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
@@ -136,7 +136,7 @@
<feature name='tsc-deadline'/>
<feature name='x2apic'/>
</blockers>
- <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+ <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model>
<blockers model='Cascadelake-Server'>
<feature name='3dnowprefetch'/>
<feature name='avx'/>
@@ -160,7 +160,7 @@
<feature name='x2apic'/>
<feature name='xsavec'/>
</blockers>
- <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+ <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v3'>Cascadelake-Server-noTSX</model>
<blockers model='Cascadelake-Server-noTSX'>
<feature name='3dnowprefetch'/>
<feature name='arch-capabilities'/>
@@ -187,6 +187,141 @@
<feature name='x2apic'/>
<feature name='xsavec'/>
</blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v1</model>
+ <blockers model='Cascadelake-Server-v1'>
+ <feature name='3dnowprefetch'/>
+ <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='f16c'/>
+ <feature name='fma'/>
+ <feature name='hle'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='rdseed'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='tsc-deadline'/>
+ <feature name='x2apic'/>
+ <feature name='xsavec'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
+ <blockers model='Cascadelake-Server-v2'>
+ <feature name='3dnowprefetch'/>
+ <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='f16c'/>
+ <feature name='fma'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='mds-no'/>
+ <feature name='pcid'/>
+ <feature name='rdctl-no'/>
+ <feature name='rdseed'/>
+ <feature name='rtm'/>
+ <feature name='skip-l1dfl-vmentry'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='tsc-deadline'/>
+ <feature name='x2apic'/>
+ <feature name='xsavec'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v3</model>
+ <blockers model='Cascadelake-Server-v3'>
+ <feature name='3dnowprefetch'/>
+ <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='f16c'/>
+ <feature name='fma'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='mds-no'/>
+ <feature name='pcid'/>
+ <feature name='rdctl-no'/>
+ <feature name='rdseed'/>
+ <feature name='skip-l1dfl-vmentry'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='tsc-deadline'/>
+ <feature name='x2apic'/>
+ <feature name='xsavec'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+ <blockers model='Cascadelake-Server-v4'>
+ <feature name='3dnowprefetch'/>
+ <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='f16c'/>
+ <feature name='fma'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='mds-no'/>
+ <feature name='pcid'/>
+ <feature name='rdctl-no'/>
+ <feature name='rdseed'/>
+ <feature name='skip-l1dfl-vmentry'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='tsc-deadline'/>
+ <feature name='x2apic'/>
+ <feature name='xsavec'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v5</model>
+ <blockers model='Cascadelake-Server-v5'>
+ <feature name='3dnowprefetch'/>
+ <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='f16c'/>
+ <feature name='fma'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='mds-no'/>
+ <feature name='pcid'/>
+ <feature name='rdctl-no'/>
+ <feature name='rdseed'/>
+ <feature name='skip-l1dfl-vmentry'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='tsc-deadline'/>
+ <feature name='x2apic'/>
+ <feature name='xsavec'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='yes' vendor='Intel'>Conroe</model>
<model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
<blockers model='Cooperlake'>
diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
index 71b92316e5..66ee266274 100644
--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
@@ -93,7 +93,7 @@
<feature name='pcid'/>
<feature name='spec-ctrl'/>
</blockers>
- <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+ <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model>
<blockers model='Cascadelake-Server'>
<feature name='avx512bw'/>
<feature name='avx512cd'/>
@@ -109,7 +109,7 @@
<feature name='rtm'/>
<feature name='spec-ctrl'/>
</blockers>
- <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+ <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v3'>Cascadelake-Server-noTSX</model>
<blockers model='Cascadelake-Server-noTSX'>
<feature name='avx512bw'/>
<feature name='avx512cd'/>
@@ -124,6 +124,84 @@
<feature name='pku'/>
<feature name='spec-ctrl'/>
</blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v1</model>
+ <blockers model='Cascadelake-Server-v1'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
+ <blockers model='Cascadelake-Server-v2'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v3</model>
+ <blockers model='Cascadelake-Server-v3'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+ <blockers model='Cascadelake-Server-v4'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v5</model>
+ <blockers model='Cascadelake-Server-v5'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
<model usable='yes' vendor='Intel'>Conroe</model>
<model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
<blockers model='Cooperlake'>
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 455e6fff84..d7d70ca91a 100644
--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
@@ -95,7 +95,7 @@
<feature name='pcid'/>
<feature name='spec-ctrl'/>
</blockers>
- <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+ <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model>
<blockers model='Cascadelake-Server'>
<feature name='avx512bw'/>
<feature name='avx512cd'/>
@@ -111,7 +111,7 @@
<feature name='rtm'/>
<feature name='spec-ctrl'/>
</blockers>
- <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+ <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v3'>Cascadelake-Server-noTSX</model>
<blockers model='Cascadelake-Server-noTSX'>
<feature name='avx512bw'/>
<feature name='avx512cd'/>
@@ -126,6 +126,84 @@
<feature name='pku'/>
<feature name='spec-ctrl'/>
</blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v1</model>
+ <blockers model='Cascadelake-Server-v1'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
+ <blockers model='Cascadelake-Server-v2'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v3</model>
+ <blockers model='Cascadelake-Server-v3'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+ <blockers model='Cascadelake-Server-v4'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v5</model>
+ <blockers model='Cascadelake-Server-v5'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
<model usable='yes' vendor='Intel'>Conroe</model>
<model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
<blockers model='Cooperlake'>
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 1e54fd398d..4dfced633e 100644
--- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
@@ -137,7 +137,7 @@
<feature name='tsc-deadline'/>
<feature name='x2apic'/>
</blockers>
- <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+ <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model>
<blockers model='Cascadelake-Server'>
<feature name='3dnowprefetch'/>
<feature name='avx'/>
@@ -161,7 +161,7 @@
<feature name='x2apic'/>
<feature name='xsavec'/>
</blockers>
- <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+ <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v3'>Cascadelake-Server-noTSX</model>
<blockers model='Cascadelake-Server-noTSX'>
<feature name='3dnowprefetch'/>
<feature name='arch-capabilities'/>
@@ -188,6 +188,141 @@
<feature name='x2apic'/>
<feature name='xsavec'/>
</blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v1</model>
+ <blockers model='Cascadelake-Server-v1'>
+ <feature name='3dnowprefetch'/>
+ <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='f16c'/>
+ <feature name='fma'/>
+ <feature name='hle'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='rdseed'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='tsc-deadline'/>
+ <feature name='x2apic'/>
+ <feature name='xsavec'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
+ <blockers model='Cascadelake-Server-v2'>
+ <feature name='3dnowprefetch'/>
+ <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='f16c'/>
+ <feature name='fma'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='mds-no'/>
+ <feature name='pcid'/>
+ <feature name='rdctl-no'/>
+ <feature name='rdseed'/>
+ <feature name='rtm'/>
+ <feature name='skip-l1dfl-vmentry'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='tsc-deadline'/>
+ <feature name='x2apic'/>
+ <feature name='xsavec'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v3</model>
+ <blockers model='Cascadelake-Server-v3'>
+ <feature name='3dnowprefetch'/>
+ <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='f16c'/>
+ <feature name='fma'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='mds-no'/>
+ <feature name='pcid'/>
+ <feature name='rdctl-no'/>
+ <feature name='rdseed'/>
+ <feature name='skip-l1dfl-vmentry'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='tsc-deadline'/>
+ <feature name='x2apic'/>
+ <feature name='xsavec'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+ <blockers model='Cascadelake-Server-v4'>
+ <feature name='3dnowprefetch'/>
+ <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='f16c'/>
+ <feature name='fma'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='mds-no'/>
+ <feature name='pcid'/>
+ <feature name='rdctl-no'/>
+ <feature name='rdseed'/>
+ <feature name='skip-l1dfl-vmentry'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='tsc-deadline'/>
+ <feature name='x2apic'/>
+ <feature name='xsavec'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v5</model>
+ <blockers model='Cascadelake-Server-v5'>
+ <feature name='3dnowprefetch'/>
+ <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='f16c'/>
+ <feature name='fma'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='mds-no'/>
+ <feature name='pcid'/>
+ <feature name='rdctl-no'/>
+ <feature name='rdseed'/>
+ <feature name='skip-l1dfl-vmentry'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='tsc-deadline'/>
+ <feature name='x2apic'/>
+ <feature name='xsavec'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='yes' vendor='Intel'>Conroe</model>
<model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
<blockers model='Cooperlake'>
diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
index 6531049aff..4492a6046a 100644
--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
@@ -94,7 +94,7 @@
<feature name='pcid'/>
<feature name='spec-ctrl'/>
</blockers>
- <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+ <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model>
<blockers model='Cascadelake-Server'>
<feature name='avx512bw'/>
<feature name='avx512cd'/>
@@ -110,7 +110,7 @@
<feature name='rtm'/>
<feature name='spec-ctrl'/>
</blockers>
- <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+ <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v3'>Cascadelake-Server-noTSX</model>
<blockers model='Cascadelake-Server-noTSX'>
<feature name='avx512bw'/>
<feature name='avx512cd'/>
@@ -125,6 +125,84 @@
<feature name='pku'/>
<feature name='spec-ctrl'/>
</blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v1</model>
+ <blockers model='Cascadelake-Server-v1'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
+ <blockers model='Cascadelake-Server-v2'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v3</model>
+ <blockers model='Cascadelake-Server-v3'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+ <blockers model='Cascadelake-Server-v4'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v5</model>
+ <blockers model='Cascadelake-Server-v5'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
<model usable='yes' vendor='Intel'>Conroe</model>
<model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
<blockers model='Cooperlake'>
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 cde60502d5..46cfed5f9d 100644
--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
@@ -96,7 +96,7 @@
<feature name='pcid'/>
<feature name='spec-ctrl'/>
</blockers>
- <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+ <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model>
<blockers model='Cascadelake-Server'>
<feature name='avx512bw'/>
<feature name='avx512cd'/>
@@ -112,7 +112,7 @@
<feature name='rtm'/>
<feature name='spec-ctrl'/>
</blockers>
- <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+ <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v3'>Cascadelake-Server-noTSX</model>
<blockers model='Cascadelake-Server-noTSX'>
<feature name='avx512bw'/>
<feature name='avx512cd'/>
@@ -127,6 +127,84 @@
<feature name='pku'/>
<feature name='spec-ctrl'/>
</blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v1</model>
+ <blockers model='Cascadelake-Server-v1'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
+ <blockers model='Cascadelake-Server-v2'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v3</model>
+ <blockers model='Cascadelake-Server-v3'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+ <blockers model='Cascadelake-Server-v4'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v5</model>
+ <blockers model='Cascadelake-Server-v5'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
<model usable='yes' vendor='Intel'>Conroe</model>
<model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
<blockers model='Cooperlake'>
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 a0b652df0e..8be62f8414 100644
--- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
@@ -137,7 +137,7 @@
<feature name='tsc-deadline'/>
<feature name='x2apic'/>
</blockers>
- <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+ <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model>
<blockers model='Cascadelake-Server'>
<feature name='3dnowprefetch'/>
<feature name='avx'/>
@@ -161,7 +161,7 @@
<feature name='x2apic'/>
<feature name='xsavec'/>
</blockers>
- <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+ <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v3'>Cascadelake-Server-noTSX</model>
<blockers model='Cascadelake-Server-noTSX'>
<feature name='3dnowprefetch'/>
<feature name='arch-capabilities'/>
@@ -188,6 +188,141 @@
<feature name='x2apic'/>
<feature name='xsavec'/>
</blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v1</model>
+ <blockers model='Cascadelake-Server-v1'>
+ <feature name='3dnowprefetch'/>
+ <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='f16c'/>
+ <feature name='fma'/>
+ <feature name='hle'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='rdseed'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='tsc-deadline'/>
+ <feature name='x2apic'/>
+ <feature name='xsavec'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
+ <blockers model='Cascadelake-Server-v2'>
+ <feature name='3dnowprefetch'/>
+ <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='f16c'/>
+ <feature name='fma'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='mds-no'/>
+ <feature name='pcid'/>
+ <feature name='rdctl-no'/>
+ <feature name='rdseed'/>
+ <feature name='rtm'/>
+ <feature name='skip-l1dfl-vmentry'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='tsc-deadline'/>
+ <feature name='x2apic'/>
+ <feature name='xsavec'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v3</model>
+ <blockers model='Cascadelake-Server-v3'>
+ <feature name='3dnowprefetch'/>
+ <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='f16c'/>
+ <feature name='fma'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='mds-no'/>
+ <feature name='pcid'/>
+ <feature name='rdctl-no'/>
+ <feature name='rdseed'/>
+ <feature name='skip-l1dfl-vmentry'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='tsc-deadline'/>
+ <feature name='x2apic'/>
+ <feature name='xsavec'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+ <blockers model='Cascadelake-Server-v4'>
+ <feature name='3dnowprefetch'/>
+ <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='f16c'/>
+ <feature name='fma'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='mds-no'/>
+ <feature name='pcid'/>
+ <feature name='rdctl-no'/>
+ <feature name='rdseed'/>
+ <feature name='skip-l1dfl-vmentry'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='tsc-deadline'/>
+ <feature name='x2apic'/>
+ <feature name='xsavec'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v5</model>
+ <blockers model='Cascadelake-Server-v5'>
+ <feature name='3dnowprefetch'/>
+ <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='f16c'/>
+ <feature name='fma'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='mds-no'/>
+ <feature name='pcid'/>
+ <feature name='rdctl-no'/>
+ <feature name='rdseed'/>
+ <feature name='skip-l1dfl-vmentry'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='tsc-deadline'/>
+ <feature name='x2apic'/>
+ <feature name='xsavec'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='yes' vendor='Intel'>Conroe</model>
<model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
<blockers model='Cooperlake'>
diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
index 97bb824317..f976cc9868 100644
--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
@@ -95,7 +95,7 @@
<feature name='pcid'/>
<feature name='spec-ctrl'/>
</blockers>
- <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+ <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model>
<blockers model='Cascadelake-Server'>
<feature name='avx512bw'/>
<feature name='avx512cd'/>
@@ -111,7 +111,7 @@
<feature name='rtm'/>
<feature name='spec-ctrl'/>
</blockers>
- <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+ <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v3'>Cascadelake-Server-noTSX</model>
<blockers model='Cascadelake-Server-noTSX'>
<feature name='avx512bw'/>
<feature name='avx512cd'/>
@@ -126,6 +126,84 @@
<feature name='pku'/>
<feature name='spec-ctrl'/>
</blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v1</model>
+ <blockers model='Cascadelake-Server-v1'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
+ <blockers model='Cascadelake-Server-v2'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v3</model>
+ <blockers model='Cascadelake-Server-v3'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+ <blockers model='Cascadelake-Server-v4'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v5</model>
+ <blockers model='Cascadelake-Server-v5'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
<model usable='yes' vendor='Intel'>Conroe</model>
<model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
<blockers model='Cooperlake'>
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 9ba9ac5008..446a4ea7b3 100644
--- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
@@ -101,7 +101,7 @@
<feature name='pcid'/>
<feature name='spec-ctrl'/>
</blockers>
- <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+ <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model>
<blockers model='Cascadelake-Server'>
<feature name='avx512bw'/>
<feature name='avx512cd'/>
@@ -117,7 +117,7 @@
<feature name='rtm'/>
<feature name='spec-ctrl'/>
</blockers>
- <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+ <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v3'>Cascadelake-Server-noTSX</model>
<blockers model='Cascadelake-Server-noTSX'>
<feature name='avx512bw'/>
<feature name='avx512cd'/>
@@ -132,6 +132,84 @@
<feature name='pku'/>
<feature name='spec-ctrl'/>
</blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v1</model>
+ <blockers model='Cascadelake-Server-v1'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
+ <blockers model='Cascadelake-Server-v2'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v3</model>
+ <blockers model='Cascadelake-Server-v3'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+ <blockers model='Cascadelake-Server-v4'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v5</model>
+ <blockers model='Cascadelake-Server-v5'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
<model usable='yes' vendor='Intel'>Conroe</model>
<model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
<blockers model='Cooperlake'>
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 849756739a..388e9f0341 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
@@ -110,7 +110,7 @@
<feature name='tsc-deadline'/>
<feature name='x2apic'/>
</blockers>
- <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+ <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model>
<blockers model='Cascadelake-Server'>
<feature name='3dnowprefetch'/>
<feature name='avx512bw'/>
@@ -130,7 +130,7 @@
<feature name='x2apic'/>
<feature name='xsavec'/>
</blockers>
- <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+ <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v3'>Cascadelake-Server-noTSX</model>
<blockers model='Cascadelake-Server-noTSX'>
<feature name='3dnowprefetch'/>
<feature name='arch-capabilities'/>
@@ -153,6 +153,121 @@
<feature name='x2apic'/>
<feature name='xsavec'/>
</blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v1</model>
+ <blockers model='Cascadelake-Server-v1'>
+ <feature name='3dnowprefetch'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='hle'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='rdseed'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='tsc-deadline'/>
+ <feature name='x2apic'/>
+ <feature name='xsavec'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
+ <blockers model='Cascadelake-Server-v2'>
+ <feature name='3dnowprefetch'/>
+ <feature name='arch-capabilities'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='mds-no'/>
+ <feature name='pcid'/>
+ <feature name='rdctl-no'/>
+ <feature name='rdseed'/>
+ <feature name='rtm'/>
+ <feature name='skip-l1dfl-vmentry'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='tsc-deadline'/>
+ <feature name='x2apic'/>
+ <feature name='xsavec'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v3</model>
+ <blockers model='Cascadelake-Server-v3'>
+ <feature name='3dnowprefetch'/>
+ <feature name='arch-capabilities'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='mds-no'/>
+ <feature name='pcid'/>
+ <feature name='rdctl-no'/>
+ <feature name='rdseed'/>
+ <feature name='skip-l1dfl-vmentry'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='tsc-deadline'/>
+ <feature name='x2apic'/>
+ <feature name='xsavec'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+ <blockers model='Cascadelake-Server-v4'>
+ <feature name='3dnowprefetch'/>
+ <feature name='arch-capabilities'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='mds-no'/>
+ <feature name='pcid'/>
+ <feature name='rdctl-no'/>
+ <feature name='rdseed'/>
+ <feature name='skip-l1dfl-vmentry'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='tsc-deadline'/>
+ <feature name='x2apic'/>
+ <feature name='xsavec'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v5</model>
+ <blockers model='Cascadelake-Server-v5'>
+ <feature name='3dnowprefetch'/>
+ <feature name='arch-capabilities'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='mds-no'/>
+ <feature name='pcid'/>
+ <feature name='rdctl-no'/>
+ <feature name='rdseed'/>
+ <feature name='skip-l1dfl-vmentry'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='tsc-deadline'/>
+ <feature name='x2apic'/>
+ <feature name='xsavec'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='yes' vendor='Intel'>Conroe</model>
<model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
<blockers model='Cooperlake'>
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 849756739a..388e9f0341 100644
--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
@@ -110,7 +110,7 @@
<feature name='tsc-deadline'/>
<feature name='x2apic'/>
</blockers>
- <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+ <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model>
<blockers model='Cascadelake-Server'>
<feature name='3dnowprefetch'/>
<feature name='avx512bw'/>
@@ -130,7 +130,7 @@
<feature name='x2apic'/>
<feature name='xsavec'/>
</blockers>
- <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+ <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v3'>Cascadelake-Server-noTSX</model>
<blockers model='Cascadelake-Server-noTSX'>
<feature name='3dnowprefetch'/>
<feature name='arch-capabilities'/>
@@ -153,6 +153,121 @@
<feature name='x2apic'/>
<feature name='xsavec'/>
</blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v1</model>
+ <blockers model='Cascadelake-Server-v1'>
+ <feature name='3dnowprefetch'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='hle'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='rdseed'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='tsc-deadline'/>
+ <feature name='x2apic'/>
+ <feature name='xsavec'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
+ <blockers model='Cascadelake-Server-v2'>
+ <feature name='3dnowprefetch'/>
+ <feature name='arch-capabilities'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='mds-no'/>
+ <feature name='pcid'/>
+ <feature name='rdctl-no'/>
+ <feature name='rdseed'/>
+ <feature name='rtm'/>
+ <feature name='skip-l1dfl-vmentry'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='tsc-deadline'/>
+ <feature name='x2apic'/>
+ <feature name='xsavec'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v3</model>
+ <blockers model='Cascadelake-Server-v3'>
+ <feature name='3dnowprefetch'/>
+ <feature name='arch-capabilities'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='mds-no'/>
+ <feature name='pcid'/>
+ <feature name='rdctl-no'/>
+ <feature name='rdseed'/>
+ <feature name='skip-l1dfl-vmentry'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='tsc-deadline'/>
+ <feature name='x2apic'/>
+ <feature name='xsavec'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+ <blockers model='Cascadelake-Server-v4'>
+ <feature name='3dnowprefetch'/>
+ <feature name='arch-capabilities'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='mds-no'/>
+ <feature name='pcid'/>
+ <feature name='rdctl-no'/>
+ <feature name='rdseed'/>
+ <feature name='skip-l1dfl-vmentry'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='tsc-deadline'/>
+ <feature name='x2apic'/>
+ <feature name='xsavec'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v5</model>
+ <blockers model='Cascadelake-Server-v5'>
+ <feature name='3dnowprefetch'/>
+ <feature name='arch-capabilities'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='mds-no'/>
+ <feature name='pcid'/>
+ <feature name='rdctl-no'/>
+ <feature name='rdseed'/>
+ <feature name='skip-l1dfl-vmentry'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='tsc-deadline'/>
+ <feature name='x2apic'/>
+ <feature name='xsavec'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='yes' vendor='Intel'>Conroe</model>
<model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
<blockers model='Cooperlake'>
diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
index 3edab09abd..eac02f497a 100644
--- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
@@ -100,7 +100,7 @@
<feature name='pcid'/>
<feature name='spec-ctrl'/>
</blockers>
- <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+ <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model>
<blockers model='Cascadelake-Server'>
<feature name='avx512bw'/>
<feature name='avx512cd'/>
@@ -116,7 +116,7 @@
<feature name='rtm'/>
<feature name='spec-ctrl'/>
</blockers>
- <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+ <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v3'>Cascadelake-Server-noTSX</model>
<blockers model='Cascadelake-Server-noTSX'>
<feature name='avx512bw'/>
<feature name='avx512cd'/>
@@ -131,6 +131,84 @@
<feature name='pku'/>
<feature name='spec-ctrl'/>
</blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v1</model>
+ <blockers model='Cascadelake-Server-v1'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
+ <blockers model='Cascadelake-Server-v2'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v3</model>
+ <blockers model='Cascadelake-Server-v3'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+ <blockers model='Cascadelake-Server-v4'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v5</model>
+ <blockers model='Cascadelake-Server-v5'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
<model usable='yes' vendor='Intel'>Conroe</model>
<model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
<blockers model='Cooperlake'>
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 7cfe1538d1..e0fd74a139 100644
--- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
@@ -101,7 +101,7 @@
<feature name='pcid'/>
<feature name='spec-ctrl'/>
</blockers>
- <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+ <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model>
<blockers model='Cascadelake-Server'>
<feature name='avx512bw'/>
<feature name='avx512cd'/>
@@ -117,7 +117,7 @@
<feature name='rtm'/>
<feature name='spec-ctrl'/>
</blockers>
- <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+ <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v3'>Cascadelake-Server-noTSX</model>
<blockers model='Cascadelake-Server-noTSX'>
<feature name='avx512bw'/>
<feature name='avx512cd'/>
@@ -132,6 +132,84 @@
<feature name='pku'/>
<feature name='spec-ctrl'/>
</blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v1</model>
+ <blockers model='Cascadelake-Server-v1'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
+ <blockers model='Cascadelake-Server-v2'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v3</model>
+ <blockers model='Cascadelake-Server-v3'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+ <blockers model='Cascadelake-Server-v4'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v5</model>
+ <blockers model='Cascadelake-Server-v5'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
<model usable='yes' vendor='Intel'>Conroe</model>
<model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
<blockers model='Cooperlake'>
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 7a35a7ae24..be5e5b16b0 100644
--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
@@ -114,7 +114,7 @@
<feature name='tsc-deadline'/>
<feature name='x2apic'/>
</blockers>
- <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+ <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model>
<blockers model='Cascadelake-Server'>
<feature name='3dnowprefetch'/>
<feature name='avx512bw'/>
@@ -134,7 +134,7 @@
<feature name='x2apic'/>
<feature name='xsavec'/>
</blockers>
- <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+ <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v3'>Cascadelake-Server-noTSX</model>
<blockers model='Cascadelake-Server-noTSX'>
<feature name='3dnowprefetch'/>
<feature name='arch-capabilities'/>
@@ -157,6 +157,121 @@
<feature name='x2apic'/>
<feature name='xsavec'/>
</blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v1</model>
+ <blockers model='Cascadelake-Server-v1'>
+ <feature name='3dnowprefetch'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='hle'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='rdseed'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='tsc-deadline'/>
+ <feature name='x2apic'/>
+ <feature name='xsavec'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
+ <blockers model='Cascadelake-Server-v2'>
+ <feature name='3dnowprefetch'/>
+ <feature name='arch-capabilities'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='mds-no'/>
+ <feature name='pcid'/>
+ <feature name='rdctl-no'/>
+ <feature name='rdseed'/>
+ <feature name='rtm'/>
+ <feature name='skip-l1dfl-vmentry'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='tsc-deadline'/>
+ <feature name='x2apic'/>
+ <feature name='xsavec'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v3</model>
+ <blockers model='Cascadelake-Server-v3'>
+ <feature name='3dnowprefetch'/>
+ <feature name='arch-capabilities'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='mds-no'/>
+ <feature name='pcid'/>
+ <feature name='rdctl-no'/>
+ <feature name='rdseed'/>
+ <feature name='skip-l1dfl-vmentry'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='tsc-deadline'/>
+ <feature name='x2apic'/>
+ <feature name='xsavec'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+ <blockers model='Cascadelake-Server-v4'>
+ <feature name='3dnowprefetch'/>
+ <feature name='arch-capabilities'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='mds-no'/>
+ <feature name='pcid'/>
+ <feature name='rdctl-no'/>
+ <feature name='rdseed'/>
+ <feature name='skip-l1dfl-vmentry'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='tsc-deadline'/>
+ <feature name='x2apic'/>
+ <feature name='xsavec'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v5</model>
+ <blockers model='Cascadelake-Server-v5'>
+ <feature name='3dnowprefetch'/>
+ <feature name='arch-capabilities'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='mds-no'/>
+ <feature name='pcid'/>
+ <feature name='rdctl-no'/>
+ <feature name='rdseed'/>
+ <feature name='skip-l1dfl-vmentry'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='tsc-deadline'/>
+ <feature name='x2apic'/>
+ <feature name='xsavec'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='yes' vendor='Intel'>Conroe</model>
<model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
<blockers model='Cooperlake'>
diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
index f63dc64c38..9573f80845 100644
--- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
@@ -100,7 +100,7 @@
<feature name='pcid'/>
<feature name='spec-ctrl'/>
</blockers>
- <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+ <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model>
<blockers model='Cascadelake-Server'>
<feature name='avx512bw'/>
<feature name='avx512cd'/>
@@ -116,7 +116,7 @@
<feature name='rtm'/>
<feature name='spec-ctrl'/>
</blockers>
- <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+ <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v3'>Cascadelake-Server-noTSX</model>
<blockers model='Cascadelake-Server-noTSX'>
<feature name='avx512bw'/>
<feature name='avx512cd'/>
@@ -131,6 +131,84 @@
<feature name='pku'/>
<feature name='spec-ctrl'/>
</blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v1</model>
+ <blockers model='Cascadelake-Server-v1'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
+ <blockers model='Cascadelake-Server-v2'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v3</model>
+ <blockers model='Cascadelake-Server-v3'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+ <blockers model='Cascadelake-Server-v4'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v5</model>
+ <blockers model='Cascadelake-Server-v5'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
<model usable='yes' vendor='Intel'>Conroe</model>
<model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
<blockers model='Cooperlake'>
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 8638cb6eb2..1b4ceacb16 100644
--- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
@@ -103,7 +103,7 @@
<feature name='pcid'/>
<feature name='spec-ctrl'/>
</blockers>
- <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+ <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model>
<blockers model='Cascadelake-Server'>
<feature name='avx512bw'/>
<feature name='avx512cd'/>
@@ -119,7 +119,7 @@
<feature name='rtm'/>
<feature name='spec-ctrl'/>
</blockers>
- <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+ <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v3'>Cascadelake-Server-noTSX</model>
<blockers model='Cascadelake-Server-noTSX'>
<feature name='avx512bw'/>
<feature name='avx512cd'/>
@@ -134,6 +134,85 @@
<feature name='pku'/>
<feature name='spec-ctrl'/>
</blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v1</model>
+ <blockers model='Cascadelake-Server-v1'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
+ <blockers model='Cascadelake-Server-v2'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v3</model>
+ <blockers model='Cascadelake-Server-v3'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+ <blockers model='Cascadelake-Server-v4'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v5</model>
+ <blockers model='Cascadelake-Server-v5'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='spec-ctrl'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='yes' vendor='Intel'>Conroe</model>
<model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
<blockers model='Cooperlake'>
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 2968dc71a2..bcd73d2eb9 100644
--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
@@ -107,7 +107,7 @@
<feature name='tsc-deadline'/>
<feature name='x2apic'/>
</blockers>
- <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+ <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model>
<blockers model='Cascadelake-Server'>
<feature name='avx512bw'/>
<feature name='avx512cd'/>
@@ -125,7 +125,7 @@
<feature name='x2apic'/>
<feature name='xsavec'/>
</blockers>
- <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+ <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v3'>Cascadelake-Server-noTSX</model>
<blockers model='Cascadelake-Server-noTSX'>
<feature name='arch-capabilities'/>
<feature name='avx512bw'/>
@@ -142,6 +142,95 @@
<feature name='x2apic'/>
<feature name='xsavec'/>
</blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v1</model>
+ <blockers model='Cascadelake-Server-v1'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='hle'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='tsc-deadline'/>
+ <feature name='x2apic'/>
+ <feature name='xsavec'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
+ <blockers model='Cascadelake-Server-v2'>
+ <feature name='arch-capabilities'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='hle'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='tsc-deadline'/>
+ <feature name='x2apic'/>
+ <feature name='xsavec'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v3</model>
+ <blockers model='Cascadelake-Server-v3'>
+ <feature name='arch-capabilities'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='tsc-deadline'/>
+ <feature name='x2apic'/>
+ <feature name='xsavec'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+ <blockers model='Cascadelake-Server-v4'>
+ <feature name='arch-capabilities'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='tsc-deadline'/>
+ <feature name='x2apic'/>
+ <feature name='xsavec'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v5</model>
+ <blockers model='Cascadelake-Server-v5'>
+ <feature name='arch-capabilities'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='tsc-deadline'/>
+ <feature name='x2apic'/>
+ <feature name='xsavec'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='yes' vendor='Intel'>Conroe</model>
<model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
<blockers model='Cooperlake'>
diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
index bc8bbc31b1..1fceafeaa8 100644
--- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
@@ -102,7 +102,7 @@
<feature name='pcid'/>
<feature name='spec-ctrl'/>
</blockers>
- <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+ <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model>
<blockers model='Cascadelake-Server'>
<feature name='avx512bw'/>
<feature name='avx512cd'/>
@@ -118,7 +118,7 @@
<feature name='rtm'/>
<feature name='spec-ctrl'/>
</blockers>
- <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+ <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v3'>Cascadelake-Server-noTSX</model>
<blockers model='Cascadelake-Server-noTSX'>
<feature name='avx512bw'/>
<feature name='avx512cd'/>
@@ -133,6 +133,85 @@
<feature name='pku'/>
<feature name='spec-ctrl'/>
</blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v1</model>
+ <blockers model='Cascadelake-Server-v1'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
+ <blockers model='Cascadelake-Server-v2'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v3</model>
+ <blockers model='Cascadelake-Server-v3'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+ <blockers model='Cascadelake-Server-v4'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v5</model>
+ <blockers model='Cascadelake-Server-v5'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='spec-ctrl'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='yes' vendor='Intel'>Conroe</model>
<model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
<blockers model='Cooperlake'>
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 f0c374491a..b3b3c5c538 100644
--- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
@@ -104,7 +104,7 @@
<feature name='pcid'/>
<feature name='spec-ctrl'/>
</blockers>
- <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+ <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model>
<blockers model='Cascadelake-Server'>
<feature name='avx512bw'/>
<feature name='avx512cd'/>
@@ -120,7 +120,7 @@
<feature name='rtm'/>
<feature name='spec-ctrl'/>
</blockers>
- <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+ <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v3'>Cascadelake-Server-noTSX</model>
<blockers model='Cascadelake-Server-noTSX'>
<feature name='avx512bw'/>
<feature name='avx512cd'/>
@@ -135,6 +135,85 @@
<feature name='pku'/>
<feature name='spec-ctrl'/>
</blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v1</model>
+ <blockers model='Cascadelake-Server-v1'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
+ <blockers model='Cascadelake-Server-v2'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v3</model>
+ <blockers model='Cascadelake-Server-v3'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+ <blockers model='Cascadelake-Server-v4'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v5</model>
+ <blockers model='Cascadelake-Server-v5'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='spec-ctrl'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='yes' vendor='Intel'>Conroe</model>
<model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
<blockers model='Cooperlake'>
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 fb989bb068..050160af25 100644
--- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
@@ -106,7 +106,7 @@
<feature name='tsc-deadline'/>
<feature name='x2apic'/>
</blockers>
- <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+ <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model>
<blockers model='Cascadelake-Server'>
<feature name='avx512bw'/>
<feature name='avx512cd'/>
@@ -124,7 +124,7 @@
<feature name='x2apic'/>
<feature name='xsavec'/>
</blockers>
- <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+ <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v3'>Cascadelake-Server-noTSX</model>
<blockers model='Cascadelake-Server-noTSX'>
<feature name='arch-capabilities'/>
<feature name='avx512bw'/>
@@ -141,6 +141,95 @@
<feature name='x2apic'/>
<feature name='xsavec'/>
</blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v1</model>
+ <blockers model='Cascadelake-Server-v1'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='hle'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='tsc-deadline'/>
+ <feature name='x2apic'/>
+ <feature name='xsavec'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
+ <blockers model='Cascadelake-Server-v2'>
+ <feature name='arch-capabilities'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='hle'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='tsc-deadline'/>
+ <feature name='x2apic'/>
+ <feature name='xsavec'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v3</model>
+ <blockers model='Cascadelake-Server-v3'>
+ <feature name='arch-capabilities'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='tsc-deadline'/>
+ <feature name='x2apic'/>
+ <feature name='xsavec'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+ <blockers model='Cascadelake-Server-v4'>
+ <feature name='arch-capabilities'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='tsc-deadline'/>
+ <feature name='x2apic'/>
+ <feature name='xsavec'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v5</model>
+ <blockers model='Cascadelake-Server-v5'>
+ <feature name='arch-capabilities'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='tsc-deadline'/>
+ <feature name='x2apic'/>
+ <feature name='xsavec'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='yes' vendor='Intel'>Conroe</model>
<model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
<blockers model='Cooperlake'>
diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
index 59076315d0..1c8b91caa6 100644
--- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
@@ -103,7 +103,7 @@
<feature name='pcid'/>
<feature name='spec-ctrl'/>
</blockers>
- <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+ <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model>
<blockers model='Cascadelake-Server'>
<feature name='avx512bw'/>
<feature name='avx512cd'/>
@@ -119,7 +119,7 @@
<feature name='rtm'/>
<feature name='spec-ctrl'/>
</blockers>
- <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+ <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v3'>Cascadelake-Server-noTSX</model>
<blockers model='Cascadelake-Server-noTSX'>
<feature name='avx512bw'/>
<feature name='avx512cd'/>
@@ -134,6 +134,85 @@
<feature name='pku'/>
<feature name='spec-ctrl'/>
</blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v1</model>
+ <blockers model='Cascadelake-Server-v1'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
+ <blockers model='Cascadelake-Server-v2'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v3</model>
+ <blockers model='Cascadelake-Server-v3'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+ <blockers model='Cascadelake-Server-v4'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v5</model>
+ <blockers model='Cascadelake-Server-v5'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='spec-ctrl'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='yes' vendor='Intel'>Conroe</model>
<model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
<blockers model='Cooperlake'>
diff --git a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
index 45e1a712d5..00950d1c3e 100644
--- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
@@ -104,7 +104,7 @@
<feature name='pcid'/>
<feature name='spec-ctrl'/>
</blockers>
- <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+ <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model>
<blockers model='Cascadelake-Server'>
<feature name='avx512bw'/>
<feature name='avx512cd'/>
@@ -120,7 +120,7 @@
<feature name='rtm'/>
<feature name='spec-ctrl'/>
</blockers>
- <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+ <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v3'>Cascadelake-Server-noTSX</model>
<blockers model='Cascadelake-Server-noTSX'>
<feature name='avx512bw'/>
<feature name='avx512cd'/>
@@ -135,6 +135,85 @@
<feature name='pku'/>
<feature name='spec-ctrl'/>
</blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v1</model>
+ <blockers model='Cascadelake-Server-v1'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
+ <blockers model='Cascadelake-Server-v2'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v3</model>
+ <blockers model='Cascadelake-Server-v3'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+ <blockers model='Cascadelake-Server-v4'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v5</model>
+ <blockers model='Cascadelake-Server-v5'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='spec-ctrl'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='yes' vendor='Intel'>Conroe</model>
<model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
<blockers model='Cooperlake'>
diff --git a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
index 4d222bbbdf..a24a446373 100644
--- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
@@ -104,7 +104,7 @@
<feature name='spec-ctrl'/>
<feature name='tsc-deadline'/>
</blockers>
- <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+ <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model>
<blockers model='Cascadelake-Server'>
<feature name='avx512bw'/>
<feature name='avx512cd'/>
@@ -121,7 +121,7 @@
<feature name='tsc-deadline'/>
<feature name='xsavec'/>
</blockers>
- <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+ <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v3'>Cascadelake-Server-noTSX</model>
<blockers model='Cascadelake-Server-noTSX'>
<feature name='arch-capabilities'/>
<feature name='avx512bw'/>
@@ -137,6 +137,90 @@
<feature name='tsc-deadline'/>
<feature name='xsavec'/>
</blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v1</model>
+ <blockers model='Cascadelake-Server-v1'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='hle'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='tsc-deadline'/>
+ <feature name='xsavec'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
+ <blockers model='Cascadelake-Server-v2'>
+ <feature name='arch-capabilities'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='hle'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='tsc-deadline'/>
+ <feature name='xsavec'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v3</model>
+ <blockers model='Cascadelake-Server-v3'>
+ <feature name='arch-capabilities'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='tsc-deadline'/>
+ <feature name='xsavec'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+ <blockers model='Cascadelake-Server-v4'>
+ <feature name='arch-capabilities'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='tsc-deadline'/>
+ <feature name='xsavec'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v5</model>
+ <blockers model='Cascadelake-Server-v5'>
+ <feature name='arch-capabilities'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='tsc-deadline'/>
+ <feature name='xsavec'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='yes' vendor='Intel'>Conroe</model>
<model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
<blockers model='Cooperlake'>
diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
index f9250ef372..c5126d4c10 100644
--- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
@@ -103,7 +103,7 @@
<feature name='pcid'/>
<feature name='spec-ctrl'/>
</blockers>
- <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+ <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model>
<blockers model='Cascadelake-Server'>
<feature name='avx512bw'/>
<feature name='avx512cd'/>
@@ -119,7 +119,7 @@
<feature name='rtm'/>
<feature name='spec-ctrl'/>
</blockers>
- <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+ <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v3'>Cascadelake-Server-noTSX</model>
<blockers model='Cascadelake-Server-noTSX'>
<feature name='avx512bw'/>
<feature name='avx512cd'/>
@@ -134,6 +134,85 @@
<feature name='pku'/>
<feature name='spec-ctrl'/>
</blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v1</model>
+ <blockers model='Cascadelake-Server-v1'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
+ <blockers model='Cascadelake-Server-v2'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v3</model>
+ <blockers model='Cascadelake-Server-v3'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+ <blockers model='Cascadelake-Server-v4'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v5</model>
+ <blockers model='Cascadelake-Server-v5'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='spec-ctrl'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='yes' vendor='Intel'>Conroe</model>
<model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
<blockers model='Cooperlake'>
diff --git a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
index 0e40fdc47e..607f0d1dcb 100644
--- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
@@ -108,7 +108,7 @@
<feature name='pcid'/>
<feature name='spec-ctrl'/>
</blockers>
- <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+ <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model>
<blockers model='Cascadelake-Server'>
<feature name='avx512bw'/>
<feature name='avx512cd'/>
@@ -124,7 +124,7 @@
<feature name='rtm'/>
<feature name='spec-ctrl'/>
</blockers>
- <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+ <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v3'>Cascadelake-Server-noTSX</model>
<blockers model='Cascadelake-Server-noTSX'>
<feature name='avx512bw'/>
<feature name='avx512cd'/>
@@ -139,6 +139,85 @@
<feature name='pku'/>
<feature name='spec-ctrl'/>
</blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v1</model>
+ <blockers model='Cascadelake-Server-v1'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
+ <blockers model='Cascadelake-Server-v2'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v3</model>
+ <blockers model='Cascadelake-Server-v3'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+ <blockers model='Cascadelake-Server-v4'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v5</model>
+ <blockers model='Cascadelake-Server-v5'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='spec-ctrl'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='yes' vendor='Intel'>Conroe</model>
<model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
<blockers model='Cooperlake'>
diff --git a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
index bc29e8dda4..729afba017 100644
--- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
@@ -103,7 +103,7 @@
<feature name='spec-ctrl'/>
<feature name='tsc-deadline'/>
</blockers>
- <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+ <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model>
<blockers model='Cascadelake-Server'>
<feature name='avx512bw'/>
<feature name='avx512cd'/>
@@ -120,7 +120,7 @@
<feature name='tsc-deadline'/>
<feature name='xsavec'/>
</blockers>
- <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+ <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v3'>Cascadelake-Server-noTSX</model>
<blockers model='Cascadelake-Server-noTSX'>
<feature name='arch-capabilities'/>
<feature name='avx512bw'/>
@@ -136,6 +136,90 @@
<feature name='tsc-deadline'/>
<feature name='xsavec'/>
</blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v1</model>
+ <blockers model='Cascadelake-Server-v1'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='hle'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='tsc-deadline'/>
+ <feature name='xsavec'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
+ <blockers model='Cascadelake-Server-v2'>
+ <feature name='arch-capabilities'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='hle'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='tsc-deadline'/>
+ <feature name='xsavec'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v3</model>
+ <blockers model='Cascadelake-Server-v3'>
+ <feature name='arch-capabilities'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='tsc-deadline'/>
+ <feature name='xsavec'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+ <blockers model='Cascadelake-Server-v4'>
+ <feature name='arch-capabilities'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='tsc-deadline'/>
+ <feature name='xsavec'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v5</model>
+ <blockers model='Cascadelake-Server-v5'>
+ <feature name='arch-capabilities'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='tsc-deadline'/>
+ <feature name='xsavec'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='yes' vendor='Intel'>Conroe</model>
<model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
<blockers model='Cooperlake'>
diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
index a70abf2263..4fe1f27009 100644
--- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
@@ -107,7 +107,7 @@
<feature name='pcid'/>
<feature name='spec-ctrl'/>
</blockers>
- <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+ <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model>
<blockers model='Cascadelake-Server'>
<feature name='avx512bw'/>
<feature name='avx512cd'/>
@@ -123,7 +123,7 @@
<feature name='rtm'/>
<feature name='spec-ctrl'/>
</blockers>
- <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+ <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v3'>Cascadelake-Server-noTSX</model>
<blockers model='Cascadelake-Server-noTSX'>
<feature name='avx512bw'/>
<feature name='avx512cd'/>
@@ -138,6 +138,85 @@
<feature name='pku'/>
<feature name='spec-ctrl'/>
</blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v1</model>
+ <blockers model='Cascadelake-Server-v1'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
+ <blockers model='Cascadelake-Server-v2'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v3</model>
+ <blockers model='Cascadelake-Server-v3'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+ <blockers model='Cascadelake-Server-v4'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v5</model>
+ <blockers model='Cascadelake-Server-v5'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='spec-ctrl'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='yes' vendor='Intel'>Conroe</model>
<model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
<blockers model='Cooperlake'>
diff --git a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
index 1cd20a0049..7ac02a6559 100644
--- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
@@ -108,7 +108,7 @@
<feature name='pcid'/>
<feature name='spec-ctrl'/>
</blockers>
- <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+ <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model>
<blockers model='Cascadelake-Server'>
<feature name='avx512bw'/>
<feature name='avx512cd'/>
@@ -124,7 +124,7 @@
<feature name='rtm'/>
<feature name='spec-ctrl'/>
</blockers>
- <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+ <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v3'>Cascadelake-Server-noTSX</model>
<blockers model='Cascadelake-Server-noTSX'>
<feature name='avx512bw'/>
<feature name='avx512cd'/>
@@ -139,6 +139,85 @@
<feature name='pku'/>
<feature name='spec-ctrl'/>
</blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v1</model>
+ <blockers model='Cascadelake-Server-v1'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
+ <blockers model='Cascadelake-Server-v2'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v3</model>
+ <blockers model='Cascadelake-Server-v3'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+ <blockers model='Cascadelake-Server-v4'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v5</model>
+ <blockers model='Cascadelake-Server-v5'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='spec-ctrl'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='yes' vendor='Intel'>Conroe</model>
<model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
<blockers model='Cooperlake'>
diff --git a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
index ab6f60cfa1..c3ccc4a83d 100644
--- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
@@ -103,7 +103,7 @@
<feature name='spec-ctrl'/>
<feature name='tsc-deadline'/>
</blockers>
- <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+ <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model>
<blockers model='Cascadelake-Server'>
<feature name='avx512bw'/>
<feature name='avx512cd'/>
@@ -120,7 +120,7 @@
<feature name='tsc-deadline'/>
<feature name='xsavec'/>
</blockers>
- <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+ <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v3'>Cascadelake-Server-noTSX</model>
<blockers model='Cascadelake-Server-noTSX'>
<feature name='arch-capabilities'/>
<feature name='avx512bw'/>
@@ -136,6 +136,90 @@
<feature name='tsc-deadline'/>
<feature name='xsavec'/>
</blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v1</model>
+ <blockers model='Cascadelake-Server-v1'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='hle'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='tsc-deadline'/>
+ <feature name='xsavec'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
+ <blockers model='Cascadelake-Server-v2'>
+ <feature name='arch-capabilities'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='hle'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='tsc-deadline'/>
+ <feature name='xsavec'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v3</model>
+ <blockers model='Cascadelake-Server-v3'>
+ <feature name='arch-capabilities'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='tsc-deadline'/>
+ <feature name='xsavec'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+ <blockers model='Cascadelake-Server-v4'>
+ <feature name='arch-capabilities'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='tsc-deadline'/>
+ <feature name='xsavec'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v5</model>
+ <blockers model='Cascadelake-Server-v5'>
+ <feature name='arch-capabilities'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='tsc-deadline'/>
+ <feature name='xsavec'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='yes' vendor='Intel'>Conroe</model>
<model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
<blockers model='Cooperlake'>
diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
index ff31f05915..dac46b82f7 100644
--- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
@@ -107,7 +107,7 @@
<feature name='pcid'/>
<feature name='spec-ctrl'/>
</blockers>
- <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+ <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v1'>Cascadelake-Server</model>
<blockers model='Cascadelake-Server'>
<feature name='avx512bw'/>
<feature name='avx512cd'/>
@@ -123,7 +123,7 @@
<feature name='rtm'/>
<feature name='spec-ctrl'/>
</blockers>
- <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+ <model usable='no' vendor='Intel' canonical='Cascadelake-Server-v3'>Cascadelake-Server-noTSX</model>
<blockers model='Cascadelake-Server-noTSX'>
<feature name='avx512bw'/>
<feature name='avx512cd'/>
@@ -138,6 +138,85 @@
<feature name='pku'/>
<feature name='spec-ctrl'/>
</blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v1</model>
+ <blockers model='Cascadelake-Server-v1'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v2</model>
+ <blockers model='Cascadelake-Server-v2'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='rtm'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v3</model>
+ <blockers model='Cascadelake-Server-v3'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v4</model>
+ <blockers model='Cascadelake-Server-v4'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='spec-ctrl'/>
+ </blockers>
+ <model usable='no' vendor='Intel'>Cascadelake-Server-v5</model>
+ <blockers model='Cascadelake-Server-v5'>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='erms'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='spec-ctrl'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='yes' vendor='Intel'>Conroe</model>
<model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
<blockers model='Cooperlake'>
--
2.47.0© 2016 - 2024 Red Hat, Inc.