cpu_map: Add Opteron_G3-v1 CPU model

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

diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml
index 0070796dee5278dac8e9eb0e0d4df4e3bb75aa4f..cdb8a568a6d231ceffa3cc653e3e0900fe797b58 100644 (file)
--- a/src/cpu_map/index.xml
+++ b/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'/>

diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build
index fb6494a14a73b924ec615e6f305128833d4a8f3d..d735c54fd691a4b4a4cbe007c5f700cd2e11ed9d 100644 (file)
--- a/src/cpu_map/meson.build
+++ b/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',

diff --git a/src/cpu_map/x86_Opteron_G3-v1.xml b/src/cpu_map/x86_Opteron_G3-v1.xml
new file mode 100644 (file)
index 0000000..8a625c5
--- /dev/null
+++ b/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>

diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-1352-host.xml b/tests/cputestdata/x86_64-cpuid-Opteron-1352-host.xml
index 53b98713e5e49412803b126f93eee71c38c16ad8..87aee9febe2d6490a0e1be889cbe448a9dc9af5a 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Opteron-1352-host.xml
+++ b/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'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-2350-host.xml b/tests/cputestdata/x86_64-cpuid-Opteron-2350-host.xml
index 53b98713e5e49412803b126f93eee71c38c16ad8..87aee9febe2d6490a0e1be889cbe448a9dc9af5a 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Opteron-2350-host.xml
+++ b/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'/>

diff --git a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
index 8f0b9b3bff839e24a238f42b453c009edfe66247..f673f670a0a2d213f662bf4f0bfef30e886e4245 100644 (file)
--- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
+++ b/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'/>

diff --git a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
index b4f2c700f9fe98c1c793b4571919028905fcc141..6a3af3195617bd7fb281de225e810e41866cf611 100644 (file)
--- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
+++ b/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'/>

diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
index bd3095fec9bf21d2e9a992d53138e7b20fbb3a78..f0f63030991a2b1d28433a9b3801f69a1a16772b 100644 (file)
--- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
+++ b/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'/>

diff --git a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
index b426bd1e63c3de58ae0f5c6b414aad9df4f554b1..24f2c910221c70e2102372b3ede9428bcbaf7644 100644 (file)
--- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
+++ b/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'/>

diff --git a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
index d89a9b2c325a0397b2163bea3cf099556ba62858..111613d0b8fa5201aa6e1e722383ce146ac9266b 100644 (file)
--- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
+++ b/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'/>

diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
index a8773fb4f732ea692745f796e70116dc2162fc0f..82dbca5341848c7131fbde3e62fe96b3a0f0979e 100644 (file)
--- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
+++ b/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'/>

diff --git a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
index de1f78b335b6e02e3469d3252d139b1436e3cfd5..a86931486851aa19f7512e515753fb26b08e6e99 100644 (file)
--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
+++ b/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'/>

diff --git a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
index 581afc86a09d31856b32dda5b8719347f082d848..660744d28ce17573ad7f149d156a4c320247966c 100644 (file)
--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
+++ b/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'/>

diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
index 53d83980a634e1de83c7d5f8f65afeeee034ad37..8bc739091e23914d8a0312b536eb5a499ba367a9 100644 (file)
--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
+++ b/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'/>

diff --git a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
index 77eab8aa95a6a79c74c01b7fd58dfc0fcf2da826..a3014c81422a232062ff4752c5f8513be96a834e 100644 (file)
--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
+++ b/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'/>

diff --git a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
index 710866e495816314f3e7ced041d9ca91d800d63a..b4d902b44cbead2e91b9b01c77ae947bf843e721 100644 (file)
--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
+++ b/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'/>

diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
index 99fe26dc766c9df124a38a17e429c3b5dc7d42f1..2e9bc75e1fee880b0584df5bd2b08e0e34b366d5 100644 (file)
--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+++ b/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'/>

diff --git a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
index eab56f9a7c8f7dca78f7fac72f355e66d9d826a6..8a6379b7b96c9c0f14f55f7d27d7a7671c4c8741 100644 (file)
--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
+++ b/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'/>

diff --git a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
index e5b4cff7c62bf3c05b8f4cfab672a3284ae73adb..02a58872559fbebf251088ac3750bfbd7140c47e 100644 (file)
--- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
+++ b/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'/>

diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
index 6ec56068bd6836d688e50900cfffd900b5f391e8..7168fb805a285d68c1577398b7a2466ed19fd94e 100644 (file)
--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+++ b/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'/>

diff --git a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
index 0e27b3400c157fe6511e08673d3b159dffd7c3bc..93373fbe5be4e7cb5edd2e08c24a492711a4b56d 100644 (file)
--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
+++ b/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'/>

diff --git a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
index e588593d914b3521e854a3e105298d8f636e57c0..890164b50a7b449bb8d1d9d18c6dea9ab25f7581 100644 (file)
--- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
+++ b/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'/>

diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
index 7cb9663805e1cf7837c1bee4f4ba9bf355cd3e5a..1c0a102063912a2f3638ec7cd0dd1ca0f062d799 100644 (file)
--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
+++ b/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'/>

diff --git a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
index c66731ceac53af76c5b00674b7449325a60af5c8..6348bf9eb99d4d9858f4d672e6f2ea9d73e627b5 100644 (file)
--- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
+++ b/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'/>

diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml
index ec61c328c96a81cdc735b893a620633db1ac8a47..dc9a0cc4b2f2cfaab8541b179b87b439cc352d5f 100644 (file)
--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml
+++ b/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'/>

diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
index ec61c328c96a81cdc735b893a620633db1ac8a47..dc9a0cc4b2f2cfaab8541b179b87b439cc352d5f 100644 (file)
--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
+++ b/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'/>

diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
index 8fd837d2c409d1dba022a11157791e28684c9c93..70c15a677add3a439ccb78387da300e8e3f43577 100644 (file)
--- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
+++ b/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'/>

diff --git a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
index 2a78fe6926af54577cf4c3db3d5e9b1a463f3961..875f902101be5f973fd0b65c2d71a57f9dc72b65 100644 (file)
--- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
+++ b/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'/>

diff --git a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
index cb7bb1513ce0e7b90622628aac43906e3b94a66c..52324024a08718d1615bc8cbb284437ef47d9c61 100644 (file)
--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
+++ b/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'/>

diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
index 7c66d893aebe2ef0141862cf810dbd7640fbdca2..6291c3c303203ef26c33b717347158916081a7e5 100644 (file)
--- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
+++ b/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'/>

diff --git a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
index 1d23c2519648edea30901635c77c155e4cb0abc7..cc248936df0a96b30658b5e5038ddc1d7f54e2ad 100644 (file)
--- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
+++ b/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'/>

diff --git a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
index 768769a4ef29e9b66b34172e6fc98b4f6c8148d3..b1e820ea6134e99dd669531b0bebd4e408beb967 100644 (file)
--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
+++ b/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'/>

diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
index 95106cfeabf9e806729a8082dad68245e9fa49ac..c3cd328deaad67cbd033db4c240a6c82f17d1e5f 100644 (file)
--- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
+++ b/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'/>

diff --git a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
index 5b777b730be5926f4e4e86122bfbdeff21a9d4de..5dbfe76dd8d10eb44f91cddfdcbed73515b380fd 100644 (file)
--- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
+++ b/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'/>

diff --git a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
index 0ea4c2cdb85e476a045596d4a7db7f7d5dd19a82..a51e57f66d22b1bc7a5b7548c08f75942f497ebb 100644 (file)
--- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
+++ b/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'/>

diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
index 506b9492252ea05ae980c473af78180191ce1b54..dfc98e58f041e297875487ec01237d32dd46eec0 100644 (file)
--- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
+++ b/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'/>

diff --git a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
index d84324eac6879c3412d2f9627ae0f55db716efe8..9c21297cec1395484e4b8c6e4e2350da44367045 100644 (file)
--- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
+++ b/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'/>

diff --git a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
index cccf48aafb343e43f8265953d79951795e14d3da..81c404727c7a9e566cc1da702bb2c65963c4f5b6 100644 (file)
--- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
+++ b/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'/>

diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
index 05c06c9b25355bb4d95ca648bf991fe40188b232..744280a43a9faf10b65947b863b2324c0a56f257 100644 (file)
--- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
+++ b/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'/>

diff --git a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
index e295c808d787cd6c63aceb68e5ba8aa89ced2254..3b5ee6ec78900b65804581c534a4b155c50e7095 100644 (file)
--- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
+++ b/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'/>

diff --git a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
index 8b338c75befb8e11ef40a2df9b4225f977563868..9091305bb5ad4d32b0032a38995f17f78e41b4c4 100644 (file)
--- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
+++ b/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'/>

diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
index 6b2c1f15b5b76f7c7e4f52d004252f0b7c8b64dc..330e9748b9218eb2c3a71bd5fe59a23fae925d2a 100644 (file)
--- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
+++ b/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'/>

diff --git a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
index ab82a874b174b1d0f6f96566ee1d1bed5b3b3624..adf0140fc20a5952e1e3df67e732f4df03a17031 100644 (file)
--- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
+++ b/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'/>

diff --git a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
index bf20e3d536228863b710b205793f98e15f407995..93efe9253b940718ba8db4dc231e00312a38f3c4 100644 (file)
--- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
+++ b/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'/>

diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
index d28d4c1f1430ba501a051b4baa041a274412fcd5..e2e11f239f0660939df86e7a8760e6ddd5594a16 100644 (file)
--- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
+++ b/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'/>