[PATCH 1/3] domain_capabilities: Sort CPU models

[Jiri Denemark <jdenemar@xxxxxxxxxx>]

Signed-off-by: Jiri Denemark <jdenemar@xxxxxxxxxx>
---
 src/conf/domain_capabilities.c                |  21 +++
 src/conf/domain_capabilities.h                |   2 +
 src/libvirt_private.syms                      |   1 +
 src/qemu/qemu_capabilities.c                  |   1 +
 .../domaincapsdata/qemu_5.2.0-q35.x86_64.xml  | 106 +++++++--------
 .../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml  | 106 +++++++--------
 .../qemu_5.2.0-virt.aarch64.xml               |  56 ++++----
 tests/domaincapsdata/qemu_5.2.0.aarch64.xml   |  56 ++++----
 tests/domaincapsdata/qemu_5.2.0.ppc64.xml     |   4 +-
 tests/domaincapsdata/qemu_5.2.0.s390x.xml     | 122 ++++++++---------
 tests/domaincapsdata/qemu_5.2.0.x86_64.xml    | 106 +++++++--------
 .../domaincapsdata/qemu_6.0.0-q35.x86_64.xml  | 108 +++++++--------
 .../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml  | 108 +++++++--------
 .../qemu_6.0.0-virt.aarch64.xml               |  56 ++++----
 tests/domaincapsdata/qemu_6.0.0.aarch64.xml   |  56 ++++----
 tests/domaincapsdata/qemu_6.0.0.s390x.xml     | 122 ++++++++---------
 tests/domaincapsdata/qemu_6.0.0.x86_64.xml    | 108 +++++++--------
 .../domaincapsdata/qemu_6.1.0-q35.x86_64.xml  | 108 +++++++--------
 .../domaincapsdata/qemu_6.1.0-tcg.x86_64.xml  | 108 +++++++--------
 tests/domaincapsdata/qemu_6.1.0.x86_64.xml    | 108 +++++++--------
 .../domaincapsdata/qemu_6.2.0-q35.x86_64.xml  | 108 +++++++--------
 .../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml  | 108 +++++++--------
 .../qemu_6.2.0-virt.aarch64.xml               |  58 ++++----
 tests/domaincapsdata/qemu_6.2.0.aarch64.xml   |  58 ++++----
 tests/domaincapsdata/qemu_6.2.0.ppc64.xml     |   4 +-
 tests/domaincapsdata/qemu_6.2.0.x86_64.xml    | 108 +++++++--------
 .../domaincapsdata/qemu_7.0.0-q35.x86_64.xml  | 108 +++++++--------
 .../domaincapsdata/qemu_7.0.0-tcg.x86_64.xml  | 108 +++++++--------
 .../qemu_7.0.0-virt.aarch64.xml               |  58 ++++----
 tests/domaincapsdata/qemu_7.0.0.aarch64.xml   |  58 ++++----
 tests/domaincapsdata/qemu_7.0.0.ppc64.xml     |   4 +-
 tests/domaincapsdata/qemu_7.0.0.x86_64.xml    | 108 +++++++--------
 .../domaincapsdata/qemu_7.1.0-q35.x86_64.xml  | 104 +++++++-------
 .../domaincapsdata/qemu_7.1.0-tcg.x86_64.xml  | 104 +++++++-------
 tests/domaincapsdata/qemu_7.1.0.ppc64.xml     |   4 +-
 tests/domaincapsdata/qemu_7.1.0.x86_64.xml    | 104 +++++++-------
 .../domaincapsdata/qemu_7.2.0-q35.x86_64.xml  | 104 +++++++-------
 .../qemu_7.2.0-tcg.x86_64+hvf.xml             | 104 +++++++-------
 .../domaincapsdata/qemu_7.2.0-tcg.x86_64.xml  | 104 +++++++-------
 tests/domaincapsdata/qemu_7.2.0.x86_64.xml    | 104 +++++++-------
 .../domaincapsdata/qemu_8.0.0-q35.x86_64.xml  | 106 +++++++--------
 .../domaincapsdata/qemu_8.0.0-tcg.x86_64.xml  | 106 +++++++--------
 tests/domaincapsdata/qemu_8.0.0.x86_64.xml    | 106 +++++++--------
 .../domaincapsdata/qemu_8.1.0-q35.x86_64.xml  | 110 +++++++--------
 .../domaincapsdata/qemu_8.1.0-tcg.x86_64.xml  | 110 +++++++--------
 tests/domaincapsdata/qemu_8.1.0.s390x.xml     | 128 +++++++++---------
 tests/domaincapsdata/qemu_8.1.0.x86_64.xml    | 110 +++++++--------
 .../domaincapsdata/qemu_8.2.0-q35.x86_64.xml  | 110 +++++++--------
 .../domaincapsdata/qemu_8.2.0-tcg.x86_64.xml  | 110 +++++++--------
 .../qemu_8.2.0-virt.aarch64.xml               |  72 +++++-----
 tests/domaincapsdata/qemu_8.2.0.aarch64.xml   |  72 +++++-----
 tests/domaincapsdata/qemu_8.2.0.s390x.xml     | 126 ++++++++---------
 tests/domaincapsdata/qemu_8.2.0.x86_64.xml    | 110 +++++++--------
 .../domaincapsdata/qemu_9.0.0-q35.x86_64.xml  | 110 +++++++--------
 .../domaincapsdata/qemu_9.0.0-tcg.x86_64.xml  | 110 +++++++--------
 tests/domaincapsdata/qemu_9.0.0.x86_64.xml    | 110 +++++++--------
 .../domaincapsdata/qemu_9.1.0-q35.x86_64.xml  | 112 +++++++--------
 .../qemu_9.1.0-tcg-virt.riscv64.xml           |  16 +--
 .../domaincapsdata/qemu_9.1.0-tcg.x86_64.xml  | 112 +++++++--------
 tests/domaincapsdata/qemu_9.1.0.x86_64.xml    | 112 +++++++--------
 .../domaincapsdata/qemu_9.2.0-q35.x86_64.xml  | 112 +++++++--------
 .../domaincapsdata/qemu_9.2.0-tcg.x86_64.xml  | 112 +++++++--------
 tests/domaincapsdata/qemu_9.2.0.x86_64.xml    | 112 +++++++--------
 63 files changed, 2751 insertions(+), 2726 deletions(-)

diff --git a/src/conf/domain_capabilities.c b/src/conf/domain_capabilities.c
index 30540de326..6fd7ed3158 100644
--- a/src/conf/domain_capabilities.c
+++ b/src/conf/domain_capabilities.c
@@ -232,6 +232,27 @@ virDomainCapsCPUModelsGet(virDomainCapsCPUModels *cpuModels,
 }
 
 
+static int
+virDomainCapsCPUModelsCompare(const void *m1,
+                              const void *m2,
+                              void *opaque G_GNUC_UNUSED)
+{
+    const virDomainCapsCPUModel *model1 = m1;
+    const virDomainCapsCPUModel *model2 = m2;
+
+    return strcmp(model1->name, model2->name);
+}
+
+
+void
+virDomainCapsCPUModelsSort(virDomainCapsCPUModels *cpuModels)
+{
+    g_qsort_with_data(cpuModels->models, cpuModels->nmodels,
+                      sizeof(*cpuModels->models),
+                      virDomainCapsCPUModelsCompare, NULL);
+}
+
+
 int
 virDomainCapsEnumSet(virDomainCapsEnum *capsEnum,
                      const char *capsEnumName,
diff --git a/src/conf/domain_capabilities.h b/src/conf/domain_capabilities.h
index 2a4596ac14..a706ab337e 100644
--- a/src/conf/domain_capabilities.h
+++ b/src/conf/domain_capabilities.h
@@ -327,6 +327,8 @@ virDomainCapsCPUModelsAdd(virDomainCapsCPUModels *cpuModels,
 virDomainCapsCPUModel *
 virDomainCapsCPUModelsGet(virDomainCapsCPUModels *cpuModels,
                           const char *name);
+void
+virDomainCapsCPUModelsSort(virDomainCapsCPUModels *cpuModels);
 
 #define VIR_DOMAIN_CAPS_ENUM_IS_SET(capsEnum, value) \
     ((capsEnum).values & (1U << value))
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index c1542847f4..918f9a99c7 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -212,6 +212,7 @@ virDomainCapsCPUModelsAdd;
 virDomainCapsCPUModelsCopy;
 virDomainCapsCPUModelsGet;
 virDomainCapsCPUModelsNew;
+virDomainCapsCPUModelsSort;
 virDomainCapsCPUUsableTypeFromString;
 virDomainCapsCPUUsableTypeToString;
 virDomainCapsEnumClear;
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index b5fa738bd8..9322ae9ae6 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -2159,6 +2159,7 @@ virQEMUCapsCPUDefsToModels(virArch arch,
                                   cpu->blockers, cpu->deprecated, vendor);
     }
 
+    virDomainCapsCPUModelsSort(cpuModels);
     return cpuModels;
 }
 
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 35bc747d39..b082e3bfb7 100644
--- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
@@ -62,60 +62,60 @@
       <feature policy='require' name='pschange-mc-no'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>qemu64</model>
-      <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='AMD'>phenom</model>
-      <model usable='yes' vendor='unknown'>pentium3</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
-      <model usable='yes' vendor='unknown'>pentium</model>
-      <model usable='no' vendor='Intel'>n270</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='yes' vendor='unknown'>kvm32</model>
-      <model usable='no' vendor='Intel'>coreduo</model>
-      <model usable='no' vendor='Intel'>core2duo</model>
-      <model usable='no' vendor='AMD'>athlon</model>
-      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
-      <model usable='yes' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Snowridge</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client</model>
-      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
-      <model usable='yes' vendor='Intel'>SandyBridge</model>
-      <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
-      <model usable='no' vendor='AMD'>Opteron_G4</model>
-      <model usable='yes' vendor='AMD'>Opteron_G3</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-      <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='Intel'>Nehalem</model>
-      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='Intel'>IvyBridge</model>
-      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Icelake-Server</model>
-      <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client-noTSX</model>
-      <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
-      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell</model>
-      <model usable='yes' vendor='AMD'>EPYC-Rome</model>
-      <model usable='yes' vendor='AMD'>EPYC-IBPB</model>
-      <model usable='yes' vendor='AMD'>EPYC</model>
-      <model usable='yes' vendor='Hygon'>Dhyana</model>
-      <model usable='no' vendor='Intel'>Cooperlake</model>
-      <model usable='yes' vendor='Intel'>Conroe</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
-      <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell</model>
       <model usable='yes' vendor='unknown'>486</model>
+      <model usable='no' vendor='Intel'>Broadwell</model>
+      <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
+      <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
+      <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cooperlake</model>
+      <model usable='yes' vendor='Hygon'>Dhyana</model>
+      <model usable='yes' vendor='AMD'>EPYC</model>
+      <model usable='yes' vendor='AMD'>EPYC-IBPB</model>
+      <model usable='yes' vendor='AMD'>EPYC-Rome</model>
+      <model usable='no' vendor='Intel'>Haswell</model>
+      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
+      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
+      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
+      <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client</model>
+      <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client-noTSX</model>
+      <model usable='no' vendor='Intel'>Icelake-Server</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
+      <model usable='no' vendor='Intel'>IvyBridge</model>
+      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
+      <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
+      <model usable='yes' vendor='AMD'>Opteron_G1</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>
+      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='yes' vendor='Intel'>Penryn</model>
+      <model usable='yes' vendor='Intel'>SandyBridge</model>
+      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Client</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Server</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Snowridge</model>
+      <model usable='yes' vendor='Intel'>Westmere</model>
+      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
+      <model usable='no' vendor='AMD'>athlon</model>
+      <model usable='no' vendor='Intel'>core2duo</model>
+      <model usable='no' vendor='Intel'>coreduo</model>
+      <model usable='yes' vendor='unknown'>kvm32</model>
+      <model usable='yes' vendor='unknown'>kvm64</model>
+      <model usable='no' vendor='Intel'>n270</model>
+      <model usable='yes' vendor='unknown'>pentium</model>
+      <model usable='yes' vendor='unknown'>pentium2</model>
+      <model usable='yes' vendor='unknown'>pentium3</model>
+      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='yes' vendor='unknown'>qemu64</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 33b55317ad..bd004e0b6e 100644
--- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
@@ -74,60 +74,60 @@
       <feature policy='disable' name='misalignsse'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>qemu64</model>
-      <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='AMD'>phenom</model>
-      <model usable='yes' vendor='unknown'>pentium3</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
-      <model usable='yes' vendor='unknown'>pentium</model>
-      <model usable='yes' vendor='Intel'>n270</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='yes' vendor='unknown'>kvm32</model>
-      <model usable='yes' vendor='Intel'>coreduo</model>
-      <model usable='yes' vendor='Intel'>core2duo</model>
-      <model usable='yes' vendor='AMD'>athlon</model>
-      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
-      <model usable='yes' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Snowridge</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client</model>
-      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
-      <model usable='no' vendor='Intel'>SandyBridge</model>
-      <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
-      <model usable='no' vendor='AMD'>Opteron_G4</model>
-      <model usable='no' vendor='AMD'>Opteron_G3</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-      <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='Intel'>Nehalem</model>
-      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='Intel'>IvyBridge</model>
-      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Icelake-Server</model>
-      <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client-noTSX</model>
-      <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
-      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell</model>
-      <model usable='no' vendor='AMD'>EPYC-Rome</model>
-      <model usable='no' vendor='AMD'>EPYC-IBPB</model>
-      <model usable='no' vendor='AMD'>EPYC</model>
-      <model usable='no' vendor='Hygon'>Dhyana</model>
-      <model usable='no' vendor='Intel'>Cooperlake</model>
-      <model usable='yes' vendor='Intel'>Conroe</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
-      <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell</model>
       <model usable='yes' vendor='unknown'>486</model>
+      <model usable='no' vendor='Intel'>Broadwell</model>
+      <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
+      <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
+      <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cooperlake</model>
+      <model usable='no' vendor='Hygon'>Dhyana</model>
+      <model usable='no' vendor='AMD'>EPYC</model>
+      <model usable='no' vendor='AMD'>EPYC-IBPB</model>
+      <model usable='no' vendor='AMD'>EPYC-Rome</model>
+      <model usable='no' vendor='Intel'>Haswell</model>
+      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
+      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
+      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
+      <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client</model>
+      <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client-noTSX</model>
+      <model usable='no' vendor='Intel'>Icelake-Server</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
+      <model usable='no' vendor='Intel'>IvyBridge</model>
+      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
+      <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
+      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2</model>
+      <model usable='no' vendor='AMD'>Opteron_G3</model>
+      <model usable='no' vendor='AMD'>Opteron_G4</model>
+      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='yes' vendor='Intel'>Penryn</model>
+      <model usable='no' vendor='Intel'>SandyBridge</model>
+      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Client</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Server</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Snowridge</model>
+      <model usable='yes' vendor='Intel'>Westmere</model>
+      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
+      <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='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'>pentium2</model>
+      <model usable='yes' vendor='unknown'>pentium3</model>
+      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='yes' vendor='unknown'>qemu64</model>
     </mode>
   </cpu>
   <memoryBacking supported='yes'>
diff --git a/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml
index a35dd78c2c..00f434b7d7 100644
--- a/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml
@@ -39,43 +39,43 @@
     </mode>
     <mode name='host-model' supported='no'/>
     <mode name='custom' supported='yes'>
-      <model usable='unknown' vendor='unknown'>cortex-a9</model>
-      <model usable='unknown' vendor='unknown'>pxa250</model>
-      <model usable='unknown' vendor='unknown'>pxa270-a1</model>
-      <model usable='unknown' vendor='unknown'>arm946</model>
-      <model usable='unknown' vendor='unknown'>pxa270-c0</model>
-      <model usable='unknown' vendor='unknown'>max</model>
       <model usable='unknown' vendor='unknown'>arm1026</model>
-      <model usable='unknown' vendor='unknown'>pxa260</model>
-      <model usable='unknown' vendor='unknown'>pxa270-b1</model>
-      <model usable='unknown' vendor='unknown'>cortex-a57</model>
-      <model usable='unknown' vendor='unknown'>pxa255</model>
-      <model usable='unknown' vendor='unknown'>cortex-r5</model>
       <model usable='unknown' vendor='unknown'>arm1136</model>
-      <model usable='unknown' vendor='unknown'>cortex-a7</model>
-      <model usable='unknown' vendor='unknown'>pxa261</model>
-      <model usable='unknown' vendor='unknown'>pxa270-c5</model>
-      <model usable='unknown' vendor='unknown'>cortex-m3</model>
+      <model usable='unknown' vendor='unknown'>arm1136-r2</model>
       <model usable='unknown' vendor='unknown'>arm1176</model>
-      <model usable='unknown' vendor='unknown'>sa1100</model>
-      <model usable='unknown' vendor='unknown'>cortex-a53</model>
-      <model usable='unknown' vendor='unknown'>ti925t</model>
-      <model usable='unknown' vendor='unknown'>cortex-m33</model>
-      <model usable='unknown' vendor='unknown'>cortex-a8</model>
+      <model usable='unknown' vendor='unknown'>arm11mpcore</model>
       <model usable='unknown' vendor='unknown'>arm926</model>
+      <model usable='unknown' vendor='unknown'>arm946</model>
+      <model usable='unknown' vendor='unknown'>cortex-a15</model>
+      <model usable='unknown' vendor='unknown'>cortex-a53</model>
+      <model usable='unknown' vendor='unknown'>cortex-a57</model>
+      <model usable='unknown' vendor='unknown'>cortex-a7</model>
       <model usable='unknown' vendor='unknown'>cortex-a72</model>
-      <model usable='unknown' vendor='unknown'>pxa270</model>
-      <model usable='unknown' vendor='unknown'>pxa270-a0</model>
+      <model usable='unknown' vendor='unknown'>cortex-a8</model>
+      <model usable='unknown' vendor='unknown'>cortex-a9</model>
+      <model usable='unknown' vendor='unknown'>cortex-m0</model>
+      <model usable='unknown' vendor='unknown'>cortex-m3</model>
+      <model usable='unknown' vendor='unknown'>cortex-m33</model>
       <model usable='unknown' vendor='unknown'>cortex-m4</model>
       <model usable='unknown' vendor='unknown'>cortex-m7</model>
-      <model usable='unknown' vendor='unknown'>cortex-a15</model>
-      <model usable='unknown' vendor='unknown'>arm11mpcore</model>
+      <model usable='unknown' vendor='unknown'>cortex-r5</model>
       <model usable='unknown' vendor='unknown'>cortex-r5f</model>
-      <model usable='unknown' vendor='unknown'>cortex-m0</model>
-      <model usable='unknown' vendor='unknown'>sa1110</model>
-      <model usable='unknown' vendor='unknown'>arm1136-r2</model>
-      <model usable='unknown' vendor='unknown'>pxa270-b0</model>
+      <model usable='unknown' vendor='unknown'>max</model>
+      <model usable='unknown' vendor='unknown'>pxa250</model>
+      <model usable='unknown' vendor='unknown'>pxa255</model>
+      <model usable='unknown' vendor='unknown'>pxa260</model>
+      <model usable='unknown' vendor='unknown'>pxa261</model>
       <model usable='unknown' vendor='unknown'>pxa262</model>
+      <model usable='unknown' vendor='unknown'>pxa270</model>
+      <model usable='unknown' vendor='unknown'>pxa270-a0</model>
+      <model usable='unknown' vendor='unknown'>pxa270-a1</model>
+      <model usable='unknown' vendor='unknown'>pxa270-b0</model>
+      <model usable='unknown' vendor='unknown'>pxa270-b1</model>
+      <model usable='unknown' vendor='unknown'>pxa270-c0</model>
+      <model usable='unknown' vendor='unknown'>pxa270-c5</model>
+      <model usable='unknown' vendor='unknown'>sa1100</model>
+      <model usable='unknown' vendor='unknown'>sa1110</model>
+      <model usable='unknown' vendor='unknown'>ti925t</model>
     </mode>
   </cpu>
   <memoryBacking supported='yes'>
diff --git a/tests/domaincapsdata/qemu_5.2.0.aarch64.xml b/tests/domaincapsdata/qemu_5.2.0.aarch64.xml
index a35dd78c2c..00f434b7d7 100644
--- a/tests/domaincapsdata/qemu_5.2.0.aarch64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0.aarch64.xml
@@ -39,43 +39,43 @@
     </mode>
     <mode name='host-model' supported='no'/>
     <mode name='custom' supported='yes'>
-      <model usable='unknown' vendor='unknown'>cortex-a9</model>
-      <model usable='unknown' vendor='unknown'>pxa250</model>
-      <model usable='unknown' vendor='unknown'>pxa270-a1</model>
-      <model usable='unknown' vendor='unknown'>arm946</model>
-      <model usable='unknown' vendor='unknown'>pxa270-c0</model>
-      <model usable='unknown' vendor='unknown'>max</model>
       <model usable='unknown' vendor='unknown'>arm1026</model>
-      <model usable='unknown' vendor='unknown'>pxa260</model>
-      <model usable='unknown' vendor='unknown'>pxa270-b1</model>
-      <model usable='unknown' vendor='unknown'>cortex-a57</model>
-      <model usable='unknown' vendor='unknown'>pxa255</model>
-      <model usable='unknown' vendor='unknown'>cortex-r5</model>
       <model usable='unknown' vendor='unknown'>arm1136</model>
-      <model usable='unknown' vendor='unknown'>cortex-a7</model>
-      <model usable='unknown' vendor='unknown'>pxa261</model>
-      <model usable='unknown' vendor='unknown'>pxa270-c5</model>
-      <model usable='unknown' vendor='unknown'>cortex-m3</model>
+      <model usable='unknown' vendor='unknown'>arm1136-r2</model>
       <model usable='unknown' vendor='unknown'>arm1176</model>
-      <model usable='unknown' vendor='unknown'>sa1100</model>
-      <model usable='unknown' vendor='unknown'>cortex-a53</model>
-      <model usable='unknown' vendor='unknown'>ti925t</model>
-      <model usable='unknown' vendor='unknown'>cortex-m33</model>
-      <model usable='unknown' vendor='unknown'>cortex-a8</model>
+      <model usable='unknown' vendor='unknown'>arm11mpcore</model>
       <model usable='unknown' vendor='unknown'>arm926</model>
+      <model usable='unknown' vendor='unknown'>arm946</model>
+      <model usable='unknown' vendor='unknown'>cortex-a15</model>
+      <model usable='unknown' vendor='unknown'>cortex-a53</model>
+      <model usable='unknown' vendor='unknown'>cortex-a57</model>
+      <model usable='unknown' vendor='unknown'>cortex-a7</model>
       <model usable='unknown' vendor='unknown'>cortex-a72</model>
-      <model usable='unknown' vendor='unknown'>pxa270</model>
-      <model usable='unknown' vendor='unknown'>pxa270-a0</model>
+      <model usable='unknown' vendor='unknown'>cortex-a8</model>
+      <model usable='unknown' vendor='unknown'>cortex-a9</model>
+      <model usable='unknown' vendor='unknown'>cortex-m0</model>
+      <model usable='unknown' vendor='unknown'>cortex-m3</model>
+      <model usable='unknown' vendor='unknown'>cortex-m33</model>
       <model usable='unknown' vendor='unknown'>cortex-m4</model>
       <model usable='unknown' vendor='unknown'>cortex-m7</model>
-      <model usable='unknown' vendor='unknown'>cortex-a15</model>
-      <model usable='unknown' vendor='unknown'>arm11mpcore</model>
+      <model usable='unknown' vendor='unknown'>cortex-r5</model>
       <model usable='unknown' vendor='unknown'>cortex-r5f</model>
-      <model usable='unknown' vendor='unknown'>cortex-m0</model>
-      <model usable='unknown' vendor='unknown'>sa1110</model>
-      <model usable='unknown' vendor='unknown'>arm1136-r2</model>
-      <model usable='unknown' vendor='unknown'>pxa270-b0</model>
+      <model usable='unknown' vendor='unknown'>max</model>
+      <model usable='unknown' vendor='unknown'>pxa250</model>
+      <model usable='unknown' vendor='unknown'>pxa255</model>
+      <model usable='unknown' vendor='unknown'>pxa260</model>
+      <model usable='unknown' vendor='unknown'>pxa261</model>
       <model usable='unknown' vendor='unknown'>pxa262</model>
+      <model usable='unknown' vendor='unknown'>pxa270</model>
+      <model usable='unknown' vendor='unknown'>pxa270-a0</model>
+      <model usable='unknown' vendor='unknown'>pxa270-a1</model>
+      <model usable='unknown' vendor='unknown'>pxa270-b0</model>
+      <model usable='unknown' vendor='unknown'>pxa270-b1</model>
+      <model usable='unknown' vendor='unknown'>pxa270-c0</model>
+      <model usable='unknown' vendor='unknown'>pxa270-c5</model>
+      <model usable='unknown' vendor='unknown'>sa1100</model>
+      <model usable='unknown' vendor='unknown'>sa1110</model>
+      <model usable='unknown' vendor='unknown'>ti925t</model>
     </mode>
   </cpu>
   <memoryBacking supported='yes'>
diff --git a/tests/domaincapsdata/qemu_5.2.0.ppc64.xml b/tests/domaincapsdata/qemu_5.2.0.ppc64.xml
index a6fcc39ca9..3413138fba 100644
--- a/tests/domaincapsdata/qemu_5.2.0.ppc64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0.ppc64.xml
@@ -41,9 +41,9 @@
     </mode>
     <mode name='custom' supported='yes'>
       <model usable='unknown' vendor='IBM'>POWER10</model>
-      <model usable='unknown' vendor='IBM'>POWER9</model>
-      <model usable='unknown' vendor='IBM'>POWER8</model>
       <model usable='unknown' vendor='IBM'>POWER7</model>
+      <model usable='unknown' vendor='IBM'>POWER8</model>
+      <model usable='unknown' vendor='IBM'>POWER9</model>
     </mode>
   </cpu>
   <memoryBacking supported='yes'>
diff --git a/tests/domaincapsdata/qemu_5.2.0.s390x.xml b/tests/domaincapsdata/qemu_5.2.0.s390x.xml
index 084a221fa1..34234a7a2c 100644
--- a/tests/domaincapsdata/qemu_5.2.0.s390x.xml
+++ b/tests/domaincapsdata/qemu_5.2.0.s390x.xml
@@ -84,80 +84,80 @@
       <feature policy='require' name='cmm'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='IBM'>z800-base</model>
-      <model usable='yes' vendor='IBM'>z890.2-base</model>
-      <model usable='yes' vendor='IBM'>z9EC.2</model>
-      <model usable='yes' vendor='IBM'>z13.2</model>
-      <model usable='yes' vendor='IBM'>z990.5-base</model>
-      <model usable='yes' vendor='IBM'>z9BC-base</model>
-      <model usable='yes' vendor='IBM'>z890.2</model>
-      <model usable='yes' vendor='IBM'>z890</model>
-      <model usable='yes' vendor='IBM'>z9BC</model>
+      <model usable='yes' vendor='IBM'>gen15a</model>
+      <model usable='yes' vendor='IBM'>gen15a-base</model>
+      <model usable='yes' vendor='IBM'>gen15b</model>
+      <model usable='yes' vendor='IBM'>gen15b-base</model>
+      <model usable='yes' vendor='unknown'>max</model>
+      <model usable='yes' vendor='unknown'>qemu</model>
+      <model usable='yes' vendor='IBM'>z10BC</model>
+      <model usable='yes' vendor='IBM'>z10BC-base</model>
+      <model usable='yes' vendor='IBM'>z10BC.2</model>
+      <model usable='yes' vendor='IBM'>z10BC.2-base</model>
+      <model usable='yes' vendor='IBM'>z10EC</model>
+      <model usable='yes' vendor='IBM'>z10EC-base</model>
+      <model usable='yes' vendor='IBM'>z10EC.2</model>
+      <model usable='yes' vendor='IBM'>z10EC.2-base</model>
+      <model usable='yes' vendor='IBM'>z10EC.3</model>
+      <model usable='yes' vendor='IBM'>z10EC.3-base</model>
+      <model usable='yes' vendor='IBM'>z114</model>
+      <model usable='yes' vendor='IBM'>z114-base</model>
       <model usable='yes' vendor='IBM'>z13</model>
-      <model usable='yes' vendor='IBM'>z196</model>
+      <model usable='yes' vendor='IBM'>z13-base</model>
+      <model usable='yes' vendor='IBM'>z13.2</model>
+      <model usable='yes' vendor='IBM'>z13.2-base</model>
       <model usable='yes' vendor='IBM'>z13s</model>
-      <model usable='yes' vendor='IBM'>z990.3</model>
       <model usable='yes' vendor='IBM'>z13s-base</model>
-      <model usable='yes' vendor='IBM'>z9EC</model>
-      <model usable='yes' vendor='IBM'>gen15a</model>
-      <model usable='yes' vendor='IBM'>z14ZR1-base</model>
+      <model usable='yes' vendor='IBM'>z14</model>
+      <model usable='yes' vendor='IBM'>z14-base</model>
+      <model usable='yes' vendor='IBM'>z14.2</model>
       <model usable='yes' vendor='IBM'>z14.2-base</model>
-      <model usable='yes' vendor='IBM'>z900.3-base</model>
-      <model usable='yes' vendor='IBM'>z13.2-base</model>
+      <model usable='yes' vendor='IBM'>z14ZR1</model>
+      <model usable='yes' vendor='IBM'>z14ZR1-base</model>
+      <model usable='yes' vendor='IBM'>z196</model>
+      <model usable='yes' vendor='IBM'>z196-base</model>
+      <model usable='yes' vendor='IBM'>z196.2</model>
       <model usable='yes' vendor='IBM'>z196.2-base</model>
-      <model usable='yes' vendor='IBM'>zBC12-base</model>
-      <model usable='yes' vendor='IBM'>z9BC.2-base</model>
-      <model usable='yes' vendor='IBM'>z900.2-base</model>
-      <model usable='yes' vendor='IBM'>z9EC.3</model>
-      <model usable='yes' vendor='IBM'>zEC12</model>
+      <model usable='yes' vendor='IBM'>z800</model>
+      <model usable='yes' vendor='IBM'>z800-base</model>
+      <model usable='yes' vendor='IBM'>z890</model>
+      <model usable='yes' vendor='IBM'>z890-base</model>
+      <model usable='yes' vendor='IBM'>z890.2</model>
+      <model usable='yes' vendor='IBM'>z890.2-base</model>
+      <model usable='yes' vendor='IBM'>z890.3</model>
+      <model usable='yes' vendor='IBM'>z890.3-base</model>
       <model usable='yes' vendor='IBM'>z900</model>
-      <model usable='yes' vendor='IBM'>z114-base</model>
-      <model usable='yes' vendor='IBM'>zEC12-base</model>
-      <model usable='yes' vendor='IBM'>z10EC.2</model>
-      <model usable='yes' vendor='IBM'>z10EC-base</model>
+      <model usable='yes' vendor='IBM'>z900-base</model>
+      <model usable='yes' vendor='IBM'>z900.2</model>
+      <model usable='yes' vendor='IBM'>z900.2-base</model>
       <model usable='yes' vendor='IBM'>z900.3</model>
-      <model usable='yes' vendor='IBM'>z14ZR1</model>
-      <model usable='yes' vendor='IBM'>z10BC</model>
-      <model usable='yes' vendor='IBM'>z10BC.2-base</model>
-      <model usable='yes' vendor='IBM'>z9BC.2</model>
+      <model usable='yes' vendor='IBM'>z900.3-base</model>
       <model usable='yes' vendor='IBM'>z990</model>
+      <model usable='yes' vendor='IBM'>z990-base</model>
       <model usable='yes' vendor='IBM'>z990.2</model>
-      <model usable='yes' vendor='IBM'>z14</model>
-      <model usable='yes' vendor='IBM'>gen15b-base</model>
-      <model usable='yes' vendor='IBM'>z990.4</model>
-      <model usable='yes' vendor='unknown'>max</model>
       <model usable='yes' vendor='IBM'>z990.2-base</model>
-      <model usable='yes' vendor='IBM'>z10EC.2-base</model>
-      <model usable='yes' vendor='IBM'>gen15a-base</model>
-      <model usable='yes' vendor='IBM'>z800</model>
-      <model usable='yes' vendor='IBM'>z10EC</model>
-      <model usable='yes' vendor='IBM'>zEC12.2</model>
-      <model usable='yes' vendor='IBM'>z900-base</model>
-      <model usable='yes' vendor='IBM'>z10BC.2</model>
+      <model usable='yes' vendor='IBM'>z990.3</model>
+      <model usable='yes' vendor='IBM'>z990.3-base</model>
+      <model usable='yes' vendor='IBM'>z990.4</model>
+      <model usable='yes' vendor='IBM'>z990.4-base</model>
+      <model usable='yes' vendor='IBM'>z990.5</model>
+      <model usable='yes' vendor='IBM'>z990.5-base</model>
+      <model usable='yes' vendor='IBM'>z9BC</model>
+      <model usable='yes' vendor='IBM'>z9BC-base</model>
+      <model usable='yes' vendor='IBM'>z9BC.2</model>
+      <model usable='yes' vendor='IBM'>z9BC.2-base</model>
+      <model usable='yes' vendor='IBM'>z9EC</model>
       <model usable='yes' vendor='IBM'>z9EC-base</model>
-      <model usable='yes' vendor='IBM'>z9EC.3-base</model>
-      <model usable='yes' vendor='IBM'>z114</model>
-      <model usable='yes' vendor='IBM'>z890.3</model>
-      <model usable='yes' vendor='IBM'>z196-base</model>
+      <model usable='yes' vendor='IBM'>z9EC.2</model>
       <model usable='yes' vendor='IBM'>z9EC.2-base</model>
-      <model usable='yes' vendor='IBM'>z196.2</model>
-      <model usable='yes' vendor='IBM'>z14.2</model>
-      <model usable='yes' vendor='IBM'>z990-base</model>
-      <model usable='yes' vendor='IBM'>z900.2</model>
-      <model usable='yes' vendor='IBM'>z10EC.3</model>
-      <model usable='yes' vendor='IBM'>z890-base</model>
-      <model usable='yes' vendor='IBM'>z14-base</model>
-      <model usable='yes' vendor='IBM'>z990.4-base</model>
-      <model usable='yes' vendor='IBM'>z10EC.3-base</model>
-      <model usable='yes' vendor='IBM'>z10BC-base</model>
-      <model usable='yes' vendor='IBM'>z13-base</model>
-      <model usable='yes' vendor='IBM'>z990.3-base</model>
-      <model usable='yes' vendor='IBM'>zEC12.2-base</model>
+      <model usable='yes' vendor='IBM'>z9EC.3</model>
+      <model usable='yes' vendor='IBM'>z9EC.3-base</model>
       <model usable='yes' vendor='IBM'>zBC12</model>
-      <model usable='yes' vendor='IBM'>z890.3-base</model>
-      <model usable='yes' vendor='IBM'>z990.5</model>
-      <model usable='yes' vendor='IBM'>gen15b</model>
-      <model usable='yes' vendor='unknown'>qemu</model>
+      <model usable='yes' vendor='IBM'>zBC12-base</model>
+      <model usable='yes' vendor='IBM'>zEC12</model>
+      <model usable='yes' vendor='IBM'>zEC12-base</model>
+      <model usable='yes' vendor='IBM'>zEC12.2</model>
+      <model usable='yes' vendor='IBM'>zEC12.2-base</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 2889fce115..0979dda37f 100644
--- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
@@ -61,60 +61,60 @@
       <feature policy='require' name='pschange-mc-no'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>qemu64</model>
-      <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='AMD'>phenom</model>
-      <model usable='yes' vendor='unknown'>pentium3</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
-      <model usable='yes' vendor='unknown'>pentium</model>
-      <model usable='no' vendor='Intel'>n270</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='yes' vendor='unknown'>kvm32</model>
-      <model usable='no' vendor='Intel'>coreduo</model>
-      <model usable='no' vendor='Intel'>core2duo</model>
-      <model usable='no' vendor='AMD'>athlon</model>
-      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
-      <model usable='yes' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Snowridge</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client</model>
-      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
-      <model usable='yes' vendor='Intel'>SandyBridge</model>
-      <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
-      <model usable='no' vendor='AMD'>Opteron_G4</model>
-      <model usable='yes' vendor='AMD'>Opteron_G3</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-      <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='Intel'>Nehalem</model>
-      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='Intel'>IvyBridge</model>
-      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Icelake-Server</model>
-      <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client-noTSX</model>
-      <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
-      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell</model>
-      <model usable='yes' vendor='AMD'>EPYC-Rome</model>
-      <model usable='yes' vendor='AMD'>EPYC-IBPB</model>
-      <model usable='yes' vendor='AMD'>EPYC</model>
-      <model usable='yes' vendor='Hygon'>Dhyana</model>
-      <model usable='no' vendor='Intel'>Cooperlake</model>
-      <model usable='yes' vendor='Intel'>Conroe</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
-      <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell</model>
       <model usable='yes' vendor='unknown'>486</model>
+      <model usable='no' vendor='Intel'>Broadwell</model>
+      <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
+      <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
+      <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cooperlake</model>
+      <model usable='yes' vendor='Hygon'>Dhyana</model>
+      <model usable='yes' vendor='AMD'>EPYC</model>
+      <model usable='yes' vendor='AMD'>EPYC-IBPB</model>
+      <model usable='yes' vendor='AMD'>EPYC-Rome</model>
+      <model usable='no' vendor='Intel'>Haswell</model>
+      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
+      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
+      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
+      <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client</model>
+      <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client-noTSX</model>
+      <model usable='no' vendor='Intel'>Icelake-Server</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
+      <model usable='no' vendor='Intel'>IvyBridge</model>
+      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
+      <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
+      <model usable='yes' vendor='AMD'>Opteron_G1</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>
+      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='yes' vendor='Intel'>Penryn</model>
+      <model usable='yes' vendor='Intel'>SandyBridge</model>
+      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Client</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Server</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Snowridge</model>
+      <model usable='yes' vendor='Intel'>Westmere</model>
+      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
+      <model usable='no' vendor='AMD'>athlon</model>
+      <model usable='no' vendor='Intel'>core2duo</model>
+      <model usable='no' vendor='Intel'>coreduo</model>
+      <model usable='yes' vendor='unknown'>kvm32</model>
+      <model usable='yes' vendor='unknown'>kvm64</model>
+      <model usable='no' vendor='Intel'>n270</model>
+      <model usable='yes' vendor='unknown'>pentium</model>
+      <model usable='yes' vendor='unknown'>pentium2</model>
+      <model usable='yes' vendor='unknown'>pentium3</model>
+      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='yes' vendor='unknown'>qemu64</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 5bc2bdd167..1c4ed9c490 100644
--- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
@@ -62,61 +62,61 @@
       <feature policy='require' name='pschange-mc-no'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>qemu64</model>
-      <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='AMD'>phenom</model>
-      <model usable='yes' vendor='unknown'>pentium3</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
-      <model usable='yes' vendor='unknown'>pentium</model>
-      <model usable='no' vendor='Intel'>n270</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='yes' vendor='unknown'>kvm32</model>
-      <model usable='no' vendor='Intel'>coreduo</model>
-      <model usable='no' vendor='Intel'>core2duo</model>
-      <model usable='no' vendor='AMD'>athlon</model>
-      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
-      <model usable='yes' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Snowridge</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client</model>
-      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
-      <model usable='yes' vendor='Intel'>SandyBridge</model>
-      <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
-      <model usable='no' vendor='AMD'>Opteron_G4</model>
-      <model usable='yes' vendor='AMD'>Opteron_G3</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-      <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='Intel'>Nehalem</model>
-      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='Intel'>IvyBridge</model>
-      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Icelake-Server</model>
-      <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client-noTSX</model>
-      <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
-      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell</model>
-      <model usable='yes' vendor='AMD'>EPYC-Rome</model>
-      <model usable='no' vendor='AMD'>EPYC-Milan</model>
-      <model usable='yes' vendor='AMD'>EPYC-IBPB</model>
-      <model usable='yes' vendor='AMD'>EPYC</model>
-      <model usable='yes' vendor='Hygon'>Dhyana</model>
-      <model usable='no' vendor='Intel'>Cooperlake</model>
-      <model usable='yes' vendor='Intel'>Conroe</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
-      <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell</model>
       <model usable='yes' vendor='unknown'>486</model>
+      <model usable='no' vendor='Intel'>Broadwell</model>
+      <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
+      <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
+      <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cooperlake</model>
+      <model usable='yes' vendor='Hygon'>Dhyana</model>
+      <model usable='yes' vendor='AMD'>EPYC</model>
+      <model usable='yes' vendor='AMD'>EPYC-IBPB</model>
+      <model usable='no' vendor='AMD'>EPYC-Milan</model>
+      <model usable='yes' vendor='AMD'>EPYC-Rome</model>
+      <model usable='no' vendor='Intel'>Haswell</model>
+      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
+      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
+      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
+      <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client</model>
+      <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client-noTSX</model>
+      <model usable='no' vendor='Intel'>Icelake-Server</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
+      <model usable='no' vendor='Intel'>IvyBridge</model>
+      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
+      <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
+      <model usable='yes' vendor='AMD'>Opteron_G1</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>
+      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='yes' vendor='Intel'>Penryn</model>
+      <model usable='yes' vendor='Intel'>SandyBridge</model>
+      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Client</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Server</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Snowridge</model>
+      <model usable='yes' vendor='Intel'>Westmere</model>
+      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
+      <model usable='no' vendor='AMD'>athlon</model>
+      <model usable='no' vendor='Intel'>core2duo</model>
+      <model usable='no' vendor='Intel'>coreduo</model>
+      <model usable='yes' vendor='unknown'>kvm32</model>
+      <model usable='yes' vendor='unknown'>kvm64</model>
+      <model usable='no' vendor='Intel'>n270</model>
+      <model usable='yes' vendor='unknown'>pentium</model>
+      <model usable='yes' vendor='unknown'>pentium2</model>
+      <model usable='yes' vendor='unknown'>pentium3</model>
+      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='yes' vendor='unknown'>qemu64</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 a39f777ef6..ec5ea85637 100644
--- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
@@ -75,61 +75,61 @@
       <feature policy='disable' name='misalignsse'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>qemu64</model>
-      <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='AMD'>phenom</model>
-      <model usable='yes' vendor='unknown'>pentium3</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
-      <model usable='yes' vendor='unknown'>pentium</model>
-      <model usable='yes' vendor='Intel'>n270</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='yes' vendor='unknown'>kvm32</model>
-      <model usable='yes' vendor='Intel'>coreduo</model>
-      <model usable='yes' vendor='Intel'>core2duo</model>
-      <model usable='yes' vendor='AMD'>athlon</model>
-      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
-      <model usable='yes' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Snowridge</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client</model>
-      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
-      <model usable='no' vendor='Intel'>SandyBridge</model>
-      <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
-      <model usable='no' vendor='AMD'>Opteron_G4</model>
-      <model usable='no' vendor='AMD'>Opteron_G3</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-      <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='Intel'>Nehalem</model>
-      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='Intel'>IvyBridge</model>
-      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Icelake-Server</model>
-      <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client-noTSX</model>
-      <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
-      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell</model>
-      <model usable='no' vendor='AMD'>EPYC-Rome</model>
-      <model usable='no' vendor='AMD'>EPYC-Milan</model>
-      <model usable='no' vendor='AMD'>EPYC-IBPB</model>
-      <model usable='no' vendor='AMD'>EPYC</model>
-      <model usable='no' vendor='Hygon'>Dhyana</model>
-      <model usable='no' vendor='Intel'>Cooperlake</model>
-      <model usable='yes' vendor='Intel'>Conroe</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
-      <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell</model>
       <model usable='yes' vendor='unknown'>486</model>
+      <model usable='no' vendor='Intel'>Broadwell</model>
+      <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
+      <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
+      <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cooperlake</model>
+      <model usable='no' vendor='Hygon'>Dhyana</model>
+      <model usable='no' vendor='AMD'>EPYC</model>
+      <model usable='no' vendor='AMD'>EPYC-IBPB</model>
+      <model usable='no' vendor='AMD'>EPYC-Milan</model>
+      <model usable='no' vendor='AMD'>EPYC-Rome</model>
+      <model usable='no' vendor='Intel'>Haswell</model>
+      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
+      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
+      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
+      <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client</model>
+      <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client-noTSX</model>
+      <model usable='no' vendor='Intel'>Icelake-Server</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
+      <model usable='no' vendor='Intel'>IvyBridge</model>
+      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
+      <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
+      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2</model>
+      <model usable='no' vendor='AMD'>Opteron_G3</model>
+      <model usable='no' vendor='AMD'>Opteron_G4</model>
+      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='yes' vendor='Intel'>Penryn</model>
+      <model usable='no' vendor='Intel'>SandyBridge</model>
+      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Client</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Server</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Snowridge</model>
+      <model usable='yes' vendor='Intel'>Westmere</model>
+      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
+      <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='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'>pentium2</model>
+      <model usable='yes' vendor='unknown'>pentium3</model>
+      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='yes' vendor='unknown'>qemu64</model>
     </mode>
   </cpu>
   <memoryBacking supported='yes'>
diff --git a/tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml
index 780436ce33..9f07b64178 100644
--- a/tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml
@@ -39,44 +39,44 @@
     </mode>
     <mode name='host-model' supported='no'/>
     <mode name='custom' supported='yes'>
-      <model usable='unknown' vendor='unknown'>cortex-a9</model>
-      <model usable='unknown' vendor='unknown'>pxa250</model>
-      <model usable='unknown' vendor='unknown'>pxa270-a1</model>
-      <model usable='unknown' vendor='unknown'>arm946</model>
-      <model usable='unknown' vendor='unknown'>max</model>
-      <model usable='unknown' vendor='unknown'>pxa270-c0</model>
       <model usable='unknown' vendor='unknown'>arm1026</model>
-      <model usable='unknown' vendor='unknown'>pxa260</model>
-      <model usable='unknown' vendor='unknown'>pxa270-b1</model>
-      <model usable='unknown' vendor='unknown'>cortex-a57</model>
-      <model usable='unknown' vendor='unknown'>pxa255</model>
-      <model usable='unknown' vendor='unknown'>cortex-r5</model>
       <model usable='unknown' vendor='unknown'>arm1136</model>
-      <model usable='unknown' vendor='unknown'>cortex-a7</model>
-      <model usable='unknown' vendor='unknown'>pxa261</model>
-      <model usable='unknown' vendor='unknown'>pxa270-c5</model>
-      <model usable='unknown' vendor='unknown'>cortex-m3</model>
+      <model usable='unknown' vendor='unknown'>arm1136-r2</model>
       <model usable='unknown' vendor='unknown'>arm1176</model>
-      <model usable='unknown' vendor='unknown'>sa1100</model>
-      <model usable='unknown' vendor='unknown'>cortex-a53</model>
-      <model usable='unknown' vendor='unknown'>ti925t</model>
-      <model usable='unknown' vendor='unknown'>cortex-m33</model>
-      <model usable='unknown' vendor='unknown'>cortex-a8</model>
+      <model usable='unknown' vendor='unknown'>arm11mpcore</model>
       <model usable='unknown' vendor='unknown'>arm926</model>
+      <model usable='unknown' vendor='unknown'>arm946</model>
+      <model usable='unknown' vendor='unknown'>cortex-a15</model>
+      <model usable='unknown' vendor='unknown'>cortex-a53</model>
+      <model usable='unknown' vendor='unknown'>cortex-a57</model>
+      <model usable='unknown' vendor='unknown'>cortex-a7</model>
       <model usable='unknown' vendor='unknown'>cortex-a72</model>
-      <model usable='unknown' vendor='unknown'>pxa270</model>
-      <model usable='unknown' vendor='unknown'>pxa270-a0</model>
+      <model usable='unknown' vendor='unknown'>cortex-a8</model>
+      <model usable='unknown' vendor='unknown'>cortex-a9</model>
+      <model usable='unknown' vendor='unknown'>cortex-m0</model>
+      <model usable='unknown' vendor='unknown'>cortex-m3</model>
+      <model usable='unknown' vendor='unknown'>cortex-m33</model>
       <model usable='unknown' vendor='unknown'>cortex-m4</model>
       <model usable='unknown' vendor='unknown'>cortex-m55</model>
       <model usable='unknown' vendor='unknown'>cortex-m7</model>
-      <model usable='unknown' vendor='unknown'>cortex-a15</model>
-      <model usable='unknown' vendor='unknown'>arm11mpcore</model>
+      <model usable='unknown' vendor='unknown'>cortex-r5</model>
       <model usable='unknown' vendor='unknown'>cortex-r5f</model>
-      <model usable='unknown' vendor='unknown'>cortex-m0</model>
-      <model usable='unknown' vendor='unknown'>sa1110</model>
-      <model usable='unknown' vendor='unknown'>arm1136-r2</model>
-      <model usable='unknown' vendor='unknown'>pxa270-b0</model>
+      <model usable='unknown' vendor='unknown'>max</model>
+      <model usable='unknown' vendor='unknown'>pxa250</model>
+      <model usable='unknown' vendor='unknown'>pxa255</model>
+      <model usable='unknown' vendor='unknown'>pxa260</model>
+      <model usable='unknown' vendor='unknown'>pxa261</model>
       <model usable='unknown' vendor='unknown'>pxa262</model>
+      <model usable='unknown' vendor='unknown'>pxa270</model>
+      <model usable='unknown' vendor='unknown'>pxa270-a0</model>
+      <model usable='unknown' vendor='unknown'>pxa270-a1</model>
+      <model usable='unknown' vendor='unknown'>pxa270-b0</model>
+      <model usable='unknown' vendor='unknown'>pxa270-b1</model>
+      <model usable='unknown' vendor='unknown'>pxa270-c0</model>
+      <model usable='unknown' vendor='unknown'>pxa270-c5</model>
+      <model usable='unknown' vendor='unknown'>sa1100</model>
+      <model usable='unknown' vendor='unknown'>sa1110</model>
+      <model usable='unknown' vendor='unknown'>ti925t</model>
     </mode>
   </cpu>
   <memoryBacking supported='yes'>
diff --git a/tests/domaincapsdata/qemu_6.0.0.aarch64.xml b/tests/domaincapsdata/qemu_6.0.0.aarch64.xml
index 780436ce33..9f07b64178 100644
--- a/tests/domaincapsdata/qemu_6.0.0.aarch64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0.aarch64.xml
@@ -39,44 +39,44 @@
     </mode>
     <mode name='host-model' supported='no'/>
     <mode name='custom' supported='yes'>
-      <model usable='unknown' vendor='unknown'>cortex-a9</model>
-      <model usable='unknown' vendor='unknown'>pxa250</model>
-      <model usable='unknown' vendor='unknown'>pxa270-a1</model>
-      <model usable='unknown' vendor='unknown'>arm946</model>
-      <model usable='unknown' vendor='unknown'>max</model>
-      <model usable='unknown' vendor='unknown'>pxa270-c0</model>
       <model usable='unknown' vendor='unknown'>arm1026</model>
-      <model usable='unknown' vendor='unknown'>pxa260</model>
-      <model usable='unknown' vendor='unknown'>pxa270-b1</model>
-      <model usable='unknown' vendor='unknown'>cortex-a57</model>
-      <model usable='unknown' vendor='unknown'>pxa255</model>
-      <model usable='unknown' vendor='unknown'>cortex-r5</model>
       <model usable='unknown' vendor='unknown'>arm1136</model>
-      <model usable='unknown' vendor='unknown'>cortex-a7</model>
-      <model usable='unknown' vendor='unknown'>pxa261</model>
-      <model usable='unknown' vendor='unknown'>pxa270-c5</model>
-      <model usable='unknown' vendor='unknown'>cortex-m3</model>
+      <model usable='unknown' vendor='unknown'>arm1136-r2</model>
       <model usable='unknown' vendor='unknown'>arm1176</model>
-      <model usable='unknown' vendor='unknown'>sa1100</model>
-      <model usable='unknown' vendor='unknown'>cortex-a53</model>
-      <model usable='unknown' vendor='unknown'>ti925t</model>
-      <model usable='unknown' vendor='unknown'>cortex-m33</model>
-      <model usable='unknown' vendor='unknown'>cortex-a8</model>
+      <model usable='unknown' vendor='unknown'>arm11mpcore</model>
       <model usable='unknown' vendor='unknown'>arm926</model>
+      <model usable='unknown' vendor='unknown'>arm946</model>
+      <model usable='unknown' vendor='unknown'>cortex-a15</model>
+      <model usable='unknown' vendor='unknown'>cortex-a53</model>
+      <model usable='unknown' vendor='unknown'>cortex-a57</model>
+      <model usable='unknown' vendor='unknown'>cortex-a7</model>
       <model usable='unknown' vendor='unknown'>cortex-a72</model>
-      <model usable='unknown' vendor='unknown'>pxa270</model>
-      <model usable='unknown' vendor='unknown'>pxa270-a0</model>
+      <model usable='unknown' vendor='unknown'>cortex-a8</model>
+      <model usable='unknown' vendor='unknown'>cortex-a9</model>
+      <model usable='unknown' vendor='unknown'>cortex-m0</model>
+      <model usable='unknown' vendor='unknown'>cortex-m3</model>
+      <model usable='unknown' vendor='unknown'>cortex-m33</model>
       <model usable='unknown' vendor='unknown'>cortex-m4</model>
       <model usable='unknown' vendor='unknown'>cortex-m55</model>
       <model usable='unknown' vendor='unknown'>cortex-m7</model>
-      <model usable='unknown' vendor='unknown'>cortex-a15</model>
-      <model usable='unknown' vendor='unknown'>arm11mpcore</model>
+      <model usable='unknown' vendor='unknown'>cortex-r5</model>
       <model usable='unknown' vendor='unknown'>cortex-r5f</model>
-      <model usable='unknown' vendor='unknown'>cortex-m0</model>
-      <model usable='unknown' vendor='unknown'>sa1110</model>
-      <model usable='unknown' vendor='unknown'>arm1136-r2</model>
-      <model usable='unknown' vendor='unknown'>pxa270-b0</model>
+      <model usable='unknown' vendor='unknown'>max</model>
+      <model usable='unknown' vendor='unknown'>pxa250</model>
+      <model usable='unknown' vendor='unknown'>pxa255</model>
+      <model usable='unknown' vendor='unknown'>pxa260</model>
+      <model usable='unknown' vendor='unknown'>pxa261</model>
       <model usable='unknown' vendor='unknown'>pxa262</model>
+      <model usable='unknown' vendor='unknown'>pxa270</model>
+      <model usable='unknown' vendor='unknown'>pxa270-a0</model>
+      <model usable='unknown' vendor='unknown'>pxa270-a1</model>
+      <model usable='unknown' vendor='unknown'>pxa270-b0</model>
+      <model usable='unknown' vendor='unknown'>pxa270-b1</model>
+      <model usable='unknown' vendor='unknown'>pxa270-c0</model>
+      <model usable='unknown' vendor='unknown'>pxa270-c5</model>
+      <model usable='unknown' vendor='unknown'>sa1100</model>
+      <model usable='unknown' vendor='unknown'>sa1110</model>
+      <model usable='unknown' vendor='unknown'>ti925t</model>
     </mode>
   </cpu>
   <memoryBacking supported='yes'>
diff --git a/tests/domaincapsdata/qemu_6.0.0.s390x.xml b/tests/domaincapsdata/qemu_6.0.0.s390x.xml
index 2bc02dd4c8..7b3d1ab492 100644
--- a/tests/domaincapsdata/qemu_6.0.0.s390x.xml
+++ b/tests/domaincapsdata/qemu_6.0.0.s390x.xml
@@ -85,80 +85,80 @@
       <feature policy='require' name='cmm'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='IBM'>z800-base</model>
-      <model usable='yes' vendor='IBM'>z890.2-base</model>
-      <model usable='yes' vendor='IBM'>z9EC.2</model>
-      <model usable='yes' vendor='IBM'>z13.2</model>
-      <model usable='yes' vendor='IBM'>z990.5-base</model>
-      <model usable='yes' vendor='IBM'>z9BC-base</model>
-      <model usable='yes' vendor='IBM'>z890.2</model>
-      <model usable='yes' vendor='IBM'>z890</model>
-      <model usable='yes' vendor='IBM'>z9BC</model>
+      <model usable='yes' vendor='IBM'>gen15a</model>
+      <model usable='yes' vendor='IBM'>gen15a-base</model>
+      <model usable='yes' vendor='IBM'>gen15b</model>
+      <model usable='yes' vendor='IBM'>gen15b-base</model>
+      <model usable='yes' vendor='unknown'>max</model>
+      <model usable='yes' vendor='unknown'>qemu</model>
+      <model usable='yes' vendor='IBM'>z10BC</model>
+      <model usable='yes' vendor='IBM'>z10BC-base</model>
+      <model usable='yes' vendor='IBM'>z10BC.2</model>
+      <model usable='yes' vendor='IBM'>z10BC.2-base</model>
+      <model usable='yes' vendor='IBM'>z10EC</model>
+      <model usable='yes' vendor='IBM'>z10EC-base</model>
+      <model usable='yes' vendor='IBM'>z10EC.2</model>
+      <model usable='yes' vendor='IBM'>z10EC.2-base</model>
+      <model usable='yes' vendor='IBM'>z10EC.3</model>
+      <model usable='yes' vendor='IBM'>z10EC.3-base</model>
+      <model usable='yes' vendor='IBM'>z114</model>
+      <model usable='yes' vendor='IBM'>z114-base</model>
       <model usable='yes' vendor='IBM'>z13</model>
-      <model usable='yes' vendor='IBM'>z196</model>
+      <model usable='yes' vendor='IBM'>z13-base</model>
+      <model usable='yes' vendor='IBM'>z13.2</model>
+      <model usable='yes' vendor='IBM'>z13.2-base</model>
       <model usable='yes' vendor='IBM'>z13s</model>
-      <model usable='yes' vendor='IBM'>z990.3</model>
       <model usable='yes' vendor='IBM'>z13s-base</model>
-      <model usable='yes' vendor='IBM'>z9EC</model>
-      <model usable='yes' vendor='IBM'>gen15a</model>
-      <model usable='yes' vendor='IBM'>z14ZR1-base</model>
+      <model usable='yes' vendor='IBM'>z14</model>
+      <model usable='yes' vendor='IBM'>z14-base</model>
+      <model usable='yes' vendor='IBM'>z14.2</model>
       <model usable='yes' vendor='IBM'>z14.2-base</model>
-      <model usable='yes' vendor='IBM'>z900.3-base</model>
-      <model usable='yes' vendor='IBM'>z13.2-base</model>
+      <model usable='yes' vendor='IBM'>z14ZR1</model>
+      <model usable='yes' vendor='IBM'>z14ZR1-base</model>
+      <model usable='yes' vendor='IBM'>z196</model>
+      <model usable='yes' vendor='IBM'>z196-base</model>
+      <model usable='yes' vendor='IBM'>z196.2</model>
       <model usable='yes' vendor='IBM'>z196.2-base</model>
-      <model usable='yes' vendor='IBM'>zBC12-base</model>
-      <model usable='yes' vendor='IBM'>z9BC.2-base</model>
-      <model usable='yes' vendor='IBM'>z900.2-base</model>
-      <model usable='yes' vendor='IBM'>z9EC.3</model>
-      <model usable='yes' vendor='IBM'>zEC12</model>
+      <model usable='yes' vendor='IBM'>z800</model>
+      <model usable='yes' vendor='IBM'>z800-base</model>
+      <model usable='yes' vendor='IBM'>z890</model>
+      <model usable='yes' vendor='IBM'>z890-base</model>
+      <model usable='yes' vendor='IBM'>z890.2</model>
+      <model usable='yes' vendor='IBM'>z890.2-base</model>
+      <model usable='yes' vendor='IBM'>z890.3</model>
+      <model usable='yes' vendor='IBM'>z890.3-base</model>
       <model usable='yes' vendor='IBM'>z900</model>
-      <model usable='yes' vendor='IBM'>z114-base</model>
-      <model usable='yes' vendor='IBM'>zEC12-base</model>
-      <model usable='yes' vendor='IBM'>z10EC.2</model>
-      <model usable='yes' vendor='IBM'>z10EC-base</model>
+      <model usable='yes' vendor='IBM'>z900-base</model>
+      <model usable='yes' vendor='IBM'>z900.2</model>
+      <model usable='yes' vendor='IBM'>z900.2-base</model>
       <model usable='yes' vendor='IBM'>z900.3</model>
-      <model usable='yes' vendor='IBM'>z14ZR1</model>
-      <model usable='yes' vendor='IBM'>z10BC</model>
-      <model usable='yes' vendor='IBM'>z10BC.2-base</model>
-      <model usable='yes' vendor='IBM'>z9BC.2</model>
+      <model usable='yes' vendor='IBM'>z900.3-base</model>
       <model usable='yes' vendor='IBM'>z990</model>
+      <model usable='yes' vendor='IBM'>z990-base</model>
       <model usable='yes' vendor='IBM'>z990.2</model>
-      <model usable='yes' vendor='IBM'>z14</model>
-      <model usable='yes' vendor='IBM'>gen15b-base</model>
-      <model usable='yes' vendor='IBM'>z990.4</model>
-      <model usable='yes' vendor='unknown'>max</model>
-      <model usable='yes' vendor='IBM'>z10EC.2-base</model>
-      <model usable='yes' vendor='IBM'>gen15a-base</model>
-      <model usable='yes' vendor='IBM'>z800</model>
-      <model usable='yes' vendor='IBM'>z10EC</model>
-      <model usable='yes' vendor='IBM'>zEC12.2</model>
       <model usable='yes' vendor='IBM'>z990.2-base</model>
-      <model usable='yes' vendor='IBM'>z900-base</model>
-      <model usable='yes' vendor='IBM'>z10BC.2</model>
+      <model usable='yes' vendor='IBM'>z990.3</model>
+      <model usable='yes' vendor='IBM'>z990.3-base</model>
+      <model usable='yes' vendor='IBM'>z990.4</model>
+      <model usable='yes' vendor='IBM'>z990.4-base</model>
+      <model usable='yes' vendor='IBM'>z990.5</model>
+      <model usable='yes' vendor='IBM'>z990.5-base</model>
+      <model usable='yes' vendor='IBM'>z9BC</model>
+      <model usable='yes' vendor='IBM'>z9BC-base</model>
+      <model usable='yes' vendor='IBM'>z9BC.2</model>
+      <model usable='yes' vendor='IBM'>z9BC.2-base</model>
+      <model usable='yes' vendor='IBM'>z9EC</model>
       <model usable='yes' vendor='IBM'>z9EC-base</model>
-      <model usable='yes' vendor='IBM'>z9EC.3-base</model>
-      <model usable='yes' vendor='IBM'>z114</model>
-      <model usable='yes' vendor='IBM'>z890.3</model>
-      <model usable='yes' vendor='IBM'>z196-base</model>
+      <model usable='yes' vendor='IBM'>z9EC.2</model>
       <model usable='yes' vendor='IBM'>z9EC.2-base</model>
-      <model usable='yes' vendor='IBM'>z196.2</model>
-      <model usable='yes' vendor='IBM'>z14.2</model>
-      <model usable='yes' vendor='IBM'>z990-base</model>
-      <model usable='yes' vendor='IBM'>z900.2</model>
-      <model usable='yes' vendor='IBM'>z890-base</model>
-      <model usable='yes' vendor='IBM'>z10EC.3</model>
-      <model usable='yes' vendor='IBM'>z14-base</model>
-      <model usable='yes' vendor='IBM'>z990.4-base</model>
-      <model usable='yes' vendor='IBM'>z10EC.3-base</model>
-      <model usable='yes' vendor='IBM'>z10BC-base</model>
-      <model usable='yes' vendor='IBM'>z13-base</model>
-      <model usable='yes' vendor='IBM'>z990.3-base</model>
-      <model usable='yes' vendor='IBM'>zEC12.2-base</model>
+      <model usable='yes' vendor='IBM'>z9EC.3</model>
+      <model usable='yes' vendor='IBM'>z9EC.3-base</model>
       <model usable='yes' vendor='IBM'>zBC12</model>
-      <model usable='yes' vendor='IBM'>z890.3-base</model>
-      <model usable='yes' vendor='IBM'>z990.5</model>
-      <model usable='yes' vendor='IBM'>gen15b</model>
-      <model usable='yes' vendor='unknown'>qemu</model>
+      <model usable='yes' vendor='IBM'>zBC12-base</model>
+      <model usable='yes' vendor='IBM'>zEC12</model>
+      <model usable='yes' vendor='IBM'>zEC12-base</model>
+      <model usable='yes' vendor='IBM'>zEC12.2</model>
+      <model usable='yes' vendor='IBM'>zEC12.2-base</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 0c322b1139..3a9c2050a5 100644
--- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
@@ -61,61 +61,61 @@
       <feature policy='require' name='pschange-mc-no'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>qemu64</model>
-      <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='AMD'>phenom</model>
-      <model usable='yes' vendor='unknown'>pentium3</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
-      <model usable='yes' vendor='unknown'>pentium</model>
-      <model usable='no' vendor='Intel'>n270</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='yes' vendor='unknown'>kvm32</model>
-      <model usable='no' vendor='Intel'>coreduo</model>
-      <model usable='no' vendor='Intel'>core2duo</model>
-      <model usable='no' vendor='AMD'>athlon</model>
-      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
-      <model usable='yes' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Snowridge</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client</model>
-      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
-      <model usable='yes' vendor='Intel'>SandyBridge</model>
-      <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
-      <model usable='no' vendor='AMD'>Opteron_G4</model>
-      <model usable='yes' vendor='AMD'>Opteron_G3</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-      <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='Intel'>Nehalem</model>
-      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='Intel'>IvyBridge</model>
-      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Icelake-Server</model>
-      <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client-noTSX</model>
-      <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
-      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell</model>
-      <model usable='yes' vendor='AMD'>EPYC-Rome</model>
-      <model usable='no' vendor='AMD'>EPYC-Milan</model>
-      <model usable='yes' vendor='AMD'>EPYC-IBPB</model>
-      <model usable='yes' vendor='AMD'>EPYC</model>
-      <model usable='yes' vendor='Hygon'>Dhyana</model>
-      <model usable='no' vendor='Intel'>Cooperlake</model>
-      <model usable='yes' vendor='Intel'>Conroe</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
-      <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell</model>
       <model usable='yes' vendor='unknown'>486</model>
+      <model usable='no' vendor='Intel'>Broadwell</model>
+      <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
+      <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
+      <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cooperlake</model>
+      <model usable='yes' vendor='Hygon'>Dhyana</model>
+      <model usable='yes' vendor='AMD'>EPYC</model>
+      <model usable='yes' vendor='AMD'>EPYC-IBPB</model>
+      <model usable='no' vendor='AMD'>EPYC-Milan</model>
+      <model usable='yes' vendor='AMD'>EPYC-Rome</model>
+      <model usable='no' vendor='Intel'>Haswell</model>
+      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
+      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
+      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
+      <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client</model>
+      <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client-noTSX</model>
+      <model usable='no' vendor='Intel'>Icelake-Server</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
+      <model usable='no' vendor='Intel'>IvyBridge</model>
+      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
+      <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
+      <model usable='yes' vendor='AMD'>Opteron_G1</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>
+      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='yes' vendor='Intel'>Penryn</model>
+      <model usable='yes' vendor='Intel'>SandyBridge</model>
+      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Client</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Server</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Snowridge</model>
+      <model usable='yes' vendor='Intel'>Westmere</model>
+      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
+      <model usable='no' vendor='AMD'>athlon</model>
+      <model usable='no' vendor='Intel'>core2duo</model>
+      <model usable='no' vendor='Intel'>coreduo</model>
+      <model usable='yes' vendor='unknown'>kvm32</model>
+      <model usable='yes' vendor='unknown'>kvm64</model>
+      <model usable='no' vendor='Intel'>n270</model>
+      <model usable='yes' vendor='unknown'>pentium</model>
+      <model usable='yes' vendor='unknown'>pentium2</model>
+      <model usable='yes' vendor='unknown'>pentium3</model>
+      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='yes' vendor='unknown'>qemu64</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 b5f488d514..b98f628fcb 100644
--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
@@ -63,61 +63,61 @@
       <feature policy='require' name='pschange-mc-no'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>qemu64</model>
-      <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='AMD'>phenom</model>
-      <model usable='yes' vendor='unknown'>pentium3</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
-      <model usable='yes' vendor='unknown'>pentium</model>
-      <model usable='no' vendor='Intel'>n270</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='yes' vendor='unknown'>kvm32</model>
-      <model usable='no' vendor='Intel'>coreduo</model>
-      <model usable='no' vendor='Intel'>core2duo</model>
-      <model usable='no' vendor='AMD'>athlon</model>
-      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
-      <model usable='yes' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Snowridge</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client</model>
-      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
-      <model usable='yes' vendor='Intel'>SandyBridge</model>
-      <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
-      <model usable='no' vendor='AMD'>Opteron_G4</model>
-      <model usable='yes' vendor='AMD'>Opteron_G3</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-      <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='Intel'>Nehalem</model>
-      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='Intel'>IvyBridge</model>
-      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Icelake-Server</model>
-      <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client-noTSX</model>
-      <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
-      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell</model>
-      <model usable='yes' vendor='AMD'>EPYC-Rome</model>
-      <model usable='no' vendor='AMD'>EPYC-Milan</model>
-      <model usable='yes' vendor='AMD'>EPYC-IBPB</model>
-      <model usable='yes' vendor='AMD'>EPYC</model>
-      <model usable='yes' vendor='Hygon'>Dhyana</model>
-      <model usable='no' vendor='Intel'>Cooperlake</model>
-      <model usable='yes' vendor='Intel'>Conroe</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
-      <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell</model>
       <model usable='yes' vendor='unknown'>486</model>
+      <model usable='no' vendor='Intel'>Broadwell</model>
+      <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
+      <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
+      <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cooperlake</model>
+      <model usable='yes' vendor='Hygon'>Dhyana</model>
+      <model usable='yes' vendor='AMD'>EPYC</model>
+      <model usable='yes' vendor='AMD'>EPYC-IBPB</model>
+      <model usable='no' vendor='AMD'>EPYC-Milan</model>
+      <model usable='yes' vendor='AMD'>EPYC-Rome</model>
+      <model usable='no' vendor='Intel'>Haswell</model>
+      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
+      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
+      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
+      <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client</model>
+      <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client-noTSX</model>
+      <model usable='no' vendor='Intel'>Icelake-Server</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
+      <model usable='no' vendor='Intel'>IvyBridge</model>
+      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
+      <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
+      <model usable='yes' vendor='AMD'>Opteron_G1</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>
+      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='yes' vendor='Intel'>Penryn</model>
+      <model usable='yes' vendor='Intel'>SandyBridge</model>
+      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Client</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Server</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Snowridge</model>
+      <model usable='yes' vendor='Intel'>Westmere</model>
+      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
+      <model usable='no' vendor='AMD'>athlon</model>
+      <model usable='no' vendor='Intel'>core2duo</model>
+      <model usable='no' vendor='Intel'>coreduo</model>
+      <model usable='yes' vendor='unknown'>kvm32</model>
+      <model usable='yes' vendor='unknown'>kvm64</model>
+      <model usable='no' vendor='Intel'>n270</model>
+      <model usable='yes' vendor='unknown'>pentium</model>
+      <model usable='yes' vendor='unknown'>pentium2</model>
+      <model usable='yes' vendor='unknown'>pentium3</model>
+      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='yes' vendor='unknown'>qemu64</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 3137894ade..1e4c60fe2f 100644
--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
@@ -75,61 +75,61 @@
       <feature policy='disable' name='misalignsse'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>qemu64</model>
-      <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='AMD'>phenom</model>
-      <model usable='yes' vendor='unknown'>pentium3</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
-      <model usable='yes' vendor='unknown'>pentium</model>
-      <model usable='yes' vendor='Intel'>n270</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='yes' vendor='unknown'>kvm32</model>
-      <model usable='yes' vendor='Intel'>coreduo</model>
-      <model usable='yes' vendor='Intel'>core2duo</model>
-      <model usable='yes' vendor='AMD'>athlon</model>
-      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
-      <model usable='yes' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Snowridge</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client</model>
-      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
-      <model usable='no' vendor='Intel'>SandyBridge</model>
-      <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
-      <model usable='no' vendor='AMD'>Opteron_G4</model>
-      <model usable='no' vendor='AMD'>Opteron_G3</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-      <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='Intel'>Nehalem</model>
-      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='Intel'>IvyBridge</model>
-      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Icelake-Server</model>
-      <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client-noTSX</model>
-      <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
-      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell</model>
-      <model usable='no' vendor='AMD'>EPYC-Rome</model>
-      <model usable='no' vendor='AMD'>EPYC-Milan</model>
-      <model usable='no' vendor='AMD'>EPYC-IBPB</model>
-      <model usable='no' vendor='AMD'>EPYC</model>
-      <model usable='no' vendor='Hygon'>Dhyana</model>
-      <model usable='no' vendor='Intel'>Cooperlake</model>
-      <model usable='yes' vendor='Intel'>Conroe</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
-      <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell</model>
       <model usable='yes' vendor='unknown'>486</model>
+      <model usable='no' vendor='Intel'>Broadwell</model>
+      <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
+      <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
+      <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cooperlake</model>
+      <model usable='no' vendor='Hygon'>Dhyana</model>
+      <model usable='no' vendor='AMD'>EPYC</model>
+      <model usable='no' vendor='AMD'>EPYC-IBPB</model>
+      <model usable='no' vendor='AMD'>EPYC-Milan</model>
+      <model usable='no' vendor='AMD'>EPYC-Rome</model>
+      <model usable='no' vendor='Intel'>Haswell</model>
+      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
+      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
+      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
+      <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client</model>
+      <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client-noTSX</model>
+      <model usable='no' vendor='Intel'>Icelake-Server</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
+      <model usable='no' vendor='Intel'>IvyBridge</model>
+      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
+      <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
+      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2</model>
+      <model usable='no' vendor='AMD'>Opteron_G3</model>
+      <model usable='no' vendor='AMD'>Opteron_G4</model>
+      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='yes' vendor='Intel'>Penryn</model>
+      <model usable='no' vendor='Intel'>SandyBridge</model>
+      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Client</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Server</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Snowridge</model>
+      <model usable='yes' vendor='Intel'>Westmere</model>
+      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
+      <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='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'>pentium2</model>
+      <model usable='yes' vendor='unknown'>pentium3</model>
+      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='yes' vendor='unknown'>qemu64</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 a99dccf800..c22f1a398c 100644
--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
@@ -62,61 +62,61 @@
       <feature policy='require' name='pschange-mc-no'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>qemu64</model>
-      <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='AMD'>phenom</model>
-      <model usable='yes' vendor='unknown'>pentium3</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
-      <model usable='yes' vendor='unknown'>pentium</model>
-      <model usable='no' vendor='Intel'>n270</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='yes' vendor='unknown'>kvm32</model>
-      <model usable='no' vendor='Intel'>coreduo</model>
-      <model usable='no' vendor='Intel'>core2duo</model>
-      <model usable='no' vendor='AMD'>athlon</model>
-      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
-      <model usable='yes' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Snowridge</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client</model>
-      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
-      <model usable='yes' vendor='Intel'>SandyBridge</model>
-      <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
-      <model usable='no' vendor='AMD'>Opteron_G4</model>
-      <model usable='yes' vendor='AMD'>Opteron_G3</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-      <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='Intel'>Nehalem</model>
-      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='Intel'>IvyBridge</model>
-      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Icelake-Server</model>
-      <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client-noTSX</model>
-      <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
-      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell</model>
-      <model usable='yes' vendor='AMD'>EPYC-Rome</model>
-      <model usable='no' vendor='AMD'>EPYC-Milan</model>
-      <model usable='yes' vendor='AMD'>EPYC-IBPB</model>
-      <model usable='yes' vendor='AMD'>EPYC</model>
-      <model usable='yes' vendor='Hygon'>Dhyana</model>
-      <model usable='no' vendor='Intel'>Cooperlake</model>
-      <model usable='yes' vendor='Intel'>Conroe</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
-      <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell</model>
       <model usable='yes' vendor='unknown'>486</model>
+      <model usable='no' vendor='Intel'>Broadwell</model>
+      <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
+      <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
+      <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cooperlake</model>
+      <model usable='yes' vendor='Hygon'>Dhyana</model>
+      <model usable='yes' vendor='AMD'>EPYC</model>
+      <model usable='yes' vendor='AMD'>EPYC-IBPB</model>
+      <model usable='no' vendor='AMD'>EPYC-Milan</model>
+      <model usable='yes' vendor='AMD'>EPYC-Rome</model>
+      <model usable='no' vendor='Intel'>Haswell</model>
+      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
+      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
+      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
+      <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client</model>
+      <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client-noTSX</model>
+      <model usable='no' vendor='Intel'>Icelake-Server</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
+      <model usable='no' vendor='Intel'>IvyBridge</model>
+      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
+      <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
+      <model usable='yes' vendor='AMD'>Opteron_G1</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>
+      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='yes' vendor='Intel'>Penryn</model>
+      <model usable='yes' vendor='Intel'>SandyBridge</model>
+      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Client</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Server</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Snowridge</model>
+      <model usable='yes' vendor='Intel'>Westmere</model>
+      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
+      <model usable='no' vendor='AMD'>athlon</model>
+      <model usable='no' vendor='Intel'>core2duo</model>
+      <model usable='no' vendor='Intel'>coreduo</model>
+      <model usable='yes' vendor='unknown'>kvm32</model>
+      <model usable='yes' vendor='unknown'>kvm64</model>
+      <model usable='no' vendor='Intel'>n270</model>
+      <model usable='yes' vendor='unknown'>pentium</model>
+      <model usable='yes' vendor='unknown'>pentium2</model>
+      <model usable='yes' vendor='unknown'>pentium3</model>
+      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='yes' vendor='unknown'>qemu64</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 2326871dc7..ddeabd8fa6 100644
--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
@@ -63,61 +63,61 @@
       <feature policy='require' name='pschange-mc-no'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>qemu64</model>
-      <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='AMD'>phenom</model>
-      <model usable='yes' vendor='unknown'>pentium3</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
-      <model usable='yes' vendor='unknown'>pentium</model>
-      <model usable='no' vendor='Intel'>n270</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='yes' vendor='unknown'>kvm32</model>
-      <model usable='no' vendor='Intel'>coreduo</model>
-      <model usable='no' vendor='Intel'>core2duo</model>
-      <model usable='no' vendor='AMD'>athlon</model>
-      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
-      <model usable='yes' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Snowridge</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client</model>
-      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
-      <model usable='yes' vendor='Intel'>SandyBridge</model>
-      <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
-      <model usable='no' vendor='AMD'>Opteron_G4</model>
-      <model usable='yes' vendor='AMD'>Opteron_G3</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-      <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='Intel'>Nehalem</model>
-      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='Intel'>IvyBridge</model>
-      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Icelake-Server</model>
-      <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client-noTSX</model>
-      <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
-      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell</model>
-      <model usable='yes' vendor='AMD'>EPYC-Rome</model>
-      <model usable='no' vendor='AMD'>EPYC-Milan</model>
-      <model usable='yes' vendor='AMD'>EPYC-IBPB</model>
-      <model usable='yes' vendor='AMD'>EPYC</model>
-      <model usable='yes' vendor='Hygon'>Dhyana</model>
-      <model usable='no' vendor='Intel'>Cooperlake</model>
-      <model usable='yes' vendor='Intel'>Conroe</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
-      <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell</model>
       <model usable='yes' vendor='unknown'>486</model>
+      <model usable='no' vendor='Intel'>Broadwell</model>
+      <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
+      <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
+      <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cooperlake</model>
+      <model usable='yes' vendor='Hygon'>Dhyana</model>
+      <model usable='yes' vendor='AMD'>EPYC</model>
+      <model usable='yes' vendor='AMD'>EPYC-IBPB</model>
+      <model usable='no' vendor='AMD'>EPYC-Milan</model>
+      <model usable='yes' vendor='AMD'>EPYC-Rome</model>
+      <model usable='no' vendor='Intel'>Haswell</model>
+      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
+      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
+      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
+      <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client</model>
+      <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client-noTSX</model>
+      <model usable='no' vendor='Intel'>Icelake-Server</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
+      <model usable='no' vendor='Intel'>IvyBridge</model>
+      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
+      <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
+      <model usable='yes' vendor='AMD'>Opteron_G1</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>
+      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='yes' vendor='Intel'>Penryn</model>
+      <model usable='yes' vendor='Intel'>SandyBridge</model>
+      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Client</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Server</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Snowridge</model>
+      <model usable='yes' vendor='Intel'>Westmere</model>
+      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
+      <model usable='no' vendor='AMD'>athlon</model>
+      <model usable='no' vendor='Intel'>core2duo</model>
+      <model usable='no' vendor='Intel'>coreduo</model>
+      <model usable='yes' vendor='unknown'>kvm32</model>
+      <model usable='yes' vendor='unknown'>kvm64</model>
+      <model usable='no' vendor='Intel'>n270</model>
+      <model usable='yes' vendor='unknown'>pentium</model>
+      <model usable='yes' vendor='unknown'>pentium2</model>
+      <model usable='yes' vendor='unknown'>pentium3</model>
+      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='yes' vendor='unknown'>qemu64</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 4270ba0b03..f9e62f215f 100644
--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
@@ -77,61 +77,61 @@
       <feature policy='disable' name='misalignsse'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>qemu64</model>
-      <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='AMD'>phenom</model>
-      <model usable='yes' vendor='unknown'>pentium3</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
-      <model usable='yes' vendor='unknown'>pentium</model>
-      <model usable='yes' vendor='Intel'>n270</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='yes' vendor='unknown'>kvm32</model>
-      <model usable='yes' vendor='Intel'>coreduo</model>
-      <model usable='yes' vendor='Intel'>core2duo</model>
-      <model usable='yes' vendor='AMD'>athlon</model>
-      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
-      <model usable='yes' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Snowridge</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client</model>
-      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
-      <model usable='no' vendor='Intel'>SandyBridge</model>
-      <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
-      <model usable='no' vendor='AMD'>Opteron_G4</model>
-      <model usable='no' vendor='AMD'>Opteron_G3</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-      <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='Intel'>Nehalem</model>
-      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='Intel'>IvyBridge</model>
-      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Icelake-Server</model>
-      <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client-noTSX</model>
-      <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
-      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell</model>
-      <model usable='no' vendor='AMD'>EPYC-Rome</model>
-      <model usable='no' vendor='AMD'>EPYC-Milan</model>
-      <model usable='no' vendor='AMD'>EPYC-IBPB</model>
-      <model usable='no' vendor='AMD'>EPYC</model>
-      <model usable='no' vendor='Hygon'>Dhyana</model>
-      <model usable='no' vendor='Intel'>Cooperlake</model>
-      <model usable='yes' vendor='Intel'>Conroe</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
-      <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell</model>
       <model usable='yes' vendor='unknown'>486</model>
+      <model usable='no' vendor='Intel'>Broadwell</model>
+      <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
+      <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
+      <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cooperlake</model>
+      <model usable='no' vendor='Hygon'>Dhyana</model>
+      <model usable='no' vendor='AMD'>EPYC</model>
+      <model usable='no' vendor='AMD'>EPYC-IBPB</model>
+      <model usable='no' vendor='AMD'>EPYC-Milan</model>
+      <model usable='no' vendor='AMD'>EPYC-Rome</model>
+      <model usable='no' vendor='Intel'>Haswell</model>
+      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
+      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
+      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
+      <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client</model>
+      <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client-noTSX</model>
+      <model usable='no' vendor='Intel'>Icelake-Server</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
+      <model usable='no' vendor='Intel'>IvyBridge</model>
+      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
+      <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
+      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2</model>
+      <model usable='no' vendor='AMD'>Opteron_G3</model>
+      <model usable='no' vendor='AMD'>Opteron_G4</model>
+      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='yes' vendor='Intel'>Penryn</model>
+      <model usable='no' vendor='Intel'>SandyBridge</model>
+      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Client</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Server</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Snowridge</model>
+      <model usable='yes' vendor='Intel'>Westmere</model>
+      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
+      <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='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'>pentium2</model>
+      <model usable='yes' vendor='unknown'>pentium3</model>
+      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='yes' vendor='unknown'>qemu64</model>
     </mode>
   </cpu>
   <memoryBacking supported='yes'>
diff --git a/tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml
index d0903aacc9..ea9a62d789 100644
--- a/tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml
@@ -39,45 +39,45 @@
     </mode>
     <mode name='host-model' supported='no'/>
     <mode name='custom' supported='yes'>
-      <model usable='unknown' vendor='unknown'>cortex-a9</model>
-      <model usable='unknown' vendor='unknown'>pxa250</model>
-      <model usable='unknown' vendor='unknown'>pxa270-a1</model>
-      <model usable='unknown' vendor='unknown'>arm946</model>
-      <model usable='unknown' vendor='unknown'>pxa270-c0</model>
-      <model usable='unknown' vendor='unknown'>max</model>
+      <model usable='unknown' vendor='unknown'>a64fx</model>
       <model usable='unknown' vendor='unknown'>arm1026</model>
-      <model usable='unknown' vendor='unknown'>pxa260</model>
-      <model usable='unknown' vendor='unknown'>pxa270-b1</model>
-      <model usable='unknown' vendor='unknown'>cortex-a57</model>
-      <model usable='unknown' vendor='unknown'>pxa255</model>
-      <model usable='unknown' vendor='unknown'>cortex-r5</model>
       <model usable='unknown' vendor='unknown'>arm1136</model>
-      <model usable='unknown' vendor='unknown'>cortex-a7</model>
-      <model usable='unknown' vendor='unknown'>pxa261</model>
-      <model usable='unknown' vendor='unknown'>pxa270-c5</model>
-      <model usable='unknown' vendor='unknown'>cortex-m3</model>
+      <model usable='unknown' vendor='unknown'>arm1136-r2</model>
       <model usable='unknown' vendor='unknown'>arm1176</model>
-      <model usable='unknown' vendor='unknown'>sa1100</model>
-      <model usable='unknown' vendor='unknown'>cortex-a53</model>
-      <model usable='unknown' vendor='unknown'>ti925t</model>
-      <model usable='unknown' vendor='unknown'>cortex-m33</model>
-      <model usable='unknown' vendor='unknown'>cortex-a8</model>
+      <model usable='unknown' vendor='unknown'>arm11mpcore</model>
       <model usable='unknown' vendor='unknown'>arm926</model>
+      <model usable='unknown' vendor='unknown'>arm946</model>
+      <model usable='unknown' vendor='unknown'>cortex-a15</model>
+      <model usable='unknown' vendor='unknown'>cortex-a53</model>
+      <model usable='unknown' vendor='unknown'>cortex-a57</model>
+      <model usable='unknown' vendor='unknown'>cortex-a7</model>
       <model usable='unknown' vendor='unknown'>cortex-a72</model>
-      <model usable='unknown' vendor='unknown'>pxa270</model>
-      <model usable='unknown' vendor='unknown'>pxa270-a0</model>
+      <model usable='unknown' vendor='unknown'>cortex-a8</model>
+      <model usable='unknown' vendor='unknown'>cortex-a9</model>
+      <model usable='unknown' vendor='unknown'>cortex-m0</model>
+      <model usable='unknown' vendor='unknown'>cortex-m3</model>
+      <model usable='unknown' vendor='unknown'>cortex-m33</model>
       <model usable='unknown' vendor='unknown'>cortex-m4</model>
       <model usable='unknown' vendor='unknown'>cortex-m55</model>
-      <model usable='unknown' vendor='unknown'>a64fx</model>
       <model usable='unknown' vendor='unknown'>cortex-m7</model>
-      <model usable='unknown' vendor='unknown'>cortex-a15</model>
-      <model usable='unknown' vendor='unknown'>arm11mpcore</model>
+      <model usable='unknown' vendor='unknown'>cortex-r5</model>
       <model usable='unknown' vendor='unknown'>cortex-r5f</model>
-      <model usable='unknown' vendor='unknown'>cortex-m0</model>
-      <model usable='unknown' vendor='unknown'>sa1110</model>
-      <model usable='unknown' vendor='unknown'>arm1136-r2</model>
-      <model usable='unknown' vendor='unknown'>pxa270-b0</model>
+      <model usable='unknown' vendor='unknown'>max</model>
+      <model usable='unknown' vendor='unknown'>pxa250</model>
+      <model usable='unknown' vendor='unknown'>pxa255</model>
+      <model usable='unknown' vendor='unknown'>pxa260</model>
+      <model usable='unknown' vendor='unknown'>pxa261</model>
       <model usable='unknown' vendor='unknown'>pxa262</model>
+      <model usable='unknown' vendor='unknown'>pxa270</model>
+      <model usable='unknown' vendor='unknown'>pxa270-a0</model>
+      <model usable='unknown' vendor='unknown'>pxa270-a1</model>
+      <model usable='unknown' vendor='unknown'>pxa270-b0</model>
+      <model usable='unknown' vendor='unknown'>pxa270-b1</model>
+      <model usable='unknown' vendor='unknown'>pxa270-c0</model>
+      <model usable='unknown' vendor='unknown'>pxa270-c5</model>
+      <model usable='unknown' vendor='unknown'>sa1100</model>
+      <model usable='unknown' vendor='unknown'>sa1110</model>
+      <model usable='unknown' vendor='unknown'>ti925t</model>
     </mode>
   </cpu>
   <memoryBacking supported='yes'>
diff --git a/tests/domaincapsdata/qemu_6.2.0.aarch64.xml b/tests/domaincapsdata/qemu_6.2.0.aarch64.xml
index d0903aacc9..ea9a62d789 100644
--- a/tests/domaincapsdata/qemu_6.2.0.aarch64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0.aarch64.xml
@@ -39,45 +39,45 @@
     </mode>
     <mode name='host-model' supported='no'/>
     <mode name='custom' supported='yes'>
-      <model usable='unknown' vendor='unknown'>cortex-a9</model>
-      <model usable='unknown' vendor='unknown'>pxa250</model>
-      <model usable='unknown' vendor='unknown'>pxa270-a1</model>
-      <model usable='unknown' vendor='unknown'>arm946</model>
-      <model usable='unknown' vendor='unknown'>pxa270-c0</model>
-      <model usable='unknown' vendor='unknown'>max</model>
+      <model usable='unknown' vendor='unknown'>a64fx</model>
       <model usable='unknown' vendor='unknown'>arm1026</model>
-      <model usable='unknown' vendor='unknown'>pxa260</model>
-      <model usable='unknown' vendor='unknown'>pxa270-b1</model>
-      <model usable='unknown' vendor='unknown'>cortex-a57</model>
-      <model usable='unknown' vendor='unknown'>pxa255</model>
-      <model usable='unknown' vendor='unknown'>cortex-r5</model>
       <model usable='unknown' vendor='unknown'>arm1136</model>
-      <model usable='unknown' vendor='unknown'>cortex-a7</model>
-      <model usable='unknown' vendor='unknown'>pxa261</model>
-      <model usable='unknown' vendor='unknown'>pxa270-c5</model>
-      <model usable='unknown' vendor='unknown'>cortex-m3</model>
+      <model usable='unknown' vendor='unknown'>arm1136-r2</model>
       <model usable='unknown' vendor='unknown'>arm1176</model>
-      <model usable='unknown' vendor='unknown'>sa1100</model>
-      <model usable='unknown' vendor='unknown'>cortex-a53</model>
-      <model usable='unknown' vendor='unknown'>ti925t</model>
-      <model usable='unknown' vendor='unknown'>cortex-m33</model>
-      <model usable='unknown' vendor='unknown'>cortex-a8</model>
+      <model usable='unknown' vendor='unknown'>arm11mpcore</model>
       <model usable='unknown' vendor='unknown'>arm926</model>
+      <model usable='unknown' vendor='unknown'>arm946</model>
+      <model usable='unknown' vendor='unknown'>cortex-a15</model>
+      <model usable='unknown' vendor='unknown'>cortex-a53</model>
+      <model usable='unknown' vendor='unknown'>cortex-a57</model>
+      <model usable='unknown' vendor='unknown'>cortex-a7</model>
       <model usable='unknown' vendor='unknown'>cortex-a72</model>
-      <model usable='unknown' vendor='unknown'>pxa270</model>
-      <model usable='unknown' vendor='unknown'>pxa270-a0</model>
+      <model usable='unknown' vendor='unknown'>cortex-a8</model>
+      <model usable='unknown' vendor='unknown'>cortex-a9</model>
+      <model usable='unknown' vendor='unknown'>cortex-m0</model>
+      <model usable='unknown' vendor='unknown'>cortex-m3</model>
+      <model usable='unknown' vendor='unknown'>cortex-m33</model>
       <model usable='unknown' vendor='unknown'>cortex-m4</model>
       <model usable='unknown' vendor='unknown'>cortex-m55</model>
-      <model usable='unknown' vendor='unknown'>a64fx</model>
       <model usable='unknown' vendor='unknown'>cortex-m7</model>
-      <model usable='unknown' vendor='unknown'>cortex-a15</model>
-      <model usable='unknown' vendor='unknown'>arm11mpcore</model>
+      <model usable='unknown' vendor='unknown'>cortex-r5</model>
       <model usable='unknown' vendor='unknown'>cortex-r5f</model>
-      <model usable='unknown' vendor='unknown'>cortex-m0</model>
-      <model usable='unknown' vendor='unknown'>sa1110</model>
-      <model usable='unknown' vendor='unknown'>arm1136-r2</model>
-      <model usable='unknown' vendor='unknown'>pxa270-b0</model>
+      <model usable='unknown' vendor='unknown'>max</model>
+      <model usable='unknown' vendor='unknown'>pxa250</model>
+      <model usable='unknown' vendor='unknown'>pxa255</model>
+      <model usable='unknown' vendor='unknown'>pxa260</model>
+      <model usable='unknown' vendor='unknown'>pxa261</model>
       <model usable='unknown' vendor='unknown'>pxa262</model>
+      <model usable='unknown' vendor='unknown'>pxa270</model>
+      <model usable='unknown' vendor='unknown'>pxa270-a0</model>
+      <model usable='unknown' vendor='unknown'>pxa270-a1</model>
+      <model usable='unknown' vendor='unknown'>pxa270-b0</model>
+      <model usable='unknown' vendor='unknown'>pxa270-b1</model>
+      <model usable='unknown' vendor='unknown'>pxa270-c0</model>
+      <model usable='unknown' vendor='unknown'>pxa270-c5</model>
+      <model usable='unknown' vendor='unknown'>sa1100</model>
+      <model usable='unknown' vendor='unknown'>sa1110</model>
+      <model usable='unknown' vendor='unknown'>ti925t</model>
     </mode>
   </cpu>
   <memoryBacking supported='yes'>
diff --git a/tests/domaincapsdata/qemu_6.2.0.ppc64.xml b/tests/domaincapsdata/qemu_6.2.0.ppc64.xml
index fe62364dbc..84f2f31e44 100644
--- a/tests/domaincapsdata/qemu_6.2.0.ppc64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0.ppc64.xml
@@ -41,9 +41,9 @@
     </mode>
     <mode name='custom' supported='yes'>
       <model usable='unknown' vendor='IBM'>POWER10</model>
-      <model usable='unknown' vendor='IBM'>POWER9</model>
-      <model usable='unknown' vendor='IBM'>POWER8</model>
       <model usable='unknown' vendor='IBM'>POWER7</model>
+      <model usable='unknown' vendor='IBM'>POWER8</model>
+      <model usable='unknown' vendor='IBM'>POWER9</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 63ddcaec21..010d3199fa 100644
--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
@@ -62,61 +62,61 @@
       <feature policy='require' name='pschange-mc-no'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>qemu64</model>
-      <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='AMD'>phenom</model>
-      <model usable='yes' vendor='unknown'>pentium3</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
-      <model usable='yes' vendor='unknown'>pentium</model>
-      <model usable='no' vendor='Intel'>n270</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='yes' vendor='unknown'>kvm32</model>
-      <model usable='no' vendor='Intel'>coreduo</model>
-      <model usable='no' vendor='Intel'>core2duo</model>
-      <model usable='no' vendor='AMD'>athlon</model>
-      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
-      <model usable='yes' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Snowridge</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client</model>
-      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
-      <model usable='yes' vendor='Intel'>SandyBridge</model>
-      <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
-      <model usable='no' vendor='AMD'>Opteron_G4</model>
-      <model usable='yes' vendor='AMD'>Opteron_G3</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-      <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='Intel'>Nehalem</model>
-      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='Intel'>IvyBridge</model>
-      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Icelake-Server</model>
-      <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client-noTSX</model>
-      <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
-      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell</model>
-      <model usable='yes' vendor='AMD'>EPYC-Rome</model>
-      <model usable='no' vendor='AMD'>EPYC-Milan</model>
-      <model usable='yes' vendor='AMD'>EPYC-IBPB</model>
-      <model usable='yes' vendor='AMD'>EPYC</model>
-      <model usable='yes' vendor='Hygon'>Dhyana</model>
-      <model usable='no' vendor='Intel'>Cooperlake</model>
-      <model usable='yes' vendor='Intel'>Conroe</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
-      <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell</model>
       <model usable='yes' vendor='unknown'>486</model>
+      <model usable='no' vendor='Intel'>Broadwell</model>
+      <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
+      <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
+      <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cooperlake</model>
+      <model usable='yes' vendor='Hygon'>Dhyana</model>
+      <model usable='yes' vendor='AMD'>EPYC</model>
+      <model usable='yes' vendor='AMD'>EPYC-IBPB</model>
+      <model usable='no' vendor='AMD'>EPYC-Milan</model>
+      <model usable='yes' vendor='AMD'>EPYC-Rome</model>
+      <model usable='no' vendor='Intel'>Haswell</model>
+      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
+      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
+      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
+      <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client</model>
+      <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client-noTSX</model>
+      <model usable='no' vendor='Intel'>Icelake-Server</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
+      <model usable='no' vendor='Intel'>IvyBridge</model>
+      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
+      <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
+      <model usable='yes' vendor='AMD'>Opteron_G1</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>
+      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='yes' vendor='Intel'>Penryn</model>
+      <model usable='yes' vendor='Intel'>SandyBridge</model>
+      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Client</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Server</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Snowridge</model>
+      <model usable='yes' vendor='Intel'>Westmere</model>
+      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
+      <model usable='no' vendor='AMD'>athlon</model>
+      <model usable='no' vendor='Intel'>core2duo</model>
+      <model usable='no' vendor='Intel'>coreduo</model>
+      <model usable='yes' vendor='unknown'>kvm32</model>
+      <model usable='yes' vendor='unknown'>kvm64</model>
+      <model usable='no' vendor='Intel'>n270</model>
+      <model usable='yes' vendor='unknown'>pentium</model>
+      <model usable='yes' vendor='unknown'>pentium2</model>
+      <model usable='yes' vendor='unknown'>pentium3</model>
+      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='yes' vendor='unknown'>qemu64</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 83c62a1140..0451ee3439 100644
--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
@@ -64,61 +64,61 @@
       <feature policy='require' name='pschange-mc-no'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>qemu64</model>
-      <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='AMD'>phenom</model>
-      <model usable='yes' vendor='unknown'>pentium3</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
-      <model usable='yes' vendor='unknown'>pentium</model>
-      <model usable='no' vendor='Intel'>n270</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='yes' vendor='unknown'>kvm32</model>
-      <model usable='no' vendor='Intel'>coreduo</model>
-      <model usable='no' vendor='Intel'>core2duo</model>
-      <model usable='no' vendor='AMD'>athlon</model>
-      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
-      <model usable='yes' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Snowridge</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client</model>
-      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
-      <model usable='yes' vendor='Intel'>SandyBridge</model>
-      <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
-      <model usable='no' vendor='AMD'>Opteron_G4</model>
-      <model usable='yes' vendor='AMD'>Opteron_G3</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-      <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='Intel'>Nehalem</model>
-      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='Intel'>IvyBridge</model>
-      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Icelake-Server</model>
-      <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client-noTSX</model>
-      <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
-      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell</model>
-      <model usable='yes' vendor='AMD'>EPYC-Rome</model>
-      <model usable='no' vendor='AMD'>EPYC-Milan</model>
-      <model usable='yes' vendor='AMD'>EPYC-IBPB</model>
-      <model usable='yes' vendor='AMD'>EPYC</model>
-      <model usable='yes' vendor='Hygon'>Dhyana</model>
-      <model usable='no' vendor='Intel'>Cooperlake</model>
-      <model usable='yes' vendor='Intel'>Conroe</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
-      <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell</model>
       <model usable='yes' vendor='unknown'>486</model>
+      <model usable='no' vendor='Intel'>Broadwell</model>
+      <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
+      <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
+      <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cooperlake</model>
+      <model usable='yes' vendor='Hygon'>Dhyana</model>
+      <model usable='yes' vendor='AMD'>EPYC</model>
+      <model usable='yes' vendor='AMD'>EPYC-IBPB</model>
+      <model usable='no' vendor='AMD'>EPYC-Milan</model>
+      <model usable='yes' vendor='AMD'>EPYC-Rome</model>
+      <model usable='no' vendor='Intel'>Haswell</model>
+      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
+      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
+      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
+      <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client</model>
+      <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client-noTSX</model>
+      <model usable='no' vendor='Intel'>Icelake-Server</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
+      <model usable='no' vendor='Intel'>IvyBridge</model>
+      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
+      <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
+      <model usable='yes' vendor='AMD'>Opteron_G1</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>
+      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='yes' vendor='Intel'>Penryn</model>
+      <model usable='yes' vendor='Intel'>SandyBridge</model>
+      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Client</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Server</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Snowridge</model>
+      <model usable='yes' vendor='Intel'>Westmere</model>
+      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
+      <model usable='no' vendor='AMD'>athlon</model>
+      <model usable='no' vendor='Intel'>core2duo</model>
+      <model usable='no' vendor='Intel'>coreduo</model>
+      <model usable='yes' vendor='unknown'>kvm32</model>
+      <model usable='yes' vendor='unknown'>kvm64</model>
+      <model usable='no' vendor='Intel'>n270</model>
+      <model usable='yes' vendor='unknown'>pentium</model>
+      <model usable='yes' vendor='unknown'>pentium2</model>
+      <model usable='yes' vendor='unknown'>pentium3</model>
+      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='yes' vendor='unknown'>qemu64</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 00adacd184..a7ce3641bb 100644
--- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
@@ -78,61 +78,61 @@
       <feature policy='disable' name='misalignsse'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>qemu64</model>
-      <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='AMD'>phenom</model>
-      <model usable='yes' vendor='unknown'>pentium3</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
-      <model usable='yes' vendor='unknown'>pentium</model>
-      <model usable='yes' vendor='Intel'>n270</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='yes' vendor='unknown'>kvm32</model>
-      <model usable='yes' vendor='Intel'>coreduo</model>
-      <model usable='yes' vendor='Intel'>core2duo</model>
-      <model usable='yes' vendor='AMD'>athlon</model>
-      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
-      <model usable='yes' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Snowridge</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client</model>
-      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
-      <model usable='no' vendor='Intel'>SandyBridge</model>
-      <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
-      <model usable='no' vendor='AMD'>Opteron_G4</model>
-      <model usable='no' vendor='AMD'>Opteron_G3</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-      <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='Intel'>Nehalem</model>
-      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='Intel'>IvyBridge</model>
-      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Icelake-Server</model>
-      <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client-noTSX</model>
-      <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
-      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell</model>
-      <model usable='no' vendor='AMD'>EPYC-Rome</model>
-      <model usable='no' vendor='AMD'>EPYC-Milan</model>
-      <model usable='no' vendor='AMD'>EPYC-IBPB</model>
-      <model usable='no' vendor='AMD'>EPYC</model>
-      <model usable='no' vendor='Hygon'>Dhyana</model>
-      <model usable='no' vendor='Intel'>Cooperlake</model>
-      <model usable='yes' vendor='Intel'>Conroe</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
-      <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell</model>
       <model usable='yes' vendor='unknown'>486</model>
+      <model usable='no' vendor='Intel'>Broadwell</model>
+      <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
+      <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
+      <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cooperlake</model>
+      <model usable='no' vendor='Hygon'>Dhyana</model>
+      <model usable='no' vendor='AMD'>EPYC</model>
+      <model usable='no' vendor='AMD'>EPYC-IBPB</model>
+      <model usable='no' vendor='AMD'>EPYC-Milan</model>
+      <model usable='no' vendor='AMD'>EPYC-Rome</model>
+      <model usable='no' vendor='Intel'>Haswell</model>
+      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
+      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
+      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
+      <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client</model>
+      <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client-noTSX</model>
+      <model usable='no' vendor='Intel'>Icelake-Server</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
+      <model usable='no' vendor='Intel'>IvyBridge</model>
+      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
+      <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
+      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2</model>
+      <model usable='no' vendor='AMD'>Opteron_G3</model>
+      <model usable='no' vendor='AMD'>Opteron_G4</model>
+      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='yes' vendor='Intel'>Penryn</model>
+      <model usable='no' vendor='Intel'>SandyBridge</model>
+      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Client</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Server</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Snowridge</model>
+      <model usable='yes' vendor='Intel'>Westmere</model>
+      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
+      <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='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'>pentium2</model>
+      <model usable='yes' vendor='unknown'>pentium3</model>
+      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='yes' vendor='unknown'>qemu64</model>
     </mode>
   </cpu>
   <memoryBacking supported='yes'>
diff --git a/tests/domaincapsdata/qemu_7.0.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_7.0.0-virt.aarch64.xml
index 216e39993a..1e0fca4988 100644
--- a/tests/domaincapsdata/qemu_7.0.0-virt.aarch64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-virt.aarch64.xml
@@ -39,45 +39,45 @@
     </mode>
     <mode name='host-model' supported='no'/>
     <mode name='custom' supported='yes'>
-      <model usable='unknown' vendor='unknown'>cortex-a9</model>
-      <model usable='unknown' vendor='unknown'>pxa250</model>
-      <model usable='unknown' vendor='unknown'>pxa270-a1</model>
-      <model usable='unknown' vendor='unknown'>arm946</model>
-      <model usable='unknown' vendor='unknown'>pxa270-c0</model>
-      <model usable='unknown' vendor='unknown'>max</model>
+      <model usable='unknown' vendor='unknown'>a64fx</model>
       <model usable='unknown' vendor='unknown'>arm1026</model>
-      <model usable='unknown' vendor='unknown'>pxa260</model>
-      <model usable='unknown' vendor='unknown'>pxa270-b1</model>
-      <model usable='unknown' vendor='unknown'>cortex-a57</model>
-      <model usable='unknown' vendor='unknown'>pxa255</model>
-      <model usable='unknown' vendor='unknown'>cortex-r5</model>
       <model usable='unknown' vendor='unknown'>arm1136</model>
-      <model usable='unknown' vendor='unknown'>cortex-a7</model>
-      <model usable='unknown' vendor='unknown'>pxa261</model>
-      <model usable='unknown' vendor='unknown'>pxa270-c5</model>
-      <model usable='unknown' vendor='unknown'>cortex-m3</model>
+      <model usable='unknown' vendor='unknown'>arm1136-r2</model>
       <model usable='unknown' vendor='unknown'>arm1176</model>
-      <model usable='unknown' vendor='unknown'>sa1100</model>
-      <model usable='unknown' vendor='unknown'>ti925t</model>
-      <model usable='unknown' vendor='unknown'>cortex-a53</model>
-      <model usable='unknown' vendor='unknown'>cortex-m33</model>
-      <model usable='unknown' vendor='unknown'>cortex-a8</model>
+      <model usable='unknown' vendor='unknown'>arm11mpcore</model>
       <model usable='unknown' vendor='unknown'>arm926</model>
+      <model usable='unknown' vendor='unknown'>arm946</model>
+      <model usable='unknown' vendor='unknown'>cortex-a15</model>
+      <model usable='unknown' vendor='unknown'>cortex-a53</model>
+      <model usable='unknown' vendor='unknown'>cortex-a57</model>
+      <model usable='unknown' vendor='unknown'>cortex-a7</model>
       <model usable='unknown' vendor='unknown'>cortex-a72</model>
-      <model usable='unknown' vendor='unknown'>pxa270</model>
-      <model usable='unknown' vendor='unknown'>pxa270-a0</model>
+      <model usable='unknown' vendor='unknown'>cortex-a8</model>
+      <model usable='unknown' vendor='unknown'>cortex-a9</model>
+      <model usable='unknown' vendor='unknown'>cortex-m0</model>
+      <model usable='unknown' vendor='unknown'>cortex-m3</model>
+      <model usable='unknown' vendor='unknown'>cortex-m33</model>
       <model usable='unknown' vendor='unknown'>cortex-m4</model>
       <model usable='unknown' vendor='unknown'>cortex-m55</model>
-      <model usable='unknown' vendor='unknown'>a64fx</model>
       <model usable='unknown' vendor='unknown'>cortex-m7</model>
-      <model usable='unknown' vendor='unknown'>cortex-a15</model>
-      <model usable='unknown' vendor='unknown'>arm11mpcore</model>
+      <model usable='unknown' vendor='unknown'>cortex-r5</model>
       <model usable='unknown' vendor='unknown'>cortex-r5f</model>
-      <model usable='unknown' vendor='unknown'>cortex-m0</model>
-      <model usable='unknown' vendor='unknown'>sa1110</model>
-      <model usable='unknown' vendor='unknown'>arm1136-r2</model>
-      <model usable='unknown' vendor='unknown'>pxa270-b0</model>
+      <model usable='unknown' vendor='unknown'>max</model>
+      <model usable='unknown' vendor='unknown'>pxa250</model>
+      <model usable='unknown' vendor='unknown'>pxa255</model>
+      <model usable='unknown' vendor='unknown'>pxa260</model>
+      <model usable='unknown' vendor='unknown'>pxa261</model>
       <model usable='unknown' vendor='unknown'>pxa262</model>
+      <model usable='unknown' vendor='unknown'>pxa270</model>
+      <model usable='unknown' vendor='unknown'>pxa270-a0</model>
+      <model usable='unknown' vendor='unknown'>pxa270-a1</model>
+      <model usable='unknown' vendor='unknown'>pxa270-b0</model>
+      <model usable='unknown' vendor='unknown'>pxa270-b1</model>
+      <model usable='unknown' vendor='unknown'>pxa270-c0</model>
+      <model usable='unknown' vendor='unknown'>pxa270-c5</model>
+      <model usable='unknown' vendor='unknown'>sa1100</model>
+      <model usable='unknown' vendor='unknown'>sa1110</model>
+      <model usable='unknown' vendor='unknown'>ti925t</model>
     </mode>
   </cpu>
   <memoryBacking supported='yes'>
diff --git a/tests/domaincapsdata/qemu_7.0.0.aarch64.xml b/tests/domaincapsdata/qemu_7.0.0.aarch64.xml
index 216e39993a..1e0fca4988 100644
--- a/tests/domaincapsdata/qemu_7.0.0.aarch64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0.aarch64.xml
@@ -39,45 +39,45 @@
     </mode>
     <mode name='host-model' supported='no'/>
     <mode name='custom' supported='yes'>
-      <model usable='unknown' vendor='unknown'>cortex-a9</model>
-      <model usable='unknown' vendor='unknown'>pxa250</model>
-      <model usable='unknown' vendor='unknown'>pxa270-a1</model>
-      <model usable='unknown' vendor='unknown'>arm946</model>
-      <model usable='unknown' vendor='unknown'>pxa270-c0</model>
-      <model usable='unknown' vendor='unknown'>max</model>
+      <model usable='unknown' vendor='unknown'>a64fx</model>
       <model usable='unknown' vendor='unknown'>arm1026</model>
-      <model usable='unknown' vendor='unknown'>pxa260</model>
-      <model usable='unknown' vendor='unknown'>pxa270-b1</model>
-      <model usable='unknown' vendor='unknown'>cortex-a57</model>
-      <model usable='unknown' vendor='unknown'>pxa255</model>
-      <model usable='unknown' vendor='unknown'>cortex-r5</model>
       <model usable='unknown' vendor='unknown'>arm1136</model>
-      <model usable='unknown' vendor='unknown'>cortex-a7</model>
-      <model usable='unknown' vendor='unknown'>pxa261</model>
-      <model usable='unknown' vendor='unknown'>pxa270-c5</model>
-      <model usable='unknown' vendor='unknown'>cortex-m3</model>
+      <model usable='unknown' vendor='unknown'>arm1136-r2</model>
       <model usable='unknown' vendor='unknown'>arm1176</model>
-      <model usable='unknown' vendor='unknown'>sa1100</model>
-      <model usable='unknown' vendor='unknown'>ti925t</model>
-      <model usable='unknown' vendor='unknown'>cortex-a53</model>
-      <model usable='unknown' vendor='unknown'>cortex-m33</model>
-      <model usable='unknown' vendor='unknown'>cortex-a8</model>
+      <model usable='unknown' vendor='unknown'>arm11mpcore</model>
       <model usable='unknown' vendor='unknown'>arm926</model>
+      <model usable='unknown' vendor='unknown'>arm946</model>
+      <model usable='unknown' vendor='unknown'>cortex-a15</model>
+      <model usable='unknown' vendor='unknown'>cortex-a53</model>
+      <model usable='unknown' vendor='unknown'>cortex-a57</model>
+      <model usable='unknown' vendor='unknown'>cortex-a7</model>
       <model usable='unknown' vendor='unknown'>cortex-a72</model>
-      <model usable='unknown' vendor='unknown'>pxa270</model>
-      <model usable='unknown' vendor='unknown'>pxa270-a0</model>
+      <model usable='unknown' vendor='unknown'>cortex-a8</model>
+      <model usable='unknown' vendor='unknown'>cortex-a9</model>
+      <model usable='unknown' vendor='unknown'>cortex-m0</model>
+      <model usable='unknown' vendor='unknown'>cortex-m3</model>
+      <model usable='unknown' vendor='unknown'>cortex-m33</model>
       <model usable='unknown' vendor='unknown'>cortex-m4</model>
       <model usable='unknown' vendor='unknown'>cortex-m55</model>
-      <model usable='unknown' vendor='unknown'>a64fx</model>
       <model usable='unknown' vendor='unknown'>cortex-m7</model>
-      <model usable='unknown' vendor='unknown'>cortex-a15</model>
-      <model usable='unknown' vendor='unknown'>arm11mpcore</model>
+      <model usable='unknown' vendor='unknown'>cortex-r5</model>
       <model usable='unknown' vendor='unknown'>cortex-r5f</model>
-      <model usable='unknown' vendor='unknown'>cortex-m0</model>
-      <model usable='unknown' vendor='unknown'>sa1110</model>
-      <model usable='unknown' vendor='unknown'>arm1136-r2</model>
-      <model usable='unknown' vendor='unknown'>pxa270-b0</model>
+      <model usable='unknown' vendor='unknown'>max</model>
+      <model usable='unknown' vendor='unknown'>pxa250</model>
+      <model usable='unknown' vendor='unknown'>pxa255</model>
+      <model usable='unknown' vendor='unknown'>pxa260</model>
+      <model usable='unknown' vendor='unknown'>pxa261</model>
       <model usable='unknown' vendor='unknown'>pxa262</model>
+      <model usable='unknown' vendor='unknown'>pxa270</model>
+      <model usable='unknown' vendor='unknown'>pxa270-a0</model>
+      <model usable='unknown' vendor='unknown'>pxa270-a1</model>
+      <model usable='unknown' vendor='unknown'>pxa270-b0</model>
+      <model usable='unknown' vendor='unknown'>pxa270-b1</model>
+      <model usable='unknown' vendor='unknown'>pxa270-c0</model>
+      <model usable='unknown' vendor='unknown'>pxa270-c5</model>
+      <model usable='unknown' vendor='unknown'>sa1100</model>
+      <model usable='unknown' vendor='unknown'>sa1110</model>
+      <model usable='unknown' vendor='unknown'>ti925t</model>
     </mode>
   </cpu>
   <memoryBacking supported='yes'>
diff --git a/tests/domaincapsdata/qemu_7.0.0.ppc64.xml b/tests/domaincapsdata/qemu_7.0.0.ppc64.xml
index e0fda8fca2..9c31ff40dc 100644
--- a/tests/domaincapsdata/qemu_7.0.0.ppc64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0.ppc64.xml
@@ -41,9 +41,9 @@
     </mode>
     <mode name='custom' supported='yes'>
       <model usable='unknown' vendor='IBM'>POWER10</model>
-      <model usable='unknown' vendor='IBM'>POWER9</model>
-      <model usable='unknown' vendor='IBM'>POWER8</model>
       <model usable='unknown' vendor='IBM'>POWER7</model>
+      <model usable='unknown' vendor='IBM'>POWER8</model>
+      <model usable='unknown' vendor='IBM'>POWER9</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 97e3888862..c980906edb 100644
--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
@@ -63,61 +63,61 @@
       <feature policy='require' name='pschange-mc-no'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>qemu64</model>
-      <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='AMD'>phenom</model>
-      <model usable='yes' vendor='unknown'>pentium3</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
-      <model usable='yes' vendor='unknown'>pentium</model>
-      <model usable='no' vendor='Intel'>n270</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='yes' vendor='unknown'>kvm32</model>
-      <model usable='no' vendor='Intel'>coreduo</model>
-      <model usable='no' vendor='Intel'>core2duo</model>
-      <model usable='no' vendor='AMD'>athlon</model>
-      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
-      <model usable='yes' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Snowridge</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client</model>
-      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
-      <model usable='yes' vendor='Intel'>SandyBridge</model>
-      <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
-      <model usable='no' vendor='AMD'>Opteron_G4</model>
-      <model usable='yes' vendor='AMD'>Opteron_G3</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-      <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='Intel'>Nehalem</model>
-      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='Intel'>IvyBridge</model>
-      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Icelake-Server</model>
-      <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client-noTSX</model>
-      <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
-      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell</model>
-      <model usable='yes' vendor='AMD'>EPYC-Rome</model>
-      <model usable='no' vendor='AMD'>EPYC-Milan</model>
-      <model usable='yes' vendor='AMD'>EPYC-IBPB</model>
-      <model usable='yes' vendor='AMD'>EPYC</model>
-      <model usable='yes' vendor='Hygon'>Dhyana</model>
-      <model usable='no' vendor='Intel'>Cooperlake</model>
-      <model usable='yes' vendor='Intel'>Conroe</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
-      <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell</model>
       <model usable='yes' vendor='unknown'>486</model>
+      <model usable='no' vendor='Intel'>Broadwell</model>
+      <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
+      <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
+      <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cooperlake</model>
+      <model usable='yes' vendor='Hygon'>Dhyana</model>
+      <model usable='yes' vendor='AMD'>EPYC</model>
+      <model usable='yes' vendor='AMD'>EPYC-IBPB</model>
+      <model usable='no' vendor='AMD'>EPYC-Milan</model>
+      <model usable='yes' vendor='AMD'>EPYC-Rome</model>
+      <model usable='no' vendor='Intel'>Haswell</model>
+      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
+      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
+      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
+      <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client</model>
+      <model usable='no' deprecated='yes' vendor='Intel'>Icelake-Client-noTSX</model>
+      <model usable='no' vendor='Intel'>Icelake-Server</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
+      <model usable='no' vendor='Intel'>IvyBridge</model>
+      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
+      <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
+      <model usable='yes' vendor='AMD'>Opteron_G1</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>
+      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='yes' vendor='Intel'>Penryn</model>
+      <model usable='yes' vendor='Intel'>SandyBridge</model>
+      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Client</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Server</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Snowridge</model>
+      <model usable='yes' vendor='Intel'>Westmere</model>
+      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
+      <model usable='no' vendor='AMD'>athlon</model>
+      <model usable='no' vendor='Intel'>core2duo</model>
+      <model usable='no' vendor='Intel'>coreduo</model>
+      <model usable='yes' vendor='unknown'>kvm32</model>
+      <model usable='yes' vendor='unknown'>kvm64</model>
+      <model usable='no' vendor='Intel'>n270</model>
+      <model usable='yes' vendor='unknown'>pentium</model>
+      <model usable='yes' vendor='unknown'>pentium2</model>
+      <model usable='yes' vendor='unknown'>pentium3</model>
+      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='yes' vendor='unknown'>qemu64</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 1b55b9b4f7..83a75cc73d 100644
--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
@@ -65,59 +65,59 @@
       <feature policy='require' name='pschange-mc-no'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>qemu64</model>
-      <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='AMD'>phenom</model>
-      <model usable='yes' vendor='unknown'>pentium3</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
-      <model usable='yes' vendor='unknown'>pentium</model>
-      <model usable='no' vendor='Intel'>n270</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='yes' vendor='unknown'>kvm32</model>
-      <model usable='no' vendor='Intel'>coreduo</model>
-      <model usable='no' vendor='Intel'>core2duo</model>
-      <model usable='no' vendor='AMD'>athlon</model>
-      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
-      <model usable='yes' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Snowridge</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client</model>
-      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
-      <model usable='yes' vendor='Intel'>SandyBridge</model>
-      <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
-      <model usable='no' vendor='AMD'>Opteron_G4</model>
-      <model usable='yes' vendor='AMD'>Opteron_G3</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-      <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='Intel'>Nehalem</model>
-      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='Intel'>IvyBridge</model>
-      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Icelake-Server</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
-      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell</model>
-      <model usable='yes' vendor='AMD'>EPYC-Rome</model>
-      <model usable='no' vendor='AMD'>EPYC-Milan</model>
-      <model usable='yes' vendor='AMD'>EPYC-IBPB</model>
-      <model usable='yes' vendor='AMD'>EPYC</model>
-      <model usable='yes' vendor='Hygon'>Dhyana</model>
-      <model usable='no' vendor='Intel'>Cooperlake</model>
-      <model usable='yes' vendor='Intel'>Conroe</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
-      <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell</model>
       <model usable='yes' vendor='unknown'>486</model>
+      <model usable='no' vendor='Intel'>Broadwell</model>
+      <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
+      <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
+      <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cooperlake</model>
+      <model usable='yes' vendor='Hygon'>Dhyana</model>
+      <model usable='yes' vendor='AMD'>EPYC</model>
+      <model usable='yes' vendor='AMD'>EPYC-IBPB</model>
+      <model usable='no' vendor='AMD'>EPYC-Milan</model>
+      <model usable='yes' vendor='AMD'>EPYC-Rome</model>
+      <model usable='no' vendor='Intel'>Haswell</model>
+      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
+      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
+      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Icelake-Server</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
+      <model usable='no' vendor='Intel'>IvyBridge</model>
+      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
+      <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
+      <model usable='yes' vendor='AMD'>Opteron_G1</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>
+      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='yes' vendor='Intel'>Penryn</model>
+      <model usable='yes' vendor='Intel'>SandyBridge</model>
+      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Client</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Server</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Snowridge</model>
+      <model usable='yes' vendor='Intel'>Westmere</model>
+      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
+      <model usable='no' vendor='AMD'>athlon</model>
+      <model usable='no' vendor='Intel'>core2duo</model>
+      <model usable='no' vendor='Intel'>coreduo</model>
+      <model usable='yes' vendor='unknown'>kvm32</model>
+      <model usable='yes' vendor='unknown'>kvm64</model>
+      <model usable='no' vendor='Intel'>n270</model>
+      <model usable='yes' vendor='unknown'>pentium</model>
+      <model usable='yes' vendor='unknown'>pentium2</model>
+      <model usable='yes' vendor='unknown'>pentium3</model>
+      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='yes' vendor='unknown'>qemu64</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 3769792874..411eca05c9 100644
--- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
@@ -78,59 +78,59 @@
       <feature policy='disable' name='misalignsse'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>qemu64</model>
-      <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='AMD'>phenom</model>
-      <model usable='yes' vendor='unknown'>pentium3</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
-      <model usable='yes' vendor='unknown'>pentium</model>
-      <model usable='yes' vendor='Intel'>n270</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='yes' vendor='unknown'>kvm32</model>
-      <model usable='yes' vendor='Intel'>coreduo</model>
-      <model usable='yes' vendor='Intel'>core2duo</model>
-      <model usable='yes' vendor='AMD'>athlon</model>
-      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
-      <model usable='yes' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Snowridge</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client</model>
-      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
-      <model usable='no' vendor='Intel'>SandyBridge</model>
-      <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
-      <model usable='no' vendor='AMD'>Opteron_G4</model>
-      <model usable='no' vendor='AMD'>Opteron_G3</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-      <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='Intel'>Nehalem</model>
-      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='Intel'>IvyBridge</model>
-      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Icelake-Server</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
-      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell</model>
-      <model usable='no' vendor='AMD'>EPYC-Rome</model>
-      <model usable='no' vendor='AMD'>EPYC-Milan</model>
-      <model usable='no' vendor='AMD'>EPYC-IBPB</model>
-      <model usable='no' vendor='AMD'>EPYC</model>
-      <model usable='no' vendor='Hygon'>Dhyana</model>
-      <model usable='no' vendor='Intel'>Cooperlake</model>
-      <model usable='yes' vendor='Intel'>Conroe</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
-      <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell</model>
       <model usable='yes' vendor='unknown'>486</model>
+      <model usable='no' vendor='Intel'>Broadwell</model>
+      <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
+      <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
+      <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cooperlake</model>
+      <model usable='no' vendor='Hygon'>Dhyana</model>
+      <model usable='no' vendor='AMD'>EPYC</model>
+      <model usable='no' vendor='AMD'>EPYC-IBPB</model>
+      <model usable='no' vendor='AMD'>EPYC-Milan</model>
+      <model usable='no' vendor='AMD'>EPYC-Rome</model>
+      <model usable='no' vendor='Intel'>Haswell</model>
+      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
+      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
+      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Icelake-Server</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
+      <model usable='no' vendor='Intel'>IvyBridge</model>
+      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
+      <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
+      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2</model>
+      <model usable='no' vendor='AMD'>Opteron_G3</model>
+      <model usable='no' vendor='AMD'>Opteron_G4</model>
+      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='yes' vendor='Intel'>Penryn</model>
+      <model usable='no' vendor='Intel'>SandyBridge</model>
+      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Client</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Server</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Snowridge</model>
+      <model usable='yes' vendor='Intel'>Westmere</model>
+      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
+      <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='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'>pentium2</model>
+      <model usable='yes' vendor='unknown'>pentium3</model>
+      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='yes' vendor='unknown'>qemu64</model>
     </mode>
   </cpu>
   <memoryBacking supported='yes'>
diff --git a/tests/domaincapsdata/qemu_7.1.0.ppc64.xml b/tests/domaincapsdata/qemu_7.1.0.ppc64.xml
index bbdf8a6014..3028db7af4 100644
--- a/tests/domaincapsdata/qemu_7.1.0.ppc64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0.ppc64.xml
@@ -36,9 +36,9 @@
     </mode>
     <mode name='custom' supported='yes'>
       <model usable='unknown' vendor='IBM'>POWER10</model>
-      <model usable='unknown' vendor='IBM'>POWER9</model>
-      <model usable='unknown' vendor='IBM'>POWER8</model>
       <model usable='unknown' vendor='IBM'>POWER7</model>
+      <model usable='unknown' vendor='IBM'>POWER8</model>
+      <model usable='unknown' vendor='IBM'>POWER9</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 9d5ff18c57..6113ccab7c 100644
--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
@@ -64,59 +64,59 @@
       <feature policy='require' name='pschange-mc-no'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>qemu64</model>
-      <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='AMD'>phenom</model>
-      <model usable='yes' vendor='unknown'>pentium3</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
-      <model usable='yes' vendor='unknown'>pentium</model>
-      <model usable='no' vendor='Intel'>n270</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='yes' vendor='unknown'>kvm32</model>
-      <model usable='no' vendor='Intel'>coreduo</model>
-      <model usable='no' vendor='Intel'>core2duo</model>
-      <model usable='no' vendor='AMD'>athlon</model>
-      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
-      <model usable='yes' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Snowridge</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client</model>
-      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
-      <model usable='yes' vendor='Intel'>SandyBridge</model>
-      <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
-      <model usable='no' vendor='AMD'>Opteron_G4</model>
-      <model usable='yes' vendor='AMD'>Opteron_G3</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-      <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='Intel'>Nehalem</model>
-      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='Intel'>IvyBridge</model>
-      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Icelake-Server</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
-      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell</model>
-      <model usable='yes' vendor='AMD'>EPYC-Rome</model>
-      <model usable='no' vendor='AMD'>EPYC-Milan</model>
-      <model usable='yes' vendor='AMD'>EPYC-IBPB</model>
-      <model usable='yes' vendor='AMD'>EPYC</model>
-      <model usable='yes' vendor='Hygon'>Dhyana</model>
-      <model usable='no' vendor='Intel'>Cooperlake</model>
-      <model usable='yes' vendor='Intel'>Conroe</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
-      <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell</model>
       <model usable='yes' vendor='unknown'>486</model>
+      <model usable='no' vendor='Intel'>Broadwell</model>
+      <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
+      <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
+      <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cooperlake</model>
+      <model usable='yes' vendor='Hygon'>Dhyana</model>
+      <model usable='yes' vendor='AMD'>EPYC</model>
+      <model usable='yes' vendor='AMD'>EPYC-IBPB</model>
+      <model usable='no' vendor='AMD'>EPYC-Milan</model>
+      <model usable='yes' vendor='AMD'>EPYC-Rome</model>
+      <model usable='no' vendor='Intel'>Haswell</model>
+      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
+      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
+      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Icelake-Server</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
+      <model usable='no' vendor='Intel'>IvyBridge</model>
+      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
+      <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
+      <model usable='yes' vendor='AMD'>Opteron_G1</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>
+      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='yes' vendor='Intel'>Penryn</model>
+      <model usable='yes' vendor='Intel'>SandyBridge</model>
+      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Client</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Server</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Snowridge</model>
+      <model usable='yes' vendor='Intel'>Westmere</model>
+      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
+      <model usable='no' vendor='AMD'>athlon</model>
+      <model usable='no' vendor='Intel'>core2duo</model>
+      <model usable='no' vendor='Intel'>coreduo</model>
+      <model usable='yes' vendor='unknown'>kvm32</model>
+      <model usable='yes' vendor='unknown'>kvm64</model>
+      <model usable='no' vendor='Intel'>n270</model>
+      <model usable='yes' vendor='unknown'>pentium</model>
+      <model usable='yes' vendor='unknown'>pentium2</model>
+      <model usable='yes' vendor='unknown'>pentium3</model>
+      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='yes' vendor='unknown'>qemu64</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 73475e499c..3505d0152d 100644
--- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
@@ -70,59 +70,59 @@
       <feature policy='require' name='pschange-mc-no'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>qemu64</model>
-      <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='AMD'>phenom</model>
-      <model usable='yes' vendor='unknown'>pentium3</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
-      <model usable='yes' vendor='unknown'>pentium</model>
-      <model usable='no' vendor='Intel'>n270</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='yes' vendor='unknown'>kvm32</model>
-      <model usable='no' vendor='Intel'>coreduo</model>
-      <model usable='no' vendor='Intel'>core2duo</model>
-      <model usable='no' vendor='AMD'>athlon</model>
-      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
-      <model usable='yes' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Snowridge</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client</model>
-      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
-      <model usable='yes' vendor='Intel'>SandyBridge</model>
-      <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
-      <model usable='no' vendor='AMD'>Opteron_G4</model>
-      <model usable='yes' vendor='AMD'>Opteron_G3</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-      <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='Intel'>Nehalem</model>
-      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='Intel'>IvyBridge</model>
-      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Icelake-Server</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
-      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell</model>
-      <model usable='yes' vendor='AMD'>EPYC-Rome</model>
-      <model usable='no' vendor='AMD'>EPYC-Milan</model>
-      <model usable='yes' vendor='AMD'>EPYC-IBPB</model>
-      <model usable='yes' vendor='AMD'>EPYC</model>
-      <model usable='yes' vendor='Hygon'>Dhyana</model>
-      <model usable='no' vendor='Intel'>Cooperlake</model>
-      <model usable='yes' vendor='Intel'>Conroe</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
-      <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell</model>
       <model usable='yes' vendor='unknown'>486</model>
+      <model usable='no' vendor='Intel'>Broadwell</model>
+      <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
+      <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
+      <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cooperlake</model>
+      <model usable='yes' vendor='Hygon'>Dhyana</model>
+      <model usable='yes' vendor='AMD'>EPYC</model>
+      <model usable='yes' vendor='AMD'>EPYC-IBPB</model>
+      <model usable='no' vendor='AMD'>EPYC-Milan</model>
+      <model usable='yes' vendor='AMD'>EPYC-Rome</model>
+      <model usable='no' vendor='Intel'>Haswell</model>
+      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
+      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
+      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Icelake-Server</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
+      <model usable='no' vendor='Intel'>IvyBridge</model>
+      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
+      <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
+      <model usable='yes' vendor='AMD'>Opteron_G1</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>
+      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='yes' vendor='Intel'>Penryn</model>
+      <model usable='yes' vendor='Intel'>SandyBridge</model>
+      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Client</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Server</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Snowridge</model>
+      <model usable='yes' vendor='Intel'>Westmere</model>
+      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
+      <model usable='no' vendor='AMD'>athlon</model>
+      <model usable='no' vendor='Intel'>core2duo</model>
+      <model usable='no' vendor='Intel'>coreduo</model>
+      <model usable='yes' vendor='unknown'>kvm32</model>
+      <model usable='yes' vendor='unknown'>kvm64</model>
+      <model usable='no' vendor='Intel'>n270</model>
+      <model usable='yes' vendor='unknown'>pentium</model>
+      <model usable='yes' vendor='unknown'>pentium2</model>
+      <model usable='yes' vendor='unknown'>pentium3</model>
+      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='yes' vendor='unknown'>qemu64</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 38fedd6c1c..922e352362 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,59 +67,59 @@
       <feature policy='disable' name='nrip-save'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>qemu64</model>
-      <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='AMD'>phenom</model>
-      <model usable='yes' vendor='unknown'>pentium3</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
-      <model usable='yes' vendor='unknown'>pentium</model>
-      <model usable='yes' vendor='Intel'>n270</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='yes' vendor='unknown'>kvm32</model>
-      <model usable='yes' vendor='Intel'>coreduo</model>
-      <model usable='yes' vendor='Intel'>core2duo</model>
-      <model usable='yes' vendor='AMD'>athlon</model>
-      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
-      <model usable='yes' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Snowridge</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client</model>
-      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
-      <model usable='no' vendor='Intel'>SandyBridge</model>
-      <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
-      <model usable='no' vendor='AMD'>Opteron_G4</model>
-      <model usable='no' vendor='AMD'>Opteron_G3</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-      <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='Intel'>Nehalem</model>
-      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='Intel'>IvyBridge</model>
-      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Icelake-Server</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
-      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell</model>
-      <model usable='no' vendor='AMD'>EPYC-Rome</model>
-      <model usable='no' vendor='AMD'>EPYC-Milan</model>
-      <model usable='no' vendor='AMD'>EPYC-IBPB</model>
-      <model usable='no' vendor='AMD'>EPYC</model>
-      <model usable='no' vendor='Hygon'>Dhyana</model>
-      <model usable='no' vendor='Intel'>Cooperlake</model>
-      <model usable='yes' vendor='Intel'>Conroe</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
-      <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell</model>
       <model usable='yes' vendor='unknown'>486</model>
+      <model usable='no' vendor='Intel'>Broadwell</model>
+      <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
+      <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
+      <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cooperlake</model>
+      <model usable='no' vendor='Hygon'>Dhyana</model>
+      <model usable='no' vendor='AMD'>EPYC</model>
+      <model usable='no' vendor='AMD'>EPYC-IBPB</model>
+      <model usable='no' vendor='AMD'>EPYC-Milan</model>
+      <model usable='no' vendor='AMD'>EPYC-Rome</model>
+      <model usable='no' vendor='Intel'>Haswell</model>
+      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
+      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
+      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Icelake-Server</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
+      <model usable='no' vendor='Intel'>IvyBridge</model>
+      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
+      <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
+      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2</model>
+      <model usable='no' vendor='AMD'>Opteron_G3</model>
+      <model usable='no' vendor='AMD'>Opteron_G4</model>
+      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='yes' vendor='Intel'>Penryn</model>
+      <model usable='no' vendor='Intel'>SandyBridge</model>
+      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Client</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Server</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Snowridge</model>
+      <model usable='yes' vendor='Intel'>Westmere</model>
+      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
+      <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='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'>pentium2</model>
+      <model usable='yes' vendor='unknown'>pentium3</model>
+      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='yes' vendor='unknown'>qemu64</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 38fedd6c1c..922e352362 100644
--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
@@ -67,59 +67,59 @@
       <feature policy='disable' name='nrip-save'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>qemu64</model>
-      <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='AMD'>phenom</model>
-      <model usable='yes' vendor='unknown'>pentium3</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
-      <model usable='yes' vendor='unknown'>pentium</model>
-      <model usable='yes' vendor='Intel'>n270</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='yes' vendor='unknown'>kvm32</model>
-      <model usable='yes' vendor='Intel'>coreduo</model>
-      <model usable='yes' vendor='Intel'>core2duo</model>
-      <model usable='yes' vendor='AMD'>athlon</model>
-      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
-      <model usable='yes' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Snowridge</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client</model>
-      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
-      <model usable='no' vendor='Intel'>SandyBridge</model>
-      <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
-      <model usable='no' vendor='AMD'>Opteron_G4</model>
-      <model usable='no' vendor='AMD'>Opteron_G3</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-      <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='Intel'>Nehalem</model>
-      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='Intel'>IvyBridge</model>
-      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Icelake-Server</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
-      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell</model>
-      <model usable='no' vendor='AMD'>EPYC-Rome</model>
-      <model usable='no' vendor='AMD'>EPYC-Milan</model>
-      <model usable='no' vendor='AMD'>EPYC-IBPB</model>
-      <model usable='no' vendor='AMD'>EPYC</model>
-      <model usable='no' vendor='Hygon'>Dhyana</model>
-      <model usable='no' vendor='Intel'>Cooperlake</model>
-      <model usable='yes' vendor='Intel'>Conroe</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
-      <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell</model>
       <model usable='yes' vendor='unknown'>486</model>
+      <model usable='no' vendor='Intel'>Broadwell</model>
+      <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
+      <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
+      <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cooperlake</model>
+      <model usable='no' vendor='Hygon'>Dhyana</model>
+      <model usable='no' vendor='AMD'>EPYC</model>
+      <model usable='no' vendor='AMD'>EPYC-IBPB</model>
+      <model usable='no' vendor='AMD'>EPYC-Milan</model>
+      <model usable='no' vendor='AMD'>EPYC-Rome</model>
+      <model usable='no' vendor='Intel'>Haswell</model>
+      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
+      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
+      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Icelake-Server</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
+      <model usable='no' vendor='Intel'>IvyBridge</model>
+      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
+      <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
+      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2</model>
+      <model usable='no' vendor='AMD'>Opteron_G3</model>
+      <model usable='no' vendor='AMD'>Opteron_G4</model>
+      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='yes' vendor='Intel'>Penryn</model>
+      <model usable='no' vendor='Intel'>SandyBridge</model>
+      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Client</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Server</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Snowridge</model>
+      <model usable='yes' vendor='Intel'>Westmere</model>
+      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
+      <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='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'>pentium2</model>
+      <model usable='yes' vendor='unknown'>pentium3</model>
+      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='yes' vendor='unknown'>qemu64</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 b8b2aada9d..cb9ad6bb2b 100644
--- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
@@ -69,59 +69,59 @@
       <feature policy='require' name='pschange-mc-no'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>qemu64</model>
-      <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='AMD'>phenom</model>
-      <model usable='yes' vendor='unknown'>pentium3</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
-      <model usable='yes' vendor='unknown'>pentium</model>
-      <model usable='no' vendor='Intel'>n270</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='yes' vendor='unknown'>kvm32</model>
-      <model usable='no' vendor='Intel'>coreduo</model>
-      <model usable='no' vendor='Intel'>core2duo</model>
-      <model usable='no' vendor='AMD'>athlon</model>
-      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
-      <model usable='yes' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Snowridge</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client</model>
-      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
-      <model usable='yes' vendor='Intel'>SandyBridge</model>
-      <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
-      <model usable='no' vendor='AMD'>Opteron_G4</model>
-      <model usable='yes' vendor='AMD'>Opteron_G3</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-      <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='Intel'>Nehalem</model>
-      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='Intel'>IvyBridge</model>
-      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Icelake-Server</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
-      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell</model>
-      <model usable='yes' vendor='AMD'>EPYC-Rome</model>
-      <model usable='no' vendor='AMD'>EPYC-Milan</model>
-      <model usable='yes' vendor='AMD'>EPYC-IBPB</model>
-      <model usable='yes' vendor='AMD'>EPYC</model>
-      <model usable='yes' vendor='Hygon'>Dhyana</model>
-      <model usable='no' vendor='Intel'>Cooperlake</model>
-      <model usable='yes' vendor='Intel'>Conroe</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
-      <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell</model>
       <model usable='yes' vendor='unknown'>486</model>
+      <model usable='no' vendor='Intel'>Broadwell</model>
+      <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
+      <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
+      <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cooperlake</model>
+      <model usable='yes' vendor='Hygon'>Dhyana</model>
+      <model usable='yes' vendor='AMD'>EPYC</model>
+      <model usable='yes' vendor='AMD'>EPYC-IBPB</model>
+      <model usable='no' vendor='AMD'>EPYC-Milan</model>
+      <model usable='yes' vendor='AMD'>EPYC-Rome</model>
+      <model usable='no' vendor='Intel'>Haswell</model>
+      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
+      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
+      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Icelake-Server</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
+      <model usable='no' vendor='Intel'>IvyBridge</model>
+      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
+      <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
+      <model usable='yes' vendor='AMD'>Opteron_G1</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>
+      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='yes' vendor='Intel'>Penryn</model>
+      <model usable='yes' vendor='Intel'>SandyBridge</model>
+      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Client</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Server</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Snowridge</model>
+      <model usable='yes' vendor='Intel'>Westmere</model>
+      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
+      <model usable='no' vendor='AMD'>athlon</model>
+      <model usable='no' vendor='Intel'>core2duo</model>
+      <model usable='no' vendor='Intel'>coreduo</model>
+      <model usable='yes' vendor='unknown'>kvm32</model>
+      <model usable='yes' vendor='unknown'>kvm64</model>
+      <model usable='no' vendor='Intel'>n270</model>
+      <model usable='yes' vendor='unknown'>pentium</model>
+      <model usable='yes' vendor='unknown'>pentium2</model>
+      <model usable='yes' vendor='unknown'>pentium3</model>
+      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='yes' vendor='unknown'>qemu64</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 c7c118d52c..bd6cbb4066 100644
--- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
@@ -70,60 +70,60 @@
       <feature policy='require' name='pschange-mc-no'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>qemu64</model>
-      <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='AMD'>phenom</model>
-      <model usable='yes' vendor='unknown'>pentium3</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
-      <model usable='yes' vendor='unknown'>pentium</model>
-      <model usable='no' vendor='Intel'>n270</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='yes' vendor='unknown'>kvm32</model>
-      <model usable='no' vendor='Intel'>coreduo</model>
-      <model usable='no' vendor='Intel'>core2duo</model>
-      <model usable='no' vendor='AMD'>athlon</model>
-      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
-      <model usable='yes' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Snowridge</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client</model>
-      <model usable='no' vendor='Intel'>SapphireRapids</model>
-      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
-      <model usable='yes' vendor='Intel'>SandyBridge</model>
-      <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
-      <model usable='no' vendor='AMD'>Opteron_G4</model>
-      <model usable='yes' vendor='AMD'>Opteron_G3</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-      <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='Intel'>Nehalem</model>
-      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='Intel'>IvyBridge</model>
-      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Icelake-Server</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
-      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell</model>
-      <model usable='yes' vendor='AMD'>EPYC-Rome</model>
-      <model usable='no' vendor='AMD'>EPYC-Milan</model>
-      <model usable='yes' vendor='AMD'>EPYC-IBPB</model>
-      <model usable='yes' vendor='AMD'>EPYC</model>
-      <model usable='yes' vendor='Hygon'>Dhyana</model>
-      <model usable='no' vendor='Intel'>Cooperlake</model>
-      <model usable='yes' vendor='Intel'>Conroe</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
-      <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell</model>
       <model usable='yes' vendor='unknown'>486</model>
+      <model usable='no' vendor='Intel'>Broadwell</model>
+      <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
+      <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
+      <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cooperlake</model>
+      <model usable='yes' vendor='Hygon'>Dhyana</model>
+      <model usable='yes' vendor='AMD'>EPYC</model>
+      <model usable='yes' vendor='AMD'>EPYC-IBPB</model>
+      <model usable='no' vendor='AMD'>EPYC-Milan</model>
+      <model usable='yes' vendor='AMD'>EPYC-Rome</model>
+      <model usable='no' vendor='Intel'>Haswell</model>
+      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
+      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
+      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Icelake-Server</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
+      <model usable='no' vendor='Intel'>IvyBridge</model>
+      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
+      <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
+      <model usable='yes' vendor='AMD'>Opteron_G1</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>
+      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='yes' vendor='Intel'>Penryn</model>
+      <model usable='yes' vendor='Intel'>SandyBridge</model>
+      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
+      <model usable='no' vendor='Intel'>SapphireRapids</model>
+      <model usable='no' vendor='Intel'>Skylake-Client</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Server</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Snowridge</model>
+      <model usable='yes' vendor='Intel'>Westmere</model>
+      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
+      <model usable='no' vendor='AMD'>athlon</model>
+      <model usable='no' vendor='Intel'>core2duo</model>
+      <model usable='no' vendor='Intel'>coreduo</model>
+      <model usable='yes' vendor='unknown'>kvm32</model>
+      <model usable='yes' vendor='unknown'>kvm64</model>
+      <model usable='no' vendor='Intel'>n270</model>
+      <model usable='yes' vendor='unknown'>pentium</model>
+      <model usable='yes' vendor='unknown'>pentium2</model>
+      <model usable='yes' vendor='unknown'>pentium3</model>
+      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='yes' vendor='unknown'>qemu64</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 ab81714ceb..ea8f687b7b 100644
--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
@@ -71,60 +71,60 @@
       <feature policy='disable' name='nrip-save'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>qemu64</model>
-      <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='AMD'>phenom</model>
-      <model usable='yes' vendor='unknown'>pentium3</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
-      <model usable='yes' vendor='unknown'>pentium</model>
-      <model usable='yes' vendor='Intel'>n270</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='yes' vendor='unknown'>kvm32</model>
-      <model usable='yes' vendor='Intel'>coreduo</model>
-      <model usable='yes' vendor='Intel'>core2duo</model>
-      <model usable='yes' vendor='AMD'>athlon</model>
-      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
-      <model usable='yes' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Snowridge</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client</model>
-      <model usable='no' vendor='Intel'>SapphireRapids</model>
-      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
-      <model usable='no' vendor='Intel'>SandyBridge</model>
-      <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
-      <model usable='no' vendor='AMD'>Opteron_G4</model>
-      <model usable='no' vendor='AMD'>Opteron_G3</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-      <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='Intel'>Nehalem</model>
-      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='Intel'>IvyBridge</model>
-      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Icelake-Server</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
-      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell</model>
-      <model usable='no' vendor='AMD'>EPYC-Rome</model>
-      <model usable='no' vendor='AMD'>EPYC-Milan</model>
-      <model usable='no' vendor='AMD'>EPYC-IBPB</model>
-      <model usable='no' vendor='AMD'>EPYC</model>
-      <model usable='no' vendor='Hygon'>Dhyana</model>
-      <model usable='no' vendor='Intel'>Cooperlake</model>
-      <model usable='yes' vendor='Intel'>Conroe</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
-      <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell</model>
       <model usable='yes' vendor='unknown'>486</model>
+      <model usable='no' vendor='Intel'>Broadwell</model>
+      <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
+      <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
+      <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cooperlake</model>
+      <model usable='no' vendor='Hygon'>Dhyana</model>
+      <model usable='no' vendor='AMD'>EPYC</model>
+      <model usable='no' vendor='AMD'>EPYC-IBPB</model>
+      <model usable='no' vendor='AMD'>EPYC-Milan</model>
+      <model usable='no' vendor='AMD'>EPYC-Rome</model>
+      <model usable='no' vendor='Intel'>Haswell</model>
+      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
+      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
+      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Icelake-Server</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
+      <model usable='no' vendor='Intel'>IvyBridge</model>
+      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
+      <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
+      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2</model>
+      <model usable='no' vendor='AMD'>Opteron_G3</model>
+      <model usable='no' vendor='AMD'>Opteron_G4</model>
+      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='yes' vendor='Intel'>Penryn</model>
+      <model usable='no' vendor='Intel'>SandyBridge</model>
+      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
+      <model usable='no' vendor='Intel'>SapphireRapids</model>
+      <model usable='no' vendor='Intel'>Skylake-Client</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Server</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Snowridge</model>
+      <model usable='yes' vendor='Intel'>Westmere</model>
+      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
+      <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='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'>pentium2</model>
+      <model usable='yes' vendor='unknown'>pentium3</model>
+      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='yes' vendor='unknown'>qemu64</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 ad9eaf54de..2820a95b37 100644
--- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
@@ -69,60 +69,60 @@
       <feature policy='require' name='pschange-mc-no'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>qemu64</model>
-      <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='AMD'>phenom</model>
-      <model usable='yes' vendor='unknown'>pentium3</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
-      <model usable='yes' vendor='unknown'>pentium</model>
-      <model usable='no' vendor='Intel'>n270</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='yes' vendor='unknown'>kvm32</model>
-      <model usable='no' vendor='Intel'>coreduo</model>
-      <model usable='no' vendor='Intel'>core2duo</model>
-      <model usable='no' vendor='AMD'>athlon</model>
-      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
-      <model usable='yes' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Snowridge</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client</model>
-      <model usable='no' vendor='Intel'>SapphireRapids</model>
-      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
-      <model usable='yes' vendor='Intel'>SandyBridge</model>
-      <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
-      <model usable='no' vendor='AMD'>Opteron_G4</model>
-      <model usable='yes' vendor='AMD'>Opteron_G3</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-      <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='Intel'>Nehalem</model>
-      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='Intel'>IvyBridge</model>
-      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Icelake-Server</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
-      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell</model>
-      <model usable='yes' vendor='AMD'>EPYC-Rome</model>
-      <model usable='no' vendor='AMD'>EPYC-Milan</model>
-      <model usable='yes' vendor='AMD'>EPYC-IBPB</model>
-      <model usable='yes' vendor='AMD'>EPYC</model>
-      <model usable='yes' vendor='Hygon'>Dhyana</model>
-      <model usable='no' vendor='Intel'>Cooperlake</model>
-      <model usable='yes' vendor='Intel'>Conroe</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
-      <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell</model>
       <model usable='yes' vendor='unknown'>486</model>
+      <model usable='no' vendor='Intel'>Broadwell</model>
+      <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
+      <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
+      <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cooperlake</model>
+      <model usable='yes' vendor='Hygon'>Dhyana</model>
+      <model usable='yes' vendor='AMD'>EPYC</model>
+      <model usable='yes' vendor='AMD'>EPYC-IBPB</model>
+      <model usable='no' vendor='AMD'>EPYC-Milan</model>
+      <model usable='yes' vendor='AMD'>EPYC-Rome</model>
+      <model usable='no' vendor='Intel'>Haswell</model>
+      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
+      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
+      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Icelake-Server</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
+      <model usable='no' vendor='Intel'>IvyBridge</model>
+      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
+      <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
+      <model usable='yes' vendor='AMD'>Opteron_G1</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>
+      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='yes' vendor='Intel'>Penryn</model>
+      <model usable='yes' vendor='Intel'>SandyBridge</model>
+      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
+      <model usable='no' vendor='Intel'>SapphireRapids</model>
+      <model usable='no' vendor='Intel'>Skylake-Client</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Server</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Snowridge</model>
+      <model usable='yes' vendor='Intel'>Westmere</model>
+      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
+      <model usable='no' vendor='AMD'>athlon</model>
+      <model usable='no' vendor='Intel'>core2duo</model>
+      <model usable='no' vendor='Intel'>coreduo</model>
+      <model usable='yes' vendor='unknown'>kvm32</model>
+      <model usable='yes' vendor='unknown'>kvm64</model>
+      <model usable='no' vendor='Intel'>n270</model>
+      <model usable='yes' vendor='unknown'>pentium</model>
+      <model usable='yes' vendor='unknown'>pentium2</model>
+      <model usable='yes' vendor='unknown'>pentium3</model>
+      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='yes' vendor='unknown'>qemu64</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 aa01168ac1..4761f862e4 100644
--- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
@@ -72,62 +72,62 @@
       <feature policy='disable' name='xsaves'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>qemu64</model>
-      <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='AMD'>phenom</model>
-      <model usable='yes' vendor='unknown'>pentium3</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
-      <model usable='yes' vendor='unknown'>pentium</model>
-      <model usable='no' vendor='Intel'>n270</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='yes' vendor='unknown'>kvm32</model>
-      <model usable='no' vendor='Intel'>coreduo</model>
-      <model usable='no' vendor='Intel'>core2duo</model>
-      <model usable='no' vendor='AMD'>athlon</model>
-      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
-      <model usable='yes' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Snowridge</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client</model>
-      <model usable='no' vendor='Intel'>SapphireRapids</model>
-      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
-      <model usable='yes' vendor='Intel'>SandyBridge</model>
-      <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
-      <model usable='no' vendor='AMD'>Opteron_G4</model>
-      <model usable='yes' vendor='AMD'>Opteron_G3</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-      <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='Intel'>Nehalem</model>
-      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='Intel'>IvyBridge</model>
-      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Icelake-Server</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
-      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell</model>
-      <model usable='no' vendor='Intel'>GraniteRapids</model>
-      <model usable='no' vendor='AMD'>EPYC-Rome</model>
-      <model usable='no' vendor='AMD'>EPYC-Milan</model>
-      <model usable='yes' vendor='AMD'>EPYC-IBPB</model>
-      <model usable='no' vendor='AMD'>EPYC-Genoa</model>
-      <model usable='yes' vendor='AMD'>EPYC</model>
-      <model usable='yes' vendor='Hygon'>Dhyana</model>
-      <model usable='no' vendor='Intel'>Cooperlake</model>
-      <model usable='yes' vendor='Intel'>Conroe</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
-      <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell</model>
       <model usable='yes' vendor='unknown'>486</model>
+      <model usable='no' vendor='Intel'>Broadwell</model>
+      <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
+      <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
+      <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cooperlake</model>
+      <model usable='yes' vendor='Hygon'>Dhyana</model>
+      <model usable='yes' vendor='AMD'>EPYC</model>
+      <model usable='no' vendor='AMD'>EPYC-Genoa</model>
+      <model usable='yes' vendor='AMD'>EPYC-IBPB</model>
+      <model usable='no' vendor='AMD'>EPYC-Milan</model>
+      <model usable='no' vendor='AMD'>EPYC-Rome</model>
+      <model usable='no' vendor='Intel'>GraniteRapids</model>
+      <model usable='no' vendor='Intel'>Haswell</model>
+      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
+      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
+      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Icelake-Server</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
+      <model usable='no' vendor='Intel'>IvyBridge</model>
+      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
+      <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
+      <model usable='yes' vendor='AMD'>Opteron_G1</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>
+      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='yes' vendor='Intel'>Penryn</model>
+      <model usable='yes' vendor='Intel'>SandyBridge</model>
+      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
+      <model usable='no' vendor='Intel'>SapphireRapids</model>
+      <model usable='no' vendor='Intel'>Skylake-Client</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Server</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Snowridge</model>
+      <model usable='yes' vendor='Intel'>Westmere</model>
+      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
+      <model usable='no' vendor='AMD'>athlon</model>
+      <model usable='no' vendor='Intel'>core2duo</model>
+      <model usable='no' vendor='Intel'>coreduo</model>
+      <model usable='yes' vendor='unknown'>kvm32</model>
+      <model usable='yes' vendor='unknown'>kvm64</model>
+      <model usable='no' vendor='Intel'>n270</model>
+      <model usable='yes' vendor='unknown'>pentium</model>
+      <model usable='yes' vendor='unknown'>pentium2</model>
+      <model usable='yes' vendor='unknown'>pentium3</model>
+      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='yes' vendor='unknown'>qemu64</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 8e33506abd..585b6540a3 100644
--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
@@ -72,62 +72,62 @@
       <feature policy='disable' name='nrip-save'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>qemu64</model>
-      <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='AMD'>phenom</model>
-      <model usable='yes' vendor='unknown'>pentium3</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
-      <model usable='yes' vendor='unknown'>pentium</model>
-      <model usable='yes' vendor='Intel'>n270</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='yes' vendor='unknown'>kvm32</model>
-      <model usable='yes' vendor='Intel'>coreduo</model>
-      <model usable='yes' vendor='Intel'>core2duo</model>
-      <model usable='yes' vendor='AMD'>athlon</model>
-      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
-      <model usable='yes' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Snowridge</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client</model>
-      <model usable='no' vendor='Intel'>SapphireRapids</model>
-      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
-      <model usable='no' vendor='Intel'>SandyBridge</model>
-      <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
-      <model usable='no' vendor='AMD'>Opteron_G4</model>
-      <model usable='no' vendor='AMD'>Opteron_G3</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-      <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='Intel'>Nehalem</model>
-      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='Intel'>IvyBridge</model>
-      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Icelake-Server</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
-      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell</model>
-      <model usable='no' vendor='Intel'>GraniteRapids</model>
-      <model usable='no' vendor='AMD'>EPYC-Rome</model>
-      <model usable='no' vendor='AMD'>EPYC-Milan</model>
-      <model usable='no' vendor='AMD'>EPYC-IBPB</model>
-      <model usable='no' vendor='AMD'>EPYC-Genoa</model>
-      <model usable='no' vendor='AMD'>EPYC</model>
-      <model usable='no' vendor='Hygon'>Dhyana</model>
-      <model usable='no' vendor='Intel'>Cooperlake</model>
-      <model usable='yes' vendor='Intel'>Conroe</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
-      <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell</model>
       <model usable='yes' vendor='unknown'>486</model>
+      <model usable='no' vendor='Intel'>Broadwell</model>
+      <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
+      <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
+      <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cooperlake</model>
+      <model usable='no' vendor='Hygon'>Dhyana</model>
+      <model usable='no' vendor='AMD'>EPYC</model>
+      <model usable='no' vendor='AMD'>EPYC-Genoa</model>
+      <model usable='no' vendor='AMD'>EPYC-IBPB</model>
+      <model usable='no' vendor='AMD'>EPYC-Milan</model>
+      <model usable='no' vendor='AMD'>EPYC-Rome</model>
+      <model usable='no' vendor='Intel'>GraniteRapids</model>
+      <model usable='no' vendor='Intel'>Haswell</model>
+      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
+      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
+      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Icelake-Server</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
+      <model usable='no' vendor='Intel'>IvyBridge</model>
+      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
+      <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
+      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2</model>
+      <model usable='no' vendor='AMD'>Opteron_G3</model>
+      <model usable='no' vendor='AMD'>Opteron_G4</model>
+      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='yes' vendor='Intel'>Penryn</model>
+      <model usable='no' vendor='Intel'>SandyBridge</model>
+      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
+      <model usable='no' vendor='Intel'>SapphireRapids</model>
+      <model usable='no' vendor='Intel'>Skylake-Client</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Server</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Snowridge</model>
+      <model usable='yes' vendor='Intel'>Westmere</model>
+      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
+      <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='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'>pentium2</model>
+      <model usable='yes' vendor='unknown'>pentium3</model>
+      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='yes' vendor='unknown'>qemu64</model>
     </mode>
   </cpu>
   <memoryBacking supported='yes'>
diff --git a/tests/domaincapsdata/qemu_8.1.0.s390x.xml b/tests/domaincapsdata/qemu_8.1.0.s390x.xml
index 92fa89f078..5e1db1a65a 100644
--- a/tests/domaincapsdata/qemu_8.1.0.s390x.xml
+++ b/tests/domaincapsdata/qemu_8.1.0.s390x.xml
@@ -77,84 +77,84 @@
       <feature policy='require' name='te'/>
     </mode>
     <mode name='custom' supported='yes'>
+      <model usable='no' vendor='IBM'>gen15a</model>
+      <model usable='yes' vendor='IBM'>gen15a-base</model>
+      <model usable='no' vendor='IBM'>gen15b</model>
+      <model usable='yes' vendor='IBM'>gen15b-base</model>
       <model usable='no' vendor='IBM'>gen16a</model>
-      <model usable='yes' vendor='IBM'>z800-base</model>
-      <model usable='yes' vendor='IBM'>z890.2-base</model>
-      <model usable='no' vendor='IBM'>z9EC.2</model>
-      <model usable='no' vendor='IBM'>z13.2</model>
-      <model usable='yes' vendor='IBM'>z990.5-base</model>
-      <model usable='yes' vendor='IBM'>z9BC-base</model>
-      <model usable='yes' vendor='IBM'>z890</model>
-      <model usable='yes' vendor='IBM'>z890.2</model>
-      <model usable='no' vendor='IBM'>z9BC</model>
-      <model usable='no' vendor='IBM'>z196</model>
+      <model usable='no' vendor='IBM'>gen16a-base</model>
+      <model usable='no' vendor='IBM'>gen16b</model>
+      <model usable='no' vendor='IBM'>gen16b-base</model>
+      <model usable='yes' vendor='unknown'>max</model>
+      <model usable='yes' vendor='unknown'>qemu</model>
+      <model usable='no' vendor='IBM'>z10BC</model>
+      <model usable='yes' vendor='IBM'>z10BC-base</model>
+      <model usable='no' vendor='IBM'>z10BC.2</model>
+      <model usable='yes' vendor='IBM'>z10BC.2-base</model>
+      <model usable='no' vendor='IBM'>z10EC</model>
+      <model usable='yes' vendor='IBM'>z10EC-base</model>
+      <model usable='no' vendor='IBM'>z10EC.2</model>
+      <model usable='yes' vendor='IBM'>z10EC.2-base</model>
+      <model usable='no' vendor='IBM'>z10EC.3</model>
+      <model usable='yes' vendor='IBM'>z10EC.3-base</model>
+      <model usable='no' vendor='IBM'>z114</model>
+      <model usable='yes' vendor='IBM'>z114-base</model>
       <model usable='no' vendor='IBM'>z13</model>
+      <model usable='yes' vendor='IBM'>z13-base</model>
+      <model usable='no' vendor='IBM'>z13.2</model>
+      <model usable='yes' vendor='IBM'>z13.2-base</model>
       <model usable='no' vendor='IBM'>z13s</model>
-      <model usable='no' vendor='IBM'>gen16b-base</model>
-      <model usable='yes' vendor='IBM'>z990.3</model>
       <model usable='yes' vendor='IBM'>z13s-base</model>
-      <model usable='no' vendor='IBM'>gen15a</model>
-      <model usable='no' vendor='IBM'>z9EC</model>
-      <model usable='yes' vendor='IBM'>z14ZR1-base</model>
+      <model usable='no' vendor='IBM'>z14</model>
+      <model usable='yes' vendor='IBM'>z14-base</model>
+      <model usable='no' vendor='IBM'>z14.2</model>
       <model usable='yes' vendor='IBM'>z14.2-base</model>
-      <model usable='yes' vendor='IBM'>z900.3-base</model>
-      <model usable='yes' vendor='IBM'>z13.2-base</model>
+      <model usable='no' vendor='IBM'>z14ZR1</model>
+      <model usable='yes' vendor='IBM'>z14ZR1-base</model>
+      <model usable='no' vendor='IBM'>z196</model>
+      <model usable='yes' vendor='IBM'>z196-base</model>
+      <model usable='no' vendor='IBM'>z196.2</model>
       <model usable='yes' vendor='IBM'>z196.2-base</model>
-      <model usable='yes' vendor='IBM'>zBC12-base</model>
-      <model usable='yes' vendor='IBM'>z9BC.2-base</model>
-      <model usable='yes' vendor='IBM'>z900.2-base</model>
-      <model usable='no' vendor='IBM'>zEC12</model>
-      <model usable='no' vendor='IBM'>z9EC.3</model>
+      <model usable='yes' vendor='IBM'>z800</model>
+      <model usable='yes' vendor='IBM'>z800-base</model>
+      <model usable='yes' vendor='IBM'>z890</model>
+      <model usable='yes' vendor='IBM'>z890-base</model>
+      <model usable='yes' vendor='IBM'>z890.2</model>
+      <model usable='yes' vendor='IBM'>z890.2-base</model>
+      <model usable='yes' vendor='IBM'>z890.3</model>
+      <model usable='yes' vendor='IBM'>z890.3-base</model>
       <model usable='yes' vendor='IBM'>z900</model>
-      <model usable='yes' vendor='IBM'>z114-base</model>
-      <model usable='yes' vendor='IBM'>zEC12-base</model>
-      <model usable='no' vendor='IBM'>z10EC.2</model>
-      <model usable='yes' vendor='IBM'>z10EC-base</model>
+      <model usable='yes' vendor='IBM'>z900-base</model>
+      <model usable='yes' vendor='IBM'>z900.2</model>
+      <model usable='yes' vendor='IBM'>z900.2-base</model>
       <model usable='yes' vendor='IBM'>z900.3</model>
-      <model usable='no' vendor='IBM'>z14ZR1</model>
-      <model usable='no' vendor='IBM'>z10BC</model>
-      <model usable='yes' vendor='IBM'>z10BC.2-base</model>
-      <model usable='no' vendor='IBM'>z9BC.2</model>
+      <model usable='yes' vendor='IBM'>z900.3-base</model>
       <model usable='yes' vendor='IBM'>z990</model>
+      <model usable='yes' vendor='IBM'>z990-base</model>
       <model usable='yes' vendor='IBM'>z990.2</model>
-      <model usable='no' vendor='IBM'>z14</model>
-      <model usable='yes' vendor='IBM'>gen15b-base</model>
-      <model usable='yes' vendor='IBM'>z990.4</model>
-      <model usable='yes' vendor='unknown'>max</model>
-      <model usable='no' vendor='IBM'>gen16b</model>
-      <model usable='yes' vendor='IBM'>z10EC.2-base</model>
-      <model usable='yes' vendor='IBM'>gen15a-base</model>
-      <model usable='yes' vendor='IBM'>z800</model>
-      <model usable='no' vendor='IBM'>zEC12.2</model>
-      <model usable='no' vendor='IBM'>z10EC</model>
       <model usable='yes' vendor='IBM'>z990.2-base</model>
-      <model usable='yes' vendor='IBM'>z900-base</model>
-      <model usable='no' vendor='IBM'>z10BC.2</model>
-      <model usable='yes' vendor='IBM'>z9EC-base</model>
-      <model usable='yes' vendor='IBM'>z9EC.3-base</model>
-      <model usable='no' vendor='IBM'>z114</model>
-      <model usable='yes' vendor='IBM'>z890.3</model>
-      <model usable='yes' vendor='IBM'>z196-base</model>
-      <model usable='yes' vendor='IBM'>z9EC.2-base</model>
-      <model usable='no' vendor='IBM'>z196.2</model>
-      <model usable='no' vendor='IBM'>z14.2</model>
-      <model usable='yes' vendor='IBM'>z990-base</model>
-      <model usable='no' vendor='IBM'>z10EC.3</model>
-      <model usable='yes' vendor='IBM'>z890-base</model>
-      <model usable='yes' vendor='IBM'>z900.2</model>
-      <model usable='yes' vendor='IBM'>z14-base</model>
-      <model usable='yes' vendor='IBM'>z990.4-base</model>
-      <model usable='yes' vendor='IBM'>zEC12.2-base</model>
-      <model usable='yes' vendor='IBM'>z10EC.3-base</model>
-      <model usable='yes' vendor='IBM'>z10BC-base</model>
-      <model usable='yes' vendor='IBM'>z13-base</model>
+      <model usable='yes' vendor='IBM'>z990.3</model>
       <model usable='yes' vendor='IBM'>z990.3-base</model>
+      <model usable='yes' vendor='IBM'>z990.4</model>
+      <model usable='yes' vendor='IBM'>z990.4-base</model>
       <model usable='yes' vendor='IBM'>z990.5</model>
+      <model usable='yes' vendor='IBM'>z990.5-base</model>
+      <model usable='no' vendor='IBM'>z9BC</model>
+      <model usable='yes' vendor='IBM'>z9BC-base</model>
+      <model usable='no' vendor='IBM'>z9BC.2</model>
+      <model usable='yes' vendor='IBM'>z9BC.2-base</model>
+      <model usable='no' vendor='IBM'>z9EC</model>
+      <model usable='yes' vendor='IBM'>z9EC-base</model>
+      <model usable='no' vendor='IBM'>z9EC.2</model>
+      <model usable='yes' vendor='IBM'>z9EC.2-base</model>
+      <model usable='no' vendor='IBM'>z9EC.3</model>
+      <model usable='yes' vendor='IBM'>z9EC.3-base</model>
       <model usable='no' vendor='IBM'>zBC12</model>
-      <model usable='yes' vendor='IBM'>z890.3-base</model>
-      <model usable='yes' vendor='unknown'>qemu</model>
-      <model usable='no' vendor='IBM'>gen15b</model>
-      <model usable='no' vendor='IBM'>gen16a-base</model>
+      <model usable='yes' vendor='IBM'>zBC12-base</model>
+      <model usable='no' vendor='IBM'>zEC12</model>
+      <model usable='yes' vendor='IBM'>zEC12-base</model>
+      <model usable='no' vendor='IBM'>zEC12.2</model>
+      <model usable='yes' vendor='IBM'>zEC12.2-base</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 532a9b2d77..28e0757b86 100644
--- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
@@ -71,62 +71,62 @@
       <feature policy='disable' name='xsaves'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>qemu64</model>
-      <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='AMD'>phenom</model>
-      <model usable='yes' vendor='unknown'>pentium3</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
-      <model usable='yes' vendor='unknown'>pentium</model>
-      <model usable='no' vendor='Intel'>n270</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='yes' vendor='unknown'>kvm32</model>
-      <model usable='no' vendor='Intel'>coreduo</model>
-      <model usable='no' vendor='Intel'>core2duo</model>
-      <model usable='no' vendor='AMD'>athlon</model>
-      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
-      <model usable='yes' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Snowridge</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client</model>
-      <model usable='no' vendor='Intel'>SapphireRapids</model>
-      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
-      <model usable='yes' vendor='Intel'>SandyBridge</model>
-      <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
-      <model usable='no' vendor='AMD'>Opteron_G4</model>
-      <model usable='yes' vendor='AMD'>Opteron_G3</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-      <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='Intel'>Nehalem</model>
-      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='Intel'>IvyBridge</model>
-      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Icelake-Server</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
-      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell</model>
-      <model usable='no' vendor='Intel'>GraniteRapids</model>
-      <model usable='no' vendor='AMD'>EPYC-Rome</model>
-      <model usable='no' vendor='AMD'>EPYC-Milan</model>
-      <model usable='yes' vendor='AMD'>EPYC-IBPB</model>
-      <model usable='no' vendor='AMD'>EPYC-Genoa</model>
-      <model usable='yes' vendor='AMD'>EPYC</model>
-      <model usable='yes' vendor='Hygon'>Dhyana</model>
-      <model usable='no' vendor='Intel'>Cooperlake</model>
-      <model usable='yes' vendor='Intel'>Conroe</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
-      <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell</model>
       <model usable='yes' vendor='unknown'>486</model>
+      <model usable='no' vendor='Intel'>Broadwell</model>
+      <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
+      <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
+      <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cooperlake</model>
+      <model usable='yes' vendor='Hygon'>Dhyana</model>
+      <model usable='yes' vendor='AMD'>EPYC</model>
+      <model usable='no' vendor='AMD'>EPYC-Genoa</model>
+      <model usable='yes' vendor='AMD'>EPYC-IBPB</model>
+      <model usable='no' vendor='AMD'>EPYC-Milan</model>
+      <model usable='no' vendor='AMD'>EPYC-Rome</model>
+      <model usable='no' vendor='Intel'>GraniteRapids</model>
+      <model usable='no' vendor='Intel'>Haswell</model>
+      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
+      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
+      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Icelake-Server</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
+      <model usable='no' vendor='Intel'>IvyBridge</model>
+      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
+      <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
+      <model usable='yes' vendor='AMD'>Opteron_G1</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>
+      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='yes' vendor='Intel'>Penryn</model>
+      <model usable='yes' vendor='Intel'>SandyBridge</model>
+      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
+      <model usable='no' vendor='Intel'>SapphireRapids</model>
+      <model usable='no' vendor='Intel'>Skylake-Client</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Server</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Snowridge</model>
+      <model usable='yes' vendor='Intel'>Westmere</model>
+      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
+      <model usable='no' vendor='AMD'>athlon</model>
+      <model usable='no' vendor='Intel'>core2duo</model>
+      <model usable='no' vendor='Intel'>coreduo</model>
+      <model usable='yes' vendor='unknown'>kvm32</model>
+      <model usable='yes' vendor='unknown'>kvm64</model>
+      <model usable='no' vendor='Intel'>n270</model>
+      <model usable='yes' vendor='unknown'>pentium</model>
+      <model usable='yes' vendor='unknown'>pentium2</model>
+      <model usable='yes' vendor='unknown'>pentium3</model>
+      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='yes' vendor='unknown'>qemu64</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 cebc4e01e9..0a91be679b 100644
--- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
@@ -73,62 +73,62 @@
       <feature policy='disable' name='xsaves'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>qemu64</model>
-      <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='AMD'>phenom</model>
-      <model usable='yes' vendor='unknown'>pentium3</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
-      <model usable='yes' vendor='unknown'>pentium</model>
-      <model usable='no' vendor='Intel'>n270</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='yes' vendor='unknown'>kvm32</model>
-      <model usable='no' vendor='Intel'>coreduo</model>
-      <model usable='no' vendor='Intel'>core2duo</model>
-      <model usable='no' vendor='AMD'>athlon</model>
-      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
-      <model usable='yes' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Snowridge</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client</model>
-      <model usable='no' vendor='Intel'>SapphireRapids</model>
-      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
-      <model usable='yes' vendor='Intel'>SandyBridge</model>
-      <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
-      <model usable='no' vendor='AMD'>Opteron_G4</model>
-      <model usable='yes' vendor='AMD'>Opteron_G3</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-      <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='Intel'>Nehalem</model>
-      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='Intel'>IvyBridge</model>
-      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Icelake-Server</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
-      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell</model>
-      <model usable='no' vendor='Intel'>GraniteRapids</model>
-      <model usable='no' vendor='AMD'>EPYC-Rome</model>
-      <model usable='no' vendor='AMD'>EPYC-Milan</model>
-      <model usable='yes' vendor='AMD'>EPYC-IBPB</model>
-      <model usable='no' vendor='AMD'>EPYC-Genoa</model>
-      <model usable='yes' vendor='AMD'>EPYC</model>
-      <model usable='yes' vendor='Hygon'>Dhyana</model>
-      <model usable='no' vendor='Intel'>Cooperlake</model>
-      <model usable='yes' vendor='Intel'>Conroe</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
-      <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell</model>
       <model usable='yes' vendor='unknown'>486</model>
+      <model usable='no' vendor='Intel'>Broadwell</model>
+      <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
+      <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
+      <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cooperlake</model>
+      <model usable='yes' vendor='Hygon'>Dhyana</model>
+      <model usable='yes' vendor='AMD'>EPYC</model>
+      <model usable='no' vendor='AMD'>EPYC-Genoa</model>
+      <model usable='yes' vendor='AMD'>EPYC-IBPB</model>
+      <model usable='no' vendor='AMD'>EPYC-Milan</model>
+      <model usable='no' vendor='AMD'>EPYC-Rome</model>
+      <model usable='no' vendor='Intel'>GraniteRapids</model>
+      <model usable='no' vendor='Intel'>Haswell</model>
+      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
+      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
+      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Icelake-Server</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
+      <model usable='no' vendor='Intel'>IvyBridge</model>
+      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
+      <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
+      <model usable='yes' vendor='AMD'>Opteron_G1</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>
+      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='yes' vendor='Intel'>Penryn</model>
+      <model usable='yes' vendor='Intel'>SandyBridge</model>
+      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
+      <model usable='no' vendor='Intel'>SapphireRapids</model>
+      <model usable='no' vendor='Intel'>Skylake-Client</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Server</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Snowridge</model>
+      <model usable='yes' vendor='Intel'>Westmere</model>
+      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
+      <model usable='no' vendor='AMD'>athlon</model>
+      <model usable='no' vendor='Intel'>core2duo</model>
+      <model usable='no' vendor='Intel'>coreduo</model>
+      <model usable='yes' vendor='unknown'>kvm32</model>
+      <model usable='yes' vendor='unknown'>kvm64</model>
+      <model usable='no' vendor='Intel'>n270</model>
+      <model usable='yes' vendor='unknown'>pentium</model>
+      <model usable='yes' vendor='unknown'>pentium2</model>
+      <model usable='yes' vendor='unknown'>pentium3</model>
+      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='yes' vendor='unknown'>qemu64</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 a68b8a6f36..7744bf95d3 100644
--- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
@@ -71,62 +71,62 @@
       <feature policy='disable' name='nrip-save'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>qemu64</model>
-      <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='AMD'>phenom</model>
-      <model usable='yes' vendor='unknown'>pentium3</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
-      <model usable='yes' vendor='unknown'>pentium</model>
-      <model usable='yes' vendor='Intel'>n270</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='yes' vendor='unknown'>kvm32</model>
-      <model usable='yes' vendor='Intel'>coreduo</model>
-      <model usable='yes' vendor='Intel'>core2duo</model>
-      <model usable='yes' vendor='AMD'>athlon</model>
-      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
-      <model usable='yes' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Snowridge</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client</model>
-      <model usable='no' vendor='Intel'>SapphireRapids</model>
-      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
-      <model usable='no' vendor='Intel'>SandyBridge</model>
-      <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
-      <model usable='no' vendor='AMD'>Opteron_G4</model>
-      <model usable='no' vendor='AMD'>Opteron_G3</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-      <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='Intel'>Nehalem</model>
-      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='Intel'>IvyBridge</model>
-      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Icelake-Server</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
-      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell</model>
-      <model usable='no' vendor='Intel'>GraniteRapids</model>
-      <model usable='no' vendor='AMD'>EPYC-Rome</model>
-      <model usable='no' vendor='AMD'>EPYC-Milan</model>
-      <model usable='no' vendor='AMD'>EPYC-IBPB</model>
-      <model usable='no' vendor='AMD'>EPYC-Genoa</model>
-      <model usable='no' vendor='AMD'>EPYC</model>
-      <model usable='no' vendor='Hygon'>Dhyana</model>
-      <model usable='no' vendor='Intel'>Cooperlake</model>
-      <model usable='yes' vendor='Intel'>Conroe</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
-      <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell</model>
       <model usable='yes' vendor='unknown'>486</model>
+      <model usable='no' vendor='Intel'>Broadwell</model>
+      <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
+      <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
+      <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cooperlake</model>
+      <model usable='no' vendor='Hygon'>Dhyana</model>
+      <model usable='no' vendor='AMD'>EPYC</model>
+      <model usable='no' vendor='AMD'>EPYC-Genoa</model>
+      <model usable='no' vendor='AMD'>EPYC-IBPB</model>
+      <model usable='no' vendor='AMD'>EPYC-Milan</model>
+      <model usable='no' vendor='AMD'>EPYC-Rome</model>
+      <model usable='no' vendor='Intel'>GraniteRapids</model>
+      <model usable='no' vendor='Intel'>Haswell</model>
+      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
+      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
+      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Icelake-Server</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
+      <model usable='no' vendor='Intel'>IvyBridge</model>
+      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
+      <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
+      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2</model>
+      <model usable='no' vendor='AMD'>Opteron_G3</model>
+      <model usable='no' vendor='AMD'>Opteron_G4</model>
+      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='yes' vendor='Intel'>Penryn</model>
+      <model usable='no' vendor='Intel'>SandyBridge</model>
+      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
+      <model usable='no' vendor='Intel'>SapphireRapids</model>
+      <model usable='no' vendor='Intel'>Skylake-Client</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Server</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Snowridge</model>
+      <model usable='yes' vendor='Intel'>Westmere</model>
+      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
+      <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='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'>pentium2</model>
+      <model usable='yes' vendor='unknown'>pentium3</model>
+      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='yes' vendor='unknown'>qemu64</model>
     </mode>
   </cpu>
   <memoryBacking supported='yes'>
diff --git a/tests/domaincapsdata/qemu_8.2.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_8.2.0-virt.aarch64.xml
index 2f661b7eb3..1d1af1a2ac 100644
--- a/tests/domaincapsdata/qemu_8.2.0-virt.aarch64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0-virt.aarch64.xml
@@ -39,53 +39,53 @@
     </mode>
     <mode name='host-model' supported='no'/>
     <mode name='custom' supported='yes'>
-      <model usable='unknown' vendor='unknown'>neoverse-n2</model>
-      <model usable='unknown' vendor='unknown'>pxa270-c0</model>
+      <model usable='unknown' vendor='unknown'>a64fx</model>
+      <model usable='unknown' vendor='unknown'>arm1026</model>
+      <model usable='unknown' vendor='unknown'>arm1136</model>
+      <model usable='unknown' vendor='unknown'>arm1136-r2</model>
+      <model usable='unknown' vendor='unknown'>arm1176</model>
+      <model usable='unknown' vendor='unknown'>arm11mpcore</model>
+      <model usable='unknown' vendor='unknown'>arm926</model>
+      <model usable='unknown' vendor='unknown'>arm946</model>
       <model usable='unknown' vendor='unknown'>cortex-a15</model>
-      <model usable='unknown' vendor='unknown'>pxa270-b0</model>
-      <model usable='unknown' vendor='unknown'>cortex-m4</model>
+      <model usable='unknown' vendor='unknown'>cortex-a35</model>
+      <model usable='unknown' vendor='unknown'>cortex-a53</model>
+      <model usable='unknown' vendor='unknown'>cortex-a55</model>
       <model usable='unknown' vendor='unknown'>cortex-a57</model>
-      <model usable='unknown' vendor='unknown'>pxa270-a0</model>
-      <model usable='unknown' vendor='unknown'>arm1176</model>
-      <model usable='unknown' vendor='unknown'>pxa270-b1</model>
       <model usable='unknown' vendor='unknown'>cortex-a7</model>
-      <model usable='unknown' vendor='unknown'>pxa270-a1</model>
+      <model usable='unknown' vendor='unknown'>cortex-a710</model>
+      <model usable='unknown' vendor='unknown'>cortex-a72</model>
       <model usable='unknown' vendor='unknown'>cortex-a76</model>
-      <model usable='unknown' vendor='unknown'>a64fx</model>
       <model usable='unknown' vendor='unknown'>cortex-a8</model>
-      <model usable='unknown' vendor='unknown'>neoverse-v1</model>
-      <model usable='unknown' vendor='unknown'>cortex-r5</model>
-      <model usable='unknown' vendor='unknown'>ti925t</model>
-      <model usable='unknown' vendor='unknown'>cortex-r5f</model>
-      <model usable='unknown' vendor='unknown'>arm1026</model>
       <model usable='unknown' vendor='unknown'>cortex-a9</model>
+      <model usable='unknown' vendor='unknown'>cortex-m0</model>
+      <model usable='unknown' vendor='unknown'>cortex-m3</model>
+      <model usable='unknown' vendor='unknown'>cortex-m33</model>
+      <model usable='unknown' vendor='unknown'>cortex-m4</model>
+      <model usable='unknown' vendor='unknown'>cortex-m55</model>
       <model usable='unknown' vendor='unknown'>cortex-m7</model>
-      <model usable='unknown' vendor='unknown'>pxa270</model>
-      <model usable='unknown' vendor='unknown'>pxa260</model>
+      <model usable='unknown' vendor='unknown'>cortex-r5</model>
+      <model usable='unknown' vendor='unknown'>cortex-r52</model>
+      <model usable='unknown' vendor='unknown'>cortex-r5f</model>
+      <model usable='unknown' vendor='unknown'>max</model>
+      <model usable='unknown' vendor='unknown'>neoverse-n1</model>
+      <model usable='unknown' vendor='unknown'>neoverse-n2</model>
+      <model usable='unknown' vendor='unknown'>neoverse-v1</model>
       <model usable='unknown' vendor='unknown'>pxa250</model>
-      <model usable='unknown' vendor='unknown'>pxa270-c5</model>
+      <model usable='unknown' vendor='unknown'>pxa255</model>
+      <model usable='unknown' vendor='unknown'>pxa260</model>
       <model usable='unknown' vendor='unknown'>pxa261</model>
       <model usable='unknown' vendor='unknown'>pxa262</model>
-      <model usable='unknown' vendor='unknown'>cortex-a710</model>
-      <model usable='unknown' vendor='unknown'>cortex-r52</model>
-      <model usable='unknown' vendor='unknown'>sa1110</model>
+      <model usable='unknown' vendor='unknown'>pxa270</model>
+      <model usable='unknown' vendor='unknown'>pxa270-a0</model>
+      <model usable='unknown' vendor='unknown'>pxa270-a1</model>
+      <model usable='unknown' vendor='unknown'>pxa270-b0</model>
+      <model usable='unknown' vendor='unknown'>pxa270-b1</model>
+      <model usable='unknown' vendor='unknown'>pxa270-c0</model>
+      <model usable='unknown' vendor='unknown'>pxa270-c5</model>
       <model usable='unknown' vendor='unknown'>sa1100</model>
-      <model usable='unknown' vendor='unknown'>max</model>
-      <model usable='unknown' vendor='unknown'>cortex-a53</model>
-      <model usable='unknown' vendor='unknown'>cortex-m0</model>
-      <model usable='unknown' vendor='unknown'>cortex-m33</model>
-      <model usable='unknown' vendor='unknown'>cortex-a72</model>
-      <model usable='unknown' vendor='unknown'>arm946</model>
-      <model usable='unknown' vendor='unknown'>pxa255</model>
-      <model usable='unknown' vendor='unknown'>cortex-a55</model>
-      <model usable='unknown' vendor='unknown'>arm11mpcore</model>
-      <model usable='unknown' vendor='unknown'>cortex-m55</model>
-      <model usable='unknown' vendor='unknown'>neoverse-n1</model>
-      <model usable='unknown' vendor='unknown'>arm926</model>
-      <model usable='unknown' vendor='unknown'>arm1136</model>
-      <model usable='unknown' vendor='unknown'>cortex-a35</model>
-      <model usable='unknown' vendor='unknown'>arm1136-r2</model>
-      <model usable='unknown' vendor='unknown'>cortex-m3</model>
+      <model usable='unknown' vendor='unknown'>sa1110</model>
+      <model usable='unknown' vendor='unknown'>ti925t</model>
     </mode>
   </cpu>
   <memoryBacking supported='yes'>
diff --git a/tests/domaincapsdata/qemu_8.2.0.aarch64.xml b/tests/domaincapsdata/qemu_8.2.0.aarch64.xml
index 2f661b7eb3..1d1af1a2ac 100644
--- a/tests/domaincapsdata/qemu_8.2.0.aarch64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0.aarch64.xml
@@ -39,53 +39,53 @@
     </mode>
     <mode name='host-model' supported='no'/>
     <mode name='custom' supported='yes'>
-      <model usable='unknown' vendor='unknown'>neoverse-n2</model>
-      <model usable='unknown' vendor='unknown'>pxa270-c0</model>
+      <model usable='unknown' vendor='unknown'>a64fx</model>
+      <model usable='unknown' vendor='unknown'>arm1026</model>
+      <model usable='unknown' vendor='unknown'>arm1136</model>
+      <model usable='unknown' vendor='unknown'>arm1136-r2</model>
+      <model usable='unknown' vendor='unknown'>arm1176</model>
+      <model usable='unknown' vendor='unknown'>arm11mpcore</model>
+      <model usable='unknown' vendor='unknown'>arm926</model>
+      <model usable='unknown' vendor='unknown'>arm946</model>
       <model usable='unknown' vendor='unknown'>cortex-a15</model>
-      <model usable='unknown' vendor='unknown'>pxa270-b0</model>
-      <model usable='unknown' vendor='unknown'>cortex-m4</model>
+      <model usable='unknown' vendor='unknown'>cortex-a35</model>
+      <model usable='unknown' vendor='unknown'>cortex-a53</model>
+      <model usable='unknown' vendor='unknown'>cortex-a55</model>
       <model usable='unknown' vendor='unknown'>cortex-a57</model>
-      <model usable='unknown' vendor='unknown'>pxa270-a0</model>
-      <model usable='unknown' vendor='unknown'>arm1176</model>
-      <model usable='unknown' vendor='unknown'>pxa270-b1</model>
       <model usable='unknown' vendor='unknown'>cortex-a7</model>
-      <model usable='unknown' vendor='unknown'>pxa270-a1</model>
+      <model usable='unknown' vendor='unknown'>cortex-a710</model>
+      <model usable='unknown' vendor='unknown'>cortex-a72</model>
       <model usable='unknown' vendor='unknown'>cortex-a76</model>
-      <model usable='unknown' vendor='unknown'>a64fx</model>
       <model usable='unknown' vendor='unknown'>cortex-a8</model>
-      <model usable='unknown' vendor='unknown'>neoverse-v1</model>
-      <model usable='unknown' vendor='unknown'>cortex-r5</model>
-      <model usable='unknown' vendor='unknown'>ti925t</model>
-      <model usable='unknown' vendor='unknown'>cortex-r5f</model>
-      <model usable='unknown' vendor='unknown'>arm1026</model>
       <model usable='unknown' vendor='unknown'>cortex-a9</model>
+      <model usable='unknown' vendor='unknown'>cortex-m0</model>
+      <model usable='unknown' vendor='unknown'>cortex-m3</model>
+      <model usable='unknown' vendor='unknown'>cortex-m33</model>
+      <model usable='unknown' vendor='unknown'>cortex-m4</model>
+      <model usable='unknown' vendor='unknown'>cortex-m55</model>
       <model usable='unknown' vendor='unknown'>cortex-m7</model>
-      <model usable='unknown' vendor='unknown'>pxa270</model>
-      <model usable='unknown' vendor='unknown'>pxa260</model>
+      <model usable='unknown' vendor='unknown'>cortex-r5</model>
+      <model usable='unknown' vendor='unknown'>cortex-r52</model>
+      <model usable='unknown' vendor='unknown'>cortex-r5f</model>
+      <model usable='unknown' vendor='unknown'>max</model>
+      <model usable='unknown' vendor='unknown'>neoverse-n1</model>
+      <model usable='unknown' vendor='unknown'>neoverse-n2</model>
+      <model usable='unknown' vendor='unknown'>neoverse-v1</model>
       <model usable='unknown' vendor='unknown'>pxa250</model>
-      <model usable='unknown' vendor='unknown'>pxa270-c5</model>
+      <model usable='unknown' vendor='unknown'>pxa255</model>
+      <model usable='unknown' vendor='unknown'>pxa260</model>
       <model usable='unknown' vendor='unknown'>pxa261</model>
       <model usable='unknown' vendor='unknown'>pxa262</model>
-      <model usable='unknown' vendor='unknown'>cortex-a710</model>
-      <model usable='unknown' vendor='unknown'>cortex-r52</model>
-      <model usable='unknown' vendor='unknown'>sa1110</model>
+      <model usable='unknown' vendor='unknown'>pxa270</model>
+      <model usable='unknown' vendor='unknown'>pxa270-a0</model>
+      <model usable='unknown' vendor='unknown'>pxa270-a1</model>
+      <model usable='unknown' vendor='unknown'>pxa270-b0</model>
+      <model usable='unknown' vendor='unknown'>pxa270-b1</model>
+      <model usable='unknown' vendor='unknown'>pxa270-c0</model>
+      <model usable='unknown' vendor='unknown'>pxa270-c5</model>
       <model usable='unknown' vendor='unknown'>sa1100</model>
-      <model usable='unknown' vendor='unknown'>max</model>
-      <model usable='unknown' vendor='unknown'>cortex-a53</model>
-      <model usable='unknown' vendor='unknown'>cortex-m0</model>
-      <model usable='unknown' vendor='unknown'>cortex-m33</model>
-      <model usable='unknown' vendor='unknown'>cortex-a72</model>
-      <model usable='unknown' vendor='unknown'>arm946</model>
-      <model usable='unknown' vendor='unknown'>pxa255</model>
-      <model usable='unknown' vendor='unknown'>cortex-a55</model>
-      <model usable='unknown' vendor='unknown'>arm11mpcore</model>
-      <model usable='unknown' vendor='unknown'>cortex-m55</model>
-      <model usable='unknown' vendor='unknown'>neoverse-n1</model>
-      <model usable='unknown' vendor='unknown'>arm926</model>
-      <model usable='unknown' vendor='unknown'>arm1136</model>
-      <model usable='unknown' vendor='unknown'>cortex-a35</model>
-      <model usable='unknown' vendor='unknown'>arm1136-r2</model>
-      <model usable='unknown' vendor='unknown'>cortex-m3</model>
+      <model usable='unknown' vendor='unknown'>sa1110</model>
+      <model usable='unknown' vendor='unknown'>ti925t</model>
     </mode>
   </cpu>
   <memoryBacking supported='yes'>
diff --git a/tests/domaincapsdata/qemu_8.2.0.s390x.xml b/tests/domaincapsdata/qemu_8.2.0.s390x.xml
index cc8bbec050..67ddc87b31 100644
--- a/tests/domaincapsdata/qemu_8.2.0.s390x.xml
+++ b/tests/domaincapsdata/qemu_8.2.0.s390x.xml
@@ -77,84 +77,84 @@
       <feature policy='require' name='te'/>
     </mode>
     <mode name='custom' supported='yes'>
+      <model usable='no' vendor='IBM'>gen15a</model>
+      <model usable='yes' vendor='IBM'>gen15a-base</model>
+      <model usable='no' vendor='IBM'>gen15b</model>
+      <model usable='yes' vendor='IBM'>gen15b-base</model>
+      <model usable='no' vendor='IBM'>gen16a</model>
+      <model usable='no' vendor='IBM'>gen16a-base</model>
+      <model usable='no' vendor='IBM'>gen16b</model>
+      <model usable='no' vendor='IBM'>gen16b-base</model>
+      <model usable='yes' vendor='unknown'>max</model>
+      <model usable='yes' vendor='unknown'>qemu</model>
+      <model usable='no' vendor='IBM'>z10BC</model>
+      <model usable='yes' vendor='IBM'>z10BC-base</model>
+      <model usable='no' vendor='IBM'>z10BC.2</model>
+      <model usable='yes' vendor='IBM'>z10BC.2-base</model>
+      <model usable='no' vendor='IBM'>z10EC</model>
+      <model usable='yes' vendor='IBM'>z10EC-base</model>
+      <model usable='no' vendor='IBM'>z10EC.2</model>
+      <model usable='yes' vendor='IBM'>z10EC.2-base</model>
+      <model usable='no' vendor='IBM'>z10EC.3</model>
+      <model usable='yes' vendor='IBM'>z10EC.3-base</model>
+      <model usable='no' vendor='IBM'>z114</model>
+      <model usable='yes' vendor='IBM'>z114-base</model>
       <model usable='no' vendor='IBM'>z13</model>
-      <model usable='yes' vendor='IBM'>z990.3</model>
       <model usable='yes' vendor='IBM'>z13-base</model>
-      <model usable='yes' vendor='IBM'>z990.2</model>
-      <model usable='yes' vendor='IBM'>z196.2-base</model>
+      <model usable='no' vendor='IBM'>z13.2</model>
+      <model usable='yes' vendor='IBM'>z13.2-base</model>
+      <model usable='no' vendor='IBM'>z13s</model>
+      <model usable='yes' vendor='IBM'>z13s-base</model>
       <model usable='no' vendor='IBM'>z14</model>
+      <model usable='yes' vendor='IBM'>z14-base</model>
+      <model usable='no' vendor='IBM'>z14.2</model>
       <model usable='yes' vendor='IBM'>z14.2-base</model>
-      <model usable='yes' vendor='IBM'>z990.4</model>
+      <model usable='no' vendor='IBM'>z14ZR1</model>
+      <model usable='yes' vendor='IBM'>z14ZR1-base</model>
       <model usable='no' vendor='IBM'>z196</model>
-      <model usable='yes' vendor='IBM'>z10BC.2-base</model>
-      <model usable='yes' vendor='IBM'>z114-base</model>
-      <model usable='no' vendor='IBM'>gen16b</model>
-      <model usable='yes' vendor='IBM'>z890.3-base</model>
-      <model usable='no' vendor='IBM'>gen16a</model>
-      <model usable='yes' vendor='IBM'>z990.5</model>
+      <model usable='yes' vendor='IBM'>z196-base</model>
       <model usable='no' vendor='IBM'>z196.2</model>
-      <model usable='no' vendor='IBM'>zEC12</model>
-      <model usable='no' vendor='IBM'>zEC12.2</model>
-      <model usable='no' vendor='IBM'>z9EC.2</model>
-      <model usable='no' vendor='IBM'>z9BC</model>
-      <model usable='yes' vendor='IBM'>z9EC.3-base</model>
+      <model usable='yes' vendor='IBM'>z196.2-base</model>
+      <model usable='yes' vendor='IBM'>z800</model>
       <model usable='yes' vendor='IBM'>z800-base</model>
-      <model usable='yes' vendor='IBM'>z14ZR1-base</model>
       <model usable='yes' vendor='IBM'>z890</model>
-      <model usable='yes' vendor='IBM'>z990.4-base</model>
-      <model usable='no' vendor='IBM'>z9EC.3</model>
-      <model usable='no' vendor='IBM'>z13.2</model>
-      <model usable='no' vendor='IBM'>z10BC.2</model>
-      <model usable='yes' vendor='IBM'>gen15a-base</model>
-      <model usable='no' vendor='IBM'>z14.2</model>
-      <model usable='yes' vendor='IBM'>zBC12-base</model>
-      <model usable='no' vendor='IBM'>gen16a-base</model>
-      <model usable='yes' vendor='IBM'>z900.3</model>
-      <model usable='yes' vendor='IBM'>z196-base</model>
-      <model usable='yes' vendor='IBM'>z990</model>
-      <model usable='yes' vendor='IBM'>z14-base</model>
-      <model usable='yes' vendor='IBM'>z900.2</model>
-      <model usable='yes' vendor='IBM'>z800</model>
-      <model usable='no' vendor='IBM'>z10EC</model>
-      <model usable='no' vendor='IBM'>z14ZR1</model>
-      <model usable='no' vendor='IBM'>z10EC.2</model>
+      <model usable='yes' vendor='IBM'>z890-base</model>
+      <model usable='yes' vendor='IBM'>z890.2</model>
+      <model usable='yes' vendor='IBM'>z890.2-base</model>
+      <model usable='yes' vendor='IBM'>z890.3</model>
+      <model usable='yes' vendor='IBM'>z890.3-base</model>
       <model usable='yes' vendor='IBM'>z900</model>
-      <model usable='yes' vendor='IBM'>z10EC.2-base</model>
-      <model usable='yes' vendor='IBM'>z900.2-base</model>
       <model usable='yes' vendor='IBM'>z900-base</model>
-      <model usable='no' vendor='IBM'>z10EC.3</model>
-      <model usable='yes' vendor='IBM'>z990.5-base</model>
-      <model usable='yes' vendor='unknown'>max</model>
-      <model usable='no' vendor='IBM'>gen15b</model>
-      <model usable='yes' vendor='IBM'>z9BC.2-base</model>
-      <model usable='no' vendor='IBM'>gen15a</model>
+      <model usable='yes' vendor='IBM'>z900.2</model>
+      <model usable='yes' vendor='IBM'>z900.2-base</model>
+      <model usable='yes' vendor='IBM'>z900.3</model>
+      <model usable='yes' vendor='IBM'>z900.3-base</model>
+      <model usable='yes' vendor='IBM'>z990</model>
+      <model usable='yes' vendor='IBM'>z990-base</model>
+      <model usable='yes' vendor='IBM'>z990.2</model>
       <model usable='yes' vendor='IBM'>z990.2-base</model>
-      <model usable='yes' vendor='IBM'>z10EC-base</model>
-      <model usable='no' vendor='IBM'>gen16b-base</model>
-      <model usable='no' vendor='IBM'>z114</model>
-      <model usable='yes' vendor='IBM'>z9EC-base</model>
-      <model usable='no' vendor='IBM'>z13s</model>
-      <model usable='yes' vendor='unknown'>qemu</model>
-      <model usable='yes' vendor='IBM'>gen15b-base</model>
-      <model usable='yes' vendor='IBM'>zEC12-base</model>
-      <model usable='yes' vendor='IBM'>z890.3</model>
-      <model usable='yes' vendor='IBM'>z10EC.3-base</model>
-      <model usable='yes' vendor='IBM'>z890.2-base</model>
-      <model usable='yes' vendor='IBM'>z890.2</model>
-      <model usable='yes' vendor='IBM'>zEC12.2-base</model>
-      <model usable='yes' vendor='IBM'>z10BC-base</model>
-      <model usable='yes' vendor='IBM'>z890-base</model>
+      <model usable='yes' vendor='IBM'>z990.3</model>
+      <model usable='yes' vendor='IBM'>z990.3-base</model>
+      <model usable='yes' vendor='IBM'>z990.4</model>
+      <model usable='yes' vendor='IBM'>z990.4-base</model>
+      <model usable='yes' vendor='IBM'>z990.5</model>
+      <model usable='yes' vendor='IBM'>z990.5-base</model>
+      <model usable='no' vendor='IBM'>z9BC</model>
       <model usable='yes' vendor='IBM'>z9BC-base</model>
-      <model usable='no' vendor='IBM'>z10BC</model>
+      <model usable='no' vendor='IBM'>z9BC.2</model>
+      <model usable='yes' vendor='IBM'>z9BC.2-base</model>
       <model usable='no' vendor='IBM'>z9EC</model>
+      <model usable='yes' vendor='IBM'>z9EC-base</model>
+      <model usable='no' vendor='IBM'>z9EC.2</model>
       <model usable='yes' vendor='IBM'>z9EC.2-base</model>
-      <model usable='yes' vendor='IBM'>z13.2-base</model>
-      <model usable='yes' vendor='IBM'>z900.3-base</model>
-      <model usable='yes' vendor='IBM'>z990.3-base</model>
-      <model usable='yes' vendor='IBM'>z13s-base</model>
+      <model usable='no' vendor='IBM'>z9EC.3</model>
+      <model usable='yes' vendor='IBM'>z9EC.3-base</model>
       <model usable='no' vendor='IBM'>zBC12</model>
-      <model usable='yes' vendor='IBM'>z990-base</model>
-      <model usable='no' vendor='IBM'>z9BC.2</model>
+      <model usable='yes' vendor='IBM'>zBC12-base</model>
+      <model usable='no' vendor='IBM'>zEC12</model>
+      <model usable='yes' vendor='IBM'>zEC12-base</model>
+      <model usable='no' vendor='IBM'>zEC12.2</model>
+      <model usable='yes' vendor='IBM'>zEC12.2-base</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 0bd89504e7..bbc940d77d 100644
--- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
@@ -72,62 +72,62 @@
       <feature policy='disable' name='xsaves'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>qemu64</model>
-      <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='AMD'>phenom</model>
-      <model usable='yes' vendor='unknown'>pentium3</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
-      <model usable='yes' vendor='unknown'>pentium</model>
-      <model usable='no' vendor='Intel'>n270</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='yes' vendor='unknown'>kvm32</model>
-      <model usable='no' vendor='Intel'>coreduo</model>
-      <model usable='no' vendor='Intel'>core2duo</model>
-      <model usable='no' vendor='AMD'>athlon</model>
-      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
-      <model usable='yes' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Snowridge</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client</model>
-      <model usable='no' vendor='Intel'>SapphireRapids</model>
-      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
-      <model usable='yes' vendor='Intel'>SandyBridge</model>
-      <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
-      <model usable='no' vendor='AMD'>Opteron_G4</model>
-      <model usable='yes' vendor='AMD'>Opteron_G3</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-      <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='Intel'>Nehalem</model>
-      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='Intel'>IvyBridge</model>
-      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Icelake-Server</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
-      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell</model>
-      <model usable='no' vendor='Intel'>GraniteRapids</model>
-      <model usable='no' vendor='AMD'>EPYC-Rome</model>
-      <model usable='no' vendor='AMD'>EPYC-Milan</model>
-      <model usable='yes' vendor='AMD'>EPYC-IBPB</model>
-      <model usable='no' vendor='AMD'>EPYC-Genoa</model>
-      <model usable='yes' vendor='AMD'>EPYC</model>
-      <model usable='yes' vendor='Hygon'>Dhyana</model>
-      <model usable='no' vendor='Intel'>Cooperlake</model>
-      <model usable='yes' vendor='Intel'>Conroe</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
-      <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell</model>
       <model usable='yes' vendor='unknown'>486</model>
+      <model usable='no' vendor='Intel'>Broadwell</model>
+      <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
+      <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
+      <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cooperlake</model>
+      <model usable='yes' vendor='Hygon'>Dhyana</model>
+      <model usable='yes' vendor='AMD'>EPYC</model>
+      <model usable='no' vendor='AMD'>EPYC-Genoa</model>
+      <model usable='yes' vendor='AMD'>EPYC-IBPB</model>
+      <model usable='no' vendor='AMD'>EPYC-Milan</model>
+      <model usable='no' vendor='AMD'>EPYC-Rome</model>
+      <model usable='no' vendor='Intel'>GraniteRapids</model>
+      <model usable='no' vendor='Intel'>Haswell</model>
+      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
+      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
+      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Icelake-Server</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
+      <model usable='no' vendor='Intel'>IvyBridge</model>
+      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
+      <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
+      <model usable='yes' vendor='AMD'>Opteron_G1</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>
+      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='yes' vendor='Intel'>Penryn</model>
+      <model usable='yes' vendor='Intel'>SandyBridge</model>
+      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
+      <model usable='no' vendor='Intel'>SapphireRapids</model>
+      <model usable='no' vendor='Intel'>Skylake-Client</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Server</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Snowridge</model>
+      <model usable='yes' vendor='Intel'>Westmere</model>
+      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
+      <model usable='no' vendor='AMD'>athlon</model>
+      <model usable='no' vendor='Intel'>core2duo</model>
+      <model usable='no' vendor='Intel'>coreduo</model>
+      <model usable='yes' vendor='unknown'>kvm32</model>
+      <model usable='yes' vendor='unknown'>kvm64</model>
+      <model usable='no' vendor='Intel'>n270</model>
+      <model usable='yes' vendor='unknown'>pentium</model>
+      <model usable='yes' vendor='unknown'>pentium2</model>
+      <model usable='yes' vendor='unknown'>pentium3</model>
+      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='yes' vendor='unknown'>qemu64</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 b9a215492b..3c3358026b 100644
--- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
@@ -73,62 +73,62 @@
       <feature policy='disable' name='xsaves'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>qemu64</model>
-      <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='AMD'>phenom</model>
-      <model usable='yes' vendor='unknown'>pentium3</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
-      <model usable='yes' vendor='unknown'>pentium</model>
-      <model usable='no' vendor='Intel'>n270</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='yes' vendor='unknown'>kvm32</model>
-      <model usable='no' vendor='Intel'>coreduo</model>
-      <model usable='no' vendor='Intel'>core2duo</model>
-      <model usable='no' vendor='AMD'>athlon</model>
-      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
-      <model usable='yes' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Snowridge</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client</model>
-      <model usable='no' vendor='Intel'>SapphireRapids</model>
-      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
-      <model usable='yes' vendor='Intel'>SandyBridge</model>
-      <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
-      <model usable='no' vendor='AMD'>Opteron_G4</model>
-      <model usable='yes' vendor='AMD'>Opteron_G3</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-      <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='Intel'>Nehalem</model>
-      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='Intel'>IvyBridge</model>
-      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Icelake-Server</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
-      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell</model>
-      <model usable='no' vendor='Intel'>GraniteRapids</model>
-      <model usable='no' vendor='AMD'>EPYC-Rome</model>
-      <model usable='no' vendor='AMD'>EPYC-Milan</model>
-      <model usable='yes' vendor='AMD'>EPYC-IBPB</model>
-      <model usable='no' vendor='AMD'>EPYC-Genoa</model>
-      <model usable='yes' vendor='AMD'>EPYC</model>
-      <model usable='yes' vendor='Hygon'>Dhyana</model>
-      <model usable='no' vendor='Intel'>Cooperlake</model>
-      <model usable='yes' vendor='Intel'>Conroe</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
-      <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell</model>
       <model usable='yes' vendor='unknown'>486</model>
+      <model usable='no' vendor='Intel'>Broadwell</model>
+      <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
+      <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
+      <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cooperlake</model>
+      <model usable='yes' vendor='Hygon'>Dhyana</model>
+      <model usable='yes' vendor='AMD'>EPYC</model>
+      <model usable='no' vendor='AMD'>EPYC-Genoa</model>
+      <model usable='yes' vendor='AMD'>EPYC-IBPB</model>
+      <model usable='no' vendor='AMD'>EPYC-Milan</model>
+      <model usable='no' vendor='AMD'>EPYC-Rome</model>
+      <model usable='no' vendor='Intel'>GraniteRapids</model>
+      <model usable='no' vendor='Intel'>Haswell</model>
+      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
+      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
+      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Icelake-Server</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
+      <model usable='no' vendor='Intel'>IvyBridge</model>
+      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
+      <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
+      <model usable='yes' vendor='AMD'>Opteron_G1</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>
+      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='yes' vendor='Intel'>Penryn</model>
+      <model usable='yes' vendor='Intel'>SandyBridge</model>
+      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
+      <model usable='no' vendor='Intel'>SapphireRapids</model>
+      <model usable='no' vendor='Intel'>Skylake-Client</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Server</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Snowridge</model>
+      <model usable='yes' vendor='Intel'>Westmere</model>
+      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
+      <model usable='no' vendor='AMD'>athlon</model>
+      <model usable='no' vendor='Intel'>core2duo</model>
+      <model usable='no' vendor='Intel'>coreduo</model>
+      <model usable='yes' vendor='unknown'>kvm32</model>
+      <model usable='yes' vendor='unknown'>kvm64</model>
+      <model usable='no' vendor='Intel'>n270</model>
+      <model usable='yes' vendor='unknown'>pentium</model>
+      <model usable='yes' vendor='unknown'>pentium2</model>
+      <model usable='yes' vendor='unknown'>pentium3</model>
+      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='yes' vendor='unknown'>qemu64</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 25bf1d8431..b30babfaee 100644
--- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
@@ -73,62 +73,62 @@
       <feature policy='disable' name='nrip-save'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>qemu64</model>
-      <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='AMD'>phenom</model>
-      <model usable='yes' vendor='unknown'>pentium3</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
-      <model usable='yes' vendor='unknown'>pentium</model>
-      <model usable='yes' vendor='Intel'>n270</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='yes' vendor='unknown'>kvm32</model>
-      <model usable='yes' vendor='Intel'>coreduo</model>
-      <model usable='yes' vendor='Intel'>core2duo</model>
-      <model usable='yes' vendor='AMD'>athlon</model>
-      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
-      <model usable='yes' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Snowridge</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client</model>
-      <model usable='no' vendor='Intel'>SapphireRapids</model>
-      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
-      <model usable='no' vendor='Intel'>SandyBridge</model>
-      <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
-      <model usable='no' vendor='AMD'>Opteron_G4</model>
-      <model usable='no' vendor='AMD'>Opteron_G3</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-      <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='Intel'>Nehalem</model>
-      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='Intel'>IvyBridge</model>
-      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Icelake-Server</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
-      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell</model>
-      <model usable='no' vendor='Intel'>GraniteRapids</model>
-      <model usable='no' vendor='AMD'>EPYC-Rome</model>
-      <model usable='no' vendor='AMD'>EPYC-Milan</model>
-      <model usable='no' vendor='AMD'>EPYC-IBPB</model>
-      <model usable='no' vendor='AMD'>EPYC-Genoa</model>
-      <model usable='no' vendor='AMD'>EPYC</model>
-      <model usable='no' vendor='Hygon'>Dhyana</model>
-      <model usable='no' vendor='Intel'>Cooperlake</model>
-      <model usable='yes' vendor='Intel'>Conroe</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
-      <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell</model>
       <model usable='yes' vendor='unknown'>486</model>
+      <model usable='no' vendor='Intel'>Broadwell</model>
+      <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
+      <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
+      <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cooperlake</model>
+      <model usable='no' vendor='Hygon'>Dhyana</model>
+      <model usable='no' vendor='AMD'>EPYC</model>
+      <model usable='no' vendor='AMD'>EPYC-Genoa</model>
+      <model usable='no' vendor='AMD'>EPYC-IBPB</model>
+      <model usable='no' vendor='AMD'>EPYC-Milan</model>
+      <model usable='no' vendor='AMD'>EPYC-Rome</model>
+      <model usable='no' vendor='Intel'>GraniteRapids</model>
+      <model usable='no' vendor='Intel'>Haswell</model>
+      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
+      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
+      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Icelake-Server</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
+      <model usable='no' vendor='Intel'>IvyBridge</model>
+      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
+      <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
+      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2</model>
+      <model usable='no' vendor='AMD'>Opteron_G3</model>
+      <model usable='no' vendor='AMD'>Opteron_G4</model>
+      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='yes' vendor='Intel'>Penryn</model>
+      <model usable='no' vendor='Intel'>SandyBridge</model>
+      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
+      <model usable='no' vendor='Intel'>SapphireRapids</model>
+      <model usable='no' vendor='Intel'>Skylake-Client</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Server</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Snowridge</model>
+      <model usable='yes' vendor='Intel'>Westmere</model>
+      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
+      <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='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'>pentium2</model>
+      <model usable='yes' vendor='unknown'>pentium3</model>
+      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='yes' vendor='unknown'>qemu64</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 f785e83fb6..632c076681 100644
--- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
@@ -72,62 +72,62 @@
       <feature policy='disable' name='xsaves'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>qemu64</model>
-      <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='AMD'>phenom</model>
-      <model usable='yes' vendor='unknown'>pentium3</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
-      <model usable='yes' vendor='unknown'>pentium</model>
-      <model usable='no' vendor='Intel'>n270</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='yes' vendor='unknown'>kvm32</model>
-      <model usable='no' vendor='Intel'>coreduo</model>
-      <model usable='no' vendor='Intel'>core2duo</model>
-      <model usable='no' vendor='AMD'>athlon</model>
-      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
-      <model usable='yes' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Snowridge</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client</model>
-      <model usable='no' vendor='Intel'>SapphireRapids</model>
-      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
-      <model usable='yes' vendor='Intel'>SandyBridge</model>
-      <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
-      <model usable='no' vendor='AMD'>Opteron_G4</model>
-      <model usable='yes' vendor='AMD'>Opteron_G3</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-      <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='Intel'>Nehalem</model>
-      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='Intel'>IvyBridge</model>
-      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Icelake-Server</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
-      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell</model>
-      <model usable='no' vendor='Intel'>GraniteRapids</model>
-      <model usable='no' vendor='AMD'>EPYC-Rome</model>
-      <model usable='no' vendor='AMD'>EPYC-Milan</model>
-      <model usable='yes' vendor='AMD'>EPYC-IBPB</model>
-      <model usable='no' vendor='AMD'>EPYC-Genoa</model>
-      <model usable='yes' vendor='AMD'>EPYC</model>
-      <model usable='yes' vendor='Hygon'>Dhyana</model>
-      <model usable='no' vendor='Intel'>Cooperlake</model>
-      <model usable='yes' vendor='Intel'>Conroe</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
-      <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell</model>
       <model usable='yes' vendor='unknown'>486</model>
+      <model usable='no' vendor='Intel'>Broadwell</model>
+      <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
+      <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
+      <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cooperlake</model>
+      <model usable='yes' vendor='Hygon'>Dhyana</model>
+      <model usable='yes' vendor='AMD'>EPYC</model>
+      <model usable='no' vendor='AMD'>EPYC-Genoa</model>
+      <model usable='yes' vendor='AMD'>EPYC-IBPB</model>
+      <model usable='no' vendor='AMD'>EPYC-Milan</model>
+      <model usable='no' vendor='AMD'>EPYC-Rome</model>
+      <model usable='no' vendor='Intel'>GraniteRapids</model>
+      <model usable='no' vendor='Intel'>Haswell</model>
+      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
+      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
+      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Icelake-Server</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
+      <model usable='no' vendor='Intel'>IvyBridge</model>
+      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
+      <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
+      <model usable='yes' vendor='AMD'>Opteron_G1</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>
+      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='yes' vendor='Intel'>Penryn</model>
+      <model usable='yes' vendor='Intel'>SandyBridge</model>
+      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
+      <model usable='no' vendor='Intel'>SapphireRapids</model>
+      <model usable='no' vendor='Intel'>Skylake-Client</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Server</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Snowridge</model>
+      <model usable='yes' vendor='Intel'>Westmere</model>
+      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
+      <model usable='no' vendor='AMD'>athlon</model>
+      <model usable='no' vendor='Intel'>core2duo</model>
+      <model usable='no' vendor='Intel'>coreduo</model>
+      <model usable='yes' vendor='unknown'>kvm32</model>
+      <model usable='yes' vendor='unknown'>kvm64</model>
+      <model usable='no' vendor='Intel'>n270</model>
+      <model usable='yes' vendor='unknown'>pentium</model>
+      <model usable='yes' vendor='unknown'>pentium2</model>
+      <model usable='yes' vendor='unknown'>pentium3</model>
+      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='yes' vendor='unknown'>qemu64</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 5db1b2486c..a545b88560 100644
--- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
@@ -77,63 +77,63 @@
       <feature policy='disable' name='xsaves'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>qemu64</model>
-      <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='AMD'>phenom</model>
-      <model usable='yes' vendor='unknown'>pentium3</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
-      <model usable='yes' vendor='unknown'>pentium</model>
-      <model usable='no' vendor='Intel'>n270</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='yes' vendor='unknown'>kvm32</model>
-      <model usable='no' vendor='Intel'>coreduo</model>
-      <model usable='no' vendor='Intel'>core2duo</model>
-      <model usable='no' vendor='AMD'>athlon</model>
-      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
-      <model usable='yes' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Snowridge</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client</model>
-      <model usable='no' vendor='Intel'>SierraForest</model>
-      <model usable='no' vendor='Intel'>SapphireRapids</model>
-      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
-      <model usable='yes' vendor='Intel'>SandyBridge</model>
-      <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
-      <model usable='no' vendor='AMD'>Opteron_G4</model>
-      <model usable='yes' vendor='AMD'>Opteron_G3</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-      <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='Intel'>Nehalem</model>
-      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='Intel'>IvyBridge</model>
-      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Icelake-Server</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
-      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell</model>
-      <model usable='no' vendor='Intel'>GraniteRapids</model>
-      <model usable='no' vendor='AMD'>EPYC-Rome</model>
-      <model usable='no' vendor='AMD'>EPYC-Milan</model>
-      <model usable='yes' vendor='AMD'>EPYC-IBPB</model>
-      <model usable='no' vendor='AMD'>EPYC-Genoa</model>
-      <model usable='yes' vendor='AMD'>EPYC</model>
-      <model usable='yes' vendor='Hygon'>Dhyana</model>
-      <model usable='no' vendor='Intel'>Cooperlake</model>
-      <model usable='yes' vendor='Intel'>Conroe</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
-      <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell</model>
       <model usable='yes' vendor='unknown'>486</model>
+      <model usable='no' vendor='Intel'>Broadwell</model>
+      <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
+      <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
+      <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cooperlake</model>
+      <model usable='yes' vendor='Hygon'>Dhyana</model>
+      <model usable='yes' vendor='AMD'>EPYC</model>
+      <model usable='no' vendor='AMD'>EPYC-Genoa</model>
+      <model usable='yes' vendor='AMD'>EPYC-IBPB</model>
+      <model usable='no' vendor='AMD'>EPYC-Milan</model>
+      <model usable='no' vendor='AMD'>EPYC-Rome</model>
+      <model usable='no' vendor='Intel'>GraniteRapids</model>
+      <model usable='no' vendor='Intel'>Haswell</model>
+      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
+      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
+      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Icelake-Server</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
+      <model usable='no' vendor='Intel'>IvyBridge</model>
+      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
+      <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
+      <model usable='yes' vendor='AMD'>Opteron_G1</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>
+      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='yes' vendor='Intel'>Penryn</model>
+      <model usable='yes' vendor='Intel'>SandyBridge</model>
+      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
+      <model usable='no' vendor='Intel'>SapphireRapids</model>
+      <model usable='no' vendor='Intel'>SierraForest</model>
+      <model usable='no' vendor='Intel'>Skylake-Client</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Server</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Snowridge</model>
+      <model usable='yes' vendor='Intel'>Westmere</model>
+      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
+      <model usable='no' vendor='AMD'>athlon</model>
+      <model usable='no' vendor='Intel'>core2duo</model>
+      <model usable='no' vendor='Intel'>coreduo</model>
+      <model usable='yes' vendor='unknown'>kvm32</model>
+      <model usable='yes' vendor='unknown'>kvm64</model>
+      <model usable='no' vendor='Intel'>n270</model>
+      <model usable='yes' vendor='unknown'>pentium</model>
+      <model usable='yes' vendor='unknown'>pentium2</model>
+      <model usable='yes' vendor='unknown'>pentium3</model>
+      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='yes' vendor='unknown'>qemu64</model>
     </mode>
   </cpu>
   <memoryBacking supported='yes'>
diff --git a/tests/domaincapsdata/qemu_9.1.0-tcg-virt.riscv64.xml b/tests/domaincapsdata/qemu_9.1.0-tcg-virt.riscv64.xml
index bffcf9a145..0ae1d0b614 100644
--- a/tests/domaincapsdata/qemu_9.1.0-tcg-virt.riscv64.xml
+++ b/tests/domaincapsdata/qemu_9.1.0-tcg-virt.riscv64.xml
@@ -35,19 +35,19 @@
     </mode>
     <mode name='host-model' supported='no'/>
     <mode name='custom' supported='yes'>
-      <model usable='unknown' vendor='unknown'>rv64</model>
-      <model usable='unknown' vendor='unknown'>sifive-e51</model>
-      <model usable='unknown' vendor='unknown'>rv64i</model>
       <model usable='unknown' vendor='unknown'>any</model>
-      <model usable='unknown' vendor='unknown'>x-rv128</model>
-      <model usable='unknown' vendor='unknown'>shakti-c</model>
-      <model usable='unknown' vendor='unknown'>rva22u64</model>
-      <model usable='unknown' vendor='unknown'>rv64e</model>
       <model usable='unknown' vendor='unknown'>max</model>
+      <model usable='unknown' vendor='unknown'>rv64</model>
+      <model usable='unknown' vendor='unknown'>rv64e</model>
+      <model usable='unknown' vendor='unknown'>rv64i</model>
       <model usable='unknown' vendor='unknown'>rva22s64</model>
-      <model usable='unknown' vendor='unknown'>thead-c906</model>
+      <model usable='unknown' vendor='unknown'>rva22u64</model>
+      <model usable='unknown' vendor='unknown'>shakti-c</model>
+      <model usable='unknown' vendor='unknown'>sifive-e51</model>
       <model usable='unknown' vendor='unknown'>sifive-u54</model>
+      <model usable='unknown' vendor='unknown'>thead-c906</model>
       <model usable='unknown' vendor='unknown'>veyron-v1</model>
+      <model usable='unknown' vendor='unknown'>x-rv128</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 3aa47fa247..b47a85c294 100644
--- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
@@ -72,63 +72,63 @@
       <feature policy='disable' name='nrip-save'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>qemu64</model>
-      <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='AMD'>phenom</model>
-      <model usable='yes' vendor='unknown'>pentium3</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
-      <model usable='yes' vendor='unknown'>pentium</model>
-      <model usable='yes' vendor='Intel'>n270</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='yes' vendor='unknown'>kvm32</model>
-      <model usable='yes' vendor='Intel'>coreduo</model>
-      <model usable='yes' vendor='Intel'>core2duo</model>
-      <model usable='yes' vendor='AMD'>athlon</model>
-      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
-      <model usable='yes' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Snowridge</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client</model>
-      <model usable='no' vendor='Intel'>SierraForest</model>
-      <model usable='no' vendor='Intel'>SapphireRapids</model>
-      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
-      <model usable='no' vendor='Intel'>SandyBridge</model>
-      <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
-      <model usable='no' vendor='AMD'>Opteron_G4</model>
-      <model usable='no' vendor='AMD'>Opteron_G3</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-      <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='Intel'>Nehalem</model>
-      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='Intel'>IvyBridge</model>
-      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Icelake-Server</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
-      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell</model>
-      <model usable='no' vendor='Intel'>GraniteRapids</model>
-      <model usable='no' vendor='AMD'>EPYC-Rome</model>
-      <model usable='no' vendor='AMD'>EPYC-Milan</model>
-      <model usable='no' vendor='AMD'>EPYC-IBPB</model>
-      <model usable='no' vendor='AMD'>EPYC-Genoa</model>
-      <model usable='no' vendor='AMD'>EPYC</model>
-      <model usable='no' vendor='Hygon'>Dhyana</model>
-      <model usable='no' vendor='Intel'>Cooperlake</model>
-      <model usable='yes' vendor='Intel'>Conroe</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
-      <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell</model>
       <model usable='yes' vendor='unknown'>486</model>
+      <model usable='no' vendor='Intel'>Broadwell</model>
+      <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
+      <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
+      <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cooperlake</model>
+      <model usable='no' vendor='Hygon'>Dhyana</model>
+      <model usable='no' vendor='AMD'>EPYC</model>
+      <model usable='no' vendor='AMD'>EPYC-Genoa</model>
+      <model usable='no' vendor='AMD'>EPYC-IBPB</model>
+      <model usable='no' vendor='AMD'>EPYC-Milan</model>
+      <model usable='no' vendor='AMD'>EPYC-Rome</model>
+      <model usable='no' vendor='Intel'>GraniteRapids</model>
+      <model usable='no' vendor='Intel'>Haswell</model>
+      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
+      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
+      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Icelake-Server</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
+      <model usable='no' vendor='Intel'>IvyBridge</model>
+      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
+      <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
+      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2</model>
+      <model usable='no' vendor='AMD'>Opteron_G3</model>
+      <model usable='no' vendor='AMD'>Opteron_G4</model>
+      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='yes' vendor='Intel'>Penryn</model>
+      <model usable='no' vendor='Intel'>SandyBridge</model>
+      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
+      <model usable='no' vendor='Intel'>SapphireRapids</model>
+      <model usable='no' vendor='Intel'>SierraForest</model>
+      <model usable='no' vendor='Intel'>Skylake-Client</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Server</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Snowridge</model>
+      <model usable='yes' vendor='Intel'>Westmere</model>
+      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
+      <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='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'>pentium2</model>
+      <model usable='yes' vendor='unknown'>pentium3</model>
+      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='yes' vendor='unknown'>qemu64</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 59d1cab3c9..dad7e70424 100644
--- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
@@ -76,63 +76,63 @@
       <feature policy='disable' name='xsaves'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>qemu64</model>
-      <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='AMD'>phenom</model>
-      <model usable='yes' vendor='unknown'>pentium3</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
-      <model usable='yes' vendor='unknown'>pentium</model>
-      <model usable='no' vendor='Intel'>n270</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='yes' vendor='unknown'>kvm32</model>
-      <model usable='no' vendor='Intel'>coreduo</model>
-      <model usable='no' vendor='Intel'>core2duo</model>
-      <model usable='no' vendor='AMD'>athlon</model>
-      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
-      <model usable='yes' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Snowridge</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client</model>
-      <model usable='no' vendor='Intel'>SierraForest</model>
-      <model usable='no' vendor='Intel'>SapphireRapids</model>
-      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
-      <model usable='yes' vendor='Intel'>SandyBridge</model>
-      <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
-      <model usable='no' vendor='AMD'>Opteron_G4</model>
-      <model usable='yes' vendor='AMD'>Opteron_G3</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-      <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='Intel'>Nehalem</model>
-      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='Intel'>IvyBridge</model>
-      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Icelake-Server</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
-      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell</model>
-      <model usable='no' vendor='Intel'>GraniteRapids</model>
-      <model usable='no' vendor='AMD'>EPYC-Rome</model>
-      <model usable='no' vendor='AMD'>EPYC-Milan</model>
-      <model usable='yes' vendor='AMD'>EPYC-IBPB</model>
-      <model usable='no' vendor='AMD'>EPYC-Genoa</model>
-      <model usable='yes' vendor='AMD'>EPYC</model>
-      <model usable='yes' vendor='Hygon'>Dhyana</model>
-      <model usable='no' vendor='Intel'>Cooperlake</model>
-      <model usable='yes' vendor='Intel'>Conroe</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
-      <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell</model>
       <model usable='yes' vendor='unknown'>486</model>
+      <model usable='no' vendor='Intel'>Broadwell</model>
+      <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
+      <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
+      <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cooperlake</model>
+      <model usable='yes' vendor='Hygon'>Dhyana</model>
+      <model usable='yes' vendor='AMD'>EPYC</model>
+      <model usable='no' vendor='AMD'>EPYC-Genoa</model>
+      <model usable='yes' vendor='AMD'>EPYC-IBPB</model>
+      <model usable='no' vendor='AMD'>EPYC-Milan</model>
+      <model usable='no' vendor='AMD'>EPYC-Rome</model>
+      <model usable='no' vendor='Intel'>GraniteRapids</model>
+      <model usable='no' vendor='Intel'>Haswell</model>
+      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
+      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
+      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Icelake-Server</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
+      <model usable='no' vendor='Intel'>IvyBridge</model>
+      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
+      <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
+      <model usable='yes' vendor='AMD'>Opteron_G1</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>
+      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='yes' vendor='Intel'>Penryn</model>
+      <model usable='yes' vendor='Intel'>SandyBridge</model>
+      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
+      <model usable='no' vendor='Intel'>SapphireRapids</model>
+      <model usable='no' vendor='Intel'>SierraForest</model>
+      <model usable='no' vendor='Intel'>Skylake-Client</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Server</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Snowridge</model>
+      <model usable='yes' vendor='Intel'>Westmere</model>
+      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
+      <model usable='no' vendor='AMD'>athlon</model>
+      <model usable='no' vendor='Intel'>core2duo</model>
+      <model usable='no' vendor='Intel'>coreduo</model>
+      <model usable='yes' vendor='unknown'>kvm32</model>
+      <model usable='yes' vendor='unknown'>kvm64</model>
+      <model usable='no' vendor='Intel'>n270</model>
+      <model usable='yes' vendor='unknown'>pentium</model>
+      <model usable='yes' vendor='unknown'>pentium2</model>
+      <model usable='yes' vendor='unknown'>pentium3</model>
+      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='yes' vendor='unknown'>qemu64</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 bcf6d3ea14..9cbed26a3e 100644
--- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
@@ -77,63 +77,63 @@
       <feature policy='disable' name='xsaves'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>qemu64</model>
-      <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='AMD'>phenom</model>
-      <model usable='yes' vendor='unknown'>pentium3</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
-      <model usable='yes' vendor='unknown'>pentium</model>
-      <model usable='no' vendor='Intel'>n270</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='yes' vendor='unknown'>kvm32</model>
-      <model usable='no' vendor='Intel'>coreduo</model>
-      <model usable='no' vendor='Intel'>core2duo</model>
-      <model usable='no' vendor='AMD'>athlon</model>
-      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
-      <model usable='yes' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Snowridge</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client</model>
-      <model usable='no' vendor='Intel'>SierraForest</model>
-      <model usable='no' vendor='Intel'>SapphireRapids</model>
-      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
-      <model usable='yes' vendor='Intel'>SandyBridge</model>
-      <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
-      <model usable='no' vendor='AMD'>Opteron_G4</model>
-      <model usable='yes' vendor='AMD'>Opteron_G3</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-      <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='Intel'>Nehalem</model>
-      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='Intel'>IvyBridge</model>
-      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Icelake-Server</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
-      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell</model>
-      <model usable='no' vendor='Intel'>GraniteRapids</model>
-      <model usable='no' vendor='AMD'>EPYC-Rome</model>
-      <model usable='no' vendor='AMD'>EPYC-Milan</model>
-      <model usable='yes' vendor='AMD'>EPYC-IBPB</model>
-      <model usable='no' vendor='AMD'>EPYC-Genoa</model>
-      <model usable='yes' vendor='AMD'>EPYC</model>
-      <model usable='yes' vendor='Hygon'>Dhyana</model>
-      <model usable='no' vendor='Intel'>Cooperlake</model>
-      <model usable='yes' vendor='Intel'>Conroe</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
-      <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell</model>
       <model usable='yes' vendor='unknown'>486</model>
+      <model usable='no' vendor='Intel'>Broadwell</model>
+      <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
+      <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
+      <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cooperlake</model>
+      <model usable='yes' vendor='Hygon'>Dhyana</model>
+      <model usable='yes' vendor='AMD'>EPYC</model>
+      <model usable='no' vendor='AMD'>EPYC-Genoa</model>
+      <model usable='yes' vendor='AMD'>EPYC-IBPB</model>
+      <model usable='no' vendor='AMD'>EPYC-Milan</model>
+      <model usable='no' vendor='AMD'>EPYC-Rome</model>
+      <model usable='no' vendor='Intel'>GraniteRapids</model>
+      <model usable='no' vendor='Intel'>Haswell</model>
+      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
+      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
+      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Icelake-Server</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
+      <model usable='no' vendor='Intel'>IvyBridge</model>
+      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
+      <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
+      <model usable='yes' vendor='AMD'>Opteron_G1</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>
+      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='yes' vendor='Intel'>Penryn</model>
+      <model usable='yes' vendor='Intel'>SandyBridge</model>
+      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
+      <model usable='no' vendor='Intel'>SapphireRapids</model>
+      <model usable='no' vendor='Intel'>SierraForest</model>
+      <model usable='no' vendor='Intel'>Skylake-Client</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Server</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Snowridge</model>
+      <model usable='yes' vendor='Intel'>Westmere</model>
+      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
+      <model usable='no' vendor='AMD'>athlon</model>
+      <model usable='no' vendor='Intel'>core2duo</model>
+      <model usable='no' vendor='Intel'>coreduo</model>
+      <model usable='yes' vendor='unknown'>kvm32</model>
+      <model usable='yes' vendor='unknown'>kvm64</model>
+      <model usable='no' vendor='Intel'>n270</model>
+      <model usable='yes' vendor='unknown'>pentium</model>
+      <model usable='yes' vendor='unknown'>pentium2</model>
+      <model usable='yes' vendor='unknown'>pentium3</model>
+      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='yes' vendor='unknown'>qemu64</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 ec905cb80b..2b040ce086 100644
--- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
@@ -72,63 +72,63 @@
       <feature policy='disable' name='nrip-save'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>qemu64</model>
-      <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='AMD'>phenom</model>
-      <model usable='yes' vendor='unknown'>pentium3</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
-      <model usable='yes' vendor='unknown'>pentium</model>
-      <model usable='yes' vendor='Intel'>n270</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='yes' vendor='unknown'>kvm32</model>
-      <model usable='yes' vendor='Intel'>coreduo</model>
-      <model usable='yes' vendor='Intel'>core2duo</model>
-      <model usable='yes' vendor='AMD'>athlon</model>
-      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
-      <model usable='yes' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Snowridge</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client</model>
-      <model usable='no' vendor='Intel'>SierraForest</model>
-      <model usable='no' vendor='Intel'>SapphireRapids</model>
-      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
-      <model usable='no' vendor='Intel'>SandyBridge</model>
-      <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
-      <model usable='no' vendor='AMD'>Opteron_G4</model>
-      <model usable='no' vendor='AMD'>Opteron_G3</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-      <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='Intel'>Nehalem</model>
-      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='Intel'>IvyBridge</model>
-      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Icelake-Server</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
-      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell</model>
-      <model usable='no' vendor='Intel'>GraniteRapids</model>
-      <model usable='no' vendor='AMD'>EPYC-Rome</model>
-      <model usable='no' vendor='AMD'>EPYC-Milan</model>
-      <model usable='no' vendor='AMD'>EPYC-IBPB</model>
-      <model usable='no' vendor='AMD'>EPYC-Genoa</model>
-      <model usable='no' vendor='AMD'>EPYC</model>
-      <model usable='no' vendor='Hygon'>Dhyana</model>
-      <model usable='no' vendor='Intel'>Cooperlake</model>
-      <model usable='yes' vendor='Intel'>Conroe</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
-      <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell</model>
       <model usable='yes' vendor='unknown'>486</model>
+      <model usable='no' vendor='Intel'>Broadwell</model>
+      <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
+      <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
+      <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cooperlake</model>
+      <model usable='no' vendor='Hygon'>Dhyana</model>
+      <model usable='no' vendor='AMD'>EPYC</model>
+      <model usable='no' vendor='AMD'>EPYC-Genoa</model>
+      <model usable='no' vendor='AMD'>EPYC-IBPB</model>
+      <model usable='no' vendor='AMD'>EPYC-Milan</model>
+      <model usable='no' vendor='AMD'>EPYC-Rome</model>
+      <model usable='no' vendor='Intel'>GraniteRapids</model>
+      <model usable='no' vendor='Intel'>Haswell</model>
+      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
+      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
+      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Icelake-Server</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
+      <model usable='no' vendor='Intel'>IvyBridge</model>
+      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
+      <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
+      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2</model>
+      <model usable='no' vendor='AMD'>Opteron_G3</model>
+      <model usable='no' vendor='AMD'>Opteron_G4</model>
+      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='yes' vendor='Intel'>Penryn</model>
+      <model usable='no' vendor='Intel'>SandyBridge</model>
+      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
+      <model usable='no' vendor='Intel'>SapphireRapids</model>
+      <model usable='no' vendor='Intel'>SierraForest</model>
+      <model usable='no' vendor='Intel'>Skylake-Client</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Server</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Snowridge</model>
+      <model usable='yes' vendor='Intel'>Westmere</model>
+      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
+      <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='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'>pentium2</model>
+      <model usable='yes' vendor='unknown'>pentium3</model>
+      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='yes' vendor='unknown'>qemu64</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 95184fad6b..fa4651e8ac 100644
--- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
@@ -76,63 +76,63 @@
       <feature policy='disable' name='xsaves'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>qemu64</model>
-      <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='AMD'>phenom</model>
-      <model usable='yes' vendor='unknown'>pentium3</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
-      <model usable='yes' vendor='unknown'>pentium</model>
-      <model usable='no' vendor='Intel'>n270</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='yes' vendor='unknown'>kvm32</model>
-      <model usable='no' vendor='Intel'>coreduo</model>
-      <model usable='no' vendor='Intel'>core2duo</model>
-      <model usable='no' vendor='AMD'>athlon</model>
-      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
-      <model usable='yes' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Snowridge</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Server</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='Intel'>Skylake-Client</model>
-      <model usable='no' vendor='Intel'>SierraForest</model>
-      <model usable='no' vendor='Intel'>SapphireRapids</model>
-      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
-      <model usable='yes' vendor='Intel'>SandyBridge</model>
-      <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='no' vendor='AMD'>Opteron_G5</model>
-      <model usable='no' vendor='AMD'>Opteron_G4</model>
-      <model usable='yes' vendor='AMD'>Opteron_G3</model>
-      <model usable='yes' vendor='AMD'>Opteron_G2</model>
-      <model usable='yes' vendor='AMD'>Opteron_G1</model>
-      <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='Intel'>Nehalem</model>
-      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='Intel'>IvyBridge</model>
-      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Icelake-Server</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
-      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
-      <model usable='no' vendor='Intel'>Haswell</model>
-      <model usable='no' vendor='Intel'>GraniteRapids</model>
-      <model usable='no' vendor='AMD'>EPYC-Rome</model>
-      <model usable='no' vendor='AMD'>EPYC-Milan</model>
-      <model usable='yes' vendor='AMD'>EPYC-IBPB</model>
-      <model usable='no' vendor='AMD'>EPYC-Genoa</model>
-      <model usable='yes' vendor='AMD'>EPYC</model>
-      <model usable='yes' vendor='Hygon'>Dhyana</model>
-      <model usable='no' vendor='Intel'>Cooperlake</model>
-      <model usable='yes' vendor='Intel'>Conroe</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
-      <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
-      <model usable='no' vendor='Intel'>Broadwell</model>
       <model usable='yes' vendor='unknown'>486</model>
+      <model usable='no' vendor='Intel'>Broadwell</model>
+      <model usable='no' vendor='Intel'>Broadwell-IBRS</model>
+      <model usable='no' vendor='Intel'>Broadwell-noTSX</model>
+      <model usable='no' vendor='Intel'>Broadwell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cooperlake</model>
+      <model usable='yes' vendor='Hygon'>Dhyana</model>
+      <model usable='yes' vendor='AMD'>EPYC</model>
+      <model usable='no' vendor='AMD'>EPYC-Genoa</model>
+      <model usable='yes' vendor='AMD'>EPYC-IBPB</model>
+      <model usable='no' vendor='AMD'>EPYC-Milan</model>
+      <model usable='no' vendor='AMD'>EPYC-Rome</model>
+      <model usable='no' vendor='Intel'>GraniteRapids</model>
+      <model usable='no' vendor='Intel'>Haswell</model>
+      <model usable='no' vendor='Intel'>Haswell-IBRS</model>
+      <model usable='no' vendor='Intel'>Haswell-noTSX</model>
+      <model usable='no' vendor='Intel'>Haswell-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Icelake-Server</model>
+      <model usable='no' vendor='Intel'>Icelake-Server-noTSX</model>
+      <model usable='no' vendor='Intel'>IvyBridge</model>
+      <model usable='no' vendor='Intel'>IvyBridge-IBRS</model>
+      <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='no' vendor='Intel'>Nehalem-IBRS</model>
+      <model usable='yes' vendor='AMD'>Opteron_G1</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>
+      <model usable='no' vendor='AMD'>Opteron_G5</model>
+      <model usable='yes' vendor='Intel'>Penryn</model>
+      <model usable='yes' vendor='Intel'>SandyBridge</model>
+      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
+      <model usable='no' vendor='Intel'>SapphireRapids</model>
+      <model usable='no' vendor='Intel'>SierraForest</model>
+      <model usable='no' vendor='Intel'>Skylake-Client</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Server</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-IBRS</model>
+      <model usable='no' vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
+      <model usable='no' vendor='Intel'>Snowridge</model>
+      <model usable='yes' vendor='Intel'>Westmere</model>
+      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
+      <model usable='no' vendor='AMD'>athlon</model>
+      <model usable='no' vendor='Intel'>core2duo</model>
+      <model usable='no' vendor='Intel'>coreduo</model>
+      <model usable='yes' vendor='unknown'>kvm32</model>
+      <model usable='yes' vendor='unknown'>kvm64</model>
+      <model usable='no' vendor='Intel'>n270</model>
+      <model usable='yes' vendor='unknown'>pentium</model>
+      <model usable='yes' vendor='unknown'>pentium2</model>
+      <model usable='yes' vendor='unknown'>pentium3</model>
+      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='yes' vendor='unknown'>qemu64</model>
     </mode>
   </cpu>
   <memoryBacking supported='yes'>
-- 
2.47.0