From: Jiri Denemark <jdenemar@redhat.com>
Date: Thu, 29 Sep 2022 19:40:40 +0000 (+0200)
Subject: cpu_x86: Implement virCPUGetVendorForModel
X-Git-Tag: v8.9.0-rc1~80
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=311e21ad321c9536dc41dd9b0e3120c2a4d6eaea;p=thirdparty%2Flibvirt.git

cpu_x86: Implement virCPUGetVendorForModel

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
index 9fcd6b8add..4d2379803c 100644
--- a/src/cpu/cpu_x86.c
+++ b/src/cpu/cpu_x86.c
@@ -3137,6 +3137,24 @@ virCPUx86GetModels(char ***models)
 }
 
 
+static const char *
+virCPUx86GetVendorForModel(const char *modelName)
+{
+    virCPUx86Map *map;
+    virCPUx86Model *model;
+
+    if (!(map = virCPUx86GetMap()))
+        return NULL;
+
+    model = x86ModelFind(map, modelName);
+
+    if (!model || !model->vendor)
+        return NULL;
+
+    return model->vendor->name;
+}
+
+
 static int
 virCPUx86Translate(virCPUDef *cpu,
                    virDomainCapsCPUModels *models)
@@ -3539,6 +3557,7 @@ struct cpuArchDriver cpuDriverX86 = {
     .dataFormat = virCPUx86DataFormat,
     .dataParse  = virCPUx86DataParse,
     .getModels  = virCPUx86GetModels,
+    .getVendorForModel = virCPUx86GetVendorForModel,
     .translate  = virCPUx86Translate,
     .expandFeatures = virCPUx86ExpandFeatures,
     .copyMigratable = virCPUx86CopyMigratable,
diff --git a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
index fa86554892..dab12e5888 100644
--- a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
@@ -63,55 +63,55 @@
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown'>qemu64</model>
       <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='unknown'>phenom</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='unknown'>n270</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='unknown'>coreduo</model>
-      <model usable='yes' vendor='unknown'>core2duo</model>
-      <model usable='no' vendor='unknown'>athlon</model>
-      <model usable='yes' vendor='unknown'>Westmere-IBRS</model>
-      <model usable='yes' vendor='unknown'>Westmere</model>
-      <model usable='no' vendor='unknown'>Snowridge</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server</model>
-      <model usable='yes' vendor='unknown'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='yes' vendor='unknown'>Skylake-Client-IBRS</model>
-      <model usable='yes' vendor='unknown'>Skylake-Client</model>
-      <model usable='yes' vendor='unknown'>SandyBridge-IBRS</model>
-      <model usable='yes' vendor='unknown'>SandyBridge</model>
-      <model usable='yes' vendor='unknown'>Penryn</model>
-      <model usable='no' vendor='unknown'>Opteron_G5</model>
-      <model usable='no' vendor='unknown'>Opteron_G4</model>
-      <model usable='no' vendor='unknown'>Opteron_G3</model>
-      <model usable='yes' vendor='unknown'>Opteron_G2</model>
-      <model usable='yes' vendor='unknown'>Opteron_G1</model>
-      <model usable='yes' vendor='unknown'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='unknown'>Nehalem</model>
-      <model usable='yes' vendor='unknown'>IvyBridge-IBRS</model>
-      <model usable='yes' vendor='unknown'>IvyBridge</model>
-      <model usable='no' vendor='unknown'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Icelake-Server</model>
-      <model usable='no' vendor='unknown'>Icelake-Client-noTSX</model>
-      <model usable='no' vendor='unknown'>Icelake-Client</model>
-      <model usable='yes' vendor='unknown'>Haswell-noTSX-IBRS</model>
-      <model usable='yes' vendor='unknown'>Haswell-noTSX</model>
-      <model usable='yes' vendor='unknown'>Haswell-IBRS</model>
-      <model usable='yes' vendor='unknown'>Haswell</model>
-      <model usable='no' vendor='unknown'>EPYC-IBPB</model>
-      <model usable='no' vendor='unknown'>EPYC</model>
-      <model usable='no' vendor='unknown'>Dhyana</model>
-      <model usable='yes' vendor='unknown'>Conroe</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server</model>
-      <model usable='yes' vendor='unknown'>Broadwell-noTSX-IBRS</model>
-      <model usable='yes' vendor='unknown'>Broadwell-noTSX</model>
-      <model usable='yes' vendor='unknown'>Broadwell-IBRS</model>
-      <model usable='yes' vendor='unknown'>Broadwell</model>
+      <model usable='yes' vendor='Intel'>coreduo</model>
+      <model usable='yes' vendor='Intel'>core2duo</model>
+      <model usable='no' vendor='AMD'>athlon</model>
+      <model usable='yes' 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='yes' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
+      <model usable='yes' vendor='Intel'>Skylake-Client-IBRS</model>
+      <model usable='yes' vendor='Intel'>Skylake-Client</model>
+      <model usable='yes' 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='no' vendor='AMD'>Opteron_G3</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='yes' vendor='Intel'>Nehalem-IBRS</model>
+      <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='yes' vendor='Intel'>IvyBridge-IBRS</model>
+      <model usable='yes' 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'>Icelake-Client-noTSX</model>
+      <model usable='no' vendor='Intel'>Icelake-Client</model>
+      <model usable='yes' vendor='Intel'>Haswell-noTSX-IBRS</model>
+      <model usable='yes' vendor='Intel'>Haswell-noTSX</model>
+      <model usable='yes' vendor='Intel'>Haswell-IBRS</model>
+      <model usable='yes' vendor='Intel'>Haswell</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='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+      <model usable='yes' vendor='Intel'>Broadwell-noTSX-IBRS</model>
+      <model usable='yes' vendor='Intel'>Broadwell-noTSX</model>
+      <model usable='yes' vendor='Intel'>Broadwell-IBRS</model>
+      <model usable='yes' vendor='Intel'>Broadwell</model>
       <model usable='yes' vendor='unknown'>486</model>
     </mode>
   </cpu>
diff --git a/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml
index 2909d1fd0a..6dc6decf1e 100644
--- a/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml
@@ -77,55 +77,55 @@
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown'>qemu64</model>
       <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='unknown'>phenom</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='unknown'>n270</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='unknown'>coreduo</model>
-      <model usable='yes' vendor='unknown'>core2duo</model>
-      <model usable='yes' vendor='unknown'>athlon</model>
-      <model usable='no' vendor='unknown'>Westmere-IBRS</model>
-      <model usable='no' vendor='unknown'>Westmere</model>
-      <model usable='no' vendor='unknown'>Snowridge</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client</model>
-      <model usable='no' vendor='unknown'>SandyBridge-IBRS</model>
-      <model usable='no' vendor='unknown'>SandyBridge</model>
-      <model usable='yes' vendor='unknown'>Penryn</model>
-      <model usable='no' vendor='unknown'>Opteron_G5</model>
-      <model usable='no' vendor='unknown'>Opteron_G4</model>
-      <model usable='no' vendor='unknown'>Opteron_G3</model>
-      <model usable='yes' vendor='unknown'>Opteron_G2</model>
-      <model usable='yes' vendor='unknown'>Opteron_G1</model>
-      <model usable='no' vendor='unknown'>Nehalem-IBRS</model>
-      <model usable='no' vendor='unknown'>Nehalem</model>
-      <model usable='no' vendor='unknown'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='unknown'>IvyBridge</model>
-      <model usable='no' vendor='unknown'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Icelake-Server</model>
-      <model usable='no' vendor='unknown'>Icelake-Client-noTSX</model>
-      <model usable='no' vendor='unknown'>Icelake-Client</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX</model>
-      <model usable='no' vendor='unknown'>Haswell-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell</model>
-      <model usable='no' vendor='unknown'>EPYC-IBPB</model>
-      <model usable='no' vendor='unknown'>EPYC</model>
-      <model usable='no' vendor='unknown'>Dhyana</model>
-      <model usable='yes' vendor='unknown'>Conroe</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX</model>
-      <model usable='no' vendor='unknown'>Broadwell-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell</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='no' 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='no' 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'>Icelake-Client-noTSX</model>
+      <model usable='no' 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-IBPB</model>
+      <model usable='no' vendor='AMD'>EPYC</model>
+      <model usable='no' vendor='Hygon'>Dhyana</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>
     </mode>
   </cpu>
diff --git a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
index 272d36d61b..d9c12424c6 100644
--- a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
@@ -62,55 +62,55 @@
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown'>qemu64</model>
       <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='unknown'>phenom</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='unknown'>n270</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='unknown'>coreduo</model>
-      <model usable='yes' vendor='unknown'>core2duo</model>
-      <model usable='no' vendor='unknown'>athlon</model>
-      <model usable='yes' vendor='unknown'>Westmere-IBRS</model>
-      <model usable='yes' vendor='unknown'>Westmere</model>
-      <model usable='no' vendor='unknown'>Snowridge</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server</model>
-      <model usable='yes' vendor='unknown'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='yes' vendor='unknown'>Skylake-Client-IBRS</model>
-      <model usable='yes' vendor='unknown'>Skylake-Client</model>
-      <model usable='yes' vendor='unknown'>SandyBridge-IBRS</model>
-      <model usable='yes' vendor='unknown'>SandyBridge</model>
-      <model usable='yes' vendor='unknown'>Penryn</model>
-      <model usable='no' vendor='unknown'>Opteron_G5</model>
-      <model usable='no' vendor='unknown'>Opteron_G4</model>
-      <model usable='no' vendor='unknown'>Opteron_G3</model>
-      <model usable='yes' vendor='unknown'>Opteron_G2</model>
-      <model usable='yes' vendor='unknown'>Opteron_G1</model>
-      <model usable='yes' vendor='unknown'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='unknown'>Nehalem</model>
-      <model usable='yes' vendor='unknown'>IvyBridge-IBRS</model>
-      <model usable='yes' vendor='unknown'>IvyBridge</model>
-      <model usable='no' vendor='unknown'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Icelake-Server</model>
-      <model usable='no' vendor='unknown'>Icelake-Client-noTSX</model>
-      <model usable='no' vendor='unknown'>Icelake-Client</model>
-      <model usable='yes' vendor='unknown'>Haswell-noTSX-IBRS</model>
-      <model usable='yes' vendor='unknown'>Haswell-noTSX</model>
-      <model usable='yes' vendor='unknown'>Haswell-IBRS</model>
-      <model usable='yes' vendor='unknown'>Haswell</model>
-      <model usable='no' vendor='unknown'>EPYC-IBPB</model>
-      <model usable='no' vendor='unknown'>EPYC</model>
-      <model usable='no' vendor='unknown'>Dhyana</model>
-      <model usable='yes' vendor='unknown'>Conroe</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server</model>
-      <model usable='yes' vendor='unknown'>Broadwell-noTSX-IBRS</model>
-      <model usable='yes' vendor='unknown'>Broadwell-noTSX</model>
-      <model usable='yes' vendor='unknown'>Broadwell-IBRS</model>
-      <model usable='yes' vendor='unknown'>Broadwell</model>
+      <model usable='yes' vendor='Intel'>coreduo</model>
+      <model usable='yes' vendor='Intel'>core2duo</model>
+      <model usable='no' vendor='AMD'>athlon</model>
+      <model usable='yes' 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='yes' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
+      <model usable='yes' vendor='Intel'>Skylake-Client-IBRS</model>
+      <model usable='yes' vendor='Intel'>Skylake-Client</model>
+      <model usable='yes' 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='no' vendor='AMD'>Opteron_G3</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='yes' vendor='Intel'>Nehalem-IBRS</model>
+      <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='yes' vendor='Intel'>IvyBridge-IBRS</model>
+      <model usable='yes' 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'>Icelake-Client-noTSX</model>
+      <model usable='no' vendor='Intel'>Icelake-Client</model>
+      <model usable='yes' vendor='Intel'>Haswell-noTSX-IBRS</model>
+      <model usable='yes' vendor='Intel'>Haswell-noTSX</model>
+      <model usable='yes' vendor='Intel'>Haswell-IBRS</model>
+      <model usable='yes' vendor='Intel'>Haswell</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='yes' vendor='Intel'>Conroe</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server-noTSX</model>
+      <model usable='no' vendor='Intel'>Cascadelake-Server</model>
+      <model usable='yes' vendor='Intel'>Broadwell-noTSX-IBRS</model>
+      <model usable='yes' vendor='Intel'>Broadwell-noTSX</model>
+      <model usable='yes' vendor='Intel'>Broadwell-IBRS</model>
+      <model usable='yes' vendor='Intel'>Broadwell</model>
       <model usable='yes' vendor='unknown'>486</model>
     </mode>
   </cpu>
diff --git a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
index 3e25bcb048..52c5d235bb 100644
--- a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
@@ -63,57 +63,57 @@
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown'>qemu64</model>
       <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='unknown'>phenom</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='unknown'>n270</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='unknown'>coreduo</model>
-      <model usable='yes' vendor='unknown'>core2duo</model>
-      <model usable='no' vendor='unknown'>athlon</model>
-      <model usable='yes' vendor='unknown'>Westmere-IBRS</model>
-      <model usable='yes' vendor='unknown'>Westmere</model>
-      <model usable='no' vendor='unknown'>Snowridge</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server</model>
-      <model usable='yes' vendor='unknown'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='yes' vendor='unknown'>Skylake-Client-IBRS</model>
-      <model usable='yes' vendor='unknown'>Skylake-Client</model>
-      <model usable='yes' vendor='unknown'>SandyBridge-IBRS</model>
-      <model usable='yes' vendor='unknown'>SandyBridge</model>
-      <model usable='yes' vendor='unknown'>Penryn</model>
-      <model usable='no' vendor='unknown'>Opteron_G5</model>
-      <model usable='no' vendor='unknown'>Opteron_G4</model>
-      <model usable='no' vendor='unknown'>Opteron_G3</model>
-      <model usable='yes' vendor='unknown'>Opteron_G2</model>
-      <model usable='yes' vendor='unknown'>Opteron_G1</model>
-      <model usable='yes' vendor='unknown'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='unknown'>Nehalem</model>
-      <model usable='yes' vendor='unknown'>IvyBridge-IBRS</model>
-      <model usable='yes' vendor='unknown'>IvyBridge</model>
-      <model usable='no' vendor='unknown'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Icelake-Server</model>
-      <model usable='no' vendor='unknown'>Icelake-Client-noTSX</model>
-      <model usable='no' vendor='unknown'>Icelake-Client</model>
-      <model usable='yes' vendor='unknown'>Haswell-noTSX-IBRS</model>
-      <model usable='yes' vendor='unknown'>Haswell-noTSX</model>
-      <model usable='yes' vendor='unknown'>Haswell-IBRS</model>
-      <model usable='yes' vendor='unknown'>Haswell</model>
-      <model usable='no' vendor='unknown'>EPYC-Rome</model>
-      <model usable='no' vendor='unknown'>EPYC-IBPB</model>
-      <model usable='no' vendor='unknown'>EPYC</model>
-      <model usable='no' vendor='unknown'>Dhyana</model>
-      <model usable='no' vendor='unknown'>Cooperlake</model>
-      <model usable='yes' vendor='unknown'>Conroe</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server</model>
-      <model usable='yes' vendor='unknown'>Broadwell-noTSX-IBRS</model>
-      <model usable='yes' vendor='unknown'>Broadwell-noTSX</model>
-      <model usable='yes' vendor='unknown'>Broadwell-IBRS</model>
-      <model usable='yes' vendor='unknown'>Broadwell</model>
+      <model usable='yes' vendor='Intel'>coreduo</model>
+      <model usable='yes' vendor='Intel'>core2duo</model>
+      <model usable='no' vendor='AMD'>athlon</model>
+      <model usable='yes' 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='yes' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
+      <model usable='yes' vendor='Intel'>Skylake-Client-IBRS</model>
+      <model usable='yes' vendor='Intel'>Skylake-Client</model>
+      <model usable='yes' 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='no' vendor='AMD'>Opteron_G3</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='yes' vendor='Intel'>Nehalem-IBRS</model>
+      <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='yes' vendor='Intel'>IvyBridge-IBRS</model>
+      <model usable='yes' 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'>Icelake-Client-noTSX</model>
+      <model usable='no' vendor='Intel'>Icelake-Client</model>
+      <model usable='yes' vendor='Intel'>Haswell-noTSX-IBRS</model>
+      <model usable='yes' vendor='Intel'>Haswell-noTSX</model>
+      <model usable='yes' vendor='Intel'>Haswell-IBRS</model>
+      <model usable='yes' 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='yes' vendor='Intel'>Broadwell-noTSX-IBRS</model>
+      <model usable='yes' vendor='Intel'>Broadwell-noTSX</model>
+      <model usable='yes' vendor='Intel'>Broadwell-IBRS</model>
+      <model usable='yes' vendor='Intel'>Broadwell</model>
       <model usable='yes' vendor='unknown'>486</model>
     </mode>
   </cpu>
diff --git a/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml
index b92d519be6..8a0f20b06f 100644
--- a/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml
@@ -77,57 +77,57 @@
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown'>qemu64</model>
       <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='unknown'>phenom</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='unknown'>n270</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='unknown'>coreduo</model>
-      <model usable='yes' vendor='unknown'>core2duo</model>
-      <model usable='yes' vendor='unknown'>athlon</model>
-      <model usable='no' vendor='unknown'>Westmere-IBRS</model>
-      <model usable='yes' vendor='unknown'>Westmere</model>
-      <model usable='no' vendor='unknown'>Snowridge</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client</model>
-      <model usable='no' vendor='unknown'>SandyBridge-IBRS</model>
-      <model usable='no' vendor='unknown'>SandyBridge</model>
-      <model usable='yes' vendor='unknown'>Penryn</model>
-      <model usable='no' vendor='unknown'>Opteron_G5</model>
-      <model usable='no' vendor='unknown'>Opteron_G4</model>
-      <model usable='no' vendor='unknown'>Opteron_G3</model>
-      <model usable='yes' vendor='unknown'>Opteron_G2</model>
-      <model usable='yes' vendor='unknown'>Opteron_G1</model>
-      <model usable='no' vendor='unknown'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='unknown'>Nehalem</model>
-      <model usable='no' vendor='unknown'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='unknown'>IvyBridge</model>
-      <model usable='no' vendor='unknown'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Icelake-Server</model>
-      <model usable='no' vendor='unknown'>Icelake-Client-noTSX</model>
-      <model usable='no' vendor='unknown'>Icelake-Client</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX</model>
-      <model usable='no' vendor='unknown'>Haswell-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell</model>
-      <model usable='no' vendor='unknown'>EPYC-Rome</model>
-      <model usable='no' vendor='unknown'>EPYC-IBPB</model>
-      <model usable='no' vendor='unknown'>EPYC</model>
-      <model usable='no' vendor='unknown'>Dhyana</model>
-      <model usable='no' vendor='unknown'>Cooperlake</model>
-      <model usable='yes' vendor='unknown'>Conroe</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX</model>
-      <model usable='no' vendor='unknown'>Broadwell-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell</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'>Icelake-Client-noTSX</model>
+      <model usable='no' 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>
     </mode>
   </cpu>
diff --git a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
index ecbd13fb19..d9b7c31448 100644
--- a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
@@ -62,57 +62,57 @@
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown'>qemu64</model>
       <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='unknown'>phenom</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='unknown'>n270</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='unknown'>coreduo</model>
-      <model usable='yes' vendor='unknown'>core2duo</model>
-      <model usable='no' vendor='unknown'>athlon</model>
-      <model usable='yes' vendor='unknown'>Westmere-IBRS</model>
-      <model usable='yes' vendor='unknown'>Westmere</model>
-      <model usable='no' vendor='unknown'>Snowridge</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server</model>
-      <model usable='yes' vendor='unknown'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='yes' vendor='unknown'>Skylake-Client-IBRS</model>
-      <model usable='yes' vendor='unknown'>Skylake-Client</model>
-      <model usable='yes' vendor='unknown'>SandyBridge-IBRS</model>
-      <model usable='yes' vendor='unknown'>SandyBridge</model>
-      <model usable='yes' vendor='unknown'>Penryn</model>
-      <model usable='no' vendor='unknown'>Opteron_G5</model>
-      <model usable='no' vendor='unknown'>Opteron_G4</model>
-      <model usable='no' vendor='unknown'>Opteron_G3</model>
-      <model usable='yes' vendor='unknown'>Opteron_G2</model>
-      <model usable='yes' vendor='unknown'>Opteron_G1</model>
-      <model usable='yes' vendor='unknown'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='unknown'>Nehalem</model>
-      <model usable='yes' vendor='unknown'>IvyBridge-IBRS</model>
-      <model usable='yes' vendor='unknown'>IvyBridge</model>
-      <model usable='no' vendor='unknown'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Icelake-Server</model>
-      <model usable='no' vendor='unknown'>Icelake-Client-noTSX</model>
-      <model usable='no' vendor='unknown'>Icelake-Client</model>
-      <model usable='yes' vendor='unknown'>Haswell-noTSX-IBRS</model>
-      <model usable='yes' vendor='unknown'>Haswell-noTSX</model>
-      <model usable='yes' vendor='unknown'>Haswell-IBRS</model>
-      <model usable='yes' vendor='unknown'>Haswell</model>
-      <model usable='no' vendor='unknown'>EPYC-Rome</model>
-      <model usable='no' vendor='unknown'>EPYC-IBPB</model>
-      <model usable='no' vendor='unknown'>EPYC</model>
-      <model usable='no' vendor='unknown'>Dhyana</model>
-      <model usable='no' vendor='unknown'>Cooperlake</model>
-      <model usable='yes' vendor='unknown'>Conroe</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server</model>
-      <model usable='yes' vendor='unknown'>Broadwell-noTSX-IBRS</model>
-      <model usable='yes' vendor='unknown'>Broadwell-noTSX</model>
-      <model usable='yes' vendor='unknown'>Broadwell-IBRS</model>
-      <model usable='yes' vendor='unknown'>Broadwell</model>
+      <model usable='yes' vendor='Intel'>coreduo</model>
+      <model usable='yes' vendor='Intel'>core2duo</model>
+      <model usable='no' vendor='AMD'>athlon</model>
+      <model usable='yes' 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='yes' vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
+      <model usable='yes' vendor='Intel'>Skylake-Client-IBRS</model>
+      <model usable='yes' vendor='Intel'>Skylake-Client</model>
+      <model usable='yes' 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='no' vendor='AMD'>Opteron_G3</model>
+      <model usable='yes' vendor='AMD'>Opteron_G2</model>
+      <model usable='yes' vendor='AMD'>Opteron_G1</model>
+      <model usable='yes' vendor='Intel'>Nehalem-IBRS</model>
+      <model usable='yes' vendor='Intel'>Nehalem</model>
+      <model usable='yes' vendor='Intel'>IvyBridge-IBRS</model>
+      <model usable='yes' 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'>Icelake-Client-noTSX</model>
+      <model usable='no' vendor='Intel'>Icelake-Client</model>
+      <model usable='yes' vendor='Intel'>Haswell-noTSX-IBRS</model>
+      <model usable='yes' vendor='Intel'>Haswell-noTSX</model>
+      <model usable='yes' vendor='Intel'>Haswell-IBRS</model>
+      <model usable='yes' 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='yes' vendor='Intel'>Broadwell-noTSX-IBRS</model>
+      <model usable='yes' vendor='Intel'>Broadwell-noTSX</model>
+      <model usable='yes' vendor='Intel'>Broadwell-IBRS</model>
+      <model usable='yes' vendor='Intel'>Broadwell</model>
       <model usable='yes' vendor='unknown'>486</model>
     </mode>
   </cpu>
diff --git a/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml
index d0ceae6d7f..0917fb3e94 100644
--- a/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml
@@ -64,57 +64,57 @@
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown'>qemu64</model>
       <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='unknown'>phenom</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='unknown'>n270</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='unknown'>coreduo</model>
-      <model usable='no' vendor='unknown'>core2duo</model>
-      <model usable='no' vendor='unknown'>athlon</model>
-      <model usable='no' vendor='unknown'>Westmere-IBRS</model>
-      <model usable='yes' vendor='unknown'>Westmere</model>
-      <model usable='no' vendor='unknown'>Snowridge</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client</model>
-      <model usable='no' vendor='unknown'>SandyBridge-IBRS</model>
-      <model usable='yes' vendor='unknown'>SandyBridge</model>
-      <model usable='yes' vendor='unknown'>Penryn</model>
-      <model usable='no' vendor='unknown'>Opteron_G5</model>
-      <model usable='no' vendor='unknown'>Opteron_G4</model>
-      <model usable='yes' vendor='unknown'>Opteron_G3</model>
-      <model usable='yes' vendor='unknown'>Opteron_G2</model>
-      <model usable='yes' vendor='unknown'>Opteron_G1</model>
-      <model usable='no' vendor='unknown'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='unknown'>Nehalem</model>
-      <model usable='no' vendor='unknown'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='unknown'>IvyBridge</model>
-      <model usable='no' vendor='unknown'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Icelake-Server</model>
-      <model usable='no' vendor='unknown'>Icelake-Client-noTSX</model>
-      <model usable='no' vendor='unknown'>Icelake-Client</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX</model>
-      <model usable='no' vendor='unknown'>Haswell-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell</model>
-      <model usable='yes' vendor='unknown'>EPYC-Rome</model>
-      <model usable='yes' vendor='unknown'>EPYC-IBPB</model>
-      <model usable='yes' vendor='unknown'>EPYC</model>
-      <model usable='yes' vendor='unknown'>Dhyana</model>
-      <model usable='no' vendor='unknown'>Cooperlake</model>
-      <model usable='yes' vendor='unknown'>Conroe</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX</model>
-      <model usable='no' vendor='unknown'>Broadwell-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell</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'>Icelake-Client-noTSX</model>
+      <model usable='no' 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>
     </mode>
   </cpu>
diff --git a/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml
index 92560c92ed..b2dc0cecca 100644
--- a/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml
@@ -77,57 +77,57 @@
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown'>qemu64</model>
       <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='unknown'>phenom</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='unknown'>n270</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='unknown'>coreduo</model>
-      <model usable='yes' vendor='unknown'>core2duo</model>
-      <model usable='yes' vendor='unknown'>athlon</model>
-      <model usable='no' vendor='unknown'>Westmere-IBRS</model>
-      <model usable='yes' vendor='unknown'>Westmere</model>
-      <model usable='no' vendor='unknown'>Snowridge</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client</model>
-      <model usable='no' vendor='unknown'>SandyBridge-IBRS</model>
-      <model usable='no' vendor='unknown'>SandyBridge</model>
-      <model usable='yes' vendor='unknown'>Penryn</model>
-      <model usable='no' vendor='unknown'>Opteron_G5</model>
-      <model usable='no' vendor='unknown'>Opteron_G4</model>
-      <model usable='no' vendor='unknown'>Opteron_G3</model>
-      <model usable='yes' vendor='unknown'>Opteron_G2</model>
-      <model usable='yes' vendor='unknown'>Opteron_G1</model>
-      <model usable='no' vendor='unknown'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='unknown'>Nehalem</model>
-      <model usable='no' vendor='unknown'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='unknown'>IvyBridge</model>
-      <model usable='no' vendor='unknown'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Icelake-Server</model>
-      <model usable='no' vendor='unknown'>Icelake-Client-noTSX</model>
-      <model usable='no' vendor='unknown'>Icelake-Client</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX</model>
-      <model usable='no' vendor='unknown'>Haswell-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell</model>
-      <model usable='no' vendor='unknown'>EPYC-Rome</model>
-      <model usable='no' vendor='unknown'>EPYC-IBPB</model>
-      <model usable='no' vendor='unknown'>EPYC</model>
-      <model usable='no' vendor='unknown'>Dhyana</model>
-      <model usable='no' vendor='unknown'>Cooperlake</model>
-      <model usable='yes' vendor='unknown'>Conroe</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX</model>
-      <model usable='no' vendor='unknown'>Broadwell-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell</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'>Icelake-Client-noTSX</model>
+      <model usable='no' 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>
     </mode>
   </cpu>
diff --git a/tests/domaincapsdata/qemu_5.1.0.x86_64.xml b/tests/domaincapsdata/qemu_5.1.0.x86_64.xml
index 169db1c00f..abddcd6e62 100644
--- a/tests/domaincapsdata/qemu_5.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.1.0.x86_64.xml
@@ -63,57 +63,57 @@
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown'>qemu64</model>
       <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='unknown'>phenom</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='unknown'>n270</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='unknown'>coreduo</model>
-      <model usable='no' vendor='unknown'>core2duo</model>
-      <model usable='no' vendor='unknown'>athlon</model>
-      <model usable='no' vendor='unknown'>Westmere-IBRS</model>
-      <model usable='yes' vendor='unknown'>Westmere</model>
-      <model usable='no' vendor='unknown'>Snowridge</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client</model>
-      <model usable='no' vendor='unknown'>SandyBridge-IBRS</model>
-      <model usable='yes' vendor='unknown'>SandyBridge</model>
-      <model usable='yes' vendor='unknown'>Penryn</model>
-      <model usable='no' vendor='unknown'>Opteron_G5</model>
-      <model usable='no' vendor='unknown'>Opteron_G4</model>
-      <model usable='yes' vendor='unknown'>Opteron_G3</model>
-      <model usable='yes' vendor='unknown'>Opteron_G2</model>
-      <model usable='yes' vendor='unknown'>Opteron_G1</model>
-      <model usable='no' vendor='unknown'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='unknown'>Nehalem</model>
-      <model usable='no' vendor='unknown'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='unknown'>IvyBridge</model>
-      <model usable='no' vendor='unknown'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Icelake-Server</model>
-      <model usable='no' vendor='unknown'>Icelake-Client-noTSX</model>
-      <model usable='no' vendor='unknown'>Icelake-Client</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX</model>
-      <model usable='no' vendor='unknown'>Haswell-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell</model>
-      <model usable='yes' vendor='unknown'>EPYC-Rome</model>
-      <model usable='yes' vendor='unknown'>EPYC-IBPB</model>
-      <model usable='yes' vendor='unknown'>EPYC</model>
-      <model usable='yes' vendor='unknown'>Dhyana</model>
-      <model usable='no' vendor='unknown'>Cooperlake</model>
-      <model usable='yes' vendor='unknown'>Conroe</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX</model>
-      <model usable='no' vendor='unknown'>Broadwell-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell</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'>Icelake-Client-noTSX</model>
+      <model usable='no' 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>
     </mode>
   </cpu>
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 d4922249c0..f441139af2 100644
--- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
@@ -64,57 +64,57 @@
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown'>qemu64</model>
       <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='unknown'>phenom</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='unknown'>n270</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='unknown'>coreduo</model>
-      <model usable='no' vendor='unknown'>core2duo</model>
-      <model usable='no' vendor='unknown'>athlon</model>
-      <model usable='no' vendor='unknown'>Westmere-IBRS</model>
-      <model usable='yes' vendor='unknown'>Westmere</model>
-      <model usable='no' vendor='unknown'>Snowridge</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client</model>
-      <model usable='no' vendor='unknown'>SandyBridge-IBRS</model>
-      <model usable='yes' vendor='unknown'>SandyBridge</model>
-      <model usable='yes' vendor='unknown'>Penryn</model>
-      <model usable='no' vendor='unknown'>Opteron_G5</model>
-      <model usable='no' vendor='unknown'>Opteron_G4</model>
-      <model usable='yes' vendor='unknown'>Opteron_G3</model>
-      <model usable='yes' vendor='unknown'>Opteron_G2</model>
-      <model usable='yes' vendor='unknown'>Opteron_G1</model>
-      <model usable='no' vendor='unknown'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='unknown'>Nehalem</model>
-      <model usable='no' vendor='unknown'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='unknown'>IvyBridge</model>
-      <model usable='no' vendor='unknown'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Icelake-Server</model>
-      <model usable='no' deprecated='yes' vendor='unknown'>Icelake-Client-noTSX</model>
-      <model usable='no' deprecated='yes' vendor='unknown'>Icelake-Client</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX</model>
-      <model usable='no' vendor='unknown'>Haswell-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell</model>
-      <model usable='yes' vendor='unknown'>EPYC-Rome</model>
-      <model usable='yes' vendor='unknown'>EPYC-IBPB</model>
-      <model usable='yes' vendor='unknown'>EPYC</model>
-      <model usable='yes' vendor='unknown'>Dhyana</model>
-      <model usable='no' vendor='unknown'>Cooperlake</model>
-      <model usable='yes' vendor='unknown'>Conroe</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX</model>
-      <model usable='no' vendor='unknown'>Broadwell-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell</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>
     </mode>
   </cpu>
diff --git a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
index 96d9aabc29..690fba9fc2 100644
--- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
@@ -77,57 +77,57 @@
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown'>qemu64</model>
       <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='unknown'>phenom</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='unknown'>n270</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='unknown'>coreduo</model>
-      <model usable='yes' vendor='unknown'>core2duo</model>
-      <model usable='yes' vendor='unknown'>athlon</model>
-      <model usable='no' vendor='unknown'>Westmere-IBRS</model>
-      <model usable='yes' vendor='unknown'>Westmere</model>
-      <model usable='no' vendor='unknown'>Snowridge</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client</model>
-      <model usable='no' vendor='unknown'>SandyBridge-IBRS</model>
-      <model usable='no' vendor='unknown'>SandyBridge</model>
-      <model usable='yes' vendor='unknown'>Penryn</model>
-      <model usable='no' vendor='unknown'>Opteron_G5</model>
-      <model usable='no' vendor='unknown'>Opteron_G4</model>
-      <model usable='no' vendor='unknown'>Opteron_G3</model>
-      <model usable='yes' vendor='unknown'>Opteron_G2</model>
-      <model usable='yes' vendor='unknown'>Opteron_G1</model>
-      <model usable='no' vendor='unknown'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='unknown'>Nehalem</model>
-      <model usable='no' vendor='unknown'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='unknown'>IvyBridge</model>
-      <model usable='no' vendor='unknown'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Icelake-Server</model>
-      <model usable='no' deprecated='yes' vendor='unknown'>Icelake-Client-noTSX</model>
-      <model usable='no' deprecated='yes' vendor='unknown'>Icelake-Client</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX</model>
-      <model usable='no' vendor='unknown'>Haswell-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell</model>
-      <model usable='no' vendor='unknown'>EPYC-Rome</model>
-      <model usable='no' vendor='unknown'>EPYC-IBPB</model>
-      <model usable='no' vendor='unknown'>EPYC</model>
-      <model usable='no' vendor='unknown'>Dhyana</model>
-      <model usable='no' vendor='unknown'>Cooperlake</model>
-      <model usable='yes' vendor='unknown'>Conroe</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX</model>
-      <model usable='no' vendor='unknown'>Broadwell-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell</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>
     </mode>
   </cpu>
diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
index cb99bfab9e..27a3af5ba0 100644
--- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
@@ -63,57 +63,57 @@
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown'>qemu64</model>
       <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='unknown'>phenom</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='unknown'>n270</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='unknown'>coreduo</model>
-      <model usable='no' vendor='unknown'>core2duo</model>
-      <model usable='no' vendor='unknown'>athlon</model>
-      <model usable='no' vendor='unknown'>Westmere-IBRS</model>
-      <model usable='yes' vendor='unknown'>Westmere</model>
-      <model usable='no' vendor='unknown'>Snowridge</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client</model>
-      <model usable='no' vendor='unknown'>SandyBridge-IBRS</model>
-      <model usable='yes' vendor='unknown'>SandyBridge</model>
-      <model usable='yes' vendor='unknown'>Penryn</model>
-      <model usable='no' vendor='unknown'>Opteron_G5</model>
-      <model usable='no' vendor='unknown'>Opteron_G4</model>
-      <model usable='yes' vendor='unknown'>Opteron_G3</model>
-      <model usable='yes' vendor='unknown'>Opteron_G2</model>
-      <model usable='yes' vendor='unknown'>Opteron_G1</model>
-      <model usable='no' vendor='unknown'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='unknown'>Nehalem</model>
-      <model usable='no' vendor='unknown'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='unknown'>IvyBridge</model>
-      <model usable='no' vendor='unknown'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Icelake-Server</model>
-      <model usable='no' deprecated='yes' vendor='unknown'>Icelake-Client-noTSX</model>
-      <model usable='no' deprecated='yes' vendor='unknown'>Icelake-Client</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX</model>
-      <model usable='no' vendor='unknown'>Haswell-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell</model>
-      <model usable='yes' vendor='unknown'>EPYC-Rome</model>
-      <model usable='yes' vendor='unknown'>EPYC-IBPB</model>
-      <model usable='yes' vendor='unknown'>EPYC</model>
-      <model usable='yes' vendor='unknown'>Dhyana</model>
-      <model usable='no' vendor='unknown'>Cooperlake</model>
-      <model usable='yes' vendor='unknown'>Conroe</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX</model>
-      <model usable='no' vendor='unknown'>Broadwell-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell</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>
     </mode>
   </cpu>
diff --git a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
index cc2d6c8135..56f2ee8b15 100644
--- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
@@ -64,58 +64,58 @@
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown'>qemu64</model>
       <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='unknown'>phenom</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='unknown'>n270</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='unknown'>coreduo</model>
-      <model usable='no' vendor='unknown'>core2duo</model>
-      <model usable='no' vendor='unknown'>athlon</model>
-      <model usable='no' vendor='unknown'>Westmere-IBRS</model>
-      <model usable='yes' vendor='unknown'>Westmere</model>
-      <model usable='no' vendor='unknown'>Snowridge</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client</model>
-      <model usable='no' vendor='unknown'>SandyBridge-IBRS</model>
-      <model usable='yes' vendor='unknown'>SandyBridge</model>
-      <model usable='yes' vendor='unknown'>Penryn</model>
-      <model usable='no' vendor='unknown'>Opteron_G5</model>
-      <model usable='no' vendor='unknown'>Opteron_G4</model>
-      <model usable='yes' vendor='unknown'>Opteron_G3</model>
-      <model usable='yes' vendor='unknown'>Opteron_G2</model>
-      <model usable='yes' vendor='unknown'>Opteron_G1</model>
-      <model usable='no' vendor='unknown'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='unknown'>Nehalem</model>
-      <model usable='no' vendor='unknown'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='unknown'>IvyBridge</model>
-      <model usable='no' vendor='unknown'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Icelake-Server</model>
-      <model usable='no' deprecated='yes' vendor='unknown'>Icelake-Client-noTSX</model>
-      <model usable='no' deprecated='yes' vendor='unknown'>Icelake-Client</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX</model>
-      <model usable='no' vendor='unknown'>Haswell-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell</model>
-      <model usable='yes' vendor='unknown'>EPYC-Rome</model>
-      <model usable='no' vendor='unknown'>EPYC-Milan</model>
-      <model usable='yes' vendor='unknown'>EPYC-IBPB</model>
-      <model usable='yes' vendor='unknown'>EPYC</model>
-      <model usable='yes' vendor='unknown'>Dhyana</model>
-      <model usable='no' vendor='unknown'>Cooperlake</model>
-      <model usable='yes' vendor='unknown'>Conroe</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX</model>
-      <model usable='no' vendor='unknown'>Broadwell-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell</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>
     </mode>
   </cpu>
diff --git a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
index 4910fad094..dab11a82d6 100644
--- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
@@ -77,58 +77,58 @@
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown'>qemu64</model>
       <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='unknown'>phenom</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='unknown'>n270</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='unknown'>coreduo</model>
-      <model usable='yes' vendor='unknown'>core2duo</model>
-      <model usable='yes' vendor='unknown'>athlon</model>
-      <model usable='no' vendor='unknown'>Westmere-IBRS</model>
-      <model usable='yes' vendor='unknown'>Westmere</model>
-      <model usable='no' vendor='unknown'>Snowridge</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client</model>
-      <model usable='no' vendor='unknown'>SandyBridge-IBRS</model>
-      <model usable='no' vendor='unknown'>SandyBridge</model>
-      <model usable='yes' vendor='unknown'>Penryn</model>
-      <model usable='no' vendor='unknown'>Opteron_G5</model>
-      <model usable='no' vendor='unknown'>Opteron_G4</model>
-      <model usable='no' vendor='unknown'>Opteron_G3</model>
-      <model usable='yes' vendor='unknown'>Opteron_G2</model>
-      <model usable='yes' vendor='unknown'>Opteron_G1</model>
-      <model usable='no' vendor='unknown'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='unknown'>Nehalem</model>
-      <model usable='no' vendor='unknown'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='unknown'>IvyBridge</model>
-      <model usable='no' vendor='unknown'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Icelake-Server</model>
-      <model usable='no' deprecated='yes' vendor='unknown'>Icelake-Client-noTSX</model>
-      <model usable='no' deprecated='yes' vendor='unknown'>Icelake-Client</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX</model>
-      <model usable='no' vendor='unknown'>Haswell-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell</model>
-      <model usable='no' vendor='unknown'>EPYC-Rome</model>
-      <model usable='no' vendor='unknown'>EPYC-Milan</model>
-      <model usable='no' vendor='unknown'>EPYC-IBPB</model>
-      <model usable='no' vendor='unknown'>EPYC</model>
-      <model usable='no' vendor='unknown'>Dhyana</model>
-      <model usable='no' vendor='unknown'>Cooperlake</model>
-      <model usable='yes' vendor='unknown'>Conroe</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX</model>
-      <model usable='no' vendor='unknown'>Broadwell-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell</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>
     </mode>
   </cpu>
diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
index 8433c4b51c..338a9a7494 100644
--- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
@@ -63,58 +63,58 @@
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown'>qemu64</model>
       <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='unknown'>phenom</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='unknown'>n270</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='unknown'>coreduo</model>
-      <model usable='no' vendor='unknown'>core2duo</model>
-      <model usable='no' vendor='unknown'>athlon</model>
-      <model usable='no' vendor='unknown'>Westmere-IBRS</model>
-      <model usable='yes' vendor='unknown'>Westmere</model>
-      <model usable='no' vendor='unknown'>Snowridge</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client</model>
-      <model usable='no' vendor='unknown'>SandyBridge-IBRS</model>
-      <model usable='yes' vendor='unknown'>SandyBridge</model>
-      <model usable='yes' vendor='unknown'>Penryn</model>
-      <model usable='no' vendor='unknown'>Opteron_G5</model>
-      <model usable='no' vendor='unknown'>Opteron_G4</model>
-      <model usable='yes' vendor='unknown'>Opteron_G3</model>
-      <model usable='yes' vendor='unknown'>Opteron_G2</model>
-      <model usable='yes' vendor='unknown'>Opteron_G1</model>
-      <model usable='no' vendor='unknown'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='unknown'>Nehalem</model>
-      <model usable='no' vendor='unknown'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='unknown'>IvyBridge</model>
-      <model usable='no' vendor='unknown'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Icelake-Server</model>
-      <model usable='no' deprecated='yes' vendor='unknown'>Icelake-Client-noTSX</model>
-      <model usable='no' deprecated='yes' vendor='unknown'>Icelake-Client</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX</model>
-      <model usable='no' vendor='unknown'>Haswell-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell</model>
-      <model usable='yes' vendor='unknown'>EPYC-Rome</model>
-      <model usable='no' vendor='unknown'>EPYC-Milan</model>
-      <model usable='yes' vendor='unknown'>EPYC-IBPB</model>
-      <model usable='yes' vendor='unknown'>EPYC</model>
-      <model usable='yes' vendor='unknown'>Dhyana</model>
-      <model usable='no' vendor='unknown'>Cooperlake</model>
-      <model usable='yes' vendor='unknown'>Conroe</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX</model>
-      <model usable='no' vendor='unknown'>Broadwell-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell</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>
     </mode>
   </cpu>
diff --git a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
index 5070e3828b..c023a72dec 100644
--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
@@ -65,58 +65,58 @@
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown'>qemu64</model>
       <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='unknown'>phenom</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='unknown'>n270</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='unknown'>coreduo</model>
-      <model usable='no' vendor='unknown'>core2duo</model>
-      <model usable='no' vendor='unknown'>athlon</model>
-      <model usable='no' vendor='unknown'>Westmere-IBRS</model>
-      <model usable='yes' vendor='unknown'>Westmere</model>
-      <model usable='no' vendor='unknown'>Snowridge</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client</model>
-      <model usable='no' vendor='unknown'>SandyBridge-IBRS</model>
-      <model usable='yes' vendor='unknown'>SandyBridge</model>
-      <model usable='yes' vendor='unknown'>Penryn</model>
-      <model usable='no' vendor='unknown'>Opteron_G5</model>
-      <model usable='no' vendor='unknown'>Opteron_G4</model>
-      <model usable='yes' vendor='unknown'>Opteron_G3</model>
-      <model usable='yes' vendor='unknown'>Opteron_G2</model>
-      <model usable='yes' vendor='unknown'>Opteron_G1</model>
-      <model usable='no' vendor='unknown'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='unknown'>Nehalem</model>
-      <model usable='no' vendor='unknown'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='unknown'>IvyBridge</model>
-      <model usable='no' vendor='unknown'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Icelake-Server</model>
-      <model usable='no' deprecated='yes' vendor='unknown'>Icelake-Client-noTSX</model>
-      <model usable='no' deprecated='yes' vendor='unknown'>Icelake-Client</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX</model>
-      <model usable='no' vendor='unknown'>Haswell-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell</model>
-      <model usable='yes' vendor='unknown'>EPYC-Rome</model>
-      <model usable='no' vendor='unknown'>EPYC-Milan</model>
-      <model usable='yes' vendor='unknown'>EPYC-IBPB</model>
-      <model usable='yes' vendor='unknown'>EPYC</model>
-      <model usable='yes' vendor='unknown'>Dhyana</model>
-      <model usable='no' vendor='unknown'>Cooperlake</model>
-      <model usable='yes' vendor='unknown'>Conroe</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX</model>
-      <model usable='no' vendor='unknown'>Broadwell-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell</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>
     </mode>
   </cpu>
diff --git a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
index d1cc3e88a3..18da71d0a7 100644
--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
@@ -77,58 +77,58 @@
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown'>qemu64</model>
       <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='unknown'>phenom</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='unknown'>n270</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='unknown'>coreduo</model>
-      <model usable='yes' vendor='unknown'>core2duo</model>
-      <model usable='yes' vendor='unknown'>athlon</model>
-      <model usable='no' vendor='unknown'>Westmere-IBRS</model>
-      <model usable='yes' vendor='unknown'>Westmere</model>
-      <model usable='no' vendor='unknown'>Snowridge</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client</model>
-      <model usable='no' vendor='unknown'>SandyBridge-IBRS</model>
-      <model usable='no' vendor='unknown'>SandyBridge</model>
-      <model usable='yes' vendor='unknown'>Penryn</model>
-      <model usable='no' vendor='unknown'>Opteron_G5</model>
-      <model usable='no' vendor='unknown'>Opteron_G4</model>
-      <model usable='no' vendor='unknown'>Opteron_G3</model>
-      <model usable='yes' vendor='unknown'>Opteron_G2</model>
-      <model usable='yes' vendor='unknown'>Opteron_G1</model>
-      <model usable='no' vendor='unknown'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='unknown'>Nehalem</model>
-      <model usable='no' vendor='unknown'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='unknown'>IvyBridge</model>
-      <model usable='no' vendor='unknown'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Icelake-Server</model>
-      <model usable='no' deprecated='yes' vendor='unknown'>Icelake-Client-noTSX</model>
-      <model usable='no' deprecated='yes' vendor='unknown'>Icelake-Client</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX</model>
-      <model usable='no' vendor='unknown'>Haswell-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell</model>
-      <model usable='no' vendor='unknown'>EPYC-Rome</model>
-      <model usable='no' vendor='unknown'>EPYC-Milan</model>
-      <model usable='no' vendor='unknown'>EPYC-IBPB</model>
-      <model usable='no' vendor='unknown'>EPYC</model>
-      <model usable='no' vendor='unknown'>Dhyana</model>
-      <model usable='no' vendor='unknown'>Cooperlake</model>
-      <model usable='yes' vendor='unknown'>Conroe</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX</model>
-      <model usable='no' vendor='unknown'>Broadwell-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell</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>
     </mode>
   </cpu>
diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
index a4013faa0e..de17a784f6 100644
--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
@@ -64,58 +64,58 @@
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown'>qemu64</model>
       <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='unknown'>phenom</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='unknown'>n270</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='unknown'>coreduo</model>
-      <model usable='no' vendor='unknown'>core2duo</model>
-      <model usable='no' vendor='unknown'>athlon</model>
-      <model usable='no' vendor='unknown'>Westmere-IBRS</model>
-      <model usable='yes' vendor='unknown'>Westmere</model>
-      <model usable='no' vendor='unknown'>Snowridge</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client</model>
-      <model usable='no' vendor='unknown'>SandyBridge-IBRS</model>
-      <model usable='yes' vendor='unknown'>SandyBridge</model>
-      <model usable='yes' vendor='unknown'>Penryn</model>
-      <model usable='no' vendor='unknown'>Opteron_G5</model>
-      <model usable='no' vendor='unknown'>Opteron_G4</model>
-      <model usable='yes' vendor='unknown'>Opteron_G3</model>
-      <model usable='yes' vendor='unknown'>Opteron_G2</model>
-      <model usable='yes' vendor='unknown'>Opteron_G1</model>
-      <model usable='no' vendor='unknown'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='unknown'>Nehalem</model>
-      <model usable='no' vendor='unknown'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='unknown'>IvyBridge</model>
-      <model usable='no' vendor='unknown'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Icelake-Server</model>
-      <model usable='no' deprecated='yes' vendor='unknown'>Icelake-Client-noTSX</model>
-      <model usable='no' deprecated='yes' vendor='unknown'>Icelake-Client</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX</model>
-      <model usable='no' vendor='unknown'>Haswell-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell</model>
-      <model usable='yes' vendor='unknown'>EPYC-Rome</model>
-      <model usable='no' vendor='unknown'>EPYC-Milan</model>
-      <model usable='yes' vendor='unknown'>EPYC-IBPB</model>
-      <model usable='yes' vendor='unknown'>EPYC</model>
-      <model usable='yes' vendor='unknown'>Dhyana</model>
-      <model usable='no' vendor='unknown'>Cooperlake</model>
-      <model usable='yes' vendor='unknown'>Conroe</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX</model>
-      <model usable='no' vendor='unknown'>Broadwell-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell</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>
     </mode>
   </cpu>
diff --git a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
index da3ee2b734..f767ded170 100644
--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
@@ -65,58 +65,58 @@
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown'>qemu64</model>
       <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='unknown'>phenom</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='unknown'>n270</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='unknown'>coreduo</model>
-      <model usable='no' vendor='unknown'>core2duo</model>
-      <model usable='no' vendor='unknown'>athlon</model>
-      <model usable='no' vendor='unknown'>Westmere-IBRS</model>
-      <model usable='yes' vendor='unknown'>Westmere</model>
-      <model usable='no' vendor='unknown'>Snowridge</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client</model>
-      <model usable='no' vendor='unknown'>SandyBridge-IBRS</model>
-      <model usable='yes' vendor='unknown'>SandyBridge</model>
-      <model usable='yes' vendor='unknown'>Penryn</model>
-      <model usable='no' vendor='unknown'>Opteron_G5</model>
-      <model usable='no' vendor='unknown'>Opteron_G4</model>
-      <model usable='yes' vendor='unknown'>Opteron_G3</model>
-      <model usable='yes' vendor='unknown'>Opteron_G2</model>
-      <model usable='yes' vendor='unknown'>Opteron_G1</model>
-      <model usable='no' vendor='unknown'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='unknown'>Nehalem</model>
-      <model usable='no' vendor='unknown'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='unknown'>IvyBridge</model>
-      <model usable='no' vendor='unknown'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Icelake-Server</model>
-      <model usable='no' deprecated='yes' vendor='unknown'>Icelake-Client-noTSX</model>
-      <model usable='no' deprecated='yes' vendor='unknown'>Icelake-Client</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX</model>
-      <model usable='no' vendor='unknown'>Haswell-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell</model>
-      <model usable='yes' vendor='unknown'>EPYC-Rome</model>
-      <model usable='no' vendor='unknown'>EPYC-Milan</model>
-      <model usable='yes' vendor='unknown'>EPYC-IBPB</model>
-      <model usable='yes' vendor='unknown'>EPYC</model>
-      <model usable='yes' vendor='unknown'>Dhyana</model>
-      <model usable='no' vendor='unknown'>Cooperlake</model>
-      <model usable='yes' vendor='unknown'>Conroe</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX</model>
-      <model usable='no' vendor='unknown'>Broadwell-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell</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>
     </mode>
   </cpu>
diff --git a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
index e21e6d5de2..5122df5419 100644
--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
@@ -78,58 +78,58 @@
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown'>qemu64</model>
       <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='unknown'>phenom</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='unknown'>n270</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='unknown'>coreduo</model>
-      <model usable='yes' vendor='unknown'>core2duo</model>
-      <model usable='yes' vendor='unknown'>athlon</model>
-      <model usable='no' vendor='unknown'>Westmere-IBRS</model>
-      <model usable='yes' vendor='unknown'>Westmere</model>
-      <model usable='no' vendor='unknown'>Snowridge</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client</model>
-      <model usable='no' vendor='unknown'>SandyBridge-IBRS</model>
-      <model usable='no' vendor='unknown'>SandyBridge</model>
-      <model usable='yes' vendor='unknown'>Penryn</model>
-      <model usable='no' vendor='unknown'>Opteron_G5</model>
-      <model usable='no' vendor='unknown'>Opteron_G4</model>
-      <model usable='no' vendor='unknown'>Opteron_G3</model>
-      <model usable='yes' vendor='unknown'>Opteron_G2</model>
-      <model usable='yes' vendor='unknown'>Opteron_G1</model>
-      <model usable='no' vendor='unknown'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='unknown'>Nehalem</model>
-      <model usable='no' vendor='unknown'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='unknown'>IvyBridge</model>
-      <model usable='no' vendor='unknown'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Icelake-Server</model>
-      <model usable='no' deprecated='yes' vendor='unknown'>Icelake-Client-noTSX</model>
-      <model usable='no' deprecated='yes' vendor='unknown'>Icelake-Client</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX</model>
-      <model usable='no' vendor='unknown'>Haswell-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell</model>
-      <model usable='no' vendor='unknown'>EPYC-Rome</model>
-      <model usable='no' vendor='unknown'>EPYC-Milan</model>
-      <model usable='no' vendor='unknown'>EPYC-IBPB</model>
-      <model usable='no' vendor='unknown'>EPYC</model>
-      <model usable='no' vendor='unknown'>Dhyana</model>
-      <model usable='no' vendor='unknown'>Cooperlake</model>
-      <model usable='yes' vendor='unknown'>Conroe</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX</model>
-      <model usable='no' vendor='unknown'>Broadwell-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell</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>
     </mode>
   </cpu>
diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
index 6aa7d8636c..bdce41d4db 100644
--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
@@ -64,58 +64,58 @@
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown'>qemu64</model>
       <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='unknown'>phenom</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='unknown'>n270</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='unknown'>coreduo</model>
-      <model usable='no' vendor='unknown'>core2duo</model>
-      <model usable='no' vendor='unknown'>athlon</model>
-      <model usable='no' vendor='unknown'>Westmere-IBRS</model>
-      <model usable='yes' vendor='unknown'>Westmere</model>
-      <model usable='no' vendor='unknown'>Snowridge</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client</model>
-      <model usable='no' vendor='unknown'>SandyBridge-IBRS</model>
-      <model usable='yes' vendor='unknown'>SandyBridge</model>
-      <model usable='yes' vendor='unknown'>Penryn</model>
-      <model usable='no' vendor='unknown'>Opteron_G5</model>
-      <model usable='no' vendor='unknown'>Opteron_G4</model>
-      <model usable='yes' vendor='unknown'>Opteron_G3</model>
-      <model usable='yes' vendor='unknown'>Opteron_G2</model>
-      <model usable='yes' vendor='unknown'>Opteron_G1</model>
-      <model usable='no' vendor='unknown'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='unknown'>Nehalem</model>
-      <model usable='no' vendor='unknown'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='unknown'>IvyBridge</model>
-      <model usable='no' vendor='unknown'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Icelake-Server</model>
-      <model usable='no' deprecated='yes' vendor='unknown'>Icelake-Client-noTSX</model>
-      <model usable='no' deprecated='yes' vendor='unknown'>Icelake-Client</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX</model>
-      <model usable='no' vendor='unknown'>Haswell-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell</model>
-      <model usable='yes' vendor='unknown'>EPYC-Rome</model>
-      <model usable='no' vendor='unknown'>EPYC-Milan</model>
-      <model usable='yes' vendor='unknown'>EPYC-IBPB</model>
-      <model usable='yes' vendor='unknown'>EPYC</model>
-      <model usable='yes' vendor='unknown'>Dhyana</model>
-      <model usable='no' vendor='unknown'>Cooperlake</model>
-      <model usable='yes' vendor='unknown'>Conroe</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX</model>
-      <model usable='no' vendor='unknown'>Broadwell-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell</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>
     </mode>
   </cpu>
diff --git a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
index caecac2b8c..e7850eafcf 100644
--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
@@ -66,58 +66,58 @@
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown'>qemu64</model>
       <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='unknown'>phenom</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='unknown'>n270</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='unknown'>coreduo</model>
-      <model usable='no' vendor='unknown'>core2duo</model>
-      <model usable='no' vendor='unknown'>athlon</model>
-      <model usable='no' vendor='unknown'>Westmere-IBRS</model>
-      <model usable='yes' vendor='unknown'>Westmere</model>
-      <model usable='no' vendor='unknown'>Snowridge</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client</model>
-      <model usable='no' vendor='unknown'>SandyBridge-IBRS</model>
-      <model usable='yes' vendor='unknown'>SandyBridge</model>
-      <model usable='yes' vendor='unknown'>Penryn</model>
-      <model usable='no' vendor='unknown'>Opteron_G5</model>
-      <model usable='no' vendor='unknown'>Opteron_G4</model>
-      <model usable='yes' vendor='unknown'>Opteron_G3</model>
-      <model usable='yes' vendor='unknown'>Opteron_G2</model>
-      <model usable='yes' vendor='unknown'>Opteron_G1</model>
-      <model usable='no' vendor='unknown'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='unknown'>Nehalem</model>
-      <model usable='no' vendor='unknown'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='unknown'>IvyBridge</model>
-      <model usable='no' vendor='unknown'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Icelake-Server</model>
-      <model usable='no' deprecated='yes' vendor='unknown'>Icelake-Client-noTSX</model>
-      <model usable='no' deprecated='yes' vendor='unknown'>Icelake-Client</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX</model>
-      <model usable='no' vendor='unknown'>Haswell-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell</model>
-      <model usable='yes' vendor='unknown'>EPYC-Rome</model>
-      <model usable='no' vendor='unknown'>EPYC-Milan</model>
-      <model usable='yes' vendor='unknown'>EPYC-IBPB</model>
-      <model usable='yes' vendor='unknown'>EPYC</model>
-      <model usable='yes' vendor='unknown'>Dhyana</model>
-      <model usable='no' vendor='unknown'>Cooperlake</model>
-      <model usable='yes' vendor='unknown'>Conroe</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX</model>
-      <model usable='no' vendor='unknown'>Broadwell-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell</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>
     </mode>
   </cpu>
diff --git a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
index 980c0e0bd9..53b0de03e7 100644
--- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
@@ -79,58 +79,58 @@
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown'>qemu64</model>
       <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='unknown'>phenom</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='unknown'>n270</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='unknown'>coreduo</model>
-      <model usable='yes' vendor='unknown'>core2duo</model>
-      <model usable='yes' vendor='unknown'>athlon</model>
-      <model usable='no' vendor='unknown'>Westmere-IBRS</model>
-      <model usable='yes' vendor='unknown'>Westmere</model>
-      <model usable='no' vendor='unknown'>Snowridge</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client</model>
-      <model usable='no' vendor='unknown'>SandyBridge-IBRS</model>
-      <model usable='no' vendor='unknown'>SandyBridge</model>
-      <model usable='yes' vendor='unknown'>Penryn</model>
-      <model usable='no' vendor='unknown'>Opteron_G5</model>
-      <model usable='no' vendor='unknown'>Opteron_G4</model>
-      <model usable='no' vendor='unknown'>Opteron_G3</model>
-      <model usable='yes' vendor='unknown'>Opteron_G2</model>
-      <model usable='yes' vendor='unknown'>Opteron_G1</model>
-      <model usable='no' vendor='unknown'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='unknown'>Nehalem</model>
-      <model usable='no' vendor='unknown'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='unknown'>IvyBridge</model>
-      <model usable='no' vendor='unknown'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Icelake-Server</model>
-      <model usable='no' deprecated='yes' vendor='unknown'>Icelake-Client-noTSX</model>
-      <model usable='no' deprecated='yes' vendor='unknown'>Icelake-Client</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX</model>
-      <model usable='no' vendor='unknown'>Haswell-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell</model>
-      <model usable='no' vendor='unknown'>EPYC-Rome</model>
-      <model usable='no' vendor='unknown'>EPYC-Milan</model>
-      <model usable='no' vendor='unknown'>EPYC-IBPB</model>
-      <model usable='no' vendor='unknown'>EPYC</model>
-      <model usable='no' vendor='unknown'>Dhyana</model>
-      <model usable='no' vendor='unknown'>Cooperlake</model>
-      <model usable='yes' vendor='unknown'>Conroe</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX</model>
-      <model usable='no' vendor='unknown'>Broadwell-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell</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>
     </mode>
   </cpu>
diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
index 5359f66dcb..ccee94df7a 100644
--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
@@ -65,58 +65,58 @@
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown'>qemu64</model>
       <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='unknown'>phenom</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='unknown'>n270</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='unknown'>coreduo</model>
-      <model usable='no' vendor='unknown'>core2duo</model>
-      <model usable='no' vendor='unknown'>athlon</model>
-      <model usable='no' vendor='unknown'>Westmere-IBRS</model>
-      <model usable='yes' vendor='unknown'>Westmere</model>
-      <model usable='no' vendor='unknown'>Snowridge</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client</model>
-      <model usable='no' vendor='unknown'>SandyBridge-IBRS</model>
-      <model usable='yes' vendor='unknown'>SandyBridge</model>
-      <model usable='yes' vendor='unknown'>Penryn</model>
-      <model usable='no' vendor='unknown'>Opteron_G5</model>
-      <model usable='no' vendor='unknown'>Opteron_G4</model>
-      <model usable='yes' vendor='unknown'>Opteron_G3</model>
-      <model usable='yes' vendor='unknown'>Opteron_G2</model>
-      <model usable='yes' vendor='unknown'>Opteron_G1</model>
-      <model usable='no' vendor='unknown'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='unknown'>Nehalem</model>
-      <model usable='no' vendor='unknown'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='unknown'>IvyBridge</model>
-      <model usable='no' vendor='unknown'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Icelake-Server</model>
-      <model usable='no' deprecated='yes' vendor='unknown'>Icelake-Client-noTSX</model>
-      <model usable='no' deprecated='yes' vendor='unknown'>Icelake-Client</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX</model>
-      <model usable='no' vendor='unknown'>Haswell-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell</model>
-      <model usable='yes' vendor='unknown'>EPYC-Rome</model>
-      <model usable='no' vendor='unknown'>EPYC-Milan</model>
-      <model usable='yes' vendor='unknown'>EPYC-IBPB</model>
-      <model usable='yes' vendor='unknown'>EPYC</model>
-      <model usable='yes' vendor='unknown'>Dhyana</model>
-      <model usable='no' vendor='unknown'>Cooperlake</model>
-      <model usable='yes' vendor='unknown'>Conroe</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX</model>
-      <model usable='no' vendor='unknown'>Broadwell-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell</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>
     </mode>
   </cpu>
diff --git a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
index 5168c62266..6e3df1e24b 100644
--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
@@ -67,56 +67,56 @@
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown'>qemu64</model>
       <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='unknown'>phenom</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='unknown'>n270</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='unknown'>coreduo</model>
-      <model usable='no' vendor='unknown'>core2duo</model>
-      <model usable='no' vendor='unknown'>athlon</model>
-      <model usable='no' vendor='unknown'>Westmere-IBRS</model>
-      <model usable='yes' vendor='unknown'>Westmere</model>
-      <model usable='no' vendor='unknown'>Snowridge</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client</model>
-      <model usable='no' vendor='unknown'>SandyBridge-IBRS</model>
-      <model usable='yes' vendor='unknown'>SandyBridge</model>
-      <model usable='yes' vendor='unknown'>Penryn</model>
-      <model usable='no' vendor='unknown'>Opteron_G5</model>
-      <model usable='no' vendor='unknown'>Opteron_G4</model>
-      <model usable='yes' vendor='unknown'>Opteron_G3</model>
-      <model usable='yes' vendor='unknown'>Opteron_G2</model>
-      <model usable='yes' vendor='unknown'>Opteron_G1</model>
-      <model usable='no' vendor='unknown'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='unknown'>Nehalem</model>
-      <model usable='no' vendor='unknown'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='unknown'>IvyBridge</model>
-      <model usable='no' vendor='unknown'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Icelake-Server</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX</model>
-      <model usable='no' vendor='unknown'>Haswell-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell</model>
-      <model usable='yes' vendor='unknown'>EPYC-Rome</model>
-      <model usable='no' vendor='unknown'>EPYC-Milan</model>
-      <model usable='yes' vendor='unknown'>EPYC-IBPB</model>
-      <model usable='yes' vendor='unknown'>EPYC</model>
-      <model usable='yes' vendor='unknown'>Dhyana</model>
-      <model usable='no' vendor='unknown'>Cooperlake</model>
-      <model usable='yes' vendor='unknown'>Conroe</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX</model>
-      <model usable='no' vendor='unknown'>Broadwell-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell</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>
     </mode>
   </cpu>
diff --git a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
index 98b1d14ec1..61aa269741 100644
--- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
@@ -79,56 +79,56 @@
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown'>qemu64</model>
       <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='unknown'>phenom</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='unknown'>n270</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='unknown'>coreduo</model>
-      <model usable='yes' vendor='unknown'>core2duo</model>
-      <model usable='yes' vendor='unknown'>athlon</model>
-      <model usable='no' vendor='unknown'>Westmere-IBRS</model>
-      <model usable='yes' vendor='unknown'>Westmere</model>
-      <model usable='no' vendor='unknown'>Snowridge</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client</model>
-      <model usable='no' vendor='unknown'>SandyBridge-IBRS</model>
-      <model usable='no' vendor='unknown'>SandyBridge</model>
-      <model usable='yes' vendor='unknown'>Penryn</model>
-      <model usable='no' vendor='unknown'>Opteron_G5</model>
-      <model usable='no' vendor='unknown'>Opteron_G4</model>
-      <model usable='no' vendor='unknown'>Opteron_G3</model>
-      <model usable='yes' vendor='unknown'>Opteron_G2</model>
-      <model usable='yes' vendor='unknown'>Opteron_G1</model>
-      <model usable='no' vendor='unknown'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='unknown'>Nehalem</model>
-      <model usable='no' vendor='unknown'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='unknown'>IvyBridge</model>
-      <model usable='no' vendor='unknown'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Icelake-Server</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX</model>
-      <model usable='no' vendor='unknown'>Haswell-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell</model>
-      <model usable='no' vendor='unknown'>EPYC-Rome</model>
-      <model usable='no' vendor='unknown'>EPYC-Milan</model>
-      <model usable='no' vendor='unknown'>EPYC-IBPB</model>
-      <model usable='no' vendor='unknown'>EPYC</model>
-      <model usable='no' vendor='unknown'>Dhyana</model>
-      <model usable='no' vendor='unknown'>Cooperlake</model>
-      <model usable='yes' vendor='unknown'>Conroe</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX</model>
-      <model usable='no' vendor='unknown'>Broadwell-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell</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>
     </mode>
   </cpu>
diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
index ec982b16ae..e1218e3f16 100644
--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
@@ -66,56 +66,56 @@
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown'>qemu64</model>
       <model usable='yes' vendor='unknown'>qemu32</model>
-      <model usable='no' vendor='unknown'>phenom</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='unknown'>n270</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='unknown'>coreduo</model>
-      <model usable='no' vendor='unknown'>core2duo</model>
-      <model usable='no' vendor='unknown'>athlon</model>
-      <model usable='no' vendor='unknown'>Westmere-IBRS</model>
-      <model usable='yes' vendor='unknown'>Westmere</model>
-      <model usable='no' vendor='unknown'>Snowridge</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Server</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client-IBRS</model>
-      <model usable='no' vendor='unknown'>Skylake-Client</model>
-      <model usable='no' vendor='unknown'>SandyBridge-IBRS</model>
-      <model usable='yes' vendor='unknown'>SandyBridge</model>
-      <model usable='yes' vendor='unknown'>Penryn</model>
-      <model usable='no' vendor='unknown'>Opteron_G5</model>
-      <model usable='no' vendor='unknown'>Opteron_G4</model>
-      <model usable='yes' vendor='unknown'>Opteron_G3</model>
-      <model usable='yes' vendor='unknown'>Opteron_G2</model>
-      <model usable='yes' vendor='unknown'>Opteron_G1</model>
-      <model usable='no' vendor='unknown'>Nehalem-IBRS</model>
-      <model usable='yes' vendor='unknown'>Nehalem</model>
-      <model usable='no' vendor='unknown'>IvyBridge-IBRS</model>
-      <model usable='no' vendor='unknown'>IvyBridge</model>
-      <model usable='no' vendor='unknown'>Icelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Icelake-Server</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell-noTSX</model>
-      <model usable='no' vendor='unknown'>Haswell-IBRS</model>
-      <model usable='no' vendor='unknown'>Haswell</model>
-      <model usable='yes' vendor='unknown'>EPYC-Rome</model>
-      <model usable='no' vendor='unknown'>EPYC-Milan</model>
-      <model usable='yes' vendor='unknown'>EPYC-IBPB</model>
-      <model usable='yes' vendor='unknown'>EPYC</model>
-      <model usable='yes' vendor='unknown'>Dhyana</model>
-      <model usable='no' vendor='unknown'>Cooperlake</model>
-      <model usable='yes' vendor='unknown'>Conroe</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server-noTSX</model>
-      <model usable='no' vendor='unknown'>Cascadelake-Server</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell-noTSX</model>
-      <model usable='no' vendor='unknown'>Broadwell-IBRS</model>
-      <model usable='no' vendor='unknown'>Broadwell</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>
     </mode>
   </cpu>