diff --git a/docs/formatdomaincaps.rst b/docs/formatdomaincaps.rst
index 70f46b972a..6ce780fb69 100644
--- a/docs/formatdomaincaps.rst
+++ b/docs/formatdomaincaps.rst
@@ -191,9 +191,10 @@ CPUs <formatdomain.html#cpu-model-and-topology>`__.
          <feature policy='require' name='vmx'/>
        </mode>
        <mode name='custom' supported='yes'>
-         <model usable='no' deprecated='no'>Broadwell</model>
-         <model usable='yes' deprecated='no'>Broadwell-noTSX</model>
-         <model usable='no' deprecated='yes'>Haswell</model>
+         <model usable='no' deprecated='no' vendor='Intel'>Broadwell</model>
+         <model usable='yes' deprecated='no' vendor='Intel'>Broadwell-noTSX</model>
+         <model usable='no' deprecated='yes' vendor='Intel'>Haswell</model>
+         <model usable='no' deprecated='no' vendor='AMD'>EPYC-Milan</model>
          ...
        </mode>
      </cpu>
@@ -226,7 +227,10 @@ more details about it:
    CPU of such model is expected to have. A special value ``unknown`` indicates
    libvirt does not have enough information to provide the usability data. The
    ``deprecated`` attribute reflects the hypervisor's policy on usage of this
-   model :since:`(since 7.1.0)` .
+   model :since:`(since 7.1.0)`. The ``vendor`` attribute :since:`(since 8.9.0)`
+   contains the vendor of the CPU model for users who want to use CPU models
+   with specific vendors only. CPU models with undefined vendor will be listed
+   with ``vendor='unkwnown'``.
 
 I/O Threads
 ~~~~~~~~~~~
diff --git a/src/conf/domain_capabilities.c b/src/conf/domain_capabilities.c
index 123c80a560..b5d8288982 100644
--- a/src/conf/domain_capabilities.c
+++ b/src/conf/domain_capabilities.c
@@ -105,6 +105,7 @@ virDomainCapsCPUModelsDispose(void *obj)
     for (i = 0; i < cpuModels->nmodels; i++) {
         g_free(cpuModels->models[i].name);
         g_strfreev(cpuModels->models[i].blockers);
+        g_free(cpuModels->models[i].vendor);
     }
 
     g_free(cpuModels->models);
@@ -166,7 +167,8 @@ virDomainCapsCPUModelsCopy(virDomainCapsCPUModels *old)
                                   old->models[i].name,
                                   old->models[i].usable,
                                   old->models[i].blockers,
-                                  old->models[i].deprecated);
+                                  old->models[i].deprecated,
+                                  old->models[i].vendor);
     }
 
     return cpuModels;
@@ -178,7 +180,8 @@ virDomainCapsCPUModelsAdd(virDomainCapsCPUModels *cpuModels,
                           const char *name,
                           virDomainCapsCPUUsable usable,
                           char **blockers,
-                          bool deprecated)
+                          bool deprecated,
+                          const char *vendor)
 {
     virDomainCapsCPUModel *cpu;
 
@@ -192,6 +195,7 @@ virDomainCapsCPUModelsAdd(virDomainCapsCPUModels *cpuModels,
     cpu->name = g_strdup(name);
     cpu->blockers = g_strdupv(blockers);
     cpu->deprecated = deprecated;
+    cpu->vendor = g_strdup(vendor);
 }
 
 
@@ -377,6 +381,11 @@ virDomainCapsCPUCustomFormat(virBuffer *buf,
         if (model->deprecated)
             virBufferAddLit(buf, " deprecated='yes'");
 
+        if (model->vendor)
+            virBufferAsprintf(buf, " vendor='%s'", model->vendor);
+        else
+            virBufferAddLit(buf, " vendor='unknown'");
+
         virBufferAsprintf(buf, ">%s</model>\n", model->name);
     }
 
diff --git a/src/conf/domain_capabilities.h b/src/conf/domain_capabilities.h
index 7333276231..f5fa1fb8e3 100644
--- a/src/conf/domain_capabilities.h
+++ b/src/conf/domain_capabilities.h
@@ -159,6 +159,7 @@ struct _virDomainCapsCPUModel {
     virDomainCapsCPUUsable usable;
     char **blockers; /* NULL-terminated list of usability blockers */
     bool deprecated;
+    char *vendor;
 };
 
 typedef struct _virDomainCapsCPUModels virDomainCapsCPUModels;
@@ -249,7 +250,8 @@ virDomainCapsCPUModelsAdd(virDomainCapsCPUModels *cpuModels,
                           const char *name,
                           virDomainCapsCPUUsable usable,
                           char **blockers,
-                          bool deprecated);
+                          bool deprecated,
+                          const char *vendor);
 virDomainCapsCPUModel *
 virDomainCapsCPUModelsGet(virDomainCapsCPUModels *cpuModels,
                           const char *name);
diff --git a/src/conf/schemas/domaincaps.rng b/src/conf/schemas/domaincaps.rng
index 9cbc2467ab..c4cb9afeba 100644
--- a/src/conf/schemas/domaincaps.rng
+++ b/src/conf/schemas/domaincaps.rng
@@ -159,6 +159,9 @@
               <ref name="virYesNo"/>
             </attribute>
           </optional>
+          <attribute name='vendor'>
+            <text/>
+          </attribute>
           <text/>
         </element>
       </zeroOrMore>
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index f366e6797c..5af5de8fc5 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -2195,7 +2195,7 @@ virQEMUCapsCPUDefsToModels(qemuMonitorCPUDefs *defs,
             continue;
 
         virDomainCapsCPUModelsAdd(cpuModels, cpu->name, cpu->usable,
-                                  cpu->blockers, cpu->deprecated);
+                                  cpu->blockers, cpu->deprecated, NULL);
     }
 
     return cpuModels;
diff --git a/tests/cputest.c b/tests/cputest.c
index 9d24b9d0f5..52e0022ac3 100644
--- a/tests/cputest.c
+++ b/tests/cputest.c
@@ -824,7 +824,7 @@ cpuTestUpdateLive(const void *arg)
         }
 
         virDomainCapsCPUModelsAdd(models, expected->model,
-                                  usable, blockers, false);
+                                  usable, blockers, false, expected->vendor);
 
         cpu->fallback = VIR_CPU_FALLBACK_ALLOW;
         ignore_value(virCPUTranslate(data->arch, cpu, models));
@@ -902,7 +902,8 @@ cpuTestInitModels(const char **list)
 
     for (model = list; *model; model++) {
         virDomainCapsCPUModelsAdd(cpus, *model,
-                                  VIR_DOMCAPS_CPU_USABLE_UNKNOWN, NULL, false);
+                                  VIR_DOMCAPS_CPU_USABLE_UNKNOWN,
+                                  NULL, false, NULL);
     }
 
     return cpus;
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 0ec4c570ac..fa86554892 100644
--- a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
@@ -61,58 +61,58 @@
       <feature policy='require' name='pschange-mc-no'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes'>qemu64</model>
-      <model usable='yes'>qemu32</model>
-      <model usable='no'>phenom</model>
-      <model usable='yes'>pentium3</model>
-      <model usable='yes'>pentium2</model>
-      <model usable='yes'>pentium</model>
-      <model usable='yes'>n270</model>
-      <model usable='yes'>kvm64</model>
-      <model usable='yes'>kvm32</model>
-      <model usable='yes'>coreduo</model>
-      <model usable='yes'>core2duo</model>
-      <model usable='no'>athlon</model>
-      <model usable='yes'>Westmere-IBRS</model>
-      <model usable='yes'>Westmere</model>
-      <model usable='no'>Snowridge</model>
-      <model usable='no'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no'>Skylake-Server-IBRS</model>
-      <model usable='no'>Skylake-Server</model>
-      <model usable='yes'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='yes'>Skylake-Client-IBRS</model>
-      <model usable='yes'>Skylake-Client</model>
-      <model usable='yes'>SandyBridge-IBRS</model>
-      <model usable='yes'>SandyBridge</model>
-      <model usable='yes'>Penryn</model>
-      <model usable='no'>Opteron_G5</model>
-      <model usable='no'>Opteron_G4</model>
-      <model usable='no'>Opteron_G3</model>
-      <model usable='yes'>Opteron_G2</model>
-      <model usable='yes'>Opteron_G1</model>
-      <model usable='yes'>Nehalem-IBRS</model>
-      <model usable='yes'>Nehalem</model>
-      <model usable='yes'>IvyBridge-IBRS</model>
-      <model usable='yes'>IvyBridge</model>
-      <model usable='no'>Icelake-Server-noTSX</model>
-      <model usable='no'>Icelake-Server</model>
-      <model usable='no'>Icelake-Client-noTSX</model>
-      <model usable='no'>Icelake-Client</model>
-      <model usable='yes'>Haswell-noTSX-IBRS</model>
-      <model usable='yes'>Haswell-noTSX</model>
-      <model usable='yes'>Haswell-IBRS</model>
-      <model usable='yes'>Haswell</model>
-      <model usable='no'>EPYC-IBPB</model>
-      <model usable='no'>EPYC</model>
-      <model usable='no'>Dhyana</model>
-      <model usable='yes'>Conroe</model>
-      <model usable='no'>Cascadelake-Server-noTSX</model>
-      <model usable='no'>Cascadelake-Server</model>
-      <model usable='yes'>Broadwell-noTSX-IBRS</model>
-      <model usable='yes'>Broadwell-noTSX</model>
-      <model usable='yes'>Broadwell-IBRS</model>
-      <model usable='yes'>Broadwell</model>
-      <model usable='yes'>486</model>
+      <model usable='yes' vendor='unknown'>qemu64</model>
+      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='no' vendor='unknown'>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='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='unknown'>486</model>
     </mode>
   </cpu>
   <memoryBacking supported='yes'>
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 4e0cb08b72..2909d1fd0a 100644
--- a/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml
@@ -75,58 +75,58 @@
       <feature policy='disable' name='misalignsse'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes'>qemu64</model>
-      <model usable='yes'>qemu32</model>
-      <model usable='no'>phenom</model>
-      <model usable='yes'>pentium3</model>
-      <model usable='yes'>pentium2</model>
-      <model usable='yes'>pentium</model>
-      <model usable='yes'>n270</model>
-      <model usable='yes'>kvm64</model>
-      <model usable='yes'>kvm32</model>
-      <model usable='yes'>coreduo</model>
-      <model usable='yes'>core2duo</model>
-      <model usable='yes'>athlon</model>
-      <model usable='no'>Westmere-IBRS</model>
-      <model usable='no'>Westmere</model>
-      <model usable='no'>Snowridge</model>
-      <model usable='no'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no'>Skylake-Server-IBRS</model>
-      <model usable='no'>Skylake-Server</model>
-      <model usable='no'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no'>Skylake-Client-IBRS</model>
-      <model usable='no'>Skylake-Client</model>
-      <model usable='no'>SandyBridge-IBRS</model>
-      <model usable='no'>SandyBridge</model>
-      <model usable='yes'>Penryn</model>
-      <model usable='no'>Opteron_G5</model>
-      <model usable='no'>Opteron_G4</model>
-      <model usable='no'>Opteron_G3</model>
-      <model usable='yes'>Opteron_G2</model>
-      <model usable='yes'>Opteron_G1</model>
-      <model usable='no'>Nehalem-IBRS</model>
-      <model usable='no'>Nehalem</model>
-      <model usable='no'>IvyBridge-IBRS</model>
-      <model usable='no'>IvyBridge</model>
-      <model usable='no'>Icelake-Server-noTSX</model>
-      <model usable='no'>Icelake-Server</model>
-      <model usable='no'>Icelake-Client-noTSX</model>
-      <model usable='no'>Icelake-Client</model>
-      <model usable='no'>Haswell-noTSX-IBRS</model>
-      <model usable='no'>Haswell-noTSX</model>
-      <model usable='no'>Haswell-IBRS</model>
-      <model usable='no'>Haswell</model>
-      <model usable='no'>EPYC-IBPB</model>
-      <model usable='no'>EPYC</model>
-      <model usable='no'>Dhyana</model>
-      <model usable='yes'>Conroe</model>
-      <model usable='no'>Cascadelake-Server-noTSX</model>
-      <model usable='no'>Cascadelake-Server</model>
-      <model usable='no'>Broadwell-noTSX-IBRS</model>
-      <model usable='no'>Broadwell-noTSX</model>
-      <model usable='no'>Broadwell-IBRS</model>
-      <model usable='no'>Broadwell</model>
-      <model usable='yes'>486</model>
+      <model usable='yes' vendor='unknown'>qemu64</model>
+      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='no' vendor='unknown'>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='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='unknown'>486</model>
     </mode>
   </cpu>
   <memoryBacking supported='yes'>
diff --git a/tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml
index 05d606967b..51581c1816 100644
--- a/tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml
@@ -40,42 +40,42 @@
     </mode>
     <mode name='host-model' supported='no'/>
     <mode name='custom' supported='yes'>
-      <model usable='unknown'>pxa262</model>
-      <model usable='unknown'>pxa270-a0</model>
-      <model usable='unknown'>arm1136</model>
-      <model usable='unknown'>cortex-a15</model>
-      <model usable='unknown'>pxa260</model>
-      <model usable='unknown'>arm1136-r2</model>
-      <model usable='unknown'>pxa261</model>
-      <model usable='unknown'>pxa255</model>
-      <model usable='unknown'>cortex-a72</model>
-      <model usable='unknown'>cortex-m33</model>
-      <model usable='unknown'>arm926</model>
-      <model usable='unknown'>cortex-r5f</model>
-      <model usable='unknown'>arm11mpcore</model>
-      <model usable='unknown'>pxa250</model>
-      <model usable='unknown'>ti925t</model>
-      <model usable='unknown'>cortex-a57</model>
-      <model usable='unknown'>sa1110</model>
-      <model usable='unknown'>arm1176</model>
-      <model usable='unknown'>cortex-a53</model>
-      <model usable='unknown'>sa1100</model>
-      <model usable='unknown'>pxa270-c5</model>
-      <model usable='unknown'>cortex-a9</model>
-      <model usable='unknown'>cortex-a8</model>
-      <model usable='unknown'>cortex-a7</model>
-      <model usable='unknown'>pxa270-c0</model>
-      <model usable='unknown'>arm1026</model>
-      <model usable='unknown'>pxa270-b1</model>
-      <model usable='unknown'>cortex-m3</model>
-      <model usable='unknown'>max</model>
-      <model usable='unknown'>cortex-m4</model>
-      <model usable='unknown'>pxa270-b0</model>
-      <model usable='unknown'>arm946</model>
-      <model usable='unknown'>cortex-m0</model>
-      <model usable='unknown'>cortex-r5</model>
-      <model usable='unknown'>pxa270-a1</model>
-      <model usable='unknown'>pxa270</model>
+      <model usable='unknown' vendor='unknown'>pxa262</model>
+      <model usable='unknown' vendor='unknown'>pxa270-a0</model>
+      <model usable='unknown' vendor='unknown'>arm1136</model>
+      <model usable='unknown' vendor='unknown'>cortex-a15</model>
+      <model usable='unknown' vendor='unknown'>pxa260</model>
+      <model usable='unknown' vendor='unknown'>arm1136-r2</model>
+      <model usable='unknown' vendor='unknown'>pxa261</model>
+      <model usable='unknown' vendor='unknown'>pxa255</model>
+      <model usable='unknown' vendor='unknown'>cortex-a72</model>
+      <model usable='unknown' vendor='unknown'>cortex-m33</model>
+      <model usable='unknown' vendor='unknown'>arm926</model>
+      <model usable='unknown' vendor='unknown'>cortex-r5f</model>
+      <model usable='unknown' vendor='unknown'>arm11mpcore</model>
+      <model usable='unknown' vendor='unknown'>pxa250</model>
+      <model usable='unknown' vendor='unknown'>ti925t</model>
+      <model usable='unknown' vendor='unknown'>cortex-a57</model>
+      <model usable='unknown' vendor='unknown'>sa1110</model>
+      <model usable='unknown' vendor='unknown'>arm1176</model>
+      <model usable='unknown' vendor='unknown'>cortex-a53</model>
+      <model usable='unknown' vendor='unknown'>sa1100</model>
+      <model usable='unknown' vendor='unknown'>pxa270-c5</model>
+      <model usable='unknown' vendor='unknown'>cortex-a9</model>
+      <model usable='unknown' vendor='unknown'>cortex-a8</model>
+      <model usable='unknown' vendor='unknown'>cortex-a7</model>
+      <model usable='unknown' vendor='unknown'>pxa270-c0</model>
+      <model usable='unknown' vendor='unknown'>arm1026</model>
+      <model usable='unknown' vendor='unknown'>pxa270-b1</model>
+      <model usable='unknown' vendor='unknown'>cortex-m3</model>
+      <model usable='unknown' vendor='unknown'>max</model>
+      <model usable='unknown' vendor='unknown'>cortex-m4</model>
+      <model usable='unknown' vendor='unknown'>pxa270-b0</model>
+      <model usable='unknown' vendor='unknown'>arm946</model>
+      <model usable='unknown' vendor='unknown'>cortex-m0</model>
+      <model usable='unknown' vendor='unknown'>cortex-r5</model>
+      <model usable='unknown' vendor='unknown'>pxa270-a1</model>
+      <model usable='unknown' vendor='unknown'>pxa270</model>
     </mode>
   </cpu>
   <memoryBacking supported='yes'>
diff --git a/tests/domaincapsdata/qemu_4.2.0.aarch64.xml b/tests/domaincapsdata/qemu_4.2.0.aarch64.xml
index f19ad5e6db..c993e0e7d1 100644
--- a/tests/domaincapsdata/qemu_4.2.0.aarch64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0.aarch64.xml
@@ -38,42 +38,42 @@
     </mode>
     <mode name='host-model' supported='no'/>
     <mode name='custom' supported='yes'>
-      <model usable='unknown'>pxa262</model>
-      <model usable='unknown'>pxa270-a0</model>
-      <model usable='unknown'>arm1136</model>
-      <model usable='unknown'>cortex-a15</model>
-      <model usable='unknown'>pxa260</model>
-      <model usable='unknown'>arm1136-r2</model>
-      <model usable='unknown'>pxa261</model>
-      <model usable='unknown'>pxa255</model>
-      <model usable='unknown'>cortex-a72</model>
-      <model usable='unknown'>cortex-m33</model>
-      <model usable='unknown'>arm926</model>
-      <model usable='unknown'>cortex-r5f</model>
-      <model usable='unknown'>arm11mpcore</model>
-      <model usable='unknown'>pxa250</model>
-      <model usable='unknown'>ti925t</model>
-      <model usable='unknown'>cortex-a57</model>
-      <model usable='unknown'>sa1110</model>
-      <model usable='unknown'>arm1176</model>
-      <model usable='unknown'>cortex-a53</model>
-      <model usable='unknown'>sa1100</model>
-      <model usable='unknown'>pxa270-c5</model>
-      <model usable='unknown'>cortex-a9</model>
-      <model usable='unknown'>cortex-a8</model>
-      <model usable='unknown'>cortex-a7</model>
-      <model usable='unknown'>pxa270-c0</model>
-      <model usable='unknown'>arm1026</model>
-      <model usable='unknown'>pxa270-b1</model>
-      <model usable='unknown'>cortex-m3</model>
-      <model usable='unknown'>max</model>
-      <model usable='unknown'>cortex-m4</model>
-      <model usable='unknown'>pxa270-b0</model>
-      <model usable='unknown'>arm946</model>
-      <model usable='unknown'>cortex-m0</model>
-      <model usable='unknown'>cortex-r5</model>
-      <model usable='unknown'>pxa270-a1</model>
-      <model usable='unknown'>pxa270</model>
+      <model usable='unknown' vendor='unknown'>pxa262</model>
+      <model usable='unknown' vendor='unknown'>pxa270-a0</model>
+      <model usable='unknown' vendor='unknown'>arm1136</model>
+      <model usable='unknown' vendor='unknown'>cortex-a15</model>
+      <model usable='unknown' vendor='unknown'>pxa260</model>
+      <model usable='unknown' vendor='unknown'>arm1136-r2</model>
+      <model usable='unknown' vendor='unknown'>pxa261</model>
+      <model usable='unknown' vendor='unknown'>pxa255</model>
+      <model usable='unknown' vendor='unknown'>cortex-a72</model>
+      <model usable='unknown' vendor='unknown'>cortex-m33</model>
+      <model usable='unknown' vendor='unknown'>arm926</model>
+      <model usable='unknown' vendor='unknown'>cortex-r5f</model>
+      <model usable='unknown' vendor='unknown'>arm11mpcore</model>
+      <model usable='unknown' vendor='unknown'>pxa250</model>
+      <model usable='unknown' vendor='unknown'>ti925t</model>
+      <model usable='unknown' vendor='unknown'>cortex-a57</model>
+      <model usable='unknown' vendor='unknown'>sa1110</model>
+      <model usable='unknown' vendor='unknown'>arm1176</model>
+      <model usable='unknown' vendor='unknown'>cortex-a53</model>
+      <model usable='unknown' vendor='unknown'>sa1100</model>
+      <model usable='unknown' vendor='unknown'>pxa270-c5</model>
+      <model usable='unknown' vendor='unknown'>cortex-a9</model>
+      <model usable='unknown' vendor='unknown'>cortex-a8</model>
+      <model usable='unknown' vendor='unknown'>cortex-a7</model>
+      <model usable='unknown' vendor='unknown'>pxa270-c0</model>
+      <model usable='unknown' vendor='unknown'>arm1026</model>
+      <model usable='unknown' vendor='unknown'>pxa270-b1</model>
+      <model usable='unknown' vendor='unknown'>cortex-m3</model>
+      <model usable='unknown' vendor='unknown'>max</model>
+      <model usable='unknown' vendor='unknown'>cortex-m4</model>
+      <model usable='unknown' vendor='unknown'>pxa270-b0</model>
+      <model usable='unknown' vendor='unknown'>arm946</model>
+      <model usable='unknown' vendor='unknown'>cortex-m0</model>
+      <model usable='unknown' vendor='unknown'>cortex-r5</model>
+      <model usable='unknown' vendor='unknown'>pxa270-a1</model>
+      <model usable='unknown' vendor='unknown'>pxa270</model>
     </mode>
   </cpu>
   <memoryBacking supported='yes'>
diff --git a/tests/domaincapsdata/qemu_4.2.0.ppc64.xml b/tests/domaincapsdata/qemu_4.2.0.ppc64.xml
index 8ea7ad5714..6d09c5ae4e 100644
--- a/tests/domaincapsdata/qemu_4.2.0.ppc64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0.ppc64.xml
@@ -40,9 +40,9 @@
       <model fallback='allow'>POWER8</model>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='unknown'>POWER9</model>
-      <model usable='unknown'>POWER8</model>
-      <model usable='unknown'>POWER7</model>
+      <model usable='unknown' vendor='unknown'>POWER9</model>
+      <model usable='unknown' vendor='unknown'>POWER8</model>
+      <model usable='unknown' vendor='unknown'>POWER7</model>
     </mode>
   </cpu>
   <memoryBacking supported='yes'>
diff --git a/tests/domaincapsdata/qemu_4.2.0.s390x.xml b/tests/domaincapsdata/qemu_4.2.0.s390x.xml
index fb162ea578..3187e637d3 100644
--- a/tests/domaincapsdata/qemu_4.2.0.s390x.xml
+++ b/tests/domaincapsdata/qemu_4.2.0.s390x.xml
@@ -83,80 +83,80 @@
       <feature policy='require' name='cmm'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes'>z800-base</model>
-      <model usable='yes'>z890.2-base</model>
-      <model usable='yes'>z9EC.2</model>
-      <model usable='yes'>z13.2</model>
-      <model usable='yes'>z9BC-base</model>
-      <model usable='yes'>z990.5-base</model>
-      <model usable='yes'>z890.2</model>
-      <model usable='yes'>z890</model>
-      <model usable='yes'>z9BC</model>
-      <model usable='yes'>z13</model>
-      <model usable='yes'>z196</model>
-      <model usable='yes'>z13s</model>
-      <model usable='yes'>z990.3</model>
-      <model usable='yes'>z13s-base</model>
-      <model usable='yes'>z9EC</model>
-      <model usable='yes'>gen15a</model>
-      <model usable='yes'>z14ZR1-base</model>
-      <model usable='yes'>z14.2-base</model>
-      <model usable='yes'>z900.3-base</model>
-      <model usable='yes'>z13.2-base</model>
-      <model usable='yes'>z196.2-base</model>
-      <model usable='yes'>zBC12-base</model>
-      <model usable='yes'>z9BC.2-base</model>
-      <model usable='yes'>z900.2-base</model>
-      <model usable='yes'>z9EC.3</model>
-      <model usable='yes'>zEC12</model>
-      <model usable='yes'>z900</model>
-      <model usable='yes'>z114-base</model>
-      <model usable='yes'>zEC12-base</model>
-      <model usable='yes'>z10EC.2</model>
-      <model usable='yes'>z10EC-base</model>
-      <model usable='yes'>z900.3</model>
-      <model usable='yes'>z14ZR1</model>
-      <model usable='yes'>z10BC</model>
-      <model usable='yes'>z10BC.2-base</model>
-      <model usable='yes'>z990.2</model>
-      <model usable='yes'>z9BC.2</model>
-      <model usable='yes'>z990</model>
-      <model usable='yes'>z14</model>
-      <model usable='yes'>gen15b-base</model>
-      <model usable='yes'>z990.4</model>
-      <model usable='yes'>max</model>
-      <model usable='yes'>z10EC.2-base</model>
-      <model usable='yes'>gen15a-base</model>
-      <model usable='yes'>z800</model>
-      <model usable='yes'>zEC12.2</model>
-      <model usable='yes'>z10EC</model>
-      <model usable='yes'>z990.2-base</model>
-      <model usable='yes'>z900-base</model>
-      <model usable='yes'>z10BC.2</model>
-      <model usable='yes'>z9EC-base</model>
-      <model usable='yes'>z9EC.3-base</model>
-      <model usable='yes'>z114</model>
-      <model usable='yes'>z890.3</model>
-      <model usable='yes'>z196-base</model>
-      <model usable='yes'>z9EC.2-base</model>
-      <model usable='yes'>z196.2</model>
-      <model usable='yes'>z14.2</model>
-      <model usable='yes'>z990-base</model>
-      <model usable='yes'>z900.2</model>
-      <model usable='yes'>z890-base</model>
-      <model usable='yes'>z10EC.3</model>
-      <model usable='yes'>z14-base</model>
-      <model usable='yes'>z990.4-base</model>
-      <model usable='yes'>z10EC.3-base</model>
-      <model usable='yes'>z10BC-base</model>
-      <model usable='yes'>z13-base</model>
-      <model usable='yes'>z990.3-base</model>
-      <model usable='yes'>zEC12.2-base</model>
-      <model usable='yes'>zBC12</model>
-      <model usable='yes'>z890.3-base</model>
-      <model usable='yes'>z990.5</model>
-      <model usable='yes'>gen15b</model>
-      <model usable='no'>qemu</model>
+      <model usable='yes' vendor='unknown'>z800-base</model>
+      <model usable='yes' vendor='unknown'>z890.2-base</model>
+      <model usable='yes' vendor='unknown'>z9EC.2</model>
+      <model usable='yes' vendor='unknown'>z13.2</model>
+      <model usable='yes' vendor='unknown'>z9BC-base</model>
+      <model usable='yes' vendor='unknown'>z990.5-base</model>
+      <model usable='yes' vendor='unknown'>z890.2</model>
+      <model usable='yes' vendor='unknown'>z890</model>
+      <model usable='yes' vendor='unknown'>z9BC</model>
+      <model usable='yes' vendor='unknown'>z13</model>
+      <model usable='yes' vendor='unknown'>z196</model>
+      <model usable='yes' vendor='unknown'>z13s</model>
+      <model usable='yes' vendor='unknown'>z990.3</model>
+      <model usable='yes' vendor='unknown'>z13s-base</model>
+      <model usable='yes' vendor='unknown'>z9EC</model>
+      <model usable='yes' vendor='unknown'>gen15a</model>
+      <model usable='yes' vendor='unknown'>z14ZR1-base</model>
+      <model usable='yes' vendor='unknown'>z14.2-base</model>
+      <model usable='yes' vendor='unknown'>z900.3-base</model>
+      <model usable='yes' vendor='unknown'>z13.2-base</model>
+      <model usable='yes' vendor='unknown'>z196.2-base</model>
+      <model usable='yes' vendor='unknown'>zBC12-base</model>
+      <model usable='yes' vendor='unknown'>z9BC.2-base</model>
+      <model usable='yes' vendor='unknown'>z900.2-base</model>
+      <model usable='yes' vendor='unknown'>z9EC.3</model>
+      <model usable='yes' vendor='unknown'>zEC12</model>
+      <model usable='yes' vendor='unknown'>z900</model>
+      <model usable='yes' vendor='unknown'>z114-base</model>
+      <model usable='yes' vendor='unknown'>zEC12-base</model>
+      <model usable='yes' vendor='unknown'>z10EC.2</model>
+      <model usable='yes' vendor='unknown'>z10EC-base</model>
+      <model usable='yes' vendor='unknown'>z900.3</model>
+      <model usable='yes' vendor='unknown'>z14ZR1</model>
+      <model usable='yes' vendor='unknown'>z10BC</model>
+      <model usable='yes' vendor='unknown'>z10BC.2-base</model>
+      <model usable='yes' vendor='unknown'>z990.2</model>
+      <model usable='yes' vendor='unknown'>z9BC.2</model>
+      <model usable='yes' vendor='unknown'>z990</model>
+      <model usable='yes' vendor='unknown'>z14</model>
+      <model usable='yes' vendor='unknown'>gen15b-base</model>
+      <model usable='yes' vendor='unknown'>z990.4</model>
+      <model usable='yes' vendor='unknown'>max</model>
+      <model usable='yes' vendor='unknown'>z10EC.2-base</model>
+      <model usable='yes' vendor='unknown'>gen15a-base</model>
+      <model usable='yes' vendor='unknown'>z800</model>
+      <model usable='yes' vendor='unknown'>zEC12.2</model>
+      <model usable='yes' vendor='unknown'>z10EC</model>
+      <model usable='yes' vendor='unknown'>z990.2-base</model>
+      <model usable='yes' vendor='unknown'>z900-base</model>
+      <model usable='yes' vendor='unknown'>z10BC.2</model>
+      <model usable='yes' vendor='unknown'>z9EC-base</model>
+      <model usable='yes' vendor='unknown'>z9EC.3-base</model>
+      <model usable='yes' vendor='unknown'>z114</model>
+      <model usable='yes' vendor='unknown'>z890.3</model>
+      <model usable='yes' vendor='unknown'>z196-base</model>
+      <model usable='yes' vendor='unknown'>z9EC.2-base</model>
+      <model usable='yes' vendor='unknown'>z196.2</model>
+      <model usable='yes' vendor='unknown'>z14.2</model>
+      <model usable='yes' vendor='unknown'>z990-base</model>
+      <model usable='yes' vendor='unknown'>z900.2</model>
+      <model usable='yes' vendor='unknown'>z890-base</model>
+      <model usable='yes' vendor='unknown'>z10EC.3</model>
+      <model usable='yes' vendor='unknown'>z14-base</model>
+      <model usable='yes' vendor='unknown'>z990.4-base</model>
+      <model usable='yes' vendor='unknown'>z10EC.3-base</model>
+      <model usable='yes' vendor='unknown'>z10BC-base</model>
+      <model usable='yes' vendor='unknown'>z13-base</model>
+      <model usable='yes' vendor='unknown'>z990.3-base</model>
+      <model usable='yes' vendor='unknown'>zEC12.2-base</model>
+      <model usable='yes' vendor='unknown'>zBC12</model>
+      <model usable='yes' vendor='unknown'>z890.3-base</model>
+      <model usable='yes' vendor='unknown'>z990.5</model>
+      <model usable='yes' vendor='unknown'>gen15b</model>
+      <model usable='no' vendor='unknown'>qemu</model>
     </mode>
   </cpu>
   <memoryBacking supported='yes'>
diff --git a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
index d8793bb38a..272d36d61b 100644
--- a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
@@ -60,58 +60,58 @@
       <feature policy='require' name='pschange-mc-no'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes'>qemu64</model>
-      <model usable='yes'>qemu32</model>
-      <model usable='no'>phenom</model>
-      <model usable='yes'>pentium3</model>
-      <model usable='yes'>pentium2</model>
-      <model usable='yes'>pentium</model>
-      <model usable='yes'>n270</model>
-      <model usable='yes'>kvm64</model>
-      <model usable='yes'>kvm32</model>
-      <model usable='yes'>coreduo</model>
-      <model usable='yes'>core2duo</model>
-      <model usable='no'>athlon</model>
-      <model usable='yes'>Westmere-IBRS</model>
-      <model usable='yes'>Westmere</model>
-      <model usable='no'>Snowridge</model>
-      <model usable='no'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no'>Skylake-Server-IBRS</model>
-      <model usable='no'>Skylake-Server</model>
-      <model usable='yes'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='yes'>Skylake-Client-IBRS</model>
-      <model usable='yes'>Skylake-Client</model>
-      <model usable='yes'>SandyBridge-IBRS</model>
-      <model usable='yes'>SandyBridge</model>
-      <model usable='yes'>Penryn</model>
-      <model usable='no'>Opteron_G5</model>
-      <model usable='no'>Opteron_G4</model>
-      <model usable='no'>Opteron_G3</model>
-      <model usable='yes'>Opteron_G2</model>
-      <model usable='yes'>Opteron_G1</model>
-      <model usable='yes'>Nehalem-IBRS</model>
-      <model usable='yes'>Nehalem</model>
-      <model usable='yes'>IvyBridge-IBRS</model>
-      <model usable='yes'>IvyBridge</model>
-      <model usable='no'>Icelake-Server-noTSX</model>
-      <model usable='no'>Icelake-Server</model>
-      <model usable='no'>Icelake-Client-noTSX</model>
-      <model usable='no'>Icelake-Client</model>
-      <model usable='yes'>Haswell-noTSX-IBRS</model>
-      <model usable='yes'>Haswell-noTSX</model>
-      <model usable='yes'>Haswell-IBRS</model>
-      <model usable='yes'>Haswell</model>
-      <model usable='no'>EPYC-IBPB</model>
-      <model usable='no'>EPYC</model>
-      <model usable='no'>Dhyana</model>
-      <model usable='yes'>Conroe</model>
-      <model usable='no'>Cascadelake-Server-noTSX</model>
-      <model usable='no'>Cascadelake-Server</model>
-      <model usable='yes'>Broadwell-noTSX-IBRS</model>
-      <model usable='yes'>Broadwell-noTSX</model>
-      <model usable='yes'>Broadwell-IBRS</model>
-      <model usable='yes'>Broadwell</model>
-      <model usable='yes'>486</model>
+      <model usable='yes' vendor='unknown'>qemu64</model>
+      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='no' vendor='unknown'>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='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='unknown'>486</model>
     </mode>
   </cpu>
   <memoryBacking supported='yes'>
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 036e446c64..3e25bcb048 100644
--- a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
@@ -61,60 +61,60 @@
       <feature policy='require' name='pschange-mc-no'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes'>qemu64</model>
-      <model usable='yes'>qemu32</model>
-      <model usable='no'>phenom</model>
-      <model usable='yes'>pentium3</model>
-      <model usable='yes'>pentium2</model>
-      <model usable='yes'>pentium</model>
-      <model usable='yes'>n270</model>
-      <model usable='yes'>kvm64</model>
-      <model usable='yes'>kvm32</model>
-      <model usable='yes'>coreduo</model>
-      <model usable='yes'>core2duo</model>
-      <model usable='no'>athlon</model>
-      <model usable='yes'>Westmere-IBRS</model>
-      <model usable='yes'>Westmere</model>
-      <model usable='no'>Snowridge</model>
-      <model usable='no'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no'>Skylake-Server-IBRS</model>
-      <model usable='no'>Skylake-Server</model>
-      <model usable='yes'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='yes'>Skylake-Client-IBRS</model>
-      <model usable='yes'>Skylake-Client</model>
-      <model usable='yes'>SandyBridge-IBRS</model>
-      <model usable='yes'>SandyBridge</model>
-      <model usable='yes'>Penryn</model>
-      <model usable='no'>Opteron_G5</model>
-      <model usable='no'>Opteron_G4</model>
-      <model usable='no'>Opteron_G3</model>
-      <model usable='yes'>Opteron_G2</model>
-      <model usable='yes'>Opteron_G1</model>
-      <model usable='yes'>Nehalem-IBRS</model>
-      <model usable='yes'>Nehalem</model>
-      <model usable='yes'>IvyBridge-IBRS</model>
-      <model usable='yes'>IvyBridge</model>
-      <model usable='no'>Icelake-Server-noTSX</model>
-      <model usable='no'>Icelake-Server</model>
-      <model usable='no'>Icelake-Client-noTSX</model>
-      <model usable='no'>Icelake-Client</model>
-      <model usable='yes'>Haswell-noTSX-IBRS</model>
-      <model usable='yes'>Haswell-noTSX</model>
-      <model usable='yes'>Haswell-IBRS</model>
-      <model usable='yes'>Haswell</model>
-      <model usable='no'>EPYC-Rome</model>
-      <model usable='no'>EPYC-IBPB</model>
-      <model usable='no'>EPYC</model>
-      <model usable='no'>Dhyana</model>
-      <model usable='no'>Cooperlake</model>
-      <model usable='yes'>Conroe</model>
-      <model usable='no'>Cascadelake-Server-noTSX</model>
-      <model usable='no'>Cascadelake-Server</model>
-      <model usable='yes'>Broadwell-noTSX-IBRS</model>
-      <model usable='yes'>Broadwell-noTSX</model>
-      <model usable='yes'>Broadwell-IBRS</model>
-      <model usable='yes'>Broadwell</model>
-      <model usable='yes'>486</model>
+      <model usable='yes' vendor='unknown'>qemu64</model>
+      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='no' vendor='unknown'>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='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='unknown'>486</model>
     </mode>
   </cpu>
   <memoryBacking supported='yes'>
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 4df4e86cf1..b92d519be6 100644
--- a/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml
@@ -75,60 +75,60 @@
       <feature policy='disable' name='misalignsse'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes'>qemu64</model>
-      <model usable='yes'>qemu32</model>
-      <model usable='no'>phenom</model>
-      <model usable='yes'>pentium3</model>
-      <model usable='yes'>pentium2</model>
-      <model usable='yes'>pentium</model>
-      <model usable='yes'>n270</model>
-      <model usable='yes'>kvm64</model>
-      <model usable='yes'>kvm32</model>
-      <model usable='yes'>coreduo</model>
-      <model usable='yes'>core2duo</model>
-      <model usable='yes'>athlon</model>
-      <model usable='no'>Westmere-IBRS</model>
-      <model usable='yes'>Westmere</model>
-      <model usable='no'>Snowridge</model>
-      <model usable='no'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no'>Skylake-Server-IBRS</model>
-      <model usable='no'>Skylake-Server</model>
-      <model usable='no'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no'>Skylake-Client-IBRS</model>
-      <model usable='no'>Skylake-Client</model>
-      <model usable='no'>SandyBridge-IBRS</model>
-      <model usable='no'>SandyBridge</model>
-      <model usable='yes'>Penryn</model>
-      <model usable='no'>Opteron_G5</model>
-      <model usable='no'>Opteron_G4</model>
-      <model usable='no'>Opteron_G3</model>
-      <model usable='yes'>Opteron_G2</model>
-      <model usable='yes'>Opteron_G1</model>
-      <model usable='no'>Nehalem-IBRS</model>
-      <model usable='yes'>Nehalem</model>
-      <model usable='no'>IvyBridge-IBRS</model>
-      <model usable='no'>IvyBridge</model>
-      <model usable='no'>Icelake-Server-noTSX</model>
-      <model usable='no'>Icelake-Server</model>
-      <model usable='no'>Icelake-Client-noTSX</model>
-      <model usable='no'>Icelake-Client</model>
-      <model usable='no'>Haswell-noTSX-IBRS</model>
-      <model usable='no'>Haswell-noTSX</model>
-      <model usable='no'>Haswell-IBRS</model>
-      <model usable='no'>Haswell</model>
-      <model usable='no'>EPYC-Rome</model>
-      <model usable='no'>EPYC-IBPB</model>
-      <model usable='no'>EPYC</model>
-      <model usable='no'>Dhyana</model>
-      <model usable='no'>Cooperlake</model>
-      <model usable='yes'>Conroe</model>
-      <model usable='no'>Cascadelake-Server-noTSX</model>
-      <model usable='no'>Cascadelake-Server</model>
-      <model usable='no'>Broadwell-noTSX-IBRS</model>
-      <model usable='no'>Broadwell-noTSX</model>
-      <model usable='no'>Broadwell-IBRS</model>
-      <model usable='no'>Broadwell</model>
-      <model usable='yes'>486</model>
+      <model usable='yes' vendor='unknown'>qemu64</model>
+      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='no' vendor='unknown'>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='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='unknown'>486</model>
     </mode>
   </cpu>
   <memoryBacking supported='yes'>
diff --git a/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml
index bb8500baa6..8fe15c0bcb 100644
--- a/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml
@@ -40,43 +40,43 @@
     </mode>
     <mode name='host-model' supported='no'/>
     <mode name='custom' supported='yes'>
-      <model usable='unknown'>cortex-a9</model>
-      <model usable='unknown'>pxa250</model>
-      <model usable='unknown'>pxa270-a1</model>
-      <model usable='unknown'>arm946</model>
-      <model usable='unknown'>pxa270-c0</model>
-      <model usable='unknown'>max</model>
-      <model usable='unknown'>arm1026</model>
-      <model usable='unknown'>pxa260</model>
-      <model usable='unknown'>pxa270-b1</model>
-      <model usable='unknown'>cortex-a57</model>
-      <model usable='unknown'>pxa255</model>
-      <model usable='unknown'>cortex-r5</model>
-      <model usable='unknown'>arm1136</model>
-      <model usable='unknown'>cortex-a7</model>
-      <model usable='unknown'>pxa261</model>
-      <model usable='unknown'>pxa270-c5</model>
-      <model usable='unknown'>cortex-m3</model>
-      <model usable='unknown'>arm1176</model>
-      <model usable='unknown'>sa1100</model>
-      <model usable='unknown'>cortex-a53</model>
-      <model usable='unknown'>ti925t</model>
-      <model usable='unknown'>cortex-m33</model>
-      <model usable='unknown'>cortex-a8</model>
-      <model usable='unknown'>arm926</model>
-      <model usable='unknown'>cortex-a72</model>
-      <model usable='unknown'>pxa270</model>
-      <model usable='unknown'>pxa270-a0</model>
-      <model usable='unknown'>cortex-m4</model>
-      <model usable='unknown'>cortex-m7</model>
-      <model usable='unknown'>cortex-a15</model>
-      <model usable='unknown'>arm11mpcore</model>
-      <model usable='unknown'>cortex-r5f</model>
-      <model usable='unknown'>cortex-m0</model>
-      <model usable='unknown'>sa1110</model>
-      <model usable='unknown'>arm1136-r2</model>
-      <model usable='unknown'>pxa270-b0</model>
-      <model usable='unknown'>pxa262</model>
+      <model usable='unknown' vendor='unknown'>cortex-a9</model>
+      <model usable='unknown' vendor='unknown'>pxa250</model>
+      <model usable='unknown' vendor='unknown'>pxa270-a1</model>
+      <model usable='unknown' vendor='unknown'>arm946</model>
+      <model usable='unknown' vendor='unknown'>pxa270-c0</model>
+      <model usable='unknown' vendor='unknown'>max</model>
+      <model usable='unknown' vendor='unknown'>arm1026</model>
+      <model usable='unknown' vendor='unknown'>pxa260</model>
+      <model usable='unknown' vendor='unknown'>pxa270-b1</model>
+      <model usable='unknown' vendor='unknown'>cortex-a57</model>
+      <model usable='unknown' vendor='unknown'>pxa255</model>
+      <model usable='unknown' vendor='unknown'>cortex-r5</model>
+      <model usable='unknown' vendor='unknown'>arm1136</model>
+      <model usable='unknown' vendor='unknown'>cortex-a7</model>
+      <model usable='unknown' vendor='unknown'>pxa261</model>
+      <model usable='unknown' vendor='unknown'>pxa270-c5</model>
+      <model usable='unknown' vendor='unknown'>cortex-m3</model>
+      <model usable='unknown' vendor='unknown'>arm1176</model>
+      <model usable='unknown' vendor='unknown'>sa1100</model>
+      <model usable='unknown' vendor='unknown'>cortex-a53</model>
+      <model usable='unknown' vendor='unknown'>ti925t</model>
+      <model usable='unknown' vendor='unknown'>cortex-m33</model>
+      <model usable='unknown' vendor='unknown'>cortex-a8</model>
+      <model usable='unknown' vendor='unknown'>arm926</model>
+      <model usable='unknown' vendor='unknown'>cortex-a72</model>
+      <model usable='unknown' vendor='unknown'>pxa270</model>
+      <model usable='unknown' vendor='unknown'>pxa270-a0</model>
+      <model usable='unknown' vendor='unknown'>cortex-m4</model>
+      <model usable='unknown' vendor='unknown'>cortex-m7</model>
+      <model usable='unknown' vendor='unknown'>cortex-a15</model>
+      <model usable='unknown' vendor='unknown'>arm11mpcore</model>
+      <model usable='unknown' vendor='unknown'>cortex-r5f</model>
+      <model usable='unknown' vendor='unknown'>cortex-m0</model>
+      <model usable='unknown' vendor='unknown'>sa1110</model>
+      <model usable='unknown' vendor='unknown'>arm1136-r2</model>
+      <model usable='unknown' vendor='unknown'>pxa270-b0</model>
+      <model usable='unknown' vendor='unknown'>pxa262</model>
     </mode>
   </cpu>
   <memoryBacking supported='yes'>
diff --git a/tests/domaincapsdata/qemu_5.0.0.aarch64.xml b/tests/domaincapsdata/qemu_5.0.0.aarch64.xml
index e7227d092f..49380bd218 100644
--- a/tests/domaincapsdata/qemu_5.0.0.aarch64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0.aarch64.xml
@@ -38,43 +38,43 @@
     </mode>
     <mode name='host-model' supported='no'/>
     <mode name='custom' supported='yes'>
-      <model usable='unknown'>cortex-a9</model>
-      <model usable='unknown'>pxa250</model>
-      <model usable='unknown'>pxa270-a1</model>
-      <model usable='unknown'>arm946</model>
-      <model usable='unknown'>pxa270-c0</model>
-      <model usable='unknown'>max</model>
-      <model usable='unknown'>arm1026</model>
-      <model usable='unknown'>pxa260</model>
-      <model usable='unknown'>pxa270-b1</model>
-      <model usable='unknown'>cortex-a57</model>
-      <model usable='unknown'>pxa255</model>
-      <model usable='unknown'>cortex-r5</model>
-      <model usable='unknown'>arm1136</model>
-      <model usable='unknown'>cortex-a7</model>
-      <model usable='unknown'>pxa261</model>
-      <model usable='unknown'>pxa270-c5</model>
-      <model usable='unknown'>cortex-m3</model>
-      <model usable='unknown'>arm1176</model>
-      <model usable='unknown'>sa1100</model>
-      <model usable='unknown'>cortex-a53</model>
-      <model usable='unknown'>ti925t</model>
-      <model usable='unknown'>cortex-m33</model>
-      <model usable='unknown'>cortex-a8</model>
-      <model usable='unknown'>arm926</model>
-      <model usable='unknown'>cortex-a72</model>
-      <model usable='unknown'>pxa270</model>
-      <model usable='unknown'>pxa270-a0</model>
-      <model usable='unknown'>cortex-m4</model>
-      <model usable='unknown'>cortex-m7</model>
-      <model usable='unknown'>cortex-a15</model>
-      <model usable='unknown'>arm11mpcore</model>
-      <model usable='unknown'>cortex-r5f</model>
-      <model usable='unknown'>cortex-m0</model>
-      <model usable='unknown'>sa1110</model>
-      <model usable='unknown'>arm1136-r2</model>
-      <model usable='unknown'>pxa270-b0</model>
-      <model usable='unknown'>pxa262</model>
+      <model usable='unknown' vendor='unknown'>cortex-a9</model>
+      <model usable='unknown' vendor='unknown'>pxa250</model>
+      <model usable='unknown' vendor='unknown'>pxa270-a1</model>
+      <model usable='unknown' vendor='unknown'>arm946</model>
+      <model usable='unknown' vendor='unknown'>pxa270-c0</model>
+      <model usable='unknown' vendor='unknown'>max</model>
+      <model usable='unknown' vendor='unknown'>arm1026</model>
+      <model usable='unknown' vendor='unknown'>pxa260</model>
+      <model usable='unknown' vendor='unknown'>pxa270-b1</model>
+      <model usable='unknown' vendor='unknown'>cortex-a57</model>
+      <model usable='unknown' vendor='unknown'>pxa255</model>
+      <model usable='unknown' vendor='unknown'>cortex-r5</model>
+      <model usable='unknown' vendor='unknown'>arm1136</model>
+      <model usable='unknown' vendor='unknown'>cortex-a7</model>
+      <model usable='unknown' vendor='unknown'>pxa261</model>
+      <model usable='unknown' vendor='unknown'>pxa270-c5</model>
+      <model usable='unknown' vendor='unknown'>cortex-m3</model>
+      <model usable='unknown' vendor='unknown'>arm1176</model>
+      <model usable='unknown' vendor='unknown'>sa1100</model>
+      <model usable='unknown' vendor='unknown'>cortex-a53</model>
+      <model usable='unknown' vendor='unknown'>ti925t</model>
+      <model usable='unknown' vendor='unknown'>cortex-m33</model>
+      <model usable='unknown' vendor='unknown'>cortex-a8</model>
+      <model usable='unknown' vendor='unknown'>arm926</model>
+      <model usable='unknown' vendor='unknown'>cortex-a72</model>
+      <model usable='unknown' vendor='unknown'>pxa270</model>
+      <model usable='unknown' vendor='unknown'>pxa270-a0</model>
+      <model usable='unknown' vendor='unknown'>cortex-m4</model>
+      <model usable='unknown' vendor='unknown'>cortex-m7</model>
+      <model usable='unknown' vendor='unknown'>cortex-a15</model>
+      <model usable='unknown' vendor='unknown'>arm11mpcore</model>
+      <model usable='unknown' vendor='unknown'>cortex-r5f</model>
+      <model usable='unknown' vendor='unknown'>cortex-m0</model>
+      <model usable='unknown' vendor='unknown'>sa1110</model>
+      <model usable='unknown' vendor='unknown'>arm1136-r2</model>
+      <model usable='unknown' vendor='unknown'>pxa270-b0</model>
+      <model usable='unknown' vendor='unknown'>pxa262</model>
     </mode>
   </cpu>
   <memoryBacking supported='yes'>
diff --git a/tests/domaincapsdata/qemu_5.0.0.ppc64.xml b/tests/domaincapsdata/qemu_5.0.0.ppc64.xml
index cac329fd08..032a4f4e19 100644
--- a/tests/domaincapsdata/qemu_5.0.0.ppc64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0.ppc64.xml
@@ -40,10 +40,10 @@
       <model fallback='allow'>POWER8</model>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='unknown'>POWER10</model>
-      <model usable='unknown'>POWER9</model>
-      <model usable='unknown'>POWER8</model>
-      <model usable='unknown'>POWER7</model>
+      <model usable='unknown' vendor='unknown'>POWER10</model>
+      <model usable='unknown' vendor='unknown'>POWER9</model>
+      <model usable='unknown' vendor='unknown'>POWER8</model>
+      <model usable='unknown' vendor='unknown'>POWER7</model>
     </mode>
   </cpu>
   <memoryBacking supported='yes'>
diff --git a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
index e901d12918..ecbd13fb19 100644
--- a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
@@ -60,60 +60,60 @@
       <feature policy='require' name='pschange-mc-no'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes'>qemu64</model>
-      <model usable='yes'>qemu32</model>
-      <model usable='no'>phenom</model>
-      <model usable='yes'>pentium3</model>
-      <model usable='yes'>pentium2</model>
-      <model usable='yes'>pentium</model>
-      <model usable='yes'>n270</model>
-      <model usable='yes'>kvm64</model>
-      <model usable='yes'>kvm32</model>
-      <model usable='yes'>coreduo</model>
-      <model usable='yes'>core2duo</model>
-      <model usable='no'>athlon</model>
-      <model usable='yes'>Westmere-IBRS</model>
-      <model usable='yes'>Westmere</model>
-      <model usable='no'>Snowridge</model>
-      <model usable='no'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no'>Skylake-Server-IBRS</model>
-      <model usable='no'>Skylake-Server</model>
-      <model usable='yes'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='yes'>Skylake-Client-IBRS</model>
-      <model usable='yes'>Skylake-Client</model>
-      <model usable='yes'>SandyBridge-IBRS</model>
-      <model usable='yes'>SandyBridge</model>
-      <model usable='yes'>Penryn</model>
-      <model usable='no'>Opteron_G5</model>
-      <model usable='no'>Opteron_G4</model>
-      <model usable='no'>Opteron_G3</model>
-      <model usable='yes'>Opteron_G2</model>
-      <model usable='yes'>Opteron_G1</model>
-      <model usable='yes'>Nehalem-IBRS</model>
-      <model usable='yes'>Nehalem</model>
-      <model usable='yes'>IvyBridge-IBRS</model>
-      <model usable='yes'>IvyBridge</model>
-      <model usable='no'>Icelake-Server-noTSX</model>
-      <model usable='no'>Icelake-Server</model>
-      <model usable='no'>Icelake-Client-noTSX</model>
-      <model usable='no'>Icelake-Client</model>
-      <model usable='yes'>Haswell-noTSX-IBRS</model>
-      <model usable='yes'>Haswell-noTSX</model>
-      <model usable='yes'>Haswell-IBRS</model>
-      <model usable='yes'>Haswell</model>
-      <model usable='no'>EPYC-Rome</model>
-      <model usable='no'>EPYC-IBPB</model>
-      <model usable='no'>EPYC</model>
-      <model usable='no'>Dhyana</model>
-      <model usable='no'>Cooperlake</model>
-      <model usable='yes'>Conroe</model>
-      <model usable='no'>Cascadelake-Server-noTSX</model>
-      <model usable='no'>Cascadelake-Server</model>
-      <model usable='yes'>Broadwell-noTSX-IBRS</model>
-      <model usable='yes'>Broadwell-noTSX</model>
-      <model usable='yes'>Broadwell-IBRS</model>
-      <model usable='yes'>Broadwell</model>
-      <model usable='yes'>486</model>
+      <model usable='yes' vendor='unknown'>qemu64</model>
+      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='no' vendor='unknown'>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='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='unknown'>486</model>
     </mode>
   </cpu>
   <memoryBacking supported='yes'>
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 df1572c901..d0ceae6d7f 100644
--- a/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml
@@ -62,60 +62,60 @@
       <feature policy='require' name='pschange-mc-no'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes'>qemu64</model>
-      <model usable='yes'>qemu32</model>
-      <model usable='no'>phenom</model>
-      <model usable='yes'>pentium3</model>
-      <model usable='yes'>pentium2</model>
-      <model usable='yes'>pentium</model>
-      <model usable='no'>n270</model>
-      <model usable='yes'>kvm64</model>
-      <model usable='yes'>kvm32</model>
-      <model usable='no'>coreduo</model>
-      <model usable='no'>core2duo</model>
-      <model usable='no'>athlon</model>
-      <model usable='no'>Westmere-IBRS</model>
-      <model usable='yes'>Westmere</model>
-      <model usable='no'>Snowridge</model>
-      <model usable='no'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no'>Skylake-Server-IBRS</model>
-      <model usable='no'>Skylake-Server</model>
-      <model usable='no'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no'>Skylake-Client-IBRS</model>
-      <model usable='no'>Skylake-Client</model>
-      <model usable='no'>SandyBridge-IBRS</model>
-      <model usable='yes'>SandyBridge</model>
-      <model usable='yes'>Penryn</model>
-      <model usable='no'>Opteron_G5</model>
-      <model usable='no'>Opteron_G4</model>
-      <model usable='yes'>Opteron_G3</model>
-      <model usable='yes'>Opteron_G2</model>
-      <model usable='yes'>Opteron_G1</model>
-      <model usable='no'>Nehalem-IBRS</model>
-      <model usable='yes'>Nehalem</model>
-      <model usable='no'>IvyBridge-IBRS</model>
-      <model usable='no'>IvyBridge</model>
-      <model usable='no'>Icelake-Server-noTSX</model>
-      <model usable='no'>Icelake-Server</model>
-      <model usable='no'>Icelake-Client-noTSX</model>
-      <model usable='no'>Icelake-Client</model>
-      <model usable='no'>Haswell-noTSX-IBRS</model>
-      <model usable='no'>Haswell-noTSX</model>
-      <model usable='no'>Haswell-IBRS</model>
-      <model usable='no'>Haswell</model>
-      <model usable='yes'>EPYC-Rome</model>
-      <model usable='yes'>EPYC-IBPB</model>
-      <model usable='yes'>EPYC</model>
-      <model usable='yes'>Dhyana</model>
-      <model usable='no'>Cooperlake</model>
-      <model usable='yes'>Conroe</model>
-      <model usable='no'>Cascadelake-Server-noTSX</model>
-      <model usable='no'>Cascadelake-Server</model>
-      <model usable='no'>Broadwell-noTSX-IBRS</model>
-      <model usable='no'>Broadwell-noTSX</model>
-      <model usable='no'>Broadwell-IBRS</model>
-      <model usable='no'>Broadwell</model>
-      <model usable='yes'>486</model>
+      <model usable='yes' vendor='unknown'>qemu64</model>
+      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='no' vendor='unknown'>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='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='yes' vendor='unknown'>486</model>
     </mode>
   </cpu>
   <memoryBacking supported='yes'>
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 3a6dc7b5fc..92560c92ed 100644
--- a/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml
@@ -75,60 +75,60 @@
       <feature policy='disable' name='misalignsse'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes'>qemu64</model>
-      <model usable='yes'>qemu32</model>
-      <model usable='no'>phenom</model>
-      <model usable='yes'>pentium3</model>
-      <model usable='yes'>pentium2</model>
-      <model usable='yes'>pentium</model>
-      <model usable='yes'>n270</model>
-      <model usable='yes'>kvm64</model>
-      <model usable='yes'>kvm32</model>
-      <model usable='yes'>coreduo</model>
-      <model usable='yes'>core2duo</model>
-      <model usable='yes'>athlon</model>
-      <model usable='no'>Westmere-IBRS</model>
-      <model usable='yes'>Westmere</model>
-      <model usable='no'>Snowridge</model>
-      <model usable='no'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no'>Skylake-Server-IBRS</model>
-      <model usable='no'>Skylake-Server</model>
-      <model usable='no'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no'>Skylake-Client-IBRS</model>
-      <model usable='no'>Skylake-Client</model>
-      <model usable='no'>SandyBridge-IBRS</model>
-      <model usable='no'>SandyBridge</model>
-      <model usable='yes'>Penryn</model>
-      <model usable='no'>Opteron_G5</model>
-      <model usable='no'>Opteron_G4</model>
-      <model usable='no'>Opteron_G3</model>
-      <model usable='yes'>Opteron_G2</model>
-      <model usable='yes'>Opteron_G1</model>
-      <model usable='no'>Nehalem-IBRS</model>
-      <model usable='yes'>Nehalem</model>
-      <model usable='no'>IvyBridge-IBRS</model>
-      <model usable='no'>IvyBridge</model>
-      <model usable='no'>Icelake-Server-noTSX</model>
-      <model usable='no'>Icelake-Server</model>
-      <model usable='no'>Icelake-Client-noTSX</model>
-      <model usable='no'>Icelake-Client</model>
-      <model usable='no'>Haswell-noTSX-IBRS</model>
-      <model usable='no'>Haswell-noTSX</model>
-      <model usable='no'>Haswell-IBRS</model>
-      <model usable='no'>Haswell</model>
-      <model usable='no'>EPYC-Rome</model>
-      <model usable='no'>EPYC-IBPB</model>
-      <model usable='no'>EPYC</model>
-      <model usable='no'>Dhyana</model>
-      <model usable='no'>Cooperlake</model>
-      <model usable='yes'>Conroe</model>
-      <model usable='no'>Cascadelake-Server-noTSX</model>
-      <model usable='no'>Cascadelake-Server</model>
-      <model usable='no'>Broadwell-noTSX-IBRS</model>
-      <model usable='no'>Broadwell-noTSX</model>
-      <model usable='no'>Broadwell-IBRS</model>
-      <model usable='no'>Broadwell</model>
-      <model usable='yes'>486</model>
+      <model usable='yes' vendor='unknown'>qemu64</model>
+      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='no' vendor='unknown'>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='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='unknown'>486</model>
     </mode>
   </cpu>
   <memoryBacking supported='yes'>
diff --git a/tests/domaincapsdata/qemu_5.1.0.x86_64.xml b/tests/domaincapsdata/qemu_5.1.0.x86_64.xml
index e0e8e0ed12..169db1c00f 100644
--- a/tests/domaincapsdata/qemu_5.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.1.0.x86_64.xml
@@ -61,60 +61,60 @@
       <feature policy='require' name='pschange-mc-no'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes'>qemu64</model>
-      <model usable='yes'>qemu32</model>
-      <model usable='no'>phenom</model>
-      <model usable='yes'>pentium3</model>
-      <model usable='yes'>pentium2</model>
-      <model usable='yes'>pentium</model>
-      <model usable='no'>n270</model>
-      <model usable='yes'>kvm64</model>
-      <model usable='yes'>kvm32</model>
-      <model usable='no'>coreduo</model>
-      <model usable='no'>core2duo</model>
-      <model usable='no'>athlon</model>
-      <model usable='no'>Westmere-IBRS</model>
-      <model usable='yes'>Westmere</model>
-      <model usable='no'>Snowridge</model>
-      <model usable='no'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no'>Skylake-Server-IBRS</model>
-      <model usable='no'>Skylake-Server</model>
-      <model usable='no'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no'>Skylake-Client-IBRS</model>
-      <model usable='no'>Skylake-Client</model>
-      <model usable='no'>SandyBridge-IBRS</model>
-      <model usable='yes'>SandyBridge</model>
-      <model usable='yes'>Penryn</model>
-      <model usable='no'>Opteron_G5</model>
-      <model usable='no'>Opteron_G4</model>
-      <model usable='yes'>Opteron_G3</model>
-      <model usable='yes'>Opteron_G2</model>
-      <model usable='yes'>Opteron_G1</model>
-      <model usable='no'>Nehalem-IBRS</model>
-      <model usable='yes'>Nehalem</model>
-      <model usable='no'>IvyBridge-IBRS</model>
-      <model usable='no'>IvyBridge</model>
-      <model usable='no'>Icelake-Server-noTSX</model>
-      <model usable='no'>Icelake-Server</model>
-      <model usable='no'>Icelake-Client-noTSX</model>
-      <model usable='no'>Icelake-Client</model>
-      <model usable='no'>Haswell-noTSX-IBRS</model>
-      <model usable='no'>Haswell-noTSX</model>
-      <model usable='no'>Haswell-IBRS</model>
-      <model usable='no'>Haswell</model>
-      <model usable='yes'>EPYC-Rome</model>
-      <model usable='yes'>EPYC-IBPB</model>
-      <model usable='yes'>EPYC</model>
-      <model usable='yes'>Dhyana</model>
-      <model usable='no'>Cooperlake</model>
-      <model usable='yes'>Conroe</model>
-      <model usable='no'>Cascadelake-Server-noTSX</model>
-      <model usable='no'>Cascadelake-Server</model>
-      <model usable='no'>Broadwell-noTSX-IBRS</model>
-      <model usable='no'>Broadwell-noTSX</model>
-      <model usable='no'>Broadwell-IBRS</model>
-      <model usable='no'>Broadwell</model>
-      <model usable='yes'>486</model>
+      <model usable='yes' vendor='unknown'>qemu64</model>
+      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='no' vendor='unknown'>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='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='yes' vendor='unknown'>486</model>
     </mode>
   </cpu>
   <memoryBacking supported='yes'>
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 6a49f568be..d4922249c0 100644
--- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
@@ -62,60 +62,60 @@
       <feature policy='require' name='pschange-mc-no'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes'>qemu64</model>
-      <model usable='yes'>qemu32</model>
-      <model usable='no'>phenom</model>
-      <model usable='yes'>pentium3</model>
-      <model usable='yes'>pentium2</model>
-      <model usable='yes'>pentium</model>
-      <model usable='no'>n270</model>
-      <model usable='yes'>kvm64</model>
-      <model usable='yes'>kvm32</model>
-      <model usable='no'>coreduo</model>
-      <model usable='no'>core2duo</model>
-      <model usable='no'>athlon</model>
-      <model usable='no'>Westmere-IBRS</model>
-      <model usable='yes'>Westmere</model>
-      <model usable='no'>Snowridge</model>
-      <model usable='no'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no'>Skylake-Server-IBRS</model>
-      <model usable='no'>Skylake-Server</model>
-      <model usable='no'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no'>Skylake-Client-IBRS</model>
-      <model usable='no'>Skylake-Client</model>
-      <model usable='no'>SandyBridge-IBRS</model>
-      <model usable='yes'>SandyBridge</model>
-      <model usable='yes'>Penryn</model>
-      <model usable='no'>Opteron_G5</model>
-      <model usable='no'>Opteron_G4</model>
-      <model usable='yes'>Opteron_G3</model>
-      <model usable='yes'>Opteron_G2</model>
-      <model usable='yes'>Opteron_G1</model>
-      <model usable='no'>Nehalem-IBRS</model>
-      <model usable='yes'>Nehalem</model>
-      <model usable='no'>IvyBridge-IBRS</model>
-      <model usable='no'>IvyBridge</model>
-      <model usable='no'>Icelake-Server-noTSX</model>
-      <model usable='no'>Icelake-Server</model>
-      <model usable='no' deprecated='yes'>Icelake-Client-noTSX</model>
-      <model usable='no' deprecated='yes'>Icelake-Client</model>
-      <model usable='no'>Haswell-noTSX-IBRS</model>
-      <model usable='no'>Haswell-noTSX</model>
-      <model usable='no'>Haswell-IBRS</model>
-      <model usable='no'>Haswell</model>
-      <model usable='yes'>EPYC-Rome</model>
-      <model usable='yes'>EPYC-IBPB</model>
-      <model usable='yes'>EPYC</model>
-      <model usable='yes'>Dhyana</model>
-      <model usable='no'>Cooperlake</model>
-      <model usable='yes'>Conroe</model>
-      <model usable='no'>Cascadelake-Server-noTSX</model>
-      <model usable='no'>Cascadelake-Server</model>
-      <model usable='no'>Broadwell-noTSX-IBRS</model>
-      <model usable='no'>Broadwell-noTSX</model>
-      <model usable='no'>Broadwell-IBRS</model>
-      <model usable='no'>Broadwell</model>
-      <model usable='yes'>486</model>
+      <model usable='yes' vendor='unknown'>qemu64</model>
+      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='no' vendor='unknown'>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='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='yes' vendor='unknown'>486</model>
     </mode>
   </cpu>
   <memoryBacking supported='yes'>
diff --git a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
index f41f47c346..96d9aabc29 100644
--- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
@@ -75,60 +75,60 @@
       <feature policy='disable' name='misalignsse'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes'>qemu64</model>
-      <model usable='yes'>qemu32</model>
-      <model usable='no'>phenom</model>
-      <model usable='yes'>pentium3</model>
-      <model usable='yes'>pentium2</model>
-      <model usable='yes'>pentium</model>
-      <model usable='yes'>n270</model>
-      <model usable='yes'>kvm64</model>
-      <model usable='yes'>kvm32</model>
-      <model usable='yes'>coreduo</model>
-      <model usable='yes'>core2duo</model>
-      <model usable='yes'>athlon</model>
-      <model usable='no'>Westmere-IBRS</model>
-      <model usable='yes'>Westmere</model>
-      <model usable='no'>Snowridge</model>
-      <model usable='no'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no'>Skylake-Server-IBRS</model>
-      <model usable='no'>Skylake-Server</model>
-      <model usable='no'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no'>Skylake-Client-IBRS</model>
-      <model usable='no'>Skylake-Client</model>
-      <model usable='no'>SandyBridge-IBRS</model>
-      <model usable='no'>SandyBridge</model>
-      <model usable='yes'>Penryn</model>
-      <model usable='no'>Opteron_G5</model>
-      <model usable='no'>Opteron_G4</model>
-      <model usable='no'>Opteron_G3</model>
-      <model usable='yes'>Opteron_G2</model>
-      <model usable='yes'>Opteron_G1</model>
-      <model usable='no'>Nehalem-IBRS</model>
-      <model usable='yes'>Nehalem</model>
-      <model usable='no'>IvyBridge-IBRS</model>
-      <model usable='no'>IvyBridge</model>
-      <model usable='no'>Icelake-Server-noTSX</model>
-      <model usable='no'>Icelake-Server</model>
-      <model usable='no' deprecated='yes'>Icelake-Client-noTSX</model>
-      <model usable='no' deprecated='yes'>Icelake-Client</model>
-      <model usable='no'>Haswell-noTSX-IBRS</model>
-      <model usable='no'>Haswell-noTSX</model>
-      <model usable='no'>Haswell-IBRS</model>
-      <model usable='no'>Haswell</model>
-      <model usable='no'>EPYC-Rome</model>
-      <model usable='no'>EPYC-IBPB</model>
-      <model usable='no'>EPYC</model>
-      <model usable='no'>Dhyana</model>
-      <model usable='no'>Cooperlake</model>
-      <model usable='yes'>Conroe</model>
-      <model usable='no'>Cascadelake-Server-noTSX</model>
-      <model usable='no'>Cascadelake-Server</model>
-      <model usable='no'>Broadwell-noTSX-IBRS</model>
-      <model usable='no'>Broadwell-noTSX</model>
-      <model usable='no'>Broadwell-IBRS</model>
-      <model usable='no'>Broadwell</model>
-      <model usable='yes'>486</model>
+      <model usable='yes' vendor='unknown'>qemu64</model>
+      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='no' vendor='unknown'>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='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='unknown'>486</model>
     </mode>
   </cpu>
   <memoryBacking supported='yes'>
diff --git a/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml
index dfd792c031..a6363b0aad 100644
--- a/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml
@@ -40,43 +40,43 @@
     </mode>
     <mode name='host-model' supported='no'/>
     <mode name='custom' supported='yes'>
-      <model usable='unknown'>cortex-a9</model>
-      <model usable='unknown'>pxa250</model>
-      <model usable='unknown'>pxa270-a1</model>
-      <model usable='unknown'>arm946</model>
-      <model usable='unknown'>pxa270-c0</model>
-      <model usable='unknown'>max</model>
-      <model usable='unknown'>arm1026</model>
-      <model usable='unknown'>pxa260</model>
-      <model usable='unknown'>pxa270-b1</model>
-      <model usable='unknown'>cortex-a57</model>
-      <model usable='unknown'>pxa255</model>
-      <model usable='unknown'>cortex-r5</model>
-      <model usable='unknown'>arm1136</model>
-      <model usable='unknown'>cortex-a7</model>
-      <model usable='unknown'>pxa261</model>
-      <model usable='unknown'>pxa270-c5</model>
-      <model usable='unknown'>cortex-m3</model>
-      <model usable='unknown'>arm1176</model>
-      <model usable='unknown'>sa1100</model>
-      <model usable='unknown'>cortex-a53</model>
-      <model usable='unknown'>ti925t</model>
-      <model usable='unknown'>cortex-m33</model>
-      <model usable='unknown'>cortex-a8</model>
-      <model usable='unknown'>arm926</model>
-      <model usable='unknown'>cortex-a72</model>
-      <model usable='unknown'>pxa270</model>
-      <model usable='unknown'>pxa270-a0</model>
-      <model usable='unknown'>cortex-m4</model>
-      <model usable='unknown'>cortex-m7</model>
-      <model usable='unknown'>cortex-a15</model>
-      <model usable='unknown'>arm11mpcore</model>
-      <model usable='unknown'>cortex-r5f</model>
-      <model usable='unknown'>cortex-m0</model>
-      <model usable='unknown'>sa1110</model>
-      <model usable='unknown'>arm1136-r2</model>
-      <model usable='unknown'>pxa270-b0</model>
-      <model usable='unknown'>pxa262</model>
+      <model usable='unknown' vendor='unknown'>cortex-a9</model>
+      <model usable='unknown' vendor='unknown'>pxa250</model>
+      <model usable='unknown' vendor='unknown'>pxa270-a1</model>
+      <model usable='unknown' vendor='unknown'>arm946</model>
+      <model usable='unknown' vendor='unknown'>pxa270-c0</model>
+      <model usable='unknown' vendor='unknown'>max</model>
+      <model usable='unknown' vendor='unknown'>arm1026</model>
+      <model usable='unknown' vendor='unknown'>pxa260</model>
+      <model usable='unknown' vendor='unknown'>pxa270-b1</model>
+      <model usable='unknown' vendor='unknown'>cortex-a57</model>
+      <model usable='unknown' vendor='unknown'>pxa255</model>
+      <model usable='unknown' vendor='unknown'>cortex-r5</model>
+      <model usable='unknown' vendor='unknown'>arm1136</model>
+      <model usable='unknown' vendor='unknown'>cortex-a7</model>
+      <model usable='unknown' vendor='unknown'>pxa261</model>
+      <model usable='unknown' vendor='unknown'>pxa270-c5</model>
+      <model usable='unknown' vendor='unknown'>cortex-m3</model>
+      <model usable='unknown' vendor='unknown'>arm1176</model>
+      <model usable='unknown' vendor='unknown'>sa1100</model>
+      <model usable='unknown' vendor='unknown'>cortex-a53</model>
+      <model usable='unknown' vendor='unknown'>ti925t</model>
+      <model usable='unknown' vendor='unknown'>cortex-m33</model>
+      <model usable='unknown' vendor='unknown'>cortex-a8</model>
+      <model usable='unknown' vendor='unknown'>arm926</model>
+      <model usable='unknown' vendor='unknown'>cortex-a72</model>
+      <model usable='unknown' vendor='unknown'>pxa270</model>
+      <model usable='unknown' vendor='unknown'>pxa270-a0</model>
+      <model usable='unknown' vendor='unknown'>cortex-m4</model>
+      <model usable='unknown' vendor='unknown'>cortex-m7</model>
+      <model usable='unknown' vendor='unknown'>cortex-a15</model>
+      <model usable='unknown' vendor='unknown'>arm11mpcore</model>
+      <model usable='unknown' vendor='unknown'>cortex-r5f</model>
+      <model usable='unknown' vendor='unknown'>cortex-m0</model>
+      <model usable='unknown' vendor='unknown'>sa1110</model>
+      <model usable='unknown' vendor='unknown'>arm1136-r2</model>
+      <model usable='unknown' vendor='unknown'>pxa270-b0</model>
+      <model usable='unknown' vendor='unknown'>pxa262</model>
     </mode>
   </cpu>
   <memoryBacking supported='yes'>
diff --git a/tests/domaincapsdata/qemu_5.2.0.aarch64.xml b/tests/domaincapsdata/qemu_5.2.0.aarch64.xml
index e7227d092f..49380bd218 100644
--- a/tests/domaincapsdata/qemu_5.2.0.aarch64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0.aarch64.xml
@@ -38,43 +38,43 @@
     </mode>
     <mode name='host-model' supported='no'/>
     <mode name='custom' supported='yes'>
-      <model usable='unknown'>cortex-a9</model>
-      <model usable='unknown'>pxa250</model>
-      <model usable='unknown'>pxa270-a1</model>
-      <model usable='unknown'>arm946</model>
-      <model usable='unknown'>pxa270-c0</model>
-      <model usable='unknown'>max</model>
-      <model usable='unknown'>arm1026</model>
-      <model usable='unknown'>pxa260</model>
-      <model usable='unknown'>pxa270-b1</model>
-      <model usable='unknown'>cortex-a57</model>
-      <model usable='unknown'>pxa255</model>
-      <model usable='unknown'>cortex-r5</model>
-      <model usable='unknown'>arm1136</model>
-      <model usable='unknown'>cortex-a7</model>
-      <model usable='unknown'>pxa261</model>
-      <model usable='unknown'>pxa270-c5</model>
-      <model usable='unknown'>cortex-m3</model>
-      <model usable='unknown'>arm1176</model>
-      <model usable='unknown'>sa1100</model>
-      <model usable='unknown'>cortex-a53</model>
-      <model usable='unknown'>ti925t</model>
-      <model usable='unknown'>cortex-m33</model>
-      <model usable='unknown'>cortex-a8</model>
-      <model usable='unknown'>arm926</model>
-      <model usable='unknown'>cortex-a72</model>
-      <model usable='unknown'>pxa270</model>
-      <model usable='unknown'>pxa270-a0</model>
-      <model usable='unknown'>cortex-m4</model>
-      <model usable='unknown'>cortex-m7</model>
-      <model usable='unknown'>cortex-a15</model>
-      <model usable='unknown'>arm11mpcore</model>
-      <model usable='unknown'>cortex-r5f</model>
-      <model usable='unknown'>cortex-m0</model>
-      <model usable='unknown'>sa1110</model>
-      <model usable='unknown'>arm1136-r2</model>
-      <model usable='unknown'>pxa270-b0</model>
-      <model usable='unknown'>pxa262</model>
+      <model usable='unknown' vendor='unknown'>cortex-a9</model>
+      <model usable='unknown' vendor='unknown'>pxa250</model>
+      <model usable='unknown' vendor='unknown'>pxa270-a1</model>
+      <model usable='unknown' vendor='unknown'>arm946</model>
+      <model usable='unknown' vendor='unknown'>pxa270-c0</model>
+      <model usable='unknown' vendor='unknown'>max</model>
+      <model usable='unknown' vendor='unknown'>arm1026</model>
+      <model usable='unknown' vendor='unknown'>pxa260</model>
+      <model usable='unknown' vendor='unknown'>pxa270-b1</model>
+      <model usable='unknown' vendor='unknown'>cortex-a57</model>
+      <model usable='unknown' vendor='unknown'>pxa255</model>
+      <model usable='unknown' vendor='unknown'>cortex-r5</model>
+      <model usable='unknown' vendor='unknown'>arm1136</model>
+      <model usable='unknown' vendor='unknown'>cortex-a7</model>
+      <model usable='unknown' vendor='unknown'>pxa261</model>
+      <model usable='unknown' vendor='unknown'>pxa270-c5</model>
+      <model usable='unknown' vendor='unknown'>cortex-m3</model>
+      <model usable='unknown' vendor='unknown'>arm1176</model>
+      <model usable='unknown' vendor='unknown'>sa1100</model>
+      <model usable='unknown' vendor='unknown'>cortex-a53</model>
+      <model usable='unknown' vendor='unknown'>ti925t</model>
+      <model usable='unknown' vendor='unknown'>cortex-m33</model>
+      <model usable='unknown' vendor='unknown'>cortex-a8</model>
+      <model usable='unknown' vendor='unknown'>arm926</model>
+      <model usable='unknown' vendor='unknown'>cortex-a72</model>
+      <model usable='unknown' vendor='unknown'>pxa270</model>
+      <model usable='unknown' vendor='unknown'>pxa270-a0</model>
+      <model usable='unknown' vendor='unknown'>cortex-m4</model>
+      <model usable='unknown' vendor='unknown'>cortex-m7</model>
+      <model usable='unknown' vendor='unknown'>cortex-a15</model>
+      <model usable='unknown' vendor='unknown'>arm11mpcore</model>
+      <model usable='unknown' vendor='unknown'>cortex-r5f</model>
+      <model usable='unknown' vendor='unknown'>cortex-m0</model>
+      <model usable='unknown' vendor='unknown'>sa1110</model>
+      <model usable='unknown' vendor='unknown'>arm1136-r2</model>
+      <model usable='unknown' vendor='unknown'>pxa270-b0</model>
+      <model usable='unknown' vendor='unknown'>pxa262</model>
     </mode>
   </cpu>
   <memoryBacking supported='yes'>
diff --git a/tests/domaincapsdata/qemu_5.2.0.ppc64.xml b/tests/domaincapsdata/qemu_5.2.0.ppc64.xml
index 88e4837ec3..570d88235b 100644
--- a/tests/domaincapsdata/qemu_5.2.0.ppc64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0.ppc64.xml
@@ -40,10 +40,10 @@
       <model fallback='allow'>POWER8</model>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='unknown'>POWER10</model>
-      <model usable='unknown'>POWER9</model>
-      <model usable='unknown'>POWER8</model>
-      <model usable='unknown'>POWER7</model>
+      <model usable='unknown' vendor='unknown'>POWER10</model>
+      <model usable='unknown' vendor='unknown'>POWER9</model>
+      <model usable='unknown' vendor='unknown'>POWER8</model>
+      <model usable='unknown' vendor='unknown'>POWER7</model>
     </mode>
   </cpu>
   <memoryBacking supported='yes'>
diff --git a/tests/domaincapsdata/qemu_5.2.0.s390x.xml b/tests/domaincapsdata/qemu_5.2.0.s390x.xml
index 2a2ca8abcf..84820332e4 100644
--- a/tests/domaincapsdata/qemu_5.2.0.s390x.xml
+++ b/tests/domaincapsdata/qemu_5.2.0.s390x.xml
@@ -85,80 +85,80 @@
       <feature policy='require' name='cmm'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes'>z800-base</model>
-      <model usable='yes'>z890.2-base</model>
-      <model usable='yes'>z9EC.2</model>
-      <model usable='yes'>z13.2</model>
-      <model usable='yes'>z990.5-base</model>
-      <model usable='yes'>z9BC-base</model>
-      <model usable='yes'>z890.2</model>
-      <model usable='yes'>z890</model>
-      <model usable='yes'>z9BC</model>
-      <model usable='yes'>z13</model>
-      <model usable='yes'>z196</model>
-      <model usable='yes'>z13s</model>
-      <model usable='yes'>z990.3</model>
-      <model usable='yes'>z13s-base</model>
-      <model usable='yes'>z9EC</model>
-      <model usable='yes'>gen15a</model>
-      <model usable='yes'>z14ZR1-base</model>
-      <model usable='yes'>z14.2-base</model>
-      <model usable='yes'>z900.3-base</model>
-      <model usable='yes'>z13.2-base</model>
-      <model usable='yes'>z196.2-base</model>
-      <model usable='yes'>zBC12-base</model>
-      <model usable='yes'>z9BC.2-base</model>
-      <model usable='yes'>z900.2-base</model>
-      <model usable='yes'>z9EC.3</model>
-      <model usable='yes'>zEC12</model>
-      <model usable='yes'>z900</model>
-      <model usable='yes'>z114-base</model>
-      <model usable='yes'>zEC12-base</model>
-      <model usable='yes'>z10EC.2</model>
-      <model usable='yes'>z10EC-base</model>
-      <model usable='yes'>z900.3</model>
-      <model usable='yes'>z14ZR1</model>
-      <model usable='yes'>z10BC</model>
-      <model usable='yes'>z10BC.2-base</model>
-      <model usable='yes'>z9BC.2</model>
-      <model usable='yes'>z990</model>
-      <model usable='yes'>z990.2</model>
-      <model usable='yes'>z14</model>
-      <model usable='yes'>gen15b-base</model>
-      <model usable='yes'>z990.4</model>
-      <model usable='yes'>max</model>
-      <model usable='yes'>z990.2-base</model>
-      <model usable='yes'>z10EC.2-base</model>
-      <model usable='yes'>gen15a-base</model>
-      <model usable='yes'>z800</model>
-      <model usable='yes'>z10EC</model>
-      <model usable='yes'>zEC12.2</model>
-      <model usable='yes'>z900-base</model>
-      <model usable='yes'>z10BC.2</model>
-      <model usable='yes'>z9EC-base</model>
-      <model usable='yes'>z9EC.3-base</model>
-      <model usable='yes'>z114</model>
-      <model usable='yes'>z890.3</model>
-      <model usable='yes'>z196-base</model>
-      <model usable='yes'>z9EC.2-base</model>
-      <model usable='yes'>z196.2</model>
-      <model usable='yes'>z14.2</model>
-      <model usable='yes'>z990-base</model>
-      <model usable='yes'>z900.2</model>
-      <model usable='yes'>z10EC.3</model>
-      <model usable='yes'>z890-base</model>
-      <model usable='yes'>z14-base</model>
-      <model usable='yes'>z990.4-base</model>
-      <model usable='yes'>z10EC.3-base</model>
-      <model usable='yes'>z10BC-base</model>
-      <model usable='yes'>z13-base</model>
-      <model usable='yes'>z990.3-base</model>
-      <model usable='yes'>zEC12.2-base</model>
-      <model usable='yes'>zBC12</model>
-      <model usable='yes'>z890.3-base</model>
-      <model usable='yes'>z990.5</model>
-      <model usable='yes'>gen15b</model>
-      <model usable='yes'>qemu</model>
+      <model usable='yes' vendor='unknown'>z800-base</model>
+      <model usable='yes' vendor='unknown'>z890.2-base</model>
+      <model usable='yes' vendor='unknown'>z9EC.2</model>
+      <model usable='yes' vendor='unknown'>z13.2</model>
+      <model usable='yes' vendor='unknown'>z990.5-base</model>
+      <model usable='yes' vendor='unknown'>z9BC-base</model>
+      <model usable='yes' vendor='unknown'>z890.2</model>
+      <model usable='yes' vendor='unknown'>z890</model>
+      <model usable='yes' vendor='unknown'>z9BC</model>
+      <model usable='yes' vendor='unknown'>z13</model>
+      <model usable='yes' vendor='unknown'>z196</model>
+      <model usable='yes' vendor='unknown'>z13s</model>
+      <model usable='yes' vendor='unknown'>z990.3</model>
+      <model usable='yes' vendor='unknown'>z13s-base</model>
+      <model usable='yes' vendor='unknown'>z9EC</model>
+      <model usable='yes' vendor='unknown'>gen15a</model>
+      <model usable='yes' vendor='unknown'>z14ZR1-base</model>
+      <model usable='yes' vendor='unknown'>z14.2-base</model>
+      <model usable='yes' vendor='unknown'>z900.3-base</model>
+      <model usable='yes' vendor='unknown'>z13.2-base</model>
+      <model usable='yes' vendor='unknown'>z196.2-base</model>
+      <model usable='yes' vendor='unknown'>zBC12-base</model>
+      <model usable='yes' vendor='unknown'>z9BC.2-base</model>
+      <model usable='yes' vendor='unknown'>z900.2-base</model>
+      <model usable='yes' vendor='unknown'>z9EC.3</model>
+      <model usable='yes' vendor='unknown'>zEC12</model>
+      <model usable='yes' vendor='unknown'>z900</model>
+      <model usable='yes' vendor='unknown'>z114-base</model>
+      <model usable='yes' vendor='unknown'>zEC12-base</model>
+      <model usable='yes' vendor='unknown'>z10EC.2</model>
+      <model usable='yes' vendor='unknown'>z10EC-base</model>
+      <model usable='yes' vendor='unknown'>z900.3</model>
+      <model usable='yes' vendor='unknown'>z14ZR1</model>
+      <model usable='yes' vendor='unknown'>z10BC</model>
+      <model usable='yes' vendor='unknown'>z10BC.2-base</model>
+      <model usable='yes' vendor='unknown'>z9BC.2</model>
+      <model usable='yes' vendor='unknown'>z990</model>
+      <model usable='yes' vendor='unknown'>z990.2</model>
+      <model usable='yes' vendor='unknown'>z14</model>
+      <model usable='yes' vendor='unknown'>gen15b-base</model>
+      <model usable='yes' vendor='unknown'>z990.4</model>
+      <model usable='yes' vendor='unknown'>max</model>
+      <model usable='yes' vendor='unknown'>z990.2-base</model>
+      <model usable='yes' vendor='unknown'>z10EC.2-base</model>
+      <model usable='yes' vendor='unknown'>gen15a-base</model>
+      <model usable='yes' vendor='unknown'>z800</model>
+      <model usable='yes' vendor='unknown'>z10EC</model>
+      <model usable='yes' vendor='unknown'>zEC12.2</model>
+      <model usable='yes' vendor='unknown'>z900-base</model>
+      <model usable='yes' vendor='unknown'>z10BC.2</model>
+      <model usable='yes' vendor='unknown'>z9EC-base</model>
+      <model usable='yes' vendor='unknown'>z9EC.3-base</model>
+      <model usable='yes' vendor='unknown'>z114</model>
+      <model usable='yes' vendor='unknown'>z890.3</model>
+      <model usable='yes' vendor='unknown'>z196-base</model>
+      <model usable='yes' vendor='unknown'>z9EC.2-base</model>
+      <model usable='yes' vendor='unknown'>z196.2</model>
+      <model usable='yes' vendor='unknown'>z14.2</model>
+      <model usable='yes' vendor='unknown'>z990-base</model>
+      <model usable='yes' vendor='unknown'>z900.2</model>
+      <model usable='yes' vendor='unknown'>z10EC.3</model>
+      <model usable='yes' vendor='unknown'>z890-base</model>
+      <model usable='yes' vendor='unknown'>z14-base</model>
+      <model usable='yes' vendor='unknown'>z990.4-base</model>
+      <model usable='yes' vendor='unknown'>z10EC.3-base</model>
+      <model usable='yes' vendor='unknown'>z10BC-base</model>
+      <model usable='yes' vendor='unknown'>z13-base</model>
+      <model usable='yes' vendor='unknown'>z990.3-base</model>
+      <model usable='yes' vendor='unknown'>zEC12.2-base</model>
+      <model usable='yes' vendor='unknown'>zBC12</model>
+      <model usable='yes' vendor='unknown'>z890.3-base</model>
+      <model usable='yes' vendor='unknown'>z990.5</model>
+      <model usable='yes' vendor='unknown'>gen15b</model>
+      <model usable='yes' vendor='unknown'>qemu</model>
     </mode>
   </cpu>
   <memoryBacking supported='yes'>
diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
index 0a6f72df7e..cb99bfab9e 100644
--- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
@@ -61,60 +61,60 @@
       <feature policy='require' name='pschange-mc-no'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes'>qemu64</model>
-      <model usable='yes'>qemu32</model>
-      <model usable='no'>phenom</model>
-      <model usable='yes'>pentium3</model>
-      <model usable='yes'>pentium2</model>
-      <model usable='yes'>pentium</model>
-      <model usable='no'>n270</model>
-      <model usable='yes'>kvm64</model>
-      <model usable='yes'>kvm32</model>
-      <model usable='no'>coreduo</model>
-      <model usable='no'>core2duo</model>
-      <model usable='no'>athlon</model>
-      <model usable='no'>Westmere-IBRS</model>
-      <model usable='yes'>Westmere</model>
-      <model usable='no'>Snowridge</model>
-      <model usable='no'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no'>Skylake-Server-IBRS</model>
-      <model usable='no'>Skylake-Server</model>
-      <model usable='no'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no'>Skylake-Client-IBRS</model>
-      <model usable='no'>Skylake-Client</model>
-      <model usable='no'>SandyBridge-IBRS</model>
-      <model usable='yes'>SandyBridge</model>
-      <model usable='yes'>Penryn</model>
-      <model usable='no'>Opteron_G5</model>
-      <model usable='no'>Opteron_G4</model>
-      <model usable='yes'>Opteron_G3</model>
-      <model usable='yes'>Opteron_G2</model>
-      <model usable='yes'>Opteron_G1</model>
-      <model usable='no'>Nehalem-IBRS</model>
-      <model usable='yes'>Nehalem</model>
-      <model usable='no'>IvyBridge-IBRS</model>
-      <model usable='no'>IvyBridge</model>
-      <model usable='no'>Icelake-Server-noTSX</model>
-      <model usable='no'>Icelake-Server</model>
-      <model usable='no' deprecated='yes'>Icelake-Client-noTSX</model>
-      <model usable='no' deprecated='yes'>Icelake-Client</model>
-      <model usable='no'>Haswell-noTSX-IBRS</model>
-      <model usable='no'>Haswell-noTSX</model>
-      <model usable='no'>Haswell-IBRS</model>
-      <model usable='no'>Haswell</model>
-      <model usable='yes'>EPYC-Rome</model>
-      <model usable='yes'>EPYC-IBPB</model>
-      <model usable='yes'>EPYC</model>
-      <model usable='yes'>Dhyana</model>
-      <model usable='no'>Cooperlake</model>
-      <model usable='yes'>Conroe</model>
-      <model usable='no'>Cascadelake-Server-noTSX</model>
-      <model usable='no'>Cascadelake-Server</model>
-      <model usable='no'>Broadwell-noTSX-IBRS</model>
-      <model usable='no'>Broadwell-noTSX</model>
-      <model usable='no'>Broadwell-IBRS</model>
-      <model usable='no'>Broadwell</model>
-      <model usable='yes'>486</model>
+      <model usable='yes' vendor='unknown'>qemu64</model>
+      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='no' vendor='unknown'>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='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='yes' vendor='unknown'>486</model>
     </mode>
   </cpu>
   <memoryBacking supported='yes'>
diff --git a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
index 40df34edf0..cc2d6c8135 100644
--- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
@@ -62,61 +62,61 @@
       <feature policy='require' name='pschange-mc-no'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes'>qemu64</model>
-      <model usable='yes'>qemu32</model>
-      <model usable='no'>phenom</model>
-      <model usable='yes'>pentium3</model>
-      <model usable='yes'>pentium2</model>
-      <model usable='yes'>pentium</model>
-      <model usable='no'>n270</model>
-      <model usable='yes'>kvm64</model>
-      <model usable='yes'>kvm32</model>
-      <model usable='no'>coreduo</model>
-      <model usable='no'>core2duo</model>
-      <model usable='no'>athlon</model>
-      <model usable='no'>Westmere-IBRS</model>
-      <model usable='yes'>Westmere</model>
-      <model usable='no'>Snowridge</model>
-      <model usable='no'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no'>Skylake-Server-IBRS</model>
-      <model usable='no'>Skylake-Server</model>
-      <model usable='no'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no'>Skylake-Client-IBRS</model>
-      <model usable='no'>Skylake-Client</model>
-      <model usable='no'>SandyBridge-IBRS</model>
-      <model usable='yes'>SandyBridge</model>
-      <model usable='yes'>Penryn</model>
-      <model usable='no'>Opteron_G5</model>
-      <model usable='no'>Opteron_G4</model>
-      <model usable='yes'>Opteron_G3</model>
-      <model usable='yes'>Opteron_G2</model>
-      <model usable='yes'>Opteron_G1</model>
-      <model usable='no'>Nehalem-IBRS</model>
-      <model usable='yes'>Nehalem</model>
-      <model usable='no'>IvyBridge-IBRS</model>
-      <model usable='no'>IvyBridge</model>
-      <model usable='no'>Icelake-Server-noTSX</model>
-      <model usable='no'>Icelake-Server</model>
-      <model usable='no' deprecated='yes'>Icelake-Client-noTSX</model>
-      <model usable='no' deprecated='yes'>Icelake-Client</model>
-      <model usable='no'>Haswell-noTSX-IBRS</model>
-      <model usable='no'>Haswell-noTSX</model>
-      <model usable='no'>Haswell-IBRS</model>
-      <model usable='no'>Haswell</model>
-      <model usable='yes'>EPYC-Rome</model>
-      <model usable='no'>EPYC-Milan</model>
-      <model usable='yes'>EPYC-IBPB</model>
-      <model usable='yes'>EPYC</model>
-      <model usable='yes'>Dhyana</model>
-      <model usable='no'>Cooperlake</model>
-      <model usable='yes'>Conroe</model>
-      <model usable='no'>Cascadelake-Server-noTSX</model>
-      <model usable='no'>Cascadelake-Server</model>
-      <model usable='no'>Broadwell-noTSX-IBRS</model>
-      <model usable='no'>Broadwell-noTSX</model>
-      <model usable='no'>Broadwell-IBRS</model>
-      <model usable='no'>Broadwell</model>
-      <model usable='yes'>486</model>
+      <model usable='yes' vendor='unknown'>qemu64</model>
+      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='no' vendor='unknown'>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='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='yes' vendor='unknown'>486</model>
     </mode>
   </cpu>
   <memoryBacking supported='yes'>
diff --git a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
index e563b0cb59..4910fad094 100644
--- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
@@ -75,61 +75,61 @@
       <feature policy='disable' name='misalignsse'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes'>qemu64</model>
-      <model usable='yes'>qemu32</model>
-      <model usable='no'>phenom</model>
-      <model usable='yes'>pentium3</model>
-      <model usable='yes'>pentium2</model>
-      <model usable='yes'>pentium</model>
-      <model usable='yes'>n270</model>
-      <model usable='yes'>kvm64</model>
-      <model usable='yes'>kvm32</model>
-      <model usable='yes'>coreduo</model>
-      <model usable='yes'>core2duo</model>
-      <model usable='yes'>athlon</model>
-      <model usable='no'>Westmere-IBRS</model>
-      <model usable='yes'>Westmere</model>
-      <model usable='no'>Snowridge</model>
-      <model usable='no'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no'>Skylake-Server-IBRS</model>
-      <model usable='no'>Skylake-Server</model>
-      <model usable='no'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no'>Skylake-Client-IBRS</model>
-      <model usable='no'>Skylake-Client</model>
-      <model usable='no'>SandyBridge-IBRS</model>
-      <model usable='no'>SandyBridge</model>
-      <model usable='yes'>Penryn</model>
-      <model usable='no'>Opteron_G5</model>
-      <model usable='no'>Opteron_G4</model>
-      <model usable='no'>Opteron_G3</model>
-      <model usable='yes'>Opteron_G2</model>
-      <model usable='yes'>Opteron_G1</model>
-      <model usable='no'>Nehalem-IBRS</model>
-      <model usable='yes'>Nehalem</model>
-      <model usable='no'>IvyBridge-IBRS</model>
-      <model usable='no'>IvyBridge</model>
-      <model usable='no'>Icelake-Server-noTSX</model>
-      <model usable='no'>Icelake-Server</model>
-      <model usable='no' deprecated='yes'>Icelake-Client-noTSX</model>
-      <model usable='no' deprecated='yes'>Icelake-Client</model>
-      <model usable='no'>Haswell-noTSX-IBRS</model>
-      <model usable='no'>Haswell-noTSX</model>
-      <model usable='no'>Haswell-IBRS</model>
-      <model usable='no'>Haswell</model>
-      <model usable='no'>EPYC-Rome</model>
-      <model usable='no'>EPYC-Milan</model>
-      <model usable='no'>EPYC-IBPB</model>
-      <model usable='no'>EPYC</model>
-      <model usable='no'>Dhyana</model>
-      <model usable='no'>Cooperlake</model>
-      <model usable='yes'>Conroe</model>
-      <model usable='no'>Cascadelake-Server-noTSX</model>
-      <model usable='no'>Cascadelake-Server</model>
-      <model usable='no'>Broadwell-noTSX-IBRS</model>
-      <model usable='no'>Broadwell-noTSX</model>
-      <model usable='no'>Broadwell-IBRS</model>
-      <model usable='no'>Broadwell</model>
-      <model usable='yes'>486</model>
+      <model usable='yes' vendor='unknown'>qemu64</model>
+      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='no' vendor='unknown'>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='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='unknown'>486</model>
     </mode>
   </cpu>
   <memoryBacking supported='yes'>
diff --git a/tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml
index 958c40437f..68f3a523f4 100644
--- a/tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml
@@ -40,44 +40,44 @@
     </mode>
     <mode name='host-model' supported='no'/>
     <mode name='custom' supported='yes'>
-      <model usable='unknown'>cortex-a9</model>
-      <model usable='unknown'>pxa250</model>
-      <model usable='unknown'>pxa270-a1</model>
-      <model usable='unknown'>arm946</model>
-      <model usable='unknown'>max</model>
-      <model usable='unknown'>pxa270-c0</model>
-      <model usable='unknown'>arm1026</model>
-      <model usable='unknown'>pxa260</model>
-      <model usable='unknown'>pxa270-b1</model>
-      <model usable='unknown'>cortex-a57</model>
-      <model usable='unknown'>pxa255</model>
-      <model usable='unknown'>cortex-r5</model>
-      <model usable='unknown'>arm1136</model>
-      <model usable='unknown'>cortex-a7</model>
-      <model usable='unknown'>pxa261</model>
-      <model usable='unknown'>pxa270-c5</model>
-      <model usable='unknown'>cortex-m3</model>
-      <model usable='unknown'>arm1176</model>
-      <model usable='unknown'>sa1100</model>
-      <model usable='unknown'>cortex-a53</model>
-      <model usable='unknown'>ti925t</model>
-      <model usable='unknown'>cortex-m33</model>
-      <model usable='unknown'>cortex-a8</model>
-      <model usable='unknown'>arm926</model>
-      <model usable='unknown'>cortex-a72</model>
-      <model usable='unknown'>pxa270</model>
-      <model usable='unknown'>pxa270-a0</model>
-      <model usable='unknown'>cortex-m4</model>
-      <model usable='unknown'>cortex-m55</model>
-      <model usable='unknown'>cortex-m7</model>
-      <model usable='unknown'>cortex-a15</model>
-      <model usable='unknown'>arm11mpcore</model>
-      <model usable='unknown'>cortex-r5f</model>
-      <model usable='unknown'>cortex-m0</model>
-      <model usable='unknown'>sa1110</model>
-      <model usable='unknown'>arm1136-r2</model>
-      <model usable='unknown'>pxa270-b0</model>
-      <model usable='unknown'>pxa262</model>
+      <model usable='unknown' vendor='unknown'>cortex-a9</model>
+      <model usable='unknown' vendor='unknown'>pxa250</model>
+      <model usable='unknown' vendor='unknown'>pxa270-a1</model>
+      <model usable='unknown' vendor='unknown'>arm946</model>
+      <model usable='unknown' vendor='unknown'>max</model>
+      <model usable='unknown' vendor='unknown'>pxa270-c0</model>
+      <model usable='unknown' vendor='unknown'>arm1026</model>
+      <model usable='unknown' vendor='unknown'>pxa260</model>
+      <model usable='unknown' vendor='unknown'>pxa270-b1</model>
+      <model usable='unknown' vendor='unknown'>cortex-a57</model>
+      <model usable='unknown' vendor='unknown'>pxa255</model>
+      <model usable='unknown' vendor='unknown'>cortex-r5</model>
+      <model usable='unknown' vendor='unknown'>arm1136</model>
+      <model usable='unknown' vendor='unknown'>cortex-a7</model>
+      <model usable='unknown' vendor='unknown'>pxa261</model>
+      <model usable='unknown' vendor='unknown'>pxa270-c5</model>
+      <model usable='unknown' vendor='unknown'>cortex-m3</model>
+      <model usable='unknown' vendor='unknown'>arm1176</model>
+      <model usable='unknown' vendor='unknown'>sa1100</model>
+      <model usable='unknown' vendor='unknown'>cortex-a53</model>
+      <model usable='unknown' vendor='unknown'>ti925t</model>
+      <model usable='unknown' vendor='unknown'>cortex-m33</model>
+      <model usable='unknown' vendor='unknown'>cortex-a8</model>
+      <model usable='unknown' vendor='unknown'>arm926</model>
+      <model usable='unknown' vendor='unknown'>cortex-a72</model>
+      <model usable='unknown' vendor='unknown'>pxa270</model>
+      <model usable='unknown' vendor='unknown'>pxa270-a0</model>
+      <model usable='unknown' vendor='unknown'>cortex-m4</model>
+      <model usable='unknown' vendor='unknown'>cortex-m55</model>
+      <model usable='unknown' vendor='unknown'>cortex-m7</model>
+      <model usable='unknown' vendor='unknown'>cortex-a15</model>
+      <model usable='unknown' vendor='unknown'>arm11mpcore</model>
+      <model usable='unknown' vendor='unknown'>cortex-r5f</model>
+      <model usable='unknown' vendor='unknown'>cortex-m0</model>
+      <model usable='unknown' vendor='unknown'>sa1110</model>
+      <model usable='unknown' vendor='unknown'>arm1136-r2</model>
+      <model usable='unknown' vendor='unknown'>pxa270-b0</model>
+      <model usable='unknown' vendor='unknown'>pxa262</model>
     </mode>
   </cpu>
   <memoryBacking supported='yes'>
diff --git a/tests/domaincapsdata/qemu_6.0.0.aarch64.xml b/tests/domaincapsdata/qemu_6.0.0.aarch64.xml
index 4164bf49f7..c9830c3b25 100644
--- a/tests/domaincapsdata/qemu_6.0.0.aarch64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0.aarch64.xml
@@ -38,44 +38,44 @@
     </mode>
     <mode name='host-model' supported='no'/>
     <mode name='custom' supported='yes'>
-      <model usable='unknown'>cortex-a9</model>
-      <model usable='unknown'>pxa250</model>
-      <model usable='unknown'>pxa270-a1</model>
-      <model usable='unknown'>arm946</model>
-      <model usable='unknown'>max</model>
-      <model usable='unknown'>pxa270-c0</model>
-      <model usable='unknown'>arm1026</model>
-      <model usable='unknown'>pxa260</model>
-      <model usable='unknown'>pxa270-b1</model>
-      <model usable='unknown'>cortex-a57</model>
-      <model usable='unknown'>pxa255</model>
-      <model usable='unknown'>cortex-r5</model>
-      <model usable='unknown'>arm1136</model>
-      <model usable='unknown'>cortex-a7</model>
-      <model usable='unknown'>pxa261</model>
-      <model usable='unknown'>pxa270-c5</model>
-      <model usable='unknown'>cortex-m3</model>
-      <model usable='unknown'>arm1176</model>
-      <model usable='unknown'>sa1100</model>
-      <model usable='unknown'>cortex-a53</model>
-      <model usable='unknown'>ti925t</model>
-      <model usable='unknown'>cortex-m33</model>
-      <model usable='unknown'>cortex-a8</model>
-      <model usable='unknown'>arm926</model>
-      <model usable='unknown'>cortex-a72</model>
-      <model usable='unknown'>pxa270</model>
-      <model usable='unknown'>pxa270-a0</model>
-      <model usable='unknown'>cortex-m4</model>
-      <model usable='unknown'>cortex-m55</model>
-      <model usable='unknown'>cortex-m7</model>
-      <model usable='unknown'>cortex-a15</model>
-      <model usable='unknown'>arm11mpcore</model>
-      <model usable='unknown'>cortex-r5f</model>
-      <model usable='unknown'>cortex-m0</model>
-      <model usable='unknown'>sa1110</model>
-      <model usable='unknown'>arm1136-r2</model>
-      <model usable='unknown'>pxa270-b0</model>
-      <model usable='unknown'>pxa262</model>
+      <model usable='unknown' vendor='unknown'>cortex-a9</model>
+      <model usable='unknown' vendor='unknown'>pxa250</model>
+      <model usable='unknown' vendor='unknown'>pxa270-a1</model>
+      <model usable='unknown' vendor='unknown'>arm946</model>
+      <model usable='unknown' vendor='unknown'>max</model>
+      <model usable='unknown' vendor='unknown'>pxa270-c0</model>
+      <model usable='unknown' vendor='unknown'>arm1026</model>
+      <model usable='unknown' vendor='unknown'>pxa260</model>
+      <model usable='unknown' vendor='unknown'>pxa270-b1</model>
+      <model usable='unknown' vendor='unknown'>cortex-a57</model>
+      <model usable='unknown' vendor='unknown'>pxa255</model>
+      <model usable='unknown' vendor='unknown'>cortex-r5</model>
+      <model usable='unknown' vendor='unknown'>arm1136</model>
+      <model usable='unknown' vendor='unknown'>cortex-a7</model>
+      <model usable='unknown' vendor='unknown'>pxa261</model>
+      <model usable='unknown' vendor='unknown'>pxa270-c5</model>
+      <model usable='unknown' vendor='unknown'>cortex-m3</model>
+      <model usable='unknown' vendor='unknown'>arm1176</model>
+      <model usable='unknown' vendor='unknown'>sa1100</model>
+      <model usable='unknown' vendor='unknown'>cortex-a53</model>
+      <model usable='unknown' vendor='unknown'>ti925t</model>
+      <model usable='unknown' vendor='unknown'>cortex-m33</model>
+      <model usable='unknown' vendor='unknown'>cortex-a8</model>
+      <model usable='unknown' vendor='unknown'>arm926</model>
+      <model usable='unknown' vendor='unknown'>cortex-a72</model>
+      <model usable='unknown' vendor='unknown'>pxa270</model>
+      <model usable='unknown' vendor='unknown'>pxa270-a0</model>
+      <model usable='unknown' vendor='unknown'>cortex-m4</model>
+      <model usable='unknown' vendor='unknown'>cortex-m55</model>
+      <model usable='unknown' vendor='unknown'>cortex-m7</model>
+      <model usable='unknown' vendor='unknown'>cortex-a15</model>
+      <model usable='unknown' vendor='unknown'>arm11mpcore</model>
+      <model usable='unknown' vendor='unknown'>cortex-r5f</model>
+      <model usable='unknown' vendor='unknown'>cortex-m0</model>
+      <model usable='unknown' vendor='unknown'>sa1110</model>
+      <model usable='unknown' vendor='unknown'>arm1136-r2</model>
+      <model usable='unknown' vendor='unknown'>pxa270-b0</model>
+      <model usable='unknown' vendor='unknown'>pxa262</model>
     </mode>
   </cpu>
   <memoryBacking supported='yes'>
diff --git a/tests/domaincapsdata/qemu_6.0.0.s390x.xml b/tests/domaincapsdata/qemu_6.0.0.s390x.xml
index 13fa3a637e..d0375c68ef 100644
--- a/tests/domaincapsdata/qemu_6.0.0.s390x.xml
+++ b/tests/domaincapsdata/qemu_6.0.0.s390x.xml
@@ -86,80 +86,80 @@
       <feature policy='require' name='cmm'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes'>z800-base</model>
-      <model usable='yes'>z890.2-base</model>
-      <model usable='yes'>z9EC.2</model>
-      <model usable='yes'>z13.2</model>
-      <model usable='yes'>z990.5-base</model>
-      <model usable='yes'>z9BC-base</model>
-      <model usable='yes'>z890.2</model>
-      <model usable='yes'>z890</model>
-      <model usable='yes'>z9BC</model>
-      <model usable='yes'>z13</model>
-      <model usable='yes'>z196</model>
-      <model usable='yes'>z13s</model>
-      <model usable='yes'>z990.3</model>
-      <model usable='yes'>z13s-base</model>
-      <model usable='yes'>z9EC</model>
-      <model usable='yes'>gen15a</model>
-      <model usable='yes'>z14ZR1-base</model>
-      <model usable='yes'>z14.2-base</model>
-      <model usable='yes'>z900.3-base</model>
-      <model usable='yes'>z13.2-base</model>
-      <model usable='yes'>z196.2-base</model>
-      <model usable='yes'>zBC12-base</model>
-      <model usable='yes'>z9BC.2-base</model>
-      <model usable='yes'>z900.2-base</model>
-      <model usable='yes'>z9EC.3</model>
-      <model usable='yes'>zEC12</model>
-      <model usable='yes'>z900</model>
-      <model usable='yes'>z114-base</model>
-      <model usable='yes'>zEC12-base</model>
-      <model usable='yes'>z10EC.2</model>
-      <model usable='yes'>z10EC-base</model>
-      <model usable='yes'>z900.3</model>
-      <model usable='yes'>z14ZR1</model>
-      <model usable='yes'>z10BC</model>
-      <model usable='yes'>z10BC.2-base</model>
-      <model usable='yes'>z9BC.2</model>
-      <model usable='yes'>z990</model>
-      <model usable='yes'>z990.2</model>
-      <model usable='yes'>z14</model>
-      <model usable='yes'>gen15b-base</model>
-      <model usable='yes'>z990.4</model>
-      <model usable='yes'>max</model>
-      <model usable='yes'>z10EC.2-base</model>
-      <model usable='yes'>gen15a-base</model>
-      <model usable='yes'>z800</model>
-      <model usable='yes'>z10EC</model>
-      <model usable='yes'>zEC12.2</model>
-      <model usable='yes'>z990.2-base</model>
-      <model usable='yes'>z900-base</model>
-      <model usable='yes'>z10BC.2</model>
-      <model usable='yes'>z9EC-base</model>
-      <model usable='yes'>z9EC.3-base</model>
-      <model usable='yes'>z114</model>
-      <model usable='yes'>z890.3</model>
-      <model usable='yes'>z196-base</model>
-      <model usable='yes'>z9EC.2-base</model>
-      <model usable='yes'>z196.2</model>
-      <model usable='yes'>z14.2</model>
-      <model usable='yes'>z990-base</model>
-      <model usable='yes'>z900.2</model>
-      <model usable='yes'>z890-base</model>
-      <model usable='yes'>z10EC.3</model>
-      <model usable='yes'>z14-base</model>
-      <model usable='yes'>z990.4-base</model>
-      <model usable='yes'>z10EC.3-base</model>
-      <model usable='yes'>z10BC-base</model>
-      <model usable='yes'>z13-base</model>
-      <model usable='yes'>z990.3-base</model>
-      <model usable='yes'>zEC12.2-base</model>
-      <model usable='yes'>zBC12</model>
-      <model usable='yes'>z890.3-base</model>
-      <model usable='yes'>z990.5</model>
-      <model usable='yes'>gen15b</model>
-      <model usable='yes'>qemu</model>
+      <model usable='yes' vendor='unknown'>z800-base</model>
+      <model usable='yes' vendor='unknown'>z890.2-base</model>
+      <model usable='yes' vendor='unknown'>z9EC.2</model>
+      <model usable='yes' vendor='unknown'>z13.2</model>
+      <model usable='yes' vendor='unknown'>z990.5-base</model>
+      <model usable='yes' vendor='unknown'>z9BC-base</model>
+      <model usable='yes' vendor='unknown'>z890.2</model>
+      <model usable='yes' vendor='unknown'>z890</model>
+      <model usable='yes' vendor='unknown'>z9BC</model>
+      <model usable='yes' vendor='unknown'>z13</model>
+      <model usable='yes' vendor='unknown'>z196</model>
+      <model usable='yes' vendor='unknown'>z13s</model>
+      <model usable='yes' vendor='unknown'>z990.3</model>
+      <model usable='yes' vendor='unknown'>z13s-base</model>
+      <model usable='yes' vendor='unknown'>z9EC</model>
+      <model usable='yes' vendor='unknown'>gen15a</model>
+      <model usable='yes' vendor='unknown'>z14ZR1-base</model>
+      <model usable='yes' vendor='unknown'>z14.2-base</model>
+      <model usable='yes' vendor='unknown'>z900.3-base</model>
+      <model usable='yes' vendor='unknown'>z13.2-base</model>
+      <model usable='yes' vendor='unknown'>z196.2-base</model>
+      <model usable='yes' vendor='unknown'>zBC12-base</model>
+      <model usable='yes' vendor='unknown'>z9BC.2-base</model>
+      <model usable='yes' vendor='unknown'>z900.2-base</model>
+      <model usable='yes' vendor='unknown'>z9EC.3</model>
+      <model usable='yes' vendor='unknown'>zEC12</model>
+      <model usable='yes' vendor='unknown'>z900</model>
+      <model usable='yes' vendor='unknown'>z114-base</model>
+      <model usable='yes' vendor='unknown'>zEC12-base</model>
+      <model usable='yes' vendor='unknown'>z10EC.2</model>
+      <model usable='yes' vendor='unknown'>z10EC-base</model>
+      <model usable='yes' vendor='unknown'>z900.3</model>
+      <model usable='yes' vendor='unknown'>z14ZR1</model>
+      <model usable='yes' vendor='unknown'>z10BC</model>
+      <model usable='yes' vendor='unknown'>z10BC.2-base</model>
+      <model usable='yes' vendor='unknown'>z9BC.2</model>
+      <model usable='yes' vendor='unknown'>z990</model>
+      <model usable='yes' vendor='unknown'>z990.2</model>
+      <model usable='yes' vendor='unknown'>z14</model>
+      <model usable='yes' vendor='unknown'>gen15b-base</model>
+      <model usable='yes' vendor='unknown'>z990.4</model>
+      <model usable='yes' vendor='unknown'>max</model>
+      <model usable='yes' vendor='unknown'>z10EC.2-base</model>
+      <model usable='yes' vendor='unknown'>gen15a-base</model>
+      <model usable='yes' vendor='unknown'>z800</model>
+      <model usable='yes' vendor='unknown'>z10EC</model>
+      <model usable='yes' vendor='unknown'>zEC12.2</model>
+      <model usable='yes' vendor='unknown'>z990.2-base</model>
+      <model usable='yes' vendor='unknown'>z900-base</model>
+      <model usable='yes' vendor='unknown'>z10BC.2</model>
+      <model usable='yes' vendor='unknown'>z9EC-base</model>
+      <model usable='yes' vendor='unknown'>z9EC.3-base</model>
+      <model usable='yes' vendor='unknown'>z114</model>
+      <model usable='yes' vendor='unknown'>z890.3</model>
+      <model usable='yes' vendor='unknown'>z196-base</model>
+      <model usable='yes' vendor='unknown'>z9EC.2-base</model>
+      <model usable='yes' vendor='unknown'>z196.2</model>
+      <model usable='yes' vendor='unknown'>z14.2</model>
+      <model usable='yes' vendor='unknown'>z990-base</model>
+      <model usable='yes' vendor='unknown'>z900.2</model>
+      <model usable='yes' vendor='unknown'>z890-base</model>
+      <model usable='yes' vendor='unknown'>z10EC.3</model>
+      <model usable='yes' vendor='unknown'>z14-base</model>
+      <model usable='yes' vendor='unknown'>z990.4-base</model>
+      <model usable='yes' vendor='unknown'>z10EC.3-base</model>
+      <model usable='yes' vendor='unknown'>z10BC-base</model>
+      <model usable='yes' vendor='unknown'>z13-base</model>
+      <model usable='yes' vendor='unknown'>z990.3-base</model>
+      <model usable='yes' vendor='unknown'>zEC12.2-base</model>
+      <model usable='yes' vendor='unknown'>zBC12</model>
+      <model usable='yes' vendor='unknown'>z890.3-base</model>
+      <model usable='yes' vendor='unknown'>z990.5</model>
+      <model usable='yes' vendor='unknown'>gen15b</model>
+      <model usable='yes' vendor='unknown'>qemu</model>
     </mode>
   </cpu>
   <memoryBacking supported='yes'>
diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
index eb60a2105f..8433c4b51c 100644
--- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
@@ -61,61 +61,61 @@
       <feature policy='require' name='pschange-mc-no'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes'>qemu64</model>
-      <model usable='yes'>qemu32</model>
-      <model usable='no'>phenom</model>
-      <model usable='yes'>pentium3</model>
-      <model usable='yes'>pentium2</model>
-      <model usable='yes'>pentium</model>
-      <model usable='no'>n270</model>
-      <model usable='yes'>kvm64</model>
-      <model usable='yes'>kvm32</model>
-      <model usable='no'>coreduo</model>
-      <model usable='no'>core2duo</model>
-      <model usable='no'>athlon</model>
-      <model usable='no'>Westmere-IBRS</model>
-      <model usable='yes'>Westmere</model>
-      <model usable='no'>Snowridge</model>
-      <model usable='no'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no'>Skylake-Server-IBRS</model>
-      <model usable='no'>Skylake-Server</model>
-      <model usable='no'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no'>Skylake-Client-IBRS</model>
-      <model usable='no'>Skylake-Client</model>
-      <model usable='no'>SandyBridge-IBRS</model>
-      <model usable='yes'>SandyBridge</model>
-      <model usable='yes'>Penryn</model>
-      <model usable='no'>Opteron_G5</model>
-      <model usable='no'>Opteron_G4</model>
-      <model usable='yes'>Opteron_G3</model>
-      <model usable='yes'>Opteron_G2</model>
-      <model usable='yes'>Opteron_G1</model>
-      <model usable='no'>Nehalem-IBRS</model>
-      <model usable='yes'>Nehalem</model>
-      <model usable='no'>IvyBridge-IBRS</model>
-      <model usable='no'>IvyBridge</model>
-      <model usable='no'>Icelake-Server-noTSX</model>
-      <model usable='no'>Icelake-Server</model>
-      <model usable='no' deprecated='yes'>Icelake-Client-noTSX</model>
-      <model usable='no' deprecated='yes'>Icelake-Client</model>
-      <model usable='no'>Haswell-noTSX-IBRS</model>
-      <model usable='no'>Haswell-noTSX</model>
-      <model usable='no'>Haswell-IBRS</model>
-      <model usable='no'>Haswell</model>
-      <model usable='yes'>EPYC-Rome</model>
-      <model usable='no'>EPYC-Milan</model>
-      <model usable='yes'>EPYC-IBPB</model>
-      <model usable='yes'>EPYC</model>
-      <model usable='yes'>Dhyana</model>
-      <model usable='no'>Cooperlake</model>
-      <model usable='yes'>Conroe</model>
-      <model usable='no'>Cascadelake-Server-noTSX</model>
-      <model usable='no'>Cascadelake-Server</model>
-      <model usable='no'>Broadwell-noTSX-IBRS</model>
-      <model usable='no'>Broadwell-noTSX</model>
-      <model usable='no'>Broadwell-IBRS</model>
-      <model usable='no'>Broadwell</model>
-      <model usable='yes'>486</model>
+      <model usable='yes' vendor='unknown'>qemu64</model>
+      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='no' vendor='unknown'>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='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='yes' vendor='unknown'>486</model>
     </mode>
   </cpu>
   <memoryBacking supported='yes'>
diff --git a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
index 0480a086c6..5070e3828b 100644
--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
@@ -63,61 +63,61 @@
       <feature policy='require' name='pschange-mc-no'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes'>qemu64</model>
-      <model usable='yes'>qemu32</model>
-      <model usable='no'>phenom</model>
-      <model usable='yes'>pentium3</model>
-      <model usable='yes'>pentium2</model>
-      <model usable='yes'>pentium</model>
-      <model usable='no'>n270</model>
-      <model usable='yes'>kvm64</model>
-      <model usable='yes'>kvm32</model>
-      <model usable='no'>coreduo</model>
-      <model usable='no'>core2duo</model>
-      <model usable='no'>athlon</model>
-      <model usable='no'>Westmere-IBRS</model>
-      <model usable='yes'>Westmere</model>
-      <model usable='no'>Snowridge</model>
-      <model usable='no'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no'>Skylake-Server-IBRS</model>
-      <model usable='no'>Skylake-Server</model>
-      <model usable='no'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no'>Skylake-Client-IBRS</model>
-      <model usable='no'>Skylake-Client</model>
-      <model usable='no'>SandyBridge-IBRS</model>
-      <model usable='yes'>SandyBridge</model>
-      <model usable='yes'>Penryn</model>
-      <model usable='no'>Opteron_G5</model>
-      <model usable='no'>Opteron_G4</model>
-      <model usable='yes'>Opteron_G3</model>
-      <model usable='yes'>Opteron_G2</model>
-      <model usable='yes'>Opteron_G1</model>
-      <model usable='no'>Nehalem-IBRS</model>
-      <model usable='yes'>Nehalem</model>
-      <model usable='no'>IvyBridge-IBRS</model>
-      <model usable='no'>IvyBridge</model>
-      <model usable='no'>Icelake-Server-noTSX</model>
-      <model usable='no'>Icelake-Server</model>
-      <model usable='no' deprecated='yes'>Icelake-Client-noTSX</model>
-      <model usable='no' deprecated='yes'>Icelake-Client</model>
-      <model usable='no'>Haswell-noTSX-IBRS</model>
-      <model usable='no'>Haswell-noTSX</model>
-      <model usable='no'>Haswell-IBRS</model>
-      <model usable='no'>Haswell</model>
-      <model usable='yes'>EPYC-Rome</model>
-      <model usable='no'>EPYC-Milan</model>
-      <model usable='yes'>EPYC-IBPB</model>
-      <model usable='yes'>EPYC</model>
-      <model usable='yes'>Dhyana</model>
-      <model usable='no'>Cooperlake</model>
-      <model usable='yes'>Conroe</model>
-      <model usable='no'>Cascadelake-Server-noTSX</model>
-      <model usable='no'>Cascadelake-Server</model>
-      <model usable='no'>Broadwell-noTSX-IBRS</model>
-      <model usable='no'>Broadwell-noTSX</model>
-      <model usable='no'>Broadwell-IBRS</model>
-      <model usable='no'>Broadwell</model>
-      <model usable='yes'>486</model>
+      <model usable='yes' vendor='unknown'>qemu64</model>
+      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='no' vendor='unknown'>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='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='yes' vendor='unknown'>486</model>
     </mode>
   </cpu>
   <memoryBacking supported='yes'>
diff --git a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
index 7baecb0c73..d1cc3e88a3 100644
--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
@@ -75,61 +75,61 @@
       <feature policy='disable' name='misalignsse'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes'>qemu64</model>
-      <model usable='yes'>qemu32</model>
-      <model usable='no'>phenom</model>
-      <model usable='yes'>pentium3</model>
-      <model usable='yes'>pentium2</model>
-      <model usable='yes'>pentium</model>
-      <model usable='yes'>n270</model>
-      <model usable='yes'>kvm64</model>
-      <model usable='yes'>kvm32</model>
-      <model usable='yes'>coreduo</model>
-      <model usable='yes'>core2duo</model>
-      <model usable='yes'>athlon</model>
-      <model usable='no'>Westmere-IBRS</model>
-      <model usable='yes'>Westmere</model>
-      <model usable='no'>Snowridge</model>
-      <model usable='no'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no'>Skylake-Server-IBRS</model>
-      <model usable='no'>Skylake-Server</model>
-      <model usable='no'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no'>Skylake-Client-IBRS</model>
-      <model usable='no'>Skylake-Client</model>
-      <model usable='no'>SandyBridge-IBRS</model>
-      <model usable='no'>SandyBridge</model>
-      <model usable='yes'>Penryn</model>
-      <model usable='no'>Opteron_G5</model>
-      <model usable='no'>Opteron_G4</model>
-      <model usable='no'>Opteron_G3</model>
-      <model usable='yes'>Opteron_G2</model>
-      <model usable='yes'>Opteron_G1</model>
-      <model usable='no'>Nehalem-IBRS</model>
-      <model usable='yes'>Nehalem</model>
-      <model usable='no'>IvyBridge-IBRS</model>
-      <model usable='no'>IvyBridge</model>
-      <model usable='no'>Icelake-Server-noTSX</model>
-      <model usable='no'>Icelake-Server</model>
-      <model usable='no' deprecated='yes'>Icelake-Client-noTSX</model>
-      <model usable='no' deprecated='yes'>Icelake-Client</model>
-      <model usable='no'>Haswell-noTSX-IBRS</model>
-      <model usable='no'>Haswell-noTSX</model>
-      <model usable='no'>Haswell-IBRS</model>
-      <model usable='no'>Haswell</model>
-      <model usable='no'>EPYC-Rome</model>
-      <model usable='no'>EPYC-Milan</model>
-      <model usable='no'>EPYC-IBPB</model>
-      <model usable='no'>EPYC</model>
-      <model usable='no'>Dhyana</model>
-      <model usable='no'>Cooperlake</model>
-      <model usable='yes'>Conroe</model>
-      <model usable='no'>Cascadelake-Server-noTSX</model>
-      <model usable='no'>Cascadelake-Server</model>
-      <model usable='no'>Broadwell-noTSX-IBRS</model>
-      <model usable='no'>Broadwell-noTSX</model>
-      <model usable='no'>Broadwell-IBRS</model>
-      <model usable='no'>Broadwell</model>
-      <model usable='yes'>486</model>
+      <model usable='yes' vendor='unknown'>qemu64</model>
+      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='no' vendor='unknown'>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='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='unknown'>486</model>
     </mode>
   </cpu>
   <memoryBacking supported='yes'>
diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
index 9cbe93ad46..a4013faa0e 100644
--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
@@ -62,61 +62,61 @@
       <feature policy='require' name='pschange-mc-no'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes'>qemu64</model>
-      <model usable='yes'>qemu32</model>
-      <model usable='no'>phenom</model>
-      <model usable='yes'>pentium3</model>
-      <model usable='yes'>pentium2</model>
-      <model usable='yes'>pentium</model>
-      <model usable='no'>n270</model>
-      <model usable='yes'>kvm64</model>
-      <model usable='yes'>kvm32</model>
-      <model usable='no'>coreduo</model>
-      <model usable='no'>core2duo</model>
-      <model usable='no'>athlon</model>
-      <model usable='no'>Westmere-IBRS</model>
-      <model usable='yes'>Westmere</model>
-      <model usable='no'>Snowridge</model>
-      <model usable='no'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no'>Skylake-Server-IBRS</model>
-      <model usable='no'>Skylake-Server</model>
-      <model usable='no'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no'>Skylake-Client-IBRS</model>
-      <model usable='no'>Skylake-Client</model>
-      <model usable='no'>SandyBridge-IBRS</model>
-      <model usable='yes'>SandyBridge</model>
-      <model usable='yes'>Penryn</model>
-      <model usable='no'>Opteron_G5</model>
-      <model usable='no'>Opteron_G4</model>
-      <model usable='yes'>Opteron_G3</model>
-      <model usable='yes'>Opteron_G2</model>
-      <model usable='yes'>Opteron_G1</model>
-      <model usable='no'>Nehalem-IBRS</model>
-      <model usable='yes'>Nehalem</model>
-      <model usable='no'>IvyBridge-IBRS</model>
-      <model usable='no'>IvyBridge</model>
-      <model usable='no'>Icelake-Server-noTSX</model>
-      <model usable='no'>Icelake-Server</model>
-      <model usable='no' deprecated='yes'>Icelake-Client-noTSX</model>
-      <model usable='no' deprecated='yes'>Icelake-Client</model>
-      <model usable='no'>Haswell-noTSX-IBRS</model>
-      <model usable='no'>Haswell-noTSX</model>
-      <model usable='no'>Haswell-IBRS</model>
-      <model usable='no'>Haswell</model>
-      <model usable='yes'>EPYC-Rome</model>
-      <model usable='no'>EPYC-Milan</model>
-      <model usable='yes'>EPYC-IBPB</model>
-      <model usable='yes'>EPYC</model>
-      <model usable='yes'>Dhyana</model>
-      <model usable='no'>Cooperlake</model>
-      <model usable='yes'>Conroe</model>
-      <model usable='no'>Cascadelake-Server-noTSX</model>
-      <model usable='no'>Cascadelake-Server</model>
-      <model usable='no'>Broadwell-noTSX-IBRS</model>
-      <model usable='no'>Broadwell-noTSX</model>
-      <model usable='no'>Broadwell-IBRS</model>
-      <model usable='no'>Broadwell</model>
-      <model usable='yes'>486</model>
+      <model usable='yes' vendor='unknown'>qemu64</model>
+      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='no' vendor='unknown'>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='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='yes' vendor='unknown'>486</model>
     </mode>
   </cpu>
   <memoryBacking supported='yes'>
diff --git a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
index 07b951b81f..da3ee2b734 100644
--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
@@ -63,61 +63,61 @@
       <feature policy='require' name='pschange-mc-no'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes'>qemu64</model>
-      <model usable='yes'>qemu32</model>
-      <model usable='no'>phenom</model>
-      <model usable='yes'>pentium3</model>
-      <model usable='yes'>pentium2</model>
-      <model usable='yes'>pentium</model>
-      <model usable='no'>n270</model>
-      <model usable='yes'>kvm64</model>
-      <model usable='yes'>kvm32</model>
-      <model usable='no'>coreduo</model>
-      <model usable='no'>core2duo</model>
-      <model usable='no'>athlon</model>
-      <model usable='no'>Westmere-IBRS</model>
-      <model usable='yes'>Westmere</model>
-      <model usable='no'>Snowridge</model>
-      <model usable='no'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no'>Skylake-Server-IBRS</model>
-      <model usable='no'>Skylake-Server</model>
-      <model usable='no'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no'>Skylake-Client-IBRS</model>
-      <model usable='no'>Skylake-Client</model>
-      <model usable='no'>SandyBridge-IBRS</model>
-      <model usable='yes'>SandyBridge</model>
-      <model usable='yes'>Penryn</model>
-      <model usable='no'>Opteron_G5</model>
-      <model usable='no'>Opteron_G4</model>
-      <model usable='yes'>Opteron_G3</model>
-      <model usable='yes'>Opteron_G2</model>
-      <model usable='yes'>Opteron_G1</model>
-      <model usable='no'>Nehalem-IBRS</model>
-      <model usable='yes'>Nehalem</model>
-      <model usable='no'>IvyBridge-IBRS</model>
-      <model usable='no'>IvyBridge</model>
-      <model usable='no'>Icelake-Server-noTSX</model>
-      <model usable='no'>Icelake-Server</model>
-      <model usable='no' deprecated='yes'>Icelake-Client-noTSX</model>
-      <model usable='no' deprecated='yes'>Icelake-Client</model>
-      <model usable='no'>Haswell-noTSX-IBRS</model>
-      <model usable='no'>Haswell-noTSX</model>
-      <model usable='no'>Haswell-IBRS</model>
-      <model usable='no'>Haswell</model>
-      <model usable='yes'>EPYC-Rome</model>
-      <model usable='no'>EPYC-Milan</model>
-      <model usable='yes'>EPYC-IBPB</model>
-      <model usable='yes'>EPYC</model>
-      <model usable='yes'>Dhyana</model>
-      <model usable='no'>Cooperlake</model>
-      <model usable='yes'>Conroe</model>
-      <model usable='no'>Cascadelake-Server-noTSX</model>
-      <model usable='no'>Cascadelake-Server</model>
-      <model usable='no'>Broadwell-noTSX-IBRS</model>
-      <model usable='no'>Broadwell-noTSX</model>
-      <model usable='no'>Broadwell-IBRS</model>
-      <model usable='no'>Broadwell</model>
-      <model usable='yes'>486</model>
+      <model usable='yes' vendor='unknown'>qemu64</model>
+      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='no' vendor='unknown'>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='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='yes' vendor='unknown'>486</model>
     </mode>
   </cpu>
   <memoryBacking supported='yes'>
diff --git a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
index 367e656b31..e21e6d5de2 100644
--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
@@ -76,61 +76,61 @@
       <feature policy='disable' name='misalignsse'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes'>qemu64</model>
-      <model usable='yes'>qemu32</model>
-      <model usable='no'>phenom</model>
-      <model usable='yes'>pentium3</model>
-      <model usable='yes'>pentium2</model>
-      <model usable='yes'>pentium</model>
-      <model usable='yes'>n270</model>
-      <model usable='yes'>kvm64</model>
-      <model usable='yes'>kvm32</model>
-      <model usable='yes'>coreduo</model>
-      <model usable='yes'>core2duo</model>
-      <model usable='yes'>athlon</model>
-      <model usable='no'>Westmere-IBRS</model>
-      <model usable='yes'>Westmere</model>
-      <model usable='no'>Snowridge</model>
-      <model usable='no'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no'>Skylake-Server-IBRS</model>
-      <model usable='no'>Skylake-Server</model>
-      <model usable='no'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no'>Skylake-Client-IBRS</model>
-      <model usable='no'>Skylake-Client</model>
-      <model usable='no'>SandyBridge-IBRS</model>
-      <model usable='no'>SandyBridge</model>
-      <model usable='yes'>Penryn</model>
-      <model usable='no'>Opteron_G5</model>
-      <model usable='no'>Opteron_G4</model>
-      <model usable='no'>Opteron_G3</model>
-      <model usable='yes'>Opteron_G2</model>
-      <model usable='yes'>Opteron_G1</model>
-      <model usable='no'>Nehalem-IBRS</model>
-      <model usable='yes'>Nehalem</model>
-      <model usable='no'>IvyBridge-IBRS</model>
-      <model usable='no'>IvyBridge</model>
-      <model usable='no'>Icelake-Server-noTSX</model>
-      <model usable='no'>Icelake-Server</model>
-      <model usable='no' deprecated='yes'>Icelake-Client-noTSX</model>
-      <model usable='no' deprecated='yes'>Icelake-Client</model>
-      <model usable='no'>Haswell-noTSX-IBRS</model>
-      <model usable='no'>Haswell-noTSX</model>
-      <model usable='no'>Haswell-IBRS</model>
-      <model usable='no'>Haswell</model>
-      <model usable='no'>EPYC-Rome</model>
-      <model usable='no'>EPYC-Milan</model>
-      <model usable='no'>EPYC-IBPB</model>
-      <model usable='no'>EPYC</model>
-      <model usable='no'>Dhyana</model>
-      <model usable='no'>Cooperlake</model>
-      <model usable='yes'>Conroe</model>
-      <model usable='no'>Cascadelake-Server-noTSX</model>
-      <model usable='no'>Cascadelake-Server</model>
-      <model usable='no'>Broadwell-noTSX-IBRS</model>
-      <model usable='no'>Broadwell-noTSX</model>
-      <model usable='no'>Broadwell-IBRS</model>
-      <model usable='no'>Broadwell</model>
-      <model usable='yes'>486</model>
+      <model usable='yes' vendor='unknown'>qemu64</model>
+      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='no' vendor='unknown'>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='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='unknown'>486</model>
     </mode>
   </cpu>
   <memoryBacking supported='yes'>
diff --git a/tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml
index 99c0fc03fd..c356fc21d4 100644
--- a/tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml
@@ -40,45 +40,45 @@
     </mode>
     <mode name='host-model' supported='no'/>
     <mode name='custom' supported='yes'>
-      <model usable='unknown'>cortex-a9</model>
-      <model usable='unknown'>pxa250</model>
-      <model usable='unknown'>pxa270-a1</model>
-      <model usable='unknown'>arm946</model>
-      <model usable='unknown'>pxa270-c0</model>
-      <model usable='unknown'>max</model>
-      <model usable='unknown'>arm1026</model>
-      <model usable='unknown'>pxa260</model>
-      <model usable='unknown'>pxa270-b1</model>
-      <model usable='unknown'>cortex-a57</model>
-      <model usable='unknown'>pxa255</model>
-      <model usable='unknown'>cortex-r5</model>
-      <model usable='unknown'>arm1136</model>
-      <model usable='unknown'>cortex-a7</model>
-      <model usable='unknown'>pxa261</model>
-      <model usable='unknown'>pxa270-c5</model>
-      <model usable='unknown'>cortex-m3</model>
-      <model usable='unknown'>arm1176</model>
-      <model usable='unknown'>sa1100</model>
-      <model usable='unknown'>cortex-a53</model>
-      <model usable='unknown'>ti925t</model>
-      <model usable='unknown'>cortex-m33</model>
-      <model usable='unknown'>cortex-a8</model>
-      <model usable='unknown'>arm926</model>
-      <model usable='unknown'>cortex-a72</model>
-      <model usable='unknown'>pxa270</model>
-      <model usable='unknown'>pxa270-a0</model>
-      <model usable='unknown'>cortex-m4</model>
-      <model usable='unknown'>cortex-m55</model>
-      <model usable='unknown'>a64fx</model>
-      <model usable='unknown'>cortex-m7</model>
-      <model usable='unknown'>cortex-a15</model>
-      <model usable='unknown'>arm11mpcore</model>
-      <model usable='unknown'>cortex-r5f</model>
-      <model usable='unknown'>cortex-m0</model>
-      <model usable='unknown'>sa1110</model>
-      <model usable='unknown'>arm1136-r2</model>
-      <model usable='unknown'>pxa270-b0</model>
-      <model usable='unknown'>pxa262</model>
+      <model usable='unknown' vendor='unknown'>cortex-a9</model>
+      <model usable='unknown' vendor='unknown'>pxa250</model>
+      <model usable='unknown' vendor='unknown'>pxa270-a1</model>
+      <model usable='unknown' vendor='unknown'>arm946</model>
+      <model usable='unknown' vendor='unknown'>pxa270-c0</model>
+      <model usable='unknown' vendor='unknown'>max</model>
+      <model usable='unknown' vendor='unknown'>arm1026</model>
+      <model usable='unknown' vendor='unknown'>pxa260</model>
+      <model usable='unknown' vendor='unknown'>pxa270-b1</model>
+      <model usable='unknown' vendor='unknown'>cortex-a57</model>
+      <model usable='unknown' vendor='unknown'>pxa255</model>
+      <model usable='unknown' vendor='unknown'>cortex-r5</model>
+      <model usable='unknown' vendor='unknown'>arm1136</model>
+      <model usable='unknown' vendor='unknown'>cortex-a7</model>
+      <model usable='unknown' vendor='unknown'>pxa261</model>
+      <model usable='unknown' vendor='unknown'>pxa270-c5</model>
+      <model usable='unknown' vendor='unknown'>cortex-m3</model>
+      <model usable='unknown' vendor='unknown'>arm1176</model>
+      <model usable='unknown' vendor='unknown'>sa1100</model>
+      <model usable='unknown' vendor='unknown'>cortex-a53</model>
+      <model usable='unknown' vendor='unknown'>ti925t</model>
+      <model usable='unknown' vendor='unknown'>cortex-m33</model>
+      <model usable='unknown' vendor='unknown'>cortex-a8</model>
+      <model usable='unknown' vendor='unknown'>arm926</model>
+      <model usable='unknown' vendor='unknown'>cortex-a72</model>
+      <model usable='unknown' vendor='unknown'>pxa270</model>
+      <model usable='unknown' vendor='unknown'>pxa270-a0</model>
+      <model usable='unknown' vendor='unknown'>cortex-m4</model>
+      <model usable='unknown' vendor='unknown'>cortex-m55</model>
+      <model usable='unknown' vendor='unknown'>a64fx</model>
+      <model usable='unknown' vendor='unknown'>cortex-m7</model>
+      <model usable='unknown' vendor='unknown'>cortex-a15</model>
+      <model usable='unknown' vendor='unknown'>arm11mpcore</model>
+      <model usable='unknown' vendor='unknown'>cortex-r5f</model>
+      <model usable='unknown' vendor='unknown'>cortex-m0</model>
+      <model usable='unknown' vendor='unknown'>sa1110</model>
+      <model usable='unknown' vendor='unknown'>arm1136-r2</model>
+      <model usable='unknown' vendor='unknown'>pxa270-b0</model>
+      <model usable='unknown' vendor='unknown'>pxa262</model>
     </mode>
   </cpu>
   <memoryBacking supported='yes'>
diff --git a/tests/domaincapsdata/qemu_6.2.0.aarch64.xml b/tests/domaincapsdata/qemu_6.2.0.aarch64.xml
index 8e04508694..9e817d15e4 100644
--- a/tests/domaincapsdata/qemu_6.2.0.aarch64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0.aarch64.xml
@@ -38,45 +38,45 @@
     </mode>
     <mode name='host-model' supported='no'/>
     <mode name='custom' supported='yes'>
-      <model usable='unknown'>cortex-a9</model>
-      <model usable='unknown'>pxa250</model>
-      <model usable='unknown'>pxa270-a1</model>
-      <model usable='unknown'>arm946</model>
-      <model usable='unknown'>pxa270-c0</model>
-      <model usable='unknown'>max</model>
-      <model usable='unknown'>arm1026</model>
-      <model usable='unknown'>pxa260</model>
-      <model usable='unknown'>pxa270-b1</model>
-      <model usable='unknown'>cortex-a57</model>
-      <model usable='unknown'>pxa255</model>
-      <model usable='unknown'>cortex-r5</model>
-      <model usable='unknown'>arm1136</model>
-      <model usable='unknown'>cortex-a7</model>
-      <model usable='unknown'>pxa261</model>
-      <model usable='unknown'>pxa270-c5</model>
-      <model usable='unknown'>cortex-m3</model>
-      <model usable='unknown'>arm1176</model>
-      <model usable='unknown'>sa1100</model>
-      <model usable='unknown'>cortex-a53</model>
-      <model usable='unknown'>ti925t</model>
-      <model usable='unknown'>cortex-m33</model>
-      <model usable='unknown'>cortex-a8</model>
-      <model usable='unknown'>arm926</model>
-      <model usable='unknown'>cortex-a72</model>
-      <model usable='unknown'>pxa270</model>
-      <model usable='unknown'>pxa270-a0</model>
-      <model usable='unknown'>cortex-m4</model>
-      <model usable='unknown'>cortex-m55</model>
-      <model usable='unknown'>a64fx</model>
-      <model usable='unknown'>cortex-m7</model>
-      <model usable='unknown'>cortex-a15</model>
-      <model usable='unknown'>arm11mpcore</model>
-      <model usable='unknown'>cortex-r5f</model>
-      <model usable='unknown'>cortex-m0</model>
-      <model usable='unknown'>sa1110</model>
-      <model usable='unknown'>arm1136-r2</model>
-      <model usable='unknown'>pxa270-b0</model>
-      <model usable='unknown'>pxa262</model>
+      <model usable='unknown' vendor='unknown'>cortex-a9</model>
+      <model usable='unknown' vendor='unknown'>pxa250</model>
+      <model usable='unknown' vendor='unknown'>pxa270-a1</model>
+      <model usable='unknown' vendor='unknown'>arm946</model>
+      <model usable='unknown' vendor='unknown'>pxa270-c0</model>
+      <model usable='unknown' vendor='unknown'>max</model>
+      <model usable='unknown' vendor='unknown'>arm1026</model>
+      <model usable='unknown' vendor='unknown'>pxa260</model>
+      <model usable='unknown' vendor='unknown'>pxa270-b1</model>
+      <model usable='unknown' vendor='unknown'>cortex-a57</model>
+      <model usable='unknown' vendor='unknown'>pxa255</model>
+      <model usable='unknown' vendor='unknown'>cortex-r5</model>
+      <model usable='unknown' vendor='unknown'>arm1136</model>
+      <model usable='unknown' vendor='unknown'>cortex-a7</model>
+      <model usable='unknown' vendor='unknown'>pxa261</model>
+      <model usable='unknown' vendor='unknown'>pxa270-c5</model>
+      <model usable='unknown' vendor='unknown'>cortex-m3</model>
+      <model usable='unknown' vendor='unknown'>arm1176</model>
+      <model usable='unknown' vendor='unknown'>sa1100</model>
+      <model usable='unknown' vendor='unknown'>cortex-a53</model>
+      <model usable='unknown' vendor='unknown'>ti925t</model>
+      <model usable='unknown' vendor='unknown'>cortex-m33</model>
+      <model usable='unknown' vendor='unknown'>cortex-a8</model>
+      <model usable='unknown' vendor='unknown'>arm926</model>
+      <model usable='unknown' vendor='unknown'>cortex-a72</model>
+      <model usable='unknown' vendor='unknown'>pxa270</model>
+      <model usable='unknown' vendor='unknown'>pxa270-a0</model>
+      <model usable='unknown' vendor='unknown'>cortex-m4</model>
+      <model usable='unknown' vendor='unknown'>cortex-m55</model>
+      <model usable='unknown' vendor='unknown'>a64fx</model>
+      <model usable='unknown' vendor='unknown'>cortex-m7</model>
+      <model usable='unknown' vendor='unknown'>cortex-a15</model>
+      <model usable='unknown' vendor='unknown'>arm11mpcore</model>
+      <model usable='unknown' vendor='unknown'>cortex-r5f</model>
+      <model usable='unknown' vendor='unknown'>cortex-m0</model>
+      <model usable='unknown' vendor='unknown'>sa1110</model>
+      <model usable='unknown' vendor='unknown'>arm1136-r2</model>
+      <model usable='unknown' vendor='unknown'>pxa270-b0</model>
+      <model usable='unknown' vendor='unknown'>pxa262</model>
     </mode>
   </cpu>
   <memoryBacking supported='yes'>
diff --git a/tests/domaincapsdata/qemu_6.2.0.ppc64.xml b/tests/domaincapsdata/qemu_6.2.0.ppc64.xml
index 0bbe501383..c2fe03d227 100644
--- a/tests/domaincapsdata/qemu_6.2.0.ppc64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0.ppc64.xml
@@ -40,10 +40,10 @@
       <model fallback='allow'>POWER8</model>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='unknown'>POWER10</model>
-      <model usable='unknown'>POWER9</model>
-      <model usable='unknown'>POWER8</model>
-      <model usable='unknown'>POWER7</model>
+      <model usable='unknown' vendor='unknown'>POWER10</model>
+      <model usable='unknown' vendor='unknown'>POWER9</model>
+      <model usable='unknown' vendor='unknown'>POWER8</model>
+      <model usable='unknown' vendor='unknown'>POWER7</model>
     </mode>
   </cpu>
   <memoryBacking supported='yes'>
diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
index f363cf1b79..6aa7d8636c 100644
--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
@@ -62,61 +62,61 @@
       <feature policy='require' name='pschange-mc-no'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes'>qemu64</model>
-      <model usable='yes'>qemu32</model>
-      <model usable='no'>phenom</model>
-      <model usable='yes'>pentium3</model>
-      <model usable='yes'>pentium2</model>
-      <model usable='yes'>pentium</model>
-      <model usable='no'>n270</model>
-      <model usable='yes'>kvm64</model>
-      <model usable='yes'>kvm32</model>
-      <model usable='no'>coreduo</model>
-      <model usable='no'>core2duo</model>
-      <model usable='no'>athlon</model>
-      <model usable='no'>Westmere-IBRS</model>
-      <model usable='yes'>Westmere</model>
-      <model usable='no'>Snowridge</model>
-      <model usable='no'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no'>Skylake-Server-IBRS</model>
-      <model usable='no'>Skylake-Server</model>
-      <model usable='no'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no'>Skylake-Client-IBRS</model>
-      <model usable='no'>Skylake-Client</model>
-      <model usable='no'>SandyBridge-IBRS</model>
-      <model usable='yes'>SandyBridge</model>
-      <model usable='yes'>Penryn</model>
-      <model usable='no'>Opteron_G5</model>
-      <model usable='no'>Opteron_G4</model>
-      <model usable='yes'>Opteron_G3</model>
-      <model usable='yes'>Opteron_G2</model>
-      <model usable='yes'>Opteron_G1</model>
-      <model usable='no'>Nehalem-IBRS</model>
-      <model usable='yes'>Nehalem</model>
-      <model usable='no'>IvyBridge-IBRS</model>
-      <model usable='no'>IvyBridge</model>
-      <model usable='no'>Icelake-Server-noTSX</model>
-      <model usable='no'>Icelake-Server</model>
-      <model usable='no' deprecated='yes'>Icelake-Client-noTSX</model>
-      <model usable='no' deprecated='yes'>Icelake-Client</model>
-      <model usable='no'>Haswell-noTSX-IBRS</model>
-      <model usable='no'>Haswell-noTSX</model>
-      <model usable='no'>Haswell-IBRS</model>
-      <model usable='no'>Haswell</model>
-      <model usable='yes'>EPYC-Rome</model>
-      <model usable='no'>EPYC-Milan</model>
-      <model usable='yes'>EPYC-IBPB</model>
-      <model usable='yes'>EPYC</model>
-      <model usable='yes'>Dhyana</model>
-      <model usable='no'>Cooperlake</model>
-      <model usable='yes'>Conroe</model>
-      <model usable='no'>Cascadelake-Server-noTSX</model>
-      <model usable='no'>Cascadelake-Server</model>
-      <model usable='no'>Broadwell-noTSX-IBRS</model>
-      <model usable='no'>Broadwell-noTSX</model>
-      <model usable='no'>Broadwell-IBRS</model>
-      <model usable='no'>Broadwell</model>
-      <model usable='yes'>486</model>
+      <model usable='yes' vendor='unknown'>qemu64</model>
+      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='no' vendor='unknown'>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='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='yes' vendor='unknown'>486</model>
     </mode>
   </cpu>
   <memoryBacking supported='yes'>
diff --git a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
index 136dadaeb4..caecac2b8c 100644
--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
@@ -64,61 +64,61 @@
       <feature policy='require' name='pschange-mc-no'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes'>qemu64</model>
-      <model usable='yes'>qemu32</model>
-      <model usable='no'>phenom</model>
-      <model usable='yes'>pentium3</model>
-      <model usable='yes'>pentium2</model>
-      <model usable='yes'>pentium</model>
-      <model usable='no'>n270</model>
-      <model usable='yes'>kvm64</model>
-      <model usable='yes'>kvm32</model>
-      <model usable='no'>coreduo</model>
-      <model usable='no'>core2duo</model>
-      <model usable='no'>athlon</model>
-      <model usable='no'>Westmere-IBRS</model>
-      <model usable='yes'>Westmere</model>
-      <model usable='no'>Snowridge</model>
-      <model usable='no'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no'>Skylake-Server-IBRS</model>
-      <model usable='no'>Skylake-Server</model>
-      <model usable='no'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no'>Skylake-Client-IBRS</model>
-      <model usable='no'>Skylake-Client</model>
-      <model usable='no'>SandyBridge-IBRS</model>
-      <model usable='yes'>SandyBridge</model>
-      <model usable='yes'>Penryn</model>
-      <model usable='no'>Opteron_G5</model>
-      <model usable='no'>Opteron_G4</model>
-      <model usable='yes'>Opteron_G3</model>
-      <model usable='yes'>Opteron_G2</model>
-      <model usable='yes'>Opteron_G1</model>
-      <model usable='no'>Nehalem-IBRS</model>
-      <model usable='yes'>Nehalem</model>
-      <model usable='no'>IvyBridge-IBRS</model>
-      <model usable='no'>IvyBridge</model>
-      <model usable='no'>Icelake-Server-noTSX</model>
-      <model usable='no'>Icelake-Server</model>
-      <model usable='no' deprecated='yes'>Icelake-Client-noTSX</model>
-      <model usable='no' deprecated='yes'>Icelake-Client</model>
-      <model usable='no'>Haswell-noTSX-IBRS</model>
-      <model usable='no'>Haswell-noTSX</model>
-      <model usable='no'>Haswell-IBRS</model>
-      <model usable='no'>Haswell</model>
-      <model usable='yes'>EPYC-Rome</model>
-      <model usable='no'>EPYC-Milan</model>
-      <model usable='yes'>EPYC-IBPB</model>
-      <model usable='yes'>EPYC</model>
-      <model usable='yes'>Dhyana</model>
-      <model usable='no'>Cooperlake</model>
-      <model usable='yes'>Conroe</model>
-      <model usable='no'>Cascadelake-Server-noTSX</model>
-      <model usable='no'>Cascadelake-Server</model>
-      <model usable='no'>Broadwell-noTSX-IBRS</model>
-      <model usable='no'>Broadwell-noTSX</model>
-      <model usable='no'>Broadwell-IBRS</model>
-      <model usable='no'>Broadwell</model>
-      <model usable='yes'>486</model>
+      <model usable='yes' vendor='unknown'>qemu64</model>
+      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='no' vendor='unknown'>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='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='yes' vendor='unknown'>486</model>
     </mode>
   </cpu>
   <memoryBacking supported='yes'>
diff --git a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
index c684759356..980c0e0bd9 100644
--- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
@@ -77,61 +77,61 @@
       <feature policy='disable' name='misalignsse'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes'>qemu64</model>
-      <model usable='yes'>qemu32</model>
-      <model usable='no'>phenom</model>
-      <model usable='yes'>pentium3</model>
-      <model usable='yes'>pentium2</model>
-      <model usable='yes'>pentium</model>
-      <model usable='yes'>n270</model>
-      <model usable='yes'>kvm64</model>
-      <model usable='yes'>kvm32</model>
-      <model usable='yes'>coreduo</model>
-      <model usable='yes'>core2duo</model>
-      <model usable='yes'>athlon</model>
-      <model usable='no'>Westmere-IBRS</model>
-      <model usable='yes'>Westmere</model>
-      <model usable='no'>Snowridge</model>
-      <model usable='no'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no'>Skylake-Server-IBRS</model>
-      <model usable='no'>Skylake-Server</model>
-      <model usable='no'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no'>Skylake-Client-IBRS</model>
-      <model usable='no'>Skylake-Client</model>
-      <model usable='no'>SandyBridge-IBRS</model>
-      <model usable='no'>SandyBridge</model>
-      <model usable='yes'>Penryn</model>
-      <model usable='no'>Opteron_G5</model>
-      <model usable='no'>Opteron_G4</model>
-      <model usable='no'>Opteron_G3</model>
-      <model usable='yes'>Opteron_G2</model>
-      <model usable='yes'>Opteron_G1</model>
-      <model usable='no'>Nehalem-IBRS</model>
-      <model usable='yes'>Nehalem</model>
-      <model usable='no'>IvyBridge-IBRS</model>
-      <model usable='no'>IvyBridge</model>
-      <model usable='no'>Icelake-Server-noTSX</model>
-      <model usable='no'>Icelake-Server</model>
-      <model usable='no' deprecated='yes'>Icelake-Client-noTSX</model>
-      <model usable='no' deprecated='yes'>Icelake-Client</model>
-      <model usable='no'>Haswell-noTSX-IBRS</model>
-      <model usable='no'>Haswell-noTSX</model>
-      <model usable='no'>Haswell-IBRS</model>
-      <model usable='no'>Haswell</model>
-      <model usable='no'>EPYC-Rome</model>
-      <model usable='no'>EPYC-Milan</model>
-      <model usable='no'>EPYC-IBPB</model>
-      <model usable='no'>EPYC</model>
-      <model usable='no'>Dhyana</model>
-      <model usable='no'>Cooperlake</model>
-      <model usable='yes'>Conroe</model>
-      <model usable='no'>Cascadelake-Server-noTSX</model>
-      <model usable='no'>Cascadelake-Server</model>
-      <model usable='no'>Broadwell-noTSX-IBRS</model>
-      <model usable='no'>Broadwell-noTSX</model>
-      <model usable='no'>Broadwell-IBRS</model>
-      <model usable='no'>Broadwell</model>
-      <model usable='yes'>486</model>
+      <model usable='yes' vendor='unknown'>qemu64</model>
+      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='no' vendor='unknown'>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='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='unknown'>486</model>
     </mode>
   </cpu>
   <memoryBacking supported='yes'>
diff --git a/tests/domaincapsdata/qemu_7.0.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_7.0.0-virt.aarch64.xml
index 1d6f29db9f..96c8fbfdf3 100644
--- a/tests/domaincapsdata/qemu_7.0.0-virt.aarch64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-virt.aarch64.xml
@@ -40,45 +40,45 @@
     </mode>
     <mode name='host-model' supported='no'/>
     <mode name='custom' supported='yes'>
-      <model usable='unknown'>cortex-a9</model>
-      <model usable='unknown'>pxa250</model>
-      <model usable='unknown'>pxa270-a1</model>
-      <model usable='unknown'>arm946</model>
-      <model usable='unknown'>pxa270-c0</model>
-      <model usable='unknown'>max</model>
-      <model usable='unknown'>arm1026</model>
-      <model usable='unknown'>pxa260</model>
-      <model usable='unknown'>pxa270-b1</model>
-      <model usable='unknown'>cortex-a57</model>
-      <model usable='unknown'>pxa255</model>
-      <model usable='unknown'>cortex-r5</model>
-      <model usable='unknown'>arm1136</model>
-      <model usable='unknown'>cortex-a7</model>
-      <model usable='unknown'>pxa261</model>
-      <model usable='unknown'>pxa270-c5</model>
-      <model usable='unknown'>cortex-m3</model>
-      <model usable='unknown'>arm1176</model>
-      <model usable='unknown'>sa1100</model>
-      <model usable='unknown'>ti925t</model>
-      <model usable='unknown'>cortex-a53</model>
-      <model usable='unknown'>cortex-m33</model>
-      <model usable='unknown'>cortex-a8</model>
-      <model usable='unknown'>arm926</model>
-      <model usable='unknown'>cortex-a72</model>
-      <model usable='unknown'>pxa270</model>
-      <model usable='unknown'>pxa270-a0</model>
-      <model usable='unknown'>cortex-m4</model>
-      <model usable='unknown'>cortex-m55</model>
-      <model usable='unknown'>a64fx</model>
-      <model usable='unknown'>cortex-m7</model>
-      <model usable='unknown'>cortex-a15</model>
-      <model usable='unknown'>arm11mpcore</model>
-      <model usable='unknown'>cortex-r5f</model>
-      <model usable='unknown'>cortex-m0</model>
-      <model usable='unknown'>sa1110</model>
-      <model usable='unknown'>arm1136-r2</model>
-      <model usable='unknown'>pxa270-b0</model>
-      <model usable='unknown'>pxa262</model>
+      <model usable='unknown' vendor='unknown'>cortex-a9</model>
+      <model usable='unknown' vendor='unknown'>pxa250</model>
+      <model usable='unknown' vendor='unknown'>pxa270-a1</model>
+      <model usable='unknown' vendor='unknown'>arm946</model>
+      <model usable='unknown' vendor='unknown'>pxa270-c0</model>
+      <model usable='unknown' vendor='unknown'>max</model>
+      <model usable='unknown' vendor='unknown'>arm1026</model>
+      <model usable='unknown' vendor='unknown'>pxa260</model>
+      <model usable='unknown' vendor='unknown'>pxa270-b1</model>
+      <model usable='unknown' vendor='unknown'>cortex-a57</model>
+      <model usable='unknown' vendor='unknown'>pxa255</model>
+      <model usable='unknown' vendor='unknown'>cortex-r5</model>
+      <model usable='unknown' vendor='unknown'>arm1136</model>
+      <model usable='unknown' vendor='unknown'>cortex-a7</model>
+      <model usable='unknown' vendor='unknown'>pxa261</model>
+      <model usable='unknown' vendor='unknown'>pxa270-c5</model>
+      <model usable='unknown' vendor='unknown'>cortex-m3</model>
+      <model usable='unknown' vendor='unknown'>arm1176</model>
+      <model usable='unknown' vendor='unknown'>sa1100</model>
+      <model usable='unknown' vendor='unknown'>ti925t</model>
+      <model usable='unknown' vendor='unknown'>cortex-a53</model>
+      <model usable='unknown' vendor='unknown'>cortex-m33</model>
+      <model usable='unknown' vendor='unknown'>cortex-a8</model>
+      <model usable='unknown' vendor='unknown'>arm926</model>
+      <model usable='unknown' vendor='unknown'>cortex-a72</model>
+      <model usable='unknown' vendor='unknown'>pxa270</model>
+      <model usable='unknown' vendor='unknown'>pxa270-a0</model>
+      <model usable='unknown' vendor='unknown'>cortex-m4</model>
+      <model usable='unknown' vendor='unknown'>cortex-m55</model>
+      <model usable='unknown' vendor='unknown'>a64fx</model>
+      <model usable='unknown' vendor='unknown'>cortex-m7</model>
+      <model usable='unknown' vendor='unknown'>cortex-a15</model>
+      <model usable='unknown' vendor='unknown'>arm11mpcore</model>
+      <model usable='unknown' vendor='unknown'>cortex-r5f</model>
+      <model usable='unknown' vendor='unknown'>cortex-m0</model>
+      <model usable='unknown' vendor='unknown'>sa1110</model>
+      <model usable='unknown' vendor='unknown'>arm1136-r2</model>
+      <model usable='unknown' vendor='unknown'>pxa270-b0</model>
+      <model usable='unknown' vendor='unknown'>pxa262</model>
     </mode>
   </cpu>
   <memoryBacking supported='yes'>
diff --git a/tests/domaincapsdata/qemu_7.0.0.aarch64.xml b/tests/domaincapsdata/qemu_7.0.0.aarch64.xml
index 73097470f8..ce0a313bb9 100644
--- a/tests/domaincapsdata/qemu_7.0.0.aarch64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0.aarch64.xml
@@ -38,45 +38,45 @@
     </mode>
     <mode name='host-model' supported='no'/>
     <mode name='custom' supported='yes'>
-      <model usable='unknown'>cortex-a9</model>
-      <model usable='unknown'>pxa250</model>
-      <model usable='unknown'>pxa270-a1</model>
-      <model usable='unknown'>arm946</model>
-      <model usable='unknown'>pxa270-c0</model>
-      <model usable='unknown'>max</model>
-      <model usable='unknown'>arm1026</model>
-      <model usable='unknown'>pxa260</model>
-      <model usable='unknown'>pxa270-b1</model>
-      <model usable='unknown'>cortex-a57</model>
-      <model usable='unknown'>pxa255</model>
-      <model usable='unknown'>cortex-r5</model>
-      <model usable='unknown'>arm1136</model>
-      <model usable='unknown'>cortex-a7</model>
-      <model usable='unknown'>pxa261</model>
-      <model usable='unknown'>pxa270-c5</model>
-      <model usable='unknown'>cortex-m3</model>
-      <model usable='unknown'>arm1176</model>
-      <model usable='unknown'>sa1100</model>
-      <model usable='unknown'>ti925t</model>
-      <model usable='unknown'>cortex-a53</model>
-      <model usable='unknown'>cortex-m33</model>
-      <model usable='unknown'>cortex-a8</model>
-      <model usable='unknown'>arm926</model>
-      <model usable='unknown'>cortex-a72</model>
-      <model usable='unknown'>pxa270</model>
-      <model usable='unknown'>pxa270-a0</model>
-      <model usable='unknown'>cortex-m4</model>
-      <model usable='unknown'>cortex-m55</model>
-      <model usable='unknown'>a64fx</model>
-      <model usable='unknown'>cortex-m7</model>
-      <model usable='unknown'>cortex-a15</model>
-      <model usable='unknown'>arm11mpcore</model>
-      <model usable='unknown'>cortex-r5f</model>
-      <model usable='unknown'>cortex-m0</model>
-      <model usable='unknown'>sa1110</model>
-      <model usable='unknown'>arm1136-r2</model>
-      <model usable='unknown'>pxa270-b0</model>
-      <model usable='unknown'>pxa262</model>
+      <model usable='unknown' vendor='unknown'>cortex-a9</model>
+      <model usable='unknown' vendor='unknown'>pxa250</model>
+      <model usable='unknown' vendor='unknown'>pxa270-a1</model>
+      <model usable='unknown' vendor='unknown'>arm946</model>
+      <model usable='unknown' vendor='unknown'>pxa270-c0</model>
+      <model usable='unknown' vendor='unknown'>max</model>
+      <model usable='unknown' vendor='unknown'>arm1026</model>
+      <model usable='unknown' vendor='unknown'>pxa260</model>
+      <model usable='unknown' vendor='unknown'>pxa270-b1</model>
+      <model usable='unknown' vendor='unknown'>cortex-a57</model>
+      <model usable='unknown' vendor='unknown'>pxa255</model>
+      <model usable='unknown' vendor='unknown'>cortex-r5</model>
+      <model usable='unknown' vendor='unknown'>arm1136</model>
+      <model usable='unknown' vendor='unknown'>cortex-a7</model>
+      <model usable='unknown' vendor='unknown'>pxa261</model>
+      <model usable='unknown' vendor='unknown'>pxa270-c5</model>
+      <model usable='unknown' vendor='unknown'>cortex-m3</model>
+      <model usable='unknown' vendor='unknown'>arm1176</model>
+      <model usable='unknown' vendor='unknown'>sa1100</model>
+      <model usable='unknown' vendor='unknown'>ti925t</model>
+      <model usable='unknown' vendor='unknown'>cortex-a53</model>
+      <model usable='unknown' vendor='unknown'>cortex-m33</model>
+      <model usable='unknown' vendor='unknown'>cortex-a8</model>
+      <model usable='unknown' vendor='unknown'>arm926</model>
+      <model usable='unknown' vendor='unknown'>cortex-a72</model>
+      <model usable='unknown' vendor='unknown'>pxa270</model>
+      <model usable='unknown' vendor='unknown'>pxa270-a0</model>
+      <model usable='unknown' vendor='unknown'>cortex-m4</model>
+      <model usable='unknown' vendor='unknown'>cortex-m55</model>
+      <model usable='unknown' vendor='unknown'>a64fx</model>
+      <model usable='unknown' vendor='unknown'>cortex-m7</model>
+      <model usable='unknown' vendor='unknown'>cortex-a15</model>
+      <model usable='unknown' vendor='unknown'>arm11mpcore</model>
+      <model usable='unknown' vendor='unknown'>cortex-r5f</model>
+      <model usable='unknown' vendor='unknown'>cortex-m0</model>
+      <model usable='unknown' vendor='unknown'>sa1110</model>
+      <model usable='unknown' vendor='unknown'>arm1136-r2</model>
+      <model usable='unknown' vendor='unknown'>pxa270-b0</model>
+      <model usable='unknown' vendor='unknown'>pxa262</model>
     </mode>
   </cpu>
   <memoryBacking supported='yes'>
diff --git a/tests/domaincapsdata/qemu_7.0.0.ppc64.xml b/tests/domaincapsdata/qemu_7.0.0.ppc64.xml
index 7765c941c5..06e713373e 100644
--- a/tests/domaincapsdata/qemu_7.0.0.ppc64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0.ppc64.xml
@@ -40,10 +40,10 @@
       <model fallback='allow'>POWER8</model>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='unknown'>POWER10</model>
-      <model usable='unknown'>POWER9</model>
-      <model usable='unknown'>POWER8</model>
-      <model usable='unknown'>POWER7</model>
+      <model usable='unknown' vendor='unknown'>POWER10</model>
+      <model usable='unknown' vendor='unknown'>POWER9</model>
+      <model usable='unknown' vendor='unknown'>POWER8</model>
+      <model usable='unknown' vendor='unknown'>POWER7</model>
     </mode>
   </cpu>
   <memoryBacking supported='yes'>
diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
index 0f9a65ef1b..5359f66dcb 100644
--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
@@ -63,61 +63,61 @@
       <feature policy='require' name='pschange-mc-no'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes'>qemu64</model>
-      <model usable='yes'>qemu32</model>
-      <model usable='no'>phenom</model>
-      <model usable='yes'>pentium3</model>
-      <model usable='yes'>pentium2</model>
-      <model usable='yes'>pentium</model>
-      <model usable='no'>n270</model>
-      <model usable='yes'>kvm64</model>
-      <model usable='yes'>kvm32</model>
-      <model usable='no'>coreduo</model>
-      <model usable='no'>core2duo</model>
-      <model usable='no'>athlon</model>
-      <model usable='no'>Westmere-IBRS</model>
-      <model usable='yes'>Westmere</model>
-      <model usable='no'>Snowridge</model>
-      <model usable='no'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no'>Skylake-Server-IBRS</model>
-      <model usable='no'>Skylake-Server</model>
-      <model usable='no'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no'>Skylake-Client-IBRS</model>
-      <model usable='no'>Skylake-Client</model>
-      <model usable='no'>SandyBridge-IBRS</model>
-      <model usable='yes'>SandyBridge</model>
-      <model usable='yes'>Penryn</model>
-      <model usable='no'>Opteron_G5</model>
-      <model usable='no'>Opteron_G4</model>
-      <model usable='yes'>Opteron_G3</model>
-      <model usable='yes'>Opteron_G2</model>
-      <model usable='yes'>Opteron_G1</model>
-      <model usable='no'>Nehalem-IBRS</model>
-      <model usable='yes'>Nehalem</model>
-      <model usable='no'>IvyBridge-IBRS</model>
-      <model usable='no'>IvyBridge</model>
-      <model usable='no'>Icelake-Server-noTSX</model>
-      <model usable='no'>Icelake-Server</model>
-      <model usable='no' deprecated='yes'>Icelake-Client-noTSX</model>
-      <model usable='no' deprecated='yes'>Icelake-Client</model>
-      <model usable='no'>Haswell-noTSX-IBRS</model>
-      <model usable='no'>Haswell-noTSX</model>
-      <model usable='no'>Haswell-IBRS</model>
-      <model usable='no'>Haswell</model>
-      <model usable='yes'>EPYC-Rome</model>
-      <model usable='no'>EPYC-Milan</model>
-      <model usable='yes'>EPYC-IBPB</model>
-      <model usable='yes'>EPYC</model>
-      <model usable='yes'>Dhyana</model>
-      <model usable='no'>Cooperlake</model>
-      <model usable='yes'>Conroe</model>
-      <model usable='no'>Cascadelake-Server-noTSX</model>
-      <model usable='no'>Cascadelake-Server</model>
-      <model usable='no'>Broadwell-noTSX-IBRS</model>
-      <model usable='no'>Broadwell-noTSX</model>
-      <model usable='no'>Broadwell-IBRS</model>
-      <model usable='no'>Broadwell</model>
-      <model usable='yes'>486</model>
+      <model usable='yes' vendor='unknown'>qemu64</model>
+      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='no' vendor='unknown'>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='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='yes' vendor='unknown'>486</model>
     </mode>
   </cpu>
   <memoryBacking supported='yes'>
diff --git a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
index 30082712f4..5168c62266 100644
--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
@@ -65,59 +65,59 @@
       <feature policy='require' name='pschange-mc-no'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes'>qemu64</model>
-      <model usable='yes'>qemu32</model>
-      <model usable='no'>phenom</model>
-      <model usable='yes'>pentium3</model>
-      <model usable='yes'>pentium2</model>
-      <model usable='yes'>pentium</model>
-      <model usable='no'>n270</model>
-      <model usable='yes'>kvm64</model>
-      <model usable='yes'>kvm32</model>
-      <model usable='no'>coreduo</model>
-      <model usable='no'>core2duo</model>
-      <model usable='no'>athlon</model>
-      <model usable='no'>Westmere-IBRS</model>
-      <model usable='yes'>Westmere</model>
-      <model usable='no'>Snowridge</model>
-      <model usable='no'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no'>Skylake-Server-IBRS</model>
-      <model usable='no'>Skylake-Server</model>
-      <model usable='no'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no'>Skylake-Client-IBRS</model>
-      <model usable='no'>Skylake-Client</model>
-      <model usable='no'>SandyBridge-IBRS</model>
-      <model usable='yes'>SandyBridge</model>
-      <model usable='yes'>Penryn</model>
-      <model usable='no'>Opteron_G5</model>
-      <model usable='no'>Opteron_G4</model>
-      <model usable='yes'>Opteron_G3</model>
-      <model usable='yes'>Opteron_G2</model>
-      <model usable='yes'>Opteron_G1</model>
-      <model usable='no'>Nehalem-IBRS</model>
-      <model usable='yes'>Nehalem</model>
-      <model usable='no'>IvyBridge-IBRS</model>
-      <model usable='no'>IvyBridge</model>
-      <model usable='no'>Icelake-Server-noTSX</model>
-      <model usable='no'>Icelake-Server</model>
-      <model usable='no'>Haswell-noTSX-IBRS</model>
-      <model usable='no'>Haswell-noTSX</model>
-      <model usable='no'>Haswell-IBRS</model>
-      <model usable='no'>Haswell</model>
-      <model usable='yes'>EPYC-Rome</model>
-      <model usable='no'>EPYC-Milan</model>
-      <model usable='yes'>EPYC-IBPB</model>
-      <model usable='yes'>EPYC</model>
-      <model usable='yes'>Dhyana</model>
-      <model usable='no'>Cooperlake</model>
-      <model usable='yes'>Conroe</model>
-      <model usable='no'>Cascadelake-Server-noTSX</model>
-      <model usable='no'>Cascadelake-Server</model>
-      <model usable='no'>Broadwell-noTSX-IBRS</model>
-      <model usable='no'>Broadwell-noTSX</model>
-      <model usable='no'>Broadwell-IBRS</model>
-      <model usable='no'>Broadwell</model>
-      <model usable='yes'>486</model>
+      <model usable='yes' vendor='unknown'>qemu64</model>
+      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='no' vendor='unknown'>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='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='yes' vendor='unknown'>486</model>
     </mode>
   </cpu>
   <memoryBacking supported='yes'>
diff --git a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
index bcca02f0a4..98b1d14ec1 100644
--- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
@@ -77,59 +77,59 @@
       <feature policy='disable' name='misalignsse'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes'>qemu64</model>
-      <model usable='yes'>qemu32</model>
-      <model usable='no'>phenom</model>
-      <model usable='yes'>pentium3</model>
-      <model usable='yes'>pentium2</model>
-      <model usable='yes'>pentium</model>
-      <model usable='yes'>n270</model>
-      <model usable='yes'>kvm64</model>
-      <model usable='yes'>kvm32</model>
-      <model usable='yes'>coreduo</model>
-      <model usable='yes'>core2duo</model>
-      <model usable='yes'>athlon</model>
-      <model usable='no'>Westmere-IBRS</model>
-      <model usable='yes'>Westmere</model>
-      <model usable='no'>Snowridge</model>
-      <model usable='no'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no'>Skylake-Server-IBRS</model>
-      <model usable='no'>Skylake-Server</model>
-      <model usable='no'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no'>Skylake-Client-IBRS</model>
-      <model usable='no'>Skylake-Client</model>
-      <model usable='no'>SandyBridge-IBRS</model>
-      <model usable='no'>SandyBridge</model>
-      <model usable='yes'>Penryn</model>
-      <model usable='no'>Opteron_G5</model>
-      <model usable='no'>Opteron_G4</model>
-      <model usable='no'>Opteron_G3</model>
-      <model usable='yes'>Opteron_G2</model>
-      <model usable='yes'>Opteron_G1</model>
-      <model usable='no'>Nehalem-IBRS</model>
-      <model usable='yes'>Nehalem</model>
-      <model usable='no'>IvyBridge-IBRS</model>
-      <model usable='no'>IvyBridge</model>
-      <model usable='no'>Icelake-Server-noTSX</model>
-      <model usable='no'>Icelake-Server</model>
-      <model usable='no'>Haswell-noTSX-IBRS</model>
-      <model usable='no'>Haswell-noTSX</model>
-      <model usable='no'>Haswell-IBRS</model>
-      <model usable='no'>Haswell</model>
-      <model usable='no'>EPYC-Rome</model>
-      <model usable='no'>EPYC-Milan</model>
-      <model usable='no'>EPYC-IBPB</model>
-      <model usable='no'>EPYC</model>
-      <model usable='no'>Dhyana</model>
-      <model usable='no'>Cooperlake</model>
-      <model usable='yes'>Conroe</model>
-      <model usable='no'>Cascadelake-Server-noTSX</model>
-      <model usable='no'>Cascadelake-Server</model>
-      <model usable='no'>Broadwell-noTSX-IBRS</model>
-      <model usable='no'>Broadwell-noTSX</model>
-      <model usable='no'>Broadwell-IBRS</model>
-      <model usable='no'>Broadwell</model>
-      <model usable='yes'>486</model>
+      <model usable='yes' vendor='unknown'>qemu64</model>
+      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='no' vendor='unknown'>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='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='unknown'>486</model>
     </mode>
   </cpu>
   <memoryBacking supported='yes'>
diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
index f377b8e3a9..ec982b16ae 100644
--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
@@ -64,59 +64,59 @@
       <feature policy='require' name='pschange-mc-no'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes'>qemu64</model>
-      <model usable='yes'>qemu32</model>
-      <model usable='no'>phenom</model>
-      <model usable='yes'>pentium3</model>
-      <model usable='yes'>pentium2</model>
-      <model usable='yes'>pentium</model>
-      <model usable='no'>n270</model>
-      <model usable='yes'>kvm64</model>
-      <model usable='yes'>kvm32</model>
-      <model usable='no'>coreduo</model>
-      <model usable='no'>core2duo</model>
-      <model usable='no'>athlon</model>
-      <model usable='no'>Westmere-IBRS</model>
-      <model usable='yes'>Westmere</model>
-      <model usable='no'>Snowridge</model>
-      <model usable='no'>Skylake-Server-noTSX-IBRS</model>
-      <model usable='no'>Skylake-Server-IBRS</model>
-      <model usable='no'>Skylake-Server</model>
-      <model usable='no'>Skylake-Client-noTSX-IBRS</model>
-      <model usable='no'>Skylake-Client-IBRS</model>
-      <model usable='no'>Skylake-Client</model>
-      <model usable='no'>SandyBridge-IBRS</model>
-      <model usable='yes'>SandyBridge</model>
-      <model usable='yes'>Penryn</model>
-      <model usable='no'>Opteron_G5</model>
-      <model usable='no'>Opteron_G4</model>
-      <model usable='yes'>Opteron_G3</model>
-      <model usable='yes'>Opteron_G2</model>
-      <model usable='yes'>Opteron_G1</model>
-      <model usable='no'>Nehalem-IBRS</model>
-      <model usable='yes'>Nehalem</model>
-      <model usable='no'>IvyBridge-IBRS</model>
-      <model usable='no'>IvyBridge</model>
-      <model usable='no'>Icelake-Server-noTSX</model>
-      <model usable='no'>Icelake-Server</model>
-      <model usable='no'>Haswell-noTSX-IBRS</model>
-      <model usable='no'>Haswell-noTSX</model>
-      <model usable='no'>Haswell-IBRS</model>
-      <model usable='no'>Haswell</model>
-      <model usable='yes'>EPYC-Rome</model>
-      <model usable='no'>EPYC-Milan</model>
-      <model usable='yes'>EPYC-IBPB</model>
-      <model usable='yes'>EPYC</model>
-      <model usable='yes'>Dhyana</model>
-      <model usable='no'>Cooperlake</model>
-      <model usable='yes'>Conroe</model>
-      <model usable='no'>Cascadelake-Server-noTSX</model>
-      <model usable='no'>Cascadelake-Server</model>
-      <model usable='no'>Broadwell-noTSX-IBRS</model>
-      <model usable='no'>Broadwell-noTSX</model>
-      <model usable='no'>Broadwell-IBRS</model>
-      <model usable='no'>Broadwell</model>
-      <model usable='yes'>486</model>
+      <model usable='yes' vendor='unknown'>qemu64</model>
+      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='no' vendor='unknown'>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='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='yes' vendor='unknown'>486</model>
     </mode>
   </cpu>
   <memoryBacking supported='yes'>