cpu_map: Add Opteron_G5-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 40be965c361318479d920f1cba193d7adda494ef..9bd90cc83b922b9935e5b4bc634e773ae1a01c27 100644 (file)
--- a/src/cpu_map/index.xml
+++ b/src/cpu_map/index.xml
@@ -145,6 +145,7 @@
       <include filename='x86_Opteron_G4.xml'/>
       <include filename='x86_Opteron_G4-v1.xml'/>
       <include filename='x86_Opteron_G5.xml'/>
+      <include filename='x86_Opteron_G5-v1.xml'/>
       <include filename='x86_EPYC.xml'/>
       <include filename='x86_EPYC-IBPB.xml'/>
       <include filename='x86_EPYC-v1.xml'/>

diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build
index b1bff43d1a096f6c2d09c5be6893912eb6734d87..5ac3c82dc71c293768741685ed7689d2515d03f5 100644 (file)
--- a/src/cpu_map/meson.build
+++ b/src/cpu_map/meson.build
@@ -120,6 +120,7 @@ cpumap_data = [
   'x86_Opteron_G3.xml',
   'x86_Opteron_G4-v1.xml',
   'x86_Opteron_G4.xml',
+  'x86_Opteron_G5-v1.xml',
   'x86_Opteron_G5.xml',
   'x86_Penryn-v1.xml',
   'x86_Penryn.xml',

diff --git a/src/cpu_map/x86_Opteron_G5-v1.xml b/src/cpu_map/x86_Opteron_G5-v1.xml
new file mode 100644 (file)
index 0000000..7e0f167
--- /dev/null
+++ b/src/cpu_map/x86_Opteron_G5-v1.xml
@@ -0,0 +1,6 @@
+<cpus>
+  <model name='Opteron_G5-v1'>
+    <decode host='on' guest='off'/>
+    <model name='Opteron_G5'/>
+  </model>
+</cpus>

diff --git a/tests/cputestdata/x86_64-cpuid-A10-5800K-host.xml b/tests/cputestdata/x86_64-cpuid-A10-5800K-host.xml
index e4a455df15240c237035d64df7f129935ab72ba0..738e8ea67a74d506b7389385cf408c89749ef20f 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-A10-5800K-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-A10-5800K-host.xml
@@ -1,6 +1,6 @@
 <cpu>
   <arch>x86_64</arch>
-  <model>Opteron_G5</model>
+  <model>Opteron_G5-v1</model>
   <vendor>AMD</vendor>
   <signature family='21' model='16' stepping='1'/>
   <feature name='monitor'/>

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 48303b17e1647251ee196ded92cc433c641a396e..ce3ba1468426a28ec225818392e0cccf241e732b 100644 (file)
--- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
@@ -588,12 +588,18 @@
         <feature name='fma4'/>
         <feature name='xop'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <feature name='fma4'/>
         <feature name='tbm'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
+      <blockers model='Opteron_G5-v1'>
+        <feature name='fma4'/>
+        <feature name='tbm'/>
+        <feature name='xop'/>
+      </blockers>
       <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
       <model usable='yes' vendor='Intel'>Penryn-v1</model>
       <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>

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 bc8fd8b7e851f65a33f9891b445578e18efef871..92827056dbd998abbc81e9946a4cd19f2bec5570 100644 (file)
--- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
@@ -1097,7 +1097,7 @@
         <feature name='nrip-save'/>
         <feature name='xop'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <feature name='3dnowprefetch'/>
         <feature name='avx'/>
@@ -1109,6 +1109,18 @@
         <feature name='tbm'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
+      <blockers model='Opteron_G5-v1'>
+        <feature name='3dnowprefetch'/>
+        <feature name='avx'/>
+        <feature name='f16c'/>
+        <feature name='fma'/>
+        <feature name='fma4'/>
+        <feature name='misalignsse'/>
+        <feature name='nrip-save'/>
+        <feature name='tbm'/>
+        <feature name='xop'/>
+      </blockers>
       <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
       <model usable='yes' vendor='Intel'>Penryn-v1</model>
       <model usable='no' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>

diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
index a149caaac78a7771f0bf2517b7f0cfa4b8e60c38..21e8a55a639c9acea85aa829ad8ac17663c40520 100644 (file)
--- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
@@ -587,12 +587,18 @@
         <feature name='fma4'/>
         <feature name='xop'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <feature name='fma4'/>
         <feature name='tbm'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
+      <blockers model='Opteron_G5-v1'>
+        <feature name='fma4'/>
+        <feature name='tbm'/>
+        <feature name='xop'/>
+      </blockers>
       <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
       <model usable='yes' vendor='Intel'>Penryn-v1</model>
       <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>

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 342e2b3ccdde9e1ebb03a6bedbf485fdbb8e4503..ba09a6cbb29ce2179ff04e5b3c89b01642fff630 100644 (file)
--- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
@@ -610,12 +610,18 @@
         <feature name='fma4'/>
         <feature name='xop'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <feature name='fma4'/>
         <feature name='tbm'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
+      <blockers model='Opteron_G5-v1'>
+        <feature name='fma4'/>
+        <feature name='tbm'/>
+        <feature name='xop'/>
+      </blockers>
       <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
       <model usable='yes' vendor='Intel'>Penryn-v1</model>
       <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>

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 ddf0080cc17811545931109b7d8ad68577e4d7c5..dc15afa01755f8ea80879c490339eed9c399895a 100644 (file)
--- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
@@ -1187,7 +1187,7 @@
         <feature name='nrip-save'/>
         <feature name='xop'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <feature name='3dnowprefetch'/>
         <feature name='avx'/>
@@ -1199,6 +1199,18 @@
         <feature name='tbm'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
+      <blockers model='Opteron_G5-v1'>
+        <feature name='3dnowprefetch'/>
+        <feature name='avx'/>
+        <feature name='f16c'/>
+        <feature name='fma'/>
+        <feature name='fma4'/>
+        <feature name='misalignsse'/>
+        <feature name='nrip-save'/>
+        <feature name='tbm'/>
+        <feature name='xop'/>
+      </blockers>
       <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
       <model usable='yes' vendor='Intel'>Penryn-v1</model>
       <model usable='no' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>

diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
index 79a282c0654355940617be639e2bc3f4a3a0a746..72ceb3159577606186e6fbb8dfae7d1063ee5d81 100644 (file)
--- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
@@ -609,12 +609,18 @@
         <feature name='fma4'/>
         <feature name='xop'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <feature name='fma4'/>
         <feature name='tbm'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
+      <blockers model='Opteron_G5-v1'>
+        <feature name='fma4'/>
+        <feature name='tbm'/>
+        <feature name='xop'/>
+      </blockers>
       <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
       <model usable='yes' vendor='Intel'>Penryn-v1</model>
       <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>

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 edabb37ead50fcbe23edbf9fe04b8f134a411ccd..deaa3a00412ece3f6cb3b5c9b17870b2a7e24837 100644 (file)
--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
@@ -680,12 +680,18 @@
         <feature name='fma4'/>
         <feature name='xop'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <feature name='fma4'/>
         <feature name='tbm'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
+      <blockers model='Opteron_G5-v1'>
+        <feature name='fma4'/>
+        <feature name='tbm'/>
+        <feature name='xop'/>
+      </blockers>
       <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
       <model usable='yes' vendor='Intel'>Penryn-v1</model>
       <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>

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 801fddf93a424831fdc536ee4264fc803859371f..469752cf32690e21e6ab04117e2a433c7671422a 100644 (file)
--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
@@ -1327,7 +1327,7 @@
         <feature name='nrip-save'/>
         <feature name='xop'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <feature name='3dnowprefetch'/>
         <feature name='avx'/>
@@ -1339,6 +1339,18 @@
         <feature name='tbm'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
+      <blockers model='Opteron_G5-v1'>
+        <feature name='3dnowprefetch'/>
+        <feature name='avx'/>
+        <feature name='f16c'/>
+        <feature name='fma'/>
+        <feature name='fma4'/>
+        <feature name='misalignsse'/>
+        <feature name='nrip-save'/>
+        <feature name='tbm'/>
+        <feature name='xop'/>
+      </blockers>
       <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
       <model usable='yes' vendor='Intel'>Penryn-v1</model>
       <model usable='no' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>

diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
index 386083131c25805fa5e64a4b413e9b97e49b0f17..7484c13f2c13c8daeb273d646fc33029f6e0dfdc 100644 (file)
--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
@@ -679,12 +679,18 @@
         <feature name='fma4'/>
         <feature name='xop'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <feature name='fma4'/>
         <feature name='tbm'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
+      <blockers model='Opteron_G5-v1'>
+        <feature name='fma4'/>
+        <feature name='tbm'/>
+        <feature name='xop'/>
+      </blockers>
       <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
       <model usable='yes' vendor='Intel'>Penryn-v1</model>
       <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>

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 12aa247563682393021d16111485daaba8d1da59..d1a83998120b93f5bf90ce93c3e252c39db5da07 100644 (file)
--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
@@ -677,12 +677,18 @@
         <feature name='fma4'/>
         <feature name='xop'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <feature name='fma4'/>
         <feature name='tbm'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
+      <blockers model='Opteron_G5-v1'>
+        <feature name='fma4'/>
+        <feature name='tbm'/>
+        <feature name='xop'/>
+      </blockers>
       <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
       <model usable='yes' vendor='Intel'>Penryn-v1</model>
       <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>

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 8eaadfd3890eb9f284e824adbab70af8f6c585f3..8c8f016233802cbf0fe62014925294923864eb9b 100644 (file)
--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
@@ -1324,7 +1324,7 @@
         <feature name='nrip-save'/>
         <feature name='xop'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <feature name='3dnowprefetch'/>
         <feature name='avx'/>
@@ -1336,6 +1336,18 @@
         <feature name='tbm'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
+      <blockers model='Opteron_G5-v1'>
+        <feature name='3dnowprefetch'/>
+        <feature name='avx'/>
+        <feature name='f16c'/>
+        <feature name='fma'/>
+        <feature name='fma4'/>
+        <feature name='misalignsse'/>
+        <feature name='nrip-save'/>
+        <feature name='tbm'/>
+        <feature name='xop'/>
+      </blockers>
       <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
       <model usable='yes' vendor='Intel'>Penryn-v1</model>
       <model usable='no' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>

diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
index 5744c2cbbf82ad430aa34fb80d5bb2c7ce50d5fc..1f21b8be4edf624e4480bbe5625a84f71fbbebc8 100644 (file)
--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
@@ -676,12 +676,18 @@
         <feature name='fma4'/>
         <feature name='xop'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <feature name='fma4'/>
         <feature name='tbm'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
+      <blockers model='Opteron_G5-v1'>
+        <feature name='fma4'/>
+        <feature name='tbm'/>
+        <feature name='xop'/>
+      </blockers>
       <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
       <model usable='yes' vendor='Intel'>Penryn-v1</model>
       <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>

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 7129b49670bc4096f674f9cc09a0398fe2c854bb..2c5129453eec56f6eb43877ae7de7d5967bf912f 100644 (file)
--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
@@ -704,12 +704,18 @@
         <feature name='fma4'/>
         <feature name='xop'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <feature name='fma4'/>
         <feature name='tbm'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
+      <blockers model='Opteron_G5-v1'>
+        <feature name='fma4'/>
+        <feature name='tbm'/>
+        <feature name='xop'/>
+      </blockers>
       <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
       <model usable='yes' vendor='Intel'>Penryn-v1</model>
       <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>

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 e10973b62936530876d22f1f1627ae0cf286d633..d4a567f5c6f5c1dc488df3ecaf29e758ce91ebd9 100644 (file)
--- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
@@ -1353,7 +1353,7 @@
         <feature name='nrip-save'/>
         <feature name='xop'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <feature name='3dnowprefetch'/>
         <feature name='avx'/>
@@ -1365,6 +1365,18 @@
         <feature name='tbm'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
+      <blockers model='Opteron_G5-v1'>
+        <feature name='3dnowprefetch'/>
+        <feature name='avx'/>
+        <feature name='f16c'/>
+        <feature name='fma'/>
+        <feature name='fma4'/>
+        <feature name='misalignsse'/>
+        <feature name='nrip-save'/>
+        <feature name='tbm'/>
+        <feature name='xop'/>
+      </blockers>
       <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
       <model usable='yes' vendor='Intel'>Penryn-v1</model>
       <model usable='no' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>

diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
index 98cf875d10a43ddc0e19cdb51057e39516470a35..6fa08af994f3e126d66a6f30a0f6cd1174e83423 100644 (file)
--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
@@ -703,12 +703,18 @@
         <feature name='fma4'/>
         <feature name='xop'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <feature name='fma4'/>
         <feature name='tbm'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
+      <blockers model='Opteron_G5-v1'>
+        <feature name='fma4'/>
+        <feature name='tbm'/>
+        <feature name='xop'/>
+      </blockers>
       <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
       <model usable='yes' vendor='Intel'>Penryn-v1</model>
       <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>

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 7617177578eee9cccee08c7f54e5b2dba88332a7..8bed31ad2262325cfef55a5b39d916dba9346786 100644 (file)
--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
@@ -671,12 +671,18 @@
         <feature name='fma4'/>
         <feature name='xop'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <feature name='fma4'/>
         <feature name='tbm'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
+      <blockers model='Opteron_G5-v1'>
+        <feature name='fma4'/>
+        <feature name='tbm'/>
+        <feature name='xop'/>
+      </blockers>
       <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
       <model usable='yes' vendor='Intel'>Penryn-v1</model>
       <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>

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 6d1b7774427fb9c00ad846c68a0e014b9c5dbf2e..cb7fd8811b67163d7f7feabdbbc517f4c0119cd1 100644 (file)
--- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
@@ -1301,7 +1301,7 @@
         <feature name='nrip-save'/>
         <feature name='xop'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <feature name='3dnowprefetch'/>
         <feature name='avx'/>
@@ -1313,6 +1313,18 @@
         <feature name='tbm'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
+      <blockers model='Opteron_G5-v1'>
+        <feature name='3dnowprefetch'/>
+        <feature name='avx'/>
+        <feature name='f16c'/>
+        <feature name='fma'/>
+        <feature name='fma4'/>
+        <feature name='misalignsse'/>
+        <feature name='nrip-save'/>
+        <feature name='tbm'/>
+        <feature name='xop'/>
+      </blockers>
       <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
       <model usable='yes' vendor='Intel'>Penryn-v1</model>
       <model usable='no' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>

diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
index 95b347611677e10edee3053d35214acb2b34924f..a0f8b13f720561a31078f2065f370334085588c8 100644 (file)
--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
@@ -670,12 +670,18 @@
         <feature name='fma4'/>
         <feature name='xop'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <feature name='fma4'/>
         <feature name='tbm'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
+      <blockers model='Opteron_G5-v1'>
+        <feature name='fma4'/>
+        <feature name='tbm'/>
+        <feature name='xop'/>
+      </blockers>
       <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
       <model usable='yes' vendor='Intel'>Penryn-v1</model>
       <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>

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 fe591e6644bd276b19db325fffc6691af5d0397e..f9d27024fc88f1b97bdeda58ce0f44c361fb46ef 100644 (file)
--- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
@@ -676,12 +676,18 @@
         <feature name='fma4'/>
         <feature name='xop'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <feature name='fma4'/>
         <feature name='tbm'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
+      <blockers model='Opteron_G5-v1'>
+        <feature name='fma4'/>
+        <feature name='tbm'/>
+        <feature name='xop'/>
+      </blockers>
       <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
       <model usable='yes' vendor='Intel'>Penryn-v1</model>
       <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>

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

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 6e6eb8d57c4876dea78ca4763850537a5e230513..c7728ac4543e3c6dbe5d7afba90dd775f1b71d27 100644 (file)
--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
@@ -1076,7 +1076,7 @@
         <feature name='nrip-save'/>
         <feature name='xop'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <feature name='3dnowprefetch'/>
         <feature name='fma4'/>
@@ -1085,6 +1085,15 @@
         <feature name='tbm'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
+      <blockers model='Opteron_G5-v1'>
+        <feature name='3dnowprefetch'/>
+        <feature name='fma4'/>
+        <feature name='misalignsse'/>
+        <feature name='nrip-save'/>
+        <feature name='tbm'/>
+        <feature name='xop'/>
+      </blockers>
       <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
       <model usable='yes' vendor='Intel'>Penryn-v1</model>
       <model usable='no' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>

diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
index 3568c4011be5a0d8105f481e3e446b1652c7f11e..f0d9493353a6fe7b0c3562b97ea5032edc1600b8 100644 (file)
--- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
@@ -675,12 +675,18 @@
         <feature name='fma4'/>
         <feature name='xop'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <feature name='fma4'/>
         <feature name='tbm'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
+      <blockers model='Opteron_G5-v1'>
+        <feature name='fma4'/>
+        <feature name='tbm'/>
+        <feature name='xop'/>
+      </blockers>
       <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
       <model usable='yes' vendor='Intel'>Penryn-v1</model>
       <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>

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 3846d633c11a230accb742b08f63200bbc20d73f..b8c376cb14de6337c115cb9b83a370553c2c5b8f 100644 (file)
--- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
@@ -676,12 +676,18 @@
         <feature name='fma4'/>
         <feature name='xop'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <feature name='fma4'/>
         <feature name='tbm'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
+      <blockers model='Opteron_G5-v1'>
+        <feature name='fma4'/>
+        <feature name='tbm'/>
+        <feature name='xop'/>
+      </blockers>
       <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
       <model usable='yes' vendor='Intel'>Penryn-v1</model>
       <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>

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 1983d5e6353388a288fca5f69353805c3920a4d6..d3c9830a1a011f5d231f2d8b661b97693f9c7f76 100644 (file)
--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
@@ -1075,7 +1075,7 @@
         <feature name='nrip-save'/>
         <feature name='xop'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <feature name='3dnowprefetch'/>
         <feature name='fma4'/>
@@ -1084,6 +1084,15 @@
         <feature name='tbm'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
+      <blockers model='Opteron_G5-v1'>
+        <feature name='3dnowprefetch'/>
+        <feature name='fma4'/>
+        <feature name='misalignsse'/>
+        <feature name='nrip-save'/>
+        <feature name='tbm'/>
+        <feature name='xop'/>
+      </blockers>
       <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
       <model usable='yes' vendor='Intel'>Penryn-v1</model>
       <model usable='no' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>

diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
index 0fd169dda6e6ccab1738febc7274cfdd3eb78b67..e8df30ae0781ba935560ff7739831998defd1811 100644 (file)
--- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
@@ -675,12 +675,18 @@
         <feature name='fma4'/>
         <feature name='xop'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <feature name='fma4'/>
         <feature name='tbm'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
+      <blockers model='Opteron_G5-v1'>
+        <feature name='fma4'/>
+        <feature name='tbm'/>
+        <feature name='xop'/>
+      </blockers>
       <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
       <model usable='yes' vendor='Intel'>Penryn-v1</model>
       <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>

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 2f1ef6b196be5d51caae551abc7dc10185e21658..197efcbe595ea10cbc4d5e1ae7209876e241f507 100644 (file)
--- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
@@ -854,12 +854,18 @@
         <feature name='fma4'/>
         <feature name='xop'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <feature name='fma4'/>
         <feature name='tbm'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
+      <blockers model='Opteron_G5-v1'>
+        <feature name='fma4'/>
+        <feature name='tbm'/>
+        <feature name='xop'/>
+      </blockers>
       <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
       <model usable='yes' vendor='Intel'>Penryn-v1</model>
       <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>

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 816891f3030acbaebf7868ddaae5413462659b6c..07fdd0c3a32db650ccbce3d098ffd9a154889301 100644 (file)
--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
@@ -1081,7 +1081,7 @@
         <feature name='nrip-save'/>
         <feature name='xop'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <feature name='fma4'/>
         <feature name='misalignsse'/>
@@ -1089,6 +1089,14 @@
         <feature name='tbm'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
+      <blockers model='Opteron_G5-v1'>
+        <feature name='fma4'/>
+        <feature name='misalignsse'/>
+        <feature name='nrip-save'/>
+        <feature name='tbm'/>
+        <feature name='xop'/>
+      </blockers>
       <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
       <model usable='yes' vendor='Intel'>Penryn-v1</model>
       <model usable='no' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>

diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
index 6bf06dd4451155c0d38590d2c3a7c9eebef1c8ad..ec95c1a2ac81ce7e3d25b888d1a1cfa869d27c95 100644 (file)
--- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
@@ -853,12 +853,18 @@
         <feature name='fma4'/>
         <feature name='xop'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <feature name='fma4'/>
         <feature name='tbm'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
+      <blockers model='Opteron_G5-v1'>
+        <feature name='fma4'/>
+        <feature name='tbm'/>
+        <feature name='xop'/>
+      </blockers>
       <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
       <model usable='yes' vendor='Intel'>Penryn-v1</model>
       <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>

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 b4258868aa04ee5f99a9529fca7d029bc787ac47..d1d330df873b5ec7ed42bac108b211868fdc2664 100644 (file)
--- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
@@ -855,12 +855,18 @@
         <feature name='fma4'/>
         <feature name='xop'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <feature name='fma4'/>
         <feature name='tbm'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
+      <blockers model='Opteron_G5-v1'>
+        <feature name='fma4'/>
+        <feature name='tbm'/>
+        <feature name='xop'/>
+      </blockers>
       <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
       <model usable='yes' vendor='Intel'>Penryn-v1</model>
       <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>

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 fc92315651ee7c795ff1d5407aa1e8fa2ba21d34..75cb1b8f1736f9c8908d0d748a1e654f12865b76 100644 (file)
--- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
@@ -1056,7 +1056,7 @@
         <feature name='nrip-save'/>
         <feature name='xop'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <feature name='fma4'/>
         <feature name='misalignsse'/>
@@ -1064,6 +1064,14 @@
         <feature name='tbm'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
+      <blockers model='Opteron_G5-v1'>
+        <feature name='fma4'/>
+        <feature name='misalignsse'/>
+        <feature name='nrip-save'/>
+        <feature name='tbm'/>
+        <feature name='xop'/>
+      </blockers>
       <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
       <model usable='yes' vendor='Intel'>Penryn-v1</model>
       <model usable='no' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>

diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
index 2b33577cec03977bdb7a437bbe46dc0f9912180f..5f6e72e7ca8515d277b65443f8981e8d43d7fdb4 100644 (file)
--- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
@@ -854,12 +854,18 @@
         <feature name='fma4'/>
         <feature name='xop'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <feature name='fma4'/>
         <feature name='tbm'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
+      <blockers model='Opteron_G5-v1'>
+        <feature name='fma4'/>
+        <feature name='tbm'/>
+        <feature name='xop'/>
+      </blockers>
       <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
       <model usable='yes' vendor='Intel'>Penryn-v1</model>
       <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>

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 85216b05a42833fd7e93515161b6f344e2a5facb..3c005d0c108f26795cb9831e6f8a8bd6b9bac829 100644 (file)
--- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
@@ -855,12 +855,18 @@
         <feature name='fma4'/>
         <feature name='xop'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <feature name='fma4'/>
         <feature name='tbm'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
+      <blockers model='Opteron_G5-v1'>
+        <feature name='fma4'/>
+        <feature name='tbm'/>
+        <feature name='xop'/>
+      </blockers>
       <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
       <model usable='yes' vendor='Intel'>Penryn-v1</model>
       <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>

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 8cf49e42f85c3d7db0097e49efb0a6483ba7dd99..3a6424eddf4a20ae21ed51f669d3351c57f189a0 100644 (file)
--- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
@@ -1012,7 +1012,7 @@
         <feature name='nrip-save'/>
         <feature name='xop'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <feature name='fma4'/>
         <feature name='misalignsse'/>
@@ -1020,6 +1020,14 @@
         <feature name='tbm'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
+      <blockers model='Opteron_G5-v1'>
+        <feature name='fma4'/>
+        <feature name='misalignsse'/>
+        <feature name='nrip-save'/>
+        <feature name='tbm'/>
+        <feature name='xop'/>
+      </blockers>
       <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
       <model usable='yes' vendor='Intel'>Penryn-v1</model>
       <model usable='no' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>

diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
index 6570359797e6762eb3dc5aa564e1b9444d0fdefe..79c39678ca2c2b23b09d48acc2912d65232f04ee 100644 (file)
--- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
@@ -854,12 +854,18 @@
         <feature name='fma4'/>
         <feature name='xop'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <feature name='fma4'/>
         <feature name='tbm'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
+      <blockers model='Opteron_G5-v1'>
+        <feature name='fma4'/>
+        <feature name='tbm'/>
+        <feature name='xop'/>
+      </blockers>
       <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
       <model usable='yes' vendor='Intel'>Penryn-v1</model>
       <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>

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 b7aa3acedd0707e55720fde698bbf6172a9a9332..117947ef1374a9dfabe9d6fdef2e0c19787cb582 100644 (file)
--- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
@@ -888,12 +888,18 @@
         <feature name='fma4'/>
         <feature name='xop'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <feature name='fma4'/>
         <feature name='tbm'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
+      <blockers model='Opteron_G5-v1'>
+        <feature name='fma4'/>
+        <feature name='tbm'/>
+        <feature name='xop'/>
+      </blockers>
       <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
       <model usable='yes' vendor='Intel'>Penryn-v1</model>
       <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>

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 fbcae333c65e60bbd3e0268f7458265f81cba50b..c2c244f464ef6fbf59bf589725b45de0d514fad0 100644 (file)
--- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
@@ -1037,7 +1037,7 @@
         <feature name='nrip-save'/>
         <feature name='xop'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <feature name='fma4'/>
         <feature name='misalignsse'/>
@@ -1045,6 +1045,14 @@
         <feature name='tbm'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
+      <blockers model='Opteron_G5-v1'>
+        <feature name='fma4'/>
+        <feature name='misalignsse'/>
+        <feature name='nrip-save'/>
+        <feature name='tbm'/>
+        <feature name='xop'/>
+      </blockers>
       <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
       <model usable='yes' vendor='Intel'>Penryn-v1</model>
       <model usable='no' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>

diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
index 65f42381258db83ec9b8e0eea83b4d98179f8785..30959cd7231ca6b0647632330d635ba180cc47f7 100644 (file)
--- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
@@ -887,12 +887,18 @@
         <feature name='fma4'/>
         <feature name='xop'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <feature name='fma4'/>
         <feature name='tbm'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
+      <blockers model='Opteron_G5-v1'>
+        <feature name='fma4'/>
+        <feature name='tbm'/>
+        <feature name='xop'/>
+      </blockers>
       <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
       <model usable='yes' vendor='Intel'>Penryn-v1</model>
       <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>

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 21f38b8f2f2df1cef405580ff5b5494f7ffd2eb5..5fc95764952445c2db9345c73b3da074976e369c 100644 (file)
--- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
@@ -888,12 +888,18 @@
         <feature name='fma4'/>
         <feature name='xop'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <feature name='fma4'/>
         <feature name='tbm'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
+      <blockers model='Opteron_G5-v1'>
+        <feature name='fma4'/>
+        <feature name='tbm'/>
+        <feature name='xop'/>
+      </blockers>
       <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
       <model usable='yes' vendor='Intel'>Penryn-v1</model>
       <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>

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 507176254421590ff8edf65b252d305d984adce2..eeba43f9fa7cbf6b26e7871619e6c30df38a5e5f 100644 (file)
--- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
@@ -1037,7 +1037,7 @@
         <feature name='nrip-save'/>
         <feature name='xop'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <feature name='fma4'/>
         <feature name='misalignsse'/>
@@ -1045,6 +1045,14 @@
         <feature name='tbm'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
+      <blockers model='Opteron_G5-v1'>
+        <feature name='fma4'/>
+        <feature name='misalignsse'/>
+        <feature name='nrip-save'/>
+        <feature name='tbm'/>
+        <feature name='xop'/>
+      </blockers>
       <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
       <model usable='yes' vendor='Intel'>Penryn-v1</model>
       <model usable='no' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>

diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
index e3391a74bf447b6664fca7171abe3e874a866fb9..96d789ee1c5065ccbb5afb6d55d0bd54186a7744 100644 (file)
--- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
@@ -887,12 +887,18 @@
         <feature name='fma4'/>
         <feature name='xop'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G5-v1'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <feature name='fma4'/>
         <feature name='tbm'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G5-v1</model>
+      <blockers model='Opteron_G5-v1'>
+        <feature name='fma4'/>
+        <feature name='tbm'/>
+        <feature name='xop'/>
+      </blockers>
       <model usable='yes' vendor='Intel' canonical='Penryn-v1'>Penryn</model>
       <model usable='yes' vendor='Intel'>Penryn-v1</model>
       <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>