From 9bc479a3c0e0453e50ceb149abc41c5787e61735 Mon Sep 17 00:00:00 2001
From: Jiri Denemark <jdenemar@redhat.com>
Date: Thu, 5 Dec 2024 16:01:20 +0100
Subject: [PATCH] cpu_map: Add Opteron_G5-v1 CPU model

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
---
 src/cpu_map/index.xml                              |  1 +
 src/cpu_map/meson.build                            |  1 +
 src/cpu_map/x86_Opteron_G5-v1.xml                  |  6 ++++++
 tests/cputestdata/x86_64-cpuid-A10-5800K-host.xml  |  2 +-
 tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml     |  8 +++++++-
 tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml     | 14 +++++++++++++-
 tests/domaincapsdata/qemu_5.2.0.x86_64.xml         |  8 +++++++-
 tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml     |  8 +++++++-
 tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml     | 14 +++++++++++++-
 tests/domaincapsdata/qemu_6.0.0.x86_64.xml         |  8 +++++++-
 tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml     |  8 +++++++-
 tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml     | 14 +++++++++++++-
 tests/domaincapsdata/qemu_6.1.0.x86_64.xml         |  8 +++++++-
 tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml     |  8 +++++++-
 tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml     | 14 +++++++++++++-
 tests/domaincapsdata/qemu_6.2.0.x86_64.xml         |  8 +++++++-
 tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml     |  8 +++++++-
 tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml     | 14 +++++++++++++-
 tests/domaincapsdata/qemu_7.0.0.x86_64.xml         |  8 +++++++-
 tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml     |  8 +++++++-
 tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml     | 14 +++++++++++++-
 tests/domaincapsdata/qemu_7.1.0.x86_64.xml         |  8 +++++++-
 tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml     |  8 +++++++-
 tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml | 11 ++++++++++-
 tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml     | 11 ++++++++++-
 tests/domaincapsdata/qemu_7.2.0.x86_64.xml         |  8 +++++++-
 tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml     |  8 +++++++-
 tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml     | 11 ++++++++++-
 tests/domaincapsdata/qemu_8.0.0.x86_64.xml         |  8 +++++++-
 tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml     |  8 +++++++-
 tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml     | 10 +++++++++-
 tests/domaincapsdata/qemu_8.1.0.x86_64.xml         |  8 +++++++-
 tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml     |  8 +++++++-
 tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml     | 10 +++++++++-
 tests/domaincapsdata/qemu_8.2.0.x86_64.xml         |  8 +++++++-
 tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml     |  8 +++++++-
 tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml     | 10 +++++++++-
 tests/domaincapsdata/qemu_9.0.0.x86_64.xml         |  8 +++++++-
 tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml     |  8 +++++++-
 tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml     | 10 +++++++++-
 tests/domaincapsdata/qemu_9.1.0.x86_64.xml         |  8 +++++++-
 tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml     |  8 +++++++-
 tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml     | 10 +++++++++-
 tests/domaincapsdata/qemu_9.2.0.x86_64.xml         |  8 +++++++-
 44 files changed, 344 insertions(+), 41 deletions(-)
 create mode 100644 src/cpu_map/x86_Opteron_G5-v1.xml

diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml
index 40be965c36..9bd90cc83b 100644
--- 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 b1bff43d1a..5ac3c82dc7 100644
--- 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
index 0000000000..7e0f16775e
--- /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 e4a455df15..738e8ea67a 100644
--- 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 48303b17e1..ce3ba14684 100644
--- 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 bc8fd8b7e8..92827056db 100644
--- 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 a149caaac7..21e8a55a63 100644
--- 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 342e2b3ccd..ba09a6cbb2 100644
--- 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 ddf0080cc1..dc15afa017 100644
--- 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 79a282c065..72ceb31595 100644
--- 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 edabb37ead..deaa3a0041 100644
--- 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 801fddf93a..469752cf32 100644
--- 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 386083131c..7484c13f2c 100644
--- 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 12aa247563..d1a8399812 100644
--- 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 8eaadfd389..8c8f016233 100644
--- 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 5744c2cbbf..1f21b8be4e 100644
--- 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 7129b49670..2c5129453e 100644
--- 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 e10973b629..d4a567f5c6 100644
--- 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 98cf875d10..6fa08af994 100644
--- 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 7617177578..8bed31ad22 100644
--- 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 6d1b777442..cb7fd8811b 100644
--- 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 95b3476116..a0f8b13f72 100644
--- 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 fe591e6644..f9d27024fc 100644
--- 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 6e6eb8d57c..c7728ac454 100644
--- 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 6e6eb8d57c..c7728ac454 100644
--- 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 3568c4011b..f0d9493353 100644
--- 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 3846d633c1..b8c376cb14 100644
--- 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 1983d5e635..d3c9830a1a 100644
--- 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 0fd169dda6..e8df30ae07 100644
--- 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 2f1ef6b196..197efcbe59 100644
--- 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 816891f303..07fdd0c3a3 100644
--- 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 6bf06dd445..ec95c1a2ac 100644
--- 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 b4258868aa..d1d330df87 100644
--- 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 fc92315651..75cb1b8f17 100644
--- 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 2b33577cec..5f6e72e7ca 100644
--- 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 85216b05a4..3c005d0c10 100644
--- 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 8cf49e42f8..3a6424eddf 100644
--- 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 6570359797..79c39678ca 100644
--- 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 b7aa3acedd..117947ef13 100644
--- 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 fbcae333c6..c2c244f464 100644
--- 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 65f4238125..30959cd723 100644
--- 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 21f38b8f2f..5fc9576495 100644
--- 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 5071762544..eeba43f9fa 100644
--- 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 e3391a74bf..96d789ee1c 100644
--- 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>