cpu_map: Add Opteron_G5-v1 CPU model

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

src/cpu_map/index.xml

@@ -145,6 +145,7 @@
       <include filename='x86_Opteron_G4.xml'/>
       <include filename='x86_Opteron_G4-v1.xml'/>
       <include filename='x86_Opteron_G5.xml'/>
+      <include filename='x86_Opteron_G5-v1.xml'/>
       <include filename='x86_EPYC.xml'/>
       <include filename='x86_EPYC-IBPB.xml'/>
       <include filename='x86_EPYC-v1.xml'/>

src/cpu_map/meson.build

@@ -120,6 +120,7 @@ cpumap_data = [
   'x86_Opteron_G3.xml',
   'x86_Opteron_G4-v1.xml',
   'x86_Opteron_G4.xml',
+  'x86_Opteron_G5-v1.xml',
   'x86_Opteron_G5.xml',
   'x86_Penryn-v1.xml',
   'x86_Penryn.xml',

src/cpu_map/x86_Opteron_G5-v1.xml

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

tests/cputestdata/x86_64-cpuid-A10-5800K-host.xml

@@ -1,6 +1,6 @@
 <cpu>
   <arch>x86_64</arch>
-  <model>Opteron_G5</model>
+  <model>Opteron_G5-v1</model>
   <vendor>AMD</vendor>
   <signature family='21' model='16' stepping='1'/>
   <feature name='monitor'/>

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

@@ -588,12 +588,18 @@
         <feature name='fma4'/>
         <feature name='xop'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <feature name='fma4'/>
         <feature name='tbm'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
+      <blockers model='Opteron_G5-v1'>
+        <feature name='fma4'/>
+        <feature name='tbm'/>
+        <feature name='xop'/>
+      </blockers>
       <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>

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

@@ -1097,7 +1097,7 @@
         <feature name='nrip-save'/>
         <feature name='xop'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <feature name='3dnowprefetch'/>
         <feature name='avx'/>
@@ -1109,6 +1109,18 @@
         <feature name='tbm'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
+      <blockers model='Opteron_G5-v1'>
+        <feature name='3dnowprefetch'/>
+        <feature name='avx'/>
+        <feature name='f16c'/>
+        <feature name='fma'/>
+        <feature name='fma4'/>
+        <feature name='misalignsse'/>
+        <feature name='nrip-save'/>
+        <feature name='tbm'/>
+        <feature name='xop'/>
+      </blockers>
       <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>

tests/domaincapsdata/qemu_5.2.0.x86_64.xml

@@ -587,12 +587,18 @@
         <feature name='fma4'/>
         <feature name='xop'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <feature name='fma4'/>
         <feature name='tbm'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
+      <blockers model='Opteron_G5-v1'>
+        <feature name='fma4'/>
+        <feature name='tbm'/>
+        <feature name='xop'/>
+      </blockers>
       <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>

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

@@ -610,12 +610,18 @@
         <feature name='fma4'/>
         <feature name='xop'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <feature name='fma4'/>
         <feature name='tbm'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
+      <blockers model='Opteron_G5-v1'>
+        <feature name='fma4'/>
+        <feature name='tbm'/>
+        <feature name='xop'/>
+      </blockers>
       <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>

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

@@ -1187,7 +1187,7 @@
         <feature name='nrip-save'/>
         <feature name='xop'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <feature name='3dnowprefetch'/>
         <feature name='avx'/>
@@ -1199,6 +1199,18 @@
         <feature name='tbm'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
+      <blockers model='Opteron_G5-v1'>
+        <feature name='3dnowprefetch'/>
+        <feature name='avx'/>
+        <feature name='f16c'/>
+        <feature name='fma'/>
+        <feature name='fma4'/>
+        <feature name='misalignsse'/>
+        <feature name='nrip-save'/>
+        <feature name='tbm'/>
+        <feature name='xop'/>
+      </blockers>
       <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>

tests/domaincapsdata/qemu_6.0.0.x86_64.xml

@@ -609,12 +609,18 @@
         <feature name='fma4'/>
         <feature name='xop'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <feature name='fma4'/>
         <feature name='tbm'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
+      <blockers model='Opteron_G5-v1'>
+        <feature name='fma4'/>
+        <feature name='tbm'/>
+        <feature name='xop'/>
+      </blockers>
       <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>

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

@@ -680,12 +680,18 @@
         <feature name='fma4'/>
         <feature name='xop'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <feature name='fma4'/>
         <feature name='tbm'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
+      <blockers model='Opteron_G5-v1'>
+        <feature name='fma4'/>
+        <feature name='tbm'/>
+        <feature name='xop'/>
+      </blockers>
       <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>

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

@@ -1327,7 +1327,7 @@
         <feature name='nrip-save'/>
         <feature name='xop'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <feature name='3dnowprefetch'/>
         <feature name='avx'/>
@@ -1339,6 +1339,18 @@
         <feature name='tbm'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
+      <blockers model='Opteron_G5-v1'>
+        <feature name='3dnowprefetch'/>
+        <feature name='avx'/>
+        <feature name='f16c'/>
+        <feature name='fma'/>
+        <feature name='fma4'/>
+        <feature name='misalignsse'/>
+        <feature name='nrip-save'/>
+        <feature name='tbm'/>
+        <feature name='xop'/>
+      </blockers>
       <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>

tests/domaincapsdata/qemu_6.1.0.x86_64.xml

@@ -679,12 +679,18 @@
         <feature name='fma4'/>
         <feature name='xop'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <feature name='fma4'/>
         <feature name='tbm'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
+      <blockers model='Opteron_G5-v1'>
+        <feature name='fma4'/>
+        <feature name='tbm'/>
+        <feature name='xop'/>
+      </blockers>
       <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>

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

@@ -677,12 +677,18 @@
         <feature name='fma4'/>
         <feature name='xop'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <feature name='fma4'/>
         <feature name='tbm'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
+      <blockers model='Opteron_G5-v1'>
+        <feature name='fma4'/>
+        <feature name='tbm'/>
+        <feature name='xop'/>
+      </blockers>
       <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>

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

@@ -1324,7 +1324,7 @@
         <feature name='nrip-save'/>
         <feature name='xop'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <feature name='3dnowprefetch'/>
         <feature name='avx'/>
@@ -1336,6 +1336,18 @@
         <feature name='tbm'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
+      <blockers model='Opteron_G5-v1'>
+        <feature name='3dnowprefetch'/>
+        <feature name='avx'/>
+        <feature name='f16c'/>
+        <feature name='fma'/>
+        <feature name='fma4'/>
+        <feature name='misalignsse'/>
+        <feature name='nrip-save'/>
+        <feature name='tbm'/>
+        <feature name='xop'/>
+      </blockers>
       <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>

tests/domaincapsdata/qemu_6.2.0.x86_64.xml

@@ -676,12 +676,18 @@
         <feature name='fma4'/>
         <feature name='xop'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <feature name='fma4'/>
         <feature name='tbm'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
+      <blockers model='Opteron_G5-v1'>
+        <feature name='fma4'/>
+        <feature name='tbm'/>
+        <feature name='xop'/>
+      </blockers>
       <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>

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

@@ -704,12 +704,18 @@
         <feature name='fma4'/>
         <feature name='xop'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <feature name='fma4'/>
         <feature name='tbm'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
+      <blockers model='Opteron_G5-v1'>
+        <feature name='fma4'/>
+        <feature name='tbm'/>
+        <feature name='xop'/>
+      </blockers>
       <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>

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

@@ -1353,7 +1353,7 @@
         <feature name='nrip-save'/>
         <feature name='xop'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <feature name='3dnowprefetch'/>
         <feature name='avx'/>
@@ -1365,6 +1365,18 @@
         <feature name='tbm'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
+      <blockers model='Opteron_G5-v1'>
+        <feature name='3dnowprefetch'/>
+        <feature name='avx'/>
+        <feature name='f16c'/>
+        <feature name='fma'/>
+        <feature name='fma4'/>
+        <feature name='misalignsse'/>
+        <feature name='nrip-save'/>
+        <feature name='tbm'/>
+        <feature name='xop'/>
+      </blockers>
       <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>

tests/domaincapsdata/qemu_7.0.0.x86_64.xml

@@ -703,12 +703,18 @@
         <feature name='fma4'/>
         <feature name='xop'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <feature name='fma4'/>
         <feature name='tbm'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
+      <blockers model='Opteron_G5-v1'>
+        <feature name='fma4'/>
+        <feature name='tbm'/>
+        <feature name='xop'/>
+      </blockers>
       <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>

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

@@ -671,12 +671,18 @@
         <feature name='fma4'/>
         <feature name='xop'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <feature name='fma4'/>
         <feature name='tbm'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
+      <blockers model='Opteron_G5-v1'>
+        <feature name='fma4'/>
+        <feature name='tbm'/>
+        <feature name='xop'/>
+      </blockers>
       <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>

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

@@ -1301,7 +1301,7 @@
         <feature name='nrip-save'/>
         <feature name='xop'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <feature name='3dnowprefetch'/>
         <feature name='avx'/>
@@ -1313,6 +1313,18 @@
         <feature name='tbm'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
+      <blockers model='Opteron_G5-v1'>
+        <feature name='3dnowprefetch'/>
+        <feature name='avx'/>
+        <feature name='f16c'/>
+        <feature name='fma'/>
+        <feature name='fma4'/>
+        <feature name='misalignsse'/>
+        <feature name='nrip-save'/>
+        <feature name='tbm'/>
+        <feature name='xop'/>
+      </blockers>
       <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>

tests/domaincapsdata/qemu_7.1.0.x86_64.xml

@@ -670,12 +670,18 @@
         <feature name='fma4'/>
         <feature name='xop'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <feature name='fma4'/>
         <feature name='tbm'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
+      <blockers model='Opteron_G5-v1'>
+        <feature name='fma4'/>
+        <feature name='tbm'/>
+        <feature name='xop'/>
+      </blockers>
       <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>

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

@@ -676,12 +676,18 @@
         <feature name='fma4'/>
         <feature name='xop'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <feature name='fma4'/>
         <feature name='tbm'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
+      <blockers model='Opteron_G5-v1'>
+        <feature name='fma4'/>
+        <feature name='tbm'/>
+        <feature name='xop'/>
+      </blockers>
       <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>

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

@@ -1076,7 +1076,7 @@
         <feature name='nrip-save'/>
         <feature name='xop'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <feature name='3dnowprefetch'/>
         <feature name='fma4'/>
@@ -1085,6 +1085,15 @@
         <feature name='tbm'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
+      <blockers model='Opteron_G5-v1'>
+        <feature name='3dnowprefetch'/>
+        <feature name='fma4'/>
+        <feature name='misalignsse'/>
+        <feature name='nrip-save'/>
+        <feature name='tbm'/>
+        <feature name='xop'/>
+      </blockers>
       <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>

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

@@ -1076,7 +1076,7 @@
         <feature name='nrip-save'/>
         <feature name='xop'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <feature name='3dnowprefetch'/>
         <feature name='fma4'/>
@@ -1085,6 +1085,15 @@
         <feature name='tbm'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
+      <blockers model='Opteron_G5-v1'>
+        <feature name='3dnowprefetch'/>
+        <feature name='fma4'/>
+        <feature name='misalignsse'/>
+        <feature name='nrip-save'/>
+        <feature name='tbm'/>
+        <feature name='xop'/>
+      </blockers>
       <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>

tests/domaincapsdata/qemu_7.2.0.x86_64.xml

@@ -675,12 +675,18 @@
         <feature name='fma4'/>
         <feature name='xop'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <feature name='fma4'/>
         <feature name='tbm'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
+      <blockers model='Opteron_G5-v1'>
+        <feature name='fma4'/>
+        <feature name='tbm'/>
+        <feature name='xop'/>
+      </blockers>
       <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>

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

@@ -676,12 +676,18 @@
         <feature name='fma4'/>
         <feature name='xop'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <feature name='fma4'/>
         <feature name='tbm'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
+      <blockers model='Opteron_G5-v1'>
+        <feature name='fma4'/>
+        <feature name='tbm'/>
+        <feature name='xop'/>
+      </blockers>
       <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>

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

@@ -1075,7 +1075,7 @@
         <feature name='nrip-save'/>
         <feature name='xop'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <feature name='3dnowprefetch'/>
         <feature name='fma4'/>
@@ -1084,6 +1084,15 @@
         <feature name='tbm'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
+      <blockers model='Opteron_G5-v1'>
+        <feature name='3dnowprefetch'/>
+        <feature name='fma4'/>
+        <feature name='misalignsse'/>
+        <feature name='nrip-save'/>
+        <feature name='tbm'/>
+        <feature name='xop'/>
+      </blockers>
       <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>

tests/domaincapsdata/qemu_8.0.0.x86_64.xml

@@ -675,12 +675,18 @@
         <feature name='fma4'/>
         <feature name='xop'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <feature name='fma4'/>
         <feature name='tbm'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
+      <blockers model='Opteron_G5-v1'>
+        <feature name='fma4'/>
+        <feature name='tbm'/>
+        <feature name='xop'/>
+      </blockers>
       <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>

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

@@ -854,12 +854,18 @@
         <feature name='fma4'/>
         <feature name='xop'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <feature name='fma4'/>
         <feature name='tbm'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
+      <blockers model='Opteron_G5-v1'>
+        <feature name='fma4'/>
+        <feature name='tbm'/>
+        <feature name='xop'/>
+      </blockers>
       <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>

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

@@ -1081,7 +1081,7 @@
         <feature name='nrip-save'/>
         <feature name='xop'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <feature name='fma4'/>
         <feature name='misalignsse'/>
@@ -1089,6 +1089,14 @@
         <feature name='tbm'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
+      <blockers model='Opteron_G5-v1'>
+        <feature name='fma4'/>
+        <feature name='misalignsse'/>
+        <feature name='nrip-save'/>
+        <feature name='tbm'/>
+        <feature name='xop'/>
+      </blockers>
       <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>

tests/domaincapsdata/qemu_8.1.0.x86_64.xml

@@ -853,12 +853,18 @@
         <feature name='fma4'/>
         <feature name='xop'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <feature name='fma4'/>
         <feature name='tbm'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
+      <blockers model='Opteron_G5-v1'>
+        <feature name='fma4'/>
+        <feature name='tbm'/>
+        <feature name='xop'/>
+      </blockers>
       <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>

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

@@ -855,12 +855,18 @@
         <feature name='fma4'/>
         <feature name='xop'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <feature name='fma4'/>
         <feature name='tbm'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
+      <blockers model='Opteron_G5-v1'>
+        <feature name='fma4'/>
+        <feature name='tbm'/>
+        <feature name='xop'/>
+      </blockers>
       <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>

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

@@ -1056,7 +1056,7 @@
         <feature name='nrip-save'/>
         <feature name='xop'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <feature name='fma4'/>
         <feature name='misalignsse'/>
@@ -1064,6 +1064,14 @@
         <feature name='tbm'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
+      <blockers model='Opteron_G5-v1'>
+        <feature name='fma4'/>
+        <feature name='misalignsse'/>
+        <feature name='nrip-save'/>
+        <feature name='tbm'/>
+        <feature name='xop'/>
+      </blockers>
       <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>

tests/domaincapsdata/qemu_8.2.0.x86_64.xml

@@ -854,12 +854,18 @@
         <feature name='fma4'/>
         <feature name='xop'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <feature name='fma4'/>
         <feature name='tbm'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
+      <blockers model='Opteron_G5-v1'>
+        <feature name='fma4'/>
+        <feature name='tbm'/>
+        <feature name='xop'/>
+      </blockers>
       <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>

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

@@ -855,12 +855,18 @@
         <feature name='fma4'/>
         <feature name='xop'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <feature name='fma4'/>
         <feature name='tbm'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
+      <blockers model='Opteron_G5-v1'>
+        <feature name='fma4'/>
+        <feature name='tbm'/>
+        <feature name='xop'/>
+      </blockers>
       <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>

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

@@ -1012,7 +1012,7 @@
         <feature name='nrip-save'/>
         <feature name='xop'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <feature name='fma4'/>
         <feature name='misalignsse'/>
@@ -1020,6 +1020,14 @@
         <feature name='tbm'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
+      <blockers model='Opteron_G5-v1'>
+        <feature name='fma4'/>
+        <feature name='misalignsse'/>
+        <feature name='nrip-save'/>
+        <feature name='tbm'/>
+        <feature name='xop'/>
+      </blockers>
       <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>

tests/domaincapsdata/qemu_9.0.0.x86_64.xml

@@ -854,12 +854,18 @@
         <feature name='fma4'/>
         <feature name='xop'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <feature name='fma4'/>
         <feature name='tbm'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
+      <blockers model='Opteron_G5-v1'>
+        <feature name='fma4'/>
+        <feature name='tbm'/>
+        <feature name='xop'/>
+      </blockers>
       <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>

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

@@ -888,12 +888,18 @@
         <feature name='fma4'/>
         <feature name='xop'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <feature name='fma4'/>
         <feature name='tbm'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
+      <blockers model='Opteron_G5-v1'>
+        <feature name='fma4'/>
+        <feature name='tbm'/>
+        <feature name='xop'/>
+      </blockers>
       <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>

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

@@ -1037,7 +1037,7 @@
         <feature name='nrip-save'/>
         <feature name='xop'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <feature name='fma4'/>
         <feature name='misalignsse'/>
@@ -1045,6 +1045,14 @@
         <feature name='tbm'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
+      <blockers model='Opteron_G5-v1'>
+        <feature name='fma4'/>
+        <feature name='misalignsse'/>
+        <feature name='nrip-save'/>
+        <feature name='tbm'/>
+        <feature name='xop'/>
+      </blockers>
       <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>

tests/domaincapsdata/qemu_9.1.0.x86_64.xml

@@ -887,12 +887,18 @@
         <feature name='fma4'/>
         <feature name='xop'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <feature name='fma4'/>
         <feature name='tbm'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
+      <blockers model='Opteron_G5-v1'>
+        <feature name='fma4'/>
+        <feature name='tbm'/>
+        <feature name='xop'/>
+      </blockers>
       <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>

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

@@ -888,12 +888,18 @@
         <feature name='fma4'/>
         <feature name='xop'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <feature name='fma4'/>
         <feature name='tbm'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
+      <blockers model='Opteron_G5-v1'>
+        <feature name='fma4'/>
+        <feature name='tbm'/>
+        <feature name='xop'/>
+      </blockers>
       <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>

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

@@ -1037,7 +1037,7 @@
         <feature name='nrip-save'/>
         <feature name='xop'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <feature name='fma4'/>
         <feature name='misalignsse'/>
@@ -1045,6 +1045,14 @@
         <feature name='tbm'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
+      <blockers model='Opteron_G5-v1'>
+        <feature name='fma4'/>
+        <feature name='misalignsse'/>
+        <feature name='nrip-save'/>
+        <feature name='tbm'/>
+        <feature name='xop'/>
+      </blockers>
       <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>

tests/domaincapsdata/qemu_9.2.0.x86_64.xml

@@ -887,12 +887,18 @@
         <feature name='fma4'/>
         <feature name='xop'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <feature name='fma4'/>
         <feature name='tbm'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
+      <blockers model='Opteron_G5-v1'>
+        <feature name='fma4'/>
+        <feature name='tbm'/>
+        <feature name='xop'/>
+      </blockers>
       <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>