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

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

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

diff --git a/tests/cputestdata/x86_64-cpuid-FX-8150-host.xml b/tests/cputestdata/x86_64-cpuid-FX-8150-host.xml
index d8c6a8ac0f0b6268babdd82e0be111a41cbe0f2b..9549fa150731739c9771b9129d1091b18151024c 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-FX-8150-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-FX-8150-host.xml
@@ -1,6 +1,6 @@
 <cpu>
   <arch>x86_64</arch>
-  <model>Opteron_G4</model>
+  <model>Opteron_G4-v1</model>
   <vendor>AMD</vendor>
   <signature family='21' model='1' stepping='2'/>
   <feature name='monitor'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-6234-host.xml b/tests/cputestdata/x86_64-cpuid-Opteron-6234-host.xml
index d8c6a8ac0f0b6268babdd82e0be111a41cbe0f2b..9549fa150731739c9771b9129d1091b18151024c 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Opteron-6234-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-6234-host.xml
@@ -1,6 +1,6 @@
 <cpu>
   <arch>x86_64</arch>
-  <model>Opteron_G4</model>
+  <model>Opteron_G4-v1</model>
   <vendor>AMD</vendor>
   <signature family='21' model='1' stepping='2'/>
   <feature name='monitor'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-6282-host.xml b/tests/cputestdata/x86_64-cpuid-Opteron-6282-host.xml
index d8c6a8ac0f0b6268babdd82e0be111a41cbe0f2b..9549fa150731739c9771b9129d1091b18151024c 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Opteron-6282-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-6282-host.xml
@@ -1,6 +1,6 @@
 <cpu>
   <arch>x86_64</arch>
-  <model>Opteron_G4</model>
+  <model>Opteron_G4-v1</model>
   <vendor>AMD</vendor>
   <signature family='21' model='1' stepping='2'/>
   <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 f673f670a0a2d213f662bf4f0bfef30e886e4245..48303b17e1647251ee196ded92cc433c641a396e 100644 (file)
--- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
@@ -578,11 +578,16 @@
       <model usable='yes' vendor='AMD'>Opteron_G2-v1</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>
+      <model usable='no' vendor='AMD' canonical='Opteron_G4-v1'>Opteron_G4</model>
       <blockers model='Opteron_G4'>
         <feature name='fma4'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G4-v1</model>
+      <blockers model='Opteron_G4-v1'>
+        <feature name='fma4'/>
+        <feature name='xop'/>
+      </blockers>
       <model usable='no' vendor='AMD'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <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 6a3af3195617bd7fb281de225e810e41866cf611..bc8fd8b7e851f65a33f9891b445578e18efef871 100644 (file)
--- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
@@ -1079,7 +1079,7 @@
       <blockers model='Opteron_G3-v1'>
         <feature name='misalignsse'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G4</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G4-v1'>Opteron_G4</model>
       <blockers model='Opteron_G4'>
         <feature name='3dnowprefetch'/>
         <feature name='avx'/>
@@ -1088,6 +1088,15 @@
         <feature name='nrip-save'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G4-v1</model>
+      <blockers model='Opteron_G4-v1'>
+        <feature name='3dnowprefetch'/>
+        <feature name='avx'/>
+        <feature name='fma4'/>
+        <feature name='misalignsse'/>
+        <feature name='nrip-save'/>
+        <feature name='xop'/>
+      </blockers>
       <model usable='no' vendor='AMD'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <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 f0f63030991a2b1d28433a9b3801f69a1a16772b..a149caaac78a7771f0bf2517b7f0cfa4b8e60c38 100644 (file)
--- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
@@ -577,11 +577,16 @@
       <model usable='yes' vendor='AMD'>Opteron_G2-v1</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>
+      <model usable='no' vendor='AMD' canonical='Opteron_G4-v1'>Opteron_G4</model>
       <blockers model='Opteron_G4'>
         <feature name='fma4'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G4-v1</model>
+      <blockers model='Opteron_G4-v1'>
+        <feature name='fma4'/>
+        <feature name='xop'/>
+      </blockers>
       <model usable='no' vendor='AMD'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <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 24f2c910221c70e2102372b3ede9428bcbaf7644..342e2b3ccdde9e1ebb03a6bedbf485fdbb8e4503 100644 (file)
--- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
@@ -600,11 +600,16 @@
       <model usable='yes' vendor='AMD'>Opteron_G2-v1</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>
+      <model usable='no' vendor='AMD' canonical='Opteron_G4-v1'>Opteron_G4</model>
       <blockers model='Opteron_G4'>
         <feature name='fma4'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G4-v1</model>
+      <blockers model='Opteron_G4-v1'>
+        <feature name='fma4'/>
+        <feature name='xop'/>
+      </blockers>
       <model usable='no' vendor='AMD'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <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 111613d0b8fa5201aa6e1e722383ce146ac9266b..ddf0080cc17811545931109b7d8ad68577e4d7c5 100644 (file)
--- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
@@ -1169,7 +1169,7 @@
       <blockers model='Opteron_G3-v1'>
         <feature name='misalignsse'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G4</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G4-v1'>Opteron_G4</model>
       <blockers model='Opteron_G4'>
         <feature name='3dnowprefetch'/>
         <feature name='avx'/>
@@ -1178,6 +1178,15 @@
         <feature name='nrip-save'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G4-v1</model>
+      <blockers model='Opteron_G4-v1'>
+        <feature name='3dnowprefetch'/>
+        <feature name='avx'/>
+        <feature name='fma4'/>
+        <feature name='misalignsse'/>
+        <feature name='nrip-save'/>
+        <feature name='xop'/>
+      </blockers>
       <model usable='no' vendor='AMD'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <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 82dbca5341848c7131fbde3e62fe96b3a0f0979e..79a282c0654355940617be639e2bc3f4a3a0a746 100644 (file)
--- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
@@ -599,11 +599,16 @@
       <model usable='yes' vendor='AMD'>Opteron_G2-v1</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>
+      <model usable='no' vendor='AMD' canonical='Opteron_G4-v1'>Opteron_G4</model>
       <blockers model='Opteron_G4'>
         <feature name='fma4'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G4-v1</model>
+      <blockers model='Opteron_G4-v1'>
+        <feature name='fma4'/>
+        <feature name='xop'/>
+      </blockers>
       <model usable='no' vendor='AMD'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <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 a86931486851aa19f7512e515753fb26b08e6e99..edabb37ead50fcbe23edbf9fe04b8f134a411ccd 100644 (file)
--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
@@ -670,11 +670,16 @@
       <model usable='yes' vendor='AMD'>Opteron_G2-v1</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>
+      <model usable='no' vendor='AMD' canonical='Opteron_G4-v1'>Opteron_G4</model>
       <blockers model='Opteron_G4'>
         <feature name='fma4'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G4-v1</model>
+      <blockers model='Opteron_G4-v1'>
+        <feature name='fma4'/>
+        <feature name='xop'/>
+      </blockers>
       <model usable='no' vendor='AMD'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <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 660744d28ce17573ad7f149d156a4c320247966c..801fddf93a424831fdc536ee4264fc803859371f 100644 (file)
--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
@@ -1309,7 +1309,7 @@
       <blockers model='Opteron_G3-v1'>
         <feature name='misalignsse'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G4</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G4-v1'>Opteron_G4</model>
       <blockers model='Opteron_G4'>
         <feature name='3dnowprefetch'/>
         <feature name='avx'/>
@@ -1318,6 +1318,15 @@
         <feature name='nrip-save'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G4-v1</model>
+      <blockers model='Opteron_G4-v1'>
+        <feature name='3dnowprefetch'/>
+        <feature name='avx'/>
+        <feature name='fma4'/>
+        <feature name='misalignsse'/>
+        <feature name='nrip-save'/>
+        <feature name='xop'/>
+      </blockers>
       <model usable='no' vendor='AMD'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <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 8bc739091e23914d8a0312b536eb5a499ba367a9..386083131c25805fa5e64a4b413e9b97e49b0f17 100644 (file)
--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
@@ -669,11 +669,16 @@
       <model usable='yes' vendor='AMD'>Opteron_G2-v1</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>
+      <model usable='no' vendor='AMD' canonical='Opteron_G4-v1'>Opteron_G4</model>
       <blockers model='Opteron_G4'>
         <feature name='fma4'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G4-v1</model>
+      <blockers model='Opteron_G4-v1'>
+        <feature name='fma4'/>
+        <feature name='xop'/>
+      </blockers>
       <model usable='no' vendor='AMD'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <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 a3014c81422a232062ff4752c5f8513be96a834e..12aa247563682393021d16111485daaba8d1da59 100644 (file)
--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
@@ -667,11 +667,16 @@
       <model usable='yes' vendor='AMD'>Opteron_G2-v1</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>
+      <model usable='no' vendor='AMD' canonical='Opteron_G4-v1'>Opteron_G4</model>
       <blockers model='Opteron_G4'>
         <feature name='fma4'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G4-v1</model>
+      <blockers model='Opteron_G4-v1'>
+        <feature name='fma4'/>
+        <feature name='xop'/>
+      </blockers>
       <model usable='no' vendor='AMD'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <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 b4d902b44cbead2e91b9b01c77ae947bf843e721..8eaadfd3890eb9f284e824adbab70af8f6c585f3 100644 (file)
--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
@@ -1306,7 +1306,7 @@
       <blockers model='Opteron_G3-v1'>
         <feature name='misalignsse'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G4</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G4-v1'>Opteron_G4</model>
       <blockers model='Opteron_G4'>
         <feature name='3dnowprefetch'/>
         <feature name='avx'/>
@@ -1315,6 +1315,15 @@
         <feature name='nrip-save'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G4-v1</model>
+      <blockers model='Opteron_G4-v1'>
+        <feature name='3dnowprefetch'/>
+        <feature name='avx'/>
+        <feature name='fma4'/>
+        <feature name='misalignsse'/>
+        <feature name='nrip-save'/>
+        <feature name='xop'/>
+      </blockers>
       <model usable='no' vendor='AMD'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <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 2e9bc75e1fee880b0584df5bd2b08e0e34b366d5..5744c2cbbf82ad430aa34fb80d5bb2c7ce50d5fc 100644 (file)
--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
@@ -666,11 +666,16 @@
       <model usable='yes' vendor='AMD'>Opteron_G2-v1</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>
+      <model usable='no' vendor='AMD' canonical='Opteron_G4-v1'>Opteron_G4</model>
       <blockers model='Opteron_G4'>
         <feature name='fma4'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G4-v1</model>
+      <blockers model='Opteron_G4-v1'>
+        <feature name='fma4'/>
+        <feature name='xop'/>
+      </blockers>
       <model usable='no' vendor='AMD'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <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 8a6379b7b96c9c0f14f55f7d27d7a7671c4c8741..7129b49670bc4096f674f9cc09a0398fe2c854bb 100644 (file)
--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
@@ -694,11 +694,16 @@
       <model usable='yes' vendor='AMD'>Opteron_G2-v1</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>
+      <model usable='no' vendor='AMD' canonical='Opteron_G4-v1'>Opteron_G4</model>
       <blockers model='Opteron_G4'>
         <feature name='fma4'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G4-v1</model>
+      <blockers model='Opteron_G4-v1'>
+        <feature name='fma4'/>
+        <feature name='xop'/>
+      </blockers>
       <model usable='no' vendor='AMD'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <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 02a58872559fbebf251088ac3750bfbd7140c47e..e10973b62936530876d22f1f1627ae0cf286d633 100644 (file)
--- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
@@ -1335,7 +1335,7 @@
       <blockers model='Opteron_G3-v1'>
         <feature name='misalignsse'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G4</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G4-v1'>Opteron_G4</model>
       <blockers model='Opteron_G4'>
         <feature name='3dnowprefetch'/>
         <feature name='avx'/>
@@ -1344,6 +1344,15 @@
         <feature name='nrip-save'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G4-v1</model>
+      <blockers model='Opteron_G4-v1'>
+        <feature name='3dnowprefetch'/>
+        <feature name='avx'/>
+        <feature name='fma4'/>
+        <feature name='misalignsse'/>
+        <feature name='nrip-save'/>
+        <feature name='xop'/>
+      </blockers>
       <model usable='no' vendor='AMD'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <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 7168fb805a285d68c1577398b7a2466ed19fd94e..98cf875d10a43ddc0e19cdb51057e39516470a35 100644 (file)
--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
@@ -693,11 +693,16 @@
       <model usable='yes' vendor='AMD'>Opteron_G2-v1</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>
+      <model usable='no' vendor='AMD' canonical='Opteron_G4-v1'>Opteron_G4</model>
       <blockers model='Opteron_G4'>
         <feature name='fma4'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G4-v1</model>
+      <blockers model='Opteron_G4-v1'>
+        <feature name='fma4'/>
+        <feature name='xop'/>
+      </blockers>
       <model usable='no' vendor='AMD'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <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 93373fbe5be4e7cb5edd2e08c24a492711a4b56d..7617177578eee9cccee08c7f54e5b2dba88332a7 100644 (file)
--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
@@ -661,11 +661,16 @@
       <model usable='yes' vendor='AMD'>Opteron_G2-v1</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>
+      <model usable='no' vendor='AMD' canonical='Opteron_G4-v1'>Opteron_G4</model>
       <blockers model='Opteron_G4'>
         <feature name='fma4'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G4-v1</model>
+      <blockers model='Opteron_G4-v1'>
+        <feature name='fma4'/>
+        <feature name='xop'/>
+      </blockers>
       <model usable='no' vendor='AMD'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <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 890164b50a7b449bb8d1d9d18c6dea9ab25f7581..6d1b7774427fb9c00ad846c68a0e014b9c5dbf2e 100644 (file)
--- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
@@ -1283,7 +1283,7 @@
       <blockers model='Opteron_G3-v1'>
         <feature name='misalignsse'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G4</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G4-v1'>Opteron_G4</model>
       <blockers model='Opteron_G4'>
         <feature name='3dnowprefetch'/>
         <feature name='avx'/>
@@ -1292,6 +1292,15 @@
         <feature name='nrip-save'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G4-v1</model>
+      <blockers model='Opteron_G4-v1'>
+        <feature name='3dnowprefetch'/>
+        <feature name='avx'/>
+        <feature name='fma4'/>
+        <feature name='misalignsse'/>
+        <feature name='nrip-save'/>
+        <feature name='xop'/>
+      </blockers>
       <model usable='no' vendor='AMD'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <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 1c0a102063912a2f3638ec7cd0dd1ca0f062d799..95b347611677e10edee3053d35214acb2b34924f 100644 (file)
--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
@@ -660,11 +660,16 @@
       <model usable='yes' vendor='AMD'>Opteron_G2-v1</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>
+      <model usable='no' vendor='AMD' canonical='Opteron_G4-v1'>Opteron_G4</model>
       <blockers model='Opteron_G4'>
         <feature name='fma4'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G4-v1</model>
+      <blockers model='Opteron_G4-v1'>
+        <feature name='fma4'/>
+        <feature name='xop'/>
+      </blockers>
       <model usable='no' vendor='AMD'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <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 6348bf9eb99d4d9858f4d672e6f2ea9d73e627b5..fe591e6644bd276b19db325fffc6691af5d0397e 100644 (file)
--- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
@@ -666,11 +666,16 @@
       <model usable='yes' vendor='AMD'>Opteron_G2-v1</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>
+      <model usable='no' vendor='AMD' canonical='Opteron_G4-v1'>Opteron_G4</model>
       <blockers model='Opteron_G4'>
         <feature name='fma4'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G4-v1</model>
+      <blockers model='Opteron_G4-v1'>
+        <feature name='fma4'/>
+        <feature name='xop'/>
+      </blockers>
       <model usable='no' vendor='AMD'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <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 dc9a0cc4b2f2cfaab8541b179b87b439cc352d5f..6e6eb8d57c4876dea78ca4763850537a5e230513 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
@@ -1060,7 +1060,7 @@
       <blockers model='Opteron_G3-v1'>
         <feature name='misalignsse'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G4</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G4-v1'>Opteron_G4</model>
       <blockers model='Opteron_G4'>
         <feature name='3dnowprefetch'/>
         <feature name='fma4'/>
@@ -1068,6 +1068,14 @@
         <feature name='nrip-save'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G4-v1</model>
+      <blockers model='Opteron_G4-v1'>
+        <feature name='3dnowprefetch'/>
+        <feature name='fma4'/>
+        <feature name='misalignsse'/>
+        <feature name='nrip-save'/>
+        <feature name='xop'/>
+      </blockers>
       <model usable='no' vendor='AMD'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <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 dc9a0cc4b2f2cfaab8541b179b87b439cc352d5f..6e6eb8d57c4876dea78ca4763850537a5e230513 100644 (file)
--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
@@ -1060,7 +1060,7 @@
       <blockers model='Opteron_G3-v1'>
         <feature name='misalignsse'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G4</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G4-v1'>Opteron_G4</model>
       <blockers model='Opteron_G4'>
         <feature name='3dnowprefetch'/>
         <feature name='fma4'/>
@@ -1068,6 +1068,14 @@
         <feature name='nrip-save'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G4-v1</model>
+      <blockers model='Opteron_G4-v1'>
+        <feature name='3dnowprefetch'/>
+        <feature name='fma4'/>
+        <feature name='misalignsse'/>
+        <feature name='nrip-save'/>
+        <feature name='xop'/>
+      </blockers>
       <model usable='no' vendor='AMD'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <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 70c15a677add3a439ccb78387da300e8e3f43577..3568c4011be5a0d8105f481e3e446b1652c7f11e 100644 (file)
--- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
@@ -665,11 +665,16 @@
       <model usable='yes' vendor='AMD'>Opteron_G2-v1</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>
+      <model usable='no' vendor='AMD' canonical='Opteron_G4-v1'>Opteron_G4</model>
       <blockers model='Opteron_G4'>
         <feature name='fma4'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G4-v1</model>
+      <blockers model='Opteron_G4-v1'>
+        <feature name='fma4'/>
+        <feature name='xop'/>
+      </blockers>
       <model usable='no' vendor='AMD'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <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 875f902101be5f973fd0b65c2d71a57f9dc72b65..3846d633c11a230accb742b08f63200bbc20d73f 100644 (file)
--- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
@@ -666,11 +666,16 @@
       <model usable='yes' vendor='AMD'>Opteron_G2-v1</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>
+      <model usable='no' vendor='AMD' canonical='Opteron_G4-v1'>Opteron_G4</model>
       <blockers model='Opteron_G4'>
         <feature name='fma4'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G4-v1</model>
+      <blockers model='Opteron_G4-v1'>
+        <feature name='fma4'/>
+        <feature name='xop'/>
+      </blockers>
       <model usable='no' vendor='AMD'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <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 52324024a08718d1615bc8cbb284437ef47d9c61..1983d5e6353388a288fca5f69353805c3920a4d6 100644 (file)
--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
@@ -1059,7 +1059,7 @@
       <blockers model='Opteron_G3-v1'>
         <feature name='misalignsse'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G4</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G4-v1'>Opteron_G4</model>
       <blockers model='Opteron_G4'>
         <feature name='3dnowprefetch'/>
         <feature name='fma4'/>
@@ -1067,6 +1067,14 @@
         <feature name='nrip-save'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G4-v1</model>
+      <blockers model='Opteron_G4-v1'>
+        <feature name='3dnowprefetch'/>
+        <feature name='fma4'/>
+        <feature name='misalignsse'/>
+        <feature name='nrip-save'/>
+        <feature name='xop'/>
+      </blockers>
       <model usable='no' vendor='AMD'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <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 6291c3c303203ef26c33b717347158916081a7e5..0fd169dda6e6ccab1738febc7274cfdd3eb78b67 100644 (file)
--- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
@@ -665,11 +665,16 @@
       <model usable='yes' vendor='AMD'>Opteron_G2-v1</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>
+      <model usable='no' vendor='AMD' canonical='Opteron_G4-v1'>Opteron_G4</model>
       <blockers model='Opteron_G4'>
         <feature name='fma4'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G4-v1</model>
+      <blockers model='Opteron_G4-v1'>
+        <feature name='fma4'/>
+        <feature name='xop'/>
+      </blockers>
       <model usable='no' vendor='AMD'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <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 cc248936df0a96b30658b5e5038ddc1d7f54e2ad..2f1ef6b196be5d51caae551abc7dc10185e21658 100644 (file)
--- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
@@ -844,11 +844,16 @@
       <model usable='yes' vendor='AMD'>Opteron_G2-v1</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>
+      <model usable='no' vendor='AMD' canonical='Opteron_G4-v1'>Opteron_G4</model>
       <blockers model='Opteron_G4'>
         <feature name='fma4'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G4-v1</model>
+      <blockers model='Opteron_G4-v1'>
+        <feature name='fma4'/>
+        <feature name='xop'/>
+      </blockers>
       <model usable='no' vendor='AMD'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <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 b1e820ea6134e99dd669531b0bebd4e408beb967..816891f3030acbaebf7868ddaae5413462659b6c 100644 (file)
--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
@@ -1067,13 +1067,20 @@
       <blockers model='Opteron_G3-v1'>
         <feature name='misalignsse'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G4</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G4-v1'>Opteron_G4</model>
       <blockers model='Opteron_G4'>
         <feature name='fma4'/>
         <feature name='misalignsse'/>
         <feature name='nrip-save'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G4-v1</model>
+      <blockers model='Opteron_G4-v1'>
+        <feature name='fma4'/>
+        <feature name='misalignsse'/>
+        <feature name='nrip-save'/>
+        <feature name='xop'/>
+      </blockers>
       <model usable='no' vendor='AMD'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <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 c3cd328deaad67cbd033db4c240a6c82f17d1e5f..6bf06dd4451155c0d38590d2c3a7c9eebef1c8ad 100644 (file)
--- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
@@ -843,11 +843,16 @@
       <model usable='yes' vendor='AMD'>Opteron_G2-v1</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>
+      <model usable='no' vendor='AMD' canonical='Opteron_G4-v1'>Opteron_G4</model>
       <blockers model='Opteron_G4'>
         <feature name='fma4'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G4-v1</model>
+      <blockers model='Opteron_G4-v1'>
+        <feature name='fma4'/>
+        <feature name='xop'/>
+      </blockers>
       <model usable='no' vendor='AMD'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <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 5dbfe76dd8d10eb44f91cddfdcbed73515b380fd..b4258868aa04ee5f99a9529fca7d029bc787ac47 100644 (file)
--- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
@@ -845,11 +845,16 @@
       <model usable='yes' vendor='AMD'>Opteron_G2-v1</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>
+      <model usable='no' vendor='AMD' canonical='Opteron_G4-v1'>Opteron_G4</model>
       <blockers model='Opteron_G4'>
         <feature name='fma4'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G4-v1</model>
+      <blockers model='Opteron_G4-v1'>
+        <feature name='fma4'/>
+        <feature name='xop'/>
+      </blockers>
       <model usable='no' vendor='AMD'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <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 a51e57f66d22b1bc7a5b7548c08f75942f497ebb..fc92315651ee7c795ff1d5407aa1e8fa2ba21d34 100644 (file)
--- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
@@ -1042,13 +1042,20 @@
       <blockers model='Opteron_G3-v1'>
         <feature name='misalignsse'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G4</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G4-v1'>Opteron_G4</model>
       <blockers model='Opteron_G4'>
         <feature name='fma4'/>
         <feature name='misalignsse'/>
         <feature name='nrip-save'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G4-v1</model>
+      <blockers model='Opteron_G4-v1'>
+        <feature name='fma4'/>
+        <feature name='misalignsse'/>
+        <feature name='nrip-save'/>
+        <feature name='xop'/>
+      </blockers>
       <model usable='no' vendor='AMD'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <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 dfc98e58f041e297875487ec01237d32dd46eec0..2b33577cec03977bdb7a437bbe46dc0f9912180f 100644 (file)
--- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
@@ -844,11 +844,16 @@
       <model usable='yes' vendor='AMD'>Opteron_G2-v1</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>
+      <model usable='no' vendor='AMD' canonical='Opteron_G4-v1'>Opteron_G4</model>
       <blockers model='Opteron_G4'>
         <feature name='fma4'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G4-v1</model>
+      <blockers model='Opteron_G4-v1'>
+        <feature name='fma4'/>
+        <feature name='xop'/>
+      </blockers>
       <model usable='no' vendor='AMD'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <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 9c21297cec1395484e4b8c6e4e2350da44367045..85216b05a42833fd7e93515161b6f344e2a5facb 100644 (file)
--- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
@@ -845,11 +845,16 @@
       <model usable='yes' vendor='AMD'>Opteron_G2-v1</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>
+      <model usable='no' vendor='AMD' canonical='Opteron_G4-v1'>Opteron_G4</model>
       <blockers model='Opteron_G4'>
         <feature name='fma4'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G4-v1</model>
+      <blockers model='Opteron_G4-v1'>
+        <feature name='fma4'/>
+        <feature name='xop'/>
+      </blockers>
       <model usable='no' vendor='AMD'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <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 81c404727c7a9e566cc1da702bb2c65963c4f5b6..8cf49e42f85c3d7db0097e49efb0a6483ba7dd99 100644 (file)
--- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
@@ -998,13 +998,20 @@
       <blockers model='Opteron_G3-v1'>
         <feature name='misalignsse'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G4</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G4-v1'>Opteron_G4</model>
       <blockers model='Opteron_G4'>
         <feature name='fma4'/>
         <feature name='misalignsse'/>
         <feature name='nrip-save'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G4-v1</model>
+      <blockers model='Opteron_G4-v1'>
+        <feature name='fma4'/>
+        <feature name='misalignsse'/>
+        <feature name='nrip-save'/>
+        <feature name='xop'/>
+      </blockers>
       <model usable='no' vendor='AMD'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <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 744280a43a9faf10b65947b863b2324c0a56f257..6570359797e6762eb3dc5aa564e1b9444d0fdefe 100644 (file)
--- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
@@ -844,11 +844,16 @@
       <model usable='yes' vendor='AMD'>Opteron_G2-v1</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>
+      <model usable='no' vendor='AMD' canonical='Opteron_G4-v1'>Opteron_G4</model>
       <blockers model='Opteron_G4'>
         <feature name='fma4'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G4-v1</model>
+      <blockers model='Opteron_G4-v1'>
+        <feature name='fma4'/>
+        <feature name='xop'/>
+      </blockers>
       <model usable='no' vendor='AMD'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <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 3b5ee6ec78900b65804581c534a4b155c50e7095..b7aa3acedd0707e55720fde698bbf6172a9a9332 100644 (file)
--- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
@@ -878,11 +878,16 @@
       <model usable='yes' vendor='AMD'>Opteron_G2-v1</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>
+      <model usable='no' vendor='AMD' canonical='Opteron_G4-v1'>Opteron_G4</model>
       <blockers model='Opteron_G4'>
         <feature name='fma4'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G4-v1</model>
+      <blockers model='Opteron_G4-v1'>
+        <feature name='fma4'/>
+        <feature name='xop'/>
+      </blockers>
       <model usable='no' vendor='AMD'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <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 9091305bb5ad4d32b0032a38995f17f78e41b4c4..fbcae333c65e60bbd3e0268f7458265f81cba50b 100644 (file)
--- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
@@ -1023,13 +1023,20 @@
       <blockers model='Opteron_G3-v1'>
         <feature name='misalignsse'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G4</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G4-v1'>Opteron_G4</model>
       <blockers model='Opteron_G4'>
         <feature name='fma4'/>
         <feature name='misalignsse'/>
         <feature name='nrip-save'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G4-v1</model>
+      <blockers model='Opteron_G4-v1'>
+        <feature name='fma4'/>
+        <feature name='misalignsse'/>
+        <feature name='nrip-save'/>
+        <feature name='xop'/>
+      </blockers>
       <model usable='no' vendor='AMD'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <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 330e9748b9218eb2c3a71bd5fe59a23fae925d2a..65f42381258db83ec9b8e0eea83b4d98179f8785 100644 (file)
--- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
@@ -877,11 +877,16 @@
       <model usable='yes' vendor='AMD'>Opteron_G2-v1</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>
+      <model usable='no' vendor='AMD' canonical='Opteron_G4-v1'>Opteron_G4</model>
       <blockers model='Opteron_G4'>
         <feature name='fma4'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G4-v1</model>
+      <blockers model='Opteron_G4-v1'>
+        <feature name='fma4'/>
+        <feature name='xop'/>
+      </blockers>
       <model usable='no' vendor='AMD'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <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 adf0140fc20a5952e1e3df67e732f4df03a17031..21f38b8f2f2df1cef405580ff5b5494f7ffd2eb5 100644 (file)
--- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
@@ -878,11 +878,16 @@
       <model usable='yes' vendor='AMD'>Opteron_G2-v1</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>
+      <model usable='no' vendor='AMD' canonical='Opteron_G4-v1'>Opteron_G4</model>
       <blockers model='Opteron_G4'>
         <feature name='fma4'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G4-v1</model>
+      <blockers model='Opteron_G4-v1'>
+        <feature name='fma4'/>
+        <feature name='xop'/>
+      </blockers>
       <model usable='no' vendor='AMD'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <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 93efe9253b940718ba8db4dc231e00312a38f3c4..507176254421590ff8edf65b252d305d984adce2 100644 (file)
--- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
@@ -1023,13 +1023,20 @@
       <blockers model='Opteron_G3-v1'>
         <feature name='misalignsse'/>
       </blockers>
-      <model usable='no' vendor='AMD'>Opteron_G4</model>
+      <model usable='no' vendor='AMD' canonical='Opteron_G4-v1'>Opteron_G4</model>
       <blockers model='Opteron_G4'>
         <feature name='fma4'/>
         <feature name='misalignsse'/>
         <feature name='nrip-save'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G4-v1</model>
+      <blockers model='Opteron_G4-v1'>
+        <feature name='fma4'/>
+        <feature name='misalignsse'/>
+        <feature name='nrip-save'/>
+        <feature name='xop'/>
+      </blockers>
       <model usable='no' vendor='AMD'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <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 e2e11f239f0660939df86e7a8760e6ddd5594a16..e3391a74bf447b6664fca7171abe3e874a866fb9 100644 (file)
--- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
@@ -877,11 +877,16 @@
       <model usable='yes' vendor='AMD'>Opteron_G2-v1</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>
+      <model usable='no' vendor='AMD' canonical='Opteron_G4-v1'>Opteron_G4</model>
       <blockers model='Opteron_G4'>
         <feature name='fma4'/>
         <feature name='xop'/>
       </blockers>
+      <model usable='no' vendor='AMD'>Opteron_G4-v1</model>
+      <blockers model='Opteron_G4-v1'>
+        <feature name='fma4'/>
+        <feature name='xop'/>
+      </blockers>
       <model usable='no' vendor='AMD'>Opteron_G5</model>
       <blockers model='Opteron_G5'>
         <feature name='fma4'/>