[PATCH 24/32] cpu_map: Add versions of Haswell CPU model

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- src/cpu_map/index.xml | 4 + src/cpu_map/meson.build | 4 + src/cpu_map/x86_Haswell-v1.xml | 6 + src/cpu_map/x86_Haswell-v2.xml | 134 +++++++++++++++++ src/cpu_map/x86_Haswell-v3.xml | 137 ++++++++++++++++++ src/cpu_map/x86_Haswell-v4.xml | 135 +++++++++++++++++ .../domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 30 ++++ .../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 50 +++++++ 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 | 50 +++++++ tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 30 ++++ .../domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 30 ++++ .../domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 50 +++++++ tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 30 ++++ .../domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 30 ++++ .../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 50 +++++++ tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 30 ++++ .../domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 30 ++++ .../domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 50 +++++++ tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 30 ++++ .../domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 30 ++++ .../domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 50 +++++++ tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 30 ++++ .../domaincapsdata/qemu_7.2.0-q35.x86_64.xml | 30 ++++ .../qemu_7.2.0-tcg.x86_64+hvf.xml | 34 +++++ .../domaincapsdata/qemu_7.2.0-tcg.x86_64.xml | 34 +++++ tests/domaincapsdata/qemu_7.2.0.x86_64.xml | 30 ++++ .../domaincapsdata/qemu_8.0.0-q35.x86_64.xml | 30 ++++ .../domaincapsdata/qemu_8.0.0-tcg.x86_64.xml | 34 +++++ tests/domaincapsdata/qemu_8.0.0.x86_64.xml | 30 ++++ .../domaincapsdata/qemu_8.1.0-q35.x86_64.xml | 30 ++++ .../domaincapsdata/qemu_8.1.0-tcg.x86_64.xml | 34 +++++ tests/domaincapsdata/qemu_8.1.0.x86_64.xml | 30 ++++ .../domaincapsdata/qemu_8.2.0-q35.x86_64.xml | 30 ++++ .../domaincapsdata/qemu_8.2.0-tcg.x86_64.xml | 34 +++++ tests/domaincapsdata/qemu_8.2.0.x86_64.xml | 30 ++++ .../domaincapsdata/qemu_9.0.0-q35.x86_64.xml | 30 ++++ .../domaincapsdata/qemu_9.0.0-tcg.x86_64.xml | 30 ++++ tests/domaincapsdata/qemu_9.0.0.x86_64.xml | 30 ++++ .../domaincapsdata/qemu_9.1.0-q35.x86_64.xml | 30 ++++ .../domaincapsdata/qemu_9.1.0-tcg.x86_64.xml | 30 ++++ tests/domaincapsdata/qemu_9.1.0.x86_64.xml | 30 ++++ .../domaincapsdata/qemu_9.2.0-q35.x86_64.xml | 30 ++++ .../domaincapsdata/qemu_9.2.0-tcg.x86_64.xml | 30 ++++ tests/domaincapsdata/qemu_9.2.0.x86_64.xml | 30 ++++ .../cpu-Haswell.x86_64-latest.args | 2 +- .../cpu-Haswell.x86_64-latest.xml | 2 +- .../cpu-Haswell2.x86_64-latest.args | 2 +- .../cpu-Haswell2.x86_64-latest.xml | 2 +- .../cpu-Haswell3.x86_64-latest.args | 2 +- .../cpu-Haswell3.x86_64-latest.xml | 2 +- .../cpu-strict1.x86_64-latest.args | 2 +- .../cpu-strict1.x86_64-latest.xml | 2 +- .../cpu-translation.x86_64-latest.args | 2 +- .../cpu-translation.x86_64-latest.xml | 2 +- 56 files changed, 1770 insertions(+), 10 deletions(-) create mode 100644 src/cpu_map/x86_Haswell-v1.xml create mode 100644 src/cpu_map/x86_Haswell-v2.xml create mode 100644 src/cpu_map/x86_Haswell-v3.xml create mode 100644 src/cpu_map/x86_Haswell-v4.xml diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml index 50ffa70f39..ab20043839 100644 --- a/src/cpu_map/index.xml +++ b/src/cpu_map/index.xml @@ -41,6 +41,10 @@ <include filename='x86_Haswell-noTSX-IBRS.xml'/> <include filename='x86_Haswell.xml'/> <include filename='x86_Haswell-IBRS.xml'/> + <include filename='x86_Haswell-v1.xml'/> + <include filename='x86_Haswell-v2.xml'/> + <include filename='x86_Haswell-v3.xml'/> + <include filename='x86_Haswell-v4.xml'/> <include filename='x86_Broadwell-noTSX.xml'/> <include filename='x86_Broadwell-noTSX-IBRS.xml'/> <include filename='x86_Broadwell.xml'/> diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build index 410f29f505..e230ade8f0 100644 --- a/src/cpu_map/meson.build +++ b/src/cpu_map/meson.build @@ -59,6 +59,10 @@ cpumap_data = [ 'x86_Haswell-IBRS.xml', 'x86_Haswell-noTSX-IBRS.xml', 'x86_Haswell-noTSX.xml', + 'x86_Haswell-v1.xml', + 'x86_Haswell-v2.xml', + 'x86_Haswell-v3.xml', + 'x86_Haswell-v4.xml', 'x86_Haswell.xml', 'x86_Icelake-Client-noTSX.xml', 'x86_Icelake-Client.xml', diff --git a/src/cpu_map/x86_Haswell-v1.xml b/src/cpu_map/x86_Haswell-v1.xml new file mode 100644 index 0000000000..faa454220b --- /dev/null +++ b/src/cpu_map/x86_Haswell-v1.xml @@ -0,0 +1,6 @@ +<cpus> + <model name='Haswell-v1'> + <decode host='off' guest='off'/> + <model name='Haswell'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_Haswell-v2.xml b/src/cpu_map/x86_Haswell-v2.xml new file mode 100644 index 0000000000..71c1135ad4 --- /dev/null +++ b/src/cpu_map/x86_Haswell-v2.xml @@ -0,0 +1,134 @@ +<cpus> + <model name='Haswell-v2'> + <decode host='on' guest='on'/> + <signature family='6' model='60'/> + <signature family='6' model='63'/> + <signature family='6' model='69'/> + <signature family='6' model='70'/> + <vendor name='Intel'/> + <feature name='abm'/> + <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='rdtscp'/> + <feature name='sep'/> + <feature name='smep'/> + <feature name='sse'/> + <feature name='sse2'/> + <feature name='sse4.1'/> + <feature name='sse4.2'/> + <feature name='ssse3'/> + <feature name='syscall'/> + <feature name='tsc'/> + <feature name='tsc-deadline'/> + <feature name='vme'/> + <feature name='vmx-activity-hlt'/> + <feature name='vmx-apicv-register'/> + <feature name='vmx-apicv-vid'/> + <feature name='vmx-apicv-x2apic'/> + <feature name='vmx-apicv-xapic'/> + <feature name='vmx-cr3-load-noexit'/> + <feature name='vmx-cr3-store-noexit'/> + <feature name='vmx-cr8-load-exit'/> + <feature name='vmx-cr8-store-exit'/> + <feature name='vmx-desc-exit'/> + <feature name='vmx-entry-ia32e-mode'/> + <feature name='vmx-entry-load-efer'/> + <feature name='vmx-entry-load-pat'/> + <feature name='vmx-entry-load-perf-global-ctrl'/> + <feature name='vmx-entry-noload-debugctl'/> + <feature name='vmx-ept'/> + <feature name='vmx-ept-1gb'/> + <feature name='vmx-ept-2mb'/> + <feature name='vmx-ept-execonly'/> + <feature name='vmx-eptad'/> + <feature name='vmx-eptp-switching'/> + <feature name='vmx-exit-ack-intr'/> + <feature name='vmx-exit-load-efer'/> + <feature name='vmx-exit-load-pat'/> + <feature name='vmx-exit-load-perf-global-ctrl'/> + <feature name='vmx-exit-nosave-debugctl'/> + <feature name='vmx-exit-save-efer'/> + <feature name='vmx-exit-save-pat'/> + <feature name='vmx-exit-save-preemption-timer'/> + <feature name='vmx-flexpriority'/> + <feature name='vmx-hlt-exit'/> + <feature name='vmx-ins-outs'/> + <feature name='vmx-intr-exit'/> + <feature name='vmx-invept'/> + <feature name='vmx-invept-all-context'/> + <feature name='vmx-invept-single-context'/> + <feature name='vmx-invlpg-exit'/> + <feature name='vmx-invpcid-exit'/> + <feature name='vmx-invvpid-all-context'/> + <feature name='vmx-invvpid-single-addr'/> + <feature name='vmx-invvpid-single-context-noglobals'/> + <feature name='vmx-io-bitmap'/> + <feature name='vmx-io-exit'/> + <feature name='vmx-monitor-exit'/> + <feature name='vmx-movdr-exit'/> + <feature name='vmx-msr-bitmap'/> + <feature name='vmx-mtf'/> + <feature name='vmx-mwait-exit'/> + <feature name='vmx-nmi-exit'/> + <feature name='vmx-page-walk-4'/> + <feature name='vmx-pause-exit'/> + <feature name='vmx-posted-intr'/> + <feature name='vmx-preemption-timer'/> + <feature name='vmx-rdpmc-exit'/> + <feature name='vmx-rdrand-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='xsave'/> + <feature name='xsaveopt'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_Haswell-v3.xml b/src/cpu_map/x86_Haswell-v3.xml new file mode 100644 index 0000000000..283e4b82cf --- /dev/null +++ b/src/cpu_map/x86_Haswell-v3.xml @@ -0,0 +1,137 @@ +<cpus> + <model name='Haswell-v3'> + <decode host='on' guest='on'/> + <signature family='6' model='60'/> + <signature family='6' model='63'/> + <signature family='6' model='69'/> + <signature family='6' model='70'/> + <vendor name='Intel'/> + <feature name='abm'/> + <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='rdtscp'/> + <feature name='rtm'/> + <feature name='sep'/> + <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-register'/> + <feature name='vmx-apicv-vid'/> + <feature name='vmx-apicv-x2apic'/> + <feature name='vmx-apicv-xapic'/> + <feature name='vmx-cr3-load-noexit'/> + <feature name='vmx-cr3-store-noexit'/> + <feature name='vmx-cr8-load-exit'/> + <feature name='vmx-cr8-store-exit'/> + <feature name='vmx-desc-exit'/> + <feature name='vmx-entry-ia32e-mode'/> + <feature name='vmx-entry-load-efer'/> + <feature name='vmx-entry-load-pat'/> + <feature name='vmx-entry-load-perf-global-ctrl'/> + <feature name='vmx-entry-noload-debugctl'/> + <feature name='vmx-ept'/> + <feature name='vmx-ept-1gb'/> + <feature name='vmx-ept-2mb'/> + <feature name='vmx-ept-execonly'/> + <feature name='vmx-eptad'/> + <feature name='vmx-eptp-switching'/> + <feature name='vmx-exit-ack-intr'/> + <feature name='vmx-exit-load-efer'/> + <feature name='vmx-exit-load-pat'/> + <feature name='vmx-exit-load-perf-global-ctrl'/> + <feature name='vmx-exit-nosave-debugctl'/> + <feature name='vmx-exit-save-efer'/> + <feature name='vmx-exit-save-pat'/> + <feature name='vmx-exit-save-preemption-timer'/> + <feature name='vmx-flexpriority'/> + <feature name='vmx-hlt-exit'/> + <feature name='vmx-ins-outs'/> + <feature name='vmx-intr-exit'/> + <feature name='vmx-invept'/> + <feature name='vmx-invept-all-context'/> + <feature name='vmx-invept-single-context'/> + <feature name='vmx-invlpg-exit'/> + <feature name='vmx-invpcid-exit'/> + <feature name='vmx-invvpid-all-context'/> + <feature name='vmx-invvpid-single-addr'/> + <feature name='vmx-invvpid-single-context-noglobals'/> + <feature name='vmx-io-bitmap'/> + <feature name='vmx-io-exit'/> + <feature name='vmx-monitor-exit'/> + <feature name='vmx-movdr-exit'/> + <feature name='vmx-msr-bitmap'/> + <feature name='vmx-mtf'/> + <feature name='vmx-mwait-exit'/> + <feature name='vmx-nmi-exit'/> + <feature name='vmx-page-walk-4'/> + <feature name='vmx-pause-exit'/> + <feature name='vmx-posted-intr'/> + <feature name='vmx-preemption-timer'/> + <feature name='vmx-rdpmc-exit'/> + <feature name='vmx-rdrand-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='xsave'/> + <feature name='xsaveopt'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_Haswell-v4.xml b/src/cpu_map/x86_Haswell-v4.xml new file mode 100644 index 0000000000..8c7938013b --- /dev/null +++ b/src/cpu_map/x86_Haswell-v4.xml @@ -0,0 +1,135 @@ +<cpus> + <model name='Haswell-v4'> + <decode host='on' guest='on'/> + <signature family='6' model='60'/> + <signature family='6' model='63'/> + <signature family='6' model='69'/> + <signature family='6' model='70'/> + <vendor name='Intel'/> + <feature name='abm'/> + <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='rdtscp'/> + <feature name='sep'/> + <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-register'/> + <feature name='vmx-apicv-vid'/> + <feature name='vmx-apicv-x2apic'/> + <feature name='vmx-apicv-xapic'/> + <feature name='vmx-cr3-load-noexit'/> + <feature name='vmx-cr3-store-noexit'/> + <feature name='vmx-cr8-load-exit'/> + <feature name='vmx-cr8-store-exit'/> + <feature name='vmx-desc-exit'/> + <feature name='vmx-entry-ia32e-mode'/> + <feature name='vmx-entry-load-efer'/> + <feature name='vmx-entry-load-pat'/> + <feature name='vmx-entry-load-perf-global-ctrl'/> + <feature name='vmx-entry-noload-debugctl'/> + <feature name='vmx-ept'/> + <feature name='vmx-ept-1gb'/> + <feature name='vmx-ept-2mb'/> + <feature name='vmx-ept-execonly'/> + <feature name='vmx-eptad'/> + <feature name='vmx-eptp-switching'/> + <feature name='vmx-exit-ack-intr'/> + <feature name='vmx-exit-load-efer'/> + <feature name='vmx-exit-load-pat'/> + <feature name='vmx-exit-load-perf-global-ctrl'/> + <feature name='vmx-exit-nosave-debugctl'/> + <feature name='vmx-exit-save-efer'/> + <feature name='vmx-exit-save-pat'/> + <feature name='vmx-exit-save-preemption-timer'/> + <feature name='vmx-flexpriority'/> + <feature name='vmx-hlt-exit'/> + <feature name='vmx-ins-outs'/> + <feature name='vmx-intr-exit'/> + <feature name='vmx-invept'/> + <feature name='vmx-invept-all-context'/> + <feature name='vmx-invept-single-context'/> + <feature name='vmx-invlpg-exit'/> + <feature name='vmx-invpcid-exit'/> + <feature name='vmx-invvpid-all-context'/> + <feature name='vmx-invvpid-single-addr'/> + <feature name='vmx-invvpid-single-context-noglobals'/> + <feature name='vmx-io-bitmap'/> + <feature name='vmx-io-exit'/> + <feature name='vmx-monitor-exit'/> + <feature name='vmx-movdr-exit'/> + <feature name='vmx-msr-bitmap'/> + <feature name='vmx-mtf'/> + <feature name='vmx-mwait-exit'/> + <feature name='vmx-nmi-exit'/> + <feature name='vmx-page-walk-4'/> + <feature name='vmx-pause-exit'/> + <feature name='vmx-posted-intr'/> + <feature name='vmx-preemption-timer'/> + <feature name='vmx-rdpmc-exit'/> + <feature name='vmx-rdrand-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='xsave'/> + <feature name='xsaveopt'/> + </model> +</cpus> 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 8c17b700fb..16becefae8 100644 --- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml @@ -290,6 +290,36 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Haswell-v1</model> + <blockers model='Haswell-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v2</model> + <blockers model='Haswell-v2'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v3</model> + <blockers model='Haswell-v3'> + <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'>Haswell-v4</model> + <blockers model='Haswell-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client</model> <blockers model='Icelake-Client'> <feature name='avx512-vpopcntdq'/> 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 ca355c8da0..cc6cb95848 100644 --- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml @@ -540,6 +540,56 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> + <model usable='no' vendor='Intel'>Haswell-v1</model> + <blockers model='Haswell-v1'> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v2</model> + <blockers model='Haswell-v2'> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v3</model> + <blockers model='Haswell-v3'> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v4</model> + <blockers model='Haswell-v4'> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client</model> <blockers model='Icelake-Client'> <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 ad24cb1747..a8fe2afbbb 100644 --- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml @@ -289,6 +289,36 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Haswell-v1</model> + <blockers model='Haswell-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v2</model> + <blockers model='Haswell-v2'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v3</model> + <blockers model='Haswell-v3'> + <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'>Haswell-v4</model> + <blockers model='Haswell-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client</model> <blockers model='Icelake-Client'> <feature name='avx512-vpopcntdq'/> 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 50dce43183..0dee658c07 100644 --- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml @@ -299,6 +299,36 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Haswell-v1</model> + <blockers model='Haswell-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v2</model> + <blockers model='Haswell-v2'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v3</model> + <blockers model='Haswell-v3'> + <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'>Haswell-v4</model> + <blockers model='Haswell-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client</model> <blockers model='Icelake-Client'> <feature name='avx512-vpopcntdq'/> 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 0dcbe795b5..09fec2a421 100644 --- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml @@ -572,6 +572,56 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> + <model usable='no' vendor='Intel'>Haswell-v1</model> + <blockers model='Haswell-v1'> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v2</model> + <blockers model='Haswell-v2'> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v3</model> + <blockers model='Haswell-v3'> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v4</model> + <blockers model='Haswell-v4'> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client</model> <blockers model='Icelake-Client'> <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 89751475fe..5c0b671e45 100644 --- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml @@ -298,6 +298,36 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Haswell-v1</model> + <blockers model='Haswell-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v2</model> + <blockers model='Haswell-v2'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v3</model> + <blockers model='Haswell-v3'> + <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'>Haswell-v4</model> + <blockers model='Haswell-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client</model> <blockers model='Icelake-Client'> <feature name='avx512-vpopcntdq'/> 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 86d9326ecd..e0bf757475 100644 --- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml @@ -337,6 +337,36 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Haswell-v1</model> + <blockers model='Haswell-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v2</model> + <blockers model='Haswell-v2'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v3</model> + <blockers model='Haswell-v3'> + <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'>Haswell-v4</model> + <blockers model='Haswell-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client</model> <blockers model='Icelake-Client'> <feature name='avx512-vpopcntdq'/> 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 f8b0217649..e650e29bbe 100644 --- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml @@ -637,6 +637,56 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> + <model usable='no' vendor='Intel'>Haswell-v1</model> + <blockers model='Haswell-v1'> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v2</model> + <blockers model='Haswell-v2'> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v3</model> + <blockers model='Haswell-v3'> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v4</model> + <blockers model='Haswell-v4'> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client</model> <blockers model='Icelake-Client'> <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 fef42537ac..f3a10a23aa 100644 --- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml @@ -336,6 +336,36 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Haswell-v1</model> + <blockers model='Haswell-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v2</model> + <blockers model='Haswell-v2'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v3</model> + <blockers model='Haswell-v3'> + <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'>Haswell-v4</model> + <blockers model='Haswell-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client</model> <blockers model='Icelake-Client'> <feature name='avx512-vpopcntdq'/> 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 2bf7ac3b8a..1695f7946d 100644 --- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml @@ -334,6 +334,36 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Haswell-v1</model> + <blockers model='Haswell-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v2</model> + <blockers model='Haswell-v2'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v3</model> + <blockers model='Haswell-v3'> + <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'>Haswell-v4</model> + <blockers model='Haswell-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client</model> <blockers model='Icelake-Client'> <feature name='avx512-vpopcntdq'/> 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 fd218674c6..f51d00d7e2 100644 --- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml @@ -635,6 +635,56 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> + <model usable='no' vendor='Intel'>Haswell-v1</model> + <blockers model='Haswell-v1'> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v2</model> + <blockers model='Haswell-v2'> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v3</model> + <blockers model='Haswell-v3'> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v4</model> + <blockers model='Haswell-v4'> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client</model> <blockers model='Icelake-Client'> <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 e3d2d1a3a7..af129cd01c 100644 --- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml @@ -333,6 +333,36 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Haswell-v1</model> + <blockers model='Haswell-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v2</model> + <blockers model='Haswell-v2'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v3</model> + <blockers model='Haswell-v3'> + <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'>Haswell-v4</model> + <blockers model='Haswell-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client</model> <blockers model='Icelake-Client'> <feature name='avx512-vpopcntdq'/> 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 2843bae33c..1b5edb55b1 100644 --- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml @@ -335,6 +335,36 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Haswell-v1</model> + <blockers model='Haswell-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v2</model> + <blockers model='Haswell-v2'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v3</model> + <blockers model='Haswell-v3'> + <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'>Haswell-v4</model> + <blockers model='Haswell-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client</model> <blockers model='Icelake-Client'> <feature name='avx512-vpopcntdq'/> 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 6b40b0c9ab..391d7dfbb3 100644 --- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml @@ -634,6 +634,56 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> + <model usable='no' vendor='Intel'>Haswell-v1</model> + <blockers model='Haswell-v1'> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v2</model> + <blockers model='Haswell-v2'> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v3</model> + <blockers model='Haswell-v3'> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v4</model> + <blockers model='Haswell-v4'> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client</model> <blockers model='Icelake-Client'> <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 cbd27ae8dd..80a3a03857 100644 --- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml @@ -334,6 +334,36 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Haswell-v1</model> + <blockers model='Haswell-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v2</model> + <blockers model='Haswell-v2'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v3</model> + <blockers model='Haswell-v3'> + <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'>Haswell-v4</model> + <blockers model='Haswell-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client</model> <blockers model='Icelake-Client'> <feature name='avx512-vpopcntdq'/> 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 f111234188..821992dc53 100644 --- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml @@ -336,6 +336,36 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Haswell-v1</model> + <blockers model='Haswell-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v2</model> + <blockers model='Haswell-v2'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v3</model> + <blockers model='Haswell-v3'> + <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'>Haswell-v4</model> + <blockers model='Haswell-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel'>Icelake-Server</model> <blockers model='Icelake-Server'> <feature name='avx512-vpopcntdq'/> 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 420df21170..9765c403bf 100644 --- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml @@ -634,6 +634,56 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> + <model usable='no' vendor='Intel'>Haswell-v1</model> + <blockers model='Haswell-v1'> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v2</model> + <blockers model='Haswell-v2'> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v3</model> + <blockers model='Haswell-v3'> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v4</model> + <blockers model='Haswell-v4'> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> <model usable='no' vendor='Intel'>Icelake-Server</model> <blockers model='Icelake-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 c5f1fbf16e..9ae58a319c 100644 --- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml @@ -335,6 +335,36 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Haswell-v1</model> + <blockers model='Haswell-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v2</model> + <blockers model='Haswell-v2'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v3</model> + <blockers model='Haswell-v3'> + <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'>Haswell-v4</model> + <blockers model='Haswell-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel'>Icelake-Server</model> <blockers model='Icelake-Server'> <feature name='avx512-vpopcntdq'/> 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 32b1d9f682..dcaf7abb7d 100644 --- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml @@ -341,6 +341,36 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Haswell-v1</model> + <blockers model='Haswell-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v2</model> + <blockers model='Haswell-v2'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v3</model> + <blockers model='Haswell-v3'> + <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'>Haswell-v4</model> + <blockers model='Haswell-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel'>Icelake-Server</model> <blockers model='Icelake-Server'> <feature name='avx512-vpopcntdq'/> 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 9e8189ef4a..a29ba56a77 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 @@ -515,6 +515,40 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> + <model usable='no' vendor='Intel'>Haswell-v1</model> + <blockers model='Haswell-v1'> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v2</model> + <blockers model='Haswell-v2'> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v3</model> + <blockers model='Haswell-v3'> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v4</model> + <blockers model='Haswell-v4'> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> <model usable='no' vendor='Intel'>Icelake-Server</model> <blockers model='Icelake-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 9e8189ef4a..a29ba56a77 100644 --- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml @@ -515,6 +515,40 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> + <model usable='no' vendor='Intel'>Haswell-v1</model> + <blockers model='Haswell-v1'> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v2</model> + <blockers model='Haswell-v2'> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v3</model> + <blockers model='Haswell-v3'> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v4</model> + <blockers model='Haswell-v4'> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> <model usable='no' vendor='Intel'>Icelake-Server</model> <blockers model='Icelake-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 25bc84624e..fd8f6bc7e7 100644 --- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml @@ -340,6 +340,36 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Haswell-v1</model> + <blockers model='Haswell-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v2</model> + <blockers model='Haswell-v2'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v3</model> + <blockers model='Haswell-v3'> + <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'>Haswell-v4</model> + <blockers model='Haswell-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel'>Icelake-Server</model> <blockers model='Icelake-Server'> <feature name='avx512-vpopcntdq'/> 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 4b3e131f2c..c5fa4a166b 100644 --- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml @@ -341,6 +341,36 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Haswell-v1</model> + <blockers model='Haswell-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v2</model> + <blockers model='Haswell-v2'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v3</model> + <blockers model='Haswell-v3'> + <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'>Haswell-v4</model> + <blockers model='Haswell-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel'>Icelake-Server</model> <blockers model='Icelake-Server'> <feature name='avx512-vpopcntdq'/> 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 9ec5ce3624..01786e6e13 100644 --- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml @@ -518,6 +518,40 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> + <model usable='no' vendor='Intel'>Haswell-v1</model> + <blockers model='Haswell-v1'> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v2</model> + <blockers model='Haswell-v2'> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v3</model> + <blockers model='Haswell-v3'> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v4</model> + <blockers model='Haswell-v4'> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> <model usable='no' vendor='Intel'>Icelake-Server</model> <blockers model='Icelake-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 6b7c7e59d9..4a0f9e0d96 100644 --- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml @@ -340,6 +340,36 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Haswell-v1</model> + <blockers model='Haswell-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v2</model> + <blockers model='Haswell-v2'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v3</model> + <blockers model='Haswell-v3'> + <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'>Haswell-v4</model> + <blockers model='Haswell-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel'>Icelake-Server</model> <blockers model='Icelake-Server'> <feature name='avx512-vpopcntdq'/> 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 f81cfe481c..6e64d60b2c 100644 --- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml @@ -477,6 +477,36 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Haswell-v1</model> + <blockers model='Haswell-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v2</model> + <blockers model='Haswell-v2'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v3</model> + <blockers model='Haswell-v3'> + <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'>Haswell-v4</model> + <blockers model='Haswell-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel'>Icelake-Server</model> <blockers model='Icelake-Server'> <feature name='avx512-vpopcntdq'/> 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 595076b2ef..5ff608815c 100644 --- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml @@ -551,6 +551,40 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> + <model usable='no' vendor='Intel'>Haswell-v1</model> + <blockers model='Haswell-v1'> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v2</model> + <blockers model='Haswell-v2'> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v3</model> + <blockers model='Haswell-v3'> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v4</model> + <blockers model='Haswell-v4'> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> <model usable='no' vendor='Intel'>Icelake-Server</model> <blockers model='Icelake-Server'> <feature name='avx512-vpopcntdq'/> diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml index cd9aa71c10..e3ee1af930 100644 --- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml @@ -476,6 +476,36 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Haswell-v1</model> + <blockers model='Haswell-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v2</model> + <blockers model='Haswell-v2'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v3</model> + <blockers model='Haswell-v3'> + <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'>Haswell-v4</model> + <blockers model='Haswell-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel'>Icelake-Server</model> <blockers model='Icelake-Server'> <feature name='avx512-vpopcntdq'/> 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 33e98b2726..81a0f0c1cd 100644 --- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml @@ -478,6 +478,36 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Haswell-v1</model> + <blockers model='Haswell-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v2</model> + <blockers model='Haswell-v2'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v3</model> + <blockers model='Haswell-v3'> + <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'>Haswell-v4</model> + <blockers model='Haswell-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel'>Icelake-Server</model> <blockers model='Icelake-Server'> <feature name='avx512-vpopcntdq'/> 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 059080ad4c..bb6068bfa0 100644 --- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml @@ -543,6 +543,40 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> + <model usable='no' vendor='Intel'>Haswell-v1</model> + <blockers model='Haswell-v1'> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v2</model> + <blockers model='Haswell-v2'> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v3</model> + <blockers model='Haswell-v3'> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v4</model> + <blockers model='Haswell-v4'> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> <model usable='no' vendor='Intel'>Icelake-Server</model> <blockers model='Icelake-Server'> <feature name='avx512-vpopcntdq'/> diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml index 297bd9900e..d849aabcba 100644 --- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml @@ -477,6 +477,36 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Haswell-v1</model> + <blockers model='Haswell-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v2</model> + <blockers model='Haswell-v2'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v3</model> + <blockers model='Haswell-v3'> + <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'>Haswell-v4</model> + <blockers model='Haswell-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel'>Icelake-Server</model> <blockers model='Icelake-Server'> <feature name='avx512-vpopcntdq'/> 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 6c9564bf40..7fed542d4c 100644 --- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml @@ -478,6 +478,36 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Haswell-v1</model> + <blockers model='Haswell-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v2</model> + <blockers model='Haswell-v2'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v3</model> + <blockers model='Haswell-v3'> + <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'>Haswell-v4</model> + <blockers model='Haswell-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel'>Icelake-Server</model> <blockers model='Icelake-Server'> <feature name='avx512-vpopcntdq'/> 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 1b6b286b32..3456d79ec4 100644 --- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml @@ -521,6 +521,36 @@ <feature name='spec-ctrl'/> <feature name='tsc-deadline'/> </blockers> + <model usable='no' vendor='Intel'>Haswell-v1</model> + <blockers model='Haswell-v1'> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='tsc-deadline'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v2</model> + <blockers model='Haswell-v2'> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='tsc-deadline'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v3</model> + <blockers model='Haswell-v3'> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v4</model> + <blockers model='Haswell-v4'> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + </blockers> <model usable='no' vendor='Intel'>Icelake-Server</model> <blockers model='Icelake-Server'> <feature name='avx512-vpopcntdq'/> diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml index f8ec7d2dd8..993ead2871 100644 --- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml @@ -477,6 +477,36 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Haswell-v1</model> + <blockers model='Haswell-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v2</model> + <blockers model='Haswell-v2'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v3</model> + <blockers model='Haswell-v3'> + <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'>Haswell-v4</model> + <blockers model='Haswell-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel'>Icelake-Server</model> <blockers model='Icelake-Server'> <feature name='avx512-vpopcntdq'/> 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 9cf2caa536..9af65c73a3 100644 --- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml @@ -482,6 +482,36 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Haswell-v1</model> + <blockers model='Haswell-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v2</model> + <blockers model='Haswell-v2'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v3</model> + <blockers model='Haswell-v3'> + <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'>Haswell-v4</model> + <blockers model='Haswell-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel'>Icelake-Server</model> <blockers model='Icelake-Server'> <feature name='avx512-vpopcntdq'/> 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 36cdf3db73..ee5a280bdd 100644 --- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml @@ -520,6 +520,36 @@ <feature name='spec-ctrl'/> <feature name='tsc-deadline'/> </blockers> + <model usable='no' vendor='Intel'>Haswell-v1</model> + <blockers model='Haswell-v1'> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='tsc-deadline'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v2</model> + <blockers model='Haswell-v2'> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='tsc-deadline'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v3</model> + <blockers model='Haswell-v3'> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v4</model> + <blockers model='Haswell-v4'> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + </blockers> <model usable='no' vendor='Intel'>Icelake-Server</model> <blockers model='Icelake-Server'> <feature name='avx512-vpopcntdq'/> diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml index 97be27077f..dbb7c7388d 100644 --- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml @@ -481,6 +481,36 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Haswell-v1</model> + <blockers model='Haswell-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v2</model> + <blockers model='Haswell-v2'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v3</model> + <blockers model='Haswell-v3'> + <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'>Haswell-v4</model> + <blockers model='Haswell-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel'>Icelake-Server</model> <blockers model='Icelake-Server'> <feature name='avx512-vpopcntdq'/> 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 632424557e..0ba696fba8 100644 --- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml @@ -482,6 +482,36 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Haswell-v1</model> + <blockers model='Haswell-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v2</model> + <blockers model='Haswell-v2'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v3</model> + <blockers model='Haswell-v3'> + <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'>Haswell-v4</model> + <blockers model='Haswell-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel'>Icelake-Server</model> <blockers model='Icelake-Server'> <feature name='avx512-vpopcntdq'/> 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 b6055fae4d..5bef20b85d 100644 --- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml @@ -520,6 +520,36 @@ <feature name='spec-ctrl'/> <feature name='tsc-deadline'/> </blockers> + <model usable='no' vendor='Intel'>Haswell-v1</model> + <blockers model='Haswell-v1'> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='tsc-deadline'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v2</model> + <blockers model='Haswell-v2'> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='tsc-deadline'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v3</model> + <blockers model='Haswell-v3'> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v4</model> + <blockers model='Haswell-v4'> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + </blockers> <model usable='no' vendor='Intel'>Icelake-Server</model> <blockers model='Icelake-Server'> <feature name='avx512-vpopcntdq'/> diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml index 90c5b55b6a..1bb2263c2c 100644 --- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml @@ -481,6 +481,36 @@ <feature name='pcid'/> <feature name='spec-ctrl'/> </blockers> + <model usable='no' vendor='Intel'>Haswell-v1</model> + <blockers model='Haswell-v1'> + <feature name='erms'/> + <feature name='hle'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='rtm'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v2</model> + <blockers model='Haswell-v2'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + </blockers> + <model usable='no' vendor='Intel'>Haswell-v3</model> + <blockers model='Haswell-v3'> + <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'>Haswell-v4</model> + <blockers model='Haswell-v4'> + <feature name='erms'/> + <feature name='invpcid'/> + <feature name='pcid'/> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel'>Icelake-Server</model> <blockers model='Icelake-Server'> <feature name='avx512-vpopcntdq'/> diff --git a/tests/qemuxmlconfdata/cpu-Haswell.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-Haswell.x86_64-latest.args index bfbb2d8700..f5b7d9a8d2 100644 --- a/tests/qemuxmlconfdata/cpu-Haswell.x86_64-latest.args +++ b/tests/qemuxmlconfdata/cpu-Haswell.x86_64-latest.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel kvm \ --cpu Haswell \ +-cpu Haswell-v1 \ -m size=219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ diff --git a/tests/qemuxmlconfdata/cpu-Haswell.x86_64-latest.xml b/tests/qemuxmlconfdata/cpu-Haswell.x86_64-latest.xml index a0c483e5e4..0b14ca250c 100644 --- a/tests/qemuxmlconfdata/cpu-Haswell.x86_64-latest.xml +++ b/tests/qemuxmlconfdata/cpu-Haswell.x86_64-latest.xml @@ -9,7 +9,7 @@ <boot dev='network'/> </os> <cpu mode='custom' match='exact' check='partial'> - <model fallback='forbid'>Haswell</model> + <model fallback='forbid'>Haswell-v1</model> </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> diff --git a/tests/qemuxmlconfdata/cpu-Haswell2.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-Haswell2.x86_64-latest.args index 84e9e86127..33e1aa2a59 100644 --- a/tests/qemuxmlconfdata/cpu-Haswell2.x86_64-latest.args +++ b/tests/qemuxmlconfdata/cpu-Haswell2.x86_64-latest.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel kvm \ --cpu Haswell,hle=off,rtm=off \ +-cpu Haswell-v1,hle=off,rtm=off \ -m size=219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ diff --git a/tests/qemuxmlconfdata/cpu-Haswell2.x86_64-latest.xml b/tests/qemuxmlconfdata/cpu-Haswell2.x86_64-latest.xml index 458c696cc6..0002b225db 100644 --- a/tests/qemuxmlconfdata/cpu-Haswell2.x86_64-latest.xml +++ b/tests/qemuxmlconfdata/cpu-Haswell2.x86_64-latest.xml @@ -9,7 +9,7 @@ <boot dev='network'/> </os> <cpu mode='custom' match='exact' check='partial'> - <model fallback='forbid'>Haswell</model> + <model fallback='forbid'>Haswell-v1</model> <feature policy='disable' name='hle'/> <feature policy='disable' name='rtm'/> </cpu> diff --git a/tests/qemuxmlconfdata/cpu-Haswell3.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-Haswell3.x86_64-latest.args index 4c2cdf0484..97c9fbe6bb 100644 --- a/tests/qemuxmlconfdata/cpu-Haswell3.x86_64-latest.args +++ b/tests/qemuxmlconfdata/cpu-Haswell3.x86_64-latest.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel kvm \ --cpu Haswell,rtm=on,hle=on \ +-cpu Haswell-v1,rtm=on,hle=on \ -m size=219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ diff --git a/tests/qemuxmlconfdata/cpu-Haswell3.x86_64-latest.xml b/tests/qemuxmlconfdata/cpu-Haswell3.x86_64-latest.xml index 184370519b..06d1bf54fe 100644 --- a/tests/qemuxmlconfdata/cpu-Haswell3.x86_64-latest.xml +++ b/tests/qemuxmlconfdata/cpu-Haswell3.x86_64-latest.xml @@ -9,7 +9,7 @@ <boot dev='network'/> </os> <cpu mode='custom' match='exact' check='partial'> - <model fallback='forbid'>Haswell</model> + <model fallback='forbid'>Haswell-v1</model> <feature policy='require' name='rtm'/> <feature policy='force' name='hle'/> </cpu> diff --git a/tests/qemuxmlconfdata/cpu-strict1.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-strict1.x86_64-latest.args index 3f9c3516bb..a2c9d8335e 100644 --- a/tests/qemuxmlconfdata/cpu-strict1.x86_64-latest.args +++ b/tests/qemuxmlconfdata/cpu-strict1.x86_64-latest.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel kvm \ --cpu Haswell,ds=on,acpi=on,ht=on,tm=on,ds-cpl=on,vmx=on,est=on,xtpr=on,3dnowext=on,lahf-lm=on,nx=off,cx16=off,tm2=off,pbe=off,ss=off,sse4a=off,wdt=off,vme=off,invtsc=off,abm=off,pdpe1gb=off,rdrand=off,f16c=off,pdcm=off,smx=off,monitor=off,dtes64=off \ +-cpu Haswell-v1,ds=on,acpi=on,ht=on,tm=on,ds-cpl=on,vmx=on,est=on,xtpr=on,3dnowext=on,lahf-lm=on,nx=off,cx16=off,tm2=off,pbe=off,ss=off,sse4a=off,wdt=off,vme=off,invtsc=off,abm=off,pdpe1gb=off,rdrand=off,f16c=off,pdcm=off,smx=off,monitor=off,dtes64=off \ -m size=219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ diff --git a/tests/qemuxmlconfdata/cpu-strict1.x86_64-latest.xml b/tests/qemuxmlconfdata/cpu-strict1.x86_64-latest.xml index beeaf5c682..1e048cfe60 100644 --- a/tests/qemuxmlconfdata/cpu-strict1.x86_64-latest.xml +++ b/tests/qemuxmlconfdata/cpu-strict1.x86_64-latest.xml @@ -9,7 +9,7 @@ <boot dev='network'/> </os> <cpu mode='custom' match='strict' check='partial'> - <model fallback='allow'>Haswell</model> + <model fallback='allow'>Haswell-v1</model> <feature policy='require' name='ds'/> <feature policy='optional' name='acpi'/> <feature policy='require' name='ht'/> diff --git a/tests/qemuxmlconfdata/cpu-translation.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-translation.x86_64-latest.args index 49e1b590dd..7295c4f7f6 100644 --- a/tests/qemuxmlconfdata/cpu-translation.x86_64-latest.args +++ b/tests/qemuxmlconfdata/cpu-translation.x86_64-latest.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel tcg \ --cpu Haswell,pclmulqdq=on,ds-cpl=on,tsc-adjust=on,fxsr-opt=on,lahf-lm=on,cmp-legacy=on,nodeid-msr=on,perfctr-core=on,perfctr-nb=on,kvm-pv-eoi=on,kvm-pv-unhalt=on \ +-cpu Haswell-v1,pclmulqdq=on,ds-cpl=on,tsc-adjust=on,fxsr-opt=on,lahf-lm=on,cmp-legacy=on,nodeid-msr=on,perfctr-core=on,perfctr-nb=on,kvm-pv-eoi=on,kvm-pv-unhalt=on \ -m size=219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ diff --git a/tests/qemuxmlconfdata/cpu-translation.x86_64-latest.xml b/tests/qemuxmlconfdata/cpu-translation.x86_64-latest.xml index e7f8b710a7..9b4bbb12d3 100644 --- a/tests/qemuxmlconfdata/cpu-translation.x86_64-latest.xml +++ b/tests/qemuxmlconfdata/cpu-translation.x86_64-latest.xml @@ -13,7 +13,7 @@ <pvspinlock state='on'/> </features> <cpu mode='custom' match='exact' check='none'> - <model fallback='forbid'>Haswell</model> + <model fallback='forbid'>Haswell-v1</model> <feature policy='require' name='pclmuldq'/> <feature policy='require' name='ds_cpl'/> <feature policy='require' name='tsc_adjust'/> -- 2.47.0