[PATCH 28/32] cpu_map: Add versions of Nehalem CPU model

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- src/cpu_map/index.xml | 2 + src/cpu_map/meson.build | 2 + src/cpu_map/x86_Nehalem-v1.xml | 6 ++ src/cpu_map/x86_Nehalem-v2.xml | 101 ++++++++++++++++++ .../domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 5 + .../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 5 + 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 | 5 + 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 | 5 + 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 | 5 + 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 | 5 + 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 | 5 + 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 | 5 + .../domaincapsdata/qemu_7.2.0-tcg.x86_64.xml | 5 + 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 | 5 + 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 | 5 + 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 | 5 + 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 | 5 + 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 | 5 + 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 | 5 + tests/domaincapsdata/qemu_9.2.0.x86_64.xml | 5 + 44 files changed, 311 insertions(+) create mode 100644 src/cpu_map/x86_Nehalem-v1.xml create mode 100644 src/cpu_map/x86_Nehalem-v2.xml diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml index 7900e6d824..afb3a994fb 100644 --- a/src/cpu_map/index.xml +++ b/src/cpu_map/index.xml @@ -31,6 +31,8 @@ <include filename='x86_Penryn.xml'/> <include filename='x86_Nehalem.xml'/> <include filename='x86_Nehalem-IBRS.xml'/> + <include filename='x86_Nehalem-v1.xml'/> + <include filename='x86_Nehalem-v2.xml'/> <include filename='x86_Westmere.xml'/> <include filename='x86_Westmere-IBRS.xml'/> <include filename='x86_Westmere-v1.xml'/> diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build index 474f43fad5..9accba9936 100644 --- a/src/cpu_map/meson.build +++ b/src/cpu_map/meson.build @@ -83,6 +83,8 @@ cpumap_data = [ 'x86_kvm64.xml', 'x86_n270.xml', 'x86_Nehalem-IBRS.xml', + 'x86_Nehalem-v1.xml', + 'x86_Nehalem-v2.xml', 'x86_Nehalem.xml', 'x86_Opteron_G1.xml', 'x86_Opteron_G2.xml', diff --git a/src/cpu_map/x86_Nehalem-v1.xml b/src/cpu_map/x86_Nehalem-v1.xml new file mode 100644 index 0000000000..af24241772 --- /dev/null +++ b/src/cpu_map/x86_Nehalem-v1.xml @@ -0,0 +1,6 @@ +<cpus> + <model name='Nehalem-v1'> + <decode host='off' guest='off'/> + <model name='Nehalem'/> + </model> +</cpus> diff --git a/src/cpu_map/x86_Nehalem-v2.xml b/src/cpu_map/x86_Nehalem-v2.xml new file mode 100644 index 0000000000..bae74d3d54 --- /dev/null +++ b/src/cpu_map/x86_Nehalem-v2.xml @@ -0,0 +1,101 @@ +<cpus> + <model name='Nehalem-v2'> + <decode host='on' guest='on'/> + <signature family='6' model='26'/> + <signature family='6' model='30'/> + <signature family='6' model='31'/> + <signature family='6' model='46'/> + <vendor name='Intel'/> + <feature name='apic'/> + <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='pge'/> + <feature name='pni'/> + <feature name='popcnt'/> + <feature name='pse'/> + <feature name='pse36'/> + <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='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-true-ctls'/> + <feature name='vmx-tsc-offset'/> + <feature name='vmx-vintr-pending'/> + <feature name='vmx-vnmi'/> + <feature name='vmx-vnmi-pending'/> + <feature name='vmx-vpid'/> + <feature name='vmx-wbinvd-exit'/> + </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 6932895110..f0b5293c5d 100644 --- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml @@ -519,6 +519,11 @@ <blockers model='Nehalem-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>Nehalem-v1</model> + <model usable='no' vendor='Intel'>Nehalem-v2</model> + <blockers model='Nehalem-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='AMD'>Opteron_G1</model> <model usable='yes' vendor='AMD'>Opteron_G2</model> <model usable='yes' vendor='AMD'>Opteron_G3</model> 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 d4a5b2c3b8..75b35c15be 100644 --- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml @@ -887,6 +887,11 @@ <blockers model='Nehalem-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>Nehalem-v1</model> + <model usable='no' vendor='Intel'>Nehalem-v2</model> + <blockers model='Nehalem-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='AMD'>Opteron_G1</model> <model usable='yes' vendor='AMD'>Opteron_G2</model> <model usable='no' vendor='AMD'>Opteron_G3</model> diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml index 980c940883..08b60043f6 100644 --- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml @@ -518,6 +518,11 @@ <blockers model='Nehalem-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>Nehalem-v1</model> + <model usable='no' vendor='Intel'>Nehalem-v2</model> + <blockers model='Nehalem-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='AMD'>Opteron_G1</model> <model usable='yes' vendor='AMD'>Opteron_G2</model> <model usable='yes' vendor='AMD'>Opteron_G3</model> 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 cfa1740854..c1583c7b69 100644 --- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml @@ -528,6 +528,11 @@ <blockers model='Nehalem-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>Nehalem-v1</model> + <model usable='no' vendor='Intel'>Nehalem-v2</model> + <blockers model='Nehalem-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='AMD'>Opteron_G1</model> <model usable='yes' vendor='AMD'>Opteron_G2</model> <model usable='yes' vendor='AMD'>Opteron_G3</model> 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 f409f19159..d5196be7b9 100644 --- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml @@ -919,6 +919,11 @@ <blockers model='Nehalem-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>Nehalem-v1</model> + <model usable='no' vendor='Intel'>Nehalem-v2</model> + <blockers model='Nehalem-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='AMD'>Opteron_G1</model> <model usable='yes' vendor='AMD'>Opteron_G2</model> <model usable='no' vendor='AMD'>Opteron_G3</model> diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml index a176cde6d9..826e829b68 100644 --- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml @@ -527,6 +527,11 @@ <blockers model='Nehalem-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>Nehalem-v1</model> + <model usable='no' vendor='Intel'>Nehalem-v2</model> + <blockers model='Nehalem-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='AMD'>Opteron_G1</model> <model usable='yes' vendor='AMD'>Opteron_G2</model> <model usable='yes' vendor='AMD'>Opteron_G3</model> 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 ac6d662afc..1b385af7e6 100644 --- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml @@ -592,6 +592,11 @@ <blockers model='Nehalem-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>Nehalem-v1</model> + <model usable='no' vendor='Intel'>Nehalem-v2</model> + <blockers model='Nehalem-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='AMD'>Opteron_G1</model> <model usable='yes' vendor='AMD'>Opteron_G2</model> <model usable='yes' vendor='AMD'>Opteron_G3</model> 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 7259db82c8..67a943b587 100644 --- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml @@ -1027,6 +1027,11 @@ <blockers model='Nehalem-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>Nehalem-v1</model> + <model usable='no' vendor='Intel'>Nehalem-v2</model> + <blockers model='Nehalem-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='AMD'>Opteron_G1</model> <model usable='yes' vendor='AMD'>Opteron_G2</model> <model usable='no' vendor='AMD'>Opteron_G3</model> diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml index 682fff3b61..25212bdc52 100644 --- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml @@ -591,6 +591,11 @@ <blockers model='Nehalem-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>Nehalem-v1</model> + <model usable='no' vendor='Intel'>Nehalem-v2</model> + <blockers model='Nehalem-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='AMD'>Opteron_G1</model> <model usable='yes' vendor='AMD'>Opteron_G2</model> <model usable='yes' vendor='AMD'>Opteron_G3</model> 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 5592787eed..a8b20bfc6f 100644 --- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml @@ -589,6 +589,11 @@ <blockers model='Nehalem-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>Nehalem-v1</model> + <model usable='no' vendor='Intel'>Nehalem-v2</model> + <blockers model='Nehalem-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='AMD'>Opteron_G1</model> <model usable='yes' vendor='AMD'>Opteron_G2</model> <model usable='yes' vendor='AMD'>Opteron_G3</model> 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 6dbcc900a8..ad3095ade1 100644 --- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml @@ -1025,6 +1025,11 @@ <blockers model='Nehalem-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>Nehalem-v1</model> + <model usable='no' vendor='Intel'>Nehalem-v2</model> + <blockers model='Nehalem-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='AMD'>Opteron_G1</model> <model usable='yes' vendor='AMD'>Opteron_G2</model> <model usable='no' vendor='AMD'>Opteron_G3</model> diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml index 8dcfb48a09..49b36890b9 100644 --- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml @@ -588,6 +588,11 @@ <blockers model='Nehalem-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>Nehalem-v1</model> + <model usable='no' vendor='Intel'>Nehalem-v2</model> + <blockers model='Nehalem-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='AMD'>Opteron_G1</model> <model usable='yes' vendor='AMD'>Opteron_G2</model> <model usable='yes' vendor='AMD'>Opteron_G3</model> 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 7e837256e3..060e773ce9 100644 --- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml @@ -616,6 +616,11 @@ <blockers model='Nehalem-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>Nehalem-v1</model> + <model usable='no' vendor='Intel'>Nehalem-v2</model> + <blockers model='Nehalem-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='AMD'>Opteron_G1</model> <model usable='yes' vendor='AMD'>Opteron_G2</model> <model usable='yes' vendor='AMD'>Opteron_G3</model> 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 24e0046d6b..cc75218853 100644 --- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml @@ -1057,6 +1057,11 @@ <blockers model='Nehalem-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>Nehalem-v1</model> + <model usable='no' vendor='Intel'>Nehalem-v2</model> + <blockers model='Nehalem-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='AMD'>Opteron_G1</model> <model usable='yes' vendor='AMD'>Opteron_G2</model> <model usable='no' vendor='AMD'>Opteron_G3</model> diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml index 9e9651e449..09d570e2f4 100644 --- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml @@ -615,6 +615,11 @@ <blockers model='Nehalem-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>Nehalem-v1</model> + <model usable='no' vendor='Intel'>Nehalem-v2</model> + <blockers model='Nehalem-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='AMD'>Opteron_G1</model> <model usable='yes' vendor='AMD'>Opteron_G2</model> <model usable='yes' vendor='AMD'>Opteron_G3</model> 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 23e4204b47..58424aa4b9 100644 --- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml @@ -583,6 +583,11 @@ <blockers model='Nehalem-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>Nehalem-v1</model> + <model usable='no' vendor='Intel'>Nehalem-v2</model> + <blockers model='Nehalem-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='AMD'>Opteron_G1</model> <model usable='yes' vendor='AMD'>Opteron_G2</model> <model usable='yes' vendor='AMD'>Opteron_G3</model> 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 0ce088e308..70e73c4d65 100644 --- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml @@ -1005,6 +1005,11 @@ <blockers model='Nehalem-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>Nehalem-v1</model> + <model usable='no' vendor='Intel'>Nehalem-v2</model> + <blockers model='Nehalem-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='AMD'>Opteron_G1</model> <model usable='yes' vendor='AMD'>Opteron_G2</model> <model usable='no' vendor='AMD'>Opteron_G3</model> diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml index 7f42c7fb84..48809b554f 100644 --- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml @@ -582,6 +582,11 @@ <blockers model='Nehalem-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>Nehalem-v1</model> + <model usable='no' vendor='Intel'>Nehalem-v2</model> + <blockers model='Nehalem-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='AMD'>Opteron_G1</model> <model usable='yes' vendor='AMD'>Opteron_G2</model> <model usable='yes' vendor='AMD'>Opteron_G3</model> 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 60c032ddd2..cb0710e2cd 100644 --- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml @@ -588,6 +588,11 @@ <blockers model='Nehalem-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>Nehalem-v1</model> + <model usable='no' vendor='Intel'>Nehalem-v2</model> + <blockers model='Nehalem-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='AMD'>Opteron_G1</model> <model usable='yes' vendor='AMD'>Opteron_G2</model> <model usable='yes' vendor='AMD'>Opteron_G3</model> 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 908d2a1b52..148ab6b3b0 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 @@ -822,6 +822,11 @@ <blockers model='Nehalem-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>Nehalem-v1</model> + <model usable='no' vendor='Intel'>Nehalem-v2</model> + <blockers model='Nehalem-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='AMD'>Opteron_G1</model> <model usable='yes' vendor='AMD'>Opteron_G2</model> <model usable='no' vendor='AMD'>Opteron_G3</model> 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 908d2a1b52..148ab6b3b0 100644 --- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml @@ -822,6 +822,11 @@ <blockers model='Nehalem-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>Nehalem-v1</model> + <model usable='no' vendor='Intel'>Nehalem-v2</model> + <blockers model='Nehalem-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='AMD'>Opteron_G1</model> <model usable='yes' vendor='AMD'>Opteron_G2</model> <model usable='no' vendor='AMD'>Opteron_G3</model> diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml index c41076c48f..c9edd151a9 100644 --- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml @@ -587,6 +587,11 @@ <blockers model='Nehalem-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>Nehalem-v1</model> + <model usable='no' vendor='Intel'>Nehalem-v2</model> + <blockers model='Nehalem-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='AMD'>Opteron_G1</model> <model usable='yes' vendor='AMD'>Opteron_G2</model> <model usable='yes' vendor='AMD'>Opteron_G3</model> 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 7b88e5d27c..dd9be29826 100644 --- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml @@ -588,6 +588,11 @@ <blockers model='Nehalem-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>Nehalem-v1</model> + <model usable='no' vendor='Intel'>Nehalem-v2</model> + <blockers model='Nehalem-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='AMD'>Opteron_G1</model> <model usable='yes' vendor='AMD'>Opteron_G2</model> <model usable='yes' vendor='AMD'>Opteron_G3</model> 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 0834c1ac06..525cec8ae6 100644 --- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml @@ -822,6 +822,11 @@ <blockers model='Nehalem-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>Nehalem-v1</model> + <model usable='no' vendor='Intel'>Nehalem-v2</model> + <blockers model='Nehalem-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='AMD'>Opteron_G1</model> <model usable='yes' vendor='AMD'>Opteron_G2</model> <model usable='no' vendor='AMD'>Opteron_G3</model> diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml index f4e878dd40..076c96cebe 100644 --- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml @@ -587,6 +587,11 @@ <blockers model='Nehalem-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>Nehalem-v1</model> + <model usable='no' vendor='Intel'>Nehalem-v2</model> + <blockers model='Nehalem-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='AMD'>Opteron_G1</model> <model usable='yes' vendor='AMD'>Opteron_G2</model> <model usable='yes' vendor='AMD'>Opteron_G3</model> 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 381a048f1b..d7c8bf6f79 100644 --- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml @@ -726,6 +726,11 @@ <blockers model='Nehalem-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>Nehalem-v1</model> + <model usable='no' vendor='Intel'>Nehalem-v2</model> + <blockers model='Nehalem-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='AMD'>Opteron_G1</model> <model usable='yes' vendor='AMD'>Opteron_G2</model> <model usable='yes' vendor='AMD'>Opteron_G3</model> 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 928aede1c5..3b0ef7d162 100644 --- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml @@ -804,6 +804,11 @@ <blockers model='Nehalem-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>Nehalem-v1</model> + <model usable='no' vendor='Intel'>Nehalem-v2</model> + <blockers model='Nehalem-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='AMD'>Opteron_G1</model> <model usable='yes' vendor='AMD'>Opteron_G2</model> <model usable='no' vendor='AMD'>Opteron_G3</model> diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml index c727d391e4..f1e3d1bff8 100644 --- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml @@ -725,6 +725,11 @@ <blockers model='Nehalem-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>Nehalem-v1</model> + <model usable='no' vendor='Intel'>Nehalem-v2</model> + <blockers model='Nehalem-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='AMD'>Opteron_G1</model> <model usable='yes' vendor='AMD'>Opteron_G2</model> <model usable='yes' vendor='AMD'>Opteron_G3</model> 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 454040f6a8..75d22bce68 100644 --- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml @@ -727,6 +727,11 @@ <blockers model='Nehalem-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>Nehalem-v1</model> + <model usable='no' vendor='Intel'>Nehalem-v2</model> + <blockers model='Nehalem-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='AMD'>Opteron_G1</model> <model usable='yes' vendor='AMD'>Opteron_G2</model> <model usable='yes' vendor='AMD'>Opteron_G3</model> 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 9ee0bedc51..24d1ea46f8 100644 --- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml @@ -793,6 +793,11 @@ <blockers model='Nehalem-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>Nehalem-v1</model> + <model usable='no' vendor='Intel'>Nehalem-v2</model> + <blockers model='Nehalem-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='AMD'>Opteron_G1</model> <model usable='yes' vendor='AMD'>Opteron_G2</model> <model usable='no' vendor='AMD'>Opteron_G3</model> diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml index 0f706b8b5f..04d5631dd1 100644 --- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml @@ -726,6 +726,11 @@ <blockers model='Nehalem-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>Nehalem-v1</model> + <model usable='no' vendor='Intel'>Nehalem-v2</model> + <blockers model='Nehalem-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='AMD'>Opteron_G1</model> <model usable='yes' vendor='AMD'>Opteron_G2</model> <model usable='yes' vendor='AMD'>Opteron_G3</model> 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 0f5b7cd5a2..7687af999b 100644 --- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml @@ -727,6 +727,11 @@ <blockers model='Nehalem-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>Nehalem-v1</model> + <model usable='no' vendor='Intel'>Nehalem-v2</model> + <blockers model='Nehalem-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='AMD'>Opteron_G1</model> <model usable='yes' vendor='AMD'>Opteron_G2</model> <model usable='yes' vendor='AMD'>Opteron_G3</model> 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 d7b182f43e..a9423e9160 100644 --- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml @@ -755,6 +755,11 @@ <blockers model='Nehalem-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>Nehalem-v1</model> + <model usable='no' vendor='Intel'>Nehalem-v2</model> + <blockers model='Nehalem-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='AMD'>Opteron_G1</model> <model usable='yes' vendor='AMD'>Opteron_G2</model> <model usable='no' vendor='AMD'>Opteron_G3</model> diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml index aafdd4e359..98f6cbf734 100644 --- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml @@ -726,6 +726,11 @@ <blockers model='Nehalem-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>Nehalem-v1</model> + <model usable='no' vendor='Intel'>Nehalem-v2</model> + <blockers model='Nehalem-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='AMD'>Opteron_G1</model> <model usable='yes' vendor='AMD'>Opteron_G2</model> <model usable='yes' vendor='AMD'>Opteron_G3</model> 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 888a02a420..1110b08ec1 100644 --- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml @@ -760,6 +760,11 @@ <blockers model='Nehalem-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>Nehalem-v1</model> + <model usable='no' vendor='Intel'>Nehalem-v2</model> + <blockers model='Nehalem-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='AMD'>Opteron_G1</model> <model usable='yes' vendor='AMD'>Opteron_G2</model> <model usable='yes' vendor='AMD'>Opteron_G3</model> 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 26431fc647..0f47ccd0f2 100644 --- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml @@ -780,6 +780,11 @@ <blockers model='Nehalem-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>Nehalem-v1</model> + <model usable='no' vendor='Intel'>Nehalem-v2</model> + <blockers model='Nehalem-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='AMD'>Opteron_G1</model> <model usable='yes' vendor='AMD'>Opteron_G2</model> <model usable='no' vendor='AMD'>Opteron_G3</model> diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml index 7eb449b9e2..17763856b8 100644 --- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml @@ -759,6 +759,11 @@ <blockers model='Nehalem-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>Nehalem-v1</model> + <model usable='no' vendor='Intel'>Nehalem-v2</model> + <blockers model='Nehalem-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='AMD'>Opteron_G1</model> <model usable='yes' vendor='AMD'>Opteron_G2</model> <model usable='yes' vendor='AMD'>Opteron_G3</model> 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 730d8e9e26..822ca0af9d 100644 --- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml @@ -760,6 +760,11 @@ <blockers model='Nehalem-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>Nehalem-v1</model> + <model usable='no' vendor='Intel'>Nehalem-v2</model> + <blockers model='Nehalem-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='AMD'>Opteron_G1</model> <model usable='yes' vendor='AMD'>Opteron_G2</model> <model usable='yes' vendor='AMD'>Opteron_G3</model> 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 d98ab20f88..7375cd46ae 100644 --- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml @@ -780,6 +780,11 @@ <blockers model='Nehalem-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>Nehalem-v1</model> + <model usable='no' vendor='Intel'>Nehalem-v2</model> + <blockers model='Nehalem-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='AMD'>Opteron_G1</model> <model usable='yes' vendor='AMD'>Opteron_G2</model> <model usable='no' vendor='AMD'>Opteron_G3</model> diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml index 558415500f..584732a2a7 100644 --- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml @@ -759,6 +759,11 @@ <blockers model='Nehalem-IBRS'> <feature name='spec-ctrl'/> </blockers> + <model usable='yes' vendor='Intel'>Nehalem-v1</model> + <model usable='no' vendor='Intel'>Nehalem-v2</model> + <blockers model='Nehalem-v2'> + <feature name='spec-ctrl'/> + </blockers> <model usable='yes' vendor='AMD'>Opteron_G1</model> <model usable='yes' vendor='AMD'>Opteron_G2</model> <model usable='yes' vendor='AMD'>Opteron_G3</model> -- 2.47.0