Signed-off-by: Jiri Denemark <jdenemar@xxxxxxxxxx> --- src/cpu_map/index.xml | 2 + src/cpu_map/meson.build | 2 + src/cpu_map/x86_SandyBridge-v1.xml | 6 + src/cpu_map/x86_SandyBridge-v2.xml | 110 ++++++++++++++++++ .../domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 5 + .../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 13 +++ tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 5 + .../domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 5 + .../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 13 +++ tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 5 + .../domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 5 + .../domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 13 +++ tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 5 + .../domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 5 + .../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 13 +++ tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 5 + .../domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 5 + .../domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 13 +++ tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 5 + .../domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 5 + .../domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 13 +++ tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 5 + .../domaincapsdata/qemu_7.2.0-q35.x86_64.xml | 5 + .../qemu_7.2.0-tcg.x86_64+hvf.xml | 11 ++ .../domaincapsdata/qemu_7.2.0-tcg.x86_64.xml | 11 ++ tests/domaincapsdata/qemu_7.2.0.x86_64.xml | 5 + .../domaincapsdata/qemu_8.0.0-q35.x86_64.xml | 5 + .../domaincapsdata/qemu_8.0.0-tcg.x86_64.xml | 11 ++ tests/domaincapsdata/qemu_8.0.0.x86_64.xml | 5 + .../domaincapsdata/qemu_8.1.0-q35.x86_64.xml | 5 + .../domaincapsdata/qemu_8.1.0-tcg.x86_64.xml | 11 ++ tests/domaincapsdata/qemu_8.1.0.x86_64.xml | 5 + .../domaincapsdata/qemu_8.2.0-q35.x86_64.xml | 5 + .../domaincapsdata/qemu_8.2.0-tcg.x86_64.xml | 11 ++ tests/domaincapsdata/qemu_8.2.0.x86_64.xml | 5 + .../domaincapsdata/qemu_9.0.0-q35.x86_64.xml | 5 + .../domaincapsdata/qemu_9.0.0-tcg.x86_64.xml | 9 ++ tests/domaincapsdata/qemu_9.0.0.x86_64.xml | 5 + .../domaincapsdata/qemu_9.1.0-q35.x86_64.xml | 5 + .../domaincapsdata/qemu_9.1.0-tcg.x86_64.xml | 9 ++ tests/domaincapsdata/qemu_9.1.0.x86_64.xml | 5 + .../domaincapsdata/qemu_9.2.0-q35.x86_64.xml | 5 + .../domaincapsdata/qemu_9.2.0-tcg.x86_64.xml | 9 ++ tests/domaincapsdata/qemu_9.2.0.x86_64.xml | 5 + 44 files changed, 410 insertions(+) create mode 100644 src/cpu_map/x86_SandyBridge-v1.xml create mode 100644 src/cpu_map/x86_SandyBridge-v2.xml diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml index 7ca2ddf24f..bc9db47c89 100644 --- a/src/cpu_map/index.xml +++ b/src/cpu_map/index.xml @@ -35,6 +35,8 @@ <include filename='x86_Westmere-IBRS.xml'/> <include filename='x86_SandyBridge.xml'/> <include filename='x86_SandyBridge-IBRS.xml'/> + <include filename='x86_SandyBridge-v1.xml'/> + <include filename='x86_SandyBridge-v2.xml'/> <include filename='x86_IvyBridge.xml'/> <include filename='x86_IvyBridge-IBRS.xml'/> <include filename='x86_IvyBridge-v1.xml'/> diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build index 5f5cbc6049..de1eb8efbd 100644 --- a/src/cpu_map/meson.build +++ b/src/cpu_map/meson.build @@ -98,6 +98,8 @@ cpumap_data = [ 'x86_qemu32.xml', 'x86_qemu64.xml', 'x86_SandyBridge-IBRS.xml', + 'x86_SandyBridge-v1.xml', + 'x86_SandyBridge-v2.xml', 'x86_SandyBridge.xml', 'x86_SapphireRapids-v1.xml', 'x86_SapphireRapids-v2.xml', diff --git a/src/cpu_map/x86_SandyBridge-v1.xml b/src/cpu_map/x86_SandyBridge-v1.xml new file mode 100644 index 0000000000..e43f53d273 --- /dev/null +++ b/src/cpu_map/x86_SandyBridge-v1.xml @@ -0,0 +1,6 @@ +<cpus> + <model name='SandyBridge-v1'> + <decode host='off' guest='off'/> + <model name='SandyBridge'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_SandyBridge-v2.xml b/src/cpu_map/x86_SandyBridge-v2.xml new file mode 100644 index 0000000000..34e9fbdcce --- /dev/null +++ b/src/cpu_map/x86_SandyBridge-v2.xml @@ -0,0 +1,110 @@ +<cpus> + <model name='SandyBridge-v2'> + <decode host='on' guest='on'/> + <signature family='6' model='42'/> + <signature family='6' model='45'/> + <vendor name='Intel'/> + <feature name='aes'/> + <feature name='apic'/> + <feature name='arat'/> + <feature name='avx'/> + <feature name='clflush'/> + <feature name='cmov'/> + <feature name='cx16'/> + <feature name='cx8'/> + <feature name='de'/> + <feature name='fpu'/> + <feature name='fxsr'/> + <feature name='lahf_lm'/> + <feature name='lm'/> + <feature name='mca'/> + <feature name='mce'/> + <feature name='mmx'/> + <feature name='msr'/> + <feature name='mtrr'/> + <feature name='nx'/> + <feature name='pae'/> + <feature name='pat'/> + <feature name='pclmuldq'/> + <feature name='pge'/> + <feature name='pni'/> + <feature name='popcnt'/> + <feature name='pse'/> + <feature name='pse36'/> + <feature name='rdtscp'/> + <feature name='sep'/> + <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-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-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-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-preemption-timer'/> + <feature name='vmx-rdpmc-exit'/> + <feature name='vmx-rdtsc-exit'/> + <feature name='vmx-rdtscp-exit'/> + <feature name='vmx-secondary-ctls'/> + <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-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 bd4422aa5f..605aa866e1 100644 --- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml @@ -539,6 +539,11 @@ <blockers model='SandyBridge-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>SandyBridge-v1</model> + <model usable='no' vendor='Intel'>SandyBridge-v2</model> + <blockers model='SandyBridge-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel'>Skylake-Client</model> <blockers model='Skylake-Client'> <feature name='erms'/> 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 c6721abb85..01af090ce9 100644 --- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml @@ -928,6 +928,19 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> + <model usable='no' vendor='Intel'>SandyBridge-v1</model> + <blockers model='SandyBridge-v1'> + <feature name='avx'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>SandyBridge-v2</model> + <blockers model='SandyBridge-v2'> + <feature name='avx'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> <model usable='no' vendor='Intel'>Skylake-Client</model> <blockers model='Skylake-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 a10e7740f6..243cbfe504 100644 --- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml @@ -538,6 +538,11 @@ <blockers model='SandyBridge-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>SandyBridge-v1</model> + <model usable='no' vendor='Intel'>SandyBridge-v2</model> + <blockers model='SandyBridge-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel'>Skylake-Client</model> <blockers model='Skylake-Client'> <feature name='erms'/> 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 6e2e6222cc..f33fffe78b 100644 --- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml @@ -548,6 +548,11 @@ <blockers model='SandyBridge-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>SandyBridge-v1</model> + <model usable='no' vendor='Intel'>SandyBridge-v2</model> + <blockers model='SandyBridge-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel'>Skylake-Client</model> <blockers model='Skylake-Client'> <feature name='erms'/> 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 a7dd580356..b7d51223ab 100644 --- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml @@ -960,6 +960,19 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> + <model usable='no' vendor='Intel'>SandyBridge-v1</model> + <blockers model='SandyBridge-v1'> + <feature name='avx'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>SandyBridge-v2</model> + <blockers model='SandyBridge-v2'> + <feature name='avx'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> <model usable='no' vendor='Intel'>Skylake-Client</model> <blockers model='Skylake-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 5ed0c9529c..6ecbe63dce 100644 --- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml @@ -547,6 +547,11 @@ <blockers model='SandyBridge-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>SandyBridge-v1</model> + <model usable='no' vendor='Intel'>SandyBridge-v2</model> + <blockers model='SandyBridge-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel'>Skylake-Client</model> <blockers model='Skylake-Client'> <feature name='erms'/> 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 dae0d85c35..e5a90a82bd 100644 --- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml @@ -612,6 +612,11 @@ <blockers model='SandyBridge-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>SandyBridge-v1</model> + <model usable='no' vendor='Intel'>SandyBridge-v2</model> + <blockers model='SandyBridge-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel'>Skylake-Client</model> <blockers model='Skylake-Client'> <feature name='erms'/> 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 60e8d82825..bfe8224c26 100644 --- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml @@ -1068,6 +1068,19 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> + <model usable='no' vendor='Intel'>SandyBridge-v1</model> + <blockers model='SandyBridge-v1'> + <feature name='avx'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>SandyBridge-v2</model> + <blockers model='SandyBridge-v2'> + <feature name='avx'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> <model usable='no' vendor='Intel'>Skylake-Client</model> <blockers model='Skylake-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 bddf6e6757..8318dd3774 100644 --- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml @@ -611,6 +611,11 @@ <blockers model='SandyBridge-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>SandyBridge-v1</model> + <model usable='no' vendor='Intel'>SandyBridge-v2</model> + <blockers model='SandyBridge-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel'>Skylake-Client</model> <blockers model='Skylake-Client'> <feature name='erms'/> 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 f36cfedfac..0e44868d46 100644 --- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml @@ -609,6 +609,11 @@ <blockers model='SandyBridge-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>SandyBridge-v1</model> + <model usable='no' vendor='Intel'>SandyBridge-v2</model> + <blockers model='SandyBridge-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel'>Skylake-Client</model> <blockers model='Skylake-Client'> <feature name='erms'/> 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 0e21af4424..877e135343 100644 --- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml @@ -1066,6 +1066,19 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> + <model usable='no' vendor='Intel'>SandyBridge-v1</model> + <blockers model='SandyBridge-v1'> + <feature name='avx'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>SandyBridge-v2</model> + <blockers model='SandyBridge-v2'> + <feature name='avx'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> <model usable='no' vendor='Intel'>Skylake-Client</model> <blockers model='Skylake-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 eb9319fa37..25c057ccbf 100644 --- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml @@ -608,6 +608,11 @@ <blockers model='SandyBridge-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>SandyBridge-v1</model> + <model usable='no' vendor='Intel'>SandyBridge-v2</model> + <blockers model='SandyBridge-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel'>Skylake-Client</model> <blockers model='Skylake-Client'> <feature name='erms'/> 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 7672799710..57fff049c8 100644 --- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml @@ -636,6 +636,11 @@ <blockers model='SandyBridge-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>SandyBridge-v1</model> + <model usable='no' vendor='Intel'>SandyBridge-v2</model> + <blockers model='SandyBridge-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel'>Skylake-Client</model> <blockers model='Skylake-Client'> <feature name='erms'/> 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 5611ca2f59..54635c84ac 100644 --- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml @@ -1098,6 +1098,19 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> + <model usable='no' vendor='Intel'>SandyBridge-v1</model> + <blockers model='SandyBridge-v1'> + <feature name='avx'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>SandyBridge-v2</model> + <blockers model='SandyBridge-v2'> + <feature name='avx'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> <model usable='no' vendor='Intel'>Skylake-Client</model> <blockers model='Skylake-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 fdd12dca3f..2ad9f0b60c 100644 --- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml @@ -635,6 +635,11 @@ <blockers model='SandyBridge-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>SandyBridge-v1</model> + <model usable='no' vendor='Intel'>SandyBridge-v2</model> + <blockers model='SandyBridge-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel'>Skylake-Client</model> <blockers model='Skylake-Client'> <feature name='erms'/> 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 1c8d73a488..20d87fa75c 100644 --- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml @@ -603,6 +603,11 @@ <blockers model='SandyBridge-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>SandyBridge-v1</model> + <model usable='no' vendor='Intel'>SandyBridge-v2</model> + <blockers model='SandyBridge-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel'>Skylake-Client</model> <blockers model='Skylake-Client'> <feature name='erms'/> 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 6ef4cf615f..769be5f99a 100644 --- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml @@ -1046,6 +1046,19 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> + <model usable='no' vendor='Intel'>SandyBridge-v1</model> + <blockers model='SandyBridge-v1'> + <feature name='avx'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>SandyBridge-v2</model> + <blockers model='SandyBridge-v2'> + <feature name='avx'/> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> <model usable='no' vendor='Intel'>Skylake-Client</model> <blockers model='Skylake-Client'> <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 69d5e4a073..2b768d9258 100644 --- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml @@ -602,6 +602,11 @@ <blockers model='SandyBridge-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>SandyBridge-v1</model> + <model usable='no' vendor='Intel'>SandyBridge-v2</model> + <blockers model='SandyBridge-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel'>Skylake-Client</model> <blockers model='Skylake-Client'> <feature name='erms'/> 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 6cf5a9e42a..576ca119a6 100644 --- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml @@ -608,6 +608,11 @@ <blockers model='SandyBridge-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>SandyBridge-v1</model> + <model usable='no' vendor='Intel'>SandyBridge-v2</model> + <blockers model='SandyBridge-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel'>Skylake-Client</model> <blockers model='Skylake-Client'> <feature name='erms'/> 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 55e72d828c..9abf3506bf 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 @@ -857,6 +857,17 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> + <model usable='no' vendor='Intel'>SandyBridge-v1</model> + <blockers model='SandyBridge-v1'> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>SandyBridge-v2</model> + <blockers model='SandyBridge-v2'> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> <model usable='no' vendor='Intel'>Skylake-Client</model> <blockers model='Skylake-Client'> <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 55e72d828c..9abf3506bf 100644 --- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml @@ -857,6 +857,17 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> + <model usable='no' vendor='Intel'>SandyBridge-v1</model> + <blockers model='SandyBridge-v1'> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>SandyBridge-v2</model> + <blockers model='SandyBridge-v2'> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> <model usable='no' vendor='Intel'>Skylake-Client</model> <blockers model='Skylake-Client'> <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 ee01c70610..1d294bdd06 100644 --- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml @@ -607,6 +607,11 @@ <blockers model='SandyBridge-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>SandyBridge-v1</model> + <model usable='no' vendor='Intel'>SandyBridge-v2</model> + <blockers model='SandyBridge-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel'>Skylake-Client</model> <blockers model='Skylake-Client'> <feature name='erms'/> 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 dce1fbf450..fc0c9d320b 100644 --- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml @@ -608,6 +608,11 @@ <blockers model='SandyBridge-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>SandyBridge-v1</model> + <model usable='no' vendor='Intel'>SandyBridge-v2</model> + <blockers model='SandyBridge-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel'>SapphireRapids</model> <blockers model='SapphireRapids'> <feature name='amx-bf16'/> 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 9ff9b195a7..d1a6270237 100644 --- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml @@ -857,6 +857,17 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> + <model usable='no' vendor='Intel'>SandyBridge-v1</model> + <blockers model='SandyBridge-v1'> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>SandyBridge-v2</model> + <blockers model='SandyBridge-v2'> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> <model usable='no' vendor='Intel'>SapphireRapids</model> <blockers model='SapphireRapids'> <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 c13f9b47a5..b61b7dbddb 100644 --- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml @@ -607,6 +607,11 @@ <blockers model='SandyBridge-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>SandyBridge-v1</model> + <model usable='no' vendor='Intel'>SandyBridge-v2</model> + <blockers model='SandyBridge-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel'>SapphireRapids</model> <blockers model='SapphireRapids'> <feature name='amx-bf16'/> 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 94fbe72971..d225ecae4b 100644 --- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml @@ -746,6 +746,11 @@ <blockers model='SandyBridge-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>SandyBridge-v1</model> + <model usable='no' vendor='Intel'>SandyBridge-v2</model> + <blockers model='SandyBridge-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel'>SapphireRapids</model> <blockers model='SapphireRapids'> <feature name='amx-bf16'/> 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 5cf208b8ef..caaf0dfe84 100644 --- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml @@ -837,6 +837,17 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> + <model usable='no' vendor='Intel'>SandyBridge-v1</model> + <blockers model='SandyBridge-v1'> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>SandyBridge-v2</model> + <blockers model='SandyBridge-v2'> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> <model usable='no' vendor='Intel'>SapphireRapids</model> <blockers model='SapphireRapids'> <feature name='amx-bf16'/> diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml index e057a438bc..6ef35d465b 100644 --- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml @@ -745,6 +745,11 @@ <blockers model='SandyBridge-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>SandyBridge-v1</model> + <model usable='no' vendor='Intel'>SandyBridge-v2</model> + <blockers model='SandyBridge-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel'>SapphireRapids</model> <blockers model='SapphireRapids'> <feature name='amx-bf16'/> 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 5e84da10a1..f912d65ff5 100644 --- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml @@ -747,6 +747,11 @@ <blockers model='SandyBridge-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>SandyBridge-v1</model> + <model usable='no' vendor='Intel'>SandyBridge-v2</model> + <blockers model='SandyBridge-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel'>SapphireRapids</model> <blockers model='SapphireRapids'> <feature name='amx-bf16'/> 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 0dace5357c..76b4853af6 100644 --- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml @@ -826,6 +826,17 @@ <feature name='tsc-deadline'/> <feature name='x2apic'/> </blockers> + <model usable='no' vendor='Intel'>SandyBridge-v1</model> + <blockers model='SandyBridge-v1'> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> + <model usable='no' vendor='Intel'>SandyBridge-v2</model> + <blockers model='SandyBridge-v2'> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + </blockers> <model usable='no' vendor='Intel'>SapphireRapids</model> <blockers model='SapphireRapids'> <feature name='amx-bf16'/> diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml index 581f8031ac..f9d96fb8fe 100644 --- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml @@ -746,6 +746,11 @@ <blockers model='SandyBridge-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>SandyBridge-v1</model> + <model usable='no' vendor='Intel'>SandyBridge-v2</model> + <blockers model='SandyBridge-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel'>SapphireRapids</model> <blockers model='SapphireRapids'> <feature name='amx-bf16'/> 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 4b27cd7c85..6d371660ce 100644 --- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml @@ -747,6 +747,11 @@ <blockers model='SandyBridge-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>SandyBridge-v1</model> + <model usable='no' vendor='Intel'>SandyBridge-v2</model> + <blockers model='SandyBridge-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel'>SapphireRapids</model> <blockers model='SapphireRapids'> <feature name='amx-bf16'/> 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 f95e981ce6..b4f8542b55 100644 --- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml @@ -786,6 +786,15 @@ <feature name='spec-ctrl'/> <feature name='tsc-deadline'/> </blockers> + <model usable='no' vendor='Intel'>SandyBridge-v1</model> + <blockers model='SandyBridge-v1'> + <feature name='tsc-deadline'/> + </blockers> + <model usable='no' vendor='Intel'>SandyBridge-v2</model> + <blockers model='SandyBridge-v2'> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + </blockers> <model usable='no' vendor='Intel'>SapphireRapids</model> <blockers model='SapphireRapids'> <feature name='amx-bf16'/> diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml index 94e7163f68..463478f13d 100644 --- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml @@ -746,6 +746,11 @@ <blockers model='SandyBridge-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>SandyBridge-v1</model> + <model usable='no' vendor='Intel'>SandyBridge-v2</model> + <blockers model='SandyBridge-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel'>SapphireRapids</model> <blockers model='SapphireRapids'> <feature name='amx-bf16'/> 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 5cdfa2d270..fd509ca52c 100644 --- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml @@ -780,6 +780,11 @@ <blockers model='SandyBridge-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>SandyBridge-v1</model> + <model usable='no' vendor='Intel'>SandyBridge-v2</model> + <blockers model='SandyBridge-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel'>SapphireRapids</model> <blockers model='SapphireRapids'> <feature name='amx-bf16'/> 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 608032c706..7d95b9c32f 100644 --- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml @@ -811,6 +811,15 @@ <feature name='spec-ctrl'/> <feature name='tsc-deadline'/> </blockers> + <model usable='no' vendor='Intel'>SandyBridge-v1</model> + <blockers model='SandyBridge-v1'> + <feature name='tsc-deadline'/> + </blockers> + <model usable='no' vendor='Intel'>SandyBridge-v2</model> + <blockers model='SandyBridge-v2'> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + </blockers> <model usable='no' vendor='Intel'>SapphireRapids</model> <blockers model='SapphireRapids'> <feature name='amx-bf16'/> diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml index a70874a95b..937b6671ef 100644 --- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml @@ -779,6 +779,11 @@ <blockers model='SandyBridge-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>SandyBridge-v1</model> + <model usable='no' vendor='Intel'>SandyBridge-v2</model> + <blockers model='SandyBridge-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel'>SapphireRapids</model> <blockers model='SapphireRapids'> <feature name='amx-bf16'/> 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 58ca8e89c0..be67479619 100644 --- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml @@ -780,6 +780,11 @@ <blockers model='SandyBridge-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>SandyBridge-v1</model> + <model usable='no' vendor='Intel'>SandyBridge-v2</model> + <blockers model='SandyBridge-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel'>SapphireRapids</model> <blockers model='SapphireRapids'> <feature name='amx-bf16'/> 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 aaaf492439..fa183e1394 100644 --- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml @@ -811,6 +811,15 @@ <feature name='spec-ctrl'/> <feature name='tsc-deadline'/> </blockers> + <model usable='no' vendor='Intel'>SandyBridge-v1</model> + <blockers model='SandyBridge-v1'> + <feature name='tsc-deadline'/> + </blockers> + <model usable='no' vendor='Intel'>SandyBridge-v2</model> + <blockers model='SandyBridge-v2'> + <feature name='spec-ctrl'/> + <feature name='tsc-deadline'/> + </blockers> <model usable='no' vendor='Intel'>SapphireRapids</model> <blockers model='SapphireRapids'> <feature name='amx-bf16'/> diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml index 8fd01d313c..ac21366d12 100644 --- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml @@ -779,6 +779,11 @@ <blockers model='SandyBridge-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>SandyBridge-v1</model> + <model usable='no' vendor='Intel'>SandyBridge-v2</model> + <blockers model='SandyBridge-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='no' vendor='Intel'>SapphireRapids</model> <blockers model='SapphireRapids'> <feature name='amx-bf16'/> -- 2.47.0