diff --git a/libvirt-cpu_map-Add-486-v1-CPU-model.patch b/libvirt-cpu_map-Add-486-v1-CPU-model.patch
new file mode 100644
index 0000000..29f49a3
--- /dev/null
+++ b/libvirt-cpu_map-Add-486-v1-CPU-model.patch
@@ -0,0 +1,658 @@
+From cc918753926e4844de2bad3cf2ce598f69e7fc79 Mon Sep 17 00:00:00 2001
+Message-ID: <cc918753926e4844de2bad3cf2ce598f69e7fc79.1734429553.git.jdenemar@redhat.com>
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Thu, 5 Dec 2024 15:20:54 +0100
+Subject: [PATCH] cpu_map: Add 486-v1 CPU model
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit 2abf6bd47c795c05d299285876977394e60479e4)
+
+https://issues.redhat.com/browse/RHEL-70129
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ src/cpu_map/index.xml                              | 1 +
+ src/cpu_map/meson.build                            | 1 +
+ src/cpu_map/x86_486-v1.xml                         | 6 ++++++
+ tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_5.2.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_6.0.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_6.1.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_6.2.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_7.0.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_7.1.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml | 3 ++-
+ tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_7.2.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_8.0.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_8.1.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_8.2.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_9.0.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_9.1.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_9.2.0.x86_64.xml         | 3 ++-
+ 43 files changed, 88 insertions(+), 40 deletions(-)
+ create mode 100644 src/cpu_map/x86_486-v1.xml
+
+diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml
+index 287cd7395e..e9fb278fd3 100644
+--- a/src/cpu_map/index.xml
++++ b/src/cpu_map/index.xml
+@@ -5,6 +5,7 @@
+ 
+     <group name='generic'>
+       <include filename='x86_486.xml'/>
++      <include filename='x86_486-v1.xml'/>
+     </group>
+ 
+     <group name='Intel-based QEMU generic CPU models'>
+diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build
+index f659ef230e..b335278b08 100644
+--- a/src/cpu_map/meson.build
++++ b/src/cpu_map/meson.build
+@@ -22,6 +22,7 @@ cpumap_data = [
+   'ppc64_POWERPC_e5500.xml',
+   'ppc64_POWERPC_e6500.xml',
+   'ppc64_vendors.xml',
++  'x86_486-v1.xml',
+   'x86_486.xml',
+   'x86_athlon.xml',
+   'x86_Broadwell-IBRS.xml',
+diff --git a/src/cpu_map/x86_486-v1.xml b/src/cpu_map/x86_486-v1.xml
+new file mode 100644
+index 0000000000..33f7ee09b5
+--- /dev/null
++++ b/src/cpu_map/x86_486-v1.xml
+@@ -0,0 +1,6 @@
++<cpus>
++  <model name='486-v1'>
++    <decode host='on' guest='off'/>
++    <model name='486'/>
++  </model>
++</cpus>
+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 5fa2d07976..46f1bd7d4f 100644
+--- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
+@@ -62,7 +62,8 @@
+       <feature policy='require' name='pschange-mc-no'/>
+     </mode>
+     <mode name='custom' supported='yes'>
+-      <model usable='yes' vendor='unknown'>486</model>
++      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
++      <model usable='yes' vendor='unknown'>486-v1</model>
+       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
+       <blockers model='Broadwell'>
+         <feature name='erms'/>
+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 0348a65589..7153fe3925 100644
+--- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
+@@ -74,7 +74,8 @@
+       <feature policy='disable' name='misalignsse'/>
+     </mode>
+     <mode name='custom' supported='yes'>
+-      <model usable='yes' vendor='unknown'>486</model>
++      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
++      <model usable='yes' vendor='unknown'>486-v1</model>
+       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
+       <blockers model='Broadwell'>
+         <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 49a18cd333..93df9af8f6 100644
+--- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
+@@ -61,7 +61,8 @@
+       <feature policy='require' name='pschange-mc-no'/>
+     </mode>
+     <mode name='custom' supported='yes'>
+-      <model usable='yes' vendor='unknown'>486</model>
++      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
++      <model usable='yes' vendor='unknown'>486-v1</model>
+       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
+       <blockers model='Broadwell'>
+         <feature name='erms'/>
+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 b990a2d597..25b16b34bb 100644
+--- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
+@@ -62,7 +62,8 @@
+       <feature policy='require' name='pschange-mc-no'/>
+     </mode>
+     <mode name='custom' supported='yes'>
+-      <model usable='yes' vendor='unknown'>486</model>
++      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
++      <model usable='yes' vendor='unknown'>486-v1</model>
+       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
+       <blockers model='Broadwell'>
+         <feature name='erms'/>
+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 6746479be5..c9a124cda2 100644
+--- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
+@@ -75,7 +75,8 @@
+       <feature policy='disable' name='misalignsse'/>
+     </mode>
+     <mode name='custom' supported='yes'>
+-      <model usable='yes' vendor='unknown'>486</model>
++      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
++      <model usable='yes' vendor='unknown'>486-v1</model>
+       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
+       <blockers model='Broadwell'>
+         <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 81c9bb1444..a99c89e98b 100644
+--- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
+@@ -61,7 +61,8 @@
+       <feature policy='require' name='pschange-mc-no'/>
+     </mode>
+     <mode name='custom' supported='yes'>
+-      <model usable='yes' vendor='unknown'>486</model>
++      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
++      <model usable='yes' vendor='unknown'>486-v1</model>
+       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
+       <blockers model='Broadwell'>
+         <feature name='erms'/>
+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 0cd73ee54f..c4f95a282b 100644
+--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
+@@ -63,7 +63,8 @@
+       <feature policy='require' name='pschange-mc-no'/>
+     </mode>
+     <mode name='custom' supported='yes'>
+-      <model usable='yes' vendor='unknown'>486</model>
++      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
++      <model usable='yes' vendor='unknown'>486-v1</model>
+       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
+       <blockers model='Broadwell'>
+         <feature name='erms'/>
+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 8a09c53177..b6f01ffbce 100644
+--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
+@@ -75,7 +75,8 @@
+       <feature policy='disable' name='misalignsse'/>
+     </mode>
+     <mode name='custom' supported='yes'>
+-      <model usable='yes' vendor='unknown'>486</model>
++      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
++      <model usable='yes' vendor='unknown'>486-v1</model>
+       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
+       <blockers model='Broadwell'>
+         <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 5a23dfee52..5d3c1ab1aa 100644
+--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
+@@ -62,7 +62,8 @@
+       <feature policy='require' name='pschange-mc-no'/>
+     </mode>
+     <mode name='custom' supported='yes'>
+-      <model usable='yes' vendor='unknown'>486</model>
++      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
++      <model usable='yes' vendor='unknown'>486-v1</model>
+       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
+       <blockers model='Broadwell'>
+         <feature name='erms'/>
+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 84e783f739..c24b88f412 100644
+--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
+@@ -63,7 +63,8 @@
+       <feature policy='require' name='pschange-mc-no'/>
+     </mode>
+     <mode name='custom' supported='yes'>
+-      <model usable='yes' vendor='unknown'>486</model>
++      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
++      <model usable='yes' vendor='unknown'>486-v1</model>
+       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
+       <blockers model='Broadwell'>
+         <feature name='erms'/>
+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 4d7ed1eea8..eb8f5e3f22 100644
+--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
+@@ -77,7 +77,8 @@
+       <feature policy='disable' name='misalignsse'/>
+     </mode>
+     <mode name='custom' supported='yes'>
+-      <model usable='yes' vendor='unknown'>486</model>
++      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
++      <model usable='yes' vendor='unknown'>486-v1</model>
+       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
+       <blockers model='Broadwell'>
+         <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 0446dff4fb..b1f198d62b 100644
+--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+@@ -62,7 +62,8 @@
+       <feature policy='require' name='pschange-mc-no'/>
+     </mode>
+     <mode name='custom' supported='yes'>
+-      <model usable='yes' vendor='unknown'>486</model>
++      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
++      <model usable='yes' vendor='unknown'>486-v1</model>
+       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
+       <blockers model='Broadwell'>
+         <feature name='erms'/>
+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 e5718bc50c..7a4830b126 100644
+--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
+@@ -64,7 +64,8 @@
+       <feature policy='require' name='pschange-mc-no'/>
+     </mode>
+     <mode name='custom' supported='yes'>
+-      <model usable='yes' vendor='unknown'>486</model>
++      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
++      <model usable='yes' vendor='unknown'>486-v1</model>
+       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
+       <blockers model='Broadwell'>
+         <feature name='erms'/>
+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 c3a93369e4..d624842aab 100644
+--- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
+@@ -78,7 +78,8 @@
+       <feature policy='disable' name='misalignsse'/>
+     </mode>
+     <mode name='custom' supported='yes'>
+-      <model usable='yes' vendor='unknown'>486</model>
++      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
++      <model usable='yes' vendor='unknown'>486-v1</model>
+       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
+       <blockers model='Broadwell'>
+         <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 7415bda6bf..43bcca9b52 100644
+--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+@@ -63,7 +63,8 @@
+       <feature policy='require' name='pschange-mc-no'/>
+     </mode>
+     <mode name='custom' supported='yes'>
+-      <model usable='yes' vendor='unknown'>486</model>
++      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
++      <model usable='yes' vendor='unknown'>486-v1</model>
+       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
+       <blockers model='Broadwell'>
+         <feature name='erms'/>
+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 720387e9db..275ce525fe 100644
+--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
+@@ -65,7 +65,8 @@
+       <feature policy='require' name='pschange-mc-no'/>
+     </mode>
+     <mode name='custom' supported='yes'>
+-      <model usable='yes' vendor='unknown'>486</model>
++      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
++      <model usable='yes' vendor='unknown'>486-v1</model>
+       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
+       <blockers model='Broadwell'>
+         <feature name='erms'/>
+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 3000d11487..6500ceac17 100644
+--- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
+@@ -78,7 +78,8 @@
+       <feature policy='disable' name='misalignsse'/>
+     </mode>
+     <mode name='custom' supported='yes'>
+-      <model usable='yes' vendor='unknown'>486</model>
++      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
++      <model usable='yes' vendor='unknown'>486-v1</model>
+       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
+       <blockers model='Broadwell'>
+         <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 31fe652a9f..1e54981f3c 100644
+--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
+@@ -64,7 +64,8 @@
+       <feature policy='require' name='pschange-mc-no'/>
+     </mode>
+     <mode name='custom' supported='yes'>
+-      <model usable='yes' vendor='unknown'>486</model>
++      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
++      <model usable='yes' vendor='unknown'>486-v1</model>
+       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
+       <blockers model='Broadwell'>
+         <feature name='erms'/>
+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 88db1c659e..5b1bb3ad55 100644
+--- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
+@@ -70,7 +70,8 @@
+       <feature policy='require' name='pschange-mc-no'/>
+     </mode>
+     <mode name='custom' supported='yes'>
+-      <model usable='yes' vendor='unknown'>486</model>
++      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
++      <model usable='yes' vendor='unknown'>486-v1</model>
+       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
+       <blockers model='Broadwell'>
+         <feature name='erms'/>
+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 3392f2b42f..339c622684 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
+@@ -67,7 +67,8 @@
+       <feature policy='disable' name='nrip-save'/>
+     </mode>
+     <mode name='custom' supported='yes'>
+-      <model usable='yes' vendor='unknown'>486</model>
++      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
++      <model usable='yes' vendor='unknown'>486-v1</model>
+       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
+       <blockers model='Broadwell'>
+         <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 3392f2b42f..339c622684 100644
+--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
+@@ -67,7 +67,8 @@
+       <feature policy='disable' name='nrip-save'/>
+     </mode>
+     <mode name='custom' supported='yes'>
+-      <model usable='yes' vendor='unknown'>486</model>
++      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
++      <model usable='yes' vendor='unknown'>486-v1</model>
+       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
+       <blockers model='Broadwell'>
+         <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 5223dbb2e2..a016f77b09 100644
+--- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
+@@ -69,7 +69,8 @@
+       <feature policy='require' name='pschange-mc-no'/>
+     </mode>
+     <mode name='custom' supported='yes'>
+-      <model usable='yes' vendor='unknown'>486</model>
++      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
++      <model usable='yes' vendor='unknown'>486-v1</model>
+       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
+       <blockers model='Broadwell'>
+         <feature name='erms'/>
+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 e43c6710e9..9a42375791 100644
+--- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
+@@ -70,7 +70,8 @@
+       <feature policy='require' name='pschange-mc-no'/>
+     </mode>
+     <mode name='custom' supported='yes'>
+-      <model usable='yes' vendor='unknown'>486</model>
++      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
++      <model usable='yes' vendor='unknown'>486-v1</model>
+       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
+       <blockers model='Broadwell'>
+         <feature name='erms'/>
+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 3d5c15fdf1..677ebbf2e6 100644
+--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
+@@ -71,7 +71,8 @@
+       <feature policy='disable' name='nrip-save'/>
+     </mode>
+     <mode name='custom' supported='yes'>
+-      <model usable='yes' vendor='unknown'>486</model>
++      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
++      <model usable='yes' vendor='unknown'>486-v1</model>
+       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
+       <blockers model='Broadwell'>
+         <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 420dae738f..1eb4af3fdc 100644
+--- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
+@@ -69,7 +69,8 @@
+       <feature policy='require' name='pschange-mc-no'/>
+     </mode>
+     <mode name='custom' supported='yes'>
+-      <model usable='yes' vendor='unknown'>486</model>
++      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
++      <model usable='yes' vendor='unknown'>486-v1</model>
+       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
+       <blockers model='Broadwell'>
+         <feature name='erms'/>
+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 e5853535ce..e2fa9da460 100644
+--- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
+@@ -72,7 +72,8 @@
+       <feature policy='disable' name='xsaves'/>
+     </mode>
+     <mode name='custom' supported='yes'>
+-      <model usable='yes' vendor='unknown'>486</model>
++      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
++      <model usable='yes' vendor='unknown'>486-v1</model>
+       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
+       <blockers model='Broadwell'>
+         <feature name='erms'/>
+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 22c40afdb1..787fc9d870 100644
+--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
+@@ -72,7 +72,8 @@
+       <feature policy='disable' name='nrip-save'/>
+     </mode>
+     <mode name='custom' supported='yes'>
+-      <model usable='yes' vendor='unknown'>486</model>
++      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
++      <model usable='yes' vendor='unknown'>486-v1</model>
+       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
+       <blockers model='Broadwell'>
+         <feature name='hle'/>
+diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
+index c40cbb8a73..3fa195c6aa 100644
+--- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
+@@ -71,7 +71,8 @@
+       <feature policy='disable' name='xsaves'/>
+     </mode>
+     <mode name='custom' supported='yes'>
+-      <model usable='yes' vendor='unknown'>486</model>
++      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
++      <model usable='yes' vendor='unknown'>486-v1</model>
+       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
+       <blockers model='Broadwell'>
+         <feature name='erms'/>
+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 cfc4b3e301..5fe9ab775c 100644
+--- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
+@@ -73,7 +73,8 @@
+       <feature policy='disable' name='xsaves'/>
+     </mode>
+     <mode name='custom' supported='yes'>
+-      <model usable='yes' vendor='unknown'>486</model>
++      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
++      <model usable='yes' vendor='unknown'>486-v1</model>
+       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
+       <blockers model='Broadwell'>
+         <feature name='erms'/>
+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 4383050d3c..5c9f1c92a5 100644
+--- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
+@@ -71,7 +71,8 @@
+       <feature policy='disable' name='nrip-save'/>
+     </mode>
+     <mode name='custom' supported='yes'>
+-      <model usable='yes' vendor='unknown'>486</model>
++      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
++      <model usable='yes' vendor='unknown'>486-v1</model>
+       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
+       <blockers model='Broadwell'>
+         <feature name='hle'/>
+diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
+index 062d91ba9a..73f129706d 100644
+--- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
+@@ -72,7 +72,8 @@
+       <feature policy='disable' name='xsaves'/>
+     </mode>
+     <mode name='custom' supported='yes'>
+-      <model usable='yes' vendor='unknown'>486</model>
++      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
++      <model usable='yes' vendor='unknown'>486-v1</model>
+       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
+       <blockers model='Broadwell'>
+         <feature name='erms'/>
+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 e8053efc99..2315bda338 100644
+--- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
+@@ -73,7 +73,8 @@
+       <feature policy='disable' name='xsaves'/>
+     </mode>
+     <mode name='custom' supported='yes'>
+-      <model usable='yes' vendor='unknown'>486</model>
++      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
++      <model usable='yes' vendor='unknown'>486-v1</model>
+       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
+       <blockers model='Broadwell'>
+         <feature name='erms'/>
+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 8f3357be6f..90c9862321 100644
+--- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
+@@ -73,7 +73,8 @@
+       <feature policy='disable' name='nrip-save'/>
+     </mode>
+     <mode name='custom' supported='yes'>
+-      <model usable='yes' vendor='unknown'>486</model>
++      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
++      <model usable='yes' vendor='unknown'>486-v1</model>
+       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
+       <blockers model='Broadwell'>
+         <feature name='hle'/>
+diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
+index db12bd81e3..983597be92 100644
+--- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
+@@ -72,7 +72,8 @@
+       <feature policy='disable' name='xsaves'/>
+     </mode>
+     <mode name='custom' supported='yes'>
+-      <model usable='yes' vendor='unknown'>486</model>
++      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
++      <model usable='yes' vendor='unknown'>486-v1</model>
+       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
+       <blockers model='Broadwell'>
+         <feature name='erms'/>
+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 c3a7aff766..578dea23a5 100644
+--- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
+@@ -77,7 +77,8 @@
+       <feature policy='disable' name='xsaves'/>
+     </mode>
+     <mode name='custom' supported='yes'>
+-      <model usable='yes' vendor='unknown'>486</model>
++      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
++      <model usable='yes' vendor='unknown'>486-v1</model>
+       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
+       <blockers model='Broadwell'>
+         <feature name='erms'/>
+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 a18ce928a5..2009920390 100644
+--- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
+@@ -72,7 +72,8 @@
+       <feature policy='disable' name='nrip-save'/>
+     </mode>
+     <mode name='custom' supported='yes'>
+-      <model usable='yes' vendor='unknown'>486</model>
++      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
++      <model usable='yes' vendor='unknown'>486-v1</model>
+       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
+       <blockers model='Broadwell'>
+         <feature name='hle'/>
+diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
+index 5019918b9b..505ea9978f 100644
+--- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
+@@ -76,7 +76,8 @@
+       <feature policy='disable' name='xsaves'/>
+     </mode>
+     <mode name='custom' supported='yes'>
+-      <model usable='yes' vendor='unknown'>486</model>
++      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
++      <model usable='yes' vendor='unknown'>486-v1</model>
+       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
+       <blockers model='Broadwell'>
+         <feature name='erms'/>
+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 5cd872831b..e78f6a9dd3 100644
+--- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
+@@ -77,7 +77,8 @@
+       <feature policy='disable' name='xsaves'/>
+     </mode>
+     <mode name='custom' supported='yes'>
+-      <model usable='yes' vendor='unknown'>486</model>
++      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
++      <model usable='yes' vendor='unknown'>486-v1</model>
+       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
+       <blockers model='Broadwell'>
+         <feature name='erms'/>
+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 7afc9e3d69..da9f2a1193 100644
+--- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
+@@ -72,7 +72,8 @@
+       <feature policy='disable' name='nrip-save'/>
+     </mode>
+     <mode name='custom' supported='yes'>
+-      <model usable='yes' vendor='unknown'>486</model>
++      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
++      <model usable='yes' vendor='unknown'>486-v1</model>
+       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
+       <blockers model='Broadwell'>
+         <feature name='hle'/>
+diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
+index 11cfc7863d..74d1094511 100644
+--- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
+@@ -76,7 +76,8 @@
+       <feature policy='disable' name='xsaves'/>
+     </mode>
+     <mode name='custom' supported='yes'>
+-      <model usable='yes' vendor='unknown'>486</model>
++      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
++      <model usable='yes' vendor='unknown'>486-v1</model>
+       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
+       <blockers model='Broadwell'>
+         <feature name='erms'/>
+-- 
+2.47.1
diff --git a/libvirt-cpu_map-Add-Conroe-v1-CPU-model.patch b/libvirt-cpu_map-Add-Conroe-v1-CPU-model.patch
new file mode 100644
index 0000000..94d5707
--- /dev/null
+++ b/libvirt-cpu_map-Add-Conroe-v1-CPU-model.patch
@@ -0,0 +1,684 @@
+From ca37c1656ba02cdc78667f3ce07c316d9d3ab41e Mon Sep 17 00:00:00 2001
+Message-ID: <ca37c1656ba02cdc78667f3ce07c316d9d3ab41e.1734429554.git.jdenemar@redhat.com>
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Thu, 5 Dec 2024 15:38:08 +0100
+Subject: [PATCH] cpu_map: Add Conroe-v1 CPU model
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit 2d061eba8c2b7907cad1fe80fb6e2b1707417ed3)
+
+https://issues.redhat.com/browse/RHEL-70129
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ src/cpu_map/index.xml                               | 1 +
+ src/cpu_map/meson.build                             | 1 +
+ src/cpu_map/x86_Conroe-v1.xml                       | 6 ++++++
+ tests/cputestdata/x86_64-cpuid-Core2-E6850-host.xml | 2 +-
+ tests/cputestdata/x86_64-cpuid-Xeon-5110-host.xml   | 2 +-
+ tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml      | 3 ++-
+ tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml      | 3 ++-
+ tests/domaincapsdata/qemu_5.2.0.x86_64.xml          | 3 ++-
+ tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml      | 3 ++-
+ tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml      | 3 ++-
+ tests/domaincapsdata/qemu_6.0.0.x86_64.xml          | 3 ++-
+ tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml      | 3 ++-
+ tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml      | 3 ++-
+ tests/domaincapsdata/qemu_6.1.0.x86_64.xml          | 3 ++-
+ tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml      | 3 ++-
+ tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml      | 3 ++-
+ tests/domaincapsdata/qemu_6.2.0.x86_64.xml          | 3 ++-
+ tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml      | 3 ++-
+ tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml      | 3 ++-
+ tests/domaincapsdata/qemu_7.0.0.x86_64.xml          | 3 ++-
+ tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml      | 3 ++-
+ tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml      | 3 ++-
+ tests/domaincapsdata/qemu_7.1.0.x86_64.xml          | 3 ++-
+ tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml      | 3 ++-
+ tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml  | 3 ++-
+ tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml      | 3 ++-
+ tests/domaincapsdata/qemu_7.2.0.x86_64.xml          | 3 ++-
+ tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml      | 3 ++-
+ tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml      | 3 ++-
+ tests/domaincapsdata/qemu_8.0.0.x86_64.xml          | 3 ++-
+ tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml      | 3 ++-
+ tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml      | 3 ++-
+ tests/domaincapsdata/qemu_8.1.0.x86_64.xml          | 3 ++-
+ tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml      | 3 ++-
+ tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml      | 3 ++-
+ tests/domaincapsdata/qemu_8.2.0.x86_64.xml          | 3 ++-
+ tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml      | 3 ++-
+ tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml      | 3 ++-
+ tests/domaincapsdata/qemu_9.0.0.x86_64.xml          | 3 ++-
+ tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml      | 3 ++-
+ tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml      | 3 ++-
+ tests/domaincapsdata/qemu_9.1.0.x86_64.xml          | 3 ++-
+ tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml      | 3 ++-
+ tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml      | 3 ++-
+ tests/domaincapsdata/qemu_9.2.0.x86_64.xml          | 3 ++-
+ 45 files changed, 90 insertions(+), 42 deletions(-)
+ create mode 100644 src/cpu_map/x86_Conroe-v1.xml
+
+diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml
+index a9a8d1b2c4..e9a180526e 100644
+--- a/src/cpu_map/index.xml
++++ b/src/cpu_map/index.xml
+@@ -39,6 +39,7 @@
+ 
+     <group name='Intel CPU models'>
+       <include filename='x86_Conroe.xml'/>
++      <include filename='x86_Conroe-v1.xml'/>
+       <include filename='x86_Penryn.xml'/>
+       <include filename='x86_Nehalem.xml'/>
+       <include filename='x86_Nehalem-IBRS.xml'/>
+diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build
+index 7ea53373ae..cbf7bb407b 100644
+--- a/src/cpu_map/meson.build
++++ b/src/cpu_map/meson.build
+@@ -40,6 +40,7 @@ cpumap_data = [
+   'x86_Cascadelake-Server-v4.xml',
+   'x86_Cascadelake-Server-v5.xml',
+   'x86_Cascadelake-Server.xml',
++  'x86_Conroe-v1.xml',
+   'x86_Conroe.xml',
+   'x86_Cooperlake-v1.xml',
+   'x86_Cooperlake-v2.xml',
+diff --git a/src/cpu_map/x86_Conroe-v1.xml b/src/cpu_map/x86_Conroe-v1.xml
+new file mode 100644
+index 0000000000..8dd626795a
+--- /dev/null
++++ b/src/cpu_map/x86_Conroe-v1.xml
+@@ -0,0 +1,6 @@
++<cpus>
++  <model name='Conroe-v1'>
++    <decode host='on' guest='off'/>
++    <model name='Conroe'/>
++  </model>
++</cpus>
+diff --git a/tests/cputestdata/x86_64-cpuid-Core2-E6850-host.xml b/tests/cputestdata/x86_64-cpuid-Core2-E6850-host.xml
+index dae7f8846e..6625ebc44d 100644
+--- a/tests/cputestdata/x86_64-cpuid-Core2-E6850-host.xml
++++ b/tests/cputestdata/x86_64-cpuid-Core2-E6850-host.xml
+@@ -1,6 +1,6 @@
+ <cpu>
+   <arch>x86_64</arch>
+-  <model>Conroe</model>
++  <model>Conroe-v1</model>
+   <vendor>Intel</vendor>
+   <signature family='6' model='15' stepping='11'/>
+   <feature name='dtes64'/>
+diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-5110-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-5110-host.xml
+index ec509f92e4..cca99c7b04 100644
+--- a/tests/cputestdata/x86_64-cpuid-Xeon-5110-host.xml
++++ b/tests/cputestdata/x86_64-cpuid-Xeon-5110-host.xml
+@@ -1,6 +1,6 @@
+ <cpu>
+   <arch>x86_64</arch>
+-  <model>Conroe</model>
++  <model>Conroe-v1</model>
+   <vendor>Intel</vendor>
+   <signature family='6' model='15' stepping='6'/>
+   <feature name='dtes64'/>
+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 985a00cf84..3a14131fda 100644
+--- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
+@@ -218,7 +218,8 @@
+         <feature name='pku'/>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='yes' vendor='Intel'>Conroe</model>
++      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
++      <model usable='yes' vendor='Intel'>Conroe-v1</model>
+       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
+       <blockers model='Cooperlake'>
+         <feature name='avx512-bf16'/>
+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 74aa563566..5223402151 100644
+--- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
+@@ -350,7 +350,8 @@
+         <feature name='x2apic'/>
+         <feature name='xsavec'/>
+       </blockers>
+-      <model usable='yes' vendor='Intel'>Conroe</model>
++      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
++      <model usable='yes' vendor='Intel'>Conroe-v1</model>
+       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
+       <blockers model='Cooperlake'>
+         <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 4fdeaec417..a3638c64a4 100644
+--- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
+@@ -217,7 +217,8 @@
+         <feature name='pku'/>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='yes' vendor='Intel'>Conroe</model>
++      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
++      <model usable='yes' vendor='Intel'>Conroe-v1</model>
+       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
+       <blockers model='Cooperlake'>
+         <feature name='avx512-bf16'/>
+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 284d70c7cc..9af3b3768d 100644
+--- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
+@@ -218,7 +218,8 @@
+         <feature name='pku'/>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='yes' vendor='Intel'>Conroe</model>
++      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
++      <model usable='yes' vendor='Intel'>Conroe-v1</model>
+       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
+       <blockers model='Cooperlake'>
+         <feature name='avx512-bf16'/>
+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 07097ce25b..7932c25f39 100644
+--- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
+@@ -351,7 +351,8 @@
+         <feature name='x2apic'/>
+         <feature name='xsavec'/>
+       </blockers>
+-      <model usable='yes' vendor='Intel'>Conroe</model>
++      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
++      <model usable='yes' vendor='Intel'>Conroe-v1</model>
+       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
+       <blockers model='Cooperlake'>
+         <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 1aefe0ea08..72c598466a 100644
+--- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
+@@ -217,7 +217,8 @@
+         <feature name='pku'/>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='yes' vendor='Intel'>Conroe</model>
++      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
++      <model usable='yes' vendor='Intel'>Conroe-v1</model>
+       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
+       <blockers model='Cooperlake'>
+         <feature name='avx512-bf16'/>
+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 2ffe8cb354..b3ba5b020d 100644
+--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
+@@ -234,7 +234,8 @@
+         <feature name='pku'/>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='yes' vendor='Intel'>Conroe</model>
++      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
++      <model usable='yes' vendor='Intel'>Conroe-v1</model>
+       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
+       <blockers model='Cooperlake'>
+         <feature name='avx-vnni'/>
+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 2a084c64fe..69a73ea9b2 100644
+--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
+@@ -379,7 +379,8 @@
+         <feature name='xsavec'/>
+         <feature name='xsaves'/>
+       </blockers>
+-      <model usable='yes' vendor='Intel'>Conroe</model>
++      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
++      <model usable='yes' vendor='Intel'>Conroe-v1</model>
+       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
+       <blockers model='Cooperlake'>
+         <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 bda2e0ef68..54edabd43f 100644
+--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
+@@ -233,7 +233,8 @@
+         <feature name='pku'/>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='yes' vendor='Intel'>Conroe</model>
++      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
++      <model usable='yes' vendor='Intel'>Conroe-v1</model>
+       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
+       <blockers model='Cooperlake'>
+         <feature name='avx-vnni'/>
+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 d2fbcad98c..be908c6cc6 100644
+--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
+@@ -234,7 +234,8 @@
+         <feature name='pku'/>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='yes' vendor='Intel'>Conroe</model>
++      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
++      <model usable='yes' vendor='Intel'>Conroe-v1</model>
+       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
+       <blockers model='Cooperlake'>
+         <feature name='avx512-bf16'/>
+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 60093eda9a..8fb08191ea 100644
+--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
+@@ -381,7 +381,8 @@
+         <feature name='xsavec'/>
+         <feature name='xsaves'/>
+       </blockers>
+-      <model usable='yes' vendor='Intel'>Conroe</model>
++      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
++      <model usable='yes' vendor='Intel'>Conroe-v1</model>
+       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
+       <blockers model='Cooperlake'>
+         <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 eafdc53ff6..1f9bdf36af 100644
+--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+@@ -233,7 +233,8 @@
+         <feature name='pku'/>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='yes' vendor='Intel'>Conroe</model>
++      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
++      <model usable='yes' vendor='Intel'>Conroe-v1</model>
+       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
+       <blockers model='Cooperlake'>
+         <feature name='avx512-bf16'/>
+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 03896267d5..14081dfafd 100644
+--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
+@@ -235,7 +235,8 @@
+         <feature name='pku'/>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='yes' vendor='Intel'>Conroe</model>
++      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
++      <model usable='yes' vendor='Intel'>Conroe-v1</model>
+       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
+       <blockers model='Cooperlake'>
+         <feature name='avx512-bf16'/>
+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 52eb4b8215..d9ba0202bd 100644
+--- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
+@@ -382,7 +382,8 @@
+         <feature name='xsavec'/>
+         <feature name='xsaves'/>
+       </blockers>
+-      <model usable='yes' vendor='Intel'>Conroe</model>
++      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
++      <model usable='yes' vendor='Intel'>Conroe-v1</model>
+       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
+       <blockers model='Cooperlake'>
+         <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 f212097662..bba1b69e41 100644
+--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+@@ -234,7 +234,8 @@
+         <feature name='pku'/>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='yes' vendor='Intel'>Conroe</model>
++      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
++      <model usable='yes' vendor='Intel'>Conroe-v1</model>
+       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
+       <blockers model='Cooperlake'>
+         <feature name='avx512-bf16'/>
+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 38b0f47092..9fb0fbe581 100644
+--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
+@@ -236,7 +236,8 @@
+         <feature name='pku'/>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='yes' vendor='Intel'>Conroe</model>
++      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
++      <model usable='yes' vendor='Intel'>Conroe-v1</model>
+       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
+       <blockers model='Cooperlake'>
+         <feature name='avx512-bf16'/>
+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 43de9e5193..b7f01c2b58 100644
+--- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
+@@ -382,7 +382,8 @@
+         <feature name='xsavec'/>
+         <feature name='xsaves'/>
+       </blockers>
+-      <model usable='yes' vendor='Intel'>Conroe</model>
++      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
++      <model usable='yes' vendor='Intel'>Conroe-v1</model>
+       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
+       <blockers model='Cooperlake'>
+         <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 92514055c9..f7e9853077 100644
+--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
+@@ -235,7 +235,8 @@
+         <feature name='pku'/>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='yes' vendor='Intel'>Conroe</model>
++      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
++      <model usable='yes' vendor='Intel'>Conroe-v1</model>
+       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
+       <blockers model='Cooperlake'>
+         <feature name='avx512-bf16'/>
+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 10017064b8..4b670c95fe 100644
+--- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
+@@ -241,7 +241,8 @@
+         <feature name='pku'/>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='yes' vendor='Intel'>Conroe</model>
++      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
++      <model usable='yes' vendor='Intel'>Conroe-v1</model>
+       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
+       <blockers model='Cooperlake'>
+         <feature name='avx512-bf16'/>
+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 95b582af9f..8b85bd98b4 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
+@@ -311,7 +311,8 @@
+         <feature name='xsavec'/>
+         <feature name='xsaves'/>
+       </blockers>
+-      <model usable='yes' vendor='Intel'>Conroe</model>
++      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
++      <model usable='yes' vendor='Intel'>Conroe-v1</model>
+       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
+       <blockers model='Cooperlake'>
+         <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 95b582af9f..8b85bd98b4 100644
+--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
+@@ -311,7 +311,8 @@
+         <feature name='xsavec'/>
+         <feature name='xsaves'/>
+       </blockers>
+-      <model usable='yes' vendor='Intel'>Conroe</model>
++      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
++      <model usable='yes' vendor='Intel'>Conroe-v1</model>
+       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
+       <blockers model='Cooperlake'>
+         <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 1e40bc5b23..0e1328f1fc 100644
+--- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
+@@ -240,7 +240,8 @@
+         <feature name='pku'/>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='yes' vendor='Intel'>Conroe</model>
++      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
++      <model usable='yes' vendor='Intel'>Conroe-v1</model>
+       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
+       <blockers model='Cooperlake'>
+         <feature name='avx512-bf16'/>
+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 392ec1e232..b3040a9e6e 100644
+--- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
+@@ -241,7 +241,8 @@
+         <feature name='pku'/>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='yes' vendor='Intel'>Conroe</model>
++      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
++      <model usable='yes' vendor='Intel'>Conroe-v1</model>
+       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
+       <blockers model='Cooperlake'>
+         <feature name='avx512-bf16'/>
+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 0893277250..ac533cccfa 100644
+--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
+@@ -315,7 +315,8 @@
+         <feature name='xsavec'/>
+         <feature name='xsaves'/>
+       </blockers>
+-      <model usable='yes' vendor='Intel'>Conroe</model>
++      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
++      <model usable='yes' vendor='Intel'>Conroe-v1</model>
+       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
+       <blockers model='Cooperlake'>
+         <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 52ef9718d0..0558eb7588 100644
+--- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
+@@ -240,7 +240,8 @@
+         <feature name='pku'/>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='yes' vendor='Intel'>Conroe</model>
++      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
++      <model usable='yes' vendor='Intel'>Conroe-v1</model>
+       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
+       <blockers model='Cooperlake'>
+         <feature name='avx512-bf16'/>
+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 ef74bbd2fa..3b334589ed 100644
+--- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
+@@ -244,7 +244,8 @@
+         <feature name='spec-ctrl'/>
+         <feature name='xsaves'/>
+       </blockers>
+-      <model usable='yes' vendor='Intel'>Conroe</model>
++      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
++      <model usable='yes' vendor='Intel'>Conroe-v1</model>
+       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
+       <blockers model='Cooperlake'>
+         <feature name='avx512-bf16'/>
+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 404237ef67..9815a01beb 100644
+--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
+@@ -266,7 +266,8 @@
+         <feature name='xsavec'/>
+         <feature name='xsaves'/>
+       </blockers>
+-      <model usable='yes' vendor='Intel'>Conroe</model>
++      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
++      <model usable='yes' vendor='Intel'>Conroe-v1</model>
+       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
+       <blockers model='Cooperlake'>
+         <feature name='arch-capabilities'/>
+diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
+index eafacf0b61..3b1796949f 100644
+--- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
+@@ -243,7 +243,8 @@
+         <feature name='spec-ctrl'/>
+         <feature name='xsaves'/>
+       </blockers>
+-      <model usable='yes' vendor='Intel'>Conroe</model>
++      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
++      <model usable='yes' vendor='Intel'>Conroe-v1</model>
+       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
+       <blockers model='Cooperlake'>
+         <feature name='avx512-bf16'/>
+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 c544eb02e3..c4d2a768bd 100644
+--- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
+@@ -245,7 +245,8 @@
+         <feature name='spec-ctrl'/>
+         <feature name='xsaves'/>
+       </blockers>
+-      <model usable='yes' vendor='Intel'>Conroe</model>
++      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
++      <model usable='yes' vendor='Intel'>Conroe-v1</model>
+       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
+       <blockers model='Cooperlake'>
+         <feature name='avx512-bf16'/>
+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 b7b0ddd7c4..207092ba7b 100644
+--- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
+@@ -265,7 +265,8 @@
+         <feature name='xsavec'/>
+         <feature name='xsaves'/>
+       </blockers>
+-      <model usable='yes' vendor='Intel'>Conroe</model>
++      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
++      <model usable='yes' vendor='Intel'>Conroe-v1</model>
+       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
+       <blockers model='Cooperlake'>
+         <feature name='arch-capabilities'/>
+diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
+index a4c86941c6..855dfef498 100644
+--- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
+@@ -244,7 +244,8 @@
+         <feature name='spec-ctrl'/>
+         <feature name='xsaves'/>
+       </blockers>
+-      <model usable='yes' vendor='Intel'>Conroe</model>
++      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
++      <model usable='yes' vendor='Intel'>Conroe-v1</model>
+       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
+       <blockers model='Cooperlake'>
+         <feature name='avx512-bf16'/>
+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 06341f125a..f7ddcd9aff 100644
+--- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
+@@ -245,7 +245,8 @@
+         <feature name='spec-ctrl'/>
+         <feature name='xsaves'/>
+       </blockers>
+-      <model usable='yes' vendor='Intel'>Conroe</model>
++      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
++      <model usable='yes' vendor='Intel'>Conroe-v1</model>
+       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
+       <blockers model='Cooperlake'>
+         <feature name='avx512-bf16'/>
+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 e759a15ea7..3419e26d32 100644
+--- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
+@@ -252,7 +252,8 @@
+         <feature name='xsavec'/>
+         <feature name='xsaves'/>
+       </blockers>
+-      <model usable='yes' vendor='Intel'>Conroe</model>
++      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
++      <model usable='yes' vendor='Intel'>Conroe-v1</model>
+       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
+       <blockers model='Cooperlake'>
+         <feature name='arch-capabilities'/>
+diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
+index eb4822c667..43bc77f7cc 100644
+--- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
+@@ -244,7 +244,8 @@
+         <feature name='spec-ctrl'/>
+         <feature name='xsaves'/>
+       </blockers>
+-      <model usable='yes' vendor='Intel'>Conroe</model>
++      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
++      <model usable='yes' vendor='Intel'>Conroe-v1</model>
+       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
+       <blockers model='Cooperlake'>
+         <feature name='avx512-bf16'/>
+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 a6c7d8e74c..0a962420cd 100644
+--- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
+@@ -249,7 +249,8 @@
+         <feature name='spec-ctrl'/>
+         <feature name='xsaves'/>
+       </blockers>
+-      <model usable='yes' vendor='Intel'>Conroe</model>
++      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
++      <model usable='yes' vendor='Intel'>Conroe-v1</model>
+       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
+       <blockers model='Cooperlake'>
+         <feature name='avx512-bf16'/>
+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 18070cd01a..02209df41b 100644
+--- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
+@@ -251,7 +251,8 @@
+         <feature name='xsavec'/>
+         <feature name='xsaves'/>
+       </blockers>
+-      <model usable='yes' vendor='Intel'>Conroe</model>
++      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
++      <model usable='yes' vendor='Intel'>Conroe-v1</model>
+       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
+       <blockers model='Cooperlake'>
+         <feature name='arch-capabilities'/>
+diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
+index e008a2f2e9..49e1df7be4 100644
+--- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
+@@ -248,7 +248,8 @@
+         <feature name='spec-ctrl'/>
+         <feature name='xsaves'/>
+       </blockers>
+-      <model usable='yes' vendor='Intel'>Conroe</model>
++      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
++      <model usable='yes' vendor='Intel'>Conroe-v1</model>
+       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
+       <blockers model='Cooperlake'>
+         <feature name='avx512-bf16'/>
+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 ce19774d0d..56449ad3db 100644
+--- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
+@@ -249,7 +249,8 @@
+         <feature name='spec-ctrl'/>
+         <feature name='xsaves'/>
+       </blockers>
+-      <model usable='yes' vendor='Intel'>Conroe</model>
++      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
++      <model usable='yes' vendor='Intel'>Conroe-v1</model>
+       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
+       <blockers model='Cooperlake'>
+         <feature name='avx512-bf16'/>
+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 217fbfe51c..04a759a16b 100644
+--- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
+@@ -251,7 +251,8 @@
+         <feature name='xsavec'/>
+         <feature name='xsaves'/>
+       </blockers>
+-      <model usable='yes' vendor='Intel'>Conroe</model>
++      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
++      <model usable='yes' vendor='Intel'>Conroe-v1</model>
+       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
+       <blockers model='Cooperlake'>
+         <feature name='arch-capabilities'/>
+diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
+index 4f34340651..7b3379b3e5 100644
+--- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
+@@ -248,7 +248,8 @@
+         <feature name='spec-ctrl'/>
+         <feature name='xsaves'/>
+       </blockers>
+-      <model usable='yes' vendor='Intel'>Conroe</model>
++      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
++      <model usable='yes' vendor='Intel'>Conroe-v1</model>
+       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
+       <blockers model='Cooperlake'>
+         <feature name='avx512-bf16'/>
+-- 
+2.47.1
diff --git a/libvirt-cpu_map-Add-EPYC-Genoa-v1-CPU-model.patch b/libvirt-cpu_map-Add-EPYC-Genoa-v1-CPU-model.patch
new file mode 100644
index 0000000..dfb3b6a
--- /dev/null
+++ b/libvirt-cpu_map-Add-EPYC-Genoa-v1-CPU-model.patch
@@ -0,0 +1,869 @@
+From 98dc35fe2c13d75f8e866f6ca3f580bf7d7e0207 Mon Sep 17 00:00:00 2001
+Message-ID: <98dc35fe2c13d75f8e866f6ca3f580bf7d7e0207.1734429554.git.jdenemar@redhat.com>
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Thu, 5 Dec 2024 16:02:17 +0100
+Subject: [PATCH] cpu_map: Add EPYC-Genoa-v1 CPU model
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit da2439b746c5da1b6544d6e1cc0d6dd6b9691a1b)
+
+https://issues.redhat.com/browse/RHEL-70129
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ src/cpu_map/index.xml                         |  1 +
+ src/cpu_map/meson.build                       |  1 +
+ src/cpu_map/x86_EPYC-Genoa-v1.xml             |  6 +++
+ .../domaincapsdata/qemu_8.1.0-q35.x86_64.xml  | 32 +++++++++++++-
+ .../domaincapsdata/qemu_8.1.0-tcg.x86_64.xml  | 42 ++++++++++++++++++-
+ tests/domaincapsdata/qemu_8.1.0.x86_64.xml    | 32 +++++++++++++-
+ .../domaincapsdata/qemu_8.2.0-q35.x86_64.xml  | 32 +++++++++++++-
+ .../domaincapsdata/qemu_8.2.0-tcg.x86_64.xml  | 41 +++++++++++++++++-
+ tests/domaincapsdata/qemu_8.2.0.x86_64.xml    | 32 +++++++++++++-
+ .../domaincapsdata/qemu_9.0.0-q35.x86_64.xml  | 32 +++++++++++++-
+ .../domaincapsdata/qemu_9.0.0-tcg.x86_64.xml  | 41 +++++++++++++++++-
+ tests/domaincapsdata/qemu_9.0.0.x86_64.xml    | 32 +++++++++++++-
+ .../domaincapsdata/qemu_9.1.0-q35.x86_64.xml  | 32 +++++++++++++-
+ .../domaincapsdata/qemu_9.1.0-tcg.x86_64.xml  | 41 +++++++++++++++++-
+ tests/domaincapsdata/qemu_9.1.0.x86_64.xml    | 32 +++++++++++++-
+ .../domaincapsdata/qemu_9.2.0-q35.x86_64.xml  | 32 +++++++++++++-
+ .../domaincapsdata/qemu_9.2.0-tcg.x86_64.xml  | 41 +++++++++++++++++-
+ tests/domaincapsdata/qemu_9.2.0.x86_64.xml    | 32 +++++++++++++-
+ 18 files changed, 519 insertions(+), 15 deletions(-)
+ create mode 100644 src/cpu_map/x86_EPYC-Genoa-v1.xml
+
+diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml
+index 9bd90cc83b..8e74195312 100644
+--- a/src/cpu_map/index.xml
++++ b/src/cpu_map/index.xml
+@@ -161,6 +161,7 @@
+       <include filename='x86_EPYC-Milan-v1.xml'/>
+       <include filename='x86_EPYC-Milan-v2.xml'/>
+       <include filename='x86_EPYC-Genoa.xml'/>
++      <include filename='x86_EPYC-Genoa-v1.xml'/>
+     </group>
+ 
+     <group name='Hygon CPU models'>
+diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build
+index 5ac3c82dc7..fa7faa4016 100644
+--- a/src/cpu_map/meson.build
++++ b/src/cpu_map/meson.build
+@@ -59,6 +59,7 @@ cpumap_data = [
+   'x86_Dhyana-v1.xml',
+   'x86_Dhyana-v2.xml',
+   'x86_Dhyana.xml',
++  'x86_EPYC-Genoa-v1.xml',
+   'x86_EPYC-Genoa.xml',
+   'x86_EPYC-IBPB.xml',
+   'x86_EPYC-Milan-v1.xml',
+diff --git a/src/cpu_map/x86_EPYC-Genoa-v1.xml b/src/cpu_map/x86_EPYC-Genoa-v1.xml
+new file mode 100644
+index 0000000000..df45ca18ff
+--- /dev/null
++++ b/src/cpu_map/x86_EPYC-Genoa-v1.xml
+@@ -0,0 +1,6 @@
++<cpus>
++  <model name='EPYC-Genoa-v1'>
++    <decode host='on' guest='off'/>
++    <model name='EPYC-Genoa'/>
++  </model>
++</cpus>
+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 197efcbe59..e80e175376 100644
+--- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
+@@ -334,7 +334,7 @@
+         <feature name='xsaves'/>
+       </blockers>
+       <model usable='yes' vendor='AMD' canonical='EPYC-v1'>EPYC</model>
+-      <model usable='no' vendor='AMD'>EPYC-Genoa</model>
++      <model usable='no' vendor='AMD' canonical='EPYC-Genoa-v1'>EPYC-Genoa</model>
+       <blockers model='EPYC-Genoa'>
+         <feature name='amd-psfd'/>
+         <feature name='auto-ibrs'/>
+@@ -364,6 +364,36 @@
+         <feature name='vpclmulqdq'/>
+         <feature name='xsaves'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>EPYC-Genoa-v1</model>
++      <blockers model='EPYC-Genoa-v1'>
++        <feature name='amd-psfd'/>
++        <feature name='auto-ibrs'/>
++        <feature name='avx512-bf16'/>
++        <feature name='avx512-vpopcntdq'/>
++        <feature name='avx512bitalg'/>
++        <feature name='avx512bw'/>
++        <feature name='avx512cd'/>
++        <feature name='avx512dq'/>
++        <feature name='avx512f'/>
++        <feature name='avx512ifma'/>
++        <feature name='avx512vbmi'/>
++        <feature name='avx512vbmi2'/>
++        <feature name='avx512vl'/>
++        <feature name='avx512vnni'/>
++        <feature name='erms'/>
++        <feature name='fsrm'/>
++        <feature name='gfni'/>
++        <feature name='ibrs'/>
++        <feature name='invpcid'/>
++        <feature name='la57'/>
++        <feature name='no-nested-data-bp'/>
++        <feature name='pcid'/>
++        <feature name='pku'/>
++        <feature name='stibp-always-on'/>
++        <feature name='vaes'/>
++        <feature name='vpclmulqdq'/>
++        <feature name='xsaves'/>
++      </blockers>
+       <model usable='yes' vendor='AMD' canonical='EPYC-v2'>EPYC-IBPB</model>
+       <model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model>
+       <blockers model='EPYC-Milan'>
+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 07fdd0c3a3..62ffabb3e2 100644
+--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
+@@ -414,7 +414,7 @@
+         <feature name='topoext'/>
+         <feature name='xsavec'/>
+       </blockers>
+-      <model usable='no' vendor='AMD'>EPYC-Genoa</model>
++      <model usable='no' vendor='AMD' canonical='EPYC-Genoa-v1'>EPYC-Genoa</model>
+       <blockers model='EPYC-Genoa'>
+         <feature name='amd-psfd'/>
+         <feature name='amd-ssbd'/>
+@@ -454,6 +454,46 @@
+         <feature name='xsavec'/>
+         <feature name='xsaves'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>EPYC-Genoa-v1</model>
++      <blockers model='EPYC-Genoa-v1'>
++        <feature name='amd-psfd'/>
++        <feature name='amd-ssbd'/>
++        <feature name='amd-stibp'/>
++        <feature name='auto-ibrs'/>
++        <feature name='avx512-bf16'/>
++        <feature name='avx512-vpopcntdq'/>
++        <feature name='avx512bitalg'/>
++        <feature name='avx512bw'/>
++        <feature name='avx512cd'/>
++        <feature name='avx512dq'/>
++        <feature name='avx512f'/>
++        <feature name='avx512ifma'/>
++        <feature name='avx512vbmi'/>
++        <feature name='avx512vbmi2'/>
++        <feature name='avx512vl'/>
++        <feature name='avx512vnni'/>
++        <feature name='clzero'/>
++        <feature name='fxsr_opt'/>
++        <feature name='gfni'/>
++        <feature name='ibpb'/>
++        <feature name='ibrs'/>
++        <feature name='invpcid'/>
++        <feature name='lfence-always-serializing'/>
++        <feature name='misalignsse'/>
++        <feature name='no-nested-data-bp'/>
++        <feature name='nrip-save'/>
++        <feature name='null-sel-clr-base'/>
++        <feature name='osvw'/>
++        <feature name='pcid'/>
++        <feature name='perfctr_core'/>
++        <feature name='sha-ni'/>
++        <feature name='stibp-always-on'/>
++        <feature name='topoext'/>
++        <feature name='vnmi'/>
++        <feature name='vpclmulqdq'/>
++        <feature name='xsavec'/>
++        <feature name='xsaves'/>
++      </blockers>
+       <model usable='no' vendor='AMD' canonical='EPYC-v2'>EPYC-IBPB</model>
+       <blockers model='EPYC-IBPB'>
+         <feature name='fxsr_opt'/>
+diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
+index ec95c1a2ac..4117d926cb 100644
+--- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
+@@ -333,7 +333,7 @@
+         <feature name='xsaves'/>
+       </blockers>
+       <model usable='yes' vendor='AMD' canonical='EPYC-v1'>EPYC</model>
+-      <model usable='no' vendor='AMD'>EPYC-Genoa</model>
++      <model usable='no' vendor='AMD' canonical='EPYC-Genoa-v1'>EPYC-Genoa</model>
+       <blockers model='EPYC-Genoa'>
+         <feature name='amd-psfd'/>
+         <feature name='auto-ibrs'/>
+@@ -363,6 +363,36 @@
+         <feature name='vpclmulqdq'/>
+         <feature name='xsaves'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>EPYC-Genoa-v1</model>
++      <blockers model='EPYC-Genoa-v1'>
++        <feature name='amd-psfd'/>
++        <feature name='auto-ibrs'/>
++        <feature name='avx512-bf16'/>
++        <feature name='avx512-vpopcntdq'/>
++        <feature name='avx512bitalg'/>
++        <feature name='avx512bw'/>
++        <feature name='avx512cd'/>
++        <feature name='avx512dq'/>
++        <feature name='avx512f'/>
++        <feature name='avx512ifma'/>
++        <feature name='avx512vbmi'/>
++        <feature name='avx512vbmi2'/>
++        <feature name='avx512vl'/>
++        <feature name='avx512vnni'/>
++        <feature name='erms'/>
++        <feature name='fsrm'/>
++        <feature name='gfni'/>
++        <feature name='ibrs'/>
++        <feature name='invpcid'/>
++        <feature name='la57'/>
++        <feature name='no-nested-data-bp'/>
++        <feature name='pcid'/>
++        <feature name='pku'/>
++        <feature name='stibp-always-on'/>
++        <feature name='vaes'/>
++        <feature name='vpclmulqdq'/>
++        <feature name='xsaves'/>
++      </blockers>
+       <model usable='yes' vendor='AMD' canonical='EPYC-v2'>EPYC-IBPB</model>
+       <model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model>
+       <blockers model='EPYC-Milan'>
+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 d1d330df87..dfa88bcf96 100644
+--- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
+@@ -335,7 +335,7 @@
+         <feature name='xsaves'/>
+       </blockers>
+       <model usable='yes' vendor='AMD' canonical='EPYC-v1'>EPYC</model>
+-      <model usable='no' vendor='AMD'>EPYC-Genoa</model>
++      <model usable='no' vendor='AMD' canonical='EPYC-Genoa-v1'>EPYC-Genoa</model>
+       <blockers model='EPYC-Genoa'>
+         <feature name='amd-psfd'/>
+         <feature name='auto-ibrs'/>
+@@ -365,6 +365,36 @@
+         <feature name='vpclmulqdq'/>
+         <feature name='xsaves'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>EPYC-Genoa-v1</model>
++      <blockers model='EPYC-Genoa-v1'>
++        <feature name='amd-psfd'/>
++        <feature name='auto-ibrs'/>
++        <feature name='avx512-bf16'/>
++        <feature name='avx512-vpopcntdq'/>
++        <feature name='avx512bitalg'/>
++        <feature name='avx512bw'/>
++        <feature name='avx512cd'/>
++        <feature name='avx512dq'/>
++        <feature name='avx512f'/>
++        <feature name='avx512ifma'/>
++        <feature name='avx512vbmi'/>
++        <feature name='avx512vbmi2'/>
++        <feature name='avx512vl'/>
++        <feature name='avx512vnni'/>
++        <feature name='erms'/>
++        <feature name='fsrm'/>
++        <feature name='gfni'/>
++        <feature name='ibrs'/>
++        <feature name='invpcid'/>
++        <feature name='la57'/>
++        <feature name='no-nested-data-bp'/>
++        <feature name='pcid'/>
++        <feature name='pku'/>
++        <feature name='stibp-always-on'/>
++        <feature name='vaes'/>
++        <feature name='vpclmulqdq'/>
++        <feature name='xsaves'/>
++      </blockers>
+       <model usable='yes' vendor='AMD' canonical='EPYC-v2'>EPYC-IBPB</model>
+       <model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model>
+       <blockers model='EPYC-Milan'>
+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 75cb1b8f17..327cad253e 100644
+--- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
+@@ -408,7 +408,7 @@
+         <feature name='topoext'/>
+         <feature name='xsavec'/>
+       </blockers>
+-      <model usable='no' vendor='AMD'>EPYC-Genoa</model>
++      <model usable='no' vendor='AMD' canonical='EPYC-Genoa-v1'>EPYC-Genoa</model>
+       <blockers model='EPYC-Genoa'>
+         <feature name='amd-psfd'/>
+         <feature name='amd-ssbd'/>
+@@ -447,6 +447,45 @@
+         <feature name='xsavec'/>
+         <feature name='xsaves'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>EPYC-Genoa-v1</model>
++      <blockers model='EPYC-Genoa-v1'>
++        <feature name='amd-psfd'/>
++        <feature name='amd-ssbd'/>
++        <feature name='amd-stibp'/>
++        <feature name='auto-ibrs'/>
++        <feature name='avx512-bf16'/>
++        <feature name='avx512-vpopcntdq'/>
++        <feature name='avx512bitalg'/>
++        <feature name='avx512bw'/>
++        <feature name='avx512cd'/>
++        <feature name='avx512dq'/>
++        <feature name='avx512f'/>
++        <feature name='avx512ifma'/>
++        <feature name='avx512vbmi'/>
++        <feature name='avx512vbmi2'/>
++        <feature name='avx512vl'/>
++        <feature name='avx512vnni'/>
++        <feature name='clzero'/>
++        <feature name='fxsr_opt'/>
++        <feature name='gfni'/>
++        <feature name='ibpb'/>
++        <feature name='ibrs'/>
++        <feature name='invpcid'/>
++        <feature name='lfence-always-serializing'/>
++        <feature name='misalignsse'/>
++        <feature name='no-nested-data-bp'/>
++        <feature name='nrip-save'/>
++        <feature name='null-sel-clr-base'/>
++        <feature name='osvw'/>
++        <feature name='pcid'/>
++        <feature name='perfctr_core'/>
++        <feature name='stibp-always-on'/>
++        <feature name='topoext'/>
++        <feature name='vnmi'/>
++        <feature name='vpclmulqdq'/>
++        <feature name='xsavec'/>
++        <feature name='xsaves'/>
++      </blockers>
+       <model usable='no' vendor='AMD' canonical='EPYC-v2'>EPYC-IBPB</model>
+       <blockers model='EPYC-IBPB'>
+         <feature name='fxsr_opt'/>
+diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
+index 5f6e72e7ca..f8dbb717f1 100644
+--- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
+@@ -334,7 +334,7 @@
+         <feature name='xsaves'/>
+       </blockers>
+       <model usable='yes' vendor='AMD' canonical='EPYC-v1'>EPYC</model>
+-      <model usable='no' vendor='AMD'>EPYC-Genoa</model>
++      <model usable='no' vendor='AMD' canonical='EPYC-Genoa-v1'>EPYC-Genoa</model>
+       <blockers model='EPYC-Genoa'>
+         <feature name='amd-psfd'/>
+         <feature name='auto-ibrs'/>
+@@ -364,6 +364,36 @@
+         <feature name='vpclmulqdq'/>
+         <feature name='xsaves'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>EPYC-Genoa-v1</model>
++      <blockers model='EPYC-Genoa-v1'>
++        <feature name='amd-psfd'/>
++        <feature name='auto-ibrs'/>
++        <feature name='avx512-bf16'/>
++        <feature name='avx512-vpopcntdq'/>
++        <feature name='avx512bitalg'/>
++        <feature name='avx512bw'/>
++        <feature name='avx512cd'/>
++        <feature name='avx512dq'/>
++        <feature name='avx512f'/>
++        <feature name='avx512ifma'/>
++        <feature name='avx512vbmi'/>
++        <feature name='avx512vbmi2'/>
++        <feature name='avx512vl'/>
++        <feature name='avx512vnni'/>
++        <feature name='erms'/>
++        <feature name='fsrm'/>
++        <feature name='gfni'/>
++        <feature name='ibrs'/>
++        <feature name='invpcid'/>
++        <feature name='la57'/>
++        <feature name='no-nested-data-bp'/>
++        <feature name='pcid'/>
++        <feature name='pku'/>
++        <feature name='stibp-always-on'/>
++        <feature name='vaes'/>
++        <feature name='vpclmulqdq'/>
++        <feature name='xsaves'/>
++      </blockers>
+       <model usable='yes' vendor='AMD' canonical='EPYC-v2'>EPYC-IBPB</model>
+       <model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model>
+       <blockers model='EPYC-Milan'>
+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 3c005d0c10..c5a653f57b 100644
+--- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
+@@ -335,7 +335,7 @@
+         <feature name='xsaves'/>
+       </blockers>
+       <model usable='yes' vendor='AMD' canonical='EPYC-v1'>EPYC</model>
+-      <model usable='no' vendor='AMD'>EPYC-Genoa</model>
++      <model usable='no' vendor='AMD' canonical='EPYC-Genoa-v1'>EPYC-Genoa</model>
+       <blockers model='EPYC-Genoa'>
+         <feature name='amd-psfd'/>
+         <feature name='auto-ibrs'/>
+@@ -365,6 +365,36 @@
+         <feature name='vpclmulqdq'/>
+         <feature name='xsaves'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>EPYC-Genoa-v1</model>
++      <blockers model='EPYC-Genoa-v1'>
++        <feature name='amd-psfd'/>
++        <feature name='auto-ibrs'/>
++        <feature name='avx512-bf16'/>
++        <feature name='avx512-vpopcntdq'/>
++        <feature name='avx512bitalg'/>
++        <feature name='avx512bw'/>
++        <feature name='avx512cd'/>
++        <feature name='avx512dq'/>
++        <feature name='avx512f'/>
++        <feature name='avx512ifma'/>
++        <feature name='avx512vbmi'/>
++        <feature name='avx512vbmi2'/>
++        <feature name='avx512vl'/>
++        <feature name='avx512vnni'/>
++        <feature name='erms'/>
++        <feature name='fsrm'/>
++        <feature name='gfni'/>
++        <feature name='ibrs'/>
++        <feature name='invpcid'/>
++        <feature name='la57'/>
++        <feature name='no-nested-data-bp'/>
++        <feature name='pcid'/>
++        <feature name='pku'/>
++        <feature name='stibp-always-on'/>
++        <feature name='vaes'/>
++        <feature name='vpclmulqdq'/>
++        <feature name='xsaves'/>
++      </blockers>
+       <model usable='yes' vendor='AMD' canonical='EPYC-v2'>EPYC-IBPB</model>
+       <model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model>
+       <blockers model='EPYC-Milan'>
+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 3a6424eddf..30876c5fef 100644
+--- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
+@@ -388,7 +388,7 @@
+         <feature name='topoext'/>
+         <feature name='xsavec'/>
+       </blockers>
+-      <model usable='no' vendor='AMD'>EPYC-Genoa</model>
++      <model usable='no' vendor='AMD' canonical='EPYC-Genoa-v1'>EPYC-Genoa</model>
+       <blockers model='EPYC-Genoa'>
+         <feature name='amd-psfd'/>
+         <feature name='amd-ssbd'/>
+@@ -427,6 +427,45 @@
+         <feature name='xsavec'/>
+         <feature name='xsaves'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>EPYC-Genoa-v1</model>
++      <blockers model='EPYC-Genoa-v1'>
++        <feature name='amd-psfd'/>
++        <feature name='amd-ssbd'/>
++        <feature name='amd-stibp'/>
++        <feature name='auto-ibrs'/>
++        <feature name='avx512-bf16'/>
++        <feature name='avx512-vpopcntdq'/>
++        <feature name='avx512bitalg'/>
++        <feature name='avx512bw'/>
++        <feature name='avx512cd'/>
++        <feature name='avx512dq'/>
++        <feature name='avx512f'/>
++        <feature name='avx512ifma'/>
++        <feature name='avx512vbmi'/>
++        <feature name='avx512vbmi2'/>
++        <feature name='avx512vl'/>
++        <feature name='avx512vnni'/>
++        <feature name='clzero'/>
++        <feature name='fxsr_opt'/>
++        <feature name='gfni'/>
++        <feature name='ibpb'/>
++        <feature name='ibrs'/>
++        <feature name='invpcid'/>
++        <feature name='lfence-always-serializing'/>
++        <feature name='misalignsse'/>
++        <feature name='no-nested-data-bp'/>
++        <feature name='nrip-save'/>
++        <feature name='null-sel-clr-base'/>
++        <feature name='osvw'/>
++        <feature name='pcid'/>
++        <feature name='perfctr_core'/>
++        <feature name='stibp-always-on'/>
++        <feature name='topoext'/>
++        <feature name='vnmi'/>
++        <feature name='vpclmulqdq'/>
++        <feature name='xsavec'/>
++        <feature name='xsaves'/>
++      </blockers>
+       <model usable='no' vendor='AMD' canonical='EPYC-v2'>EPYC-IBPB</model>
+       <blockers model='EPYC-IBPB'>
+         <feature name='fxsr_opt'/>
+diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
+index 79c39678ca..6c141e1cb9 100644
+--- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
+@@ -334,7 +334,7 @@
+         <feature name='xsaves'/>
+       </blockers>
+       <model usable='yes' vendor='AMD' canonical='EPYC-v1'>EPYC</model>
+-      <model usable='no' vendor='AMD'>EPYC-Genoa</model>
++      <model usable='no' vendor='AMD' canonical='EPYC-Genoa-v1'>EPYC-Genoa</model>
+       <blockers model='EPYC-Genoa'>
+         <feature name='amd-psfd'/>
+         <feature name='auto-ibrs'/>
+@@ -364,6 +364,36 @@
+         <feature name='vpclmulqdq'/>
+         <feature name='xsaves'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>EPYC-Genoa-v1</model>
++      <blockers model='EPYC-Genoa-v1'>
++        <feature name='amd-psfd'/>
++        <feature name='auto-ibrs'/>
++        <feature name='avx512-bf16'/>
++        <feature name='avx512-vpopcntdq'/>
++        <feature name='avx512bitalg'/>
++        <feature name='avx512bw'/>
++        <feature name='avx512cd'/>
++        <feature name='avx512dq'/>
++        <feature name='avx512f'/>
++        <feature name='avx512ifma'/>
++        <feature name='avx512vbmi'/>
++        <feature name='avx512vbmi2'/>
++        <feature name='avx512vl'/>
++        <feature name='avx512vnni'/>
++        <feature name='erms'/>
++        <feature name='fsrm'/>
++        <feature name='gfni'/>
++        <feature name='ibrs'/>
++        <feature name='invpcid'/>
++        <feature name='la57'/>
++        <feature name='no-nested-data-bp'/>
++        <feature name='pcid'/>
++        <feature name='pku'/>
++        <feature name='stibp-always-on'/>
++        <feature name='vaes'/>
++        <feature name='vpclmulqdq'/>
++        <feature name='xsaves'/>
++      </blockers>
+       <model usable='yes' vendor='AMD' canonical='EPYC-v2'>EPYC-IBPB</model>
+       <model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model>
+       <blockers model='EPYC-Milan'>
+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 117947ef13..9445d999b5 100644
+--- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
+@@ -339,7 +339,7 @@
+         <feature name='xsaves'/>
+       </blockers>
+       <model usable='yes' vendor='AMD' canonical='EPYC-v1'>EPYC</model>
+-      <model usable='no' vendor='AMD'>EPYC-Genoa</model>
++      <model usable='no' vendor='AMD' canonical='EPYC-Genoa-v1'>EPYC-Genoa</model>
+       <blockers model='EPYC-Genoa'>
+         <feature name='amd-psfd'/>
+         <feature name='auto-ibrs'/>
+@@ -369,6 +369,36 @@
+         <feature name='vpclmulqdq'/>
+         <feature name='xsaves'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>EPYC-Genoa-v1</model>
++      <blockers model='EPYC-Genoa-v1'>
++        <feature name='amd-psfd'/>
++        <feature name='auto-ibrs'/>
++        <feature name='avx512-bf16'/>
++        <feature name='avx512-vpopcntdq'/>
++        <feature name='avx512bitalg'/>
++        <feature name='avx512bw'/>
++        <feature name='avx512cd'/>
++        <feature name='avx512dq'/>
++        <feature name='avx512f'/>
++        <feature name='avx512ifma'/>
++        <feature name='avx512vbmi'/>
++        <feature name='avx512vbmi2'/>
++        <feature name='avx512vl'/>
++        <feature name='avx512vnni'/>
++        <feature name='erms'/>
++        <feature name='fsrm'/>
++        <feature name='gfni'/>
++        <feature name='ibrs'/>
++        <feature name='invpcid'/>
++        <feature name='la57'/>
++        <feature name='no-nested-data-bp'/>
++        <feature name='pcid'/>
++        <feature name='pku'/>
++        <feature name='stibp-always-on'/>
++        <feature name='vaes'/>
++        <feature name='vpclmulqdq'/>
++        <feature name='xsaves'/>
++      </blockers>
+       <model usable='yes' vendor='AMD' canonical='EPYC-v2'>EPYC-IBPB</model>
+       <model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model>
+       <blockers model='EPYC-Milan'>
+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 c2c244f464..61d92550c1 100644
+--- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
+@@ -387,7 +387,7 @@
+         <feature name='topoext'/>
+         <feature name='xsavec'/>
+       </blockers>
+-      <model usable='no' vendor='AMD'>EPYC-Genoa</model>
++      <model usable='no' vendor='AMD' canonical='EPYC-Genoa-v1'>EPYC-Genoa</model>
+       <blockers model='EPYC-Genoa'>
+         <feature name='amd-psfd'/>
+         <feature name='amd-ssbd'/>
+@@ -426,6 +426,45 @@
+         <feature name='xsavec'/>
+         <feature name='xsaves'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>EPYC-Genoa-v1</model>
++      <blockers model='EPYC-Genoa-v1'>
++        <feature name='amd-psfd'/>
++        <feature name='amd-ssbd'/>
++        <feature name='amd-stibp'/>
++        <feature name='auto-ibrs'/>
++        <feature name='avx512-bf16'/>
++        <feature name='avx512-vpopcntdq'/>
++        <feature name='avx512bitalg'/>
++        <feature name='avx512bw'/>
++        <feature name='avx512cd'/>
++        <feature name='avx512dq'/>
++        <feature name='avx512f'/>
++        <feature name='avx512ifma'/>
++        <feature name='avx512vbmi'/>
++        <feature name='avx512vbmi2'/>
++        <feature name='avx512vl'/>
++        <feature name='avx512vnni'/>
++        <feature name='clzero'/>
++        <feature name='fxsr_opt'/>
++        <feature name='gfni'/>
++        <feature name='ibpb'/>
++        <feature name='ibrs'/>
++        <feature name='invpcid'/>
++        <feature name='lfence-always-serializing'/>
++        <feature name='misalignsse'/>
++        <feature name='no-nested-data-bp'/>
++        <feature name='nrip-save'/>
++        <feature name='null-sel-clr-base'/>
++        <feature name='osvw'/>
++        <feature name='pcid'/>
++        <feature name='perfctr_core'/>
++        <feature name='stibp-always-on'/>
++        <feature name='topoext'/>
++        <feature name='vnmi'/>
++        <feature name='vpclmulqdq'/>
++        <feature name='xsavec'/>
++        <feature name='xsaves'/>
++      </blockers>
+       <model usable='no' vendor='AMD' canonical='EPYC-v2'>EPYC-IBPB</model>
+       <blockers model='EPYC-IBPB'>
+         <feature name='fxsr_opt'/>
+diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
+index 30959cd723..5e87efe5e8 100644
+--- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
+@@ -338,7 +338,7 @@
+         <feature name='xsaves'/>
+       </blockers>
+       <model usable='yes' vendor='AMD' canonical='EPYC-v1'>EPYC</model>
+-      <model usable='no' vendor='AMD'>EPYC-Genoa</model>
++      <model usable='no' vendor='AMD' canonical='EPYC-Genoa-v1'>EPYC-Genoa</model>
+       <blockers model='EPYC-Genoa'>
+         <feature name='amd-psfd'/>
+         <feature name='auto-ibrs'/>
+@@ -368,6 +368,36 @@
+         <feature name='vpclmulqdq'/>
+         <feature name='xsaves'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>EPYC-Genoa-v1</model>
++      <blockers model='EPYC-Genoa-v1'>
++        <feature name='amd-psfd'/>
++        <feature name='auto-ibrs'/>
++        <feature name='avx512-bf16'/>
++        <feature name='avx512-vpopcntdq'/>
++        <feature name='avx512bitalg'/>
++        <feature name='avx512bw'/>
++        <feature name='avx512cd'/>
++        <feature name='avx512dq'/>
++        <feature name='avx512f'/>
++        <feature name='avx512ifma'/>
++        <feature name='avx512vbmi'/>
++        <feature name='avx512vbmi2'/>
++        <feature name='avx512vl'/>
++        <feature name='avx512vnni'/>
++        <feature name='erms'/>
++        <feature name='fsrm'/>
++        <feature name='gfni'/>
++        <feature name='ibrs'/>
++        <feature name='invpcid'/>
++        <feature name='la57'/>
++        <feature name='no-nested-data-bp'/>
++        <feature name='pcid'/>
++        <feature name='pku'/>
++        <feature name='stibp-always-on'/>
++        <feature name='vaes'/>
++        <feature name='vpclmulqdq'/>
++        <feature name='xsaves'/>
++      </blockers>
+       <model usable='yes' vendor='AMD' canonical='EPYC-v2'>EPYC-IBPB</model>
+       <model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model>
+       <blockers model='EPYC-Milan'>
+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 5fc9576495..99445e5f44 100644
+--- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
+@@ -339,7 +339,7 @@
+         <feature name='xsaves'/>
+       </blockers>
+       <model usable='yes' vendor='AMD' canonical='EPYC-v1'>EPYC</model>
+-      <model usable='no' vendor='AMD'>EPYC-Genoa</model>
++      <model usable='no' vendor='AMD' canonical='EPYC-Genoa-v1'>EPYC-Genoa</model>
+       <blockers model='EPYC-Genoa'>
+         <feature name='amd-psfd'/>
+         <feature name='auto-ibrs'/>
+@@ -369,6 +369,36 @@
+         <feature name='vpclmulqdq'/>
+         <feature name='xsaves'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>EPYC-Genoa-v1</model>
++      <blockers model='EPYC-Genoa-v1'>
++        <feature name='amd-psfd'/>
++        <feature name='auto-ibrs'/>
++        <feature name='avx512-bf16'/>
++        <feature name='avx512-vpopcntdq'/>
++        <feature name='avx512bitalg'/>
++        <feature name='avx512bw'/>
++        <feature name='avx512cd'/>
++        <feature name='avx512dq'/>
++        <feature name='avx512f'/>
++        <feature name='avx512ifma'/>
++        <feature name='avx512vbmi'/>
++        <feature name='avx512vbmi2'/>
++        <feature name='avx512vl'/>
++        <feature name='avx512vnni'/>
++        <feature name='erms'/>
++        <feature name='fsrm'/>
++        <feature name='gfni'/>
++        <feature name='ibrs'/>
++        <feature name='invpcid'/>
++        <feature name='la57'/>
++        <feature name='no-nested-data-bp'/>
++        <feature name='pcid'/>
++        <feature name='pku'/>
++        <feature name='stibp-always-on'/>
++        <feature name='vaes'/>
++        <feature name='vpclmulqdq'/>
++        <feature name='xsaves'/>
++      </blockers>
+       <model usable='yes' vendor='AMD' canonical='EPYC-v2'>EPYC-IBPB</model>
+       <model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model>
+       <blockers model='EPYC-Milan'>
+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 eeba43f9fa..8bf967c99f 100644
+--- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
+@@ -387,7 +387,7 @@
+         <feature name='topoext'/>
+         <feature name='xsavec'/>
+       </blockers>
+-      <model usable='no' vendor='AMD'>EPYC-Genoa</model>
++      <model usable='no' vendor='AMD' canonical='EPYC-Genoa-v1'>EPYC-Genoa</model>
+       <blockers model='EPYC-Genoa'>
+         <feature name='amd-psfd'/>
+         <feature name='amd-ssbd'/>
+@@ -426,6 +426,45 @@
+         <feature name='xsavec'/>
+         <feature name='xsaves'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>EPYC-Genoa-v1</model>
++      <blockers model='EPYC-Genoa-v1'>
++        <feature name='amd-psfd'/>
++        <feature name='amd-ssbd'/>
++        <feature name='amd-stibp'/>
++        <feature name='auto-ibrs'/>
++        <feature name='avx512-bf16'/>
++        <feature name='avx512-vpopcntdq'/>
++        <feature name='avx512bitalg'/>
++        <feature name='avx512bw'/>
++        <feature name='avx512cd'/>
++        <feature name='avx512dq'/>
++        <feature name='avx512f'/>
++        <feature name='avx512ifma'/>
++        <feature name='avx512vbmi'/>
++        <feature name='avx512vbmi2'/>
++        <feature name='avx512vl'/>
++        <feature name='avx512vnni'/>
++        <feature name='clzero'/>
++        <feature name='fxsr_opt'/>
++        <feature name='gfni'/>
++        <feature name='ibpb'/>
++        <feature name='ibrs'/>
++        <feature name='invpcid'/>
++        <feature name='lfence-always-serializing'/>
++        <feature name='misalignsse'/>
++        <feature name='no-nested-data-bp'/>
++        <feature name='nrip-save'/>
++        <feature name='null-sel-clr-base'/>
++        <feature name='osvw'/>
++        <feature name='pcid'/>
++        <feature name='perfctr_core'/>
++        <feature name='stibp-always-on'/>
++        <feature name='topoext'/>
++        <feature name='vnmi'/>
++        <feature name='vpclmulqdq'/>
++        <feature name='xsavec'/>
++        <feature name='xsaves'/>
++      </blockers>
+       <model usable='no' vendor='AMD' canonical='EPYC-v2'>EPYC-IBPB</model>
+       <blockers model='EPYC-IBPB'>
+         <feature name='fxsr_opt'/>
+diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
+index 96d789ee1c..40aa971144 100644
+--- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
+@@ -338,7 +338,7 @@
+         <feature name='xsaves'/>
+       </blockers>
+       <model usable='yes' vendor='AMD' canonical='EPYC-v1'>EPYC</model>
+-      <model usable='no' vendor='AMD'>EPYC-Genoa</model>
++      <model usable='no' vendor='AMD' canonical='EPYC-Genoa-v1'>EPYC-Genoa</model>
+       <blockers model='EPYC-Genoa'>
+         <feature name='amd-psfd'/>
+         <feature name='auto-ibrs'/>
+@@ -368,6 +368,36 @@
+         <feature name='vpclmulqdq'/>
+         <feature name='xsaves'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>EPYC-Genoa-v1</model>
++      <blockers model='EPYC-Genoa-v1'>
++        <feature name='amd-psfd'/>
++        <feature name='auto-ibrs'/>
++        <feature name='avx512-bf16'/>
++        <feature name='avx512-vpopcntdq'/>
++        <feature name='avx512bitalg'/>
++        <feature name='avx512bw'/>
++        <feature name='avx512cd'/>
++        <feature name='avx512dq'/>
++        <feature name='avx512f'/>
++        <feature name='avx512ifma'/>
++        <feature name='avx512vbmi'/>
++        <feature name='avx512vbmi2'/>
++        <feature name='avx512vl'/>
++        <feature name='avx512vnni'/>
++        <feature name='erms'/>
++        <feature name='fsrm'/>
++        <feature name='gfni'/>
++        <feature name='ibrs'/>
++        <feature name='invpcid'/>
++        <feature name='la57'/>
++        <feature name='no-nested-data-bp'/>
++        <feature name='pcid'/>
++        <feature name='pku'/>
++        <feature name='stibp-always-on'/>
++        <feature name='vaes'/>
++        <feature name='vpclmulqdq'/>
++        <feature name='xsaves'/>
++      </blockers>
+       <model usable='yes' vendor='AMD' canonical='EPYC-v2'>EPYC-IBPB</model>
+       <model usable='no' vendor='AMD' canonical='EPYC-Milan-v1'>EPYC-Milan</model>
+       <blockers model='EPYC-Milan'>
+-- 
+2.47.1
diff --git a/libvirt-cpu_map-Add-KnightsMill-v1-CPU-model.patch b/libvirt-cpu_map-Add-KnightsMill-v1-CPU-model.patch
new file mode 100644
index 0000000..813cd5b
--- /dev/null
+++ b/libvirt-cpu_map-Add-KnightsMill-v1-CPU-model.patch
@@ -0,0 +1,1417 @@
+From 73304bf841c7ab80031bd1db051a4b1fcb0f6b79 Mon Sep 17 00:00:00 2001
+Message-ID: <73304bf841c7ab80031bd1db051a4b1fcb0f6b79.1734429554.git.jdenemar@redhat.com>
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Thu, 5 Dec 2024 15:42:16 +0100
+Subject: [PATCH] cpu_map: Add KnightsMill-v1 CPU model
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit 8f5e36cbce655086009bc906d63adcd50ddf8925)
+
+https://issues.redhat.com/browse/RHEL-70129
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ src/cpu_map/index.xml                         |  1 +
+ src/cpu_map/meson.build                       |  1 +
+ src/cpu_map/x86_KnightsMill-v1.xml            |  6 ++++++
+ .../domaincapsdata/qemu_5.2.0-q35.x86_64.xml  | 14 ++++++++++++-
+ .../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml  | 20 ++++++++++++++++++-
+ tests/domaincapsdata/qemu_5.2.0.x86_64.xml    | 14 ++++++++++++-
+ .../domaincapsdata/qemu_6.0.0-q35.x86_64.xml  | 14 ++++++++++++-
+ .../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml  | 20 ++++++++++++++++++-
+ tests/domaincapsdata/qemu_6.0.0.x86_64.xml    | 14 ++++++++++++-
+ .../domaincapsdata/qemu_6.1.0-q35.x86_64.xml  | 14 ++++++++++++-
+ .../domaincapsdata/qemu_6.1.0-tcg.x86_64.xml  | 20 ++++++++++++++++++-
+ tests/domaincapsdata/qemu_6.1.0.x86_64.xml    | 14 ++++++++++++-
+ .../domaincapsdata/qemu_6.2.0-q35.x86_64.xml  | 14 ++++++++++++-
+ .../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml  | 20 ++++++++++++++++++-
+ tests/domaincapsdata/qemu_6.2.0.x86_64.xml    | 14 ++++++++++++-
+ .../domaincapsdata/qemu_7.0.0-q35.x86_64.xml  | 14 ++++++++++++-
+ .../domaincapsdata/qemu_7.0.0-tcg.x86_64.xml  | 20 ++++++++++++++++++-
+ tests/domaincapsdata/qemu_7.0.0.x86_64.xml    | 14 ++++++++++++-
+ .../domaincapsdata/qemu_7.1.0-q35.x86_64.xml  | 14 ++++++++++++-
+ .../domaincapsdata/qemu_7.1.0-tcg.x86_64.xml  | 20 ++++++++++++++++++-
+ tests/domaincapsdata/qemu_7.1.0.x86_64.xml    | 14 ++++++++++++-
+ .../domaincapsdata/qemu_7.2.0-q35.x86_64.xml  | 14 ++++++++++++-
+ .../qemu_7.2.0-tcg.x86_64+hvf.xml             | 16 ++++++++++++++-
+ .../domaincapsdata/qemu_7.2.0-tcg.x86_64.xml  | 16 ++++++++++++++-
+ tests/domaincapsdata/qemu_7.2.0.x86_64.xml    | 14 ++++++++++++-
+ .../domaincapsdata/qemu_8.0.0-q35.x86_64.xml  | 14 ++++++++++++-
+ .../domaincapsdata/qemu_8.0.0-tcg.x86_64.xml  | 16 ++++++++++++++-
+ tests/domaincapsdata/qemu_8.0.0.x86_64.xml    | 14 ++++++++++++-
+ .../domaincapsdata/qemu_8.1.0-q35.x86_64.xml  | 14 ++++++++++++-
+ .../domaincapsdata/qemu_8.1.0-tcg.x86_64.xml  | 14 ++++++++++++-
+ tests/domaincapsdata/qemu_8.1.0.x86_64.xml    | 14 ++++++++++++-
+ .../domaincapsdata/qemu_8.2.0-q35.x86_64.xml  | 14 ++++++++++++-
+ .../domaincapsdata/qemu_8.2.0-tcg.x86_64.xml  | 14 ++++++++++++-
+ tests/domaincapsdata/qemu_8.2.0.x86_64.xml    | 14 ++++++++++++-
+ .../domaincapsdata/qemu_9.0.0-q35.x86_64.xml  | 14 ++++++++++++-
+ .../domaincapsdata/qemu_9.0.0-tcg.x86_64.xml  | 13 +++++++++++-
+ tests/domaincapsdata/qemu_9.0.0.x86_64.xml    | 14 ++++++++++++-
+ .../domaincapsdata/qemu_9.1.0-q35.x86_64.xml  | 14 ++++++++++++-
+ .../domaincapsdata/qemu_9.1.0-tcg.x86_64.xml  | 13 +++++++++++-
+ tests/domaincapsdata/qemu_9.1.0.x86_64.xml    | 14 ++++++++++++-
+ .../domaincapsdata/qemu_9.2.0-q35.x86_64.xml  | 14 ++++++++++++-
+ .../domaincapsdata/qemu_9.2.0-tcg.x86_64.xml  | 13 +++++++++++-
+ tests/domaincapsdata/qemu_9.2.0.x86_64.xml    | 14 ++++++++++++-
+ 43 files changed, 567 insertions(+), 40 deletions(-)
+ create mode 100644 src/cpu_map/x86_KnightsMill-v1.xml
+
+diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml
+index 16ebe36539..a0aa677dee 100644
+--- a/src/cpu_map/index.xml
++++ b/src/cpu_map/index.xml
+@@ -128,6 +128,7 @@
+       <include filename='x86_Denverton-v2.xml'/>
+       <include filename='x86_Denverton-v3.xml'/>
+       <include filename='x86_KnightsMill.xml'/>
++      <include filename='x86_KnightsMill-v1.xml'/>
+     </group>
+ 
+     <group name='AMD CPU models'>
+diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build
+index 4d74431c55..70c7d2091b 100644
+--- a/src/cpu_map/meson.build
++++ b/src/cpu_map/meson.build
+@@ -99,6 +99,7 @@ cpumap_data = [
+   'x86_IvyBridge-v1.xml',
+   'x86_IvyBridge-v2.xml',
+   'x86_IvyBridge.xml',
++  'x86_KnightsMill-v1.xml',
+   'x86_KnightsMill.xml',
+   'x86_kvm32-v1.xml',
+   'x86_kvm32.xml',
+diff --git a/src/cpu_map/x86_KnightsMill-v1.xml b/src/cpu_map/x86_KnightsMill-v1.xml
+new file mode 100644
+index 0000000000..00293d05b8
+--- /dev/null
++++ b/src/cpu_map/x86_KnightsMill-v1.xml
+@@ -0,0 +1,6 @@
++<cpus>
++  <model name='KnightsMill-v1'>
++    <decode host='on' guest='off'/>
++    <model name='KnightsMill'/>
++  </model>
++</cpus>
+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 efd8f06104..43e1ca8861 100644
+--- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
+@@ -538,7 +538,7 @@
+         <feature name='erms'/>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>KnightsMill</model>
++      <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
+       <blockers model='KnightsMill'>
+         <feature name='avx512-4fmaps'/>
+         <feature name='avx512-4vnniw'/>
+@@ -550,6 +550,18 @@
+         <feature name='erms'/>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>KnightsMill-v1</model>
++      <blockers model='KnightsMill-v1'>
++        <feature name='avx512-4fmaps'/>
++        <feature name='avx512-4vnniw'/>
++        <feature name='avx512-vpopcntdq'/>
++        <feature name='avx512cd'/>
++        <feature name='avx512er'/>
++        <feature name='avx512f'/>
++        <feature name='avx512pf'/>
++        <feature name='erms'/>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
+       <model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
+       <blockers model='Nehalem-IBRS'>
+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 beb923a1f3..0718de04f7 100644
+--- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
+@@ -1021,7 +1021,7 @@
+         <feature name='tsc-deadline'/>
+         <feature name='x2apic'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>KnightsMill</model>
++      <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
+       <blockers model='KnightsMill'>
+         <feature name='3dnowprefetch'/>
+         <feature name='avx'/>
+@@ -1039,6 +1039,24 @@
+         <feature name='tsc-deadline'/>
+         <feature name='x2apic'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>KnightsMill-v1</model>
++      <blockers model='KnightsMill-v1'>
++        <feature name='3dnowprefetch'/>
++        <feature name='avx'/>
++        <feature name='avx2'/>
++        <feature name='avx512-4fmaps'/>
++        <feature name='avx512-4vnniw'/>
++        <feature name='avx512-vpopcntdq'/>
++        <feature name='avx512cd'/>
++        <feature name='avx512er'/>
++        <feature name='avx512f'/>
++        <feature name='avx512pf'/>
++        <feature name='f16c'/>
++        <feature name='fma'/>
++        <feature name='rdseed'/>
++        <feature name='tsc-deadline'/>
++        <feature name='x2apic'/>
++      </blockers>
+       <model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
+       <model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
+       <blockers model='Nehalem-IBRS'>
+diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
+index d9ae5568be..6eb78e68f0 100644
+--- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
+@@ -537,7 +537,7 @@
+         <feature name='erms'/>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>KnightsMill</model>
++      <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
+       <blockers model='KnightsMill'>
+         <feature name='avx512-4fmaps'/>
+         <feature name='avx512-4vnniw'/>
+@@ -549,6 +549,18 @@
+         <feature name='erms'/>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>KnightsMill-v1</model>
++      <blockers model='KnightsMill-v1'>
++        <feature name='avx512-4fmaps'/>
++        <feature name='avx512-4vnniw'/>
++        <feature name='avx512-vpopcntdq'/>
++        <feature name='avx512cd'/>
++        <feature name='avx512er'/>
++        <feature name='avx512f'/>
++        <feature name='avx512pf'/>
++        <feature name='erms'/>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
+       <model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
+       <blockers model='Nehalem-IBRS'>
+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 403b9f6674..3b716faf00 100644
+--- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
+@@ -560,7 +560,7 @@
+         <feature name='erms'/>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>KnightsMill</model>
++      <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
+       <blockers model='KnightsMill'>
+         <feature name='avx512-4fmaps'/>
+         <feature name='avx512-4vnniw'/>
+@@ -572,6 +572,18 @@
+         <feature name='erms'/>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>KnightsMill-v1</model>
++      <blockers model='KnightsMill-v1'>
++        <feature name='avx512-4fmaps'/>
++        <feature name='avx512-4vnniw'/>
++        <feature name='avx512-vpopcntdq'/>
++        <feature name='avx512cd'/>
++        <feature name='avx512er'/>
++        <feature name='avx512f'/>
++        <feature name='avx512pf'/>
++        <feature name='erms'/>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
+       <model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
+       <blockers model='Nehalem-IBRS'>
+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 f2ad35c6cd..bd8c0a086c 100644
+--- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
+@@ -1111,7 +1111,7 @@
+         <feature name='tsc-deadline'/>
+         <feature name='x2apic'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>KnightsMill</model>
++      <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
+       <blockers model='KnightsMill'>
+         <feature name='3dnowprefetch'/>
+         <feature name='avx'/>
+@@ -1129,6 +1129,24 @@
+         <feature name='tsc-deadline'/>
+         <feature name='x2apic'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>KnightsMill-v1</model>
++      <blockers model='KnightsMill-v1'>
++        <feature name='3dnowprefetch'/>
++        <feature name='avx'/>
++        <feature name='avx2'/>
++        <feature name='avx512-4fmaps'/>
++        <feature name='avx512-4vnniw'/>
++        <feature name='avx512-vpopcntdq'/>
++        <feature name='avx512cd'/>
++        <feature name='avx512er'/>
++        <feature name='avx512f'/>
++        <feature name='avx512pf'/>
++        <feature name='f16c'/>
++        <feature name='fma'/>
++        <feature name='rdseed'/>
++        <feature name='tsc-deadline'/>
++        <feature name='x2apic'/>
++      </blockers>
+       <model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
+       <model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
+       <blockers model='Nehalem-IBRS'>
+diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
+index 07570f5b02..b6ec55cf0c 100644
+--- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
+@@ -559,7 +559,7 @@
+         <feature name='erms'/>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>KnightsMill</model>
++      <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
+       <blockers model='KnightsMill'>
+         <feature name='avx512-4fmaps'/>
+         <feature name='avx512-4vnniw'/>
+@@ -571,6 +571,18 @@
+         <feature name='erms'/>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>KnightsMill-v1</model>
++      <blockers model='KnightsMill-v1'>
++        <feature name='avx512-4fmaps'/>
++        <feature name='avx512-4vnniw'/>
++        <feature name='avx512-vpopcntdq'/>
++        <feature name='avx512cd'/>
++        <feature name='avx512er'/>
++        <feature name='avx512f'/>
++        <feature name='avx512pf'/>
++        <feature name='erms'/>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
+       <model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
+       <blockers model='Nehalem-IBRS'>
+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 4cf841b3e9..e6615316f7 100644
+--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
+@@ -630,7 +630,7 @@
+         <feature name='erms'/>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>KnightsMill</model>
++      <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
+       <blockers model='KnightsMill'>
+         <feature name='avx512-4fmaps'/>
+         <feature name='avx512-4vnniw'/>
+@@ -642,6 +642,18 @@
+         <feature name='erms'/>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>KnightsMill-v1</model>
++      <blockers model='KnightsMill-v1'>
++        <feature name='avx512-4fmaps'/>
++        <feature name='avx512-4vnniw'/>
++        <feature name='avx512-vpopcntdq'/>
++        <feature name='avx512cd'/>
++        <feature name='avx512er'/>
++        <feature name='avx512f'/>
++        <feature name='avx512pf'/>
++        <feature name='erms'/>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
+       <model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
+       <blockers model='Nehalem-IBRS'>
+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 bbb9cfff7f..50d6395d7f 100644
+--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
+@@ -1251,7 +1251,7 @@
+         <feature name='tsc-deadline'/>
+         <feature name='x2apic'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>KnightsMill</model>
++      <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
+       <blockers model='KnightsMill'>
+         <feature name='3dnowprefetch'/>
+         <feature name='avx'/>
+@@ -1269,6 +1269,24 @@
+         <feature name='tsc-deadline'/>
+         <feature name='x2apic'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>KnightsMill-v1</model>
++      <blockers model='KnightsMill-v1'>
++        <feature name='3dnowprefetch'/>
++        <feature name='avx'/>
++        <feature name='avx2'/>
++        <feature name='avx512-4fmaps'/>
++        <feature name='avx512-4vnniw'/>
++        <feature name='avx512-vpopcntdq'/>
++        <feature name='avx512cd'/>
++        <feature name='avx512er'/>
++        <feature name='avx512f'/>
++        <feature name='avx512pf'/>
++        <feature name='f16c'/>
++        <feature name='fma'/>
++        <feature name='rdseed'/>
++        <feature name='tsc-deadline'/>
++        <feature name='x2apic'/>
++      </blockers>
+       <model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
+       <model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
+       <blockers model='Nehalem-IBRS'>
+diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
+index 0c615f1802..974346f980 100644
+--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
+@@ -629,7 +629,7 @@
+         <feature name='erms'/>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>KnightsMill</model>
++      <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
+       <blockers model='KnightsMill'>
+         <feature name='avx512-4fmaps'/>
+         <feature name='avx512-4vnniw'/>
+@@ -641,6 +641,18 @@
+         <feature name='erms'/>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>KnightsMill-v1</model>
++      <blockers model='KnightsMill-v1'>
++        <feature name='avx512-4fmaps'/>
++        <feature name='avx512-4vnniw'/>
++        <feature name='avx512-vpopcntdq'/>
++        <feature name='avx512cd'/>
++        <feature name='avx512er'/>
++        <feature name='avx512f'/>
++        <feature name='avx512pf'/>
++        <feature name='erms'/>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
+       <model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
+       <blockers model='Nehalem-IBRS'>
+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 e468a90911..812ebd5e0a 100644
+--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
+@@ -627,7 +627,7 @@
+         <feature name='erms'/>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>KnightsMill</model>
++      <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
+       <blockers model='KnightsMill'>
+         <feature name='avx512-4fmaps'/>
+         <feature name='avx512-4vnniw'/>
+@@ -639,6 +639,18 @@
+         <feature name='erms'/>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>KnightsMill-v1</model>
++      <blockers model='KnightsMill-v1'>
++        <feature name='avx512-4fmaps'/>
++        <feature name='avx512-4vnniw'/>
++        <feature name='avx512-vpopcntdq'/>
++        <feature name='avx512cd'/>
++        <feature name='avx512er'/>
++        <feature name='avx512f'/>
++        <feature name='avx512pf'/>
++        <feature name='erms'/>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
+       <model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
+       <blockers model='Nehalem-IBRS'>
+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 b46a515864..24f22dd53f 100644
+--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
+@@ -1248,7 +1248,7 @@
+         <feature name='tsc-deadline'/>
+         <feature name='x2apic'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>KnightsMill</model>
++      <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
+       <blockers model='KnightsMill'>
+         <feature name='3dnowprefetch'/>
+         <feature name='avx'/>
+@@ -1266,6 +1266,24 @@
+         <feature name='tsc-deadline'/>
+         <feature name='x2apic'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>KnightsMill-v1</model>
++      <blockers model='KnightsMill-v1'>
++        <feature name='3dnowprefetch'/>
++        <feature name='avx'/>
++        <feature name='avx2'/>
++        <feature name='avx512-4fmaps'/>
++        <feature name='avx512-4vnniw'/>
++        <feature name='avx512-vpopcntdq'/>
++        <feature name='avx512cd'/>
++        <feature name='avx512er'/>
++        <feature name='avx512f'/>
++        <feature name='avx512pf'/>
++        <feature name='f16c'/>
++        <feature name='fma'/>
++        <feature name='rdseed'/>
++        <feature name='tsc-deadline'/>
++        <feature name='x2apic'/>
++      </blockers>
+       <model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
+       <model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
+       <blockers model='Nehalem-IBRS'>
+diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+index d06e67a5e2..9af219d59d 100644
+--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+@@ -626,7 +626,7 @@
+         <feature name='erms'/>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>KnightsMill</model>
++      <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
+       <blockers model='KnightsMill'>
+         <feature name='avx512-4fmaps'/>
+         <feature name='avx512-4vnniw'/>
+@@ -638,6 +638,18 @@
+         <feature name='erms'/>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>KnightsMill-v1</model>
++      <blockers model='KnightsMill-v1'>
++        <feature name='avx512-4fmaps'/>
++        <feature name='avx512-4vnniw'/>
++        <feature name='avx512-vpopcntdq'/>
++        <feature name='avx512cd'/>
++        <feature name='avx512er'/>
++        <feature name='avx512f'/>
++        <feature name='avx512pf'/>
++        <feature name='erms'/>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
+       <model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
+       <blockers model='Nehalem-IBRS'>
+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 a0c47fd84e..439f609233 100644
+--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
+@@ -654,7 +654,7 @@
+         <feature name='erms'/>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>KnightsMill</model>
++      <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
+       <blockers model='KnightsMill'>
+         <feature name='avx512-4fmaps'/>
+         <feature name='avx512-4vnniw'/>
+@@ -666,6 +666,18 @@
+         <feature name='erms'/>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>KnightsMill-v1</model>
++      <blockers model='KnightsMill-v1'>
++        <feature name='avx512-4fmaps'/>
++        <feature name='avx512-4vnniw'/>
++        <feature name='avx512-vpopcntdq'/>
++        <feature name='avx512cd'/>
++        <feature name='avx512er'/>
++        <feature name='avx512f'/>
++        <feature name='avx512pf'/>
++        <feature name='erms'/>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
+       <model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
+       <blockers model='Nehalem-IBRS'>
+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 db68047af7..53c114699c 100644
+--- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
+@@ -1277,7 +1277,7 @@
+         <feature name='tsc-deadline'/>
+         <feature name='x2apic'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>KnightsMill</model>
++      <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
+       <blockers model='KnightsMill'>
+         <feature name='3dnowprefetch'/>
+         <feature name='avx'/>
+@@ -1295,6 +1295,24 @@
+         <feature name='tsc-deadline'/>
+         <feature name='x2apic'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>KnightsMill-v1</model>
++      <blockers model='KnightsMill-v1'>
++        <feature name='3dnowprefetch'/>
++        <feature name='avx'/>
++        <feature name='avx2'/>
++        <feature name='avx512-4fmaps'/>
++        <feature name='avx512-4vnniw'/>
++        <feature name='avx512-vpopcntdq'/>
++        <feature name='avx512cd'/>
++        <feature name='avx512er'/>
++        <feature name='avx512f'/>
++        <feature name='avx512pf'/>
++        <feature name='f16c'/>
++        <feature name='fma'/>
++        <feature name='rdseed'/>
++        <feature name='tsc-deadline'/>
++        <feature name='x2apic'/>
++      </blockers>
+       <model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
+       <model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
+       <blockers model='Nehalem-IBRS'>
+diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+index 71999ab677..6d91c4ac75 100644
+--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+@@ -653,7 +653,7 @@
+         <feature name='erms'/>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>KnightsMill</model>
++      <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
+       <blockers model='KnightsMill'>
+         <feature name='avx512-4fmaps'/>
+         <feature name='avx512-4vnniw'/>
+@@ -665,6 +665,18 @@
+         <feature name='erms'/>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>KnightsMill-v1</model>
++      <blockers model='KnightsMill-v1'>
++        <feature name='avx512-4fmaps'/>
++        <feature name='avx512-4vnniw'/>
++        <feature name='avx512-vpopcntdq'/>
++        <feature name='avx512cd'/>
++        <feature name='avx512er'/>
++        <feature name='avx512f'/>
++        <feature name='avx512pf'/>
++        <feature name='erms'/>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
+       <model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
+       <blockers model='Nehalem-IBRS'>
+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 3a2874f08a..d61b339dd9 100644
+--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
+@@ -621,7 +621,7 @@
+         <feature name='erms'/>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>KnightsMill</model>
++      <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
+       <blockers model='KnightsMill'>
+         <feature name='avx512-4fmaps'/>
+         <feature name='avx512-4vnniw'/>
+@@ -633,6 +633,18 @@
+         <feature name='erms'/>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>KnightsMill-v1</model>
++      <blockers model='KnightsMill-v1'>
++        <feature name='avx512-4fmaps'/>
++        <feature name='avx512-4vnniw'/>
++        <feature name='avx512-vpopcntdq'/>
++        <feature name='avx512cd'/>
++        <feature name='avx512er'/>
++        <feature name='avx512f'/>
++        <feature name='avx512pf'/>
++        <feature name='erms'/>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
+       <model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
+       <blockers model='Nehalem-IBRS'>
+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 2416987852..a758fbabc5 100644
+--- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
+@@ -1225,7 +1225,7 @@
+         <feature name='tsc-deadline'/>
+         <feature name='x2apic'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>KnightsMill</model>
++      <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
+       <blockers model='KnightsMill'>
+         <feature name='3dnowprefetch'/>
+         <feature name='avx'/>
+@@ -1243,6 +1243,24 @@
+         <feature name='tsc-deadline'/>
+         <feature name='x2apic'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>KnightsMill-v1</model>
++      <blockers model='KnightsMill-v1'>
++        <feature name='3dnowprefetch'/>
++        <feature name='avx'/>
++        <feature name='avx2'/>
++        <feature name='avx512-4fmaps'/>
++        <feature name='avx512-4vnniw'/>
++        <feature name='avx512-vpopcntdq'/>
++        <feature name='avx512cd'/>
++        <feature name='avx512er'/>
++        <feature name='avx512f'/>
++        <feature name='avx512pf'/>
++        <feature name='f16c'/>
++        <feature name='fma'/>
++        <feature name='rdseed'/>
++        <feature name='tsc-deadline'/>
++        <feature name='x2apic'/>
++      </blockers>
+       <model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
+       <model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
+       <blockers model='Nehalem-IBRS'>
+diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
+index eda271a1b2..48e8299c23 100644
+--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
+@@ -620,7 +620,7 @@
+         <feature name='erms'/>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>KnightsMill</model>
++      <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
+       <blockers model='KnightsMill'>
+         <feature name='avx512-4fmaps'/>
+         <feature name='avx512-4vnniw'/>
+@@ -632,6 +632,18 @@
+         <feature name='erms'/>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>KnightsMill-v1</model>
++      <blockers model='KnightsMill-v1'>
++        <feature name='avx512-4fmaps'/>
++        <feature name='avx512-4vnniw'/>
++        <feature name='avx512-vpopcntdq'/>
++        <feature name='avx512cd'/>
++        <feature name='avx512er'/>
++        <feature name='avx512f'/>
++        <feature name='avx512pf'/>
++        <feature name='erms'/>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
+       <model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
+       <blockers model='Nehalem-IBRS'>
+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 2b5cfdae87..6a15994158 100644
+--- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
+@@ -626,7 +626,7 @@
+         <feature name='erms'/>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>KnightsMill</model>
++      <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
+       <blockers model='KnightsMill'>
+         <feature name='avx512-4fmaps'/>
+         <feature name='avx512-4vnniw'/>
+@@ -638,6 +638,18 @@
+         <feature name='erms'/>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>KnightsMill-v1</model>
++      <blockers model='KnightsMill-v1'>
++        <feature name='avx512-4fmaps'/>
++        <feature name='avx512-4vnniw'/>
++        <feature name='avx512-vpopcntdq'/>
++        <feature name='avx512cd'/>
++        <feature name='avx512er'/>
++        <feature name='avx512f'/>
++        <feature name='avx512pf'/>
++        <feature name='erms'/>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
+       <model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
+       <blockers model='Nehalem-IBRS'>
+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 6a191f3ce8..4d0def8fc7 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
+@@ -1010,7 +1010,7 @@
+         <feature name='tsc-deadline'/>
+         <feature name='x2apic'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>KnightsMill</model>
++      <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
+       <blockers model='KnightsMill'>
+         <feature name='3dnowprefetch'/>
+         <feature name='avx512-4fmaps'/>
+@@ -1024,6 +1024,20 @@
+         <feature name='tsc-deadline'/>
+         <feature name='x2apic'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>KnightsMill-v1</model>
++      <blockers model='KnightsMill-v1'>
++        <feature name='3dnowprefetch'/>
++        <feature name='avx512-4fmaps'/>
++        <feature name='avx512-4vnniw'/>
++        <feature name='avx512-vpopcntdq'/>
++        <feature name='avx512cd'/>
++        <feature name='avx512er'/>
++        <feature name='avx512f'/>
++        <feature name='avx512pf'/>
++        <feature name='rdseed'/>
++        <feature name='tsc-deadline'/>
++        <feature name='x2apic'/>
++      </blockers>
+       <model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
+       <model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
+       <blockers model='Nehalem-IBRS'>
+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 6a191f3ce8..4d0def8fc7 100644
+--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
+@@ -1010,7 +1010,7 @@
+         <feature name='tsc-deadline'/>
+         <feature name='x2apic'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>KnightsMill</model>
++      <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
+       <blockers model='KnightsMill'>
+         <feature name='3dnowprefetch'/>
+         <feature name='avx512-4fmaps'/>
+@@ -1024,6 +1024,20 @@
+         <feature name='tsc-deadline'/>
+         <feature name='x2apic'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>KnightsMill-v1</model>
++      <blockers model='KnightsMill-v1'>
++        <feature name='3dnowprefetch'/>
++        <feature name='avx512-4fmaps'/>
++        <feature name='avx512-4vnniw'/>
++        <feature name='avx512-vpopcntdq'/>
++        <feature name='avx512cd'/>
++        <feature name='avx512er'/>
++        <feature name='avx512f'/>
++        <feature name='avx512pf'/>
++        <feature name='rdseed'/>
++        <feature name='tsc-deadline'/>
++        <feature name='x2apic'/>
++      </blockers>
+       <model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
+       <model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
+       <blockers model='Nehalem-IBRS'>
+diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
+index 48b4ced22f..ead8df9815 100644
+--- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
+@@ -625,7 +625,7 @@
+         <feature name='erms'/>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>KnightsMill</model>
++      <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
+       <blockers model='KnightsMill'>
+         <feature name='avx512-4fmaps'/>
+         <feature name='avx512-4vnniw'/>
+@@ -637,6 +637,18 @@
+         <feature name='erms'/>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>KnightsMill-v1</model>
++      <blockers model='KnightsMill-v1'>
++        <feature name='avx512-4fmaps'/>
++        <feature name='avx512-4vnniw'/>
++        <feature name='avx512-vpopcntdq'/>
++        <feature name='avx512cd'/>
++        <feature name='avx512er'/>
++        <feature name='avx512f'/>
++        <feature name='avx512pf'/>
++        <feature name='erms'/>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
+       <model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
+       <blockers model='Nehalem-IBRS'>
+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 ec1fea19fc..1936c89c70 100644
+--- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
+@@ -626,7 +626,7 @@
+         <feature name='erms'/>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>KnightsMill</model>
++      <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
+       <blockers model='KnightsMill'>
+         <feature name='avx512-4fmaps'/>
+         <feature name='avx512-4vnniw'/>
+@@ -638,6 +638,18 @@
+         <feature name='erms'/>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>KnightsMill-v1</model>
++      <blockers model='KnightsMill-v1'>
++        <feature name='avx512-4fmaps'/>
++        <feature name='avx512-4vnniw'/>
++        <feature name='avx512-vpopcntdq'/>
++        <feature name='avx512cd'/>
++        <feature name='avx512er'/>
++        <feature name='avx512f'/>
++        <feature name='avx512pf'/>
++        <feature name='erms'/>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
+       <model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
+       <blockers model='Nehalem-IBRS'>
+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 049bef7aa6..d72b0c93d3 100644
+--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
+@@ -1009,7 +1009,7 @@
+         <feature name='tsc-deadline'/>
+         <feature name='x2apic'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>KnightsMill</model>
++      <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
+       <blockers model='KnightsMill'>
+         <feature name='3dnowprefetch'/>
+         <feature name='avx512-4fmaps'/>
+@@ -1023,6 +1023,20 @@
+         <feature name='tsc-deadline'/>
+         <feature name='x2apic'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>KnightsMill-v1</model>
++      <blockers model='KnightsMill-v1'>
++        <feature name='3dnowprefetch'/>
++        <feature name='avx512-4fmaps'/>
++        <feature name='avx512-4vnniw'/>
++        <feature name='avx512-vpopcntdq'/>
++        <feature name='avx512cd'/>
++        <feature name='avx512er'/>
++        <feature name='avx512f'/>
++        <feature name='avx512pf'/>
++        <feature name='rdseed'/>
++        <feature name='tsc-deadline'/>
++        <feature name='x2apic'/>
++      </blockers>
+       <model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
+       <model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
+       <blockers model='Nehalem-IBRS'>
+diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
+index 206a3a86a2..4adb6402ae 100644
+--- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
+@@ -625,7 +625,7 @@
+         <feature name='erms'/>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>KnightsMill</model>
++      <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
+       <blockers model='KnightsMill'>
+         <feature name='avx512-4fmaps'/>
+         <feature name='avx512-4vnniw'/>
+@@ -637,6 +637,18 @@
+         <feature name='erms'/>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>KnightsMill-v1</model>
++      <blockers model='KnightsMill-v1'>
++        <feature name='avx512-4fmaps'/>
++        <feature name='avx512-4vnniw'/>
++        <feature name='avx512-vpopcntdq'/>
++        <feature name='avx512cd'/>
++        <feature name='avx512er'/>
++        <feature name='avx512f'/>
++        <feature name='avx512pf'/>
++        <feature name='erms'/>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
+       <model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
+       <blockers model='Nehalem-IBRS'>
+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 34fbc59118..c9f53064ff 100644
+--- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
+@@ -804,7 +804,7 @@
+         <feature name='erms'/>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>KnightsMill</model>
++      <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
+       <blockers model='KnightsMill'>
+         <feature name='avx512-4fmaps'/>
+         <feature name='avx512-4vnniw'/>
+@@ -816,6 +816,18 @@
+         <feature name='erms'/>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>KnightsMill-v1</model>
++      <blockers model='KnightsMill-v1'>
++        <feature name='avx512-4fmaps'/>
++        <feature name='avx512-4vnniw'/>
++        <feature name='avx512-vpopcntdq'/>
++        <feature name='avx512cd'/>
++        <feature name='avx512er'/>
++        <feature name='avx512f'/>
++        <feature name='avx512pf'/>
++        <feature name='erms'/>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
+       <model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
+       <blockers model='Nehalem-IBRS'>
+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 2a836cbc21..b2e2c3264b 100644
+--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
+@@ -1021,7 +1021,7 @@
+         <feature name='tsc-deadline'/>
+         <feature name='x2apic'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>KnightsMill</model>
++      <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
+       <blockers model='KnightsMill'>
+         <feature name='avx512-4fmaps'/>
+         <feature name='avx512-4vnniw'/>
+@@ -1033,6 +1033,18 @@
+         <feature name='tsc-deadline'/>
+         <feature name='x2apic'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>KnightsMill-v1</model>
++      <blockers model='KnightsMill-v1'>
++        <feature name='avx512-4fmaps'/>
++        <feature name='avx512-4vnniw'/>
++        <feature name='avx512-vpopcntdq'/>
++        <feature name='avx512cd'/>
++        <feature name='avx512er'/>
++        <feature name='avx512f'/>
++        <feature name='avx512pf'/>
++        <feature name='tsc-deadline'/>
++        <feature name='x2apic'/>
++      </blockers>
+       <model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
+       <model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
+       <blockers model='Nehalem-IBRS'>
+diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
+index 3380b8a9aa..c630356571 100644
+--- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
+@@ -803,7 +803,7 @@
+         <feature name='erms'/>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>KnightsMill</model>
++      <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
+       <blockers model='KnightsMill'>
+         <feature name='avx512-4fmaps'/>
+         <feature name='avx512-4vnniw'/>
+@@ -815,6 +815,18 @@
+         <feature name='erms'/>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>KnightsMill-v1</model>
++      <blockers model='KnightsMill-v1'>
++        <feature name='avx512-4fmaps'/>
++        <feature name='avx512-4vnniw'/>
++        <feature name='avx512-vpopcntdq'/>
++        <feature name='avx512cd'/>
++        <feature name='avx512er'/>
++        <feature name='avx512f'/>
++        <feature name='avx512pf'/>
++        <feature name='erms'/>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
+       <model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
+       <blockers model='Nehalem-IBRS'>
+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 0ec9ebeafe..17f4f6c4f0 100644
+--- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
+@@ -805,7 +805,7 @@
+         <feature name='erms'/>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>KnightsMill</model>
++      <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
+       <blockers model='KnightsMill'>
+         <feature name='avx512-4fmaps'/>
+         <feature name='avx512-4vnniw'/>
+@@ -817,6 +817,18 @@
+         <feature name='erms'/>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>KnightsMill-v1</model>
++      <blockers model='KnightsMill-v1'>
++        <feature name='avx512-4fmaps'/>
++        <feature name='avx512-4vnniw'/>
++        <feature name='avx512-vpopcntdq'/>
++        <feature name='avx512cd'/>
++        <feature name='avx512er'/>
++        <feature name='avx512f'/>
++        <feature name='avx512pf'/>
++        <feature name='erms'/>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
+       <model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
+       <blockers model='Nehalem-IBRS'>
+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 b3fd8eb6c6..3ea2911762 100644
+--- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
+@@ -996,7 +996,7 @@
+         <feature name='tsc-deadline'/>
+         <feature name='x2apic'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>KnightsMill</model>
++      <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
+       <blockers model='KnightsMill'>
+         <feature name='avx512-4fmaps'/>
+         <feature name='avx512-4vnniw'/>
+@@ -1008,6 +1008,18 @@
+         <feature name='tsc-deadline'/>
+         <feature name='x2apic'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>KnightsMill-v1</model>
++      <blockers model='KnightsMill-v1'>
++        <feature name='avx512-4fmaps'/>
++        <feature name='avx512-4vnniw'/>
++        <feature name='avx512-vpopcntdq'/>
++        <feature name='avx512cd'/>
++        <feature name='avx512er'/>
++        <feature name='avx512f'/>
++        <feature name='avx512pf'/>
++        <feature name='tsc-deadline'/>
++        <feature name='x2apic'/>
++      </blockers>
+       <model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
+       <model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
+       <blockers model='Nehalem-IBRS'>
+diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
+index 210024bc44..77286e9aef 100644
+--- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
+@@ -804,7 +804,7 @@
+         <feature name='erms'/>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>KnightsMill</model>
++      <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
+       <blockers model='KnightsMill'>
+         <feature name='avx512-4fmaps'/>
+         <feature name='avx512-4vnniw'/>
+@@ -816,6 +816,18 @@
+         <feature name='erms'/>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>KnightsMill-v1</model>
++      <blockers model='KnightsMill-v1'>
++        <feature name='avx512-4fmaps'/>
++        <feature name='avx512-4vnniw'/>
++        <feature name='avx512-vpopcntdq'/>
++        <feature name='avx512cd'/>
++        <feature name='avx512er'/>
++        <feature name='avx512f'/>
++        <feature name='avx512pf'/>
++        <feature name='erms'/>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
+       <model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
+       <blockers model='Nehalem-IBRS'>
+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 2aade71dae..d304fbd62b 100644
+--- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
+@@ -805,7 +805,7 @@
+         <feature name='erms'/>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>KnightsMill</model>
++      <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
+       <blockers model='KnightsMill'>
+         <feature name='avx512-4fmaps'/>
+         <feature name='avx512-4vnniw'/>
+@@ -817,6 +817,18 @@
+         <feature name='erms'/>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>KnightsMill-v1</model>
++      <blockers model='KnightsMill-v1'>
++        <feature name='avx512-4fmaps'/>
++        <feature name='avx512-4vnniw'/>
++        <feature name='avx512-vpopcntdq'/>
++        <feature name='avx512cd'/>
++        <feature name='avx512er'/>
++        <feature name='avx512f'/>
++        <feature name='avx512pf'/>
++        <feature name='erms'/>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
+       <model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
+       <blockers model='Nehalem-IBRS'>
+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 36cec1ee6b..3e6cc25529 100644
+--- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
+@@ -954,7 +954,7 @@
+         <feature name='spec-ctrl'/>
+         <feature name='tsc-deadline'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>KnightsMill</model>
++      <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
+       <blockers model='KnightsMill'>
+         <feature name='avx512-4fmaps'/>
+         <feature name='avx512-4vnniw'/>
+@@ -965,6 +965,17 @@
+         <feature name='avx512pf'/>
+         <feature name='tsc-deadline'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>KnightsMill-v1</model>
++      <blockers model='KnightsMill-v1'>
++        <feature name='avx512-4fmaps'/>
++        <feature name='avx512-4vnniw'/>
++        <feature name='avx512-vpopcntdq'/>
++        <feature name='avx512cd'/>
++        <feature name='avx512er'/>
++        <feature name='avx512f'/>
++        <feature name='avx512pf'/>
++        <feature name='tsc-deadline'/>
++      </blockers>
+       <model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
+       <model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
+       <blockers model='Nehalem-IBRS'>
+diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
+index 8316b40fce..a6fae9e3f1 100644
+--- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
+@@ -804,7 +804,7 @@
+         <feature name='erms'/>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>KnightsMill</model>
++      <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
+       <blockers model='KnightsMill'>
+         <feature name='avx512-4fmaps'/>
+         <feature name='avx512-4vnniw'/>
+@@ -816,6 +816,18 @@
+         <feature name='erms'/>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>KnightsMill-v1</model>
++      <blockers model='KnightsMill-v1'>
++        <feature name='avx512-4fmaps'/>
++        <feature name='avx512-4vnniw'/>
++        <feature name='avx512-vpopcntdq'/>
++        <feature name='avx512cd'/>
++        <feature name='avx512er'/>
++        <feature name='avx512f'/>
++        <feature name='avx512pf'/>
++        <feature name='erms'/>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
+       <model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
+       <blockers model='Nehalem-IBRS'>
+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 cabd1c3694..060d96ab09 100644
+--- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
+@@ -838,7 +838,7 @@
+         <feature name='erms'/>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>KnightsMill</model>
++      <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
+       <blockers model='KnightsMill'>
+         <feature name='avx512-4fmaps'/>
+         <feature name='avx512-4vnniw'/>
+@@ -850,6 +850,18 @@
+         <feature name='erms'/>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>KnightsMill-v1</model>
++      <blockers model='KnightsMill-v1'>
++        <feature name='avx512-4fmaps'/>
++        <feature name='avx512-4vnniw'/>
++        <feature name='avx512-vpopcntdq'/>
++        <feature name='avx512cd'/>
++        <feature name='avx512er'/>
++        <feature name='avx512f'/>
++        <feature name='avx512pf'/>
++        <feature name='erms'/>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
+       <model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
+       <blockers model='Nehalem-IBRS'>
+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 67a8a5f5e7..75f83cb376 100644
+--- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
+@@ -979,7 +979,7 @@
+         <feature name='spec-ctrl'/>
+         <feature name='tsc-deadline'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>KnightsMill</model>
++      <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
+       <blockers model='KnightsMill'>
+         <feature name='avx512-4fmaps'/>
+         <feature name='avx512-4vnniw'/>
+@@ -990,6 +990,17 @@
+         <feature name='avx512pf'/>
+         <feature name='tsc-deadline'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>KnightsMill-v1</model>
++      <blockers model='KnightsMill-v1'>
++        <feature name='avx512-4fmaps'/>
++        <feature name='avx512-4vnniw'/>
++        <feature name='avx512-vpopcntdq'/>
++        <feature name='avx512cd'/>
++        <feature name='avx512er'/>
++        <feature name='avx512f'/>
++        <feature name='avx512pf'/>
++        <feature name='tsc-deadline'/>
++      </blockers>
+       <model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
+       <model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
+       <blockers model='Nehalem-IBRS'>
+diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
+index 45252b6b81..66dcb81fe6 100644
+--- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
+@@ -837,7 +837,7 @@
+         <feature name='erms'/>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>KnightsMill</model>
++      <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
+       <blockers model='KnightsMill'>
+         <feature name='avx512-4fmaps'/>
+         <feature name='avx512-4vnniw'/>
+@@ -849,6 +849,18 @@
+         <feature name='erms'/>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>KnightsMill-v1</model>
++      <blockers model='KnightsMill-v1'>
++        <feature name='avx512-4fmaps'/>
++        <feature name='avx512-4vnniw'/>
++        <feature name='avx512-vpopcntdq'/>
++        <feature name='avx512cd'/>
++        <feature name='avx512er'/>
++        <feature name='avx512f'/>
++        <feature name='avx512pf'/>
++        <feature name='erms'/>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
+       <model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
+       <blockers model='Nehalem-IBRS'>
+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 cc5cbfbf19..72df5e5e7d 100644
+--- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
+@@ -838,7 +838,7 @@
+         <feature name='erms'/>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>KnightsMill</model>
++      <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
+       <blockers model='KnightsMill'>
+         <feature name='avx512-4fmaps'/>
+         <feature name='avx512-4vnniw'/>
+@@ -850,6 +850,18 @@
+         <feature name='erms'/>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>KnightsMill-v1</model>
++      <blockers model='KnightsMill-v1'>
++        <feature name='avx512-4fmaps'/>
++        <feature name='avx512-4vnniw'/>
++        <feature name='avx512-vpopcntdq'/>
++        <feature name='avx512cd'/>
++        <feature name='avx512er'/>
++        <feature name='avx512f'/>
++        <feature name='avx512pf'/>
++        <feature name='erms'/>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
+       <model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
+       <blockers model='Nehalem-IBRS'>
+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 d0761a2c57..6a756782cd 100644
+--- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
+@@ -979,7 +979,7 @@
+         <feature name='spec-ctrl'/>
+         <feature name='tsc-deadline'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>KnightsMill</model>
++      <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
+       <blockers model='KnightsMill'>
+         <feature name='avx512-4fmaps'/>
+         <feature name='avx512-4vnniw'/>
+@@ -990,6 +990,17 @@
+         <feature name='avx512pf'/>
+         <feature name='tsc-deadline'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>KnightsMill-v1</model>
++      <blockers model='KnightsMill-v1'>
++        <feature name='avx512-4fmaps'/>
++        <feature name='avx512-4vnniw'/>
++        <feature name='avx512-vpopcntdq'/>
++        <feature name='avx512cd'/>
++        <feature name='avx512er'/>
++        <feature name='avx512f'/>
++        <feature name='avx512pf'/>
++        <feature name='tsc-deadline'/>
++      </blockers>
+       <model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
+       <model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
+       <blockers model='Nehalem-IBRS'>
+diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
+index df2f9d27ad..ef7b2bb67b 100644
+--- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
+@@ -837,7 +837,7 @@
+         <feature name='erms'/>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>KnightsMill</model>
++      <model usable='no' vendor='Intel' canonical='KnightsMill-v1'>KnightsMill</model>
+       <blockers model='KnightsMill'>
+         <feature name='avx512-4fmaps'/>
+         <feature name='avx512-4vnniw'/>
+@@ -849,6 +849,18 @@
+         <feature name='erms'/>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>KnightsMill-v1</model>
++      <blockers model='KnightsMill-v1'>
++        <feature name='avx512-4fmaps'/>
++        <feature name='avx512-4vnniw'/>
++        <feature name='avx512-vpopcntdq'/>
++        <feature name='avx512cd'/>
++        <feature name='avx512er'/>
++        <feature name='avx512f'/>
++        <feature name='avx512pf'/>
++        <feature name='erms'/>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='yes' vendor='Intel' canonical='Nehalem-v1'>Nehalem</model>
+       <model usable='no' vendor='Intel' canonical='Nehalem-v2'>Nehalem-IBRS</model>
+       <blockers model='Nehalem-IBRS'>
+-- 
+2.47.1
diff --git a/libvirt-cpu_map-Add-Opteron_G1-v1-CPU-model.patch b/libvirt-cpu_map-Add-Opteron_G1-v1-CPU-model.patch
new file mode 100644
index 0000000..be8bf9c
--- /dev/null
+++ b/libvirt-cpu_map-Add-Opteron_G1-v1-CPU-model.patch
@@ -0,0 +1,658 @@
+From 803b3302ba93c1f2e966a9876c457ae426e29fbf Mon Sep 17 00:00:00 2001
+Message-ID: <803b3302ba93c1f2e966a9876c457ae426e29fbf.1734429554.git.jdenemar@redhat.com>
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Thu, 5 Dec 2024 15:45:11 +0100
+Subject: [PATCH] cpu_map: Add Opteron_G1-v1 CPU model
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit a1625b73f6408918a3a5b07572b21d5bbb5f2fbd)
+
+https://issues.redhat.com/browse/RHEL-70129
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ src/cpu_map/index.xml                              | 1 +
+ src/cpu_map/meson.build                            | 1 +
+ src/cpu_map/x86_Opteron_G1-v1.xml                  | 6 ++++++
+ tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_5.2.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_6.0.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_6.1.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_6.2.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_7.0.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_7.1.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml | 3 ++-
+ tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_7.2.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_8.0.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_8.1.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_8.2.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_9.0.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_9.1.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_9.2.0.x86_64.xml         | 3 ++-
+ 43 files changed, 88 insertions(+), 40 deletions(-)
+ create mode 100644 src/cpu_map/x86_Opteron_G1-v1.xml
+
+diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml
+index 74b315c661..4cf884e778 100644
+--- a/src/cpu_map/index.xml
++++ b/src/cpu_map/index.xml
+@@ -137,6 +137,7 @@
+       <include filename='x86_phenom.xml'/>
+       <include filename='x86_phenom-v1.xml'/>
+       <include filename='x86_Opteron_G1.xml'/>
++      <include filename='x86_Opteron_G1-v1.xml'/>
+       <include filename='x86_Opteron_G2.xml'/>
+       <include filename='x86_Opteron_G3.xml'/>
+       <include filename='x86_Opteron_G4.xml'/>
+diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build
+index 47c93deace..8385c89552 100644
+--- a/src/cpu_map/meson.build
++++ b/src/cpu_map/meson.build
+@@ -112,6 +112,7 @@ cpumap_data = [
+   'x86_Nehalem-v1.xml',
+   'x86_Nehalem-v2.xml',
+   'x86_Nehalem.xml',
++  'x86_Opteron_G1-v1.xml',
+   'x86_Opteron_G1.xml',
+   'x86_Opteron_G2.xml',
+   'x86_Opteron_G3.xml',
+diff --git a/src/cpu_map/x86_Opteron_G1-v1.xml b/src/cpu_map/x86_Opteron_G1-v1.xml
+new file mode 100644
+index 0000000000..b040da4dea
+--- /dev/null
++++ b/src/cpu_map/x86_Opteron_G1-v1.xml
+@@ -0,0 +1,6 @@
++<cpus>
++  <model name='Opteron_G1-v1'>
++    <decode host='on' guest='off'/>
++    <model name='Opteron_G1'/>
++  </model>
++</cpus>
+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 27d36feccf..d12aa0d569 100644
+--- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
+@@ -572,7 +572,8 @@
+       <blockers model='Nehalem-v2'>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
++      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G2</model>
+       <model usable='yes' vendor='AMD'>Opteron_G3</model>
+       <model usable='no' vendor='AMD'>Opteron_G4</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 b06febb821..2aabe77417 100644
+--- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
+@@ -1067,7 +1067,8 @@
+       <blockers model='Nehalem-v2'>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
++      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G2</model>
+       <model usable='no' vendor='AMD'>Opteron_G3</model>
+       <blockers model='Opteron_G3'>
+diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
+index 21b4ab8c5c..743262e1a0 100644
+--- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
+@@ -571,7 +571,8 @@
+       <blockers model='Nehalem-v2'>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
++      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G2</model>
+       <model usable='yes' vendor='AMD'>Opteron_G3</model>
+       <model usable='no' vendor='AMD'>Opteron_G4</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 83bb914c7d..b15ba4ebb6 100644
+--- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
+@@ -594,7 +594,8 @@
+       <blockers model='Nehalem-v2'>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
++      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G2</model>
+       <model usable='yes' vendor='AMD'>Opteron_G3</model>
+       <model usable='no' vendor='AMD'>Opteron_G4</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 47ab7240fb..38b2861714 100644
+--- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
+@@ -1157,7 +1157,8 @@
+       <blockers model='Nehalem-v2'>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
++      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G2</model>
+       <model usable='no' vendor='AMD'>Opteron_G3</model>
+       <blockers model='Opteron_G3'>
+diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
+index cc212722f5..01a0eb2f47 100644
+--- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
+@@ -593,7 +593,8 @@
+       <blockers model='Nehalem-v2'>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
++      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G2</model>
+       <model usable='yes' vendor='AMD'>Opteron_G3</model>
+       <model usable='no' vendor='AMD'>Opteron_G4</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 ec7abc3903..ac184c5075 100644
+--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
+@@ -664,7 +664,8 @@
+       <blockers model='Nehalem-v2'>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
++      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G2</model>
+       <model usable='yes' vendor='AMD'>Opteron_G3</model>
+       <model usable='no' vendor='AMD'>Opteron_G4</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 87fe22edd7..02b362c722 100644
+--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
+@@ -1297,7 +1297,8 @@
+       <blockers model='Nehalem-v2'>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
++      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G2</model>
+       <model usable='no' vendor='AMD'>Opteron_G3</model>
+       <blockers model='Opteron_G3'>
+diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
+index 35bba84033..00b61e4380 100644
+--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
+@@ -663,7 +663,8 @@
+       <blockers model='Nehalem-v2'>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
++      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G2</model>
+       <model usable='yes' vendor='AMD'>Opteron_G3</model>
+       <model usable='no' vendor='AMD'>Opteron_G4</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 b448d7bdb8..dc82ce2aa9 100644
+--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
+@@ -661,7 +661,8 @@
+       <blockers model='Nehalem-v2'>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
++      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G2</model>
+       <model usable='yes' vendor='AMD'>Opteron_G3</model>
+       <model usable='no' vendor='AMD'>Opteron_G4</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 a8a96f2bb4..1a016f7379 100644
+--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
+@@ -1294,7 +1294,8 @@
+       <blockers model='Nehalem-v2'>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
++      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G2</model>
+       <model usable='no' vendor='AMD'>Opteron_G3</model>
+       <blockers model='Opteron_G3'>
+diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+index 303b714aa7..b5389e8a3f 100644
+--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+@@ -660,7 +660,8 @@
+       <blockers model='Nehalem-v2'>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
++      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G2</model>
+       <model usable='yes' vendor='AMD'>Opteron_G3</model>
+       <model usable='no' vendor='AMD'>Opteron_G4</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 9da8e156e2..ccb8bb7f7b 100644
+--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
+@@ -688,7 +688,8 @@
+       <blockers model='Nehalem-v2'>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
++      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G2</model>
+       <model usable='yes' vendor='AMD'>Opteron_G3</model>
+       <model usable='no' vendor='AMD'>Opteron_G4</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 a5b9edaeb6..e0e53e543d 100644
+--- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
+@@ -1323,7 +1323,8 @@
+       <blockers model='Nehalem-v2'>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
++      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G2</model>
+       <model usable='no' vendor='AMD'>Opteron_G3</model>
+       <blockers model='Opteron_G3'>
+diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+index 3029403bac..980c296c18 100644
+--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+@@ -687,7 +687,8 @@
+       <blockers model='Nehalem-v2'>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
++      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G2</model>
+       <model usable='yes' vendor='AMD'>Opteron_G3</model>
+       <model usable='no' vendor='AMD'>Opteron_G4</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 259613d7fe..10d31b6007 100644
+--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
+@@ -655,7 +655,8 @@
+       <blockers model='Nehalem-v2'>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
++      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G2</model>
+       <model usable='yes' vendor='AMD'>Opteron_G3</model>
+       <model usable='no' vendor='AMD'>Opteron_G4</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 d3ecad143c..e916f523ac 100644
+--- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
+@@ -1271,7 +1271,8 @@
+       <blockers model='Nehalem-v2'>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
++      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G2</model>
+       <model usable='no' vendor='AMD'>Opteron_G3</model>
+       <blockers model='Opteron_G3'>
+diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
+index 7f08dd995d..434fa7bd95 100644
+--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
+@@ -654,7 +654,8 @@
+       <blockers model='Nehalem-v2'>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
++      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G2</model>
+       <model usable='yes' vendor='AMD'>Opteron_G3</model>
+       <model usable='no' vendor='AMD'>Opteron_G4</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 1057fc58d3..80497c5125 100644
+--- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
+@@ -660,7 +660,8 @@
+       <blockers model='Nehalem-v2'>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
++      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G2</model>
+       <model usable='yes' vendor='AMD'>Opteron_G3</model>
+       <model usable='no' vendor='AMD'>Opteron_G4</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 fa4e9cfb8c..e67ae9b280 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
+@@ -1048,7 +1048,8 @@
+       <blockers model='Nehalem-v2'>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
++      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G2</model>
+       <model usable='no' vendor='AMD'>Opteron_G3</model>
+       <blockers model='Opteron_G3'>
+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 fa4e9cfb8c..e67ae9b280 100644
+--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
+@@ -1048,7 +1048,8 @@
+       <blockers model='Nehalem-v2'>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
++      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G2</model>
+       <model usable='no' vendor='AMD'>Opteron_G3</model>
+       <blockers model='Opteron_G3'>
+diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
+index 0c0f363d2b..e0a1209cea 100644
+--- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
+@@ -659,7 +659,8 @@
+       <blockers model='Nehalem-v2'>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
++      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G2</model>
+       <model usable='yes' vendor='AMD'>Opteron_G3</model>
+       <model usable='no' vendor='AMD'>Opteron_G4</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 b1de96fadd..03c40996e1 100644
+--- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
+@@ -660,7 +660,8 @@
+       <blockers model='Nehalem-v2'>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
++      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G2</model>
+       <model usable='yes' vendor='AMD'>Opteron_G3</model>
+       <model usable='no' vendor='AMD'>Opteron_G4</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 c83819435d..3d52b5fda0 100644
+--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
+@@ -1047,7 +1047,8 @@
+       <blockers model='Nehalem-v2'>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
++      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G2</model>
+       <model usable='no' vendor='AMD'>Opteron_G3</model>
+       <blockers model='Opteron_G3'>
+diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
+index 8f195f0e39..8c84a54239 100644
+--- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
+@@ -659,7 +659,8 @@
+       <blockers model='Nehalem-v2'>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
++      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G2</model>
+       <model usable='yes' vendor='AMD'>Opteron_G3</model>
+       <model usable='no' vendor='AMD'>Opteron_G4</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 5495883fe9..dcce5a827f 100644
+--- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
+@@ -838,7 +838,8 @@
+       <blockers model='Nehalem-v2'>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
++      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G2</model>
+       <model usable='yes' vendor='AMD'>Opteron_G3</model>
+       <model usable='no' vendor='AMD'>Opteron_G4</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 87fc57da66..d086460c7d 100644
+--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
+@@ -1055,7 +1055,8 @@
+       <blockers model='Nehalem-v2'>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
++      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G2</model>
+       <model usable='no' vendor='AMD'>Opteron_G3</model>
+       <blockers model='Opteron_G3'>
+diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
+index 43703fefab..19ff721d09 100644
+--- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
+@@ -837,7 +837,8 @@
+       <blockers model='Nehalem-v2'>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
++      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G2</model>
+       <model usable='yes' vendor='AMD'>Opteron_G3</model>
+       <model usable='no' vendor='AMD'>Opteron_G4</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 2eab4e49b1..c09f4c56bf 100644
+--- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
+@@ -839,7 +839,8 @@
+       <blockers model='Nehalem-v2'>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
++      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G2</model>
+       <model usable='yes' vendor='AMD'>Opteron_G3</model>
+       <model usable='no' vendor='AMD'>Opteron_G4</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 08b45ba90b..13c2cc5439 100644
+--- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
+@@ -1030,7 +1030,8 @@
+       <blockers model='Nehalem-v2'>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
++      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G2</model>
+       <model usable='no' vendor='AMD'>Opteron_G3</model>
+       <blockers model='Opteron_G3'>
+diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
+index 28b233d35d..bd6c173c04 100644
+--- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
+@@ -838,7 +838,8 @@
+       <blockers model='Nehalem-v2'>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
++      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G2</model>
+       <model usable='yes' vendor='AMD'>Opteron_G3</model>
+       <model usable='no' vendor='AMD'>Opteron_G4</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 16a3cdacb5..f644b1ac5c 100644
+--- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
+@@ -839,7 +839,8 @@
+       <blockers model='Nehalem-v2'>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
++      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G2</model>
+       <model usable='yes' vendor='AMD'>Opteron_G3</model>
+       <model usable='no' vendor='AMD'>Opteron_G4</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 549e21c273..2107e5b7be 100644
+--- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
+@@ -986,7 +986,8 @@
+       <blockers model='Nehalem-v2'>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
++      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G2</model>
+       <model usable='no' vendor='AMD'>Opteron_G3</model>
+       <blockers model='Opteron_G3'>
+diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
+index 16e0d61c51..5cf479694e 100644
+--- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
+@@ -838,7 +838,8 @@
+       <blockers model='Nehalem-v2'>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
++      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G2</model>
+       <model usable='yes' vendor='AMD'>Opteron_G3</model>
+       <model usable='no' vendor='AMD'>Opteron_G4</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 2b33304882..5c52c08ee7 100644
+--- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
+@@ -872,7 +872,8 @@
+       <blockers model='Nehalem-v2'>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
++      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G2</model>
+       <model usable='yes' vendor='AMD'>Opteron_G3</model>
+       <model usable='no' vendor='AMD'>Opteron_G4</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 f91fcdd4e5..1d41d3ef8c 100644
+--- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
+@@ -1011,7 +1011,8 @@
+       <blockers model='Nehalem-v2'>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
++      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G2</model>
+       <model usable='no' vendor='AMD'>Opteron_G3</model>
+       <blockers model='Opteron_G3'>
+diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
+index 82fe2b3b1a..dfb6f741c4 100644
+--- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
+@@ -871,7 +871,8 @@
+       <blockers model='Nehalem-v2'>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
++      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G2</model>
+       <model usable='yes' vendor='AMD'>Opteron_G3</model>
+       <model usable='no' vendor='AMD'>Opteron_G4</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 0c896766cb..c711064a04 100644
+--- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
+@@ -872,7 +872,8 @@
+       <blockers model='Nehalem-v2'>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
++      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G2</model>
+       <model usable='yes' vendor='AMD'>Opteron_G3</model>
+       <model usable='no' vendor='AMD'>Opteron_G4</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 94c6914767..caf86d2c2b 100644
+--- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
+@@ -1011,7 +1011,8 @@
+       <blockers model='Nehalem-v2'>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
++      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G2</model>
+       <model usable='no' vendor='AMD'>Opteron_G3</model>
+       <blockers model='Opteron_G3'>
+diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
+index 1f73e3903c..16a34ed042 100644
+--- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
+@@ -871,7 +871,8 @@
+       <blockers model='Nehalem-v2'>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
++      <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G2</model>
+       <model usable='yes' vendor='AMD'>Opteron_G3</model>
+       <model usable='no' vendor='AMD'>Opteron_G4</model>
+-- 
+2.47.1
diff --git a/libvirt-cpu_map-Add-Opteron_G2-v1-CPU-model.patch b/libvirt-cpu_map-Add-Opteron_G2-v1-CPU-model.patch
new file mode 100644
index 0000000..2f1883a
--- /dev/null
+++ b/libvirt-cpu_map-Add-Opteron_G2-v1-CPU-model.patch
@@ -0,0 +1,658 @@
+From 7e7f1cddd9badb0fd9a10ea019237e4fc1e514ab Mon Sep 17 00:00:00 2001
+Message-ID: <7e7f1cddd9badb0fd9a10ea019237e4fc1e514ab.1734429554.git.jdenemar@redhat.com>
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Thu, 5 Dec 2024 15:47:52 +0100
+Subject: [PATCH] cpu_map: Add Opteron_G2-v1 CPU model
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit 51ffa44fb4242bd6c6610271a6c45d2c3672a55d)
+
+https://issues.redhat.com/browse/RHEL-70129
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ src/cpu_map/index.xml                              | 1 +
+ src/cpu_map/meson.build                            | 1 +
+ src/cpu_map/x86_Opteron_G2-v1.xml                  | 6 ++++++
+ tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_5.2.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_6.0.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_6.1.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_6.2.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_7.0.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_7.1.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml | 3 ++-
+ tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_7.2.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_8.0.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_8.1.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_8.2.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_9.0.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_9.1.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_9.2.0.x86_64.xml         | 3 ++-
+ 43 files changed, 88 insertions(+), 40 deletions(-)
+ create mode 100644 src/cpu_map/x86_Opteron_G2-v1.xml
+
+diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml
+index 4cf884e778..0070796dee 100644
+--- a/src/cpu_map/index.xml
++++ b/src/cpu_map/index.xml
+@@ -139,6 +139,7 @@
+       <include filename='x86_Opteron_G1.xml'/>
+       <include filename='x86_Opteron_G1-v1.xml'/>
+       <include filename='x86_Opteron_G2.xml'/>
++      <include filename='x86_Opteron_G2-v1.xml'/>
+       <include filename='x86_Opteron_G3.xml'/>
+       <include filename='x86_Opteron_G4.xml'/>
+       <include filename='x86_Opteron_G5.xml'/>
+diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build
+index 8385c89552..fb6494a14a 100644
+--- a/src/cpu_map/meson.build
++++ b/src/cpu_map/meson.build
+@@ -114,6 +114,7 @@ cpumap_data = [
+   'x86_Nehalem.xml',
+   'x86_Opteron_G1-v1.xml',
+   'x86_Opteron_G1.xml',
++  'x86_Opteron_G2-v1.xml',
+   'x86_Opteron_G2.xml',
+   'x86_Opteron_G3.xml',
+   'x86_Opteron_G4.xml',
+diff --git a/src/cpu_map/x86_Opteron_G2-v1.xml b/src/cpu_map/x86_Opteron_G2-v1.xml
+new file mode 100644
+index 0000000000..8f0a05f37c
+--- /dev/null
++++ b/src/cpu_map/x86_Opteron_G2-v1.xml
+@@ -0,0 +1,6 @@
++<cpus>
++  <model name='Opteron_G2-v1'>
++    <decode host='on' guest='off'/>
++    <model name='Opteron_G2'/>
++  </model>
++</cpus>
+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 d12aa0d569..8f0b9b3bff 100644
+--- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
+@@ -574,7 +574,8 @@
+       </blockers>
+       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
++      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G3</model>
+       <model usable='no' vendor='AMD'>Opteron_G4</model>
+       <blockers model='Opteron_G4'>
+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 2aabe77417..b4f2c700f9 100644
+--- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
+@@ -1069,7 +1069,8 @@
+       </blockers>
+       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
++      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
+       <model usable='no' vendor='AMD'>Opteron_G3</model>
+       <blockers model='Opteron_G3'>
+         <feature name='misalignsse'/>
+diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
+index 743262e1a0..bd3095fec9 100644
+--- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
+@@ -573,7 +573,8 @@
+       </blockers>
+       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
++      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G3</model>
+       <model usable='no' vendor='AMD'>Opteron_G4</model>
+       <blockers model='Opteron_G4'>
+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 b15ba4ebb6..b426bd1e63 100644
+--- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
+@@ -596,7 +596,8 @@
+       </blockers>
+       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
++      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G3</model>
+       <model usable='no' vendor='AMD'>Opteron_G4</model>
+       <blockers model='Opteron_G4'>
+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 38b2861714..d89a9b2c32 100644
+--- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
+@@ -1159,7 +1159,8 @@
+       </blockers>
+       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
++      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
+       <model usable='no' vendor='AMD'>Opteron_G3</model>
+       <blockers model='Opteron_G3'>
+         <feature name='misalignsse'/>
+diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
+index 01a0eb2f47..a8773fb4f7 100644
+--- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
+@@ -595,7 +595,8 @@
+       </blockers>
+       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
++      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G3</model>
+       <model usable='no' vendor='AMD'>Opteron_G4</model>
+       <blockers model='Opteron_G4'>
+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 ac184c5075..de1f78b335 100644
+--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
+@@ -666,7 +666,8 @@
+       </blockers>
+       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
++      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G3</model>
+       <model usable='no' vendor='AMD'>Opteron_G4</model>
+       <blockers model='Opteron_G4'>
+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 02b362c722..581afc86a0 100644
+--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
+@@ -1299,7 +1299,8 @@
+       </blockers>
+       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
++      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
+       <model usable='no' vendor='AMD'>Opteron_G3</model>
+       <blockers model='Opteron_G3'>
+         <feature name='misalignsse'/>
+diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
+index 00b61e4380..53d83980a6 100644
+--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
+@@ -665,7 +665,8 @@
+       </blockers>
+       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
++      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G3</model>
+       <model usable='no' vendor='AMD'>Opteron_G4</model>
+       <blockers model='Opteron_G4'>
+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 dc82ce2aa9..77eab8aa95 100644
+--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
+@@ -663,7 +663,8 @@
+       </blockers>
+       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
++      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G3</model>
+       <model usable='no' vendor='AMD'>Opteron_G4</model>
+       <blockers model='Opteron_G4'>
+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 1a016f7379..710866e495 100644
+--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
+@@ -1296,7 +1296,8 @@
+       </blockers>
+       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
++      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
+       <model usable='no' vendor='AMD'>Opteron_G3</model>
+       <blockers model='Opteron_G3'>
+         <feature name='misalignsse'/>
+diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+index b5389e8a3f..99fe26dc76 100644
+--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+@@ -662,7 +662,8 @@
+       </blockers>
+       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
++      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G3</model>
+       <model usable='no' vendor='AMD'>Opteron_G4</model>
+       <blockers model='Opteron_G4'>
+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 ccb8bb7f7b..eab56f9a7c 100644
+--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
+@@ -690,7 +690,8 @@
+       </blockers>
+       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
++      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G3</model>
+       <model usable='no' vendor='AMD'>Opteron_G4</model>
+       <blockers model='Opteron_G4'>
+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 e0e53e543d..e5b4cff7c6 100644
+--- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
+@@ -1325,7 +1325,8 @@
+       </blockers>
+       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
++      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
+       <model usable='no' vendor='AMD'>Opteron_G3</model>
+       <blockers model='Opteron_G3'>
+         <feature name='misalignsse'/>
+diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+index 980c296c18..6ec56068bd 100644
+--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+@@ -689,7 +689,8 @@
+       </blockers>
+       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
++      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G3</model>
+       <model usable='no' vendor='AMD'>Opteron_G4</model>
+       <blockers model='Opteron_G4'>
+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 10d31b6007..0e27b3400c 100644
+--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
+@@ -657,7 +657,8 @@
+       </blockers>
+       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
++      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G3</model>
+       <model usable='no' vendor='AMD'>Opteron_G4</model>
+       <blockers model='Opteron_G4'>
+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 e916f523ac..e588593d91 100644
+--- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
+@@ -1273,7 +1273,8 @@
+       </blockers>
+       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
++      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
+       <model usable='no' vendor='AMD'>Opteron_G3</model>
+       <blockers model='Opteron_G3'>
+         <feature name='misalignsse'/>
+diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
+index 434fa7bd95..7cb9663805 100644
+--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
+@@ -656,7 +656,8 @@
+       </blockers>
+       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
++      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G3</model>
+       <model usable='no' vendor='AMD'>Opteron_G4</model>
+       <blockers model='Opteron_G4'>
+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 80497c5125..c66731ceac 100644
+--- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
+@@ -662,7 +662,8 @@
+       </blockers>
+       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
++      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G3</model>
+       <model usable='no' vendor='AMD'>Opteron_G4</model>
+       <blockers model='Opteron_G4'>
+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 e67ae9b280..ec61c328c9 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
+@@ -1050,7 +1050,8 @@
+       </blockers>
+       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
++      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
+       <model usable='no' vendor='AMD'>Opteron_G3</model>
+       <blockers model='Opteron_G3'>
+         <feature name='misalignsse'/>
+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 e67ae9b280..ec61c328c9 100644
+--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
+@@ -1050,7 +1050,8 @@
+       </blockers>
+       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
++      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
+       <model usable='no' vendor='AMD'>Opteron_G3</model>
+       <blockers model='Opteron_G3'>
+         <feature name='misalignsse'/>
+diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
+index e0a1209cea..8fd837d2c4 100644
+--- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
+@@ -661,7 +661,8 @@
+       </blockers>
+       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
++      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G3</model>
+       <model usable='no' vendor='AMD'>Opteron_G4</model>
+       <blockers model='Opteron_G4'>
+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 03c40996e1..2a78fe6926 100644
+--- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
+@@ -662,7 +662,8 @@
+       </blockers>
+       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
++      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G3</model>
+       <model usable='no' vendor='AMD'>Opteron_G4</model>
+       <blockers model='Opteron_G4'>
+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 3d52b5fda0..cb7bb1513c 100644
+--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
+@@ -1049,7 +1049,8 @@
+       </blockers>
+       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
++      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
+       <model usable='no' vendor='AMD'>Opteron_G3</model>
+       <blockers model='Opteron_G3'>
+         <feature name='misalignsse'/>
+diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
+index 8c84a54239..7c66d893ae 100644
+--- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
+@@ -661,7 +661,8 @@
+       </blockers>
+       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
++      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G3</model>
+       <model usable='no' vendor='AMD'>Opteron_G4</model>
+       <blockers model='Opteron_G4'>
+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 dcce5a827f..1d23c25196 100644
+--- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
+@@ -840,7 +840,8 @@
+       </blockers>
+       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
++      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G3</model>
+       <model usable='no' vendor='AMD'>Opteron_G4</model>
+       <blockers model='Opteron_G4'>
+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 d086460c7d..768769a4ef 100644
+--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
+@@ -1057,7 +1057,8 @@
+       </blockers>
+       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
++      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
+       <model usable='no' vendor='AMD'>Opteron_G3</model>
+       <blockers model='Opteron_G3'>
+         <feature name='misalignsse'/>
+diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
+index 19ff721d09..95106cfeab 100644
+--- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
+@@ -839,7 +839,8 @@
+       </blockers>
+       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
++      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G3</model>
+       <model usable='no' vendor='AMD'>Opteron_G4</model>
+       <blockers model='Opteron_G4'>
+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 c09f4c56bf..5b777b730b 100644
+--- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
+@@ -841,7 +841,8 @@
+       </blockers>
+       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
++      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G3</model>
+       <model usable='no' vendor='AMD'>Opteron_G4</model>
+       <blockers model='Opteron_G4'>
+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 13c2cc5439..0ea4c2cdb8 100644
+--- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
+@@ -1032,7 +1032,8 @@
+       </blockers>
+       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
++      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
+       <model usable='no' vendor='AMD'>Opteron_G3</model>
+       <blockers model='Opteron_G3'>
+         <feature name='misalignsse'/>
+diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
+index bd6c173c04..506b949225 100644
+--- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
+@@ -840,7 +840,8 @@
+       </blockers>
+       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
++      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G3</model>
+       <model usable='no' vendor='AMD'>Opteron_G4</model>
+       <blockers model='Opteron_G4'>
+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 f644b1ac5c..d84324eac6 100644
+--- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
+@@ -841,7 +841,8 @@
+       </blockers>
+       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
++      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G3</model>
+       <model usable='no' vendor='AMD'>Opteron_G4</model>
+       <blockers model='Opteron_G4'>
+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 2107e5b7be..cccf48aafb 100644
+--- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
+@@ -988,7 +988,8 @@
+       </blockers>
+       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
++      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
+       <model usable='no' vendor='AMD'>Opteron_G3</model>
+       <blockers model='Opteron_G3'>
+         <feature name='misalignsse'/>
+diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
+index 5cf479694e..05c06c9b25 100644
+--- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
+@@ -840,7 +840,8 @@
+       </blockers>
+       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
++      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G3</model>
+       <model usable='no' vendor='AMD'>Opteron_G4</model>
+       <blockers model='Opteron_G4'>
+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 5c52c08ee7..e295c808d7 100644
+--- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
+@@ -874,7 +874,8 @@
+       </blockers>
+       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
++      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G3</model>
+       <model usable='no' vendor='AMD'>Opteron_G4</model>
+       <blockers model='Opteron_G4'>
+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 1d41d3ef8c..8b338c75be 100644
+--- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
+@@ -1013,7 +1013,8 @@
+       </blockers>
+       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
++      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
+       <model usable='no' vendor='AMD'>Opteron_G3</model>
+       <blockers model='Opteron_G3'>
+         <feature name='misalignsse'/>
+diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
+index dfb6f741c4..6b2c1f15b5 100644
+--- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
+@@ -873,7 +873,8 @@
+       </blockers>
+       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
++      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G3</model>
+       <model usable='no' vendor='AMD'>Opteron_G4</model>
+       <blockers model='Opteron_G4'>
+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 c711064a04..ab82a874b1 100644
+--- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
+@@ -874,7 +874,8 @@
+       </blockers>
+       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
++      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G3</model>
+       <model usable='no' vendor='AMD'>Opteron_G4</model>
+       <blockers model='Opteron_G4'>
+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 caf86d2c2b..bf20e3d536 100644
+--- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
+@@ -1013,7 +1013,8 @@
+       </blockers>
+       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
++      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
+       <model usable='no' vendor='AMD'>Opteron_G3</model>
+       <blockers model='Opteron_G3'>
+         <feature name='misalignsse'/>
+diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
+index 16a34ed042..d28d4c1f14 100644
+--- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
+@@ -873,7 +873,8 @@
+       </blockers>
+       <model usable='yes' vendor='AMD' canonical='Opteron_G1-v1'>Opteron_G1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
++      <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
+       <model usable='yes' vendor='AMD'>Opteron_G3</model>
+       <model usable='no' vendor='AMD'>Opteron_G4</model>
+       <blockers model='Opteron_G4'>
+-- 
+2.47.1
diff --git a/libvirt-cpu_map-Add-Opteron_G3-v1-CPU-model.patch b/libvirt-cpu_map-Add-Opteron_G3-v1-CPU-model.patch
new file mode 100644
index 0000000..fac42c3
--- /dev/null
+++ b/libvirt-cpu_map-Add-Opteron_G3-v1-CPU-model.patch
@@ -0,0 +1,768 @@
+From 84beffae6c1e35998ac9dd396c22323fa2753f0f Mon Sep 17 00:00:00 2001
+Message-ID: <84beffae6c1e35998ac9dd396c22323fa2753f0f.1734429554.git.jdenemar@redhat.com>
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Thu, 5 Dec 2024 15:48:47 +0100
+Subject: [PATCH] cpu_map: Add Opteron_G3-v1 CPU model
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit 422d90dc56d34879e6f52f34516c92dfc7f286fa)
+
+https://issues.redhat.com/browse/RHEL-70129
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ src/cpu_map/index.xml                                | 1 +
+ src/cpu_map/meson.build                              | 1 +
+ src/cpu_map/x86_Opteron_G3-v1.xml                    | 6 ++++++
+ tests/cputestdata/x86_64-cpuid-Opteron-1352-host.xml | 2 +-
+ tests/cputestdata/x86_64-cpuid-Opteron-2350-host.xml | 2 +-
+ tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml       | 3 ++-
+ tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml       | 6 +++++-
+ tests/domaincapsdata/qemu_5.2.0.x86_64.xml           | 3 ++-
+ tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml       | 3 ++-
+ tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml       | 6 +++++-
+ tests/domaincapsdata/qemu_6.0.0.x86_64.xml           | 3 ++-
+ tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml       | 3 ++-
+ tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml       | 6 +++++-
+ tests/domaincapsdata/qemu_6.1.0.x86_64.xml           | 3 ++-
+ tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml       | 3 ++-
+ tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml       | 6 +++++-
+ tests/domaincapsdata/qemu_6.2.0.x86_64.xml           | 3 ++-
+ tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml       | 3 ++-
+ tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml       | 6 +++++-
+ tests/domaincapsdata/qemu_7.0.0.x86_64.xml           | 3 ++-
+ tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml       | 3 ++-
+ tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml       | 6 +++++-
+ tests/domaincapsdata/qemu_7.1.0.x86_64.xml           | 3 ++-
+ tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml       | 3 ++-
+ tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml   | 6 +++++-
+ tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml       | 6 +++++-
+ tests/domaincapsdata/qemu_7.2.0.x86_64.xml           | 3 ++-
+ tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml       | 3 ++-
+ tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml       | 6 +++++-
+ tests/domaincapsdata/qemu_8.0.0.x86_64.xml           | 3 ++-
+ tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml       | 3 ++-
+ tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml       | 6 +++++-
+ tests/domaincapsdata/qemu_8.1.0.x86_64.xml           | 3 ++-
+ tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml       | 3 ++-
+ tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml       | 6 +++++-
+ tests/domaincapsdata/qemu_8.2.0.x86_64.xml           | 3 ++-
+ tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml       | 3 ++-
+ tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml       | 6 +++++-
+ tests/domaincapsdata/qemu_9.0.0.x86_64.xml           | 3 ++-
+ tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml       | 3 ++-
+ tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml       | 6 +++++-
+ tests/domaincapsdata/qemu_9.1.0.x86_64.xml           | 3 ++-
+ tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml       | 3 ++-
+ tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml       | 6 +++++-
+ tests/domaincapsdata/qemu_9.2.0.x86_64.xml           | 3 ++-
+ 45 files changed, 132 insertions(+), 42 deletions(-)
+ create mode 100644 src/cpu_map/x86_Opteron_G3-v1.xml
+
+diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml
+index 0070796dee..cdb8a568a6 100644
+--- a/src/cpu_map/index.xml
++++ b/src/cpu_map/index.xml
+@@ -141,6 +141,7 @@
+       <include filename='x86_Opteron_G2.xml'/>
+       <include filename='x86_Opteron_G2-v1.xml'/>
+       <include filename='x86_Opteron_G3.xml'/>
++      <include filename='x86_Opteron_G3-v1.xml'/>
+       <include filename='x86_Opteron_G4.xml'/>
+       <include filename='x86_Opteron_G5.xml'/>
+       <include filename='x86_EPYC.xml'/>
+diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build
+index fb6494a14a..d735c54fd6 100644
+--- a/src/cpu_map/meson.build
++++ b/src/cpu_map/meson.build
+@@ -116,6 +116,7 @@ cpumap_data = [
+   'x86_Opteron_G1.xml',
+   'x86_Opteron_G2-v1.xml',
+   'x86_Opteron_G2.xml',
++  'x86_Opteron_G3-v1.xml',
+   'x86_Opteron_G3.xml',
+   'x86_Opteron_G4.xml',
+   'x86_Opteron_G5.xml',
+diff --git a/src/cpu_map/x86_Opteron_G3-v1.xml b/src/cpu_map/x86_Opteron_G3-v1.xml
+new file mode 100644
+index 0000000000..8a625c5b1f
+--- /dev/null
++++ b/src/cpu_map/x86_Opteron_G3-v1.xml
+@@ -0,0 +1,6 @@
++<cpus>
++  <model name='Opteron_G3-v1'>
++    <decode host='on' guest='off'/>
++    <model name='Opteron_G3'/>
++  </model>
++</cpus>
+diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-1352-host.xml b/tests/cputestdata/x86_64-cpuid-Opteron-1352-host.xml
+index 53b98713e5..87aee9febe 100644
+--- a/tests/cputestdata/x86_64-cpuid-Opteron-1352-host.xml
++++ b/tests/cputestdata/x86_64-cpuid-Opteron-1352-host.xml
+@@ -1,6 +1,6 @@
+ <cpu>
+   <arch>x86_64</arch>
+-  <model>Opteron_G3</model>
++  <model>Opteron_G3-v1</model>
+   <vendor>AMD</vendor>
+   <signature family='16' model='2' stepping='3'/>
+   <feature name='monitor'/>
+diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-2350-host.xml b/tests/cputestdata/x86_64-cpuid-Opteron-2350-host.xml
+index 53b98713e5..87aee9febe 100644
+--- a/tests/cputestdata/x86_64-cpuid-Opteron-2350-host.xml
++++ b/tests/cputestdata/x86_64-cpuid-Opteron-2350-host.xml
+@@ -1,6 +1,6 @@
+ <cpu>
+   <arch>x86_64</arch>
+-  <model>Opteron_G3</model>
++  <model>Opteron_G3-v1</model>
+   <vendor>AMD</vendor>
+   <signature family='16' model='2' stepping='3'/>
+   <feature name='monitor'/>
+diff --git a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
+index 8f0b9b3bff..f673f670a0 100644
+--- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
+@@ -576,7 +576,8 @@
+       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+       <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
+       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
+-      <model usable='yes' vendor='AMD'>Opteron_G3</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
++      <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
+       <model usable='no' vendor='AMD'>Opteron_G4</model>
+       <blockers model='Opteron_G4'>
+         <feature name='fma4'/>
+diff --git a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
+index b4f2c700f9..6a3af31956 100644
+--- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
+@@ -1071,10 +1071,14 @@
+       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+       <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
+       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
+-      <model usable='no' vendor='AMD'>Opteron_G3</model>
++      <model usable='no' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
+       <blockers model='Opteron_G3'>
+         <feature name='misalignsse'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>Opteron_G3-v1</model>
++      <blockers model='Opteron_G3-v1'>
++        <feature name='misalignsse'/>
++      </blockers>
+       <model usable='no' vendor='AMD'>Opteron_G4</model>
+       <blockers model='Opteron_G4'>
+         <feature name='3dnowprefetch'/>
+diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
+index bd3095fec9..f0f6303099 100644
+--- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
+@@ -575,7 +575,8 @@
+       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+       <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
+       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
+-      <model usable='yes' vendor='AMD'>Opteron_G3</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
++      <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
+       <model usable='no' vendor='AMD'>Opteron_G4</model>
+       <blockers model='Opteron_G4'>
+         <feature name='fma4'/>
+diff --git a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
+index b426bd1e63..24f2c91022 100644
+--- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
+@@ -598,7 +598,8 @@
+       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+       <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
+       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
+-      <model usable='yes' vendor='AMD'>Opteron_G3</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
++      <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
+       <model usable='no' vendor='AMD'>Opteron_G4</model>
+       <blockers model='Opteron_G4'>
+         <feature name='fma4'/>
+diff --git a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
+index d89a9b2c32..111613d0b8 100644
+--- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
+@@ -1161,10 +1161,14 @@
+       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+       <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
+       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
+-      <model usable='no' vendor='AMD'>Opteron_G3</model>
++      <model usable='no' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
+       <blockers model='Opteron_G3'>
+         <feature name='misalignsse'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>Opteron_G3-v1</model>
++      <blockers model='Opteron_G3-v1'>
++        <feature name='misalignsse'/>
++      </blockers>
+       <model usable='no' vendor='AMD'>Opteron_G4</model>
+       <blockers model='Opteron_G4'>
+         <feature name='3dnowprefetch'/>
+diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
+index a8773fb4f7..82dbca5341 100644
+--- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
+@@ -597,7 +597,8 @@
+       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+       <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
+       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
+-      <model usable='yes' vendor='AMD'>Opteron_G3</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
++      <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
+       <model usable='no' vendor='AMD'>Opteron_G4</model>
+       <blockers model='Opteron_G4'>
+         <feature name='fma4'/>
+diff --git a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
+index de1f78b335..a869314868 100644
+--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
+@@ -668,7 +668,8 @@
+       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+       <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
+       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
+-      <model usable='yes' vendor='AMD'>Opteron_G3</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
++      <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
+       <model usable='no' vendor='AMD'>Opteron_G4</model>
+       <blockers model='Opteron_G4'>
+         <feature name='fma4'/>
+diff --git a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
+index 581afc86a0..660744d28c 100644
+--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
+@@ -1301,10 +1301,14 @@
+       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+       <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
+       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
+-      <model usable='no' vendor='AMD'>Opteron_G3</model>
++      <model usable='no' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
+       <blockers model='Opteron_G3'>
+         <feature name='misalignsse'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>Opteron_G3-v1</model>
++      <blockers model='Opteron_G3-v1'>
++        <feature name='misalignsse'/>
++      </blockers>
+       <model usable='no' vendor='AMD'>Opteron_G4</model>
+       <blockers model='Opteron_G4'>
+         <feature name='3dnowprefetch'/>
+diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
+index 53d83980a6..8bc739091e 100644
+--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
+@@ -667,7 +667,8 @@
+       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+       <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
+       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
+-      <model usable='yes' vendor='AMD'>Opteron_G3</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
++      <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
+       <model usable='no' vendor='AMD'>Opteron_G4</model>
+       <blockers model='Opteron_G4'>
+         <feature name='fma4'/>
+diff --git a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
+index 77eab8aa95..a3014c8142 100644
+--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
+@@ -665,7 +665,8 @@
+       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+       <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
+       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
+-      <model usable='yes' vendor='AMD'>Opteron_G3</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
++      <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
+       <model usable='no' vendor='AMD'>Opteron_G4</model>
+       <blockers model='Opteron_G4'>
+         <feature name='fma4'/>
+diff --git a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
+index 710866e495..b4d902b44c 100644
+--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
+@@ -1298,10 +1298,14 @@
+       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+       <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
+       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
+-      <model usable='no' vendor='AMD'>Opteron_G3</model>
++      <model usable='no' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
+       <blockers model='Opteron_G3'>
+         <feature name='misalignsse'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>Opteron_G3-v1</model>
++      <blockers model='Opteron_G3-v1'>
++        <feature name='misalignsse'/>
++      </blockers>
+       <model usable='no' vendor='AMD'>Opteron_G4</model>
+       <blockers model='Opteron_G4'>
+         <feature name='3dnowprefetch'/>
+diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+index 99fe26dc76..2e9bc75e1f 100644
+--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+@@ -664,7 +664,8 @@
+       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+       <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
+       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
+-      <model usable='yes' vendor='AMD'>Opteron_G3</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
++      <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
+       <model usable='no' vendor='AMD'>Opteron_G4</model>
+       <blockers model='Opteron_G4'>
+         <feature name='fma4'/>
+diff --git a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
+index eab56f9a7c..8a6379b7b9 100644
+--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
+@@ -692,7 +692,8 @@
+       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+       <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
+       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
+-      <model usable='yes' vendor='AMD'>Opteron_G3</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
++      <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
+       <model usable='no' vendor='AMD'>Opteron_G4</model>
+       <blockers model='Opteron_G4'>
+         <feature name='fma4'/>
+diff --git a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
+index e5b4cff7c6..02a5887255 100644
+--- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
+@@ -1327,10 +1327,14 @@
+       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+       <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
+       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
+-      <model usable='no' vendor='AMD'>Opteron_G3</model>
++      <model usable='no' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
+       <blockers model='Opteron_G3'>
+         <feature name='misalignsse'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>Opteron_G3-v1</model>
++      <blockers model='Opteron_G3-v1'>
++        <feature name='misalignsse'/>
++      </blockers>
+       <model usable='no' vendor='AMD'>Opteron_G4</model>
+       <blockers model='Opteron_G4'>
+         <feature name='3dnowprefetch'/>
+diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+index 6ec56068bd..7168fb805a 100644
+--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+@@ -691,7 +691,8 @@
+       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+       <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
+       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
+-      <model usable='yes' vendor='AMD'>Opteron_G3</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
++      <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
+       <model usable='no' vendor='AMD'>Opteron_G4</model>
+       <blockers model='Opteron_G4'>
+         <feature name='fma4'/>
+diff --git a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
+index 0e27b3400c..93373fbe5b 100644
+--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
+@@ -659,7 +659,8 @@
+       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+       <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
+       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
+-      <model usable='yes' vendor='AMD'>Opteron_G3</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
++      <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
+       <model usable='no' vendor='AMD'>Opteron_G4</model>
+       <blockers model='Opteron_G4'>
+         <feature name='fma4'/>
+diff --git a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
+index e588593d91..890164b50a 100644
+--- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
+@@ -1275,10 +1275,14 @@
+       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+       <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
+       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
+-      <model usable='no' vendor='AMD'>Opteron_G3</model>
++      <model usable='no' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
+       <blockers model='Opteron_G3'>
+         <feature name='misalignsse'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>Opteron_G3-v1</model>
++      <blockers model='Opteron_G3-v1'>
++        <feature name='misalignsse'/>
++      </blockers>
+       <model usable='no' vendor='AMD'>Opteron_G4</model>
+       <blockers model='Opteron_G4'>
+         <feature name='3dnowprefetch'/>
+diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
+index 7cb9663805..1c0a102063 100644
+--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
+@@ -658,7 +658,8 @@
+       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+       <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
+       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
+-      <model usable='yes' vendor='AMD'>Opteron_G3</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
++      <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
+       <model usable='no' vendor='AMD'>Opteron_G4</model>
+       <blockers model='Opteron_G4'>
+         <feature name='fma4'/>
+diff --git a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
+index c66731ceac..6348bf9eb9 100644
+--- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
+@@ -664,7 +664,8 @@
+       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+       <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
+       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
+-      <model usable='yes' vendor='AMD'>Opteron_G3</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
++      <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
+       <model usable='no' vendor='AMD'>Opteron_G4</model>
+       <blockers model='Opteron_G4'>
+         <feature name='fma4'/>
+diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml
+index ec61c328c9..dc9a0cc4b2 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
+@@ -1052,10 +1052,14 @@
+       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+       <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
+       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
+-      <model usable='no' vendor='AMD'>Opteron_G3</model>
++      <model usable='no' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
+       <blockers model='Opteron_G3'>
+         <feature name='misalignsse'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>Opteron_G3-v1</model>
++      <blockers model='Opteron_G3-v1'>
++        <feature name='misalignsse'/>
++      </blockers>
+       <model usable='no' vendor='AMD'>Opteron_G4</model>
+       <blockers model='Opteron_G4'>
+         <feature name='3dnowprefetch'/>
+diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
+index ec61c328c9..dc9a0cc4b2 100644
+--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
+@@ -1052,10 +1052,14 @@
+       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+       <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
+       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
+-      <model usable='no' vendor='AMD'>Opteron_G3</model>
++      <model usable='no' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
+       <blockers model='Opteron_G3'>
+         <feature name='misalignsse'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>Opteron_G3-v1</model>
++      <blockers model='Opteron_G3-v1'>
++        <feature name='misalignsse'/>
++      </blockers>
+       <model usable='no' vendor='AMD'>Opteron_G4</model>
+       <blockers model='Opteron_G4'>
+         <feature name='3dnowprefetch'/>
+diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
+index 8fd837d2c4..70c15a677a 100644
+--- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
+@@ -663,7 +663,8 @@
+       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+       <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
+       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
+-      <model usable='yes' vendor='AMD'>Opteron_G3</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
++      <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
+       <model usable='no' vendor='AMD'>Opteron_G4</model>
+       <blockers model='Opteron_G4'>
+         <feature name='fma4'/>
+diff --git a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
+index 2a78fe6926..875f902101 100644
+--- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
+@@ -664,7 +664,8 @@
+       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+       <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
+       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
+-      <model usable='yes' vendor='AMD'>Opteron_G3</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
++      <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
+       <model usable='no' vendor='AMD'>Opteron_G4</model>
+       <blockers model='Opteron_G4'>
+         <feature name='fma4'/>
+diff --git a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
+index cb7bb1513c..52324024a0 100644
+--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
+@@ -1051,10 +1051,14 @@
+       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+       <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
+       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
+-      <model usable='no' vendor='AMD'>Opteron_G3</model>
++      <model usable='no' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
+       <blockers model='Opteron_G3'>
+         <feature name='misalignsse'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>Opteron_G3-v1</model>
++      <blockers model='Opteron_G3-v1'>
++        <feature name='misalignsse'/>
++      </blockers>
+       <model usable='no' vendor='AMD'>Opteron_G4</model>
+       <blockers model='Opteron_G4'>
+         <feature name='3dnowprefetch'/>
+diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
+index 7c66d893ae..6291c3c303 100644
+--- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
+@@ -663,7 +663,8 @@
+       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+       <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
+       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
+-      <model usable='yes' vendor='AMD'>Opteron_G3</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
++      <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
+       <model usable='no' vendor='AMD'>Opteron_G4</model>
+       <blockers model='Opteron_G4'>
+         <feature name='fma4'/>
+diff --git a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
+index 1d23c25196..cc248936df 100644
+--- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
+@@ -842,7 +842,8 @@
+       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+       <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
+       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
+-      <model usable='yes' vendor='AMD'>Opteron_G3</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
++      <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
+       <model usable='no' vendor='AMD'>Opteron_G4</model>
+       <blockers model='Opteron_G4'>
+         <feature name='fma4'/>
+diff --git a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
+index 768769a4ef..b1e820ea61 100644
+--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
+@@ -1059,10 +1059,14 @@
+       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+       <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
+       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
+-      <model usable='no' vendor='AMD'>Opteron_G3</model>
++      <model usable='no' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
+       <blockers model='Opteron_G3'>
+         <feature name='misalignsse'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>Opteron_G3-v1</model>
++      <blockers model='Opteron_G3-v1'>
++        <feature name='misalignsse'/>
++      </blockers>
+       <model usable='no' vendor='AMD'>Opteron_G4</model>
+       <blockers model='Opteron_G4'>
+         <feature name='fma4'/>
+diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
+index 95106cfeab..c3cd328dea 100644
+--- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
+@@ -841,7 +841,8 @@
+       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+       <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
+       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
+-      <model usable='yes' vendor='AMD'>Opteron_G3</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
++      <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
+       <model usable='no' vendor='AMD'>Opteron_G4</model>
+       <blockers model='Opteron_G4'>
+         <feature name='fma4'/>
+diff --git a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
+index 5b777b730b..5dbfe76dd8 100644
+--- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
+@@ -843,7 +843,8 @@
+       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+       <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
+       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
+-      <model usable='yes' vendor='AMD'>Opteron_G3</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
++      <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
+       <model usable='no' vendor='AMD'>Opteron_G4</model>
+       <blockers model='Opteron_G4'>
+         <feature name='fma4'/>
+diff --git a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
+index 0ea4c2cdb8..a51e57f66d 100644
+--- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
+@@ -1034,10 +1034,14 @@
+       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+       <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
+       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
+-      <model usable='no' vendor='AMD'>Opteron_G3</model>
++      <model usable='no' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
+       <blockers model='Opteron_G3'>
+         <feature name='misalignsse'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>Opteron_G3-v1</model>
++      <blockers model='Opteron_G3-v1'>
++        <feature name='misalignsse'/>
++      </blockers>
+       <model usable='no' vendor='AMD'>Opteron_G4</model>
+       <blockers model='Opteron_G4'>
+         <feature name='fma4'/>
+diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
+index 506b949225..dfc98e58f0 100644
+--- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
+@@ -842,7 +842,8 @@
+       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+       <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
+       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
+-      <model usable='yes' vendor='AMD'>Opteron_G3</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
++      <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
+       <model usable='no' vendor='AMD'>Opteron_G4</model>
+       <blockers model='Opteron_G4'>
+         <feature name='fma4'/>
+diff --git a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
+index d84324eac6..9c21297cec 100644
+--- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
+@@ -843,7 +843,8 @@
+       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+       <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
+       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
+-      <model usable='yes' vendor='AMD'>Opteron_G3</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
++      <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
+       <model usable='no' vendor='AMD'>Opteron_G4</model>
+       <blockers model='Opteron_G4'>
+         <feature name='fma4'/>
+diff --git a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
+index cccf48aafb..81c404727c 100644
+--- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
+@@ -990,10 +990,14 @@
+       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+       <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
+       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
+-      <model usable='no' vendor='AMD'>Opteron_G3</model>
++      <model usable='no' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
+       <blockers model='Opteron_G3'>
+         <feature name='misalignsse'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>Opteron_G3-v1</model>
++      <blockers model='Opteron_G3-v1'>
++        <feature name='misalignsse'/>
++      </blockers>
+       <model usable='no' vendor='AMD'>Opteron_G4</model>
+       <blockers model='Opteron_G4'>
+         <feature name='fma4'/>
+diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
+index 05c06c9b25..744280a43a 100644
+--- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
+@@ -842,7 +842,8 @@
+       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+       <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
+       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
+-      <model usable='yes' vendor='AMD'>Opteron_G3</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
++      <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
+       <model usable='no' vendor='AMD'>Opteron_G4</model>
+       <blockers model='Opteron_G4'>
+         <feature name='fma4'/>
+diff --git a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
+index e295c808d7..3b5ee6ec78 100644
+--- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
+@@ -876,7 +876,8 @@
+       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+       <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
+       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
+-      <model usable='yes' vendor='AMD'>Opteron_G3</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
++      <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
+       <model usable='no' vendor='AMD'>Opteron_G4</model>
+       <blockers model='Opteron_G4'>
+         <feature name='fma4'/>
+diff --git a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
+index 8b338c75be..9091305bb5 100644
+--- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
+@@ -1015,10 +1015,14 @@
+       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+       <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
+       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
+-      <model usable='no' vendor='AMD'>Opteron_G3</model>
++      <model usable='no' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
+       <blockers model='Opteron_G3'>
+         <feature name='misalignsse'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>Opteron_G3-v1</model>
++      <blockers model='Opteron_G3-v1'>
++        <feature name='misalignsse'/>
++      </blockers>
+       <model usable='no' vendor='AMD'>Opteron_G4</model>
+       <blockers model='Opteron_G4'>
+         <feature name='fma4'/>
+diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
+index 6b2c1f15b5..330e9748b9 100644
+--- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
+@@ -875,7 +875,8 @@
+       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+       <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
+       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
+-      <model usable='yes' vendor='AMD'>Opteron_G3</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
++      <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
+       <model usable='no' vendor='AMD'>Opteron_G4</model>
+       <blockers model='Opteron_G4'>
+         <feature name='fma4'/>
+diff --git a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
+index ab82a874b1..adf0140fc2 100644
+--- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
+@@ -876,7 +876,8 @@
+       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+       <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
+       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
+-      <model usable='yes' vendor='AMD'>Opteron_G3</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
++      <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
+       <model usable='no' vendor='AMD'>Opteron_G4</model>
+       <blockers model='Opteron_G4'>
+         <feature name='fma4'/>
+diff --git a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
+index bf20e3d536..93efe9253b 100644
+--- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
+@@ -1015,10 +1015,14 @@
+       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+       <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
+       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
+-      <model usable='no' vendor='AMD'>Opteron_G3</model>
++      <model usable='no' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
+       <blockers model='Opteron_G3'>
+         <feature name='misalignsse'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>Opteron_G3-v1</model>
++      <blockers model='Opteron_G3-v1'>
++        <feature name='misalignsse'/>
++      </blockers>
+       <model usable='no' vendor='AMD'>Opteron_G4</model>
+       <blockers model='Opteron_G4'>
+         <feature name='fma4'/>
+diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
+index d28d4c1f14..e2e11f239f 100644
+--- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
+@@ -875,7 +875,8 @@
+       <model usable='yes' vendor='AMD'>Opteron_G1-v1</model>
+       <model usable='yes' vendor='AMD' canonical='Opteron_G2-v1'>Opteron_G2</model>
+       <model usable='yes' vendor='AMD'>Opteron_G2-v1</model>
+-      <model usable='yes' vendor='AMD'>Opteron_G3</model>
++      <model usable='yes' vendor='AMD' canonical='Opteron_G3-v1'>Opteron_G3</model>
++      <model usable='yes' vendor='AMD'>Opteron_G3-v1</model>
+       <model usable='no' vendor='AMD'>Opteron_G4</model>
+       <blockers model='Opteron_G4'>
+         <feature name='fma4'/>
+-- 
+2.47.1
diff --git a/libvirt-cpu_map-Add-Opteron_G4-v1-CPU-model.patch b/libvirt-cpu_map-Add-Opteron_G4-v1-CPU-model.patch
new file mode 100644
index 0000000..5c82b2f
--- /dev/null
+++ b/libvirt-cpu_map-Add-Opteron_G4-v1-CPU-model.patch
@@ -0,0 +1,1097 @@
+From 1c8864b7353dde6b0f2c2e25ed2c5625775136e0 Mon Sep 17 00:00:00 2001
+Message-ID: <1c8864b7353dde6b0f2c2e25ed2c5625775136e0.1734429554.git.jdenemar@redhat.com>
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Thu, 5 Dec 2024 15:49:46 +0100
+Subject: [PATCH] cpu_map: Add Opteron_G4-v1 CPU model
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit d092730fb4e629ec87c45e7a4340ae63c853556c)
+
+https://issues.redhat.com/browse/RHEL-70129
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ src/cpu_map/index.xml                                |  1 +
+ src/cpu_map/meson.build                              |  1 +
+ src/cpu_map/x86_Opteron_G4-v1.xml                    |  6 ++++++
+ tests/cputestdata/x86_64-cpuid-FX-8150-host.xml      |  2 +-
+ tests/cputestdata/x86_64-cpuid-Opteron-6234-host.xml |  2 +-
+ tests/cputestdata/x86_64-cpuid-Opteron-6282-host.xml |  2 +-
+ tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml       |  7 ++++++-
+ tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml       | 11 ++++++++++-
+ tests/domaincapsdata/qemu_5.2.0.x86_64.xml           |  7 ++++++-
+ tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml       |  7 ++++++-
+ tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml       | 11 ++++++++++-
+ tests/domaincapsdata/qemu_6.0.0.x86_64.xml           |  7 ++++++-
+ tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml       |  7 ++++++-
+ tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml       | 11 ++++++++++-
+ tests/domaincapsdata/qemu_6.1.0.x86_64.xml           |  7 ++++++-
+ tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml       |  7 ++++++-
+ tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml       | 11 ++++++++++-
+ tests/domaincapsdata/qemu_6.2.0.x86_64.xml           |  7 ++++++-
+ tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml       |  7 ++++++-
+ tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml       | 11 ++++++++++-
+ tests/domaincapsdata/qemu_7.0.0.x86_64.xml           |  7 ++++++-
+ tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml       |  7 ++++++-
+ tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml       | 11 ++++++++++-
+ tests/domaincapsdata/qemu_7.1.0.x86_64.xml           |  7 ++++++-
+ tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml       |  7 ++++++-
+ tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml   | 10 +++++++++-
+ tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml       | 10 +++++++++-
+ tests/domaincapsdata/qemu_7.2.0.x86_64.xml           |  7 ++++++-
+ tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml       |  7 ++++++-
+ tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml       | 10 +++++++++-
+ tests/domaincapsdata/qemu_8.0.0.x86_64.xml           |  7 ++++++-
+ tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml       |  7 ++++++-
+ tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml       |  9 ++++++++-
+ tests/domaincapsdata/qemu_8.1.0.x86_64.xml           |  7 ++++++-
+ tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml       |  7 ++++++-
+ tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml       |  9 ++++++++-
+ tests/domaincapsdata/qemu_8.2.0.x86_64.xml           |  7 ++++++-
+ tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml       |  7 ++++++-
+ tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml       |  9 ++++++++-
+ tests/domaincapsdata/qemu_9.0.0.x86_64.xml           |  7 ++++++-
+ tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml       |  7 ++++++-
+ tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml       |  9 ++++++++-
+ tests/domaincapsdata/qemu_9.1.0.x86_64.xml           |  7 ++++++-
+ tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml       |  7 ++++++-
+ tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml       |  9 ++++++++-
+ tests/domaincapsdata/qemu_9.2.0.x86_64.xml           |  7 ++++++-
+ 46 files changed, 294 insertions(+), 43 deletions(-)
+ create mode 100644 src/cpu_map/x86_Opteron_G4-v1.xml
+
+diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml
+index cdb8a568a6..40be965c36 100644
+--- 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 d735c54fd6..b1bff43d1a 100644
+--- 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
+index 0000000000..e89c93948d
+--- /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 d8c6a8ac0f..9549fa1507 100644
+--- 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 d8c6a8ac0f..9549fa1507 100644
+--- 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 d8c6a8ac0f..9549fa1507 100644
+--- 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 f673f670a0..48303b17e1 100644
+--- 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 6a3af31956..bc8fd8b7e8 100644
+--- 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 f0f6303099..a149caaac7 100644
+--- 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 24f2c91022..342e2b3ccd 100644
+--- 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 111613d0b8..ddf0080cc1 100644
+--- 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 82dbca5341..79a282c065 100644
+--- 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 a869314868..edabb37ead 100644
+--- 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 660744d28c..801fddf93a 100644
+--- 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 8bc739091e..386083131c 100644
+--- 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 a3014c8142..12aa247563 100644
+--- 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 b4d902b44c..8eaadfd389 100644
+--- 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 2e9bc75e1f..5744c2cbbf 100644
+--- 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 8a6379b7b9..7129b49670 100644
+--- 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 02a5887255..e10973b629 100644
+--- 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 7168fb805a..98cf875d10 100644
+--- 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 93373fbe5b..7617177578 100644
+--- 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 890164b50a..6d1b777442 100644
+--- 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 1c0a102063..95b3476116 100644
+--- 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 6348bf9eb9..fe591e6644 100644
+--- 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 dc9a0cc4b2..6e6eb8d57c 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
+@@ -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 dc9a0cc4b2..6e6eb8d57c 100644
+--- 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 70c15a677a..3568c4011b 100644
+--- 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 875f902101..3846d633c1 100644
+--- 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 52324024a0..1983d5e635 100644
+--- 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 6291c3c303..0fd169dda6 100644
+--- 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 cc248936df..2f1ef6b196 100644
+--- 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 b1e820ea61..816891f303 100644
+--- 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 c3cd328dea..6bf06dd445 100644
+--- 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 5dbfe76dd8..b4258868aa 100644
+--- 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 a51e57f66d..fc92315651 100644
+--- 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 dfc98e58f0..2b33577cec 100644
+--- 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 9c21297cec..85216b05a4 100644
+--- 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 81c404727c..8cf49e42f8 100644
+--- 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 744280a43a..6570359797 100644
+--- 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 3b5ee6ec78..b7aa3acedd 100644
+--- 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 9091305bb5..fbcae333c6 100644
+--- 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 330e9748b9..65f4238125 100644
+--- 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 adf0140fc2..21f38b8f2f 100644
+--- 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 93efe9253b..5071762544 100644
+--- 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 e2e11f239f..e3391a74bf 100644
+--- 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'/>
+-- 
+2.47.1
diff --git a/libvirt-cpu_map-Add-Opteron_G5-v1-CPU-model.patch b/libvirt-cpu_map-Add-Opteron_G5-v1-CPU-model.patch
new file mode 100644
index 0000000..3469ad6
--- /dev/null
+++ b/libvirt-cpu_map-Add-Opteron_G5-v1-CPU-model.patch
@@ -0,0 +1,1154 @@
+From d147eccd3b750ded3dbf3d65fcc50f2a1cb209e4 Mon Sep 17 00:00:00 2001
+Message-ID: <d147eccd3b750ded3dbf3d65fcc50f2a1cb209e4.1734429554.git.jdenemar@redhat.com>
+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>
+(cherry picked from commit 9bc479a3c0e0453e50ceb149abc41c5787e61735)
+
+https://issues.redhat.com/browse/RHEL-70129
+
+Signed-off-by: Jiri Denemark <jdenemar@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>
+-- 
+2.47.1
diff --git a/libvirt-cpu_map-Add-Penryn-v1-CPU-model.patch b/libvirt-cpu_map-Add-Penryn-v1-CPU-model.patch
new file mode 100644
index 0000000..40dfb5b
--- /dev/null
+++ b/libvirt-cpu_map-Add-Penryn-v1-CPU-model.patch
@@ -0,0 +1,684 @@
+From a947a1e1d18ed4ea0f2dc5ef7e25ab9ab31c9f4b Mon Sep 17 00:00:00 2001
+Message-ID: <a947a1e1d18ed4ea0f2dc5ef7e25ab9ab31c9f4b.1734429554.git.jdenemar@redhat.com>
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Thu, 5 Dec 2024 15:41:18 +0100
+Subject: [PATCH] cpu_map: Add Penryn-v1 CPU model
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit 537f136549ea9c02642b6114c540c6cb1276ed6e)
+
+https://issues.redhat.com/browse/RHEL-70129
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ src/cpu_map/index.xml                               | 1 +
+ src/cpu_map/meson.build                             | 1 +
+ src/cpu_map/x86_Penryn-v1.xml                       | 6 ++++++
+ tests/cputestdata/x86_64-cpuid-Core2-Q9500-host.xml | 2 +-
+ tests/cputestdata/x86_64-cpuid-Xeon-X5460-host.xml  | 2 +-
+ tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml      | 3 ++-
+ tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml      | 3 ++-
+ tests/domaincapsdata/qemu_5.2.0.x86_64.xml          | 3 ++-
+ tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml      | 3 ++-
+ tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml      | 3 ++-
+ tests/domaincapsdata/qemu_6.0.0.x86_64.xml          | 3 ++-
+ tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml      | 3 ++-
+ tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml      | 3 ++-
+ tests/domaincapsdata/qemu_6.1.0.x86_64.xml          | 3 ++-
+ tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml      | 3 ++-
+ tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml      | 3 ++-
+ tests/domaincapsdata/qemu_6.2.0.x86_64.xml          | 3 ++-
+ tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml      | 3 ++-
+ tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml      | 3 ++-
+ tests/domaincapsdata/qemu_7.0.0.x86_64.xml          | 3 ++-
+ tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml      | 3 ++-
+ tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml      | 3 ++-
+ tests/domaincapsdata/qemu_7.1.0.x86_64.xml          | 3 ++-
+ tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml      | 3 ++-
+ tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml  | 3 ++-
+ tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml      | 3 ++-
+ tests/domaincapsdata/qemu_7.2.0.x86_64.xml          | 3 ++-
+ tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml      | 3 ++-
+ tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml      | 3 ++-
+ tests/domaincapsdata/qemu_8.0.0.x86_64.xml          | 3 ++-
+ tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml      | 3 ++-
+ tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml      | 3 ++-
+ tests/domaincapsdata/qemu_8.1.0.x86_64.xml          | 3 ++-
+ tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml      | 3 ++-
+ tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml      | 3 ++-
+ tests/domaincapsdata/qemu_8.2.0.x86_64.xml          | 3 ++-
+ tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml      | 3 ++-
+ tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml      | 3 ++-
+ tests/domaincapsdata/qemu_9.0.0.x86_64.xml          | 3 ++-
+ tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml      | 3 ++-
+ tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml      | 3 ++-
+ tests/domaincapsdata/qemu_9.1.0.x86_64.xml          | 3 ++-
+ tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml      | 3 ++-
+ tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml      | 3 ++-
+ tests/domaincapsdata/qemu_9.2.0.x86_64.xml          | 3 ++-
+ 45 files changed, 90 insertions(+), 42 deletions(-)
+ create mode 100644 src/cpu_map/x86_Penryn-v1.xml
+
+diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml
+index e9a180526e..16ebe36539 100644
+--- a/src/cpu_map/index.xml
++++ b/src/cpu_map/index.xml
+@@ -41,6 +41,7 @@
+       <include filename='x86_Conroe.xml'/>
+       <include filename='x86_Conroe-v1.xml'/>
+       <include filename='x86_Penryn.xml'/>
++      <include filename='x86_Penryn-v1.xml'/>
+       <include filename='x86_Nehalem.xml'/>
+       <include filename='x86_Nehalem-IBRS.xml'/>
+       <include filename='x86_Nehalem-v1.xml'/>
+diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build
+index cbf7bb407b..4d74431c55 100644
+--- a/src/cpu_map/meson.build
++++ b/src/cpu_map/meson.build
+@@ -115,6 +115,7 @@ cpumap_data = [
+   'x86_Opteron_G3.xml',
+   'x86_Opteron_G4.xml',
+   'x86_Opteron_G5.xml',
++  'x86_Penryn-v1.xml',
+   'x86_Penryn.xml',
+   'x86_pentium-v1.xml',
+   'x86_pentium.xml',
+diff --git a/src/cpu_map/x86_Penryn-v1.xml b/src/cpu_map/x86_Penryn-v1.xml
+new file mode 100644
+index 0000000000..5da70a233e
+--- /dev/null
++++ b/src/cpu_map/x86_Penryn-v1.xml
+@@ -0,0 +1,6 @@
++<cpus>
++  <model name='Penryn-v1'>
++    <decode host='on' guest='off'/>
++    <model name='Penryn'/>
++  </model>
++</cpus>
+diff --git a/tests/cputestdata/x86_64-cpuid-Core2-Q9500-host.xml b/tests/cputestdata/x86_64-cpuid-Core2-Q9500-host.xml
+index dac84ba5fc..5034355859 100644
+--- a/tests/cputestdata/x86_64-cpuid-Core2-Q9500-host.xml
++++ b/tests/cputestdata/x86_64-cpuid-Core2-Q9500-host.xml
+@@ -1,6 +1,6 @@
+ <cpu>
+   <arch>x86_64</arch>
+-  <model>Penryn</model>
++  <model>Penryn-v1</model>
+   <vendor>Intel</vendor>
+   <signature family='6' model='23' stepping='10'/>
+   <feature name='dtes64'/>
+diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-X5460-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-X5460-host.xml
+index b7bc4cbb5b..a0516e6652 100644
+--- a/tests/cputestdata/x86_64-cpuid-Xeon-X5460-host.xml
++++ b/tests/cputestdata/x86_64-cpuid-Xeon-X5460-host.xml
+@@ -1,6 +1,6 @@
+ <cpu>
+   <arch>x86_64</arch>
+-  <model>Penryn</model>
++  <model>Penryn-v1</model>
+   <vendor>Intel</vendor>
+   <signature family='6' model='23' stepping='6'/>
+   <feature name='dtes64'/>
+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 3a14131fda..efd8f06104 100644
+--- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
+@@ -574,7 +574,8 @@
+         <feature name='tbm'/>
+         <feature name='xop'/>
+       </blockers>
+-      <model usable='yes' vendor='Intel'>Penryn</model>
++      <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>
+       <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
+       <blockers model='SandyBridge-IBRS'>
+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 5223402151..beb923a1f3 100644
+--- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
+@@ -1076,7 +1076,8 @@
+         <feature name='tbm'/>
+         <feature name='xop'/>
+       </blockers>
+-      <model usable='yes' vendor='Intel'>Penryn</model>
++      <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>
+       <blockers model='SandyBridge'>
+         <feature name='avx'/>
+diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
+index a3638c64a4..d9ae5568be 100644
+--- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
+@@ -573,7 +573,8 @@
+         <feature name='tbm'/>
+         <feature name='xop'/>
+       </blockers>
+-      <model usable='yes' vendor='Intel'>Penryn</model>
++      <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>
+       <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
+       <blockers model='SandyBridge-IBRS'>
+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 9af3b3768d..403b9f6674 100644
+--- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
+@@ -596,7 +596,8 @@
+         <feature name='tbm'/>
+         <feature name='xop'/>
+       </blockers>
+-      <model usable='yes' vendor='Intel'>Penryn</model>
++      <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>
+       <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
+       <blockers model='SandyBridge-IBRS'>
+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 7932c25f39..f2ad35c6cd 100644
+--- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
+@@ -1166,7 +1166,8 @@
+         <feature name='tbm'/>
+         <feature name='xop'/>
+       </blockers>
+-      <model usable='yes' vendor='Intel'>Penryn</model>
++      <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>
+       <blockers model='SandyBridge'>
+         <feature name='avx'/>
+diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
+index 72c598466a..07570f5b02 100644
+--- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
+@@ -595,7 +595,8 @@
+         <feature name='tbm'/>
+         <feature name='xop'/>
+       </blockers>
+-      <model usable='yes' vendor='Intel'>Penryn</model>
++      <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>
+       <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
+       <blockers model='SandyBridge-IBRS'>
+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 b3ba5b020d..4cf841b3e9 100644
+--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
+@@ -666,7 +666,8 @@
+         <feature name='tbm'/>
+         <feature name='xop'/>
+       </blockers>
+-      <model usable='yes' vendor='Intel'>Penryn</model>
++      <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>
+       <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
+       <blockers model='SandyBridge-IBRS'>
+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 69a73ea9b2..bbb9cfff7f 100644
+--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
+@@ -1306,7 +1306,8 @@
+         <feature name='tbm'/>
+         <feature name='xop'/>
+       </blockers>
+-      <model usable='yes' vendor='Intel'>Penryn</model>
++      <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>
+       <blockers model='SandyBridge'>
+         <feature name='avx'/>
+diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
+index 54edabd43f..0c615f1802 100644
+--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
+@@ -665,7 +665,8 @@
+         <feature name='tbm'/>
+         <feature name='xop'/>
+       </blockers>
+-      <model usable='yes' vendor='Intel'>Penryn</model>
++      <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>
+       <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
+       <blockers model='SandyBridge-IBRS'>
+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 be908c6cc6..e468a90911 100644
+--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
+@@ -663,7 +663,8 @@
+         <feature name='tbm'/>
+         <feature name='xop'/>
+       </blockers>
+-      <model usable='yes' vendor='Intel'>Penryn</model>
++      <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>
+       <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
+       <blockers model='SandyBridge-IBRS'>
+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 8fb08191ea..b46a515864 100644
+--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
+@@ -1303,7 +1303,8 @@
+         <feature name='tbm'/>
+         <feature name='xop'/>
+       </blockers>
+-      <model usable='yes' vendor='Intel'>Penryn</model>
++      <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>
+       <blockers model='SandyBridge'>
+         <feature name='avx'/>
+diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+index 1f9bdf36af..d06e67a5e2 100644
+--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+@@ -662,7 +662,8 @@
+         <feature name='tbm'/>
+         <feature name='xop'/>
+       </blockers>
+-      <model usable='yes' vendor='Intel'>Penryn</model>
++      <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>
+       <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
+       <blockers model='SandyBridge-IBRS'>
+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 14081dfafd..a0c47fd84e 100644
+--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
+@@ -690,7 +690,8 @@
+         <feature name='tbm'/>
+         <feature name='xop'/>
+       </blockers>
+-      <model usable='yes' vendor='Intel'>Penryn</model>
++      <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>
+       <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
+       <blockers model='SandyBridge-IBRS'>
+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 d9ba0202bd..db68047af7 100644
+--- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
+@@ -1332,7 +1332,8 @@
+         <feature name='tbm'/>
+         <feature name='xop'/>
+       </blockers>
+-      <model usable='yes' vendor='Intel'>Penryn</model>
++      <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>
+       <blockers model='SandyBridge'>
+         <feature name='avx'/>
+diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+index bba1b69e41..71999ab677 100644
+--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+@@ -689,7 +689,8 @@
+         <feature name='tbm'/>
+         <feature name='xop'/>
+       </blockers>
+-      <model usable='yes' vendor='Intel'>Penryn</model>
++      <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>
+       <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
+       <blockers model='SandyBridge-IBRS'>
+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 9fb0fbe581..3a2874f08a 100644
+--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
+@@ -657,7 +657,8 @@
+         <feature name='tbm'/>
+         <feature name='xop'/>
+       </blockers>
+-      <model usable='yes' vendor='Intel'>Penryn</model>
++      <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>
+       <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
+       <blockers model='SandyBridge-IBRS'>
+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 b7f01c2b58..2416987852 100644
+--- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
+@@ -1280,7 +1280,8 @@
+         <feature name='tbm'/>
+         <feature name='xop'/>
+       </blockers>
+-      <model usable='yes' vendor='Intel'>Penryn</model>
++      <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>
+       <blockers model='SandyBridge'>
+         <feature name='avx'/>
+diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
+index f7e9853077..eda271a1b2 100644
+--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
+@@ -656,7 +656,8 @@
+         <feature name='tbm'/>
+         <feature name='xop'/>
+       </blockers>
+-      <model usable='yes' vendor='Intel'>Penryn</model>
++      <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>
+       <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
+       <blockers model='SandyBridge-IBRS'>
+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 4b670c95fe..2b5cfdae87 100644
+--- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
+@@ -662,7 +662,8 @@
+         <feature name='tbm'/>
+         <feature name='xop'/>
+       </blockers>
+-      <model usable='yes' vendor='Intel'>Penryn</model>
++      <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>
+       <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
+       <blockers model='SandyBridge-IBRS'>
+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 8b85bd98b4..6a191f3ce8 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
+@@ -1057,7 +1057,8 @@
+         <feature name='tbm'/>
+         <feature name='xop'/>
+       </blockers>
+-      <model usable='yes' vendor='Intel'>Penryn</model>
++      <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>
+       <blockers model='SandyBridge'>
+         <feature name='tsc-deadline'/>
+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 8b85bd98b4..6a191f3ce8 100644
+--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
+@@ -1057,7 +1057,8 @@
+         <feature name='tbm'/>
+         <feature name='xop'/>
+       </blockers>
+-      <model usable='yes' vendor='Intel'>Penryn</model>
++      <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>
+       <blockers model='SandyBridge'>
+         <feature name='tsc-deadline'/>
+diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
+index 0e1328f1fc..48b4ced22f 100644
+--- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
+@@ -661,7 +661,8 @@
+         <feature name='tbm'/>
+         <feature name='xop'/>
+       </blockers>
+-      <model usable='yes' vendor='Intel'>Penryn</model>
++      <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>
+       <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
+       <blockers model='SandyBridge-IBRS'>
+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 b3040a9e6e..ec1fea19fc 100644
+--- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
+@@ -662,7 +662,8 @@
+         <feature name='tbm'/>
+         <feature name='xop'/>
+       </blockers>
+-      <model usable='yes' vendor='Intel'>Penryn</model>
++      <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>
+       <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
+       <blockers model='SandyBridge-IBRS'>
+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 ac533cccfa..049bef7aa6 100644
+--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
+@@ -1056,7 +1056,8 @@
+         <feature name='tbm'/>
+         <feature name='xop'/>
+       </blockers>
+-      <model usable='yes' vendor='Intel'>Penryn</model>
++      <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>
+       <blockers model='SandyBridge'>
+         <feature name='tsc-deadline'/>
+diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
+index 0558eb7588..206a3a86a2 100644
+--- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
+@@ -661,7 +661,8 @@
+         <feature name='tbm'/>
+         <feature name='xop'/>
+       </blockers>
+-      <model usable='yes' vendor='Intel'>Penryn</model>
++      <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>
+       <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
+       <blockers model='SandyBridge-IBRS'>
+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 3b334589ed..34fbc59118 100644
+--- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
+@@ -840,7 +840,8 @@
+         <feature name='tbm'/>
+         <feature name='xop'/>
+       </blockers>
+-      <model usable='yes' vendor='Intel'>Penryn</model>
++      <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>
+       <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
+       <blockers model='SandyBridge-IBRS'>
+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 9815a01beb..2a836cbc21 100644
+--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
+@@ -1064,7 +1064,8 @@
+         <feature name='tbm'/>
+         <feature name='xop'/>
+       </blockers>
+-      <model usable='yes' vendor='Intel'>Penryn</model>
++      <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>
+       <blockers model='SandyBridge'>
+         <feature name='tsc-deadline'/>
+diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
+index 3b1796949f..3380b8a9aa 100644
+--- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
+@@ -839,7 +839,8 @@
+         <feature name='tbm'/>
+         <feature name='xop'/>
+       </blockers>
+-      <model usable='yes' vendor='Intel'>Penryn</model>
++      <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>
+       <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
+       <blockers model='SandyBridge-IBRS'>
+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 c4d2a768bd..0ec9ebeafe 100644
+--- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
+@@ -841,7 +841,8 @@
+         <feature name='tbm'/>
+         <feature name='xop'/>
+       </blockers>
+-      <model usable='yes' vendor='Intel'>Penryn</model>
++      <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>
+       <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
+       <blockers model='SandyBridge-IBRS'>
+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 207092ba7b..b3fd8eb6c6 100644
+--- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
+@@ -1039,7 +1039,8 @@
+         <feature name='tbm'/>
+         <feature name='xop'/>
+       </blockers>
+-      <model usable='yes' vendor='Intel'>Penryn</model>
++      <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>
+       <blockers model='SandyBridge'>
+         <feature name='tsc-deadline'/>
+diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
+index 855dfef498..210024bc44 100644
+--- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
+@@ -840,7 +840,8 @@
+         <feature name='tbm'/>
+         <feature name='xop'/>
+       </blockers>
+-      <model usable='yes' vendor='Intel'>Penryn</model>
++      <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>
+       <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
+       <blockers model='SandyBridge-IBRS'>
+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 f7ddcd9aff..2aade71dae 100644
+--- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
+@@ -841,7 +841,8 @@
+         <feature name='tbm'/>
+         <feature name='xop'/>
+       </blockers>
+-      <model usable='yes' vendor='Intel'>Penryn</model>
++      <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>
+       <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
+       <blockers model='SandyBridge-IBRS'>
+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 3419e26d32..36cec1ee6b 100644
+--- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
+@@ -996,7 +996,8 @@
+         <feature name='tbm'/>
+         <feature name='xop'/>
+       </blockers>
+-      <model usable='yes' vendor='Intel'>Penryn</model>
++      <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>
+       <blockers model='SandyBridge'>
+         <feature name='tsc-deadline'/>
+diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
+index 43bc77f7cc..8316b40fce 100644
+--- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
+@@ -840,7 +840,8 @@
+         <feature name='tbm'/>
+         <feature name='xop'/>
+       </blockers>
+-      <model usable='yes' vendor='Intel'>Penryn</model>
++      <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>
+       <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
+       <blockers model='SandyBridge-IBRS'>
+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 0a962420cd..cabd1c3694 100644
+--- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
+@@ -874,7 +874,8 @@
+         <feature name='tbm'/>
+         <feature name='xop'/>
+       </blockers>
+-      <model usable='yes' vendor='Intel'>Penryn</model>
++      <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>
+       <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
+       <blockers model='SandyBridge-IBRS'>
+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 02209df41b..67a8a5f5e7 100644
+--- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
+@@ -1021,7 +1021,8 @@
+         <feature name='tbm'/>
+         <feature name='xop'/>
+       </blockers>
+-      <model usable='yes' vendor='Intel'>Penryn</model>
++      <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>
+       <blockers model='SandyBridge'>
+         <feature name='tsc-deadline'/>
+diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
+index 49e1df7be4..45252b6b81 100644
+--- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
+@@ -873,7 +873,8 @@
+         <feature name='tbm'/>
+         <feature name='xop'/>
+       </blockers>
+-      <model usable='yes' vendor='Intel'>Penryn</model>
++      <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>
+       <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
+       <blockers model='SandyBridge-IBRS'>
+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 56449ad3db..cc5cbfbf19 100644
+--- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
+@@ -874,7 +874,8 @@
+         <feature name='tbm'/>
+         <feature name='xop'/>
+       </blockers>
+-      <model usable='yes' vendor='Intel'>Penryn</model>
++      <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>
+       <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
+       <blockers model='SandyBridge-IBRS'>
+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 04a759a16b..d0761a2c57 100644
+--- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
+@@ -1021,7 +1021,8 @@
+         <feature name='tbm'/>
+         <feature name='xop'/>
+       </blockers>
+-      <model usable='yes' vendor='Intel'>Penryn</model>
++      <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>
+       <blockers model='SandyBridge'>
+         <feature name='tsc-deadline'/>
+diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
+index 7b3379b3e5..df2f9d27ad 100644
+--- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
+@@ -873,7 +873,8 @@
+         <feature name='tbm'/>
+         <feature name='xop'/>
+       </blockers>
+-      <model usable='yes' vendor='Intel'>Penryn</model>
++      <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>
+       <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
+       <blockers model='SandyBridge-IBRS'>
+-- 
+2.47.1
diff --git a/libvirt-cpu_map-Add-athlon-v1-CPU-model.patch b/libvirt-cpu_map-Add-athlon-v1-CPU-model.patch
new file mode 100644
index 0000000..5dffb72
--- /dev/null
+++ b/libvirt-cpu_map-Add-athlon-v1-CPU-model.patch
@@ -0,0 +1,879 @@
+From 70e3771c2d845924934ae776f0419ca9aa52eed5 Mon Sep 17 00:00:00 2001
+Message-ID: <70e3771c2d845924934ae776f0419ca9aa52eed5.1734429554.git.jdenemar@redhat.com>
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Thu, 5 Dec 2024 15:43:25 +0100
+Subject: [PATCH] cpu_map: Add athlon-v1 CPU model
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit 6b775a68ec90595c2a0892c70985ca0784f87c10)
+
+https://issues.redhat.com/browse/RHEL-70129
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ src/cpu_map/index.xml                              | 1 +
+ src/cpu_map/meson.build                            | 1 +
+ src/cpu_map/x86_athlon-v1.xml                      | 6 ++++++
+ tests/cputestdata/x86_64-cpuid-Phenom-B95-host.xml | 2 +-
+ tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml     | 7 ++++++-
+ tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_5.2.0.x86_64.xml         | 7 ++++++-
+ tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml     | 7 ++++++-
+ tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_6.0.0.x86_64.xml         | 7 ++++++-
+ tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml     | 7 ++++++-
+ tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_6.1.0.x86_64.xml         | 7 ++++++-
+ tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml     | 7 ++++++-
+ tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_6.2.0.x86_64.xml         | 7 ++++++-
+ tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml     | 7 ++++++-
+ tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_7.0.0.x86_64.xml         | 7 ++++++-
+ tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml     | 7 ++++++-
+ tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_7.1.0.x86_64.xml         | 7 ++++++-
+ tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml     | 7 ++++++-
+ tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml | 3 ++-
+ tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_7.2.0.x86_64.xml         | 7 ++++++-
+ tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml     | 7 ++++++-
+ tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_8.0.0.x86_64.xml         | 7 ++++++-
+ tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml     | 7 ++++++-
+ tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_8.1.0.x86_64.xml         | 7 ++++++-
+ tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml     | 7 ++++++-
+ tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_8.2.0.x86_64.xml         | 7 ++++++-
+ tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml     | 7 ++++++-
+ tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_9.0.0.x86_64.xml         | 7 ++++++-
+ tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml     | 7 ++++++-
+ tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_9.1.0.x86_64.xml         | 7 ++++++-
+ tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml     | 7 ++++++-
+ tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_9.2.0.x86_64.xml         | 7 ++++++-
+ 44 files changed, 193 insertions(+), 41 deletions(-)
+ create mode 100644 src/cpu_map/x86_athlon-v1.xml
+
+diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml
+index a0aa677dee..5f42fdc7fd 100644
+--- a/src/cpu_map/index.xml
++++ b/src/cpu_map/index.xml
+@@ -133,6 +133,7 @@
+ 
+     <group name='AMD CPU models'>
+       <include filename='x86_athlon.xml'/>
++      <include filename='x86_athlon-v1.xml'/>
+       <include filename='x86_phenom.xml'/>
+       <include filename='x86_Opteron_G1.xml'/>
+       <include filename='x86_Opteron_G2.xml'/>
+diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build
+index 70c7d2091b..8d45feee00 100644
+--- a/src/cpu_map/meson.build
++++ b/src/cpu_map/meson.build
+@@ -24,6 +24,7 @@ cpumap_data = [
+   'ppc64_vendors.xml',
+   'x86_486-v1.xml',
+   'x86_486.xml',
++  'x86_athlon-v1.xml',
+   'x86_athlon.xml',
+   'x86_Broadwell-IBRS.xml',
+   'x86_Broadwell-noTSX-IBRS.xml',
+diff --git a/src/cpu_map/x86_athlon-v1.xml b/src/cpu_map/x86_athlon-v1.xml
+new file mode 100644
+index 0000000000..cefe282c51
+--- /dev/null
++++ b/src/cpu_map/x86_athlon-v1.xml
+@@ -0,0 +1,6 @@
++<cpus>
++  <model name='athlon-v1'>
++    <decode host='on' guest='off'/>
++    <model name='athlon'/>
++  </model>
++</cpus>
+diff --git a/tests/cputestdata/x86_64-cpuid-Phenom-B95-host.xml b/tests/cputestdata/x86_64-cpuid-Phenom-B95-host.xml
+index 6a4196b735..b337947d3e 100644
+--- a/tests/cputestdata/x86_64-cpuid-Phenom-B95-host.xml
++++ b/tests/cputestdata/x86_64-cpuid-Phenom-B95-host.xml
+@@ -1,6 +1,6 @@
+ <cpu>
+   <arch>x86_64</arch>
+-  <model>athlon</model>
++  <model>athlon-v1</model>
+   <vendor>AMD</vendor>
+   <signature family='16' model='4' stepping='2'/>
+   <feature name='pni'/>
+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 43e1ca8861..c71286deb2 100644
+--- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
+@@ -788,11 +788,16 @@
+       <blockers model='Westmere-v2'>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='no' vendor='AMD'>athlon</model>
++      <model usable='no' vendor='AMD' canonical='athlon-v1'>athlon</model>
+       <blockers model='athlon'>
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>athlon-v1</model>
++      <blockers model='athlon-v1'>
++        <feature name='3dnow'/>
++        <feature name='3dnowext'/>
++      </blockers>
+       <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
+       <blockers model='core2duo'>
+         <feature name='ss'/>
+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 0718de04f7..26f3eed92b 100644
+--- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
+@@ -1431,7 +1431,8 @@
+       <blockers model='Westmere-v2'>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='yes' vendor='AMD'>athlon</model>
++      <model usable='yes' vendor='AMD' canonical='athlon-v1'>athlon</model>
++      <model usable='yes' vendor='AMD'>athlon-v1</model>
+       <model usable='yes' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
+       <model usable='yes' vendor='Intel'>core2duo-v1</model>
+       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
+index 6eb78e68f0..6e67479e25 100644
+--- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
+@@ -787,11 +787,16 @@
+       <blockers model='Westmere-v2'>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='no' vendor='AMD'>athlon</model>
++      <model usable='no' vendor='AMD' canonical='athlon-v1'>athlon</model>
+       <blockers model='athlon'>
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>athlon-v1</model>
++      <blockers model='athlon-v1'>
++        <feature name='3dnow'/>
++        <feature name='3dnowext'/>
++      </blockers>
+       <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
+       <blockers model='core2duo'>
+         <feature name='ss'/>
+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 3b716faf00..d5b703e09a 100644
+--- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
+@@ -810,11 +810,16 @@
+       <blockers model='Westmere-v2'>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='no' vendor='AMD'>athlon</model>
++      <model usable='no' vendor='AMD' canonical='athlon-v1'>athlon</model>
+       <blockers model='athlon'>
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>athlon-v1</model>
++      <blockers model='athlon-v1'>
++        <feature name='3dnow'/>
++        <feature name='3dnowext'/>
++      </blockers>
+       <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
+       <blockers model='core2duo'>
+         <feature name='ss'/>
+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 bd8c0a086c..5928a72da9 100644
+--- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
+@@ -1521,7 +1521,8 @@
+       <blockers model='Westmere-v2'>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='yes' vendor='AMD'>athlon</model>
++      <model usable='yes' vendor='AMD' canonical='athlon-v1'>athlon</model>
++      <model usable='yes' vendor='AMD'>athlon-v1</model>
+       <model usable='yes' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
+       <model usable='yes' vendor='Intel'>core2duo-v1</model>
+       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
+index b6ec55cf0c..69c1eb816f 100644
+--- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
+@@ -809,11 +809,16 @@
+       <blockers model='Westmere-v2'>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='no' vendor='AMD'>athlon</model>
++      <model usable='no' vendor='AMD' canonical='athlon-v1'>athlon</model>
+       <blockers model='athlon'>
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>athlon-v1</model>
++      <blockers model='athlon-v1'>
++        <feature name='3dnow'/>
++        <feature name='3dnowext'/>
++      </blockers>
+       <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
+       <blockers model='core2duo'>
+         <feature name='ss'/>
+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 e6615316f7..c65db67a41 100644
+--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
+@@ -911,11 +911,16 @@
+       <blockers model='Westmere-v2'>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='no' vendor='AMD'>athlon</model>
++      <model usable='no' vendor='AMD' canonical='athlon-v1'>athlon</model>
+       <blockers model='athlon'>
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>athlon-v1</model>
++      <blockers model='athlon-v1'>
++        <feature name='3dnow'/>
++        <feature name='3dnowext'/>
++      </blockers>
+       <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
+       <blockers model='core2duo'>
+         <feature name='ss'/>
+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 50d6395d7f..e85937b36d 100644
+--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
+@@ -1718,7 +1718,8 @@
+       <blockers model='Westmere-v2'>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='yes' vendor='AMD'>athlon</model>
++      <model usable='yes' vendor='AMD' canonical='athlon-v1'>athlon</model>
++      <model usable='yes' vendor='AMD'>athlon-v1</model>
+       <model usable='yes' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
+       <model usable='yes' vendor='Intel'>core2duo-v1</model>
+       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
+index 974346f980..b1b76ad6fd 100644
+--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
+@@ -910,11 +910,16 @@
+       <blockers model='Westmere-v2'>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='no' vendor='AMD'>athlon</model>
++      <model usable='no' vendor='AMD' canonical='athlon-v1'>athlon</model>
+       <blockers model='athlon'>
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>athlon-v1</model>
++      <blockers model='athlon-v1'>
++        <feature name='3dnow'/>
++        <feature name='3dnowext'/>
++      </blockers>
+       <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
+       <blockers model='core2duo'>
+         <feature name='ss'/>
+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 812ebd5e0a..fa27ff520a 100644
+--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
+@@ -917,11 +917,16 @@
+       <blockers model='Westmere-v2'>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='no' vendor='AMD'>athlon</model>
++      <model usable='no' vendor='AMD' canonical='athlon-v1'>athlon</model>
+       <blockers model='athlon'>
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>athlon-v1</model>
++      <blockers model='athlon-v1'>
++        <feature name='3dnow'/>
++        <feature name='3dnowext'/>
++      </blockers>
+       <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
+       <blockers model='core2duo'>
+         <feature name='ss'/>
+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 24f22dd53f..33ff630126 100644
+--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
+@@ -1733,7 +1733,8 @@
+       <blockers model='Westmere-v2'>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='yes' vendor='AMD'>athlon</model>
++      <model usable='yes' vendor='AMD' canonical='athlon-v1'>athlon</model>
++      <model usable='yes' vendor='AMD'>athlon-v1</model>
+       <model usable='yes' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
+       <model usable='yes' vendor='Intel'>core2duo-v1</model>
+       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+index 9af219d59d..0cf8733f1e 100644
+--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+@@ -916,11 +916,16 @@
+       <blockers model='Westmere-v2'>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='no' vendor='AMD'>athlon</model>
++      <model usable='no' vendor='AMD' canonical='athlon-v1'>athlon</model>
+       <blockers model='athlon'>
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>athlon-v1</model>
++      <blockers model='athlon-v1'>
++        <feature name='3dnow'/>
++        <feature name='3dnowext'/>
++      </blockers>
+       <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
+       <blockers model='core2duo'>
+         <feature name='ss'/>
+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 439f609233..ba3669f4b2 100644
+--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
+@@ -944,11 +944,16 @@
+       <blockers model='Westmere-v2'>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='no' vendor='AMD'>athlon</model>
++      <model usable='no' vendor='AMD' canonical='athlon-v1'>athlon</model>
+       <blockers model='athlon'>
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>athlon-v1</model>
++      <blockers model='athlon-v1'>
++        <feature name='3dnow'/>
++        <feature name='3dnowext'/>
++      </blockers>
+       <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
+       <blockers model='core2duo'>
+         <feature name='ss'/>
+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 53c114699c..43b6a68e24 100644
+--- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
+@@ -1757,7 +1757,8 @@
+       <blockers model='Westmere-v2'>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='yes' vendor='AMD'>athlon</model>
++      <model usable='yes' vendor='AMD' canonical='athlon-v1'>athlon</model>
++      <model usable='yes' vendor='AMD'>athlon-v1</model>
+       <model usable='yes' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
+       <model usable='yes' vendor='Intel'>core2duo-v1</model>
+       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+index 6d91c4ac75..a7d454b330 100644
+--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+@@ -943,11 +943,16 @@
+       <blockers model='Westmere-v2'>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='no' vendor='AMD'>athlon</model>
++      <model usable='no' vendor='AMD' canonical='athlon-v1'>athlon</model>
+       <blockers model='athlon'>
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>athlon-v1</model>
++      <blockers model='athlon-v1'>
++        <feature name='3dnow'/>
++        <feature name='3dnowext'/>
++      </blockers>
+       <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
+       <blockers model='core2duo'>
+         <feature name='ss'/>
+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 d61b339dd9..08c27dbab8 100644
+--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
+@@ -911,11 +911,16 @@
+       <blockers model='Westmere-v2'>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='no' vendor='AMD'>athlon</model>
++      <model usable='no' vendor='AMD' canonical='athlon-v1'>athlon</model>
+       <blockers model='athlon'>
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>athlon-v1</model>
++      <blockers model='athlon-v1'>
++        <feature name='3dnow'/>
++        <feature name='3dnowext'/>
++      </blockers>
+       <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
+       <blockers model='core2duo'>
+         <feature name='ss'/>
+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 a758fbabc5..8e974ebfde 100644
+--- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
+@@ -1705,7 +1705,8 @@
+       <blockers model='Westmere-v2'>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='yes' vendor='AMD'>athlon</model>
++      <model usable='yes' vendor='AMD' canonical='athlon-v1'>athlon</model>
++      <model usable='yes' vendor='AMD'>athlon-v1</model>
+       <model usable='yes' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
+       <model usable='yes' vendor='Intel'>core2duo-v1</model>
+       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
+index 48e8299c23..71cb90d172 100644
+--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
+@@ -910,11 +910,16 @@
+       <blockers model='Westmere-v2'>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='no' vendor='AMD'>athlon</model>
++      <model usable='no' vendor='AMD' canonical='athlon-v1'>athlon</model>
+       <blockers model='athlon'>
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>athlon-v1</model>
++      <blockers model='athlon-v1'>
++        <feature name='3dnow'/>
++        <feature name='3dnowext'/>
++      </blockers>
+       <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
+       <blockers model='core2duo'>
+         <feature name='ss'/>
+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 6a15994158..2d346b5a15 100644
+--- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
+@@ -916,11 +916,16 @@
+       <blockers model='Westmere-v2'>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='no' vendor='AMD'>athlon</model>
++      <model usable='no' vendor='AMD' canonical='athlon-v1'>athlon</model>
+       <blockers model='athlon'>
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>athlon-v1</model>
++      <blockers model='athlon-v1'>
++        <feature name='3dnow'/>
++        <feature name='3dnowext'/>
++      </blockers>
+       <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
+       <blockers model='core2duo'>
+         <feature name='ss'/>
+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 4d0def8fc7..31a774af8a 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
+@@ -1414,7 +1414,8 @@
+       <blockers model='Westmere-v2'>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='yes' vendor='AMD'>athlon</model>
++      <model usable='yes' vendor='AMD' canonical='athlon-v1'>athlon</model>
++      <model usable='yes' vendor='AMD'>athlon-v1</model>
+       <model usable='yes' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
+       <model usable='yes' vendor='Intel'>core2duo-v1</model>
+       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</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 4d0def8fc7..31a774af8a 100644
+--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
+@@ -1414,7 +1414,8 @@
+       <blockers model='Westmere-v2'>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='yes' vendor='AMD'>athlon</model>
++      <model usable='yes' vendor='AMD' canonical='athlon-v1'>athlon</model>
++      <model usable='yes' vendor='AMD'>athlon-v1</model>
+       <model usable='yes' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
+       <model usable='yes' vendor='Intel'>core2duo-v1</model>
+       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
+index ead8df9815..46b0e223c7 100644
+--- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
+@@ -915,11 +915,16 @@
+       <blockers model='Westmere-v2'>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='no' vendor='AMD'>athlon</model>
++      <model usable='no' vendor='AMD' canonical='athlon-v1'>athlon</model>
+       <blockers model='athlon'>
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>athlon-v1</model>
++      <blockers model='athlon-v1'>
++        <feature name='3dnow'/>
++        <feature name='3dnowext'/>
++      </blockers>
+       <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
+       <blockers model='core2duo'>
+         <feature name='ss'/>
+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 1936c89c70..95d809d412 100644
+--- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
+@@ -998,11 +998,16 @@
+       <blockers model='Westmere-v2'>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='no' vendor='AMD'>athlon</model>
++      <model usable='no' vendor='AMD' canonical='athlon-v1'>athlon</model>
+       <blockers model='athlon'>
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>athlon-v1</model>
++      <blockers model='athlon-v1'>
++        <feature name='3dnow'/>
++        <feature name='3dnowext'/>
++      </blockers>
+       <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
+       <blockers model='core2duo'>
+         <feature name='ss'/>
+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 d72b0c93d3..95c413a22f 100644
+--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
+@@ -1509,7 +1509,8 @@
+       <blockers model='Westmere-v2'>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='yes' vendor='AMD'>athlon</model>
++      <model usable='yes' vendor='AMD' canonical='athlon-v1'>athlon</model>
++      <model usable='yes' vendor='AMD'>athlon-v1</model>
+       <model usable='yes' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
+       <model usable='yes' vendor='Intel'>core2duo-v1</model>
+       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
+index 4adb6402ae..4cd5d8e640 100644
+--- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
+@@ -997,11 +997,16 @@
+       <blockers model='Westmere-v2'>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='no' vendor='AMD'>athlon</model>
++      <model usable='no' vendor='AMD' canonical='athlon-v1'>athlon</model>
+       <blockers model='athlon'>
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>athlon-v1</model>
++      <blockers model='athlon-v1'>
++        <feature name='3dnow'/>
++        <feature name='3dnowext'/>
++      </blockers>
+       <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
+       <blockers model='core2duo'>
+         <feature name='ss'/>
+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 c9f53064ff..94def05942 100644
+--- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
+@@ -1227,11 +1227,16 @@
+       <blockers model='Westmere-v2'>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='no' vendor='AMD'>athlon</model>
++      <model usable='no' vendor='AMD' canonical='athlon-v1'>athlon</model>
+       <blockers model='athlon'>
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>athlon-v1</model>
++      <blockers model='athlon-v1'>
++        <feature name='3dnow'/>
++        <feature name='3dnowext'/>
++      </blockers>
+       <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
+       <blockers model='core2duo'>
+         <feature name='ss'/>
+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 b2e2c3264b..958b250336 100644
+--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
+@@ -1493,7 +1493,8 @@
+       <blockers model='Westmere-v2'>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='yes' vendor='AMD'>athlon</model>
++      <model usable='yes' vendor='AMD' canonical='athlon-v1'>athlon</model>
++      <model usable='yes' vendor='AMD'>athlon-v1</model>
+       <model usable='yes' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
+       <model usable='yes' vendor='Intel'>core2duo-v1</model>
+       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
+index c630356571..4480ff39cd 100644
+--- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
+@@ -1226,11 +1226,16 @@
+       <blockers model='Westmere-v2'>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='no' vendor='AMD'>athlon</model>
++      <model usable='no' vendor='AMD' canonical='athlon-v1'>athlon</model>
+       <blockers model='athlon'>
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>athlon-v1</model>
++      <blockers model='athlon-v1'>
++        <feature name='3dnow'/>
++        <feature name='3dnowext'/>
++      </blockers>
+       <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
+       <blockers model='core2duo'>
+         <feature name='ss'/>
+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 17f4f6c4f0..9f91f9ef93 100644
+--- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
+@@ -1228,11 +1228,16 @@
+       <blockers model='Westmere-v2'>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='no' vendor='AMD'>athlon</model>
++      <model usable='no' vendor='AMD' canonical='athlon-v1'>athlon</model>
+       <blockers model='athlon'>
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>athlon-v1</model>
++      <blockers model='athlon-v1'>
++        <feature name='3dnow'/>
++        <feature name='3dnowext'/>
++      </blockers>
+       <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
+       <blockers model='core2duo'>
+         <feature name='ss'/>
+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 3ea2911762..cf6ce11821 100644
+--- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
+@@ -1460,7 +1460,8 @@
+       <blockers model='Westmere-v2'>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='yes' vendor='AMD'>athlon</model>
++      <model usable='yes' vendor='AMD' canonical='athlon-v1'>athlon</model>
++      <model usable='yes' vendor='AMD'>athlon-v1</model>
+       <model usable='yes' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
+       <model usable='yes' vendor='Intel'>core2duo-v1</model>
+       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
+index 77286e9aef..07034ee9a7 100644
+--- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
+@@ -1227,11 +1227,16 @@
+       <blockers model='Westmere-v2'>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='no' vendor='AMD'>athlon</model>
++      <model usable='no' vendor='AMD' canonical='athlon-v1'>athlon</model>
+       <blockers model='athlon'>
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>athlon-v1</model>
++      <blockers model='athlon-v1'>
++        <feature name='3dnow'/>
++        <feature name='3dnowext'/>
++      </blockers>
+       <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
+       <blockers model='core2duo'>
+         <feature name='ss'/>
+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 d304fbd62b..020ad5bdba 100644
+--- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
+@@ -1228,11 +1228,16 @@
+       <blockers model='Westmere-v2'>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='no' vendor='AMD'>athlon</model>
++      <model usable='no' vendor='AMD' canonical='athlon-v1'>athlon</model>
+       <blockers model='athlon'>
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>athlon-v1</model>
++      <blockers model='athlon-v1'>
++        <feature name='3dnow'/>
++        <feature name='3dnowext'/>
++      </blockers>
+       <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
+       <blockers model='core2duo'>
+         <feature name='ss'/>
+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 3e6cc25529..b0a25f5ea6 100644
+--- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
+@@ -1389,7 +1389,8 @@
+       <blockers model='Westmere-v2'>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='yes' vendor='AMD'>athlon</model>
++      <model usable='yes' vendor='AMD' canonical='athlon-v1'>athlon</model>
++      <model usable='yes' vendor='AMD'>athlon-v1</model>
+       <model usable='yes' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
+       <model usable='yes' vendor='Intel'>core2duo-v1</model>
+       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
+index a6fae9e3f1..f6e47f704a 100644
+--- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
+@@ -1227,11 +1227,16 @@
+       <blockers model='Westmere-v2'>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='no' vendor='AMD'>athlon</model>
++      <model usable='no' vendor='AMD' canonical='athlon-v1'>athlon</model>
+       <blockers model='athlon'>
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>athlon-v1</model>
++      <blockers model='athlon-v1'>
++        <feature name='3dnow'/>
++        <feature name='3dnowext'/>
++      </blockers>
+       <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
+       <blockers model='core2duo'>
+         <feature name='ss'/>
+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 060d96ab09..b501544f11 100644
+--- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
+@@ -1364,11 +1364,16 @@
+       <blockers model='Westmere-v2'>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='no' vendor='AMD'>athlon</model>
++      <model usable='no' vendor='AMD' canonical='athlon-v1'>athlon</model>
+       <blockers model='athlon'>
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>athlon-v1</model>
++      <blockers model='athlon-v1'>
++        <feature name='3dnow'/>
++        <feature name='3dnowext'/>
++      </blockers>
+       <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
+       <blockers model='core2duo'>
+         <feature name='ss'/>
+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 75f83cb376..1704b3b265 100644
+--- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
+@@ -1494,7 +1494,8 @@
+       <blockers model='Westmere-v2'>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='yes' vendor='AMD'>athlon</model>
++      <model usable='yes' vendor='AMD' canonical='athlon-v1'>athlon</model>
++      <model usable='yes' vendor='AMD'>athlon-v1</model>
+       <model usable='yes' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
+       <model usable='yes' vendor='Intel'>core2duo-v1</model>
+       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
+index 66dcb81fe6..3a1642af94 100644
+--- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
+@@ -1363,11 +1363,16 @@
+       <blockers model='Westmere-v2'>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='no' vendor='AMD'>athlon</model>
++      <model usable='no' vendor='AMD' canonical='athlon-v1'>athlon</model>
+       <blockers model='athlon'>
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>athlon-v1</model>
++      <blockers model='athlon-v1'>
++        <feature name='3dnow'/>
++        <feature name='3dnowext'/>
++      </blockers>
+       <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
+       <blockers model='core2duo'>
+         <feature name='ss'/>
+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 72df5e5e7d..91eab35039 100644
+--- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
+@@ -1364,11 +1364,16 @@
+       <blockers model='Westmere-v2'>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='no' vendor='AMD'>athlon</model>
++      <model usable='no' vendor='AMD' canonical='athlon-v1'>athlon</model>
+       <blockers model='athlon'>
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>athlon-v1</model>
++      <blockers model='athlon-v1'>
++        <feature name='3dnow'/>
++        <feature name='3dnowext'/>
++      </blockers>
+       <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
+       <blockers model='core2duo'>
+         <feature name='ss'/>
+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 6a756782cd..e807b965f6 100644
+--- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
+@@ -1494,7 +1494,8 @@
+       <blockers model='Westmere-v2'>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='yes' vendor='AMD'>athlon</model>
++      <model usable='yes' vendor='AMD' canonical='athlon-v1'>athlon</model>
++      <model usable='yes' vendor='AMD'>athlon-v1</model>
+       <model usable='yes' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
+       <model usable='yes' vendor='Intel'>core2duo-v1</model>
+       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
+index ef7b2bb67b..a876e7b98f 100644
+--- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
+@@ -1363,11 +1363,16 @@
+       <blockers model='Westmere-v2'>
+         <feature name='spec-ctrl'/>
+       </blockers>
+-      <model usable='no' vendor='AMD'>athlon</model>
++      <model usable='no' vendor='AMD' canonical='athlon-v1'>athlon</model>
+       <blockers model='athlon'>
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>athlon-v1</model>
++      <blockers model='athlon-v1'>
++        <feature name='3dnow'/>
++        <feature name='3dnowext'/>
++      </blockers>
+       <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
+       <blockers model='core2duo'>
+         <feature name='ss'/>
+-- 
+2.47.1
diff --git a/libvirt-cpu_map-Add-core2duo-v1-CPU-model.patch b/libvirt-cpu_map-Add-core2duo-v1-CPU-model.patch
new file mode 100644
index 0000000..a313f3f
--- /dev/null
+++ b/libvirt-cpu_map-Add-core2duo-v1-CPU-model.patch
@@ -0,0 +1,827 @@
+From ccd4b647b359903a345691fceb455e7b1afcd785 Mon Sep 17 00:00:00 2001
+Message-ID: <ccd4b647b359903a345691fceb455e7b1afcd785.1734429553.git.jdenemar@redhat.com>
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Thu, 5 Dec 2024 15:32:57 +0100
+Subject: [PATCH] cpu_map: Add core2duo-v1 CPU model
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit a3cab1ae67c4d0657a1ebfeaaa0e6d41d951d780)
+
+https://issues.redhat.com/browse/RHEL-70129
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ src/cpu_map/index.xml                                 | 1 +
+ src/cpu_map/meson.build                               | 1 +
+ src/cpu_map/x86_core2duo-v1.xml                       | 6 ++++++
+ tests/cputestdata/x86_64-cpuid-Pentium-P6100-host.xml | 2 +-
+ tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml        | 6 +++++-
+ tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml        | 3 ++-
+ tests/domaincapsdata/qemu_5.2.0.x86_64.xml            | 6 +++++-
+ tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml        | 6 +++++-
+ tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml        | 3 ++-
+ tests/domaincapsdata/qemu_6.0.0.x86_64.xml            | 6 +++++-
+ tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml        | 6 +++++-
+ tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml        | 3 ++-
+ tests/domaincapsdata/qemu_6.1.0.x86_64.xml            | 6 +++++-
+ tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml        | 6 +++++-
+ tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml        | 3 ++-
+ tests/domaincapsdata/qemu_6.2.0.x86_64.xml            | 6 +++++-
+ tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml        | 6 +++++-
+ tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml        | 3 ++-
+ tests/domaincapsdata/qemu_7.0.0.x86_64.xml            | 6 +++++-
+ tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml        | 6 +++++-
+ tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml        | 3 ++-
+ tests/domaincapsdata/qemu_7.1.0.x86_64.xml            | 6 +++++-
+ tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml        | 6 +++++-
+ tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml    | 3 ++-
+ tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml        | 3 ++-
+ tests/domaincapsdata/qemu_7.2.0.x86_64.xml            | 6 +++++-
+ tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml        | 6 +++++-
+ tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml        | 3 ++-
+ tests/domaincapsdata/qemu_8.0.0.x86_64.xml            | 6 +++++-
+ tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml        | 6 +++++-
+ tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml        | 3 ++-
+ tests/domaincapsdata/qemu_8.1.0.x86_64.xml            | 6 +++++-
+ tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml        | 6 +++++-
+ tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml        | 3 ++-
+ tests/domaincapsdata/qemu_8.2.0.x86_64.xml            | 6 +++++-
+ tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml        | 6 +++++-
+ tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml        | 3 ++-
+ tests/domaincapsdata/qemu_9.0.0.x86_64.xml            | 6 +++++-
+ tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml        | 6 +++++-
+ tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml        | 3 ++-
+ tests/domaincapsdata/qemu_9.1.0.x86_64.xml            | 6 +++++-
+ tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml        | 6 +++++-
+ tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml        | 3 ++-
+ tests/domaincapsdata/qemu_9.2.0.x86_64.xml            | 6 +++++-
+ 44 files changed, 167 insertions(+), 41 deletions(-)
+ create mode 100644 src/cpu_map/x86_core2duo-v1.xml
+
+diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml
+index 9534e5f308..eb847341da 100644
+--- a/src/cpu_map/index.xml
++++ b/src/cpu_map/index.xml
+@@ -21,6 +21,7 @@
+       <include filename='x86_n270.xml'/>
+       <include filename='x86_n270-v1.xml'/>
+       <include filename='x86_core2duo.xml'/>
++      <include filename='x86_core2duo-v1.xml'/>
+     </group>
+ 
+     <group name='Generic QEMU CPU models'>
+diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build
+index 5e85e24eb9..b179fb442c 100644
+--- a/src/cpu_map/meson.build
++++ b/src/cpu_map/meson.build
+@@ -44,6 +44,7 @@ cpumap_data = [
+   'x86_Cooperlake-v1.xml',
+   'x86_Cooperlake-v2.xml',
+   'x86_Cooperlake.xml',
++  'x86_core2duo-v1.xml',
+   'x86_core2duo.xml',
+   'x86_coreduo-v1.xml',
+   'x86_coreduo.xml',
+diff --git a/src/cpu_map/x86_core2duo-v1.xml b/src/cpu_map/x86_core2duo-v1.xml
+new file mode 100644
+index 0000000000..e23855ae75
+--- /dev/null
++++ b/src/cpu_map/x86_core2duo-v1.xml
+@@ -0,0 +1,6 @@
++<cpus>
++  <model name='core2duo-v1'>
++    <decode host='on' guest='off'/>
++    <model name='core2duo'/>
++  </model>
++</cpus>
+diff --git a/tests/cputestdata/x86_64-cpuid-Pentium-P6100-host.xml b/tests/cputestdata/x86_64-cpuid-Pentium-P6100-host.xml
+index a1a42d4b83..1bad0b11d3 100644
+--- a/tests/cputestdata/x86_64-cpuid-Pentium-P6100-host.xml
++++ b/tests/cputestdata/x86_64-cpuid-Pentium-P6100-host.xml
+@@ -1,6 +1,6 @@
+ <cpu>
+   <arch>x86_64</arch>
+-  <model>core2duo</model>
++  <model>core2duo-v1</model>
+   <vendor>Intel</vendor>
+   <signature family='6' model='37' stepping='5'/>
+   <feature name='dtes64'/>
+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 1ba8a7eb11..d4853706b3 100644
+--- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
+@@ -779,10 +779,14 @@
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>core2duo</model>
++      <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
+       <blockers model='core2duo'>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>core2duo-v1</model>
++      <blockers model='core2duo-v1'>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+       <blockers model='coreduo'>
+         <feature name='ss'/>
+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 1abbfcc4bb..03c88241c8 100644
+--- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
+@@ -1412,7 +1412,8 @@
+         <feature name='spec-ctrl'/>
+       </blockers>
+       <model usable='yes' vendor='AMD'>athlon</model>
+-      <model usable='yes' vendor='Intel'>core2duo</model>
++      <model usable='yes' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
++      <model usable='yes' vendor='Intel'>core2duo-v1</model>
+       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+       <model usable='yes' vendor='Intel'>coreduo-v1</model>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
+index 3040deeb50..75592e124e 100644
+--- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
+@@ -778,10 +778,14 @@
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>core2duo</model>
++      <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
+       <blockers model='core2duo'>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>core2duo-v1</model>
++      <blockers model='core2duo-v1'>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+       <blockers model='coreduo'>
+         <feature name='ss'/>
+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 cb59946b78..de38e87010 100644
+--- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
+@@ -801,10 +801,14 @@
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>core2duo</model>
++      <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
+       <blockers model='core2duo'>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>core2duo-v1</model>
++      <blockers model='core2duo-v1'>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+       <blockers model='coreduo'>
+         <feature name='ss'/>
+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 e6165eab77..29aa3f9adc 100644
+--- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
+@@ -1502,7 +1502,8 @@
+         <feature name='spec-ctrl'/>
+       </blockers>
+       <model usable='yes' vendor='AMD'>athlon</model>
+-      <model usable='yes' vendor='Intel'>core2duo</model>
++      <model usable='yes' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
++      <model usable='yes' vendor='Intel'>core2duo-v1</model>
+       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+       <model usable='yes' vendor='Intel'>coreduo-v1</model>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
+index 5aae9a3fca..6469251e47 100644
+--- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
+@@ -800,10 +800,14 @@
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>core2duo</model>
++      <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
+       <blockers model='core2duo'>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>core2duo-v1</model>
++      <blockers model='core2duo-v1'>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+       <blockers model='coreduo'>
+         <feature name='ss'/>
+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 2898e56b41..3918fd5101 100644
+--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
+@@ -902,10 +902,14 @@
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>core2duo</model>
++      <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
+       <blockers model='core2duo'>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>core2duo-v1</model>
++      <blockers model='core2duo-v1'>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+       <blockers model='coreduo'>
+         <feature name='ss'/>
+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 2b5baf0a02..5d5b18cfdf 100644
+--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
+@@ -1699,7 +1699,8 @@
+         <feature name='spec-ctrl'/>
+       </blockers>
+       <model usable='yes' vendor='AMD'>athlon</model>
+-      <model usable='yes' vendor='Intel'>core2duo</model>
++      <model usable='yes' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
++      <model usable='yes' vendor='Intel'>core2duo-v1</model>
+       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+       <model usable='yes' vendor='Intel'>coreduo-v1</model>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
+index 0fd3e38ee6..98bcfec2bb 100644
+--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
+@@ -901,10 +901,14 @@
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>core2duo</model>
++      <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
+       <blockers model='core2duo'>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>core2duo-v1</model>
++      <blockers model='core2duo-v1'>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+       <blockers model='coreduo'>
+         <feature name='ss'/>
+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 690959d35a..ed4a66a4ca 100644
+--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
+@@ -908,10 +908,14 @@
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>core2duo</model>
++      <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
+       <blockers model='core2duo'>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>core2duo-v1</model>
++      <blockers model='core2duo-v1'>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+       <blockers model='coreduo'>
+         <feature name='ss'/>
+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 6153d8a9ee..a748c623bc 100644
+--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
+@@ -1714,7 +1714,8 @@
+         <feature name='spec-ctrl'/>
+       </blockers>
+       <model usable='yes' vendor='AMD'>athlon</model>
+-      <model usable='yes' vendor='Intel'>core2duo</model>
++      <model usable='yes' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
++      <model usable='yes' vendor='Intel'>core2duo-v1</model>
+       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+       <model usable='yes' vendor='Intel'>coreduo-v1</model>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+index 15edc7e73d..f9a0221e7b 100644
+--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+@@ -907,10 +907,14 @@
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>core2duo</model>
++      <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
+       <blockers model='core2duo'>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>core2duo-v1</model>
++      <blockers model='core2duo-v1'>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+       <blockers model='coreduo'>
+         <feature name='ss'/>
+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 a1f68beb2a..6b97ff8ba7 100644
+--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
+@@ -935,10 +935,14 @@
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>core2duo</model>
++      <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
+       <blockers model='core2duo'>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>core2duo-v1</model>
++      <blockers model='core2duo-v1'>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+       <blockers model='coreduo'>
+         <feature name='ss'/>
+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 9eda36d3c8..2e27e674f2 100644
+--- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
+@@ -1738,7 +1738,8 @@
+         <feature name='spec-ctrl'/>
+       </blockers>
+       <model usable='yes' vendor='AMD'>athlon</model>
+-      <model usable='yes' vendor='Intel'>core2duo</model>
++      <model usable='yes' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
++      <model usable='yes' vendor='Intel'>core2duo-v1</model>
+       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+       <model usable='yes' vendor='Intel'>coreduo-v1</model>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+index 249baa1342..99d8cf9558 100644
+--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+@@ -934,10 +934,14 @@
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>core2duo</model>
++      <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
+       <blockers model='core2duo'>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>core2duo-v1</model>
++      <blockers model='core2duo-v1'>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+       <blockers model='coreduo'>
+         <feature name='ss'/>
+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 b65196f979..e101305e83 100644
+--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
+@@ -902,10 +902,14 @@
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>core2duo</model>
++      <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
+       <blockers model='core2duo'>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>core2duo-v1</model>
++      <blockers model='core2duo-v1'>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+       <blockers model='coreduo'>
+         <feature name='ss'/>
+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 84df14bc63..24f90ed830 100644
+--- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
+@@ -1686,7 +1686,8 @@
+         <feature name='spec-ctrl'/>
+       </blockers>
+       <model usable='yes' vendor='AMD'>athlon</model>
+-      <model usable='yes' vendor='Intel'>core2duo</model>
++      <model usable='yes' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
++      <model usable='yes' vendor='Intel'>core2duo-v1</model>
+       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+       <model usable='yes' vendor='Intel'>coreduo-v1</model>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
+index 2e41f4a73a..0f993e3763 100644
+--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
+@@ -901,10 +901,14 @@
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>core2duo</model>
++      <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
+       <blockers model='core2duo'>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>core2duo-v1</model>
++      <blockers model='core2duo-v1'>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+       <blockers model='coreduo'>
+         <feature name='ss'/>
+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 ca8391756b..bfea565a00 100644
+--- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
+@@ -907,10 +907,14 @@
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>core2duo</model>
++      <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
+       <blockers model='core2duo'>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>core2duo-v1</model>
++      <blockers model='core2duo-v1'>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+       <blockers model='coreduo'>
+         <feature name='ss'/>
+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 258212d852..91fc6133e4 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
+@@ -1399,7 +1399,8 @@
+         <feature name='spec-ctrl'/>
+       </blockers>
+       <model usable='yes' vendor='AMD'>athlon</model>
+-      <model usable='yes' vendor='Intel'>core2duo</model>
++      <model usable='yes' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
++      <model usable='yes' vendor='Intel'>core2duo-v1</model>
+       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+       <model usable='yes' vendor='Intel'>coreduo-v1</model>
+       <model usable='yes' vendor='unknown'>kvm32</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 258212d852..91fc6133e4 100644
+--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
+@@ -1399,7 +1399,8 @@
+         <feature name='spec-ctrl'/>
+       </blockers>
+       <model usable='yes' vendor='AMD'>athlon</model>
+-      <model usable='yes' vendor='Intel'>core2duo</model>
++      <model usable='yes' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
++      <model usable='yes' vendor='Intel'>core2duo-v1</model>
+       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+       <model usable='yes' vendor='Intel'>coreduo-v1</model>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
+index 819010acff..1e8f10d17f 100644
+--- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
+@@ -906,10 +906,14 @@
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>core2duo</model>
++      <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
+       <blockers model='core2duo'>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>core2duo-v1</model>
++      <blockers model='core2duo-v1'>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+       <blockers model='coreduo'>
+         <feature name='ss'/>
+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 68b1192153..8dfbc2b21a 100644
+--- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
+@@ -989,10 +989,14 @@
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>core2duo</model>
++      <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
+       <blockers model='core2duo'>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>core2duo-v1</model>
++      <blockers model='core2duo-v1'>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+       <blockers model='coreduo'>
+         <feature name='ss'/>
+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 ea0bc81bea..6982dc8035 100644
+--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
+@@ -1494,7 +1494,8 @@
+         <feature name='spec-ctrl'/>
+       </blockers>
+       <model usable='yes' vendor='AMD'>athlon</model>
+-      <model usable='yes' vendor='Intel'>core2duo</model>
++      <model usable='yes' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
++      <model usable='yes' vendor='Intel'>core2duo-v1</model>
+       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+       <model usable='yes' vendor='Intel'>coreduo-v1</model>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
+index bddb1413a1..a739ec6b73 100644
+--- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
+@@ -988,10 +988,14 @@
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>core2duo</model>
++      <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
+       <blockers model='core2duo'>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>core2duo-v1</model>
++      <blockers model='core2duo-v1'>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+       <blockers model='coreduo'>
+         <feature name='ss'/>
+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 7f1f4a2082..4d6e8c8a7f 100644
+--- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
+@@ -1218,10 +1218,14 @@
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>core2duo</model>
++      <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
+       <blockers model='core2duo'>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>core2duo-v1</model>
++      <blockers model='core2duo-v1'>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+       <blockers model='coreduo'>
+         <feature name='ss'/>
+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 e2fc678bb6..0009fb007d 100644
+--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
+@@ -1480,7 +1480,8 @@
+         <feature name='spec-ctrl'/>
+       </blockers>
+       <model usable='yes' vendor='AMD'>athlon</model>
+-      <model usable='yes' vendor='Intel'>core2duo</model>
++      <model usable='yes' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
++      <model usable='yes' vendor='Intel'>core2duo-v1</model>
+       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+       <model usable='yes' vendor='Intel'>coreduo-v1</model>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
+index 4b0aed148d..74f9fe6dbe 100644
+--- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
+@@ -1217,10 +1217,14 @@
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>core2duo</model>
++      <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
+       <blockers model='core2duo'>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>core2duo-v1</model>
++      <blockers model='core2duo-v1'>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+       <blockers model='coreduo'>
+         <feature name='ss'/>
+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 ab371ea688..d4d7a9e079 100644
+--- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
+@@ -1219,10 +1219,14 @@
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>core2duo</model>
++      <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
+       <blockers model='core2duo'>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>core2duo-v1</model>
++      <blockers model='core2duo-v1'>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+       <blockers model='coreduo'>
+         <feature name='ss'/>
+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 a256fed6d7..b948f32538 100644
+--- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
+@@ -1447,7 +1447,8 @@
+         <feature name='spec-ctrl'/>
+       </blockers>
+       <model usable='yes' vendor='AMD'>athlon</model>
+-      <model usable='yes' vendor='Intel'>core2duo</model>
++      <model usable='yes' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
++      <model usable='yes' vendor='Intel'>core2duo-v1</model>
+       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+       <model usable='yes' vendor='Intel'>coreduo-v1</model>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
+index 3f952bb379..3e22f5e9b3 100644
+--- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
+@@ -1218,10 +1218,14 @@
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>core2duo</model>
++      <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
+       <blockers model='core2duo'>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>core2duo-v1</model>
++      <blockers model='core2duo-v1'>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+       <blockers model='coreduo'>
+         <feature name='ss'/>
+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 21358e340a..7a30c27b83 100644
+--- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
+@@ -1219,10 +1219,14 @@
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>core2duo</model>
++      <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
+       <blockers model='core2duo'>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>core2duo-v1</model>
++      <blockers model='core2duo-v1'>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+       <blockers model='coreduo'>
+         <feature name='ss'/>
+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 d34524193a..ee71c658cb 100644
+--- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
+@@ -1377,7 +1377,8 @@
+         <feature name='spec-ctrl'/>
+       </blockers>
+       <model usable='yes' vendor='AMD'>athlon</model>
+-      <model usable='yes' vendor='Intel'>core2duo</model>
++      <model usable='yes' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
++      <model usable='yes' vendor='Intel'>core2duo-v1</model>
+       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+       <model usable='yes' vendor='Intel'>coreduo-v1</model>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
+index 9bbb95c0cb..8509032a62 100644
+--- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
+@@ -1218,10 +1218,14 @@
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>core2duo</model>
++      <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
+       <blockers model='core2duo'>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>core2duo-v1</model>
++      <blockers model='core2duo-v1'>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+       <blockers model='coreduo'>
+         <feature name='ss'/>
+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 c5cbe2d855..b43b607c39 100644
+--- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
+@@ -1355,10 +1355,14 @@
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>core2duo</model>
++      <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
+       <blockers model='core2duo'>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>core2duo-v1</model>
++      <blockers model='core2duo-v1'>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+       <blockers model='coreduo'>
+         <feature name='ss'/>
+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 3ec8575cf4..b79140038c 100644
+--- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
+@@ -1482,7 +1482,8 @@
+         <feature name='spec-ctrl'/>
+       </blockers>
+       <model usable='yes' vendor='AMD'>athlon</model>
+-      <model usable='yes' vendor='Intel'>core2duo</model>
++      <model usable='yes' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
++      <model usable='yes' vendor='Intel'>core2duo-v1</model>
+       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+       <model usable='yes' vendor='Intel'>coreduo-v1</model>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
+index 513f4486cb..509b5a6c33 100644
+--- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
+@@ -1354,10 +1354,14 @@
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>core2duo</model>
++      <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
+       <blockers model='core2duo'>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>core2duo-v1</model>
++      <blockers model='core2duo-v1'>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+       <blockers model='coreduo'>
+         <feature name='ss'/>
+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 089ab497e0..9114ece766 100644
+--- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
+@@ -1355,10 +1355,14 @@
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>core2duo</model>
++      <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
+       <blockers model='core2duo'>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>core2duo-v1</model>
++      <blockers model='core2duo-v1'>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+       <blockers model='coreduo'>
+         <feature name='ss'/>
+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 64e893116a..e2e40d7ca2 100644
+--- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
+@@ -1482,7 +1482,8 @@
+         <feature name='spec-ctrl'/>
+       </blockers>
+       <model usable='yes' vendor='AMD'>athlon</model>
+-      <model usable='yes' vendor='Intel'>core2duo</model>
++      <model usable='yes' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
++      <model usable='yes' vendor='Intel'>core2duo-v1</model>
+       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+       <model usable='yes' vendor='Intel'>coreduo-v1</model>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
+index 6e4f518b23..4a5a09c488 100644
+--- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
+@@ -1354,10 +1354,14 @@
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>core2duo</model>
++      <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
+       <blockers model='core2duo'>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>core2duo-v1</model>
++      <blockers model='core2duo-v1'>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+       <blockers model='coreduo'>
+         <feature name='ss'/>
+-- 
+2.47.1
diff --git a/libvirt-cpu_map-Add-coreduo-v1-CPU-model.patch b/libvirt-cpu_map-Add-coreduo-v1-CPU-model.patch
new file mode 100644
index 0000000..cd9e78b
--- /dev/null
+++ b/libvirt-cpu_map-Add-coreduo-v1-CPU-model.patch
@@ -0,0 +1,814 @@
+From 65d6734cfd183ba58a113e00f81b99a4a45ae8b9 Mon Sep 17 00:00:00 2001
+Message-ID: <65d6734cfd183ba58a113e00f81b99a4a45ae8b9.1734429553.git.jdenemar@redhat.com>
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Thu, 5 Dec 2024 15:30:57 +0100
+Subject: [PATCH] cpu_map: Add coreduo-v1 CPU model
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit ae14b20aaa11f506977b2e88b3c6050ad50ec33d)
+
+https://issues.redhat.com/browse/RHEL-70129
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ src/cpu_map/index.xml                              | 1 +
+ src/cpu_map/meson.build                            | 1 +
+ src/cpu_map/x86_coreduo-v1.xml                     | 6 ++++++
+ tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml     | 6 +++++-
+ tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_5.2.0.x86_64.xml         | 6 +++++-
+ tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml     | 6 +++++-
+ tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_6.0.0.x86_64.xml         | 6 +++++-
+ tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml     | 6 +++++-
+ tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_6.1.0.x86_64.xml         | 6 +++++-
+ tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml     | 6 +++++-
+ tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_6.2.0.x86_64.xml         | 6 +++++-
+ tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml     | 6 +++++-
+ tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_7.0.0.x86_64.xml         | 6 +++++-
+ tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml     | 6 +++++-
+ tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_7.1.0.x86_64.xml         | 6 +++++-
+ tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml     | 6 +++++-
+ tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml | 3 ++-
+ tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_7.2.0.x86_64.xml         | 6 +++++-
+ tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml     | 6 +++++-
+ tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_8.0.0.x86_64.xml         | 6 +++++-
+ tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml     | 6 +++++-
+ tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_8.1.0.x86_64.xml         | 6 +++++-
+ tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml     | 6 +++++-
+ tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_8.2.0.x86_64.xml         | 6 +++++-
+ tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml     | 6 +++++-
+ tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_9.0.0.x86_64.xml         | 6 +++++-
+ tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml     | 6 +++++-
+ tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_9.1.0.x86_64.xml         | 6 +++++-
+ tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml     | 6 +++++-
+ tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_9.2.0.x86_64.xml         | 6 +++++-
+ 43 files changed, 166 insertions(+), 40 deletions(-)
+ create mode 100644 src/cpu_map/x86_coreduo-v1.xml
+
+diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml
+index 87cc4f61ed..d8df3b214d 100644
+--- a/src/cpu_map/index.xml
++++ b/src/cpu_map/index.xml
+@@ -17,6 +17,7 @@
+       <include filename='x86_pentium3-v1.xml'/>
+       <include filename='x86_pentiumpro.xml'/>
+       <include filename='x86_coreduo.xml'/>
++      <include filename='x86_coreduo-v1.xml'/>
+       <include filename='x86_n270.xml'/>
+       <include filename='x86_core2duo.xml'/>
+     </group>
+diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build
+index 6645786736..1213f6929c 100644
+--- a/src/cpu_map/meson.build
++++ b/src/cpu_map/meson.build
+@@ -45,6 +45,7 @@ cpumap_data = [
+   'x86_Cooperlake-v2.xml',
+   'x86_Cooperlake.xml',
+   'x86_core2duo.xml',
++  'x86_coreduo-v1.xml',
+   'x86_coreduo.xml',
+   'x86_cpu64-rhel5.xml',
+   'x86_cpu64-rhel6.xml',
+diff --git a/src/cpu_map/x86_coreduo-v1.xml b/src/cpu_map/x86_coreduo-v1.xml
+new file mode 100644
+index 0000000000..c32be47485
+--- /dev/null
++++ b/src/cpu_map/x86_coreduo-v1.xml
+@@ -0,0 +1,6 @@
++<cpus>
++  <model name='coreduo-v1'>
++    <decode host='on' guest='off'/>
++    <model name='coreduo'/>
++  </model>
++</cpus>
+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 f887be4468..cb6db8f83c 100644
+--- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
+@@ -783,10 +783,14 @@
+       <blockers model='core2duo'>
+         <feature name='ss'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>coreduo</model>
++      <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+       <blockers model='coreduo'>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>coreduo-v1</model>
++      <blockers model='coreduo-v1'>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='no' vendor='Intel'>n270</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 0c5a3a81f8..36625a07b3 100644
+--- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
+@@ -1413,7 +1413,8 @@
+       </blockers>
+       <model usable='yes' vendor='AMD'>athlon</model>
+       <model usable='yes' vendor='Intel'>core2duo</model>
+-      <model usable='yes' vendor='Intel'>coreduo</model>
++      <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
++      <model usable='yes' vendor='Intel'>coreduo-v1</model>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='yes' vendor='Intel'>n270</model>
+diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
+index 7591b2efe9..fcd76f9bc8 100644
+--- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
+@@ -782,10 +782,14 @@
+       <blockers model='core2duo'>
+         <feature name='ss'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>coreduo</model>
++      <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+       <blockers model='coreduo'>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>coreduo-v1</model>
++      <blockers model='coreduo-v1'>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='no' vendor='Intel'>n270</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 a7b325fd61..4b2d94b281 100644
+--- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
+@@ -805,10 +805,14 @@
+       <blockers model='core2duo'>
+         <feature name='ss'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>coreduo</model>
++      <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+       <blockers model='coreduo'>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>coreduo-v1</model>
++      <blockers model='coreduo-v1'>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='no' vendor='Intel'>n270</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 63c1ff9b4a..b20dbe72c1 100644
+--- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
+@@ -1503,7 +1503,8 @@
+       </blockers>
+       <model usable='yes' vendor='AMD'>athlon</model>
+       <model usable='yes' vendor='Intel'>core2duo</model>
+-      <model usable='yes' vendor='Intel'>coreduo</model>
++      <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
++      <model usable='yes' vendor='Intel'>coreduo-v1</model>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='yes' vendor='Intel'>n270</model>
+diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
+index 3d6ff5657e..ad3be21085 100644
+--- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
+@@ -804,10 +804,14 @@
+       <blockers model='core2duo'>
+         <feature name='ss'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>coreduo</model>
++      <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+       <blockers model='coreduo'>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>coreduo-v1</model>
++      <blockers model='coreduo-v1'>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='no' vendor='Intel'>n270</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 e475c264ee..a76f03f910 100644
+--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
+@@ -906,10 +906,14 @@
+       <blockers model='core2duo'>
+         <feature name='ss'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>coreduo</model>
++      <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+       <blockers model='coreduo'>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>coreduo-v1</model>
++      <blockers model='coreduo-v1'>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='no' vendor='Intel'>n270</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 5deb101fe3..da44554a73 100644
+--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
+@@ -1700,7 +1700,8 @@
+       </blockers>
+       <model usable='yes' vendor='AMD'>athlon</model>
+       <model usable='yes' vendor='Intel'>core2duo</model>
+-      <model usable='yes' vendor='Intel'>coreduo</model>
++      <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
++      <model usable='yes' vendor='Intel'>coreduo-v1</model>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='yes' vendor='Intel'>n270</model>
+diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
+index f4542588e8..4369595b2e 100644
+--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
+@@ -905,10 +905,14 @@
+       <blockers model='core2duo'>
+         <feature name='ss'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>coreduo</model>
++      <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+       <blockers model='coreduo'>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>coreduo-v1</model>
++      <blockers model='coreduo-v1'>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='no' vendor='Intel'>n270</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 c388b7919a..dc6dd2f743 100644
+--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
+@@ -912,10 +912,14 @@
+       <blockers model='core2duo'>
+         <feature name='ss'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>coreduo</model>
++      <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+       <blockers model='coreduo'>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>coreduo-v1</model>
++      <blockers model='coreduo-v1'>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='no' vendor='Intel'>n270</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 bae374c05b..d8bb03fbfd 100644
+--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
+@@ -1715,7 +1715,8 @@
+       </blockers>
+       <model usable='yes' vendor='AMD'>athlon</model>
+       <model usable='yes' vendor='Intel'>core2duo</model>
+-      <model usable='yes' vendor='Intel'>coreduo</model>
++      <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
++      <model usable='yes' vendor='Intel'>coreduo-v1</model>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='yes' vendor='Intel'>n270</model>
+diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+index 43d1a8d3a2..69afbc55f0 100644
+--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+@@ -911,10 +911,14 @@
+       <blockers model='core2duo'>
+         <feature name='ss'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>coreduo</model>
++      <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+       <blockers model='coreduo'>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>coreduo-v1</model>
++      <blockers model='coreduo-v1'>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='no' vendor='Intel'>n270</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 b882feace0..0798ee74de 100644
+--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
+@@ -939,10 +939,14 @@
+       <blockers model='core2duo'>
+         <feature name='ss'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>coreduo</model>
++      <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+       <blockers model='coreduo'>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>coreduo-v1</model>
++      <blockers model='coreduo-v1'>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='no' vendor='Intel'>n270</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 dcdad93bc4..07bbd505fa 100644
+--- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
+@@ -1739,7 +1739,8 @@
+       </blockers>
+       <model usable='yes' vendor='AMD'>athlon</model>
+       <model usable='yes' vendor='Intel'>core2duo</model>
+-      <model usable='yes' vendor='Intel'>coreduo</model>
++      <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
++      <model usable='yes' vendor='Intel'>coreduo-v1</model>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='yes' vendor='Intel'>n270</model>
+diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+index f825365d4e..bf07fa3f51 100644
+--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+@@ -938,10 +938,14 @@
+       <blockers model='core2duo'>
+         <feature name='ss'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>coreduo</model>
++      <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+       <blockers model='coreduo'>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>coreduo-v1</model>
++      <blockers model='coreduo-v1'>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='no' vendor='Intel'>n270</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 f8ac31d143..694561221f 100644
+--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
+@@ -906,10 +906,14 @@
+       <blockers model='core2duo'>
+         <feature name='ss'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>coreduo</model>
++      <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+       <blockers model='coreduo'>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>coreduo-v1</model>
++      <blockers model='coreduo-v1'>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='no' vendor='Intel'>n270</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 c4a159a3da..d98b895940 100644
+--- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
+@@ -1687,7 +1687,8 @@
+       </blockers>
+       <model usable='yes' vendor='AMD'>athlon</model>
+       <model usable='yes' vendor='Intel'>core2duo</model>
+-      <model usable='yes' vendor='Intel'>coreduo</model>
++      <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
++      <model usable='yes' vendor='Intel'>coreduo-v1</model>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='yes' vendor='Intel'>n270</model>
+diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
+index 5efd8d499f..e02f39bdf5 100644
+--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
+@@ -905,10 +905,14 @@
+       <blockers model='core2duo'>
+         <feature name='ss'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>coreduo</model>
++      <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+       <blockers model='coreduo'>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>coreduo-v1</model>
++      <blockers model='coreduo-v1'>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='no' vendor='Intel'>n270</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 a0f10ca42d..faa838ee4b 100644
+--- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
+@@ -911,10 +911,14 @@
+       <blockers model='core2duo'>
+         <feature name='ss'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>coreduo</model>
++      <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+       <blockers model='coreduo'>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>coreduo-v1</model>
++      <blockers model='coreduo-v1'>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='no' vendor='Intel'>n270</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 26e716e0e8..c65ffc40bb 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
+@@ -1400,7 +1400,8 @@
+       </blockers>
+       <model usable='yes' vendor='AMD'>athlon</model>
+       <model usable='yes' vendor='Intel'>core2duo</model>
+-      <model usable='yes' vendor='Intel'>coreduo</model>
++      <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
++      <model usable='yes' vendor='Intel'>coreduo-v1</model>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='yes' vendor='Intel'>n270</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 26e716e0e8..c65ffc40bb 100644
+--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
+@@ -1400,7 +1400,8 @@
+       </blockers>
+       <model usable='yes' vendor='AMD'>athlon</model>
+       <model usable='yes' vendor='Intel'>core2duo</model>
+-      <model usable='yes' vendor='Intel'>coreduo</model>
++      <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
++      <model usable='yes' vendor='Intel'>coreduo-v1</model>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='yes' vendor='Intel'>n270</model>
+diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
+index 871949d74f..0a88511093 100644
+--- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
+@@ -910,10 +910,14 @@
+       <blockers model='core2duo'>
+         <feature name='ss'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>coreduo</model>
++      <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+       <blockers model='coreduo'>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>coreduo-v1</model>
++      <blockers model='coreduo-v1'>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='no' vendor='Intel'>n270</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 9fb5e0a823..e931d7445d 100644
+--- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
+@@ -993,10 +993,14 @@
+       <blockers model='core2duo'>
+         <feature name='ss'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>coreduo</model>
++      <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+       <blockers model='coreduo'>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>coreduo-v1</model>
++      <blockers model='coreduo-v1'>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='no' vendor='Intel'>n270</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 d7aeb43b83..c0cc453fd1 100644
+--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
+@@ -1495,7 +1495,8 @@
+       </blockers>
+       <model usable='yes' vendor='AMD'>athlon</model>
+       <model usable='yes' vendor='Intel'>core2duo</model>
+-      <model usable='yes' vendor='Intel'>coreduo</model>
++      <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
++      <model usable='yes' vendor='Intel'>coreduo-v1</model>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='yes' vendor='Intel'>n270</model>
+diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
+index 8e226ee237..59c36bfa49 100644
+--- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
+@@ -992,10 +992,14 @@
+       <blockers model='core2duo'>
+         <feature name='ss'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>coreduo</model>
++      <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+       <blockers model='coreduo'>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>coreduo-v1</model>
++      <blockers model='coreduo-v1'>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='no' vendor='Intel'>n270</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 27fddae9f5..f822c040de 100644
+--- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
+@@ -1222,10 +1222,14 @@
+       <blockers model='core2duo'>
+         <feature name='ss'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>coreduo</model>
++      <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+       <blockers model='coreduo'>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>coreduo-v1</model>
++      <blockers model='coreduo-v1'>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='no' vendor='Intel'>n270</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 30169a55e4..7ea876c1fc 100644
+--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
+@@ -1481,7 +1481,8 @@
+       </blockers>
+       <model usable='yes' vendor='AMD'>athlon</model>
+       <model usable='yes' vendor='Intel'>core2duo</model>
+-      <model usable='yes' vendor='Intel'>coreduo</model>
++      <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
++      <model usable='yes' vendor='Intel'>coreduo-v1</model>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='yes' vendor='Intel'>n270</model>
+diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
+index c91b05f312..56a57665f1 100644
+--- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
+@@ -1221,10 +1221,14 @@
+       <blockers model='core2duo'>
+         <feature name='ss'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>coreduo</model>
++      <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+       <blockers model='coreduo'>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>coreduo-v1</model>
++      <blockers model='coreduo-v1'>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='no' vendor='Intel'>n270</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 76d9f80936..d2e14fcaab 100644
+--- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
+@@ -1223,10 +1223,14 @@
+       <blockers model='core2duo'>
+         <feature name='ss'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>coreduo</model>
++      <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+       <blockers model='coreduo'>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>coreduo-v1</model>
++      <blockers model='coreduo-v1'>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='no' vendor='Intel'>n270</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 7f08733452..25fe5a3f48 100644
+--- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
+@@ -1448,7 +1448,8 @@
+       </blockers>
+       <model usable='yes' vendor='AMD'>athlon</model>
+       <model usable='yes' vendor='Intel'>core2duo</model>
+-      <model usable='yes' vendor='Intel'>coreduo</model>
++      <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
++      <model usable='yes' vendor='Intel'>coreduo-v1</model>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='yes' vendor='Intel'>n270</model>
+diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
+index 4bf5988cf3..dfcbcf2477 100644
+--- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
+@@ -1222,10 +1222,14 @@
+       <blockers model='core2duo'>
+         <feature name='ss'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>coreduo</model>
++      <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+       <blockers model='coreduo'>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>coreduo-v1</model>
++      <blockers model='coreduo-v1'>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='no' vendor='Intel'>n270</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 8e2d2a636e..7b20023b19 100644
+--- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
+@@ -1223,10 +1223,14 @@
+       <blockers model='core2duo'>
+         <feature name='ss'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>coreduo</model>
++      <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+       <blockers model='coreduo'>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>coreduo-v1</model>
++      <blockers model='coreduo-v1'>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='no' vendor='Intel'>n270</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 0b488faa07..ee58ddff1d 100644
+--- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
+@@ -1378,7 +1378,8 @@
+       </blockers>
+       <model usable='yes' vendor='AMD'>athlon</model>
+       <model usable='yes' vendor='Intel'>core2duo</model>
+-      <model usable='yes' vendor='Intel'>coreduo</model>
++      <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
++      <model usable='yes' vendor='Intel'>coreduo-v1</model>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='yes' vendor='Intel'>n270</model>
+diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
+index 9b41cc5fcc..d2f19183f0 100644
+--- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
+@@ -1222,10 +1222,14 @@
+       <blockers model='core2duo'>
+         <feature name='ss'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>coreduo</model>
++      <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+       <blockers model='coreduo'>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>coreduo-v1</model>
++      <blockers model='coreduo-v1'>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='no' vendor='Intel'>n270</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 996a269525..3e3bd2b5e1 100644
+--- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
+@@ -1359,10 +1359,14 @@
+       <blockers model='core2duo'>
+         <feature name='ss'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>coreduo</model>
++      <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+       <blockers model='coreduo'>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>coreduo-v1</model>
++      <blockers model='coreduo-v1'>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='no' vendor='Intel'>n270</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 5d914aa62c..f4e8163256 100644
+--- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
+@@ -1483,7 +1483,8 @@
+       </blockers>
+       <model usable='yes' vendor='AMD'>athlon</model>
+       <model usable='yes' vendor='Intel'>core2duo</model>
+-      <model usable='yes' vendor='Intel'>coreduo</model>
++      <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
++      <model usable='yes' vendor='Intel'>coreduo-v1</model>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='yes' vendor='Intel'>n270</model>
+diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
+index 094ec28df0..54d5323f71 100644
+--- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
+@@ -1358,10 +1358,14 @@
+       <blockers model='core2duo'>
+         <feature name='ss'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>coreduo</model>
++      <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+       <blockers model='coreduo'>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>coreduo-v1</model>
++      <blockers model='coreduo-v1'>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='no' vendor='Intel'>n270</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 0e9a63cf4e..b9697229d9 100644
+--- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
+@@ -1359,10 +1359,14 @@
+       <blockers model='core2duo'>
+         <feature name='ss'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>coreduo</model>
++      <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+       <blockers model='coreduo'>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>coreduo-v1</model>
++      <blockers model='coreduo-v1'>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='no' vendor='Intel'>n270</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 9fb8cb4e4a..cc672be9a1 100644
+--- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
+@@ -1483,7 +1483,8 @@
+       </blockers>
+       <model usable='yes' vendor='AMD'>athlon</model>
+       <model usable='yes' vendor='Intel'>core2duo</model>
+-      <model usable='yes' vendor='Intel'>coreduo</model>
++      <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
++      <model usable='yes' vendor='Intel'>coreduo-v1</model>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='yes' vendor='Intel'>n270</model>
+diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
+index d99a66ecfe..c29d1e99bc 100644
+--- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
+@@ -1358,10 +1358,14 @@
+       <blockers model='core2duo'>
+         <feature name='ss'/>
+       </blockers>
+-      <model usable='no' vendor='Intel'>coreduo</model>
++      <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+       <blockers model='coreduo'>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>coreduo-v1</model>
++      <blockers model='coreduo-v1'>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='no' vendor='Intel'>n270</model>
+-- 
+2.47.1
diff --git a/libvirt-cpu_map-Add-kvm32-v1-CPU-model.patch b/libvirt-cpu_map-Add-kvm32-v1-CPU-model.patch
new file mode 100644
index 0000000..a011224
--- /dev/null
+++ b/libvirt-cpu_map-Add-kvm32-v1-CPU-model.patch
@@ -0,0 +1,658 @@
+From d537d1a9ecc47099351ad893ce2d031d8d799b35 Mon Sep 17 00:00:00 2001
+Message-ID: <d537d1a9ecc47099351ad893ce2d031d8d799b35.1734429554.git.jdenemar@redhat.com>
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Thu, 5 Dec 2024 15:35:19 +0100
+Subject: [PATCH] cpu_map: Add kvm32-v1 CPU model
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit 4a8259b5a3bfa224b431767e9091f54caefb25a2)
+
+https://issues.redhat.com/browse/RHEL-70129
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ src/cpu_map/index.xml                              | 1 +
+ src/cpu_map/meson.build                            | 1 +
+ src/cpu_map/x86_kvm32-v1.xml                       | 6 ++++++
+ tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_5.2.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_6.0.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_6.1.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_6.2.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_7.0.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_7.1.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml | 3 ++-
+ tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_7.2.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_8.0.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_8.1.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_8.2.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_9.0.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_9.1.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_9.2.0.x86_64.xml         | 3 ++-
+ 43 files changed, 88 insertions(+), 40 deletions(-)
+ create mode 100644 src/cpu_map/x86_kvm32-v1.xml
+
+diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml
+index 0fe2a513ca..81d77e4dba 100644
+--- a/src/cpu_map/index.xml
++++ b/src/cpu_map/index.xml
+@@ -28,6 +28,7 @@
+       <include filename='x86_qemu32.xml'/>
+       <include filename='x86_qemu32-v1.xml'/>
+       <include filename='x86_kvm32.xml'/>
++      <include filename='x86_kvm32-v1.xml'/>
+       <include filename='x86_cpu64-rhel5.xml'/>
+       <include filename='x86_cpu64-rhel6.xml'/>
+       <include filename='x86_qemu64.xml'/>
+diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build
+index 61c5e403f9..d73a1b4feb 100644
+--- a/src/cpu_map/meson.build
++++ b/src/cpu_map/meson.build
+@@ -99,6 +99,7 @@ cpumap_data = [
+   'x86_IvyBridge-v2.xml',
+   'x86_IvyBridge.xml',
+   'x86_KnightsMill.xml',
++  'x86_kvm32-v1.xml',
+   'x86_kvm32.xml',
+   'x86_kvm64.xml',
+   'x86_n270-v1.xml',
+diff --git a/src/cpu_map/x86_kvm32-v1.xml b/src/cpu_map/x86_kvm32-v1.xml
+new file mode 100644
+index 0000000000..cce4b1d7c5
+--- /dev/null
++++ b/src/cpu_map/x86_kvm32-v1.xml
+@@ -0,0 +1,6 @@
++<cpus>
++  <model name='kvm32-v1'>
++    <decode host='on' guest='off'/>
++    <model name='kvm32'/>
++  </model>
++</cpus>
+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 90a947b72a..da05a9358f 100644
+--- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
+@@ -795,7 +795,8 @@
+       <blockers model='coreduo-v1'>
+         <feature name='ss'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>kvm32</model>
++      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
++      <model usable='yes' vendor='unknown'>kvm32-v1</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
+       <blockers model='n270'>
+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 a1d2982897..296f4bce12 100644
+--- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
+@@ -1416,7 +1416,8 @@
+       <model usable='yes' vendor='Intel'>core2duo-v1</model>
+       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+       <model usable='yes' vendor='Intel'>coreduo-v1</model>
+-      <model usable='yes' vendor='unknown'>kvm32</model>
++      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
++      <model usable='yes' vendor='unknown'>kvm32-v1</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
+       <model usable='yes' vendor='Intel'>n270-v1</model>
+diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
+index 1c6e65a408..dd5df8de0d 100644
+--- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
+@@ -794,7 +794,8 @@
+       <blockers model='coreduo-v1'>
+         <feature name='ss'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>kvm32</model>
++      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
++      <model usable='yes' vendor='unknown'>kvm32-v1</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
+       <blockers model='n270'>
+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 bafaee4dc5..4330afb33a 100644
+--- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
+@@ -817,7 +817,8 @@
+       <blockers model='coreduo-v1'>
+         <feature name='ss'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>kvm32</model>
++      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
++      <model usable='yes' vendor='unknown'>kvm32-v1</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
+       <blockers model='n270'>
+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 bac7c98eea..873d4b7b1f 100644
+--- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
+@@ -1506,7 +1506,8 @@
+       <model usable='yes' vendor='Intel'>core2duo-v1</model>
+       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+       <model usable='yes' vendor='Intel'>coreduo-v1</model>
+-      <model usable='yes' vendor='unknown'>kvm32</model>
++      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
++      <model usable='yes' vendor='unknown'>kvm32-v1</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
+       <model usable='yes' vendor='Intel'>n270-v1</model>
+diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
+index fe78b42ab3..f1f8362f52 100644
+--- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
+@@ -816,7 +816,8 @@
+       <blockers model='coreduo-v1'>
+         <feature name='ss'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>kvm32</model>
++      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
++      <model usable='yes' vendor='unknown'>kvm32-v1</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
+       <blockers model='n270'>
+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 c4e6cfeb84..7e0ed073a2 100644
+--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
+@@ -918,7 +918,8 @@
+       <blockers model='coreduo-v1'>
+         <feature name='ss'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>kvm32</model>
++      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
++      <model usable='yes' vendor='unknown'>kvm32-v1</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
+       <blockers model='n270'>
+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 3390d156e5..b93e3ca9ac 100644
+--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
+@@ -1703,7 +1703,8 @@
+       <model usable='yes' vendor='Intel'>core2duo-v1</model>
+       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+       <model usable='yes' vendor='Intel'>coreduo-v1</model>
+-      <model usable='yes' vendor='unknown'>kvm32</model>
++      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
++      <model usable='yes' vendor='unknown'>kvm32-v1</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
+       <model usable='yes' vendor='Intel'>n270-v1</model>
+diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
+index 62d5a4bdad..8c538a6568 100644
+--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
+@@ -917,7 +917,8 @@
+       <blockers model='coreduo-v1'>
+         <feature name='ss'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>kvm32</model>
++      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
++      <model usable='yes' vendor='unknown'>kvm32-v1</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
+       <blockers model='n270'>
+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 77fa39cf13..dc8fd0539b 100644
+--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
+@@ -924,7 +924,8 @@
+       <blockers model='coreduo-v1'>
+         <feature name='ss'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>kvm32</model>
++      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
++      <model usable='yes' vendor='unknown'>kvm32-v1</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
+       <blockers model='n270'>
+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 ee36631717..e075cc7dca 100644
+--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
+@@ -1718,7 +1718,8 @@
+       <model usable='yes' vendor='Intel'>core2duo-v1</model>
+       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+       <model usable='yes' vendor='Intel'>coreduo-v1</model>
+-      <model usable='yes' vendor='unknown'>kvm32</model>
++      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
++      <model usable='yes' vendor='unknown'>kvm32-v1</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
+       <model usable='yes' vendor='Intel'>n270-v1</model>
+diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+index fb66ff6032..d0955a30f2 100644
+--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+@@ -923,7 +923,8 @@
+       <blockers model='coreduo-v1'>
+         <feature name='ss'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>kvm32</model>
++      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
++      <model usable='yes' vendor='unknown'>kvm32-v1</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
+       <blockers model='n270'>
+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 fbbe1f7ed4..4f2d2a272d 100644
+--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
+@@ -951,7 +951,8 @@
+       <blockers model='coreduo-v1'>
+         <feature name='ss'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>kvm32</model>
++      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
++      <model usable='yes' vendor='unknown'>kvm32-v1</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
+       <blockers model='n270'>
+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 f5a84c16f7..fcb175557c 100644
+--- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
+@@ -1742,7 +1742,8 @@
+       <model usable='yes' vendor='Intel'>core2duo-v1</model>
+       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+       <model usable='yes' vendor='Intel'>coreduo-v1</model>
+-      <model usable='yes' vendor='unknown'>kvm32</model>
++      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
++      <model usable='yes' vendor='unknown'>kvm32-v1</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
+       <model usable='yes' vendor='Intel'>n270-v1</model>
+diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+index d828319061..07fa015c26 100644
+--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+@@ -950,7 +950,8 @@
+       <blockers model='coreduo-v1'>
+         <feature name='ss'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>kvm32</model>
++      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
++      <model usable='yes' vendor='unknown'>kvm32-v1</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
+       <blockers model='n270'>
+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 968be6fc31..7880718caf 100644
+--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
+@@ -918,7 +918,8 @@
+       <blockers model='coreduo-v1'>
+         <feature name='ss'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>kvm32</model>
++      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
++      <model usable='yes' vendor='unknown'>kvm32-v1</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
+       <blockers model='n270'>
+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 d0a03a641c..e34444f915 100644
+--- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
+@@ -1690,7 +1690,8 @@
+       <model usable='yes' vendor='Intel'>core2duo-v1</model>
+       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+       <model usable='yes' vendor='Intel'>coreduo-v1</model>
+-      <model usable='yes' vendor='unknown'>kvm32</model>
++      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
++      <model usable='yes' vendor='unknown'>kvm32-v1</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
+       <model usable='yes' vendor='Intel'>n270-v1</model>
+diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
+index a0492d152e..dd045555db 100644
+--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
+@@ -917,7 +917,8 @@
+       <blockers model='coreduo-v1'>
+         <feature name='ss'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>kvm32</model>
++      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
++      <model usable='yes' vendor='unknown'>kvm32-v1</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
+       <blockers model='n270'>
+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 dfb06177ff..34527a0fc0 100644
+--- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
+@@ -923,7 +923,8 @@
+       <blockers model='coreduo-v1'>
+         <feature name='ss'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>kvm32</model>
++      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
++      <model usable='yes' vendor='unknown'>kvm32-v1</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
+       <blockers model='n270'>
+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 90908a78e2..14f0bc7f87 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
+@@ -1403,7 +1403,8 @@
+       <model usable='yes' vendor='Intel'>core2duo-v1</model>
+       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+       <model usable='yes' vendor='Intel'>coreduo-v1</model>
+-      <model usable='yes' vendor='unknown'>kvm32</model>
++      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
++      <model usable='yes' vendor='unknown'>kvm32-v1</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
+       <model usable='yes' vendor='Intel'>n270-v1</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 90908a78e2..14f0bc7f87 100644
+--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
+@@ -1403,7 +1403,8 @@
+       <model usable='yes' vendor='Intel'>core2duo-v1</model>
+       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+       <model usable='yes' vendor='Intel'>coreduo-v1</model>
+-      <model usable='yes' vendor='unknown'>kvm32</model>
++      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
++      <model usable='yes' vendor='unknown'>kvm32-v1</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
+       <model usable='yes' vendor='Intel'>n270-v1</model>
+diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
+index f3c03fe68b..de7e039b84 100644
+--- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
+@@ -922,7 +922,8 @@
+       <blockers model='coreduo-v1'>
+         <feature name='ss'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>kvm32</model>
++      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
++      <model usable='yes' vendor='unknown'>kvm32-v1</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
+       <blockers model='n270'>
+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 27e43a875e..eeee7b926c 100644
+--- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
+@@ -1005,7 +1005,8 @@
+       <blockers model='coreduo-v1'>
+         <feature name='ss'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>kvm32</model>
++      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
++      <model usable='yes' vendor='unknown'>kvm32-v1</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
+       <blockers model='n270'>
+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 8fc17e9d8a..882ef3ed4d 100644
+--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
+@@ -1498,7 +1498,8 @@
+       <model usable='yes' vendor='Intel'>core2duo-v1</model>
+       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+       <model usable='yes' vendor='Intel'>coreduo-v1</model>
+-      <model usable='yes' vendor='unknown'>kvm32</model>
++      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
++      <model usable='yes' vendor='unknown'>kvm32-v1</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
+       <model usable='yes' vendor='Intel'>n270-v1</model>
+diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
+index ccaf3af991..dee27a40c4 100644
+--- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
+@@ -1004,7 +1004,8 @@
+       <blockers model='coreduo-v1'>
+         <feature name='ss'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>kvm32</model>
++      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
++      <model usable='yes' vendor='unknown'>kvm32-v1</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
+       <blockers model='n270'>
+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 f77e36d1ea..14f9d0a3a5 100644
+--- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
+@@ -1234,7 +1234,8 @@
+       <blockers model='coreduo-v1'>
+         <feature name='ss'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>kvm32</model>
++      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
++      <model usable='yes' vendor='unknown'>kvm32-v1</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
+       <blockers model='n270'>
+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 5e5cf92e53..1347de2c5b 100644
+--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
+@@ -1484,7 +1484,8 @@
+       <model usable='yes' vendor='Intel'>core2duo-v1</model>
+       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+       <model usable='yes' vendor='Intel'>coreduo-v1</model>
+-      <model usable='yes' vendor='unknown'>kvm32</model>
++      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
++      <model usable='yes' vendor='unknown'>kvm32-v1</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
+       <model usable='yes' vendor='Intel'>n270-v1</model>
+diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
+index 3b53baae7a..6855f75ba4 100644
+--- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
+@@ -1233,7 +1233,8 @@
+       <blockers model='coreduo-v1'>
+         <feature name='ss'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>kvm32</model>
++      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
++      <model usable='yes' vendor='unknown'>kvm32-v1</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
+       <blockers model='n270'>
+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 a4faf9112c..63bce83ba5 100644
+--- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
+@@ -1235,7 +1235,8 @@
+       <blockers model='coreduo-v1'>
+         <feature name='ss'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>kvm32</model>
++      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
++      <model usable='yes' vendor='unknown'>kvm32-v1</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
+       <blockers model='n270'>
+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 3e7ba22317..6b4db43077 100644
+--- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
+@@ -1451,7 +1451,8 @@
+       <model usable='yes' vendor='Intel'>core2duo-v1</model>
+       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+       <model usable='yes' vendor='Intel'>coreduo-v1</model>
+-      <model usable='yes' vendor='unknown'>kvm32</model>
++      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
++      <model usable='yes' vendor='unknown'>kvm32-v1</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
+       <model usable='yes' vendor='Intel'>n270-v1</model>
+diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
+index a2fbea3b21..b9449120d3 100644
+--- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
+@@ -1234,7 +1234,8 @@
+       <blockers model='coreduo-v1'>
+         <feature name='ss'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>kvm32</model>
++      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
++      <model usable='yes' vendor='unknown'>kvm32-v1</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
+       <blockers model='n270'>
+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 b945327d7a..5b0f2f84be 100644
+--- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
+@@ -1235,7 +1235,8 @@
+       <blockers model='coreduo-v1'>
+         <feature name='ss'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>kvm32</model>
++      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
++      <model usable='yes' vendor='unknown'>kvm32-v1</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
+       <blockers model='n270'>
+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 1c00bbb899..04049d17af 100644
+--- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
+@@ -1381,7 +1381,8 @@
+       <model usable='yes' vendor='Intel'>core2duo-v1</model>
+       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+       <model usable='yes' vendor='Intel'>coreduo-v1</model>
+-      <model usable='yes' vendor='unknown'>kvm32</model>
++      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
++      <model usable='yes' vendor='unknown'>kvm32-v1</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
+       <model usable='yes' vendor='Intel'>n270-v1</model>
+diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
+index c0d45ff56b..4ec2b2e96d 100644
+--- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
+@@ -1234,7 +1234,8 @@
+       <blockers model='coreduo-v1'>
+         <feature name='ss'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>kvm32</model>
++      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
++      <model usable='yes' vendor='unknown'>kvm32-v1</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
+       <blockers model='n270'>
+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 7d5c0b114d..9e152d5b55 100644
+--- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
+@@ -1371,7 +1371,8 @@
+       <blockers model='coreduo-v1'>
+         <feature name='ss'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>kvm32</model>
++      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
++      <model usable='yes' vendor='unknown'>kvm32-v1</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
+       <blockers model='n270'>
+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 915970f0ca..1c79f73ae2 100644
+--- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
+@@ -1486,7 +1486,8 @@
+       <model usable='yes' vendor='Intel'>core2duo-v1</model>
+       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+       <model usable='yes' vendor='Intel'>coreduo-v1</model>
+-      <model usable='yes' vendor='unknown'>kvm32</model>
++      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
++      <model usable='yes' vendor='unknown'>kvm32-v1</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
+       <model usable='yes' vendor='Intel'>n270-v1</model>
+diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
+index 3703b8b6f4..0af8a79cb4 100644
+--- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
+@@ -1370,7 +1370,8 @@
+       <blockers model='coreduo-v1'>
+         <feature name='ss'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>kvm32</model>
++      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
++      <model usable='yes' vendor='unknown'>kvm32-v1</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
+       <blockers model='n270'>
+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 c76d4d112f..4cb0a22a9b 100644
+--- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
+@@ -1371,7 +1371,8 @@
+       <blockers model='coreduo-v1'>
+         <feature name='ss'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>kvm32</model>
++      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
++      <model usable='yes' vendor='unknown'>kvm32-v1</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
+       <blockers model='n270'>
+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 cf9ef74abe..99858a0b91 100644
+--- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
+@@ -1486,7 +1486,8 @@
+       <model usable='yes' vendor='Intel'>core2duo-v1</model>
+       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
+       <model usable='yes' vendor='Intel'>coreduo-v1</model>
+-      <model usable='yes' vendor='unknown'>kvm32</model>
++      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
++      <model usable='yes' vendor='unknown'>kvm32-v1</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
+       <model usable='yes' vendor='Intel'>n270-v1</model>
+diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
+index bb64a26754..cfedba3e8e 100644
+--- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
+@@ -1370,7 +1370,8 @@
+       <blockers model='coreduo-v1'>
+         <feature name='ss'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>kvm32</model>
++      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
++      <model usable='yes' vendor='unknown'>kvm32-v1</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
+       <blockers model='n270'>
+-- 
+2.47.1
diff --git a/libvirt-cpu_map-Add-kvm64-v1-CPU-model.patch b/libvirt-cpu_map-Add-kvm64-v1-CPU-model.patch
new file mode 100644
index 0000000..991ab0e
--- /dev/null
+++ b/libvirt-cpu_map-Add-kvm64-v1-CPU-model.patch
@@ -0,0 +1,658 @@
+From 084610a2718223fc68fe2ed4362dd3f7734a0bde Mon Sep 17 00:00:00 2001
+Message-ID: <084610a2718223fc68fe2ed4362dd3f7734a0bde.1734429554.git.jdenemar@redhat.com>
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Thu, 5 Dec 2024 15:37:01 +0100
+Subject: [PATCH] cpu_map: Add kvm64-v1 CPU model
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit 6d25eafaec0f138a57fbaa5c3e51952548ffae18)
+
+https://issues.redhat.com/browse/RHEL-70129
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ src/cpu_map/index.xml                              | 1 +
+ src/cpu_map/meson.build                            | 1 +
+ src/cpu_map/x86_kvm64-v1.xml                       | 6 ++++++
+ tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_5.2.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_6.0.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_6.1.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_6.2.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_7.0.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_7.1.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml | 3 ++-
+ tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_7.2.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_8.0.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_8.1.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_8.2.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_9.0.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_9.1.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_9.2.0.x86_64.xml         | 3 ++-
+ 43 files changed, 88 insertions(+), 40 deletions(-)
+ create mode 100644 src/cpu_map/x86_kvm64-v1.xml
+
+diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml
+index 8077da260d..a9a8d1b2c4 100644
+--- a/src/cpu_map/index.xml
++++ b/src/cpu_map/index.xml
+@@ -34,6 +34,7 @@
+       <include filename='x86_qemu64.xml'/>
+       <include filename='x86_qemu64-v1.xml'/>
+       <include filename='x86_kvm64.xml'/>
++      <include filename='x86_kvm64-v1.xml'/>
+     </group>
+ 
+     <group name='Intel CPU models'>
+diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build
+index 799a72df47..7ea53373ae 100644
+--- a/src/cpu_map/meson.build
++++ b/src/cpu_map/meson.build
+@@ -101,6 +101,7 @@ cpumap_data = [
+   'x86_KnightsMill.xml',
+   'x86_kvm32-v1.xml',
+   'x86_kvm32.xml',
++  'x86_kvm64-v1.xml',
+   'x86_kvm64.xml',
+   'x86_n270-v1.xml',
+   'x86_n270.xml',
+diff --git a/src/cpu_map/x86_kvm64-v1.xml b/src/cpu_map/x86_kvm64-v1.xml
+new file mode 100644
+index 0000000000..73d1e4f574
+--- /dev/null
++++ b/src/cpu_map/x86_kvm64-v1.xml
+@@ -0,0 +1,6 @@
++<cpus>
++  <model name='kvm64-v1'>
++    <decode host='on' guest='off'/>
++    <model name='kvm64'/>
++  </model>
++</cpus>
+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 e6c0863d54..985a00cf84 100644
+--- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
+@@ -797,7 +797,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm32-v1</model>
+-      <model usable='yes' vendor='unknown'>kvm64</model>
++      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
++      <model usable='yes' vendor='unknown'>kvm64-v1</model>
+       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
+       <blockers model='n270'>
+         <feature name='ss'/>
+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 7f68ca79c7..74aa563566 100644
+--- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
+@@ -1418,7 +1418,8 @@
+       <model usable='yes' vendor='Intel'>coreduo-v1</model>
+       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm32-v1</model>
+-      <model usable='yes' vendor='unknown'>kvm64</model>
++      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
++      <model usable='yes' vendor='unknown'>kvm64-v1</model>
+       <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
+       <model usable='yes' vendor='Intel'>n270-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
+index 13aef737e2..4fdeaec417 100644
+--- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
+@@ -796,7 +796,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm32-v1</model>
+-      <model usable='yes' vendor='unknown'>kvm64</model>
++      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
++      <model usable='yes' vendor='unknown'>kvm64-v1</model>
+       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
+       <blockers model='n270'>
+         <feature name='ss'/>
+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 734d1f3bb2..284d70c7cc 100644
+--- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
+@@ -819,7 +819,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm32-v1</model>
+-      <model usable='yes' vendor='unknown'>kvm64</model>
++      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
++      <model usable='yes' vendor='unknown'>kvm64-v1</model>
+       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
+       <blockers model='n270'>
+         <feature name='ss'/>
+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 39f1aaf3f8..07097ce25b 100644
+--- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
+@@ -1508,7 +1508,8 @@
+       <model usable='yes' vendor='Intel'>coreduo-v1</model>
+       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm32-v1</model>
+-      <model usable='yes' vendor='unknown'>kvm64</model>
++      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
++      <model usable='yes' vendor='unknown'>kvm64-v1</model>
+       <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
+       <model usable='yes' vendor='Intel'>n270-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
+index 3db605a87b..1aefe0ea08 100644
+--- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
+@@ -818,7 +818,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm32-v1</model>
+-      <model usable='yes' vendor='unknown'>kvm64</model>
++      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
++      <model usable='yes' vendor='unknown'>kvm64-v1</model>
+       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
+       <blockers model='n270'>
+         <feature name='ss'/>
+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 c77b05c257..2ffe8cb354 100644
+--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
+@@ -920,7 +920,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm32-v1</model>
+-      <model usable='yes' vendor='unknown'>kvm64</model>
++      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
++      <model usable='yes' vendor='unknown'>kvm64-v1</model>
+       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
+       <blockers model='n270'>
+         <feature name='ss'/>
+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 67b5a9f3d8..2a084c64fe 100644
+--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
+@@ -1705,7 +1705,8 @@
+       <model usable='yes' vendor='Intel'>coreduo-v1</model>
+       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm32-v1</model>
+-      <model usable='yes' vendor='unknown'>kvm64</model>
++      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
++      <model usable='yes' vendor='unknown'>kvm64-v1</model>
+       <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
+       <model usable='yes' vendor='Intel'>n270-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
+index daafd91079..bda2e0ef68 100644
+--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
+@@ -919,7 +919,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm32-v1</model>
+-      <model usable='yes' vendor='unknown'>kvm64</model>
++      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
++      <model usable='yes' vendor='unknown'>kvm64-v1</model>
+       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
+       <blockers model='n270'>
+         <feature name='ss'/>
+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 6c15cae03d..d2fbcad98c 100644
+--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
+@@ -926,7 +926,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm32-v1</model>
+-      <model usable='yes' vendor='unknown'>kvm64</model>
++      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
++      <model usable='yes' vendor='unknown'>kvm64-v1</model>
+       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
+       <blockers model='n270'>
+         <feature name='ss'/>
+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 2480513c4b..60093eda9a 100644
+--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
+@@ -1720,7 +1720,8 @@
+       <model usable='yes' vendor='Intel'>coreduo-v1</model>
+       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm32-v1</model>
+-      <model usable='yes' vendor='unknown'>kvm64</model>
++      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
++      <model usable='yes' vendor='unknown'>kvm64-v1</model>
+       <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
+       <model usable='yes' vendor='Intel'>n270-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+index 914f011071..eafdc53ff6 100644
+--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+@@ -925,7 +925,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm32-v1</model>
+-      <model usable='yes' vendor='unknown'>kvm64</model>
++      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
++      <model usable='yes' vendor='unknown'>kvm64-v1</model>
+       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
+       <blockers model='n270'>
+         <feature name='ss'/>
+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 f368716de9..03896267d5 100644
+--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
+@@ -953,7 +953,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm32-v1</model>
+-      <model usable='yes' vendor='unknown'>kvm64</model>
++      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
++      <model usable='yes' vendor='unknown'>kvm64-v1</model>
+       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
+       <blockers model='n270'>
+         <feature name='ss'/>
+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 c3dba8ccd7..52eb4b8215 100644
+--- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
+@@ -1744,7 +1744,8 @@
+       <model usable='yes' vendor='Intel'>coreduo-v1</model>
+       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm32-v1</model>
+-      <model usable='yes' vendor='unknown'>kvm64</model>
++      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
++      <model usable='yes' vendor='unknown'>kvm64-v1</model>
+       <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
+       <model usable='yes' vendor='Intel'>n270-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+index 4592e03dc4..f212097662 100644
+--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+@@ -952,7 +952,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm32-v1</model>
+-      <model usable='yes' vendor='unknown'>kvm64</model>
++      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
++      <model usable='yes' vendor='unknown'>kvm64-v1</model>
+       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
+       <blockers model='n270'>
+         <feature name='ss'/>
+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 39535a73ad..38b0f47092 100644
+--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
+@@ -920,7 +920,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm32-v1</model>
+-      <model usable='yes' vendor='unknown'>kvm64</model>
++      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
++      <model usable='yes' vendor='unknown'>kvm64-v1</model>
+       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
+       <blockers model='n270'>
+         <feature name='ss'/>
+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 0694b5426e..43de9e5193 100644
+--- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
+@@ -1692,7 +1692,8 @@
+       <model usable='yes' vendor='Intel'>coreduo-v1</model>
+       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm32-v1</model>
+-      <model usable='yes' vendor='unknown'>kvm64</model>
++      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
++      <model usable='yes' vendor='unknown'>kvm64-v1</model>
+       <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
+       <model usable='yes' vendor='Intel'>n270-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
+index c36ebcf7fd..92514055c9 100644
+--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
+@@ -919,7 +919,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm32-v1</model>
+-      <model usable='yes' vendor='unknown'>kvm64</model>
++      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
++      <model usable='yes' vendor='unknown'>kvm64-v1</model>
+       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
+       <blockers model='n270'>
+         <feature name='ss'/>
+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 3d15c7dca5..10017064b8 100644
+--- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
+@@ -925,7 +925,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm32-v1</model>
+-      <model usable='yes' vendor='unknown'>kvm64</model>
++      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
++      <model usable='yes' vendor='unknown'>kvm64-v1</model>
+       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
+       <blockers model='n270'>
+         <feature name='ss'/>
+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 bfb94bc389..95b582af9f 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
+@@ -1405,7 +1405,8 @@
+       <model usable='yes' vendor='Intel'>coreduo-v1</model>
+       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm32-v1</model>
+-      <model usable='yes' vendor='unknown'>kvm64</model>
++      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
++      <model usable='yes' vendor='unknown'>kvm64-v1</model>
+       <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
+       <model usable='yes' vendor='Intel'>n270-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</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 bfb94bc389..95b582af9f 100644
+--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
+@@ -1405,7 +1405,8 @@
+       <model usable='yes' vendor='Intel'>coreduo-v1</model>
+       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm32-v1</model>
+-      <model usable='yes' vendor='unknown'>kvm64</model>
++      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
++      <model usable='yes' vendor='unknown'>kvm64-v1</model>
+       <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
+       <model usable='yes' vendor='Intel'>n270-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
+index 2c3bca4a76..1e40bc5b23 100644
+--- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
+@@ -924,7 +924,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm32-v1</model>
+-      <model usable='yes' vendor='unknown'>kvm64</model>
++      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
++      <model usable='yes' vendor='unknown'>kvm64-v1</model>
+       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
+       <blockers model='n270'>
+         <feature name='ss'/>
+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 bf2c489691..392ec1e232 100644
+--- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
+@@ -1007,7 +1007,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm32-v1</model>
+-      <model usable='yes' vendor='unknown'>kvm64</model>
++      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
++      <model usable='yes' vendor='unknown'>kvm64-v1</model>
+       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
+       <blockers model='n270'>
+         <feature name='ss'/>
+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 345f8177f2..0893277250 100644
+--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
+@@ -1500,7 +1500,8 @@
+       <model usable='yes' vendor='Intel'>coreduo-v1</model>
+       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm32-v1</model>
+-      <model usable='yes' vendor='unknown'>kvm64</model>
++      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
++      <model usable='yes' vendor='unknown'>kvm64-v1</model>
+       <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
+       <model usable='yes' vendor='Intel'>n270-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
+index 758ce18d38..52ef9718d0 100644
+--- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
+@@ -1006,7 +1006,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm32-v1</model>
+-      <model usable='yes' vendor='unknown'>kvm64</model>
++      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
++      <model usable='yes' vendor='unknown'>kvm64-v1</model>
+       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
+       <blockers model='n270'>
+         <feature name='ss'/>
+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 4a478b678f..ef74bbd2fa 100644
+--- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
+@@ -1236,7 +1236,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm32-v1</model>
+-      <model usable='yes' vendor='unknown'>kvm64</model>
++      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
++      <model usable='yes' vendor='unknown'>kvm64-v1</model>
+       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
+       <blockers model='n270'>
+         <feature name='ss'/>
+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 e3dda5ff74..404237ef67 100644
+--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
+@@ -1486,7 +1486,8 @@
+       <model usable='yes' vendor='Intel'>coreduo-v1</model>
+       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm32-v1</model>
+-      <model usable='yes' vendor='unknown'>kvm64</model>
++      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
++      <model usable='yes' vendor='unknown'>kvm64-v1</model>
+       <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
+       <model usable='yes' vendor='Intel'>n270-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
+index aa94c97499..eafacf0b61 100644
+--- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
+@@ -1235,7 +1235,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm32-v1</model>
+-      <model usable='yes' vendor='unknown'>kvm64</model>
++      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
++      <model usable='yes' vendor='unknown'>kvm64-v1</model>
+       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
+       <blockers model='n270'>
+         <feature name='ss'/>
+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 f3ad13ff40..c544eb02e3 100644
+--- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
+@@ -1237,7 +1237,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm32-v1</model>
+-      <model usable='yes' vendor='unknown'>kvm64</model>
++      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
++      <model usable='yes' vendor='unknown'>kvm64-v1</model>
+       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
+       <blockers model='n270'>
+         <feature name='ss'/>
+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 4aa6ddca4f..b7b0ddd7c4 100644
+--- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
+@@ -1453,7 +1453,8 @@
+       <model usable='yes' vendor='Intel'>coreduo-v1</model>
+       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm32-v1</model>
+-      <model usable='yes' vendor='unknown'>kvm64</model>
++      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
++      <model usable='yes' vendor='unknown'>kvm64-v1</model>
+       <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
+       <model usable='yes' vendor='Intel'>n270-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
+index 8ad3499c67..a4c86941c6 100644
+--- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
+@@ -1236,7 +1236,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm32-v1</model>
+-      <model usable='yes' vendor='unknown'>kvm64</model>
++      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
++      <model usable='yes' vendor='unknown'>kvm64-v1</model>
+       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
+       <blockers model='n270'>
+         <feature name='ss'/>
+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 b3325f4e36..06341f125a 100644
+--- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
+@@ -1237,7 +1237,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm32-v1</model>
+-      <model usable='yes' vendor='unknown'>kvm64</model>
++      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
++      <model usable='yes' vendor='unknown'>kvm64-v1</model>
+       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
+       <blockers model='n270'>
+         <feature name='ss'/>
+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 90a785ed55..e759a15ea7 100644
+--- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
+@@ -1383,7 +1383,8 @@
+       <model usable='yes' vendor='Intel'>coreduo-v1</model>
+       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm32-v1</model>
+-      <model usable='yes' vendor='unknown'>kvm64</model>
++      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
++      <model usable='yes' vendor='unknown'>kvm64-v1</model>
+       <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
+       <model usable='yes' vendor='Intel'>n270-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
+index 9bac49c553..eb4822c667 100644
+--- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
+@@ -1236,7 +1236,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm32-v1</model>
+-      <model usable='yes' vendor='unknown'>kvm64</model>
++      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
++      <model usable='yes' vendor='unknown'>kvm64-v1</model>
+       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
+       <blockers model='n270'>
+         <feature name='ss'/>
+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 986c3936c0..a6c7d8e74c 100644
+--- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
+@@ -1373,7 +1373,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm32-v1</model>
+-      <model usable='yes' vendor='unknown'>kvm64</model>
++      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
++      <model usable='yes' vendor='unknown'>kvm64-v1</model>
+       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
+       <blockers model='n270'>
+         <feature name='ss'/>
+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 9f4d2d8af8..18070cd01a 100644
+--- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
+@@ -1488,7 +1488,8 @@
+       <model usable='yes' vendor='Intel'>coreduo-v1</model>
+       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm32-v1</model>
+-      <model usable='yes' vendor='unknown'>kvm64</model>
++      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
++      <model usable='yes' vendor='unknown'>kvm64-v1</model>
+       <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
+       <model usable='yes' vendor='Intel'>n270-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
+index e8b70c7e0f..e008a2f2e9 100644
+--- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
+@@ -1372,7 +1372,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm32-v1</model>
+-      <model usable='yes' vendor='unknown'>kvm64</model>
++      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
++      <model usable='yes' vendor='unknown'>kvm64-v1</model>
+       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
+       <blockers model='n270'>
+         <feature name='ss'/>
+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 4ac90bad0d..ce19774d0d 100644
+--- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
+@@ -1373,7 +1373,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm32-v1</model>
+-      <model usable='yes' vendor='unknown'>kvm64</model>
++      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
++      <model usable='yes' vendor='unknown'>kvm64-v1</model>
+       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
+       <blockers model='n270'>
+         <feature name='ss'/>
+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 94d866a5f0..217fbfe51c 100644
+--- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
+@@ -1488,7 +1488,8 @@
+       <model usable='yes' vendor='Intel'>coreduo-v1</model>
+       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm32-v1</model>
+-      <model usable='yes' vendor='unknown'>kvm64</model>
++      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
++      <model usable='yes' vendor='unknown'>kvm64-v1</model>
+       <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
+       <model usable='yes' vendor='Intel'>n270-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
+index 84303bee0b..4f34340651 100644
+--- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
+@@ -1372,7 +1372,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm32-v1</model>
+-      <model usable='yes' vendor='unknown'>kvm64</model>
++      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
++      <model usable='yes' vendor='unknown'>kvm64-v1</model>
+       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
+       <blockers model='n270'>
+         <feature name='ss'/>
+-- 
+2.47.1
diff --git a/libvirt-cpu_map-Add-n270-v1-CPU-model.patch b/libvirt-cpu_map-Add-n270-v1-CPU-model.patch
new file mode 100644
index 0000000..bdbf96c
--- /dev/null
+++ b/libvirt-cpu_map-Add-n270-v1-CPU-model.patch
@@ -0,0 +1,840 @@
+From a1ec31d7e7f105c4784e37134bdb838fb2b4e465 Mon Sep 17 00:00:00 2001
+Message-ID: <a1ec31d7e7f105c4784e37134bdb838fb2b4e465.1734429553.git.jdenemar@redhat.com>
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Thu, 5 Dec 2024 15:32:08 +0100
+Subject: [PATCH] cpu_map: Add n270-v1 CPU model
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit c9fa77bfe84b8184254bb381d04f365391ab8a96)
+
+https://issues.redhat.com/browse/RHEL-70129
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ src/cpu_map/index.xml                              | 1 +
+ src/cpu_map/meson.build                            | 1 +
+ src/cpu_map/x86_n270-v1.xml                        | 6 ++++++
+ tests/cputestdata/x86_64-cpuid-Atom-D510-host.xml  | 2 +-
+ tests/cputestdata/x86_64-cpuid-Atom-N450-host.xml  | 2 +-
+ tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml     | 6 +++++-
+ tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_5.2.0.x86_64.xml         | 6 +++++-
+ tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml     | 6 +++++-
+ tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_6.0.0.x86_64.xml         | 6 +++++-
+ tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml     | 6 +++++-
+ tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_6.1.0.x86_64.xml         | 6 +++++-
+ tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml     | 6 +++++-
+ tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_6.2.0.x86_64.xml         | 6 +++++-
+ tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml     | 6 +++++-
+ tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_7.0.0.x86_64.xml         | 6 +++++-
+ tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml     | 6 +++++-
+ tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_7.1.0.x86_64.xml         | 6 +++++-
+ tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml     | 6 +++++-
+ tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml | 3 ++-
+ tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_7.2.0.x86_64.xml         | 6 +++++-
+ tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml     | 6 +++++-
+ tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_8.0.0.x86_64.xml         | 6 +++++-
+ tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml     | 6 +++++-
+ tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_8.1.0.x86_64.xml         | 6 +++++-
+ tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml     | 6 +++++-
+ tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_8.2.0.x86_64.xml         | 6 +++++-
+ tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml     | 6 +++++-
+ tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_9.0.0.x86_64.xml         | 6 +++++-
+ tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml     | 6 +++++-
+ tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_9.1.0.x86_64.xml         | 6 +++++-
+ tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml     | 6 +++++-
+ tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_9.2.0.x86_64.xml         | 6 +++++-
+ 45 files changed, 168 insertions(+), 42 deletions(-)
+ create mode 100644 src/cpu_map/x86_n270-v1.xml
+
+diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml
+index d8df3b214d..9534e5f308 100644
+--- a/src/cpu_map/index.xml
++++ b/src/cpu_map/index.xml
+@@ -19,6 +19,7 @@
+       <include filename='x86_coreduo.xml'/>
+       <include filename='x86_coreduo-v1.xml'/>
+       <include filename='x86_n270.xml'/>
++      <include filename='x86_n270-v1.xml'/>
+       <include filename='x86_core2duo.xml'/>
+     </group>
+ 
+diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build
+index 1213f6929c..5e85e24eb9 100644
+--- a/src/cpu_map/meson.build
++++ b/src/cpu_map/meson.build
+@@ -100,6 +100,7 @@ cpumap_data = [
+   'x86_KnightsMill.xml',
+   'x86_kvm32.xml',
+   'x86_kvm64.xml',
++  'x86_n270-v1.xml',
+   'x86_n270.xml',
+   'x86_Nehalem-IBRS.xml',
+   'x86_Nehalem-v1.xml',
+diff --git a/src/cpu_map/x86_n270-v1.xml b/src/cpu_map/x86_n270-v1.xml
+new file mode 100644
+index 0000000000..f49b823953
+--- /dev/null
++++ b/src/cpu_map/x86_n270-v1.xml
+@@ -0,0 +1,6 @@
++<cpus>
++  <model name='n270-v1'>
++    <decode host='on' guest='off'/>
++    <model name='n270'/>
++  </model>
++</cpus>
+diff --git a/tests/cputestdata/x86_64-cpuid-Atom-D510-host.xml b/tests/cputestdata/x86_64-cpuid-Atom-D510-host.xml
+index 1e9c6782e9..10797e0633 100644
+--- a/tests/cputestdata/x86_64-cpuid-Atom-D510-host.xml
++++ b/tests/cputestdata/x86_64-cpuid-Atom-D510-host.xml
+@@ -1,6 +1,6 @@
+ <cpu>
+   <arch>x86_64</arch>
+-  <model>n270</model>
++  <model>n270-v1</model>
+   <vendor>Intel</vendor>
+   <signature family='6' model='28' stepping='10'/>
+   <feature name='dtes64'/>
+diff --git a/tests/cputestdata/x86_64-cpuid-Atom-N450-host.xml b/tests/cputestdata/x86_64-cpuid-Atom-N450-host.xml
+index 4856cf53c4..498863b3ed 100644
+--- a/tests/cputestdata/x86_64-cpuid-Atom-N450-host.xml
++++ b/tests/cputestdata/x86_64-cpuid-Atom-N450-host.xml
+@@ -1,6 +1,6 @@
+ <cpu>
+   <arch>x86_64</arch>
+-  <model>n270</model>
++  <model>n270-v1</model>
+   <vendor>Intel</vendor>
+   <signature family='6' model='28' stepping='10'/>
+   <feature name='dtes64'/>
+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 cb6db8f83c..1ba8a7eb11 100644
+--- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
+@@ -793,10 +793,14 @@
+       </blockers>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+-      <model usable='no' vendor='Intel'>n270</model>
++      <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
+       <blockers model='n270'>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>n270-v1</model>
++      <blockers model='n270-v1'>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</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 36625a07b3..1abbfcc4bb 100644
+--- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
+@@ -1417,7 +1417,8 @@
+       <model usable='yes' vendor='Intel'>coreduo-v1</model>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+-      <model usable='yes' vendor='Intel'>n270</model>
++      <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
++      <model usable='yes' vendor='Intel'>n270-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
+index fcd76f9bc8..3040deeb50 100644
+--- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
+@@ -792,10 +792,14 @@
+       </blockers>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+-      <model usable='no' vendor='Intel'>n270</model>
++      <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
+       <blockers model='n270'>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>n270-v1</model>
++      <blockers model='n270-v1'>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</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 4b2d94b281..cb59946b78 100644
+--- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
+@@ -815,10 +815,14 @@
+       </blockers>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+-      <model usable='no' vendor='Intel'>n270</model>
++      <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
+       <blockers model='n270'>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>n270-v1</model>
++      <blockers model='n270-v1'>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</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 b20dbe72c1..e6165eab77 100644
+--- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
+@@ -1507,7 +1507,8 @@
+       <model usable='yes' vendor='Intel'>coreduo-v1</model>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+-      <model usable='yes' vendor='Intel'>n270</model>
++      <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
++      <model usable='yes' vendor='Intel'>n270-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
+index ad3be21085..5aae9a3fca 100644
+--- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
+@@ -814,10 +814,14 @@
+       </blockers>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+-      <model usable='no' vendor='Intel'>n270</model>
++      <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
+       <blockers model='n270'>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>n270-v1</model>
++      <blockers model='n270-v1'>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</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 a76f03f910..2898e56b41 100644
+--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
+@@ -916,10 +916,14 @@
+       </blockers>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+-      <model usable='no' vendor='Intel'>n270</model>
++      <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
+       <blockers model='n270'>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>n270-v1</model>
++      <blockers model='n270-v1'>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</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 da44554a73..2b5baf0a02 100644
+--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
+@@ -1704,7 +1704,8 @@
+       <model usable='yes' vendor='Intel'>coreduo-v1</model>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+-      <model usable='yes' vendor='Intel'>n270</model>
++      <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
++      <model usable='yes' vendor='Intel'>n270-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
+index 4369595b2e..0fd3e38ee6 100644
+--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
+@@ -915,10 +915,14 @@
+       </blockers>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+-      <model usable='no' vendor='Intel'>n270</model>
++      <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
+       <blockers model='n270'>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>n270-v1</model>
++      <blockers model='n270-v1'>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</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 dc6dd2f743..690959d35a 100644
+--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
+@@ -922,10 +922,14 @@
+       </blockers>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+-      <model usable='no' vendor='Intel'>n270</model>
++      <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
+       <blockers model='n270'>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>n270-v1</model>
++      <blockers model='n270-v1'>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</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 d8bb03fbfd..6153d8a9ee 100644
+--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
+@@ -1719,7 +1719,8 @@
+       <model usable='yes' vendor='Intel'>coreduo-v1</model>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+-      <model usable='yes' vendor='Intel'>n270</model>
++      <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
++      <model usable='yes' vendor='Intel'>n270-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+index 69afbc55f0..15edc7e73d 100644
+--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+@@ -921,10 +921,14 @@
+       </blockers>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+-      <model usable='no' vendor='Intel'>n270</model>
++      <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
+       <blockers model='n270'>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>n270-v1</model>
++      <blockers model='n270-v1'>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</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 0798ee74de..a1f68beb2a 100644
+--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
+@@ -949,10 +949,14 @@
+       </blockers>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+-      <model usable='no' vendor='Intel'>n270</model>
++      <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
+       <blockers model='n270'>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>n270-v1</model>
++      <blockers model='n270-v1'>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</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 07bbd505fa..9eda36d3c8 100644
+--- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
+@@ -1743,7 +1743,8 @@
+       <model usable='yes' vendor='Intel'>coreduo-v1</model>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+-      <model usable='yes' vendor='Intel'>n270</model>
++      <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
++      <model usable='yes' vendor='Intel'>n270-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+index bf07fa3f51..249baa1342 100644
+--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+@@ -948,10 +948,14 @@
+       </blockers>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+-      <model usable='no' vendor='Intel'>n270</model>
++      <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
+       <blockers model='n270'>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>n270-v1</model>
++      <blockers model='n270-v1'>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</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 694561221f..b65196f979 100644
+--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
+@@ -916,10 +916,14 @@
+       </blockers>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+-      <model usable='no' vendor='Intel'>n270</model>
++      <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
+       <blockers model='n270'>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>n270-v1</model>
++      <blockers model='n270-v1'>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</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 d98b895940..84df14bc63 100644
+--- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
+@@ -1691,7 +1691,8 @@
+       <model usable='yes' vendor='Intel'>coreduo-v1</model>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+-      <model usable='yes' vendor='Intel'>n270</model>
++      <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
++      <model usable='yes' vendor='Intel'>n270-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
+index e02f39bdf5..2e41f4a73a 100644
+--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
+@@ -915,10 +915,14 @@
+       </blockers>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+-      <model usable='no' vendor='Intel'>n270</model>
++      <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
+       <blockers model='n270'>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>n270-v1</model>
++      <blockers model='n270-v1'>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</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 faa838ee4b..ca8391756b 100644
+--- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
+@@ -921,10 +921,14 @@
+       </blockers>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+-      <model usable='no' vendor='Intel'>n270</model>
++      <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
+       <blockers model='n270'>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>n270-v1</model>
++      <blockers model='n270-v1'>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</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 c65ffc40bb..258212d852 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
+@@ -1404,7 +1404,8 @@
+       <model usable='yes' vendor='Intel'>coreduo-v1</model>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+-      <model usable='yes' vendor='Intel'>n270</model>
++      <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
++      <model usable='yes' vendor='Intel'>n270-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</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 c65ffc40bb..258212d852 100644
+--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
+@@ -1404,7 +1404,8 @@
+       <model usable='yes' vendor='Intel'>coreduo-v1</model>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+-      <model usable='yes' vendor='Intel'>n270</model>
++      <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
++      <model usable='yes' vendor='Intel'>n270-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
+index 0a88511093..819010acff 100644
+--- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
+@@ -920,10 +920,14 @@
+       </blockers>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+-      <model usable='no' vendor='Intel'>n270</model>
++      <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
+       <blockers model='n270'>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>n270-v1</model>
++      <blockers model='n270-v1'>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</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 e931d7445d..68b1192153 100644
+--- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
+@@ -1003,10 +1003,14 @@
+       </blockers>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+-      <model usable='no' vendor='Intel'>n270</model>
++      <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
+       <blockers model='n270'>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>n270-v1</model>
++      <blockers model='n270-v1'>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</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 c0cc453fd1..ea0bc81bea 100644
+--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
+@@ -1499,7 +1499,8 @@
+       <model usable='yes' vendor='Intel'>coreduo-v1</model>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+-      <model usable='yes' vendor='Intel'>n270</model>
++      <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
++      <model usable='yes' vendor='Intel'>n270-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
+index 59c36bfa49..bddb1413a1 100644
+--- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
+@@ -1002,10 +1002,14 @@
+       </blockers>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+-      <model usable='no' vendor='Intel'>n270</model>
++      <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
+       <blockers model='n270'>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>n270-v1</model>
++      <blockers model='n270-v1'>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</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 f822c040de..7f1f4a2082 100644
+--- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
+@@ -1232,10 +1232,14 @@
+       </blockers>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+-      <model usable='no' vendor='Intel'>n270</model>
++      <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
+       <blockers model='n270'>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>n270-v1</model>
++      <blockers model='n270-v1'>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</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 7ea876c1fc..e2fc678bb6 100644
+--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
+@@ -1485,7 +1485,8 @@
+       <model usable='yes' vendor='Intel'>coreduo-v1</model>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+-      <model usable='yes' vendor='Intel'>n270</model>
++      <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
++      <model usable='yes' vendor='Intel'>n270-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
+index 56a57665f1..4b0aed148d 100644
+--- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
+@@ -1231,10 +1231,14 @@
+       </blockers>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+-      <model usable='no' vendor='Intel'>n270</model>
++      <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
+       <blockers model='n270'>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>n270-v1</model>
++      <blockers model='n270-v1'>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</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 d2e14fcaab..ab371ea688 100644
+--- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
+@@ -1233,10 +1233,14 @@
+       </blockers>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+-      <model usable='no' vendor='Intel'>n270</model>
++      <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
+       <blockers model='n270'>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>n270-v1</model>
++      <blockers model='n270-v1'>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</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 25fe5a3f48..a256fed6d7 100644
+--- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
+@@ -1452,7 +1452,8 @@
+       <model usable='yes' vendor='Intel'>coreduo-v1</model>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+-      <model usable='yes' vendor='Intel'>n270</model>
++      <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
++      <model usable='yes' vendor='Intel'>n270-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
+index dfcbcf2477..3f952bb379 100644
+--- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
+@@ -1232,10 +1232,14 @@
+       </blockers>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+-      <model usable='no' vendor='Intel'>n270</model>
++      <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
+       <blockers model='n270'>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>n270-v1</model>
++      <blockers model='n270-v1'>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</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 7b20023b19..21358e340a 100644
+--- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
+@@ -1233,10 +1233,14 @@
+       </blockers>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+-      <model usable='no' vendor='Intel'>n270</model>
++      <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
+       <blockers model='n270'>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>n270-v1</model>
++      <blockers model='n270-v1'>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</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 ee58ddff1d..d34524193a 100644
+--- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
+@@ -1382,7 +1382,8 @@
+       <model usable='yes' vendor='Intel'>coreduo-v1</model>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+-      <model usable='yes' vendor='Intel'>n270</model>
++      <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
++      <model usable='yes' vendor='Intel'>n270-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
+index d2f19183f0..9bbb95c0cb 100644
+--- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
+@@ -1232,10 +1232,14 @@
+       </blockers>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+-      <model usable='no' vendor='Intel'>n270</model>
++      <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
+       <blockers model='n270'>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>n270-v1</model>
++      <blockers model='n270-v1'>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</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 3e3bd2b5e1..c5cbe2d855 100644
+--- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
+@@ -1369,10 +1369,14 @@
+       </blockers>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+-      <model usable='no' vendor='Intel'>n270</model>
++      <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
+       <blockers model='n270'>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>n270-v1</model>
++      <blockers model='n270-v1'>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</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 f4e8163256..3ec8575cf4 100644
+--- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
+@@ -1487,7 +1487,8 @@
+       <model usable='yes' vendor='Intel'>coreduo-v1</model>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+-      <model usable='yes' vendor='Intel'>n270</model>
++      <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
++      <model usable='yes' vendor='Intel'>n270-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
+index 54d5323f71..513f4486cb 100644
+--- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
+@@ -1368,10 +1368,14 @@
+       </blockers>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+-      <model usable='no' vendor='Intel'>n270</model>
++      <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
+       <blockers model='n270'>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>n270-v1</model>
++      <blockers model='n270-v1'>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</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 b9697229d9..089ab497e0 100644
+--- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
+@@ -1369,10 +1369,14 @@
+       </blockers>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+-      <model usable='no' vendor='Intel'>n270</model>
++      <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
+       <blockers model='n270'>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>n270-v1</model>
++      <blockers model='n270-v1'>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</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 cc672be9a1..64e893116a 100644
+--- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
+@@ -1487,7 +1487,8 @@
+       <model usable='yes' vendor='Intel'>coreduo-v1</model>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+-      <model usable='yes' vendor='Intel'>n270</model>
++      <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
++      <model usable='yes' vendor='Intel'>n270-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
+index c29d1e99bc..6e4f518b23 100644
+--- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
+@@ -1368,10 +1368,14 @@
+       </blockers>
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+-      <model usable='no' vendor='Intel'>n270</model>
++      <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
+       <blockers model='n270'>
+         <feature name='ss'/>
+       </blockers>
++      <model usable='no' vendor='Intel'>n270-v1</model>
++      <blockers model='n270-v1'>
++        <feature name='ss'/>
++      </blockers>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+-- 
+2.47.1
diff --git a/libvirt-cpu_map-Add-pentium-v1-CPU-model.patch b/libvirt-cpu_map-Add-pentium-v1-CPU-model.patch
new file mode 100644
index 0000000..74269c7
--- /dev/null
+++ b/libvirt-cpu_map-Add-pentium-v1-CPU-model.patch
@@ -0,0 +1,658 @@
+From 0c9dc40e979c33aa65c3008d3e0f675b696169ff Mon Sep 17 00:00:00 2001
+Message-ID: <0c9dc40e979c33aa65c3008d3e0f675b696169ff.1734429553.git.jdenemar@redhat.com>
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Thu, 5 Dec 2024 15:23:04 +0100
+Subject: [PATCH] cpu_map: Add pentium-v1 CPU model
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit 70a4ec29a780d47b34ed0026f968cc4a66f3a2ee)
+
+https://issues.redhat.com/browse/RHEL-70129
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ src/cpu_map/index.xml                              | 1 +
+ src/cpu_map/meson.build                            | 1 +
+ src/cpu_map/x86_pentium-v1.xml                     | 6 ++++++
+ tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_5.2.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_6.0.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_6.1.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_6.2.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_7.0.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_7.1.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml | 3 ++-
+ tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_7.2.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_8.0.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_8.1.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_8.2.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_9.0.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_9.1.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_9.2.0.x86_64.xml         | 3 ++-
+ 43 files changed, 88 insertions(+), 40 deletions(-)
+ create mode 100644 src/cpu_map/x86_pentium-v1.xml
+
+diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml
+index e9fb278fd3..a12c32eec6 100644
+--- a/src/cpu_map/index.xml
++++ b/src/cpu_map/index.xml
+@@ -10,6 +10,7 @@
+ 
+     <group name='Intel-based QEMU generic CPU models'>
+       <include filename='x86_pentium.xml'/>
++      <include filename='x86_pentium-v1.xml'/>
+       <include filename='x86_pentium2.xml'/>
+       <include filename='x86_pentium3.xml'/>
+       <include filename='x86_pentiumpro.xml'/>
+diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build
+index b335278b08..2c76b32280 100644
+--- a/src/cpu_map/meson.build
++++ b/src/cpu_map/meson.build
+@@ -110,6 +110,7 @@ cpumap_data = [
+   'x86_Opteron_G4.xml',
+   'x86_Opteron_G5.xml',
+   'x86_Penryn.xml',
++  'x86_pentium-v1.xml',
+   'x86_pentium.xml',
+   'x86_pentium2.xml',
+   'x86_pentium3.xml',
+diff --git a/src/cpu_map/x86_pentium-v1.xml b/src/cpu_map/x86_pentium-v1.xml
+new file mode 100644
+index 0000000000..2b690dab19
+--- /dev/null
++++ b/src/cpu_map/x86_pentium-v1.xml
+@@ -0,0 +1,6 @@
++<cpus>
++  <model name='pentium-v1'>
++    <decode host='on' guest='off'/>
++    <model name='pentium'/>
++  </model>
++</cpus>
+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 46f1bd7d4f..783df2e45f 100644
+--- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
+@@ -793,7 +793,8 @@
+       <blockers model='n270'>
+         <feature name='ss'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>pentium</model>
++      <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
++      <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown'>pentium2</model>
+       <model usable='yes' vendor='unknown'>pentium3</model>
+       <model usable='no' vendor='AMD'>phenom</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 7153fe3925..b0c660dda2 100644
+--- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
+@@ -1417,7 +1417,8 @@
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='yes' vendor='Intel'>n270</model>
+-      <model usable='yes' vendor='unknown'>pentium</model>
++      <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
++      <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown'>pentium2</model>
+       <model usable='yes' vendor='unknown'>pentium3</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
+index 93df9af8f6..d600d744f4 100644
+--- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
+@@ -792,7 +792,8 @@
+       <blockers model='n270'>
+         <feature name='ss'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>pentium</model>
++      <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
++      <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown'>pentium2</model>
+       <model usable='yes' vendor='unknown'>pentium3</model>
+       <model usable='no' vendor='AMD'>phenom</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 25b16b34bb..5076c5f864 100644
+--- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
+@@ -815,7 +815,8 @@
+       <blockers model='n270'>
+         <feature name='ss'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>pentium</model>
++      <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
++      <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown'>pentium2</model>
+       <model usable='yes' vendor='unknown'>pentium3</model>
+       <model usable='no' vendor='AMD'>phenom</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 c9a124cda2..d47632f95f 100644
+--- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
+@@ -1507,7 +1507,8 @@
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='yes' vendor='Intel'>n270</model>
+-      <model usable='yes' vendor='unknown'>pentium</model>
++      <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
++      <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown'>pentium2</model>
+       <model usable='yes' vendor='unknown'>pentium3</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
+index a99c89e98b..1a5ba3ed86 100644
+--- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
+@@ -814,7 +814,8 @@
+       <blockers model='n270'>
+         <feature name='ss'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>pentium</model>
++      <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
++      <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown'>pentium2</model>
+       <model usable='yes' vendor='unknown'>pentium3</model>
+       <model usable='no' vendor='AMD'>phenom</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 c4f95a282b..6f444b15ec 100644
+--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
+@@ -916,7 +916,8 @@
+       <blockers model='n270'>
+         <feature name='ss'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>pentium</model>
++      <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
++      <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown'>pentium2</model>
+       <model usable='yes' vendor='unknown'>pentium3</model>
+       <model usable='no' vendor='AMD'>phenom</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 b6f01ffbce..d1a8a432d3 100644
+--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
+@@ -1704,7 +1704,8 @@
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='yes' vendor='Intel'>n270</model>
+-      <model usable='yes' vendor='unknown'>pentium</model>
++      <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
++      <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown'>pentium2</model>
+       <model usable='yes' vendor='unknown'>pentium3</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
+index 5d3c1ab1aa..9c83624e20 100644
+--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
+@@ -915,7 +915,8 @@
+       <blockers model='n270'>
+         <feature name='ss'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>pentium</model>
++      <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
++      <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown'>pentium2</model>
+       <model usable='yes' vendor='unknown'>pentium3</model>
+       <model usable='no' vendor='AMD'>phenom</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 c24b88f412..b696860c36 100644
+--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
+@@ -922,7 +922,8 @@
+       <blockers model='n270'>
+         <feature name='ss'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>pentium</model>
++      <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
++      <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown'>pentium2</model>
+       <model usable='yes' vendor='unknown'>pentium3</model>
+       <model usable='no' vendor='AMD'>phenom</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 eb8f5e3f22..686d89e864 100644
+--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
+@@ -1719,7 +1719,8 @@
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='yes' vendor='Intel'>n270</model>
+-      <model usable='yes' vendor='unknown'>pentium</model>
++      <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
++      <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown'>pentium2</model>
+       <model usable='yes' vendor='unknown'>pentium3</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+index b1f198d62b..c1ed9f13e9 100644
+--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+@@ -921,7 +921,8 @@
+       <blockers model='n270'>
+         <feature name='ss'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>pentium</model>
++      <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
++      <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown'>pentium2</model>
+       <model usable='yes' vendor='unknown'>pentium3</model>
+       <model usable='no' vendor='AMD'>phenom</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 7a4830b126..1a0860f81a 100644
+--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
+@@ -949,7 +949,8 @@
+       <blockers model='n270'>
+         <feature name='ss'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>pentium</model>
++      <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
++      <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown'>pentium2</model>
+       <model usable='yes' vendor='unknown'>pentium3</model>
+       <model usable='no' vendor='AMD'>phenom</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 d624842aab..b8f950e7f3 100644
+--- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
+@@ -1743,7 +1743,8 @@
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='yes' vendor='Intel'>n270</model>
+-      <model usable='yes' vendor='unknown'>pentium</model>
++      <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
++      <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown'>pentium2</model>
+       <model usable='yes' vendor='unknown'>pentium3</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+index 43bcca9b52..9b7046a713 100644
+--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+@@ -948,7 +948,8 @@
+       <blockers model='n270'>
+         <feature name='ss'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>pentium</model>
++      <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
++      <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown'>pentium2</model>
+       <model usable='yes' vendor='unknown'>pentium3</model>
+       <model usable='no' vendor='AMD'>phenom</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 275ce525fe..087c90344e 100644
+--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
+@@ -916,7 +916,8 @@
+       <blockers model='n270'>
+         <feature name='ss'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>pentium</model>
++      <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
++      <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown'>pentium2</model>
+       <model usable='yes' vendor='unknown'>pentium3</model>
+       <model usable='no' vendor='AMD'>phenom</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 6500ceac17..521eae41ce 100644
+--- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
+@@ -1691,7 +1691,8 @@
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='yes' vendor='Intel'>n270</model>
+-      <model usable='yes' vendor='unknown'>pentium</model>
++      <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
++      <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown'>pentium2</model>
+       <model usable='yes' vendor='unknown'>pentium3</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
+index 1e54981f3c..5d6438d440 100644
+--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
+@@ -915,7 +915,8 @@
+       <blockers model='n270'>
+         <feature name='ss'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>pentium</model>
++      <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
++      <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown'>pentium2</model>
+       <model usable='yes' vendor='unknown'>pentium3</model>
+       <model usable='no' vendor='AMD'>phenom</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 5b1bb3ad55..b7175be7dc 100644
+--- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
+@@ -921,7 +921,8 @@
+       <blockers model='n270'>
+         <feature name='ss'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>pentium</model>
++      <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
++      <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown'>pentium2</model>
+       <model usable='yes' vendor='unknown'>pentium3</model>
+       <model usable='no' vendor='AMD'>phenom</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 339c622684..08534be348 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
+@@ -1404,7 +1404,8 @@
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='yes' vendor='Intel'>n270</model>
+-      <model usable='yes' vendor='unknown'>pentium</model>
++      <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
++      <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown'>pentium2</model>
+       <model usable='yes' vendor='unknown'>pentium3</model>
+       <model usable='no' vendor='AMD'>phenom</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 339c622684..08534be348 100644
+--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
+@@ -1404,7 +1404,8 @@
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='yes' vendor='Intel'>n270</model>
+-      <model usable='yes' vendor='unknown'>pentium</model>
++      <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
++      <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown'>pentium2</model>
+       <model usable='yes' vendor='unknown'>pentium3</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
+index a016f77b09..f8b95431ac 100644
+--- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
+@@ -920,7 +920,8 @@
+       <blockers model='n270'>
+         <feature name='ss'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>pentium</model>
++      <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
++      <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown'>pentium2</model>
+       <model usable='yes' vendor='unknown'>pentium3</model>
+       <model usable='no' vendor='AMD'>phenom</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 9a42375791..30cf441d89 100644
+--- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
+@@ -1003,7 +1003,8 @@
+       <blockers model='n270'>
+         <feature name='ss'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>pentium</model>
++      <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
++      <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown'>pentium2</model>
+       <model usable='yes' vendor='unknown'>pentium3</model>
+       <model usable='no' vendor='AMD'>phenom</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 677ebbf2e6..940f1338e9 100644
+--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
+@@ -1499,7 +1499,8 @@
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='yes' vendor='Intel'>n270</model>
+-      <model usable='yes' vendor='unknown'>pentium</model>
++      <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
++      <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown'>pentium2</model>
+       <model usable='yes' vendor='unknown'>pentium3</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
+index 1eb4af3fdc..7ba288f0b2 100644
+--- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
+@@ -1002,7 +1002,8 @@
+       <blockers model='n270'>
+         <feature name='ss'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>pentium</model>
++      <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
++      <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown'>pentium2</model>
+       <model usable='yes' vendor='unknown'>pentium3</model>
+       <model usable='no' vendor='AMD'>phenom</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 e2fa9da460..f5f6afb094 100644
+--- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
+@@ -1232,7 +1232,8 @@
+       <blockers model='n270'>
+         <feature name='ss'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>pentium</model>
++      <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
++      <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown'>pentium2</model>
+       <model usable='yes' vendor='unknown'>pentium3</model>
+       <model usable='no' vendor='AMD'>phenom</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 787fc9d870..3fabd84691 100644
+--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
+@@ -1485,7 +1485,8 @@
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='yes' vendor='Intel'>n270</model>
+-      <model usable='yes' vendor='unknown'>pentium</model>
++      <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
++      <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown'>pentium2</model>
+       <model usable='yes' vendor='unknown'>pentium3</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
+index 3fa195c6aa..b52d6d68d6 100644
+--- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
+@@ -1231,7 +1231,8 @@
+       <blockers model='n270'>
+         <feature name='ss'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>pentium</model>
++      <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
++      <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown'>pentium2</model>
+       <model usable='yes' vendor='unknown'>pentium3</model>
+       <model usable='no' vendor='AMD'>phenom</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 5fe9ab775c..b67425cd20 100644
+--- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
+@@ -1233,7 +1233,8 @@
+       <blockers model='n270'>
+         <feature name='ss'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>pentium</model>
++      <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
++      <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown'>pentium2</model>
+       <model usable='yes' vendor='unknown'>pentium3</model>
+       <model usable='no' vendor='AMD'>phenom</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 5c9f1c92a5..69be0c7ffe 100644
+--- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
+@@ -1452,7 +1452,8 @@
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='yes' vendor='Intel'>n270</model>
+-      <model usable='yes' vendor='unknown'>pentium</model>
++      <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
++      <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown'>pentium2</model>
+       <model usable='yes' vendor='unknown'>pentium3</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
+index 73f129706d..29e6285b17 100644
+--- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
+@@ -1232,7 +1232,8 @@
+       <blockers model='n270'>
+         <feature name='ss'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>pentium</model>
++      <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
++      <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown'>pentium2</model>
+       <model usable='yes' vendor='unknown'>pentium3</model>
+       <model usable='no' vendor='AMD'>phenom</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 2315bda338..c75666a7fd 100644
+--- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
+@@ -1233,7 +1233,8 @@
+       <blockers model='n270'>
+         <feature name='ss'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>pentium</model>
++      <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
++      <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown'>pentium2</model>
+       <model usable='yes' vendor='unknown'>pentium3</model>
+       <model usable='no' vendor='AMD'>phenom</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 90c9862321..de856ff33b 100644
+--- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
+@@ -1382,7 +1382,8 @@
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='yes' vendor='Intel'>n270</model>
+-      <model usable='yes' vendor='unknown'>pentium</model>
++      <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
++      <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown'>pentium2</model>
+       <model usable='yes' vendor='unknown'>pentium3</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
+index 983597be92..b6d210838c 100644
+--- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
+@@ -1232,7 +1232,8 @@
+       <blockers model='n270'>
+         <feature name='ss'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>pentium</model>
++      <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
++      <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown'>pentium2</model>
+       <model usable='yes' vendor='unknown'>pentium3</model>
+       <model usable='no' vendor='AMD'>phenom</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 578dea23a5..054b233cfc 100644
+--- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
+@@ -1369,7 +1369,8 @@
+       <blockers model='n270'>
+         <feature name='ss'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>pentium</model>
++      <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
++      <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown'>pentium2</model>
+       <model usable='yes' vendor='unknown'>pentium3</model>
+       <model usable='no' vendor='AMD'>phenom</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 2009920390..d847b56680 100644
+--- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
+@@ -1487,7 +1487,8 @@
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='yes' vendor='Intel'>n270</model>
+-      <model usable='yes' vendor='unknown'>pentium</model>
++      <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
++      <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown'>pentium2</model>
+       <model usable='yes' vendor='unknown'>pentium3</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
+index 505ea9978f..6a4918211c 100644
+--- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
+@@ -1368,7 +1368,8 @@
+       <blockers model='n270'>
+         <feature name='ss'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>pentium</model>
++      <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
++      <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown'>pentium2</model>
+       <model usable='yes' vendor='unknown'>pentium3</model>
+       <model usable='no' vendor='AMD'>phenom</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 e78f6a9dd3..fe8e7c6a8d 100644
+--- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
+@@ -1369,7 +1369,8 @@
+       <blockers model='n270'>
+         <feature name='ss'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>pentium</model>
++      <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
++      <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown'>pentium2</model>
+       <model usable='yes' vendor='unknown'>pentium3</model>
+       <model usable='no' vendor='AMD'>phenom</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 da9f2a1193..58ee6816e7 100644
+--- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
+@@ -1487,7 +1487,8 @@
+       <model usable='yes' vendor='unknown'>kvm32</model>
+       <model usable='yes' vendor='unknown'>kvm64</model>
+       <model usable='yes' vendor='Intel'>n270</model>
+-      <model usable='yes' vendor='unknown'>pentium</model>
++      <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
++      <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown'>pentium2</model>
+       <model usable='yes' vendor='unknown'>pentium3</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
+index 74d1094511..7aae7a2904 100644
+--- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
+@@ -1368,7 +1368,8 @@
+       <blockers model='n270'>
+         <feature name='ss'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>pentium</model>
++      <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
++      <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown'>pentium2</model>
+       <model usable='yes' vendor='unknown'>pentium3</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+-- 
+2.47.1
diff --git a/libvirt-cpu_map-Add-pentium2-v1-CPU-model.patch b/libvirt-cpu_map-Add-pentium2-v1-CPU-model.patch
new file mode 100644
index 0000000..d86b8c9
--- /dev/null
+++ b/libvirt-cpu_map-Add-pentium2-v1-CPU-model.patch
@@ -0,0 +1,658 @@
+From a00901e05b09af50d2bde48be9faa60d0ffecb1d Mon Sep 17 00:00:00 2001
+Message-ID: <a00901e05b09af50d2bde48be9faa60d0ffecb1d.1734429553.git.jdenemar@redhat.com>
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Thu, 5 Dec 2024 15:25:30 +0100
+Subject: [PATCH] cpu_map: Add pentium2-v1 CPU model
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit df34ae48e9cb8fe0ed9b50900eab07cd6e87481c)
+
+https://issues.redhat.com/browse/RHEL-70129
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ src/cpu_map/index.xml                              | 1 +
+ src/cpu_map/meson.build                            | 1 +
+ src/cpu_map/x86_pentium2-v1.xml                    | 6 ++++++
+ tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_5.2.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_6.0.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_6.1.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_6.2.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_7.0.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_7.1.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml | 3 ++-
+ tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_7.2.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_8.0.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_8.1.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_8.2.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_9.0.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_9.1.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_9.2.0.x86_64.xml         | 3 ++-
+ 43 files changed, 88 insertions(+), 40 deletions(-)
+ create mode 100644 src/cpu_map/x86_pentium2-v1.xml
+
+diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml
+index a12c32eec6..1f1536339c 100644
+--- a/src/cpu_map/index.xml
++++ b/src/cpu_map/index.xml
+@@ -12,6 +12,7 @@
+       <include filename='x86_pentium.xml'/>
+       <include filename='x86_pentium-v1.xml'/>
+       <include filename='x86_pentium2.xml'/>
++      <include filename='x86_pentium2-v1.xml'/>
+       <include filename='x86_pentium3.xml'/>
+       <include filename='x86_pentiumpro.xml'/>
+       <include filename='x86_coreduo.xml'/>
+diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build
+index 2c76b32280..47c22db5b7 100644
+--- a/src/cpu_map/meson.build
++++ b/src/cpu_map/meson.build
+@@ -112,6 +112,7 @@ cpumap_data = [
+   'x86_Penryn.xml',
+   'x86_pentium-v1.xml',
+   'x86_pentium.xml',
++  'x86_pentium2-v1.xml',
+   'x86_pentium2.xml',
+   'x86_pentium3.xml',
+   'x86_pentiumpro.xml',
+diff --git a/src/cpu_map/x86_pentium2-v1.xml b/src/cpu_map/x86_pentium2-v1.xml
+new file mode 100644
+index 0000000000..554aebce41
+--- /dev/null
++++ b/src/cpu_map/x86_pentium2-v1.xml
+@@ -0,0 +1,6 @@
++<cpus>
++  <model name='pentium2-v1'>
++    <decode host='on' guest='off'/>
++    <model name='pentium2'/>
++  </model>
++</cpus>
+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 783df2e45f..db91ece840 100644
+--- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
+@@ -795,7 +795,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+-      <model usable='yes' vendor='unknown'>pentium2</model>
++      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
++      <model usable='yes' vendor='unknown'>pentium2-v1</model>
+       <model usable='yes' vendor='unknown'>pentium3</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+       <blockers model='phenom'>
+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 b0c660dda2..17ad483a0c 100644
+--- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
+@@ -1419,7 +1419,8 @@
+       <model usable='yes' vendor='Intel'>n270</model>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+-      <model usable='yes' vendor='unknown'>pentium2</model>
++      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
++      <model usable='yes' vendor='unknown'>pentium2-v1</model>
+       <model usable='yes' vendor='unknown'>pentium3</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+       <blockers model='phenom'>
+diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
+index d600d744f4..88b506eeac 100644
+--- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
+@@ -794,7 +794,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+-      <model usable='yes' vendor='unknown'>pentium2</model>
++      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
++      <model usable='yes' vendor='unknown'>pentium2-v1</model>
+       <model usable='yes' vendor='unknown'>pentium3</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+       <blockers model='phenom'>
+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 5076c5f864..ec626f9c82 100644
+--- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
+@@ -817,7 +817,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+-      <model usable='yes' vendor='unknown'>pentium2</model>
++      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
++      <model usable='yes' vendor='unknown'>pentium2-v1</model>
+       <model usable='yes' vendor='unknown'>pentium3</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+       <blockers model='phenom'>
+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 d47632f95f..1f9f215a63 100644
+--- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
+@@ -1509,7 +1509,8 @@
+       <model usable='yes' vendor='Intel'>n270</model>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+-      <model usable='yes' vendor='unknown'>pentium2</model>
++      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
++      <model usable='yes' vendor='unknown'>pentium2-v1</model>
+       <model usable='yes' vendor='unknown'>pentium3</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+       <blockers model='phenom'>
+diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
+index 1a5ba3ed86..3551b22832 100644
+--- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
+@@ -816,7 +816,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+-      <model usable='yes' vendor='unknown'>pentium2</model>
++      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
++      <model usable='yes' vendor='unknown'>pentium2-v1</model>
+       <model usable='yes' vendor='unknown'>pentium3</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+       <blockers model='phenom'>
+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 6f444b15ec..057b9a392a 100644
+--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
+@@ -918,7 +918,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+-      <model usable='yes' vendor='unknown'>pentium2</model>
++      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
++      <model usable='yes' vendor='unknown'>pentium2-v1</model>
+       <model usable='yes' vendor='unknown'>pentium3</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+       <blockers model='phenom'>
+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 d1a8a432d3..e6a74efc27 100644
+--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
+@@ -1706,7 +1706,8 @@
+       <model usable='yes' vendor='Intel'>n270</model>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+-      <model usable='yes' vendor='unknown'>pentium2</model>
++      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
++      <model usable='yes' vendor='unknown'>pentium2-v1</model>
+       <model usable='yes' vendor='unknown'>pentium3</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+       <blockers model='phenom'>
+diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
+index 9c83624e20..8583b09a19 100644
+--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
+@@ -917,7 +917,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+-      <model usable='yes' vendor='unknown'>pentium2</model>
++      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
++      <model usable='yes' vendor='unknown'>pentium2-v1</model>
+       <model usable='yes' vendor='unknown'>pentium3</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+       <blockers model='phenom'>
+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 b696860c36..5662860ea4 100644
+--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
+@@ -924,7 +924,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+-      <model usable='yes' vendor='unknown'>pentium2</model>
++      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
++      <model usable='yes' vendor='unknown'>pentium2-v1</model>
+       <model usable='yes' vendor='unknown'>pentium3</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+       <blockers model='phenom'>
+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 686d89e864..3ae800014b 100644
+--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
+@@ -1721,7 +1721,8 @@
+       <model usable='yes' vendor='Intel'>n270</model>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+-      <model usable='yes' vendor='unknown'>pentium2</model>
++      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
++      <model usable='yes' vendor='unknown'>pentium2-v1</model>
+       <model usable='yes' vendor='unknown'>pentium3</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+       <blockers model='phenom'>
+diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+index c1ed9f13e9..ac04083e6d 100644
+--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+@@ -923,7 +923,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+-      <model usable='yes' vendor='unknown'>pentium2</model>
++      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
++      <model usable='yes' vendor='unknown'>pentium2-v1</model>
+       <model usable='yes' vendor='unknown'>pentium3</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+       <blockers model='phenom'>
+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 1a0860f81a..4c884f4385 100644
+--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
+@@ -951,7 +951,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+-      <model usable='yes' vendor='unknown'>pentium2</model>
++      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
++      <model usable='yes' vendor='unknown'>pentium2-v1</model>
+       <model usable='yes' vendor='unknown'>pentium3</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+       <blockers model='phenom'>
+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 b8f950e7f3..6e308eb156 100644
+--- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
+@@ -1745,7 +1745,8 @@
+       <model usable='yes' vendor='Intel'>n270</model>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+-      <model usable='yes' vendor='unknown'>pentium2</model>
++      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
++      <model usable='yes' vendor='unknown'>pentium2-v1</model>
+       <model usable='yes' vendor='unknown'>pentium3</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+       <blockers model='phenom'>
+diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+index 9b7046a713..347c13024b 100644
+--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+@@ -950,7 +950,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+-      <model usable='yes' vendor='unknown'>pentium2</model>
++      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
++      <model usable='yes' vendor='unknown'>pentium2-v1</model>
+       <model usable='yes' vendor='unknown'>pentium3</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+       <blockers model='phenom'>
+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 087c90344e..9d11b5f6c3 100644
+--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
+@@ -918,7 +918,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+-      <model usable='yes' vendor='unknown'>pentium2</model>
++      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
++      <model usable='yes' vendor='unknown'>pentium2-v1</model>
+       <model usable='yes' vendor='unknown'>pentium3</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+       <blockers model='phenom'>
+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 521eae41ce..92d0d0d24f 100644
+--- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
+@@ -1693,7 +1693,8 @@
+       <model usable='yes' vendor='Intel'>n270</model>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+-      <model usable='yes' vendor='unknown'>pentium2</model>
++      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
++      <model usable='yes' vendor='unknown'>pentium2-v1</model>
+       <model usable='yes' vendor='unknown'>pentium3</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+       <blockers model='phenom'>
+diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
+index 5d6438d440..e3eb689de3 100644
+--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
+@@ -917,7 +917,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+-      <model usable='yes' vendor='unknown'>pentium2</model>
++      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
++      <model usable='yes' vendor='unknown'>pentium2-v1</model>
+       <model usable='yes' vendor='unknown'>pentium3</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+       <blockers model='phenom'>
+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 b7175be7dc..d9aaf6bd10 100644
+--- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
+@@ -923,7 +923,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+-      <model usable='yes' vendor='unknown'>pentium2</model>
++      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
++      <model usable='yes' vendor='unknown'>pentium2-v1</model>
+       <model usable='yes' vendor='unknown'>pentium3</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+       <blockers model='phenom'>
+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 08534be348..1b4ee8ab7a 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
+@@ -1406,7 +1406,8 @@
+       <model usable='yes' vendor='Intel'>n270</model>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+-      <model usable='yes' vendor='unknown'>pentium2</model>
++      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
++      <model usable='yes' vendor='unknown'>pentium2-v1</model>
+       <model usable='yes' vendor='unknown'>pentium3</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+       <blockers model='phenom'>
+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 08534be348..1b4ee8ab7a 100644
+--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
+@@ -1406,7 +1406,8 @@
+       <model usable='yes' vendor='Intel'>n270</model>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+-      <model usable='yes' vendor='unknown'>pentium2</model>
++      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
++      <model usable='yes' vendor='unknown'>pentium2-v1</model>
+       <model usable='yes' vendor='unknown'>pentium3</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+       <blockers model='phenom'>
+diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
+index f8b95431ac..1bd4e45095 100644
+--- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
+@@ -922,7 +922,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+-      <model usable='yes' vendor='unknown'>pentium2</model>
++      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
++      <model usable='yes' vendor='unknown'>pentium2-v1</model>
+       <model usable='yes' vendor='unknown'>pentium3</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+       <blockers model='phenom'>
+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 30cf441d89..7b9d952866 100644
+--- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
+@@ -1005,7 +1005,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+-      <model usable='yes' vendor='unknown'>pentium2</model>
++      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
++      <model usable='yes' vendor='unknown'>pentium2-v1</model>
+       <model usable='yes' vendor='unknown'>pentium3</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+       <blockers model='phenom'>
+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 940f1338e9..dd96957e79 100644
+--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
+@@ -1501,7 +1501,8 @@
+       <model usable='yes' vendor='Intel'>n270</model>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+-      <model usable='yes' vendor='unknown'>pentium2</model>
++      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
++      <model usable='yes' vendor='unknown'>pentium2-v1</model>
+       <model usable='yes' vendor='unknown'>pentium3</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+       <blockers model='phenom'>
+diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
+index 7ba288f0b2..876d2a37a8 100644
+--- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
+@@ -1004,7 +1004,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+-      <model usable='yes' vendor='unknown'>pentium2</model>
++      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
++      <model usable='yes' vendor='unknown'>pentium2-v1</model>
+       <model usable='yes' vendor='unknown'>pentium3</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+       <blockers model='phenom'>
+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 f5f6afb094..269c399d8c 100644
+--- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
+@@ -1234,7 +1234,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+-      <model usable='yes' vendor='unknown'>pentium2</model>
++      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
++      <model usable='yes' vendor='unknown'>pentium2-v1</model>
+       <model usable='yes' vendor='unknown'>pentium3</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+       <blockers model='phenom'>
+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 3fabd84691..d0899b6beb 100644
+--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
+@@ -1487,7 +1487,8 @@
+       <model usable='yes' vendor='Intel'>n270</model>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+-      <model usable='yes' vendor='unknown'>pentium2</model>
++      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
++      <model usable='yes' vendor='unknown'>pentium2-v1</model>
+       <model usable='yes' vendor='unknown'>pentium3</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+       <blockers model='phenom'>
+diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
+index b52d6d68d6..647ba2ab7a 100644
+--- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
+@@ -1233,7 +1233,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+-      <model usable='yes' vendor='unknown'>pentium2</model>
++      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
++      <model usable='yes' vendor='unknown'>pentium2-v1</model>
+       <model usable='yes' vendor='unknown'>pentium3</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+       <blockers model='phenom'>
+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 b67425cd20..a0b2a7c84b 100644
+--- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
+@@ -1235,7 +1235,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+-      <model usable='yes' vendor='unknown'>pentium2</model>
++      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
++      <model usable='yes' vendor='unknown'>pentium2-v1</model>
+       <model usable='yes' vendor='unknown'>pentium3</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+       <blockers model='phenom'>
+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 69be0c7ffe..4b9cf3e152 100644
+--- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
+@@ -1454,7 +1454,8 @@
+       <model usable='yes' vendor='Intel'>n270</model>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+-      <model usable='yes' vendor='unknown'>pentium2</model>
++      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
++      <model usable='yes' vendor='unknown'>pentium2-v1</model>
+       <model usable='yes' vendor='unknown'>pentium3</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+       <blockers model='phenom'>
+diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
+index 29e6285b17..df21513db3 100644
+--- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
+@@ -1234,7 +1234,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+-      <model usable='yes' vendor='unknown'>pentium2</model>
++      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
++      <model usable='yes' vendor='unknown'>pentium2-v1</model>
+       <model usable='yes' vendor='unknown'>pentium3</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+       <blockers model='phenom'>
+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 c75666a7fd..1c872e7f20 100644
+--- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
+@@ -1235,7 +1235,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+-      <model usable='yes' vendor='unknown'>pentium2</model>
++      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
++      <model usable='yes' vendor='unknown'>pentium2-v1</model>
+       <model usable='yes' vendor='unknown'>pentium3</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+       <blockers model='phenom'>
+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 de856ff33b..439a82f4e2 100644
+--- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
+@@ -1384,7 +1384,8 @@
+       <model usable='yes' vendor='Intel'>n270</model>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+-      <model usable='yes' vendor='unknown'>pentium2</model>
++      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
++      <model usable='yes' vendor='unknown'>pentium2-v1</model>
+       <model usable='yes' vendor='unknown'>pentium3</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+       <blockers model='phenom'>
+diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
+index b6d210838c..16764a7d67 100644
+--- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
+@@ -1234,7 +1234,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+-      <model usable='yes' vendor='unknown'>pentium2</model>
++      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
++      <model usable='yes' vendor='unknown'>pentium2-v1</model>
+       <model usable='yes' vendor='unknown'>pentium3</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+       <blockers model='phenom'>
+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 054b233cfc..c45c2a88d5 100644
+--- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
+@@ -1371,7 +1371,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+-      <model usable='yes' vendor='unknown'>pentium2</model>
++      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
++      <model usable='yes' vendor='unknown'>pentium2-v1</model>
+       <model usable='yes' vendor='unknown'>pentium3</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+       <blockers model='phenom'>
+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 d847b56680..2391821956 100644
+--- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
+@@ -1489,7 +1489,8 @@
+       <model usable='yes' vendor='Intel'>n270</model>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+-      <model usable='yes' vendor='unknown'>pentium2</model>
++      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
++      <model usable='yes' vendor='unknown'>pentium2-v1</model>
+       <model usable='yes' vendor='unknown'>pentium3</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+       <blockers model='phenom'>
+diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
+index 6a4918211c..1c23ac2b9d 100644
+--- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
+@@ -1370,7 +1370,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+-      <model usable='yes' vendor='unknown'>pentium2</model>
++      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
++      <model usable='yes' vendor='unknown'>pentium2-v1</model>
+       <model usable='yes' vendor='unknown'>pentium3</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+       <blockers model='phenom'>
+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 fe8e7c6a8d..135546d930 100644
+--- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
+@@ -1371,7 +1371,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+-      <model usable='yes' vendor='unknown'>pentium2</model>
++      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
++      <model usable='yes' vendor='unknown'>pentium2-v1</model>
+       <model usable='yes' vendor='unknown'>pentium3</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+       <blockers model='phenom'>
+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 58ee6816e7..2002feb338 100644
+--- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
+@@ -1489,7 +1489,8 @@
+       <model usable='yes' vendor='Intel'>n270</model>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+-      <model usable='yes' vendor='unknown'>pentium2</model>
++      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
++      <model usable='yes' vendor='unknown'>pentium2-v1</model>
+       <model usable='yes' vendor='unknown'>pentium3</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+       <blockers model='phenom'>
+diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
+index 7aae7a2904..871af7f505 100644
+--- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
+@@ -1370,7 +1370,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+-      <model usable='yes' vendor='unknown'>pentium2</model>
++      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
++      <model usable='yes' vendor='unknown'>pentium2-v1</model>
+       <model usable='yes' vendor='unknown'>pentium3</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+       <blockers model='phenom'>
+-- 
+2.47.1
diff --git a/libvirt-cpu_map-Add-pentium3-v1-CPU-model.patch b/libvirt-cpu_map-Add-pentium3-v1-CPU-model.patch
new file mode 100644
index 0000000..e54a17a
--- /dev/null
+++ b/libvirt-cpu_map-Add-pentium3-v1-CPU-model.patch
@@ -0,0 +1,658 @@
+From d6d9cf1baa2360b757a69395aff6fd95fd01f3d5 Mon Sep 17 00:00:00 2001
+Message-ID: <d6d9cf1baa2360b757a69395aff6fd95fd01f3d5.1734429553.git.jdenemar@redhat.com>
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Thu, 5 Dec 2024 15:28:21 +0100
+Subject: [PATCH] cpu_map: Add pentium3-v1 CPU model
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit 886fd169c5e03ca9c065e69634ab3cd5656faf36)
+
+https://issues.redhat.com/browse/RHEL-70129
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ src/cpu_map/index.xml                              | 1 +
+ src/cpu_map/meson.build                            | 1 +
+ src/cpu_map/x86_pentium3-v1.xml                    | 6 ++++++
+ tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_5.2.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_6.0.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_6.1.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_6.2.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_7.0.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_7.1.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml | 3 ++-
+ tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_7.2.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_8.0.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_8.1.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_8.2.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_9.0.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_9.1.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_9.2.0.x86_64.xml         | 3 ++-
+ 43 files changed, 88 insertions(+), 40 deletions(-)
+ create mode 100644 src/cpu_map/x86_pentium3-v1.xml
+
+diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml
+index 1f1536339c..87cc4f61ed 100644
+--- a/src/cpu_map/index.xml
++++ b/src/cpu_map/index.xml
+@@ -14,6 +14,7 @@
+       <include filename='x86_pentium2.xml'/>
+       <include filename='x86_pentium2-v1.xml'/>
+       <include filename='x86_pentium3.xml'/>
++      <include filename='x86_pentium3-v1.xml'/>
+       <include filename='x86_pentiumpro.xml'/>
+       <include filename='x86_coreduo.xml'/>
+       <include filename='x86_n270.xml'/>
+diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build
+index 47c22db5b7..6645786736 100644
+--- a/src/cpu_map/meson.build
++++ b/src/cpu_map/meson.build
+@@ -114,6 +114,7 @@ cpumap_data = [
+   'x86_pentium.xml',
+   'x86_pentium2-v1.xml',
+   'x86_pentium2.xml',
++  'x86_pentium3-v1.xml',
+   'x86_pentium3.xml',
+   'x86_pentiumpro.xml',
+   'x86_phenom.xml',
+diff --git a/src/cpu_map/x86_pentium3-v1.xml b/src/cpu_map/x86_pentium3-v1.xml
+new file mode 100644
+index 0000000000..7547e0ef0c
+--- /dev/null
++++ b/src/cpu_map/x86_pentium3-v1.xml
+@@ -0,0 +1,6 @@
++<cpus>
++  <model name='pentium3-v1'>
++    <decode host='on' guest='off'/>
++    <model name='pentium3'/>
++  </model>
++</cpus>
+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 db91ece840..f887be4468 100644
+--- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
+@@ -797,7 +797,8 @@
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+       <model usable='yes' vendor='unknown'>pentium2-v1</model>
+-      <model usable='yes' vendor='unknown'>pentium3</model>
++      <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
++      <model usable='yes' vendor='unknown'>pentium3-v1</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+       <blockers model='phenom'>
+         <feature name='3dnow'/>
+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 17ad483a0c..0c5a3a81f8 100644
+--- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
+@@ -1421,7 +1421,8 @@
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+       <model usable='yes' vendor='unknown'>pentium2-v1</model>
+-      <model usable='yes' vendor='unknown'>pentium3</model>
++      <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
++      <model usable='yes' vendor='unknown'>pentium3-v1</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+       <blockers model='phenom'>
+         <feature name='fxsr_opt'/>
+diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
+index 88b506eeac..7591b2efe9 100644
+--- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
+@@ -796,7 +796,8 @@
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+       <model usable='yes' vendor='unknown'>pentium2-v1</model>
+-      <model usable='yes' vendor='unknown'>pentium3</model>
++      <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
++      <model usable='yes' vendor='unknown'>pentium3-v1</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+       <blockers model='phenom'>
+         <feature name='3dnow'/>
+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 ec626f9c82..a7b325fd61 100644
+--- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
+@@ -819,7 +819,8 @@
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+       <model usable='yes' vendor='unknown'>pentium2-v1</model>
+-      <model usable='yes' vendor='unknown'>pentium3</model>
++      <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
++      <model usable='yes' vendor='unknown'>pentium3-v1</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+       <blockers model='phenom'>
+         <feature name='3dnow'/>
+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 1f9f215a63..63c1ff9b4a 100644
+--- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
+@@ -1511,7 +1511,8 @@
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+       <model usable='yes' vendor='unknown'>pentium2-v1</model>
+-      <model usable='yes' vendor='unknown'>pentium3</model>
++      <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
++      <model usable='yes' vendor='unknown'>pentium3-v1</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+       <blockers model='phenom'>
+         <feature name='fxsr_opt'/>
+diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
+index 3551b22832..3d6ff5657e 100644
+--- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
+@@ -818,7 +818,8 @@
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+       <model usable='yes' vendor='unknown'>pentium2-v1</model>
+-      <model usable='yes' vendor='unknown'>pentium3</model>
++      <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
++      <model usable='yes' vendor='unknown'>pentium3-v1</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+       <blockers model='phenom'>
+         <feature name='3dnow'/>
+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 057b9a392a..e475c264ee 100644
+--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
+@@ -920,7 +920,8 @@
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+       <model usable='yes' vendor='unknown'>pentium2-v1</model>
+-      <model usable='yes' vendor='unknown'>pentium3</model>
++      <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
++      <model usable='yes' vendor='unknown'>pentium3-v1</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+       <blockers model='phenom'>
+         <feature name='3dnow'/>
+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 e6a74efc27..5deb101fe3 100644
+--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
+@@ -1708,7 +1708,8 @@
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+       <model usable='yes' vendor='unknown'>pentium2-v1</model>
+-      <model usable='yes' vendor='unknown'>pentium3</model>
++      <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
++      <model usable='yes' vendor='unknown'>pentium3-v1</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+       <blockers model='phenom'>
+         <feature name='fxsr_opt'/>
+diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
+index 8583b09a19..f4542588e8 100644
+--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
+@@ -919,7 +919,8 @@
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+       <model usable='yes' vendor='unknown'>pentium2-v1</model>
+-      <model usable='yes' vendor='unknown'>pentium3</model>
++      <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
++      <model usable='yes' vendor='unknown'>pentium3-v1</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+       <blockers model='phenom'>
+         <feature name='3dnow'/>
+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 5662860ea4..c388b7919a 100644
+--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
+@@ -926,7 +926,8 @@
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+       <model usable='yes' vendor='unknown'>pentium2-v1</model>
+-      <model usable='yes' vendor='unknown'>pentium3</model>
++      <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
++      <model usable='yes' vendor='unknown'>pentium3-v1</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+       <blockers model='phenom'>
+         <feature name='3dnow'/>
+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 3ae800014b..bae374c05b 100644
+--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
+@@ -1723,7 +1723,8 @@
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+       <model usable='yes' vendor='unknown'>pentium2-v1</model>
+-      <model usable='yes' vendor='unknown'>pentium3</model>
++      <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
++      <model usable='yes' vendor='unknown'>pentium3-v1</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+       <blockers model='phenom'>
+         <feature name='fxsr_opt'/>
+diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+index ac04083e6d..43d1a8d3a2 100644
+--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+@@ -925,7 +925,8 @@
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+       <model usable='yes' vendor='unknown'>pentium2-v1</model>
+-      <model usable='yes' vendor='unknown'>pentium3</model>
++      <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
++      <model usable='yes' vendor='unknown'>pentium3-v1</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+       <blockers model='phenom'>
+         <feature name='3dnow'/>
+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 4c884f4385..b882feace0 100644
+--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
+@@ -953,7 +953,8 @@
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+       <model usable='yes' vendor='unknown'>pentium2-v1</model>
+-      <model usable='yes' vendor='unknown'>pentium3</model>
++      <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
++      <model usable='yes' vendor='unknown'>pentium3-v1</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+       <blockers model='phenom'>
+         <feature name='3dnow'/>
+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 6e308eb156..dcdad93bc4 100644
+--- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
+@@ -1747,7 +1747,8 @@
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+       <model usable='yes' vendor='unknown'>pentium2-v1</model>
+-      <model usable='yes' vendor='unknown'>pentium3</model>
++      <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
++      <model usable='yes' vendor='unknown'>pentium3-v1</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+       <blockers model='phenom'>
+         <feature name='fxsr_opt'/>
+diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+index 347c13024b..f825365d4e 100644
+--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+@@ -952,7 +952,8 @@
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+       <model usable='yes' vendor='unknown'>pentium2-v1</model>
+-      <model usable='yes' vendor='unknown'>pentium3</model>
++      <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
++      <model usable='yes' vendor='unknown'>pentium3-v1</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+       <blockers model='phenom'>
+         <feature name='3dnow'/>
+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 9d11b5f6c3..f8ac31d143 100644
+--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
+@@ -920,7 +920,8 @@
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+       <model usable='yes' vendor='unknown'>pentium2-v1</model>
+-      <model usable='yes' vendor='unknown'>pentium3</model>
++      <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
++      <model usable='yes' vendor='unknown'>pentium3-v1</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+       <blockers model='phenom'>
+         <feature name='3dnow'/>
+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 92d0d0d24f..c4a159a3da 100644
+--- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
+@@ -1695,7 +1695,8 @@
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+       <model usable='yes' vendor='unknown'>pentium2-v1</model>
+-      <model usable='yes' vendor='unknown'>pentium3</model>
++      <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
++      <model usable='yes' vendor='unknown'>pentium3-v1</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+       <blockers model='phenom'>
+         <feature name='fxsr_opt'/>
+diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
+index e3eb689de3..5efd8d499f 100644
+--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
+@@ -919,7 +919,8 @@
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+       <model usable='yes' vendor='unknown'>pentium2-v1</model>
+-      <model usable='yes' vendor='unknown'>pentium3</model>
++      <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
++      <model usable='yes' vendor='unknown'>pentium3-v1</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+       <blockers model='phenom'>
+         <feature name='3dnow'/>
+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 d9aaf6bd10..a0f10ca42d 100644
+--- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
+@@ -925,7 +925,8 @@
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+       <model usable='yes' vendor='unknown'>pentium2-v1</model>
+-      <model usable='yes' vendor='unknown'>pentium3</model>
++      <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
++      <model usable='yes' vendor='unknown'>pentium3-v1</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+       <blockers model='phenom'>
+         <feature name='3dnow'/>
+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 1b4ee8ab7a..26e716e0e8 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
+@@ -1408,7 +1408,8 @@
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+       <model usable='yes' vendor='unknown'>pentium2-v1</model>
+-      <model usable='yes' vendor='unknown'>pentium3</model>
++      <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
++      <model usable='yes' vendor='unknown'>pentium3-v1</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+       <blockers model='phenom'>
+         <feature name='fxsr_opt'/>
+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 1b4ee8ab7a..26e716e0e8 100644
+--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
+@@ -1408,7 +1408,8 @@
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+       <model usable='yes' vendor='unknown'>pentium2-v1</model>
+-      <model usable='yes' vendor='unknown'>pentium3</model>
++      <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
++      <model usable='yes' vendor='unknown'>pentium3-v1</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+       <blockers model='phenom'>
+         <feature name='fxsr_opt'/>
+diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
+index 1bd4e45095..871949d74f 100644
+--- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
+@@ -924,7 +924,8 @@
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+       <model usable='yes' vendor='unknown'>pentium2-v1</model>
+-      <model usable='yes' vendor='unknown'>pentium3</model>
++      <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
++      <model usable='yes' vendor='unknown'>pentium3-v1</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+       <blockers model='phenom'>
+         <feature name='3dnow'/>
+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 7b9d952866..9fb5e0a823 100644
+--- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
+@@ -1007,7 +1007,8 @@
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+       <model usable='yes' vendor='unknown'>pentium2-v1</model>
+-      <model usable='yes' vendor='unknown'>pentium3</model>
++      <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
++      <model usable='yes' vendor='unknown'>pentium3-v1</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+       <blockers model='phenom'>
+         <feature name='3dnow'/>
+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 dd96957e79..d7aeb43b83 100644
+--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
+@@ -1503,7 +1503,8 @@
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+       <model usable='yes' vendor='unknown'>pentium2-v1</model>
+-      <model usable='yes' vendor='unknown'>pentium3</model>
++      <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
++      <model usable='yes' vendor='unknown'>pentium3-v1</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+       <blockers model='phenom'>
+         <feature name='fxsr_opt'/>
+diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
+index 876d2a37a8..8e226ee237 100644
+--- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
+@@ -1006,7 +1006,8 @@
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+       <model usable='yes' vendor='unknown'>pentium2-v1</model>
+-      <model usable='yes' vendor='unknown'>pentium3</model>
++      <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
++      <model usable='yes' vendor='unknown'>pentium3-v1</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+       <blockers model='phenom'>
+         <feature name='3dnow'/>
+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 269c399d8c..27fddae9f5 100644
+--- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
+@@ -1236,7 +1236,8 @@
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+       <model usable='yes' vendor='unknown'>pentium2-v1</model>
+-      <model usable='yes' vendor='unknown'>pentium3</model>
++      <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
++      <model usable='yes' vendor='unknown'>pentium3-v1</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+       <blockers model='phenom'>
+         <feature name='3dnow'/>
+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 d0899b6beb..30169a55e4 100644
+--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
+@@ -1489,7 +1489,8 @@
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+       <model usable='yes' vendor='unknown'>pentium2-v1</model>
+-      <model usable='yes' vendor='unknown'>pentium3</model>
++      <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
++      <model usable='yes' vendor='unknown'>pentium3-v1</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+       <blockers model='phenom'>
+         <feature name='fxsr_opt'/>
+diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
+index 647ba2ab7a..c91b05f312 100644
+--- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
+@@ -1235,7 +1235,8 @@
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+       <model usable='yes' vendor='unknown'>pentium2-v1</model>
+-      <model usable='yes' vendor='unknown'>pentium3</model>
++      <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
++      <model usable='yes' vendor='unknown'>pentium3-v1</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+       <blockers model='phenom'>
+         <feature name='3dnow'/>
+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 a0b2a7c84b..76d9f80936 100644
+--- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
+@@ -1237,7 +1237,8 @@
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+       <model usable='yes' vendor='unknown'>pentium2-v1</model>
+-      <model usable='yes' vendor='unknown'>pentium3</model>
++      <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
++      <model usable='yes' vendor='unknown'>pentium3-v1</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+       <blockers model='phenom'>
+         <feature name='3dnow'/>
+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 4b9cf3e152..7f08733452 100644
+--- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
+@@ -1456,7 +1456,8 @@
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+       <model usable='yes' vendor='unknown'>pentium2-v1</model>
+-      <model usable='yes' vendor='unknown'>pentium3</model>
++      <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
++      <model usable='yes' vendor='unknown'>pentium3-v1</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+       <blockers model='phenom'>
+         <feature name='fxsr_opt'/>
+diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
+index df21513db3..4bf5988cf3 100644
+--- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
+@@ -1236,7 +1236,8 @@
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+       <model usable='yes' vendor='unknown'>pentium2-v1</model>
+-      <model usable='yes' vendor='unknown'>pentium3</model>
++      <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
++      <model usable='yes' vendor='unknown'>pentium3-v1</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+       <blockers model='phenom'>
+         <feature name='3dnow'/>
+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 1c872e7f20..8e2d2a636e 100644
+--- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
+@@ -1237,7 +1237,8 @@
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+       <model usable='yes' vendor='unknown'>pentium2-v1</model>
+-      <model usable='yes' vendor='unknown'>pentium3</model>
++      <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
++      <model usable='yes' vendor='unknown'>pentium3-v1</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+       <blockers model='phenom'>
+         <feature name='3dnow'/>
+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 439a82f4e2..0b488faa07 100644
+--- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
+@@ -1386,7 +1386,8 @@
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+       <model usable='yes' vendor='unknown'>pentium2-v1</model>
+-      <model usable='yes' vendor='unknown'>pentium3</model>
++      <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
++      <model usable='yes' vendor='unknown'>pentium3-v1</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+       <blockers model='phenom'>
+         <feature name='fxsr_opt'/>
+diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
+index 16764a7d67..9b41cc5fcc 100644
+--- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
+@@ -1236,7 +1236,8 @@
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+       <model usable='yes' vendor='unknown'>pentium2-v1</model>
+-      <model usable='yes' vendor='unknown'>pentium3</model>
++      <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
++      <model usable='yes' vendor='unknown'>pentium3-v1</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+       <blockers model='phenom'>
+         <feature name='3dnow'/>
+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 c45c2a88d5..996a269525 100644
+--- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
+@@ -1373,7 +1373,8 @@
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+       <model usable='yes' vendor='unknown'>pentium2-v1</model>
+-      <model usable='yes' vendor='unknown'>pentium3</model>
++      <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
++      <model usable='yes' vendor='unknown'>pentium3-v1</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+       <blockers model='phenom'>
+         <feature name='3dnow'/>
+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 2391821956..5d914aa62c 100644
+--- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
+@@ -1491,7 +1491,8 @@
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+       <model usable='yes' vendor='unknown'>pentium2-v1</model>
+-      <model usable='yes' vendor='unknown'>pentium3</model>
++      <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
++      <model usable='yes' vendor='unknown'>pentium3-v1</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+       <blockers model='phenom'>
+         <feature name='fxsr_opt'/>
+diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
+index 1c23ac2b9d..094ec28df0 100644
+--- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
+@@ -1372,7 +1372,8 @@
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+       <model usable='yes' vendor='unknown'>pentium2-v1</model>
+-      <model usable='yes' vendor='unknown'>pentium3</model>
++      <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
++      <model usable='yes' vendor='unknown'>pentium3-v1</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+       <blockers model='phenom'>
+         <feature name='3dnow'/>
+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 135546d930..0e9a63cf4e 100644
+--- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
+@@ -1373,7 +1373,8 @@
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+       <model usable='yes' vendor='unknown'>pentium2-v1</model>
+-      <model usable='yes' vendor='unknown'>pentium3</model>
++      <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
++      <model usable='yes' vendor='unknown'>pentium3-v1</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+       <blockers model='phenom'>
+         <feature name='3dnow'/>
+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 2002feb338..9fb8cb4e4a 100644
+--- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
+@@ -1491,7 +1491,8 @@
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+       <model usable='yes' vendor='unknown'>pentium2-v1</model>
+-      <model usable='yes' vendor='unknown'>pentium3</model>
++      <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
++      <model usable='yes' vendor='unknown'>pentium3-v1</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+       <blockers model='phenom'>
+         <feature name='fxsr_opt'/>
+diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
+index 871af7f505..d99a66ecfe 100644
+--- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
+@@ -1372,7 +1372,8 @@
+       <model usable='yes' vendor='unknown'>pentium-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+       <model usable='yes' vendor='unknown'>pentium2-v1</model>
+-      <model usable='yes' vendor='unknown'>pentium3</model>
++      <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
++      <model usable='yes' vendor='unknown'>pentium3-v1</model>
+       <model usable='no' vendor='AMD'>phenom</model>
+       <blockers model='phenom'>
+         <feature name='3dnow'/>
+-- 
+2.47.1
diff --git a/libvirt-cpu_map-Add-phenom-v1-CPU-model.patch b/libvirt-cpu_map-Add-phenom-v1-CPU-model.patch
new file mode 100644
index 0000000..1766a38
--- /dev/null
+++ b/libvirt-cpu_map-Add-phenom-v1-CPU-model.patch
@@ -0,0 +1,950 @@
+From 177e3fafb68267a59abedfd9e17b1dc6aa700088 Mon Sep 17 00:00:00 2001
+Message-ID: <177e3fafb68267a59abedfd9e17b1dc6aa700088.1734429554.git.jdenemar@redhat.com>
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Thu, 5 Dec 2024 15:44:29 +0100
+Subject: [PATCH] cpu_map: Add phenom-v1 CPU model
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit 332136e49ab4d122d053b11646c292a1a72e732a)
+
+https://issues.redhat.com/browse/RHEL-70129
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ src/cpu_map/index.xml                              | 1 +
+ src/cpu_map/meson.build                            | 1 +
+ src/cpu_map/x86_phenom-v1.xml                      | 6 ++++++
+ tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml     | 7 ++++++-
+ tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml     | 6 +++++-
+ tests/domaincapsdata/qemu_5.2.0.x86_64.xml         | 7 ++++++-
+ tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml     | 7 ++++++-
+ tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml     | 6 +++++-
+ tests/domaincapsdata/qemu_6.0.0.x86_64.xml         | 7 ++++++-
+ tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml     | 7 ++++++-
+ tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml     | 6 +++++-
+ tests/domaincapsdata/qemu_6.1.0.x86_64.xml         | 7 ++++++-
+ tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml     | 7 ++++++-
+ tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml     | 6 +++++-
+ tests/domaincapsdata/qemu_6.2.0.x86_64.xml         | 7 ++++++-
+ tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml     | 7 ++++++-
+ tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml     | 6 +++++-
+ tests/domaincapsdata/qemu_7.0.0.x86_64.xml         | 7 ++++++-
+ tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml     | 7 ++++++-
+ tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml     | 6 +++++-
+ tests/domaincapsdata/qemu_7.1.0.x86_64.xml         | 7 ++++++-
+ tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml     | 7 ++++++-
+ tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml | 6 +++++-
+ tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml     | 6 +++++-
+ tests/domaincapsdata/qemu_7.2.0.x86_64.xml         | 7 ++++++-
+ tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml     | 7 ++++++-
+ tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml     | 6 +++++-
+ tests/domaincapsdata/qemu_8.0.0.x86_64.xml         | 7 ++++++-
+ tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml     | 7 ++++++-
+ tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml     | 6 +++++-
+ tests/domaincapsdata/qemu_8.1.0.x86_64.xml         | 7 ++++++-
+ tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml     | 7 ++++++-
+ tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml     | 6 +++++-
+ tests/domaincapsdata/qemu_8.2.0.x86_64.xml         | 7 ++++++-
+ tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml     | 7 ++++++-
+ tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml     | 6 +++++-
+ tests/domaincapsdata/qemu_9.0.0.x86_64.xml         | 7 ++++++-
+ tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml     | 7 ++++++-
+ tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml     | 6 +++++-
+ tests/domaincapsdata/qemu_9.1.0.x86_64.xml         | 7 ++++++-
+ tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml     | 7 ++++++-
+ tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml     | 6 +++++-
+ tests/domaincapsdata/qemu_9.2.0.x86_64.xml         | 7 ++++++-
+ 43 files changed, 234 insertions(+), 40 deletions(-)
+ create mode 100644 src/cpu_map/x86_phenom-v1.xml
+
+diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml
+index 5f42fdc7fd..74b315c661 100644
+--- a/src/cpu_map/index.xml
++++ b/src/cpu_map/index.xml
+@@ -135,6 +135,7 @@
+       <include filename='x86_athlon.xml'/>
+       <include filename='x86_athlon-v1.xml'/>
+       <include filename='x86_phenom.xml'/>
++      <include filename='x86_phenom-v1.xml'/>
+       <include filename='x86_Opteron_G1.xml'/>
+       <include filename='x86_Opteron_G2.xml'/>
+       <include filename='x86_Opteron_G3.xml'/>
+diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build
+index 8d45feee00..47c93deace 100644
+--- a/src/cpu_map/meson.build
++++ b/src/cpu_map/meson.build
+@@ -126,6 +126,7 @@ cpumap_data = [
+   'x86_pentium3-v1.xml',
+   'x86_pentium3.xml',
+   'x86_pentiumpro.xml',
++  'x86_phenom-v1.xml',
+   'x86_phenom.xml',
+   'x86_qemu32-v1.xml',
+   'x86_qemu32.xml',
+diff --git a/src/cpu_map/x86_phenom-v1.xml b/src/cpu_map/x86_phenom-v1.xml
+new file mode 100644
+index 0000000000..f465c0e1d3
+--- /dev/null
++++ b/src/cpu_map/x86_phenom-v1.xml
+@@ -0,0 +1,6 @@
++<cpus>
++  <model name='phenom-v1'>
++    <decode host='on' guest='off'/>
++    <model name='phenom'/>
++  </model>
++</cpus>
+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 c71286deb2..27d36feccf 100644
+--- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
+@@ -832,11 +832,16 @@
+       <model usable='yes' vendor='unknown'>pentium2-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
+       <model usable='yes' vendor='unknown'>pentium3-v1</model>
+-      <model usable='no' vendor='AMD'>phenom</model>
++      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
+       <blockers model='phenom'>
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>phenom-v1</model>
++      <blockers model='phenom-v1'>
++        <feature name='3dnow'/>
++        <feature name='3dnowext'/>
++      </blockers>
+       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+       <model usable='yes' vendor='unknown'>qemu32-v1</model>
+       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</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 26f3eed92b..b06febb821 100644
+--- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
+@@ -1449,10 +1449,14 @@
+       <model usable='yes' vendor='unknown'>pentium2-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
+       <model usable='yes' vendor='unknown'>pentium3-v1</model>
+-      <model usable='no' vendor='AMD'>phenom</model>
++      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
+       <blockers model='phenom'>
+         <feature name='fxsr_opt'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>phenom-v1</model>
++      <blockers model='phenom-v1'>
++        <feature name='fxsr_opt'/>
++      </blockers>
+       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+       <model usable='yes' vendor='unknown'>qemu32-v1</model>
+       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
+diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
+index 6e67479e25..21b4ab8c5c 100644
+--- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
+@@ -831,11 +831,16 @@
+       <model usable='yes' vendor='unknown'>pentium2-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
+       <model usable='yes' vendor='unknown'>pentium3-v1</model>
+-      <model usable='no' vendor='AMD'>phenom</model>
++      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
+       <blockers model='phenom'>
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>phenom-v1</model>
++      <blockers model='phenom-v1'>
++        <feature name='3dnow'/>
++        <feature name='3dnowext'/>
++      </blockers>
+       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+       <model usable='yes' vendor='unknown'>qemu32-v1</model>
+       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</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 d5b703e09a..83bb914c7d 100644
+--- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
+@@ -854,11 +854,16 @@
+       <model usable='yes' vendor='unknown'>pentium2-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
+       <model usable='yes' vendor='unknown'>pentium3-v1</model>
+-      <model usable='no' vendor='AMD'>phenom</model>
++      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
+       <blockers model='phenom'>
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>phenom-v1</model>
++      <blockers model='phenom-v1'>
++        <feature name='3dnow'/>
++        <feature name='3dnowext'/>
++      </blockers>
+       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+       <model usable='yes' vendor='unknown'>qemu32-v1</model>
+       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</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 5928a72da9..47ab7240fb 100644
+--- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
+@@ -1539,10 +1539,14 @@
+       <model usable='yes' vendor='unknown'>pentium2-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
+       <model usable='yes' vendor='unknown'>pentium3-v1</model>
+-      <model usable='no' vendor='AMD'>phenom</model>
++      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
+       <blockers model='phenom'>
+         <feature name='fxsr_opt'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>phenom-v1</model>
++      <blockers model='phenom-v1'>
++        <feature name='fxsr_opt'/>
++      </blockers>
+       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+       <model usable='yes' vendor='unknown'>qemu32-v1</model>
+       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
+diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
+index 69c1eb816f..cc212722f5 100644
+--- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
+@@ -853,11 +853,16 @@
+       <model usable='yes' vendor='unknown'>pentium2-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
+       <model usable='yes' vendor='unknown'>pentium3-v1</model>
+-      <model usable='no' vendor='AMD'>phenom</model>
++      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
+       <blockers model='phenom'>
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>phenom-v1</model>
++      <blockers model='phenom-v1'>
++        <feature name='3dnow'/>
++        <feature name='3dnowext'/>
++      </blockers>
+       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+       <model usable='yes' vendor='unknown'>qemu32-v1</model>
+       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</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 c65db67a41..ec7abc3903 100644
+--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
+@@ -955,11 +955,16 @@
+       <model usable='yes' vendor='unknown'>pentium2-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
+       <model usable='yes' vendor='unknown'>pentium3-v1</model>
+-      <model usable='no' vendor='AMD'>phenom</model>
++      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
+       <blockers model='phenom'>
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>phenom-v1</model>
++      <blockers model='phenom-v1'>
++        <feature name='3dnow'/>
++        <feature name='3dnowext'/>
++      </blockers>
+       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+       <model usable='yes' vendor='unknown'>qemu32-v1</model>
+       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</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 e85937b36d..87fe22edd7 100644
+--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
+@@ -1736,10 +1736,14 @@
+       <model usable='yes' vendor='unknown'>pentium2-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
+       <model usable='yes' vendor='unknown'>pentium3-v1</model>
+-      <model usable='no' vendor='AMD'>phenom</model>
++      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
+       <blockers model='phenom'>
+         <feature name='fxsr_opt'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>phenom-v1</model>
++      <blockers model='phenom-v1'>
++        <feature name='fxsr_opt'/>
++      </blockers>
+       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+       <model usable='yes' vendor='unknown'>qemu32-v1</model>
+       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
+diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
+index b1b76ad6fd..35bba84033 100644
+--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
+@@ -954,11 +954,16 @@
+       <model usable='yes' vendor='unknown'>pentium2-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
+       <model usable='yes' vendor='unknown'>pentium3-v1</model>
+-      <model usable='no' vendor='AMD'>phenom</model>
++      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
+       <blockers model='phenom'>
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>phenom-v1</model>
++      <blockers model='phenom-v1'>
++        <feature name='3dnow'/>
++        <feature name='3dnowext'/>
++      </blockers>
+       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+       <model usable='yes' vendor='unknown'>qemu32-v1</model>
+       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</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 fa27ff520a..b448d7bdb8 100644
+--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
+@@ -961,11 +961,16 @@
+       <model usable='yes' vendor='unknown'>pentium2-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
+       <model usable='yes' vendor='unknown'>pentium3-v1</model>
+-      <model usable='no' vendor='AMD'>phenom</model>
++      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
+       <blockers model='phenom'>
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>phenom-v1</model>
++      <blockers model='phenom-v1'>
++        <feature name='3dnow'/>
++        <feature name='3dnowext'/>
++      </blockers>
+       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+       <model usable='yes' vendor='unknown'>qemu32-v1</model>
+       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</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 33ff630126..a8a96f2bb4 100644
+--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
+@@ -1751,10 +1751,14 @@
+       <model usable='yes' vendor='unknown'>pentium2-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
+       <model usable='yes' vendor='unknown'>pentium3-v1</model>
+-      <model usable='no' vendor='AMD'>phenom</model>
++      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
+       <blockers model='phenom'>
+         <feature name='fxsr_opt'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>phenom-v1</model>
++      <blockers model='phenom-v1'>
++        <feature name='fxsr_opt'/>
++      </blockers>
+       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+       <model usable='yes' vendor='unknown'>qemu32-v1</model>
+       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
+diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+index 0cf8733f1e..303b714aa7 100644
+--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+@@ -960,11 +960,16 @@
+       <model usable='yes' vendor='unknown'>pentium2-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
+       <model usable='yes' vendor='unknown'>pentium3-v1</model>
+-      <model usable='no' vendor='AMD'>phenom</model>
++      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
+       <blockers model='phenom'>
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>phenom-v1</model>
++      <blockers model='phenom-v1'>
++        <feature name='3dnow'/>
++        <feature name='3dnowext'/>
++      </blockers>
+       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+       <model usable='yes' vendor='unknown'>qemu32-v1</model>
+       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</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 ba3669f4b2..9da8e156e2 100644
+--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
+@@ -988,11 +988,16 @@
+       <model usable='yes' vendor='unknown'>pentium2-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
+       <model usable='yes' vendor='unknown'>pentium3-v1</model>
+-      <model usable='no' vendor='AMD'>phenom</model>
++      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
+       <blockers model='phenom'>
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>phenom-v1</model>
++      <blockers model='phenom-v1'>
++        <feature name='3dnow'/>
++        <feature name='3dnowext'/>
++      </blockers>
+       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+       <model usable='yes' vendor='unknown'>qemu32-v1</model>
+       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</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 43b6a68e24..a5b9edaeb6 100644
+--- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
+@@ -1775,10 +1775,14 @@
+       <model usable='yes' vendor='unknown'>pentium2-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
+       <model usable='yes' vendor='unknown'>pentium3-v1</model>
+-      <model usable='no' vendor='AMD'>phenom</model>
++      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
+       <blockers model='phenom'>
+         <feature name='fxsr_opt'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>phenom-v1</model>
++      <blockers model='phenom-v1'>
++        <feature name='fxsr_opt'/>
++      </blockers>
+       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+       <model usable='yes' vendor='unknown'>qemu32-v1</model>
+       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
+diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+index a7d454b330..3029403bac 100644
+--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+@@ -987,11 +987,16 @@
+       <model usable='yes' vendor='unknown'>pentium2-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
+       <model usable='yes' vendor='unknown'>pentium3-v1</model>
+-      <model usable='no' vendor='AMD'>phenom</model>
++      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
+       <blockers model='phenom'>
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>phenom-v1</model>
++      <blockers model='phenom-v1'>
++        <feature name='3dnow'/>
++        <feature name='3dnowext'/>
++      </blockers>
+       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+       <model usable='yes' vendor='unknown'>qemu32-v1</model>
+       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</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 08c27dbab8..259613d7fe 100644
+--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
+@@ -955,11 +955,16 @@
+       <model usable='yes' vendor='unknown'>pentium2-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
+       <model usable='yes' vendor='unknown'>pentium3-v1</model>
+-      <model usable='no' vendor='AMD'>phenom</model>
++      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
+       <blockers model='phenom'>
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>phenom-v1</model>
++      <blockers model='phenom-v1'>
++        <feature name='3dnow'/>
++        <feature name='3dnowext'/>
++      </blockers>
+       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+       <model usable='yes' vendor='unknown'>qemu32-v1</model>
+       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</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 8e974ebfde..d3ecad143c 100644
+--- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
+@@ -1723,10 +1723,14 @@
+       <model usable='yes' vendor='unknown'>pentium2-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
+       <model usable='yes' vendor='unknown'>pentium3-v1</model>
+-      <model usable='no' vendor='AMD'>phenom</model>
++      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
+       <blockers model='phenom'>
+         <feature name='fxsr_opt'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>phenom-v1</model>
++      <blockers model='phenom-v1'>
++        <feature name='fxsr_opt'/>
++      </blockers>
+       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+       <model usable='yes' vendor='unknown'>qemu32-v1</model>
+       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
+diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
+index 71cb90d172..7f08dd995d 100644
+--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
+@@ -954,11 +954,16 @@
+       <model usable='yes' vendor='unknown'>pentium2-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
+       <model usable='yes' vendor='unknown'>pentium3-v1</model>
+-      <model usable='no' vendor='AMD'>phenom</model>
++      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
+       <blockers model='phenom'>
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>phenom-v1</model>
++      <blockers model='phenom-v1'>
++        <feature name='3dnow'/>
++        <feature name='3dnowext'/>
++      </blockers>
+       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+       <model usable='yes' vendor='unknown'>qemu32-v1</model>
+       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</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 2d346b5a15..1057fc58d3 100644
+--- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
+@@ -960,11 +960,16 @@
+       <model usable='yes' vendor='unknown'>pentium2-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
+       <model usable='yes' vendor='unknown'>pentium3-v1</model>
+-      <model usable='no' vendor='AMD'>phenom</model>
++      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
+       <blockers model='phenom'>
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>phenom-v1</model>
++      <blockers model='phenom-v1'>
++        <feature name='3dnow'/>
++        <feature name='3dnowext'/>
++      </blockers>
+       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+       <model usable='yes' vendor='unknown'>qemu32-v1</model>
+       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</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 31a774af8a..fa4e9cfb8c 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
+@@ -1432,10 +1432,14 @@
+       <model usable='yes' vendor='unknown'>pentium2-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
+       <model usable='yes' vendor='unknown'>pentium3-v1</model>
+-      <model usable='no' vendor='AMD'>phenom</model>
++      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
+       <blockers model='phenom'>
+         <feature name='fxsr_opt'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>phenom-v1</model>
++      <blockers model='phenom-v1'>
++        <feature name='fxsr_opt'/>
++      </blockers>
+       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+       <model usable='yes' vendor='unknown'>qemu32-v1</model>
+       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</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 31a774af8a..fa4e9cfb8c 100644
+--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
+@@ -1432,10 +1432,14 @@
+       <model usable='yes' vendor='unknown'>pentium2-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
+       <model usable='yes' vendor='unknown'>pentium3-v1</model>
+-      <model usable='no' vendor='AMD'>phenom</model>
++      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
+       <blockers model='phenom'>
+         <feature name='fxsr_opt'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>phenom-v1</model>
++      <blockers model='phenom-v1'>
++        <feature name='fxsr_opt'/>
++      </blockers>
+       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+       <model usable='yes' vendor='unknown'>qemu32-v1</model>
+       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
+diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
+index 46b0e223c7..0c0f363d2b 100644
+--- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
+@@ -959,11 +959,16 @@
+       <model usable='yes' vendor='unknown'>pentium2-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
+       <model usable='yes' vendor='unknown'>pentium3-v1</model>
+-      <model usable='no' vendor='AMD'>phenom</model>
++      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
+       <blockers model='phenom'>
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>phenom-v1</model>
++      <blockers model='phenom-v1'>
++        <feature name='3dnow'/>
++        <feature name='3dnowext'/>
++      </blockers>
+       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+       <model usable='yes' vendor='unknown'>qemu32-v1</model>
+       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</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 95d809d412..b1de96fadd 100644
+--- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
+@@ -1042,11 +1042,16 @@
+       <model usable='yes' vendor='unknown'>pentium2-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
+       <model usable='yes' vendor='unknown'>pentium3-v1</model>
+-      <model usable='no' vendor='AMD'>phenom</model>
++      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
+       <blockers model='phenom'>
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>phenom-v1</model>
++      <blockers model='phenom-v1'>
++        <feature name='3dnow'/>
++        <feature name='3dnowext'/>
++      </blockers>
+       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+       <model usable='yes' vendor='unknown'>qemu32-v1</model>
+       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</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 95c413a22f..c83819435d 100644
+--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
+@@ -1527,10 +1527,14 @@
+       <model usable='yes' vendor='unknown'>pentium2-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
+       <model usable='yes' vendor='unknown'>pentium3-v1</model>
+-      <model usable='no' vendor='AMD'>phenom</model>
++      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
+       <blockers model='phenom'>
+         <feature name='fxsr_opt'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>phenom-v1</model>
++      <blockers model='phenom-v1'>
++        <feature name='fxsr_opt'/>
++      </blockers>
+       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+       <model usable='yes' vendor='unknown'>qemu32-v1</model>
+       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
+diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
+index 4cd5d8e640..8f195f0e39 100644
+--- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
+@@ -1041,11 +1041,16 @@
+       <model usable='yes' vendor='unknown'>pentium2-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
+       <model usable='yes' vendor='unknown'>pentium3-v1</model>
+-      <model usable='no' vendor='AMD'>phenom</model>
++      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
+       <blockers model='phenom'>
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>phenom-v1</model>
++      <blockers model='phenom-v1'>
++        <feature name='3dnow'/>
++        <feature name='3dnowext'/>
++      </blockers>
+       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+       <model usable='yes' vendor='unknown'>qemu32-v1</model>
+       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</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 94def05942..5495883fe9 100644
+--- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
+@@ -1271,11 +1271,16 @@
+       <model usable='yes' vendor='unknown'>pentium2-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
+       <model usable='yes' vendor='unknown'>pentium3-v1</model>
+-      <model usable='no' vendor='AMD'>phenom</model>
++      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
+       <blockers model='phenom'>
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>phenom-v1</model>
++      <blockers model='phenom-v1'>
++        <feature name='3dnow'/>
++        <feature name='3dnowext'/>
++      </blockers>
+       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+       <model usable='yes' vendor='unknown'>qemu32-v1</model>
+       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</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 958b250336..87fc57da66 100644
+--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
+@@ -1511,10 +1511,14 @@
+       <model usable='yes' vendor='unknown'>pentium2-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
+       <model usable='yes' vendor='unknown'>pentium3-v1</model>
+-      <model usable='no' vendor='AMD'>phenom</model>
++      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
+       <blockers model='phenom'>
+         <feature name='fxsr_opt'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>phenom-v1</model>
++      <blockers model='phenom-v1'>
++        <feature name='fxsr_opt'/>
++      </blockers>
+       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+       <model usable='yes' vendor='unknown'>qemu32-v1</model>
+       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
+diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
+index 4480ff39cd..43703fefab 100644
+--- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
+@@ -1270,11 +1270,16 @@
+       <model usable='yes' vendor='unknown'>pentium2-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
+       <model usable='yes' vendor='unknown'>pentium3-v1</model>
+-      <model usable='no' vendor='AMD'>phenom</model>
++      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
+       <blockers model='phenom'>
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>phenom-v1</model>
++      <blockers model='phenom-v1'>
++        <feature name='3dnow'/>
++        <feature name='3dnowext'/>
++      </blockers>
+       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+       <model usable='yes' vendor='unknown'>qemu32-v1</model>
+       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</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 9f91f9ef93..2eab4e49b1 100644
+--- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
+@@ -1272,11 +1272,16 @@
+       <model usable='yes' vendor='unknown'>pentium2-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
+       <model usable='yes' vendor='unknown'>pentium3-v1</model>
+-      <model usable='no' vendor='AMD'>phenom</model>
++      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
+       <blockers model='phenom'>
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>phenom-v1</model>
++      <blockers model='phenom-v1'>
++        <feature name='3dnow'/>
++        <feature name='3dnowext'/>
++      </blockers>
+       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+       <model usable='yes' vendor='unknown'>qemu32-v1</model>
+       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</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 cf6ce11821..08b45ba90b 100644
+--- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
+@@ -1478,10 +1478,14 @@
+       <model usable='yes' vendor='unknown'>pentium2-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
+       <model usable='yes' vendor='unknown'>pentium3-v1</model>
+-      <model usable='no' vendor='AMD'>phenom</model>
++      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
+       <blockers model='phenom'>
+         <feature name='fxsr_opt'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>phenom-v1</model>
++      <blockers model='phenom-v1'>
++        <feature name='fxsr_opt'/>
++      </blockers>
+       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+       <model usable='yes' vendor='unknown'>qemu32-v1</model>
+       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
+diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
+index 07034ee9a7..28b233d35d 100644
+--- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
+@@ -1271,11 +1271,16 @@
+       <model usable='yes' vendor='unknown'>pentium2-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
+       <model usable='yes' vendor='unknown'>pentium3-v1</model>
+-      <model usable='no' vendor='AMD'>phenom</model>
++      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
+       <blockers model='phenom'>
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>phenom-v1</model>
++      <blockers model='phenom-v1'>
++        <feature name='3dnow'/>
++        <feature name='3dnowext'/>
++      </blockers>
+       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+       <model usable='yes' vendor='unknown'>qemu32-v1</model>
+       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</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 020ad5bdba..16a3cdacb5 100644
+--- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
+@@ -1272,11 +1272,16 @@
+       <model usable='yes' vendor='unknown'>pentium2-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
+       <model usable='yes' vendor='unknown'>pentium3-v1</model>
+-      <model usable='no' vendor='AMD'>phenom</model>
++      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
+       <blockers model='phenom'>
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>phenom-v1</model>
++      <blockers model='phenom-v1'>
++        <feature name='3dnow'/>
++        <feature name='3dnowext'/>
++      </blockers>
+       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+       <model usable='yes' vendor='unknown'>qemu32-v1</model>
+       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</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 b0a25f5ea6..549e21c273 100644
+--- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
+@@ -1407,10 +1407,14 @@
+       <model usable='yes' vendor='unknown'>pentium2-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
+       <model usable='yes' vendor='unknown'>pentium3-v1</model>
+-      <model usable='no' vendor='AMD'>phenom</model>
++      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
+       <blockers model='phenom'>
+         <feature name='fxsr_opt'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>phenom-v1</model>
++      <blockers model='phenom-v1'>
++        <feature name='fxsr_opt'/>
++      </blockers>
+       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+       <model usable='yes' vendor='unknown'>qemu32-v1</model>
+       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
+diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
+index f6e47f704a..16e0d61c51 100644
+--- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
+@@ -1271,11 +1271,16 @@
+       <model usable='yes' vendor='unknown'>pentium2-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
+       <model usable='yes' vendor='unknown'>pentium3-v1</model>
+-      <model usable='no' vendor='AMD'>phenom</model>
++      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
+       <blockers model='phenom'>
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>phenom-v1</model>
++      <blockers model='phenom-v1'>
++        <feature name='3dnow'/>
++        <feature name='3dnowext'/>
++      </blockers>
+       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+       <model usable='yes' vendor='unknown'>qemu32-v1</model>
+       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</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 b501544f11..2b33304882 100644
+--- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
+@@ -1408,11 +1408,16 @@
+       <model usable='yes' vendor='unknown'>pentium2-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
+       <model usable='yes' vendor='unknown'>pentium3-v1</model>
+-      <model usable='no' vendor='AMD'>phenom</model>
++      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
+       <blockers model='phenom'>
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>phenom-v1</model>
++      <blockers model='phenom-v1'>
++        <feature name='3dnow'/>
++        <feature name='3dnowext'/>
++      </blockers>
+       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+       <model usable='yes' vendor='unknown'>qemu32-v1</model>
+       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</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 1704b3b265..f91fcdd4e5 100644
+--- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
+@@ -1512,10 +1512,14 @@
+       <model usable='yes' vendor='unknown'>pentium2-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
+       <model usable='yes' vendor='unknown'>pentium3-v1</model>
+-      <model usable='no' vendor='AMD'>phenom</model>
++      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
+       <blockers model='phenom'>
+         <feature name='fxsr_opt'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>phenom-v1</model>
++      <blockers model='phenom-v1'>
++        <feature name='fxsr_opt'/>
++      </blockers>
+       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+       <model usable='yes' vendor='unknown'>qemu32-v1</model>
+       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
+diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
+index 3a1642af94..82fe2b3b1a 100644
+--- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
+@@ -1407,11 +1407,16 @@
+       <model usable='yes' vendor='unknown'>pentium2-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
+       <model usable='yes' vendor='unknown'>pentium3-v1</model>
+-      <model usable='no' vendor='AMD'>phenom</model>
++      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
+       <blockers model='phenom'>
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>phenom-v1</model>
++      <blockers model='phenom-v1'>
++        <feature name='3dnow'/>
++        <feature name='3dnowext'/>
++      </blockers>
+       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+       <model usable='yes' vendor='unknown'>qemu32-v1</model>
+       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</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 91eab35039..0c896766cb 100644
+--- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
+@@ -1408,11 +1408,16 @@
+       <model usable='yes' vendor='unknown'>pentium2-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
+       <model usable='yes' vendor='unknown'>pentium3-v1</model>
+-      <model usable='no' vendor='AMD'>phenom</model>
++      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
+       <blockers model='phenom'>
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>phenom-v1</model>
++      <blockers model='phenom-v1'>
++        <feature name='3dnow'/>
++        <feature name='3dnowext'/>
++      </blockers>
+       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+       <model usable='yes' vendor='unknown'>qemu32-v1</model>
+       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</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 e807b965f6..94c6914767 100644
+--- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
+@@ -1512,10 +1512,14 @@
+       <model usable='yes' vendor='unknown'>pentium2-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
+       <model usable='yes' vendor='unknown'>pentium3-v1</model>
+-      <model usable='no' vendor='AMD'>phenom</model>
++      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
+       <blockers model='phenom'>
+         <feature name='fxsr_opt'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>phenom-v1</model>
++      <blockers model='phenom-v1'>
++        <feature name='fxsr_opt'/>
++      </blockers>
+       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+       <model usable='yes' vendor='unknown'>qemu32-v1</model>
+       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
+diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
+index a876e7b98f..1f73e3903c 100644
+--- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
+@@ -1407,11 +1407,16 @@
+       <model usable='yes' vendor='unknown'>pentium2-v1</model>
+       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
+       <model usable='yes' vendor='unknown'>pentium3-v1</model>
+-      <model usable='no' vendor='AMD'>phenom</model>
++      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
+       <blockers model='phenom'>
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
++      <model usable='no' vendor='AMD'>phenom-v1</model>
++      <blockers model='phenom-v1'>
++        <feature name='3dnow'/>
++        <feature name='3dnowext'/>
++      </blockers>
+       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+       <model usable='yes' vendor='unknown'>qemu32-v1</model>
+       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
+-- 
+2.47.1
diff --git a/libvirt-cpu_map-Add-qemu32-v1-CPU-model.patch b/libvirt-cpu_map-Add-qemu32-v1-CPU-model.patch
new file mode 100644
index 0000000..8fefea8
--- /dev/null
+++ b/libvirt-cpu_map-Add-qemu32-v1-CPU-model.patch
@@ -0,0 +1,658 @@
+From ed26bfa0db4835af94b8892ac38e823713e5c8c0 Mon Sep 17 00:00:00 2001
+Message-ID: <ed26bfa0db4835af94b8892ac38e823713e5c8c0.1734429554.git.jdenemar@redhat.com>
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Thu, 5 Dec 2024 15:34:21 +0100
+Subject: [PATCH] cpu_map: Add qemu32-v1 CPU model
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit d9b23d77c0165a3a1cbea6b6bf953ae49547b60d)
+
+https://issues.redhat.com/browse/RHEL-70129
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ src/cpu_map/index.xml                              | 1 +
+ src/cpu_map/meson.build                            | 1 +
+ src/cpu_map/x86_qemu32-v1.xml                      | 6 ++++++
+ tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_5.2.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_6.0.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_6.1.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_6.2.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_7.0.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_7.1.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml | 3 ++-
+ tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_7.2.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_8.0.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_8.1.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_8.2.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_9.0.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_9.1.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_9.2.0.x86_64.xml         | 3 ++-
+ 43 files changed, 88 insertions(+), 40 deletions(-)
+ create mode 100644 src/cpu_map/x86_qemu32-v1.xml
+
+diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml
+index eb847341da..0fe2a513ca 100644
+--- a/src/cpu_map/index.xml
++++ b/src/cpu_map/index.xml
+@@ -26,6 +26,7 @@
+ 
+     <group name='Generic QEMU CPU models'>
+       <include filename='x86_qemu32.xml'/>
++      <include filename='x86_qemu32-v1.xml'/>
+       <include filename='x86_kvm32.xml'/>
+       <include filename='x86_cpu64-rhel5.xml'/>
+       <include filename='x86_cpu64-rhel6.xml'/>
+diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build
+index b179fb442c..61c5e403f9 100644
+--- a/src/cpu_map/meson.build
++++ b/src/cpu_map/meson.build
+@@ -121,6 +121,7 @@ cpumap_data = [
+   'x86_pentium3.xml',
+   'x86_pentiumpro.xml',
+   'x86_phenom.xml',
++  'x86_qemu32-v1.xml',
+   'x86_qemu32.xml',
+   'x86_qemu64.xml',
+   'x86_SandyBridge-IBRS.xml',
+diff --git a/src/cpu_map/x86_qemu32-v1.xml b/src/cpu_map/x86_qemu32-v1.xml
+new file mode 100644
+index 0000000000..904c3c6461
+--- /dev/null
++++ b/src/cpu_map/x86_qemu32-v1.xml
+@@ -0,0 +1,6 @@
++<cpus>
++  <model name='qemu32-v1'>
++    <decode host='on' guest='off'/>
++    <model name='qemu32'/>
++  </model>
++</cpus>
+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 d4853706b3..90a947b72a 100644
+--- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
+@@ -816,7 +816,8 @@
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>qemu32</model>
++      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
++      <model usable='yes' vendor='unknown'>qemu32-v1</model>
+       <model usable='yes' vendor='unknown'>qemu64</model>
+     </mode>
+   </cpu>
+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 03c88241c8..a1d2982897 100644
+--- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
+@@ -1430,7 +1430,8 @@
+       <blockers model='phenom'>
+         <feature name='fxsr_opt'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>qemu32</model>
++      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
++      <model usable='yes' vendor='unknown'>qemu32-v1</model>
+       <model usable='yes' vendor='unknown'>qemu64</model>
+     </mode>
+   </cpu>
+diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
+index 75592e124e..1c6e65a408 100644
+--- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
+@@ -815,7 +815,8 @@
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>qemu32</model>
++      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
++      <model usable='yes' vendor='unknown'>qemu32-v1</model>
+       <model usable='yes' vendor='unknown'>qemu64</model>
+     </mode>
+   </cpu>
+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 de38e87010..bafaee4dc5 100644
+--- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
+@@ -838,7 +838,8 @@
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>qemu32</model>
++      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
++      <model usable='yes' vendor='unknown'>qemu32-v1</model>
+       <model usable='yes' vendor='unknown'>qemu64</model>
+     </mode>
+   </cpu>
+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 29aa3f9adc..bac7c98eea 100644
+--- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
+@@ -1520,7 +1520,8 @@
+       <blockers model='phenom'>
+         <feature name='fxsr_opt'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>qemu32</model>
++      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
++      <model usable='yes' vendor='unknown'>qemu32-v1</model>
+       <model usable='yes' vendor='unknown'>qemu64</model>
+     </mode>
+   </cpu>
+diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
+index 6469251e47..fe78b42ab3 100644
+--- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
+@@ -837,7 +837,8 @@
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>qemu32</model>
++      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
++      <model usable='yes' vendor='unknown'>qemu32-v1</model>
+       <model usable='yes' vendor='unknown'>qemu64</model>
+     </mode>
+   </cpu>
+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 3918fd5101..c4e6cfeb84 100644
+--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
+@@ -939,7 +939,8 @@
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>qemu32</model>
++      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
++      <model usable='yes' vendor='unknown'>qemu32-v1</model>
+       <model usable='yes' vendor='unknown'>qemu64</model>
+     </mode>
+   </cpu>
+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 5d5b18cfdf..3390d156e5 100644
+--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
+@@ -1717,7 +1717,8 @@
+       <blockers model='phenom'>
+         <feature name='fxsr_opt'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>qemu32</model>
++      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
++      <model usable='yes' vendor='unknown'>qemu32-v1</model>
+       <model usable='yes' vendor='unknown'>qemu64</model>
+     </mode>
+   </cpu>
+diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
+index 98bcfec2bb..62d5a4bdad 100644
+--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
+@@ -938,7 +938,8 @@
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>qemu32</model>
++      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
++      <model usable='yes' vendor='unknown'>qemu32-v1</model>
+       <model usable='yes' vendor='unknown'>qemu64</model>
+     </mode>
+   </cpu>
+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 ed4a66a4ca..77fa39cf13 100644
+--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
+@@ -945,7 +945,8 @@
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>qemu32</model>
++      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
++      <model usable='yes' vendor='unknown'>qemu32-v1</model>
+       <model usable='yes' vendor='unknown'>qemu64</model>
+     </mode>
+   </cpu>
+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 a748c623bc..ee36631717 100644
+--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
+@@ -1732,7 +1732,8 @@
+       <blockers model='phenom'>
+         <feature name='fxsr_opt'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>qemu32</model>
++      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
++      <model usable='yes' vendor='unknown'>qemu32-v1</model>
+       <model usable='yes' vendor='unknown'>qemu64</model>
+     </mode>
+   </cpu>
+diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+index f9a0221e7b..fb66ff6032 100644
+--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+@@ -944,7 +944,8 @@
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>qemu32</model>
++      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
++      <model usable='yes' vendor='unknown'>qemu32-v1</model>
+       <model usable='yes' vendor='unknown'>qemu64</model>
+     </mode>
+   </cpu>
+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 6b97ff8ba7..fbbe1f7ed4 100644
+--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
+@@ -972,7 +972,8 @@
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>qemu32</model>
++      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
++      <model usable='yes' vendor='unknown'>qemu32-v1</model>
+       <model usable='yes' vendor='unknown'>qemu64</model>
+     </mode>
+   </cpu>
+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 2e27e674f2..f5a84c16f7 100644
+--- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
+@@ -1756,7 +1756,8 @@
+       <blockers model='phenom'>
+         <feature name='fxsr_opt'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>qemu32</model>
++      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
++      <model usable='yes' vendor='unknown'>qemu32-v1</model>
+       <model usable='yes' vendor='unknown'>qemu64</model>
+     </mode>
+   </cpu>
+diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+index 99d8cf9558..d828319061 100644
+--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+@@ -971,7 +971,8 @@
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>qemu32</model>
++      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
++      <model usable='yes' vendor='unknown'>qemu32-v1</model>
+       <model usable='yes' vendor='unknown'>qemu64</model>
+     </mode>
+   </cpu>
+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 e101305e83..968be6fc31 100644
+--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
+@@ -939,7 +939,8 @@
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>qemu32</model>
++      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
++      <model usable='yes' vendor='unknown'>qemu32-v1</model>
+       <model usable='yes' vendor='unknown'>qemu64</model>
+     </mode>
+   </cpu>
+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 24f90ed830..d0a03a641c 100644
+--- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
+@@ -1704,7 +1704,8 @@
+       <blockers model='phenom'>
+         <feature name='fxsr_opt'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>qemu32</model>
++      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
++      <model usable='yes' vendor='unknown'>qemu32-v1</model>
+       <model usable='yes' vendor='unknown'>qemu64</model>
+     </mode>
+   </cpu>
+diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
+index 0f993e3763..a0492d152e 100644
+--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
+@@ -938,7 +938,8 @@
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>qemu32</model>
++      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
++      <model usable='yes' vendor='unknown'>qemu32-v1</model>
+       <model usable='yes' vendor='unknown'>qemu64</model>
+     </mode>
+   </cpu>
+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 bfea565a00..dfb06177ff 100644
+--- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
+@@ -944,7 +944,8 @@
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>qemu32</model>
++      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
++      <model usable='yes' vendor='unknown'>qemu32-v1</model>
+       <model usable='yes' vendor='unknown'>qemu64</model>
+     </mode>
+   </cpu>
+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 91fc6133e4..90908a78e2 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
+@@ -1417,7 +1417,8 @@
+       <blockers model='phenom'>
+         <feature name='fxsr_opt'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>qemu32</model>
++      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
++      <model usable='yes' vendor='unknown'>qemu32-v1</model>
+       <model usable='yes' vendor='unknown'>qemu64</model>
+     </mode>
+   </cpu>
+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 91fc6133e4..90908a78e2 100644
+--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
+@@ -1417,7 +1417,8 @@
+       <blockers model='phenom'>
+         <feature name='fxsr_opt'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>qemu32</model>
++      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
++      <model usable='yes' vendor='unknown'>qemu32-v1</model>
+       <model usable='yes' vendor='unknown'>qemu64</model>
+     </mode>
+   </cpu>
+diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
+index 1e8f10d17f..f3c03fe68b 100644
+--- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
+@@ -943,7 +943,8 @@
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>qemu32</model>
++      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
++      <model usable='yes' vendor='unknown'>qemu32-v1</model>
+       <model usable='yes' vendor='unknown'>qemu64</model>
+     </mode>
+   </cpu>
+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 8dfbc2b21a..27e43a875e 100644
+--- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
+@@ -1026,7 +1026,8 @@
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>qemu32</model>
++      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
++      <model usable='yes' vendor='unknown'>qemu32-v1</model>
+       <model usable='yes' vendor='unknown'>qemu64</model>
+     </mode>
+   </cpu>
+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 6982dc8035..8fc17e9d8a 100644
+--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
+@@ -1512,7 +1512,8 @@
+       <blockers model='phenom'>
+         <feature name='fxsr_opt'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>qemu32</model>
++      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
++      <model usable='yes' vendor='unknown'>qemu32-v1</model>
+       <model usable='yes' vendor='unknown'>qemu64</model>
+     </mode>
+   </cpu>
+diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
+index a739ec6b73..ccaf3af991 100644
+--- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
+@@ -1025,7 +1025,8 @@
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>qemu32</model>
++      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
++      <model usable='yes' vendor='unknown'>qemu32-v1</model>
+       <model usable='yes' vendor='unknown'>qemu64</model>
+     </mode>
+   </cpu>
+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 4d6e8c8a7f..f77e36d1ea 100644
+--- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
+@@ -1255,7 +1255,8 @@
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>qemu32</model>
++      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
++      <model usable='yes' vendor='unknown'>qemu32-v1</model>
+       <model usable='yes' vendor='unknown'>qemu64</model>
+     </mode>
+   </cpu>
+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 0009fb007d..5e5cf92e53 100644
+--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
+@@ -1498,7 +1498,8 @@
+       <blockers model='phenom'>
+         <feature name='fxsr_opt'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>qemu32</model>
++      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
++      <model usable='yes' vendor='unknown'>qemu32-v1</model>
+       <model usable='yes' vendor='unknown'>qemu64</model>
+     </mode>
+   </cpu>
+diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
+index 74f9fe6dbe..3b53baae7a 100644
+--- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
+@@ -1254,7 +1254,8 @@
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>qemu32</model>
++      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
++      <model usable='yes' vendor='unknown'>qemu32-v1</model>
+       <model usable='yes' vendor='unknown'>qemu64</model>
+     </mode>
+   </cpu>
+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 d4d7a9e079..a4faf9112c 100644
+--- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
+@@ -1256,7 +1256,8 @@
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>qemu32</model>
++      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
++      <model usable='yes' vendor='unknown'>qemu32-v1</model>
+       <model usable='yes' vendor='unknown'>qemu64</model>
+     </mode>
+   </cpu>
+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 b948f32538..3e7ba22317 100644
+--- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
+@@ -1465,7 +1465,8 @@
+       <blockers model='phenom'>
+         <feature name='fxsr_opt'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>qemu32</model>
++      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
++      <model usable='yes' vendor='unknown'>qemu32-v1</model>
+       <model usable='yes' vendor='unknown'>qemu64</model>
+     </mode>
+   </cpu>
+diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
+index 3e22f5e9b3..a2fbea3b21 100644
+--- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
+@@ -1255,7 +1255,8 @@
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>qemu32</model>
++      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
++      <model usable='yes' vendor='unknown'>qemu32-v1</model>
+       <model usable='yes' vendor='unknown'>qemu64</model>
+     </mode>
+   </cpu>
+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 7a30c27b83..b945327d7a 100644
+--- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
+@@ -1256,7 +1256,8 @@
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>qemu32</model>
++      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
++      <model usable='yes' vendor='unknown'>qemu32-v1</model>
+       <model usable='yes' vendor='unknown'>qemu64</model>
+     </mode>
+   </cpu>
+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 ee71c658cb..1c00bbb899 100644
+--- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
+@@ -1395,7 +1395,8 @@
+       <blockers model='phenom'>
+         <feature name='fxsr_opt'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>qemu32</model>
++      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
++      <model usable='yes' vendor='unknown'>qemu32-v1</model>
+       <model usable='yes' vendor='unknown'>qemu64</model>
+     </mode>
+   </cpu>
+diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
+index 8509032a62..c0d45ff56b 100644
+--- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
+@@ -1255,7 +1255,8 @@
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>qemu32</model>
++      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
++      <model usable='yes' vendor='unknown'>qemu32-v1</model>
+       <model usable='yes' vendor='unknown'>qemu64</model>
+     </mode>
+   </cpu>
+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 b43b607c39..7d5c0b114d 100644
+--- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
+@@ -1392,7 +1392,8 @@
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>qemu32</model>
++      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
++      <model usable='yes' vendor='unknown'>qemu32-v1</model>
+       <model usable='yes' vendor='unknown'>qemu64</model>
+     </mode>
+   </cpu>
+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 b79140038c..915970f0ca 100644
+--- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
+@@ -1500,7 +1500,8 @@
+       <blockers model='phenom'>
+         <feature name='fxsr_opt'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>qemu32</model>
++      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
++      <model usable='yes' vendor='unknown'>qemu32-v1</model>
+       <model usable='yes' vendor='unknown'>qemu64</model>
+     </mode>
+   </cpu>
+diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
+index 509b5a6c33..3703b8b6f4 100644
+--- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
+@@ -1391,7 +1391,8 @@
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>qemu32</model>
++      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
++      <model usable='yes' vendor='unknown'>qemu32-v1</model>
+       <model usable='yes' vendor='unknown'>qemu64</model>
+     </mode>
+   </cpu>
+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 9114ece766..c76d4d112f 100644
+--- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
+@@ -1392,7 +1392,8 @@
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>qemu32</model>
++      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
++      <model usable='yes' vendor='unknown'>qemu32-v1</model>
+       <model usable='yes' vendor='unknown'>qemu64</model>
+     </mode>
+   </cpu>
+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 e2e40d7ca2..cf9ef74abe 100644
+--- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
+@@ -1500,7 +1500,8 @@
+       <blockers model='phenom'>
+         <feature name='fxsr_opt'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>qemu32</model>
++      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
++      <model usable='yes' vendor='unknown'>qemu32-v1</model>
+       <model usable='yes' vendor='unknown'>qemu64</model>
+     </mode>
+   </cpu>
+diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
+index 4a5a09c488..bb64a26754 100644
+--- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
+@@ -1391,7 +1391,8 @@
+         <feature name='3dnow'/>
+         <feature name='3dnowext'/>
+       </blockers>
+-      <model usable='yes' vendor='unknown'>qemu32</model>
++      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
++      <model usable='yes' vendor='unknown'>qemu32-v1</model>
+       <model usable='yes' vendor='unknown'>qemu64</model>
+     </mode>
+   </cpu>
+-- 
+2.47.1
diff --git a/libvirt-cpu_map-Add-qemu64-v1-CPU-model.patch b/libvirt-cpu_map-Add-qemu64-v1-CPU-model.patch
new file mode 100644
index 0000000..000f303
--- /dev/null
+++ b/libvirt-cpu_map-Add-qemu64-v1-CPU-model.patch
@@ -0,0 +1,658 @@
+From 3e899376d4910fe160c53bfef24ef1800f495e0c Mon Sep 17 00:00:00 2001
+Message-ID: <3e899376d4910fe160c53bfef24ef1800f495e0c.1734429554.git.jdenemar@redhat.com>
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Thu, 5 Dec 2024 15:36:14 +0100
+Subject: [PATCH] cpu_map: Add qemu64-v1 CPU model
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit 2c6a015a7f7bdeffc38d5a16c91283c16325bef0)
+
+https://issues.redhat.com/browse/RHEL-70129
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ src/cpu_map/index.xml                              | 1 +
+ src/cpu_map/meson.build                            | 1 +
+ src/cpu_map/x86_qemu64-v1.xml                      | 6 ++++++
+ tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_5.2.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_6.0.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_6.1.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_6.2.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_7.0.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_7.1.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml | 3 ++-
+ tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_7.2.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_8.0.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_8.1.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_8.2.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_9.0.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_9.1.0.x86_64.xml         | 3 ++-
+ tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml     | 3 ++-
+ tests/domaincapsdata/qemu_9.2.0.x86_64.xml         | 3 ++-
+ 43 files changed, 88 insertions(+), 40 deletions(-)
+ create mode 100644 src/cpu_map/x86_qemu64-v1.xml
+
+diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml
+index 81d77e4dba..8077da260d 100644
+--- a/src/cpu_map/index.xml
++++ b/src/cpu_map/index.xml
+@@ -32,6 +32,7 @@
+       <include filename='x86_cpu64-rhel5.xml'/>
+       <include filename='x86_cpu64-rhel6.xml'/>
+       <include filename='x86_qemu64.xml'/>
++      <include filename='x86_qemu64-v1.xml'/>
+       <include filename='x86_kvm64.xml'/>
+     </group>
+ 
+diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build
+index d73a1b4feb..799a72df47 100644
+--- a/src/cpu_map/meson.build
++++ b/src/cpu_map/meson.build
+@@ -124,6 +124,7 @@ cpumap_data = [
+   'x86_phenom.xml',
+   'x86_qemu32-v1.xml',
+   'x86_qemu32.xml',
++  'x86_qemu64-v1.xml',
+   'x86_qemu64.xml',
+   'x86_SandyBridge-IBRS.xml',
+   'x86_SandyBridge-v1.xml',
+diff --git a/src/cpu_map/x86_qemu64-v1.xml b/src/cpu_map/x86_qemu64-v1.xml
+new file mode 100644
+index 0000000000..1ed9da14a7
+--- /dev/null
++++ b/src/cpu_map/x86_qemu64-v1.xml
+@@ -0,0 +1,6 @@
++<cpus>
++  <model name='qemu64-v1'>
++    <decode host='on' guest='off'/>
++    <model name='qemu64'/>
++  </model>
++</cpus>
+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 da05a9358f..e6c0863d54 100644
+--- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
+@@ -819,7 +819,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+       <model usable='yes' vendor='unknown'>qemu32-v1</model>
+-      <model usable='yes' vendor='unknown'>qemu64</model>
++      <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
++      <model usable='yes' vendor='unknown'>qemu64-v1</model>
+     </mode>
+   </cpu>
+   <memoryBacking supported='yes'>
+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 296f4bce12..7f68ca79c7 100644
+--- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
+@@ -1433,7 +1433,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+       <model usable='yes' vendor='unknown'>qemu32-v1</model>
+-      <model usable='yes' vendor='unknown'>qemu64</model>
++      <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
++      <model usable='yes' vendor='unknown'>qemu64-v1</model>
+     </mode>
+   </cpu>
+   <memoryBacking supported='yes'>
+diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
+index dd5df8de0d..13aef737e2 100644
+--- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
+@@ -818,7 +818,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+       <model usable='yes' vendor='unknown'>qemu32-v1</model>
+-      <model usable='yes' vendor='unknown'>qemu64</model>
++      <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
++      <model usable='yes' vendor='unknown'>qemu64-v1</model>
+     </mode>
+   </cpu>
+   <memoryBacking supported='yes'>
+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 4330afb33a..734d1f3bb2 100644
+--- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
+@@ -841,7 +841,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+       <model usable='yes' vendor='unknown'>qemu32-v1</model>
+-      <model usable='yes' vendor='unknown'>qemu64</model>
++      <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
++      <model usable='yes' vendor='unknown'>qemu64-v1</model>
+     </mode>
+   </cpu>
+   <memoryBacking supported='yes'>
+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 873d4b7b1f..39f1aaf3f8 100644
+--- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
+@@ -1523,7 +1523,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+       <model usable='yes' vendor='unknown'>qemu32-v1</model>
+-      <model usable='yes' vendor='unknown'>qemu64</model>
++      <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
++      <model usable='yes' vendor='unknown'>qemu64-v1</model>
+     </mode>
+   </cpu>
+   <memoryBacking supported='yes'>
+diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
+index f1f8362f52..3db605a87b 100644
+--- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
+@@ -840,7 +840,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+       <model usable='yes' vendor='unknown'>qemu32-v1</model>
+-      <model usable='yes' vendor='unknown'>qemu64</model>
++      <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
++      <model usable='yes' vendor='unknown'>qemu64-v1</model>
+     </mode>
+   </cpu>
+   <memoryBacking supported='yes'>
+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 7e0ed073a2..c77b05c257 100644
+--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
+@@ -942,7 +942,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+       <model usable='yes' vendor='unknown'>qemu32-v1</model>
+-      <model usable='yes' vendor='unknown'>qemu64</model>
++      <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
++      <model usable='yes' vendor='unknown'>qemu64-v1</model>
+     </mode>
+   </cpu>
+   <memoryBacking supported='yes'>
+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 b93e3ca9ac..67b5a9f3d8 100644
+--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
+@@ -1720,7 +1720,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+       <model usable='yes' vendor='unknown'>qemu32-v1</model>
+-      <model usable='yes' vendor='unknown'>qemu64</model>
++      <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
++      <model usable='yes' vendor='unknown'>qemu64-v1</model>
+     </mode>
+   </cpu>
+   <memoryBacking supported='yes'>
+diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
+index 8c538a6568..daafd91079 100644
+--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
+@@ -941,7 +941,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+       <model usable='yes' vendor='unknown'>qemu32-v1</model>
+-      <model usable='yes' vendor='unknown'>qemu64</model>
++      <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
++      <model usable='yes' vendor='unknown'>qemu64-v1</model>
+     </mode>
+   </cpu>
+   <memoryBacking supported='yes'>
+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 dc8fd0539b..6c15cae03d 100644
+--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
+@@ -948,7 +948,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+       <model usable='yes' vendor='unknown'>qemu32-v1</model>
+-      <model usable='yes' vendor='unknown'>qemu64</model>
++      <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
++      <model usable='yes' vendor='unknown'>qemu64-v1</model>
+     </mode>
+   </cpu>
+   <memoryBacking supported='yes'>
+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 e075cc7dca..2480513c4b 100644
+--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
+@@ -1735,7 +1735,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+       <model usable='yes' vendor='unknown'>qemu32-v1</model>
+-      <model usable='yes' vendor='unknown'>qemu64</model>
++      <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
++      <model usable='yes' vendor='unknown'>qemu64-v1</model>
+     </mode>
+   </cpu>
+   <memoryBacking supported='yes'>
+diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+index d0955a30f2..914f011071 100644
+--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+@@ -947,7 +947,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+       <model usable='yes' vendor='unknown'>qemu32-v1</model>
+-      <model usable='yes' vendor='unknown'>qemu64</model>
++      <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
++      <model usable='yes' vendor='unknown'>qemu64-v1</model>
+     </mode>
+   </cpu>
+   <memoryBacking supported='yes'>
+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 4f2d2a272d..f368716de9 100644
+--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
+@@ -975,7 +975,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+       <model usable='yes' vendor='unknown'>qemu32-v1</model>
+-      <model usable='yes' vendor='unknown'>qemu64</model>
++      <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
++      <model usable='yes' vendor='unknown'>qemu64-v1</model>
+     </mode>
+   </cpu>
+   <memoryBacking supported='yes'>
+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 fcb175557c..c3dba8ccd7 100644
+--- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
+@@ -1759,7 +1759,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+       <model usable='yes' vendor='unknown'>qemu32-v1</model>
+-      <model usable='yes' vendor='unknown'>qemu64</model>
++      <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
++      <model usable='yes' vendor='unknown'>qemu64-v1</model>
+     </mode>
+   </cpu>
+   <memoryBacking supported='yes'>
+diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+index 07fa015c26..4592e03dc4 100644
+--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+@@ -974,7 +974,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+       <model usable='yes' vendor='unknown'>qemu32-v1</model>
+-      <model usable='yes' vendor='unknown'>qemu64</model>
++      <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
++      <model usable='yes' vendor='unknown'>qemu64-v1</model>
+     </mode>
+   </cpu>
+   <memoryBacking supported='yes'>
+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 7880718caf..39535a73ad 100644
+--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
+@@ -942,7 +942,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+       <model usable='yes' vendor='unknown'>qemu32-v1</model>
+-      <model usable='yes' vendor='unknown'>qemu64</model>
++      <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
++      <model usable='yes' vendor='unknown'>qemu64-v1</model>
+     </mode>
+   </cpu>
+   <memoryBacking supported='yes'>
+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 e34444f915..0694b5426e 100644
+--- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
+@@ -1707,7 +1707,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+       <model usable='yes' vendor='unknown'>qemu32-v1</model>
+-      <model usable='yes' vendor='unknown'>qemu64</model>
++      <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
++      <model usable='yes' vendor='unknown'>qemu64-v1</model>
+     </mode>
+   </cpu>
+   <memoryBacking supported='yes'>
+diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
+index dd045555db..c36ebcf7fd 100644
+--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
+@@ -941,7 +941,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+       <model usable='yes' vendor='unknown'>qemu32-v1</model>
+-      <model usable='yes' vendor='unknown'>qemu64</model>
++      <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
++      <model usable='yes' vendor='unknown'>qemu64-v1</model>
+     </mode>
+   </cpu>
+   <memoryBacking supported='yes'>
+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 34527a0fc0..3d15c7dca5 100644
+--- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
+@@ -947,7 +947,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+       <model usable='yes' vendor='unknown'>qemu32-v1</model>
+-      <model usable='yes' vendor='unknown'>qemu64</model>
++      <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
++      <model usable='yes' vendor='unknown'>qemu64-v1</model>
+     </mode>
+   </cpu>
+   <memoryBacking supported='yes'>
+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 14f0bc7f87..bfb94bc389 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
+@@ -1420,7 +1420,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+       <model usable='yes' vendor='unknown'>qemu32-v1</model>
+-      <model usable='yes' vendor='unknown'>qemu64</model>
++      <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
++      <model usable='yes' vendor='unknown'>qemu64-v1</model>
+     </mode>
+   </cpu>
+   <memoryBacking supported='yes'>
+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 14f0bc7f87..bfb94bc389 100644
+--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
+@@ -1420,7 +1420,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+       <model usable='yes' vendor='unknown'>qemu32-v1</model>
+-      <model usable='yes' vendor='unknown'>qemu64</model>
++      <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
++      <model usable='yes' vendor='unknown'>qemu64-v1</model>
+     </mode>
+   </cpu>
+   <memoryBacking supported='yes'>
+diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
+index de7e039b84..2c3bca4a76 100644
+--- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
+@@ -946,7 +946,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+       <model usable='yes' vendor='unknown'>qemu32-v1</model>
+-      <model usable='yes' vendor='unknown'>qemu64</model>
++      <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
++      <model usable='yes' vendor='unknown'>qemu64-v1</model>
+     </mode>
+   </cpu>
+   <memoryBacking supported='yes'>
+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 eeee7b926c..bf2c489691 100644
+--- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
+@@ -1029,7 +1029,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+       <model usable='yes' vendor='unknown'>qemu32-v1</model>
+-      <model usable='yes' vendor='unknown'>qemu64</model>
++      <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
++      <model usable='yes' vendor='unknown'>qemu64-v1</model>
+     </mode>
+   </cpu>
+   <memoryBacking supported='yes'>
+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 882ef3ed4d..345f8177f2 100644
+--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
+@@ -1515,7 +1515,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+       <model usable='yes' vendor='unknown'>qemu32-v1</model>
+-      <model usable='yes' vendor='unknown'>qemu64</model>
++      <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
++      <model usable='yes' vendor='unknown'>qemu64-v1</model>
+     </mode>
+   </cpu>
+   <memoryBacking supported='yes'>
+diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
+index dee27a40c4..758ce18d38 100644
+--- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
+@@ -1028,7 +1028,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+       <model usable='yes' vendor='unknown'>qemu32-v1</model>
+-      <model usable='yes' vendor='unknown'>qemu64</model>
++      <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
++      <model usable='yes' vendor='unknown'>qemu64-v1</model>
+     </mode>
+   </cpu>
+   <memoryBacking supported='yes'>
+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 14f9d0a3a5..4a478b678f 100644
+--- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
+@@ -1258,7 +1258,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+       <model usable='yes' vendor='unknown'>qemu32-v1</model>
+-      <model usable='yes' vendor='unknown'>qemu64</model>
++      <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
++      <model usable='yes' vendor='unknown'>qemu64-v1</model>
+     </mode>
+   </cpu>
+   <memoryBacking supported='yes'>
+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 1347de2c5b..e3dda5ff74 100644
+--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
+@@ -1501,7 +1501,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+       <model usable='yes' vendor='unknown'>qemu32-v1</model>
+-      <model usable='yes' vendor='unknown'>qemu64</model>
++      <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
++      <model usable='yes' vendor='unknown'>qemu64-v1</model>
+     </mode>
+   </cpu>
+   <memoryBacking supported='yes'>
+diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
+index 6855f75ba4..aa94c97499 100644
+--- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
+@@ -1257,7 +1257,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+       <model usable='yes' vendor='unknown'>qemu32-v1</model>
+-      <model usable='yes' vendor='unknown'>qemu64</model>
++      <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
++      <model usable='yes' vendor='unknown'>qemu64-v1</model>
+     </mode>
+   </cpu>
+   <memoryBacking supported='yes'>
+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 63bce83ba5..f3ad13ff40 100644
+--- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
+@@ -1259,7 +1259,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+       <model usable='yes' vendor='unknown'>qemu32-v1</model>
+-      <model usable='yes' vendor='unknown'>qemu64</model>
++      <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
++      <model usable='yes' vendor='unknown'>qemu64-v1</model>
+     </mode>
+   </cpu>
+   <memoryBacking supported='yes'>
+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 6b4db43077..4aa6ddca4f 100644
+--- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
+@@ -1468,7 +1468,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+       <model usable='yes' vendor='unknown'>qemu32-v1</model>
+-      <model usable='yes' vendor='unknown'>qemu64</model>
++      <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
++      <model usable='yes' vendor='unknown'>qemu64-v1</model>
+     </mode>
+   </cpu>
+   <memoryBacking supported='yes'>
+diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
+index b9449120d3..8ad3499c67 100644
+--- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
+@@ -1258,7 +1258,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+       <model usable='yes' vendor='unknown'>qemu32-v1</model>
+-      <model usable='yes' vendor='unknown'>qemu64</model>
++      <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
++      <model usable='yes' vendor='unknown'>qemu64-v1</model>
+     </mode>
+   </cpu>
+   <memoryBacking supported='yes'>
+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 5b0f2f84be..b3325f4e36 100644
+--- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
+@@ -1259,7 +1259,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+       <model usable='yes' vendor='unknown'>qemu32-v1</model>
+-      <model usable='yes' vendor='unknown'>qemu64</model>
++      <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
++      <model usable='yes' vendor='unknown'>qemu64-v1</model>
+     </mode>
+   </cpu>
+   <memoryBacking supported='yes'>
+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 04049d17af..90a785ed55 100644
+--- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
+@@ -1398,7 +1398,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+       <model usable='yes' vendor='unknown'>qemu32-v1</model>
+-      <model usable='yes' vendor='unknown'>qemu64</model>
++      <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
++      <model usable='yes' vendor='unknown'>qemu64-v1</model>
+     </mode>
+   </cpu>
+   <memoryBacking supported='yes'>
+diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
+index 4ec2b2e96d..9bac49c553 100644
+--- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
+@@ -1258,7 +1258,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+       <model usable='yes' vendor='unknown'>qemu32-v1</model>
+-      <model usable='yes' vendor='unknown'>qemu64</model>
++      <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
++      <model usable='yes' vendor='unknown'>qemu64-v1</model>
+     </mode>
+   </cpu>
+   <memoryBacking supported='yes'>
+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 9e152d5b55..986c3936c0 100644
+--- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
+@@ -1395,7 +1395,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+       <model usable='yes' vendor='unknown'>qemu32-v1</model>
+-      <model usable='yes' vendor='unknown'>qemu64</model>
++      <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
++      <model usable='yes' vendor='unknown'>qemu64-v1</model>
+     </mode>
+   </cpu>
+   <memoryBacking supported='yes'>
+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 1c79f73ae2..9f4d2d8af8 100644
+--- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
+@@ -1503,7 +1503,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+       <model usable='yes' vendor='unknown'>qemu32-v1</model>
+-      <model usable='yes' vendor='unknown'>qemu64</model>
++      <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
++      <model usable='yes' vendor='unknown'>qemu64-v1</model>
+     </mode>
+   </cpu>
+   <memoryBacking supported='yes'>
+diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
+index 0af8a79cb4..e8b70c7e0f 100644
+--- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
+@@ -1394,7 +1394,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+       <model usable='yes' vendor='unknown'>qemu32-v1</model>
+-      <model usable='yes' vendor='unknown'>qemu64</model>
++      <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
++      <model usable='yes' vendor='unknown'>qemu64-v1</model>
+     </mode>
+   </cpu>
+   <memoryBacking supported='yes'>
+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 4cb0a22a9b..4ac90bad0d 100644
+--- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
+@@ -1395,7 +1395,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+       <model usable='yes' vendor='unknown'>qemu32-v1</model>
+-      <model usable='yes' vendor='unknown'>qemu64</model>
++      <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
++      <model usable='yes' vendor='unknown'>qemu64-v1</model>
+     </mode>
+   </cpu>
+   <memoryBacking supported='yes'>
+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 99858a0b91..94d866a5f0 100644
+--- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
+@@ -1503,7 +1503,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+       <model usable='yes' vendor='unknown'>qemu32-v1</model>
+-      <model usable='yes' vendor='unknown'>qemu64</model>
++      <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
++      <model usable='yes' vendor='unknown'>qemu64-v1</model>
+     </mode>
+   </cpu>
+   <memoryBacking supported='yes'>
+diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
+index cfedba3e8e..84303bee0b 100644
+--- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
+@@ -1394,7 +1394,8 @@
+       </blockers>
+       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+       <model usable='yes' vendor='unknown'>qemu32-v1</model>
+-      <model usable='yes' vendor='unknown'>qemu64</model>
++      <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>
++      <model usable='yes' vendor='unknown'>qemu64-v1</model>
+     </mode>
+   </cpu>
+   <memoryBacking supported='yes'>
+-- 
+2.47.1
diff --git a/libvirt-cpu_map-Sort-data-files-in-meson.build.patch b/libvirt-cpu_map-Sort-data-files-in-meson.build.patch
new file mode 100644
index 0000000..4454266
--- /dev/null
+++ b/libvirt-cpu_map-Sort-data-files-in-meson.build.patch
@@ -0,0 +1,73 @@
+From 00f259cc2d6abfd44424b7faf485fbe3301bfe49 Mon Sep 17 00:00:00 2001
+Message-ID: <00f259cc2d6abfd44424b7faf485fbe3301bfe49.1734429553.git.jdenemar@redhat.com>
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Thu, 28 Nov 2024 13:24:49 +0100
+Subject: [PATCH] cpu_map: Sort data files in meson.build
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit 50c6d727b6f0cc00333a1bc26925ab5f26f8f781)
+
+https://issues.redhat.com/browse/RHEL-70129
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ src/cpu_map/meson.build | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build
+index 88d67f4cce..f659ef230e 100644
+--- a/src/cpu_map/meson.build
++++ b/src/cpu_map/meson.build
+@@ -4,8 +4,8 @@ cpumap_data = [
+   'arm_cortex-a57.xml',
+   'arm_cortex-a72.xml',
+   'arm_Falkor.xml',
+-  'arm_FT-2000plus.xml',
+   'arm_features.xml',
++  'arm_FT-2000plus.xml',
+   'arm_Kunpeng-920.xml',
+   'arm_Neoverse-N1.xml',
+   'arm_Neoverse-N2.xml',
+@@ -14,11 +14,11 @@ cpumap_data = [
+   'arm_ThunderX299xx.xml',
+   'arm_vendors.xml',
+   'index.xml',
++  'ppc64_POWER10.xml',
+   'ppc64_POWER6.xml',
+   'ppc64_POWER7.xml',
+   'ppc64_POWER8.xml',
+   'ppc64_POWER9.xml',
+-  'ppc64_POWER10.xml',
+   'ppc64_POWERPC_e5500.xml',
+   'ppc64_POWERPC_e6500.xml',
+   'ppc64_vendors.xml',
+@@ -54,13 +54,8 @@ cpumap_data = [
+   'x86_Dhyana-v1.xml',
+   'x86_Dhyana-v2.xml',
+   'x86_Dhyana.xml',
+-  'x86_EPYC-IBPB.xml',
+-  'x86_EPYC-v1.xml',
+-  'x86_EPYC-v2.xml',
+-  'x86_EPYC-v3.xml',
+-  'x86_EPYC-v4.xml',
+-  'x86_EPYC.xml',
+   'x86_EPYC-Genoa.xml',
++  'x86_EPYC-IBPB.xml',
+   'x86_EPYC-Milan-v1.xml',
+   'x86_EPYC-Milan-v2.xml',
+   'x86_EPYC-Milan.xml',
+@@ -69,6 +64,11 @@ cpumap_data = [
+   'x86_EPYC-Rome-v3.xml',
+   'x86_EPYC-Rome-v4.xml',
+   'x86_EPYC-Rome.xml',
++  'x86_EPYC-v1.xml',
++  'x86_EPYC-v2.xml',
++  'x86_EPYC-v3.xml',
++  'x86_EPYC-v4.xml',
++  'x86_EPYC.xml',
+   'x86_features.xml',
+   'x86_GraniteRapids-v1.xml',
+   'x86_GraniteRapids.xml',
+-- 
+2.47.1
diff --git a/libvirt-qemu-Enable-I-O-APIC-if-needed.patch b/libvirt-qemu-Enable-I-O-APIC-if-needed.patch
new file mode 100644
index 0000000..59ed666
--- /dev/null
+++ b/libvirt-qemu-Enable-I-O-APIC-if-needed.patch
@@ -0,0 +1,61 @@
+From c00e8d5fd4268a119e6a09962220d766ecaf5b30 Mon Sep 17 00:00:00 2001
+Message-ID: <c00e8d5fd4268a119e6a09962220d766ecaf5b30.1734429553.git.jdenemar@redhat.com>
+From: Michal Privoznik <mprivozn@redhat.com>
+Date: Thu, 12 Dec 2024 10:02:43 +0100
+Subject: [PATCH] qemu: Enable I/O APIC if needed
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This is a follow up of my previous commits. If the number of
+vCPUs exceeds some arbitrary value (255) then QEMU requires IOMMU
+with EIM and intremap enabled. But in turn, intremap IOMMU
+requires split I/O APIC (per virDomainDefIOMMUValidate()). Since
+after my previous commits (e.g. v10.10.0-rc1~183) IOMMU is added
+automagically, the I/O APIC can be also enabled automagically.
+
+Relates to: https://issues.redhat.com/browse/RHEL-65844
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 2d222ecf6e73614a400b830ac56e9aaa1bc55ecc)
+https://issues.redhat.com/browse/RHEL-71414
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+---
+ src/qemu/qemu_postparse.c                         | 7 +++++++
+ tests/qemuxmlconfdata/intel-iommu-eim-autoadd.xml | 3 ---
+ 2 files changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/src/qemu/qemu_postparse.c b/src/qemu/qemu_postparse.c
+index 03b5ef825a..f48f172c37 100644
+--- a/src/qemu/qemu_postparse.c
++++ b/src/qemu/qemu_postparse.c
+@@ -1547,6 +1547,13 @@ qemuDomainDefEnableDefaultFeatures(virDomainDef *def,
+          * capabilities, we still want to enable this */
+         def->features[VIR_DOMAIN_FEATURE_GIC] = VIR_TRISTATE_SWITCH_ON;
+     }
++
++    /* IOMMU with intremap requires split I/O APIC */
++    if (def->iommu &&
++        def->iommu->intremap == VIR_TRISTATE_SWITCH_ON &&
++        def->features[VIR_DOMAIN_FEATURE_IOAPIC] == VIR_DOMAIN_IOAPIC_NONE) {
++        def->features[VIR_DOMAIN_FEATURE_IOAPIC] = VIR_DOMAIN_IOAPIC_QEMU;
++    }
+ }
+ 
+ 
+diff --git a/tests/qemuxmlconfdata/intel-iommu-eim-autoadd.xml b/tests/qemuxmlconfdata/intel-iommu-eim-autoadd.xml
+index fa3aaf0d44..5abc40e566 100644
+--- a/tests/qemuxmlconfdata/intel-iommu-eim-autoadd.xml
++++ b/tests/qemuxmlconfdata/intel-iommu-eim-autoadd.xml
+@@ -8,9 +8,6 @@
+     <type arch='x86_64' machine='q35'>hvm</type>
+     <boot dev='hd'/>
+   </os>
+-  <features>
+-    <ioapic driver='qemu'/>
+-  </features>
+   <cpu mode='custom' match='exact' check='none'>
+     <model fallback='forbid'>qemu64</model>
+   </cpu>
+-- 
+2.47.1
diff --git a/libvirt-qemu-tpm-do-not-update-profile-name-for-transient-domains.patch b/libvirt-qemu-tpm-do-not-update-profile-name-for-transient-domains.patch
new file mode 100644
index 0000000..360d3c2
--- /dev/null
+++ b/libvirt-qemu-tpm-do-not-update-profile-name-for-transient-domains.patch
@@ -0,0 +1,70 @@
+From 9817be253ea8b374bd08cb9dc2239b88c2f9f6a8 Mon Sep 17 00:00:00 2001
+Message-ID: <9817be253ea8b374bd08cb9dc2239b88c2f9f6a8.1734429553.git.jdenemar@redhat.com>
+From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
+Date: Tue, 3 Dec 2024 12:00:08 +0100
+Subject: [PATCH] qemu: tpm: do not update profile name for transient domains
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+If we do not have a persistent definition, there's no point in
+looking for it since we cannot store it.
+
+Also skip the update if the tpm device(s) in the persistent
+definition are different.
+
+This fixes the crash when starting a transient domain.
+
+https://issues.redhat.com/browse/RHEL-69774
+https://gitlab.com/libvirt/libvirt/-/issues/715
+
+Fixes: d79542eec669eb9c449bb8228179e7a87e768017
+Signed-off-by: Ján Tomko <jtomko@redhat.com>
+Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
+Reviewed-by: Stefan Berger <stefanb@linux.ibm.com>
+(cherry picked from commit 81da7a2c2a2d490cddaaa77d3e3b36e210b38bd7)
+Signed-off-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_extdevice.c | 13 ++++++++++++-
+ src/qemu/qemu_tpm.c       |  2 +-
+ 2 files changed, 13 insertions(+), 2 deletions(-)
+
+diff --git a/src/qemu/qemu_extdevice.c b/src/qemu/qemu_extdevice.c
+index a6f31f9773..954cb323a4 100644
+--- a/src/qemu/qemu_extdevice.c
++++ b/src/qemu/qemu_extdevice.c
+@@ -190,7 +190,18 @@ qemuExtDevicesStart(virQEMUDriver *driver,
+ 
+     for (i = 0; i < def->ntpms; i++) {
+         virDomainTPMDef *tpm = def->tpms[i];
+-        virDomainTPMDef *persistentTPMDef = persistentDef->tpms[i];
++        virDomainTPMDef *persistentTPMDef = NULL;
++
++        if (persistentDef) {
++            /* do not try to update the profile in the persistent definition
++             * if the device does not match */
++            if (persistentDef->ntpms == def->ntpms)
++                persistentTPMDef = persistentDef->tpms[i];
++            if (persistentTPMDef &&
++                (persistentTPMDef->type != tpm->type ||
++                 persistentTPMDef->model != tpm->model))
++                persistentTPMDef = NULL;
++        }
+ 
+         if (tpm->type == VIR_DOMAIN_TPM_TYPE_EMULATOR &&
+             qemuExtTPMStart(driver, vm, tpm, persistentTPMDef,
+diff --git a/src/qemu/qemu_tpm.c b/src/qemu/qemu_tpm.c
+index f223dcb9ae..f5e0184e54 100644
+--- a/src/qemu/qemu_tpm.c
++++ b/src/qemu/qemu_tpm.c
+@@ -773,7 +773,7 @@ qemuTPMEmulatorBuildCommand(virDomainTPMDef *tpm,
+                                 incomingMigration) < 0)
+         goto error;
+ 
+-    if (run_setup && !incomingMigration &&
++    if (run_setup && !incomingMigration && persistentTPMDef &&
+         qemuTPMEmulatorUpdateProfileName(&tpm->data.emulator, persistentTPMDef,
+                                          cfg, saveDef) < 0)
+         goto error;
+-- 
+2.47.1
diff --git a/libvirt-sync_qemu_models_i386-Generate-missing-v1-variants.patch b/libvirt-sync_qemu_models_i386-Generate-missing-v1-variants.patch
new file mode 100644
index 0000000..87357cc
--- /dev/null
+++ b/libvirt-sync_qemu_models_i386-Generate-missing-v1-variants.patch
@@ -0,0 +1,37 @@
+From af2f592ed93320d281291623622e9b2a52d33475 Mon Sep 17 00:00:00 2001
+Message-ID: <af2f592ed93320d281291623622e9b2a52d33475.1734429553.git.jdenemar@redhat.com>
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Thu, 28 Nov 2024 13:40:16 +0100
+Subject: [PATCH] sync_qemu_models_i386: Generate missing -v1 variants
+
+QEMU supports -v1 variant of any CPU model even though the list of
+versions is not defined (i.e., even if { .version = 1 } item is
+missing).
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit 8bc6ebb495f82ce8edb206eb4d5133e206fd8f2e)
+
+https://issues.redhat.com/browse/RHEL-70129
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ src/cpu_map/sync_qemu_models_i386.py | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/cpu_map/sync_qemu_models_i386.py b/src/cpu_map/sync_qemu_models_i386.py
+index 11fe1f7435..3e14136e07 100755
+--- a/src/cpu_map/sync_qemu_models_i386.py
++++ b/src/cpu_map/sync_qemu_models_i386.py
+@@ -484,6 +484,9 @@ def expand_model(outdir, model):
+     print(result['name'])
+     yield result
+ 
++    if len(versions) == 0:
++        versions.append({".version": "1"})
++
+     name = result["name"]
+     for version in versions:
+         result = copy.deepcopy(result)
+-- 
+2.47.1
diff --git a/libvirt-sync_qemu_models_i386-Update-meson.build.patch b/libvirt-sync_qemu_models_i386-Update-meson.build.patch
new file mode 100644
index 0000000..fe3bc5a
--- /dev/null
+++ b/libvirt-sync_qemu_models_i386-Update-meson.build.patch
@@ -0,0 +1,68 @@
+From 776af781ab3a673c8fab906d7f0d2de064528f0f Mon Sep 17 00:00:00 2001
+Message-ID: <776af781ab3a673c8fab906d7f0d2de064528f0f.1734429553.git.jdenemar@redhat.com>
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Thu, 28 Nov 2024 13:39:29 +0100
+Subject: [PATCH] sync_qemu_models_i386: Update meson.build
+
+When adding new CPU models to CPU map it's easy (and very common) to
+forget to add the new files to meson.build. We already update index.xml
+with the new models so updating meson.build too makes sense.
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit 19b56603c4d961fc21bfb7516b6ba011dd49f9b2)
+
+https://issues.redhat.com/browse/RHEL-70129
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ src/cpu_map/sync_qemu_models_i386.py | 27 +++++++++++++++++++++++++++
+ 1 file changed, 27 insertions(+)
+
+diff --git a/src/cpu_map/sync_qemu_models_i386.py b/src/cpu_map/sync_qemu_models_i386.py
+index 798d767f4d..11fe1f7435 100755
+--- a/src/cpu_map/sync_qemu_models_i386.py
++++ b/src/cpu_map/sync_qemu_models_i386.py
+@@ -596,6 +596,32 @@ def update_index(outdir, models):
+         f.write("\n")
+ 
+ 
++def update_meson(outdir, models):
++    meson = os.path.join(outdir, "meson.build")
++
++    with open(meson, "r") as f:
++        lines = f.readlines()
++
++    start = None
++    end = None
++    for i in range(len(lines)):
++        if start is None and lines[i].startswith("cpumap_data ="):
++            start = i + 1
++
++        if start is not None and lines[i] == "]\n":
++            end = i
++            break
++
++    xmls = lines[start:end]
++    for files in models.values():
++        xmls.extend([f"  '{file}',\n" for file in files])
++
++    with open(meson, "w") as f:
++        f.writelines(lines[:start])
++        f.writelines(sorted(xmls, key=str.lower))
++        f.writelines(lines[end:])
++
++
+ def main():
+     parser = argparse.ArgumentParser(
+         description="Synchronize x86 cpu models from QEMU i386 target.")
+@@ -658,6 +684,7 @@ def main():
+             output_model(f, extra, model)
+ 
+     update_index(args.outdir, files)
++    update_meson(args.outdir, files)
+ 
+     features = set()
+     for model in models:
+-- 
+2.47.1
diff --git a/libvirt-util-Fix-typo-in-virNetDevOpenvswitchInterfaceSetQos.patch b/libvirt-util-Fix-typo-in-virNetDevOpenvswitchInterfaceSetQos.patch
new file mode 100644
index 0000000..c65cd3d
--- /dev/null
+++ b/libvirt-util-Fix-typo-in-virNetDevOpenvswitchInterfaceSetQos.patch
@@ -0,0 +1,38 @@
+From 1953c2ecd3a3e8858a79ad2634e7bea8e708588d Mon Sep 17 00:00:00 2001
+Message-ID: <1953c2ecd3a3e8858a79ad2634e7bea8e708588d.1734429553.git.jdenemar@redhat.com>
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Wed, 4 Dec 2024 11:53:47 +0100
+Subject: [PATCH] util: Fix typo in virNetDevOpenvswitchInterfaceSetQos
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The typo is causing virtqemud to crash when starting a domain with ovs
+bridge interface and QOS.
+
+https://issues.redhat.com/browse/RHEL-69840
+
+Fixes: a3b8753db975d8b92b122ccc7daee986974f8b18
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit dba710374d92688f797bf64642cc0d640c301239)
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ src/util/virnetdevopenvswitch.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitch.c
+index a1bd9f3d5b..0f5d23b794 100644
+--- a/src/util/virnetdevopenvswitch.c
++++ b/src/util/virnetdevopenvswitch.c
+@@ -958,7 +958,7 @@ virNetDevOpenvswitchInterfaceSetQos(const char *ifname,
+     }
+ 
+     if (rx) {
+-        if (rx->peak && tx->peak != rx->average) {
++        if (rx->peak && rx->peak != rx->average) {
+             VIR_WARN("Setting different 'peak' value than 'average' for QoS for OVS interface %s might have unexpected results",
+                      ifname);
+         }
+-- 
+2.47.1
diff --git a/libvirt.spec b/libvirt.spec
index df6c356..41d2583 100644
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -292,8 +292,8 @@
 
 Summary: Library providing a simple virtualization API
 Name: libvirt
-Version: 10.9.0
-Release: 1%{?dist}%{?extra_release}.alma.1
+Version: 10.10.0
+Release: 2%{?dist}%{?extra_release}.alma.1
 License: GPL-2.0-or-later AND LGPL-2.1-only AND LGPL-2.1-or-later AND OFL-1.1
 URL: https://libvirt.org/
 
@@ -301,6 +301,35 @@ URL: https://libvirt.org/
     %define mainturl stable_updates/
 %endif
 Source: https://download.libvirt.org/%{?mainturl}libvirt-%{version}.tar.xz
+Patch1: libvirt-util-Fix-typo-in-virNetDevOpenvswitchInterfaceSetQos.patch
+Patch2: libvirt-qemu-tpm-do-not-update-profile-name-for-transient-domains.patch
+Patch3: libvirt-qemu-Enable-I-O-APIC-if-needed.patch
+Patch4: libvirt-cpu_map-Sort-data-files-in-meson.build.patch
+Patch5: libvirt-sync_qemu_models_i386-Update-meson.build.patch
+Patch6: libvirt-sync_qemu_models_i386-Generate-missing-v1-variants.patch
+Patch7: libvirt-cpu_map-Add-486-v1-CPU-model.patch
+Patch8: libvirt-cpu_map-Add-pentium-v1-CPU-model.patch
+Patch9: libvirt-cpu_map-Add-pentium2-v1-CPU-model.patch
+Patch10: libvirt-cpu_map-Add-pentium3-v1-CPU-model.patch
+Patch11: libvirt-cpu_map-Add-coreduo-v1-CPU-model.patch
+Patch12: libvirt-cpu_map-Add-n270-v1-CPU-model.patch
+Patch13: libvirt-cpu_map-Add-core2duo-v1-CPU-model.patch
+Patch14: libvirt-cpu_map-Add-qemu32-v1-CPU-model.patch
+Patch15: libvirt-cpu_map-Add-kvm32-v1-CPU-model.patch
+Patch16: libvirt-cpu_map-Add-qemu64-v1-CPU-model.patch
+Patch17: libvirt-cpu_map-Add-kvm64-v1-CPU-model.patch
+Patch18: libvirt-cpu_map-Add-Conroe-v1-CPU-model.patch
+Patch19: libvirt-cpu_map-Add-Penryn-v1-CPU-model.patch
+Patch20: libvirt-cpu_map-Add-KnightsMill-v1-CPU-model.patch
+Patch21: libvirt-cpu_map-Add-athlon-v1-CPU-model.patch
+Patch22: libvirt-cpu_map-Add-phenom-v1-CPU-model.patch
+Patch23: libvirt-cpu_map-Add-Opteron_G1-v1-CPU-model.patch
+Patch24: libvirt-cpu_map-Add-Opteron_G2-v1-CPU-model.patch
+Patch25: libvirt-cpu_map-Add-Opteron_G3-v1-CPU-model.patch
+Patch26: libvirt-cpu_map-Add-Opteron_G4-v1-CPU-model.patch
+Patch27: libvirt-cpu_map-Add-Opteron_G5-v1-CPU-model.patch
+Patch28: libvirt-cpu_map-Add-EPYC-Genoa-v1-CPU-model.patch
+
 
 Requires: libvirt-daemon = %{version}-%{release}
 Requires: libvirt-daemon-config-network = %{version}-%{release}
@@ -2282,10 +2311,10 @@ exit 0
 %config(noreplace) %{_sysconfdir}/libvirt/qemu.conf
 %config(noreplace) %{_sysconfdir}/libvirt/qemu-lockd.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.qemu
-%ghost %dir %attr(0770, %{qemu_user}, %{qemu_group}) %{_rundir}/libvirt/qemu/
+%ghost %dir %attr(0755, %{qemu_user}, %{qemu_group}) %{_rundir}/libvirt/qemu/
 %ghost %dir %attr(0770, %{qemu_user}, %{qemu_group}) %{_rundir}/libvirt/qemu/dbus/
-%ghost %dir %attr(0770, %{qemu_user}, %{qemu_group}) %{_rundir}/libvirt/qemu/passt/
-%ghost %dir %attr(0770, %{qemu_user}, %{qemu_group}) %{_rundir}/libvirt/qemu/slirp/
+%ghost %dir %attr(0755, %{qemu_user}, %{qemu_group}) %{_rundir}/libvirt/qemu/passt/
+%ghost %dir %attr(0755, %{qemu_user}, %{qemu_group}) %{_rundir}/libvirt/qemu/slirp/
 %ghost %dir %attr(0770, %{qemu_user}, %{qemu_group}) %{_rundir}/libvirt/qemu/swtpm/
 %dir %attr(0751, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/
 %dir %attr(0751, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/checkpoint/
@@ -2625,9 +2654,45 @@ exit 0
 %endif
 
 %changelog
-* Tue Dec 10 2024 Eduard Abdullin <eabdullin@almalinux.org> - 10.9.0-1.alma.1
+* Wed Jan 08 2025 Eduard Abdullin <eabdullin@almalinux.org> - 10.10.0-2.alma.1
 - Enable building for ppc64le
 
+* Tue Dec 17 2024 Jiri Denemark <jdenemar@redhat.com> - 10.10.0-2
+- util: Fix typo in virNetDevOpenvswitchInterfaceSetQos (RHEL-69840)
+- qemu: tpm: do not update profile name for transient domains (RHEL-69774)
+- qemu: Enable I/O APIC if needed (RHEL-71414)
+- cpu_map: Sort data files in meson.build (RHEL-70129)
+- sync_qemu_models_i386: Update meson.build (RHEL-70129)
+- sync_qemu_models_i386: Generate missing -v1 variants (RHEL-70129)
+- cpu_map: Add 486-v1 CPU model (RHEL-70129)
+- cpu_map: Add pentium-v1 CPU model (RHEL-70129)
+- cpu_map: Add pentium2-v1 CPU model (RHEL-70129)
+- cpu_map: Add pentium3-v1 CPU model (RHEL-70129)
+- cpu_map: Add coreduo-v1 CPU model (RHEL-70129)
+- cpu_map: Add n270-v1 CPU model (RHEL-70129)
+- cpu_map: Add core2duo-v1 CPU model (RHEL-70129)
+- cpu_map: Add qemu32-v1 CPU model (RHEL-70129)
+- cpu_map: Add kvm32-v1 CPU model (RHEL-70129)
+- cpu_map: Add qemu64-v1 CPU model (RHEL-70129)
+- cpu_map: Add kvm64-v1 CPU model (RHEL-70129)
+- cpu_map: Add Conroe-v1 CPU model (RHEL-70129)
+- cpu_map: Add Penryn-v1 CPU model (RHEL-70129)
+- cpu_map: Add KnightsMill-v1 CPU model (RHEL-70129)
+- cpu_map: Add athlon-v1 CPU model (RHEL-70129)
+- cpu_map: Add phenom-v1 CPU model (RHEL-70129)
+- cpu_map: Add Opteron_G1-v1 CPU model (RHEL-70129)
+- cpu_map: Add Opteron_G2-v1 CPU model (RHEL-70129)
+- cpu_map: Add Opteron_G3-v1 CPU model (RHEL-70129)
+- cpu_map: Add Opteron_G4-v1 CPU model (RHEL-70129)
+- cpu_map: Add Opteron_G5-v1 CPU model (RHEL-70129)
+- cpu_map: Add EPYC-Genoa-v1 CPU model (RHEL-70129)
+
+* Mon Dec  2 2024 Jiri Denemark <jdenemar@redhat.com> - 10.10.0-1
+- Rebased to libvirt-10.10.0 (RHEL-50577)
+- The rebase also fixes the following bugs:
+    RHEL-58152, RHEL-65187, RHEL-65268, RHEL-66222, RHEL-66223
+    RHEL-68066, RHEL-69449
+
 * Fri Nov  1 2024 Jiri Denemark <jdenemar@redhat.com> - 10.9.0-1
 - Rebased to libvirt-10.9.0 (RHEL-50577)
 - The rebase also fixes the following bugs:
diff --git a/sources b/sources
index 3d8cbfa..e4a3342 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libvirt-10.9.0.tar.xz) = e650ffaaa2a3cda9151a347759d6f248c4573ca4f04fc7faa3caf6a616f84b95b7da9fc62ac48b97b54a128eacf54debc44189e7387f161b8ed676d30c5de37d
+SHA512 (libvirt-10.10.0.tar.xz) = b4e8a5f7d5c15387e5f3e82ac9661feb6e89c6b3b13d869bca63d9686e1e1e8d193a1fc84a19a09b3da1c868837ee76d1b3964a6e5f7ad5d669449b0a6aa4b53