cpu_map: Add Opteron_G3-v1 CPU model

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

src/cpu_map/index.xml

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

src/cpu_map/meson.build

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

src/cpu_map/x86_Opteron_G3-v1.xml

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

tests/cputestdata/x86_64-cpuid-Opteron-1352-host.xml

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

tests/cputestdata/x86_64-cpuid-Opteron-2350-host.xml

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

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

@@ -576,7 +576,8 @@
       <model usable='yes' vendor='AMD'>Opteron_G1-v1</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='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
+      <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>
       <blockers model='Opteron_G4'>
         <feature name='fma4'/>

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

@@ -1071,10 +1071,14 @@
       <model usable='yes' vendor='AMD'>Opteron_G1-v1</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>
+      <model usable='no' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
       <blockers model='Opteron_G3'>
         <feature name='misalignsse'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G3-v1</model>
+      <blockers model='Opteron_G3-v1'>
+        <feature name='misalignsse'/>
+      </blockers>
       <model usable='no' vendor='AMD'>Opteron_G4</model>
       <blockers model='Opteron_G4'>
         <feature name='3dnowprefetch'/>

tests/domaincapsdata/qemu_5.2.0.x86_64.xml

@@ -575,7 +575,8 @@
       <model usable='yes' vendor='AMD'>Opteron_G1-v1</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='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
+      <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>
       <blockers model='Opteron_G4'>
         <feature name='fma4'/>

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

@@ -598,7 +598,8 @@
       <model usable='yes' vendor='AMD'>Opteron_G1-v1</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='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
+      <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>
       <blockers model='Opteron_G4'>
         <feature name='fma4'/>

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

@@ -1161,10 +1161,14 @@
       <model usable='yes' vendor='AMD'>Opteron_G1-v1</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>
+      <model usable='no' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
       <blockers model='Opteron_G3'>
         <feature name='misalignsse'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G3-v1</model>
+      <blockers model='Opteron_G3-v1'>
+        <feature name='misalignsse'/>
+      </blockers>
       <model usable='no' vendor='AMD'>Opteron_G4</model>
       <blockers model='Opteron_G4'>
         <feature name='3dnowprefetch'/>

tests/domaincapsdata/qemu_6.0.0.x86_64.xml

@@ -597,7 +597,8 @@
       <model usable='yes' vendor='AMD'>Opteron_G1-v1</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='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
+      <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>
       <blockers model='Opteron_G4'>
         <feature name='fma4'/>

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

@@ -668,7 +668,8 @@
       <model usable='yes' vendor='AMD'>Opteron_G1-v1</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='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
+      <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>
       <blockers model='Opteron_G4'>
         <feature name='fma4'/>

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

@@ -1301,10 +1301,14 @@
       <model usable='yes' vendor='AMD'>Opteron_G1-v1</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>
+      <model usable='no' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
       <blockers model='Opteron_G3'>
         <feature name='misalignsse'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G3-v1</model>
+      <blockers model='Opteron_G3-v1'>
+        <feature name='misalignsse'/>
+      </blockers>
       <model usable='no' vendor='AMD'>Opteron_G4</model>
       <blockers model='Opteron_G4'>
         <feature name='3dnowprefetch'/>

tests/domaincapsdata/qemu_6.1.0.x86_64.xml

@@ -667,7 +667,8 @@
       <model usable='yes' vendor='AMD'>Opteron_G1-v1</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='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
+      <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>
       <blockers model='Opteron_G4'>
         <feature name='fma4'/>

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

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

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

@@ -1298,10 +1298,14 @@
       <model usable='yes' vendor='AMD'>Opteron_G1-v1</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>
+      <model usable='no' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
       <blockers model='Opteron_G3'>
         <feature name='misalignsse'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G3-v1</model>
+      <blockers model='Opteron_G3-v1'>
+        <feature name='misalignsse'/>
+      </blockers>
       <model usable='no' vendor='AMD'>Opteron_G4</model>
       <blockers model='Opteron_G4'>
         <feature name='3dnowprefetch'/>

tests/domaincapsdata/qemu_6.2.0.x86_64.xml

@@ -664,7 +664,8 @@
       <model usable='yes' vendor='AMD'>Opteron_G1-v1</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='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
+      <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>
       <blockers model='Opteron_G4'>
         <feature name='fma4'/>

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

@@ -692,7 +692,8 @@
       <model usable='yes' vendor='AMD'>Opteron_G1-v1</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='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
+      <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>
       <blockers model='Opteron_G4'>
         <feature name='fma4'/>

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

@@ -1327,10 +1327,14 @@
       <model usable='yes' vendor='AMD'>Opteron_G1-v1</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>
+      <model usable='no' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
       <blockers model='Opteron_G3'>
         <feature name='misalignsse'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G3-v1</model>
+      <blockers model='Opteron_G3-v1'>
+        <feature name='misalignsse'/>
+      </blockers>
       <model usable='no' vendor='AMD'>Opteron_G4</model>
       <blockers model='Opteron_G4'>
         <feature name='3dnowprefetch'/>

tests/domaincapsdata/qemu_7.0.0.x86_64.xml

@@ -691,7 +691,8 @@
       <model usable='yes' vendor='AMD'>Opteron_G1-v1</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='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
+      <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>
       <blockers model='Opteron_G4'>
         <feature name='fma4'/>

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

@@ -659,7 +659,8 @@
       <model usable='yes' vendor='AMD'>Opteron_G1-v1</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='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
+      <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>
       <blockers model='Opteron_G4'>
         <feature name='fma4'/>

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

@@ -1275,10 +1275,14 @@
       <model usable='yes' vendor='AMD'>Opteron_G1-v1</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>
+      <model usable='no' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
       <blockers model='Opteron_G3'>
         <feature name='misalignsse'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G3-v1</model>
+      <blockers model='Opteron_G3-v1'>
+        <feature name='misalignsse'/>
+      </blockers>
       <model usable='no' vendor='AMD'>Opteron_G4</model>
       <blockers model='Opteron_G4'>
         <feature name='3dnowprefetch'/>

tests/domaincapsdata/qemu_7.1.0.x86_64.xml

@@ -658,7 +658,8 @@
       <model usable='yes' vendor='AMD'>Opteron_G1-v1</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='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
+      <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>
       <blockers model='Opteron_G4'>
         <feature name='fma4'/>

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

@@ -664,7 +664,8 @@
       <model usable='yes' vendor='AMD'>Opteron_G1-v1</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='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
+      <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>
       <blockers model='Opteron_G4'>
         <feature name='fma4'/>

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

@@ -1052,10 +1052,14 @@
       <model usable='yes' vendor='AMD'>Opteron_G1-v1</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>
+      <model usable='no' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
       <blockers model='Opteron_G3'>
         <feature name='misalignsse'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G3-v1</model>
+      <blockers model='Opteron_G3-v1'>
+        <feature name='misalignsse'/>
+      </blockers>
       <model usable='no' vendor='AMD'>Opteron_G4</model>
       <blockers model='Opteron_G4'>
         <feature name='3dnowprefetch'/>

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

@@ -1052,10 +1052,14 @@
       <model usable='yes' vendor='AMD'>Opteron_G1-v1</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>
+      <model usable='no' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
       <blockers model='Opteron_G3'>
         <feature name='misalignsse'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G3-v1</model>
+      <blockers model='Opteron_G3-v1'>
+        <feature name='misalignsse'/>
+      </blockers>
       <model usable='no' vendor='AMD'>Opteron_G4</model>
       <blockers model='Opteron_G4'>
         <feature name='3dnowprefetch'/>

tests/domaincapsdata/qemu_7.2.0.x86_64.xml

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

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

@@ -664,7 +664,8 @@
       <model usable='yes' vendor='AMD'>Opteron_G1-v1</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='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
+      <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>
       <blockers model='Opteron_G4'>
         <feature name='fma4'/>

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

@@ -1051,10 +1051,14 @@
       <model usable='yes' vendor='AMD'>Opteron_G1-v1</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>
+      <model usable='no' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
       <blockers model='Opteron_G3'>
         <feature name='misalignsse'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G3-v1</model>
+      <blockers model='Opteron_G3-v1'>
+        <feature name='misalignsse'/>
+      </blockers>
       <model usable='no' vendor='AMD'>Opteron_G4</model>
       <blockers model='Opteron_G4'>
         <feature name='3dnowprefetch'/>

tests/domaincapsdata/qemu_8.0.0.x86_64.xml

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

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

@@ -842,7 +842,8 @@
       <model usable='yes' vendor='AMD'>Opteron_G1-v1</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='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
+      <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>
       <blockers model='Opteron_G4'>
         <feature name='fma4'/>

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

@@ -1059,10 +1059,14 @@
       <model usable='yes' vendor='AMD'>Opteron_G1-v1</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>
+      <model usable='no' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
       <blockers model='Opteron_G3'>
         <feature name='misalignsse'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G3-v1</model>
+      <blockers model='Opteron_G3-v1'>
+        <feature name='misalignsse'/>
+      </blockers>
       <model usable='no' vendor='AMD'>Opteron_G4</model>
       <blockers model='Opteron_G4'>
         <feature name='fma4'/>

tests/domaincapsdata/qemu_8.1.0.x86_64.xml

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

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

@@ -843,7 +843,8 @@
       <model usable='yes' vendor='AMD'>Opteron_G1-v1</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='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
+      <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>
       <blockers model='Opteron_G4'>
         <feature name='fma4'/>

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

@@ -1034,10 +1034,14 @@
       <model usable='yes' vendor='AMD'>Opteron_G1-v1</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>
+      <model usable='no' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
       <blockers model='Opteron_G3'>
         <feature name='misalignsse'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G3-v1</model>
+      <blockers model='Opteron_G3-v1'>
+        <feature name='misalignsse'/>
+      </blockers>
       <model usable='no' vendor='AMD'>Opteron_G4</model>
       <blockers model='Opteron_G4'>
         <feature name='fma4'/>

tests/domaincapsdata/qemu_8.2.0.x86_64.xml

@@ -842,7 +842,8 @@
       <model usable='yes' vendor='AMD'>Opteron_G1-v1</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='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
+      <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>
       <blockers model='Opteron_G4'>
         <feature name='fma4'/>

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

@@ -843,7 +843,8 @@
       <model usable='yes' vendor='AMD'>Opteron_G1-v1</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='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
+      <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>
       <blockers model='Opteron_G4'>
         <feature name='fma4'/>

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

@@ -990,10 +990,14 @@
       <model usable='yes' vendor='AMD'>Opteron_G1-v1</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>
+      <model usable='no' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
       <blockers model='Opteron_G3'>
         <feature name='misalignsse'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G3-v1</model>
+      <blockers model='Opteron_G3-v1'>
+        <feature name='misalignsse'/>
+      </blockers>
       <model usable='no' vendor='AMD'>Opteron_G4</model>
       <blockers model='Opteron_G4'>
         <feature name='fma4'/>

tests/domaincapsdata/qemu_9.0.0.x86_64.xml

@@ -842,7 +842,8 @@
       <model usable='yes' vendor='AMD'>Opteron_G1-v1</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='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
+      <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>
       <blockers model='Opteron_G4'>
         <feature name='fma4'/>

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

@@ -876,7 +876,8 @@
       <model usable='yes' vendor='AMD'>Opteron_G1-v1</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='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
+      <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>
       <blockers model='Opteron_G4'>
         <feature name='fma4'/>

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

@@ -1015,10 +1015,14 @@
       <model usable='yes' vendor='AMD'>Opteron_G1-v1</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>
+      <model usable='no' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
       <blockers model='Opteron_G3'>
         <feature name='misalignsse'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G3-v1</model>
+      <blockers model='Opteron_G3-v1'>
+        <feature name='misalignsse'/>
+      </blockers>
       <model usable='no' vendor='AMD'>Opteron_G4</model>
       <blockers model='Opteron_G4'>
         <feature name='fma4'/>

tests/domaincapsdata/qemu_9.1.0.x86_64.xml

@@ -875,7 +875,8 @@
       <model usable='yes' vendor='AMD'>Opteron_G1-v1</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='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
+      <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>
       <blockers model='Opteron_G4'>
         <feature name='fma4'/>

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

@@ -876,7 +876,8 @@
       <model usable='yes' vendor='AMD'>Opteron_G1-v1</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='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
+      <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>
       <blockers model='Opteron_G4'>
         <feature name='fma4'/>

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

@@ -1015,10 +1015,14 @@
       <model usable='yes' vendor='AMD'>Opteron_G1-v1</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>
+      <model usable='no' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
       <blockers model='Opteron_G3'>
         <feature name='misalignsse'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G3-v1</model>
+      <blockers model='Opteron_G3-v1'>
+        <feature name='misalignsse'/>
+      </blockers>
       <model usable='no' vendor='AMD'>Opteron_G4</model>
       <blockers model='Opteron_G4'>
         <feature name='fma4'/>

tests/domaincapsdata/qemu_9.2.0.x86_64.xml

@@ -875,7 +875,8 @@
       <model usable='yes' vendor='AMD'>Opteron_G1-v1</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='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
+      <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
       <model usable='no' vendor='AMD'>Opteron_G4</model>
       <blockers model='Opteron_G4'>
         <feature name='fma4'/>