cpu_map: Add phenom-v1 CPU model

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

src/cpu_map/index.xml

@@ -135,6 +135,7 @@
       <include filename='x86_athlon.xml'/>
       <include filename='x86_athlon-v1.xml'/>
       <include filename='x86_phenom.xml'/>
+      <include filename='x86_phenom-v1.xml'/>
       <include filename='x86_Opteron_G1.xml'/>
       <include filename='x86_Opteron_G2.xml'/>
       <include filename='x86_Opteron_G3.xml'/>

src/cpu_map/meson.build

@@ -126,6 +126,7 @@ cpumap_data = [
   'x86_pentium3-v1.xml',
   'x86_pentium3.xml',
   'x86_pentiumpro.xml',
+  'x86_phenom-v1.xml',
   'x86_phenom.xml',
   'x86_qemu32-v1.xml',
   'x86_qemu32.xml',

src/cpu_map/x86_phenom-v1.xml

@@ -0,0 +1,6 @@
+<cpus>
+  <model name='phenom-v1'>
+    <decode host='on' guest='off'/>
+    <model name='phenom'/>
+  </model>
+</cpus>

tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml

@@ -832,11 +832,16 @@
       <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium3-v1</model>
-      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
       <blockers model='phenom'>
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
+      <model usable='no' vendor='AMD'>phenom-v1</model>
+      <blockers model='phenom-v1'>
+        <feature name='3dnow'/>
+        <feature name='3dnowext'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
       <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>

tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml

@@ -1449,10 +1449,14 @@
       <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium3-v1</model>
-      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
       <blockers model='phenom'>
         <feature name='fxsr_opt'/>
       </blockers>
+      <model usable='no' vendor='AMD'>phenom-v1</model>
+      <blockers model='phenom-v1'>
+        <feature name='fxsr_opt'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
       <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>

tests/domaincapsdata/qemu_5.2.0.x86_64.xml

@@ -831,11 +831,16 @@
       <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium3-v1</model>
-      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
       <blockers model='phenom'>
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
+      <model usable='no' vendor='AMD'>phenom-v1</model>
+      <blockers model='phenom-v1'>
+        <feature name='3dnow'/>
+        <feature name='3dnowext'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
       <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>

tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml

@@ -854,11 +854,16 @@
       <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium3-v1</model>
-      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
       <blockers model='phenom'>
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
+      <model usable='no' vendor='AMD'>phenom-v1</model>
+      <blockers model='phenom-v1'>
+        <feature name='3dnow'/>
+        <feature name='3dnowext'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
       <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>

tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml

@@ -1539,10 +1539,14 @@
       <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium3-v1</model>
-      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
       <blockers model='phenom'>
         <feature name='fxsr_opt'/>
       </blockers>
+      <model usable='no' vendor='AMD'>phenom-v1</model>
+      <blockers model='phenom-v1'>
+        <feature name='fxsr_opt'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
       <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>

tests/domaincapsdata/qemu_6.0.0.x86_64.xml

@@ -853,11 +853,16 @@
       <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium3-v1</model>
-      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
       <blockers model='phenom'>
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
+      <model usable='no' vendor='AMD'>phenom-v1</model>
+      <blockers model='phenom-v1'>
+        <feature name='3dnow'/>
+        <feature name='3dnowext'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
       <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>

tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml

@@ -955,11 +955,16 @@
       <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium3-v1</model>
-      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
       <blockers model='phenom'>
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
+      <model usable='no' vendor='AMD'>phenom-v1</model>
+      <blockers model='phenom-v1'>
+        <feature name='3dnow'/>
+        <feature name='3dnowext'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
       <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>

tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml

@@ -1736,10 +1736,14 @@
       <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium3-v1</model>
-      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
       <blockers model='phenom'>
         <feature name='fxsr_opt'/>
       </blockers>
+      <model usable='no' vendor='AMD'>phenom-v1</model>
+      <blockers model='phenom-v1'>
+        <feature name='fxsr_opt'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
       <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>

tests/domaincapsdata/qemu_6.1.0.x86_64.xml

@@ -954,11 +954,16 @@
       <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium3-v1</model>
-      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
       <blockers model='phenom'>
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
+      <model usable='no' vendor='AMD'>phenom-v1</model>
+      <blockers model='phenom-v1'>
+        <feature name='3dnow'/>
+        <feature name='3dnowext'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
       <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>

tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml

@@ -961,11 +961,16 @@
       <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium3-v1</model>
-      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
       <blockers model='phenom'>
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
+      <model usable='no' vendor='AMD'>phenom-v1</model>
+      <blockers model='phenom-v1'>
+        <feature name='3dnow'/>
+        <feature name='3dnowext'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
       <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>

tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml

@@ -1751,10 +1751,14 @@
       <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium3-v1</model>
-      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
       <blockers model='phenom'>
         <feature name='fxsr_opt'/>
       </blockers>
+      <model usable='no' vendor='AMD'>phenom-v1</model>
+      <blockers model='phenom-v1'>
+        <feature name='fxsr_opt'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
       <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>

tests/domaincapsdata/qemu_6.2.0.x86_64.xml

@@ -960,11 +960,16 @@
       <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium3-v1</model>
-      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
       <blockers model='phenom'>
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
+      <model usable='no' vendor='AMD'>phenom-v1</model>
+      <blockers model='phenom-v1'>
+        <feature name='3dnow'/>
+        <feature name='3dnowext'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
       <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>

tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml

@@ -988,11 +988,16 @@
       <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium3-v1</model>
-      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
       <blockers model='phenom'>
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
+      <model usable='no' vendor='AMD'>phenom-v1</model>
+      <blockers model='phenom-v1'>
+        <feature name='3dnow'/>
+        <feature name='3dnowext'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
       <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>

tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml

@@ -1775,10 +1775,14 @@
       <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium3-v1</model>
-      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
       <blockers model='phenom'>
         <feature name='fxsr_opt'/>
       </blockers>
+      <model usable='no' vendor='AMD'>phenom-v1</model>
+      <blockers model='phenom-v1'>
+        <feature name='fxsr_opt'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
       <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>

tests/domaincapsdata/qemu_7.0.0.x86_64.xml

@@ -987,11 +987,16 @@
       <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium3-v1</model>
-      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
       <blockers model='phenom'>
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
+      <model usable='no' vendor='AMD'>phenom-v1</model>
+      <blockers model='phenom-v1'>
+        <feature name='3dnow'/>
+        <feature name='3dnowext'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
       <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>

tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml

@@ -955,11 +955,16 @@
       <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium3-v1</model>
-      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
       <blockers model='phenom'>
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
+      <model usable='no' vendor='AMD'>phenom-v1</model>
+      <blockers model='phenom-v1'>
+        <feature name='3dnow'/>
+        <feature name='3dnowext'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
       <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>

tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml

@@ -1723,10 +1723,14 @@
       <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium3-v1</model>
-      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
       <blockers model='phenom'>
         <feature name='fxsr_opt'/>
       </blockers>
+      <model usable='no' vendor='AMD'>phenom-v1</model>
+      <blockers model='phenom-v1'>
+        <feature name='fxsr_opt'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
       <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>

tests/domaincapsdata/qemu_7.1.0.x86_64.xml

@@ -954,11 +954,16 @@
       <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium3-v1</model>
-      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
       <blockers model='phenom'>
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
+      <model usable='no' vendor='AMD'>phenom-v1</model>
+      <blockers model='phenom-v1'>
+        <feature name='3dnow'/>
+        <feature name='3dnowext'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
       <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>

tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml

@@ -960,11 +960,16 @@
       <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium3-v1</model>
-      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
       <blockers model='phenom'>
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
+      <model usable='no' vendor='AMD'>phenom-v1</model>
+      <blockers model='phenom-v1'>
+        <feature name='3dnow'/>
+        <feature name='3dnowext'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
       <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>

tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml

@@ -1432,10 +1432,14 @@
       <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium3-v1</model>
-      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
       <blockers model='phenom'>
         <feature name='fxsr_opt'/>
       </blockers>
+      <model usable='no' vendor='AMD'>phenom-v1</model>
+      <blockers model='phenom-v1'>
+        <feature name='fxsr_opt'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
       <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>

tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml

@@ -1432,10 +1432,14 @@
       <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium3-v1</model>
-      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
       <blockers model='phenom'>
         <feature name='fxsr_opt'/>
       </blockers>
+      <model usable='no' vendor='AMD'>phenom-v1</model>
+      <blockers model='phenom-v1'>
+        <feature name='fxsr_opt'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
       <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>

tests/domaincapsdata/qemu_7.2.0.x86_64.xml

@@ -959,11 +959,16 @@
       <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium3-v1</model>
-      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
       <blockers model='phenom'>
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
+      <model usable='no' vendor='AMD'>phenom-v1</model>
+      <blockers model='phenom-v1'>
+        <feature name='3dnow'/>
+        <feature name='3dnowext'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
       <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>

tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml

@@ -1042,11 +1042,16 @@
       <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium3-v1</model>
-      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
       <blockers model='phenom'>
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
+      <model usable='no' vendor='AMD'>phenom-v1</model>
+      <blockers model='phenom-v1'>
+        <feature name='3dnow'/>
+        <feature name='3dnowext'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
       <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>

tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml

@@ -1527,10 +1527,14 @@
       <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium3-v1</model>
-      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
       <blockers model='phenom'>
         <feature name='fxsr_opt'/>
       </blockers>
+      <model usable='no' vendor='AMD'>phenom-v1</model>
+      <blockers model='phenom-v1'>
+        <feature name='fxsr_opt'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
       <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>

tests/domaincapsdata/qemu_8.0.0.x86_64.xml

@@ -1041,11 +1041,16 @@
       <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium3-v1</model>
-      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
       <blockers model='phenom'>
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
+      <model usable='no' vendor='AMD'>phenom-v1</model>
+      <blockers model='phenom-v1'>
+        <feature name='3dnow'/>
+        <feature name='3dnowext'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
       <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>

tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml

@@ -1271,11 +1271,16 @@
       <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium3-v1</model>
-      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
       <blockers model='phenom'>
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
+      <model usable='no' vendor='AMD'>phenom-v1</model>
+      <blockers model='phenom-v1'>
+        <feature name='3dnow'/>
+        <feature name='3dnowext'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
       <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>

tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml

@@ -1511,10 +1511,14 @@
       <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium3-v1</model>
-      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
       <blockers model='phenom'>
         <feature name='fxsr_opt'/>
       </blockers>
+      <model usable='no' vendor='AMD'>phenom-v1</model>
+      <blockers model='phenom-v1'>
+        <feature name='fxsr_opt'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
       <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>

tests/domaincapsdata/qemu_8.1.0.x86_64.xml

@@ -1270,11 +1270,16 @@
       <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium3-v1</model>
-      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
       <blockers model='phenom'>
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
+      <model usable='no' vendor='AMD'>phenom-v1</model>
+      <blockers model='phenom-v1'>
+        <feature name='3dnow'/>
+        <feature name='3dnowext'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
       <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>

tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml

@@ -1272,11 +1272,16 @@
       <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium3-v1</model>
-      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
       <blockers model='phenom'>
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
+      <model usable='no' vendor='AMD'>phenom-v1</model>
+      <blockers model='phenom-v1'>
+        <feature name='3dnow'/>
+        <feature name='3dnowext'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
       <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>

tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml

@@ -1478,10 +1478,14 @@
       <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium3-v1</model>
-      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
       <blockers model='phenom'>
         <feature name='fxsr_opt'/>
       </blockers>
+      <model usable='no' vendor='AMD'>phenom-v1</model>
+      <blockers model='phenom-v1'>
+        <feature name='fxsr_opt'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
       <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>

tests/domaincapsdata/qemu_8.2.0.x86_64.xml

@@ -1271,11 +1271,16 @@
       <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium3-v1</model>
-      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
       <blockers model='phenom'>
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
+      <model usable='no' vendor='AMD'>phenom-v1</model>
+      <blockers model='phenom-v1'>
+        <feature name='3dnow'/>
+        <feature name='3dnowext'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
       <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>

tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml

@@ -1272,11 +1272,16 @@
       <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium3-v1</model>
-      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
       <blockers model='phenom'>
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
+      <model usable='no' vendor='AMD'>phenom-v1</model>
+      <blockers model='phenom-v1'>
+        <feature name='3dnow'/>
+        <feature name='3dnowext'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
       <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>

tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml

@@ -1407,10 +1407,14 @@
       <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium3-v1</model>
-      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
       <blockers model='phenom'>
         <feature name='fxsr_opt'/>
       </blockers>
+      <model usable='no' vendor='AMD'>phenom-v1</model>
+      <blockers model='phenom-v1'>
+        <feature name='fxsr_opt'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
       <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>

tests/domaincapsdata/qemu_9.0.0.x86_64.xml

@@ -1271,11 +1271,16 @@
       <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium3-v1</model>
-      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
       <blockers model='phenom'>
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
+      <model usable='no' vendor='AMD'>phenom-v1</model>
+      <blockers model='phenom-v1'>
+        <feature name='3dnow'/>
+        <feature name='3dnowext'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
       <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>

tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml

@@ -1408,11 +1408,16 @@
       <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium3-v1</model>
-      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
       <blockers model='phenom'>
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
+      <model usable='no' vendor='AMD'>phenom-v1</model>
+      <blockers model='phenom-v1'>
+        <feature name='3dnow'/>
+        <feature name='3dnowext'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
       <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>

tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml

@@ -1512,10 +1512,14 @@
       <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium3-v1</model>
-      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
       <blockers model='phenom'>
         <feature name='fxsr_opt'/>
       </blockers>
+      <model usable='no' vendor='AMD'>phenom-v1</model>
+      <blockers model='phenom-v1'>
+        <feature name='fxsr_opt'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
       <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>

tests/domaincapsdata/qemu_9.1.0.x86_64.xml

@@ -1407,11 +1407,16 @@
       <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium3-v1</model>
-      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
       <blockers model='phenom'>
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
+      <model usable='no' vendor='AMD'>phenom-v1</model>
+      <blockers model='phenom-v1'>
+        <feature name='3dnow'/>
+        <feature name='3dnowext'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
       <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>

tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml

@@ -1408,11 +1408,16 @@
       <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium3-v1</model>
-      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
       <blockers model='phenom'>
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
+      <model usable='no' vendor='AMD'>phenom-v1</model>
+      <blockers model='phenom-v1'>
+        <feature name='3dnow'/>
+        <feature name='3dnowext'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
       <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>

tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml

@@ -1512,10 +1512,14 @@
       <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium3-v1</model>
-      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
       <blockers model='phenom'>
         <feature name='fxsr_opt'/>
       </blockers>
+      <model usable='no' vendor='AMD'>phenom-v1</model>
+      <blockers model='phenom-v1'>
+        <feature name='fxsr_opt'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
       <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>

tests/domaincapsdata/qemu_9.2.0.x86_64.xml

@@ -1407,11 +1407,16 @@
       <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium3-v1</model>
-      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
       <blockers model='phenom'>
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
+      <model usable='no' vendor='AMD'>phenom-v1</model>
+      <blockers model='phenom-v1'>
+        <feature name='3dnow'/>
+        <feature name='3dnowext'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
       <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>