[PATCH v2 16/25] cpu_map: Add Penryn-v1 CPU model

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- src/cpu_map/index.xml | 1 + src/cpu_map/meson.build | 1 + src/cpu_map/x86_Penryn-v1.xml | 6 ++++++ tests/cputestdata/x86_64-cpuid-Core2-Q9500-host.xml | 2 +- tests/cputestdata/x86_64-cpuid-Xeon-X5460-host.xml | 2 +- tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 3 ++- tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 3 ++- tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 3 ++- tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 3 ++- tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 3 ++- tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 3 ++- tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 3 ++- tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 3 ++- tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 3 ++- tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 3 ++- tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 3 ++- tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 3 ++- tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 3 ++- tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 3 ++- tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 3 ++- tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 3 ++- tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 3 ++- tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 3 ++- tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml | 3 ++- tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml | 3 ++- tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml | 3 ++- tests/domaincapsdata/qemu_7.2.0.x86_64.xml | 3 ++- tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml | 3 ++- tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml | 3 ++- tests/domaincapsdata/qemu_8.0.0.x86_64.xml | 3 ++- tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml | 3 ++- tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml | 3 ++- tests/domaincapsdata/qemu_8.1.0.x86_64.xml | 3 ++- tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml | 3 ++- tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml | 3 ++- tests/domaincapsdata/qemu_8.2.0.x86_64.xml | 3 ++- tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml | 3 ++- tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml | 3 ++- tests/domaincapsdata/qemu_9.0.0.x86_64.xml | 3 ++- tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml | 3 ++- tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml | 3 ++- tests/domaincapsdata/qemu_9.1.0.x86_64.xml | 3 ++- tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml | 3 ++- tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml | 3 ++- tests/domaincapsdata/qemu_9.2.0.x86_64.xml | 3 ++- 45 files changed, 90 insertions(+), 42 deletions(-) create mode 100644 src/cpu_map/x86_Penryn-v1.xml diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml index e9a180526e..16ebe36539 100644 --- a/src/cpu_map/index.xml +++ b/src/cpu_map/index.xml @@ -41,6 +41,7 @@ <include filename='x86_Conroe.xml'/> <include filename='x86_Conroe-v1.xml'/> <include filename='x86_Penryn.xml'/> + <include filename='x86_Penryn-v1.xml'/> <include filename='x86_Nehalem.xml'/> <include filename='x86_Nehalem-IBRS.xml'/> <include filename='x86_Nehalem-v1.xml'/> diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build index cbf7bb407b..4d74431c55 100644 --- a/src/cpu_map/meson.build +++ b/src/cpu_map/meson.build @@ -115,6 +115,7 @@ cpumap_data = [ 'x86_Opteron_G3.xml', 'x86_Opteron_G4.xml', 'x86_Opteron_G5.xml', + 'x86_Penryn-v1.xml', 'x86_Penryn.xml', 'x86_pentium-v1.xml', 'x86_pentium.xml', diff --git a/src/cpu_map/x86_Penryn-v1.xml b/src/cpu_map/x86_Penryn-v1.xml new file mode 100644 index 0000000000..5da70a233e --- /dev/null +++ b/src/cpu_map/x86_Penryn-v1.xml @@ -0,0 +1,6 @@ +<cpus> + <model name='Penryn-v1'> + <decode host='on' guest='off'/> + <model name='Penryn'/> + </model> +</cpus> diff --git a/tests/cputestdata/x86_64-cpuid-Core2-Q9500-host.xml b/tests/cputestdata/x86_64-cpuid-Core2-Q9500-host.xml index dac84ba5fc..5034355859 100644 --- a/tests/cputestdata/x86_64-cpuid-Core2-Q9500-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Core2-Q9500-host.xml @@ -1,6 +1,6 @@ <cpu> <arch>x86_64</arch> - <model>Penryn</model> + <model>Penryn-v1</model> <vendor>Intel</vendor> <signature family='6' model='23' stepping='10'/> <feature name='dtes64'/> diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-X5460-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-X5460-host.xml index b7bc4cbb5b..a0516e6652 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-X5460-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Xeon-X5460-host.xml @@ -1,6 +1,6 @@ <cpu> <arch>x86_64</arch> - <model>Penryn</model> + <model>Penryn-v1</model> <vendor>Intel</vendor> <signature family='6' model='23' stepping='6'/> <feature name='dtes64'/> diff --git a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml index 3a14131fda..efd8f06104 100644 --- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml @@ -574,7 +574,8 @@ <feature name='tbm'/> <feature name='xop'/> </blockers> - <model usable='yes' vendor='Intel'>Penryn</model> + <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model> + <model usable='yes' vendor='Intel'>Penryn-v1</model> <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model> <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model> <blockers model='SandyBridge-IBRS'> 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 5223402151..beb923a1f3 100644 --- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml @@ -1076,7 +1076,8 @@ <feature name='tbm'/> <feature name='xop'/> </blockers> - <model usable='yes' vendor='Intel'>Penryn</model> + <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model> + <model usable='yes' vendor='Intel'>Penryn-v1</model> <model usable='no' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model> <blockers model='SandyBridge'> <feature name='avx'/> diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml index a3638c64a4..d9ae5568be 100644 --- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml @@ -573,7 +573,8 @@ <feature name='tbm'/> <feature name='xop'/> </blockers> - <model usable='yes' vendor='Intel'>Penryn</model> + <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model> + <model usable='yes' vendor='Intel'>Penryn-v1</model> <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model> <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model> <blockers model='SandyBridge-IBRS'> 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 9af3b3768d..403b9f6674 100644 --- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml @@ -596,7 +596,8 @@ <feature name='tbm'/> <feature name='xop'/> </blockers> - <model usable='yes' vendor='Intel'>Penryn</model> + <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model> + <model usable='yes' vendor='Intel'>Penryn-v1</model> <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model> <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model> <blockers model='SandyBridge-IBRS'> 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 7932c25f39..f2ad35c6cd 100644 --- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml @@ -1166,7 +1166,8 @@ <feature name='tbm'/> <feature name='xop'/> </blockers> - <model usable='yes' vendor='Intel'>Penryn</model> + <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model> + <model usable='yes' vendor='Intel'>Penryn-v1</model> <model usable='no' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model> <blockers model='SandyBridge'> <feature name='avx'/> diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml index 72c598466a..07570f5b02 100644 --- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml @@ -595,7 +595,8 @@ <feature name='tbm'/> <feature name='xop'/> </blockers> - <model usable='yes' vendor='Intel'>Penryn</model> + <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model> + <model usable='yes' vendor='Intel'>Penryn-v1</model> <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model> <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model> <blockers model='SandyBridge-IBRS'> 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 b3ba5b020d..4cf841b3e9 100644 --- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml @@ -666,7 +666,8 @@ <feature name='tbm'/> <feature name='xop'/> </blockers> - <model usable='yes' vendor='Intel'>Penryn</model> + <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model> + <model usable='yes' vendor='Intel'>Penryn-v1</model> <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model> <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model> <blockers model='SandyBridge-IBRS'> 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 69a73ea9b2..bbb9cfff7f 100644 --- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml @@ -1306,7 +1306,8 @@ <feature name='tbm'/> <feature name='xop'/> </blockers> - <model usable='yes' vendor='Intel'>Penryn</model> + <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model> + <model usable='yes' vendor='Intel'>Penryn-v1</model> <model usable='no' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model> <blockers model='SandyBridge'> <feature name='avx'/> diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml index 54edabd43f..0c615f1802 100644 --- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml @@ -665,7 +665,8 @@ <feature name='tbm'/> <feature name='xop'/> </blockers> - <model usable='yes' vendor='Intel'>Penryn</model> + <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model> + <model usable='yes' vendor='Intel'>Penryn-v1</model> <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model> <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model> <blockers model='SandyBridge-IBRS'> 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 be908c6cc6..e468a90911 100644 --- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml @@ -663,7 +663,8 @@ <feature name='tbm'/> <feature name='xop'/> </blockers> - <model usable='yes' vendor='Intel'>Penryn</model> + <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model> + <model usable='yes' vendor='Intel'>Penryn-v1</model> <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model> <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model> <blockers model='SandyBridge-IBRS'> 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 8fb08191ea..b46a515864 100644 --- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml @@ -1303,7 +1303,8 @@ <feature name='tbm'/> <feature name='xop'/> </blockers> - <model usable='yes' vendor='Intel'>Penryn</model> + <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model> + <model usable='yes' vendor='Intel'>Penryn-v1</model> <model usable='no' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model> <blockers model='SandyBridge'> <feature name='avx'/> diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml index 1f9bdf36af..d06e67a5e2 100644 --- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml @@ -662,7 +662,8 @@ <feature name='tbm'/> <feature name='xop'/> </blockers> - <model usable='yes' vendor='Intel'>Penryn</model> + <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model> + <model usable='yes' vendor='Intel'>Penryn-v1</model> <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model> <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model> <blockers model='SandyBridge-IBRS'> 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 14081dfafd..a0c47fd84e 100644 --- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml @@ -690,7 +690,8 @@ <feature name='tbm'/> <feature name='xop'/> </blockers> - <model usable='yes' vendor='Intel'>Penryn</model> + <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model> + <model usable='yes' vendor='Intel'>Penryn-v1</model> <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model> <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model> <blockers model='SandyBridge-IBRS'> 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 d9ba0202bd..db68047af7 100644 --- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml @@ -1332,7 +1332,8 @@ <feature name='tbm'/> <feature name='xop'/> </blockers> - <model usable='yes' vendor='Intel'>Penryn</model> + <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model> + <model usable='yes' vendor='Intel'>Penryn-v1</model> <model usable='no' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model> <blockers model='SandyBridge'> <feature name='avx'/> diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml index bba1b69e41..71999ab677 100644 --- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml @@ -689,7 +689,8 @@ <feature name='tbm'/> <feature name='xop'/> </blockers> - <model usable='yes' vendor='Intel'>Penryn</model> + <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model> + <model usable='yes' vendor='Intel'>Penryn-v1</model> <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model> <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model> <blockers model='SandyBridge-IBRS'> 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 9fb0fbe581..3a2874f08a 100644 --- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml @@ -657,7 +657,8 @@ <feature name='tbm'/> <feature name='xop'/> </blockers> - <model usable='yes' vendor='Intel'>Penryn</model> + <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model> + <model usable='yes' vendor='Intel'>Penryn-v1</model> <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model> <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model> <blockers model='SandyBridge-IBRS'> 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 b7f01c2b58..2416987852 100644 --- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml @@ -1280,7 +1280,8 @@ <feature name='tbm'/> <feature name='xop'/> </blockers> - <model usable='yes' vendor='Intel'>Penryn</model> + <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model> + <model usable='yes' vendor='Intel'>Penryn-v1</model> <model usable='no' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model> <blockers model='SandyBridge'> <feature name='avx'/> diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml index f7e9853077..eda271a1b2 100644 --- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml @@ -656,7 +656,8 @@ <feature name='tbm'/> <feature name='xop'/> </blockers> - <model usable='yes' vendor='Intel'>Penryn</model> + <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model> + <model usable='yes' vendor='Intel'>Penryn-v1</model> <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model> <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model> <blockers model='SandyBridge-IBRS'> 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 4b670c95fe..2b5cfdae87 100644 --- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml @@ -662,7 +662,8 @@ <feature name='tbm'/> <feature name='xop'/> </blockers> - <model usable='yes' vendor='Intel'>Penryn</model> + <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model> + <model usable='yes' vendor='Intel'>Penryn-v1</model> <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model> <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model> <blockers model='SandyBridge-IBRS'> 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 8b85bd98b4..6a191f3ce8 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 @@ -1057,7 +1057,8 @@ <feature name='tbm'/> <feature name='xop'/> </blockers> - <model usable='yes' vendor='Intel'>Penryn</model> + <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model> + <model usable='yes' vendor='Intel'>Penryn-v1</model> <model usable='no' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model> <blockers model='SandyBridge'> <feature name='tsc-deadline'/> 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 8b85bd98b4..6a191f3ce8 100644 --- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml @@ -1057,7 +1057,8 @@ <feature name='tbm'/> <feature name='xop'/> </blockers> - <model usable='yes' vendor='Intel'>Penryn</model> + <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model> + <model usable='yes' vendor='Intel'>Penryn-v1</model> <model usable='no' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model> <blockers model='SandyBridge'> <feature name='tsc-deadline'/> diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml index 0e1328f1fc..48b4ced22f 100644 --- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml @@ -661,7 +661,8 @@ <feature name='tbm'/> <feature name='xop'/> </blockers> - <model usable='yes' vendor='Intel'>Penryn</model> + <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model> + <model usable='yes' vendor='Intel'>Penryn-v1</model> <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model> <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model> <blockers model='SandyBridge-IBRS'> 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 b3040a9e6e..ec1fea19fc 100644 --- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml @@ -662,7 +662,8 @@ <feature name='tbm'/> <feature name='xop'/> </blockers> - <model usable='yes' vendor='Intel'>Penryn</model> + <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model> + <model usable='yes' vendor='Intel'>Penryn-v1</model> <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model> <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model> <blockers model='SandyBridge-IBRS'> 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 ac533cccfa..049bef7aa6 100644 --- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml @@ -1056,7 +1056,8 @@ <feature name='tbm'/> <feature name='xop'/> </blockers> - <model usable='yes' vendor='Intel'>Penryn</model> + <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model> + <model usable='yes' vendor='Intel'>Penryn-v1</model> <model usable='no' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model> <blockers model='SandyBridge'> <feature name='tsc-deadline'/> diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml index 0558eb7588..206a3a86a2 100644 --- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml @@ -661,7 +661,8 @@ <feature name='tbm'/> <feature name='xop'/> </blockers> - <model usable='yes' vendor='Intel'>Penryn</model> + <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model> + <model usable='yes' vendor='Intel'>Penryn-v1</model> <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model> <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model> <blockers model='SandyBridge-IBRS'> 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 3b334589ed..34fbc59118 100644 --- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml @@ -840,7 +840,8 @@ <feature name='tbm'/> <feature name='xop'/> </blockers> - <model usable='yes' vendor='Intel'>Penryn</model> + <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model> + <model usable='yes' vendor='Intel'>Penryn-v1</model> <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model> <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model> <blockers model='SandyBridge-IBRS'> 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 9815a01beb..2a836cbc21 100644 --- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml @@ -1064,7 +1064,8 @@ <feature name='tbm'/> <feature name='xop'/> </blockers> - <model usable='yes' vendor='Intel'>Penryn</model> + <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model> + <model usable='yes' vendor='Intel'>Penryn-v1</model> <model usable='no' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model> <blockers model='SandyBridge'> <feature name='tsc-deadline'/> diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml index 3b1796949f..3380b8a9aa 100644 --- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml @@ -839,7 +839,8 @@ <feature name='tbm'/> <feature name='xop'/> </blockers> - <model usable='yes' vendor='Intel'>Penryn</model> + <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model> + <model usable='yes' vendor='Intel'>Penryn-v1</model> <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model> <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model> <blockers model='SandyBridge-IBRS'> 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 c4d2a768bd..0ec9ebeafe 100644 --- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml @@ -841,7 +841,8 @@ <feature name='tbm'/> <feature name='xop'/> </blockers> - <model usable='yes' vendor='Intel'>Penryn</model> + <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model> + <model usable='yes' vendor='Intel'>Penryn-v1</model> <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model> <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model> <blockers model='SandyBridge-IBRS'> 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 207092ba7b..b3fd8eb6c6 100644 --- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml @@ -1039,7 +1039,8 @@ <feature name='tbm'/> <feature name='xop'/> </blockers> - <model usable='yes' vendor='Intel'>Penryn</model> + <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model> + <model usable='yes' vendor='Intel'>Penryn-v1</model> <model usable='no' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model> <blockers model='SandyBridge'> <feature name='tsc-deadline'/> diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml index 855dfef498..210024bc44 100644 --- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml @@ -840,7 +840,8 @@ <feature name='tbm'/> <feature name='xop'/> </blockers> - <model usable='yes' vendor='Intel'>Penryn</model> + <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model> + <model usable='yes' vendor='Intel'>Penryn-v1</model> <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model> <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model> <blockers model='SandyBridge-IBRS'> 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 f7ddcd9aff..2aade71dae 100644 --- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml @@ -841,7 +841,8 @@ <feature name='tbm'/> <feature name='xop'/> </blockers> - <model usable='yes' vendor='Intel'>Penryn</model> + <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model> + <model usable='yes' vendor='Intel'>Penryn-v1</model> <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model> <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model> <blockers model='SandyBridge-IBRS'> 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 3419e26d32..36cec1ee6b 100644 --- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml @@ -996,7 +996,8 @@ <feature name='tbm'/> <feature name='xop'/> </blockers> - <model usable='yes' vendor='Intel'>Penryn</model> + <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model> + <model usable='yes' vendor='Intel'>Penryn-v1</model> <model usable='no' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model> <blockers model='SandyBridge'> <feature name='tsc-deadline'/> diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml index 43bc77f7cc..8316b40fce 100644 --- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml @@ -840,7 +840,8 @@ <feature name='tbm'/> <feature name='xop'/> </blockers> - <model usable='yes' vendor='Intel'>Penryn</model> + <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model> + <model usable='yes' vendor='Intel'>Penryn-v1</model> <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model> <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model> <blockers model='SandyBridge-IBRS'> 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 0a962420cd..cabd1c3694 100644 --- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml @@ -874,7 +874,8 @@ <feature name='tbm'/> <feature name='xop'/> </blockers> - <model usable='yes' vendor='Intel'>Penryn</model> + <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model> + <model usable='yes' vendor='Intel'>Penryn-v1</model> <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model> <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model> <blockers model='SandyBridge-IBRS'> 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 02209df41b..67a8a5f5e7 100644 --- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml @@ -1021,7 +1021,8 @@ <feature name='tbm'/> <feature name='xop'/> </blockers> - <model usable='yes' vendor='Intel'>Penryn</model> + <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model> + <model usable='yes' vendor='Intel'>Penryn-v1</model> <model usable='no' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model> <blockers model='SandyBridge'> <feature name='tsc-deadline'/> diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml index 49e1df7be4..45252b6b81 100644 --- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml @@ -873,7 +873,8 @@ <feature name='tbm'/> <feature name='xop'/> </blockers> - <model usable='yes' vendor='Intel'>Penryn</model> + <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model> + <model usable='yes' vendor='Intel'>Penryn-v1</model> <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model> <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model> <blockers model='SandyBridge-IBRS'> 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 56449ad3db..cc5cbfbf19 100644 --- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml @@ -874,7 +874,8 @@ <feature name='tbm'/> <feature name='xop'/> </blockers> - <model usable='yes' vendor='Intel'>Penryn</model> + <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model> + <model usable='yes' vendor='Intel'>Penryn-v1</model> <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model> <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model> <blockers model='SandyBridge-IBRS'> 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 04a759a16b..d0761a2c57 100644 --- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml @@ -1021,7 +1021,8 @@ <feature name='tbm'/> <feature name='xop'/> </blockers> - <model usable='yes' vendor='Intel'>Penryn</model> + <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model> + <model usable='yes' vendor='Intel'>Penryn-v1</model> <model usable='no' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model> <blockers model='SandyBridge'> <feature name='tsc-deadline'/> diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml index 7b3379b3e5..df2f9d27ad 100644 --- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml @@ -873,7 +873,8 @@ <feature name='tbm'/> <feature name='xop'/> </blockers> - <model usable='yes' vendor='Intel'>Penryn</model> + <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model> + <model usable='yes' vendor='Intel'>Penryn-v1</model> <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model> <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model> <blockers model='SandyBridge-IBRS'> -- 2.47.0