[PATCH v2 24/36] cpu_map: Add versions of Skylake-Client CPU model

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- Notes: Version 2: - Skylake-Client-v2 defined as Skylake-Client-IBRS - Skylake-Client-v3 defined as Skylake-Client-noTSX-IBRS - <decode host='on' guest='off'/> for all versioned models - canonical CPU models in domain capabilities src/cpu_map/index.xml | 4 + src/cpu_map/meson.build | 4 + src/cpu_map/x86_Skylake-Client-v1.xml | 6 + src/cpu_map/x86_Skylake-Client-v2.xml | 6 + src/cpu_map/x86_Skylake-Client-v3.xml | 6 + src/cpu_map/x86_Skylake-Client-v4.xml | 141 ++++++++++++++++++ .../x86_64-cpuid-Core-i5-6600-host.xml | 2 +- .../x86_64-cpuid-Core-i7-7600U-host.xml | 2 +- .../x86_64-cpuid-Core-i7-7700-host.xml | 2 +- .../x86_64-cpuid-Core-i7-8550U-host.xml | 2 +- .../x86_64-cpuid-Core-i7-8700-host.xml | 2 +- .../x86_64-cpuid-Xeon-E3-1225-v5-host.xml | 2 +- .../x86_64-cpuid-Xeon-E3-1245-v5-host.xml | 2 +- .../domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 30 +++- .../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 54 ++++++- tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 30 +++- .../domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 30 +++- .../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 54 ++++++- tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 30 +++- .../domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 37 ++++- .../domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 70 ++++++++- tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 37 ++++- .../domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 37 ++++- .../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 70 ++++++++- tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 37 ++++- .../domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 37 ++++- .../domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 70 ++++++++- tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 37 ++++- .../domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 37 ++++- .../domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 70 ++++++++- tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 37 ++++- .../domaincapsdata/qemu_7.2.0-q35.x86_64.xml | 37 ++++- .../qemu_7.2.0-tcg.x86_64+hvf.xml | 54 ++++++- .../domaincapsdata/qemu_7.2.0-tcg.x86_64.xml | 54 ++++++- tests/domaincapsdata/qemu_7.2.0.x86_64.xml | 37 ++++- .../domaincapsdata/qemu_8.0.0-q35.x86_64.xml | 37 ++++- .../domaincapsdata/qemu_8.0.0-tcg.x86_64.xml | 54 ++++++- tests/domaincapsdata/qemu_8.0.0.x86_64.xml | 37 ++++- .../domaincapsdata/qemu_8.1.0-q35.x86_64.xml | 38 ++++- .../domaincapsdata/qemu_8.1.0-tcg.x86_64.xml | 46 +++++- tests/domaincapsdata/qemu_8.1.0.x86_64.xml | 38 ++++- .../domaincapsdata/qemu_8.2.0-q35.x86_64.xml | 38 ++++- .../domaincapsdata/qemu_8.2.0-tcg.x86_64.xml | 46 +++++- tests/domaincapsdata/qemu_8.2.0.x86_64.xml | 38 ++++- .../domaincapsdata/qemu_9.0.0-q35.x86_64.xml | 38 ++++- .../domaincapsdata/qemu_9.0.0-tcg.x86_64.xml | 42 +++++- tests/domaincapsdata/qemu_9.0.0.x86_64.xml | 38 ++++- .../domaincapsdata/qemu_9.1.0-q35.x86_64.xml | 38 ++++- .../domaincapsdata/qemu_9.1.0-tcg.x86_64.xml | 42 +++++- tests/domaincapsdata/qemu_9.1.0.x86_64.xml | 38 ++++- .../domaincapsdata/qemu_9.2.0-q35.x86_64.xml | 38 ++++- .../domaincapsdata/qemu_9.2.0-tcg.x86_64.xml | 42 +++++- tests/domaincapsdata/qemu_9.2.0.x86_64.xml | 38 ++++- 53 files changed, 1766 insertions(+), 127 deletions(-) create mode 100644 src/cpu_map/x86_Skylake-Client-v1.xml create mode 100644 src/cpu_map/x86_Skylake-Client-v2.xml create mode 100644 src/cpu_map/x86_Skylake-Client-v3.xml create mode 100644 src/cpu_map/x86_Skylake-Client-v4.xml diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml index af41623bc0..4d7f8dc700 100644 --- a/src/cpu_map/index.xml +++ b/src/cpu_map/index.xml @@ -48,6 +48,10 @@ <include filename='x86_Skylake-Client.xml'/> <include filename='x86_Skylake-Client-IBRS.xml'/> <include filename='x86_Skylake-Client-noTSX-IBRS.xml'/> + <include filename='x86_Skylake-Client-v1.xml'/> + <include filename='x86_Skylake-Client-v2.xml'/> + <include filename='x86_Skylake-Client-v3.xml'/> + <include filename='x86_Skylake-Client-v4.xml'/> <include filename='x86_Skylake-Server.xml'/> <include filename='x86_Skylake-Server-IBRS.xml'/> <include filename='x86_Skylake-Server-noTSX-IBRS.xml'/> diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build index 60c14539d3..9fea2059bd 100644 --- a/src/cpu_map/meson.build +++ b/src/cpu_map/meson.build @@ -97,6 +97,10 @@ cpumap_data = [ 'x86_SierraForest.xml', 'x86_Skylake-Client-IBRS.xml', 'x86_Skylake-Client-noTSX-IBRS.xml', + 'x86_Skylake-Client-v1.xml', + 'x86_Skylake-Client-v2.xml', + 'x86_Skylake-Client-v3.xml', + 'x86_Skylake-Client-v4.xml', 'x86_Skylake-Client.xml', 'x86_Skylake-Server-IBRS.xml', 'x86_Skylake-Server-noTSX-IBRS.xml', diff --git a/src/cpu_map/x86_Skylake-Client-v1.xml b/src/cpu_map/x86_Skylake-Client-v1.xml new file mode 100644 index 0000000000..50401cafeb --- /dev/null +++ b/src/cpu_map/x86_Skylake-Client-v1.xml @@ -0,0 +1,6 @@ +<cpus> + <model name='Skylake-Client-v1'> + <decode host='on' guest='off'/> + <model name='Skylake-Client'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_Skylake-Client-v2.xml b/src/cpu_map/x86_Skylake-Client-v2.xml new file mode 100644 index 0000000000..2645061f2a --- /dev/null +++ b/src/cpu_map/x86_Skylake-Client-v2.xml @@ -0,0 +1,6 @@ +<cpus> + <model name='Skylake-Client-v2'> + <decode host='on' guest='off'/> + <model name='Skylake-Client-IBRS'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_Skylake-Client-v3.xml b/src/cpu_map/x86_Skylake-Client-v3.xml new file mode 100644 index 0000000000..81814b8c8a --- /dev/null +++ b/src/cpu_map/x86_Skylake-Client-v3.xml @@ -0,0 +1,6 @@ +<cpus> + <model name='Skylake-Client-v3'> + <decode host='on' guest='off'/> + <model name='Skylake-Client-noTSX-IBRS'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_Skylake-Client-v4.xml b/src/cpu_map/x86_Skylake-Client-v4.xml new file mode 100644 index 0000000000..9b14575e5f --- /dev/null +++ b/src/cpu_map/x86_Skylake-Client-v4.xml @@ -0,0 +1,141 @@ +<cpus> + <model name='Skylake-Client-v4'> + <decode host='on' guest='off'/> + <signature family='6' model='94'/> + <signature family='6' model='78'/> + <signature family='6' model='142'/> + <signature family='6' model='158'/> + <vendor name='Intel'/> + <feature name='3dnowprefetch'/> + <feature name='abm'/> + <feature name='adx'/> + <feature name='aes'/> + <feature name='apic'/> + <feature name='arat'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='bmi1'/> + <feature name='bmi2'/> + <feature name='clflush'/> + <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='invpcid'/> + <feature name='lahf_lm'/> + <feature name='lm'/> + <feature name='mca'/> + <feature name='mce'/> + <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='pge'/> + <feature name='pni'/> + <feature name='popcnt'/> + <feature name='pse'/> + <feature name='pse36'/> + <feature name='rdrand'/> + <feature name='rdseed'/> + <feature name='rdtscp'/> + <feature name='sep'/> + <feature name='smap'/> + <feature name='smep'/> + <feature name='spec-ctrl'/> + <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-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-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-Core-i5-6600-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-6600-host.xml index 19bfe83420..c43d9f2a21 100644 --- a/tests/cputestdata/x86_64-cpuid-Core-i5-6600-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Core-i5-6600-host.xml @@ -1,6 +1,6 @@ <cpu> <arch>x86_64</arch> - <model>Skylake-Client</model> + <model>Skylake-Client-v1</model> <vendor>Intel</vendor> <signature family='6' model='94' stepping='3'/> <feature name='dtes64'/> diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-host.xml index 88ef022243..1234266ede 100644 --- a/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-host.xml @@ -1,6 +1,6 @@ <cpu> <arch>x86_64</arch> - <model>Skylake-Client-IBRS</model> + <model>Skylake-Client-v2</model> <vendor>Intel</vendor> <signature family='6' model='142' stepping='9'/> <feature name='dtes64'/> diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-7700-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-7700-host.xml index 7925f195c8..0343a80dba 100644 --- a/tests/cputestdata/x86_64-cpuid-Core-i7-7700-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-7700-host.xml @@ -1,6 +1,6 @@ <cpu> <arch>x86_64</arch> - <model>Skylake-Client</model> + <model>Skylake-Client-v1</model> <vendor>Intel</vendor> <signature family='6' model='158' stepping='9'/> <feature name='dtes64'/> diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-host.xml index 11e36e2e4c..c13f60d6fd 100644 --- a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-host.xml @@ -1,6 +1,6 @@ <cpu> <arch>x86_64</arch> - <model>Skylake-Client-noTSX-IBRS</model> + <model>Skylake-Client-v3</model> <vendor>Intel</vendor> <signature family='6' model='142' stepping='10'/> <feature name='dtes64'/> diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8700-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-8700-host.xml index 3ca7e1c548..59115d36ae 100644 --- a/tests/cputestdata/x86_64-cpuid-Core-i7-8700-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8700-host.xml @@ -1,6 +1,6 @@ <cpu> <arch>x86_64</arch> - <model>Skylake-Client-IBRS</model> + <model>Skylake-Client-v2</model> <vendor>Intel</vendor> <signature family='6' model='158' stepping='10'/> <feature name='dtes64'/> diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml index a0dd29c89b..131674e449 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml @@ -1,6 +1,6 @@ <cpu> <arch>x86_64</arch> - <model>Skylake-Client-IBRS</model> + <model>Skylake-Client-v2</model> <vendor>Intel</vendor> <signature family='6' model='94' stepping='3'/> <feature name='dtes64'/> diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-host.xml index 4053f2f9f1..b3fb527dac 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-host.xml @@ -1,6 +1,6 @@ <cpu> <arch>x86_64</arch> - <model>Skylake-Client</model> + <model>Skylake-Client-v1</model> <vendor>Intel</vendor> <signature family='6' model='94' stepping='3'/> <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 bfaae20df4..0a1dd449a7 100644 --- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml @@ -470,7 +470,7 @@ <blockers model='SandyBridge-IBRS'> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model> <blockers model='Skylake-Client'> <feature name='erms'/> <feature name='hle'/> @@ -478,7 +478,7 @@ <feature name='pcid'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v2'>Skylake-Client-IBRS</model> <blockers model='Skylake-Client-IBRS'> <feature name='erms'/> <feature name='hle'/> @@ -487,13 +487,37 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v3'>Skylake-Client-noTSX-IBRS</model> <blockers model='Skylake-Client-noTSX-IBRS'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v1</model> + <blockers model='Skylake-Client-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v2</model> + <blockers model='Skylake-Client-v2'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v3</model> + <blockers model='Skylake-Client-v3'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> 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 b34875ea9b..69d7cc7683 100644 --- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml @@ -805,7 +805,7 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model> <blockers model='Skylake-Client'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -821,7 +821,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v2'>Skylake-Client-IBRS</model> <blockers model='Skylake-Client-IBRS'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -838,7 +838,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v3'>Skylake-Client-noTSX-IBRS</model> <blockers model='Skylake-Client-noTSX-IBRS'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -853,6 +853,54 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v1</model> + <blockers model='Skylake-Client-v1'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v2</model> + <blockers model='Skylake-Client-v2'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <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='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v3</model> + <blockers model='Skylake-Client-v3'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='3dnowprefetch'/> diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml index 2cb7651d94..479a03c07c 100644 --- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml @@ -469,7 +469,7 @@ <blockers model='SandyBridge-IBRS'> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model> <blockers model='Skylake-Client'> <feature name='erms'/> <feature name='hle'/> @@ -477,7 +477,7 @@ <feature name='pcid'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v2'>Skylake-Client-IBRS</model> <blockers model='Skylake-Client-IBRS'> <feature name='erms'/> <feature name='hle'/> @@ -486,13 +486,37 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v3'>Skylake-Client-noTSX-IBRS</model> <blockers model='Skylake-Client-noTSX-IBRS'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v1</model> + <blockers model='Skylake-Client-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v2</model> + <blockers model='Skylake-Client-v2'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v3</model> + <blockers model='Skylake-Client-v3'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> 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 e2c7deb232..7a6b9f622c 100644 --- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml @@ -479,7 +479,7 @@ <blockers model='SandyBridge-IBRS'> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model> <blockers model='Skylake-Client'> <feature name='erms'/> <feature name='hle'/> @@ -487,7 +487,7 @@ <feature name='pcid'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v2'>Skylake-Client-IBRS</model> <blockers model='Skylake-Client-IBRS'> <feature name='erms'/> <feature name='hle'/> @@ -496,13 +496,37 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v3'>Skylake-Client-noTSX-IBRS</model> <blockers model='Skylake-Client-noTSX-IBRS'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v1</model> + <blockers model='Skylake-Client-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v2</model> + <blockers model='Skylake-Client-v2'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v3</model> + <blockers model='Skylake-Client-v3'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> 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 a4e9c15f3c..ac171ae9c2 100644 --- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml @@ -837,7 +837,7 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model> <blockers model='Skylake-Client'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -853,7 +853,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v2'>Skylake-Client-IBRS</model> <blockers model='Skylake-Client-IBRS'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -870,7 +870,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v3'>Skylake-Client-noTSX-IBRS</model> <blockers model='Skylake-Client-noTSX-IBRS'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -885,6 +885,54 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v1</model> + <blockers model='Skylake-Client-v1'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v2</model> + <blockers model='Skylake-Client-v2'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <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='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v3</model> + <blockers model='Skylake-Client-v3'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='3dnowprefetch'/> diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml index 5b55f7168d..43f52d1449 100644 --- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml @@ -478,7 +478,7 @@ <blockers model='SandyBridge-IBRS'> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model> <blockers model='Skylake-Client'> <feature name='erms'/> <feature name='hle'/> @@ -486,7 +486,7 @@ <feature name='pcid'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v2'>Skylake-Client-IBRS</model> <blockers model='Skylake-Client-IBRS'> <feature name='erms'/> <feature name='hle'/> @@ -495,13 +495,37 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v3'>Skylake-Client-noTSX-IBRS</model> <blockers model='Skylake-Client-noTSX-IBRS'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v1</model> + <blockers model='Skylake-Client-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v2</model> + <blockers model='Skylake-Client-v2'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v3</model> + <blockers model='Skylake-Client-v3'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> 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 ba98897a59..ab3c8a5a3b 100644 --- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml @@ -543,7 +543,7 @@ <blockers model='SandyBridge-IBRS'> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model> <blockers model='Skylake-Client'> <feature name='erms'/> <feature name='hle'/> @@ -551,7 +551,7 @@ <feature name='pcid'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v2'>Skylake-Client-IBRS</model> <blockers model='Skylake-Client-IBRS'> <feature name='erms'/> <feature name='hle'/> @@ -560,13 +560,44 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v3'>Skylake-Client-noTSX-IBRS</model> <blockers model='Skylake-Client-noTSX-IBRS'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v1</model> + <blockers model='Skylake-Client-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v2</model> + <blockers model='Skylake-Client-v2'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v3</model> + <blockers model='Skylake-Client-v3'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v4</model> + <blockers model='Skylake-Client-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> 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 e1b2fdf523..8a426d1838 100644 --- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml @@ -945,7 +945,7 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model> <blockers model='Skylake-Client'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -961,7 +961,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v2'>Skylake-Client-IBRS</model> <blockers model='Skylake-Client-IBRS'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -978,7 +978,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v3'>Skylake-Client-noTSX-IBRS</model> <blockers model='Skylake-Client-noTSX-IBRS'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -993,6 +993,70 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v1</model> + <blockers model='Skylake-Client-v1'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v2</model> + <blockers model='Skylake-Client-v2'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <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='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v3</model> + <blockers model='Skylake-Client-v3'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v4</model> + <blockers model='Skylake-Client-v4'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='3dnowprefetch'/> diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml index 0782742c55..ce9f57dfe2 100644 --- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml @@ -542,7 +542,7 @@ <blockers model='SandyBridge-IBRS'> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model> <blockers model='Skylake-Client'> <feature name='erms'/> <feature name='hle'/> @@ -550,7 +550,7 @@ <feature name='pcid'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v2'>Skylake-Client-IBRS</model> <blockers model='Skylake-Client-IBRS'> <feature name='erms'/> <feature name='hle'/> @@ -559,13 +559,44 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v3'>Skylake-Client-noTSX-IBRS</model> <blockers model='Skylake-Client-noTSX-IBRS'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v1</model> + <blockers model='Skylake-Client-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v2</model> + <blockers model='Skylake-Client-v2'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v3</model> + <blockers model='Skylake-Client-v3'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v4</model> + <blockers model='Skylake-Client-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> 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 44b85a22bf..cb31bebb9f 100644 --- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml @@ -540,7 +540,7 @@ <blockers model='SandyBridge-IBRS'> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model> <blockers model='Skylake-Client'> <feature name='erms'/> <feature name='hle'/> @@ -548,7 +548,7 @@ <feature name='pcid'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v2'>Skylake-Client-IBRS</model> <blockers model='Skylake-Client-IBRS'> <feature name='erms'/> <feature name='hle'/> @@ -557,13 +557,44 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v3'>Skylake-Client-noTSX-IBRS</model> <blockers model='Skylake-Client-noTSX-IBRS'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v1</model> + <blockers model='Skylake-Client-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v2</model> + <blockers model='Skylake-Client-v2'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v3</model> + <blockers model='Skylake-Client-v3'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v4</model> + <blockers model='Skylake-Client-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> 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 04bc338a05..a8911370e2 100644 --- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml @@ -943,7 +943,7 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model> <blockers model='Skylake-Client'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -959,7 +959,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v2'>Skylake-Client-IBRS</model> <blockers model='Skylake-Client-IBRS'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -976,7 +976,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v3'>Skylake-Client-noTSX-IBRS</model> <blockers model='Skylake-Client-noTSX-IBRS'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -991,6 +991,70 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v1</model> + <blockers model='Skylake-Client-v1'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v2</model> + <blockers model='Skylake-Client-v2'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <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='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v3</model> + <blockers model='Skylake-Client-v3'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v4</model> + <blockers model='Skylake-Client-v4'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='3dnowprefetch'/> diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml index 9ca8aea50d..cc576447f7 100644 --- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml @@ -539,7 +539,7 @@ <blockers model='SandyBridge-IBRS'> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model> <blockers model='Skylake-Client'> <feature name='erms'/> <feature name='hle'/> @@ -547,7 +547,7 @@ <feature name='pcid'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v2'>Skylake-Client-IBRS</model> <blockers model='Skylake-Client-IBRS'> <feature name='erms'/> <feature name='hle'/> @@ -556,13 +556,44 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v3'>Skylake-Client-noTSX-IBRS</model> <blockers model='Skylake-Client-noTSX-IBRS'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v1</model> + <blockers model='Skylake-Client-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v2</model> + <blockers model='Skylake-Client-v2'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v3</model> + <blockers model='Skylake-Client-v3'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v4</model> + <blockers model='Skylake-Client-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> 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 3da0f49414..b616d4a1e6 100644 --- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml @@ -567,7 +567,7 @@ <blockers model='SandyBridge-IBRS'> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model> <blockers model='Skylake-Client'> <feature name='erms'/> <feature name='hle'/> @@ -575,7 +575,7 @@ <feature name='pcid'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v2'>Skylake-Client-IBRS</model> <blockers model='Skylake-Client-IBRS'> <feature name='erms'/> <feature name='hle'/> @@ -584,13 +584,44 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v3'>Skylake-Client-noTSX-IBRS</model> <blockers model='Skylake-Client-noTSX-IBRS'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v1</model> + <blockers model='Skylake-Client-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v2</model> + <blockers model='Skylake-Client-v2'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v3</model> + <blockers model='Skylake-Client-v3'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v4</model> + <blockers model='Skylake-Client-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> 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 ff8f07bcaf..53c50c2ddc 100644 --- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml @@ -975,7 +975,7 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model> <blockers model='Skylake-Client'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -991,7 +991,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v2'>Skylake-Client-IBRS</model> <blockers model='Skylake-Client-IBRS'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -1008,7 +1008,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v3'>Skylake-Client-noTSX-IBRS</model> <blockers model='Skylake-Client-noTSX-IBRS'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -1023,6 +1023,70 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v1</model> + <blockers model='Skylake-Client-v1'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v2</model> + <blockers model='Skylake-Client-v2'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <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='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v3</model> + <blockers model='Skylake-Client-v3'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v4</model> + <blockers model='Skylake-Client-v4'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='3dnowprefetch'/> diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml index eedca7f9d2..2454a6f8c1 100644 --- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml @@ -566,7 +566,7 @@ <blockers model='SandyBridge-IBRS'> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model> <blockers model='Skylake-Client'> <feature name='erms'/> <feature name='hle'/> @@ -574,7 +574,7 @@ <feature name='pcid'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v2'>Skylake-Client-IBRS</model> <blockers model='Skylake-Client-IBRS'> <feature name='erms'/> <feature name='hle'/> @@ -583,13 +583,44 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v3'>Skylake-Client-noTSX-IBRS</model> <blockers model='Skylake-Client-noTSX-IBRS'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v1</model> + <blockers model='Skylake-Client-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v2</model> + <blockers model='Skylake-Client-v2'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v3</model> + <blockers model='Skylake-Client-v3'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v4</model> + <blockers model='Skylake-Client-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> 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 b743fd5949..ceef8576a4 100644 --- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml @@ -534,7 +534,7 @@ <blockers model='SandyBridge-IBRS'> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model> <blockers model='Skylake-Client'> <feature name='erms'/> <feature name='hle'/> @@ -542,7 +542,7 @@ <feature name='pcid'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v2'>Skylake-Client-IBRS</model> <blockers model='Skylake-Client-IBRS'> <feature name='erms'/> <feature name='hle'/> @@ -551,13 +551,44 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v3'>Skylake-Client-noTSX-IBRS</model> <blockers model='Skylake-Client-noTSX-IBRS'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v1</model> + <blockers model='Skylake-Client-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v2</model> + <blockers model='Skylake-Client-v2'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v3</model> + <blockers model='Skylake-Client-v3'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v4</model> + <blockers model='Skylake-Client-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> 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 f28f88244d..c4ca961052 100644 --- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml @@ -923,7 +923,7 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model> <blockers model='Skylake-Client'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -939,7 +939,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v2'>Skylake-Client-IBRS</model> <blockers model='Skylake-Client-IBRS'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -956,7 +956,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v3'>Skylake-Client-noTSX-IBRS</model> <blockers model='Skylake-Client-noTSX-IBRS'> <feature name='3dnowprefetch'/> <feature name='avx'/> @@ -971,6 +971,70 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v1</model> + <blockers model='Skylake-Client-v1'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v2</model> + <blockers model='Skylake-Client-v2'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <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='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v3</model> + <blockers model='Skylake-Client-v3'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v4</model> + <blockers model='Skylake-Client-v4'> + <feature name='3dnowprefetch'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='3dnowprefetch'/> diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml index 7eb0dc6079..5cd771a999 100644 --- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml @@ -533,7 +533,7 @@ <blockers model='SandyBridge-IBRS'> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model> <blockers model='Skylake-Client'> <feature name='erms'/> <feature name='hle'/> @@ -541,7 +541,7 @@ <feature name='pcid'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v2'>Skylake-Client-IBRS</model> <blockers model='Skylake-Client-IBRS'> <feature name='erms'/> <feature name='hle'/> @@ -550,13 +550,44 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v3'>Skylake-Client-noTSX-IBRS</model> <blockers model='Skylake-Client-noTSX-IBRS'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v1</model> + <blockers model='Skylake-Client-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v2</model> + <blockers model='Skylake-Client-v2'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v3</model> + <blockers model='Skylake-Client-v3'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v4</model> + <blockers model='Skylake-Client-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> 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 3989e534b6..f0f3b2e5c3 100644 --- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml @@ -539,7 +539,7 @@ <blockers model='SandyBridge-IBRS'> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model> <blockers model='Skylake-Client'> <feature name='erms'/> <feature name='hle'/> @@ -547,7 +547,7 @@ <feature name='pcid'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v2'>Skylake-Client-IBRS</model> <blockers model='Skylake-Client-IBRS'> <feature name='erms'/> <feature name='hle'/> @@ -556,13 +556,44 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v3'>Skylake-Client-noTSX-IBRS</model> <blockers model='Skylake-Client-noTSX-IBRS'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v1</model> + <blockers model='Skylake-Client-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v2</model> + <blockers model='Skylake-Client-v2'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v3</model> + <blockers model='Skylake-Client-v3'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v4</model> + <blockers model='Skylake-Client-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> 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 9e0488e11f..366b94f6fd 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 @@ -770,7 +770,7 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model> <blockers model='Skylake-Client'> <feature name='3dnowprefetch'/> <feature name='hle'/> @@ -782,7 +782,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v2'>Skylake-Client-IBRS</model> <blockers model='Skylake-Client-IBRS'> <feature name='3dnowprefetch'/> <feature name='hle'/> @@ -795,7 +795,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v3'>Skylake-Client-noTSX-IBRS</model> <blockers model='Skylake-Client-noTSX-IBRS'> <feature name='3dnowprefetch'/> <feature name='invpcid'/> @@ -806,6 +806,54 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v1</model> + <blockers model='Skylake-Client-v1'> + <feature name='3dnowprefetch'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v2</model> + <blockers model='Skylake-Client-v2'> + <feature name='3dnowprefetch'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v3</model> + <blockers model='Skylake-Client-v3'> + <feature name='3dnowprefetch'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v4</model> + <blockers model='Skylake-Client-v4'> + <feature name='3dnowprefetch'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='3dnowprefetch'/> 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 9e0488e11f..366b94f6fd 100644 --- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml @@ -770,7 +770,7 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model> <blockers model='Skylake-Client'> <feature name='3dnowprefetch'/> <feature name='hle'/> @@ -782,7 +782,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v2'>Skylake-Client-IBRS</model> <blockers model='Skylake-Client-IBRS'> <feature name='3dnowprefetch'/> <feature name='hle'/> @@ -795,7 +795,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v3'>Skylake-Client-noTSX-IBRS</model> <blockers model='Skylake-Client-noTSX-IBRS'> <feature name='3dnowprefetch'/> <feature name='invpcid'/> @@ -806,6 +806,54 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v1</model> + <blockers model='Skylake-Client-v1'> + <feature name='3dnowprefetch'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v2</model> + <blockers model='Skylake-Client-v2'> + <feature name='3dnowprefetch'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v3</model> + <blockers model='Skylake-Client-v3'> + <feature name='3dnowprefetch'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v4</model> + <blockers model='Skylake-Client-v4'> + <feature name='3dnowprefetch'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='3dnowprefetch'/> diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml index 856177f2c2..730e4ab447 100644 --- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml @@ -538,7 +538,7 @@ <blockers model='SandyBridge-IBRS'> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model> <blockers model='Skylake-Client'> <feature name='erms'/> <feature name='hle'/> @@ -546,7 +546,7 @@ <feature name='pcid'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v2'>Skylake-Client-IBRS</model> <blockers model='Skylake-Client-IBRS'> <feature name='erms'/> <feature name='hle'/> @@ -555,13 +555,44 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v3'>Skylake-Client-noTSX-IBRS</model> <blockers model='Skylake-Client-noTSX-IBRS'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v1</model> + <blockers model='Skylake-Client-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v2</model> + <blockers model='Skylake-Client-v2'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v3</model> + <blockers model='Skylake-Client-v3'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v4</model> + <blockers model='Skylake-Client-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> 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 cd9de8aa48..95b4936952 100644 --- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml @@ -621,7 +621,7 @@ <feature name='vpclmulqdq'/> <feature name='xfd'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model> <blockers model='Skylake-Client'> <feature name='erms'/> <feature name='hle'/> @@ -629,7 +629,7 @@ <feature name='pcid'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v2'>Skylake-Client-IBRS</model> <blockers model='Skylake-Client-IBRS'> <feature name='erms'/> <feature name='hle'/> @@ -638,13 +638,44 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v3'>Skylake-Client-noTSX-IBRS</model> <blockers model='Skylake-Client-noTSX-IBRS'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v1</model> + <blockers model='Skylake-Client-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v2</model> + <blockers model='Skylake-Client-v2'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v3</model> + <blockers model='Skylake-Client-v3'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v4</model> + <blockers model='Skylake-Client-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> 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 ddafb0c97d..fc3502beeb 100644 --- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml @@ -866,7 +866,7 @@ <feature name='xsavec'/> <feature name='xsaves'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model> <blockers model='Skylake-Client'> <feature name='3dnowprefetch'/> <feature name='hle'/> @@ -878,7 +878,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v2'>Skylake-Client-IBRS</model> <blockers model='Skylake-Client-IBRS'> <feature name='3dnowprefetch'/> <feature name='hle'/> @@ -891,7 +891,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v3'>Skylake-Client-noTSX-IBRS</model> <blockers model='Skylake-Client-noTSX-IBRS'> <feature name='3dnowprefetch'/> <feature name='invpcid'/> @@ -902,6 +902,54 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v1</model> + <blockers model='Skylake-Client-v1'> + <feature name='3dnowprefetch'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v2</model> + <blockers model='Skylake-Client-v2'> + <feature name='3dnowprefetch'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v3</model> + <blockers model='Skylake-Client-v3'> + <feature name='3dnowprefetch'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v4</model> + <blockers model='Skylake-Client-v4'> + <feature name='3dnowprefetch'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rdseed'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='3dnowprefetch'/> diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml index c8b413eeb4..7f36f932bd 100644 --- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml @@ -620,7 +620,7 @@ <feature name='vpclmulqdq'/> <feature name='xfd'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model> <blockers model='Skylake-Client'> <feature name='erms'/> <feature name='hle'/> @@ -628,7 +628,7 @@ <feature name='pcid'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v2'>Skylake-Client-IBRS</model> <blockers model='Skylake-Client-IBRS'> <feature name='erms'/> <feature name='hle'/> @@ -637,13 +637,44 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v3'>Skylake-Client-noTSX-IBRS</model> <blockers model='Skylake-Client-noTSX-IBRS'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v1</model> + <blockers model='Skylake-Client-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v2</model> + <blockers model='Skylake-Client-v2'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v3</model> + <blockers model='Skylake-Client-v3'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v4</model> + <blockers model='Skylake-Client-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> 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 2348b8a948..9ea66dbe8a 100644 --- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml @@ -806,7 +806,7 @@ <feature name='xfd'/> <feature name='xsaves'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model> <blockers model='Skylake-Client'> <feature name='erms'/> <feature name='hle'/> @@ -814,7 +814,7 @@ <feature name='pcid'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v2'>Skylake-Client-IBRS</model> <blockers model='Skylake-Client-IBRS'> <feature name='erms'/> <feature name='hle'/> @@ -823,13 +823,45 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v3'>Skylake-Client-noTSX-IBRS</model> <blockers model='Skylake-Client-noTSX-IBRS'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v1</model> + <blockers model='Skylake-Client-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v2</model> + <blockers model='Skylake-Client-v2'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v3</model> + <blockers model='Skylake-Client-v3'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v4</model> + <blockers model='Skylake-Client-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> 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 05a4a1c4d1..13f10d885a 100644 --- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml @@ -872,7 +872,7 @@ <feature name='xsavec'/> <feature name='xsaves'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model> <blockers model='Skylake-Client'> <feature name='hle'/> <feature name='invpcid'/> @@ -882,7 +882,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v2'>Skylake-Client-IBRS</model> <blockers model='Skylake-Client-IBRS'> <feature name='hle'/> <feature name='invpcid'/> @@ -893,7 +893,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v3'>Skylake-Client-noTSX-IBRS</model> <blockers model='Skylake-Client-noTSX-IBRS'> <feature name='invpcid'/> <feature name='pcid'/> @@ -902,6 +902,46 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v1</model> + <blockers model='Skylake-Client-v1'> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v2</model> + <blockers model='Skylake-Client-v2'> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v3</model> + <blockers model='Skylake-Client-v3'> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v4</model> + <blockers model='Skylake-Client-v4'> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml index 80c021fae5..7627ddb1d5 100644 --- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml @@ -805,7 +805,7 @@ <feature name='xfd'/> <feature name='xsaves'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model> <blockers model='Skylake-Client'> <feature name='erms'/> <feature name='hle'/> @@ -813,7 +813,7 @@ <feature name='pcid'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v2'>Skylake-Client-IBRS</model> <blockers model='Skylake-Client-IBRS'> <feature name='erms'/> <feature name='hle'/> @@ -822,13 +822,45 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v3'>Skylake-Client-noTSX-IBRS</model> <blockers model='Skylake-Client-noTSX-IBRS'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v1</model> + <blockers model='Skylake-Client-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v2</model> + <blockers model='Skylake-Client-v2'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v3</model> + <blockers model='Skylake-Client-v3'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v4</model> + <blockers model='Skylake-Client-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> 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 a10f245559..fc3e1855e7 100644 --- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml @@ -807,7 +807,7 @@ <feature name='xfd'/> <feature name='xsaves'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model> <blockers model='Skylake-Client'> <feature name='erms'/> <feature name='hle'/> @@ -815,7 +815,7 @@ <feature name='pcid'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v2'>Skylake-Client-IBRS</model> <blockers model='Skylake-Client-IBRS'> <feature name='erms'/> <feature name='hle'/> @@ -824,13 +824,45 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v3'>Skylake-Client-noTSX-IBRS</model> <blockers model='Skylake-Client-noTSX-IBRS'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v1</model> + <blockers model='Skylake-Client-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v2</model> + <blockers model='Skylake-Client-v2'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v3</model> + <blockers model='Skylake-Client-v3'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v4</model> + <blockers model='Skylake-Client-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> 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 3c1c3ccc46..eccf032aa5 100644 --- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml @@ -858,7 +858,7 @@ <feature name='xsavec'/> <feature name='xsaves'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model> <blockers model='Skylake-Client'> <feature name='hle'/> <feature name='invpcid'/> @@ -868,7 +868,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v2'>Skylake-Client-IBRS</model> <blockers model='Skylake-Client-IBRS'> <feature name='hle'/> <feature name='invpcid'/> @@ -879,7 +879,7 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v3'>Skylake-Client-noTSX-IBRS</model> <blockers model='Skylake-Client-noTSX-IBRS'> <feature name='invpcid'/> <feature name='pcid'/> @@ -888,6 +888,46 @@ <feature name='x2apic'/> <feature name='xsavec'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v1</model> + <blockers model='Skylake-Client-v1'> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v2</model> + <blockers model='Skylake-Client-v2'> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v3</model> + <blockers model='Skylake-Client-v3'> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v4</model> + <blockers model='Skylake-Client-v4'> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml index 35a04b58da..2962fb2097 100644 --- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml @@ -806,7 +806,7 @@ <feature name='xfd'/> <feature name='xsaves'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model> <blockers model='Skylake-Client'> <feature name='erms'/> <feature name='hle'/> @@ -814,7 +814,7 @@ <feature name='pcid'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v2'>Skylake-Client-IBRS</model> <blockers model='Skylake-Client-IBRS'> <feature name='erms'/> <feature name='hle'/> @@ -823,13 +823,45 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v3'>Skylake-Client-noTSX-IBRS</model> <blockers model='Skylake-Client-noTSX-IBRS'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v1</model> + <blockers model='Skylake-Client-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v2</model> + <blockers model='Skylake-Client-v2'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v3</model> + <blockers model='Skylake-Client-v3'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v4</model> + <blockers model='Skylake-Client-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> 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 fe41e2f42d..137c4e62f6 100644 --- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml @@ -807,7 +807,7 @@ <feature name='xfd'/> <feature name='xsaves'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model> <blockers model='Skylake-Client'> <feature name='erms'/> <feature name='hle'/> @@ -815,7 +815,7 @@ <feature name='pcid'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v2'>Skylake-Client-IBRS</model> <blockers model='Skylake-Client-IBRS'> <feature name='erms'/> <feature name='hle'/> @@ -824,13 +824,45 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v3'>Skylake-Client-noTSX-IBRS</model> <blockers model='Skylake-Client-noTSX-IBRS'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v1</model> + <blockers model='Skylake-Client-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v2</model> + <blockers model='Skylake-Client-v2'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v3</model> + <blockers model='Skylake-Client-v3'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v4</model> + <blockers model='Skylake-Client-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> 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 a382908512..82a369cf25 100644 --- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml @@ -825,7 +825,7 @@ <feature name='xsavec'/> <feature name='xsaves'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model> <blockers model='Skylake-Client'> <feature name='hle'/> <feature name='invpcid'/> @@ -834,7 +834,7 @@ <feature name='tsc-deadline'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v2'>Skylake-Client-IBRS</model> <blockers model='Skylake-Client-IBRS'> <feature name='hle'/> <feature name='invpcid'/> @@ -844,7 +844,7 @@ <feature name='tsc-deadline'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v3'>Skylake-Client-noTSX-IBRS</model> <blockers model='Skylake-Client-noTSX-IBRS'> <feature name='invpcid'/> <feature name='pcid'/> @@ -852,6 +852,42 @@ <feature name='tsc-deadline'/> <feature name='xsavec'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v1</model> + <blockers model='Skylake-Client-v1'> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='tsc-deadline'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v2</model> + <blockers model='Skylake-Client-v2'> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v3</model> + <blockers model='Skylake-Client-v3'> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v4</model> + <blockers model='Skylake-Client-v4'> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml index 83d5e8bbef..fa030eb235 100644 --- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml @@ -806,7 +806,7 @@ <feature name='xfd'/> <feature name='xsaves'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model> <blockers model='Skylake-Client'> <feature name='erms'/> <feature name='hle'/> @@ -814,7 +814,7 @@ <feature name='pcid'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v2'>Skylake-Client-IBRS</model> <blockers model='Skylake-Client-IBRS'> <feature name='erms'/> <feature name='hle'/> @@ -823,13 +823,45 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v3'>Skylake-Client-noTSX-IBRS</model> <blockers model='Skylake-Client-noTSX-IBRS'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v1</model> + <blockers model='Skylake-Client-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v2</model> + <blockers model='Skylake-Client-v2'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v3</model> + <blockers model='Skylake-Client-v3'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v4</model> + <blockers model='Skylake-Client-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> 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 3f89567e0a..f99ca4b2e6 100644 --- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml @@ -943,7 +943,7 @@ <feature name='vpclmulqdq'/> <feature name='xsaves'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model> <blockers model='Skylake-Client'> <feature name='erms'/> <feature name='hle'/> @@ -951,7 +951,7 @@ <feature name='pcid'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v2'>Skylake-Client-IBRS</model> <blockers model='Skylake-Client-IBRS'> <feature name='erms'/> <feature name='hle'/> @@ -960,13 +960,45 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v3'>Skylake-Client-noTSX-IBRS</model> <blockers model='Skylake-Client-noTSX-IBRS'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v1</model> + <blockers model='Skylake-Client-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v2</model> + <blockers model='Skylake-Client-v2'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v3</model> + <blockers model='Skylake-Client-v3'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v4</model> + <blockers model='Skylake-Client-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> 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 f2db7c9e9e..1f38493b16 100644 --- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml @@ -930,7 +930,7 @@ <feature name='xsavec'/> <feature name='xsaves'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model> <blockers model='Skylake-Client'> <feature name='hle'/> <feature name='invpcid'/> @@ -939,7 +939,7 @@ <feature name='tsc-deadline'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v2'>Skylake-Client-IBRS</model> <blockers model='Skylake-Client-IBRS'> <feature name='hle'/> <feature name='invpcid'/> @@ -949,7 +949,7 @@ <feature name='tsc-deadline'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v3'>Skylake-Client-noTSX-IBRS</model> <blockers model='Skylake-Client-noTSX-IBRS'> <feature name='invpcid'/> <feature name='pcid'/> @@ -957,6 +957,42 @@ <feature name='tsc-deadline'/> <feature name='xsavec'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v1</model> + <blockers model='Skylake-Client-v1'> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='tsc-deadline'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v2</model> + <blockers model='Skylake-Client-v2'> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v3</model> + <blockers model='Skylake-Client-v3'> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v4</model> + <blockers model='Skylake-Client-v4'> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml index eca4245c4b..a89a36b9b1 100644 --- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml @@ -942,7 +942,7 @@ <feature name='vpclmulqdq'/> <feature name='xsaves'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model> <blockers model='Skylake-Client'> <feature name='erms'/> <feature name='hle'/> @@ -950,7 +950,7 @@ <feature name='pcid'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v2'>Skylake-Client-IBRS</model> <blockers model='Skylake-Client-IBRS'> <feature name='erms'/> <feature name='hle'/> @@ -959,13 +959,45 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v3'>Skylake-Client-noTSX-IBRS</model> <blockers model='Skylake-Client-noTSX-IBRS'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v1</model> + <blockers model='Skylake-Client-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v2</model> + <blockers model='Skylake-Client-v2'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v3</model> + <blockers model='Skylake-Client-v3'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v4</model> + <blockers model='Skylake-Client-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> 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 980bc162b9..3f5ab7b44d 100644 --- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml @@ -943,7 +943,7 @@ <feature name='vpclmulqdq'/> <feature name='xsaves'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model> <blockers model='Skylake-Client'> <feature name='erms'/> <feature name='hle'/> @@ -951,7 +951,7 @@ <feature name='pcid'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v2'>Skylake-Client-IBRS</model> <blockers model='Skylake-Client-IBRS'> <feature name='erms'/> <feature name='hle'/> @@ -960,13 +960,45 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v3'>Skylake-Client-noTSX-IBRS</model> <blockers model='Skylake-Client-noTSX-IBRS'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v1</model> + <blockers model='Skylake-Client-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v2</model> + <blockers model='Skylake-Client-v2'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v3</model> + <blockers model='Skylake-Client-v3'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v4</model> + <blockers model='Skylake-Client-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> 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 3960ab67f8..146d166ff7 100644 --- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml @@ -930,7 +930,7 @@ <feature name='xsavec'/> <feature name='xsaves'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model> <blockers model='Skylake-Client'> <feature name='hle'/> <feature name='invpcid'/> @@ -939,7 +939,7 @@ <feature name='tsc-deadline'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v2'>Skylake-Client-IBRS</model> <blockers model='Skylake-Client-IBRS'> <feature name='hle'/> <feature name='invpcid'/> @@ -949,7 +949,7 @@ <feature name='tsc-deadline'/> <feature name='xsavec'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v3'>Skylake-Client-noTSX-IBRS</model> <blockers model='Skylake-Client-noTSX-IBRS'> <feature name='invpcid'/> <feature name='pcid'/> @@ -957,6 +957,42 @@ <feature name='tsc-deadline'/> <feature name='xsavec'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v1</model> + <blockers model='Skylake-Client-v1'> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='tsc-deadline'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v2</model> + <blockers model='Skylake-Client-v2'> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v3</model> + <blockers model='Skylake-Client-v3'> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='xsavec'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v4</model> + <blockers model='Skylake-Client-v4'> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='xsavec'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml index 5a177fd1ed..6b18f6a9ad 100644 --- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml @@ -942,7 +942,7 @@ <feature name='vpclmulqdq'/> <feature name='xsaves'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model> <blockers model='Skylake-Client'> <feature name='erms'/> <feature name='hle'/> @@ -950,7 +950,7 @@ <feature name='pcid'/> <feature name='rtm'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v2'>Skylake-Client-IBRS</model> <blockers model='Skylake-Client-IBRS'> <feature name='erms'/> <feature name='hle'/> @@ -959,13 +959,45 @@ <feature name='rtm'/> <feature name='spec-ctrl'/> </blockers> - <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model> + <model usable='no' vendor='Intel' canonical='Skylake-Client-v3'>Skylake-Client-noTSX-IBRS</model> <blockers model='Skylake-Client-noTSX-IBRS'> <feature name='erms'/> <feature name='invpcid'/> <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v1</model> + <blockers model='Skylake-Client-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v2</model> + <blockers model='Skylake-Client-v2'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v3</model> + <blockers model='Skylake-Client-v3'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> + <model usable='no' vendor='Intel'>Skylake-Client-v4</model> + <blockers model='Skylake-Client-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='xsaves'/> + </blockers> <model usable='no' vendor='Intel' canonical='Skylake-Server-v1'>Skylake-Server</model> <blockers model='Skylake-Server'> <feature name='avx512bw'/> -- 2.47.0