Signed-off-by: Jiri Denemark <jdenemar@xxxxxxxxxx>
---
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 | 141 ++++++++++++++++++
src/cpu_map/x86_Skylake-Client-v3.xml | 139 +++++++++++++++++
src/cpu_map/x86_Skylake-Client-v4.xml | 141 ++++++++++++++++++
.../x86_64-cpuid-Core-i7-8550U-json.xml | 72 +--------
.../domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 24 +++
.../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 48 ++++++
tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 24 +++
.../domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 24 +++
.../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 48 ++++++
tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 24 +++
.../domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 31 ++++
.../domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 64 ++++++++
tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 31 ++++
.../domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 31 ++++
.../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 64 ++++++++
tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 31 ++++
.../domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 31 ++++
.../domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 64 ++++++++
tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 31 ++++
.../domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 31 ++++
.../domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 64 ++++++++
tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 31 ++++
.../domaincapsdata/qemu_7.2.0-q35.x86_64.xml | 31 ++++
.../qemu_7.2.0-tcg.x86_64+hvf.xml | 48 ++++++
.../domaincapsdata/qemu_7.2.0-tcg.x86_64.xml | 48 ++++++
tests/domaincapsdata/qemu_7.2.0.x86_64.xml | 31 ++++
.../domaincapsdata/qemu_8.0.0-q35.x86_64.xml | 31 ++++
.../domaincapsdata/qemu_8.0.0-tcg.x86_64.xml | 48 ++++++
tests/domaincapsdata/qemu_8.0.0.x86_64.xml | 31 ++++
.../domaincapsdata/qemu_8.1.0-q35.x86_64.xml | 32 ++++
.../domaincapsdata/qemu_8.1.0-tcg.x86_64.xml | 40 +++++
tests/domaincapsdata/qemu_8.1.0.x86_64.xml | 32 ++++
.../domaincapsdata/qemu_8.2.0-q35.x86_64.xml | 32 ++++
.../domaincapsdata/qemu_8.2.0-tcg.x86_64.xml | 40 +++++
tests/domaincapsdata/qemu_8.2.0.x86_64.xml | 32 ++++
.../domaincapsdata/qemu_9.0.0-q35.x86_64.xml | 32 ++++
.../domaincapsdata/qemu_9.0.0-tcg.x86_64.xml | 36 +++++
tests/domaincapsdata/qemu_9.0.0.x86_64.xml | 32 ++++
.../domaincapsdata/qemu_9.1.0-q35.x86_64.xml | 32 ++++
.../domaincapsdata/qemu_9.1.0-tcg.x86_64.xml | 36 +++++
tests/domaincapsdata/qemu_9.1.0.x86_64.xml | 32 ++++
.../domaincapsdata/qemu_9.2.0-q35.x86_64.xml | 32 ++++
.../domaincapsdata/qemu_9.2.0-tcg.x86_64.xml | 36 +++++
tests/domaincapsdata/qemu_9.2.0.x86_64.xml | 32 ++++
47 files changed, 1910 insertions(+), 69 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 724ded5b3a..fbd335c7ad 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..31e332b371
--- /dev/null
+++ b/src/cpu_map/x86_Skylake-Client-v1.xml
@@ -0,0 +1,6 @@
+<cpus>
+ <model name='Skylake-Client-v1'>
+ <decode host='off' 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..53318d4d9e
--- /dev/null
+++ b/src/cpu_map/x86_Skylake-Client-v2.xml
@@ -0,0 +1,141 @@
+<cpus>
+ <model name='Skylake-Client-v2'>
+ <decode host='on' guest='on'/>
+ <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='hle'/>
+ <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='rtm'/>
+ <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='x2apic'/>
+ <feature name='xgetbv1'/>
+ <feature name='xsave'/>
+ <feature name='xsavec'/>
+ <feature name='xsaveopt'/>
+ </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..43effca568
--- /dev/null
+++ b/src/cpu_map/x86_Skylake-Client-v3.xml
@@ -0,0 +1,139 @@
+<cpus>
+ <model name='Skylake-Client-v3'>
+ <decode host='on' guest='on'/>
+ <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='x2apic'/>
+ <feature name='xgetbv1'/>
+ <feature name='xsave'/>
+ <feature name='xsavec'/>
+ <feature name='xsaveopt'/>
+ </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..456366a870
--- /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='on'/>
+ <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-i7-8550U-json.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-json.xml
index 662e88bc3b..7c9347e65b 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-json.xml
@@ -1,5 +1,5 @@
<cpu mode='custom' match='exact'>
- <model fallback='forbid'>Skylake-Client-IBRS</model>
+ <model fallback='forbid'>Skylake-Client-v3</model>
<vendor>Intel</vendor>
<feature policy='require' name='vmx'/>
<feature policy='require' name='hypervisor'/>
@@ -16,75 +16,9 @@
<feature policy='require' name='pdpe1gb'/>
<feature policy='require' name='skip-l1dfl-vmentry'/>
<feature policy='require' name='pschange-mc-no'/>
- <feature policy='require' name='vmx-ins-outs'/>
- <feature policy='require' name='vmx-true-ctls'/>
- <feature policy='require' name='vmx-store-lma'/>
- <feature policy='require' name='vmx-activity-hlt'/>
- <feature policy='require' name='vmx-vmwrite-vmexit-fields'/>
- <feature policy='require' name='vmx-apicv-xapic'/>
- <feature policy='require' name='vmx-ept'/>
- <feature policy='require' name='vmx-desc-exit'/>
- <feature policy='require' name='vmx-rdtscp-exit'/>
<feature policy='require' name='vmx-apicv-x2apic'/>
- <feature policy='require' name='vmx-vpid'/>
- <feature policy='require' name='vmx-wbinvd-exit'/>
- <feature policy='require' name='vmx-unrestricted-guest'/>
- <feature policy='require' name='vmx-rdrand-exit'/>
- <feature policy='require' name='vmx-invpcid-exit'/>
- <feature policy='require' name='vmx-vmfunc'/>
- <feature policy='require' name='vmx-shadow-vmcs'/>
- <feature policy='require' name='vmx-rdseed-exit'/>
- <feature policy='require' name='vmx-pml'/>
<feature policy='require' name='vmx-xsaves'/>
- <feature policy='require' name='vmx-ept-execonly'/>
- <feature policy='require' name='vmx-page-walk-4'/>
- <feature policy='require' name='vmx-ept-2mb'/>
- <feature policy='require' name='vmx-ept-1gb'/>
- <feature policy='require' name='vmx-invept'/>
- <feature policy='require' name='vmx-eptad'/>
- <feature policy='require' name='vmx-invept-single-context'/>
- <feature policy='require' name='vmx-invept-all-context'/>
<feature policy='require' name='vmx-invvpid'/>
- <feature policy='require' name='vmx-invvpid-single-addr'/>
- <feature policy='require' name='vmx-invvpid-all-context'/>
- <feature policy='require' name='vmx-invvpid-single-context-noglobals'/>
- <feature policy='require' name='vmx-intr-exit'/>
- <feature policy='require' name='vmx-nmi-exit'/>
- <feature policy='require' name='vmx-vnmi'/>
- <feature policy='require' name='vmx-preemption-timer'/>
- <feature policy='require' name='vmx-vintr-pending'/>
- <feature policy='require' name='vmx-tsc-offset'/>
- <feature policy='require' name='vmx-hlt-exit'/>
- <feature policy='require' name='vmx-invlpg-exit'/>
- <feature policy='require' name='vmx-mwait-exit'/>
- <feature policy='require' name='vmx-rdpmc-exit'/>
- <feature policy='require' name='vmx-rdtsc-exit'/>
- <feature policy='require' name='vmx-cr3-load-noexit'/>
- <feature policy='require' name='vmx-cr3-store-noexit'/>
- <feature policy='require' name='vmx-cr8-load-exit'/>
- <feature policy='require' name='vmx-cr8-store-exit'/>
- <feature policy='require' name='vmx-flexpriority'/>
- <feature policy='require' name='vmx-vnmi-pending'/>
- <feature policy='require' name='vmx-movdr-exit'/>
- <feature policy='require' name='vmx-io-exit'/>
- <feature policy='require' name='vmx-io-bitmap'/>
- <feature policy='require' name='vmx-mtf'/>
- <feature policy='require' name='vmx-msr-bitmap'/>
- <feature policy='require' name='vmx-monitor-exit'/>
- <feature policy='require' name='vmx-pause-exit'/>
- <feature policy='require' name='vmx-secondary-ctls'/>
- <feature policy='require' name='vmx-exit-nosave-debugctl'/>
- <feature policy='require' name='vmx-exit-ack-intr'/>
- <feature policy='require' name='vmx-exit-save-pat'/>
- <feature policy='require' name='vmx-exit-load-pat'/>
- <feature policy='require' name='vmx-exit-save-efer'/>
- <feature policy='require' name='vmx-exit-load-efer'/>
- <feature policy='require' name='vmx-exit-save-preemption-timer'/>
- <feature policy='require' name='vmx-entry-noload-debugctl'/>
- <feature policy='require' name='vmx-entry-ia32e-mode'/>
- <feature policy='require' name='vmx-entry-load-pat'/>
- <feature policy='require' name='vmx-entry-load-efer'/>
- <feature policy='require' name='vmx-eptp-switching'/>
- <feature policy='disable' name='hle'/>
- <feature policy='disable' name='rtm'/>
+ <feature policy='disable' name='vmx-exit-load-perf-global-ctrl'/>
+ <feature policy='disable' name='vmx-entry-load-perf-global-ctrl'/>
</cpu>
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 80a07f0199..5cd2d7f7c6 100644
--- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
@@ -494,6 +494,30 @@
<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-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 4b0ad22767..e6904cbf60 100644
--- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
@@ -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'>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 80f52d399c..3ff13864d2 100644
--- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
@@ -493,6 +493,30 @@
<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-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 311dc3bec5..6a8c2f0aef 100644
--- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
@@ -503,6 +503,30 @@
<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-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 fc9e7df6e9..699c3935c0 100644
--- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
@@ -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'>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 ed51ab588f..13f6c9f3f8 100644
--- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
@@ -502,6 +502,30 @@
<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-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 bd282571cc..bfc71b1cb5 100644
--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
@@ -567,6 +567,37 @@
<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'>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 2fe5843cb7..69a4adfbac 100644
--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
@@ -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'>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 f625e04725..b98b011503 100644
--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
@@ -566,6 +566,37 @@
<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'>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 ef7e29856e..9ddfe44b60 100644
--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
@@ -564,6 +564,37 @@
<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'>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 2a1a863229..6f8fa1deaf 100644
--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
@@ -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'>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 8d486bce46..f5da4c5f90 100644
--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
@@ -563,6 +563,37 @@
<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'>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 5e525d0450..eced40d3f6 100644
--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
@@ -591,6 +591,37 @@
<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'>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 fad7b4f3e5..7cf7b321f5 100644
--- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
@@ -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'>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 39ff2781b6..052094d0d0 100644
--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
@@ -590,6 +590,37 @@
<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'>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 3f0b0ade04..80a00333ba 100644
--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
@@ -558,6 +558,37 @@
<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'>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 9d043689fa..8a2c3574d5 100644
--- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
@@ -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'>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 57540eaa76..aafd72ad39 100644
--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
@@ -557,6 +557,37 @@
<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'>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 e4f856c861..edfa1faf94 100644
--- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
@@ -563,6 +563,37 @@
<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'>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 f94113cb0e..b964c6b43d 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
@@ -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'>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 f94113cb0e..b964c6b43d 100644
--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
@@ -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'>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 2441407afa..dba42a80de 100644
--- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
@@ -562,6 +562,37 @@
<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'>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 d346c724b0..e0c238248f 100644
--- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
@@ -645,6 +645,37 @@
<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'>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 7068774b4c..d23c883b3f 100644
--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
@@ -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'>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 e2879002a5..843ec89c7e 100644
--- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
@@ -644,6 +644,37 @@
<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'>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 6be32db944..1153e223c2 100644
--- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
@@ -830,6 +830,38 @@
<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'>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 507e119767..8fff9a064e 100644
--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
@@ -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'>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 55b0a8ac6a..b25f5914d4 100644
--- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
@@ -829,6 +829,38 @@
<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'>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 132efb248a..ed377ae8d8 100644
--- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
@@ -831,6 +831,38 @@
<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'>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 5c17dc51af..9f667279c0 100644
--- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
@@ -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'>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 bdc0774f93..8699375034 100644
--- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
@@ -830,6 +830,38 @@
<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'>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 7613a8469d..a3c842b990 100644
--- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
@@ -831,6 +831,38 @@
<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'>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 d152a1e157..5860da8e01 100644
--- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
@@ -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'>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 b597a3b6b5..da9f7265ef 100644
--- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
@@ -830,6 +830,38 @@
<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'>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 0afea61f3b..dfa7ad5b0f 100644
--- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
@@ -967,6 +967,38 @@
<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'>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 1fabd983a9..b1bc5d6f4e 100644
--- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
@@ -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'>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 b4c10e462e..65cbefa89f 100644
--- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
@@ -966,6 +966,38 @@
<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'>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 b9006218f8..15285ad300 100644
--- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
@@ -967,6 +967,38 @@
<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'>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 f8ebe7c194..171894295b 100644
--- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
@@ -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'>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 c13bd40de9..60d336ecfc 100644
--- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
@@ -966,6 +966,38 @@
<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'>Skylake-Server</model>
<blockers model='Skylake-Server'>
<feature name='avx512bw'/>
--
2.47.0
