cpu_map: Add Penryn-v1 CPU model

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml
index e9a180526e3e1e134b4d4acd62bfbd073276c8cd..16ebe3653985806419e907dbb44c75940408f205 100644 (file)
--- 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 cbf7bb407ba82a94016348e806705526290c32f9..4d74431c55a52dc9c2d3195ca974efa0a23adad7 100644 (file)
--- 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 (file)
index 0000000..5da70a2
--- /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 dac84ba5fcc09ac3db49fc09b087fdeba67f201f..5034355859d65f63540922c3b50cc152cdac72be 100644 (file)
--- 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 b7bc4cbb5bfb8e53b6f5c67638e80e1ff156f0fb..a0516e6652322618332f7e34d1512ccd678ffd32 100644 (file)
--- 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 3a14131fdace28aeddd36143cfa9d9e0620b0889..efd8f06104874c0c953f8c8ff66808793a9833cd 100644 (file)
--- 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 522340215146963a1adaaf98ba4a2970868fc0a2..beb923a1f3d6b68abe2ecd8b11ce2caaf352205b 100644 (file)
--- 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 a3638c64a42248dc54249cf882ab97791665df8a..d9ae5568be8bc394a9e518f90aeee1ee492ab977 100644 (file)
--- 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 9af3b3768dd671cb1c78f1fbda98d4d5360eca6b..403b9f66740800880139cd43375d8878a134a60b 100644 (file)
--- 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 7932c25f39f3c4fb95ae80d469ea357cdfba574d..f2ad35c6cde7bedaf887ca9e417e1542bb501361 100644 (file)
--- 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 72c598466aa540553edeed784c5beb534ea639f6..07570f5b024f01dee062b4d8f93fd0257c3a1216 100644 (file)
--- 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 b3ba5b020d55dcf4a49cc38b25f22e84d9faacf4..4cf841b3e9ae9121e3a461f27aba558466b6dbb4 100644 (file)
--- 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 69a73ea9b2d2d60c09ccb787be7d02ecddf394c8..bbb9cfff7fb13204eb4e325f84f34840dbabfb61 100644 (file)
--- 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 54edabd43f623ec563b0e72fd8bd0e4a81d48e72..0c615f180255217619c221309d3ffcbdd9d9de3d 100644 (file)
--- 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 be908c6cc635cabf1487055be6c1b896c74bb2f0..e468a909112ec9f1f5b9e4dbfc1a57cd92a60b17 100644 (file)
--- 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 8fb08191ea0d2534f76dfd08500a096a4b695aaf..b46a5158645ad0d3d8dd37b21c10c7eb2713b381 100644 (file)
--- 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 1f9bdf36af9cd4ed0bbdb034e288d9ee0378f4a3..d06e67a5e212e83fc411a4ab3cdfd285ba459619 100644 (file)
--- 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 14081dfafdcf14e8e0241a8f6624be6c1b92ab1f..a0c47fd84e932090204b63ddd144fa2efb70791f 100644 (file)
--- 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 d9ba0202bd5094e5ea0f0dd468daa5ef139ca3da..db68047af79140182d6f51a58bf2c35a0c84c085 100644 (file)
--- 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 bba1b69e41c6e7acbf290613a1aec79262b96c2a..71999ab677c9a4862c572df12ebf96ff71f260bc 100644 (file)
--- 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 9fb0fbe581e85537da4c1588748155bfc6207d2b..3a2874f08afa05f3ff0ec56f6c90e5df063d01b7 100644 (file)
--- 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 b7f01c2b580a47557b41f75b41c32e26609a1b54..241698785224dc82ddc2193d40b1386a10194a2e 100644 (file)
--- 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 f7e98530776fbee3e1b86205e82dfcbd9a8da542..eda271a1b2a94018c59ceed08eefb1dfda920386 100644 (file)
--- 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 4b670c95fea06dc500aabc49d2e6af144f486bb1..2b5cfdae87b5d4ed3332341839b3398550611b81 100644 (file)
--- 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 8b85bd98b494a856f64414264b8d6686db53d123..6a191f3ce8ed626ece343ee069d0ae79c9cfcb08 100644 (file)
--- 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 8b85bd98b494a856f64414264b8d6686db53d123..6a191f3ce8ed626ece343ee069d0ae79c9cfcb08 100644 (file)
--- 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 0e1328f1fc2d88ca731097c70760c57c432c8d85..48b4ced22f5f28ebfc2927edd928ac14b669d946 100644 (file)
--- 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 b3040a9e6ed4aabc67bcb1f164d8adc1a359fad5..ec1fea19fc062ab1a71062db7d4a5ef2d60d9a36 100644 (file)
--- 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 ac533cccfa80fd6ecf55622a35850e952135885d..049bef7aa6b34e39b91b145b85db041fb7aa276f 100644 (file)
--- 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 0558eb75884003cf2a6594bdfb11ed3ae136206a..206a3a86a2c7e66361514ca7a0780f9af24f8a8e 100644 (file)
--- 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 3b334589edfaf12ad758370a0bf77b0a20d5b1a0..34fbc59118258a28335f4bc8e14bc9d999f3fe5c 100644 (file)
--- 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 9815a01bebef51d214288b40fb9553591335b716..2a836cbc21e17ce8909124e348e29354bfb78b70 100644 (file)
--- 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 3b1796949fcc88461cdf871b9466d7e8a381bae5..3380b8a9aa76f3b261d9ef51880a66a989f7f1c8 100644 (file)
--- 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 c4d2a768bda839b423a42ee9891fa1157f59eb98..0ec9ebeafe2af12825344af41b79950d2c700c8e 100644 (file)
--- 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 207092ba7b604362b289416b13f993dad6bb246a..b3fd8eb6c62b4ebf4a5cee743743a2fd1a3a4284 100644 (file)
--- 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 855dfef4986645afef791ddcabe4ca72590cbc1f..210024bc4459f3aa98e16befc3b501783e6c192e 100644 (file)
--- 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 f7ddcd9affe19a9a1d808de9bf3fc45555424a1b..2aade71dae441fff952a1b0f1b72b4a41fe44aaa 100644 (file)
--- 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 3419e26d32713aab3961704d3767c11891272cbb..36cec1ee6b1130591c66c64e7604682e17509908 100644 (file)
--- 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 43bc77f7cca4ede558cfbe48b09d533da4f03865..8316b40fce88c478ede6edff4e51ad93cdd28c5b 100644 (file)
--- 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 0a962420cd2015cca3d94a19a438293c70e3a1c8..cabd1c3694df6e32a8953ae4b72dabc7c75d208c 100644 (file)
--- 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 02209df41bd94fb8233b7f65df650ef56162edbb..67a8a5f5e707e0ce6ff4982d6676f21d21efe714 100644 (file)
--- 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 49e1df7be4ab99045709cd4af4cc999c899c058f..45252b6b8194e81aad47b30320ff7cb6abf7ecf2 100644 (file)
--- 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 56449ad3db1c5119b6cd64cef6762721db7e0e00..cc5cbfbf194dfca7fa78e2a378af6c1690a99c19 100644 (file)
--- 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 04a759a16bc9d017039358bc20797a6c451895d0..d0761a2c57460c9cc74884612f578f4e66e02bf0 100644 (file)
--- 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 7b3379b3e5be425bfdf56e9b12d02c418d5b58f1..df2f9d27ad738a9d993cc588cc67d40351cc63d8 100644 (file)
--- 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'>