cpu_map: Add Opteron_G1-v1 CPU model

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

src/cpu_map/index.xml

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

src/cpu_map/meson.build

@@ -112,6 +112,7 @@ cpumap_data = [
   'x86_Nehalem-v1.xml',
   'x86_Nehalem-v2.xml',
   'x86_Nehalem.xml',
+  'x86_Opteron_G1-v1.xml',
   'x86_Opteron_G1.xml',
   'x86_Opteron_G2.xml',
   'x86_Opteron_G3.xml',

src/cpu_map/x86_Opteron_G1-v1.xml

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

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

@@ -572,7 +572,8 @@
       <blockers model='Nehalem-v2'>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G2</model>
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>

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

@@ -1067,7 +1067,8 @@
       <blockers model='Nehalem-v2'>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G2</model>
       <model usable='no' vendor='AMD'>Opteron_G3</model>
       <blockers model='Opteron_G3'>

tests/domaincapsdata/qemu_5.2.0.x86_64.xml

@@ -571,7 +571,8 @@
       <blockers model='Nehalem-v2'>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G2</model>
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>

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

@@ -594,7 +594,8 @@
       <blockers model='Nehalem-v2'>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G2</model>
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>

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

@@ -1157,7 +1157,8 @@
       <blockers model='Nehalem-v2'>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G2</model>
       <model usable='no' vendor='AMD'>Opteron_G3</model>
       <blockers model='Opteron_G3'>

tests/domaincapsdata/qemu_6.0.0.x86_64.xml

@@ -593,7 +593,8 @@
       <blockers model='Nehalem-v2'>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G2</model>
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>

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

@@ -664,7 +664,8 @@
       <blockers model='Nehalem-v2'>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G2</model>
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>

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

@@ -1297,7 +1297,8 @@
       <blockers model='Nehalem-v2'>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G2</model>
       <model usable='no' vendor='AMD'>Opteron_G3</model>
       <blockers model='Opteron_G3'>

tests/domaincapsdata/qemu_6.1.0.x86_64.xml

@@ -663,7 +663,8 @@
       <blockers model='Nehalem-v2'>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G2</model>
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>

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

@@ -661,7 +661,8 @@
       <blockers model='Nehalem-v2'>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G2</model>
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>

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

@@ -1294,7 +1294,8 @@
       <blockers model='Nehalem-v2'>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G2</model>
       <model usable='no' vendor='AMD'>Opteron_G3</model>
       <blockers model='Opteron_G3'>

tests/domaincapsdata/qemu_6.2.0.x86_64.xml

@@ -660,7 +660,8 @@
       <blockers model='Nehalem-v2'>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G2</model>
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>

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

@@ -688,7 +688,8 @@
       <blockers model='Nehalem-v2'>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G2</model>
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>

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

@@ -1323,7 +1323,8 @@
       <blockers model='Nehalem-v2'>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G2</model>
       <model usable='no' vendor='AMD'>Opteron_G3</model>
       <blockers model='Opteron_G3'>

tests/domaincapsdata/qemu_7.0.0.x86_64.xml

@@ -687,7 +687,8 @@
       <blockers model='Nehalem-v2'>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G2</model>
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>

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

@@ -655,7 +655,8 @@
       <blockers model='Nehalem-v2'>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G2</model>
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>

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

@@ -1271,7 +1271,8 @@
       <blockers model='Nehalem-v2'>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G2</model>
       <model usable='no' vendor='AMD'>Opteron_G3</model>
       <blockers model='Opteron_G3'>

tests/domaincapsdata/qemu_7.1.0.x86_64.xml

@@ -654,7 +654,8 @@
       <blockers model='Nehalem-v2'>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G2</model>
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>

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

@@ -660,7 +660,8 @@
       <blockers model='Nehalem-v2'>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G2</model>
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>

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

@@ -1048,7 +1048,8 @@
       <blockers model='Nehalem-v2'>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G2</model>
       <model usable='no' vendor='AMD'>Opteron_G3</model>
       <blockers model='Opteron_G3'>

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

@@ -1048,7 +1048,8 @@
       <blockers model='Nehalem-v2'>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G2</model>
       <model usable='no' vendor='AMD'>Opteron_G3</model>
       <blockers model='Opteron_G3'>

tests/domaincapsdata/qemu_7.2.0.x86_64.xml

@@ -659,7 +659,8 @@
       <blockers model='Nehalem-v2'>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G2</model>
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>

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

@@ -660,7 +660,8 @@
       <blockers model='Nehalem-v2'>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G2</model>
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>

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

@@ -1047,7 +1047,8 @@
       <blockers model='Nehalem-v2'>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G2</model>
       <model usable='no' vendor='AMD'>Opteron_G3</model>
       <blockers model='Opteron_G3'>

tests/domaincapsdata/qemu_8.0.0.x86_64.xml

@@ -659,7 +659,8 @@
       <blockers model='Nehalem-v2'>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G2</model>
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>

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

@@ -838,7 +838,8 @@
       <blockers model='Nehalem-v2'>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G2</model>
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>

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

@@ -1055,7 +1055,8 @@
       <blockers model='Nehalem-v2'>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G2</model>
       <model usable='no' vendor='AMD'>Opteron_G3</model>
       <blockers model='Opteron_G3'>

tests/domaincapsdata/qemu_8.1.0.x86_64.xml

@@ -837,7 +837,8 @@
       <blockers model='Nehalem-v2'>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G2</model>
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>

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

@@ -839,7 +839,8 @@
       <blockers model='Nehalem-v2'>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G2</model>
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>

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

@@ -1030,7 +1030,8 @@
       <blockers model='Nehalem-v2'>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G2</model>
       <model usable='no' vendor='AMD'>Opteron_G3</model>
       <blockers model='Opteron_G3'>

tests/domaincapsdata/qemu_8.2.0.x86_64.xml

@@ -838,7 +838,8 @@
       <blockers model='Nehalem-v2'>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G2</model>
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>

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

@@ -839,7 +839,8 @@
       <blockers model='Nehalem-v2'>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G2</model>
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>

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

@@ -986,7 +986,8 @@
       <blockers model='Nehalem-v2'>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G2</model>
       <model usable='no' vendor='AMD'>Opteron_G3</model>
       <blockers model='Opteron_G3'>

tests/domaincapsdata/qemu_9.0.0.x86_64.xml

@@ -838,7 +838,8 @@
       <blockers model='Nehalem-v2'>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G2</model>
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>

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

@@ -872,7 +872,8 @@
       <blockers model='Nehalem-v2'>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G2</model>
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>

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

@@ -1011,7 +1011,8 @@
       <blockers model='Nehalem-v2'>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G2</model>
       <model usable='no' vendor='AMD'>Opteron_G3</model>
       <blockers model='Opteron_G3'>

tests/domaincapsdata/qemu_9.1.0.x86_64.xml

@@ -871,7 +871,8 @@
       <blockers model='Nehalem-v2'>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G2</model>
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>

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

@@ -872,7 +872,8 @@
       <blockers model='Nehalem-v2'>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G2</model>
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>

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

@@ -1011,7 +1011,8 @@
       <blockers model='Nehalem-v2'>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G2</model>
       <model usable='no' vendor='AMD'>Opteron_G3</model>
       <blockers model='Opteron_G3'>

tests/domaincapsdata/qemu_9.2.0.x86_64.xml

@@ -871,7 +871,8 @@
       <blockers model='Nehalem-v2'>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G2</model>
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>