cpu_map: Add Opteron_G2-v1 CPU model

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

src/cpu_map/index.xml

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

src/cpu_map/meson.build

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

src/cpu_map/x86_Opteron_G2-v1.xml

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

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

@@ -574,7 +574,8 @@
       </blockers>
       <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' canonical='Opteron_G2-v1'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>
       <blockers model='Opteron_G4'>

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

@@ -1069,7 +1069,8 @@
       </blockers>
       <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' canonical='Opteron_G2-v1'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
       <model usable='no' vendor='AMD'>Opteron_G3</model>
       <blockers model='Opteron_G3'>
         <feature name='misalignsse'/>

tests/domaincapsdata/qemu_5.2.0.x86_64.xml

@@ -573,7 +573,8 @@
       </blockers>
       <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' canonical='Opteron_G2-v1'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>
       <blockers model='Opteron_G4'>

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

@@ -596,7 +596,8 @@
       </blockers>
       <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' canonical='Opteron_G2-v1'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>
       <blockers model='Opteron_G4'>

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

@@ -1159,7 +1159,8 @@
       </blockers>
       <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' canonical='Opteron_G2-v1'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
       <model usable='no' vendor='AMD'>Opteron_G3</model>
       <blockers model='Opteron_G3'>
         <feature name='misalignsse'/>

tests/domaincapsdata/qemu_6.0.0.x86_64.xml

@@ -595,7 +595,8 @@
       </blockers>
       <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' canonical='Opteron_G2-v1'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>
       <blockers model='Opteron_G4'>

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

@@ -666,7 +666,8 @@
       </blockers>
       <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' canonical='Opteron_G2-v1'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>
       <blockers model='Opteron_G4'>

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

@@ -1299,7 +1299,8 @@
       </blockers>
       <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' canonical='Opteron_G2-v1'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
       <model usable='no' vendor='AMD'>Opteron_G3</model>
       <blockers model='Opteron_G3'>
         <feature name='misalignsse'/>

tests/domaincapsdata/qemu_6.1.0.x86_64.xml

@@ -665,7 +665,8 @@
       </blockers>
       <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' canonical='Opteron_G2-v1'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>
       <blockers model='Opteron_G4'>

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

@@ -663,7 +663,8 @@
       </blockers>
       <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' canonical='Opteron_G2-v1'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>
       <blockers model='Opteron_G4'>

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

@@ -1296,7 +1296,8 @@
       </blockers>
       <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' canonical='Opteron_G2-v1'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
       <model usable='no' vendor='AMD'>Opteron_G3</model>
       <blockers model='Opteron_G3'>
         <feature name='misalignsse'/>

tests/domaincapsdata/qemu_6.2.0.x86_64.xml

@@ -662,7 +662,8 @@
       </blockers>
       <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' canonical='Opteron_G2-v1'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>
       <blockers model='Opteron_G4'>

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

@@ -690,7 +690,8 @@
       </blockers>
       <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' canonical='Opteron_G2-v1'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>
       <blockers model='Opteron_G4'>

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

@@ -1325,7 +1325,8 @@
       </blockers>
       <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' canonical='Opteron_G2-v1'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
       <model usable='no' vendor='AMD'>Opteron_G3</model>
       <blockers model='Opteron_G3'>
         <feature name='misalignsse'/>

tests/domaincapsdata/qemu_7.0.0.x86_64.xml

@@ -689,7 +689,8 @@
       </blockers>
       <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' canonical='Opteron_G2-v1'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>
       <blockers model='Opteron_G4'>

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

@@ -657,7 +657,8 @@
       </blockers>
       <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' canonical='Opteron_G2-v1'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>
       <blockers model='Opteron_G4'>

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

@@ -1273,7 +1273,8 @@
       </blockers>
       <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' canonical='Opteron_G2-v1'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
       <model usable='no' vendor='AMD'>Opteron_G3</model>
       <blockers model='Opteron_G3'>
         <feature name='misalignsse'/>

tests/domaincapsdata/qemu_7.1.0.x86_64.xml

@@ -656,7 +656,8 @@
       </blockers>
       <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' canonical='Opteron_G2-v1'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>
       <blockers model='Opteron_G4'>

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

@@ -662,7 +662,8 @@
       </blockers>
       <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' canonical='Opteron_G2-v1'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>
       <blockers model='Opteron_G4'>

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

@@ -1050,7 +1050,8 @@
       </blockers>
       <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' canonical='Opteron_G2-v1'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
       <model usable='no' vendor='AMD'>Opteron_G3</model>
       <blockers model='Opteron_G3'>
         <feature name='misalignsse'/>

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

@@ -1050,7 +1050,8 @@
       </blockers>
       <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' canonical='Opteron_G2-v1'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
       <model usable='no' vendor='AMD'>Opteron_G3</model>
       <blockers model='Opteron_G3'>
         <feature name='misalignsse'/>

tests/domaincapsdata/qemu_7.2.0.x86_64.xml

@@ -661,7 +661,8 @@
       </blockers>
       <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' canonical='Opteron_G2-v1'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>
       <blockers model='Opteron_G4'>

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

@@ -662,7 +662,8 @@
       </blockers>
       <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' canonical='Opteron_G2-v1'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>
       <blockers model='Opteron_G4'>

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

@@ -1049,7 +1049,8 @@
       </blockers>
       <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' canonical='Opteron_G2-v1'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
       <model usable='no' vendor='AMD'>Opteron_G3</model>
       <blockers model='Opteron_G3'>
         <feature name='misalignsse'/>

tests/domaincapsdata/qemu_8.0.0.x86_64.xml

@@ -661,7 +661,8 @@
       </blockers>
       <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' canonical='Opteron_G2-v1'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>
       <blockers model='Opteron_G4'>

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

@@ -840,7 +840,8 @@
       </blockers>
       <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' canonical='Opteron_G2-v1'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>
       <blockers model='Opteron_G4'>

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

@@ -1057,7 +1057,8 @@
       </blockers>
       <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' canonical='Opteron_G2-v1'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
       <model usable='no' vendor='AMD'>Opteron_G3</model>
       <blockers model='Opteron_G3'>
         <feature name='misalignsse'/>

tests/domaincapsdata/qemu_8.1.0.x86_64.xml

@@ -839,7 +839,8 @@
       </blockers>
       <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' canonical='Opteron_G2-v1'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>
       <blockers model='Opteron_G4'>

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

@@ -841,7 +841,8 @@
       </blockers>
       <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' canonical='Opteron_G2-v1'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>
       <blockers model='Opteron_G4'>

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

@@ -1032,7 +1032,8 @@
       </blockers>
       <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' canonical='Opteron_G2-v1'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
       <model usable='no' vendor='AMD'>Opteron_G3</model>
       <blockers model='Opteron_G3'>
         <feature name='misalignsse'/>

tests/domaincapsdata/qemu_8.2.0.x86_64.xml

@@ -840,7 +840,8 @@
       </blockers>
       <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' canonical='Opteron_G2-v1'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>
       <blockers model='Opteron_G4'>

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

@@ -841,7 +841,8 @@
       </blockers>
       <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' canonical='Opteron_G2-v1'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>
       <blockers model='Opteron_G4'>

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

@@ -988,7 +988,8 @@
       </blockers>
       <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' canonical='Opteron_G2-v1'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
       <model usable='no' vendor='AMD'>Opteron_G3</model>
       <blockers model='Opteron_G3'>
         <feature name='misalignsse'/>

tests/domaincapsdata/qemu_9.0.0.x86_64.xml

@@ -840,7 +840,8 @@
       </blockers>
       <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' canonical='Opteron_G2-v1'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>
       <blockers model='Opteron_G4'>

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

@@ -874,7 +874,8 @@
       </blockers>
       <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' canonical='Opteron_G2-v1'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>
       <blockers model='Opteron_G4'>

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

@@ -1013,7 +1013,8 @@
       </blockers>
       <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' canonical='Opteron_G2-v1'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
       <model usable='no' vendor='AMD'>Opteron_G3</model>
       <blockers model='Opteron_G3'>
         <feature name='misalignsse'/>

tests/domaincapsdata/qemu_9.1.0.x86_64.xml

@@ -873,7 +873,8 @@
       </blockers>
       <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' canonical='Opteron_G2-v1'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>
       <blockers model='Opteron_G4'>

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

@@ -874,7 +874,8 @@
       </blockers>
       <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' canonical='Opteron_G2-v1'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>
       <blockers model='Opteron_G4'>

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

@@ -1013,7 +1013,8 @@
       </blockers>
       <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' canonical='Opteron_G2-v1'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
       <model usable='no' vendor='AMD'>Opteron_G3</model>
       <blockers model='Opteron_G3'>
         <feature name='misalignsse'/>

tests/domaincapsdata/qemu_9.2.0.x86_64.xml

@@ -873,7 +873,8 @@
       </blockers>
       <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' canonical='Opteron_G2-v1'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
       <model usable='yes' vendor='AMD'>Opteron_G3</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>
       <blockers model='Opteron_G4'>