cpu_map: Add Penryn-v1 CPU model

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

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'/>

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',

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>

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'/>

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'/>

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'>

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'/>

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'>

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'>

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'/>

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'>

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'>

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'/>

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'>

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'>

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'/>

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'>

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'>

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'/>

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'>

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'>

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'/>

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'>

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'>

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'/>

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'/>

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'>

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'>

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'/>

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'>

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'>

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'/>

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'>

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'>

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'/>

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'>

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'>

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'/>

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'>

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'>

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'/>

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'>

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'>

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'/>

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'>