From: Jiri Denemark <jdenemar@redhat.com>
Date: Thu, 19 Sep 2019 18:47:37 +0000 (+0200)
Subject: qemu: Store typename from query-cpu-definitions in qemuCaps
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=94b9e6826397a074971fae73e6d8ba1991f5f97b;p=libvirt.git

qemu: Store typename from query-cpu-definitions in qemuCaps

We need to create a mapping between CPU model names and their
corresponding QOM types.

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

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 32fe3cc677..7e9a451c08 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -3530,6 +3530,8 @@ virQEMUCapsLoadCPUModels(virQEMUCapsPtr qemuCaps,
             return -1;
         }
 
+        cpu->type = virXMLPropString(nodes[i], "typename");
+
         node = ctxt->node;
         ctxt->node = nodes[i];
         nblockers = virXPathNodeSet("./blocker", ctxt, &blockerNodes);
@@ -3991,6 +3993,7 @@ virQEMUCapsFormatCPUModels(virQEMUCapsPtr qemuCaps,
 
         virBufferAsprintf(buf, "<cpu type='%s' ", typeStr);
         virBufferEscapeString(buf, "name='%s'", cpu->name);
+        virBufferEscapeString(buf, " typename='%s'", cpu->type);
         if (cpu->usable) {
             virBufferAsprintf(buf, " usable='%s'",
                               virDomainCapsCPUUsableTypeToString(cpu->usable));
diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index 4606429868..1131616291 100644
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -3571,6 +3571,7 @@ qemuMonitorCPUDefsFree(qemuMonitorCPUDefsPtr defs)
     for (i = 0; i < defs->ncpus; i++) {
         g_strfreev(defs->cpus[i].blockers);
         g_free(defs->cpus[i].name);
+        g_free(defs->cpus[i].type);
     }
 
     g_free(defs->cpus);
@@ -3607,6 +3608,7 @@ qemuMonitorCPUDefsCopy(qemuMonitorCPUDefsPtr src)
 
         cpuDst->usable = cpuSrc->usable;
         cpuDst->name = g_strdup(cpuSrc->name);
+        cpuDst->type = g_strdup(cpuSrc->type);
         cpuDst->blockers = g_strdupv(cpuSrc->blockers);
     }
 
diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index cd6b529b58..868f94fa99 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -1090,6 +1090,7 @@ typedef qemuMonitorCPUDefInfo *qemuMonitorCPUDefInfoPtr;
 struct _qemuMonitorCPUDefInfo {
     virDomainCapsCPUUsable usable;
     char *name;
+    char *type;
     char **blockers; /* NULL-terminated string list */
 };
 
diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index 7d0de45704..d504a7f191 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -5617,6 +5617,9 @@ qemuMonitorJSONGetCPUDefinitions(qemuMonitorPtr mon,
 
         cpu->name = g_strdup(tmp);
 
+        if ((tmp = virJSONValueObjectGetString(child, "typename")) && *tmp)
+            cpu->type = g_strdup(tmp);
+
         if (virJSONValueObjectHasKey(child, "unavailable-features")) {
             virJSONValuePtr blockers;
             size_t j;
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
index f0bf003528..ad4f5447ed 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
@@ -144,69 +144,69 @@
   <microcodeVersion>61700287</microcodeVersion>
   <package> (v2.10.0)</package>
   <arch>aarch64</arch>
-  <cpu type='kvm' name='pxa262'/>
-  <cpu type='kvm' name='pxa270-a0'/>
-  <cpu type='kvm' name='arm1136'/>
-  <cpu type='kvm' name='cortex-a15'/>
-  <cpu type='kvm' name='pxa260'/>
-  <cpu type='kvm' name='arm1136-r2'/>
-  <cpu type='kvm' name='pxa261'/>
-  <cpu type='kvm' name='pxa255'/>
-  <cpu type='kvm' name='arm926'/>
-  <cpu type='kvm' name='arm11mpcore'/>
-  <cpu type='kvm' name='pxa250'/>
-  <cpu type='kvm' name='ti925t'/>
-  <cpu type='kvm' name='cortex-a57'/>
-  <cpu type='kvm' name='sa1110'/>
-  <cpu type='kvm' name='arm1176'/>
-  <cpu type='kvm' name='cortex-a53'/>
-  <cpu type='kvm' name='host'/>
-  <cpu type='kvm' name='sa1100'/>
-  <cpu type='kvm' name='pxa270-c5'/>
-  <cpu type='kvm' name='cortex-a9'/>
-  <cpu type='kvm' name='cortex-a8'/>
-  <cpu type='kvm' name='pxa270-c0'/>
-  <cpu type='kvm' name='cortex-a7'/>
-  <cpu type='kvm' name='arm1026'/>
-  <cpu type='kvm' name='pxa270-b1'/>
-  <cpu type='kvm' name='cortex-m3'/>
-  <cpu type='kvm' name='cortex-m4'/>
-  <cpu type='kvm' name='pxa270-b0'/>
-  <cpu type='kvm' name='arm946'/>
-  <cpu type='kvm' name='cortex-r5'/>
-  <cpu type='kvm' name='pxa270-a1'/>
-  <cpu type='kvm' name='pxa270'/>
-  <cpu type='tcg' name='pxa262'/>
-  <cpu type='tcg' name='pxa270-a0'/>
-  <cpu type='tcg' name='arm1136'/>
-  <cpu type='tcg' name='cortex-a15'/>
-  <cpu type='tcg' name='pxa260'/>
-  <cpu type='tcg' name='arm1136-r2'/>
-  <cpu type='tcg' name='pxa261'/>
-  <cpu type='tcg' name='pxa255'/>
-  <cpu type='tcg' name='arm926'/>
-  <cpu type='tcg' name='arm11mpcore'/>
-  <cpu type='tcg' name='pxa250'/>
-  <cpu type='tcg' name='ti925t'/>
-  <cpu type='tcg' name='cortex-a57'/>
-  <cpu type='tcg' name='sa1110'/>
-  <cpu type='tcg' name='arm1176'/>
-  <cpu type='tcg' name='cortex-a53'/>
-  <cpu type='tcg' name='sa1100'/>
-  <cpu type='tcg' name='pxa270-c5'/>
-  <cpu type='tcg' name='cortex-a9'/>
-  <cpu type='tcg' name='cortex-a8'/>
-  <cpu type='tcg' name='pxa270-c0'/>
-  <cpu type='tcg' name='cortex-a7'/>
-  <cpu type='tcg' name='arm1026'/>
-  <cpu type='tcg' name='pxa270-b1'/>
-  <cpu type='tcg' name='cortex-m3'/>
-  <cpu type='tcg' name='cortex-m4'/>
-  <cpu type='tcg' name='pxa270-b0'/>
-  <cpu type='tcg' name='arm946'/>
-  <cpu type='tcg' name='cortex-r5'/>
-  <cpu type='tcg' name='pxa270-a1'/>
-  <cpu type='tcg' name='pxa270'/>
+  <cpu type='kvm' name='pxa262' typename='pxa262-arm-cpu'/>
+  <cpu type='kvm' name='pxa270-a0' typename='pxa270-a0-arm-cpu'/>
+  <cpu type='kvm' name='arm1136' typename='arm1136-arm-cpu'/>
+  <cpu type='kvm' name='cortex-a15' typename='cortex-a15-arm-cpu'/>
+  <cpu type='kvm' name='pxa260' typename='pxa260-arm-cpu'/>
+  <cpu type='kvm' name='arm1136-r2' typename='arm1136-r2-arm-cpu'/>
+  <cpu type='kvm' name='pxa261' typename='pxa261-arm-cpu'/>
+  <cpu type='kvm' name='pxa255' typename='pxa255-arm-cpu'/>
+  <cpu type='kvm' name='arm926' typename='arm926-arm-cpu'/>
+  <cpu type='kvm' name='arm11mpcore' typename='arm11mpcore-arm-cpu'/>
+  <cpu type='kvm' name='pxa250' typename='pxa250-arm-cpu'/>
+  <cpu type='kvm' name='ti925t' typename='ti925t-arm-cpu'/>
+  <cpu type='kvm' name='cortex-a57' typename='cortex-a57-arm-cpu'/>
+  <cpu type='kvm' name='sa1110' typename='sa1110-arm-cpu'/>
+  <cpu type='kvm' name='arm1176' typename='arm1176-arm-cpu'/>
+  <cpu type='kvm' name='cortex-a53' typename='cortex-a53-arm-cpu'/>
+  <cpu type='kvm' name='host' typename='host-arm-cpu'/>
+  <cpu type='kvm' name='sa1100' typename='sa1100-arm-cpu'/>
+  <cpu type='kvm' name='pxa270-c5' typename='pxa270-c5-arm-cpu'/>
+  <cpu type='kvm' name='cortex-a9' typename='cortex-a9-arm-cpu'/>
+  <cpu type='kvm' name='cortex-a8' typename='cortex-a8-arm-cpu'/>
+  <cpu type='kvm' name='pxa270-c0' typename='pxa270-c0-arm-cpu'/>
+  <cpu type='kvm' name='cortex-a7' typename='cortex-a7-arm-cpu'/>
+  <cpu type='kvm' name='arm1026' typename='arm1026-arm-cpu'/>
+  <cpu type='kvm' name='pxa270-b1' typename='pxa270-b1-arm-cpu'/>
+  <cpu type='kvm' name='cortex-m3' typename='cortex-m3-arm-cpu'/>
+  <cpu type='kvm' name='cortex-m4' typename='cortex-m4-arm-cpu'/>
+  <cpu type='kvm' name='pxa270-b0' typename='pxa270-b0-arm-cpu'/>
+  <cpu type='kvm' name='arm946' typename='arm946-arm-cpu'/>
+  <cpu type='kvm' name='cortex-r5' typename='cortex-r5-arm-cpu'/>
+  <cpu type='kvm' name='pxa270-a1' typename='pxa270-a1-arm-cpu'/>
+  <cpu type='kvm' name='pxa270' typename='pxa270-arm-cpu'/>
+  <cpu type='tcg' name='pxa262' typename='pxa262-arm-cpu'/>
+  <cpu type='tcg' name='pxa270-a0' typename='pxa270-a0-arm-cpu'/>
+  <cpu type='tcg' name='arm1136' typename='arm1136-arm-cpu'/>
+  <cpu type='tcg' name='cortex-a15' typename='cortex-a15-arm-cpu'/>
+  <cpu type='tcg' name='pxa260' typename='pxa260-arm-cpu'/>
+  <cpu type='tcg' name='arm1136-r2' typename='arm1136-r2-arm-cpu'/>
+  <cpu type='tcg' name='pxa261' typename='pxa261-arm-cpu'/>
+  <cpu type='tcg' name='pxa255' typename='pxa255-arm-cpu'/>
+  <cpu type='tcg' name='arm926' typename='arm926-arm-cpu'/>
+  <cpu type='tcg' name='arm11mpcore' typename='arm11mpcore-arm-cpu'/>
+  <cpu type='tcg' name='pxa250' typename='pxa250-arm-cpu'/>
+  <cpu type='tcg' name='ti925t' typename='ti925t-arm-cpu'/>
+  <cpu type='tcg' name='cortex-a57' typename='cortex-a57-arm-cpu'/>
+  <cpu type='tcg' name='sa1110' typename='sa1110-arm-cpu'/>
+  <cpu type='tcg' name='arm1176' typename='arm1176-arm-cpu'/>
+  <cpu type='tcg' name='cortex-a53' typename='cortex-a53-arm-cpu'/>
+  <cpu type='tcg' name='sa1100' typename='sa1100-arm-cpu'/>
+  <cpu type='tcg' name='pxa270-c5' typename='pxa270-c5-arm-cpu'/>
+  <cpu type='tcg' name='cortex-a9' typename='cortex-a9-arm-cpu'/>
+  <cpu type='tcg' name='cortex-a8' typename='cortex-a8-arm-cpu'/>
+  <cpu type='tcg' name='pxa270-c0' typename='pxa270-c0-arm-cpu'/>
+  <cpu type='tcg' name='cortex-a7' typename='cortex-a7-arm-cpu'/>
+  <cpu type='tcg' name='arm1026' typename='arm1026-arm-cpu'/>
+  <cpu type='tcg' name='pxa270-b1' typename='pxa270-b1-arm-cpu'/>
+  <cpu type='tcg' name='cortex-m3' typename='cortex-m3-arm-cpu'/>
+  <cpu type='tcg' name='cortex-m4' typename='cortex-m4-arm-cpu'/>
+  <cpu type='tcg' name='pxa270-b0' typename='pxa270-b0-arm-cpu'/>
+  <cpu type='tcg' name='arm946' typename='arm946-arm-cpu'/>
+  <cpu type='tcg' name='cortex-r5' typename='cortex-r5-arm-cpu'/>
+  <cpu type='tcg' name='pxa270-a1' typename='pxa270-a1-arm-cpu'/>
+  <cpu type='tcg' name='pxa270' typename='pxa270-arm-cpu'/>
   <machine name='integratorcp' maxCpus='1'/>
   <machine name='nuri' maxCpus='2'/>
   <machine name='mps2-an511' maxCpus='1'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
index 93c2103b65..dc2b8075db 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
@@ -143,134 +143,134 @@
   <microcodeVersion>42900287</microcodeVersion>
   <package> (v2.10.0)</package>
   <arch>ppc64</arch>
-  <cpu type='kvm' name='default'/>
-  <cpu type='kvm' name='ppc'/>
-  <cpu type='kvm' name='ppc32'/>
-  <cpu type='kvm' name='ppc64'/>
-  <cpu type='kvm' name='970mp'/>
-  <cpu type='kvm' name='970fx'/>
-  <cpu type='kvm' name='970'/>
-  <cpu type='kvm' name='POWER9'/>
-  <cpu type='kvm' name='POWER8NVL'/>
-  <cpu type='kvm' name='POWER8'/>
-  <cpu type='kvm' name='POWER8E'/>
-  <cpu type='kvm' name='POWER7+'/>
-  <cpu type='kvm' name='POWER7'/>
-  <cpu type='kvm' name='POWER5gs'/>
-  <cpu type='kvm' name='POWER5+'/>
-  <cpu type='kvm' name='Apollo7PM'/>
-  <cpu type='kvm' name='7457A'/>
-  <cpu type='kvm' name='7447A'/>
-  <cpu type='kvm' name='Apollo7'/>
-  <cpu type='kvm' name='7457'/>
-  <cpu type='kvm' name='7447'/>
-  <cpu type='kvm' name='Apollo6'/>
-  <cpu type='kvm' name='7455'/>
-  <cpu type='kvm' name='7445'/>
-  <cpu type='kvm' name='7451'/>
-  <cpu type='kvm' name='7441'/>
-  <cpu type='kvm' name='Vger'/>
-  <cpu type='kvm' name='7450'/>
-  <cpu type='kvm' name='7448'/>
-  <cpu type='kvm' name='Nitro'/>
-  <cpu type='kvm' name='7410'/>
-  <cpu type='kvm' name='G4'/>
-  <cpu type='kvm' name='Max'/>
-  <cpu type='kvm' name='7400'/>
-  <cpu type='kvm' name='Goldfinger'/>
-  <cpu type='kvm' name='755'/>
-  <cpu type='kvm' name='745'/>
-  <cpu type='kvm' name='LoneStar'/>
-  <cpu type='kvm' name='750l'/>
-  <cpu type='kvm' name='750gx'/>
-  <cpu type='kvm' name='750fx'/>
-  <cpu type='kvm' name='750cxe'/>
-  <cpu type='kvm' name='750cx'/>
-  <cpu type='kvm' name='750cl'/>
-  <cpu type='kvm' name='Conan/Doyle'/>
-  <cpu type='kvm' name='G3'/>
-  <cpu type='kvm' name='Typhoon'/>
-  <cpu type='kvm' name='750'/>
-  <cpu type='kvm' name='Arthur'/>
-  <cpu type='kvm' name='740'/>
-  <cpu type='kvm' name='Mach5'/>
-  <cpu type='kvm' name='Sirocco'/>
-  <cpu type='kvm' name='604e'/>
-  <cpu type='kvm' name='Goldeneye'/>
-  <cpu type='kvm' name='603r'/>
-  <cpu type='kvm' name='Vaillant'/>
-  <cpu type='kvm' name='Stretch'/>
-  <cpu type='kvm' name='603e'/>
-  <cpu type='kvm' name='Vanilla'/>
-  <cpu type='kvm' name='601v'/>
-  <cpu type='kvm' name='601'/>
-  <cpu type='kvm' name='MPC8560'/>
-  <cpu type='kvm' name='MPC8555E'/>
-  <cpu type='kvm' name='MPC8555'/>
-  <cpu type='kvm' name='MPC8548E'/>
-  <cpu type='kvm' name='MPC8548'/>
-  <cpu type='kvm' name='MPC8547E'/>
-  <cpu type='kvm' name='MPC8545E'/>
-  <cpu type='kvm' name='MPC8545'/>
-  <cpu type='kvm' name='MPC8544E'/>
-  <cpu type='kvm' name='MPC8544'/>
-  <cpu type='kvm' name='MPC8543E'/>
-  <cpu type='kvm' name='MPC8543'/>
-  <cpu type='kvm' name='MPC8541E'/>
-  <cpu type='kvm' name='MPC8541'/>
-  <cpu type='kvm' name='MPC8540'/>
-  <cpu type='kvm' name='MPC8533E'/>
-  <cpu type='kvm' name='MPC8533'/>
-  <cpu type='kvm' name='e500v2'/>
-  <cpu type='kvm' name='e500v1'/>
-  <cpu type='kvm' name='e500'/>
-  <cpu type='kvm' name='MPC8347EA'/>
-  <cpu type='kvm' name='MPC8347E'/>
-  <cpu type='kvm' name='MPC8347A'/>
-  <cpu type='kvm' name='MPC8347'/>
-  <cpu type='kvm' name='e300'/>
-  <cpu type='kvm' name='e200'/>
-  <cpu type='kvm' name='MPC8280'/>
-  <cpu type='kvm' name='MPC8275'/>
-  <cpu type='kvm' name='MPC8272'/>
-  <cpu type='kvm' name='MPC8271'/>
-  <cpu type='kvm' name='MPC8270'/>
-  <cpu type='kvm' name='MPC8266_HiP4'/>
-  <cpu type='kvm' name='MPC8266_HiP3'/>
-  <cpu type='kvm' name='MPC8266'/>
-  <cpu type='kvm' name='MPC8265_HiP4'/>
-  <cpu type='kvm' name='MPC8265_HiP3'/>
-  <cpu type='kvm' name='MPC8265'/>
-  <cpu type='kvm' name='MPC8264_HiP4'/>
-  <cpu type='kvm' name='MPC8264_HiP3'/>
-  <cpu type='kvm' name='MPC8264'/>
-  <cpu type='kvm' name='MPC8260_HiP4'/>
-  <cpu type='kvm' name='MPC8260_HiP3'/>
-  <cpu type='kvm' name='MPC8260'/>
-  <cpu type='kvm' name='MPC8255_HiP4'/>
-  <cpu type='kvm' name='MPC8255_HiP3'/>
-  <cpu type='kvm' name='MPC8255'/>
-  <cpu type='kvm' name='MPC8250_HiP4'/>
-  <cpu type='kvm' name='MPC8250_HiP3'/>
-  <cpu type='kvm' name='MPC8250'/>
-  <cpu type='kvm' name='MPC8248'/>
-  <cpu type='kvm' name='MPC8247'/>
-  <cpu type='kvm' name='MPC8245'/>
-  <cpu type='kvm' name='MPC8241'/>
-  <cpu type='kvm' name='PowerQUICC-II'/>
-  <cpu type='kvm' name='MPC82xx'/>
-  <cpu type='kvm' name='MPC5200B'/>
-  <cpu type='kvm' name='MPC5200'/>
-  <cpu type='kvm' name='MPC52xx'/>
-  <cpu type='kvm' name='MPC8240'/>
-  <cpu type='kvm' name='440EP'/>
-  <cpu type='kvm' name='x2vp50'/>
-  <cpu type='kvm' name='x2vp7'/>
-  <cpu type='kvm' name='405GPe'/>
-  <cpu type='kvm' name='405GP'/>
-  <cpu type='kvm' name='405CR'/>
-  <cpu type='kvm' name='405'/>
-  <cpu type='kvm' name='403'/>
+  <cpu type='kvm' name='default' typename='604-powerpc64-cpu'/>
+  <cpu type='kvm' name='ppc' typename='604-powerpc64-cpu'/>
+  <cpu type='kvm' name='ppc32' typename='604-powerpc64-cpu'/>
+  <cpu type='kvm' name='ppc64' typename='970fx_v3.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='970mp' typename='970mp_v1.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='970fx' typename='970fx_v3.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='970' typename='970_v2.2-powerpc64-cpu'/>
+  <cpu type='kvm' name='POWER9' typename='POWER9_v1.0-powerpc64-cpu'/>
+  <cpu type='kvm' name='POWER8NVL' typename='POWER8NVL_v1.0-powerpc64-cpu'/>
+  <cpu type='kvm' name='POWER8' typename='host-powerpc64-cpu'/>
+  <cpu type='kvm' name='POWER8E' typename='POWER8E_v2.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='POWER7+' typename='POWER7+_v2.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='POWER7' typename='POWER7_v2.3-powerpc64-cpu'/>
+  <cpu type='kvm' name='POWER5gs' typename='POWER5+_v2.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='POWER5+' typename='POWER5+_v2.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='Apollo7PM' typename='7457A_v1.0-powerpc64-cpu'/>
+  <cpu type='kvm' name='7457A' typename='7457A_v1.2-powerpc64-cpu'/>
+  <cpu type='kvm' name='7447A' typename='7447A_v1.2-powerpc64-cpu'/>
+  <cpu type='kvm' name='Apollo7' typename='7457_v1.2-powerpc64-cpu'/>
+  <cpu type='kvm' name='7457' typename='7457_v1.2-powerpc64-cpu'/>
+  <cpu type='kvm' name='7447' typename='7447_v1.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='Apollo6' typename='7455_v3.2-powerpc64-cpu'/>
+  <cpu type='kvm' name='7455' typename='7455_v3.2-powerpc64-cpu'/>
+  <cpu type='kvm' name='7445' typename='7445_v3.2-powerpc64-cpu'/>
+  <cpu type='kvm' name='7451' typename='7451_v2.3-powerpc64-cpu'/>
+  <cpu type='kvm' name='7441' typename='7441_v2.3-powerpc64-cpu'/>
+  <cpu type='kvm' name='Vger' typename='7450_v2.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='7450' typename='7450_v2.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='7448' typename='7448_v2.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='Nitro' typename='7410_v1.4-powerpc64-cpu'/>
+  <cpu type='kvm' name='7410' typename='7410_v1.4-powerpc64-cpu'/>
+  <cpu type='kvm' name='G4' typename='7400_v2.9-powerpc64-cpu'/>
+  <cpu type='kvm' name='Max' typename='7400_v2.9-powerpc64-cpu'/>
+  <cpu type='kvm' name='7400' typename='7400_v2.9-powerpc64-cpu'/>
+  <cpu type='kvm' name='Goldfinger' typename='755_v2.8-powerpc64-cpu'/>
+  <cpu type='kvm' name='755' typename='755_v2.8-powerpc64-cpu'/>
+  <cpu type='kvm' name='745' typename='745_v2.8-powerpc64-cpu'/>
+  <cpu type='kvm' name='LoneStar' typename='750l_v3.2-powerpc64-cpu'/>
+  <cpu type='kvm' name='750l' typename='750l_v3.2-powerpc64-cpu'/>
+  <cpu type='kvm' name='750gx' typename='750gx_v1.2-powerpc64-cpu'/>
+  <cpu type='kvm' name='750fx' typename='750fx_v2.3-powerpc64-cpu'/>
+  <cpu type='kvm' name='750cxe' typename='750cxe_v3.1b-powerpc64-cpu'/>
+  <cpu type='kvm' name='750cx' typename='750cx_v2.2-powerpc64-cpu'/>
+  <cpu type='kvm' name='750cl' typename='750cl_v2.0-powerpc64-cpu'/>
+  <cpu type='kvm' name='Conan/Doyle' typename='750p-powerpc64-cpu'/>
+  <cpu type='kvm' name='G3' typename='750_v3.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='Typhoon' typename='750_v3.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='750' typename='750_v3.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='Arthur' typename='740_v3.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='740' typename='740_v3.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='Mach5' typename='604r-powerpc64-cpu'/>
+  <cpu type='kvm' name='Sirocco' typename='604e_v2.4-powerpc64-cpu'/>
+  <cpu type='kvm' name='604e' typename='604e_v2.4-powerpc64-cpu'/>
+  <cpu type='kvm' name='Goldeneye' typename='603e7t-powerpc64-cpu'/>
+  <cpu type='kvm' name='603r' typename='603e7t-powerpc64-cpu'/>
+  <cpu type='kvm' name='Vaillant' typename='603e7v-powerpc64-cpu'/>
+  <cpu type='kvm' name='Stretch' typename='603e_v4.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='603e' typename='603e_v4.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='Vanilla' typename='603-powerpc64-cpu'/>
+  <cpu type='kvm' name='601v' typename='601_v2-powerpc64-cpu'/>
+  <cpu type='kvm' name='601' typename='601_v2-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8560' typename='MPC8560_v21-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8555E' typename='MPC8555E_v11-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8555' typename='MPC8555_v11-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8548E' typename='MPC8548E_v21-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8548' typename='MPC8548_v21-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8547E' typename='MPC8547E_v21-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8545E' typename='MPC8545E_v21-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8545' typename='MPC8545_v21-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8544E' typename='MPC8544E_v11-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8544' typename='MPC8544_v11-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8543E' typename='MPC8543E_v21-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8543' typename='MPC8543_v21-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8541E' typename='MPC8541E_v11-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8541' typename='MPC8541_v11-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8540' typename='MPC8540_v21-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8533E' typename='MPC8533E_v11-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8533' typename='MPC8533_v11-powerpc64-cpu'/>
+  <cpu type='kvm' name='e500v2' typename='e500v2_v22-powerpc64-cpu'/>
+  <cpu type='kvm' name='e500v1' typename='e500_v20-powerpc64-cpu'/>
+  <cpu type='kvm' name='e500' typename='e500v2_v22-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8347EA' typename='MPC8347EAT-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8347E' typename='MPC8347ET-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8347A' typename='MPC8347AT-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8347' typename='MPC8347T-powerpc64-cpu'/>
+  <cpu type='kvm' name='e300' typename='e300c3-powerpc64-cpu'/>
+  <cpu type='kvm' name='e200' typename='e200z6-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8280' typename='G2leGP3-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8275' typename='G2leGP3-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8272' typename='G2leGP3-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8271' typename='G2leGP3-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8270' typename='G2leGP3-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8266_HiP4' typename='G2HiP4-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8266_HiP3' typename='G2HiP3-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8266' typename='G2HiP4-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8265_HiP4' typename='G2HiP4-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8265_HiP3' typename='G2HiP3-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8265' typename='G2HiP4-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8264_HiP4' typename='G2HiP4-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8264_HiP3' typename='G2HiP3-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8264' typename='G2HiP4-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8260_HiP4' typename='G2HiP4-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8260_HiP3' typename='G2HiP3-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8260' typename='G2HiP4-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8255_HiP4' typename='G2HiP4-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8255_HiP3' typename='G2HiP3-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8255' typename='G2HiP4-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8250_HiP4' typename='G2HiP4-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8250_HiP3' typename='G2HiP3-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8250' typename='G2HiP4-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8248' typename='G2leGP3-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8247' typename='G2leGP3-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8245' typename='G2HiP4-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8241' typename='G2HiP4-powerpc64-cpu'/>
+  <cpu type='kvm' name='PowerQUICC-II' typename='G2leGP3-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC82xx' typename='G2leGP3-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC5200B' typename='MPC5200B_v21-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC5200' typename='MPC5200_v12-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC52xx' typename='MPC5200_v12-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8240' typename='603-powerpc64-cpu'/>
+  <cpu type='kvm' name='440EP' typename='440EPb-powerpc64-cpu'/>
+  <cpu type='kvm' name='x2vp50' typename='x2vp20-powerpc64-cpu'/>
+  <cpu type='kvm' name='x2vp7' typename='x2vp4-powerpc64-cpu'/>
+  <cpu type='kvm' name='405GPe' typename='405CRc-powerpc64-cpu'/>
+  <cpu type='kvm' name='405GP' typename='405GPd-powerpc64-cpu'/>
+  <cpu type='kvm' name='405CR' typename='405CRc-powerpc64-cpu'/>
+  <cpu type='kvm' name='405' typename='405D4-powerpc64-cpu'/>
+  <cpu type='kvm' name='403' typename='403GC-powerpc64-cpu'/>
   <cpu type='kvm' name='7457A_v1.2'/>
   <cpu type='kvm' name='750cl_v1.0'/>
   <cpu type='kvm' name='750cxe_v2.1'/>
@@ -577,134 +577,134 @@
   <cpu type='kvm' name='MPC8544E_v11'/>
   <cpu type='kvm' name='405GPb'/>
   <cpu type='kvm' name='MPC8541E_v11'/>
-  <cpu type='tcg' name='default'/>
-  <cpu type='tcg' name='ppc'/>
-  <cpu type='tcg' name='ppc32'/>
-  <cpu type='tcg' name='ppc64'/>
-  <cpu type='tcg' name='970mp'/>
-  <cpu type='tcg' name='970fx'/>
-  <cpu type='tcg' name='970'/>
-  <cpu type='tcg' name='POWER9'/>
-  <cpu type='tcg' name='POWER8NVL'/>
-  <cpu type='tcg' name='POWER8'/>
-  <cpu type='tcg' name='POWER8E'/>
-  <cpu type='tcg' name='POWER7+'/>
-  <cpu type='tcg' name='POWER7'/>
-  <cpu type='tcg' name='POWER5gs'/>
-  <cpu type='tcg' name='POWER5+'/>
-  <cpu type='tcg' name='Apollo7PM'/>
-  <cpu type='tcg' name='7457A'/>
-  <cpu type='tcg' name='7447A'/>
-  <cpu type='tcg' name='Apollo7'/>
-  <cpu type='tcg' name='7457'/>
-  <cpu type='tcg' name='7447'/>
-  <cpu type='tcg' name='Apollo6'/>
-  <cpu type='tcg' name='7455'/>
-  <cpu type='tcg' name='7445'/>
-  <cpu type='tcg' name='7451'/>
-  <cpu type='tcg' name='7441'/>
-  <cpu type='tcg' name='Vger'/>
-  <cpu type='tcg' name='7450'/>
-  <cpu type='tcg' name='7448'/>
-  <cpu type='tcg' name='Nitro'/>
-  <cpu type='tcg' name='7410'/>
-  <cpu type='tcg' name='G4'/>
-  <cpu type='tcg' name='Max'/>
-  <cpu type='tcg' name='7400'/>
-  <cpu type='tcg' name='Goldfinger'/>
-  <cpu type='tcg' name='755'/>
-  <cpu type='tcg' name='745'/>
-  <cpu type='tcg' name='LoneStar'/>
-  <cpu type='tcg' name='750l'/>
-  <cpu type='tcg' name='750gx'/>
-  <cpu type='tcg' name='750fx'/>
-  <cpu type='tcg' name='750cxe'/>
-  <cpu type='tcg' name='750cx'/>
-  <cpu type='tcg' name='750cl'/>
-  <cpu type='tcg' name='Conan/Doyle'/>
-  <cpu type='tcg' name='G3'/>
-  <cpu type='tcg' name='Typhoon'/>
-  <cpu type='tcg' name='750'/>
-  <cpu type='tcg' name='Arthur'/>
-  <cpu type='tcg' name='740'/>
-  <cpu type='tcg' name='Mach5'/>
-  <cpu type='tcg' name='Sirocco'/>
-  <cpu type='tcg' name='604e'/>
-  <cpu type='tcg' name='Goldeneye'/>
-  <cpu type='tcg' name='603r'/>
-  <cpu type='tcg' name='Vaillant'/>
-  <cpu type='tcg' name='Stretch'/>
-  <cpu type='tcg' name='603e'/>
-  <cpu type='tcg' name='Vanilla'/>
-  <cpu type='tcg' name='601v'/>
-  <cpu type='tcg' name='601'/>
-  <cpu type='tcg' name='MPC8560'/>
-  <cpu type='tcg' name='MPC8555E'/>
-  <cpu type='tcg' name='MPC8555'/>
-  <cpu type='tcg' name='MPC8548E'/>
-  <cpu type='tcg' name='MPC8548'/>
-  <cpu type='tcg' name='MPC8547E'/>
-  <cpu type='tcg' name='MPC8545E'/>
-  <cpu type='tcg' name='MPC8545'/>
-  <cpu type='tcg' name='MPC8544E'/>
-  <cpu type='tcg' name='MPC8544'/>
-  <cpu type='tcg' name='MPC8543E'/>
-  <cpu type='tcg' name='MPC8543'/>
-  <cpu type='tcg' name='MPC8541E'/>
-  <cpu type='tcg' name='MPC8541'/>
-  <cpu type='tcg' name='MPC8540'/>
-  <cpu type='tcg' name='MPC8533E'/>
-  <cpu type='tcg' name='MPC8533'/>
-  <cpu type='tcg' name='e500v2'/>
-  <cpu type='tcg' name='e500v1'/>
-  <cpu type='tcg' name='e500'/>
-  <cpu type='tcg' name='MPC8347EA'/>
-  <cpu type='tcg' name='MPC8347E'/>
-  <cpu type='tcg' name='MPC8347A'/>
-  <cpu type='tcg' name='MPC8347'/>
-  <cpu type='tcg' name='e300'/>
-  <cpu type='tcg' name='e200'/>
-  <cpu type='tcg' name='MPC8280'/>
-  <cpu type='tcg' name='MPC8275'/>
-  <cpu type='tcg' name='MPC8272'/>
-  <cpu type='tcg' name='MPC8271'/>
-  <cpu type='tcg' name='MPC8270'/>
-  <cpu type='tcg' name='MPC8266_HiP4'/>
-  <cpu type='tcg' name='MPC8266_HiP3'/>
-  <cpu type='tcg' name='MPC8266'/>
-  <cpu type='tcg' name='MPC8265_HiP4'/>
-  <cpu type='tcg' name='MPC8265_HiP3'/>
-  <cpu type='tcg' name='MPC8265'/>
-  <cpu type='tcg' name='MPC8264_HiP4'/>
-  <cpu type='tcg' name='MPC8264_HiP3'/>
-  <cpu type='tcg' name='MPC8264'/>
-  <cpu type='tcg' name='MPC8260_HiP4'/>
-  <cpu type='tcg' name='MPC8260_HiP3'/>
-  <cpu type='tcg' name='MPC8260'/>
-  <cpu type='tcg' name='MPC8255_HiP4'/>
-  <cpu type='tcg' name='MPC8255_HiP3'/>
-  <cpu type='tcg' name='MPC8255'/>
-  <cpu type='tcg' name='MPC8250_HiP4'/>
-  <cpu type='tcg' name='MPC8250_HiP3'/>
-  <cpu type='tcg' name='MPC8250'/>
-  <cpu type='tcg' name='MPC8248'/>
-  <cpu type='tcg' name='MPC8247'/>
-  <cpu type='tcg' name='MPC8245'/>
-  <cpu type='tcg' name='MPC8241'/>
-  <cpu type='tcg' name='PowerQUICC-II'/>
-  <cpu type='tcg' name='MPC82xx'/>
-  <cpu type='tcg' name='MPC5200B'/>
-  <cpu type='tcg' name='MPC5200'/>
-  <cpu type='tcg' name='MPC52xx'/>
-  <cpu type='tcg' name='MPC8240'/>
-  <cpu type='tcg' name='440EP'/>
-  <cpu type='tcg' name='x2vp50'/>
-  <cpu type='tcg' name='x2vp7'/>
-  <cpu type='tcg' name='405GPe'/>
-  <cpu type='tcg' name='405GP'/>
-  <cpu type='tcg' name='405CR'/>
-  <cpu type='tcg' name='405'/>
-  <cpu type='tcg' name='403'/>
+  <cpu type='tcg' name='default' typename='604-powerpc64-cpu'/>
+  <cpu type='tcg' name='ppc' typename='604-powerpc64-cpu'/>
+  <cpu type='tcg' name='ppc32' typename='604-powerpc64-cpu'/>
+  <cpu type='tcg' name='ppc64' typename='970fx_v3.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='970mp' typename='970mp_v1.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='970fx' typename='970fx_v3.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='970' typename='970_v2.2-powerpc64-cpu'/>
+  <cpu type='tcg' name='POWER9' typename='POWER9_v1.0-powerpc64-cpu'/>
+  <cpu type='tcg' name='POWER8NVL' typename='POWER8NVL_v1.0-powerpc64-cpu'/>
+  <cpu type='tcg' name='POWER8' typename='POWER8_v2.0-powerpc64-cpu'/>
+  <cpu type='tcg' name='POWER8E' typename='POWER8E_v2.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='POWER7+' typename='POWER7+_v2.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='POWER7' typename='POWER7_v2.3-powerpc64-cpu'/>
+  <cpu type='tcg' name='POWER5gs' typename='POWER5+_v2.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='POWER5+' typename='POWER5+_v2.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='Apollo7PM' typename='7457A_v1.0-powerpc64-cpu'/>
+  <cpu type='tcg' name='7457A' typename='7457A_v1.2-powerpc64-cpu'/>
+  <cpu type='tcg' name='7447A' typename='7447A_v1.2-powerpc64-cpu'/>
+  <cpu type='tcg' name='Apollo7' typename='7457_v1.2-powerpc64-cpu'/>
+  <cpu type='tcg' name='7457' typename='7457_v1.2-powerpc64-cpu'/>
+  <cpu type='tcg' name='7447' typename='7447_v1.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='Apollo6' typename='7455_v3.2-powerpc64-cpu'/>
+  <cpu type='tcg' name='7455' typename='7455_v3.2-powerpc64-cpu'/>
+  <cpu type='tcg' name='7445' typename='7445_v3.2-powerpc64-cpu'/>
+  <cpu type='tcg' name='7451' typename='7451_v2.3-powerpc64-cpu'/>
+  <cpu type='tcg' name='7441' typename='7441_v2.3-powerpc64-cpu'/>
+  <cpu type='tcg' name='Vger' typename='7450_v2.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='7450' typename='7450_v2.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='7448' typename='7448_v2.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='Nitro' typename='7410_v1.4-powerpc64-cpu'/>
+  <cpu type='tcg' name='7410' typename='7410_v1.4-powerpc64-cpu'/>
+  <cpu type='tcg' name='G4' typename='7400_v2.9-powerpc64-cpu'/>
+  <cpu type='tcg' name='Max' typename='7400_v2.9-powerpc64-cpu'/>
+  <cpu type='tcg' name='7400' typename='7400_v2.9-powerpc64-cpu'/>
+  <cpu type='tcg' name='Goldfinger' typename='755_v2.8-powerpc64-cpu'/>
+  <cpu type='tcg' name='755' typename='755_v2.8-powerpc64-cpu'/>
+  <cpu type='tcg' name='745' typename='745_v2.8-powerpc64-cpu'/>
+  <cpu type='tcg' name='LoneStar' typename='750l_v3.2-powerpc64-cpu'/>
+  <cpu type='tcg' name='750l' typename='750l_v3.2-powerpc64-cpu'/>
+  <cpu type='tcg' name='750gx' typename='750gx_v1.2-powerpc64-cpu'/>
+  <cpu type='tcg' name='750fx' typename='750fx_v2.3-powerpc64-cpu'/>
+  <cpu type='tcg' name='750cxe' typename='750cxe_v3.1b-powerpc64-cpu'/>
+  <cpu type='tcg' name='750cx' typename='750cx_v2.2-powerpc64-cpu'/>
+  <cpu type='tcg' name='750cl' typename='750cl_v2.0-powerpc64-cpu'/>
+  <cpu type='tcg' name='Conan/Doyle' typename='750p-powerpc64-cpu'/>
+  <cpu type='tcg' name='G3' typename='750_v3.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='Typhoon' typename='750_v3.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='750' typename='750_v3.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='Arthur' typename='740_v3.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='740' typename='740_v3.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='Mach5' typename='604r-powerpc64-cpu'/>
+  <cpu type='tcg' name='Sirocco' typename='604e_v2.4-powerpc64-cpu'/>
+  <cpu type='tcg' name='604e' typename='604e_v2.4-powerpc64-cpu'/>
+  <cpu type='tcg' name='Goldeneye' typename='603e7t-powerpc64-cpu'/>
+  <cpu type='tcg' name='603r' typename='603e7t-powerpc64-cpu'/>
+  <cpu type='tcg' name='Vaillant' typename='603e7v-powerpc64-cpu'/>
+  <cpu type='tcg' name='Stretch' typename='603e_v4.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='603e' typename='603e_v4.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='Vanilla' typename='603-powerpc64-cpu'/>
+  <cpu type='tcg' name='601v' typename='601_v2-powerpc64-cpu'/>
+  <cpu type='tcg' name='601' typename='601_v2-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8560' typename='MPC8560_v21-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8555E' typename='MPC8555E_v11-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8555' typename='MPC8555_v11-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8548E' typename='MPC8548E_v21-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8548' typename='MPC8548_v21-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8547E' typename='MPC8547E_v21-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8545E' typename='MPC8545E_v21-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8545' typename='MPC8545_v21-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8544E' typename='MPC8544E_v11-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8544' typename='MPC8544_v11-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8543E' typename='MPC8543E_v21-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8543' typename='MPC8543_v21-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8541E' typename='MPC8541E_v11-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8541' typename='MPC8541_v11-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8540' typename='MPC8540_v21-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8533E' typename='MPC8533E_v11-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8533' typename='MPC8533_v11-powerpc64-cpu'/>
+  <cpu type='tcg' name='e500v2' typename='e500v2_v22-powerpc64-cpu'/>
+  <cpu type='tcg' name='e500v1' typename='e500_v20-powerpc64-cpu'/>
+  <cpu type='tcg' name='e500' typename='e500v2_v22-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8347EA' typename='MPC8347EAT-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8347E' typename='MPC8347ET-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8347A' typename='MPC8347AT-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8347' typename='MPC8347T-powerpc64-cpu'/>
+  <cpu type='tcg' name='e300' typename='e300c3-powerpc64-cpu'/>
+  <cpu type='tcg' name='e200' typename='e200z6-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8280' typename='G2leGP3-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8275' typename='G2leGP3-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8272' typename='G2leGP3-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8271' typename='G2leGP3-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8270' typename='G2leGP3-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8266_HiP4' typename='G2HiP4-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8266_HiP3' typename='G2HiP3-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8266' typename='G2HiP4-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8265_HiP4' typename='G2HiP4-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8265_HiP3' typename='G2HiP3-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8265' typename='G2HiP4-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8264_HiP4' typename='G2HiP4-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8264_HiP3' typename='G2HiP3-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8264' typename='G2HiP4-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8260_HiP4' typename='G2HiP4-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8260_HiP3' typename='G2HiP3-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8260' typename='G2HiP4-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8255_HiP4' typename='G2HiP4-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8255_HiP3' typename='G2HiP3-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8255' typename='G2HiP4-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8250_HiP4' typename='G2HiP4-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8250_HiP3' typename='G2HiP3-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8250' typename='G2HiP4-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8248' typename='G2leGP3-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8247' typename='G2leGP3-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8245' typename='G2HiP4-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8241' typename='G2HiP4-powerpc64-cpu'/>
+  <cpu type='tcg' name='PowerQUICC-II' typename='G2leGP3-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC82xx' typename='G2leGP3-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC5200B' typename='MPC5200B_v21-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC5200' typename='MPC5200_v12-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC52xx' typename='MPC5200_v12-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8240' typename='603-powerpc64-cpu'/>
+  <cpu type='tcg' name='440EP' typename='440EPb-powerpc64-cpu'/>
+  <cpu type='tcg' name='x2vp50' typename='x2vp20-powerpc64-cpu'/>
+  <cpu type='tcg' name='x2vp7' typename='x2vp4-powerpc64-cpu'/>
+  <cpu type='tcg' name='405GPe' typename='405CRc-powerpc64-cpu'/>
+  <cpu type='tcg' name='405GP' typename='405GPd-powerpc64-cpu'/>
+  <cpu type='tcg' name='405CR' typename='405CRc-powerpc64-cpu'/>
+  <cpu type='tcg' name='405' typename='405D4-powerpc64-cpu'/>
+  <cpu type='tcg' name='403' typename='403GC-powerpc64-cpu'/>
   <cpu type='tcg' name='7457A_v1.2'/>
   <cpu type='tcg' name='750cl_v1.0'/>
   <cpu type='tcg' name='750cxe_v2.1'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
index 61acfa3260..0d317f60c4 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
@@ -141,73 +141,73 @@
     <property name='te' type='boolean' value='true'/>
     <property name='cmm' type='boolean' value='true'/>
   </hostCPU>
-  <cpu type='kvm' name='z10EC-base' usable='yes'/>
-  <cpu type='kvm' name='z9EC-base' usable='yes'/>
-  <cpu type='kvm' name='z196.2-base' usable='yes'/>
-  <cpu type='kvm' name='z900-base' usable='yes'/>
-  <cpu type='kvm' name='z990' usable='yes'/>
-  <cpu type='kvm' name='z900.2-base' usable='yes'/>
-  <cpu type='kvm' name='host' usable='yes'/>
-  <cpu type='kvm' name='z900.3' usable='yes'/>
-  <cpu type='kvm' name='z114' usable='yes'/>
-  <cpu type='kvm' name='z890-base' usable='yes'/>
-  <cpu type='kvm' name='z13.2-base' usable='yes'/>
-  <cpu type='kvm' name='zEC12.2' usable='yes'/>
-  <cpu type='kvm' name='z10BC' usable='yes'/>
-  <cpu type='kvm' name='z900.2' usable='yes'/>
-  <cpu type='kvm' name='z10BC.2' usable='yes'/>
-  <cpu type='kvm' name='z196' usable='yes'/>
-  <cpu type='kvm' name='z9EC' usable='yes'/>
-  <cpu type='kvm' name='z990-base' usable='yes'/>
-  <cpu type='kvm' name='z10EC.3' usable='yes'/>
-  <cpu type='kvm' name='z900' usable='yes'/>
-  <cpu type='kvm' name='z9EC.3-base' usable='yes'/>
-  <cpu type='kvm' name='z990.5-base' usable='yes'/>
-  <cpu type='kvm' name='z10EC.2' usable='yes'/>
-  <cpu type='kvm' name='z9BC.2' usable='yes'/>
-  <cpu type='kvm' name='z10EC' usable='yes'/>
-  <cpu type='kvm' name='z990.3-base' usable='yes'/>
-  <cpu type='kvm' name='z14' usable='yes'/>
-  <cpu type='kvm' name='z13s' usable='yes'/>
-  <cpu type='kvm' name='z10EC.3-base' usable='yes'/>
-  <cpu type='kvm' name='zEC12.2-base' usable='yes'/>
-  <cpu type='kvm' name='z890.3-base' usable='yes'/>
-  <cpu type='kvm' name='z9EC.3' usable='yes'/>
-  <cpu type='kvm' name='z990.5' usable='yes'/>
-  <cpu type='kvm' name='z13' usable='yes'/>
-  <cpu type='kvm' name='z13s-base' usable='yes'/>
-  <cpu type='kvm' name='z14-base' usable='yes'/>
-  <cpu type='kvm' name='z9EC.2' usable='yes'/>
-  <cpu type='kvm' name='z990.4' usable='yes'/>
-  <cpu type='kvm' name='zEC12-base' usable='yes'/>
-  <cpu type='kvm' name='z9EC.2-base' usable='yes'/>
-  <cpu type='kvm' name='zBC12' usable='yes'/>
-  <cpu type='kvm' name='z196.2' usable='yes'/>
-  <cpu type='kvm' name='z990.3' usable='yes'/>
-  <cpu type='kvm' name='z990.2-base' usable='yes'/>
-  <cpu type='kvm' name='z900.3-base' usable='yes'/>
-  <cpu type='kvm' name='z890.3' usable='yes'/>
-  <cpu type='kvm' name='z10EC.2-base' usable='yes'/>
-  <cpu type='kvm' name='z990.2' usable='yes'/>
-  <cpu type='kvm' name='z890.2' usable='yes'/>
-  <cpu type='kvm' name='zBC12-base' usable='yes'/>
-  <cpu type='kvm' name='z800-base' usable='yes'/>
-  <cpu type='kvm' name='zEC12' usable='yes'/>
-  <cpu type='kvm' name='z9BC.2-base' usable='yes'/>
-  <cpu type='kvm' name='z9BC' usable='yes'/>
-  <cpu type='kvm' name='z10BC.2-base' usable='yes'/>
-  <cpu type='kvm' name='z990.4-base' usable='yes'/>
-  <cpu type='kvm' name='qemu' usable='yes'/>
-  <cpu type='kvm' name='z10BC-base' usable='yes'/>
-  <cpu type='kvm' name='z9BC-base' usable='yes'/>
-  <cpu type='kvm' name='z800' usable='yes'/>
-  <cpu type='kvm' name='z890.2-base' usable='yes'/>
-  <cpu type='kvm' name='z13.2' usable='yes'/>
-  <cpu type='kvm' name='z114-base' usable='yes'/>
-  <cpu type='kvm' name='z196-base' usable='yes'/>
-  <cpu type='kvm' name='z13-base' usable='yes'/>
-  <cpu type='kvm' name='z890' usable='yes'/>
-  <cpu type='tcg' name='z10EC-base' usable='no'>
+  <cpu type='kvm' name='z10EC-base' typename='z10EC-base-s390-cpu' usable='yes'/>
+  <cpu type='kvm' name='z9EC-base' typename='z9EC-base-s390-cpu' usable='yes'/>
+  <cpu type='kvm' name='z196.2-base' typename='z196.2-base-s390-cpu' usable='yes'/>
+  <cpu type='kvm' name='z900-base' typename='z900-base-s390-cpu' usable='yes'/>
+  <cpu type='kvm' name='z990' typename='z990-s390-cpu' usable='yes'/>
+  <cpu type='kvm' name='z900.2-base' typename='z900.2-base-s390-cpu' usable='yes'/>
+  <cpu type='kvm' name='host' typename='host-s390-cpu' usable='yes'/>
+  <cpu type='kvm' name='z900.3' typename='z900.3-s390-cpu' usable='yes'/>
+  <cpu type='kvm' name='z114' typename='z114-s390-cpu' usable='yes'/>
+  <cpu type='kvm' name='z890-base' typename='z890-base-s390-cpu' usable='yes'/>
+  <cpu type='kvm' name='z13.2-base' typename='z13.2-base-s390-cpu' usable='yes'/>
+  <cpu type='kvm' name='zEC12.2' typename='zEC12.2-s390-cpu' usable='yes'/>
+  <cpu type='kvm' name='z10BC' typename='z10BC-s390-cpu' usable='yes'/>
+  <cpu type='kvm' name='z900.2' typename='z900.2-s390-cpu' usable='yes'/>
+  <cpu type='kvm' name='z10BC.2' typename='z10BC.2-s390-cpu' usable='yes'/>
+  <cpu type='kvm' name='z196' typename='z196-s390-cpu' usable='yes'/>
+  <cpu type='kvm' name='z9EC' typename='z9EC-s390-cpu' usable='yes'/>
+  <cpu type='kvm' name='z990-base' typename='z990-base-s390-cpu' usable='yes'/>
+  <cpu type='kvm' name='z10EC.3' typename='z10EC.3-s390-cpu' usable='yes'/>
+  <cpu type='kvm' name='z900' typename='z900-s390-cpu' usable='yes'/>
+  <cpu type='kvm' name='z9EC.3-base' typename='z9EC.3-base-s390-cpu' usable='yes'/>
+  <cpu type='kvm' name='z990.5-base' typename='z990.5-base-s390-cpu' usable='yes'/>
+  <cpu type='kvm' name='z10EC.2' typename='z10EC.2-s390-cpu' usable='yes'/>
+  <cpu type='kvm' name='z9BC.2' typename='z9BC.2-s390-cpu' usable='yes'/>
+  <cpu type='kvm' name='z10EC' typename='z10EC-s390-cpu' usable='yes'/>
+  <cpu type='kvm' name='z990.3-base' typename='z990.3-base-s390-cpu' usable='yes'/>
+  <cpu type='kvm' name='z14' typename='z14-s390-cpu' usable='yes'/>
+  <cpu type='kvm' name='z13s' typename='z13s-s390-cpu' usable='yes'/>
+  <cpu type='kvm' name='z10EC.3-base' typename='z10EC.3-base-s390-cpu' usable='yes'/>
+  <cpu type='kvm' name='zEC12.2-base' typename='zEC12.2-base-s390-cpu' usable='yes'/>
+  <cpu type='kvm' name='z890.3-base' typename='z890.3-base-s390-cpu' usable='yes'/>
+  <cpu type='kvm' name='z9EC.3' typename='z9EC.3-s390-cpu' usable='yes'/>
+  <cpu type='kvm' name='z990.5' typename='z990.5-s390-cpu' usable='yes'/>
+  <cpu type='kvm' name='z13' typename='z13-s390-cpu' usable='yes'/>
+  <cpu type='kvm' name='z13s-base' typename='z13s-base-s390-cpu' usable='yes'/>
+  <cpu type='kvm' name='z14-base' typename='z14-base-s390-cpu' usable='yes'/>
+  <cpu type='kvm' name='z9EC.2' typename='z9EC.2-s390-cpu' usable='yes'/>
+  <cpu type='kvm' name='z990.4' typename='z990.4-s390-cpu' usable='yes'/>
+  <cpu type='kvm' name='zEC12-base' typename='zEC12-base-s390-cpu' usable='yes'/>
+  <cpu type='kvm' name='z9EC.2-base' typename='z9EC.2-base-s390-cpu' usable='yes'/>
+  <cpu type='kvm' name='zBC12' typename='zBC12-s390-cpu' usable='yes'/>
+  <cpu type='kvm' name='z196.2' typename='z196.2-s390-cpu' usable='yes'/>
+  <cpu type='kvm' name='z990.3' typename='z990.3-s390-cpu' usable='yes'/>
+  <cpu type='kvm' name='z990.2-base' typename='z990.2-base-s390-cpu' usable='yes'/>
+  <cpu type='kvm' name='z900.3-base' typename='z900.3-base-s390-cpu' usable='yes'/>
+  <cpu type='kvm' name='z890.3' typename='z890.3-s390-cpu' usable='yes'/>
+  <cpu type='kvm' name='z10EC.2-base' typename='z10EC.2-base-s390-cpu' usable='yes'/>
+  <cpu type='kvm' name='z990.2' typename='z990.2-s390-cpu' usable='yes'/>
+  <cpu type='kvm' name='z890.2' typename='z890.2-s390-cpu' usable='yes'/>
+  <cpu type='kvm' name='zBC12-base' typename='zBC12-base-s390-cpu' usable='yes'/>
+  <cpu type='kvm' name='z800-base' typename='z800-base-s390-cpu' usable='yes'/>
+  <cpu type='kvm' name='zEC12' typename='zEC12-s390-cpu' usable='yes'/>
+  <cpu type='kvm' name='z9BC.2-base' typename='z9BC.2-base-s390-cpu' usable='yes'/>
+  <cpu type='kvm' name='z9BC' typename='z9BC-s390-cpu' usable='yes'/>
+  <cpu type='kvm' name='z10BC.2-base' typename='z10BC.2-base-s390-cpu' usable='yes'/>
+  <cpu type='kvm' name='z990.4-base' typename='z990.4-base-s390-cpu' usable='yes'/>
+  <cpu type='kvm' name='qemu' typename='qemu-s390-cpu' usable='yes'/>
+  <cpu type='kvm' name='z10BC-base' typename='z10BC-base-s390-cpu' usable='yes'/>
+  <cpu type='kvm' name='z9BC-base' typename='z9BC-base-s390-cpu' usable='yes'/>
+  <cpu type='kvm' name='z800' typename='z800-s390-cpu' usable='yes'/>
+  <cpu type='kvm' name='z890.2-base' typename='z890.2-base-s390-cpu' usable='yes'/>
+  <cpu type='kvm' name='z13.2' typename='z13.2-s390-cpu' usable='yes'/>
+  <cpu type='kvm' name='z114-base' typename='z114-base-s390-cpu' usable='yes'/>
+  <cpu type='kvm' name='z196-base' typename='z196-base-s390-cpu' usable='yes'/>
+  <cpu type='kvm' name='z13-base' typename='z13-base-s390-cpu' usable='yes'/>
+  <cpu type='kvm' name='z890' typename='z890-s390-cpu' usable='yes'/>
+  <cpu type='tcg' name='z10EC-base' typename='z10EC-base-s390-cpu' usable='no'>
     <blocker name='dateh2'/>
     <blocker name='pfpo'/>
     <blocker name='dfphp'/>
@@ -223,7 +223,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z9EC-base' usable='no'>
+  <cpu type='tcg' name='z9EC-base' typename='z9EC-base-s390-cpu' usable='no'>
     <blocker name='dateh2'/>
     <blocker name='hfpue'/>
     <blocker name='hfpm'/>
@@ -233,7 +233,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z196.2-base' usable='no'>
+  <cpu type='tcg' name='z196.2-base' typename='z196.2-base-s390-cpu' usable='no'>
     <blocker name='dateh2'/>
     <blocker name='iacc2'/>
     <blocker name='cmpsceh'/>
@@ -255,20 +255,20 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z900-base' usable='yes'/>
-  <cpu type='tcg' name='z990' usable='no'>
+  <cpu type='tcg' name='z900-base' typename='z900-base-s390-cpu' usable='yes'/>
+  <cpu type='tcg' name='z990' typename='z990-s390-cpu' usable='no'>
     <blocker name='hfpm'/>
     <blocker name='msa'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z900.2-base' usable='no'>
+  <cpu type='tcg' name='z900.2-base' typename='z900.2-base-s390-cpu' usable='no'>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='host'/>
-  <cpu type='tcg' name='z900.3' usable='no'>
+  <cpu type='tcg' name='host' typename='host-s390-cpu'/>
+  <cpu type='tcg' name='z900.3' typename='z900.3-s390-cpu' usable='no'>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z114' usable='no'>
+  <cpu type='tcg' name='z114' typename='z114-s390-cpu' usable='no'>
     <blocker name='cmm'/>
     <blocker name='dateh2'/>
     <blocker name='aefsi'/>
@@ -299,12 +299,12 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z890-base' usable='no'>
+  <cpu type='tcg' name='z890-base' typename='z890-base-s390-cpu' usable='no'>
     <blocker name='hfpm'/>
     <blocker name='msa'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z13.2-base' usable='no'>
+  <cpu type='tcg' name='z13.2-base' typename='z13.2-base-s390-cpu' usable='no'>
     <blocker name='dateh2'/>
     <blocker name='dfppc'/>
     <blocker name='iacc2'/>
@@ -329,7 +329,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='zEC12.2' usable='no'>
+  <cpu type='tcg' name='zEC12.2' typename='zEC12.2-s390-cpu' usable='no'>
     <blocker name='cmm'/>
     <blocker name='dateh2'/>
     <blocker name='esop'/>
@@ -369,7 +369,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z10BC' usable='no'>
+  <cpu type='tcg' name='z10BC' typename='z10BC-s390-cpu' usable='no'>
     <blocker name='cmm'/>
     <blocker name='dateh2'/>
     <blocker name='sthyi'/>
@@ -390,10 +390,10 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z900.2' usable='no'>
+  <cpu type='tcg' name='z900.2' typename='z900.2-s390-cpu' usable='no'>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z10BC.2' usable='no'>
+  <cpu type='tcg' name='z10BC.2' typename='z10BC.2-s390-cpu' usable='no'>
     <blocker name='cmm'/>
     <blocker name='dateh2'/>
     <blocker name='sthyi'/>
@@ -414,7 +414,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z196' usable='no'>
+  <cpu type='tcg' name='z196' typename='z196-s390-cpu' usable='no'>
     <blocker name='cmm'/>
     <blocker name='dateh2'/>
     <blocker name='aefsi'/>
@@ -445,7 +445,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z9EC' usable='no'>
+  <cpu type='tcg' name='z9EC' typename='z9EC-s390-cpu' usable='no'>
     <blocker name='cmm'/>
     <blocker name='dateh2'/>
     <blocker name='sthyi'/>
@@ -458,12 +458,12 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z990-base' usable='no'>
+  <cpu type='tcg' name='z990-base' typename='z990-base-s390-cpu' usable='no'>
     <blocker name='hfpm'/>
     <blocker name='msa'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z10EC.3' usable='no'>
+  <cpu type='tcg' name='z10EC.3' typename='z10EC.3-s390-cpu' usable='no'>
     <blocker name='cmm'/>
     <blocker name='dateh2'/>
     <blocker name='sthyi'/>
@@ -484,8 +484,8 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z900' usable='yes'/>
-  <cpu type='tcg' name='z9EC.3-base' usable='no'>
+  <cpu type='tcg' name='z900' typename='z900-s390-cpu' usable='yes'/>
+  <cpu type='tcg' name='z9EC.3-base' typename='z9EC.3-base-s390-cpu' usable='no'>
     <blocker name='dateh2'/>
     <blocker name='hfpue'/>
     <blocker name='hfpm'/>
@@ -495,12 +495,12 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z990.5-base' usable='no'>
+  <cpu type='tcg' name='z990.5-base' typename='z990.5-base-s390-cpu' usable='no'>
     <blocker name='hfpm'/>
     <blocker name='msa'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z10EC.2' usable='no'>
+  <cpu type='tcg' name='z10EC.2' typename='z10EC.2-s390-cpu' usable='no'>
     <blocker name='cmm'/>
     <blocker name='dateh2'/>
     <blocker name='sthyi'/>
@@ -521,7 +521,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z9BC.2' usable='no'>
+  <cpu type='tcg' name='z9BC.2' typename='z9BC.2-s390-cpu' usable='no'>
     <blocker name='cmm'/>
     <blocker name='dateh2'/>
     <blocker name='sthyi'/>
@@ -534,7 +534,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z10EC' usable='no'>
+  <cpu type='tcg' name='z10EC' typename='z10EC-s390-cpu' usable='no'>
     <blocker name='cmm'/>
     <blocker name='dateh2'/>
     <blocker name='sthyi'/>
@@ -555,12 +555,12 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z990.3-base' usable='no'>
+  <cpu type='tcg' name='z990.3-base' typename='z990.3-base-s390-cpu' usable='no'>
     <blocker name='hfpm'/>
     <blocker name='msa'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z14' usable='no'>
+  <cpu type='tcg' name='z14' typename='z14-s390-cpu' usable='no'>
     <blocker name='cmm'/>
     <blocker name='dateh2'/>
     <blocker name='esop'/>
@@ -617,7 +617,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z13s' usable='no'>
+  <cpu type='tcg' name='z13s' typename='z13s-s390-cpu' usable='no'>
     <blocker name='cmm'/>
     <blocker name='dateh2'/>
     <blocker name='esop'/>
@@ -661,7 +661,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z10EC.3-base' usable='no'>
+  <cpu type='tcg' name='z10EC.3-base' typename='z10EC.3-base-s390-cpu' usable='no'>
     <blocker name='dateh2'/>
     <blocker name='pfpo'/>
     <blocker name='dfphp'/>
@@ -677,7 +677,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='zEC12.2-base' usable='no'>
+  <cpu type='tcg' name='zEC12.2-base' typename='zEC12.2-base-s390-cpu' usable='no'>
     <blocker name='dateh2'/>
     <blocker name='iacc2'/>
     <blocker name='dfpzc'/>
@@ -700,12 +700,12 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z890.3-base' usable='no'>
+  <cpu type='tcg' name='z890.3-base' typename='z890.3-base-s390-cpu' usable='no'>
     <blocker name='hfpm'/>
     <blocker name='msa'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z9EC.3' usable='no'>
+  <cpu type='tcg' name='z9EC.3' typename='z9EC.3-s390-cpu' usable='no'>
     <blocker name='cmm'/>
     <blocker name='dateh2'/>
     <blocker name='sthyi'/>
@@ -718,12 +718,12 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z990.5' usable='no'>
+  <cpu type='tcg' name='z990.5' typename='z990.5-s390-cpu' usable='no'>
     <blocker name='hfpm'/>
     <blocker name='msa'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z13' usable='no'>
+  <cpu type='tcg' name='z13' typename='z13-s390-cpu' usable='no'>
     <blocker name='cmm'/>
     <blocker name='dateh2'/>
     <blocker name='esop'/>
@@ -767,7 +767,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z13s-base' usable='no'>
+  <cpu type='tcg' name='z13s-base' typename='z13s-base-s390-cpu' usable='no'>
     <blocker name='dateh2'/>
     <blocker name='dfppc'/>
     <blocker name='iacc2'/>
@@ -792,7 +792,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z14-base' usable='no'>
+  <cpu type='tcg' name='z14-base' typename='z14-base-s390-cpu' usable='no'>
     <blocker name='dateh2'/>
     <blocker name='dfppc'/>
     <blocker name='tsi'/>
@@ -822,7 +822,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z9EC.2' usable='no'>
+  <cpu type='tcg' name='z9EC.2' typename='z9EC.2-s390-cpu' usable='no'>
     <blocker name='cmm'/>
     <blocker name='dateh2'/>
     <blocker name='sthyi'/>
@@ -835,12 +835,12 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z990.4' usable='no'>
+  <cpu type='tcg' name='z990.4' typename='z990.4-s390-cpu' usable='no'>
     <blocker name='hfpm'/>
     <blocker name='msa'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='zEC12-base' usable='no'>
+  <cpu type='tcg' name='zEC12-base' typename='zEC12-base-s390-cpu' usable='no'>
     <blocker name='dateh2'/>
     <blocker name='iacc2'/>
     <blocker name='dfpzc'/>
@@ -863,7 +863,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z9EC.2-base' usable='no'>
+  <cpu type='tcg' name='z9EC.2-base' typename='z9EC.2-base-s390-cpu' usable='no'>
     <blocker name='dateh2'/>
     <blocker name='hfpue'/>
     <blocker name='hfpm'/>
@@ -873,7 +873,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='zBC12' usable='no'>
+  <cpu type='tcg' name='zBC12' typename='zBC12-s390-cpu' usable='no'>
     <blocker name='cmm'/>
     <blocker name='dateh2'/>
     <blocker name='esop'/>
@@ -913,7 +913,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z196.2' usable='no'>
+  <cpu type='tcg' name='z196.2' typename='z196.2-s390-cpu' usable='no'>
     <blocker name='cmm'/>
     <blocker name='dateh2'/>
     <blocker name='aefsi'/>
@@ -944,25 +944,25 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z990.3' usable='no'>
+  <cpu type='tcg' name='z990.3' typename='z990.3-s390-cpu' usable='no'>
     <blocker name='hfpm'/>
     <blocker name='msa'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z990.2-base' usable='no'>
+  <cpu type='tcg' name='z990.2-base' typename='z990.2-base-s390-cpu' usable='no'>
     <blocker name='hfpm'/>
     <blocker name='msa'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z900.3-base' usable='no'>
+  <cpu type='tcg' name='z900.3-base' typename='z900.3-base-s390-cpu' usable='no'>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z890.3' usable='no'>
+  <cpu type='tcg' name='z890.3' typename='z890.3-s390-cpu' usable='no'>
     <blocker name='hfpm'/>
     <blocker name='msa'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z10EC.2-base' usable='no'>
+  <cpu type='tcg' name='z10EC.2-base' typename='z10EC.2-base-s390-cpu' usable='no'>
     <blocker name='dateh2'/>
     <blocker name='pfpo'/>
     <blocker name='dfphp'/>
@@ -978,17 +978,17 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z990.2' usable='no'>
+  <cpu type='tcg' name='z990.2' typename='z990.2-s390-cpu' usable='no'>
     <blocker name='hfpm'/>
     <blocker name='msa'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z890.2' usable='no'>
+  <cpu type='tcg' name='z890.2' typename='z890.2-s390-cpu' usable='no'>
     <blocker name='hfpm'/>
     <blocker name='msa'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='zBC12-base' usable='no'>
+  <cpu type='tcg' name='zBC12-base' typename='zBC12-base-s390-cpu' usable='no'>
     <blocker name='dateh2'/>
     <blocker name='iacc2'/>
     <blocker name='dfpzc'/>
@@ -1011,10 +1011,10 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z800-base' usable='no'>
+  <cpu type='tcg' name='z800-base' typename='z800-base-s390-cpu' usable='no'>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='zEC12' usable='no'>
+  <cpu type='tcg' name='zEC12' typename='zEC12-s390-cpu' usable='no'>
     <blocker name='cmm'/>
     <blocker name='dateh2'/>
     <blocker name='esop'/>
@@ -1054,7 +1054,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z9BC.2-base' usable='no'>
+  <cpu type='tcg' name='z9BC.2-base' typename='z9BC.2-base-s390-cpu' usable='no'>
     <blocker name='dateh2'/>
     <blocker name='hfpue'/>
     <blocker name='hfpm'/>
@@ -1064,7 +1064,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z9BC' usable='no'>
+  <cpu type='tcg' name='z9BC' typename='z9BC-s390-cpu' usable='no'>
     <blocker name='cmm'/>
     <blocker name='dateh2'/>
     <blocker name='sthyi'/>
@@ -1077,7 +1077,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z10BC.2-base' usable='no'>
+  <cpu type='tcg' name='z10BC.2-base' typename='z10BC.2-base-s390-cpu' usable='no'>
     <blocker name='dateh2'/>
     <blocker name='pfpo'/>
     <blocker name='dfphp'/>
@@ -1093,13 +1093,13 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z990.4-base' usable='no'>
+  <cpu type='tcg' name='z990.4-base' typename='z990.4-base-s390-cpu' usable='no'>
     <blocker name='hfpm'/>
     <blocker name='msa'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='qemu' usable='yes'/>
-  <cpu type='tcg' name='z10BC-base' usable='no'>
+  <cpu type='tcg' name='qemu' typename='qemu-s390-cpu' usable='yes'/>
+  <cpu type='tcg' name='z10BC-base' typename='z10BC-base-s390-cpu' usable='no'>
     <blocker name='dateh2'/>
     <blocker name='pfpo'/>
     <blocker name='dfphp'/>
@@ -1115,7 +1115,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z9BC-base' usable='no'>
+  <cpu type='tcg' name='z9BC-base' typename='z9BC-base-s390-cpu' usable='no'>
     <blocker name='dateh2'/>
     <blocker name='hfpue'/>
     <blocker name='hfpm'/>
@@ -1125,15 +1125,15 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z800' usable='no'>
+  <cpu type='tcg' name='z800' typename='z800-s390-cpu' usable='no'>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z890.2-base' usable='no'>
+  <cpu type='tcg' name='z890.2-base' typename='z890.2-base-s390-cpu' usable='no'>
     <blocker name='hfpm'/>
     <blocker name='msa'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z13.2' usable='no'>
+  <cpu type='tcg' name='z13.2' typename='z13.2-s390-cpu' usable='no'>
     <blocker name='cmm'/>
     <blocker name='dateh2'/>
     <blocker name='esop'/>
@@ -1177,7 +1177,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z114-base' usable='no'>
+  <cpu type='tcg' name='z114-base' typename='z114-base-s390-cpu' usable='no'>
     <blocker name='dateh2'/>
     <blocker name='iacc2'/>
     <blocker name='cmpsceh'/>
@@ -1199,7 +1199,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z196-base' usable='no'>
+  <cpu type='tcg' name='z196-base' typename='z196-base-s390-cpu' usable='no'>
     <blocker name='dateh2'/>
     <blocker name='iacc2'/>
     <blocker name='cmpsceh'/>
@@ -1221,7 +1221,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z13-base' usable='no'>
+  <cpu type='tcg' name='z13-base' typename='z13-base-s390-cpu' usable='no'>
     <blocker name='dateh2'/>
     <blocker name='dfppc'/>
     <blocker name='iacc2'/>
@@ -1246,7 +1246,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z890' usable='no'>
+  <cpu type='tcg' name='z890' typename='z890-s390-cpu' usable='no'>
     <blocker name='hfpm'/>
     <blocker name='msa'/>
     <blocker name='type'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
index 875ec5f615..10a94a7f1c 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
@@ -654,12 +654,12 @@
     <property name='avx512pf' type='boolean' value='false'/>
     <property name='xstore-en' type='boolean' value='false'/>
   </hostCPU>
-  <cpu type='kvm' name='max' usable='yes'/>
-  <cpu type='kvm' name='host' usable='yes'/>
-  <cpu type='kvm' name='base' usable='yes'/>
-  <cpu type='kvm' name='qemu64' usable='yes'/>
-  <cpu type='kvm' name='qemu32' usable='yes'/>
-  <cpu type='kvm' name='phenom' usable='no'>
+  <cpu type='kvm' name='max' typename='max-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='host' typename='host-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='base' typename='base-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='qemu64' typename='qemu64-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='qemu32' typename='qemu32-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='phenom' typename='phenom-x86_64-cpu' usable='no'>
     <blocker name='mmxext'/>
     <blocker name='fxsr-opt'/>
     <blocker name='3dnowext'/>
@@ -667,21 +667,21 @@
     <blocker name='sse4a'/>
     <blocker name='npt'/>
   </cpu>
-  <cpu type='kvm' name='pentium3' usable='yes'/>
-  <cpu type='kvm' name='pentium2' usable='yes'/>
-  <cpu type='kvm' name='pentium' usable='yes'/>
-  <cpu type='kvm' name='n270' usable='yes'/>
-  <cpu type='kvm' name='kvm64' usable='yes'/>
-  <cpu type='kvm' name='kvm32' usable='yes'/>
-  <cpu type='kvm' name='coreduo' usable='yes'/>
-  <cpu type='kvm' name='core2duo' usable='yes'/>
-  <cpu type='kvm' name='athlon' usable='no'>
+  <cpu type='kvm' name='pentium3' typename='pentium3-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='pentium2' typename='pentium2-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='pentium' typename='pentium-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='n270' typename='n270-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='kvm64' typename='kvm64-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='kvm32' typename='kvm32-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='coreduo' typename='coreduo-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='core2duo' typename='core2duo-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='athlon' typename='athlon-x86_64-cpu' usable='no'>
     <blocker name='mmxext'/>
     <blocker name='3dnowext'/>
     <blocker name='3dnow'/>
   </cpu>
-  <cpu type='kvm' name='Westmere' usable='yes'/>
-  <cpu type='kvm' name='Skylake-Server' usable='no'>
+  <cpu type='kvm' name='Westmere' typename='Westmere-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Skylake-Server' typename='Skylake-Server-x86_64-cpu' usable='no'>
     <blocker name='hle'/>
     <blocker name='rtm'/>
     <blocker name='mpx'/>
@@ -703,7 +703,7 @@
     <blocker name='avx512f'/>
     <blocker name='avx512f'/>
   </cpu>
-  <cpu type='kvm' name='Skylake-Client' usable='no'>
+  <cpu type='kvm' name='Skylake-Client' typename='Skylake-Client-x86_64-cpu' usable='no'>
     <blocker name='hle'/>
     <blocker name='rtm'/>
     <blocker name='mpx'/>
@@ -716,9 +716,9 @@
     <blocker name='mpx'/>
     <blocker name='mpx'/>
   </cpu>
-  <cpu type='kvm' name='SandyBridge' usable='yes'/>
-  <cpu type='kvm' name='Penryn' usable='yes'/>
-  <cpu type='kvm' name='Opteron_G5' usable='no'>
+  <cpu type='kvm' name='SandyBridge' typename='SandyBridge-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Penryn' typename='Penryn-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Opteron_G5' typename='Opteron_G5-x86_64-cpu' usable='no'>
     <blocker name='sse4a'/>
     <blocker name='misalignsse'/>
     <blocker name='3dnowprefetch'/>
@@ -726,28 +726,28 @@
     <blocker name='fma4'/>
     <blocker name='tbm'/>
   </cpu>
-  <cpu type='kvm' name='Opteron_G4' usable='no'>
+  <cpu type='kvm' name='Opteron_G4' typename='Opteron_G4-x86_64-cpu' usable='no'>
     <blocker name='sse4a'/>
     <blocker name='misalignsse'/>
     <blocker name='3dnowprefetch'/>
     <blocker name='xop'/>
     <blocker name='fma4'/>
   </cpu>
-  <cpu type='kvm' name='Opteron_G3' usable='no'>
+  <cpu type='kvm' name='Opteron_G3' typename='Opteron_G3-x86_64-cpu' usable='no'>
     <blocker name='sse4a'/>
     <blocker name='misalignsse'/>
   </cpu>
-  <cpu type='kvm' name='Opteron_G2' usable='yes'/>
-  <cpu type='kvm' name='Opteron_G1' usable='yes'/>
-  <cpu type='kvm' name='Nehalem' usable='yes'/>
-  <cpu type='kvm' name='IvyBridge' usable='yes'/>
-  <cpu type='kvm' name='Haswell' usable='no'>
+  <cpu type='kvm' name='Opteron_G2' typename='Opteron_G2-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Opteron_G1' typename='Opteron_G1-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Nehalem' typename='Nehalem-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='IvyBridge' typename='IvyBridge-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Haswell' typename='Haswell-x86_64-cpu' usable='no'>
     <blocker name='hle'/>
     <blocker name='rtm'/>
   </cpu>
-  <cpu type='kvm' name='Haswell-noTSX' usable='yes'/>
-  <cpu type='kvm' name='Conroe' usable='yes'/>
-  <cpu type='kvm' name='Broadwell' usable='no'>
+  <cpu type='kvm' name='Haswell-noTSX' typename='Haswell-noTSX-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Conroe' typename='Conroe-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Broadwell' typename='Broadwell-x86_64-cpu' usable='no'>
     <blocker name='hle'/>
     <blocker name='rtm'/>
     <blocker name='rdseed'/>
@@ -755,35 +755,35 @@
     <blocker name='smap'/>
     <blocker name='3dnowprefetch'/>
   </cpu>
-  <cpu type='kvm' name='Broadwell-noTSX' usable='no'>
+  <cpu type='kvm' name='Broadwell-noTSX' typename='Broadwell-noTSX-x86_64-cpu' usable='no'>
     <blocker name='rdseed'/>
     <blocker name='adx'/>
     <blocker name='smap'/>
     <blocker name='3dnowprefetch'/>
   </cpu>
-  <cpu type='kvm' name='486' usable='yes'/>
-  <cpu type='tcg' name='max' usable='yes'/>
-  <cpu type='tcg' name='host' usable='no'>
+  <cpu type='kvm' name='486' typename='486-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='max' typename='max-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='host' typename='host-x86_64-cpu' usable='no'>
     <blocker name='kvm'/>
   </cpu>
-  <cpu type='tcg' name='base' usable='yes'/>
-  <cpu type='tcg' name='qemu64' usable='yes'/>
-  <cpu type='tcg' name='qemu32' usable='yes'/>
-  <cpu type='tcg' name='phenom' usable='no'>
+  <cpu type='tcg' name='base' typename='base-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='qemu64' typename='qemu64-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='qemu32' typename='qemu32-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='phenom' typename='phenom-x86_64-cpu' usable='no'>
     <blocker name='fxsr-opt'/>
     <blocker name='npt'/>
   </cpu>
-  <cpu type='tcg' name='pentium3' usable='yes'/>
-  <cpu type='tcg' name='pentium2' usable='yes'/>
-  <cpu type='tcg' name='pentium' usable='yes'/>
-  <cpu type='tcg' name='n270' usable='yes'/>
-  <cpu type='tcg' name='kvm64' usable='yes'/>
-  <cpu type='tcg' name='kvm32' usable='yes'/>
-  <cpu type='tcg' name='coreduo' usable='yes'/>
-  <cpu type='tcg' name='core2duo' usable='yes'/>
-  <cpu type='tcg' name='athlon' usable='yes'/>
-  <cpu type='tcg' name='Westmere' usable='yes'/>
-  <cpu type='tcg' name='Skylake-Server' usable='no'>
+  <cpu type='tcg' name='pentium3' typename='pentium3-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='pentium2' typename='pentium2-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='pentium' typename='pentium-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='n270' typename='n270-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='kvm64' typename='kvm64-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='kvm32' typename='kvm32-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='coreduo' typename='coreduo-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='core2duo' typename='core2duo-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='athlon' typename='athlon-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='Westmere' typename='Westmere-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='Skylake-Server' typename='Skylake-Server-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -804,7 +804,7 @@
     <blocker name='3dnowprefetch'/>
     <blocker name='xsavec'/>
   </cpu>
-  <cpu type='tcg' name='Skylake-Client' usable='no'>
+  <cpu type='tcg' name='Skylake-Client' typename='Skylake-Client-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -820,13 +820,13 @@
     <blocker name='3dnowprefetch'/>
     <blocker name='xsavec'/>
   </cpu>
-  <cpu type='tcg' name='SandyBridge' usable='no'>
+  <cpu type='tcg' name='SandyBridge' typename='SandyBridge-x86_64-cpu' usable='no'>
     <blocker name='x2apic'/>
     <blocker name='tsc-deadline'/>
     <blocker name='avx'/>
   </cpu>
-  <cpu type='tcg' name='Penryn' usable='yes'/>
-  <cpu type='tcg' name='Opteron_G5' usable='no'>
+  <cpu type='tcg' name='Penryn' typename='Penryn-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='Opteron_G5' typename='Opteron_G5-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='avx'/>
     <blocker name='f16c'/>
@@ -836,27 +836,27 @@
     <blocker name='fma4'/>
     <blocker name='tbm'/>
   </cpu>
-  <cpu type='tcg' name='Opteron_G4' usable='no'>
+  <cpu type='tcg' name='Opteron_G4' typename='Opteron_G4-x86_64-cpu' usable='no'>
     <blocker name='avx'/>
     <blocker name='misalignsse'/>
     <blocker name='3dnowprefetch'/>
     <blocker name='xop'/>
     <blocker name='fma4'/>
   </cpu>
-  <cpu type='tcg' name='Opteron_G3' usable='no'>
+  <cpu type='tcg' name='Opteron_G3' typename='Opteron_G3-x86_64-cpu' usable='no'>
     <blocker name='misalignsse'/>
   </cpu>
-  <cpu type='tcg' name='Opteron_G2' usable='yes'/>
-  <cpu type='tcg' name='Opteron_G1' usable='yes'/>
-  <cpu type='tcg' name='Nehalem' usable='yes'/>
-  <cpu type='tcg' name='IvyBridge' usable='no'>
+  <cpu type='tcg' name='Opteron_G2' typename='Opteron_G2-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='Opteron_G1' typename='Opteron_G1-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='Nehalem' typename='Nehalem-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='IvyBridge' typename='IvyBridge-x86_64-cpu' usable='no'>
     <blocker name='x2apic'/>
     <blocker name='tsc-deadline'/>
     <blocker name='avx'/>
     <blocker name='f16c'/>
     <blocker name='rdrand'/>
   </cpu>
-  <cpu type='tcg' name='Haswell' usable='no'>
+  <cpu type='tcg' name='Haswell' typename='Haswell-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -869,7 +869,7 @@
     <blocker name='invpcid'/>
     <blocker name='rtm'/>
   </cpu>
-  <cpu type='tcg' name='Haswell-noTSX' usable='no'>
+  <cpu type='tcg' name='Haswell-noTSX' typename='Haswell-noTSX-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -880,8 +880,8 @@
     <blocker name='avx2'/>
     <blocker name='invpcid'/>
   </cpu>
-  <cpu type='tcg' name='Conroe' usable='yes'/>
-  <cpu type='tcg' name='Broadwell' usable='no'>
+  <cpu type='tcg' name='Conroe' typename='Conroe-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='Broadwell' typename='Broadwell-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -896,7 +896,7 @@
     <blocker name='rdseed'/>
     <blocker name='3dnowprefetch'/>
   </cpu>
-  <cpu type='tcg' name='Broadwell-noTSX' usable='no'>
+  <cpu type='tcg' name='Broadwell-noTSX' typename='Broadwell-noTSX-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -909,7 +909,7 @@
     <blocker name='rdseed'/>
     <blocker name='3dnowprefetch'/>
   </cpu>
-  <cpu type='tcg' name='486' usable='yes'/>
+  <cpu type='tcg' name='486' typename='486-x86_64-cpu' usable='yes'/>
   <machine name='pc-i440fx-2.10' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/>
   <machine name='pc-0.12' hotplugCpus='yes' maxCpus='255'/>
   <machine name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
index f37d12c8ae..8ca2be3b83 100644
--- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
@@ -147,73 +147,73 @@
     <property name='te' type='boolean' value='true'/>
     <property name='cmm' type='boolean' value='true'/>
   </hostCPU>
-  <cpu type='kvm' name='z890.2' usable='yes'/>
-  <cpu type='kvm' name='z990.4' usable='yes'/>
-  <cpu type='kvm' name='z10BC.2' usable='yes'/>
-  <cpu type='kvm' name='z196.2' usable='yes'/>
-  <cpu type='kvm' name='z14' usable='yes'/>
-  <cpu type='kvm' name='z9BC-base' usable='yes'/>
-  <cpu type='kvm' name='zEC12-base' usable='yes'/>
-  <cpu type='kvm' name='z196-base' usable='yes'/>
-  <cpu type='kvm' name='z13-base' usable='yes'/>
-  <cpu type='kvm' name='z990.3' usable='yes'/>
-  <cpu type='kvm' name='host' usable='yes'/>
-  <cpu type='kvm' name='z9EC' usable='yes'/>
-  <cpu type='kvm' name='zBC12' usable='yes'/>
-  <cpu type='kvm' name='z9EC.3' usable='yes'/>
-  <cpu type='kvm' name='z196.2-base' usable='yes'/>
-  <cpu type='kvm' name='qemu' usable='yes'/>
-  <cpu type='kvm' name='zEC12.2-base' usable='yes'/>
-  <cpu type='kvm' name='z800-base' usable='yes'/>
-  <cpu type='kvm' name='z9EC.2' usable='yes'/>
-  <cpu type='kvm' name='z900.2-base' usable='yes'/>
-  <cpu type='kvm' name='z900.3' usable='yes'/>
-  <cpu type='kvm' name='z890-base' usable='yes'/>
-  <cpu type='kvm' name='z890' usable='yes'/>
-  <cpu type='kvm' name='z990.4-base' usable='yes'/>
-  <cpu type='kvm' name='z10BC.2-base' usable='yes'/>
-  <cpu type='kvm' name='z900.2' usable='yes'/>
-  <cpu type='kvm' name='z9BC.2-base' usable='yes'/>
-  <cpu type='kvm' name='z800' usable='yes'/>
-  <cpu type='kvm' name='z114' usable='yes'/>
-  <cpu type='kvm' name='z13' usable='yes'/>
-  <cpu type='kvm' name='z990' usable='yes'/>
-  <cpu type='kvm' name='z13s-base' usable='yes'/>
-  <cpu type='kvm' name='z990.2' usable='yes'/>
-  <cpu type='kvm' name='z14-base' usable='yes'/>
-  <cpu type='kvm' name='z890.2-base' usable='yes'/>
-  <cpu type='kvm' name='z196' usable='yes'/>
-  <cpu type='kvm' name='z10EC' usable='yes'/>
-  <cpu type='kvm' name='z13s' usable='yes'/>
-  <cpu type='kvm' name='z900' usable='yes'/>
-  <cpu type='kvm' name='z10EC.3' usable='yes'/>
-  <cpu type='kvm' name='z10EC.2-base' usable='yes'/>
-  <cpu type='kvm' name='z114-base' usable='yes'/>
-  <cpu type='kvm' name='z990.2-base' usable='yes'/>
-  <cpu type='kvm' name='z9EC.2-base' usable='yes'/>
-  <cpu type='kvm' name='z890.3' usable='yes'/>
-  <cpu type='kvm' name='z900.3-base' usable='yes'/>
-  <cpu type='kvm' name='z9BC.2' usable='yes'/>
-  <cpu type='kvm' name='z10BC' usable='yes'/>
-  <cpu type='kvm' name='z990.5' usable='yes'/>
-  <cpu type='kvm' name='zEC12.2' usable='yes'/>
-  <cpu type='kvm' name='z10EC-base' usable='yes'/>
-  <cpu type='kvm' name='z9EC-base' usable='yes'/>
-  <cpu type='kvm' name='z9EC.3-base' usable='yes'/>
-  <cpu type='kvm' name='zEC12' usable='yes'/>
-  <cpu type='kvm' name='z990.5-base' usable='yes'/>
-  <cpu type='kvm' name='z10BC-base' usable='yes'/>
-  <cpu type='kvm' name='z900-base' usable='yes'/>
-  <cpu type='kvm' name='z13.2' usable='yes'/>
-  <cpu type='kvm' name='zBC12-base' usable='yes'/>
-  <cpu type='kvm' name='z13.2-base' usable='yes'/>
-  <cpu type='kvm' name='z890.3-base' usable='yes'/>
-  <cpu type='kvm' name='z990-base' usable='yes'/>
-  <cpu type='kvm' name='z10EC.2' usable='yes'/>
-  <cpu type='kvm' name='z9BC' usable='yes'/>
-  <cpu type='kvm' name='z10EC.3-base' usable='yes'/>
-  <cpu type='kvm' name='z990.3-base' usable='yes'/>
-  <cpu type='tcg' name='z890.2' usable='no'>
+  <cpu type='kvm' name='z890.2' typename='z890.2-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z990.4' typename='z990.4-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z10BC.2' typename='z10BC.2-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z196.2' typename='z196.2-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z14' typename='z14-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z9BC-base' typename='z9BC-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='zEC12-base' typename='zEC12-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z196-base' typename='z196-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z13-base' typename='z13-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z990.3' typename='z990.3-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='host' typename='host-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z9EC' typename='z9EC-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='zBC12' typename='zBC12-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z9EC.3' typename='z9EC.3-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z196.2-base' typename='z196.2-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='qemu' typename='qemu-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='zEC12.2-base' typename='zEC12.2-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z800-base' typename='z800-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z9EC.2' typename='z9EC.2-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z900.2-base' typename='z900.2-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z900.3' typename='z900.3-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z890-base' typename='z890-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z890' typename='z890-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z990.4-base' typename='z990.4-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z10BC.2-base' typename='z10BC.2-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z900.2' typename='z900.2-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z9BC.2-base' typename='z9BC.2-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z800' typename='z800-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z114' typename='z114-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z13' typename='z13-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z990' typename='z990-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z13s-base' typename='z13s-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z990.2' typename='z990.2-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z14-base' typename='z14-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z890.2-base' typename='z890.2-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z196' typename='z196-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z10EC' typename='z10EC-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z13s' typename='z13s-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z900' typename='z900-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z10EC.3' typename='z10EC.3-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z10EC.2-base' typename='z10EC.2-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z114-base' typename='z114-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z990.2-base' typename='z990.2-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z9EC.2-base' typename='z9EC.2-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z890.3' typename='z890.3-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z900.3-base' typename='z900.3-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z9BC.2' typename='z9BC.2-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z10BC' typename='z10BC-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z990.5' typename='z990.5-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='zEC12.2' typename='zEC12.2-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z10EC-base' typename='z10EC-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z9EC-base' typename='z9EC-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z9EC.3-base' typename='z9EC.3-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='zEC12' typename='zEC12-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z990.5-base' typename='z990.5-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z10BC-base' typename='z10BC-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z900-base' typename='z900-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z13.2' typename='z13.2-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='zBC12-base' typename='zBC12-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z13.2-base' typename='z13.2-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z890.3-base' typename='z890.3-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z990-base' typename='z990-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z10EC.2' typename='z10EC.2-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z9BC' typename='z9BC-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z10EC.3-base' typename='z10EC.3-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z990.3-base' typename='z990.3-base-s390x-cpu' usable='yes'/>
+  <cpu type='tcg' name='z890.2' typename='z890.2-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -228,7 +228,7 @@
     <blocker name='hfpm'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z990.4' usable='no'>
+  <cpu type='tcg' name='z990.4' typename='z990.4-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -243,7 +243,7 @@
     <blocker name='hfpm'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z10BC.2' usable='no'>
+  <cpu type='tcg' name='z10BC.2' typename='z10BC.2-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -273,7 +273,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z196.2' usable='no'>
+  <cpu type='tcg' name='z196.2' typename='z196.2-s390x-cpu' usable='no'>
     <blocker name='pcc-xts-eaes-256'/>
     <blocker name='pcc-xts-eaes-128'/>
     <blocker name='pcc-xts-aes-256'/>
@@ -395,7 +395,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z14' usable='no'>
+  <cpu type='tcg' name='z14' typename='z14-s390x-cpu' usable='no'>
     <blocker name='ppno-sha-512-drng'/>
     <blocker name='pcc-xts-eaes-256'/>
     <blocker name='pcc-xts-eaes-128'/>
@@ -542,7 +542,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z9BC-base' usable='no'>
+  <cpu type='tcg' name='z9BC-base' typename='z9BC-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -561,7 +561,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='zEC12-base' usable='no'>
+  <cpu type='tcg' name='zEC12-base' typename='zEC12-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -593,7 +593,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z196-base' usable='no'>
+  <cpu type='tcg' name='z196-base' typename='z196-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -624,7 +624,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z13-base' usable='no'>
+  <cpu type='tcg' name='z13-base' typename='z13-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -658,7 +658,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z990.3' usable='no'>
+  <cpu type='tcg' name='z990.3' typename='z990.3-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -673,8 +673,8 @@
     <blocker name='hfpm'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='host'/>
-  <cpu type='tcg' name='z9EC' usable='no'>
+  <cpu type='tcg' name='host' typename='host-s390x-cpu'/>
+  <cpu type='tcg' name='z9EC' typename='z9EC-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -696,7 +696,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='zBC12' usable='no'>
+  <cpu type='tcg' name='zBC12' typename='zBC12-s390x-cpu' usable='no'>
     <blocker name='pcc-xts-eaes-256'/>
     <blocker name='pcc-xts-eaes-128'/>
     <blocker name='pcc-xts-aes-256'/>
@@ -827,7 +827,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z9EC.3' usable='no'>
+  <cpu type='tcg' name='z9EC.3' typename='z9EC.3-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -849,7 +849,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z196.2-base' usable='no'>
+  <cpu type='tcg' name='z196.2-base' typename='z196.2-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -880,8 +880,8 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='qemu' usable='yes'/>
-  <cpu type='tcg' name='zEC12.2-base' usable='no'>
+  <cpu type='tcg' name='qemu' typename='qemu-s390x-cpu' usable='yes'/>
+  <cpu type='tcg' name='zEC12.2-base' typename='zEC12.2-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -913,10 +913,10 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z800-base' usable='no'>
+  <cpu type='tcg' name='z800-base' typename='z800-base-s390x-cpu' usable='no'>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z9EC.2' usable='no'>
+  <cpu type='tcg' name='z9EC.2' typename='z9EC.2-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -938,13 +938,13 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z900.2-base' usable='no'>
+  <cpu type='tcg' name='z900.2-base' typename='z900.2-base-s390x-cpu' usable='no'>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z900.3' usable='no'>
+  <cpu type='tcg' name='z900.3' typename='z900.3-s390x-cpu' usable='no'>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z890-base' usable='no'>
+  <cpu type='tcg' name='z890-base' typename='z890-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -959,7 +959,7 @@
     <blocker name='hfpm'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z890' usable='no'>
+  <cpu type='tcg' name='z890' typename='z890-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -974,7 +974,7 @@
     <blocker name='hfpm'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z990.4-base' usable='no'>
+  <cpu type='tcg' name='z990.4-base' typename='z990.4-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -989,7 +989,7 @@
     <blocker name='hfpm'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z10BC.2-base' usable='no'>
+  <cpu type='tcg' name='z10BC.2-base' typename='z10BC.2-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1014,10 +1014,10 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z900.2' usable='no'>
+  <cpu type='tcg' name='z900.2' typename='z900.2-s390x-cpu' usable='no'>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z9BC.2-base' usable='no'>
+  <cpu type='tcg' name='z9BC.2-base' typename='z9BC.2-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1036,10 +1036,10 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z800' usable='no'>
+  <cpu type='tcg' name='z800' typename='z800-s390x-cpu' usable='no'>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z114' usable='no'>
+  <cpu type='tcg' name='z114' typename='z114-s390x-cpu' usable='no'>
     <blocker name='pcc-xts-eaes-256'/>
     <blocker name='pcc-xts-eaes-128'/>
     <blocker name='pcc-xts-aes-256'/>
@@ -1161,7 +1161,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z13' usable='no'>
+  <cpu type='tcg' name='z13' typename='z13-s390x-cpu' usable='no'>
     <blocker name='ppno-sha-512-drng'/>
     <blocker name='pcc-xts-eaes-256'/>
     <blocker name='pcc-xts-eaes-128'/>
@@ -1296,7 +1296,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z990' usable='no'>
+  <cpu type='tcg' name='z990' typename='z990-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1311,7 +1311,7 @@
     <blocker name='hfpm'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z13s-base' usable='no'>
+  <cpu type='tcg' name='z13s-base' typename='z13s-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1345,7 +1345,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z990.2' usable='no'>
+  <cpu type='tcg' name='z990.2' typename='z990.2-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1360,7 +1360,7 @@
     <blocker name='hfpm'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z14-base' usable='no'>
+  <cpu type='tcg' name='z14-base' typename='z14-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1399,7 +1399,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z890.2-base' usable='no'>
+  <cpu type='tcg' name='z890.2-base' typename='z890.2-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1414,7 +1414,7 @@
     <blocker name='hfpm'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z196' usable='no'>
+  <cpu type='tcg' name='z196' typename='z196-s390x-cpu' usable='no'>
     <blocker name='pcc-xts-eaes-256'/>
     <blocker name='pcc-xts-eaes-128'/>
     <blocker name='pcc-xts-aes-256'/>
@@ -1536,7 +1536,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z10EC' usable='no'>
+  <cpu type='tcg' name='z10EC' typename='z10EC-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1566,7 +1566,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z13s' usable='no'>
+  <cpu type='tcg' name='z13s' typename='z13s-s390x-cpu' usable='no'>
     <blocker name='ppno-sha-512-drng'/>
     <blocker name='pcc-xts-eaes-256'/>
     <blocker name='pcc-xts-eaes-128'/>
@@ -1701,8 +1701,8 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z900' usable='yes'/>
-  <cpu type='tcg' name='z10EC.3' usable='no'>
+  <cpu type='tcg' name='z900' typename='z900-s390x-cpu' usable='yes'/>
+  <cpu type='tcg' name='z10EC.3' typename='z10EC.3-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1732,7 +1732,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z10EC.2-base' usable='no'>
+  <cpu type='tcg' name='z10EC.2-base' typename='z10EC.2-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1757,7 +1757,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z114-base' usable='no'>
+  <cpu type='tcg' name='z114-base' typename='z114-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1788,7 +1788,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z990.2-base' usable='no'>
+  <cpu type='tcg' name='z990.2-base' typename='z990.2-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1803,7 +1803,7 @@
     <blocker name='hfpm'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z9EC.2-base' usable='no'>
+  <cpu type='tcg' name='z9EC.2-base' typename='z9EC.2-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1822,7 +1822,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z890.3' usable='no'>
+  <cpu type='tcg' name='z890.3' typename='z890.3-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1837,10 +1837,10 @@
     <blocker name='hfpm'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z900.3-base' usable='no'>
+  <cpu type='tcg' name='z900.3-base' typename='z900.3-base-s390x-cpu' usable='no'>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z9BC.2' usable='no'>
+  <cpu type='tcg' name='z9BC.2' typename='z9BC.2-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1862,7 +1862,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z10BC' usable='no'>
+  <cpu type='tcg' name='z10BC' typename='z10BC-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1892,7 +1892,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z990.5' usable='no'>
+  <cpu type='tcg' name='z990.5' typename='z990.5-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1907,7 +1907,7 @@
     <blocker name='hfpm'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='zEC12.2' usable='no'>
+  <cpu type='tcg' name='zEC12.2' typename='zEC12.2-s390x-cpu' usable='no'>
     <blocker name='pcc-xts-eaes-256'/>
     <blocker name='pcc-xts-eaes-128'/>
     <blocker name='pcc-xts-aes-256'/>
@@ -2038,7 +2038,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z10EC-base' usable='no'>
+  <cpu type='tcg' name='z10EC-base' typename='z10EC-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -2063,7 +2063,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z9EC-base' usable='no'>
+  <cpu type='tcg' name='z9EC-base' typename='z9EC-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -2082,7 +2082,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z9EC.3-base' usable='no'>
+  <cpu type='tcg' name='z9EC.3-base' typename='z9EC.3-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -2101,7 +2101,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='zEC12' usable='no'>
+  <cpu type='tcg' name='zEC12' typename='zEC12-s390x-cpu' usable='no'>
     <blocker name='pcc-xts-eaes-256'/>
     <blocker name='pcc-xts-eaes-128'/>
     <blocker name='pcc-xts-aes-256'/>
@@ -2232,7 +2232,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z990.5-base' usable='no'>
+  <cpu type='tcg' name='z990.5-base' typename='z990.5-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -2247,7 +2247,7 @@
     <blocker name='hfpm'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z10BC-base' usable='no'>
+  <cpu type='tcg' name='z10BC-base' typename='z10BC-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -2272,8 +2272,8 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z900-base' usable='yes'/>
-  <cpu type='tcg' name='z13.2' usable='no'>
+  <cpu type='tcg' name='z900-base' typename='z900-base-s390x-cpu' usable='yes'/>
+  <cpu type='tcg' name='z13.2' typename='z13.2-s390x-cpu' usable='no'>
     <blocker name='ppno-sha-512-drng'/>
     <blocker name='pcc-xts-eaes-256'/>
     <blocker name='pcc-xts-eaes-128'/>
@@ -2408,7 +2408,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='zBC12-base' usable='no'>
+  <cpu type='tcg' name='zBC12-base' typename='zBC12-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -2440,7 +2440,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z13.2-base' usable='no'>
+  <cpu type='tcg' name='z13.2-base' typename='z13.2-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -2474,7 +2474,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z890.3-base' usable='no'>
+  <cpu type='tcg' name='z890.3-base' typename='z890.3-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -2489,7 +2489,7 @@
     <blocker name='hfpm'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z990-base' usable='no'>
+  <cpu type='tcg' name='z990-base' typename='z990-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -2504,7 +2504,7 @@
     <blocker name='hfpm'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z10EC.2' usable='no'>
+  <cpu type='tcg' name='z10EC.2' typename='z10EC.2-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -2534,7 +2534,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z9BC' usable='no'>
+  <cpu type='tcg' name='z9BC' typename='z9BC-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -2556,7 +2556,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z10EC.3-base' usable='no'>
+  <cpu type='tcg' name='z10EC.3-base' typename='z10EC.3-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -2581,7 +2581,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z990.3-base' usable='no'>
+  <cpu type='tcg' name='z990.3-base' typename='z990.3-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
index a69b632917..fd8e545e6e 100644
--- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
@@ -664,12 +664,12 @@
     <property name='avx512pf' type='boolean' value='false'/>
     <property name='xstore-en' type='boolean' value='false'/>
   </hostCPU>
-  <cpu type='kvm' name='max' usable='yes'/>
-  <cpu type='kvm' name='host' usable='yes'/>
-  <cpu type='kvm' name='base' usable='yes'/>
-  <cpu type='kvm' name='qemu64' usable='yes'/>
-  <cpu type='kvm' name='qemu32' usable='yes'/>
-  <cpu type='kvm' name='phenom' usable='no'>
+  <cpu type='kvm' name='max' typename='max-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='host' typename='host-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='base' typename='base-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='qemu64' typename='qemu64-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='qemu32' typename='qemu32-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='phenom' typename='phenom-x86_64-cpu' usable='no'>
     <blocker name='mmxext'/>
     <blocker name='fxsr-opt'/>
     <blocker name='3dnowext'/>
@@ -677,21 +677,21 @@
     <blocker name='sse4a'/>
     <blocker name='npt'/>
   </cpu>
-  <cpu type='kvm' name='pentium3' usable='yes'/>
-  <cpu type='kvm' name='pentium2' usable='yes'/>
-  <cpu type='kvm' name='pentium' usable='yes'/>
-  <cpu type='kvm' name='n270' usable='yes'/>
-  <cpu type='kvm' name='kvm64' usable='yes'/>
-  <cpu type='kvm' name='kvm32' usable='yes'/>
-  <cpu type='kvm' name='coreduo' usable='yes'/>
-  <cpu type='kvm' name='core2duo' usable='yes'/>
-  <cpu type='kvm' name='athlon' usable='no'>
+  <cpu type='kvm' name='pentium3' typename='pentium3-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='pentium2' typename='pentium2-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='pentium' typename='pentium-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='n270' typename='n270-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='kvm64' typename='kvm64-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='kvm32' typename='kvm32-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='coreduo' typename='coreduo-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='core2duo' typename='core2duo-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='athlon' typename='athlon-x86_64-cpu' usable='no'>
     <blocker name='mmxext'/>
     <blocker name='3dnowext'/>
     <blocker name='3dnow'/>
   </cpu>
-  <cpu type='kvm' name='Westmere' usable='yes'/>
-  <cpu type='kvm' name='Skylake-Server' usable='no'>
+  <cpu type='kvm' name='Westmere' typename='Westmere-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Skylake-Server' typename='Skylake-Server-x86_64-cpu' usable='no'>
     <blocker name='avx512f'/>
     <blocker name='avx512dq'/>
     <blocker name='clwb'/>
@@ -702,33 +702,33 @@
     <blocker name='avx512f'/>
     <blocker name='avx512f'/>
   </cpu>
-  <cpu type='kvm' name='Skylake-Client' usable='yes'/>
-  <cpu type='kvm' name='SandyBridge' usable='yes'/>
-  <cpu type='kvm' name='Penryn' usable='yes'/>
-  <cpu type='kvm' name='Opteron_G5' usable='no'>
+  <cpu type='kvm' name='Skylake-Client' typename='Skylake-Client-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='SandyBridge' typename='SandyBridge-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Penryn' typename='Penryn-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Opteron_G5' typename='Opteron_G5-x86_64-cpu' usable='no'>
     <blocker name='sse4a'/>
     <blocker name='misalignsse'/>
     <blocker name='xop'/>
     <blocker name='fma4'/>
     <blocker name='tbm'/>
   </cpu>
-  <cpu type='kvm' name='Opteron_G4' usable='no'>
+  <cpu type='kvm' name='Opteron_G4' typename='Opteron_G4-x86_64-cpu' usable='no'>
     <blocker name='sse4a'/>
     <blocker name='misalignsse'/>
     <blocker name='xop'/>
     <blocker name='fma4'/>
   </cpu>
-  <cpu type='kvm' name='Opteron_G3' usable='no'>
+  <cpu type='kvm' name='Opteron_G3' typename='Opteron_G3-x86_64-cpu' usable='no'>
     <blocker name='sse4a'/>
     <blocker name='misalignsse'/>
   </cpu>
-  <cpu type='kvm' name='Opteron_G2' usable='yes'/>
-  <cpu type='kvm' name='Opteron_G1' usable='yes'/>
-  <cpu type='kvm' name='Nehalem' usable='yes'/>
-  <cpu type='kvm' name='IvyBridge' usable='yes'/>
-  <cpu type='kvm' name='Haswell' usable='yes'/>
-  <cpu type='kvm' name='Haswell-noTSX' usable='yes'/>
-  <cpu type='kvm' name='EPYC' usable='no'>
+  <cpu type='kvm' name='Opteron_G2' typename='Opteron_G2-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Opteron_G1' typename='Opteron_G1-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Nehalem' typename='Nehalem-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='IvyBridge' typename='IvyBridge-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Haswell' typename='Haswell-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Haswell-noTSX' typename='Haswell-noTSX-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='EPYC' typename='EPYC-x86_64-cpu' usable='no'>
     <blocker name='sha-ni'/>
     <blocker name='mmxext'/>
     <blocker name='fxsr-opt'/>
@@ -737,32 +737,32 @@
     <blocker name='misalignsse'/>
     <blocker name='osvw'/>
   </cpu>
-  <cpu type='kvm' name='Conroe' usable='yes'/>
-  <cpu type='kvm' name='Broadwell' usable='yes'/>
-  <cpu type='kvm' name='Broadwell-noTSX' usable='yes'/>
-  <cpu type='kvm' name='486' usable='yes'/>
-  <cpu type='tcg' name='max' usable='yes'/>
-  <cpu type='tcg' name='host' usable='no'>
+  <cpu type='kvm' name='Conroe' typename='Conroe-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Broadwell' typename='Broadwell-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Broadwell-noTSX' typename='Broadwell-noTSX-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='486' typename='486-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='max' typename='max-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='host' typename='host-x86_64-cpu' usable='no'>
     <blocker name='kvm'/>
   </cpu>
-  <cpu type='tcg' name='base' usable='yes'/>
-  <cpu type='tcg' name='qemu64' usable='yes'/>
-  <cpu type='tcg' name='qemu32' usable='yes'/>
-  <cpu type='tcg' name='phenom' usable='no'>
+  <cpu type='tcg' name='base' typename='base-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='qemu64' typename='qemu64-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='qemu32' typename='qemu32-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='phenom' typename='phenom-x86_64-cpu' usable='no'>
     <blocker name='fxsr-opt'/>
     <blocker name='npt'/>
   </cpu>
-  <cpu type='tcg' name='pentium3' usable='yes'/>
-  <cpu type='tcg' name='pentium2' usable='yes'/>
-  <cpu type='tcg' name='pentium' usable='yes'/>
-  <cpu type='tcg' name='n270' usable='yes'/>
-  <cpu type='tcg' name='kvm64' usable='yes'/>
-  <cpu type='tcg' name='kvm32' usable='yes'/>
-  <cpu type='tcg' name='coreduo' usable='yes'/>
-  <cpu type='tcg' name='core2duo' usable='yes'/>
-  <cpu type='tcg' name='athlon' usable='yes'/>
-  <cpu type='tcg' name='Westmere' usable='yes'/>
-  <cpu type='tcg' name='Skylake-Server' usable='no'>
+  <cpu type='tcg' name='pentium3' typename='pentium3-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='pentium2' typename='pentium2-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='pentium' typename='pentium-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='n270' typename='n270-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='kvm64' typename='kvm64-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='kvm32' typename='kvm32-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='coreduo' typename='coreduo-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='core2duo' typename='core2duo-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='athlon' typename='athlon-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='Westmere' typename='Westmere-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='Skylake-Server' typename='Skylake-Server-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -783,7 +783,7 @@
     <blocker name='3dnowprefetch'/>
     <blocker name='xsavec'/>
   </cpu>
-  <cpu type='tcg' name='Skylake-Client' usable='no'>
+  <cpu type='tcg' name='Skylake-Client' typename='Skylake-Client-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -799,13 +799,13 @@
     <blocker name='3dnowprefetch'/>
     <blocker name='xsavec'/>
   </cpu>
-  <cpu type='tcg' name='SandyBridge' usable='no'>
+  <cpu type='tcg' name='SandyBridge' typename='SandyBridge-x86_64-cpu' usable='no'>
     <blocker name='x2apic'/>
     <blocker name='tsc-deadline'/>
     <blocker name='avx'/>
   </cpu>
-  <cpu type='tcg' name='Penryn' usable='yes'/>
-  <cpu type='tcg' name='Opteron_G5' usable='no'>
+  <cpu type='tcg' name='Penryn' typename='Penryn-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='Opteron_G5' typename='Opteron_G5-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='avx'/>
     <blocker name='f16c'/>
@@ -815,27 +815,27 @@
     <blocker name='fma4'/>
     <blocker name='tbm'/>
   </cpu>
-  <cpu type='tcg' name='Opteron_G4' usable='no'>
+  <cpu type='tcg' name='Opteron_G4' typename='Opteron_G4-x86_64-cpu' usable='no'>
     <blocker name='avx'/>
     <blocker name='misalignsse'/>
     <blocker name='3dnowprefetch'/>
     <blocker name='xop'/>
     <blocker name='fma4'/>
   </cpu>
-  <cpu type='tcg' name='Opteron_G3' usable='no'>
+  <cpu type='tcg' name='Opteron_G3' typename='Opteron_G3-x86_64-cpu' usable='no'>
     <blocker name='misalignsse'/>
   </cpu>
-  <cpu type='tcg' name='Opteron_G2' usable='yes'/>
-  <cpu type='tcg' name='Opteron_G1' usable='yes'/>
-  <cpu type='tcg' name='Nehalem' usable='yes'/>
-  <cpu type='tcg' name='IvyBridge' usable='no'>
+  <cpu type='tcg' name='Opteron_G2' typename='Opteron_G2-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='Opteron_G1' typename='Opteron_G1-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='Nehalem' typename='Nehalem-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='IvyBridge' typename='IvyBridge-x86_64-cpu' usable='no'>
     <blocker name='x2apic'/>
     <blocker name='tsc-deadline'/>
     <blocker name='avx'/>
     <blocker name='f16c'/>
     <blocker name='rdrand'/>
   </cpu>
-  <cpu type='tcg' name='Haswell' usable='no'>
+  <cpu type='tcg' name='Haswell' typename='Haswell-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -848,7 +848,7 @@
     <blocker name='invpcid'/>
     <blocker name='rtm'/>
   </cpu>
-  <cpu type='tcg' name='Haswell-noTSX' usable='no'>
+  <cpu type='tcg' name='Haswell-noTSX' typename='Haswell-noTSX-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -859,7 +859,7 @@
     <blocker name='avx2'/>
     <blocker name='invpcid'/>
   </cpu>
-  <cpu type='tcg' name='EPYC' usable='no'>
+  <cpu type='tcg' name='EPYC' typename='EPYC-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='avx'/>
     <blocker name='f16c'/>
@@ -873,8 +873,8 @@
     <blocker name='osvw'/>
     <blocker name='xsavec'/>
   </cpu>
-  <cpu type='tcg' name='Conroe' usable='yes'/>
-  <cpu type='tcg' name='Broadwell' usable='no'>
+  <cpu type='tcg' name='Conroe' typename='Conroe-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='Broadwell' typename='Broadwell-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -889,7 +889,7 @@
     <blocker name='rdseed'/>
     <blocker name='3dnowprefetch'/>
   </cpu>
-  <cpu type='tcg' name='Broadwell-noTSX' usable='no'>
+  <cpu type='tcg' name='Broadwell-noTSX' typename='Broadwell-noTSX-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -902,7 +902,7 @@
     <blocker name='rdseed'/>
     <blocker name='3dnowprefetch'/>
   </cpu>
-  <cpu type='tcg' name='486' usable='yes'/>
+  <cpu type='tcg' name='486' typename='486-x86_64-cpu' usable='yes'/>
   <machine name='pc-i440fx-2.11' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/>
   <machine name='pc-0.12' hotplugCpus='yes' maxCpus='255'/>
   <machine name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
index 0a2f801f53..037ecf9594 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
@@ -159,74 +159,74 @@
   <microcodeVersion>61700289</microcodeVersion>
   <package>v2.12.0</package>
   <arch>aarch64</arch>
-  <cpu type='kvm' name='pxa262'/>
-  <cpu type='kvm' name='pxa270-a0'/>
-  <cpu type='kvm' name='arm1136'/>
-  <cpu type='kvm' name='cortex-a15'/>
-  <cpu type='kvm' name='pxa260'/>
-  <cpu type='kvm' name='arm1136-r2'/>
-  <cpu type='kvm' name='pxa261'/>
-  <cpu type='kvm' name='pxa255'/>
-  <cpu type='kvm' name='cortex-m33'/>
-  <cpu type='kvm' name='arm926'/>
-  <cpu type='kvm' name='arm11mpcore'/>
-  <cpu type='kvm' name='pxa250'/>
-  <cpu type='kvm' name='ti925t'/>
-  <cpu type='kvm' name='cortex-a57'/>
-  <cpu type='kvm' name='sa1110'/>
-  <cpu type='kvm' name='host'/>
-  <cpu type='kvm' name='arm1176'/>
-  <cpu type='kvm' name='cortex-a53'/>
-  <cpu type='kvm' name='sa1100'/>
-  <cpu type='kvm' name='pxa270-c5'/>
-  <cpu type='kvm' name='cortex-a9'/>
-  <cpu type='kvm' name='cortex-a8'/>
-  <cpu type='kvm' name='cortex-a7'/>
-  <cpu type='kvm' name='pxa270-c0'/>
-  <cpu type='kvm' name='arm1026'/>
-  <cpu type='kvm' name='pxa270-b1'/>
-  <cpu type='kvm' name='cortex-m3'/>
-  <cpu type='kvm' name='max'/>
-  <cpu type='kvm' name='cortex-m4'/>
-  <cpu type='kvm' name='pxa270-b0'/>
-  <cpu type='kvm' name='arm946'/>
-  <cpu type='kvm' name='cortex-r5'/>
-  <cpu type='kvm' name='pxa270-a1'/>
-  <cpu type='kvm' name='pxa270'/>
-  <cpu type='tcg' name='pxa262'/>
-  <cpu type='tcg' name='pxa270-a0'/>
-  <cpu type='tcg' name='arm1136'/>
-  <cpu type='tcg' name='cortex-a15'/>
-  <cpu type='tcg' name='pxa260'/>
-  <cpu type='tcg' name='arm1136-r2'/>
-  <cpu type='tcg' name='pxa261'/>
-  <cpu type='tcg' name='pxa255'/>
-  <cpu type='tcg' name='cortex-m33'/>
-  <cpu type='tcg' name='arm926'/>
-  <cpu type='tcg' name='arm11mpcore'/>
-  <cpu type='tcg' name='pxa250'/>
-  <cpu type='tcg' name='ti925t'/>
-  <cpu type='tcg' name='cortex-a57'/>
-  <cpu type='tcg' name='sa1110'/>
-  <cpu type='tcg' name='host'/>
-  <cpu type='tcg' name='arm1176'/>
-  <cpu type='tcg' name='cortex-a53'/>
-  <cpu type='tcg' name='sa1100'/>
-  <cpu type='tcg' name='pxa270-c5'/>
-  <cpu type='tcg' name='cortex-a9'/>
-  <cpu type='tcg' name='cortex-a8'/>
-  <cpu type='tcg' name='cortex-a7'/>
-  <cpu type='tcg' name='pxa270-c0'/>
-  <cpu type='tcg' name='arm1026'/>
-  <cpu type='tcg' name='pxa270-b1'/>
-  <cpu type='tcg' name='cortex-m3'/>
-  <cpu type='tcg' name='max'/>
-  <cpu type='tcg' name='cortex-m4'/>
-  <cpu type='tcg' name='pxa270-b0'/>
-  <cpu type='tcg' name='arm946'/>
-  <cpu type='tcg' name='cortex-r5'/>
-  <cpu type='tcg' name='pxa270-a1'/>
-  <cpu type='tcg' name='pxa270'/>
+  <cpu type='kvm' name='pxa262' typename='pxa262-arm-cpu'/>
+  <cpu type='kvm' name='pxa270-a0' typename='pxa270-a0-arm-cpu'/>
+  <cpu type='kvm' name='arm1136' typename='arm1136-arm-cpu'/>
+  <cpu type='kvm' name='cortex-a15' typename='cortex-a15-arm-cpu'/>
+  <cpu type='kvm' name='pxa260' typename='pxa260-arm-cpu'/>
+  <cpu type='kvm' name='arm1136-r2' typename='arm1136-r2-arm-cpu'/>
+  <cpu type='kvm' name='pxa261' typename='pxa261-arm-cpu'/>
+  <cpu type='kvm' name='pxa255' typename='pxa255-arm-cpu'/>
+  <cpu type='kvm' name='cortex-m33' typename='cortex-m33-arm-cpu'/>
+  <cpu type='kvm' name='arm926' typename='arm926-arm-cpu'/>
+  <cpu type='kvm' name='arm11mpcore' typename='arm11mpcore-arm-cpu'/>
+  <cpu type='kvm' name='pxa250' typename='pxa250-arm-cpu'/>
+  <cpu type='kvm' name='ti925t' typename='ti925t-arm-cpu'/>
+  <cpu type='kvm' name='cortex-a57' typename='cortex-a57-arm-cpu'/>
+  <cpu type='kvm' name='sa1110' typename='sa1110-arm-cpu'/>
+  <cpu type='kvm' name='host' typename='host-arm-cpu'/>
+  <cpu type='kvm' name='arm1176' typename='arm1176-arm-cpu'/>
+  <cpu type='kvm' name='cortex-a53' typename='cortex-a53-arm-cpu'/>
+  <cpu type='kvm' name='sa1100' typename='sa1100-arm-cpu'/>
+  <cpu type='kvm' name='pxa270-c5' typename='pxa270-c5-arm-cpu'/>
+  <cpu type='kvm' name='cortex-a9' typename='cortex-a9-arm-cpu'/>
+  <cpu type='kvm' name='cortex-a8' typename='cortex-a8-arm-cpu'/>
+  <cpu type='kvm' name='cortex-a7' typename='cortex-a7-arm-cpu'/>
+  <cpu type='kvm' name='pxa270-c0' typename='pxa270-c0-arm-cpu'/>
+  <cpu type='kvm' name='arm1026' typename='arm1026-arm-cpu'/>
+  <cpu type='kvm' name='pxa270-b1' typename='pxa270-b1-arm-cpu'/>
+  <cpu type='kvm' name='cortex-m3' typename='cortex-m3-arm-cpu'/>
+  <cpu type='kvm' name='max' typename='max-arm-cpu'/>
+  <cpu type='kvm' name='cortex-m4' typename='cortex-m4-arm-cpu'/>
+  <cpu type='kvm' name='pxa270-b0' typename='pxa270-b0-arm-cpu'/>
+  <cpu type='kvm' name='arm946' typename='arm946-arm-cpu'/>
+  <cpu type='kvm' name='cortex-r5' typename='cortex-r5-arm-cpu'/>
+  <cpu type='kvm' name='pxa270-a1' typename='pxa270-a1-arm-cpu'/>
+  <cpu type='kvm' name='pxa270' typename='pxa270-arm-cpu'/>
+  <cpu type='tcg' name='pxa262' typename='pxa262-arm-cpu'/>
+  <cpu type='tcg' name='pxa270-a0' typename='pxa270-a0-arm-cpu'/>
+  <cpu type='tcg' name='arm1136' typename='arm1136-arm-cpu'/>
+  <cpu type='tcg' name='cortex-a15' typename='cortex-a15-arm-cpu'/>
+  <cpu type='tcg' name='pxa260' typename='pxa260-arm-cpu'/>
+  <cpu type='tcg' name='arm1136-r2' typename='arm1136-r2-arm-cpu'/>
+  <cpu type='tcg' name='pxa261' typename='pxa261-arm-cpu'/>
+  <cpu type='tcg' name='pxa255' typename='pxa255-arm-cpu'/>
+  <cpu type='tcg' name='cortex-m33' typename='cortex-m33-arm-cpu'/>
+  <cpu type='tcg' name='arm926' typename='arm926-arm-cpu'/>
+  <cpu type='tcg' name='arm11mpcore' typename='arm11mpcore-arm-cpu'/>
+  <cpu type='tcg' name='pxa250' typename='pxa250-arm-cpu'/>
+  <cpu type='tcg' name='ti925t' typename='ti925t-arm-cpu'/>
+  <cpu type='tcg' name='cortex-a57' typename='cortex-a57-arm-cpu'/>
+  <cpu type='tcg' name='sa1110' typename='sa1110-arm-cpu'/>
+  <cpu type='tcg' name='host' typename='host-arm-cpu'/>
+  <cpu type='tcg' name='arm1176' typename='arm1176-arm-cpu'/>
+  <cpu type='tcg' name='cortex-a53' typename='cortex-a53-arm-cpu'/>
+  <cpu type='tcg' name='sa1100' typename='sa1100-arm-cpu'/>
+  <cpu type='tcg' name='pxa270-c5' typename='pxa270-c5-arm-cpu'/>
+  <cpu type='tcg' name='cortex-a9' typename='cortex-a9-arm-cpu'/>
+  <cpu type='tcg' name='cortex-a8' typename='cortex-a8-arm-cpu'/>
+  <cpu type='tcg' name='cortex-a7' typename='cortex-a7-arm-cpu'/>
+  <cpu type='tcg' name='pxa270-c0' typename='pxa270-c0-arm-cpu'/>
+  <cpu type='tcg' name='arm1026' typename='arm1026-arm-cpu'/>
+  <cpu type='tcg' name='pxa270-b1' typename='pxa270-b1-arm-cpu'/>
+  <cpu type='tcg' name='cortex-m3' typename='cortex-m3-arm-cpu'/>
+  <cpu type='tcg' name='max' typename='max-arm-cpu'/>
+  <cpu type='tcg' name='cortex-m4' typename='cortex-m4-arm-cpu'/>
+  <cpu type='tcg' name='pxa270-b0' typename='pxa270-b0-arm-cpu'/>
+  <cpu type='tcg' name='arm946' typename='arm946-arm-cpu'/>
+  <cpu type='tcg' name='cortex-r5' typename='cortex-r5-arm-cpu'/>
+  <cpu type='tcg' name='pxa270-a1' typename='pxa270-a1-arm-cpu'/>
+  <cpu type='tcg' name='pxa270' typename='pxa270-arm-cpu'/>
   <machine name='integratorcp' maxCpus='1'/>
   <machine name='nuri' maxCpus='2'/>
   <machine name='mps2-an511' maxCpus='1'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
index 5f4d657170..ef52887411 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
@@ -156,135 +156,135 @@
   <microcodeVersion>42900289</microcodeVersion>
   <package>v2.12.0-rc0</package>
   <arch>ppc64</arch>
-  <cpu type='kvm' name='default'/>
-  <cpu type='kvm' name='ppc'/>
-  <cpu type='kvm' name='ppc32'/>
-  <cpu type='kvm' name='ppc64'/>
-  <cpu type='kvm' name='970mp'/>
-  <cpu type='kvm' name='970fx'/>
-  <cpu type='kvm' name='970'/>
-  <cpu type='kvm' name='POWER9'/>
-  <cpu type='kvm' name='power8nvl'/>
-  <cpu type='kvm' name='POWER8'/>
-  <cpu type='kvm' name='power8e'/>
-  <cpu type='kvm' name='power7+'/>
-  <cpu type='kvm' name='POWER7'/>
-  <cpu type='kvm' name='power5gs'/>
-  <cpu type='kvm' name='power5+'/>
-  <cpu type='kvm' name='apollo7pm'/>
-  <cpu type='kvm' name='7457a'/>
-  <cpu type='kvm' name='7447a'/>
-  <cpu type='kvm' name='apollo7'/>
-  <cpu type='kvm' name='7457'/>
-  <cpu type='kvm' name='7447'/>
-  <cpu type='kvm' name='apollo6'/>
-  <cpu type='kvm' name='7455'/>
-  <cpu type='kvm' name='7445'/>
-  <cpu type='kvm' name='7451'/>
-  <cpu type='kvm' name='7441'/>
-  <cpu type='kvm' name='vger'/>
-  <cpu type='kvm' name='7450'/>
-  <cpu type='kvm' name='7448'/>
-  <cpu type='kvm' name='nitro'/>
-  <cpu type='kvm' name='7410'/>
-  <cpu type='kvm' name='g4'/>
-  <cpu type='kvm' name='max'/>
-  <cpu type='kvm' name='7400'/>
-  <cpu type='kvm' name='goldfinger'/>
-  <cpu type='kvm' name='755'/>
-  <cpu type='kvm' name='745'/>
-  <cpu type='kvm' name='lonestar'/>
-  <cpu type='kvm' name='750l'/>
-  <cpu type='kvm' name='750gx'/>
-  <cpu type='kvm' name='750fx'/>
-  <cpu type='kvm' name='750cxe'/>
-  <cpu type='kvm' name='750cx'/>
-  <cpu type='kvm' name='750cl'/>
-  <cpu type='kvm' name='conan/doyle'/>
-  <cpu type='kvm' name='g3'/>
-  <cpu type='kvm' name='typhoon'/>
-  <cpu type='kvm' name='750'/>
-  <cpu type='kvm' name='arthur'/>
-  <cpu type='kvm' name='740'/>
-  <cpu type='kvm' name='mach5'/>
-  <cpu type='kvm' name='sirocco'/>
-  <cpu type='kvm' name='604e'/>
-  <cpu type='kvm' name='goldeneye'/>
-  <cpu type='kvm' name='603r'/>
-  <cpu type='kvm' name='vaillant'/>
-  <cpu type='kvm' name='stretch'/>
-  <cpu type='kvm' name='603e'/>
-  <cpu type='kvm' name='vanilla'/>
-  <cpu type='kvm' name='601v'/>
-  <cpu type='kvm' name='601'/>
-  <cpu type='kvm' name='mpc8560'/>
-  <cpu type='kvm' name='mpc8555e'/>
-  <cpu type='kvm' name='mpc8555'/>
-  <cpu type='kvm' name='mpc8548e'/>
-  <cpu type='kvm' name='mpc8548'/>
-  <cpu type='kvm' name='mpc8547e'/>
-  <cpu type='kvm' name='mpc8545e'/>
-  <cpu type='kvm' name='mpc8545'/>
-  <cpu type='kvm' name='mpc8544e'/>
-  <cpu type='kvm' name='mpc8544'/>
-  <cpu type='kvm' name='mpc8543e'/>
-  <cpu type='kvm' name='mpc8543'/>
-  <cpu type='kvm' name='mpc8541e'/>
-  <cpu type='kvm' name='mpc8541'/>
-  <cpu type='kvm' name='mpc8540'/>
-  <cpu type='kvm' name='mpc8533e'/>
-  <cpu type='kvm' name='mpc8533'/>
-  <cpu type='kvm' name='e500v2'/>
-  <cpu type='kvm' name='e500v1'/>
-  <cpu type='kvm' name='e500'/>
-  <cpu type='kvm' name='mpc8347ea'/>
-  <cpu type='kvm' name='mpc8347e'/>
-  <cpu type='kvm' name='mpc8347a'/>
-  <cpu type='kvm' name='mpc8347'/>
-  <cpu type='kvm' name='e300'/>
-  <cpu type='kvm' name='e200'/>
-  <cpu type='kvm' name='mpc8280'/>
-  <cpu type='kvm' name='mpc8275'/>
-  <cpu type='kvm' name='mpc8272'/>
-  <cpu type='kvm' name='mpc8271'/>
-  <cpu type='kvm' name='mpc8270'/>
-  <cpu type='kvm' name='mpc8266_hip4'/>
-  <cpu type='kvm' name='mpc8266_hip3'/>
-  <cpu type='kvm' name='mpc8266'/>
-  <cpu type='kvm' name='mpc8265_hip4'/>
-  <cpu type='kvm' name='mpc8265_hip3'/>
-  <cpu type='kvm' name='mpc8265'/>
-  <cpu type='kvm' name='mpc8264_hip4'/>
-  <cpu type='kvm' name='mpc8264_hip3'/>
-  <cpu type='kvm' name='mpc8264'/>
-  <cpu type='kvm' name='mpc8260_hip4'/>
-  <cpu type='kvm' name='mpc8260_hip3'/>
-  <cpu type='kvm' name='mpc8260'/>
-  <cpu type='kvm' name='mpc8255_hip4'/>
-  <cpu type='kvm' name='mpc8255_hip3'/>
-  <cpu type='kvm' name='mpc8255'/>
-  <cpu type='kvm' name='mpc8250_hip4'/>
-  <cpu type='kvm' name='mpc8250_hip3'/>
-  <cpu type='kvm' name='mpc8250'/>
-  <cpu type='kvm' name='mpc8248'/>
-  <cpu type='kvm' name='mpc8247'/>
-  <cpu type='kvm' name='mpc8245'/>
-  <cpu type='kvm' name='mpc8241'/>
-  <cpu type='kvm' name='powerquicc-ii'/>
-  <cpu type='kvm' name='mpc82xx'/>
-  <cpu type='kvm' name='mpc5200b'/>
-  <cpu type='kvm' name='mpc5200'/>
-  <cpu type='kvm' name='mpc52xx'/>
-  <cpu type='kvm' name='mpc8240'/>
-  <cpu type='kvm' name='460ex'/>
-  <cpu type='kvm' name='440ep'/>
-  <cpu type='kvm' name='x2vp50'/>
-  <cpu type='kvm' name='x2vp7'/>
-  <cpu type='kvm' name='405gpe'/>
-  <cpu type='kvm' name='405gp'/>
-  <cpu type='kvm' name='405cr'/>
-  <cpu type='kvm' name='405'/>
-  <cpu type='kvm' name='403'/>
+  <cpu type='kvm' name='default' typename='604-powerpc64-cpu'/>
+  <cpu type='kvm' name='ppc' typename='604-powerpc64-cpu'/>
+  <cpu type='kvm' name='ppc32' typename='604-powerpc64-cpu'/>
+  <cpu type='kvm' name='ppc64' typename='970fx_v3.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='970mp' typename='970mp_v1.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='970fx' typename='970fx_v3.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='970' typename='970_v2.2-powerpc64-cpu'/>
+  <cpu type='kvm' name='POWER9' typename='power9_v2.0-powerpc64-cpu'/>
+  <cpu type='kvm' name='power8nvl' typename='power8nvl_v1.0-powerpc64-cpu'/>
+  <cpu type='kvm' name='POWER8' typename='host-powerpc64-cpu'/>
+  <cpu type='kvm' name='power8e' typename='power8e_v2.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='power7+' typename='power7+_v2.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='POWER7' typename='power7_v2.3-powerpc64-cpu'/>
+  <cpu type='kvm' name='power5gs' typename='power5+_v2.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='power5+' typename='power5+_v2.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='apollo7pm' typename='7457a_v1.0-powerpc64-cpu'/>
+  <cpu type='kvm' name='7457a' typename='7457a_v1.2-powerpc64-cpu'/>
+  <cpu type='kvm' name='7447a' typename='7447a_v1.2-powerpc64-cpu'/>
+  <cpu type='kvm' name='apollo7' typename='7457_v1.2-powerpc64-cpu'/>
+  <cpu type='kvm' name='7457' typename='7457_v1.2-powerpc64-cpu'/>
+  <cpu type='kvm' name='7447' typename='7447_v1.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='apollo6' typename='7455_v3.2-powerpc64-cpu'/>
+  <cpu type='kvm' name='7455' typename='7455_v3.2-powerpc64-cpu'/>
+  <cpu type='kvm' name='7445' typename='7445_v3.2-powerpc64-cpu'/>
+  <cpu type='kvm' name='7451' typename='7451_v2.3-powerpc64-cpu'/>
+  <cpu type='kvm' name='7441' typename='7441_v2.3-powerpc64-cpu'/>
+  <cpu type='kvm' name='vger' typename='7450_v2.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='7450' typename='7450_v2.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='7448' typename='7448_v2.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='nitro' typename='7410_v1.4-powerpc64-cpu'/>
+  <cpu type='kvm' name='7410' typename='7410_v1.4-powerpc64-cpu'/>
+  <cpu type='kvm' name='g4' typename='7400_v2.9-powerpc64-cpu'/>
+  <cpu type='kvm' name='max' typename='7400_v2.9-powerpc64-cpu'/>
+  <cpu type='kvm' name='7400' typename='7400_v2.9-powerpc64-cpu'/>
+  <cpu type='kvm' name='goldfinger' typename='755_v2.8-powerpc64-cpu'/>
+  <cpu type='kvm' name='755' typename='755_v2.8-powerpc64-cpu'/>
+  <cpu type='kvm' name='745' typename='745_v2.8-powerpc64-cpu'/>
+  <cpu type='kvm' name='lonestar' typename='750l_v3.2-powerpc64-cpu'/>
+  <cpu type='kvm' name='750l' typename='750l_v3.2-powerpc64-cpu'/>
+  <cpu type='kvm' name='750gx' typename='750gx_v1.2-powerpc64-cpu'/>
+  <cpu type='kvm' name='750fx' typename='750fx_v2.3-powerpc64-cpu'/>
+  <cpu type='kvm' name='750cxe' typename='750cxe_v3.1b-powerpc64-cpu'/>
+  <cpu type='kvm' name='750cx' typename='750cx_v2.2-powerpc64-cpu'/>
+  <cpu type='kvm' name='750cl' typename='750cl_v2.0-powerpc64-cpu'/>
+  <cpu type='kvm' name='conan/doyle' typename='750p-powerpc64-cpu'/>
+  <cpu type='kvm' name='g3' typename='750_v3.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='typhoon' typename='750_v3.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='750' typename='750_v3.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='arthur' typename='740_v3.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='740' typename='740_v3.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='mach5' typename='604r-powerpc64-cpu'/>
+  <cpu type='kvm' name='sirocco' typename='604e_v2.4-powerpc64-cpu'/>
+  <cpu type='kvm' name='604e' typename='604e_v2.4-powerpc64-cpu'/>
+  <cpu type='kvm' name='goldeneye' typename='603e7t-powerpc64-cpu'/>
+  <cpu type='kvm' name='603r' typename='603e7t-powerpc64-cpu'/>
+  <cpu type='kvm' name='vaillant' typename='603e7v-powerpc64-cpu'/>
+  <cpu type='kvm' name='stretch' typename='603e_v4.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='603e' typename='603e_v4.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='vanilla' typename='603-powerpc64-cpu'/>
+  <cpu type='kvm' name='601v' typename='601_v2-powerpc64-cpu'/>
+  <cpu type='kvm' name='601' typename='601_v2-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8560' typename='mpc8560_v21-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8555e' typename='mpc8555e_v11-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8555' typename='mpc8555_v11-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8548e' typename='mpc8548e_v21-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8548' typename='mpc8548_v21-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8547e' typename='mpc8547e_v21-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8545e' typename='mpc8545e_v21-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8545' typename='mpc8545_v21-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8544e' typename='mpc8544e_v11-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8544' typename='mpc8544_v11-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8543e' typename='mpc8543e_v21-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8543' typename='mpc8543_v21-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8541e' typename='mpc8541e_v11-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8541' typename='mpc8541_v11-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8540' typename='mpc8540_v21-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8533e' typename='mpc8533e_v11-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8533' typename='mpc8533_v11-powerpc64-cpu'/>
+  <cpu type='kvm' name='e500v2' typename='e500v2_v22-powerpc64-cpu'/>
+  <cpu type='kvm' name='e500v1' typename='e500_v20-powerpc64-cpu'/>
+  <cpu type='kvm' name='e500' typename='e500v2_v22-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8347ea' typename='mpc8347eat-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8347e' typename='mpc8347et-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8347a' typename='mpc8347at-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8347' typename='mpc8347t-powerpc64-cpu'/>
+  <cpu type='kvm' name='e300' typename='e300c3-powerpc64-cpu'/>
+  <cpu type='kvm' name='e200' typename='e200z6-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8280' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8275' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8272' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8271' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8270' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8266_hip4' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8266_hip3' typename='g2hip3-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8266' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8265_hip4' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8265_hip3' typename='g2hip3-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8265' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8264_hip4' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8264_hip3' typename='g2hip3-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8264' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8260_hip4' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8260_hip3' typename='g2hip3-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8260' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8255_hip4' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8255_hip3' typename='g2hip3-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8255' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8250_hip4' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8250_hip3' typename='g2hip3-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8250' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8248' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8247' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8245' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8241' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='kvm' name='powerquicc-ii' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc82xx' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc5200b' typename='mpc5200b_v21-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc5200' typename='mpc5200_v12-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc52xx' typename='mpc5200_v12-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8240' typename='603-powerpc64-cpu'/>
+  <cpu type='kvm' name='460ex' typename='460exb-powerpc64-cpu'/>
+  <cpu type='kvm' name='440ep' typename='440epb-powerpc64-cpu'/>
+  <cpu type='kvm' name='x2vp50' typename='x2vp20-powerpc64-cpu'/>
+  <cpu type='kvm' name='x2vp7' typename='x2vp4-powerpc64-cpu'/>
+  <cpu type='kvm' name='405gpe' typename='405crc-powerpc64-cpu'/>
+  <cpu type='kvm' name='405gp' typename='405gpd-powerpc64-cpu'/>
+  <cpu type='kvm' name='405cr' typename='405crc-powerpc64-cpu'/>
+  <cpu type='kvm' name='405' typename='405d4-powerpc64-cpu'/>
+  <cpu type='kvm' name='403' typename='403gc-powerpc64-cpu'/>
   <cpu type='kvm' name='mpc8547e_v21'/>
   <cpu type='kvm' name='750cl_v1.0'/>
   <cpu type='kvm' name='7457a_v1.1'/>
@@ -594,135 +594,135 @@
   <cpu type='kvm' name='750_v3.1'/>
   <cpu type='kvm' name='power8e_v2.1'/>
   <cpu type='kvm' name='mpc8568e'/>
-  <cpu type='tcg' name='default'/>
-  <cpu type='tcg' name='ppc'/>
-  <cpu type='tcg' name='ppc32'/>
-  <cpu type='tcg' name='ppc64'/>
-  <cpu type='tcg' name='970mp'/>
-  <cpu type='tcg' name='970fx'/>
-  <cpu type='tcg' name='970'/>
-  <cpu type='tcg' name='POWER9'/>
-  <cpu type='tcg' name='power8nvl'/>
-  <cpu type='tcg' name='POWER8'/>
-  <cpu type='tcg' name='power8e'/>
-  <cpu type='tcg' name='power7+'/>
-  <cpu type='tcg' name='POWER7'/>
-  <cpu type='tcg' name='power5gs'/>
-  <cpu type='tcg' name='power5+'/>
-  <cpu type='tcg' name='apollo7pm'/>
-  <cpu type='tcg' name='7457a'/>
-  <cpu type='tcg' name='7447a'/>
-  <cpu type='tcg' name='apollo7'/>
-  <cpu type='tcg' name='7457'/>
-  <cpu type='tcg' name='7447'/>
-  <cpu type='tcg' name='apollo6'/>
-  <cpu type='tcg' name='7455'/>
-  <cpu type='tcg' name='7445'/>
-  <cpu type='tcg' name='7451'/>
-  <cpu type='tcg' name='7441'/>
-  <cpu type='tcg' name='vger'/>
-  <cpu type='tcg' name='7450'/>
-  <cpu type='tcg' name='7448'/>
-  <cpu type='tcg' name='nitro'/>
-  <cpu type='tcg' name='7410'/>
-  <cpu type='tcg' name='g4'/>
-  <cpu type='tcg' name='max'/>
-  <cpu type='tcg' name='7400'/>
-  <cpu type='tcg' name='goldfinger'/>
-  <cpu type='tcg' name='755'/>
-  <cpu type='tcg' name='745'/>
-  <cpu type='tcg' name='lonestar'/>
-  <cpu type='tcg' name='750l'/>
-  <cpu type='tcg' name='750gx'/>
-  <cpu type='tcg' name='750fx'/>
-  <cpu type='tcg' name='750cxe'/>
-  <cpu type='tcg' name='750cx'/>
-  <cpu type='tcg' name='750cl'/>
-  <cpu type='tcg' name='conan/doyle'/>
-  <cpu type='tcg' name='g3'/>
-  <cpu type='tcg' name='typhoon'/>
-  <cpu type='tcg' name='750'/>
-  <cpu type='tcg' name='arthur'/>
-  <cpu type='tcg' name='740'/>
-  <cpu type='tcg' name='mach5'/>
-  <cpu type='tcg' name='sirocco'/>
-  <cpu type='tcg' name='604e'/>
-  <cpu type='tcg' name='goldeneye'/>
-  <cpu type='tcg' name='603r'/>
-  <cpu type='tcg' name='vaillant'/>
-  <cpu type='tcg' name='stretch'/>
-  <cpu type='tcg' name='603e'/>
-  <cpu type='tcg' name='vanilla'/>
-  <cpu type='tcg' name='601v'/>
-  <cpu type='tcg' name='601'/>
-  <cpu type='tcg' name='mpc8560'/>
-  <cpu type='tcg' name='mpc8555e'/>
-  <cpu type='tcg' name='mpc8555'/>
-  <cpu type='tcg' name='mpc8548e'/>
-  <cpu type='tcg' name='mpc8548'/>
-  <cpu type='tcg' name='mpc8547e'/>
-  <cpu type='tcg' name='mpc8545e'/>
-  <cpu type='tcg' name='mpc8545'/>
-  <cpu type='tcg' name='mpc8544e'/>
-  <cpu type='tcg' name='mpc8544'/>
-  <cpu type='tcg' name='mpc8543e'/>
-  <cpu type='tcg' name='mpc8543'/>
-  <cpu type='tcg' name='mpc8541e'/>
-  <cpu type='tcg' name='mpc8541'/>
-  <cpu type='tcg' name='mpc8540'/>
-  <cpu type='tcg' name='mpc8533e'/>
-  <cpu type='tcg' name='mpc8533'/>
-  <cpu type='tcg' name='e500v2'/>
-  <cpu type='tcg' name='e500v1'/>
-  <cpu type='tcg' name='e500'/>
-  <cpu type='tcg' name='mpc8347ea'/>
-  <cpu type='tcg' name='mpc8347e'/>
-  <cpu type='tcg' name='mpc8347a'/>
-  <cpu type='tcg' name='mpc8347'/>
-  <cpu type='tcg' name='e300'/>
-  <cpu type='tcg' name='e200'/>
-  <cpu type='tcg' name='mpc8280'/>
-  <cpu type='tcg' name='mpc8275'/>
-  <cpu type='tcg' name='mpc8272'/>
-  <cpu type='tcg' name='mpc8271'/>
-  <cpu type='tcg' name='mpc8270'/>
-  <cpu type='tcg' name='mpc8266_hip4'/>
-  <cpu type='tcg' name='mpc8266_hip3'/>
-  <cpu type='tcg' name='mpc8266'/>
-  <cpu type='tcg' name='mpc8265_hip4'/>
-  <cpu type='tcg' name='mpc8265_hip3'/>
-  <cpu type='tcg' name='mpc8265'/>
-  <cpu type='tcg' name='mpc8264_hip4'/>
-  <cpu type='tcg' name='mpc8264_hip3'/>
-  <cpu type='tcg' name='mpc8264'/>
-  <cpu type='tcg' name='mpc8260_hip4'/>
-  <cpu type='tcg' name='mpc8260_hip3'/>
-  <cpu type='tcg' name='mpc8260'/>
-  <cpu type='tcg' name='mpc8255_hip4'/>
-  <cpu type='tcg' name='mpc8255_hip3'/>
-  <cpu type='tcg' name='mpc8255'/>
-  <cpu type='tcg' name='mpc8250_hip4'/>
-  <cpu type='tcg' name='mpc8250_hip3'/>
-  <cpu type='tcg' name='mpc8250'/>
-  <cpu type='tcg' name='mpc8248'/>
-  <cpu type='tcg' name='mpc8247'/>
-  <cpu type='tcg' name='mpc8245'/>
-  <cpu type='tcg' name='mpc8241'/>
-  <cpu type='tcg' name='powerquicc-ii'/>
-  <cpu type='tcg' name='mpc82xx'/>
-  <cpu type='tcg' name='mpc5200b'/>
-  <cpu type='tcg' name='mpc5200'/>
-  <cpu type='tcg' name='mpc52xx'/>
-  <cpu type='tcg' name='mpc8240'/>
-  <cpu type='tcg' name='460ex'/>
-  <cpu type='tcg' name='440ep'/>
-  <cpu type='tcg' name='x2vp50'/>
-  <cpu type='tcg' name='x2vp7'/>
-  <cpu type='tcg' name='405gpe'/>
-  <cpu type='tcg' name='405gp'/>
-  <cpu type='tcg' name='405cr'/>
-  <cpu type='tcg' name='405'/>
-  <cpu type='tcg' name='403'/>
+  <cpu type='tcg' name='default' typename='604-powerpc64-cpu'/>
+  <cpu type='tcg' name='ppc' typename='604-powerpc64-cpu'/>
+  <cpu type='tcg' name='ppc32' typename='604-powerpc64-cpu'/>
+  <cpu type='tcg' name='ppc64' typename='970fx_v3.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='970mp' typename='970mp_v1.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='970fx' typename='970fx_v3.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='970' typename='970_v2.2-powerpc64-cpu'/>
+  <cpu type='tcg' name='POWER9' typename='power9_v2.0-powerpc64-cpu'/>
+  <cpu type='tcg' name='power8nvl' typename='power8nvl_v1.0-powerpc64-cpu'/>
+  <cpu type='tcg' name='POWER8' typename='power8_v2.0-powerpc64-cpu'/>
+  <cpu type='tcg' name='power8e' typename='power8e_v2.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='power7+' typename='power7+_v2.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='POWER7' typename='power7_v2.3-powerpc64-cpu'/>
+  <cpu type='tcg' name='power5gs' typename='power5+_v2.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='power5+' typename='power5+_v2.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='apollo7pm' typename='7457a_v1.0-powerpc64-cpu'/>
+  <cpu type='tcg' name='7457a' typename='7457a_v1.2-powerpc64-cpu'/>
+  <cpu type='tcg' name='7447a' typename='7447a_v1.2-powerpc64-cpu'/>
+  <cpu type='tcg' name='apollo7' typename='7457_v1.2-powerpc64-cpu'/>
+  <cpu type='tcg' name='7457' typename='7457_v1.2-powerpc64-cpu'/>
+  <cpu type='tcg' name='7447' typename='7447_v1.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='apollo6' typename='7455_v3.2-powerpc64-cpu'/>
+  <cpu type='tcg' name='7455' typename='7455_v3.2-powerpc64-cpu'/>
+  <cpu type='tcg' name='7445' typename='7445_v3.2-powerpc64-cpu'/>
+  <cpu type='tcg' name='7451' typename='7451_v2.3-powerpc64-cpu'/>
+  <cpu type='tcg' name='7441' typename='7441_v2.3-powerpc64-cpu'/>
+  <cpu type='tcg' name='vger' typename='7450_v2.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='7450' typename='7450_v2.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='7448' typename='7448_v2.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='nitro' typename='7410_v1.4-powerpc64-cpu'/>
+  <cpu type='tcg' name='7410' typename='7410_v1.4-powerpc64-cpu'/>
+  <cpu type='tcg' name='g4' typename='7400_v2.9-powerpc64-cpu'/>
+  <cpu type='tcg' name='max' typename='7400_v2.9-powerpc64-cpu'/>
+  <cpu type='tcg' name='7400' typename='7400_v2.9-powerpc64-cpu'/>
+  <cpu type='tcg' name='goldfinger' typename='755_v2.8-powerpc64-cpu'/>
+  <cpu type='tcg' name='755' typename='755_v2.8-powerpc64-cpu'/>
+  <cpu type='tcg' name='745' typename='745_v2.8-powerpc64-cpu'/>
+  <cpu type='tcg' name='lonestar' typename='750l_v3.2-powerpc64-cpu'/>
+  <cpu type='tcg' name='750l' typename='750l_v3.2-powerpc64-cpu'/>
+  <cpu type='tcg' name='750gx' typename='750gx_v1.2-powerpc64-cpu'/>
+  <cpu type='tcg' name='750fx' typename='750fx_v2.3-powerpc64-cpu'/>
+  <cpu type='tcg' name='750cxe' typename='750cxe_v3.1b-powerpc64-cpu'/>
+  <cpu type='tcg' name='750cx' typename='750cx_v2.2-powerpc64-cpu'/>
+  <cpu type='tcg' name='750cl' typename='750cl_v2.0-powerpc64-cpu'/>
+  <cpu type='tcg' name='conan/doyle' typename='750p-powerpc64-cpu'/>
+  <cpu type='tcg' name='g3' typename='750_v3.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='typhoon' typename='750_v3.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='750' typename='750_v3.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='arthur' typename='740_v3.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='740' typename='740_v3.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='mach5' typename='604r-powerpc64-cpu'/>
+  <cpu type='tcg' name='sirocco' typename='604e_v2.4-powerpc64-cpu'/>
+  <cpu type='tcg' name='604e' typename='604e_v2.4-powerpc64-cpu'/>
+  <cpu type='tcg' name='goldeneye' typename='603e7t-powerpc64-cpu'/>
+  <cpu type='tcg' name='603r' typename='603e7t-powerpc64-cpu'/>
+  <cpu type='tcg' name='vaillant' typename='603e7v-powerpc64-cpu'/>
+  <cpu type='tcg' name='stretch' typename='603e_v4.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='603e' typename='603e_v4.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='vanilla' typename='603-powerpc64-cpu'/>
+  <cpu type='tcg' name='601v' typename='601_v2-powerpc64-cpu'/>
+  <cpu type='tcg' name='601' typename='601_v2-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8560' typename='mpc8560_v21-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8555e' typename='mpc8555e_v11-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8555' typename='mpc8555_v11-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8548e' typename='mpc8548e_v21-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8548' typename='mpc8548_v21-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8547e' typename='mpc8547e_v21-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8545e' typename='mpc8545e_v21-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8545' typename='mpc8545_v21-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8544e' typename='mpc8544e_v11-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8544' typename='mpc8544_v11-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8543e' typename='mpc8543e_v21-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8543' typename='mpc8543_v21-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8541e' typename='mpc8541e_v11-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8541' typename='mpc8541_v11-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8540' typename='mpc8540_v21-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8533e' typename='mpc8533e_v11-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8533' typename='mpc8533_v11-powerpc64-cpu'/>
+  <cpu type='tcg' name='e500v2' typename='e500v2_v22-powerpc64-cpu'/>
+  <cpu type='tcg' name='e500v1' typename='e500_v20-powerpc64-cpu'/>
+  <cpu type='tcg' name='e500' typename='e500v2_v22-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8347ea' typename='mpc8347eat-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8347e' typename='mpc8347et-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8347a' typename='mpc8347at-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8347' typename='mpc8347t-powerpc64-cpu'/>
+  <cpu type='tcg' name='e300' typename='e300c3-powerpc64-cpu'/>
+  <cpu type='tcg' name='e200' typename='e200z6-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8280' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8275' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8272' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8271' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8270' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8266_hip4' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8266_hip3' typename='g2hip3-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8266' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8265_hip4' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8265_hip3' typename='g2hip3-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8265' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8264_hip4' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8264_hip3' typename='g2hip3-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8264' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8260_hip4' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8260_hip3' typename='g2hip3-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8260' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8255_hip4' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8255_hip3' typename='g2hip3-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8255' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8250_hip4' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8250_hip3' typename='g2hip3-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8250' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8248' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8247' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8245' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8241' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='tcg' name='powerquicc-ii' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc82xx' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc5200b' typename='mpc5200b_v21-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc5200' typename='mpc5200_v12-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc52xx' typename='mpc5200_v12-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8240' typename='603-powerpc64-cpu'/>
+  <cpu type='tcg' name='460ex' typename='460exb-powerpc64-cpu'/>
+  <cpu type='tcg' name='440ep' typename='440epb-powerpc64-cpu'/>
+  <cpu type='tcg' name='x2vp50' typename='x2vp20-powerpc64-cpu'/>
+  <cpu type='tcg' name='x2vp7' typename='x2vp4-powerpc64-cpu'/>
+  <cpu type='tcg' name='405gpe' typename='405crc-powerpc64-cpu'/>
+  <cpu type='tcg' name='405gp' typename='405gpd-powerpc64-cpu'/>
+  <cpu type='tcg' name='405cr' typename='405crc-powerpc64-cpu'/>
+  <cpu type='tcg' name='405' typename='405d4-powerpc64-cpu'/>
+  <cpu type='tcg' name='403' typename='403gc-powerpc64-cpu'/>
   <cpu type='tcg' name='mpc8547e_v21'/>
   <cpu type='tcg' name='750cl_v1.0'/>
   <cpu type='tcg' name='7457a_v1.1'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
index 4ac0741018..b3245762d4 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
@@ -157,75 +157,75 @@
     <property name='te' type='boolean' value='true'/>
     <property name='cmm' type='boolean' value='true'/>
   </hostCPU>
-  <cpu type='kvm' name='z890.2' usable='yes'/>
-  <cpu type='kvm' name='z990.4' usable='yes'/>
-  <cpu type='kvm' name='z10BC.2' usable='yes'/>
-  <cpu type='kvm' name='z196.2' usable='yes'/>
-  <cpu type='kvm' name='z14' usable='yes'/>
-  <cpu type='kvm' name='z9BC-base' usable='yes'/>
-  <cpu type='kvm' name='zEC12-base' usable='yes'/>
-  <cpu type='kvm' name='z196-base' usable='yes'/>
-  <cpu type='kvm' name='z13-base' usable='yes'/>
-  <cpu type='kvm' name='z990.3' usable='yes'/>
-  <cpu type='kvm' name='host' usable='yes'/>
-  <cpu type='kvm' name='z9EC' usable='yes'/>
-  <cpu type='kvm' name='zBC12' usable='yes'/>
-  <cpu type='kvm' name='z9EC.3' usable='yes'/>
-  <cpu type='kvm' name='z196.2-base' usable='yes'/>
-  <cpu type='kvm' name='qemu' usable='no'>
+  <cpu type='kvm' name='z890.2' typename='z890.2-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z990.4' typename='z990.4-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z10BC.2' typename='z10BC.2-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z196.2' typename='z196.2-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z14' typename='z14-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z9BC-base' typename='z9BC-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='zEC12-base' typename='zEC12-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z196-base' typename='z196-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z13-base' typename='z13-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z990.3' typename='z990.3-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='host' typename='host-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z9EC' typename='z9EC-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='zBC12' typename='zBC12-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z9EC.3' typename='z9EC.3-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z196.2-base' typename='z196.2-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='qemu' typename='qemu-s390x-cpu' usable='no'>
     <blocker name='ais'/>
   </cpu>
-  <cpu type='kvm' name='zEC12.2-base' usable='yes'/>
-  <cpu type='kvm' name='z800-base' usable='yes'/>
-  <cpu type='kvm' name='z9EC.2' usable='yes'/>
-  <cpu type='kvm' name='z900.2-base' usable='yes'/>
-  <cpu type='kvm' name='z900.3' usable='yes'/>
-  <cpu type='kvm' name='z890-base' usable='yes'/>
-  <cpu type='kvm' name='z890' usable='yes'/>
-  <cpu type='kvm' name='z990.4-base' usable='yes'/>
-  <cpu type='kvm' name='z10BC.2-base' usable='yes'/>
-  <cpu type='kvm' name='z900.2' usable='yes'/>
-  <cpu type='kvm' name='z9BC.2-base' usable='yes'/>
-  <cpu type='kvm' name='z800' usable='yes'/>
-  <cpu type='kvm' name='z114' usable='yes'/>
-  <cpu type='kvm' name='z13' usable='yes'/>
-  <cpu type='kvm' name='z13s-base' usable='yes'/>
-  <cpu type='kvm' name='z990' usable='yes'/>
-  <cpu type='kvm' name='z990.2' usable='yes'/>
-  <cpu type='kvm' name='z14-base' usable='yes'/>
-  <cpu type='kvm' name='z890.2-base' usable='yes'/>
-  <cpu type='kvm' name='z196' usable='yes'/>
-  <cpu type='kvm' name='z10EC' usable='yes'/>
-  <cpu type='kvm' name='z13s' usable='yes'/>
-  <cpu type='kvm' name='z900' usable='yes'/>
-  <cpu type='kvm' name='z10EC.3' usable='yes'/>
-  <cpu type='kvm' name='z10EC.2-base' usable='yes'/>
-  <cpu type='kvm' name='z114-base' usable='yes'/>
-  <cpu type='kvm' name='z990.2-base' usable='yes'/>
-  <cpu type='kvm' name='z9EC.2-base' usable='yes'/>
-  <cpu type='kvm' name='z890.3' usable='yes'/>
-  <cpu type='kvm' name='z900.3-base' usable='yes'/>
-  <cpu type='kvm' name='z9BC.2' usable='yes'/>
-  <cpu type='kvm' name='z10BC' usable='yes'/>
-  <cpu type='kvm' name='z990.5' usable='yes'/>
-  <cpu type='kvm' name='zEC12.2' usable='yes'/>
-  <cpu type='kvm' name='z10EC-base' usable='yes'/>
-  <cpu type='kvm' name='z9EC-base' usable='yes'/>
-  <cpu type='kvm' name='z9EC.3-base' usable='yes'/>
-  <cpu type='kvm' name='zEC12' usable='yes'/>
-  <cpu type='kvm' name='z990.5-base' usable='yes'/>
-  <cpu type='kvm' name='z10BC-base' usable='yes'/>
-  <cpu type='kvm' name='z900-base' usable='yes'/>
-  <cpu type='kvm' name='z13.2' usable='yes'/>
-  <cpu type='kvm' name='z890.3-base' usable='yes'/>
-  <cpu type='kvm' name='zBC12-base' usable='yes'/>
-  <cpu type='kvm' name='z13.2-base' usable='yes'/>
-  <cpu type='kvm' name='z990-base' usable='yes'/>
-  <cpu type='kvm' name='z10EC.2' usable='yes'/>
-  <cpu type='kvm' name='z9BC' usable='yes'/>
-  <cpu type='kvm' name='z10EC.3-base' usable='yes'/>
-  <cpu type='kvm' name='z990.3-base' usable='yes'/>
-  <cpu type='tcg' name='z890.2' usable='no'>
+  <cpu type='kvm' name='zEC12.2-base' typename='zEC12.2-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z800-base' typename='z800-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z9EC.2' typename='z9EC.2-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z900.2-base' typename='z900.2-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z900.3' typename='z900.3-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z890-base' typename='z890-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z890' typename='z890-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z990.4-base' typename='z990.4-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z10BC.2-base' typename='z10BC.2-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z900.2' typename='z900.2-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z9BC.2-base' typename='z9BC.2-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z800' typename='z800-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z114' typename='z114-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z13' typename='z13-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z13s-base' typename='z13s-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z990' typename='z990-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z990.2' typename='z990.2-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z14-base' typename='z14-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z890.2-base' typename='z890.2-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z196' typename='z196-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z10EC' typename='z10EC-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z13s' typename='z13s-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z900' typename='z900-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z10EC.3' typename='z10EC.3-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z10EC.2-base' typename='z10EC.2-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z114-base' typename='z114-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z990.2-base' typename='z990.2-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z9EC.2-base' typename='z9EC.2-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z890.3' typename='z890.3-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z900.3-base' typename='z900.3-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z9BC.2' typename='z9BC.2-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z10BC' typename='z10BC-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z990.5' typename='z990.5-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='zEC12.2' typename='zEC12.2-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z10EC-base' typename='z10EC-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z9EC-base' typename='z9EC-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z9EC.3-base' typename='z9EC.3-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='zEC12' typename='zEC12-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z990.5-base' typename='z990.5-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z10BC-base' typename='z10BC-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z900-base' typename='z900-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z13.2' typename='z13.2-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z890.3-base' typename='z890.3-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='zBC12-base' typename='zBC12-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z13.2-base' typename='z13.2-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z990-base' typename='z990-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z10EC.2' typename='z10EC.2-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z9BC' typename='z9BC-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z10EC.3-base' typename='z10EC.3-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z990.3-base' typename='z990.3-base-s390x-cpu' usable='yes'/>
+  <cpu type='tcg' name='z890.2' typename='z890.2-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -239,7 +239,7 @@
     <blocker name='kmac-dea'/>
     <blocker name='hfpm'/>
   </cpu>
-  <cpu type='tcg' name='z990.4' usable='no'>
+  <cpu type='tcg' name='z990.4' typename='z990.4-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -253,7 +253,7 @@
     <blocker name='kmac-dea'/>
     <blocker name='hfpm'/>
   </cpu>
-  <cpu type='tcg' name='z10BC.2' usable='no'>
+  <cpu type='tcg' name='z10BC.2' typename='z10BC.2-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -281,7 +281,7 @@
     <blocker name='msa1'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z196.2' usable='no'>
+  <cpu type='tcg' name='z196.2' typename='z196.2-s390x-cpu' usable='no'>
     <blocker name='pcc-xts-eaes-256'/>
     <blocker name='pcc-xts-eaes-128'/>
     <blocker name='pcc-xts-aes-256'/>
@@ -399,7 +399,7 @@
     <blocker name='msa1'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z14' usable='no'>
+  <cpu type='tcg' name='z14' typename='z14-s390x-cpu' usable='no'>
     <blocker name='ppno-sha-512-drng'/>
     <blocker name='pcc-xts-eaes-256'/>
     <blocker name='pcc-xts-eaes-128'/>
@@ -541,7 +541,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z9BC-base' usable='no'>
+  <cpu type='tcg' name='z9BC-base' typename='z9BC-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -559,7 +559,7 @@
     <blocker name='asnlxr'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='zEC12-base' usable='no'>
+  <cpu type='tcg' name='zEC12-base' typename='zEC12-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -587,7 +587,7 @@
     <blocker name='asnlxr'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z196-base' usable='no'>
+  <cpu type='tcg' name='z196-base' typename='z196-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -614,7 +614,7 @@
     <blocker name='asnlxr'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z13-base' usable='no'>
+  <cpu type='tcg' name='z13-base' typename='z13-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -645,7 +645,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z990.3' usable='no'>
+  <cpu type='tcg' name='z990.3' typename='z990.3-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -659,8 +659,8 @@
     <blocker name='kmac-dea'/>
     <blocker name='hfpm'/>
   </cpu>
-  <cpu type='tcg' name='host'/>
-  <cpu type='tcg' name='z9EC' usable='no'>
+  <cpu type='tcg' name='host' typename='host-s390x-cpu'/>
+  <cpu type='tcg' name='z9EC' typename='z9EC-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -681,7 +681,7 @@
     <blocker name='msa1'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='zBC12' usable='no'>
+  <cpu type='tcg' name='zBC12' typename='zBC12-s390x-cpu' usable='no'>
     <blocker name='pcc-xts-eaes-256'/>
     <blocker name='pcc-xts-eaes-128'/>
     <blocker name='pcc-xts-aes-256'/>
@@ -806,7 +806,7 @@
     <blocker name='msa1'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z9EC.3' usable='no'>
+  <cpu type='tcg' name='z9EC.3' typename='z9EC.3-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -827,7 +827,7 @@
     <blocker name='msa1'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z196.2-base' usable='no'>
+  <cpu type='tcg' name='z196.2-base' typename='z196.2-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -854,8 +854,8 @@
     <blocker name='asnlxr'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='qemu' usable='yes'/>
-  <cpu type='tcg' name='zEC12.2-base' usable='no'>
+  <cpu type='tcg' name='qemu' typename='qemu-s390x-cpu' usable='yes'/>
+  <cpu type='tcg' name='zEC12.2-base' typename='zEC12.2-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -883,8 +883,8 @@
     <blocker name='asnlxr'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z800-base' usable='yes'/>
-  <cpu type='tcg' name='z9EC.2' usable='no'>
+  <cpu type='tcg' name='z800-base' typename='z800-base-s390x-cpu' usable='yes'/>
+  <cpu type='tcg' name='z9EC.2' typename='z9EC.2-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -905,9 +905,9 @@
     <blocker name='msa1'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z900.2-base' usable='yes'/>
-  <cpu type='tcg' name='z900.3' usable='yes'/>
-  <cpu type='tcg' name='z890-base' usable='no'>
+  <cpu type='tcg' name='z900.2-base' typename='z900.2-base-s390x-cpu' usable='yes'/>
+  <cpu type='tcg' name='z900.3' typename='z900.3-s390x-cpu' usable='yes'/>
+  <cpu type='tcg' name='z890-base' typename='z890-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -921,7 +921,7 @@
     <blocker name='kmac-dea'/>
     <blocker name='hfpm'/>
   </cpu>
-  <cpu type='tcg' name='z890' usable='no'>
+  <cpu type='tcg' name='z890' typename='z890-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -935,7 +935,7 @@
     <blocker name='kmac-dea'/>
     <blocker name='hfpm'/>
   </cpu>
-  <cpu type='tcg' name='z990.4-base' usable='no'>
+  <cpu type='tcg' name='z990.4-base' typename='z990.4-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -949,7 +949,7 @@
     <blocker name='kmac-dea'/>
     <blocker name='hfpm'/>
   </cpu>
-  <cpu type='tcg' name='z10BC.2-base' usable='no'>
+  <cpu type='tcg' name='z10BC.2-base' typename='z10BC.2-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -972,8 +972,8 @@
     <blocker name='asnlxr'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z900.2' usable='yes'/>
-  <cpu type='tcg' name='z9BC.2-base' usable='no'>
+  <cpu type='tcg' name='z900.2' typename='z900.2-s390x-cpu' usable='yes'/>
+  <cpu type='tcg' name='z9BC.2-base' typename='z9BC.2-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -991,8 +991,8 @@
     <blocker name='asnlxr'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z800' usable='yes'/>
-  <cpu type='tcg' name='z114' usable='no'>
+  <cpu type='tcg' name='z800' typename='z800-s390x-cpu' usable='yes'/>
+  <cpu type='tcg' name='z114' typename='z114-s390x-cpu' usable='no'>
     <blocker name='pcc-xts-eaes-256'/>
     <blocker name='pcc-xts-eaes-128'/>
     <blocker name='pcc-xts-aes-256'/>
@@ -1110,7 +1110,7 @@
     <blocker name='msa1'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z13' usable='no'>
+  <cpu type='tcg' name='z13' typename='z13-s390x-cpu' usable='no'>
     <blocker name='ppno-sha-512-drng'/>
     <blocker name='pcc-xts-eaes-256'/>
     <blocker name='pcc-xts-eaes-128'/>
@@ -1240,7 +1240,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z13s-base' usable='no'>
+  <cpu type='tcg' name='z13s-base' typename='z13s-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1271,7 +1271,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z990' usable='no'>
+  <cpu type='tcg' name='z990' typename='z990-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1285,7 +1285,7 @@
     <blocker name='kmac-dea'/>
     <blocker name='hfpm'/>
   </cpu>
-  <cpu type='tcg' name='z990.2' usable='no'>
+  <cpu type='tcg' name='z990.2' typename='z990.2-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1299,7 +1299,7 @@
     <blocker name='kmac-dea'/>
     <blocker name='hfpm'/>
   </cpu>
-  <cpu type='tcg' name='z14-base' usable='no'>
+  <cpu type='tcg' name='z14-base' typename='z14-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1335,7 +1335,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z890.2-base' usable='no'>
+  <cpu type='tcg' name='z890.2-base' typename='z890.2-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1349,7 +1349,7 @@
     <blocker name='kmac-dea'/>
     <blocker name='hfpm'/>
   </cpu>
-  <cpu type='tcg' name='z196' usable='no'>
+  <cpu type='tcg' name='z196' typename='z196-s390x-cpu' usable='no'>
     <blocker name='pcc-xts-eaes-256'/>
     <blocker name='pcc-xts-eaes-128'/>
     <blocker name='pcc-xts-aes-256'/>
@@ -1467,7 +1467,7 @@
     <blocker name='msa1'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z10EC' usable='no'>
+  <cpu type='tcg' name='z10EC' typename='z10EC-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1495,7 +1495,7 @@
     <blocker name='msa1'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z13s' usable='no'>
+  <cpu type='tcg' name='z13s' typename='z13s-s390x-cpu' usable='no'>
     <blocker name='ppno-sha-512-drng'/>
     <blocker name='pcc-xts-eaes-256'/>
     <blocker name='pcc-xts-eaes-128'/>
@@ -1625,8 +1625,8 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z900' usable='yes'/>
-  <cpu type='tcg' name='z10EC.3' usable='no'>
+  <cpu type='tcg' name='z900' typename='z900-s390x-cpu' usable='yes'/>
+  <cpu type='tcg' name='z10EC.3' typename='z10EC.3-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1654,7 +1654,7 @@
     <blocker name='msa1'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z10EC.2-base' usable='no'>
+  <cpu type='tcg' name='z10EC.2-base' typename='z10EC.2-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1677,7 +1677,7 @@
     <blocker name='asnlxr'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z114-base' usable='no'>
+  <cpu type='tcg' name='z114-base' typename='z114-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1704,7 +1704,7 @@
     <blocker name='asnlxr'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z990.2-base' usable='no'>
+  <cpu type='tcg' name='z990.2-base' typename='z990.2-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1718,7 +1718,7 @@
     <blocker name='kmac-dea'/>
     <blocker name='hfpm'/>
   </cpu>
-  <cpu type='tcg' name='z9EC.2-base' usable='no'>
+  <cpu type='tcg' name='z9EC.2-base' typename='z9EC.2-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1736,7 +1736,7 @@
     <blocker name='asnlxr'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z890.3' usable='no'>
+  <cpu type='tcg' name='z890.3' typename='z890.3-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1750,8 +1750,8 @@
     <blocker name='kmac-dea'/>
     <blocker name='hfpm'/>
   </cpu>
-  <cpu type='tcg' name='z900.3-base' usable='yes'/>
-  <cpu type='tcg' name='z9BC.2' usable='no'>
+  <cpu type='tcg' name='z900.3-base' typename='z900.3-base-s390x-cpu' usable='yes'/>
+  <cpu type='tcg' name='z9BC.2' typename='z9BC.2-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1772,7 +1772,7 @@
     <blocker name='msa1'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z10BC' usable='no'>
+  <cpu type='tcg' name='z10BC' typename='z10BC-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1800,7 +1800,7 @@
     <blocker name='msa1'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z990.5' usable='no'>
+  <cpu type='tcg' name='z990.5' typename='z990.5-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1814,7 +1814,7 @@
     <blocker name='kmac-dea'/>
     <blocker name='hfpm'/>
   </cpu>
-  <cpu type='tcg' name='zEC12.2' usable='no'>
+  <cpu type='tcg' name='zEC12.2' typename='zEC12.2-s390x-cpu' usable='no'>
     <blocker name='pcc-xts-eaes-256'/>
     <blocker name='pcc-xts-eaes-128'/>
     <blocker name='pcc-xts-aes-256'/>
@@ -1939,7 +1939,7 @@
     <blocker name='msa1'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z10EC-base' usable='no'>
+  <cpu type='tcg' name='z10EC-base' typename='z10EC-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1962,7 +1962,7 @@
     <blocker name='asnlxr'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z9EC-base' usable='no'>
+  <cpu type='tcg' name='z9EC-base' typename='z9EC-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1980,7 +1980,7 @@
     <blocker name='asnlxr'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z9EC.3-base' usable='no'>
+  <cpu type='tcg' name='z9EC.3-base' typename='z9EC.3-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1998,7 +1998,7 @@
     <blocker name='asnlxr'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='zEC12' usable='no'>
+  <cpu type='tcg' name='zEC12' typename='zEC12-s390x-cpu' usable='no'>
     <blocker name='pcc-xts-eaes-256'/>
     <blocker name='pcc-xts-eaes-128'/>
     <blocker name='pcc-xts-aes-256'/>
@@ -2123,7 +2123,7 @@
     <blocker name='msa1'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z990.5-base' usable='no'>
+  <cpu type='tcg' name='z990.5-base' typename='z990.5-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -2137,7 +2137,7 @@
     <blocker name='kmac-dea'/>
     <blocker name='hfpm'/>
   </cpu>
-  <cpu type='tcg' name='z10BC-base' usable='no'>
+  <cpu type='tcg' name='z10BC-base' typename='z10BC-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -2160,8 +2160,8 @@
     <blocker name='asnlxr'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z900-base' usable='yes'/>
-  <cpu type='tcg' name='z13.2' usable='no'>
+  <cpu type='tcg' name='z900-base' typename='z900-base-s390x-cpu' usable='yes'/>
+  <cpu type='tcg' name='z13.2' typename='z13.2-s390x-cpu' usable='no'>
     <blocker name='ppno-sha-512-drng'/>
     <blocker name='pcc-xts-eaes-256'/>
     <blocker name='pcc-xts-eaes-128'/>
@@ -2291,7 +2291,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z890.3-base' usable='no'>
+  <cpu type='tcg' name='z890.3-base' typename='z890.3-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -2305,7 +2305,7 @@
     <blocker name='kmac-dea'/>
     <blocker name='hfpm'/>
   </cpu>
-  <cpu type='tcg' name='zBC12-base' usable='no'>
+  <cpu type='tcg' name='zBC12-base' typename='zBC12-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -2333,7 +2333,7 @@
     <blocker name='asnlxr'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z13.2-base' usable='no'>
+  <cpu type='tcg' name='z13.2-base' typename='z13.2-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -2364,7 +2364,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z990-base' usable='no'>
+  <cpu type='tcg' name='z990-base' typename='z990-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -2378,7 +2378,7 @@
     <blocker name='kmac-dea'/>
     <blocker name='hfpm'/>
   </cpu>
-  <cpu type='tcg' name='z10EC.2' usable='no'>
+  <cpu type='tcg' name='z10EC.2' typename='z10EC.2-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -2406,7 +2406,7 @@
     <blocker name='msa1'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z9BC' usable='no'>
+  <cpu type='tcg' name='z9BC' typename='z9BC-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -2427,7 +2427,7 @@
     <blocker name='msa1'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z10EC.3-base' usable='no'>
+  <cpu type='tcg' name='z10EC.3-base' typename='z10EC.3-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -2450,7 +2450,7 @@
     <blocker name='asnlxr'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z990.3-base' usable='no'>
+  <cpu type='tcg' name='z990.3-base' typename='z990.3-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
index 2952b5a799..14b111e940 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
@@ -692,12 +692,12 @@
     <property name='avx512pf' type='boolean' value='false'/>
     <property name='xstore-en' type='boolean' value='false'/>
   </hostCPU>
-  <cpu type='kvm' name='max' usable='yes'/>
-  <cpu type='kvm' name='host' usable='yes'/>
-  <cpu type='kvm' name='base' usable='yes'/>
-  <cpu type='kvm' name='qemu64' usable='yes'/>
-  <cpu type='kvm' name='qemu32' usable='yes'/>
-  <cpu type='kvm' name='phenom' usable='no'>
+  <cpu type='kvm' name='max' typename='max-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='host' typename='host-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='base' typename='base-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='qemu64' typename='qemu64-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='qemu32' typename='qemu32-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='phenom' typename='phenom-x86_64-cpu' usable='no'>
     <blocker name='mmxext'/>
     <blocker name='fxsr-opt'/>
     <blocker name='3dnowext'/>
@@ -705,24 +705,24 @@
     <blocker name='sse4a'/>
     <blocker name='npt'/>
   </cpu>
-  <cpu type='kvm' name='pentium3' usable='yes'/>
-  <cpu type='kvm' name='pentium2' usable='yes'/>
-  <cpu type='kvm' name='pentium' usable='yes'/>
-  <cpu type='kvm' name='n270' usable='yes'/>
-  <cpu type='kvm' name='kvm64' usable='yes'/>
-  <cpu type='kvm' name='kvm32' usable='yes'/>
-  <cpu type='kvm' name='coreduo' usable='yes'/>
-  <cpu type='kvm' name='core2duo' usable='yes'/>
-  <cpu type='kvm' name='athlon' usable='no'>
+  <cpu type='kvm' name='pentium3' typename='pentium3-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='pentium2' typename='pentium2-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='pentium' typename='pentium-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='n270' typename='n270-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='kvm64' typename='kvm64-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='kvm32' typename='kvm32-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='coreduo' typename='coreduo-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='core2duo' typename='core2duo-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='athlon' typename='athlon-x86_64-cpu' usable='no'>
     <blocker name='mmxext'/>
     <blocker name='3dnowext'/>
     <blocker name='3dnow'/>
   </cpu>
-  <cpu type='kvm' name='Westmere' usable='yes'/>
-  <cpu type='kvm' name='Westmere-IBRS' usable='no'>
+  <cpu type='kvm' name='Westmere' typename='Westmere-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Westmere-IBRS' typename='Westmere-IBRS-x86_64-cpu' usable='no'>
     <blocker name='spec-ctrl'/>
   </cpu>
-  <cpu type='kvm' name='Skylake-Server' usable='no'>
+  <cpu type='kvm' name='Skylake-Server' typename='Skylake-Server-x86_64-cpu' usable='no'>
     <blocker name='hle'/>
     <blocker name='rtm'/>
     <blocker name='mpx'/>
@@ -745,7 +745,7 @@
     <blocker name='avx512f'/>
     <blocker name='avx512f'/>
   </cpu>
-  <cpu type='kvm' name='Skylake-Server-IBRS' usable='no'>
+  <cpu type='kvm' name='Skylake-Server-IBRS' typename='Skylake-Server-IBRS-x86_64-cpu' usable='no'>
     <blocker name='hle'/>
     <blocker name='rtm'/>
     <blocker name='mpx'/>
@@ -768,7 +768,7 @@
     <blocker name='avx512f'/>
     <blocker name='avx512f'/>
   </cpu>
-  <cpu type='kvm' name='Skylake-Client' usable='no'>
+  <cpu type='kvm' name='Skylake-Client' typename='Skylake-Client-x86_64-cpu' usable='no'>
     <blocker name='hle'/>
     <blocker name='rtm'/>
     <blocker name='mpx'/>
@@ -781,7 +781,7 @@
     <blocker name='mpx'/>
     <blocker name='mpx'/>
   </cpu>
-  <cpu type='kvm' name='Skylake-Client-IBRS' usable='no'>
+  <cpu type='kvm' name='Skylake-Client-IBRS' typename='Skylake-Client-IBRS-x86_64-cpu' usable='no'>
     <blocker name='hle'/>
     <blocker name='rtm'/>
     <blocker name='mpx'/>
@@ -795,12 +795,12 @@
     <blocker name='mpx'/>
     <blocker name='mpx'/>
   </cpu>
-  <cpu type='kvm' name='SandyBridge' usable='yes'/>
-  <cpu type='kvm' name='SandyBridge-IBRS' usable='no'>
+  <cpu type='kvm' name='SandyBridge' typename='SandyBridge-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='SandyBridge-IBRS' typename='SandyBridge-IBRS-x86_64-cpu' usable='no'>
     <blocker name='spec-ctrl'/>
   </cpu>
-  <cpu type='kvm' name='Penryn' usable='yes'/>
-  <cpu type='kvm' name='Opteron_G5' usable='no'>
+  <cpu type='kvm' name='Penryn' typename='Penryn-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Opteron_G5' typename='Opteron_G5-x86_64-cpu' usable='no'>
     <blocker name='sse4a'/>
     <blocker name='misalignsse'/>
     <blocker name='3dnowprefetch'/>
@@ -808,41 +808,41 @@
     <blocker name='fma4'/>
     <blocker name='tbm'/>
   </cpu>
-  <cpu type='kvm' name='Opteron_G4' usable='no'>
+  <cpu type='kvm' name='Opteron_G4' typename='Opteron_G4-x86_64-cpu' usable='no'>
     <blocker name='sse4a'/>
     <blocker name='misalignsse'/>
     <blocker name='3dnowprefetch'/>
     <blocker name='xop'/>
     <blocker name='fma4'/>
   </cpu>
-  <cpu type='kvm' name='Opteron_G3' usable='no'>
+  <cpu type='kvm' name='Opteron_G3' typename='Opteron_G3-x86_64-cpu' usable='no'>
     <blocker name='sse4a'/>
     <blocker name='misalignsse'/>
   </cpu>
-  <cpu type='kvm' name='Opteron_G2' usable='yes'/>
-  <cpu type='kvm' name='Opteron_G1' usable='yes'/>
-  <cpu type='kvm' name='Nehalem' usable='yes'/>
-  <cpu type='kvm' name='Nehalem-IBRS' usable='no'>
+  <cpu type='kvm' name='Opteron_G2' typename='Opteron_G2-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Opteron_G1' typename='Opteron_G1-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Nehalem' typename='Nehalem-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Nehalem-IBRS' typename='Nehalem-IBRS-x86_64-cpu' usable='no'>
     <blocker name='spec-ctrl'/>
   </cpu>
-  <cpu type='kvm' name='IvyBridge' usable='yes'/>
-  <cpu type='kvm' name='IvyBridge-IBRS' usable='no'>
+  <cpu type='kvm' name='IvyBridge' typename='IvyBridge-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='IvyBridge-IBRS' typename='IvyBridge-IBRS-x86_64-cpu' usable='no'>
     <blocker name='spec-ctrl'/>
   </cpu>
-  <cpu type='kvm' name='Haswell' usable='no'>
+  <cpu type='kvm' name='Haswell' typename='Haswell-x86_64-cpu' usable='no'>
     <blocker name='hle'/>
     <blocker name='rtm'/>
   </cpu>
-  <cpu type='kvm' name='Haswell-noTSX' usable='yes'/>
-  <cpu type='kvm' name='Haswell-noTSX-IBRS' usable='no'>
+  <cpu type='kvm' name='Haswell-noTSX' typename='Haswell-noTSX-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Haswell-noTSX-IBRS' typename='Haswell-noTSX-IBRS-x86_64-cpu' usable='no'>
     <blocker name='spec-ctrl'/>
   </cpu>
-  <cpu type='kvm' name='Haswell-IBRS' usable='no'>
+  <cpu type='kvm' name='Haswell-IBRS' typename='Haswell-IBRS-x86_64-cpu' usable='no'>
     <blocker name='hle'/>
     <blocker name='rtm'/>
     <blocker name='spec-ctrl'/>
   </cpu>
-  <cpu type='kvm' name='EPYC' usable='no'>
+  <cpu type='kvm' name='EPYC' typename='EPYC-x86_64-cpu' usable='no'>
     <blocker name='rdseed'/>
     <blocker name='adx'/>
     <blocker name='smap'/>
@@ -858,7 +858,7 @@
     <blocker name='xsavec'/>
     <blocker name='xgetbv1'/>
   </cpu>
-  <cpu type='kvm' name='EPYC-IBPB' usable='no'>
+  <cpu type='kvm' name='EPYC-IBPB' typename='EPYC-IBPB-x86_64-cpu' usable='no'>
     <blocker name='rdseed'/>
     <blocker name='adx'/>
     <blocker name='smap'/>
@@ -875,8 +875,8 @@
     <blocker name='xsavec'/>
     <blocker name='xgetbv1'/>
   </cpu>
-  <cpu type='kvm' name='Conroe' usable='yes'/>
-  <cpu type='kvm' name='Broadwell' usable='no'>
+  <cpu type='kvm' name='Conroe' typename='Conroe-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Broadwell' typename='Broadwell-x86_64-cpu' usable='no'>
     <blocker name='hle'/>
     <blocker name='rtm'/>
     <blocker name='rdseed'/>
@@ -884,20 +884,20 @@
     <blocker name='smap'/>
     <blocker name='3dnowprefetch'/>
   </cpu>
-  <cpu type='kvm' name='Broadwell-noTSX' usable='no'>
+  <cpu type='kvm' name='Broadwell-noTSX' typename='Broadwell-noTSX-x86_64-cpu' usable='no'>
     <blocker name='rdseed'/>
     <blocker name='adx'/>
     <blocker name='smap'/>
     <blocker name='3dnowprefetch'/>
   </cpu>
-  <cpu type='kvm' name='Broadwell-noTSX-IBRS' usable='no'>
+  <cpu type='kvm' name='Broadwell-noTSX-IBRS' typename='Broadwell-noTSX-IBRS-x86_64-cpu' usable='no'>
     <blocker name='rdseed'/>
     <blocker name='adx'/>
     <blocker name='smap'/>
     <blocker name='spec-ctrl'/>
     <blocker name='3dnowprefetch'/>
   </cpu>
-  <cpu type='kvm' name='Broadwell-IBRS' usable='no'>
+  <cpu type='kvm' name='Broadwell-IBRS' typename='Broadwell-IBRS-x86_64-cpu' usable='no'>
     <blocker name='hle'/>
     <blocker name='rtm'/>
     <blocker name='rdseed'/>
@@ -906,32 +906,32 @@
     <blocker name='spec-ctrl'/>
     <blocker name='3dnowprefetch'/>
   </cpu>
-  <cpu type='kvm' name='486' usable='yes'/>
-  <cpu type='tcg' name='max' usable='yes'/>
-  <cpu type='tcg' name='host' usable='no'>
+  <cpu type='kvm' name='486' typename='486-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='max' typename='max-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='host' typename='host-x86_64-cpu' usable='no'>
     <blocker name='kvm'/>
   </cpu>
-  <cpu type='tcg' name='base' usable='yes'/>
-  <cpu type='tcg' name='qemu64' usable='yes'/>
-  <cpu type='tcg' name='qemu32' usable='yes'/>
-  <cpu type='tcg' name='phenom' usable='no'>
+  <cpu type='tcg' name='base' typename='base-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='qemu64' typename='qemu64-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='qemu32' typename='qemu32-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='phenom' typename='phenom-x86_64-cpu' usable='no'>
     <blocker name='fxsr-opt'/>
     <blocker name='npt'/>
   </cpu>
-  <cpu type='tcg' name='pentium3' usable='yes'/>
-  <cpu type='tcg' name='pentium2' usable='yes'/>
-  <cpu type='tcg' name='pentium' usable='yes'/>
-  <cpu type='tcg' name='n270' usable='yes'/>
-  <cpu type='tcg' name='kvm64' usable='yes'/>
-  <cpu type='tcg' name='kvm32' usable='yes'/>
-  <cpu type='tcg' name='coreduo' usable='yes'/>
-  <cpu type='tcg' name='core2duo' usable='yes'/>
-  <cpu type='tcg' name='athlon' usable='yes'/>
-  <cpu type='tcg' name='Westmere' usable='yes'/>
-  <cpu type='tcg' name='Westmere-IBRS' usable='no'>
+  <cpu type='tcg' name='pentium3' typename='pentium3-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='pentium2' typename='pentium2-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='pentium' typename='pentium-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='n270' typename='n270-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='kvm64' typename='kvm64-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='kvm32' typename='kvm32-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='coreduo' typename='coreduo-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='core2duo' typename='core2duo-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='athlon' typename='athlon-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='Westmere' typename='Westmere-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='Westmere-IBRS' typename='Westmere-IBRS-x86_64-cpu' usable='no'>
     <blocker name='spec-ctrl'/>
   </cpu>
-  <cpu type='tcg' name='Skylake-Server' usable='no'>
+  <cpu type='tcg' name='Skylake-Server' typename='Skylake-Server-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -952,7 +952,7 @@
     <blocker name='3dnowprefetch'/>
     <blocker name='xsavec'/>
   </cpu>
-  <cpu type='tcg' name='Skylake-Server-IBRS' usable='no'>
+  <cpu type='tcg' name='Skylake-Server-IBRS' typename='Skylake-Server-IBRS-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -974,7 +974,7 @@
     <blocker name='3dnowprefetch'/>
     <blocker name='xsavec'/>
   </cpu>
-  <cpu type='tcg' name='Skylake-Client' usable='no'>
+  <cpu type='tcg' name='Skylake-Client' typename='Skylake-Client-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -990,7 +990,7 @@
     <blocker name='3dnowprefetch'/>
     <blocker name='xsavec'/>
   </cpu>
-  <cpu type='tcg' name='Skylake-Client-IBRS' usable='no'>
+  <cpu type='tcg' name='Skylake-Client-IBRS' typename='Skylake-Client-IBRS-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1007,19 +1007,19 @@
     <blocker name='3dnowprefetch'/>
     <blocker name='xsavec'/>
   </cpu>
-  <cpu type='tcg' name='SandyBridge' usable='no'>
+  <cpu type='tcg' name='SandyBridge' typename='SandyBridge-x86_64-cpu' usable='no'>
     <blocker name='x2apic'/>
     <blocker name='tsc-deadline'/>
     <blocker name='avx'/>
   </cpu>
-  <cpu type='tcg' name='SandyBridge-IBRS' usable='no'>
+  <cpu type='tcg' name='SandyBridge-IBRS' typename='SandyBridge-IBRS-x86_64-cpu' usable='no'>
     <blocker name='x2apic'/>
     <blocker name='tsc-deadline'/>
     <blocker name='avx'/>
     <blocker name='spec-ctrl'/>
   </cpu>
-  <cpu type='tcg' name='Penryn' usable='yes'/>
-  <cpu type='tcg' name='Opteron_G5' usable='no'>
+  <cpu type='tcg' name='Penryn' typename='Penryn-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='Opteron_G5' typename='Opteron_G5-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='avx'/>
     <blocker name='f16c'/>
@@ -1029,30 +1029,30 @@
     <blocker name='fma4'/>
     <blocker name='tbm'/>
   </cpu>
-  <cpu type='tcg' name='Opteron_G4' usable='no'>
+  <cpu type='tcg' name='Opteron_G4' typename='Opteron_G4-x86_64-cpu' usable='no'>
     <blocker name='avx'/>
     <blocker name='misalignsse'/>
     <blocker name='3dnowprefetch'/>
     <blocker name='xop'/>
     <blocker name='fma4'/>
   </cpu>
-  <cpu type='tcg' name='Opteron_G3' usable='no'>
+  <cpu type='tcg' name='Opteron_G3' typename='Opteron_G3-x86_64-cpu' usable='no'>
     <blocker name='misalignsse'/>
   </cpu>
-  <cpu type='tcg' name='Opteron_G2' usable='yes'/>
-  <cpu type='tcg' name='Opteron_G1' usable='yes'/>
-  <cpu type='tcg' name='Nehalem' usable='yes'/>
-  <cpu type='tcg' name='Nehalem-IBRS' usable='no'>
+  <cpu type='tcg' name='Opteron_G2' typename='Opteron_G2-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='Opteron_G1' typename='Opteron_G1-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='Nehalem' typename='Nehalem-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='Nehalem-IBRS' typename='Nehalem-IBRS-x86_64-cpu' usable='no'>
     <blocker name='spec-ctrl'/>
   </cpu>
-  <cpu type='tcg' name='IvyBridge' usable='no'>
+  <cpu type='tcg' name='IvyBridge' typename='IvyBridge-x86_64-cpu' usable='no'>
     <blocker name='x2apic'/>
     <blocker name='tsc-deadline'/>
     <blocker name='avx'/>
     <blocker name='f16c'/>
     <blocker name='rdrand'/>
   </cpu>
-  <cpu type='tcg' name='IvyBridge-IBRS' usable='no'>
+  <cpu type='tcg' name='IvyBridge-IBRS' typename='IvyBridge-IBRS-x86_64-cpu' usable='no'>
     <blocker name='x2apic'/>
     <blocker name='tsc-deadline'/>
     <blocker name='avx'/>
@@ -1060,7 +1060,7 @@
     <blocker name='rdrand'/>
     <blocker name='spec-ctrl'/>
   </cpu>
-  <cpu type='tcg' name='Haswell' usable='no'>
+  <cpu type='tcg' name='Haswell' typename='Haswell-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1073,7 +1073,7 @@
     <blocker name='invpcid'/>
     <blocker name='rtm'/>
   </cpu>
-  <cpu type='tcg' name='Haswell-noTSX' usable='no'>
+  <cpu type='tcg' name='Haswell-noTSX' typename='Haswell-noTSX-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1084,7 +1084,7 @@
     <blocker name='avx2'/>
     <blocker name='invpcid'/>
   </cpu>
-  <cpu type='tcg' name='Haswell-noTSX-IBRS' usable='no'>
+  <cpu type='tcg' name='Haswell-noTSX-IBRS' typename='Haswell-noTSX-IBRS-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1096,7 +1096,7 @@
     <blocker name='invpcid'/>
     <blocker name='spec-ctrl'/>
   </cpu>
-  <cpu type='tcg' name='Haswell-IBRS' usable='no'>
+  <cpu type='tcg' name='Haswell-IBRS' typename='Haswell-IBRS-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1110,7 +1110,7 @@
     <blocker name='rtm'/>
     <blocker name='spec-ctrl'/>
   </cpu>
-  <cpu type='tcg' name='EPYC' usable='no'>
+  <cpu type='tcg' name='EPYC' typename='EPYC-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='avx'/>
     <blocker name='f16c'/>
@@ -1124,7 +1124,7 @@
     <blocker name='osvw'/>
     <blocker name='xsavec'/>
   </cpu>
-  <cpu type='tcg' name='EPYC-IBPB' usable='no'>
+  <cpu type='tcg' name='EPYC-IBPB' typename='EPYC-IBPB-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='avx'/>
     <blocker name='f16c'/>
@@ -1139,8 +1139,8 @@
     <blocker name='ibpb'/>
     <blocker name='xsavec'/>
   </cpu>
-  <cpu type='tcg' name='Conroe' usable='yes'/>
-  <cpu type='tcg' name='Broadwell' usable='no'>
+  <cpu type='tcg' name='Conroe' typename='Conroe-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='Broadwell' typename='Broadwell-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1155,7 +1155,7 @@
     <blocker name='rdseed'/>
     <blocker name='3dnowprefetch'/>
   </cpu>
-  <cpu type='tcg' name='Broadwell-noTSX' usable='no'>
+  <cpu type='tcg' name='Broadwell-noTSX' typename='Broadwell-noTSX-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1168,7 +1168,7 @@
     <blocker name='rdseed'/>
     <blocker name='3dnowprefetch'/>
   </cpu>
-  <cpu type='tcg' name='Broadwell-noTSX-IBRS' usable='no'>
+  <cpu type='tcg' name='Broadwell-noTSX-IBRS' typename='Broadwell-noTSX-IBRS-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1182,7 +1182,7 @@
     <blocker name='spec-ctrl'/>
     <blocker name='3dnowprefetch'/>
   </cpu>
-  <cpu type='tcg' name='Broadwell-IBRS' usable='no'>
+  <cpu type='tcg' name='Broadwell-IBRS' typename='Broadwell-IBRS-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1198,7 +1198,7 @@
     <blocker name='spec-ctrl'/>
     <blocker name='3dnowprefetch'/>
   </cpu>
-  <cpu type='tcg' name='486' usable='yes'/>
+  <cpu type='tcg' name='486' typename='486-x86_64-cpu' usable='yes'/>
   <machine name='pc-i440fx-2.12' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/>
   <machine name='isapc' hotplugCpus='yes' maxCpus='1'/>
   <machine name='pc-1.1' hotplugCpus='yes' maxCpus='255'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
index b1ade837a9..2bae44af66 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
@@ -135,134 +135,134 @@
   <microcodeVersion>42900247</microcodeVersion>
   <package> (v2.9.0)</package>
   <arch>ppc64</arch>
-  <cpu type='kvm' name='default'/>
-  <cpu type='kvm' name='ppc'/>
-  <cpu type='kvm' name='ppc32'/>
-  <cpu type='kvm' name='ppc64'/>
-  <cpu type='kvm' name='970mp'/>
-  <cpu type='kvm' name='970fx'/>
-  <cpu type='kvm' name='970'/>
-  <cpu type='kvm' name='POWER9'/>
-  <cpu type='kvm' name='POWER8NVL'/>
-  <cpu type='kvm' name='POWER8'/>
-  <cpu type='kvm' name='POWER8E'/>
-  <cpu type='kvm' name='POWER7+'/>
-  <cpu type='kvm' name='POWER7'/>
-  <cpu type='kvm' name='POWER5gs'/>
-  <cpu type='kvm' name='POWER5+'/>
-  <cpu type='kvm' name='Apollo7PM'/>
-  <cpu type='kvm' name='7457A'/>
-  <cpu type='kvm' name='7447A'/>
-  <cpu type='kvm' name='Apollo7'/>
-  <cpu type='kvm' name='7457'/>
-  <cpu type='kvm' name='7447'/>
-  <cpu type='kvm' name='Apollo6'/>
-  <cpu type='kvm' name='7455'/>
-  <cpu type='kvm' name='7445'/>
-  <cpu type='kvm' name='7451'/>
-  <cpu type='kvm' name='7441'/>
-  <cpu type='kvm' name='Vger'/>
-  <cpu type='kvm' name='7450'/>
-  <cpu type='kvm' name='7448'/>
-  <cpu type='kvm' name='Nitro'/>
-  <cpu type='kvm' name='7410'/>
-  <cpu type='kvm' name='G4'/>
-  <cpu type='kvm' name='Max'/>
-  <cpu type='kvm' name='7400'/>
-  <cpu type='kvm' name='Goldfinger'/>
-  <cpu type='kvm' name='755'/>
-  <cpu type='kvm' name='745'/>
-  <cpu type='kvm' name='LoneStar'/>
-  <cpu type='kvm' name='750l'/>
-  <cpu type='kvm' name='750gx'/>
-  <cpu type='kvm' name='750fx'/>
-  <cpu type='kvm' name='750cxe'/>
-  <cpu type='kvm' name='750cx'/>
-  <cpu type='kvm' name='750cl'/>
-  <cpu type='kvm' name='Conan/Doyle'/>
-  <cpu type='kvm' name='G3'/>
-  <cpu type='kvm' name='Typhoon'/>
-  <cpu type='kvm' name='750'/>
-  <cpu type='kvm' name='Arthur'/>
-  <cpu type='kvm' name='740'/>
-  <cpu type='kvm' name='Mach5'/>
-  <cpu type='kvm' name='Sirocco'/>
-  <cpu type='kvm' name='604e'/>
-  <cpu type='kvm' name='Goldeneye'/>
-  <cpu type='kvm' name='603r'/>
-  <cpu type='kvm' name='Vaillant'/>
-  <cpu type='kvm' name='Stretch'/>
-  <cpu type='kvm' name='603e'/>
-  <cpu type='kvm' name='Vanilla'/>
-  <cpu type='kvm' name='601v'/>
-  <cpu type='kvm' name='601'/>
-  <cpu type='kvm' name='MPC8560'/>
-  <cpu type='kvm' name='MPC8555E'/>
-  <cpu type='kvm' name='MPC8555'/>
-  <cpu type='kvm' name='MPC8548E'/>
-  <cpu type='kvm' name='MPC8548'/>
-  <cpu type='kvm' name='MPC8547E'/>
-  <cpu type='kvm' name='MPC8545E'/>
-  <cpu type='kvm' name='MPC8545'/>
-  <cpu type='kvm' name='MPC8544E'/>
-  <cpu type='kvm' name='MPC8544'/>
-  <cpu type='kvm' name='MPC8543E'/>
-  <cpu type='kvm' name='MPC8543'/>
-  <cpu type='kvm' name='MPC8541E'/>
-  <cpu type='kvm' name='MPC8541'/>
-  <cpu type='kvm' name='MPC8540'/>
-  <cpu type='kvm' name='MPC8533E'/>
-  <cpu type='kvm' name='MPC8533'/>
-  <cpu type='kvm' name='e500v2'/>
-  <cpu type='kvm' name='e500v1'/>
-  <cpu type='kvm' name='e500'/>
-  <cpu type='kvm' name='MPC8347EA'/>
-  <cpu type='kvm' name='MPC8347E'/>
-  <cpu type='kvm' name='MPC8347A'/>
-  <cpu type='kvm' name='MPC8347'/>
-  <cpu type='kvm' name='e300'/>
-  <cpu type='kvm' name='e200'/>
-  <cpu type='kvm' name='MPC8280'/>
-  <cpu type='kvm' name='MPC8275'/>
-  <cpu type='kvm' name='MPC8272'/>
-  <cpu type='kvm' name='MPC8271'/>
-  <cpu type='kvm' name='MPC8270'/>
-  <cpu type='kvm' name='MPC8266_HiP4'/>
-  <cpu type='kvm' name='MPC8266_HiP3'/>
-  <cpu type='kvm' name='MPC8266'/>
-  <cpu type='kvm' name='MPC8265_HiP4'/>
-  <cpu type='kvm' name='MPC8265_HiP3'/>
-  <cpu type='kvm' name='MPC8265'/>
-  <cpu type='kvm' name='MPC8264_HiP4'/>
-  <cpu type='kvm' name='MPC8264_HiP3'/>
-  <cpu type='kvm' name='MPC8264'/>
-  <cpu type='kvm' name='MPC8260_HiP4'/>
-  <cpu type='kvm' name='MPC8260_HiP3'/>
-  <cpu type='kvm' name='MPC8260'/>
-  <cpu type='kvm' name='MPC8255_HiP4'/>
-  <cpu type='kvm' name='MPC8255_HiP3'/>
-  <cpu type='kvm' name='MPC8255'/>
-  <cpu type='kvm' name='MPC8250_HiP4'/>
-  <cpu type='kvm' name='MPC8250_HiP3'/>
-  <cpu type='kvm' name='MPC8250'/>
-  <cpu type='kvm' name='MPC8248'/>
-  <cpu type='kvm' name='MPC8247'/>
-  <cpu type='kvm' name='MPC8245'/>
-  <cpu type='kvm' name='MPC8241'/>
-  <cpu type='kvm' name='PowerQUICC-II'/>
-  <cpu type='kvm' name='MPC82xx'/>
-  <cpu type='kvm' name='MPC5200B'/>
-  <cpu type='kvm' name='MPC5200'/>
-  <cpu type='kvm' name='MPC52xx'/>
-  <cpu type='kvm' name='MPC8240'/>
-  <cpu type='kvm' name='440EP'/>
-  <cpu type='kvm' name='x2vp50'/>
-  <cpu type='kvm' name='x2vp7'/>
-  <cpu type='kvm' name='405GPe'/>
-  <cpu type='kvm' name='405GP'/>
-  <cpu type='kvm' name='405CR'/>
-  <cpu type='kvm' name='405'/>
-  <cpu type='kvm' name='403'/>
+  <cpu type='kvm' name='default' typename='604-powerpc64-cpu'/>
+  <cpu type='kvm' name='ppc' typename='604-powerpc64-cpu'/>
+  <cpu type='kvm' name='ppc32' typename='604-powerpc64-cpu'/>
+  <cpu type='kvm' name='ppc64' typename='970fx_v3.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='970mp' typename='970mp_v1.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='970fx' typename='970fx_v3.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='970' typename='970_v2.2-powerpc64-cpu'/>
+  <cpu type='kvm' name='POWER9' typename='POWER9_v1.0-powerpc64-cpu'/>
+  <cpu type='kvm' name='POWER8NVL' typename='POWER8NVL_v1.0-powerpc64-cpu'/>
+  <cpu type='kvm' name='POWER8' typename='POWER8E_v2.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='POWER8E' typename='POWER8E_v2.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='POWER7+' typename='POWER7+_v2.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='POWER7' typename='POWER7_v2.3-powerpc64-cpu'/>
+  <cpu type='kvm' name='POWER5gs' typename='POWER5+_v2.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='POWER5+' typename='POWER5+_v2.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='Apollo7PM' typename='7457A_v1.0-powerpc64-cpu'/>
+  <cpu type='kvm' name='7457A' typename='7457A_v1.2-powerpc64-cpu'/>
+  <cpu type='kvm' name='7447A' typename='7447A_v1.2-powerpc64-cpu'/>
+  <cpu type='kvm' name='Apollo7' typename='7457_v1.2-powerpc64-cpu'/>
+  <cpu type='kvm' name='7457' typename='7457_v1.2-powerpc64-cpu'/>
+  <cpu type='kvm' name='7447' typename='7447_v1.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='Apollo6' typename='7455_v3.2-powerpc64-cpu'/>
+  <cpu type='kvm' name='7455' typename='7455_v3.2-powerpc64-cpu'/>
+  <cpu type='kvm' name='7445' typename='7445_v3.2-powerpc64-cpu'/>
+  <cpu type='kvm' name='7451' typename='7451_v2.3-powerpc64-cpu'/>
+  <cpu type='kvm' name='7441' typename='7441_v2.3-powerpc64-cpu'/>
+  <cpu type='kvm' name='Vger' typename='7450_v2.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='7450' typename='7450_v2.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='7448' typename='7448_v2.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='Nitro' typename='7410_v1.4-powerpc64-cpu'/>
+  <cpu type='kvm' name='7410' typename='7410_v1.4-powerpc64-cpu'/>
+  <cpu type='kvm' name='G4' typename='7400_v2.9-powerpc64-cpu'/>
+  <cpu type='kvm' name='Max' typename='7400_v2.9-powerpc64-cpu'/>
+  <cpu type='kvm' name='7400' typename='7400_v2.9-powerpc64-cpu'/>
+  <cpu type='kvm' name='Goldfinger' typename='755_v2.8-powerpc64-cpu'/>
+  <cpu type='kvm' name='755' typename='755_v2.8-powerpc64-cpu'/>
+  <cpu type='kvm' name='745' typename='745_v2.8-powerpc64-cpu'/>
+  <cpu type='kvm' name='LoneStar' typename='750l_v3.2-powerpc64-cpu'/>
+  <cpu type='kvm' name='750l' typename='750l_v3.2-powerpc64-cpu'/>
+  <cpu type='kvm' name='750gx' typename='750gx_v1.2-powerpc64-cpu'/>
+  <cpu type='kvm' name='750fx' typename='750fx_v2.3-powerpc64-cpu'/>
+  <cpu type='kvm' name='750cxe' typename='750cxe_v3.1b-powerpc64-cpu'/>
+  <cpu type='kvm' name='750cx' typename='750cx_v2.2-powerpc64-cpu'/>
+  <cpu type='kvm' name='750cl' typename='750cl_v2.0-powerpc64-cpu'/>
+  <cpu type='kvm' name='Conan/Doyle' typename='750p-powerpc64-cpu'/>
+  <cpu type='kvm' name='G3' typename='750_v3.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='Typhoon' typename='750_v3.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='750' typename='750_v3.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='Arthur' typename='740_v3.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='740' typename='740_v3.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='Mach5' typename='604r-powerpc64-cpu'/>
+  <cpu type='kvm' name='Sirocco' typename='604e_v2.4-powerpc64-cpu'/>
+  <cpu type='kvm' name='604e' typename='604e_v2.4-powerpc64-cpu'/>
+  <cpu type='kvm' name='Goldeneye' typename='603e7t-powerpc64-cpu'/>
+  <cpu type='kvm' name='603r' typename='603e7t-powerpc64-cpu'/>
+  <cpu type='kvm' name='Vaillant' typename='603e7v-powerpc64-cpu'/>
+  <cpu type='kvm' name='Stretch' typename='603e_v4.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='603e' typename='603e_v4.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='Vanilla' typename='603-powerpc64-cpu'/>
+  <cpu type='kvm' name='601v' typename='601_v2-powerpc64-cpu'/>
+  <cpu type='kvm' name='601' typename='601_v2-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8560' typename='MPC8560_v21-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8555E' typename='MPC8555E_v11-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8555' typename='MPC8555_v11-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8548E' typename='MPC8548E_v21-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8548' typename='MPC8548_v21-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8547E' typename='MPC8547E_v21-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8545E' typename='MPC8545E_v21-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8545' typename='MPC8545_v21-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8544E' typename='MPC8544E_v11-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8544' typename='MPC8544_v11-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8543E' typename='MPC8543E_v21-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8543' typename='MPC8543_v21-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8541E' typename='MPC8541E_v11-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8541' typename='MPC8541_v11-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8540' typename='MPC8540_v21-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8533E' typename='MPC8533E_v11-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8533' typename='MPC8533_v11-powerpc64-cpu'/>
+  <cpu type='kvm' name='e500v2' typename='e500v2_v22-powerpc64-cpu'/>
+  <cpu type='kvm' name='e500v1' typename='e500_v20-powerpc64-cpu'/>
+  <cpu type='kvm' name='e500' typename='e500v2_v22-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8347EA' typename='MPC8347EAT-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8347E' typename='MPC8347ET-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8347A' typename='MPC8347AT-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8347' typename='MPC8347T-powerpc64-cpu'/>
+  <cpu type='kvm' name='e300' typename='e300c3-powerpc64-cpu'/>
+  <cpu type='kvm' name='e200' typename='e200z6-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8280' typename='G2leGP3-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8275' typename='G2leGP3-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8272' typename='G2leGP3-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8271' typename='G2leGP3-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8270' typename='G2leGP3-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8266_HiP4' typename='G2HiP4-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8266_HiP3' typename='G2HiP3-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8266' typename='G2HiP4-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8265_HiP4' typename='G2HiP4-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8265_HiP3' typename='G2HiP3-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8265' typename='G2HiP4-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8264_HiP4' typename='G2HiP4-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8264_HiP3' typename='G2HiP3-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8264' typename='G2HiP4-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8260_HiP4' typename='G2HiP4-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8260_HiP3' typename='G2HiP3-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8260' typename='G2HiP4-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8255_HiP4' typename='G2HiP4-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8255_HiP3' typename='G2HiP3-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8255' typename='G2HiP4-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8250_HiP4' typename='G2HiP4-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8250_HiP3' typename='G2HiP3-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8250' typename='G2HiP4-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8248' typename='G2leGP3-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8247' typename='G2leGP3-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8245' typename='G2HiP4-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8241' typename='G2HiP4-powerpc64-cpu'/>
+  <cpu type='kvm' name='PowerQUICC-II' typename='G2leGP3-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC82xx' typename='G2leGP3-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC5200B' typename='MPC5200B_v21-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC5200' typename='MPC5200_v12-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC52xx' typename='MPC5200_v12-powerpc64-cpu'/>
+  <cpu type='kvm' name='MPC8240' typename='603-powerpc64-cpu'/>
+  <cpu type='kvm' name='440EP' typename='440EPb-powerpc64-cpu'/>
+  <cpu type='kvm' name='x2vp50' typename='x2vp20-powerpc64-cpu'/>
+  <cpu type='kvm' name='x2vp7' typename='x2vp4-powerpc64-cpu'/>
+  <cpu type='kvm' name='405GPe' typename='405CRc-powerpc64-cpu'/>
+  <cpu type='kvm' name='405GP' typename='405GPd-powerpc64-cpu'/>
+  <cpu type='kvm' name='405CR' typename='405CRc-powerpc64-cpu'/>
+  <cpu type='kvm' name='405' typename='405D4-powerpc64-cpu'/>
+  <cpu type='kvm' name='403' typename='403GC-powerpc64-cpu'/>
   <cpu type='kvm' name='7457A_v1.2'/>
   <cpu type='kvm' name='750cl_v1.0'/>
   <cpu type='kvm' name='750cxe_v2.1'/>
@@ -569,134 +569,134 @@
   <cpu type='kvm' name='MPC8544E_v11'/>
   <cpu type='kvm' name='405GPb'/>
   <cpu type='kvm' name='MPC8541E_v11'/>
-  <cpu type='tcg' name='default'/>
-  <cpu type='tcg' name='ppc'/>
-  <cpu type='tcg' name='ppc32'/>
-  <cpu type='tcg' name='ppc64'/>
-  <cpu type='tcg' name='970mp'/>
-  <cpu type='tcg' name='970fx'/>
-  <cpu type='tcg' name='970'/>
-  <cpu type='tcg' name='POWER9'/>
-  <cpu type='tcg' name='POWER8NVL'/>
-  <cpu type='tcg' name='POWER8'/>
-  <cpu type='tcg' name='POWER8E'/>
-  <cpu type='tcg' name='POWER7+'/>
-  <cpu type='tcg' name='POWER7'/>
-  <cpu type='tcg' name='POWER5gs'/>
-  <cpu type='tcg' name='POWER5+'/>
-  <cpu type='tcg' name='Apollo7PM'/>
-  <cpu type='tcg' name='7457A'/>
-  <cpu type='tcg' name='7447A'/>
-  <cpu type='tcg' name='Apollo7'/>
-  <cpu type='tcg' name='7457'/>
-  <cpu type='tcg' name='7447'/>
-  <cpu type='tcg' name='Apollo6'/>
-  <cpu type='tcg' name='7455'/>
-  <cpu type='tcg' name='7445'/>
-  <cpu type='tcg' name='7451'/>
-  <cpu type='tcg' name='7441'/>
-  <cpu type='tcg' name='Vger'/>
-  <cpu type='tcg' name='7450'/>
-  <cpu type='tcg' name='7448'/>
-  <cpu type='tcg' name='Nitro'/>
-  <cpu type='tcg' name='7410'/>
-  <cpu type='tcg' name='G4'/>
-  <cpu type='tcg' name='Max'/>
-  <cpu type='tcg' name='7400'/>
-  <cpu type='tcg' name='Goldfinger'/>
-  <cpu type='tcg' name='755'/>
-  <cpu type='tcg' name='745'/>
-  <cpu type='tcg' name='LoneStar'/>
-  <cpu type='tcg' name='750l'/>
-  <cpu type='tcg' name='750gx'/>
-  <cpu type='tcg' name='750fx'/>
-  <cpu type='tcg' name='750cxe'/>
-  <cpu type='tcg' name='750cx'/>
-  <cpu type='tcg' name='750cl'/>
-  <cpu type='tcg' name='Conan/Doyle'/>
-  <cpu type='tcg' name='G3'/>
-  <cpu type='tcg' name='Typhoon'/>
-  <cpu type='tcg' name='750'/>
-  <cpu type='tcg' name='Arthur'/>
-  <cpu type='tcg' name='740'/>
-  <cpu type='tcg' name='Mach5'/>
-  <cpu type='tcg' name='Sirocco'/>
-  <cpu type='tcg' name='604e'/>
-  <cpu type='tcg' name='Goldeneye'/>
-  <cpu type='tcg' name='603r'/>
-  <cpu type='tcg' name='Vaillant'/>
-  <cpu type='tcg' name='Stretch'/>
-  <cpu type='tcg' name='603e'/>
-  <cpu type='tcg' name='Vanilla'/>
-  <cpu type='tcg' name='601v'/>
-  <cpu type='tcg' name='601'/>
-  <cpu type='tcg' name='MPC8560'/>
-  <cpu type='tcg' name='MPC8555E'/>
-  <cpu type='tcg' name='MPC8555'/>
-  <cpu type='tcg' name='MPC8548E'/>
-  <cpu type='tcg' name='MPC8548'/>
-  <cpu type='tcg' name='MPC8547E'/>
-  <cpu type='tcg' name='MPC8545E'/>
-  <cpu type='tcg' name='MPC8545'/>
-  <cpu type='tcg' name='MPC8544E'/>
-  <cpu type='tcg' name='MPC8544'/>
-  <cpu type='tcg' name='MPC8543E'/>
-  <cpu type='tcg' name='MPC8543'/>
-  <cpu type='tcg' name='MPC8541E'/>
-  <cpu type='tcg' name='MPC8541'/>
-  <cpu type='tcg' name='MPC8540'/>
-  <cpu type='tcg' name='MPC8533E'/>
-  <cpu type='tcg' name='MPC8533'/>
-  <cpu type='tcg' name='e500v2'/>
-  <cpu type='tcg' name='e500v1'/>
-  <cpu type='tcg' name='e500'/>
-  <cpu type='tcg' name='MPC8347EA'/>
-  <cpu type='tcg' name='MPC8347E'/>
-  <cpu type='tcg' name='MPC8347A'/>
-  <cpu type='tcg' name='MPC8347'/>
-  <cpu type='tcg' name='e300'/>
-  <cpu type='tcg' name='e200'/>
-  <cpu type='tcg' name='MPC8280'/>
-  <cpu type='tcg' name='MPC8275'/>
-  <cpu type='tcg' name='MPC8272'/>
-  <cpu type='tcg' name='MPC8271'/>
-  <cpu type='tcg' name='MPC8270'/>
-  <cpu type='tcg' name='MPC8266_HiP4'/>
-  <cpu type='tcg' name='MPC8266_HiP3'/>
-  <cpu type='tcg' name='MPC8266'/>
-  <cpu type='tcg' name='MPC8265_HiP4'/>
-  <cpu type='tcg' name='MPC8265_HiP3'/>
-  <cpu type='tcg' name='MPC8265'/>
-  <cpu type='tcg' name='MPC8264_HiP4'/>
-  <cpu type='tcg' name='MPC8264_HiP3'/>
-  <cpu type='tcg' name='MPC8264'/>
-  <cpu type='tcg' name='MPC8260_HiP4'/>
-  <cpu type='tcg' name='MPC8260_HiP3'/>
-  <cpu type='tcg' name='MPC8260'/>
-  <cpu type='tcg' name='MPC8255_HiP4'/>
-  <cpu type='tcg' name='MPC8255_HiP3'/>
-  <cpu type='tcg' name='MPC8255'/>
-  <cpu type='tcg' name='MPC8250_HiP4'/>
-  <cpu type='tcg' name='MPC8250_HiP3'/>
-  <cpu type='tcg' name='MPC8250'/>
-  <cpu type='tcg' name='MPC8248'/>
-  <cpu type='tcg' name='MPC8247'/>
-  <cpu type='tcg' name='MPC8245'/>
-  <cpu type='tcg' name='MPC8241'/>
-  <cpu type='tcg' name='PowerQUICC-II'/>
-  <cpu type='tcg' name='MPC82xx'/>
-  <cpu type='tcg' name='MPC5200B'/>
-  <cpu type='tcg' name='MPC5200'/>
-  <cpu type='tcg' name='MPC52xx'/>
-  <cpu type='tcg' name='MPC8240'/>
-  <cpu type='tcg' name='440EP'/>
-  <cpu type='tcg' name='x2vp50'/>
-  <cpu type='tcg' name='x2vp7'/>
-  <cpu type='tcg' name='405GPe'/>
-  <cpu type='tcg' name='405GP'/>
-  <cpu type='tcg' name='405CR'/>
-  <cpu type='tcg' name='405'/>
-  <cpu type='tcg' name='403'/>
+  <cpu type='tcg' name='default' typename='604-powerpc64-cpu'/>
+  <cpu type='tcg' name='ppc' typename='604-powerpc64-cpu'/>
+  <cpu type='tcg' name='ppc32' typename='604-powerpc64-cpu'/>
+  <cpu type='tcg' name='ppc64' typename='970fx_v3.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='970mp' typename='970mp_v1.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='970fx' typename='970fx_v3.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='970' typename='970_v2.2-powerpc64-cpu'/>
+  <cpu type='tcg' name='POWER9' typename='POWER9_v1.0-powerpc64-cpu'/>
+  <cpu type='tcg' name='POWER8NVL' typename='POWER8NVL_v1.0-powerpc64-cpu'/>
+  <cpu type='tcg' name='POWER8' typename='POWER8_v2.0-powerpc64-cpu'/>
+  <cpu type='tcg' name='POWER8E' typename='POWER8E_v2.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='POWER7+' typename='POWER7+_v2.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='POWER7' typename='POWER7_v2.3-powerpc64-cpu'/>
+  <cpu type='tcg' name='POWER5gs' typename='POWER5+_v2.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='POWER5+' typename='POWER5+_v2.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='Apollo7PM' typename='7457A_v1.0-powerpc64-cpu'/>
+  <cpu type='tcg' name='7457A' typename='7457A_v1.2-powerpc64-cpu'/>
+  <cpu type='tcg' name='7447A' typename='7447A_v1.2-powerpc64-cpu'/>
+  <cpu type='tcg' name='Apollo7' typename='7457_v1.2-powerpc64-cpu'/>
+  <cpu type='tcg' name='7457' typename='7457_v1.2-powerpc64-cpu'/>
+  <cpu type='tcg' name='7447' typename='7447_v1.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='Apollo6' typename='7455_v3.2-powerpc64-cpu'/>
+  <cpu type='tcg' name='7455' typename='7455_v3.2-powerpc64-cpu'/>
+  <cpu type='tcg' name='7445' typename='7445_v3.2-powerpc64-cpu'/>
+  <cpu type='tcg' name='7451' typename='7451_v2.3-powerpc64-cpu'/>
+  <cpu type='tcg' name='7441' typename='7441_v2.3-powerpc64-cpu'/>
+  <cpu type='tcg' name='Vger' typename='7450_v2.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='7450' typename='7450_v2.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='7448' typename='7448_v2.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='Nitro' typename='7410_v1.4-powerpc64-cpu'/>
+  <cpu type='tcg' name='7410' typename='7410_v1.4-powerpc64-cpu'/>
+  <cpu type='tcg' name='G4' typename='7400_v2.9-powerpc64-cpu'/>
+  <cpu type='tcg' name='Max' typename='7400_v2.9-powerpc64-cpu'/>
+  <cpu type='tcg' name='7400' typename='7400_v2.9-powerpc64-cpu'/>
+  <cpu type='tcg' name='Goldfinger' typename='755_v2.8-powerpc64-cpu'/>
+  <cpu type='tcg' name='755' typename='755_v2.8-powerpc64-cpu'/>
+  <cpu type='tcg' name='745' typename='745_v2.8-powerpc64-cpu'/>
+  <cpu type='tcg' name='LoneStar' typename='750l_v3.2-powerpc64-cpu'/>
+  <cpu type='tcg' name='750l' typename='750l_v3.2-powerpc64-cpu'/>
+  <cpu type='tcg' name='750gx' typename='750gx_v1.2-powerpc64-cpu'/>
+  <cpu type='tcg' name='750fx' typename='750fx_v2.3-powerpc64-cpu'/>
+  <cpu type='tcg' name='750cxe' typename='750cxe_v3.1b-powerpc64-cpu'/>
+  <cpu type='tcg' name='750cx' typename='750cx_v2.2-powerpc64-cpu'/>
+  <cpu type='tcg' name='750cl' typename='750cl_v2.0-powerpc64-cpu'/>
+  <cpu type='tcg' name='Conan/Doyle' typename='750p-powerpc64-cpu'/>
+  <cpu type='tcg' name='G3' typename='750_v3.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='Typhoon' typename='750_v3.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='750' typename='750_v3.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='Arthur' typename='740_v3.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='740' typename='740_v3.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='Mach5' typename='604r-powerpc64-cpu'/>
+  <cpu type='tcg' name='Sirocco' typename='604e_v2.4-powerpc64-cpu'/>
+  <cpu type='tcg' name='604e' typename='604e_v2.4-powerpc64-cpu'/>
+  <cpu type='tcg' name='Goldeneye' typename='603e7t-powerpc64-cpu'/>
+  <cpu type='tcg' name='603r' typename='603e7t-powerpc64-cpu'/>
+  <cpu type='tcg' name='Vaillant' typename='603e7v-powerpc64-cpu'/>
+  <cpu type='tcg' name='Stretch' typename='603e_v4.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='603e' typename='603e_v4.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='Vanilla' typename='603-powerpc64-cpu'/>
+  <cpu type='tcg' name='601v' typename='601_v2-powerpc64-cpu'/>
+  <cpu type='tcg' name='601' typename='601_v2-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8560' typename='MPC8560_v21-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8555E' typename='MPC8555E_v11-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8555' typename='MPC8555_v11-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8548E' typename='MPC8548E_v21-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8548' typename='MPC8548_v21-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8547E' typename='MPC8547E_v21-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8545E' typename='MPC8545E_v21-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8545' typename='MPC8545_v21-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8544E' typename='MPC8544E_v11-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8544' typename='MPC8544_v11-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8543E' typename='MPC8543E_v21-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8543' typename='MPC8543_v21-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8541E' typename='MPC8541E_v11-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8541' typename='MPC8541_v11-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8540' typename='MPC8540_v21-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8533E' typename='MPC8533E_v11-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8533' typename='MPC8533_v11-powerpc64-cpu'/>
+  <cpu type='tcg' name='e500v2' typename='e500v2_v22-powerpc64-cpu'/>
+  <cpu type='tcg' name='e500v1' typename='e500_v20-powerpc64-cpu'/>
+  <cpu type='tcg' name='e500' typename='e500v2_v22-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8347EA' typename='MPC8347EAT-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8347E' typename='MPC8347ET-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8347A' typename='MPC8347AT-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8347' typename='MPC8347T-powerpc64-cpu'/>
+  <cpu type='tcg' name='e300' typename='e300c3-powerpc64-cpu'/>
+  <cpu type='tcg' name='e200' typename='e200z6-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8280' typename='G2leGP3-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8275' typename='G2leGP3-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8272' typename='G2leGP3-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8271' typename='G2leGP3-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8270' typename='G2leGP3-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8266_HiP4' typename='G2HiP4-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8266_HiP3' typename='G2HiP3-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8266' typename='G2HiP4-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8265_HiP4' typename='G2HiP4-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8265_HiP3' typename='G2HiP3-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8265' typename='G2HiP4-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8264_HiP4' typename='G2HiP4-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8264_HiP3' typename='G2HiP3-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8264' typename='G2HiP4-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8260_HiP4' typename='G2HiP4-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8260_HiP3' typename='G2HiP3-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8260' typename='G2HiP4-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8255_HiP4' typename='G2HiP4-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8255_HiP3' typename='G2HiP3-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8255' typename='G2HiP4-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8250_HiP4' typename='G2HiP4-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8250_HiP3' typename='G2HiP3-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8250' typename='G2HiP4-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8248' typename='G2leGP3-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8247' typename='G2leGP3-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8245' typename='G2HiP4-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8241' typename='G2HiP4-powerpc64-cpu'/>
+  <cpu type='tcg' name='PowerQUICC-II' typename='G2leGP3-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC82xx' typename='G2leGP3-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC5200B' typename='MPC5200B_v21-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC5200' typename='MPC5200_v12-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC52xx' typename='MPC5200_v12-powerpc64-cpu'/>
+  <cpu type='tcg' name='MPC8240' typename='603-powerpc64-cpu'/>
+  <cpu type='tcg' name='440EP' typename='440EPb-powerpc64-cpu'/>
+  <cpu type='tcg' name='x2vp50' typename='x2vp20-powerpc64-cpu'/>
+  <cpu type='tcg' name='x2vp7' typename='x2vp4-powerpc64-cpu'/>
+  <cpu type='tcg' name='405GPe' typename='405CRc-powerpc64-cpu'/>
+  <cpu type='tcg' name='405GP' typename='405GPd-powerpc64-cpu'/>
+  <cpu type='tcg' name='405CR' typename='405CRc-powerpc64-cpu'/>
+  <cpu type='tcg' name='405' typename='405D4-powerpc64-cpu'/>
+  <cpu type='tcg' name='403' typename='403GC-powerpc64-cpu'/>
   <cpu type='tcg' name='7457A_v1.2'/>
   <cpu type='tcg' name='750cl_v1.0'/>
   <cpu type='tcg' name='750cxe_v2.1'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
index 9d1d015e9b..8240932e79 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
@@ -122,134 +122,134 @@
     <property name='te' type='boolean' value='true'/>
     <property name='cmm' type='boolean' value='true'/>
   </hostCPU>
-  <cpu type='kvm' name='z10EC-base'/>
-  <cpu type='kvm' name='z9EC-base'/>
-  <cpu type='kvm' name='z196.2-base'/>
-  <cpu type='kvm' name='z900-base'/>
-  <cpu type='kvm' name='z990'/>
-  <cpu type='kvm' name='z900.2-base'/>
-  <cpu type='kvm' name='host'/>
-  <cpu type='kvm' name='z900.3'/>
-  <cpu type='kvm' name='z114'/>
-  <cpu type='kvm' name='z890-base'/>
-  <cpu type='kvm' name='z13.2-base'/>
-  <cpu type='kvm' name='zEC12.2'/>
-  <cpu type='kvm' name='z900.2'/>
-  <cpu type='kvm' name='z10BC'/>
-  <cpu type='kvm' name='z10BC.2'/>
-  <cpu type='kvm' name='z196'/>
-  <cpu type='kvm' name='z9EC'/>
-  <cpu type='kvm' name='z990-base'/>
-  <cpu type='kvm' name='z10EC.3'/>
-  <cpu type='kvm' name='z900'/>
-  <cpu type='kvm' name='z9EC.3-base'/>
-  <cpu type='kvm' name='z990.5-base'/>
-  <cpu type='kvm' name='z10EC.2'/>
-  <cpu type='kvm' name='z9BC.2'/>
-  <cpu type='kvm' name='z10EC'/>
-  <cpu type='kvm' name='z990.3-base'/>
-  <cpu type='kvm' name='z13s'/>
-  <cpu type='kvm' name='z10EC.3-base'/>
-  <cpu type='kvm' name='zEC12.2-base'/>
-  <cpu type='kvm' name='z890.3-base'/>
-  <cpu type='kvm' name='z9EC.3'/>
-  <cpu type='kvm' name='z990.5'/>
-  <cpu type='kvm' name='z13'/>
-  <cpu type='kvm' name='z13s-base'/>
-  <cpu type='kvm' name='z9EC.2'/>
-  <cpu type='kvm' name='z990.4'/>
-  <cpu type='kvm' name='zEC12-base'/>
-  <cpu type='kvm' name='z9EC.2-base'/>
-  <cpu type='kvm' name='zBC12'/>
-  <cpu type='kvm' name='z196.2'/>
-  <cpu type='kvm' name='z990.3'/>
-  <cpu type='kvm' name='z990.2-base'/>
-  <cpu type='kvm' name='z900.3-base'/>
-  <cpu type='kvm' name='z890.3'/>
-  <cpu type='kvm' name='z10EC.2-base'/>
-  <cpu type='kvm' name='z990.2'/>
-  <cpu type='kvm' name='z890.2'/>
-  <cpu type='kvm' name='z800-base'/>
-  <cpu type='kvm' name='zBC12-base'/>
-  <cpu type='kvm' name='zEC12'/>
-  <cpu type='kvm' name='z9BC.2-base'/>
-  <cpu type='kvm' name='z9BC'/>
-  <cpu type='kvm' name='z10BC.2-base'/>
-  <cpu type='kvm' name='z990.4-base'/>
-  <cpu type='kvm' name='qemu'/>
-  <cpu type='kvm' name='z10BC-base'/>
-  <cpu type='kvm' name='z9BC-base'/>
-  <cpu type='kvm' name='z800'/>
-  <cpu type='kvm' name='z890.2-base'/>
-  <cpu type='kvm' name='z13.2'/>
-  <cpu type='kvm' name='z114-base'/>
-  <cpu type='kvm' name='z196-base'/>
-  <cpu type='kvm' name='z13-base'/>
-  <cpu type='kvm' name='z890'/>
-  <cpu type='tcg' name='z10EC-base'/>
-  <cpu type='tcg' name='z9EC-base'/>
-  <cpu type='tcg' name='z196.2-base'/>
-  <cpu type='tcg' name='z900-base'/>
-  <cpu type='tcg' name='z990'/>
-  <cpu type='tcg' name='z900.2-base'/>
-  <cpu type='tcg' name='host'/>
-  <cpu type='tcg' name='z900.3'/>
-  <cpu type='tcg' name='z114'/>
-  <cpu type='tcg' name='z890-base'/>
-  <cpu type='tcg' name='z13.2-base'/>
-  <cpu type='tcg' name='zEC12.2'/>
-  <cpu type='tcg' name='z900.2'/>
-  <cpu type='tcg' name='z10BC'/>
-  <cpu type='tcg' name='z10BC.2'/>
-  <cpu type='tcg' name='z196'/>
-  <cpu type='tcg' name='z9EC'/>
-  <cpu type='tcg' name='z990-base'/>
-  <cpu type='tcg' name='z10EC.3'/>
-  <cpu type='tcg' name='z900'/>
-  <cpu type='tcg' name='z9EC.3-base'/>
-  <cpu type='tcg' name='z990.5-base'/>
-  <cpu type='tcg' name='z10EC.2'/>
-  <cpu type='tcg' name='z9BC.2'/>
-  <cpu type='tcg' name='z10EC'/>
-  <cpu type='tcg' name='z990.3-base'/>
-  <cpu type='tcg' name='z13s'/>
-  <cpu type='tcg' name='z10EC.3-base'/>
-  <cpu type='tcg' name='zEC12.2-base'/>
-  <cpu type='tcg' name='z890.3-base'/>
-  <cpu type='tcg' name='z9EC.3'/>
-  <cpu type='tcg' name='z990.5'/>
-  <cpu type='tcg' name='z13'/>
-  <cpu type='tcg' name='z13s-base'/>
-  <cpu type='tcg' name='z9EC.2'/>
-  <cpu type='tcg' name='z990.4'/>
-  <cpu type='tcg' name='zEC12-base'/>
-  <cpu type='tcg' name='z9EC.2-base'/>
-  <cpu type='tcg' name='zBC12'/>
-  <cpu type='tcg' name='z196.2'/>
-  <cpu type='tcg' name='z990.3'/>
-  <cpu type='tcg' name='z990.2-base'/>
-  <cpu type='tcg' name='z900.3-base'/>
-  <cpu type='tcg' name='z890.3'/>
-  <cpu type='tcg' name='z10EC.2-base'/>
-  <cpu type='tcg' name='z990.2'/>
-  <cpu type='tcg' name='z890.2'/>
-  <cpu type='tcg' name='z800-base'/>
-  <cpu type='tcg' name='zBC12-base'/>
-  <cpu type='tcg' name='zEC12'/>
-  <cpu type='tcg' name='z9BC.2-base'/>
-  <cpu type='tcg' name='z9BC'/>
-  <cpu type='tcg' name='z10BC.2-base'/>
-  <cpu type='tcg' name='z990.4-base'/>
-  <cpu type='tcg' name='qemu'/>
-  <cpu type='tcg' name='z10BC-base'/>
-  <cpu type='tcg' name='z9BC-base'/>
-  <cpu type='tcg' name='z800'/>
-  <cpu type='tcg' name='z890.2-base'/>
-  <cpu type='tcg' name='z13.2'/>
-  <cpu type='tcg' name='z114-base'/>
-  <cpu type='tcg' name='z196-base'/>
-  <cpu type='tcg' name='z13-base'/>
-  <cpu type='tcg' name='z890'/>
+  <cpu type='kvm' name='z10EC-base' typename='z10EC-base-s390-cpu'/>
+  <cpu type='kvm' name='z9EC-base' typename='z9EC-base-s390-cpu'/>
+  <cpu type='kvm' name='z196.2-base' typename='z196.2-base-s390-cpu'/>
+  <cpu type='kvm' name='z900-base' typename='z900-base-s390-cpu'/>
+  <cpu type='kvm' name='z990' typename='z990-s390-cpu'/>
+  <cpu type='kvm' name='z900.2-base' typename='z900.2-base-s390-cpu'/>
+  <cpu type='kvm' name='host' typename='host-s390-cpu'/>
+  <cpu type='kvm' name='z900.3' typename='z900.3-s390-cpu'/>
+  <cpu type='kvm' name='z114' typename='z114-s390-cpu'/>
+  <cpu type='kvm' name='z890-base' typename='z890-base-s390-cpu'/>
+  <cpu type='kvm' name='z13.2-base' typename='z13.2-base-s390-cpu'/>
+  <cpu type='kvm' name='zEC12.2' typename='zEC12.2-s390-cpu'/>
+  <cpu type='kvm' name='z900.2' typename='z900.2-s390-cpu'/>
+  <cpu type='kvm' name='z10BC' typename='z10BC-s390-cpu'/>
+  <cpu type='kvm' name='z10BC.2' typename='z10BC.2-s390-cpu'/>
+  <cpu type='kvm' name='z196' typename='z196-s390-cpu'/>
+  <cpu type='kvm' name='z9EC' typename='z9EC-s390-cpu'/>
+  <cpu type='kvm' name='z990-base' typename='z990-base-s390-cpu'/>
+  <cpu type='kvm' name='z10EC.3' typename='z10EC.3-s390-cpu'/>
+  <cpu type='kvm' name='z900' typename='z900-s390-cpu'/>
+  <cpu type='kvm' name='z9EC.3-base' typename='z9EC.3-base-s390-cpu'/>
+  <cpu type='kvm' name='z990.5-base' typename='z990.5-base-s390-cpu'/>
+  <cpu type='kvm' name='z10EC.2' typename='z10EC.2-s390-cpu'/>
+  <cpu type='kvm' name='z9BC.2' typename='z9BC.2-s390-cpu'/>
+  <cpu type='kvm' name='z10EC' typename='z10EC-s390-cpu'/>
+  <cpu type='kvm' name='z990.3-base' typename='z990.3-base-s390-cpu'/>
+  <cpu type='kvm' name='z13s' typename='z13s-s390-cpu'/>
+  <cpu type='kvm' name='z10EC.3-base' typename='z10EC.3-base-s390-cpu'/>
+  <cpu type='kvm' name='zEC12.2-base' typename='zEC12.2-base-s390-cpu'/>
+  <cpu type='kvm' name='z890.3-base' typename='z890.3-base-s390-cpu'/>
+  <cpu type='kvm' name='z9EC.3' typename='z9EC.3-s390-cpu'/>
+  <cpu type='kvm' name='z990.5' typename='z990.5-s390-cpu'/>
+  <cpu type='kvm' name='z13' typename='z13-s390-cpu'/>
+  <cpu type='kvm' name='z13s-base' typename='z13s-base-s390-cpu'/>
+  <cpu type='kvm' name='z9EC.2' typename='z9EC.2-s390-cpu'/>
+  <cpu type='kvm' name='z990.4' typename='z990.4-s390-cpu'/>
+  <cpu type='kvm' name='zEC12-base' typename='zEC12-base-s390-cpu'/>
+  <cpu type='kvm' name='z9EC.2-base' typename='z9EC.2-base-s390-cpu'/>
+  <cpu type='kvm' name='zBC12' typename='zBC12-s390-cpu'/>
+  <cpu type='kvm' name='z196.2' typename='z196.2-s390-cpu'/>
+  <cpu type='kvm' name='z990.3' typename='z990.3-s390-cpu'/>
+  <cpu type='kvm' name='z990.2-base' typename='z990.2-base-s390-cpu'/>
+  <cpu type='kvm' name='z900.3-base' typename='z900.3-base-s390-cpu'/>
+  <cpu type='kvm' name='z890.3' typename='z890.3-s390-cpu'/>
+  <cpu type='kvm' name='z10EC.2-base' typename='z10EC.2-base-s390-cpu'/>
+  <cpu type='kvm' name='z990.2' typename='z990.2-s390-cpu'/>
+  <cpu type='kvm' name='z890.2' typename='z890.2-s390-cpu'/>
+  <cpu type='kvm' name='z800-base' typename='z800-base-s390-cpu'/>
+  <cpu type='kvm' name='zBC12-base' typename='zBC12-base-s390-cpu'/>
+  <cpu type='kvm' name='zEC12' typename='zEC12-s390-cpu'/>
+  <cpu type='kvm' name='z9BC.2-base' typename='z9BC.2-base-s390-cpu'/>
+  <cpu type='kvm' name='z9BC' typename='z9BC-s390-cpu'/>
+  <cpu type='kvm' name='z10BC.2-base' typename='z10BC.2-base-s390-cpu'/>
+  <cpu type='kvm' name='z990.4-base' typename='z990.4-base-s390-cpu'/>
+  <cpu type='kvm' name='qemu' typename='qemu-s390-cpu'/>
+  <cpu type='kvm' name='z10BC-base' typename='z10BC-base-s390-cpu'/>
+  <cpu type='kvm' name='z9BC-base' typename='z9BC-base-s390-cpu'/>
+  <cpu type='kvm' name='z800' typename='z800-s390-cpu'/>
+  <cpu type='kvm' name='z890.2-base' typename='z890.2-base-s390-cpu'/>
+  <cpu type='kvm' name='z13.2' typename='z13.2-s390-cpu'/>
+  <cpu type='kvm' name='z114-base' typename='z114-base-s390-cpu'/>
+  <cpu type='kvm' name='z196-base' typename='z196-base-s390-cpu'/>
+  <cpu type='kvm' name='z13-base' typename='z13-base-s390-cpu'/>
+  <cpu type='kvm' name='z890' typename='z890-s390-cpu'/>
+  <cpu type='tcg' name='z10EC-base' typename='z10EC-base-s390-cpu'/>
+  <cpu type='tcg' name='z9EC-base' typename='z9EC-base-s390-cpu'/>
+  <cpu type='tcg' name='z196.2-base' typename='z196.2-base-s390-cpu'/>
+  <cpu type='tcg' name='z900-base' typename='z900-base-s390-cpu'/>
+  <cpu type='tcg' name='z990' typename='z990-s390-cpu'/>
+  <cpu type='tcg' name='z900.2-base' typename='z900.2-base-s390-cpu'/>
+  <cpu type='tcg' name='host' typename='host-s390-cpu'/>
+  <cpu type='tcg' name='z900.3' typename='z900.3-s390-cpu'/>
+  <cpu type='tcg' name='z114' typename='z114-s390-cpu'/>
+  <cpu type='tcg' name='z890-base' typename='z890-base-s390-cpu'/>
+  <cpu type='tcg' name='z13.2-base' typename='z13.2-base-s390-cpu'/>
+  <cpu type='tcg' name='zEC12.2' typename='zEC12.2-s390-cpu'/>
+  <cpu type='tcg' name='z900.2' typename='z900.2-s390-cpu'/>
+  <cpu type='tcg' name='z10BC' typename='z10BC-s390-cpu'/>
+  <cpu type='tcg' name='z10BC.2' typename='z10BC.2-s390-cpu'/>
+  <cpu type='tcg' name='z196' typename='z196-s390-cpu'/>
+  <cpu type='tcg' name='z9EC' typename='z9EC-s390-cpu'/>
+  <cpu type='tcg' name='z990-base' typename='z990-base-s390-cpu'/>
+  <cpu type='tcg' name='z10EC.3' typename='z10EC.3-s390-cpu'/>
+  <cpu type='tcg' name='z900' typename='z900-s390-cpu'/>
+  <cpu type='tcg' name='z9EC.3-base' typename='z9EC.3-base-s390-cpu'/>
+  <cpu type='tcg' name='z990.5-base' typename='z990.5-base-s390-cpu'/>
+  <cpu type='tcg' name='z10EC.2' typename='z10EC.2-s390-cpu'/>
+  <cpu type='tcg' name='z9BC.2' typename='z9BC.2-s390-cpu'/>
+  <cpu type='tcg' name='z10EC' typename='z10EC-s390-cpu'/>
+  <cpu type='tcg' name='z990.3-base' typename='z990.3-base-s390-cpu'/>
+  <cpu type='tcg' name='z13s' typename='z13s-s390-cpu'/>
+  <cpu type='tcg' name='z10EC.3-base' typename='z10EC.3-base-s390-cpu'/>
+  <cpu type='tcg' name='zEC12.2-base' typename='zEC12.2-base-s390-cpu'/>
+  <cpu type='tcg' name='z890.3-base' typename='z890.3-base-s390-cpu'/>
+  <cpu type='tcg' name='z9EC.3' typename='z9EC.3-s390-cpu'/>
+  <cpu type='tcg' name='z990.5' typename='z990.5-s390-cpu'/>
+  <cpu type='tcg' name='z13' typename='z13-s390-cpu'/>
+  <cpu type='tcg' name='z13s-base' typename='z13s-base-s390-cpu'/>
+  <cpu type='tcg' name='z9EC.2' typename='z9EC.2-s390-cpu'/>
+  <cpu type='tcg' name='z990.4' typename='z990.4-s390-cpu'/>
+  <cpu type='tcg' name='zEC12-base' typename='zEC12-base-s390-cpu'/>
+  <cpu type='tcg' name='z9EC.2-base' typename='z9EC.2-base-s390-cpu'/>
+  <cpu type='tcg' name='zBC12' typename='zBC12-s390-cpu'/>
+  <cpu type='tcg' name='z196.2' typename='z196.2-s390-cpu'/>
+  <cpu type='tcg' name='z990.3' typename='z990.3-s390-cpu'/>
+  <cpu type='tcg' name='z990.2-base' typename='z990.2-base-s390-cpu'/>
+  <cpu type='tcg' name='z900.3-base' typename='z900.3-base-s390-cpu'/>
+  <cpu type='tcg' name='z890.3' typename='z890.3-s390-cpu'/>
+  <cpu type='tcg' name='z10EC.2-base' typename='z10EC.2-base-s390-cpu'/>
+  <cpu type='tcg' name='z990.2' typename='z990.2-s390-cpu'/>
+  <cpu type='tcg' name='z890.2' typename='z890.2-s390-cpu'/>
+  <cpu type='tcg' name='z800-base' typename='z800-base-s390-cpu'/>
+  <cpu type='tcg' name='zBC12-base' typename='zBC12-base-s390-cpu'/>
+  <cpu type='tcg' name='zEC12' typename='zEC12-s390-cpu'/>
+  <cpu type='tcg' name='z9BC.2-base' typename='z9BC.2-base-s390-cpu'/>
+  <cpu type='tcg' name='z9BC' typename='z9BC-s390-cpu'/>
+  <cpu type='tcg' name='z10BC.2-base' typename='z10BC.2-base-s390-cpu'/>
+  <cpu type='tcg' name='z990.4-base' typename='z990.4-base-s390-cpu'/>
+  <cpu type='tcg' name='qemu' typename='qemu-s390-cpu'/>
+  <cpu type='tcg' name='z10BC-base' typename='z10BC-base-s390-cpu'/>
+  <cpu type='tcg' name='z9BC-base' typename='z9BC-base-s390-cpu'/>
+  <cpu type='tcg' name='z800' typename='z800-s390-cpu'/>
+  <cpu type='tcg' name='z890.2-base' typename='z890.2-base-s390-cpu'/>
+  <cpu type='tcg' name='z13.2' typename='z13.2-s390-cpu'/>
+  <cpu type='tcg' name='z114-base' typename='z114-base-s390-cpu'/>
+  <cpu type='tcg' name='z196-base' typename='z196-base-s390-cpu'/>
+  <cpu type='tcg' name='z13-base' typename='z13-base-s390-cpu'/>
+  <cpu type='tcg' name='z890' typename='z890-s390-cpu'/>
   <machine name='s390-ccw-virtio-2.9' alias='s390-ccw-virtio' maxCpus='248' default='yes'/>
   <machine name='s390-ccw-virtio-2.7' maxCpus='248'/>
   <machine name='s390-ccw-virtio-2.6' maxCpus='248'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
index 0e749b069f..551f985e0b 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
@@ -644,12 +644,12 @@
     <property name='avx512pf' type='boolean' value='false'/>
     <property name='xstore-en' type='boolean' value='false'/>
   </hostCPU>
-  <cpu type='kvm' name='max' usable='yes'/>
-  <cpu type='kvm' name='host' usable='yes'/>
-  <cpu type='kvm' name='base' usable='yes'/>
-  <cpu type='kvm' name='qemu64' usable='yes'/>
-  <cpu type='kvm' name='qemu32' usable='yes'/>
-  <cpu type='kvm' name='phenom' usable='no'>
+  <cpu type='kvm' name='max' typename='max-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='host' typename='host-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='base' typename='base-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='qemu64' typename='qemu64-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='qemu32' typename='qemu32-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='phenom' typename='phenom-x86_64-cpu' usable='no'>
     <blocker name='mmxext'/>
     <blocker name='fxsr-opt'/>
     <blocker name='3dnowext'/>
@@ -657,72 +657,72 @@
     <blocker name='sse4a'/>
     <blocker name='npt'/>
   </cpu>
-  <cpu type='kvm' name='pentium3' usable='yes'/>
-  <cpu type='kvm' name='pentium2' usable='yes'/>
-  <cpu type='kvm' name='pentium' usable='yes'/>
-  <cpu type='kvm' name='n270' usable='yes'/>
-  <cpu type='kvm' name='kvm64' usable='yes'/>
-  <cpu type='kvm' name='kvm32' usable='yes'/>
-  <cpu type='kvm' name='coreduo' usable='yes'/>
-  <cpu type='kvm' name='core2duo' usable='yes'/>
-  <cpu type='kvm' name='athlon' usable='no'>
+  <cpu type='kvm' name='pentium3' typename='pentium3-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='pentium2' typename='pentium2-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='pentium' typename='pentium-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='n270' typename='n270-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='kvm64' typename='kvm64-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='kvm32' typename='kvm32-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='coreduo' typename='coreduo-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='core2duo' typename='core2duo-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='athlon' typename='athlon-x86_64-cpu' usable='no'>
     <blocker name='mmxext'/>
     <blocker name='3dnowext'/>
     <blocker name='3dnow'/>
   </cpu>
-  <cpu type='kvm' name='Westmere' usable='yes'/>
-  <cpu type='kvm' name='Skylake-Client' usable='yes'/>
-  <cpu type='kvm' name='SandyBridge' usable='yes'/>
-  <cpu type='kvm' name='Penryn' usable='yes'/>
-  <cpu type='kvm' name='Opteron_G5' usable='no'>
+  <cpu type='kvm' name='Westmere' typename='Westmere-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Skylake-Client' typename='Skylake-Client-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='SandyBridge' typename='SandyBridge-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Penryn' typename='Penryn-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Opteron_G5' typename='Opteron_G5-x86_64-cpu' usable='no'>
     <blocker name='sse4a'/>
     <blocker name='misalignsse'/>
     <blocker name='xop'/>
     <blocker name='fma4'/>
     <blocker name='tbm'/>
   </cpu>
-  <cpu type='kvm' name='Opteron_G4' usable='no'>
+  <cpu type='kvm' name='Opteron_G4' typename='Opteron_G4-x86_64-cpu' usable='no'>
     <blocker name='sse4a'/>
     <blocker name='misalignsse'/>
     <blocker name='xop'/>
     <blocker name='fma4'/>
   </cpu>
-  <cpu type='kvm' name='Opteron_G3' usable='no'>
+  <cpu type='kvm' name='Opteron_G3' typename='Opteron_G3-x86_64-cpu' usable='no'>
     <blocker name='sse4a'/>
     <blocker name='misalignsse'/>
   </cpu>
-  <cpu type='kvm' name='Opteron_G2' usable='yes'/>
-  <cpu type='kvm' name='Opteron_G1' usable='yes'/>
-  <cpu type='kvm' name='Nehalem' usable='yes'/>
-  <cpu type='kvm' name='IvyBridge' usable='yes'/>
-  <cpu type='kvm' name='Haswell' usable='yes'/>
-  <cpu type='kvm' name='Haswell-noTSX' usable='yes'/>
-  <cpu type='kvm' name='Conroe' usable='yes'/>
-  <cpu type='kvm' name='Broadwell' usable='yes'/>
-  <cpu type='kvm' name='Broadwell-noTSX' usable='yes'/>
-  <cpu type='kvm' name='486' usable='yes'/>
-  <cpu type='tcg' name='max' usable='yes'/>
-  <cpu type='tcg' name='host' usable='no'>
+  <cpu type='kvm' name='Opteron_G2' typename='Opteron_G2-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Opteron_G1' typename='Opteron_G1-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Nehalem' typename='Nehalem-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='IvyBridge' typename='IvyBridge-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Haswell' typename='Haswell-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Haswell-noTSX' typename='Haswell-noTSX-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Conroe' typename='Conroe-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Broadwell' typename='Broadwell-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Broadwell-noTSX' typename='Broadwell-noTSX-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='486' typename='486-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='max' typename='max-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='host' typename='host-x86_64-cpu' usable='no'>
     <blocker name='kvm'/>
   </cpu>
-  <cpu type='tcg' name='base' usable='yes'/>
-  <cpu type='tcg' name='qemu64' usable='yes'/>
-  <cpu type='tcg' name='qemu32' usable='yes'/>
-  <cpu type='tcg' name='phenom' usable='no'>
+  <cpu type='tcg' name='base' typename='base-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='qemu64' typename='qemu64-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='qemu32' typename='qemu32-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='phenom' typename='phenom-x86_64-cpu' usable='no'>
     <blocker name='fxsr-opt'/>
     <blocker name='npt'/>
   </cpu>
-  <cpu type='tcg' name='pentium3' usable='yes'/>
-  <cpu type='tcg' name='pentium2' usable='yes'/>
-  <cpu type='tcg' name='pentium' usable='yes'/>
-  <cpu type='tcg' name='n270' usable='yes'/>
-  <cpu type='tcg' name='kvm64' usable='yes'/>
-  <cpu type='tcg' name='kvm32' usable='yes'/>
-  <cpu type='tcg' name='coreduo' usable='yes'/>
-  <cpu type='tcg' name='core2duo' usable='yes'/>
-  <cpu type='tcg' name='athlon' usable='yes'/>
-  <cpu type='tcg' name='Westmere' usable='yes'/>
-  <cpu type='tcg' name='Skylake-Client' usable='no'>
+  <cpu type='tcg' name='pentium3' typename='pentium3-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='pentium2' typename='pentium2-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='pentium' typename='pentium-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='n270' typename='n270-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='kvm64' typename='kvm64-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='kvm32' typename='kvm32-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='coreduo' typename='coreduo-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='core2duo' typename='core2duo-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='athlon' typename='athlon-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='Westmere' typename='Westmere-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='Skylake-Client' typename='Skylake-Client-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -738,13 +738,13 @@
     <blocker name='3dnowprefetch'/>
     <blocker name='xsavec'/>
   </cpu>
-  <cpu type='tcg' name='SandyBridge' usable='no'>
+  <cpu type='tcg' name='SandyBridge' typename='SandyBridge-x86_64-cpu' usable='no'>
     <blocker name='x2apic'/>
     <blocker name='tsc-deadline'/>
     <blocker name='avx'/>
   </cpu>
-  <cpu type='tcg' name='Penryn' usable='yes'/>
-  <cpu type='tcg' name='Opteron_G5' usable='no'>
+  <cpu type='tcg' name='Penryn' typename='Penryn-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='Opteron_G5' typename='Opteron_G5-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='avx'/>
     <blocker name='f16c'/>
@@ -754,27 +754,27 @@
     <blocker name='fma4'/>
     <blocker name='tbm'/>
   </cpu>
-  <cpu type='tcg' name='Opteron_G4' usable='no'>
+  <cpu type='tcg' name='Opteron_G4' typename='Opteron_G4-x86_64-cpu' usable='no'>
     <blocker name='avx'/>
     <blocker name='misalignsse'/>
     <blocker name='3dnowprefetch'/>
     <blocker name='xop'/>
     <blocker name='fma4'/>
   </cpu>
-  <cpu type='tcg' name='Opteron_G3' usable='no'>
+  <cpu type='tcg' name='Opteron_G3' typename='Opteron_G3-x86_64-cpu' usable='no'>
     <blocker name='misalignsse'/>
   </cpu>
-  <cpu type='tcg' name='Opteron_G2' usable='yes'/>
-  <cpu type='tcg' name='Opteron_G1' usable='yes'/>
-  <cpu type='tcg' name='Nehalem' usable='yes'/>
-  <cpu type='tcg' name='IvyBridge' usable='no'>
+  <cpu type='tcg' name='Opteron_G2' typename='Opteron_G2-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='Opteron_G1' typename='Opteron_G1-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='Nehalem' typename='Nehalem-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='IvyBridge' typename='IvyBridge-x86_64-cpu' usable='no'>
     <blocker name='x2apic'/>
     <blocker name='tsc-deadline'/>
     <blocker name='avx'/>
     <blocker name='f16c'/>
     <blocker name='rdrand'/>
   </cpu>
-  <cpu type='tcg' name='Haswell' usable='no'>
+  <cpu type='tcg' name='Haswell' typename='Haswell-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -787,7 +787,7 @@
     <blocker name='invpcid'/>
     <blocker name='rtm'/>
   </cpu>
-  <cpu type='tcg' name='Haswell-noTSX' usable='no'>
+  <cpu type='tcg' name='Haswell-noTSX' typename='Haswell-noTSX-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -798,8 +798,8 @@
     <blocker name='avx2'/>
     <blocker name='invpcid'/>
   </cpu>
-  <cpu type='tcg' name='Conroe' usable='yes'/>
-  <cpu type='tcg' name='Broadwell' usable='no'>
+  <cpu type='tcg' name='Conroe' typename='Conroe-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='Broadwell' typename='Broadwell-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -814,7 +814,7 @@
     <blocker name='rdseed'/>
     <blocker name='3dnowprefetch'/>
   </cpu>
-  <cpu type='tcg' name='Broadwell-noTSX' usable='no'>
+  <cpu type='tcg' name='Broadwell-noTSX' typename='Broadwell-noTSX-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -827,7 +827,7 @@
     <blocker name='rdseed'/>
     <blocker name='3dnowprefetch'/>
   </cpu>
-  <cpu type='tcg' name='486' usable='yes'/>
+  <cpu type='tcg' name='486' typename='486-x86_64-cpu' usable='yes'/>
   <machine name='pc-i440fx-2.9' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/>
   <machine name='pc-0.12' hotplugCpus='yes' maxCpus='255'/>
   <machine name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
index 6ff4254461..be58cb34fb 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
@@ -158,135 +158,135 @@
   <microcodeVersion>42900239</microcodeVersion>
   <package>v2.12.0-1689-g518d23a</package>
   <arch>ppc64</arch>
-  <cpu type='kvm' name='default'/>
-  <cpu type='kvm' name='ppc'/>
-  <cpu type='kvm' name='ppc32'/>
-  <cpu type='kvm' name='ppc64'/>
-  <cpu type='kvm' name='970mp'/>
-  <cpu type='kvm' name='970fx'/>
-  <cpu type='kvm' name='970'/>
-  <cpu type='kvm' name='POWER9'/>
-  <cpu type='kvm' name='power8nvl'/>
-  <cpu type='kvm' name='POWER8'/>
-  <cpu type='kvm' name='power8e'/>
-  <cpu type='kvm' name='power7+'/>
-  <cpu type='kvm' name='POWER7'/>
-  <cpu type='kvm' name='power5gs'/>
-  <cpu type='kvm' name='power5+'/>
-  <cpu type='kvm' name='apollo7pm'/>
-  <cpu type='kvm' name='7457a'/>
-  <cpu type='kvm' name='7447a'/>
-  <cpu type='kvm' name='apollo7'/>
-  <cpu type='kvm' name='7457'/>
-  <cpu type='kvm' name='7447'/>
-  <cpu type='kvm' name='apollo6'/>
-  <cpu type='kvm' name='7455'/>
-  <cpu type='kvm' name='7445'/>
-  <cpu type='kvm' name='7451'/>
-  <cpu type='kvm' name='7441'/>
-  <cpu type='kvm' name='vger'/>
-  <cpu type='kvm' name='7450'/>
-  <cpu type='kvm' name='7448'/>
-  <cpu type='kvm' name='nitro'/>
-  <cpu type='kvm' name='7410'/>
-  <cpu type='kvm' name='g4'/>
-  <cpu type='kvm' name='max'/>
-  <cpu type='kvm' name='7400'/>
-  <cpu type='kvm' name='goldfinger'/>
-  <cpu type='kvm' name='755'/>
-  <cpu type='kvm' name='745'/>
-  <cpu type='kvm' name='lonestar'/>
-  <cpu type='kvm' name='750l'/>
-  <cpu type='kvm' name='750gx'/>
-  <cpu type='kvm' name='750fx'/>
-  <cpu type='kvm' name='750cxe'/>
-  <cpu type='kvm' name='750cx'/>
-  <cpu type='kvm' name='750cl'/>
-  <cpu type='kvm' name='conan/doyle'/>
-  <cpu type='kvm' name='g3'/>
-  <cpu type='kvm' name='typhoon'/>
-  <cpu type='kvm' name='750'/>
-  <cpu type='kvm' name='arthur'/>
-  <cpu type='kvm' name='740'/>
-  <cpu type='kvm' name='mach5'/>
-  <cpu type='kvm' name='sirocco'/>
-  <cpu type='kvm' name='604e'/>
-  <cpu type='kvm' name='goldeneye'/>
-  <cpu type='kvm' name='603r'/>
-  <cpu type='kvm' name='vaillant'/>
-  <cpu type='kvm' name='stretch'/>
-  <cpu type='kvm' name='603e'/>
-  <cpu type='kvm' name='vanilla'/>
-  <cpu type='kvm' name='601v'/>
-  <cpu type='kvm' name='601'/>
-  <cpu type='kvm' name='mpc8560'/>
-  <cpu type='kvm' name='mpc8555e'/>
-  <cpu type='kvm' name='mpc8555'/>
-  <cpu type='kvm' name='mpc8548e'/>
-  <cpu type='kvm' name='mpc8548'/>
-  <cpu type='kvm' name='mpc8547e'/>
-  <cpu type='kvm' name='mpc8545e'/>
-  <cpu type='kvm' name='mpc8545'/>
-  <cpu type='kvm' name='mpc8544e'/>
-  <cpu type='kvm' name='mpc8544'/>
-  <cpu type='kvm' name='mpc8543e'/>
-  <cpu type='kvm' name='mpc8543'/>
-  <cpu type='kvm' name='mpc8541e'/>
-  <cpu type='kvm' name='mpc8541'/>
-  <cpu type='kvm' name='mpc8540'/>
-  <cpu type='kvm' name='mpc8533e'/>
-  <cpu type='kvm' name='mpc8533'/>
-  <cpu type='kvm' name='e500v2'/>
-  <cpu type='kvm' name='e500v1'/>
-  <cpu type='kvm' name='e500'/>
-  <cpu type='kvm' name='mpc8347ea'/>
-  <cpu type='kvm' name='mpc8347e'/>
-  <cpu type='kvm' name='mpc8347a'/>
-  <cpu type='kvm' name='mpc8347'/>
-  <cpu type='kvm' name='e300'/>
-  <cpu type='kvm' name='e200'/>
-  <cpu type='kvm' name='mpc8280'/>
-  <cpu type='kvm' name='mpc8275'/>
-  <cpu type='kvm' name='mpc8272'/>
-  <cpu type='kvm' name='mpc8271'/>
-  <cpu type='kvm' name='mpc8270'/>
-  <cpu type='kvm' name='mpc8266_hip4'/>
-  <cpu type='kvm' name='mpc8266_hip3'/>
-  <cpu type='kvm' name='mpc8266'/>
-  <cpu type='kvm' name='mpc8265_hip4'/>
-  <cpu type='kvm' name='mpc8265_hip3'/>
-  <cpu type='kvm' name='mpc8265'/>
-  <cpu type='kvm' name='mpc8264_hip4'/>
-  <cpu type='kvm' name='mpc8264_hip3'/>
-  <cpu type='kvm' name='mpc8264'/>
-  <cpu type='kvm' name='mpc8260_hip4'/>
-  <cpu type='kvm' name='mpc8260_hip3'/>
-  <cpu type='kvm' name='mpc8260'/>
-  <cpu type='kvm' name='mpc8255_hip4'/>
-  <cpu type='kvm' name='mpc8255_hip3'/>
-  <cpu type='kvm' name='mpc8255'/>
-  <cpu type='kvm' name='mpc8250_hip4'/>
-  <cpu type='kvm' name='mpc8250_hip3'/>
-  <cpu type='kvm' name='mpc8250'/>
-  <cpu type='kvm' name='mpc8248'/>
-  <cpu type='kvm' name='mpc8247'/>
-  <cpu type='kvm' name='mpc8245'/>
-  <cpu type='kvm' name='mpc8241'/>
-  <cpu type='kvm' name='powerquicc-ii'/>
-  <cpu type='kvm' name='mpc82xx'/>
-  <cpu type='kvm' name='mpc5200b'/>
-  <cpu type='kvm' name='mpc5200'/>
-  <cpu type='kvm' name='mpc52xx'/>
-  <cpu type='kvm' name='mpc8240'/>
-  <cpu type='kvm' name='460ex'/>
-  <cpu type='kvm' name='440ep'/>
-  <cpu type='kvm' name='x2vp50'/>
-  <cpu type='kvm' name='x2vp7'/>
-  <cpu type='kvm' name='405gpe'/>
-  <cpu type='kvm' name='405gp'/>
-  <cpu type='kvm' name='405cr'/>
-  <cpu type='kvm' name='405'/>
-  <cpu type='kvm' name='403'/>
+  <cpu type='kvm' name='default' typename='604-powerpc64-cpu'/>
+  <cpu type='kvm' name='ppc' typename='604-powerpc64-cpu'/>
+  <cpu type='kvm' name='ppc32' typename='604-powerpc64-cpu'/>
+  <cpu type='kvm' name='ppc64' typename='970fx_v3.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='970mp' typename='970mp_v1.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='970fx' typename='970fx_v3.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='970' typename='970_v2.2-powerpc64-cpu'/>
+  <cpu type='kvm' name='POWER9' typename='power9_v2.0-powerpc64-cpu'/>
+  <cpu type='kvm' name='power8nvl' typename='power8nvl_v1.0-powerpc64-cpu'/>
+  <cpu type='kvm' name='POWER8' typename='host-powerpc64-cpu'/>
+  <cpu type='kvm' name='power8e' typename='power8e_v2.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='power7+' typename='power7+_v2.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='POWER7' typename='power7_v2.3-powerpc64-cpu'/>
+  <cpu type='kvm' name='power5gs' typename='power5+_v2.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='power5+' typename='power5+_v2.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='apollo7pm' typename='7457a_v1.0-powerpc64-cpu'/>
+  <cpu type='kvm' name='7457a' typename='7457a_v1.2-powerpc64-cpu'/>
+  <cpu type='kvm' name='7447a' typename='7447a_v1.2-powerpc64-cpu'/>
+  <cpu type='kvm' name='apollo7' typename='7457_v1.2-powerpc64-cpu'/>
+  <cpu type='kvm' name='7457' typename='7457_v1.2-powerpc64-cpu'/>
+  <cpu type='kvm' name='7447' typename='7447_v1.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='apollo6' typename='7455_v3.2-powerpc64-cpu'/>
+  <cpu type='kvm' name='7455' typename='7455_v3.2-powerpc64-cpu'/>
+  <cpu type='kvm' name='7445' typename='7445_v3.2-powerpc64-cpu'/>
+  <cpu type='kvm' name='7451' typename='7451_v2.3-powerpc64-cpu'/>
+  <cpu type='kvm' name='7441' typename='7441_v2.3-powerpc64-cpu'/>
+  <cpu type='kvm' name='vger' typename='7450_v2.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='7450' typename='7450_v2.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='7448' typename='7448_v2.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='nitro' typename='7410_v1.4-powerpc64-cpu'/>
+  <cpu type='kvm' name='7410' typename='7410_v1.4-powerpc64-cpu'/>
+  <cpu type='kvm' name='g4' typename='7400_v2.9-powerpc64-cpu'/>
+  <cpu type='kvm' name='max' typename='7400_v2.9-powerpc64-cpu'/>
+  <cpu type='kvm' name='7400' typename='7400_v2.9-powerpc64-cpu'/>
+  <cpu type='kvm' name='goldfinger' typename='755_v2.8-powerpc64-cpu'/>
+  <cpu type='kvm' name='755' typename='755_v2.8-powerpc64-cpu'/>
+  <cpu type='kvm' name='745' typename='745_v2.8-powerpc64-cpu'/>
+  <cpu type='kvm' name='lonestar' typename='750l_v3.2-powerpc64-cpu'/>
+  <cpu type='kvm' name='750l' typename='750l_v3.2-powerpc64-cpu'/>
+  <cpu type='kvm' name='750gx' typename='750gx_v1.2-powerpc64-cpu'/>
+  <cpu type='kvm' name='750fx' typename='750fx_v2.3-powerpc64-cpu'/>
+  <cpu type='kvm' name='750cxe' typename='750cxe_v3.1b-powerpc64-cpu'/>
+  <cpu type='kvm' name='750cx' typename='750cx_v2.2-powerpc64-cpu'/>
+  <cpu type='kvm' name='750cl' typename='750cl_v2.0-powerpc64-cpu'/>
+  <cpu type='kvm' name='conan/doyle' typename='750p-powerpc64-cpu'/>
+  <cpu type='kvm' name='g3' typename='750_v3.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='typhoon' typename='750_v3.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='750' typename='750_v3.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='arthur' typename='740_v3.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='740' typename='740_v3.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='mach5' typename='604r-powerpc64-cpu'/>
+  <cpu type='kvm' name='sirocco' typename='604e_v2.4-powerpc64-cpu'/>
+  <cpu type='kvm' name='604e' typename='604e_v2.4-powerpc64-cpu'/>
+  <cpu type='kvm' name='goldeneye' typename='603e7t-powerpc64-cpu'/>
+  <cpu type='kvm' name='603r' typename='603e7t-powerpc64-cpu'/>
+  <cpu type='kvm' name='vaillant' typename='603e7v-powerpc64-cpu'/>
+  <cpu type='kvm' name='stretch' typename='603e_v4.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='603e' typename='603e_v4.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='vanilla' typename='603-powerpc64-cpu'/>
+  <cpu type='kvm' name='601v' typename='601_v2-powerpc64-cpu'/>
+  <cpu type='kvm' name='601' typename='601_v2-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8560' typename='mpc8560_v21-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8555e' typename='mpc8555e_v11-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8555' typename='mpc8555_v11-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8548e' typename='mpc8548e_v21-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8548' typename='mpc8548_v21-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8547e' typename='mpc8547e_v21-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8545e' typename='mpc8545e_v21-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8545' typename='mpc8545_v21-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8544e' typename='mpc8544e_v11-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8544' typename='mpc8544_v11-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8543e' typename='mpc8543e_v21-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8543' typename='mpc8543_v21-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8541e' typename='mpc8541e_v11-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8541' typename='mpc8541_v11-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8540' typename='mpc8540_v21-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8533e' typename='mpc8533e_v11-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8533' typename='mpc8533_v11-powerpc64-cpu'/>
+  <cpu type='kvm' name='e500v2' typename='e500v2_v22-powerpc64-cpu'/>
+  <cpu type='kvm' name='e500v1' typename='e500_v20-powerpc64-cpu'/>
+  <cpu type='kvm' name='e500' typename='e500v2_v22-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8347ea' typename='mpc8347eat-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8347e' typename='mpc8347et-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8347a' typename='mpc8347at-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8347' typename='mpc8347t-powerpc64-cpu'/>
+  <cpu type='kvm' name='e300' typename='e300c3-powerpc64-cpu'/>
+  <cpu type='kvm' name='e200' typename='e200z6-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8280' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8275' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8272' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8271' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8270' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8266_hip4' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8266_hip3' typename='g2hip3-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8266' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8265_hip4' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8265_hip3' typename='g2hip3-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8265' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8264_hip4' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8264_hip3' typename='g2hip3-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8264' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8260_hip4' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8260_hip3' typename='g2hip3-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8260' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8255_hip4' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8255_hip3' typename='g2hip3-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8255' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8250_hip4' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8250_hip3' typename='g2hip3-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8250' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8248' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8247' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8245' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8241' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='kvm' name='powerquicc-ii' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc82xx' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc5200b' typename='mpc5200b_v21-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc5200' typename='mpc5200_v12-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc52xx' typename='mpc5200_v12-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8240' typename='603-powerpc64-cpu'/>
+  <cpu type='kvm' name='460ex' typename='460exb-powerpc64-cpu'/>
+  <cpu type='kvm' name='440ep' typename='440epb-powerpc64-cpu'/>
+  <cpu type='kvm' name='x2vp50' typename='x2vp20-powerpc64-cpu'/>
+  <cpu type='kvm' name='x2vp7' typename='x2vp4-powerpc64-cpu'/>
+  <cpu type='kvm' name='405gpe' typename='405crc-powerpc64-cpu'/>
+  <cpu type='kvm' name='405gp' typename='405gpd-powerpc64-cpu'/>
+  <cpu type='kvm' name='405cr' typename='405crc-powerpc64-cpu'/>
+  <cpu type='kvm' name='405' typename='405d4-powerpc64-cpu'/>
+  <cpu type='kvm' name='403' typename='403gc-powerpc64-cpu'/>
   <cpu type='kvm' name='mpc8547e_v21'/>
   <cpu type='kvm' name='750cl_v1.0'/>
   <cpu type='kvm' name='7457a_v1.1'/>
@@ -596,135 +596,135 @@
   <cpu type='kvm' name='750_v3.1'/>
   <cpu type='kvm' name='power5+_v2.1'/>
   <cpu type='kvm' name='mpc8568e'/>
-  <cpu type='tcg' name='default'/>
-  <cpu type='tcg' name='ppc'/>
-  <cpu type='tcg' name='ppc32'/>
-  <cpu type='tcg' name='ppc64'/>
-  <cpu type='tcg' name='970mp'/>
-  <cpu type='tcg' name='970fx'/>
-  <cpu type='tcg' name='970'/>
-  <cpu type='tcg' name='POWER9'/>
-  <cpu type='tcg' name='power8nvl'/>
-  <cpu type='tcg' name='POWER8'/>
-  <cpu type='tcg' name='power8e'/>
-  <cpu type='tcg' name='power7+'/>
-  <cpu type='tcg' name='POWER7'/>
-  <cpu type='tcg' name='power5gs'/>
-  <cpu type='tcg' name='power5+'/>
-  <cpu type='tcg' name='apollo7pm'/>
-  <cpu type='tcg' name='7457a'/>
-  <cpu type='tcg' name='7447a'/>
-  <cpu type='tcg' name='apollo7'/>
-  <cpu type='tcg' name='7457'/>
-  <cpu type='tcg' name='7447'/>
-  <cpu type='tcg' name='apollo6'/>
-  <cpu type='tcg' name='7455'/>
-  <cpu type='tcg' name='7445'/>
-  <cpu type='tcg' name='7451'/>
-  <cpu type='tcg' name='7441'/>
-  <cpu type='tcg' name='vger'/>
-  <cpu type='tcg' name='7450'/>
-  <cpu type='tcg' name='7448'/>
-  <cpu type='tcg' name='nitro'/>
-  <cpu type='tcg' name='7410'/>
-  <cpu type='tcg' name='g4'/>
-  <cpu type='tcg' name='max'/>
-  <cpu type='tcg' name='7400'/>
-  <cpu type='tcg' name='goldfinger'/>
-  <cpu type='tcg' name='755'/>
-  <cpu type='tcg' name='745'/>
-  <cpu type='tcg' name='lonestar'/>
-  <cpu type='tcg' name='750l'/>
-  <cpu type='tcg' name='750gx'/>
-  <cpu type='tcg' name='750fx'/>
-  <cpu type='tcg' name='750cxe'/>
-  <cpu type='tcg' name='750cx'/>
-  <cpu type='tcg' name='750cl'/>
-  <cpu type='tcg' name='conan/doyle'/>
-  <cpu type='tcg' name='g3'/>
-  <cpu type='tcg' name='typhoon'/>
-  <cpu type='tcg' name='750'/>
-  <cpu type='tcg' name='arthur'/>
-  <cpu type='tcg' name='740'/>
-  <cpu type='tcg' name='mach5'/>
-  <cpu type='tcg' name='sirocco'/>
-  <cpu type='tcg' name='604e'/>
-  <cpu type='tcg' name='goldeneye'/>
-  <cpu type='tcg' name='603r'/>
-  <cpu type='tcg' name='vaillant'/>
-  <cpu type='tcg' name='stretch'/>
-  <cpu type='tcg' name='603e'/>
-  <cpu type='tcg' name='vanilla'/>
-  <cpu type='tcg' name='601v'/>
-  <cpu type='tcg' name='601'/>
-  <cpu type='tcg' name='mpc8560'/>
-  <cpu type='tcg' name='mpc8555e'/>
-  <cpu type='tcg' name='mpc8555'/>
-  <cpu type='tcg' name='mpc8548e'/>
-  <cpu type='tcg' name='mpc8548'/>
-  <cpu type='tcg' name='mpc8547e'/>
-  <cpu type='tcg' name='mpc8545e'/>
-  <cpu type='tcg' name='mpc8545'/>
-  <cpu type='tcg' name='mpc8544e'/>
-  <cpu type='tcg' name='mpc8544'/>
-  <cpu type='tcg' name='mpc8543e'/>
-  <cpu type='tcg' name='mpc8543'/>
-  <cpu type='tcg' name='mpc8541e'/>
-  <cpu type='tcg' name='mpc8541'/>
-  <cpu type='tcg' name='mpc8540'/>
-  <cpu type='tcg' name='mpc8533e'/>
-  <cpu type='tcg' name='mpc8533'/>
-  <cpu type='tcg' name='e500v2'/>
-  <cpu type='tcg' name='e500v1'/>
-  <cpu type='tcg' name='e500'/>
-  <cpu type='tcg' name='mpc8347ea'/>
-  <cpu type='tcg' name='mpc8347e'/>
-  <cpu type='tcg' name='mpc8347a'/>
-  <cpu type='tcg' name='mpc8347'/>
-  <cpu type='tcg' name='e300'/>
-  <cpu type='tcg' name='e200'/>
-  <cpu type='tcg' name='mpc8280'/>
-  <cpu type='tcg' name='mpc8275'/>
-  <cpu type='tcg' name='mpc8272'/>
-  <cpu type='tcg' name='mpc8271'/>
-  <cpu type='tcg' name='mpc8270'/>
-  <cpu type='tcg' name='mpc8266_hip4'/>
-  <cpu type='tcg' name='mpc8266_hip3'/>
-  <cpu type='tcg' name='mpc8266'/>
-  <cpu type='tcg' name='mpc8265_hip4'/>
-  <cpu type='tcg' name='mpc8265_hip3'/>
-  <cpu type='tcg' name='mpc8265'/>
-  <cpu type='tcg' name='mpc8264_hip4'/>
-  <cpu type='tcg' name='mpc8264_hip3'/>
-  <cpu type='tcg' name='mpc8264'/>
-  <cpu type='tcg' name='mpc8260_hip4'/>
-  <cpu type='tcg' name='mpc8260_hip3'/>
-  <cpu type='tcg' name='mpc8260'/>
-  <cpu type='tcg' name='mpc8255_hip4'/>
-  <cpu type='tcg' name='mpc8255_hip3'/>
-  <cpu type='tcg' name='mpc8255'/>
-  <cpu type='tcg' name='mpc8250_hip4'/>
-  <cpu type='tcg' name='mpc8250_hip3'/>
-  <cpu type='tcg' name='mpc8250'/>
-  <cpu type='tcg' name='mpc8248'/>
-  <cpu type='tcg' name='mpc8247'/>
-  <cpu type='tcg' name='mpc8245'/>
-  <cpu type='tcg' name='mpc8241'/>
-  <cpu type='tcg' name='powerquicc-ii'/>
-  <cpu type='tcg' name='mpc82xx'/>
-  <cpu type='tcg' name='mpc5200b'/>
-  <cpu type='tcg' name='mpc5200'/>
-  <cpu type='tcg' name='mpc52xx'/>
-  <cpu type='tcg' name='mpc8240'/>
-  <cpu type='tcg' name='460ex'/>
-  <cpu type='tcg' name='440ep'/>
-  <cpu type='tcg' name='x2vp50'/>
-  <cpu type='tcg' name='x2vp7'/>
-  <cpu type='tcg' name='405gpe'/>
-  <cpu type='tcg' name='405gp'/>
-  <cpu type='tcg' name='405cr'/>
-  <cpu type='tcg' name='405'/>
-  <cpu type='tcg' name='403'/>
+  <cpu type='tcg' name='default' typename='604-powerpc64-cpu'/>
+  <cpu type='tcg' name='ppc' typename='604-powerpc64-cpu'/>
+  <cpu type='tcg' name='ppc32' typename='604-powerpc64-cpu'/>
+  <cpu type='tcg' name='ppc64' typename='970fx_v3.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='970mp' typename='970mp_v1.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='970fx' typename='970fx_v3.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='970' typename='970_v2.2-powerpc64-cpu'/>
+  <cpu type='tcg' name='POWER9' typename='power9_v2.0-powerpc64-cpu'/>
+  <cpu type='tcg' name='power8nvl' typename='power8nvl_v1.0-powerpc64-cpu'/>
+  <cpu type='tcg' name='POWER8' typename='power8_v2.0-powerpc64-cpu'/>
+  <cpu type='tcg' name='power8e' typename='power8e_v2.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='power7+' typename='power7+_v2.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='POWER7' typename='power7_v2.3-powerpc64-cpu'/>
+  <cpu type='tcg' name='power5gs' typename='power5+_v2.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='power5+' typename='power5+_v2.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='apollo7pm' typename='7457a_v1.0-powerpc64-cpu'/>
+  <cpu type='tcg' name='7457a' typename='7457a_v1.2-powerpc64-cpu'/>
+  <cpu type='tcg' name='7447a' typename='7447a_v1.2-powerpc64-cpu'/>
+  <cpu type='tcg' name='apollo7' typename='7457_v1.2-powerpc64-cpu'/>
+  <cpu type='tcg' name='7457' typename='7457_v1.2-powerpc64-cpu'/>
+  <cpu type='tcg' name='7447' typename='7447_v1.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='apollo6' typename='7455_v3.2-powerpc64-cpu'/>
+  <cpu type='tcg' name='7455' typename='7455_v3.2-powerpc64-cpu'/>
+  <cpu type='tcg' name='7445' typename='7445_v3.2-powerpc64-cpu'/>
+  <cpu type='tcg' name='7451' typename='7451_v2.3-powerpc64-cpu'/>
+  <cpu type='tcg' name='7441' typename='7441_v2.3-powerpc64-cpu'/>
+  <cpu type='tcg' name='vger' typename='7450_v2.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='7450' typename='7450_v2.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='7448' typename='7448_v2.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='nitro' typename='7410_v1.4-powerpc64-cpu'/>
+  <cpu type='tcg' name='7410' typename='7410_v1.4-powerpc64-cpu'/>
+  <cpu type='tcg' name='g4' typename='7400_v2.9-powerpc64-cpu'/>
+  <cpu type='tcg' name='max' typename='7400_v2.9-powerpc64-cpu'/>
+  <cpu type='tcg' name='7400' typename='7400_v2.9-powerpc64-cpu'/>
+  <cpu type='tcg' name='goldfinger' typename='755_v2.8-powerpc64-cpu'/>
+  <cpu type='tcg' name='755' typename='755_v2.8-powerpc64-cpu'/>
+  <cpu type='tcg' name='745' typename='745_v2.8-powerpc64-cpu'/>
+  <cpu type='tcg' name='lonestar' typename='750l_v3.2-powerpc64-cpu'/>
+  <cpu type='tcg' name='750l' typename='750l_v3.2-powerpc64-cpu'/>
+  <cpu type='tcg' name='750gx' typename='750gx_v1.2-powerpc64-cpu'/>
+  <cpu type='tcg' name='750fx' typename='750fx_v2.3-powerpc64-cpu'/>
+  <cpu type='tcg' name='750cxe' typename='750cxe_v3.1b-powerpc64-cpu'/>
+  <cpu type='tcg' name='750cx' typename='750cx_v2.2-powerpc64-cpu'/>
+  <cpu type='tcg' name='750cl' typename='750cl_v2.0-powerpc64-cpu'/>
+  <cpu type='tcg' name='conan/doyle' typename='750p-powerpc64-cpu'/>
+  <cpu type='tcg' name='g3' typename='750_v3.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='typhoon' typename='750_v3.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='750' typename='750_v3.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='arthur' typename='740_v3.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='740' typename='740_v3.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='mach5' typename='604r-powerpc64-cpu'/>
+  <cpu type='tcg' name='sirocco' typename='604e_v2.4-powerpc64-cpu'/>
+  <cpu type='tcg' name='604e' typename='604e_v2.4-powerpc64-cpu'/>
+  <cpu type='tcg' name='goldeneye' typename='603e7t-powerpc64-cpu'/>
+  <cpu type='tcg' name='603r' typename='603e7t-powerpc64-cpu'/>
+  <cpu type='tcg' name='vaillant' typename='603e7v-powerpc64-cpu'/>
+  <cpu type='tcg' name='stretch' typename='603e_v4.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='603e' typename='603e_v4.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='vanilla' typename='603-powerpc64-cpu'/>
+  <cpu type='tcg' name='601v' typename='601_v2-powerpc64-cpu'/>
+  <cpu type='tcg' name='601' typename='601_v2-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8560' typename='mpc8560_v21-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8555e' typename='mpc8555e_v11-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8555' typename='mpc8555_v11-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8548e' typename='mpc8548e_v21-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8548' typename='mpc8548_v21-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8547e' typename='mpc8547e_v21-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8545e' typename='mpc8545e_v21-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8545' typename='mpc8545_v21-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8544e' typename='mpc8544e_v11-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8544' typename='mpc8544_v11-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8543e' typename='mpc8543e_v21-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8543' typename='mpc8543_v21-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8541e' typename='mpc8541e_v11-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8541' typename='mpc8541_v11-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8540' typename='mpc8540_v21-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8533e' typename='mpc8533e_v11-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8533' typename='mpc8533_v11-powerpc64-cpu'/>
+  <cpu type='tcg' name='e500v2' typename='e500v2_v22-powerpc64-cpu'/>
+  <cpu type='tcg' name='e500v1' typename='e500_v20-powerpc64-cpu'/>
+  <cpu type='tcg' name='e500' typename='e500v2_v22-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8347ea' typename='mpc8347eat-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8347e' typename='mpc8347et-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8347a' typename='mpc8347at-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8347' typename='mpc8347t-powerpc64-cpu'/>
+  <cpu type='tcg' name='e300' typename='e300c3-powerpc64-cpu'/>
+  <cpu type='tcg' name='e200' typename='e200z6-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8280' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8275' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8272' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8271' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8270' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8266_hip4' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8266_hip3' typename='g2hip3-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8266' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8265_hip4' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8265_hip3' typename='g2hip3-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8265' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8264_hip4' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8264_hip3' typename='g2hip3-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8264' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8260_hip4' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8260_hip3' typename='g2hip3-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8260' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8255_hip4' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8255_hip3' typename='g2hip3-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8255' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8250_hip4' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8250_hip3' typename='g2hip3-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8250' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8248' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8247' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8245' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8241' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='tcg' name='powerquicc-ii' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc82xx' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc5200b' typename='mpc5200b_v21-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc5200' typename='mpc5200_v12-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc52xx' typename='mpc5200_v12-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8240' typename='603-powerpc64-cpu'/>
+  <cpu type='tcg' name='460ex' typename='460exb-powerpc64-cpu'/>
+  <cpu type='tcg' name='440ep' typename='440epb-powerpc64-cpu'/>
+  <cpu type='tcg' name='x2vp50' typename='x2vp20-powerpc64-cpu'/>
+  <cpu type='tcg' name='x2vp7' typename='x2vp4-powerpc64-cpu'/>
+  <cpu type='tcg' name='405gpe' typename='405crc-powerpc64-cpu'/>
+  <cpu type='tcg' name='405gp' typename='405gpd-powerpc64-cpu'/>
+  <cpu type='tcg' name='405cr' typename='405crc-powerpc64-cpu'/>
+  <cpu type='tcg' name='405' typename='405d4-powerpc64-cpu'/>
+  <cpu type='tcg' name='403' typename='403gc-powerpc64-cpu'/>
   <cpu type='tcg' name='mpc8547e_v21'/>
   <cpu type='tcg' name='750cl_v1.0'/>
   <cpu type='tcg' name='7457a_v1.1'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
index 38f3864444..1a2b7aa269 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
@@ -164,77 +164,77 @@
     <property name='te' type='boolean' value='true'/>
     <property name='cmm' type='boolean' value='true'/>
   </hostCPU>
-  <cpu type='kvm' name='z890.2' usable='yes'/>
-  <cpu type='kvm' name='z990.4' usable='yes'/>
-  <cpu type='kvm' name='z14ZR1' usable='yes'/>
-  <cpu type='kvm' name='z10BC.2' usable='yes'/>
-  <cpu type='kvm' name='z196.2' usable='yes'/>
-  <cpu type='kvm' name='z14' usable='yes'/>
-  <cpu type='kvm' name='z9BC-base' usable='yes'/>
-  <cpu type='kvm' name='zEC12-base' usable='yes'/>
-  <cpu type='kvm' name='z196-base' usable='yes'/>
-  <cpu type='kvm' name='z13-base' usable='yes'/>
-  <cpu type='kvm' name='z990.3' usable='yes'/>
-  <cpu type='kvm' name='host' usable='yes'/>
-  <cpu type='kvm' name='z9EC' usable='yes'/>
-  <cpu type='kvm' name='zBC12' usable='yes'/>
-  <cpu type='kvm' name='z9EC.3' usable='yes'/>
-  <cpu type='kvm' name='z196.2-base' usable='yes'/>
-  <cpu type='kvm' name='qemu' usable='no'>
+  <cpu type='kvm' name='z890.2' typename='z890.2-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z990.4' typename='z990.4-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z14ZR1' typename='z14ZR1-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z10BC.2' typename='z10BC.2-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z196.2' typename='z196.2-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z14' typename='z14-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z9BC-base' typename='z9BC-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='zEC12-base' typename='zEC12-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z196-base' typename='z196-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z13-base' typename='z13-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z990.3' typename='z990.3-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='host' typename='host-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z9EC' typename='z9EC-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='zBC12' typename='zBC12-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z9EC.3' typename='z9EC.3-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z196.2-base' typename='z196.2-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='qemu' typename='qemu-s390x-cpu' usable='no'>
     <blocker name='ais'/>
   </cpu>
-  <cpu type='kvm' name='zEC12.2-base' usable='yes'/>
-  <cpu type='kvm' name='z800-base' usable='yes'/>
-  <cpu type='kvm' name='z9EC.2' usable='yes'/>
-  <cpu type='kvm' name='z900.2-base' usable='yes'/>
-  <cpu type='kvm' name='z14ZR1-base' usable='yes'/>
-  <cpu type='kvm' name='z900.3' usable='yes'/>
-  <cpu type='kvm' name='z890-base' usable='yes'/>
-  <cpu type='kvm' name='z890' usable='yes'/>
-  <cpu type='kvm' name='z990.4-base' usable='yes'/>
-  <cpu type='kvm' name='z10BC.2-base' usable='yes'/>
-  <cpu type='kvm' name='z900.2' usable='yes'/>
-  <cpu type='kvm' name='z9BC.2-base' usable='yes'/>
-  <cpu type='kvm' name='z800' usable='yes'/>
-  <cpu type='kvm' name='z114' usable='yes'/>
-  <cpu type='kvm' name='z13' usable='yes'/>
-  <cpu type='kvm' name='z13s-base' usable='yes'/>
-  <cpu type='kvm' name='z990' usable='yes'/>
-  <cpu type='kvm' name='z990.2' usable='yes'/>
-  <cpu type='kvm' name='z14-base' usable='yes'/>
-  <cpu type='kvm' name='z890.2-base' usable='yes'/>
-  <cpu type='kvm' name='z196' usable='yes'/>
-  <cpu type='kvm' name='z10EC' usable='yes'/>
-  <cpu type='kvm' name='z13s' usable='yes'/>
-  <cpu type='kvm' name='z900' usable='yes'/>
-  <cpu type='kvm' name='z10EC.3' usable='yes'/>
-  <cpu type='kvm' name='z10EC.2-base' usable='yes'/>
-  <cpu type='kvm' name='z114-base' usable='yes'/>
-  <cpu type='kvm' name='z990.2-base' usable='yes'/>
-  <cpu type='kvm' name='z9EC.2-base' usable='yes'/>
-  <cpu type='kvm' name='z890.3' usable='yes'/>
-  <cpu type='kvm' name='z900.3-base' usable='yes'/>
-  <cpu type='kvm' name='z9BC.2' usable='yes'/>
-  <cpu type='kvm' name='z10BC' usable='yes'/>
-  <cpu type='kvm' name='z990.5' usable='yes'/>
-  <cpu type='kvm' name='zEC12.2' usable='yes'/>
-  <cpu type='kvm' name='z10EC-base' usable='yes'/>
-  <cpu type='kvm' name='z9EC-base' usable='yes'/>
-  <cpu type='kvm' name='z9EC.3-base' usable='yes'/>
-  <cpu type='kvm' name='zEC12' usable='yes'/>
-  <cpu type='kvm' name='z990.5-base' usable='yes'/>
-  <cpu type='kvm' name='z10BC-base' usable='yes'/>
-  <cpu type='kvm' name='z900-base' usable='yes'/>
-  <cpu type='kvm' name='z13.2' usable='yes'/>
-  <cpu type='kvm' name='zBC12-base' usable='yes'/>
-  <cpu type='kvm' name='z13.2-base' usable='yes'/>
-  <cpu type='kvm' name='z890.3-base' usable='yes'/>
-  <cpu type='kvm' name='z990-base' usable='yes'/>
-  <cpu type='kvm' name='z10EC.2' usable='yes'/>
-  <cpu type='kvm' name='z9BC' usable='yes'/>
-  <cpu type='kvm' name='z10EC.3-base' usable='yes'/>
-  <cpu type='kvm' name='z990.3-base' usable='yes'/>
-  <cpu type='tcg' name='z890.2' usable='no'>
+  <cpu type='kvm' name='zEC12.2-base' typename='zEC12.2-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z800-base' typename='z800-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z9EC.2' typename='z9EC.2-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z900.2-base' typename='z900.2-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z14ZR1-base' typename='z14ZR1-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z900.3' typename='z900.3-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z890-base' typename='z890-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z890' typename='z890-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z990.4-base' typename='z990.4-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z10BC.2-base' typename='z10BC.2-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z900.2' typename='z900.2-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z9BC.2-base' typename='z9BC.2-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z800' typename='z800-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z114' typename='z114-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z13' typename='z13-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z13s-base' typename='z13s-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z990' typename='z990-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z990.2' typename='z990.2-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z14-base' typename='z14-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z890.2-base' typename='z890.2-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z196' typename='z196-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z10EC' typename='z10EC-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z13s' typename='z13s-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z900' typename='z900-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z10EC.3' typename='z10EC.3-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z10EC.2-base' typename='z10EC.2-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z114-base' typename='z114-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z990.2-base' typename='z990.2-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z9EC.2-base' typename='z9EC.2-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z890.3' typename='z890.3-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z900.3-base' typename='z900.3-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z9BC.2' typename='z9BC.2-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z10BC' typename='z10BC-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z990.5' typename='z990.5-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='zEC12.2' typename='zEC12.2-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z10EC-base' typename='z10EC-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z9EC-base' typename='z9EC-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z9EC.3-base' typename='z9EC.3-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='zEC12' typename='zEC12-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z990.5-base' typename='z990.5-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z10BC-base' typename='z10BC-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z900-base' typename='z900-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z13.2' typename='z13.2-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='zBC12-base' typename='zBC12-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z13.2-base' typename='z13.2-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z890.3-base' typename='z890.3-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z990-base' typename='z990-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z10EC.2' typename='z10EC.2-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z9BC' typename='z9BC-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z10EC.3-base' typename='z10EC.3-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z990.3-base' typename='z990.3-base-s390x-cpu' usable='yes'/>
+  <cpu type='tcg' name='z890.2' typename='z890.2-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -248,7 +248,7 @@
     <blocker name='kmac-dea'/>
     <blocker name='hfpm'/>
   </cpu>
-  <cpu type='tcg' name='z990.4' usable='no'>
+  <cpu type='tcg' name='z990.4' typename='z990.4-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -262,7 +262,7 @@
     <blocker name='kmac-dea'/>
     <blocker name='hfpm'/>
   </cpu>
-  <cpu type='tcg' name='z14ZR1' usable='no'>
+  <cpu type='tcg' name='z14ZR1' typename='z14ZR1-s390x-cpu' usable='no'>
     <blocker name='ppno-sha-512-drng'/>
     <blocker name='pcc-xts-eaes-256'/>
     <blocker name='pcc-xts-eaes-128'/>
@@ -406,7 +406,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z10BC.2' usable='no'>
+  <cpu type='tcg' name='z10BC.2' typename='z10BC.2-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -434,7 +434,7 @@
     <blocker name='msa1'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z196.2' usable='no'>
+  <cpu type='tcg' name='z196.2' typename='z196.2-s390x-cpu' usable='no'>
     <blocker name='pcc-xts-eaes-256'/>
     <blocker name='pcc-xts-eaes-128'/>
     <blocker name='pcc-xts-aes-256'/>
@@ -554,7 +554,7 @@
     <blocker name='msa1'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z14' usable='no'>
+  <cpu type='tcg' name='z14' typename='z14-s390x-cpu' usable='no'>
     <blocker name='ppno-sha-512-drng'/>
     <blocker name='pcc-xts-eaes-256'/>
     <blocker name='pcc-xts-eaes-128'/>
@@ -698,7 +698,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z9BC-base' usable='no'>
+  <cpu type='tcg' name='z9BC-base' typename='z9BC-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -716,7 +716,7 @@
     <blocker name='asnlxr'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='zEC12-base' usable='no'>
+  <cpu type='tcg' name='zEC12-base' typename='zEC12-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -744,7 +744,7 @@
     <blocker name='asnlxr'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z196-base' usable='no'>
+  <cpu type='tcg' name='z196-base' typename='z196-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -771,7 +771,7 @@
     <blocker name='asnlxr'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z13-base' usable='no'>
+  <cpu type='tcg' name='z13-base' typename='z13-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -802,7 +802,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z990.3' usable='no'>
+  <cpu type='tcg' name='z990.3' typename='z990.3-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -816,8 +816,8 @@
     <blocker name='kmac-dea'/>
     <blocker name='hfpm'/>
   </cpu>
-  <cpu type='tcg' name='host'/>
-  <cpu type='tcg' name='z9EC' usable='no'>
+  <cpu type='tcg' name='host' typename='host-s390x-cpu'/>
+  <cpu type='tcg' name='z9EC' typename='z9EC-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -838,7 +838,7 @@
     <blocker name='msa1'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='zBC12' usable='no'>
+  <cpu type='tcg' name='zBC12' typename='zBC12-s390x-cpu' usable='no'>
     <blocker name='pcc-xts-eaes-256'/>
     <blocker name='pcc-xts-eaes-128'/>
     <blocker name='pcc-xts-aes-256'/>
@@ -965,7 +965,7 @@
     <blocker name='msa1'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z9EC.3' usable='no'>
+  <cpu type='tcg' name='z9EC.3' typename='z9EC.3-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -986,7 +986,7 @@
     <blocker name='msa1'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z196.2-base' usable='no'>
+  <cpu type='tcg' name='z196.2-base' typename='z196.2-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1013,8 +1013,8 @@
     <blocker name='asnlxr'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='qemu' usable='yes'/>
-  <cpu type='tcg' name='zEC12.2-base' usable='no'>
+  <cpu type='tcg' name='qemu' typename='qemu-s390x-cpu' usable='yes'/>
+  <cpu type='tcg' name='zEC12.2-base' typename='zEC12.2-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1042,8 +1042,8 @@
     <blocker name='asnlxr'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z800-base' usable='yes'/>
-  <cpu type='tcg' name='z9EC.2' usable='no'>
+  <cpu type='tcg' name='z800-base' typename='z800-base-s390x-cpu' usable='yes'/>
+  <cpu type='tcg' name='z9EC.2' typename='z9EC.2-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1064,8 +1064,8 @@
     <blocker name='msa1'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z900.2-base' usable='yes'/>
-  <cpu type='tcg' name='z14ZR1-base' usable='no'>
+  <cpu type='tcg' name='z900.2-base' typename='z900.2-base-s390x-cpu' usable='yes'/>
+  <cpu type='tcg' name='z14ZR1-base' typename='z14ZR1-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1101,8 +1101,8 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z900.3' usable='yes'/>
-  <cpu type='tcg' name='z890-base' usable='no'>
+  <cpu type='tcg' name='z900.3' typename='z900.3-s390x-cpu' usable='yes'/>
+  <cpu type='tcg' name='z890-base' typename='z890-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1116,7 +1116,7 @@
     <blocker name='kmac-dea'/>
     <blocker name='hfpm'/>
   </cpu>
-  <cpu type='tcg' name='z890' usable='no'>
+  <cpu type='tcg' name='z890' typename='z890-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1130,7 +1130,7 @@
     <blocker name='kmac-dea'/>
     <blocker name='hfpm'/>
   </cpu>
-  <cpu type='tcg' name='z990.4-base' usable='no'>
+  <cpu type='tcg' name='z990.4-base' typename='z990.4-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1144,7 +1144,7 @@
     <blocker name='kmac-dea'/>
     <blocker name='hfpm'/>
   </cpu>
-  <cpu type='tcg' name='z10BC.2-base' usable='no'>
+  <cpu type='tcg' name='z10BC.2-base' typename='z10BC.2-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1167,8 +1167,8 @@
     <blocker name='asnlxr'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z900.2' usable='yes'/>
-  <cpu type='tcg' name='z9BC.2-base' usable='no'>
+  <cpu type='tcg' name='z900.2' typename='z900.2-s390x-cpu' usable='yes'/>
+  <cpu type='tcg' name='z9BC.2-base' typename='z9BC.2-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1186,8 +1186,8 @@
     <blocker name='asnlxr'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z800' usable='yes'/>
-  <cpu type='tcg' name='z114' usable='no'>
+  <cpu type='tcg' name='z800' typename='z800-s390x-cpu' usable='yes'/>
+  <cpu type='tcg' name='z114' typename='z114-s390x-cpu' usable='no'>
     <blocker name='pcc-xts-eaes-256'/>
     <blocker name='pcc-xts-eaes-128'/>
     <blocker name='pcc-xts-aes-256'/>
@@ -1307,7 +1307,7 @@
     <blocker name='msa1'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z13' usable='no'>
+  <cpu type='tcg' name='z13' typename='z13-s390x-cpu' usable='no'>
     <blocker name='ppno-sha-512-drng'/>
     <blocker name='pcc-xts-eaes-256'/>
     <blocker name='pcc-xts-eaes-128'/>
@@ -1439,7 +1439,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z13s-base' usable='no'>
+  <cpu type='tcg' name='z13s-base' typename='z13s-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1470,7 +1470,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z990' usable='no'>
+  <cpu type='tcg' name='z990' typename='z990-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1484,7 +1484,7 @@
     <blocker name='kmac-dea'/>
     <blocker name='hfpm'/>
   </cpu>
-  <cpu type='tcg' name='z990.2' usable='no'>
+  <cpu type='tcg' name='z990.2' typename='z990.2-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1498,7 +1498,7 @@
     <blocker name='kmac-dea'/>
     <blocker name='hfpm'/>
   </cpu>
-  <cpu type='tcg' name='z14-base' usable='no'>
+  <cpu type='tcg' name='z14-base' typename='z14-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1534,7 +1534,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z890.2-base' usable='no'>
+  <cpu type='tcg' name='z890.2-base' typename='z890.2-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1548,7 +1548,7 @@
     <blocker name='kmac-dea'/>
     <blocker name='hfpm'/>
   </cpu>
-  <cpu type='tcg' name='z196' usable='no'>
+  <cpu type='tcg' name='z196' typename='z196-s390x-cpu' usable='no'>
     <blocker name='pcc-xts-eaes-256'/>
     <blocker name='pcc-xts-eaes-128'/>
     <blocker name='pcc-xts-aes-256'/>
@@ -1668,7 +1668,7 @@
     <blocker name='msa1'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z10EC' usable='no'>
+  <cpu type='tcg' name='z10EC' typename='z10EC-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1696,7 +1696,7 @@
     <blocker name='msa1'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z13s' usable='no'>
+  <cpu type='tcg' name='z13s' typename='z13s-s390x-cpu' usable='no'>
     <blocker name='ppno-sha-512-drng'/>
     <blocker name='pcc-xts-eaes-256'/>
     <blocker name='pcc-xts-eaes-128'/>
@@ -1828,8 +1828,8 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z900' usable='yes'/>
-  <cpu type='tcg' name='z10EC.3' usable='no'>
+  <cpu type='tcg' name='z900' typename='z900-s390x-cpu' usable='yes'/>
+  <cpu type='tcg' name='z10EC.3' typename='z10EC.3-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1857,7 +1857,7 @@
     <blocker name='msa1'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z10EC.2-base' usable='no'>
+  <cpu type='tcg' name='z10EC.2-base' typename='z10EC.2-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1880,7 +1880,7 @@
     <blocker name='asnlxr'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z114-base' usable='no'>
+  <cpu type='tcg' name='z114-base' typename='z114-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1907,7 +1907,7 @@
     <blocker name='asnlxr'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z990.2-base' usable='no'>
+  <cpu type='tcg' name='z990.2-base' typename='z990.2-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1921,7 +1921,7 @@
     <blocker name='kmac-dea'/>
     <blocker name='hfpm'/>
   </cpu>
-  <cpu type='tcg' name='z9EC.2-base' usable='no'>
+  <cpu type='tcg' name='z9EC.2-base' typename='z9EC.2-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1939,7 +1939,7 @@
     <blocker name='asnlxr'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z890.3' usable='no'>
+  <cpu type='tcg' name='z890.3' typename='z890.3-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1953,8 +1953,8 @@
     <blocker name='kmac-dea'/>
     <blocker name='hfpm'/>
   </cpu>
-  <cpu type='tcg' name='z900.3-base' usable='yes'/>
-  <cpu type='tcg' name='z9BC.2' usable='no'>
+  <cpu type='tcg' name='z900.3-base' typename='z900.3-base-s390x-cpu' usable='yes'/>
+  <cpu type='tcg' name='z9BC.2' typename='z9BC.2-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1975,7 +1975,7 @@
     <blocker name='msa1'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z10BC' usable='no'>
+  <cpu type='tcg' name='z10BC' typename='z10BC-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -2003,7 +2003,7 @@
     <blocker name='msa1'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z990.5' usable='no'>
+  <cpu type='tcg' name='z990.5' typename='z990.5-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -2017,7 +2017,7 @@
     <blocker name='kmac-dea'/>
     <blocker name='hfpm'/>
   </cpu>
-  <cpu type='tcg' name='zEC12.2' usable='no'>
+  <cpu type='tcg' name='zEC12.2' typename='zEC12.2-s390x-cpu' usable='no'>
     <blocker name='pcc-xts-eaes-256'/>
     <blocker name='pcc-xts-eaes-128'/>
     <blocker name='pcc-xts-aes-256'/>
@@ -2144,7 +2144,7 @@
     <blocker name='msa1'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z10EC-base' usable='no'>
+  <cpu type='tcg' name='z10EC-base' typename='z10EC-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -2167,7 +2167,7 @@
     <blocker name='asnlxr'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z9EC-base' usable='no'>
+  <cpu type='tcg' name='z9EC-base' typename='z9EC-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -2185,7 +2185,7 @@
     <blocker name='asnlxr'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z9EC.3-base' usable='no'>
+  <cpu type='tcg' name='z9EC.3-base' typename='z9EC.3-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -2203,7 +2203,7 @@
     <blocker name='asnlxr'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='zEC12' usable='no'>
+  <cpu type='tcg' name='zEC12' typename='zEC12-s390x-cpu' usable='no'>
     <blocker name='pcc-xts-eaes-256'/>
     <blocker name='pcc-xts-eaes-128'/>
     <blocker name='pcc-xts-aes-256'/>
@@ -2330,7 +2330,7 @@
     <blocker name='msa1'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z990.5-base' usable='no'>
+  <cpu type='tcg' name='z990.5-base' typename='z990.5-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -2344,7 +2344,7 @@
     <blocker name='kmac-dea'/>
     <blocker name='hfpm'/>
   </cpu>
-  <cpu type='tcg' name='z10BC-base' usable='no'>
+  <cpu type='tcg' name='z10BC-base' typename='z10BC-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -2367,8 +2367,8 @@
     <blocker name='asnlxr'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z900-base' usable='yes'/>
-  <cpu type='tcg' name='z13.2' usable='no'>
+  <cpu type='tcg' name='z900-base' typename='z900-base-s390x-cpu' usable='yes'/>
+  <cpu type='tcg' name='z13.2' typename='z13.2-s390x-cpu' usable='no'>
     <blocker name='ppno-sha-512-drng'/>
     <blocker name='pcc-xts-eaes-256'/>
     <blocker name='pcc-xts-eaes-128'/>
@@ -2500,7 +2500,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='zBC12-base' usable='no'>
+  <cpu type='tcg' name='zBC12-base' typename='zBC12-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -2528,7 +2528,7 @@
     <blocker name='asnlxr'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z13.2-base' usable='no'>
+  <cpu type='tcg' name='z13.2-base' typename='z13.2-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -2559,7 +2559,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z890.3-base' usable='no'>
+  <cpu type='tcg' name='z890.3-base' typename='z890.3-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -2573,7 +2573,7 @@
     <blocker name='kmac-dea'/>
     <blocker name='hfpm'/>
   </cpu>
-  <cpu type='tcg' name='z990-base' usable='no'>
+  <cpu type='tcg' name='z990-base' typename='z990-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -2587,7 +2587,7 @@
     <blocker name='kmac-dea'/>
     <blocker name='hfpm'/>
   </cpu>
-  <cpu type='tcg' name='z10EC.2' usable='no'>
+  <cpu type='tcg' name='z10EC.2' typename='z10EC.2-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -2615,7 +2615,7 @@
     <blocker name='msa1'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z9BC' usable='no'>
+  <cpu type='tcg' name='z9BC' typename='z9BC-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -2636,7 +2636,7 @@
     <blocker name='msa1'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z10EC.3-base' usable='no'>
+  <cpu type='tcg' name='z10EC.3-base' typename='z10EC.3-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -2659,7 +2659,7 @@
     <blocker name='asnlxr'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z990.3-base' usable='no'>
+  <cpu type='tcg' name='z990.3-base' typename='z990.3-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
index dce80e9ba0..587455ff93 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
@@ -713,12 +713,12 @@
     <property name='avx512pf' type='boolean' value='false'/>
     <property name='xstore-en' type='boolean' value='false'/>
   </hostCPU>
-  <cpu type='kvm' name='max' usable='yes'/>
-  <cpu type='kvm' name='host' usable='yes'/>
-  <cpu type='kvm' name='base' usable='yes'/>
-  <cpu type='kvm' name='qemu64' usable='yes'/>
-  <cpu type='kvm' name='qemu32' usable='yes'/>
-  <cpu type='kvm' name='phenom' usable='no'>
+  <cpu type='kvm' name='max' typename='max-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='host' typename='host-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='base' typename='base-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='qemu64' typename='qemu64-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='qemu32' typename='qemu32-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='phenom' typename='phenom-x86_64-cpu' usable='no'>
     <blocker name='mmxext'/>
     <blocker name='fxsr-opt'/>
     <blocker name='3dnowext'/>
@@ -726,22 +726,22 @@
     <blocker name='sse4a'/>
     <blocker name='npt'/>
   </cpu>
-  <cpu type='kvm' name='pentium3' usable='yes'/>
-  <cpu type='kvm' name='pentium2' usable='yes'/>
-  <cpu type='kvm' name='pentium' usable='yes'/>
-  <cpu type='kvm' name='n270' usable='yes'/>
-  <cpu type='kvm' name='kvm64' usable='yes'/>
-  <cpu type='kvm' name='kvm32' usable='yes'/>
-  <cpu type='kvm' name='coreduo' usable='yes'/>
-  <cpu type='kvm' name='core2duo' usable='yes'/>
-  <cpu type='kvm' name='athlon' usable='no'>
+  <cpu type='kvm' name='pentium3' typename='pentium3-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='pentium2' typename='pentium2-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='pentium' typename='pentium-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='n270' typename='n270-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='kvm64' typename='kvm64-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='kvm32' typename='kvm32-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='coreduo' typename='coreduo-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='core2duo' typename='core2duo-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='athlon' typename='athlon-x86_64-cpu' usable='no'>
     <blocker name='mmxext'/>
     <blocker name='3dnowext'/>
     <blocker name='3dnow'/>
   </cpu>
-  <cpu type='kvm' name='Westmere-IBRS' usable='yes'/>
-  <cpu type='kvm' name='Westmere' usable='yes'/>
-  <cpu type='kvm' name='Skylake-Server-IBRS' usable='no'>
+  <cpu type='kvm' name='Westmere-IBRS' typename='Westmere-IBRS-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Westmere' typename='Westmere-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Skylake-Server-IBRS' typename='Skylake-Server-IBRS-x86_64-cpu' usable='no'>
     <blocker name='avx512f'/>
     <blocker name='avx512dq'/>
     <blocker name='clwb'/>
@@ -752,7 +752,7 @@
     <blocker name='avx512f'/>
     <blocker name='avx512f'/>
   </cpu>
-  <cpu type='kvm' name='Skylake-Server' usable='no'>
+  <cpu type='kvm' name='Skylake-Server' typename='Skylake-Server-x86_64-cpu' usable='no'>
     <blocker name='avx512f'/>
     <blocker name='avx512dq'/>
     <blocker name='clwb'/>
@@ -763,33 +763,33 @@
     <blocker name='avx512f'/>
     <blocker name='avx512f'/>
   </cpu>
-  <cpu type='kvm' name='Skylake-Client-IBRS' usable='yes'/>
-  <cpu type='kvm' name='Skylake-Client' usable='yes'/>
-  <cpu type='kvm' name='SandyBridge-IBRS' usable='yes'/>
-  <cpu type='kvm' name='SandyBridge' usable='yes'/>
-  <cpu type='kvm' name='Penryn' usable='yes'/>
-  <cpu type='kvm' name='Opteron_G5' usable='no'>
+  <cpu type='kvm' name='Skylake-Client-IBRS' typename='Skylake-Client-IBRS-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Skylake-Client' typename='Skylake-Client-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='SandyBridge-IBRS' typename='SandyBridge-IBRS-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='SandyBridge' typename='SandyBridge-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Penryn' typename='Penryn-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Opteron_G5' typename='Opteron_G5-x86_64-cpu' usable='no'>
     <blocker name='sse4a'/>
     <blocker name='misalignsse'/>
     <blocker name='xop'/>
     <blocker name='fma4'/>
     <blocker name='tbm'/>
   </cpu>
-  <cpu type='kvm' name='Opteron_G4' usable='no'>
+  <cpu type='kvm' name='Opteron_G4' typename='Opteron_G4-x86_64-cpu' usable='no'>
     <blocker name='sse4a'/>
     <blocker name='misalignsse'/>
     <blocker name='xop'/>
     <blocker name='fma4'/>
   </cpu>
-  <cpu type='kvm' name='Opteron_G3' usable='no'>
+  <cpu type='kvm' name='Opteron_G3' typename='Opteron_G3-x86_64-cpu' usable='no'>
     <blocker name='sse4a'/>
     <blocker name='misalignsse'/>
   </cpu>
-  <cpu type='kvm' name='Opteron_G2' usable='yes'/>
-  <cpu type='kvm' name='Opteron_G1' usable='yes'/>
-  <cpu type='kvm' name='Nehalem-IBRS' usable='yes'/>
-  <cpu type='kvm' name='Nehalem' usable='yes'/>
-  <cpu type='kvm' name='KnightsMill' usable='no'>
+  <cpu type='kvm' name='Opteron_G2' typename='Opteron_G2-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Opteron_G1' typename='Opteron_G1-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Nehalem-IBRS' typename='Nehalem-IBRS-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Nehalem' typename='Nehalem-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='KnightsMill' typename='KnightsMill-x86_64-cpu' usable='no'>
     <blocker name='avx512f'/>
     <blocker name='avx512pf'/>
     <blocker name='avx512er'/>
@@ -801,13 +801,13 @@
     <blocker name='avx512f'/>
     <blocker name='avx512f'/>
   </cpu>
-  <cpu type='kvm' name='IvyBridge-IBRS' usable='yes'/>
-  <cpu type='kvm' name='IvyBridge' usable='yes'/>
-  <cpu type='kvm' name='Haswell-noTSX-IBRS' usable='yes'/>
-  <cpu type='kvm' name='Haswell-noTSX' usable='yes'/>
-  <cpu type='kvm' name='Haswell-IBRS' usable='yes'/>
-  <cpu type='kvm' name='Haswell' usable='yes'/>
-  <cpu type='kvm' name='EPYC-IBPB' usable='no'>
+  <cpu type='kvm' name='IvyBridge-IBRS' typename='IvyBridge-IBRS-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='IvyBridge' typename='IvyBridge-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Haswell-noTSX-IBRS' typename='Haswell-noTSX-IBRS-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Haswell-noTSX' typename='Haswell-noTSX-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Haswell-IBRS' typename='Haswell-IBRS-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Haswell' typename='Haswell-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='EPYC-IBPB' typename='EPYC-IBPB-x86_64-cpu' usable='no'>
     <blocker name='sha-ni'/>
     <blocker name='mmxext'/>
     <blocker name='fxsr-opt'/>
@@ -817,7 +817,7 @@
     <blocker name='osvw'/>
     <blocker name='ibpb'/>
   </cpu>
-  <cpu type='kvm' name='EPYC' usable='no'>
+  <cpu type='kvm' name='EPYC' typename='EPYC-x86_64-cpu' usable='no'>
     <blocker name='sha-ni'/>
     <blocker name='mmxext'/>
     <blocker name='fxsr-opt'/>
@@ -826,36 +826,36 @@
     <blocker name='misalignsse'/>
     <blocker name='osvw'/>
   </cpu>
-  <cpu type='kvm' name='Conroe' usable='yes'/>
-  <cpu type='kvm' name='Broadwell-noTSX-IBRS' usable='yes'/>
-  <cpu type='kvm' name='Broadwell-noTSX' usable='yes'/>
-  <cpu type='kvm' name='Broadwell-IBRS' usable='yes'/>
-  <cpu type='kvm' name='Broadwell' usable='yes'/>
-  <cpu type='kvm' name='486' usable='yes'/>
-  <cpu type='tcg' name='max' usable='yes'/>
-  <cpu type='tcg' name='host' usable='no'>
+  <cpu type='kvm' name='Conroe' typename='Conroe-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Broadwell-noTSX-IBRS' typename='Broadwell-noTSX-IBRS-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Broadwell-noTSX' typename='Broadwell-noTSX-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Broadwell-IBRS' typename='Broadwell-IBRS-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Broadwell' typename='Broadwell-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='486' typename='486-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='max' typename='max-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='host' typename='host-x86_64-cpu' usable='no'>
     <blocker name='kvm'/>
   </cpu>
-  <cpu type='tcg' name='base' usable='yes'/>
-  <cpu type='tcg' name='qemu64' usable='yes'/>
-  <cpu type='tcg' name='qemu32' usable='yes'/>
-  <cpu type='tcg' name='phenom' usable='no'>
+  <cpu type='tcg' name='base' typename='base-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='qemu64' typename='qemu64-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='qemu32' typename='qemu32-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='phenom' typename='phenom-x86_64-cpu' usable='no'>
     <blocker name='fxsr-opt'/>
   </cpu>
-  <cpu type='tcg' name='pentium3' usable='yes'/>
-  <cpu type='tcg' name='pentium2' usable='yes'/>
-  <cpu type='tcg' name='pentium' usable='yes'/>
-  <cpu type='tcg' name='n270' usable='yes'/>
-  <cpu type='tcg' name='kvm64' usable='yes'/>
-  <cpu type='tcg' name='kvm32' usable='yes'/>
-  <cpu type='tcg' name='coreduo' usable='yes'/>
-  <cpu type='tcg' name='core2duo' usable='yes'/>
-  <cpu type='tcg' name='athlon' usable='yes'/>
-  <cpu type='tcg' name='Westmere-IBRS' usable='no'>
+  <cpu type='tcg' name='pentium3' typename='pentium3-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='pentium2' typename='pentium2-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='pentium' typename='pentium-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='n270' typename='n270-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='kvm64' typename='kvm64-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='kvm32' typename='kvm32-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='coreduo' typename='coreduo-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='core2duo' typename='core2duo-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='athlon' typename='athlon-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='Westmere-IBRS' typename='Westmere-IBRS-x86_64-cpu' usable='no'>
     <blocker name='spec-ctrl'/>
   </cpu>
-  <cpu type='tcg' name='Westmere' usable='yes'/>
-  <cpu type='tcg' name='Skylake-Server-IBRS' usable='no'>
+  <cpu type='tcg' name='Westmere' typename='Westmere-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='Skylake-Server-IBRS' typename='Skylake-Server-IBRS-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -877,7 +877,7 @@
     <blocker name='3dnowprefetch'/>
     <blocker name='xsavec'/>
   </cpu>
-  <cpu type='tcg' name='Skylake-Server' usable='no'>
+  <cpu type='tcg' name='Skylake-Server' typename='Skylake-Server-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -898,7 +898,7 @@
     <blocker name='3dnowprefetch'/>
     <blocker name='xsavec'/>
   </cpu>
-  <cpu type='tcg' name='Skylake-Client-IBRS' usable='no'>
+  <cpu type='tcg' name='Skylake-Client-IBRS' typename='Skylake-Client-IBRS-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -915,7 +915,7 @@
     <blocker name='3dnowprefetch'/>
     <blocker name='xsavec'/>
   </cpu>
-  <cpu type='tcg' name='Skylake-Client' usable='no'>
+  <cpu type='tcg' name='Skylake-Client' typename='Skylake-Client-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -931,19 +931,19 @@
     <blocker name='3dnowprefetch'/>
     <blocker name='xsavec'/>
   </cpu>
-  <cpu type='tcg' name='SandyBridge-IBRS' usable='no'>
+  <cpu type='tcg' name='SandyBridge-IBRS' typename='SandyBridge-IBRS-x86_64-cpu' usable='no'>
     <blocker name='x2apic'/>
     <blocker name='tsc-deadline'/>
     <blocker name='avx'/>
     <blocker name='spec-ctrl'/>
   </cpu>
-  <cpu type='tcg' name='SandyBridge' usable='no'>
+  <cpu type='tcg' name='SandyBridge' typename='SandyBridge-x86_64-cpu' usable='no'>
     <blocker name='x2apic'/>
     <blocker name='tsc-deadline'/>
     <blocker name='avx'/>
   </cpu>
-  <cpu type='tcg' name='Penryn' usable='yes'/>
-  <cpu type='tcg' name='Opteron_G5' usable='no'>
+  <cpu type='tcg' name='Penryn' typename='Penryn-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='Opteron_G5' typename='Opteron_G5-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='avx'/>
     <blocker name='f16c'/>
@@ -953,23 +953,23 @@
     <blocker name='fma4'/>
     <blocker name='tbm'/>
   </cpu>
-  <cpu type='tcg' name='Opteron_G4' usable='no'>
+  <cpu type='tcg' name='Opteron_G4' typename='Opteron_G4-x86_64-cpu' usable='no'>
     <blocker name='avx'/>
     <blocker name='misalignsse'/>
     <blocker name='3dnowprefetch'/>
     <blocker name='xop'/>
     <blocker name='fma4'/>
   </cpu>
-  <cpu type='tcg' name='Opteron_G3' usable='no'>
+  <cpu type='tcg' name='Opteron_G3' typename='Opteron_G3-x86_64-cpu' usable='no'>
     <blocker name='misalignsse'/>
   </cpu>
-  <cpu type='tcg' name='Opteron_G2' usable='yes'/>
-  <cpu type='tcg' name='Opteron_G1' usable='yes'/>
-  <cpu type='tcg' name='Nehalem-IBRS' usable='no'>
+  <cpu type='tcg' name='Opteron_G2' typename='Opteron_G2-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='Opteron_G1' typename='Opteron_G1-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='Nehalem-IBRS' typename='Nehalem-IBRS-x86_64-cpu' usable='no'>
     <blocker name='spec-ctrl'/>
   </cpu>
-  <cpu type='tcg' name='Nehalem' usable='yes'/>
-  <cpu type='tcg' name='KnightsMill' usable='no'>
+  <cpu type='tcg' name='Nehalem' typename='Nehalem-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='KnightsMill' typename='KnightsMill-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='x2apic'/>
     <blocker name='tsc-deadline'/>
@@ -987,7 +987,7 @@
     <blocker name='avx512-4fmaps'/>
     <blocker name='3dnowprefetch'/>
   </cpu>
-  <cpu type='tcg' name='IvyBridge-IBRS' usable='no'>
+  <cpu type='tcg' name='IvyBridge-IBRS' typename='IvyBridge-IBRS-x86_64-cpu' usable='no'>
     <blocker name='x2apic'/>
     <blocker name='tsc-deadline'/>
     <blocker name='avx'/>
@@ -995,14 +995,14 @@
     <blocker name='rdrand'/>
     <blocker name='spec-ctrl'/>
   </cpu>
-  <cpu type='tcg' name='IvyBridge' usable='no'>
+  <cpu type='tcg' name='IvyBridge' typename='IvyBridge-x86_64-cpu' usable='no'>
     <blocker name='x2apic'/>
     <blocker name='tsc-deadline'/>
     <blocker name='avx'/>
     <blocker name='f16c'/>
     <blocker name='rdrand'/>
   </cpu>
-  <cpu type='tcg' name='Haswell-noTSX-IBRS' usable='no'>
+  <cpu type='tcg' name='Haswell-noTSX-IBRS' typename='Haswell-noTSX-IBRS-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1014,7 +1014,7 @@
     <blocker name='invpcid'/>
     <blocker name='spec-ctrl'/>
   </cpu>
-  <cpu type='tcg' name='Haswell-noTSX' usable='no'>
+  <cpu type='tcg' name='Haswell-noTSX' typename='Haswell-noTSX-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1025,7 +1025,7 @@
     <blocker name='avx2'/>
     <blocker name='invpcid'/>
   </cpu>
-  <cpu type='tcg' name='Haswell-IBRS' usable='no'>
+  <cpu type='tcg' name='Haswell-IBRS' typename='Haswell-IBRS-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1039,7 +1039,7 @@
     <blocker name='rtm'/>
     <blocker name='spec-ctrl'/>
   </cpu>
-  <cpu type='tcg' name='Haswell' usable='no'>
+  <cpu type='tcg' name='Haswell' typename='Haswell-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1052,7 +1052,7 @@
     <blocker name='invpcid'/>
     <blocker name='rtm'/>
   </cpu>
-  <cpu type='tcg' name='EPYC-IBPB' usable='no'>
+  <cpu type='tcg' name='EPYC-IBPB' typename='EPYC-IBPB-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='avx'/>
     <blocker name='f16c'/>
@@ -1068,7 +1068,7 @@
     <blocker name='ibpb'/>
     <blocker name='xsavec'/>
   </cpu>
-  <cpu type='tcg' name='EPYC' usable='no'>
+  <cpu type='tcg' name='EPYC' typename='EPYC-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='avx'/>
     <blocker name='f16c'/>
@@ -1083,8 +1083,8 @@
     <blocker name='topoext'/>
     <blocker name='xsavec'/>
   </cpu>
-  <cpu type='tcg' name='Conroe' usable='yes'/>
-  <cpu type='tcg' name='Broadwell-noTSX-IBRS' usable='no'>
+  <cpu type='tcg' name='Conroe' typename='Conroe-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='Broadwell-noTSX-IBRS' typename='Broadwell-noTSX-IBRS-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1098,7 +1098,7 @@
     <blocker name='spec-ctrl'/>
     <blocker name='3dnowprefetch'/>
   </cpu>
-  <cpu type='tcg' name='Broadwell-noTSX' usable='no'>
+  <cpu type='tcg' name='Broadwell-noTSX' typename='Broadwell-noTSX-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1111,7 +1111,7 @@
     <blocker name='rdseed'/>
     <blocker name='3dnowprefetch'/>
   </cpu>
-  <cpu type='tcg' name='Broadwell-IBRS' usable='no'>
+  <cpu type='tcg' name='Broadwell-IBRS' typename='Broadwell-IBRS-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1127,7 +1127,7 @@
     <blocker name='spec-ctrl'/>
     <blocker name='3dnowprefetch'/>
   </cpu>
-  <cpu type='tcg' name='Broadwell' usable='no'>
+  <cpu type='tcg' name='Broadwell' typename='Broadwell-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1142,7 +1142,7 @@
     <blocker name='rdseed'/>
     <blocker name='3dnowprefetch'/>
   </cpu>
-  <cpu type='tcg' name='486' usable='yes'/>
+  <cpu type='tcg' name='486' typename='486-x86_64-cpu' usable='yes'/>
   <machine name='pc-i440fx-3.0' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/>
   <machine name='isapc' hotplugCpus='yes' maxCpus='1'/>
   <machine name='pc-1.1' hotplugCpus='yes' maxCpus='255'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
index 1ce578de00..d5a8b8073a 100644
--- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
@@ -162,135 +162,135 @@
   <microcodeVersion>42900240</microcodeVersion>
   <package>v3.1.0-rc1-74-g3c035a41dc</package>
   <arch>ppc64</arch>
-  <cpu type='kvm' name='default'/>
-  <cpu type='kvm' name='ppc'/>
-  <cpu type='kvm' name='ppc32'/>
-  <cpu type='kvm' name='ppc64'/>
-  <cpu type='kvm' name='POWER9'/>
-  <cpu type='kvm' name='power8nvl'/>
-  <cpu type='kvm' name='POWER8'/>
-  <cpu type='kvm' name='power8e'/>
-  <cpu type='kvm' name='power7+'/>
-  <cpu type='kvm' name='POWER7'/>
-  <cpu type='kvm' name='power5gs'/>
-  <cpu type='kvm' name='power5+'/>
-  <cpu type='kvm' name='970mp'/>
-  <cpu type='kvm' name='970fx'/>
-  <cpu type='kvm' name='970'/>
-  <cpu type='kvm' name='apollo7pm'/>
-  <cpu type='kvm' name='7457a'/>
-  <cpu type='kvm' name='7447a'/>
-  <cpu type='kvm' name='apollo7'/>
-  <cpu type='kvm' name='7457'/>
-  <cpu type='kvm' name='7447'/>
-  <cpu type='kvm' name='apollo6'/>
-  <cpu type='kvm' name='7455'/>
-  <cpu type='kvm' name='7445'/>
-  <cpu type='kvm' name='7451'/>
-  <cpu type='kvm' name='7441'/>
-  <cpu type='kvm' name='vger'/>
-  <cpu type='kvm' name='7450'/>
-  <cpu type='kvm' name='7448'/>
-  <cpu type='kvm' name='nitro'/>
-  <cpu type='kvm' name='7410'/>
-  <cpu type='kvm' name='g4'/>
-  <cpu type='kvm' name='max'/>
-  <cpu type='kvm' name='7400'/>
-  <cpu type='kvm' name='goldfinger'/>
-  <cpu type='kvm' name='755'/>
-  <cpu type='kvm' name='745'/>
-  <cpu type='kvm' name='lonestar'/>
-  <cpu type='kvm' name='750l'/>
-  <cpu type='kvm' name='750gx'/>
-  <cpu type='kvm' name='750fx'/>
-  <cpu type='kvm' name='750cxe'/>
-  <cpu type='kvm' name='750cx'/>
-  <cpu type='kvm' name='750cl'/>
-  <cpu type='kvm' name='conan/doyle'/>
-  <cpu type='kvm' name='g3'/>
-  <cpu type='kvm' name='typhoon'/>
-  <cpu type='kvm' name='750'/>
-  <cpu type='kvm' name='arthur'/>
-  <cpu type='kvm' name='740'/>
-  <cpu type='kvm' name='mach5'/>
-  <cpu type='kvm' name='sirocco'/>
-  <cpu type='kvm' name='604e'/>
-  <cpu type='kvm' name='goldeneye'/>
-  <cpu type='kvm' name='603r'/>
-  <cpu type='kvm' name='vaillant'/>
-  <cpu type='kvm' name='stretch'/>
-  <cpu type='kvm' name='603e'/>
-  <cpu type='kvm' name='vanilla'/>
-  <cpu type='kvm' name='601v'/>
-  <cpu type='kvm' name='601'/>
-  <cpu type='kvm' name='mpc8560'/>
-  <cpu type='kvm' name='mpc8555e'/>
-  <cpu type='kvm' name='mpc8555'/>
-  <cpu type='kvm' name='mpc8548e'/>
-  <cpu type='kvm' name='mpc8548'/>
-  <cpu type='kvm' name='mpc8547e'/>
-  <cpu type='kvm' name='mpc8545e'/>
-  <cpu type='kvm' name='mpc8545'/>
-  <cpu type='kvm' name='mpc8544e'/>
-  <cpu type='kvm' name='mpc8544'/>
-  <cpu type='kvm' name='mpc8543e'/>
-  <cpu type='kvm' name='mpc8543'/>
-  <cpu type='kvm' name='mpc8541e'/>
-  <cpu type='kvm' name='mpc8541'/>
-  <cpu type='kvm' name='mpc8540'/>
-  <cpu type='kvm' name='mpc8533e'/>
-  <cpu type='kvm' name='mpc8533'/>
-  <cpu type='kvm' name='e500v2'/>
-  <cpu type='kvm' name='e500v1'/>
-  <cpu type='kvm' name='e500'/>
-  <cpu type='kvm' name='mpc8347ea'/>
-  <cpu type='kvm' name='mpc8347e'/>
-  <cpu type='kvm' name='mpc8347a'/>
-  <cpu type='kvm' name='mpc8347'/>
-  <cpu type='kvm' name='e300'/>
-  <cpu type='kvm' name='e200'/>
-  <cpu type='kvm' name='mpc8280'/>
-  <cpu type='kvm' name='mpc8275'/>
-  <cpu type='kvm' name='mpc8272'/>
-  <cpu type='kvm' name='mpc8271'/>
-  <cpu type='kvm' name='mpc8270'/>
-  <cpu type='kvm' name='mpc8266_hip4'/>
-  <cpu type='kvm' name='mpc8266_hip3'/>
-  <cpu type='kvm' name='mpc8266'/>
-  <cpu type='kvm' name='mpc8265_hip4'/>
-  <cpu type='kvm' name='mpc8265_hip3'/>
-  <cpu type='kvm' name='mpc8265'/>
-  <cpu type='kvm' name='mpc8264_hip4'/>
-  <cpu type='kvm' name='mpc8264_hip3'/>
-  <cpu type='kvm' name='mpc8264'/>
-  <cpu type='kvm' name='mpc8260_hip4'/>
-  <cpu type='kvm' name='mpc8260_hip3'/>
-  <cpu type='kvm' name='mpc8260'/>
-  <cpu type='kvm' name='mpc8255_hip4'/>
-  <cpu type='kvm' name='mpc8255_hip3'/>
-  <cpu type='kvm' name='mpc8255'/>
-  <cpu type='kvm' name='mpc8250_hip4'/>
-  <cpu type='kvm' name='mpc8250_hip3'/>
-  <cpu type='kvm' name='mpc8250'/>
-  <cpu type='kvm' name='mpc8248'/>
-  <cpu type='kvm' name='mpc8247'/>
-  <cpu type='kvm' name='mpc8245'/>
-  <cpu type='kvm' name='mpc8241'/>
-  <cpu type='kvm' name='powerquicc-ii'/>
-  <cpu type='kvm' name='mpc82xx'/>
-  <cpu type='kvm' name='mpc5200b'/>
-  <cpu type='kvm' name='mpc5200'/>
-  <cpu type='kvm' name='mpc52xx'/>
-  <cpu type='kvm' name='mpc8240'/>
-  <cpu type='kvm' name='460ex'/>
-  <cpu type='kvm' name='440ep'/>
-  <cpu type='kvm' name='x2vp50'/>
-  <cpu type='kvm' name='x2vp7'/>
-  <cpu type='kvm' name='405gpe'/>
-  <cpu type='kvm' name='405gp'/>
-  <cpu type='kvm' name='405cr'/>
-  <cpu type='kvm' name='405'/>
-  <cpu type='kvm' name='403'/>
+  <cpu type='kvm' name='default' typename='604-powerpc64-cpu'/>
+  <cpu type='kvm' name='ppc' typename='604-powerpc64-cpu'/>
+  <cpu type='kvm' name='ppc32' typename='604-powerpc64-cpu'/>
+  <cpu type='kvm' name='ppc64' typename='970fx_v3.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='POWER9' typename='host-powerpc64-cpu'/>
+  <cpu type='kvm' name='power8nvl' typename='power8nvl_v1.0-powerpc64-cpu'/>
+  <cpu type='kvm' name='POWER8' typename='power8_v2.0-powerpc64-cpu'/>
+  <cpu type='kvm' name='power8e' typename='power8e_v2.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='power7+' typename='power7+_v2.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='POWER7' typename='power7_v2.3-powerpc64-cpu'/>
+  <cpu type='kvm' name='power5gs' typename='power5+_v2.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='power5+' typename='power5+_v2.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='970mp' typename='970mp_v1.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='970fx' typename='970fx_v3.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='970' typename='970_v2.2-powerpc64-cpu'/>
+  <cpu type='kvm' name='apollo7pm' typename='7457a_v1.0-powerpc64-cpu'/>
+  <cpu type='kvm' name='7457a' typename='7457a_v1.2-powerpc64-cpu'/>
+  <cpu type='kvm' name='7447a' typename='7447a_v1.2-powerpc64-cpu'/>
+  <cpu type='kvm' name='apollo7' typename='7457_v1.2-powerpc64-cpu'/>
+  <cpu type='kvm' name='7457' typename='7457_v1.2-powerpc64-cpu'/>
+  <cpu type='kvm' name='7447' typename='7447_v1.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='apollo6' typename='7455_v3.2-powerpc64-cpu'/>
+  <cpu type='kvm' name='7455' typename='7455_v3.2-powerpc64-cpu'/>
+  <cpu type='kvm' name='7445' typename='7445_v3.2-powerpc64-cpu'/>
+  <cpu type='kvm' name='7451' typename='7451_v2.3-powerpc64-cpu'/>
+  <cpu type='kvm' name='7441' typename='7441_v2.3-powerpc64-cpu'/>
+  <cpu type='kvm' name='vger' typename='7450_v2.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='7450' typename='7450_v2.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='7448' typename='7448_v2.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='nitro' typename='7410_v1.4-powerpc64-cpu'/>
+  <cpu type='kvm' name='7410' typename='7410_v1.4-powerpc64-cpu'/>
+  <cpu type='kvm' name='g4' typename='7400_v2.9-powerpc64-cpu'/>
+  <cpu type='kvm' name='max' typename='7400_v2.9-powerpc64-cpu'/>
+  <cpu type='kvm' name='7400' typename='7400_v2.9-powerpc64-cpu'/>
+  <cpu type='kvm' name='goldfinger' typename='755_v2.8-powerpc64-cpu'/>
+  <cpu type='kvm' name='755' typename='755_v2.8-powerpc64-cpu'/>
+  <cpu type='kvm' name='745' typename='745_v2.8-powerpc64-cpu'/>
+  <cpu type='kvm' name='lonestar' typename='750l_v3.2-powerpc64-cpu'/>
+  <cpu type='kvm' name='750l' typename='750l_v3.2-powerpc64-cpu'/>
+  <cpu type='kvm' name='750gx' typename='750gx_v1.2-powerpc64-cpu'/>
+  <cpu type='kvm' name='750fx' typename='750fx_v2.3-powerpc64-cpu'/>
+  <cpu type='kvm' name='750cxe' typename='750cxe_v3.1b-powerpc64-cpu'/>
+  <cpu type='kvm' name='750cx' typename='750cx_v2.2-powerpc64-cpu'/>
+  <cpu type='kvm' name='750cl' typename='750cl_v2.0-powerpc64-cpu'/>
+  <cpu type='kvm' name='conan/doyle' typename='750p-powerpc64-cpu'/>
+  <cpu type='kvm' name='g3' typename='750_v3.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='typhoon' typename='750_v3.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='750' typename='750_v3.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='arthur' typename='740_v3.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='740' typename='740_v3.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='mach5' typename='604r-powerpc64-cpu'/>
+  <cpu type='kvm' name='sirocco' typename='604e_v2.4-powerpc64-cpu'/>
+  <cpu type='kvm' name='604e' typename='604e_v2.4-powerpc64-cpu'/>
+  <cpu type='kvm' name='goldeneye' typename='603e7t-powerpc64-cpu'/>
+  <cpu type='kvm' name='603r' typename='603e7t-powerpc64-cpu'/>
+  <cpu type='kvm' name='vaillant' typename='603e7v-powerpc64-cpu'/>
+  <cpu type='kvm' name='stretch' typename='603e_v4.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='603e' typename='603e_v4.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='vanilla' typename='603-powerpc64-cpu'/>
+  <cpu type='kvm' name='601v' typename='601_v2-powerpc64-cpu'/>
+  <cpu type='kvm' name='601' typename='601_v2-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8560' typename='mpc8560_v21-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8555e' typename='mpc8555e_v11-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8555' typename='mpc8555_v11-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8548e' typename='mpc8548e_v21-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8548' typename='mpc8548_v21-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8547e' typename='mpc8547e_v21-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8545e' typename='mpc8545e_v21-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8545' typename='mpc8545_v21-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8544e' typename='mpc8544e_v11-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8544' typename='mpc8544_v11-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8543e' typename='mpc8543e_v21-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8543' typename='mpc8543_v21-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8541e' typename='mpc8541e_v11-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8541' typename='mpc8541_v11-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8540' typename='mpc8540_v21-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8533e' typename='mpc8533e_v11-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8533' typename='mpc8533_v11-powerpc64-cpu'/>
+  <cpu type='kvm' name='e500v2' typename='e500v2_v22-powerpc64-cpu'/>
+  <cpu type='kvm' name='e500v1' typename='e500_v20-powerpc64-cpu'/>
+  <cpu type='kvm' name='e500' typename='e500v2_v22-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8347ea' typename='mpc8347eat-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8347e' typename='mpc8347et-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8347a' typename='mpc8347at-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8347' typename='mpc8347t-powerpc64-cpu'/>
+  <cpu type='kvm' name='e300' typename='e300c3-powerpc64-cpu'/>
+  <cpu type='kvm' name='e200' typename='e200z6-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8280' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8275' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8272' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8271' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8270' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8266_hip4' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8266_hip3' typename='g2hip3-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8266' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8265_hip4' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8265_hip3' typename='g2hip3-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8265' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8264_hip4' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8264_hip3' typename='g2hip3-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8264' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8260_hip4' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8260_hip3' typename='g2hip3-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8260' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8255_hip4' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8255_hip3' typename='g2hip3-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8255' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8250_hip4' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8250_hip3' typename='g2hip3-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8250' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8248' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8247' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8245' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8241' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='kvm' name='powerquicc-ii' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc82xx' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc5200b' typename='mpc5200b_v21-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc5200' typename='mpc5200_v12-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc52xx' typename='mpc5200_v12-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8240' typename='603-powerpc64-cpu'/>
+  <cpu type='kvm' name='460ex' typename='460exb-powerpc64-cpu'/>
+  <cpu type='kvm' name='440ep' typename='440epb-powerpc64-cpu'/>
+  <cpu type='kvm' name='x2vp50' typename='x2vp20-powerpc64-cpu'/>
+  <cpu type='kvm' name='x2vp7' typename='x2vp4-powerpc64-cpu'/>
+  <cpu type='kvm' name='405gpe' typename='405crc-powerpc64-cpu'/>
+  <cpu type='kvm' name='405gp' typename='405gpd-powerpc64-cpu'/>
+  <cpu type='kvm' name='405cr' typename='405crc-powerpc64-cpu'/>
+  <cpu type='kvm' name='405' typename='405d4-powerpc64-cpu'/>
+  <cpu type='kvm' name='403' typename='403gc-powerpc64-cpu'/>
   <cpu type='kvm' name='mpc8547e_v21'/>
   <cpu type='kvm' name='750cl_v1.0'/>
   <cpu type='kvm' name='7457a_v1.1'/>
@@ -600,135 +600,135 @@
   <cpu type='kvm' name='750_v3.1'/>
   <cpu type='kvm' name='power5+_v2.1'/>
   <cpu type='kvm' name='mpc8568e'/>
-  <cpu type='tcg' name='default'/>
-  <cpu type='tcg' name='ppc'/>
-  <cpu type='tcg' name='ppc32'/>
-  <cpu type='tcg' name='ppc64'/>
-  <cpu type='tcg' name='POWER9'/>
-  <cpu type='tcg' name='power8nvl'/>
-  <cpu type='tcg' name='POWER8'/>
-  <cpu type='tcg' name='power8e'/>
-  <cpu type='tcg' name='power7+'/>
-  <cpu type='tcg' name='POWER7'/>
-  <cpu type='tcg' name='power5gs'/>
-  <cpu type='tcg' name='power5+'/>
-  <cpu type='tcg' name='970mp'/>
-  <cpu type='tcg' name='970fx'/>
-  <cpu type='tcg' name='970'/>
-  <cpu type='tcg' name='apollo7pm'/>
-  <cpu type='tcg' name='7457a'/>
-  <cpu type='tcg' name='7447a'/>
-  <cpu type='tcg' name='apollo7'/>
-  <cpu type='tcg' name='7457'/>
-  <cpu type='tcg' name='7447'/>
-  <cpu type='tcg' name='apollo6'/>
-  <cpu type='tcg' name='7455'/>
-  <cpu type='tcg' name='7445'/>
-  <cpu type='tcg' name='7451'/>
-  <cpu type='tcg' name='7441'/>
-  <cpu type='tcg' name='vger'/>
-  <cpu type='tcg' name='7450'/>
-  <cpu type='tcg' name='7448'/>
-  <cpu type='tcg' name='nitro'/>
-  <cpu type='tcg' name='7410'/>
-  <cpu type='tcg' name='g4'/>
-  <cpu type='tcg' name='max'/>
-  <cpu type='tcg' name='7400'/>
-  <cpu type='tcg' name='goldfinger'/>
-  <cpu type='tcg' name='755'/>
-  <cpu type='tcg' name='745'/>
-  <cpu type='tcg' name='lonestar'/>
-  <cpu type='tcg' name='750l'/>
-  <cpu type='tcg' name='750gx'/>
-  <cpu type='tcg' name='750fx'/>
-  <cpu type='tcg' name='750cxe'/>
-  <cpu type='tcg' name='750cx'/>
-  <cpu type='tcg' name='750cl'/>
-  <cpu type='tcg' name='conan/doyle'/>
-  <cpu type='tcg' name='g3'/>
-  <cpu type='tcg' name='typhoon'/>
-  <cpu type='tcg' name='750'/>
-  <cpu type='tcg' name='arthur'/>
-  <cpu type='tcg' name='740'/>
-  <cpu type='tcg' name='mach5'/>
-  <cpu type='tcg' name='sirocco'/>
-  <cpu type='tcg' name='604e'/>
-  <cpu type='tcg' name='goldeneye'/>
-  <cpu type='tcg' name='603r'/>
-  <cpu type='tcg' name='vaillant'/>
-  <cpu type='tcg' name='stretch'/>
-  <cpu type='tcg' name='603e'/>
-  <cpu type='tcg' name='vanilla'/>
-  <cpu type='tcg' name='601v'/>
-  <cpu type='tcg' name='601'/>
-  <cpu type='tcg' name='mpc8560'/>
-  <cpu type='tcg' name='mpc8555e'/>
-  <cpu type='tcg' name='mpc8555'/>
-  <cpu type='tcg' name='mpc8548e'/>
-  <cpu type='tcg' name='mpc8548'/>
-  <cpu type='tcg' name='mpc8547e'/>
-  <cpu type='tcg' name='mpc8545e'/>
-  <cpu type='tcg' name='mpc8545'/>
-  <cpu type='tcg' name='mpc8544e'/>
-  <cpu type='tcg' name='mpc8544'/>
-  <cpu type='tcg' name='mpc8543e'/>
-  <cpu type='tcg' name='mpc8543'/>
-  <cpu type='tcg' name='mpc8541e'/>
-  <cpu type='tcg' name='mpc8541'/>
-  <cpu type='tcg' name='mpc8540'/>
-  <cpu type='tcg' name='mpc8533e'/>
-  <cpu type='tcg' name='mpc8533'/>
-  <cpu type='tcg' name='e500v2'/>
-  <cpu type='tcg' name='e500v1'/>
-  <cpu type='tcg' name='e500'/>
-  <cpu type='tcg' name='mpc8347ea'/>
-  <cpu type='tcg' name='mpc8347e'/>
-  <cpu type='tcg' name='mpc8347a'/>
-  <cpu type='tcg' name='mpc8347'/>
-  <cpu type='tcg' name='e300'/>
-  <cpu type='tcg' name='e200'/>
-  <cpu type='tcg' name='mpc8280'/>
-  <cpu type='tcg' name='mpc8275'/>
-  <cpu type='tcg' name='mpc8272'/>
-  <cpu type='tcg' name='mpc8271'/>
-  <cpu type='tcg' name='mpc8270'/>
-  <cpu type='tcg' name='mpc8266_hip4'/>
-  <cpu type='tcg' name='mpc8266_hip3'/>
-  <cpu type='tcg' name='mpc8266'/>
-  <cpu type='tcg' name='mpc8265_hip4'/>
-  <cpu type='tcg' name='mpc8265_hip3'/>
-  <cpu type='tcg' name='mpc8265'/>
-  <cpu type='tcg' name='mpc8264_hip4'/>
-  <cpu type='tcg' name='mpc8264_hip3'/>
-  <cpu type='tcg' name='mpc8264'/>
-  <cpu type='tcg' name='mpc8260_hip4'/>
-  <cpu type='tcg' name='mpc8260_hip3'/>
-  <cpu type='tcg' name='mpc8260'/>
-  <cpu type='tcg' name='mpc8255_hip4'/>
-  <cpu type='tcg' name='mpc8255_hip3'/>
-  <cpu type='tcg' name='mpc8255'/>
-  <cpu type='tcg' name='mpc8250_hip4'/>
-  <cpu type='tcg' name='mpc8250_hip3'/>
-  <cpu type='tcg' name='mpc8250'/>
-  <cpu type='tcg' name='mpc8248'/>
-  <cpu type='tcg' name='mpc8247'/>
-  <cpu type='tcg' name='mpc8245'/>
-  <cpu type='tcg' name='mpc8241'/>
-  <cpu type='tcg' name='powerquicc-ii'/>
-  <cpu type='tcg' name='mpc82xx'/>
-  <cpu type='tcg' name='mpc5200b'/>
-  <cpu type='tcg' name='mpc5200'/>
-  <cpu type='tcg' name='mpc52xx'/>
-  <cpu type='tcg' name='mpc8240'/>
-  <cpu type='tcg' name='460ex'/>
-  <cpu type='tcg' name='440ep'/>
-  <cpu type='tcg' name='x2vp50'/>
-  <cpu type='tcg' name='x2vp7'/>
-  <cpu type='tcg' name='405gpe'/>
-  <cpu type='tcg' name='405gp'/>
-  <cpu type='tcg' name='405cr'/>
-  <cpu type='tcg' name='405'/>
-  <cpu type='tcg' name='403'/>
+  <cpu type='tcg' name='default' typename='604-powerpc64-cpu'/>
+  <cpu type='tcg' name='ppc' typename='604-powerpc64-cpu'/>
+  <cpu type='tcg' name='ppc32' typename='604-powerpc64-cpu'/>
+  <cpu type='tcg' name='ppc64' typename='970fx_v3.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='POWER9' typename='power9_v2.0-powerpc64-cpu'/>
+  <cpu type='tcg' name='power8nvl' typename='power8nvl_v1.0-powerpc64-cpu'/>
+  <cpu type='tcg' name='POWER8' typename='power8_v2.0-powerpc64-cpu'/>
+  <cpu type='tcg' name='power8e' typename='power8e_v2.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='power7+' typename='power7+_v2.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='POWER7' typename='power7_v2.3-powerpc64-cpu'/>
+  <cpu type='tcg' name='power5gs' typename='power5+_v2.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='power5+' typename='power5+_v2.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='970mp' typename='970mp_v1.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='970fx' typename='970fx_v3.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='970' typename='970_v2.2-powerpc64-cpu'/>
+  <cpu type='tcg' name='apollo7pm' typename='7457a_v1.0-powerpc64-cpu'/>
+  <cpu type='tcg' name='7457a' typename='7457a_v1.2-powerpc64-cpu'/>
+  <cpu type='tcg' name='7447a' typename='7447a_v1.2-powerpc64-cpu'/>
+  <cpu type='tcg' name='apollo7' typename='7457_v1.2-powerpc64-cpu'/>
+  <cpu type='tcg' name='7457' typename='7457_v1.2-powerpc64-cpu'/>
+  <cpu type='tcg' name='7447' typename='7447_v1.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='apollo6' typename='7455_v3.2-powerpc64-cpu'/>
+  <cpu type='tcg' name='7455' typename='7455_v3.2-powerpc64-cpu'/>
+  <cpu type='tcg' name='7445' typename='7445_v3.2-powerpc64-cpu'/>
+  <cpu type='tcg' name='7451' typename='7451_v2.3-powerpc64-cpu'/>
+  <cpu type='tcg' name='7441' typename='7441_v2.3-powerpc64-cpu'/>
+  <cpu type='tcg' name='vger' typename='7450_v2.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='7450' typename='7450_v2.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='7448' typename='7448_v2.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='nitro' typename='7410_v1.4-powerpc64-cpu'/>
+  <cpu type='tcg' name='7410' typename='7410_v1.4-powerpc64-cpu'/>
+  <cpu type='tcg' name='g4' typename='7400_v2.9-powerpc64-cpu'/>
+  <cpu type='tcg' name='max' typename='7400_v2.9-powerpc64-cpu'/>
+  <cpu type='tcg' name='7400' typename='7400_v2.9-powerpc64-cpu'/>
+  <cpu type='tcg' name='goldfinger' typename='755_v2.8-powerpc64-cpu'/>
+  <cpu type='tcg' name='755' typename='755_v2.8-powerpc64-cpu'/>
+  <cpu type='tcg' name='745' typename='745_v2.8-powerpc64-cpu'/>
+  <cpu type='tcg' name='lonestar' typename='750l_v3.2-powerpc64-cpu'/>
+  <cpu type='tcg' name='750l' typename='750l_v3.2-powerpc64-cpu'/>
+  <cpu type='tcg' name='750gx' typename='750gx_v1.2-powerpc64-cpu'/>
+  <cpu type='tcg' name='750fx' typename='750fx_v2.3-powerpc64-cpu'/>
+  <cpu type='tcg' name='750cxe' typename='750cxe_v3.1b-powerpc64-cpu'/>
+  <cpu type='tcg' name='750cx' typename='750cx_v2.2-powerpc64-cpu'/>
+  <cpu type='tcg' name='750cl' typename='750cl_v2.0-powerpc64-cpu'/>
+  <cpu type='tcg' name='conan/doyle' typename='750p-powerpc64-cpu'/>
+  <cpu type='tcg' name='g3' typename='750_v3.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='typhoon' typename='750_v3.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='750' typename='750_v3.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='arthur' typename='740_v3.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='740' typename='740_v3.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='mach5' typename='604r-powerpc64-cpu'/>
+  <cpu type='tcg' name='sirocco' typename='604e_v2.4-powerpc64-cpu'/>
+  <cpu type='tcg' name='604e' typename='604e_v2.4-powerpc64-cpu'/>
+  <cpu type='tcg' name='goldeneye' typename='603e7t-powerpc64-cpu'/>
+  <cpu type='tcg' name='603r' typename='603e7t-powerpc64-cpu'/>
+  <cpu type='tcg' name='vaillant' typename='603e7v-powerpc64-cpu'/>
+  <cpu type='tcg' name='stretch' typename='603e_v4.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='603e' typename='603e_v4.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='vanilla' typename='603-powerpc64-cpu'/>
+  <cpu type='tcg' name='601v' typename='601_v2-powerpc64-cpu'/>
+  <cpu type='tcg' name='601' typename='601_v2-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8560' typename='mpc8560_v21-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8555e' typename='mpc8555e_v11-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8555' typename='mpc8555_v11-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8548e' typename='mpc8548e_v21-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8548' typename='mpc8548_v21-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8547e' typename='mpc8547e_v21-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8545e' typename='mpc8545e_v21-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8545' typename='mpc8545_v21-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8544e' typename='mpc8544e_v11-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8544' typename='mpc8544_v11-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8543e' typename='mpc8543e_v21-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8543' typename='mpc8543_v21-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8541e' typename='mpc8541e_v11-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8541' typename='mpc8541_v11-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8540' typename='mpc8540_v21-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8533e' typename='mpc8533e_v11-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8533' typename='mpc8533_v11-powerpc64-cpu'/>
+  <cpu type='tcg' name='e500v2' typename='e500v2_v22-powerpc64-cpu'/>
+  <cpu type='tcg' name='e500v1' typename='e500_v20-powerpc64-cpu'/>
+  <cpu type='tcg' name='e500' typename='e500v2_v22-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8347ea' typename='mpc8347eat-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8347e' typename='mpc8347et-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8347a' typename='mpc8347at-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8347' typename='mpc8347t-powerpc64-cpu'/>
+  <cpu type='tcg' name='e300' typename='e300c3-powerpc64-cpu'/>
+  <cpu type='tcg' name='e200' typename='e200z6-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8280' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8275' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8272' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8271' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8270' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8266_hip4' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8266_hip3' typename='g2hip3-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8266' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8265_hip4' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8265_hip3' typename='g2hip3-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8265' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8264_hip4' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8264_hip3' typename='g2hip3-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8264' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8260_hip4' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8260_hip3' typename='g2hip3-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8260' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8255_hip4' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8255_hip3' typename='g2hip3-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8255' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8250_hip4' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8250_hip3' typename='g2hip3-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8250' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8248' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8247' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8245' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8241' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='tcg' name='powerquicc-ii' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc82xx' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc5200b' typename='mpc5200b_v21-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc5200' typename='mpc5200_v12-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc52xx' typename='mpc5200_v12-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8240' typename='603-powerpc64-cpu'/>
+  <cpu type='tcg' name='460ex' typename='460exb-powerpc64-cpu'/>
+  <cpu type='tcg' name='440ep' typename='440epb-powerpc64-cpu'/>
+  <cpu type='tcg' name='x2vp50' typename='x2vp20-powerpc64-cpu'/>
+  <cpu type='tcg' name='x2vp7' typename='x2vp4-powerpc64-cpu'/>
+  <cpu type='tcg' name='405gpe' typename='405crc-powerpc64-cpu'/>
+  <cpu type='tcg' name='405gp' typename='405gpd-powerpc64-cpu'/>
+  <cpu type='tcg' name='405cr' typename='405crc-powerpc64-cpu'/>
+  <cpu type='tcg' name='405' typename='405d4-powerpc64-cpu'/>
+  <cpu type='tcg' name='403' typename='403gc-powerpc64-cpu'/>
   <cpu type='tcg' name='mpc8547e_v21'/>
   <cpu type='tcg' name='750cl_v1.0'/>
   <cpu type='tcg' name='7457a_v1.1'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
index dac2fdc54d..36799746b4 100644
--- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
@@ -740,12 +740,12 @@
     <property name='avx512pf' type='boolean' value='false'/>
     <property name='xstore-en' type='boolean' value='false'/>
   </hostCPU>
-  <cpu type='kvm' name='max' usable='yes'/>
-  <cpu type='kvm' name='host' usable='yes'/>
-  <cpu type='kvm' name='base' usable='yes'/>
-  <cpu type='kvm' name='qemu64' usable='yes'/>
-  <cpu type='kvm' name='qemu32' usable='yes'/>
-  <cpu type='kvm' name='phenom' usable='no'>
+  <cpu type='kvm' name='max' typename='max-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='host' typename='host-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='base' typename='base-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='qemu64' typename='qemu64-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='qemu32' typename='qemu32-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='phenom' typename='phenom-x86_64-cpu' usable='no'>
     <blocker name='mmxext'/>
     <blocker name='fxsr-opt'/>
     <blocker name='3dnowext'/>
@@ -753,22 +753,22 @@
     <blocker name='sse4a'/>
     <blocker name='npt'/>
   </cpu>
-  <cpu type='kvm' name='pentium3' usable='yes'/>
-  <cpu type='kvm' name='pentium2' usable='yes'/>
-  <cpu type='kvm' name='pentium' usable='yes'/>
-  <cpu type='kvm' name='n270' usable='yes'/>
-  <cpu type='kvm' name='kvm64' usable='yes'/>
-  <cpu type='kvm' name='kvm32' usable='yes'/>
-  <cpu type='kvm' name='coreduo' usable='yes'/>
-  <cpu type='kvm' name='core2duo' usable='yes'/>
-  <cpu type='kvm' name='athlon' usable='no'>
+  <cpu type='kvm' name='pentium3' typename='pentium3-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='pentium2' typename='pentium2-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='pentium' typename='pentium-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='n270' typename='n270-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='kvm64' typename='kvm64-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='kvm32' typename='kvm32-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='coreduo' typename='coreduo-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='core2duo' typename='core2duo-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='athlon' typename='athlon-x86_64-cpu' usable='no'>
     <blocker name='mmxext'/>
     <blocker name='3dnowext'/>
     <blocker name='3dnow'/>
   </cpu>
-  <cpu type='kvm' name='Westmere-IBRS' usable='yes'/>
-  <cpu type='kvm' name='Westmere' usable='yes'/>
-  <cpu type='kvm' name='Skylake-Server-IBRS' usable='no'>
+  <cpu type='kvm' name='Westmere-IBRS' typename='Westmere-IBRS-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Westmere' typename='Westmere-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Skylake-Server-IBRS' typename='Skylake-Server-IBRS-x86_64-cpu' usable='no'>
     <blocker name='avx512f'/>
     <blocker name='avx512dq'/>
     <blocker name='clwb'/>
@@ -781,7 +781,7 @@
     <blocker name='avx512f'/>
     <blocker name='pku'/>
   </cpu>
-  <cpu type='kvm' name='Skylake-Server' usable='no'>
+  <cpu type='kvm' name='Skylake-Server' typename='Skylake-Server-x86_64-cpu' usable='no'>
     <blocker name='avx512f'/>
     <blocker name='avx512dq'/>
     <blocker name='clwb'/>
@@ -794,33 +794,33 @@
     <blocker name='avx512f'/>
     <blocker name='pku'/>
   </cpu>
-  <cpu type='kvm' name='Skylake-Client-IBRS' usable='yes'/>
-  <cpu type='kvm' name='Skylake-Client' usable='yes'/>
-  <cpu type='kvm' name='SandyBridge-IBRS' usable='yes'/>
-  <cpu type='kvm' name='SandyBridge' usable='yes'/>
-  <cpu type='kvm' name='Penryn' usable='yes'/>
-  <cpu type='kvm' name='Opteron_G5' usable='no'>
+  <cpu type='kvm' name='Skylake-Client-IBRS' typename='Skylake-Client-IBRS-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Skylake-Client' typename='Skylake-Client-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='SandyBridge-IBRS' typename='SandyBridge-IBRS-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='SandyBridge' typename='SandyBridge-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Penryn' typename='Penryn-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Opteron_G5' typename='Opteron_G5-x86_64-cpu' usable='no'>
     <blocker name='sse4a'/>
     <blocker name='misalignsse'/>
     <blocker name='xop'/>
     <blocker name='fma4'/>
     <blocker name='tbm'/>
   </cpu>
-  <cpu type='kvm' name='Opteron_G4' usable='no'>
+  <cpu type='kvm' name='Opteron_G4' typename='Opteron_G4-x86_64-cpu' usable='no'>
     <blocker name='sse4a'/>
     <blocker name='misalignsse'/>
     <blocker name='xop'/>
     <blocker name='fma4'/>
   </cpu>
-  <cpu type='kvm' name='Opteron_G3' usable='no'>
+  <cpu type='kvm' name='Opteron_G3' typename='Opteron_G3-x86_64-cpu' usable='no'>
     <blocker name='sse4a'/>
     <blocker name='misalignsse'/>
   </cpu>
-  <cpu type='kvm' name='Opteron_G2' usable='yes'/>
-  <cpu type='kvm' name='Opteron_G1' usable='yes'/>
-  <cpu type='kvm' name='Nehalem-IBRS' usable='yes'/>
-  <cpu type='kvm' name='Nehalem' usable='yes'/>
-  <cpu type='kvm' name='KnightsMill' usable='no'>
+  <cpu type='kvm' name='Opteron_G2' typename='Opteron_G2-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Opteron_G1' typename='Opteron_G1-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Nehalem-IBRS' typename='Nehalem-IBRS-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Nehalem' typename='Nehalem-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='KnightsMill' typename='KnightsMill-x86_64-cpu' usable='no'>
     <blocker name='avx512f'/>
     <blocker name='avx512pf'/>
     <blocker name='avx512er'/>
@@ -832,9 +832,9 @@
     <blocker name='avx512f'/>
     <blocker name='avx512f'/>
   </cpu>
-  <cpu type='kvm' name='IvyBridge-IBRS' usable='yes'/>
-  <cpu type='kvm' name='IvyBridge' usable='yes'/>
-  <cpu type='kvm' name='Icelake-Server' usable='no'>
+  <cpu type='kvm' name='IvyBridge-IBRS' typename='IvyBridge-IBRS-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='IvyBridge' typename='IvyBridge-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Icelake-Server' typename='Icelake-Server-x86_64-cpu' usable='no'>
     <blocker name='avx512f'/>
     <blocker name='avx512dq'/>
     <blocker name='clwb'/>
@@ -861,7 +861,7 @@
     <blocker name='avx512f'/>
     <blocker name='pku'/>
   </cpu>
-  <cpu type='kvm' name='Icelake-Client' usable='no'>
+  <cpu type='kvm' name='Icelake-Client' typename='Icelake-Client-x86_64-cpu' usable='no'>
     <blocker name='intel-pt'/>
     <blocker name='avx512vbmi'/>
     <blocker name='pku'/>
@@ -877,11 +877,11 @@
     <blocker name='wbnoinvd'/>
     <blocker name='pku'/>
   </cpu>
-  <cpu type='kvm' name='Haswell-noTSX-IBRS' usable='yes'/>
-  <cpu type='kvm' name='Haswell-noTSX' usable='yes'/>
-  <cpu type='kvm' name='Haswell-IBRS' usable='yes'/>
-  <cpu type='kvm' name='Haswell' usable='yes'/>
-  <cpu type='kvm' name='EPYC-IBPB' usable='no'>
+  <cpu type='kvm' name='Haswell-noTSX-IBRS' typename='Haswell-noTSX-IBRS-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Haswell-noTSX' typename='Haswell-noTSX-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Haswell-IBRS' typename='Haswell-IBRS-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Haswell' typename='Haswell-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='EPYC-IBPB' typename='EPYC-IBPB-x86_64-cpu' usable='no'>
     <blocker name='sha-ni'/>
     <blocker name='mmxext'/>
     <blocker name='fxsr-opt'/>
@@ -891,7 +891,7 @@
     <blocker name='osvw'/>
     <blocker name='ibpb'/>
   </cpu>
-  <cpu type='kvm' name='EPYC' usable='no'>
+  <cpu type='kvm' name='EPYC' typename='EPYC-x86_64-cpu' usable='no'>
     <blocker name='sha-ni'/>
     <blocker name='mmxext'/>
     <blocker name='fxsr-opt'/>
@@ -900,8 +900,8 @@
     <blocker name='misalignsse'/>
     <blocker name='osvw'/>
   </cpu>
-  <cpu type='kvm' name='Conroe' usable='yes'/>
-  <cpu type='kvm' name='Cascadelake-Server' usable='no'>
+  <cpu type='kvm' name='Conroe' typename='Conroe-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Cascadelake-Server' typename='Cascadelake-Server-x86_64-cpu' usable='no'>
     <blocker name='avx512f'/>
     <blocker name='avx512dq'/>
     <blocker name='clwb'/>
@@ -918,35 +918,35 @@
     <blocker name='avx512f'/>
     <blocker name='pku'/>
   </cpu>
-  <cpu type='kvm' name='Broadwell-noTSX-IBRS' usable='yes'/>
-  <cpu type='kvm' name='Broadwell-noTSX' usable='yes'/>
-  <cpu type='kvm' name='Broadwell-IBRS' usable='yes'/>
-  <cpu type='kvm' name='Broadwell' usable='yes'/>
-  <cpu type='kvm' name='486' usable='yes'/>
-  <cpu type='tcg' name='max' usable='yes'/>
-  <cpu type='tcg' name='host' usable='no'>
+  <cpu type='kvm' name='Broadwell-noTSX-IBRS' typename='Broadwell-noTSX-IBRS-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Broadwell-noTSX' typename='Broadwell-noTSX-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Broadwell-IBRS' typename='Broadwell-IBRS-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Broadwell' typename='Broadwell-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='486' typename='486-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='max' typename='max-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='host' typename='host-x86_64-cpu' usable='no'>
     <blocker name='kvm'/>
   </cpu>
-  <cpu type='tcg' name='base' usable='yes'/>
-  <cpu type='tcg' name='qemu64' usable='yes'/>
-  <cpu type='tcg' name='qemu32' usable='yes'/>
-  <cpu type='tcg' name='phenom' usable='no'>
+  <cpu type='tcg' name='base' typename='base-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='qemu64' typename='qemu64-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='qemu32' typename='qemu32-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='phenom' typename='phenom-x86_64-cpu' usable='no'>
     <blocker name='fxsr-opt'/>
   </cpu>
-  <cpu type='tcg' name='pentium3' usable='yes'/>
-  <cpu type='tcg' name='pentium2' usable='yes'/>
-  <cpu type='tcg' name='pentium' usable='yes'/>
-  <cpu type='tcg' name='n270' usable='yes'/>
-  <cpu type='tcg' name='kvm64' usable='yes'/>
-  <cpu type='tcg' name='kvm32' usable='yes'/>
-  <cpu type='tcg' name='coreduo' usable='yes'/>
-  <cpu type='tcg' name='core2duo' usable='yes'/>
-  <cpu type='tcg' name='athlon' usable='yes'/>
-  <cpu type='tcg' name='Westmere-IBRS' usable='no'>
+  <cpu type='tcg' name='pentium3' typename='pentium3-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='pentium2' typename='pentium2-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='pentium' typename='pentium-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='n270' typename='n270-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='kvm64' typename='kvm64-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='kvm32' typename='kvm32-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='coreduo' typename='coreduo-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='core2duo' typename='core2duo-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='athlon' typename='athlon-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='Westmere-IBRS' typename='Westmere-IBRS-x86_64-cpu' usable='no'>
     <blocker name='spec-ctrl'/>
   </cpu>
-  <cpu type='tcg' name='Westmere' usable='yes'/>
-  <cpu type='tcg' name='Skylake-Server-IBRS' usable='no'>
+  <cpu type='tcg' name='Westmere' typename='Westmere-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='Skylake-Server-IBRS' typename='Skylake-Server-IBRS-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -968,7 +968,7 @@
     <blocker name='3dnowprefetch'/>
     <blocker name='xsavec'/>
   </cpu>
-  <cpu type='tcg' name='Skylake-Server' usable='no'>
+  <cpu type='tcg' name='Skylake-Server' typename='Skylake-Server-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -989,7 +989,7 @@
     <blocker name='3dnowprefetch'/>
     <blocker name='xsavec'/>
   </cpu>
-  <cpu type='tcg' name='Skylake-Client-IBRS' usable='no'>
+  <cpu type='tcg' name='Skylake-Client-IBRS' typename='Skylake-Client-IBRS-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1006,7 +1006,7 @@
     <blocker name='3dnowprefetch'/>
     <blocker name='xsavec'/>
   </cpu>
-  <cpu type='tcg' name='Skylake-Client' usable='no'>
+  <cpu type='tcg' name='Skylake-Client' typename='Skylake-Client-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1022,19 +1022,19 @@
     <blocker name='3dnowprefetch'/>
     <blocker name='xsavec'/>
   </cpu>
-  <cpu type='tcg' name='SandyBridge-IBRS' usable='no'>
+  <cpu type='tcg' name='SandyBridge-IBRS' typename='SandyBridge-IBRS-x86_64-cpu' usable='no'>
     <blocker name='x2apic'/>
     <blocker name='tsc-deadline'/>
     <blocker name='avx'/>
     <blocker name='spec-ctrl'/>
   </cpu>
-  <cpu type='tcg' name='SandyBridge' usable='no'>
+  <cpu type='tcg' name='SandyBridge' typename='SandyBridge-x86_64-cpu' usable='no'>
     <blocker name='x2apic'/>
     <blocker name='tsc-deadline'/>
     <blocker name='avx'/>
   </cpu>
-  <cpu type='tcg' name='Penryn' usable='yes'/>
-  <cpu type='tcg' name='Opteron_G5' usable='no'>
+  <cpu type='tcg' name='Penryn' typename='Penryn-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='Opteron_G5' typename='Opteron_G5-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='avx'/>
     <blocker name='f16c'/>
@@ -1044,23 +1044,23 @@
     <blocker name='fma4'/>
     <blocker name='tbm'/>
   </cpu>
-  <cpu type='tcg' name='Opteron_G4' usable='no'>
+  <cpu type='tcg' name='Opteron_G4' typename='Opteron_G4-x86_64-cpu' usable='no'>
     <blocker name='avx'/>
     <blocker name='misalignsse'/>
     <blocker name='3dnowprefetch'/>
     <blocker name='xop'/>
     <blocker name='fma4'/>
   </cpu>
-  <cpu type='tcg' name='Opteron_G3' usable='no'>
+  <cpu type='tcg' name='Opteron_G3' typename='Opteron_G3-x86_64-cpu' usable='no'>
     <blocker name='misalignsse'/>
   </cpu>
-  <cpu type='tcg' name='Opteron_G2' usable='yes'/>
-  <cpu type='tcg' name='Opteron_G1' usable='yes'/>
-  <cpu type='tcg' name='Nehalem-IBRS' usable='no'>
+  <cpu type='tcg' name='Opteron_G2' typename='Opteron_G2-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='Opteron_G1' typename='Opteron_G1-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='Nehalem-IBRS' typename='Nehalem-IBRS-x86_64-cpu' usable='no'>
     <blocker name='spec-ctrl'/>
   </cpu>
-  <cpu type='tcg' name='Nehalem' usable='yes'/>
-  <cpu type='tcg' name='KnightsMill' usable='no'>
+  <cpu type='tcg' name='Nehalem' typename='Nehalem-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='KnightsMill' typename='KnightsMill-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='x2apic'/>
     <blocker name='tsc-deadline'/>
@@ -1078,7 +1078,7 @@
     <blocker name='avx512-4fmaps'/>
     <blocker name='3dnowprefetch'/>
   </cpu>
-  <cpu type='tcg' name='IvyBridge-IBRS' usable='no'>
+  <cpu type='tcg' name='IvyBridge-IBRS' typename='IvyBridge-IBRS-x86_64-cpu' usable='no'>
     <blocker name='x2apic'/>
     <blocker name='tsc-deadline'/>
     <blocker name='avx'/>
@@ -1086,14 +1086,14 @@
     <blocker name='rdrand'/>
     <blocker name='spec-ctrl'/>
   </cpu>
-  <cpu type='tcg' name='IvyBridge' usable='no'>
+  <cpu type='tcg' name='IvyBridge' typename='IvyBridge-x86_64-cpu' usable='no'>
     <blocker name='x2apic'/>
     <blocker name='tsc-deadline'/>
     <blocker name='avx'/>
     <blocker name='f16c'/>
     <blocker name='rdrand'/>
   </cpu>
-  <cpu type='tcg' name='Icelake-Server' usable='no'>
+  <cpu type='tcg' name='Icelake-Server' typename='Icelake-Server-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1129,7 +1129,7 @@
     <blocker name='wbnoinvd'/>
     <blocker name='xsavec'/>
   </cpu>
-  <cpu type='tcg' name='Icelake-Client' usable='no'>
+  <cpu type='tcg' name='Icelake-Client' typename='Icelake-Client-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1159,7 +1159,7 @@
     <blocker name='wbnoinvd'/>
     <blocker name='xsavec'/>
   </cpu>
-  <cpu type='tcg' name='Haswell-noTSX-IBRS' usable='no'>
+  <cpu type='tcg' name='Haswell-noTSX-IBRS' typename='Haswell-noTSX-IBRS-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1171,7 +1171,7 @@
     <blocker name='invpcid'/>
     <blocker name='spec-ctrl'/>
   </cpu>
-  <cpu type='tcg' name='Haswell-noTSX' usable='no'>
+  <cpu type='tcg' name='Haswell-noTSX' typename='Haswell-noTSX-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1182,7 +1182,7 @@
     <blocker name='avx2'/>
     <blocker name='invpcid'/>
   </cpu>
-  <cpu type='tcg' name='Haswell-IBRS' usable='no'>
+  <cpu type='tcg' name='Haswell-IBRS' typename='Haswell-IBRS-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1196,7 +1196,7 @@
     <blocker name='rtm'/>
     <blocker name='spec-ctrl'/>
   </cpu>
-  <cpu type='tcg' name='Haswell' usable='no'>
+  <cpu type='tcg' name='Haswell' typename='Haswell-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1209,7 +1209,7 @@
     <blocker name='invpcid'/>
     <blocker name='rtm'/>
   </cpu>
-  <cpu type='tcg' name='EPYC-IBPB' usable='no'>
+  <cpu type='tcg' name='EPYC-IBPB' typename='EPYC-IBPB-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='avx'/>
     <blocker name='f16c'/>
@@ -1225,7 +1225,7 @@
     <blocker name='ibpb'/>
     <blocker name='xsavec'/>
   </cpu>
-  <cpu type='tcg' name='EPYC' usable='no'>
+  <cpu type='tcg' name='EPYC' typename='EPYC-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='avx'/>
     <blocker name='f16c'/>
@@ -1240,8 +1240,8 @@
     <blocker name='topoext'/>
     <blocker name='xsavec'/>
   </cpu>
-  <cpu type='tcg' name='Conroe' usable='yes'/>
-  <cpu type='tcg' name='Cascadelake-Server' usable='no'>
+  <cpu type='tcg' name='Conroe' typename='Conroe-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='Cascadelake-Server' typename='Cascadelake-Server-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1267,7 +1267,7 @@
     <blocker name='3dnowprefetch'/>
     <blocker name='xsavec'/>
   </cpu>
-  <cpu type='tcg' name='Broadwell-noTSX-IBRS' usable='no'>
+  <cpu type='tcg' name='Broadwell-noTSX-IBRS' typename='Broadwell-noTSX-IBRS-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1281,7 +1281,7 @@
     <blocker name='spec-ctrl'/>
     <blocker name='3dnowprefetch'/>
   </cpu>
-  <cpu type='tcg' name='Broadwell-noTSX' usable='no'>
+  <cpu type='tcg' name='Broadwell-noTSX' typename='Broadwell-noTSX-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1294,7 +1294,7 @@
     <blocker name='rdseed'/>
     <blocker name='3dnowprefetch'/>
   </cpu>
-  <cpu type='tcg' name='Broadwell-IBRS' usable='no'>
+  <cpu type='tcg' name='Broadwell-IBRS' typename='Broadwell-IBRS-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1310,7 +1310,7 @@
     <blocker name='spec-ctrl'/>
     <blocker name='3dnowprefetch'/>
   </cpu>
-  <cpu type='tcg' name='Broadwell' usable='no'>
+  <cpu type='tcg' name='Broadwell' typename='Broadwell-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1325,7 +1325,7 @@
     <blocker name='rdseed'/>
     <blocker name='3dnowprefetch'/>
   </cpu>
-  <cpu type='tcg' name='486' usable='yes'/>
+  <cpu type='tcg' name='486' typename='486-x86_64-cpu' usable='yes'/>
   <machine name='pc-i440fx-3.1' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/>
   <machine name='isapc' hotplugCpus='yes' maxCpus='1'/>
   <machine name='pc-1.1' hotplugCpus='yes' maxCpus='255'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
index 83459c33cf..1d50ef1aa2 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
@@ -172,80 +172,80 @@
   <microcodeVersion>61700240</microcodeVersion>
   <package>v4.0.0</package>
   <arch>aarch64</arch>
-  <cpu type='kvm' name='pxa262'/>
-  <cpu type='kvm' name='pxa270-a0'/>
-  <cpu type='kvm' name='arm1136'/>
-  <cpu type='kvm' name='cortex-a15'/>
-  <cpu type='kvm' name='pxa260'/>
-  <cpu type='kvm' name='arm1136-r2'/>
-  <cpu type='kvm' name='pxa261'/>
-  <cpu type='kvm' name='pxa255'/>
-  <cpu type='kvm' name='cortex-a72'/>
-  <cpu type='kvm' name='cortex-m33'/>
-  <cpu type='kvm' name='arm926'/>
-  <cpu type='kvm' name='cortex-r5f'/>
-  <cpu type='kvm' name='arm11mpcore'/>
-  <cpu type='kvm' name='pxa250'/>
-  <cpu type='kvm' name='ti925t'/>
-  <cpu type='kvm' name='cortex-a57'/>
-  <cpu type='kvm' name='sa1110'/>
-  <cpu type='kvm' name='host'/>
-  <cpu type='kvm' name='arm1176'/>
-  <cpu type='kvm' name='cortex-a53'/>
-  <cpu type='kvm' name='sa1100'/>
-  <cpu type='kvm' name='pxa270-c5'/>
-  <cpu type='kvm' name='cortex-a9'/>
-  <cpu type='kvm' name='cortex-a8'/>
-  <cpu type='kvm' name='cortex-a7'/>
-  <cpu type='kvm' name='pxa270-c0'/>
-  <cpu type='kvm' name='arm1026'/>
-  <cpu type='kvm' name='pxa270-b1'/>
-  <cpu type='kvm' name='cortex-m3'/>
-  <cpu type='kvm' name='max'/>
-  <cpu type='kvm' name='cortex-m4'/>
-  <cpu type='kvm' name='pxa270-b0'/>
-  <cpu type='kvm' name='arm946'/>
-  <cpu type='kvm' name='cortex-m0'/>
-  <cpu type='kvm' name='cortex-r5'/>
-  <cpu type='kvm' name='pxa270-a1'/>
-  <cpu type='kvm' name='pxa270'/>
-  <cpu type='tcg' name='pxa262'/>
-  <cpu type='tcg' name='pxa270-a0'/>
-  <cpu type='tcg' name='arm1136'/>
-  <cpu type='tcg' name='cortex-a15'/>
-  <cpu type='tcg' name='pxa260'/>
-  <cpu type='tcg' name='arm1136-r2'/>
-  <cpu type='tcg' name='pxa261'/>
-  <cpu type='tcg' name='pxa255'/>
-  <cpu type='tcg' name='cortex-a72'/>
-  <cpu type='tcg' name='cortex-m33'/>
-  <cpu type='tcg' name='arm926'/>
-  <cpu type='tcg' name='cortex-r5f'/>
-  <cpu type='tcg' name='arm11mpcore'/>
-  <cpu type='tcg' name='pxa250'/>
-  <cpu type='tcg' name='ti925t'/>
-  <cpu type='tcg' name='cortex-a57'/>
-  <cpu type='tcg' name='sa1110'/>
-  <cpu type='tcg' name='host'/>
-  <cpu type='tcg' name='arm1176'/>
-  <cpu type='tcg' name='cortex-a53'/>
-  <cpu type='tcg' name='sa1100'/>
-  <cpu type='tcg' name='pxa270-c5'/>
-  <cpu type='tcg' name='cortex-a9'/>
-  <cpu type='tcg' name='cortex-a8'/>
-  <cpu type='tcg' name='cortex-a7'/>
-  <cpu type='tcg' name='pxa270-c0'/>
-  <cpu type='tcg' name='arm1026'/>
-  <cpu type='tcg' name='pxa270-b1'/>
-  <cpu type='tcg' name='cortex-m3'/>
-  <cpu type='tcg' name='max'/>
-  <cpu type='tcg' name='cortex-m4'/>
-  <cpu type='tcg' name='pxa270-b0'/>
-  <cpu type='tcg' name='arm946'/>
-  <cpu type='tcg' name='cortex-m0'/>
-  <cpu type='tcg' name='cortex-r5'/>
-  <cpu type='tcg' name='pxa270-a1'/>
-  <cpu type='tcg' name='pxa270'/>
+  <cpu type='kvm' name='pxa262' typename='pxa262-arm-cpu'/>
+  <cpu type='kvm' name='pxa270-a0' typename='pxa270-a0-arm-cpu'/>
+  <cpu type='kvm' name='arm1136' typename='arm1136-arm-cpu'/>
+  <cpu type='kvm' name='cortex-a15' typename='cortex-a15-arm-cpu'/>
+  <cpu type='kvm' name='pxa260' typename='pxa260-arm-cpu'/>
+  <cpu type='kvm' name='arm1136-r2' typename='arm1136-r2-arm-cpu'/>
+  <cpu type='kvm' name='pxa261' typename='pxa261-arm-cpu'/>
+  <cpu type='kvm' name='pxa255' typename='pxa255-arm-cpu'/>
+  <cpu type='kvm' name='cortex-a72' typename='cortex-a72-arm-cpu'/>
+  <cpu type='kvm' name='cortex-m33' typename='cortex-m33-arm-cpu'/>
+  <cpu type='kvm' name='arm926' typename='arm926-arm-cpu'/>
+  <cpu type='kvm' name='cortex-r5f' typename='cortex-r5f-arm-cpu'/>
+  <cpu type='kvm' name='arm11mpcore' typename='arm11mpcore-arm-cpu'/>
+  <cpu type='kvm' name='pxa250' typename='pxa250-arm-cpu'/>
+  <cpu type='kvm' name='ti925t' typename='ti925t-arm-cpu'/>
+  <cpu type='kvm' name='cortex-a57' typename='cortex-a57-arm-cpu'/>
+  <cpu type='kvm' name='sa1110' typename='sa1110-arm-cpu'/>
+  <cpu type='kvm' name='host' typename='host-arm-cpu'/>
+  <cpu type='kvm' name='arm1176' typename='arm1176-arm-cpu'/>
+  <cpu type='kvm' name='cortex-a53' typename='cortex-a53-arm-cpu'/>
+  <cpu type='kvm' name='sa1100' typename='sa1100-arm-cpu'/>
+  <cpu type='kvm' name='pxa270-c5' typename='pxa270-c5-arm-cpu'/>
+  <cpu type='kvm' name='cortex-a9' typename='cortex-a9-arm-cpu'/>
+  <cpu type='kvm' name='cortex-a8' typename='cortex-a8-arm-cpu'/>
+  <cpu type='kvm' name='cortex-a7' typename='cortex-a7-arm-cpu'/>
+  <cpu type='kvm' name='pxa270-c0' typename='pxa270-c0-arm-cpu'/>
+  <cpu type='kvm' name='arm1026' typename='arm1026-arm-cpu'/>
+  <cpu type='kvm' name='pxa270-b1' typename='pxa270-b1-arm-cpu'/>
+  <cpu type='kvm' name='cortex-m3' typename='cortex-m3-arm-cpu'/>
+  <cpu type='kvm' name='max' typename='max-arm-cpu'/>
+  <cpu type='kvm' name='cortex-m4' typename='cortex-m4-arm-cpu'/>
+  <cpu type='kvm' name='pxa270-b0' typename='pxa270-b0-arm-cpu'/>
+  <cpu type='kvm' name='arm946' typename='arm946-arm-cpu'/>
+  <cpu type='kvm' name='cortex-m0' typename='cortex-m0-arm-cpu'/>
+  <cpu type='kvm' name='cortex-r5' typename='cortex-r5-arm-cpu'/>
+  <cpu type='kvm' name='pxa270-a1' typename='pxa270-a1-arm-cpu'/>
+  <cpu type='kvm' name='pxa270' typename='pxa270-arm-cpu'/>
+  <cpu type='tcg' name='pxa262' typename='pxa262-arm-cpu'/>
+  <cpu type='tcg' name='pxa270-a0' typename='pxa270-a0-arm-cpu'/>
+  <cpu type='tcg' name='arm1136' typename='arm1136-arm-cpu'/>
+  <cpu type='tcg' name='cortex-a15' typename='cortex-a15-arm-cpu'/>
+  <cpu type='tcg' name='pxa260' typename='pxa260-arm-cpu'/>
+  <cpu type='tcg' name='arm1136-r2' typename='arm1136-r2-arm-cpu'/>
+  <cpu type='tcg' name='pxa261' typename='pxa261-arm-cpu'/>
+  <cpu type='tcg' name='pxa255' typename='pxa255-arm-cpu'/>
+  <cpu type='tcg' name='cortex-a72' typename='cortex-a72-arm-cpu'/>
+  <cpu type='tcg' name='cortex-m33' typename='cortex-m33-arm-cpu'/>
+  <cpu type='tcg' name='arm926' typename='arm926-arm-cpu'/>
+  <cpu type='tcg' name='cortex-r5f' typename='cortex-r5f-arm-cpu'/>
+  <cpu type='tcg' name='arm11mpcore' typename='arm11mpcore-arm-cpu'/>
+  <cpu type='tcg' name='pxa250' typename='pxa250-arm-cpu'/>
+  <cpu type='tcg' name='ti925t' typename='ti925t-arm-cpu'/>
+  <cpu type='tcg' name='cortex-a57' typename='cortex-a57-arm-cpu'/>
+  <cpu type='tcg' name='sa1110' typename='sa1110-arm-cpu'/>
+  <cpu type='tcg' name='host' typename='host-arm-cpu'/>
+  <cpu type='tcg' name='arm1176' typename='arm1176-arm-cpu'/>
+  <cpu type='tcg' name='cortex-a53' typename='cortex-a53-arm-cpu'/>
+  <cpu type='tcg' name='sa1100' typename='sa1100-arm-cpu'/>
+  <cpu type='tcg' name='pxa270-c5' typename='pxa270-c5-arm-cpu'/>
+  <cpu type='tcg' name='cortex-a9' typename='cortex-a9-arm-cpu'/>
+  <cpu type='tcg' name='cortex-a8' typename='cortex-a8-arm-cpu'/>
+  <cpu type='tcg' name='cortex-a7' typename='cortex-a7-arm-cpu'/>
+  <cpu type='tcg' name='pxa270-c0' typename='pxa270-c0-arm-cpu'/>
+  <cpu type='tcg' name='arm1026' typename='arm1026-arm-cpu'/>
+  <cpu type='tcg' name='pxa270-b1' typename='pxa270-b1-arm-cpu'/>
+  <cpu type='tcg' name='cortex-m3' typename='cortex-m3-arm-cpu'/>
+  <cpu type='tcg' name='max' typename='max-arm-cpu'/>
+  <cpu type='tcg' name='cortex-m4' typename='cortex-m4-arm-cpu'/>
+  <cpu type='tcg' name='pxa270-b0' typename='pxa270-b0-arm-cpu'/>
+  <cpu type='tcg' name='arm946' typename='arm946-arm-cpu'/>
+  <cpu type='tcg' name='cortex-m0' typename='cortex-m0-arm-cpu'/>
+  <cpu type='tcg' name='cortex-r5' typename='cortex-r5-arm-cpu'/>
+  <cpu type='tcg' name='pxa270-a1' typename='pxa270-a1-arm-cpu'/>
+  <cpu type='tcg' name='pxa270' typename='pxa270-arm-cpu'/>
   <machine name='integratorcp' maxCpus='1'/>
   <machine name='nuri' maxCpus='2'/>
   <machine name='mps2-an511' maxCpus='1'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
index 1a4c357308..cf677da0e0 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
@@ -176,135 +176,135 @@
   <microcodeVersion>42900240</microcodeVersion>
   <package>v4.0.0</package>
   <arch>ppc64</arch>
-  <cpu type='kvm' name='default'/>
-  <cpu type='kvm' name='ppc'/>
-  <cpu type='kvm' name='ppc32'/>
-  <cpu type='kvm' name='ppc64'/>
-  <cpu type='kvm' name='POWER9'/>
-  <cpu type='kvm' name='power8nvl'/>
-  <cpu type='kvm' name='POWER8'/>
-  <cpu type='kvm' name='power8e'/>
-  <cpu type='kvm' name='power7+'/>
-  <cpu type='kvm' name='POWER7'/>
-  <cpu type='kvm' name='power5gs'/>
-  <cpu type='kvm' name='power5+'/>
-  <cpu type='kvm' name='970mp'/>
-  <cpu type='kvm' name='970fx'/>
-  <cpu type='kvm' name='970'/>
-  <cpu type='kvm' name='apollo7pm'/>
-  <cpu type='kvm' name='7457a'/>
-  <cpu type='kvm' name='7447a'/>
-  <cpu type='kvm' name='apollo7'/>
-  <cpu type='kvm' name='7457'/>
-  <cpu type='kvm' name='7447'/>
-  <cpu type='kvm' name='apollo6'/>
-  <cpu type='kvm' name='7455'/>
-  <cpu type='kvm' name='7445'/>
-  <cpu type='kvm' name='7451'/>
-  <cpu type='kvm' name='7441'/>
-  <cpu type='kvm' name='vger'/>
-  <cpu type='kvm' name='7450'/>
-  <cpu type='kvm' name='7448'/>
-  <cpu type='kvm' name='nitro'/>
-  <cpu type='kvm' name='7410'/>
-  <cpu type='kvm' name='g4'/>
-  <cpu type='kvm' name='max'/>
-  <cpu type='kvm' name='7400'/>
-  <cpu type='kvm' name='goldfinger'/>
-  <cpu type='kvm' name='755'/>
-  <cpu type='kvm' name='745'/>
-  <cpu type='kvm' name='lonestar'/>
-  <cpu type='kvm' name='750l'/>
-  <cpu type='kvm' name='750gx'/>
-  <cpu type='kvm' name='750fx'/>
-  <cpu type='kvm' name='750cxe'/>
-  <cpu type='kvm' name='750cx'/>
-  <cpu type='kvm' name='750cl'/>
-  <cpu type='kvm' name='conan/doyle'/>
-  <cpu type='kvm' name='g3'/>
-  <cpu type='kvm' name='typhoon'/>
-  <cpu type='kvm' name='750'/>
-  <cpu type='kvm' name='arthur'/>
-  <cpu type='kvm' name='740'/>
-  <cpu type='kvm' name='mach5'/>
-  <cpu type='kvm' name='sirocco'/>
-  <cpu type='kvm' name='604e'/>
-  <cpu type='kvm' name='goldeneye'/>
-  <cpu type='kvm' name='603r'/>
-  <cpu type='kvm' name='vaillant'/>
-  <cpu type='kvm' name='stretch'/>
-  <cpu type='kvm' name='603e'/>
-  <cpu type='kvm' name='vanilla'/>
-  <cpu type='kvm' name='601v'/>
-  <cpu type='kvm' name='601'/>
-  <cpu type='kvm' name='mpc8560'/>
-  <cpu type='kvm' name='mpc8555e'/>
-  <cpu type='kvm' name='mpc8555'/>
-  <cpu type='kvm' name='mpc8548e'/>
-  <cpu type='kvm' name='mpc8548'/>
-  <cpu type='kvm' name='mpc8547e'/>
-  <cpu type='kvm' name='mpc8545e'/>
-  <cpu type='kvm' name='mpc8545'/>
-  <cpu type='kvm' name='mpc8544e'/>
-  <cpu type='kvm' name='mpc8544'/>
-  <cpu type='kvm' name='mpc8543e'/>
-  <cpu type='kvm' name='mpc8543'/>
-  <cpu type='kvm' name='mpc8541e'/>
-  <cpu type='kvm' name='mpc8541'/>
-  <cpu type='kvm' name='mpc8540'/>
-  <cpu type='kvm' name='mpc8533e'/>
-  <cpu type='kvm' name='mpc8533'/>
-  <cpu type='kvm' name='e500v2'/>
-  <cpu type='kvm' name='e500v1'/>
-  <cpu type='kvm' name='e500'/>
-  <cpu type='kvm' name='mpc8347ea'/>
-  <cpu type='kvm' name='mpc8347e'/>
-  <cpu type='kvm' name='mpc8347a'/>
-  <cpu type='kvm' name='mpc8347'/>
-  <cpu type='kvm' name='e300'/>
-  <cpu type='kvm' name='e200'/>
-  <cpu type='kvm' name='mpc8280'/>
-  <cpu type='kvm' name='mpc8275'/>
-  <cpu type='kvm' name='mpc8272'/>
-  <cpu type='kvm' name='mpc8271'/>
-  <cpu type='kvm' name='mpc8270'/>
-  <cpu type='kvm' name='mpc8266_hip4'/>
-  <cpu type='kvm' name='mpc8266_hip3'/>
-  <cpu type='kvm' name='mpc8266'/>
-  <cpu type='kvm' name='mpc8265_hip4'/>
-  <cpu type='kvm' name='mpc8265_hip3'/>
-  <cpu type='kvm' name='mpc8265'/>
-  <cpu type='kvm' name='mpc8264_hip4'/>
-  <cpu type='kvm' name='mpc8264_hip3'/>
-  <cpu type='kvm' name='mpc8264'/>
-  <cpu type='kvm' name='mpc8260_hip4'/>
-  <cpu type='kvm' name='mpc8260_hip3'/>
-  <cpu type='kvm' name='mpc8260'/>
-  <cpu type='kvm' name='mpc8255_hip4'/>
-  <cpu type='kvm' name='mpc8255_hip3'/>
-  <cpu type='kvm' name='mpc8255'/>
-  <cpu type='kvm' name='mpc8250_hip4'/>
-  <cpu type='kvm' name='mpc8250_hip3'/>
-  <cpu type='kvm' name='mpc8250'/>
-  <cpu type='kvm' name='mpc8248'/>
-  <cpu type='kvm' name='mpc8247'/>
-  <cpu type='kvm' name='mpc8245'/>
-  <cpu type='kvm' name='mpc8241'/>
-  <cpu type='kvm' name='powerquicc-ii'/>
-  <cpu type='kvm' name='mpc82xx'/>
-  <cpu type='kvm' name='mpc5200b'/>
-  <cpu type='kvm' name='mpc5200'/>
-  <cpu type='kvm' name='mpc52xx'/>
-  <cpu type='kvm' name='mpc8240'/>
-  <cpu type='kvm' name='460ex'/>
-  <cpu type='kvm' name='440ep'/>
-  <cpu type='kvm' name='x2vp50'/>
-  <cpu type='kvm' name='x2vp7'/>
-  <cpu type='kvm' name='405gpe'/>
-  <cpu type='kvm' name='405gp'/>
-  <cpu type='kvm' name='405cr'/>
-  <cpu type='kvm' name='405'/>
-  <cpu type='kvm' name='403'/>
+  <cpu type='kvm' name='default' typename='604-powerpc64-cpu'/>
+  <cpu type='kvm' name='ppc' typename='604-powerpc64-cpu'/>
+  <cpu type='kvm' name='ppc32' typename='604-powerpc64-cpu'/>
+  <cpu type='kvm' name='ppc64' typename='970fx_v3.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='POWER9' typename='power9_v2.0-powerpc64-cpu'/>
+  <cpu type='kvm' name='power8nvl' typename='power8nvl_v1.0-powerpc64-cpu'/>
+  <cpu type='kvm' name='POWER8' typename='host-powerpc64-cpu'/>
+  <cpu type='kvm' name='power8e' typename='power8e_v2.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='power7+' typename='power7+_v2.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='POWER7' typename='power7_v2.3-powerpc64-cpu'/>
+  <cpu type='kvm' name='power5gs' typename='power5+_v2.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='power5+' typename='power5+_v2.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='970mp' typename='970mp_v1.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='970fx' typename='970fx_v3.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='970' typename='970_v2.2-powerpc64-cpu'/>
+  <cpu type='kvm' name='apollo7pm' typename='7457a_v1.0-powerpc64-cpu'/>
+  <cpu type='kvm' name='7457a' typename='7457a_v1.2-powerpc64-cpu'/>
+  <cpu type='kvm' name='7447a' typename='7447a_v1.2-powerpc64-cpu'/>
+  <cpu type='kvm' name='apollo7' typename='7457_v1.2-powerpc64-cpu'/>
+  <cpu type='kvm' name='7457' typename='7457_v1.2-powerpc64-cpu'/>
+  <cpu type='kvm' name='7447' typename='7447_v1.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='apollo6' typename='7455_v3.2-powerpc64-cpu'/>
+  <cpu type='kvm' name='7455' typename='7455_v3.2-powerpc64-cpu'/>
+  <cpu type='kvm' name='7445' typename='7445_v3.2-powerpc64-cpu'/>
+  <cpu type='kvm' name='7451' typename='7451_v2.3-powerpc64-cpu'/>
+  <cpu type='kvm' name='7441' typename='7441_v2.3-powerpc64-cpu'/>
+  <cpu type='kvm' name='vger' typename='7450_v2.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='7450' typename='7450_v2.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='7448' typename='7448_v2.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='nitro' typename='7410_v1.4-powerpc64-cpu'/>
+  <cpu type='kvm' name='7410' typename='7410_v1.4-powerpc64-cpu'/>
+  <cpu type='kvm' name='g4' typename='7400_v2.9-powerpc64-cpu'/>
+  <cpu type='kvm' name='max' typename='7400_v2.9-powerpc64-cpu'/>
+  <cpu type='kvm' name='7400' typename='7400_v2.9-powerpc64-cpu'/>
+  <cpu type='kvm' name='goldfinger' typename='755_v2.8-powerpc64-cpu'/>
+  <cpu type='kvm' name='755' typename='755_v2.8-powerpc64-cpu'/>
+  <cpu type='kvm' name='745' typename='745_v2.8-powerpc64-cpu'/>
+  <cpu type='kvm' name='lonestar' typename='750l_v3.2-powerpc64-cpu'/>
+  <cpu type='kvm' name='750l' typename='750l_v3.2-powerpc64-cpu'/>
+  <cpu type='kvm' name='750gx' typename='750gx_v1.2-powerpc64-cpu'/>
+  <cpu type='kvm' name='750fx' typename='750fx_v2.3-powerpc64-cpu'/>
+  <cpu type='kvm' name='750cxe' typename='750cxe_v3.1b-powerpc64-cpu'/>
+  <cpu type='kvm' name='750cx' typename='750cx_v2.2-powerpc64-cpu'/>
+  <cpu type='kvm' name='750cl' typename='750cl_v2.0-powerpc64-cpu'/>
+  <cpu type='kvm' name='conan/doyle' typename='750p-powerpc64-cpu'/>
+  <cpu type='kvm' name='g3' typename='750_v3.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='typhoon' typename='750_v3.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='750' typename='750_v3.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='arthur' typename='740_v3.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='740' typename='740_v3.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='mach5' typename='604r-powerpc64-cpu'/>
+  <cpu type='kvm' name='sirocco' typename='604e_v2.4-powerpc64-cpu'/>
+  <cpu type='kvm' name='604e' typename='604e_v2.4-powerpc64-cpu'/>
+  <cpu type='kvm' name='goldeneye' typename='603e7t-powerpc64-cpu'/>
+  <cpu type='kvm' name='603r' typename='603e7t-powerpc64-cpu'/>
+  <cpu type='kvm' name='vaillant' typename='603e7v-powerpc64-cpu'/>
+  <cpu type='kvm' name='stretch' typename='603e_v4.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='603e' typename='603e_v4.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='vanilla' typename='603-powerpc64-cpu'/>
+  <cpu type='kvm' name='601v' typename='601_v2-powerpc64-cpu'/>
+  <cpu type='kvm' name='601' typename='601_v2-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8560' typename='mpc8560_v21-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8555e' typename='mpc8555e_v11-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8555' typename='mpc8555_v11-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8548e' typename='mpc8548e_v21-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8548' typename='mpc8548_v21-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8547e' typename='mpc8547e_v21-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8545e' typename='mpc8545e_v21-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8545' typename='mpc8545_v21-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8544e' typename='mpc8544e_v11-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8544' typename='mpc8544_v11-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8543e' typename='mpc8543e_v21-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8543' typename='mpc8543_v21-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8541e' typename='mpc8541e_v11-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8541' typename='mpc8541_v11-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8540' typename='mpc8540_v21-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8533e' typename='mpc8533e_v11-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8533' typename='mpc8533_v11-powerpc64-cpu'/>
+  <cpu type='kvm' name='e500v2' typename='e500v2_v22-powerpc64-cpu'/>
+  <cpu type='kvm' name='e500v1' typename='e500_v20-powerpc64-cpu'/>
+  <cpu type='kvm' name='e500' typename='e500v2_v22-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8347ea' typename='mpc8347eat-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8347e' typename='mpc8347et-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8347a' typename='mpc8347at-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8347' typename='mpc8347t-powerpc64-cpu'/>
+  <cpu type='kvm' name='e300' typename='e300c3-powerpc64-cpu'/>
+  <cpu type='kvm' name='e200' typename='e200z6-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8280' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8275' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8272' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8271' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8270' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8266_hip4' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8266_hip3' typename='g2hip3-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8266' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8265_hip4' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8265_hip3' typename='g2hip3-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8265' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8264_hip4' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8264_hip3' typename='g2hip3-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8264' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8260_hip4' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8260_hip3' typename='g2hip3-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8260' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8255_hip4' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8255_hip3' typename='g2hip3-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8255' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8250_hip4' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8250_hip3' typename='g2hip3-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8250' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8248' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8247' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8245' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8241' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='kvm' name='powerquicc-ii' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc82xx' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc5200b' typename='mpc5200b_v21-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc5200' typename='mpc5200_v12-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc52xx' typename='mpc5200_v12-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8240' typename='603-powerpc64-cpu'/>
+  <cpu type='kvm' name='460ex' typename='460exb-powerpc64-cpu'/>
+  <cpu type='kvm' name='440ep' typename='440epb-powerpc64-cpu'/>
+  <cpu type='kvm' name='x2vp50' typename='x2vp20-powerpc64-cpu'/>
+  <cpu type='kvm' name='x2vp7' typename='x2vp4-powerpc64-cpu'/>
+  <cpu type='kvm' name='405gpe' typename='405crc-powerpc64-cpu'/>
+  <cpu type='kvm' name='405gp' typename='405gpd-powerpc64-cpu'/>
+  <cpu type='kvm' name='405cr' typename='405crc-powerpc64-cpu'/>
+  <cpu type='kvm' name='405' typename='405d4-powerpc64-cpu'/>
+  <cpu type='kvm' name='403' typename='403gc-powerpc64-cpu'/>
   <cpu type='kvm' name='mpc8547e_v21'/>
   <cpu type='kvm' name='g2gp'/>
   <cpu type='kvm' name='7457a_v1.1'/>
@@ -614,135 +614,135 @@
   <cpu type='kvm' name='750_v3.1'/>
   <cpu type='kvm' name='power8e_v2.1'/>
   <cpu type='kvm' name='mpc8568e'/>
-  <cpu type='tcg' name='default'/>
-  <cpu type='tcg' name='ppc'/>
-  <cpu type='tcg' name='ppc32'/>
-  <cpu type='tcg' name='ppc64'/>
-  <cpu type='tcg' name='POWER9'/>
-  <cpu type='tcg' name='power8nvl'/>
-  <cpu type='tcg' name='POWER8'/>
-  <cpu type='tcg' name='power8e'/>
-  <cpu type='tcg' name='power7+'/>
-  <cpu type='tcg' name='POWER7'/>
-  <cpu type='tcg' name='power5gs'/>
-  <cpu type='tcg' name='power5+'/>
-  <cpu type='tcg' name='970mp'/>
-  <cpu type='tcg' name='970fx'/>
-  <cpu type='tcg' name='970'/>
-  <cpu type='tcg' name='apollo7pm'/>
-  <cpu type='tcg' name='7457a'/>
-  <cpu type='tcg' name='7447a'/>
-  <cpu type='tcg' name='apollo7'/>
-  <cpu type='tcg' name='7457'/>
-  <cpu type='tcg' name='7447'/>
-  <cpu type='tcg' name='apollo6'/>
-  <cpu type='tcg' name='7455'/>
-  <cpu type='tcg' name='7445'/>
-  <cpu type='tcg' name='7451'/>
-  <cpu type='tcg' name='7441'/>
-  <cpu type='tcg' name='vger'/>
-  <cpu type='tcg' name='7450'/>
-  <cpu type='tcg' name='7448'/>
-  <cpu type='tcg' name='nitro'/>
-  <cpu type='tcg' name='7410'/>
-  <cpu type='tcg' name='g4'/>
-  <cpu type='tcg' name='max'/>
-  <cpu type='tcg' name='7400'/>
-  <cpu type='tcg' name='goldfinger'/>
-  <cpu type='tcg' name='755'/>
-  <cpu type='tcg' name='745'/>
-  <cpu type='tcg' name='lonestar'/>
-  <cpu type='tcg' name='750l'/>
-  <cpu type='tcg' name='750gx'/>
-  <cpu type='tcg' name='750fx'/>
-  <cpu type='tcg' name='750cxe'/>
-  <cpu type='tcg' name='750cx'/>
-  <cpu type='tcg' name='750cl'/>
-  <cpu type='tcg' name='conan/doyle'/>
-  <cpu type='tcg' name='g3'/>
-  <cpu type='tcg' name='typhoon'/>
-  <cpu type='tcg' name='750'/>
-  <cpu type='tcg' name='arthur'/>
-  <cpu type='tcg' name='740'/>
-  <cpu type='tcg' name='mach5'/>
-  <cpu type='tcg' name='sirocco'/>
-  <cpu type='tcg' name='604e'/>
-  <cpu type='tcg' name='goldeneye'/>
-  <cpu type='tcg' name='603r'/>
-  <cpu type='tcg' name='vaillant'/>
-  <cpu type='tcg' name='stretch'/>
-  <cpu type='tcg' name='603e'/>
-  <cpu type='tcg' name='vanilla'/>
-  <cpu type='tcg' name='601v'/>
-  <cpu type='tcg' name='601'/>
-  <cpu type='tcg' name='mpc8560'/>
-  <cpu type='tcg' name='mpc8555e'/>
-  <cpu type='tcg' name='mpc8555'/>
-  <cpu type='tcg' name='mpc8548e'/>
-  <cpu type='tcg' name='mpc8548'/>
-  <cpu type='tcg' name='mpc8547e'/>
-  <cpu type='tcg' name='mpc8545e'/>
-  <cpu type='tcg' name='mpc8545'/>
-  <cpu type='tcg' name='mpc8544e'/>
-  <cpu type='tcg' name='mpc8544'/>
-  <cpu type='tcg' name='mpc8543e'/>
-  <cpu type='tcg' name='mpc8543'/>
-  <cpu type='tcg' name='mpc8541e'/>
-  <cpu type='tcg' name='mpc8541'/>
-  <cpu type='tcg' name='mpc8540'/>
-  <cpu type='tcg' name='mpc8533e'/>
-  <cpu type='tcg' name='mpc8533'/>
-  <cpu type='tcg' name='e500v2'/>
-  <cpu type='tcg' name='e500v1'/>
-  <cpu type='tcg' name='e500'/>
-  <cpu type='tcg' name='mpc8347ea'/>
-  <cpu type='tcg' name='mpc8347e'/>
-  <cpu type='tcg' name='mpc8347a'/>
-  <cpu type='tcg' name='mpc8347'/>
-  <cpu type='tcg' name='e300'/>
-  <cpu type='tcg' name='e200'/>
-  <cpu type='tcg' name='mpc8280'/>
-  <cpu type='tcg' name='mpc8275'/>
-  <cpu type='tcg' name='mpc8272'/>
-  <cpu type='tcg' name='mpc8271'/>
-  <cpu type='tcg' name='mpc8270'/>
-  <cpu type='tcg' name='mpc8266_hip4'/>
-  <cpu type='tcg' name='mpc8266_hip3'/>
-  <cpu type='tcg' name='mpc8266'/>
-  <cpu type='tcg' name='mpc8265_hip4'/>
-  <cpu type='tcg' name='mpc8265_hip3'/>
-  <cpu type='tcg' name='mpc8265'/>
-  <cpu type='tcg' name='mpc8264_hip4'/>
-  <cpu type='tcg' name='mpc8264_hip3'/>
-  <cpu type='tcg' name='mpc8264'/>
-  <cpu type='tcg' name='mpc8260_hip4'/>
-  <cpu type='tcg' name='mpc8260_hip3'/>
-  <cpu type='tcg' name='mpc8260'/>
-  <cpu type='tcg' name='mpc8255_hip4'/>
-  <cpu type='tcg' name='mpc8255_hip3'/>
-  <cpu type='tcg' name='mpc8255'/>
-  <cpu type='tcg' name='mpc8250_hip4'/>
-  <cpu type='tcg' name='mpc8250_hip3'/>
-  <cpu type='tcg' name='mpc8250'/>
-  <cpu type='tcg' name='mpc8248'/>
-  <cpu type='tcg' name='mpc8247'/>
-  <cpu type='tcg' name='mpc8245'/>
-  <cpu type='tcg' name='mpc8241'/>
-  <cpu type='tcg' name='powerquicc-ii'/>
-  <cpu type='tcg' name='mpc82xx'/>
-  <cpu type='tcg' name='mpc5200b'/>
-  <cpu type='tcg' name='mpc5200'/>
-  <cpu type='tcg' name='mpc52xx'/>
-  <cpu type='tcg' name='mpc8240'/>
-  <cpu type='tcg' name='460ex'/>
-  <cpu type='tcg' name='440ep'/>
-  <cpu type='tcg' name='x2vp50'/>
-  <cpu type='tcg' name='x2vp7'/>
-  <cpu type='tcg' name='405gpe'/>
-  <cpu type='tcg' name='405gp'/>
-  <cpu type='tcg' name='405cr'/>
-  <cpu type='tcg' name='405'/>
-  <cpu type='tcg' name='403'/>
+  <cpu type='tcg' name='default' typename='604-powerpc64-cpu'/>
+  <cpu type='tcg' name='ppc' typename='604-powerpc64-cpu'/>
+  <cpu type='tcg' name='ppc32' typename='604-powerpc64-cpu'/>
+  <cpu type='tcg' name='ppc64' typename='970fx_v3.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='POWER9' typename='power9_v2.0-powerpc64-cpu'/>
+  <cpu type='tcg' name='power8nvl' typename='power8nvl_v1.0-powerpc64-cpu'/>
+  <cpu type='tcg' name='POWER8' typename='power8_v2.0-powerpc64-cpu'/>
+  <cpu type='tcg' name='power8e' typename='power8e_v2.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='power7+' typename='power7+_v2.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='POWER7' typename='power7_v2.3-powerpc64-cpu'/>
+  <cpu type='tcg' name='power5gs' typename='power5+_v2.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='power5+' typename='power5+_v2.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='970mp' typename='970mp_v1.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='970fx' typename='970fx_v3.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='970' typename='970_v2.2-powerpc64-cpu'/>
+  <cpu type='tcg' name='apollo7pm' typename='7457a_v1.0-powerpc64-cpu'/>
+  <cpu type='tcg' name='7457a' typename='7457a_v1.2-powerpc64-cpu'/>
+  <cpu type='tcg' name='7447a' typename='7447a_v1.2-powerpc64-cpu'/>
+  <cpu type='tcg' name='apollo7' typename='7457_v1.2-powerpc64-cpu'/>
+  <cpu type='tcg' name='7457' typename='7457_v1.2-powerpc64-cpu'/>
+  <cpu type='tcg' name='7447' typename='7447_v1.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='apollo6' typename='7455_v3.2-powerpc64-cpu'/>
+  <cpu type='tcg' name='7455' typename='7455_v3.2-powerpc64-cpu'/>
+  <cpu type='tcg' name='7445' typename='7445_v3.2-powerpc64-cpu'/>
+  <cpu type='tcg' name='7451' typename='7451_v2.3-powerpc64-cpu'/>
+  <cpu type='tcg' name='7441' typename='7441_v2.3-powerpc64-cpu'/>
+  <cpu type='tcg' name='vger' typename='7450_v2.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='7450' typename='7450_v2.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='7448' typename='7448_v2.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='nitro' typename='7410_v1.4-powerpc64-cpu'/>
+  <cpu type='tcg' name='7410' typename='7410_v1.4-powerpc64-cpu'/>
+  <cpu type='tcg' name='g4' typename='7400_v2.9-powerpc64-cpu'/>
+  <cpu type='tcg' name='max' typename='7400_v2.9-powerpc64-cpu'/>
+  <cpu type='tcg' name='7400' typename='7400_v2.9-powerpc64-cpu'/>
+  <cpu type='tcg' name='goldfinger' typename='755_v2.8-powerpc64-cpu'/>
+  <cpu type='tcg' name='755' typename='755_v2.8-powerpc64-cpu'/>
+  <cpu type='tcg' name='745' typename='745_v2.8-powerpc64-cpu'/>
+  <cpu type='tcg' name='lonestar' typename='750l_v3.2-powerpc64-cpu'/>
+  <cpu type='tcg' name='750l' typename='750l_v3.2-powerpc64-cpu'/>
+  <cpu type='tcg' name='750gx' typename='750gx_v1.2-powerpc64-cpu'/>
+  <cpu type='tcg' name='750fx' typename='750fx_v2.3-powerpc64-cpu'/>
+  <cpu type='tcg' name='750cxe' typename='750cxe_v3.1b-powerpc64-cpu'/>
+  <cpu type='tcg' name='750cx' typename='750cx_v2.2-powerpc64-cpu'/>
+  <cpu type='tcg' name='750cl' typename='750cl_v2.0-powerpc64-cpu'/>
+  <cpu type='tcg' name='conan/doyle' typename='750p-powerpc64-cpu'/>
+  <cpu type='tcg' name='g3' typename='750_v3.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='typhoon' typename='750_v3.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='750' typename='750_v3.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='arthur' typename='740_v3.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='740' typename='740_v3.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='mach5' typename='604r-powerpc64-cpu'/>
+  <cpu type='tcg' name='sirocco' typename='604e_v2.4-powerpc64-cpu'/>
+  <cpu type='tcg' name='604e' typename='604e_v2.4-powerpc64-cpu'/>
+  <cpu type='tcg' name='goldeneye' typename='603e7t-powerpc64-cpu'/>
+  <cpu type='tcg' name='603r' typename='603e7t-powerpc64-cpu'/>
+  <cpu type='tcg' name='vaillant' typename='603e7v-powerpc64-cpu'/>
+  <cpu type='tcg' name='stretch' typename='603e_v4.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='603e' typename='603e_v4.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='vanilla' typename='603-powerpc64-cpu'/>
+  <cpu type='tcg' name='601v' typename='601_v2-powerpc64-cpu'/>
+  <cpu type='tcg' name='601' typename='601_v2-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8560' typename='mpc8560_v21-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8555e' typename='mpc8555e_v11-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8555' typename='mpc8555_v11-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8548e' typename='mpc8548e_v21-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8548' typename='mpc8548_v21-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8547e' typename='mpc8547e_v21-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8545e' typename='mpc8545e_v21-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8545' typename='mpc8545_v21-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8544e' typename='mpc8544e_v11-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8544' typename='mpc8544_v11-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8543e' typename='mpc8543e_v21-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8543' typename='mpc8543_v21-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8541e' typename='mpc8541e_v11-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8541' typename='mpc8541_v11-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8540' typename='mpc8540_v21-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8533e' typename='mpc8533e_v11-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8533' typename='mpc8533_v11-powerpc64-cpu'/>
+  <cpu type='tcg' name='e500v2' typename='e500v2_v22-powerpc64-cpu'/>
+  <cpu type='tcg' name='e500v1' typename='e500_v20-powerpc64-cpu'/>
+  <cpu type='tcg' name='e500' typename='e500v2_v22-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8347ea' typename='mpc8347eat-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8347e' typename='mpc8347et-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8347a' typename='mpc8347at-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8347' typename='mpc8347t-powerpc64-cpu'/>
+  <cpu type='tcg' name='e300' typename='e300c3-powerpc64-cpu'/>
+  <cpu type='tcg' name='e200' typename='e200z6-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8280' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8275' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8272' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8271' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8270' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8266_hip4' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8266_hip3' typename='g2hip3-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8266' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8265_hip4' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8265_hip3' typename='g2hip3-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8265' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8264_hip4' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8264_hip3' typename='g2hip3-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8264' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8260_hip4' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8260_hip3' typename='g2hip3-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8260' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8255_hip4' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8255_hip3' typename='g2hip3-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8255' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8250_hip4' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8250_hip3' typename='g2hip3-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8250' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8248' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8247' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8245' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8241' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='tcg' name='powerquicc-ii' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc82xx' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc5200b' typename='mpc5200b_v21-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc5200' typename='mpc5200_v12-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc52xx' typename='mpc5200_v12-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8240' typename='603-powerpc64-cpu'/>
+  <cpu type='tcg' name='460ex' typename='460exb-powerpc64-cpu'/>
+  <cpu type='tcg' name='440ep' typename='440epb-powerpc64-cpu'/>
+  <cpu type='tcg' name='x2vp50' typename='x2vp20-powerpc64-cpu'/>
+  <cpu type='tcg' name='x2vp7' typename='x2vp4-powerpc64-cpu'/>
+  <cpu type='tcg' name='405gpe' typename='405crc-powerpc64-cpu'/>
+  <cpu type='tcg' name='405gp' typename='405gpd-powerpc64-cpu'/>
+  <cpu type='tcg' name='405cr' typename='405crc-powerpc64-cpu'/>
+  <cpu type='tcg' name='405' typename='405d4-powerpc64-cpu'/>
+  <cpu type='tcg' name='403' typename='403gc-powerpc64-cpu'/>
   <cpu type='tcg' name='mpc8547e_v21'/>
   <cpu type='tcg' name='g2gp'/>
   <cpu type='tcg' name='7457a_v1.1'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
index e65040fbb0..770fe022f2 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
@@ -209,80 +209,80 @@
     <property name='msa5-base' type='boolean' value='true'/>
     <property name='tods' type='boolean' value='false'/>
   </hostCPU>
-  <cpu type='kvm' name='z14.2' usable='yes'/>
-  <cpu type='kvm' name='z890.2' usable='yes'/>
-  <cpu type='kvm' name='z990.4' usable='yes'/>
-  <cpu type='kvm' name='z14ZR1' usable='yes'/>
-  <cpu type='kvm' name='z10BC.2' usable='yes'/>
-  <cpu type='kvm' name='z196.2' usable='yes'/>
-  <cpu type='kvm' name='z14' usable='yes'/>
-  <cpu type='kvm' name='z9BC-base' usable='yes'/>
-  <cpu type='kvm' name='zEC12-base' usable='yes'/>
-  <cpu type='kvm' name='z196-base' usable='yes'/>
-  <cpu type='kvm' name='z13-base' usable='yes'/>
-  <cpu type='kvm' name='z990.3' usable='yes'/>
-  <cpu type='kvm' name='host' usable='yes'/>
-  <cpu type='kvm' name='z9EC' usable='yes'/>
-  <cpu type='kvm' name='zBC12' usable='yes'/>
-  <cpu type='kvm' name='z9EC.3' usable='yes'/>
-  <cpu type='kvm' name='z196.2-base' usable='yes'/>
-  <cpu type='kvm' name='qemu' usable='no'>
+  <cpu type='kvm' name='z14.2' typename='z14.2-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z890.2' typename='z890.2-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z990.4' typename='z990.4-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z14ZR1' typename='z14ZR1-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z10BC.2' typename='z10BC.2-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z196.2' typename='z196.2-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z14' typename='z14-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z9BC-base' typename='z9BC-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='zEC12-base' typename='zEC12-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z196-base' typename='z196-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z13-base' typename='z13-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z990.3' typename='z990.3-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='host' typename='host-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z9EC' typename='z9EC-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='zBC12' typename='zBC12-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z9EC.3' typename='z9EC.3-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z196.2-base' typename='z196.2-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='qemu' typename='qemu-s390x-cpu' usable='no'>
     <blocker name='ais'/>
   </cpu>
-  <cpu type='kvm' name='zEC12.2-base' usable='yes'/>
-  <cpu type='kvm' name='z800-base' usable='yes'/>
-  <cpu type='kvm' name='z9EC.2' usable='yes'/>
-  <cpu type='kvm' name='z900.2-base' usable='yes'/>
-  <cpu type='kvm' name='z14ZR1-base' usable='yes'/>
-  <cpu type='kvm' name='z900.3' usable='yes'/>
-  <cpu type='kvm' name='z890' usable='yes'/>
-  <cpu type='kvm' name='z890-base' usable='yes'/>
-  <cpu type='kvm' name='z990.4-base' usable='yes'/>
-  <cpu type='kvm' name='z10BC.2-base' usable='yes'/>
-  <cpu type='kvm' name='z900.2' usable='yes'/>
-  <cpu type='kvm' name='z9BC.2-base' usable='yes'/>
-  <cpu type='kvm' name='z800' usable='yes'/>
-  <cpu type='kvm' name='z114' usable='yes'/>
-  <cpu type='kvm' name='z13' usable='yes'/>
-  <cpu type='kvm' name='z990' usable='yes'/>
-  <cpu type='kvm' name='z13s-base' usable='yes'/>
-  <cpu type='kvm' name='z990.2' usable='yes'/>
-  <cpu type='kvm' name='z14.2-base' usable='yes'/>
-  <cpu type='kvm' name='z14-base' usable='yes'/>
-  <cpu type='kvm' name='z890.2-base' usable='yes'/>
-  <cpu type='kvm' name='z196' usable='yes'/>
-  <cpu type='kvm' name='z10EC' usable='yes'/>
-  <cpu type='kvm' name='z13s' usable='yes'/>
-  <cpu type='kvm' name='z900' usable='yes'/>
-  <cpu type='kvm' name='z10EC.3' usable='yes'/>
-  <cpu type='kvm' name='z10EC.2-base' usable='yes'/>
-  <cpu type='kvm' name='z114-base' usable='yes'/>
-  <cpu type='kvm' name='z990.2-base' usable='yes'/>
-  <cpu type='kvm' name='z9EC.2-base' usable='yes'/>
-  <cpu type='kvm' name='z890.3' usable='yes'/>
-  <cpu type='kvm' name='z900.3-base' usable='yes'/>
-  <cpu type='kvm' name='z9BC.2' usable='yes'/>
-  <cpu type='kvm' name='z10BC' usable='yes'/>
-  <cpu type='kvm' name='z990.5' usable='yes'/>
-  <cpu type='kvm' name='zEC12.2' usable='yes'/>
-  <cpu type='kvm' name='z10EC-base' usable='yes'/>
-  <cpu type='kvm' name='z9EC-base' usable='yes'/>
-  <cpu type='kvm' name='z9EC.3-base' usable='yes'/>
-  <cpu type='kvm' name='zEC12' usable='yes'/>
-  <cpu type='kvm' name='z990.5-base' usable='yes'/>
-  <cpu type='kvm' name='z10BC-base' usable='yes'/>
-  <cpu type='kvm' name='max' usable='yes'/>
-  <cpu type='kvm' name='z900-base' usable='yes'/>
-  <cpu type='kvm' name='z13.2' usable='yes'/>
-  <cpu type='kvm' name='zBC12-base' usable='yes'/>
-  <cpu type='kvm' name='z13.2-base' usable='yes'/>
-  <cpu type='kvm' name='z890.3-base' usable='yes'/>
-  <cpu type='kvm' name='z990-base' usable='yes'/>
-  <cpu type='kvm' name='z10EC.2' usable='yes'/>
-  <cpu type='kvm' name='z9BC' usable='yes'/>
-  <cpu type='kvm' name='z10EC.3-base' usable='yes'/>
-  <cpu type='kvm' name='z990.3-base' usable='yes'/>
-  <cpu type='tcg' name='z14.2' usable='no'>
+  <cpu type='kvm' name='zEC12.2-base' typename='zEC12.2-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z800-base' typename='z800-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z9EC.2' typename='z9EC.2-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z900.2-base' typename='z900.2-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z14ZR1-base' typename='z14ZR1-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z900.3' typename='z900.3-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z890' typename='z890-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z890-base' typename='z890-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z990.4-base' typename='z990.4-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z10BC.2-base' typename='z10BC.2-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z900.2' typename='z900.2-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z9BC.2-base' typename='z9BC.2-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z800' typename='z800-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z114' typename='z114-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z13' typename='z13-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z990' typename='z990-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z13s-base' typename='z13s-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z990.2' typename='z990.2-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z14.2-base' typename='z14.2-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z14-base' typename='z14-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z890.2-base' typename='z890.2-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z196' typename='z196-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z10EC' typename='z10EC-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z13s' typename='z13s-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z900' typename='z900-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z10EC.3' typename='z10EC.3-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z10EC.2-base' typename='z10EC.2-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z114-base' typename='z114-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z990.2-base' typename='z990.2-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z9EC.2-base' typename='z9EC.2-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z890.3' typename='z890.3-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z900.3-base' typename='z900.3-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z9BC.2' typename='z9BC.2-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z10BC' typename='z10BC-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z990.5' typename='z990.5-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='zEC12.2' typename='zEC12.2-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z10EC-base' typename='z10EC-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z9EC-base' typename='z9EC-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z9EC.3-base' typename='z9EC.3-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='zEC12' typename='zEC12-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z990.5-base' typename='z990.5-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z10BC-base' typename='z10BC-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='max' typename='max-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z900-base' typename='z900-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z13.2' typename='z13.2-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='zBC12-base' typename='zBC12-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z13.2-base' typename='z13.2-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z890.3-base' typename='z890.3-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z990-base' typename='z990-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z10EC.2' typename='z10EC.2-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z9BC' typename='z9BC-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z10EC.3-base' typename='z10EC.3-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z990.3-base' typename='z990.3-base-s390x-cpu' usable='yes'/>
+  <cpu type='tcg' name='z14.2' typename='z14.2-s390x-cpu' usable='no'>
     <blocker name='ppno-sha-512-drng'/>
     <blocker name='pcc-xts-eaes-256'/>
     <blocker name='pcc-xts-eaes-128'/>
@@ -427,7 +427,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z890.2' usable='no'>
+  <cpu type='tcg' name='z890.2' typename='z890.2-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -441,7 +441,7 @@
     <blocker name='kmac-dea'/>
     <blocker name='hfpm'/>
   </cpu>
-  <cpu type='tcg' name='z990.4' usable='no'>
+  <cpu type='tcg' name='z990.4' typename='z990.4-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -455,7 +455,7 @@
     <blocker name='kmac-dea'/>
     <blocker name='hfpm'/>
   </cpu>
-  <cpu type='tcg' name='z14ZR1' usable='no'>
+  <cpu type='tcg' name='z14ZR1' typename='z14ZR1-s390x-cpu' usable='no'>
     <blocker name='ppno-sha-512-drng'/>
     <blocker name='pcc-xts-eaes-256'/>
     <blocker name='pcc-xts-eaes-128'/>
@@ -600,7 +600,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z10BC.2' usable='no'>
+  <cpu type='tcg' name='z10BC.2' typename='z10BC.2-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -628,7 +628,7 @@
     <blocker name='msa1'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z196.2' usable='no'>
+  <cpu type='tcg' name='z196.2' typename='z196.2-s390x-cpu' usable='no'>
     <blocker name='pcc-xts-eaes-256'/>
     <blocker name='pcc-xts-eaes-128'/>
     <blocker name='pcc-xts-aes-256'/>
@@ -747,7 +747,7 @@
     <blocker name='msa1'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z14' usable='no'>
+  <cpu type='tcg' name='z14' typename='z14-s390x-cpu' usable='no'>
     <blocker name='ppno-sha-512-drng'/>
     <blocker name='pcc-xts-eaes-256'/>
     <blocker name='pcc-xts-eaes-128'/>
@@ -892,7 +892,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z9BC-base' usable='no'>
+  <cpu type='tcg' name='z9BC-base' typename='z9BC-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -910,7 +910,7 @@
     <blocker name='asnlxr'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='zEC12-base' usable='no'>
+  <cpu type='tcg' name='zEC12-base' typename='zEC12-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -937,7 +937,7 @@
     <blocker name='asnlxr'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z196-base' usable='no'>
+  <cpu type='tcg' name='z196-base' typename='z196-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -963,7 +963,7 @@
     <blocker name='asnlxr'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z13-base' usable='no'>
+  <cpu type='tcg' name='z13-base' typename='z13-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -993,7 +993,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z990.3' usable='no'>
+  <cpu type='tcg' name='z990.3' typename='z990.3-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1007,8 +1007,8 @@
     <blocker name='kmac-dea'/>
     <blocker name='hfpm'/>
   </cpu>
-  <cpu type='tcg' name='host' usable='yes'/>
-  <cpu type='tcg' name='z9EC' usable='no'>
+  <cpu type='tcg' name='host' typename='host-s390x-cpu' usable='yes'/>
+  <cpu type='tcg' name='z9EC' typename='z9EC-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1029,7 +1029,7 @@
     <blocker name='msa1'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='zBC12' usable='no'>
+  <cpu type='tcg' name='zBC12' typename='zBC12-s390x-cpu' usable='no'>
     <blocker name='pcc-xts-eaes-256'/>
     <blocker name='pcc-xts-eaes-128'/>
     <blocker name='pcc-xts-aes-256'/>
@@ -1155,7 +1155,7 @@
     <blocker name='msa1'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z9EC.3' usable='no'>
+  <cpu type='tcg' name='z9EC.3' typename='z9EC.3-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1176,7 +1176,7 @@
     <blocker name='msa1'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z196.2-base' usable='no'>
+  <cpu type='tcg' name='z196.2-base' typename='z196.2-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1202,8 +1202,8 @@
     <blocker name='asnlxr'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='qemu' usable='yes'/>
-  <cpu type='tcg' name='zEC12.2-base' usable='no'>
+  <cpu type='tcg' name='qemu' typename='qemu-s390x-cpu' usable='yes'/>
+  <cpu type='tcg' name='zEC12.2-base' typename='zEC12.2-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1230,8 +1230,8 @@
     <blocker name='asnlxr'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z800-base' usable='yes'/>
-  <cpu type='tcg' name='z9EC.2' usable='no'>
+  <cpu type='tcg' name='z800-base' typename='z800-base-s390x-cpu' usable='yes'/>
+  <cpu type='tcg' name='z9EC.2' typename='z9EC.2-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1252,8 +1252,8 @@
     <blocker name='msa1'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z900.2-base' usable='yes'/>
-  <cpu type='tcg' name='z14ZR1-base' usable='no'>
+  <cpu type='tcg' name='z900.2-base' typename='z900.2-base-s390x-cpu' usable='yes'/>
+  <cpu type='tcg' name='z14ZR1-base' typename='z14ZR1-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1288,8 +1288,8 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z900.3' usable='yes'/>
-  <cpu type='tcg' name='z890' usable='no'>
+  <cpu type='tcg' name='z900.3' typename='z900.3-s390x-cpu' usable='yes'/>
+  <cpu type='tcg' name='z890' typename='z890-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1303,7 +1303,7 @@
     <blocker name='kmac-dea'/>
     <blocker name='hfpm'/>
   </cpu>
-  <cpu type='tcg' name='z890-base' usable='no'>
+  <cpu type='tcg' name='z890-base' typename='z890-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1317,7 +1317,7 @@
     <blocker name='kmac-dea'/>
     <blocker name='hfpm'/>
   </cpu>
-  <cpu type='tcg' name='z990.4-base' usable='no'>
+  <cpu type='tcg' name='z990.4-base' typename='z990.4-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1331,7 +1331,7 @@
     <blocker name='kmac-dea'/>
     <blocker name='hfpm'/>
   </cpu>
-  <cpu type='tcg' name='z10BC.2-base' usable='no'>
+  <cpu type='tcg' name='z10BC.2-base' typename='z10BC.2-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1354,8 +1354,8 @@
     <blocker name='asnlxr'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z900.2' usable='yes'/>
-  <cpu type='tcg' name='z9BC.2-base' usable='no'>
+  <cpu type='tcg' name='z900.2' typename='z900.2-s390x-cpu' usable='yes'/>
+  <cpu type='tcg' name='z9BC.2-base' typename='z9BC.2-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1373,8 +1373,8 @@
     <blocker name='asnlxr'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z800' usable='yes'/>
-  <cpu type='tcg' name='z114' usable='no'>
+  <cpu type='tcg' name='z800' typename='z800-s390x-cpu' usable='yes'/>
+  <cpu type='tcg' name='z114' typename='z114-s390x-cpu' usable='no'>
     <blocker name='pcc-xts-eaes-256'/>
     <blocker name='pcc-xts-eaes-128'/>
     <blocker name='pcc-xts-aes-256'/>
@@ -1493,7 +1493,7 @@
     <blocker name='msa1'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z13' usable='no'>
+  <cpu type='tcg' name='z13' typename='z13-s390x-cpu' usable='no'>
     <blocker name='ppno-sha-512-drng'/>
     <blocker name='pcc-xts-eaes-256'/>
     <blocker name='pcc-xts-eaes-128'/>
@@ -1624,7 +1624,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z990' usable='no'>
+  <cpu type='tcg' name='z990' typename='z990-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1638,7 +1638,7 @@
     <blocker name='kmac-dea'/>
     <blocker name='hfpm'/>
   </cpu>
-  <cpu type='tcg' name='z13s-base' usable='no'>
+  <cpu type='tcg' name='z13s-base' typename='z13s-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1668,7 +1668,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z990.2' usable='no'>
+  <cpu type='tcg' name='z990.2' typename='z990.2-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1682,7 +1682,7 @@
     <blocker name='kmac-dea'/>
     <blocker name='hfpm'/>
   </cpu>
-  <cpu type='tcg' name='z14.2-base' usable='no'>
+  <cpu type='tcg' name='z14.2-base' typename='z14.2-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1717,7 +1717,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z14-base' usable='no'>
+  <cpu type='tcg' name='z14-base' typename='z14-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1752,7 +1752,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z890.2-base' usable='no'>
+  <cpu type='tcg' name='z890.2-base' typename='z890.2-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1766,7 +1766,7 @@
     <blocker name='kmac-dea'/>
     <blocker name='hfpm'/>
   </cpu>
-  <cpu type='tcg' name='z196' usable='no'>
+  <cpu type='tcg' name='z196' typename='z196-s390x-cpu' usable='no'>
     <blocker name='pcc-xts-eaes-256'/>
     <blocker name='pcc-xts-eaes-128'/>
     <blocker name='pcc-xts-aes-256'/>
@@ -1885,7 +1885,7 @@
     <blocker name='msa1'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z10EC' usable='no'>
+  <cpu type='tcg' name='z10EC' typename='z10EC-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1913,7 +1913,7 @@
     <blocker name='msa1'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z13s' usable='no'>
+  <cpu type='tcg' name='z13s' typename='z13s-s390x-cpu' usable='no'>
     <blocker name='ppno-sha-512-drng'/>
     <blocker name='pcc-xts-eaes-256'/>
     <blocker name='pcc-xts-eaes-128'/>
@@ -2044,8 +2044,8 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z900' usable='yes'/>
-  <cpu type='tcg' name='z10EC.3' usable='no'>
+  <cpu type='tcg' name='z900' typename='z900-s390x-cpu' usable='yes'/>
+  <cpu type='tcg' name='z10EC.3' typename='z10EC.3-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -2073,7 +2073,7 @@
     <blocker name='msa1'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z10EC.2-base' usable='no'>
+  <cpu type='tcg' name='z10EC.2-base' typename='z10EC.2-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -2096,7 +2096,7 @@
     <blocker name='asnlxr'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z114-base' usable='no'>
+  <cpu type='tcg' name='z114-base' typename='z114-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -2122,7 +2122,7 @@
     <blocker name='asnlxr'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z990.2-base' usable='no'>
+  <cpu type='tcg' name='z990.2-base' typename='z990.2-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -2136,7 +2136,7 @@
     <blocker name='kmac-dea'/>
     <blocker name='hfpm'/>
   </cpu>
-  <cpu type='tcg' name='z9EC.2-base' usable='no'>
+  <cpu type='tcg' name='z9EC.2-base' typename='z9EC.2-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -2154,7 +2154,7 @@
     <blocker name='asnlxr'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z890.3' usable='no'>
+  <cpu type='tcg' name='z890.3' typename='z890.3-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -2168,8 +2168,8 @@
     <blocker name='kmac-dea'/>
     <blocker name='hfpm'/>
   </cpu>
-  <cpu type='tcg' name='z900.3-base' usable='yes'/>
-  <cpu type='tcg' name='z9BC.2' usable='no'>
+  <cpu type='tcg' name='z900.3-base' typename='z900.3-base-s390x-cpu' usable='yes'/>
+  <cpu type='tcg' name='z9BC.2' typename='z9BC.2-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -2190,7 +2190,7 @@
     <blocker name='msa1'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z10BC' usable='no'>
+  <cpu type='tcg' name='z10BC' typename='z10BC-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -2218,7 +2218,7 @@
     <blocker name='msa1'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z990.5' usable='no'>
+  <cpu type='tcg' name='z990.5' typename='z990.5-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -2232,7 +2232,7 @@
     <blocker name='kmac-dea'/>
     <blocker name='hfpm'/>
   </cpu>
-  <cpu type='tcg' name='zEC12.2' usable='no'>
+  <cpu type='tcg' name='zEC12.2' typename='zEC12.2-s390x-cpu' usable='no'>
     <blocker name='pcc-xts-eaes-256'/>
     <blocker name='pcc-xts-eaes-128'/>
     <blocker name='pcc-xts-aes-256'/>
@@ -2358,7 +2358,7 @@
     <blocker name='msa1'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z10EC-base' usable='no'>
+  <cpu type='tcg' name='z10EC-base' typename='z10EC-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -2381,7 +2381,7 @@
     <blocker name='asnlxr'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z9EC-base' usable='no'>
+  <cpu type='tcg' name='z9EC-base' typename='z9EC-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -2399,7 +2399,7 @@
     <blocker name='asnlxr'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z9EC.3-base' usable='no'>
+  <cpu type='tcg' name='z9EC.3-base' typename='z9EC.3-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -2417,7 +2417,7 @@
     <blocker name='asnlxr'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='zEC12' usable='no'>
+  <cpu type='tcg' name='zEC12' typename='zEC12-s390x-cpu' usable='no'>
     <blocker name='pcc-xts-eaes-256'/>
     <blocker name='pcc-xts-eaes-128'/>
     <blocker name='pcc-xts-aes-256'/>
@@ -2543,7 +2543,7 @@
     <blocker name='msa1'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z990.5-base' usable='no'>
+  <cpu type='tcg' name='z990.5-base' typename='z990.5-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -2557,7 +2557,7 @@
     <blocker name='kmac-dea'/>
     <blocker name='hfpm'/>
   </cpu>
-  <cpu type='tcg' name='z10BC-base' usable='no'>
+  <cpu type='tcg' name='z10BC-base' typename='z10BC-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -2580,9 +2580,9 @@
     <blocker name='asnlxr'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='max' usable='yes'/>
-  <cpu type='tcg' name='z900-base' usable='yes'/>
-  <cpu type='tcg' name='z13.2' usable='no'>
+  <cpu type='tcg' name='max' typename='max-s390x-cpu' usable='yes'/>
+  <cpu type='tcg' name='z900-base' typename='z900-base-s390x-cpu' usable='yes'/>
+  <cpu type='tcg' name='z13.2' typename='z13.2-s390x-cpu' usable='no'>
     <blocker name='ppno-sha-512-drng'/>
     <blocker name='pcc-xts-eaes-256'/>
     <blocker name='pcc-xts-eaes-128'/>
@@ -2713,7 +2713,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='zBC12-base' usable='no'>
+  <cpu type='tcg' name='zBC12-base' typename='zBC12-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -2740,7 +2740,7 @@
     <blocker name='asnlxr'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z13.2-base' usable='no'>
+  <cpu type='tcg' name='z13.2-base' typename='z13.2-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -2770,7 +2770,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z890.3-base' usable='no'>
+  <cpu type='tcg' name='z890.3-base' typename='z890.3-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -2784,7 +2784,7 @@
     <blocker name='kmac-dea'/>
     <blocker name='hfpm'/>
   </cpu>
-  <cpu type='tcg' name='z990-base' usable='no'>
+  <cpu type='tcg' name='z990-base' typename='z990-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -2798,7 +2798,7 @@
     <blocker name='kmac-dea'/>
     <blocker name='hfpm'/>
   </cpu>
-  <cpu type='tcg' name='z10EC.2' usable='no'>
+  <cpu type='tcg' name='z10EC.2' typename='z10EC.2-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -2826,7 +2826,7 @@
     <blocker name='msa1'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z9BC' usable='no'>
+  <cpu type='tcg' name='z9BC' typename='z9BC-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -2847,7 +2847,7 @@
     <blocker name='msa1'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z10EC.3-base' usable='no'>
+  <cpu type='tcg' name='z10EC.3-base' typename='z10EC.3-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -2870,7 +2870,7 @@
     <blocker name='asnlxr'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z990.3-base' usable='no'>
+  <cpu type='tcg' name='z990.3-base' typename='z990.3-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
index e16d4af5a9..f5c0b3a28d 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
@@ -753,12 +753,12 @@
     <property name='avx512pf' type='boolean' value='false'/>
     <property name='xstore-en' type='boolean' value='false'/>
   </hostCPU>
-  <cpu type='kvm' name='max' usable='yes'/>
-  <cpu type='kvm' name='host' usable='yes'/>
-  <cpu type='kvm' name='base' usable='yes'/>
-  <cpu type='kvm' name='qemu64' usable='yes'/>
-  <cpu type='kvm' name='qemu32' usable='yes'/>
-  <cpu type='kvm' name='phenom' usable='no'>
+  <cpu type='kvm' name='max' typename='max-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='host' typename='host-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='base' typename='base-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='qemu64' typename='qemu64-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='qemu32' typename='qemu32-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='phenom' typename='phenom-x86_64-cpu' usable='no'>
     <blocker name='mmxext'/>
     <blocker name='fxsr-opt'/>
     <blocker name='3dnowext'/>
@@ -766,22 +766,22 @@
     <blocker name='sse4a'/>
     <blocker name='npt'/>
   </cpu>
-  <cpu type='kvm' name='pentium3' usable='yes'/>
-  <cpu type='kvm' name='pentium2' usable='yes'/>
-  <cpu type='kvm' name='pentium' usable='yes'/>
-  <cpu type='kvm' name='n270' usable='yes'/>
-  <cpu type='kvm' name='kvm64' usable='yes'/>
-  <cpu type='kvm' name='kvm32' usable='yes'/>
-  <cpu type='kvm' name='coreduo' usable='yes'/>
-  <cpu type='kvm' name='core2duo' usable='yes'/>
-  <cpu type='kvm' name='athlon' usable='no'>
+  <cpu type='kvm' name='pentium3' typename='pentium3-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='pentium2' typename='pentium2-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='pentium' typename='pentium-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='n270' typename='n270-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='kvm64' typename='kvm64-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='kvm32' typename='kvm32-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='coreduo' typename='coreduo-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='core2duo' typename='core2duo-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='athlon' typename='athlon-x86_64-cpu' usable='no'>
     <blocker name='mmxext'/>
     <blocker name='3dnowext'/>
     <blocker name='3dnow'/>
   </cpu>
-  <cpu type='kvm' name='Westmere-IBRS' usable='yes'/>
-  <cpu type='kvm' name='Westmere' usable='yes'/>
-  <cpu type='kvm' name='Skylake-Server-IBRS' usable='no'>
+  <cpu type='kvm' name='Westmere-IBRS' typename='Westmere-IBRS-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Westmere' typename='Westmere-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Skylake-Server-IBRS' typename='Skylake-Server-IBRS-x86_64-cpu' usable='no'>
     <blocker name='avx512f'/>
     <blocker name='avx512dq'/>
     <blocker name='clwb'/>
@@ -794,7 +794,7 @@
     <blocker name='avx512f'/>
     <blocker name='pku'/>
   </cpu>
-  <cpu type='kvm' name='Skylake-Server' usable='no'>
+  <cpu type='kvm' name='Skylake-Server' typename='Skylake-Server-x86_64-cpu' usable='no'>
     <blocker name='avx512f'/>
     <blocker name='avx512dq'/>
     <blocker name='clwb'/>
@@ -807,12 +807,12 @@
     <blocker name='avx512f'/>
     <blocker name='pku'/>
   </cpu>
-  <cpu type='kvm' name='Skylake-Client-IBRS' usable='yes'/>
-  <cpu type='kvm' name='Skylake-Client' usable='yes'/>
-  <cpu type='kvm' name='SandyBridge-IBRS' usable='yes'/>
-  <cpu type='kvm' name='SandyBridge' usable='yes'/>
-  <cpu type='kvm' name='Penryn' usable='yes'/>
-  <cpu type='kvm' name='Opteron_G5' usable='no'>
+  <cpu type='kvm' name='Skylake-Client-IBRS' typename='Skylake-Client-IBRS-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Skylake-Client' typename='Skylake-Client-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='SandyBridge-IBRS' typename='SandyBridge-IBRS-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='SandyBridge' typename='SandyBridge-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Penryn' typename='Penryn-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Opteron_G5' typename='Opteron_G5-x86_64-cpu' usable='no'>
     <blocker name='sse4a'/>
     <blocker name='misalignsse'/>
     <blocker name='xop'/>
@@ -821,7 +821,7 @@
     <blocker name='npt'/>
     <blocker name='nrip-save'/>
   </cpu>
-  <cpu type='kvm' name='Opteron_G4' usable='no'>
+  <cpu type='kvm' name='Opteron_G4' typename='Opteron_G4-x86_64-cpu' usable='no'>
     <blocker name='sse4a'/>
     <blocker name='misalignsse'/>
     <blocker name='xop'/>
@@ -829,15 +829,15 @@
     <blocker name='npt'/>
     <blocker name='nrip-save'/>
   </cpu>
-  <cpu type='kvm' name='Opteron_G3' usable='no'>
+  <cpu type='kvm' name='Opteron_G3' typename='Opteron_G3-x86_64-cpu' usable='no'>
     <blocker name='sse4a'/>
     <blocker name='misalignsse'/>
   </cpu>
-  <cpu type='kvm' name='Opteron_G2' usable='yes'/>
-  <cpu type='kvm' name='Opteron_G1' usable='yes'/>
-  <cpu type='kvm' name='Nehalem-IBRS' usable='yes'/>
-  <cpu type='kvm' name='Nehalem' usable='yes'/>
-  <cpu type='kvm' name='KnightsMill' usable='no'>
+  <cpu type='kvm' name='Opteron_G2' typename='Opteron_G2-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Opteron_G1' typename='Opteron_G1-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Nehalem-IBRS' typename='Nehalem-IBRS-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Nehalem' typename='Nehalem-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='KnightsMill' typename='KnightsMill-x86_64-cpu' usable='no'>
     <blocker name='avx512f'/>
     <blocker name='avx512pf'/>
     <blocker name='avx512er'/>
@@ -849,9 +849,9 @@
     <blocker name='avx512f'/>
     <blocker name='avx512f'/>
   </cpu>
-  <cpu type='kvm' name='IvyBridge-IBRS' usable='yes'/>
-  <cpu type='kvm' name='IvyBridge' usable='yes'/>
-  <cpu type='kvm' name='Icelake-Server' usable='no'>
+  <cpu type='kvm' name='IvyBridge-IBRS' typename='IvyBridge-IBRS-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='IvyBridge' typename='IvyBridge-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Icelake-Server' typename='Icelake-Server-x86_64-cpu' usable='no'>
     <blocker name='avx512f'/>
     <blocker name='avx512dq'/>
     <blocker name='clwb'/>
@@ -874,7 +874,7 @@
     <blocker name='avx512f'/>
     <blocker name='pku'/>
   </cpu>
-  <cpu type='kvm' name='Icelake-Client' usable='no'>
+  <cpu type='kvm' name='Icelake-Client' typename='Icelake-Client-x86_64-cpu' usable='no'>
     <blocker name='avx512vbmi'/>
     <blocker name='pku'/>
     <blocker name='avx512vbmi2'/>
@@ -887,11 +887,11 @@
     <blocker name='wbnoinvd'/>
     <blocker name='pku'/>
   </cpu>
-  <cpu type='kvm' name='Haswell-noTSX-IBRS' usable='yes'/>
-  <cpu type='kvm' name='Haswell-noTSX' usable='yes'/>
-  <cpu type='kvm' name='Haswell-IBRS' usable='yes'/>
-  <cpu type='kvm' name='Haswell' usable='yes'/>
-  <cpu type='kvm' name='EPYC-IBPB' usable='no'>
+  <cpu type='kvm' name='Haswell-noTSX-IBRS' typename='Haswell-noTSX-IBRS-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Haswell-noTSX' typename='Haswell-noTSX-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Haswell-IBRS' typename='Haswell-IBRS-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Haswell' typename='Haswell-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='EPYC-IBPB' typename='EPYC-IBPB-x86_64-cpu' usable='no'>
     <blocker name='sha-ni'/>
     <blocker name='mmxext'/>
     <blocker name='fxsr-opt'/>
@@ -903,7 +903,7 @@
     <blocker name='npt'/>
     <blocker name='nrip-save'/>
   </cpu>
-  <cpu type='kvm' name='EPYC' usable='no'>
+  <cpu type='kvm' name='EPYC' typename='EPYC-x86_64-cpu' usable='no'>
     <blocker name='sha-ni'/>
     <blocker name='mmxext'/>
     <blocker name='fxsr-opt'/>
@@ -914,8 +914,8 @@
     <blocker name='npt'/>
     <blocker name='nrip-save'/>
   </cpu>
-  <cpu type='kvm' name='Conroe' usable='yes'/>
-  <cpu type='kvm' name='Cascadelake-Server' usable='no'>
+  <cpu type='kvm' name='Conroe' typename='Conroe-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Cascadelake-Server' typename='Cascadelake-Server-x86_64-cpu' usable='no'>
     <blocker name='avx512f'/>
     <blocker name='avx512dq'/>
     <blocker name='clwb'/>
@@ -929,35 +929,35 @@
     <blocker name='avx512f'/>
     <blocker name='pku'/>
   </cpu>
-  <cpu type='kvm' name='Broadwell-noTSX-IBRS' usable='yes'/>
-  <cpu type='kvm' name='Broadwell-noTSX' usable='yes'/>
-  <cpu type='kvm' name='Broadwell-IBRS' usable='yes'/>
-  <cpu type='kvm' name='Broadwell' usable='yes'/>
-  <cpu type='kvm' name='486' usable='yes'/>
-  <cpu type='tcg' name='max' usable='yes'/>
-  <cpu type='tcg' name='host' usable='no'>
+  <cpu type='kvm' name='Broadwell-noTSX-IBRS' typename='Broadwell-noTSX-IBRS-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Broadwell-noTSX' typename='Broadwell-noTSX-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Broadwell-IBRS' typename='Broadwell-IBRS-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Broadwell' typename='Broadwell-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='486' typename='486-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='max' typename='max-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='host' typename='host-x86_64-cpu' usable='no'>
     <blocker name='kvm'/>
   </cpu>
-  <cpu type='tcg' name='base' usable='yes'/>
-  <cpu type='tcg' name='qemu64' usable='yes'/>
-  <cpu type='tcg' name='qemu32' usable='yes'/>
-  <cpu type='tcg' name='phenom' usable='no'>
+  <cpu type='tcg' name='base' typename='base-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='qemu64' typename='qemu64-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='qemu32' typename='qemu32-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='phenom' typename='phenom-x86_64-cpu' usable='no'>
     <blocker name='fxsr-opt'/>
   </cpu>
-  <cpu type='tcg' name='pentium3' usable='yes'/>
-  <cpu type='tcg' name='pentium2' usable='yes'/>
-  <cpu type='tcg' name='pentium' usable='yes'/>
-  <cpu type='tcg' name='n270' usable='yes'/>
-  <cpu type='tcg' name='kvm64' usable='yes'/>
-  <cpu type='tcg' name='kvm32' usable='yes'/>
-  <cpu type='tcg' name='coreduo' usable='yes'/>
-  <cpu type='tcg' name='core2duo' usable='yes'/>
-  <cpu type='tcg' name='athlon' usable='yes'/>
-  <cpu type='tcg' name='Westmere-IBRS' usable='no'>
+  <cpu type='tcg' name='pentium3' typename='pentium3-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='pentium2' typename='pentium2-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='pentium' typename='pentium-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='n270' typename='n270-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='kvm64' typename='kvm64-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='kvm32' typename='kvm32-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='coreduo' typename='coreduo-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='core2duo' typename='core2duo-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='athlon' typename='athlon-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='Westmere-IBRS' typename='Westmere-IBRS-x86_64-cpu' usable='no'>
     <blocker name='spec-ctrl'/>
   </cpu>
-  <cpu type='tcg' name='Westmere' usable='yes'/>
-  <cpu type='tcg' name='Skylake-Server-IBRS' usable='no'>
+  <cpu type='tcg' name='Westmere' typename='Westmere-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='Skylake-Server-IBRS' typename='Skylake-Server-IBRS-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -979,7 +979,7 @@
     <blocker name='3dnowprefetch'/>
     <blocker name='xsavec'/>
   </cpu>
-  <cpu type='tcg' name='Skylake-Server' usable='no'>
+  <cpu type='tcg' name='Skylake-Server' typename='Skylake-Server-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1000,7 +1000,7 @@
     <blocker name='3dnowprefetch'/>
     <blocker name='xsavec'/>
   </cpu>
-  <cpu type='tcg' name='Skylake-Client-IBRS' usable='no'>
+  <cpu type='tcg' name='Skylake-Client-IBRS' typename='Skylake-Client-IBRS-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1017,7 +1017,7 @@
     <blocker name='3dnowprefetch'/>
     <blocker name='xsavec'/>
   </cpu>
-  <cpu type='tcg' name='Skylake-Client' usable='no'>
+  <cpu type='tcg' name='Skylake-Client' typename='Skylake-Client-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1033,19 +1033,19 @@
     <blocker name='3dnowprefetch'/>
     <blocker name='xsavec'/>
   </cpu>
-  <cpu type='tcg' name='SandyBridge-IBRS' usable='no'>
+  <cpu type='tcg' name='SandyBridge-IBRS' typename='SandyBridge-IBRS-x86_64-cpu' usable='no'>
     <blocker name='x2apic'/>
     <blocker name='tsc-deadline'/>
     <blocker name='avx'/>
     <blocker name='spec-ctrl'/>
   </cpu>
-  <cpu type='tcg' name='SandyBridge' usable='no'>
+  <cpu type='tcg' name='SandyBridge' typename='SandyBridge-x86_64-cpu' usable='no'>
     <blocker name='x2apic'/>
     <blocker name='tsc-deadline'/>
     <blocker name='avx'/>
   </cpu>
-  <cpu type='tcg' name='Penryn' usable='yes'/>
-  <cpu type='tcg' name='Opteron_G5' usable='no'>
+  <cpu type='tcg' name='Penryn' typename='Penryn-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='Opteron_G5' typename='Opteron_G5-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='avx'/>
     <blocker name='f16c'/>
@@ -1056,7 +1056,7 @@
     <blocker name='tbm'/>
     <blocker name='nrip-save'/>
   </cpu>
-  <cpu type='tcg' name='Opteron_G4' usable='no'>
+  <cpu type='tcg' name='Opteron_G4' typename='Opteron_G4-x86_64-cpu' usable='no'>
     <blocker name='avx'/>
     <blocker name='misalignsse'/>
     <blocker name='3dnowprefetch'/>
@@ -1064,16 +1064,16 @@
     <blocker name='fma4'/>
     <blocker name='nrip-save'/>
   </cpu>
-  <cpu type='tcg' name='Opteron_G3' usable='no'>
+  <cpu type='tcg' name='Opteron_G3' typename='Opteron_G3-x86_64-cpu' usable='no'>
     <blocker name='misalignsse'/>
   </cpu>
-  <cpu type='tcg' name='Opteron_G2' usable='yes'/>
-  <cpu type='tcg' name='Opteron_G1' usable='yes'/>
-  <cpu type='tcg' name='Nehalem-IBRS' usable='no'>
+  <cpu type='tcg' name='Opteron_G2' typename='Opteron_G2-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='Opteron_G1' typename='Opteron_G1-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='Nehalem-IBRS' typename='Nehalem-IBRS-x86_64-cpu' usable='no'>
     <blocker name='spec-ctrl'/>
   </cpu>
-  <cpu type='tcg' name='Nehalem' usable='yes'/>
-  <cpu type='tcg' name='KnightsMill' usable='no'>
+  <cpu type='tcg' name='Nehalem' typename='Nehalem-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='KnightsMill' typename='KnightsMill-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='x2apic'/>
     <blocker name='tsc-deadline'/>
@@ -1091,7 +1091,7 @@
     <blocker name='avx512-4fmaps'/>
     <blocker name='3dnowprefetch'/>
   </cpu>
-  <cpu type='tcg' name='IvyBridge-IBRS' usable='no'>
+  <cpu type='tcg' name='IvyBridge-IBRS' typename='IvyBridge-IBRS-x86_64-cpu' usable='no'>
     <blocker name='x2apic'/>
     <blocker name='tsc-deadline'/>
     <blocker name='avx'/>
@@ -1099,14 +1099,14 @@
     <blocker name='rdrand'/>
     <blocker name='spec-ctrl'/>
   </cpu>
-  <cpu type='tcg' name='IvyBridge' usable='no'>
+  <cpu type='tcg' name='IvyBridge' typename='IvyBridge-x86_64-cpu' usable='no'>
     <blocker name='x2apic'/>
     <blocker name='tsc-deadline'/>
     <blocker name='avx'/>
     <blocker name='f16c'/>
     <blocker name='rdrand'/>
   </cpu>
-  <cpu type='tcg' name='Icelake-Server' usable='no'>
+  <cpu type='tcg' name='Icelake-Server' typename='Icelake-Server-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1139,7 +1139,7 @@
     <blocker name='wbnoinvd'/>
     <blocker name='xsavec'/>
   </cpu>
-  <cpu type='tcg' name='Icelake-Client' usable='no'>
+  <cpu type='tcg' name='Icelake-Client' typename='Icelake-Client-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1167,7 +1167,7 @@
     <blocker name='wbnoinvd'/>
     <blocker name='xsavec'/>
   </cpu>
-  <cpu type='tcg' name='Haswell-noTSX-IBRS' usable='no'>
+  <cpu type='tcg' name='Haswell-noTSX-IBRS' typename='Haswell-noTSX-IBRS-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1179,7 +1179,7 @@
     <blocker name='invpcid'/>
     <blocker name='spec-ctrl'/>
   </cpu>
-  <cpu type='tcg' name='Haswell-noTSX' usable='no'>
+  <cpu type='tcg' name='Haswell-noTSX' typename='Haswell-noTSX-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1190,7 +1190,7 @@
     <blocker name='avx2'/>
     <blocker name='invpcid'/>
   </cpu>
-  <cpu type='tcg' name='Haswell-IBRS' usable='no'>
+  <cpu type='tcg' name='Haswell-IBRS' typename='Haswell-IBRS-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1204,7 +1204,7 @@
     <blocker name='rtm'/>
     <blocker name='spec-ctrl'/>
   </cpu>
-  <cpu type='tcg' name='Haswell' usable='no'>
+  <cpu type='tcg' name='Haswell' typename='Haswell-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1217,7 +1217,7 @@
     <blocker name='invpcid'/>
     <blocker name='rtm'/>
   </cpu>
-  <cpu type='tcg' name='EPYC-IBPB' usable='no'>
+  <cpu type='tcg' name='EPYC-IBPB' typename='EPYC-IBPB-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='avx'/>
     <blocker name='f16c'/>
@@ -1234,7 +1234,7 @@
     <blocker name='nrip-save'/>
     <blocker name='xsavec'/>
   </cpu>
-  <cpu type='tcg' name='EPYC' usable='no'>
+  <cpu type='tcg' name='EPYC' typename='EPYC-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='avx'/>
     <blocker name='f16c'/>
@@ -1250,8 +1250,8 @@
     <blocker name='nrip-save'/>
     <blocker name='xsavec'/>
   </cpu>
-  <cpu type='tcg' name='Conroe' usable='yes'/>
-  <cpu type='tcg' name='Cascadelake-Server' usable='no'>
+  <cpu type='tcg' name='Conroe' typename='Conroe-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='Cascadelake-Server' typename='Cascadelake-Server-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1275,7 +1275,7 @@
     <blocker name='3dnowprefetch'/>
     <blocker name='xsavec'/>
   </cpu>
-  <cpu type='tcg' name='Broadwell-noTSX-IBRS' usable='no'>
+  <cpu type='tcg' name='Broadwell-noTSX-IBRS' typename='Broadwell-noTSX-IBRS-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1289,7 +1289,7 @@
     <blocker name='spec-ctrl'/>
     <blocker name='3dnowprefetch'/>
   </cpu>
-  <cpu type='tcg' name='Broadwell-noTSX' usable='no'>
+  <cpu type='tcg' name='Broadwell-noTSX' typename='Broadwell-noTSX-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1302,7 +1302,7 @@
     <blocker name='rdseed'/>
     <blocker name='3dnowprefetch'/>
   </cpu>
-  <cpu type='tcg' name='Broadwell-IBRS' usable='no'>
+  <cpu type='tcg' name='Broadwell-IBRS' typename='Broadwell-IBRS-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1318,7 +1318,7 @@
     <blocker name='spec-ctrl'/>
     <blocker name='3dnowprefetch'/>
   </cpu>
-  <cpu type='tcg' name='Broadwell' usable='no'>
+  <cpu type='tcg' name='Broadwell' typename='Broadwell-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1333,7 +1333,7 @@
     <blocker name='rdseed'/>
     <blocker name='3dnowprefetch'/>
   </cpu>
-  <cpu type='tcg' name='486' usable='yes'/>
+  <cpu type='tcg' name='486' typename='486-x86_64-cpu' usable='yes'/>
   <machine name='pc-i440fx-4.0' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/>
   <machine name='isapc' hotplugCpus='yes' maxCpus='1'/>
   <machine name='pc-1.1' hotplugCpus='yes' maxCpus='255'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
index 36b07579b2..b2c4ee61d9 100644
--- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
@@ -615,14 +615,14 @@
     <property name='avx512pf' type='boolean' value='false'/>
     <property name='xstore-en' type='boolean' value='false'/>
   </hostCPU>
-  <cpu type='kvm' name='max' usable='yes'/>
-  <cpu type='kvm' name='host' usable='yes'/>
-  <cpu type='kvm' name='base' usable='yes'/>
-  <cpu type='kvm' name='qemu64-v1' usable='yes'/>
-  <cpu type='kvm' name='qemu64' usable='yes'/>
-  <cpu type='kvm' name='qemu32-v1' usable='yes'/>
-  <cpu type='kvm' name='qemu32' usable='yes'/>
-  <cpu type='kvm' name='phenom-v1' usable='no'>
+  <cpu type='kvm' name='max' typename='max-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='host' typename='host-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='base' typename='base-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='qemu64-v1' typename='qemu64-v1-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='qemu64' typename='qemu64-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='qemu32-v1' typename='qemu32-v1-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='qemu32' typename='qemu32-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='phenom-v1' typename='phenom-v1-x86_64-cpu' usable='no'>
     <blocker name='mmxext'/>
     <blocker name='fxsr-opt'/>
     <blocker name='3dnowext'/>
@@ -630,7 +630,7 @@
     <blocker name='sse4a'/>
     <blocker name='npt'/>
   </cpu>
-  <cpu type='kvm' name='phenom' usable='no'>
+  <cpu type='kvm' name='phenom' typename='phenom-x86_64-cpu' usable='no'>
     <blocker name='mmxext'/>
     <blocker name='fxsr-opt'/>
     <blocker name='3dnowext'/>
@@ -638,37 +638,37 @@
     <blocker name='sse4a'/>
     <blocker name='npt'/>
   </cpu>
-  <cpu type='kvm' name='pentium3-v1' usable='yes'/>
-  <cpu type='kvm' name='pentium3' usable='yes'/>
-  <cpu type='kvm' name='pentium2-v1' usable='yes'/>
-  <cpu type='kvm' name='pentium2' usable='yes'/>
-  <cpu type='kvm' name='pentium-v1' usable='yes'/>
-  <cpu type='kvm' name='pentium' usable='yes'/>
-  <cpu type='kvm' name='n270-v1' usable='yes'/>
-  <cpu type='kvm' name='n270' usable='yes'/>
-  <cpu type='kvm' name='kvm64-v1' usable='yes'/>
-  <cpu type='kvm' name='kvm64' usable='yes'/>
-  <cpu type='kvm' name='kvm32-v1' usable='yes'/>
-  <cpu type='kvm' name='kvm32' usable='yes'/>
-  <cpu type='kvm' name='coreduo-v1' usable='yes'/>
-  <cpu type='kvm' name='coreduo' usable='yes'/>
-  <cpu type='kvm' name='core2duo-v1' usable='yes'/>
-  <cpu type='kvm' name='core2duo' usable='yes'/>
-  <cpu type='kvm' name='athlon-v1' usable='no'>
+  <cpu type='kvm' name='pentium3-v1' typename='pentium3-v1-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='pentium3' typename='pentium3-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='pentium2-v1' typename='pentium2-v1-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='pentium2' typename='pentium2-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='pentium-v1' typename='pentium-v1-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='pentium' typename='pentium-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='n270-v1' typename='n270-v1-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='n270' typename='n270-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='kvm64-v1' typename='kvm64-v1-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='kvm64' typename='kvm64-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='kvm32-v1' typename='kvm32-v1-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='kvm32' typename='kvm32-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='coreduo-v1' typename='coreduo-v1-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='coreduo' typename='coreduo-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='core2duo-v1' typename='core2duo-v1-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='core2duo' typename='core2duo-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='athlon-v1' typename='athlon-v1-x86_64-cpu' usable='no'>
     <blocker name='mmxext'/>
     <blocker name='3dnowext'/>
     <blocker name='3dnow'/>
   </cpu>
-  <cpu type='kvm' name='athlon' usable='no'>
+  <cpu type='kvm' name='athlon' typename='athlon-x86_64-cpu' usable='no'>
     <blocker name='mmxext'/>
     <blocker name='3dnowext'/>
     <blocker name='3dnow'/>
   </cpu>
-  <cpu type='kvm' name='Westmere-v2' usable='yes'/>
-  <cpu type='kvm' name='Westmere-v1' usable='yes'/>
-  <cpu type='kvm' name='Westmere-IBRS' usable='yes'/>
-  <cpu type='kvm' name='Westmere' usable='yes'/>
-  <cpu type='kvm' name='Snowridge-v1' usable='no'>
+  <cpu type='kvm' name='Westmere-v2' typename='Westmere-v2-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Westmere-v1' typename='Westmere-v1-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Westmere-IBRS' typename='Westmere-IBRS-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Westmere' typename='Westmere-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Snowridge-v1' typename='Snowridge-v1-x86_64-cpu' usable='no'>
     <blocker name='clwb'/>
     <blocker name='sha-ni'/>
     <blocker name='gfni'/>
@@ -678,7 +678,7 @@
     <blocker name='core-capability'/>
     <blocker name='split-lock-detect'/>
   </cpu>
-  <cpu type='kvm' name='Snowridge' usable='no'>
+  <cpu type='kvm' name='Snowridge' typename='Snowridge-x86_64-cpu' usable='no'>
     <blocker name='clwb'/>
     <blocker name='sha-ni'/>
     <blocker name='gfni'/>
@@ -688,7 +688,7 @@
     <blocker name='core-capability'/>
     <blocker name='split-lock-detect'/>
   </cpu>
-  <cpu type='kvm' name='Skylake-Server-v2' usable='no'>
+  <cpu type='kvm' name='Skylake-Server-v2' typename='Skylake-Server-v2-x86_64-cpu' usable='no'>
     <blocker name='avx512f'/>
     <blocker name='avx512dq'/>
     <blocker name='clwb'/>
@@ -701,7 +701,7 @@
     <blocker name='avx512f'/>
     <blocker name='pku'/>
   </cpu>
-  <cpu type='kvm' name='Skylake-Server-v1' usable='no'>
+  <cpu type='kvm' name='Skylake-Server-v1' typename='Skylake-Server-v1-x86_64-cpu' usable='no'>
     <blocker name='avx512f'/>
     <blocker name='avx512dq'/>
     <blocker name='clwb'/>
@@ -714,7 +714,7 @@
     <blocker name='avx512f'/>
     <blocker name='pku'/>
   </cpu>
-  <cpu type='kvm' name='Skylake-Server-IBRS' usable='no'>
+  <cpu type='kvm' name='Skylake-Server-IBRS' typename='Skylake-Server-IBRS-x86_64-cpu' usable='no'>
     <blocker name='avx512f'/>
     <blocker name='avx512dq'/>
     <blocker name='clwb'/>
@@ -727,7 +727,7 @@
     <blocker name='avx512f'/>
     <blocker name='pku'/>
   </cpu>
-  <cpu type='kvm' name='Skylake-Server' usable='no'>
+  <cpu type='kvm' name='Skylake-Server' typename='Skylake-Server-x86_64-cpu' usable='no'>
     <blocker name='avx512f'/>
     <blocker name='avx512dq'/>
     <blocker name='clwb'/>
@@ -740,17 +740,17 @@
     <blocker name='avx512f'/>
     <blocker name='pku'/>
   </cpu>
-  <cpu type='kvm' name='Skylake-Client-v2' usable='yes'/>
-  <cpu type='kvm' name='Skylake-Client-v1' usable='yes'/>
-  <cpu type='kvm' name='Skylake-Client-IBRS' usable='yes'/>
-  <cpu type='kvm' name='Skylake-Client' usable='yes'/>
-  <cpu type='kvm' name='SandyBridge-v2' usable='yes'/>
-  <cpu type='kvm' name='SandyBridge-v1' usable='yes'/>
-  <cpu type='kvm' name='SandyBridge-IBRS' usable='yes'/>
-  <cpu type='kvm' name='SandyBridge' usable='yes'/>
-  <cpu type='kvm' name='Penryn-v1' usable='yes'/>
-  <cpu type='kvm' name='Penryn' usable='yes'/>
-  <cpu type='kvm' name='Opteron_G5-v1' usable='no'>
+  <cpu type='kvm' name='Skylake-Client-v2' typename='Skylake-Client-v2-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Skylake-Client-v1' typename='Skylake-Client-v1-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Skylake-Client-IBRS' typename='Skylake-Client-IBRS-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Skylake-Client' typename='Skylake-Client-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='SandyBridge-v2' typename='SandyBridge-v2-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='SandyBridge-v1' typename='SandyBridge-v1-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='SandyBridge-IBRS' typename='SandyBridge-IBRS-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='SandyBridge' typename='SandyBridge-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Penryn-v1' typename='Penryn-v1-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Penryn' typename='Penryn-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Opteron_G5-v1' typename='Opteron_G5-v1-x86_64-cpu' usable='no'>
     <blocker name='sse4a'/>
     <blocker name='misalignsse'/>
     <blocker name='xop'/>
@@ -759,7 +759,7 @@
     <blocker name='npt'/>
     <blocker name='nrip-save'/>
   </cpu>
-  <cpu type='kvm' name='Opteron_G5' usable='no'>
+  <cpu type='kvm' name='Opteron_G5' typename='Opteron_G5-x86_64-cpu' usable='no'>
     <blocker name='sse4a'/>
     <blocker name='misalignsse'/>
     <blocker name='xop'/>
@@ -768,7 +768,7 @@
     <blocker name='npt'/>
     <blocker name='nrip-save'/>
   </cpu>
-  <cpu type='kvm' name='Opteron_G4-v1' usable='no'>
+  <cpu type='kvm' name='Opteron_G4-v1' typename='Opteron_G4-v1-x86_64-cpu' usable='no'>
     <blocker name='sse4a'/>
     <blocker name='misalignsse'/>
     <blocker name='xop'/>
@@ -776,7 +776,7 @@
     <blocker name='npt'/>
     <blocker name='nrip-save'/>
   </cpu>
-  <cpu type='kvm' name='Opteron_G4' usable='no'>
+  <cpu type='kvm' name='Opteron_G4' typename='Opteron_G4-x86_64-cpu' usable='no'>
     <blocker name='sse4a'/>
     <blocker name='misalignsse'/>
     <blocker name='xop'/>
@@ -784,23 +784,23 @@
     <blocker name='npt'/>
     <blocker name='nrip-save'/>
   </cpu>
-  <cpu type='kvm' name='Opteron_G3-v1' usable='no'>
+  <cpu type='kvm' name='Opteron_G3-v1' typename='Opteron_G3-v1-x86_64-cpu' usable='no'>
     <blocker name='sse4a'/>
     <blocker name='misalignsse'/>
   </cpu>
-  <cpu type='kvm' name='Opteron_G3' usable='no'>
+  <cpu type='kvm' name='Opteron_G3' typename='Opteron_G3-x86_64-cpu' usable='no'>
     <blocker name='sse4a'/>
     <blocker name='misalignsse'/>
   </cpu>
-  <cpu type='kvm' name='Opteron_G2-v1' usable='yes'/>
-  <cpu type='kvm' name='Opteron_G2' usable='yes'/>
-  <cpu type='kvm' name='Opteron_G1-v1' usable='yes'/>
-  <cpu type='kvm' name='Opteron_G1' usable='yes'/>
-  <cpu type='kvm' name='Nehalem-v2' usable='yes'/>
-  <cpu type='kvm' name='Nehalem-v1' usable='yes'/>
-  <cpu type='kvm' name='Nehalem-IBRS' usable='yes'/>
-  <cpu type='kvm' name='Nehalem' usable='yes'/>
-  <cpu type='kvm' name='KnightsMill-v1' usable='no'>
+  <cpu type='kvm' name='Opteron_G2-v1' typename='Opteron_G2-v1-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Opteron_G2' typename='Opteron_G2-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Opteron_G1-v1' typename='Opteron_G1-v1-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Opteron_G1' typename='Opteron_G1-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Nehalem-v2' typename='Nehalem-v2-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Nehalem-v1' typename='Nehalem-v1-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Nehalem-IBRS' typename='Nehalem-IBRS-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Nehalem' typename='Nehalem-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='KnightsMill-v1' typename='KnightsMill-v1-x86_64-cpu' usable='no'>
     <blocker name='avx512f'/>
     <blocker name='avx512pf'/>
     <blocker name='avx512er'/>
@@ -812,7 +812,7 @@
     <blocker name='avx512f'/>
     <blocker name='avx512f'/>
   </cpu>
-  <cpu type='kvm' name='KnightsMill' usable='no'>
+  <cpu type='kvm' name='KnightsMill' typename='KnightsMill-x86_64-cpu' usable='no'>
     <blocker name='avx512f'/>
     <blocker name='avx512pf'/>
     <blocker name='avx512er'/>
@@ -824,11 +824,11 @@
     <blocker name='avx512f'/>
     <blocker name='avx512f'/>
   </cpu>
-  <cpu type='kvm' name='IvyBridge-v2' usable='yes'/>
-  <cpu type='kvm' name='IvyBridge-v1' usable='yes'/>
-  <cpu type='kvm' name='IvyBridge-IBRS' usable='yes'/>
-  <cpu type='kvm' name='IvyBridge' usable='yes'/>
-  <cpu type='kvm' name='Icelake-Server-v1' usable='no'>
+  <cpu type='kvm' name='IvyBridge-v2' typename='IvyBridge-v2-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='IvyBridge-v1' typename='IvyBridge-v1-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='IvyBridge-IBRS' typename='IvyBridge-IBRS-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='IvyBridge' typename='IvyBridge-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Icelake-Server-v1' typename='Icelake-Server-v1-x86_64-cpu' usable='no'>
     <blocker name='avx512f'/>
     <blocker name='avx512dq'/>
     <blocker name='clwb'/>
@@ -851,7 +851,7 @@
     <blocker name='avx512f'/>
     <blocker name='pku'/>
   </cpu>
-  <cpu type='kvm' name='Icelake-Server' usable='no'>
+  <cpu type='kvm' name='Icelake-Server' typename='Icelake-Server-x86_64-cpu' usable='no'>
     <blocker name='avx512f'/>
     <blocker name='avx512dq'/>
     <blocker name='clwb'/>
@@ -874,7 +874,7 @@
     <blocker name='avx512f'/>
     <blocker name='pku'/>
   </cpu>
-  <cpu type='kvm' name='Icelake-Client-v1' usable='no'>
+  <cpu type='kvm' name='Icelake-Client-v1' typename='Icelake-Client-v1-x86_64-cpu' usable='no'>
     <blocker name='avx512vbmi'/>
     <blocker name='pku'/>
     <blocker name='avx512vbmi2'/>
@@ -887,7 +887,7 @@
     <blocker name='wbnoinvd'/>
     <blocker name='pku'/>
   </cpu>
-  <cpu type='kvm' name='Icelake-Client' usable='no'>
+  <cpu type='kvm' name='Icelake-Client' typename='Icelake-Client-x86_64-cpu' usable='no'>
     <blocker name='avx512vbmi'/>
     <blocker name='pku'/>
     <blocker name='avx512vbmi2'/>
@@ -900,15 +900,15 @@
     <blocker name='wbnoinvd'/>
     <blocker name='pku'/>
   </cpu>
-  <cpu type='kvm' name='Haswell-v4' usable='yes'/>
-  <cpu type='kvm' name='Haswell-v3' usable='yes'/>
-  <cpu type='kvm' name='Haswell-v2' usable='yes'/>
-  <cpu type='kvm' name='Haswell-v1' usable='yes'/>
-  <cpu type='kvm' name='Haswell-noTSX-IBRS' usable='yes'/>
-  <cpu type='kvm' name='Haswell-noTSX' usable='yes'/>
-  <cpu type='kvm' name='Haswell-IBRS' usable='yes'/>
-  <cpu type='kvm' name='Haswell' usable='yes'/>
-  <cpu type='kvm' name='EPYC-v2' usable='no'>
+  <cpu type='kvm' name='Haswell-v4' typename='Haswell-v4-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Haswell-v3' typename='Haswell-v3-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Haswell-v2' typename='Haswell-v2-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Haswell-v1' typename='Haswell-v1-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Haswell-noTSX-IBRS' typename='Haswell-noTSX-IBRS-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Haswell-noTSX' typename='Haswell-noTSX-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Haswell-IBRS' typename='Haswell-IBRS-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Haswell' typename='Haswell-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='EPYC-v2' typename='EPYC-v2-x86_64-cpu' usable='no'>
     <blocker name='sha-ni'/>
     <blocker name='mmxext'/>
     <blocker name='fxsr-opt'/>
@@ -920,7 +920,7 @@
     <blocker name='npt'/>
     <blocker name='nrip-save'/>
   </cpu>
-  <cpu type='kvm' name='EPYC-v1' usable='no'>
+  <cpu type='kvm' name='EPYC-v1' typename='EPYC-v1-x86_64-cpu' usable='no'>
     <blocker name='sha-ni'/>
     <blocker name='mmxext'/>
     <blocker name='fxsr-opt'/>
@@ -931,7 +931,7 @@
     <blocker name='npt'/>
     <blocker name='nrip-save'/>
   </cpu>
-  <cpu type='kvm' name='EPYC-IBPB' usable='no'>
+  <cpu type='kvm' name='EPYC-IBPB' typename='EPYC-IBPB-x86_64-cpu' usable='no'>
     <blocker name='sha-ni'/>
     <blocker name='mmxext'/>
     <blocker name='fxsr-opt'/>
@@ -943,7 +943,7 @@
     <blocker name='npt'/>
     <blocker name='nrip-save'/>
   </cpu>
-  <cpu type='kvm' name='EPYC' usable='no'>
+  <cpu type='kvm' name='EPYC' typename='EPYC-x86_64-cpu' usable='no'>
     <blocker name='sha-ni'/>
     <blocker name='mmxext'/>
     <blocker name='fxsr-opt'/>
@@ -955,7 +955,7 @@
     <blocker name='npt'/>
     <blocker name='nrip-save'/>
   </cpu>
-  <cpu type='kvm' name='Dhyana-v1' usable='no'>
+  <cpu type='kvm' name='Dhyana-v1' typename='Dhyana-v1-x86_64-cpu' usable='no'>
     <blocker name='mmxext'/>
     <blocker name='fxsr-opt'/>
     <blocker name='cr8legacy'/>
@@ -966,7 +966,7 @@
     <blocker name='npt'/>
     <blocker name='nrip-save'/>
   </cpu>
-  <cpu type='kvm' name='Dhyana' usable='no'>
+  <cpu type='kvm' name='Dhyana' typename='Dhyana-x86_64-cpu' usable='no'>
     <blocker name='mmxext'/>
     <blocker name='fxsr-opt'/>
     <blocker name='cr8legacy'/>
@@ -977,9 +977,9 @@
     <blocker name='npt'/>
     <blocker name='nrip-save'/>
   </cpu>
-  <cpu type='kvm' name='Conroe-v1' usable='yes'/>
-  <cpu type='kvm' name='Conroe' usable='yes'/>
-  <cpu type='kvm' name='Cascadelake-Server-v2' usable='no'>
+  <cpu type='kvm' name='Conroe-v1' typename='Conroe-v1-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Conroe' typename='Conroe-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Cascadelake-Server-v2' typename='Cascadelake-Server-v2-x86_64-cpu' usable='no'>
     <blocker name='avx512f'/>
     <blocker name='avx512dq'/>
     <blocker name='clwb'/>
@@ -996,7 +996,7 @@
     <blocker name='ibrs-all'/>
     <blocker name='mds-no'/>
   </cpu>
-  <cpu type='kvm' name='Cascadelake-Server-v1' usable='no'>
+  <cpu type='kvm' name='Cascadelake-Server-v1' typename='Cascadelake-Server-v1-x86_64-cpu' usable='no'>
     <blocker name='avx512f'/>
     <blocker name='avx512dq'/>
     <blocker name='clwb'/>
@@ -1010,7 +1010,7 @@
     <blocker name='avx512f'/>
     <blocker name='pku'/>
   </cpu>
-  <cpu type='kvm' name='Cascadelake-Server' usable='no'>
+  <cpu type='kvm' name='Cascadelake-Server' typename='Cascadelake-Server-x86_64-cpu' usable='no'>
     <blocker name='avx512f'/>
     <blocker name='avx512dq'/>
     <blocker name='clwb'/>
@@ -1027,60 +1027,60 @@
     <blocker name='ibrs-all'/>
     <blocker name='mds-no'/>
   </cpu>
-  <cpu type='kvm' name='Broadwell-v4' usable='yes'/>
-  <cpu type='kvm' name='Broadwell-v3' usable='yes'/>
-  <cpu type='kvm' name='Broadwell-v2' usable='yes'/>
-  <cpu type='kvm' name='Broadwell-v1' usable='yes'/>
-  <cpu type='kvm' name='Broadwell-noTSX-IBRS' usable='yes'/>
-  <cpu type='kvm' name='Broadwell-noTSX' usable='yes'/>
-  <cpu type='kvm' name='Broadwell-IBRS' usable='yes'/>
-  <cpu type='kvm' name='Broadwell' usable='yes'/>
-  <cpu type='kvm' name='486-v1' usable='yes'/>
-  <cpu type='kvm' name='486' usable='yes'/>
-  <cpu type='tcg' name='max' usable='yes'/>
-  <cpu type='tcg' name='host' usable='no'>
+  <cpu type='kvm' name='Broadwell-v4' typename='Broadwell-v4-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Broadwell-v3' typename='Broadwell-v3-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Broadwell-v2' typename='Broadwell-v2-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Broadwell-v1' typename='Broadwell-v1-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Broadwell-noTSX-IBRS' typename='Broadwell-noTSX-IBRS-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Broadwell-noTSX' typename='Broadwell-noTSX-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Broadwell-IBRS' typename='Broadwell-IBRS-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Broadwell' typename='Broadwell-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='486-v1' typename='486-v1-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='486' typename='486-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='max' typename='max-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='host' typename='host-x86_64-cpu' usable='no'>
     <blocker name='kvm'/>
   </cpu>
-  <cpu type='tcg' name='base' usable='yes'/>
-  <cpu type='tcg' name='qemu64-v1' usable='yes'/>
-  <cpu type='tcg' name='qemu64' usable='yes'/>
-  <cpu type='tcg' name='qemu32-v1' usable='yes'/>
-  <cpu type='tcg' name='qemu32' usable='yes'/>
-  <cpu type='tcg' name='phenom-v1' usable='no'>
+  <cpu type='tcg' name='base' typename='base-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='qemu64-v1' typename='qemu64-v1-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='qemu64' typename='qemu64-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='qemu32-v1' typename='qemu32-v1-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='qemu32' typename='qemu32-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='phenom-v1' typename='phenom-v1-x86_64-cpu' usable='no'>
     <blocker name='fxsr-opt'/>
   </cpu>
-  <cpu type='tcg' name='phenom' usable='no'>
+  <cpu type='tcg' name='phenom' typename='phenom-x86_64-cpu' usable='no'>
     <blocker name='fxsr-opt'/>
   </cpu>
-  <cpu type='tcg' name='pentium3-v1' usable='yes'/>
-  <cpu type='tcg' name='pentium3' usable='yes'/>
-  <cpu type='tcg' name='pentium2-v1' usable='yes'/>
-  <cpu type='tcg' name='pentium2' usable='yes'/>
-  <cpu type='tcg' name='pentium-v1' usable='yes'/>
-  <cpu type='tcg' name='pentium' usable='yes'/>
-  <cpu type='tcg' name='n270-v1' usable='yes'/>
-  <cpu type='tcg' name='n270' usable='yes'/>
-  <cpu type='tcg' name='kvm64-v1' usable='yes'/>
-  <cpu type='tcg' name='kvm64' usable='yes'/>
-  <cpu type='tcg' name='kvm32-v1' usable='yes'/>
-  <cpu type='tcg' name='kvm32' usable='yes'/>
-  <cpu type='tcg' name='coreduo-v1' usable='yes'/>
-  <cpu type='tcg' name='coreduo' usable='yes'/>
-  <cpu type='tcg' name='core2duo-v1' usable='yes'/>
-  <cpu type='tcg' name='core2duo' usable='yes'/>
-  <cpu type='tcg' name='athlon-v1' usable='yes'/>
-  <cpu type='tcg' name='athlon' usable='yes'/>
-  <cpu type='tcg' name='Westmere-v2' usable='no'>
+  <cpu type='tcg' name='pentium3-v1' typename='pentium3-v1-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='pentium3' typename='pentium3-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='pentium2-v1' typename='pentium2-v1-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='pentium2' typename='pentium2-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='pentium-v1' typename='pentium-v1-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='pentium' typename='pentium-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='n270-v1' typename='n270-v1-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='n270' typename='n270-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='kvm64-v1' typename='kvm64-v1-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='kvm64' typename='kvm64-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='kvm32-v1' typename='kvm32-v1-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='kvm32' typename='kvm32-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='coreduo-v1' typename='coreduo-v1-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='coreduo' typename='coreduo-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='core2duo-v1' typename='core2duo-v1-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='core2duo' typename='core2duo-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='athlon-v1' typename='athlon-v1-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='athlon' typename='athlon-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='Westmere-v2' typename='Westmere-v2-x86_64-cpu' usable='no'>
     <blocker name='spec-ctrl'/>
   </cpu>
-  <cpu type='tcg' name='Westmere-v1' usable='yes'/>
-  <cpu type='tcg' name='Westmere-IBRS' usable='no'>
+  <cpu type='tcg' name='Westmere-v1' typename='Westmere-v1-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='Westmere-IBRS' typename='Westmere-IBRS-x86_64-cpu' usable='no'>
     <blocker name='spec-ctrl'/>
   </cpu>
-  <cpu type='tcg' name='Westmere' usable='no'>
+  <cpu type='tcg' name='Westmere' typename='Westmere-x86_64-cpu' usable='no'>
     <blocker name='spec-ctrl'/>
   </cpu>
-  <cpu type='tcg' name='Snowridge-v1' usable='no'>
+  <cpu type='tcg' name='Snowridge-v1' typename='Snowridge-v1-x86_64-cpu' usable='no'>
     <blocker name='x2apic'/>
     <blocker name='tsc-deadline'/>
     <blocker name='rdseed'/>
@@ -1098,7 +1098,7 @@
     <blocker name='xsavec'/>
     <blocker name='split-lock-detect'/>
   </cpu>
-  <cpu type='tcg' name='Snowridge' usable='no'>
+  <cpu type='tcg' name='Snowridge' typename='Snowridge-x86_64-cpu' usable='no'>
     <blocker name='x2apic'/>
     <blocker name='tsc-deadline'/>
     <blocker name='rdseed'/>
@@ -1116,7 +1116,7 @@
     <blocker name='xsavec'/>
     <blocker name='split-lock-detect'/>
   </cpu>
-  <cpu type='tcg' name='Skylake-Server-v2' usable='no'>
+  <cpu type='tcg' name='Skylake-Server-v2' typename='Skylake-Server-v2-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1137,7 +1137,7 @@
     <blocker name='3dnowprefetch'/>
     <blocker name='xsavec'/>
   </cpu>
-  <cpu type='tcg' name='Skylake-Server-v1' usable='no'>
+  <cpu type='tcg' name='Skylake-Server-v1' typename='Skylake-Server-v1-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1157,7 +1157,7 @@
     <blocker name='3dnowprefetch'/>
     <blocker name='xsavec'/>
   </cpu>
-  <cpu type='tcg' name='Skylake-Server-IBRS' usable='no'>
+  <cpu type='tcg' name='Skylake-Server-IBRS' typename='Skylake-Server-IBRS-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1178,7 +1178,7 @@
     <blocker name='3dnowprefetch'/>
     <blocker name='xsavec'/>
   </cpu>
-  <cpu type='tcg' name='Skylake-Server' usable='no'>
+  <cpu type='tcg' name='Skylake-Server' typename='Skylake-Server-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1199,7 +1199,7 @@
     <blocker name='3dnowprefetch'/>
     <blocker name='xsavec'/>
   </cpu>
-  <cpu type='tcg' name='Skylake-Client-v2' usable='no'>
+  <cpu type='tcg' name='Skylake-Client-v2' typename='Skylake-Client-v2-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1215,7 +1215,7 @@
     <blocker name='3dnowprefetch'/>
     <blocker name='xsavec'/>
   </cpu>
-  <cpu type='tcg' name='Skylake-Client-v1' usable='no'>
+  <cpu type='tcg' name='Skylake-Client-v1' typename='Skylake-Client-v1-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1230,7 +1230,7 @@
     <blocker name='3dnowprefetch'/>
     <blocker name='xsavec'/>
   </cpu>
-  <cpu type='tcg' name='Skylake-Client-IBRS' usable='no'>
+  <cpu type='tcg' name='Skylake-Client-IBRS' typename='Skylake-Client-IBRS-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1246,7 +1246,7 @@
     <blocker name='3dnowprefetch'/>
     <blocker name='xsavec'/>
   </cpu>
-  <cpu type='tcg' name='Skylake-Client' usable='no'>
+  <cpu type='tcg' name='Skylake-Client' typename='Skylake-Client-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1262,32 +1262,32 @@
     <blocker name='3dnowprefetch'/>
     <blocker name='xsavec'/>
   </cpu>
-  <cpu type='tcg' name='SandyBridge-v2' usable='no'>
+  <cpu type='tcg' name='SandyBridge-v2' typename='SandyBridge-v2-x86_64-cpu' usable='no'>
     <blocker name='x2apic'/>
     <blocker name='tsc-deadline'/>
     <blocker name='avx'/>
     <blocker name='spec-ctrl'/>
   </cpu>
-  <cpu type='tcg' name='SandyBridge-v1' usable='no'>
+  <cpu type='tcg' name='SandyBridge-v1' typename='SandyBridge-v1-x86_64-cpu' usable='no'>
     <blocker name='x2apic'/>
     <blocker name='tsc-deadline'/>
     <blocker name='avx'/>
   </cpu>
-  <cpu type='tcg' name='SandyBridge-IBRS' usable='no'>
+  <cpu type='tcg' name='SandyBridge-IBRS' typename='SandyBridge-IBRS-x86_64-cpu' usable='no'>
     <blocker name='x2apic'/>
     <blocker name='tsc-deadline'/>
     <blocker name='avx'/>
     <blocker name='spec-ctrl'/>
   </cpu>
-  <cpu type='tcg' name='SandyBridge' usable='no'>
+  <cpu type='tcg' name='SandyBridge' typename='SandyBridge-x86_64-cpu' usable='no'>
     <blocker name='x2apic'/>
     <blocker name='tsc-deadline'/>
     <blocker name='avx'/>
     <blocker name='spec-ctrl'/>
   </cpu>
-  <cpu type='tcg' name='Penryn-v1' usable='yes'/>
-  <cpu type='tcg' name='Penryn' usable='yes'/>
-  <cpu type='tcg' name='Opteron_G5-v1' usable='no'>
+  <cpu type='tcg' name='Penryn-v1' typename='Penryn-v1-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='Penryn' typename='Penryn-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='Opteron_G5-v1' typename='Opteron_G5-v1-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='avx'/>
     <blocker name='f16c'/>
@@ -1298,7 +1298,7 @@
     <blocker name='tbm'/>
     <blocker name='nrip-save'/>
   </cpu>
-  <cpu type='tcg' name='Opteron_G5' usable='no'>
+  <cpu type='tcg' name='Opteron_G5' typename='Opteron_G5-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='avx'/>
     <blocker name='f16c'/>
@@ -1309,7 +1309,7 @@
     <blocker name='tbm'/>
     <blocker name='nrip-save'/>
   </cpu>
-  <cpu type='tcg' name='Opteron_G4-v1' usable='no'>
+  <cpu type='tcg' name='Opteron_G4-v1' typename='Opteron_G4-v1-x86_64-cpu' usable='no'>
     <blocker name='avx'/>
     <blocker name='misalignsse'/>
     <blocker name='3dnowprefetch'/>
@@ -1317,7 +1317,7 @@
     <blocker name='fma4'/>
     <blocker name='nrip-save'/>
   </cpu>
-  <cpu type='tcg' name='Opteron_G4' usable='no'>
+  <cpu type='tcg' name='Opteron_G4' typename='Opteron_G4-x86_64-cpu' usable='no'>
     <blocker name='avx'/>
     <blocker name='misalignsse'/>
     <blocker name='3dnowprefetch'/>
@@ -1325,27 +1325,27 @@
     <blocker name='fma4'/>
     <blocker name='nrip-save'/>
   </cpu>
-  <cpu type='tcg' name='Opteron_G3-v1' usable='no'>
+  <cpu type='tcg' name='Opteron_G3-v1' typename='Opteron_G3-v1-x86_64-cpu' usable='no'>
     <blocker name='misalignsse'/>
   </cpu>
-  <cpu type='tcg' name='Opteron_G3' usable='no'>
+  <cpu type='tcg' name='Opteron_G3' typename='Opteron_G3-x86_64-cpu' usable='no'>
     <blocker name='misalignsse'/>
   </cpu>
-  <cpu type='tcg' name='Opteron_G2-v1' usable='yes'/>
-  <cpu type='tcg' name='Opteron_G2' usable='yes'/>
-  <cpu type='tcg' name='Opteron_G1-v1' usable='yes'/>
-  <cpu type='tcg' name='Opteron_G1' usable='yes'/>
-  <cpu type='tcg' name='Nehalem-v2' usable='no'>
+  <cpu type='tcg' name='Opteron_G2-v1' typename='Opteron_G2-v1-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='Opteron_G2' typename='Opteron_G2-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='Opteron_G1-v1' typename='Opteron_G1-v1-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='Opteron_G1' typename='Opteron_G1-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='Nehalem-v2' typename='Nehalem-v2-x86_64-cpu' usable='no'>
     <blocker name='spec-ctrl'/>
   </cpu>
-  <cpu type='tcg' name='Nehalem-v1' usable='yes'/>
-  <cpu type='tcg' name='Nehalem-IBRS' usable='no'>
+  <cpu type='tcg' name='Nehalem-v1' typename='Nehalem-v1-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='Nehalem-IBRS' typename='Nehalem-IBRS-x86_64-cpu' usable='no'>
     <blocker name='spec-ctrl'/>
   </cpu>
-  <cpu type='tcg' name='Nehalem' usable='no'>
+  <cpu type='tcg' name='Nehalem' typename='Nehalem-x86_64-cpu' usable='no'>
     <blocker name='spec-ctrl'/>
   </cpu>
-  <cpu type='tcg' name='KnightsMill-v1' usable='no'>
+  <cpu type='tcg' name='KnightsMill-v1' typename='KnightsMill-v1-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='x2apic'/>
     <blocker name='tsc-deadline'/>
@@ -1362,7 +1362,7 @@
     <blocker name='avx512-4fmaps'/>
     <blocker name='3dnowprefetch'/>
   </cpu>
-  <cpu type='tcg' name='KnightsMill' usable='no'>
+  <cpu type='tcg' name='KnightsMill' typename='KnightsMill-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='x2apic'/>
     <blocker name='tsc-deadline'/>
@@ -1379,34 +1379,34 @@
     <blocker name='avx512-4fmaps'/>
     <blocker name='3dnowprefetch'/>
   </cpu>
-  <cpu type='tcg' name='IvyBridge-v2' usable='no'>
+  <cpu type='tcg' name='IvyBridge-v2' typename='IvyBridge-v2-x86_64-cpu' usable='no'>
     <blocker name='x2apic'/>
     <blocker name='tsc-deadline'/>
     <blocker name='avx'/>
     <blocker name='f16c'/>
     <blocker name='spec-ctrl'/>
   </cpu>
-  <cpu type='tcg' name='IvyBridge-v1' usable='no'>
+  <cpu type='tcg' name='IvyBridge-v1' typename='IvyBridge-v1-x86_64-cpu' usable='no'>
     <blocker name='x2apic'/>
     <blocker name='tsc-deadline'/>
     <blocker name='avx'/>
     <blocker name='f16c'/>
   </cpu>
-  <cpu type='tcg' name='IvyBridge-IBRS' usable='no'>
+  <cpu type='tcg' name='IvyBridge-IBRS' typename='IvyBridge-IBRS-x86_64-cpu' usable='no'>
     <blocker name='x2apic'/>
     <blocker name='tsc-deadline'/>
     <blocker name='avx'/>
     <blocker name='f16c'/>
     <blocker name='spec-ctrl'/>
   </cpu>
-  <cpu type='tcg' name='IvyBridge' usable='no'>
+  <cpu type='tcg' name='IvyBridge' typename='IvyBridge-x86_64-cpu' usable='no'>
     <blocker name='x2apic'/>
     <blocker name='tsc-deadline'/>
     <blocker name='avx'/>
     <blocker name='f16c'/>
     <blocker name='spec-ctrl'/>
   </cpu>
-  <cpu type='tcg' name='Icelake-Server-v1' usable='no'>
+  <cpu type='tcg' name='Icelake-Server-v1' typename='Icelake-Server-v1-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1438,7 +1438,7 @@
     <blocker name='wbnoinvd'/>
     <blocker name='xsavec'/>
   </cpu>
-  <cpu type='tcg' name='Icelake-Server' usable='no'>
+  <cpu type='tcg' name='Icelake-Server' typename='Icelake-Server-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1470,7 +1470,7 @@
     <blocker name='wbnoinvd'/>
     <blocker name='xsavec'/>
   </cpu>
-  <cpu type='tcg' name='Icelake-Client-v1' usable='no'>
+  <cpu type='tcg' name='Icelake-Client-v1' typename='Icelake-Client-v1-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1497,7 +1497,7 @@
     <blocker name='wbnoinvd'/>
     <blocker name='xsavec'/>
   </cpu>
-  <cpu type='tcg' name='Icelake-Client' usable='no'>
+  <cpu type='tcg' name='Icelake-Client' typename='Icelake-Client-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1524,7 +1524,7 @@
     <blocker name='wbnoinvd'/>
     <blocker name='xsavec'/>
   </cpu>
-  <cpu type='tcg' name='Haswell-v4' usable='no'>
+  <cpu type='tcg' name='Haswell-v4' typename='Haswell-v4-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1535,7 +1535,7 @@
     <blocker name='invpcid'/>
     <blocker name='spec-ctrl'/>
   </cpu>
-  <cpu type='tcg' name='Haswell-v3' usable='no'>
+  <cpu type='tcg' name='Haswell-v3' typename='Haswell-v3-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1548,7 +1548,7 @@
     <blocker name='rtm'/>
     <blocker name='spec-ctrl'/>
   </cpu>
-  <cpu type='tcg' name='Haswell-v2' usable='no'>
+  <cpu type='tcg' name='Haswell-v2' typename='Haswell-v2-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1558,7 +1558,7 @@
     <blocker name='avx2'/>
     <blocker name='invpcid'/>
   </cpu>
-  <cpu type='tcg' name='Haswell-v1' usable='no'>
+  <cpu type='tcg' name='Haswell-v1' typename='Haswell-v1-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1570,7 +1570,7 @@
     <blocker name='invpcid'/>
     <blocker name='rtm'/>
   </cpu>
-  <cpu type='tcg' name='Haswell-noTSX-IBRS' usable='no'>
+  <cpu type='tcg' name='Haswell-noTSX-IBRS' typename='Haswell-noTSX-IBRS-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1581,7 +1581,7 @@
     <blocker name='invpcid'/>
     <blocker name='spec-ctrl'/>
   </cpu>
-  <cpu type='tcg' name='Haswell-noTSX' usable='no'>
+  <cpu type='tcg' name='Haswell-noTSX' typename='Haswell-noTSX-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1591,7 +1591,7 @@
     <blocker name='avx2'/>
     <blocker name='invpcid'/>
   </cpu>
-  <cpu type='tcg' name='Haswell-IBRS' usable='no'>
+  <cpu type='tcg' name='Haswell-IBRS' typename='Haswell-IBRS-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1604,7 +1604,7 @@
     <blocker name='rtm'/>
     <blocker name='spec-ctrl'/>
   </cpu>
-  <cpu type='tcg' name='Haswell' usable='no'>
+  <cpu type='tcg' name='Haswell' typename='Haswell-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1615,7 +1615,7 @@
     <blocker name='invpcid'/>
     <blocker name='spec-ctrl'/>
   </cpu>
-  <cpu type='tcg' name='EPYC-v2' usable='no'>
+  <cpu type='tcg' name='EPYC-v2' typename='EPYC-v2-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='avx'/>
     <blocker name='f16c'/>
@@ -1631,7 +1631,7 @@
     <blocker name='nrip-save'/>
     <blocker name='xsavec'/>
   </cpu>
-  <cpu type='tcg' name='EPYC-v1' usable='no'>
+  <cpu type='tcg' name='EPYC-v1' typename='EPYC-v1-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='avx'/>
     <blocker name='f16c'/>
@@ -1646,7 +1646,7 @@
     <blocker name='nrip-save'/>
     <blocker name='xsavec'/>
   </cpu>
-  <cpu type='tcg' name='EPYC-IBPB' usable='no'>
+  <cpu type='tcg' name='EPYC-IBPB' typename='EPYC-IBPB-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='avx'/>
     <blocker name='f16c'/>
@@ -1662,7 +1662,7 @@
     <blocker name='nrip-save'/>
     <blocker name='xsavec'/>
   </cpu>
-  <cpu type='tcg' name='EPYC' usable='no'>
+  <cpu type='tcg' name='EPYC' typename='EPYC-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='avx'/>
     <blocker name='f16c'/>
@@ -1678,7 +1678,7 @@
     <blocker name='nrip-save'/>
     <blocker name='xsavec'/>
   </cpu>
-  <cpu type='tcg' name='Dhyana-v1' usable='no'>
+  <cpu type='tcg' name='Dhyana-v1' typename='Dhyana-v1-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='avx'/>
     <blocker name='f16c'/>
@@ -1693,7 +1693,7 @@
     <blocker name='nrip-save'/>
     <blocker name='xsavec'/>
   </cpu>
-  <cpu type='tcg' name='Dhyana' usable='no'>
+  <cpu type='tcg' name='Dhyana' typename='Dhyana-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='avx'/>
     <blocker name='f16c'/>
@@ -1708,9 +1708,9 @@
     <blocker name='nrip-save'/>
     <blocker name='xsavec'/>
   </cpu>
-  <cpu type='tcg' name='Conroe-v1' usable='yes'/>
-  <cpu type='tcg' name='Conroe' usable='yes'/>
-  <cpu type='tcg' name='Cascadelake-Server-v2' usable='no'>
+  <cpu type='tcg' name='Conroe-v1' typename='Conroe-v1-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='Conroe' typename='Conroe-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='Cascadelake-Server-v2' typename='Cascadelake-Server-v2-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1738,7 +1738,7 @@
     <blocker name='skip-l1dfl-vmentry'/>
     <blocker name='mds-no'/>
   </cpu>
-  <cpu type='tcg' name='Cascadelake-Server-v1' usable='no'>
+  <cpu type='tcg' name='Cascadelake-Server-v1' typename='Cascadelake-Server-v1-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1761,7 +1761,7 @@
     <blocker name='3dnowprefetch'/>
     <blocker name='xsavec'/>
   </cpu>
-  <cpu type='tcg' name='Cascadelake-Server' usable='no'>
+  <cpu type='tcg' name='Cascadelake-Server' typename='Cascadelake-Server-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1789,7 +1789,7 @@
     <blocker name='skip-l1dfl-vmentry'/>
     <blocker name='mds-no'/>
   </cpu>
-  <cpu type='tcg' name='Broadwell-v4' usable='no'>
+  <cpu type='tcg' name='Broadwell-v4' typename='Broadwell-v4-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1802,7 +1802,7 @@
     <blocker name='spec-ctrl'/>
     <blocker name='3dnowprefetch'/>
   </cpu>
-  <cpu type='tcg' name='Broadwell-v3' usable='no'>
+  <cpu type='tcg' name='Broadwell-v3' typename='Broadwell-v3-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1817,7 +1817,7 @@
     <blocker name='spec-ctrl'/>
     <blocker name='3dnowprefetch'/>
   </cpu>
-  <cpu type='tcg' name='Broadwell-v2' usable='no'>
+  <cpu type='tcg' name='Broadwell-v2' typename='Broadwell-v2-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1829,7 +1829,7 @@
     <blocker name='rdseed'/>
     <blocker name='3dnowprefetch'/>
   </cpu>
-  <cpu type='tcg' name='Broadwell-v1' usable='no'>
+  <cpu type='tcg' name='Broadwell-v1' typename='Broadwell-v1-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1843,7 +1843,7 @@
     <blocker name='rdseed'/>
     <blocker name='3dnowprefetch'/>
   </cpu>
-  <cpu type='tcg' name='Broadwell-noTSX-IBRS' usable='no'>
+  <cpu type='tcg' name='Broadwell-noTSX-IBRS' typename='Broadwell-noTSX-IBRS-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1856,7 +1856,7 @@
     <blocker name='spec-ctrl'/>
     <blocker name='3dnowprefetch'/>
   </cpu>
-  <cpu type='tcg' name='Broadwell-noTSX' usable='no'>
+  <cpu type='tcg' name='Broadwell-noTSX' typename='Broadwell-noTSX-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1868,7 +1868,7 @@
     <blocker name='rdseed'/>
     <blocker name='3dnowprefetch'/>
   </cpu>
-  <cpu type='tcg' name='Broadwell-IBRS' usable='no'>
+  <cpu type='tcg' name='Broadwell-IBRS' typename='Broadwell-IBRS-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1883,7 +1883,7 @@
     <blocker name='spec-ctrl'/>
     <blocker name='3dnowprefetch'/>
   </cpu>
-  <cpu type='tcg' name='Broadwell' usable='no'>
+  <cpu type='tcg' name='Broadwell' typename='Broadwell-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1896,8 +1896,8 @@
     <blocker name='spec-ctrl'/>
     <blocker name='3dnowprefetch'/>
   </cpu>
-  <cpu type='tcg' name='486-v1' usable='yes'/>
-  <cpu type='tcg' name='486' usable='yes'/>
+  <cpu type='tcg' name='486-v1' typename='486-v1-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='486' typename='486-x86_64-cpu' usable='yes'/>
   <machine name='pc-i440fx-4.1' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/>
   <machine name='pc-0.15' hotplugCpus='yes' maxCpus='255'/>
   <machine name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
index 17960460fb..8e61a75872 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
@@ -217,80 +217,80 @@
     <property name='sve1408' type='boolean' value='true'/>
     <property name='sve1664' type='boolean' value='true'/>
   </hostCPU>
-  <cpu type='kvm' name='pxa262'/>
-  <cpu type='kvm' name='pxa270-a0'/>
-  <cpu type='kvm' name='arm1136'/>
-  <cpu type='kvm' name='cortex-a15'/>
-  <cpu type='kvm' name='pxa260'/>
-  <cpu type='kvm' name='arm1136-r2'/>
-  <cpu type='kvm' name='pxa261'/>
-  <cpu type='kvm' name='pxa255'/>
-  <cpu type='kvm' name='cortex-a72'/>
-  <cpu type='kvm' name='cortex-m33'/>
-  <cpu type='kvm' name='arm926'/>
-  <cpu type='kvm' name='cortex-r5f'/>
-  <cpu type='kvm' name='arm11mpcore'/>
-  <cpu type='kvm' name='pxa250'/>
-  <cpu type='kvm' name='ti925t'/>
-  <cpu type='kvm' name='cortex-a57'/>
-  <cpu type='kvm' name='sa1110'/>
-  <cpu type='kvm' name='host'/>
-  <cpu type='kvm' name='arm1176'/>
-  <cpu type='kvm' name='cortex-a53'/>
-  <cpu type='kvm' name='sa1100'/>
-  <cpu type='kvm' name='pxa270-c5'/>
-  <cpu type='kvm' name='cortex-a9'/>
-  <cpu type='kvm' name='cortex-a8'/>
-  <cpu type='kvm' name='cortex-a7'/>
-  <cpu type='kvm' name='pxa270-c0'/>
-  <cpu type='kvm' name='arm1026'/>
-  <cpu type='kvm' name='pxa270-b1'/>
-  <cpu type='kvm' name='cortex-m3'/>
-  <cpu type='kvm' name='max'/>
-  <cpu type='kvm' name='cortex-m4'/>
-  <cpu type='kvm' name='pxa270-b0'/>
-  <cpu type='kvm' name='arm946'/>
-  <cpu type='kvm' name='cortex-m0'/>
-  <cpu type='kvm' name='cortex-r5'/>
-  <cpu type='kvm' name='pxa270-a1'/>
-  <cpu type='kvm' name='pxa270'/>
-  <cpu type='tcg' name='pxa262'/>
-  <cpu type='tcg' name='pxa270-a0'/>
-  <cpu type='tcg' name='arm1136'/>
-  <cpu type='tcg' name='cortex-a15'/>
-  <cpu type='tcg' name='pxa260'/>
-  <cpu type='tcg' name='arm1136-r2'/>
-  <cpu type='tcg' name='pxa261'/>
-  <cpu type='tcg' name='pxa255'/>
-  <cpu type='tcg' name='cortex-a72'/>
-  <cpu type='tcg' name='cortex-m33'/>
-  <cpu type='tcg' name='arm926'/>
-  <cpu type='tcg' name='cortex-r5f'/>
-  <cpu type='tcg' name='arm11mpcore'/>
-  <cpu type='tcg' name='pxa250'/>
-  <cpu type='tcg' name='ti925t'/>
-  <cpu type='tcg' name='cortex-a57'/>
-  <cpu type='tcg' name='sa1110'/>
-  <cpu type='tcg' name='host'/>
-  <cpu type='tcg' name='arm1176'/>
-  <cpu type='tcg' name='cortex-a53'/>
-  <cpu type='tcg' name='sa1100'/>
-  <cpu type='tcg' name='pxa270-c5'/>
-  <cpu type='tcg' name='cortex-a9'/>
-  <cpu type='tcg' name='cortex-a8'/>
-  <cpu type='tcg' name='cortex-a7'/>
-  <cpu type='tcg' name='pxa270-c0'/>
-  <cpu type='tcg' name='arm1026'/>
-  <cpu type='tcg' name='pxa270-b1'/>
-  <cpu type='tcg' name='cortex-m3'/>
-  <cpu type='tcg' name='max'/>
-  <cpu type='tcg' name='cortex-m4'/>
-  <cpu type='tcg' name='pxa270-b0'/>
-  <cpu type='tcg' name='arm946'/>
-  <cpu type='tcg' name='cortex-m0'/>
-  <cpu type='tcg' name='cortex-r5'/>
-  <cpu type='tcg' name='pxa270-a1'/>
-  <cpu type='tcg' name='pxa270'/>
+  <cpu type='kvm' name='pxa262' typename='pxa262-arm-cpu'/>
+  <cpu type='kvm' name='pxa270-a0' typename='pxa270-a0-arm-cpu'/>
+  <cpu type='kvm' name='arm1136' typename='arm1136-arm-cpu'/>
+  <cpu type='kvm' name='cortex-a15' typename='cortex-a15-arm-cpu'/>
+  <cpu type='kvm' name='pxa260' typename='pxa260-arm-cpu'/>
+  <cpu type='kvm' name='arm1136-r2' typename='arm1136-r2-arm-cpu'/>
+  <cpu type='kvm' name='pxa261' typename='pxa261-arm-cpu'/>
+  <cpu type='kvm' name='pxa255' typename='pxa255-arm-cpu'/>
+  <cpu type='kvm' name='cortex-a72' typename='cortex-a72-arm-cpu'/>
+  <cpu type='kvm' name='cortex-m33' typename='cortex-m33-arm-cpu'/>
+  <cpu type='kvm' name='arm926' typename='arm926-arm-cpu'/>
+  <cpu type='kvm' name='cortex-r5f' typename='cortex-r5f-arm-cpu'/>
+  <cpu type='kvm' name='arm11mpcore' typename='arm11mpcore-arm-cpu'/>
+  <cpu type='kvm' name='pxa250' typename='pxa250-arm-cpu'/>
+  <cpu type='kvm' name='ti925t' typename='ti925t-arm-cpu'/>
+  <cpu type='kvm' name='cortex-a57' typename='cortex-a57-arm-cpu'/>
+  <cpu type='kvm' name='sa1110' typename='sa1110-arm-cpu'/>
+  <cpu type='kvm' name='host' typename='host-arm-cpu'/>
+  <cpu type='kvm' name='arm1176' typename='arm1176-arm-cpu'/>
+  <cpu type='kvm' name='cortex-a53' typename='cortex-a53-arm-cpu'/>
+  <cpu type='kvm' name='sa1100' typename='sa1100-arm-cpu'/>
+  <cpu type='kvm' name='pxa270-c5' typename='pxa270-c5-arm-cpu'/>
+  <cpu type='kvm' name='cortex-a9' typename='cortex-a9-arm-cpu'/>
+  <cpu type='kvm' name='cortex-a8' typename='cortex-a8-arm-cpu'/>
+  <cpu type='kvm' name='cortex-a7' typename='cortex-a7-arm-cpu'/>
+  <cpu type='kvm' name='pxa270-c0' typename='pxa270-c0-arm-cpu'/>
+  <cpu type='kvm' name='arm1026' typename='arm1026-arm-cpu'/>
+  <cpu type='kvm' name='pxa270-b1' typename='pxa270-b1-arm-cpu'/>
+  <cpu type='kvm' name='cortex-m3' typename='cortex-m3-arm-cpu'/>
+  <cpu type='kvm' name='max' typename='max-arm-cpu'/>
+  <cpu type='kvm' name='cortex-m4' typename='cortex-m4-arm-cpu'/>
+  <cpu type='kvm' name='pxa270-b0' typename='pxa270-b0-arm-cpu'/>
+  <cpu type='kvm' name='arm946' typename='arm946-arm-cpu'/>
+  <cpu type='kvm' name='cortex-m0' typename='cortex-m0-arm-cpu'/>
+  <cpu type='kvm' name='cortex-r5' typename='cortex-r5-arm-cpu'/>
+  <cpu type='kvm' name='pxa270-a1' typename='pxa270-a1-arm-cpu'/>
+  <cpu type='kvm' name='pxa270' typename='pxa270-arm-cpu'/>
+  <cpu type='tcg' name='pxa262' typename='pxa262-arm-cpu'/>
+  <cpu type='tcg' name='pxa270-a0' typename='pxa270-a0-arm-cpu'/>
+  <cpu type='tcg' name='arm1136' typename='arm1136-arm-cpu'/>
+  <cpu type='tcg' name='cortex-a15' typename='cortex-a15-arm-cpu'/>
+  <cpu type='tcg' name='pxa260' typename='pxa260-arm-cpu'/>
+  <cpu type='tcg' name='arm1136-r2' typename='arm1136-r2-arm-cpu'/>
+  <cpu type='tcg' name='pxa261' typename='pxa261-arm-cpu'/>
+  <cpu type='tcg' name='pxa255' typename='pxa255-arm-cpu'/>
+  <cpu type='tcg' name='cortex-a72' typename='cortex-a72-arm-cpu'/>
+  <cpu type='tcg' name='cortex-m33' typename='cortex-m33-arm-cpu'/>
+  <cpu type='tcg' name='arm926' typename='arm926-arm-cpu'/>
+  <cpu type='tcg' name='cortex-r5f' typename='cortex-r5f-arm-cpu'/>
+  <cpu type='tcg' name='arm11mpcore' typename='arm11mpcore-arm-cpu'/>
+  <cpu type='tcg' name='pxa250' typename='pxa250-arm-cpu'/>
+  <cpu type='tcg' name='ti925t' typename='ti925t-arm-cpu'/>
+  <cpu type='tcg' name='cortex-a57' typename='cortex-a57-arm-cpu'/>
+  <cpu type='tcg' name='sa1110' typename='sa1110-arm-cpu'/>
+  <cpu type='tcg' name='host' typename='host-arm-cpu'/>
+  <cpu type='tcg' name='arm1176' typename='arm1176-arm-cpu'/>
+  <cpu type='tcg' name='cortex-a53' typename='cortex-a53-arm-cpu'/>
+  <cpu type='tcg' name='sa1100' typename='sa1100-arm-cpu'/>
+  <cpu type='tcg' name='pxa270-c5' typename='pxa270-c5-arm-cpu'/>
+  <cpu type='tcg' name='cortex-a9' typename='cortex-a9-arm-cpu'/>
+  <cpu type='tcg' name='cortex-a8' typename='cortex-a8-arm-cpu'/>
+  <cpu type='tcg' name='cortex-a7' typename='cortex-a7-arm-cpu'/>
+  <cpu type='tcg' name='pxa270-c0' typename='pxa270-c0-arm-cpu'/>
+  <cpu type='tcg' name='arm1026' typename='arm1026-arm-cpu'/>
+  <cpu type='tcg' name='pxa270-b1' typename='pxa270-b1-arm-cpu'/>
+  <cpu type='tcg' name='cortex-m3' typename='cortex-m3-arm-cpu'/>
+  <cpu type='tcg' name='max' typename='max-arm-cpu'/>
+  <cpu type='tcg' name='cortex-m4' typename='cortex-m4-arm-cpu'/>
+  <cpu type='tcg' name='pxa270-b0' typename='pxa270-b0-arm-cpu'/>
+  <cpu type='tcg' name='arm946' typename='arm946-arm-cpu'/>
+  <cpu type='tcg' name='cortex-m0' typename='cortex-m0-arm-cpu'/>
+  <cpu type='tcg' name='cortex-r5' typename='cortex-r5-arm-cpu'/>
+  <cpu type='tcg' name='pxa270-a1' typename='pxa270-a1-arm-cpu'/>
+  <cpu type='tcg' name='pxa270' typename='pxa270-arm-cpu'/>
   <machine name='integratorcp' maxCpus='1'/>
   <machine name='nuri' maxCpus='2'/>
   <machine name='mps2-an511' maxCpus='1'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
index 101c095446..1f2f9e7591 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
@@ -178,135 +178,135 @@
   <microcodeVersion>42900242</microcodeVersion>
   <package>v4.1.0-2198-g9e583f2</package>
   <arch>ppc64</arch>
-  <cpu type='kvm' name='default'/>
-  <cpu type='kvm' name='ppc'/>
-  <cpu type='kvm' name='ppc32'/>
-  <cpu type='kvm' name='ppc64'/>
-  <cpu type='kvm' name='POWER9'/>
-  <cpu type='kvm' name='power8nvl'/>
-  <cpu type='kvm' name='POWER8'/>
-  <cpu type='kvm' name='power8e'/>
-  <cpu type='kvm' name='power7+'/>
-  <cpu type='kvm' name='POWER7'/>
-  <cpu type='kvm' name='power5gs'/>
-  <cpu type='kvm' name='power5+'/>
-  <cpu type='kvm' name='970mp'/>
-  <cpu type='kvm' name='970fx'/>
-  <cpu type='kvm' name='970'/>
-  <cpu type='kvm' name='apollo7pm'/>
-  <cpu type='kvm' name='7457a'/>
-  <cpu type='kvm' name='7447a'/>
-  <cpu type='kvm' name='apollo7'/>
-  <cpu type='kvm' name='7457'/>
-  <cpu type='kvm' name='7447'/>
-  <cpu type='kvm' name='apollo6'/>
-  <cpu type='kvm' name='7455'/>
-  <cpu type='kvm' name='7445'/>
-  <cpu type='kvm' name='7451'/>
-  <cpu type='kvm' name='7441'/>
-  <cpu type='kvm' name='vger'/>
-  <cpu type='kvm' name='7450'/>
-  <cpu type='kvm' name='7448'/>
-  <cpu type='kvm' name='nitro'/>
-  <cpu type='kvm' name='7410'/>
-  <cpu type='kvm' name='g4'/>
-  <cpu type='kvm' name='max'/>
-  <cpu type='kvm' name='7400'/>
-  <cpu type='kvm' name='goldfinger'/>
-  <cpu type='kvm' name='755'/>
-  <cpu type='kvm' name='745'/>
-  <cpu type='kvm' name='lonestar'/>
-  <cpu type='kvm' name='750l'/>
-  <cpu type='kvm' name='750gx'/>
-  <cpu type='kvm' name='750fx'/>
-  <cpu type='kvm' name='750cxe'/>
-  <cpu type='kvm' name='750cx'/>
-  <cpu type='kvm' name='750cl'/>
-  <cpu type='kvm' name='conan/doyle'/>
-  <cpu type='kvm' name='g3'/>
-  <cpu type='kvm' name='typhoon'/>
-  <cpu type='kvm' name='750'/>
-  <cpu type='kvm' name='arthur'/>
-  <cpu type='kvm' name='740'/>
-  <cpu type='kvm' name='mach5'/>
-  <cpu type='kvm' name='sirocco'/>
-  <cpu type='kvm' name='604e'/>
-  <cpu type='kvm' name='goldeneye'/>
-  <cpu type='kvm' name='603r'/>
-  <cpu type='kvm' name='vaillant'/>
-  <cpu type='kvm' name='stretch'/>
-  <cpu type='kvm' name='603e'/>
-  <cpu type='kvm' name='vanilla'/>
-  <cpu type='kvm' name='601v'/>
-  <cpu type='kvm' name='601'/>
-  <cpu type='kvm' name='mpc8560'/>
-  <cpu type='kvm' name='mpc8555e'/>
-  <cpu type='kvm' name='mpc8555'/>
-  <cpu type='kvm' name='mpc8548e'/>
-  <cpu type='kvm' name='mpc8548'/>
-  <cpu type='kvm' name='mpc8547e'/>
-  <cpu type='kvm' name='mpc8545e'/>
-  <cpu type='kvm' name='mpc8545'/>
-  <cpu type='kvm' name='mpc8544e'/>
-  <cpu type='kvm' name='mpc8544'/>
-  <cpu type='kvm' name='mpc8543e'/>
-  <cpu type='kvm' name='mpc8543'/>
-  <cpu type='kvm' name='mpc8541e'/>
-  <cpu type='kvm' name='mpc8541'/>
-  <cpu type='kvm' name='mpc8540'/>
-  <cpu type='kvm' name='mpc8533e'/>
-  <cpu type='kvm' name='mpc8533'/>
-  <cpu type='kvm' name='e500v2'/>
-  <cpu type='kvm' name='e500v1'/>
-  <cpu type='kvm' name='e500'/>
-  <cpu type='kvm' name='mpc8347ea'/>
-  <cpu type='kvm' name='mpc8347e'/>
-  <cpu type='kvm' name='mpc8347a'/>
-  <cpu type='kvm' name='mpc8347'/>
-  <cpu type='kvm' name='e300'/>
-  <cpu type='kvm' name='e200'/>
-  <cpu type='kvm' name='mpc8280'/>
-  <cpu type='kvm' name='mpc8275'/>
-  <cpu type='kvm' name='mpc8272'/>
-  <cpu type='kvm' name='mpc8271'/>
-  <cpu type='kvm' name='mpc8270'/>
-  <cpu type='kvm' name='mpc8266_hip4'/>
-  <cpu type='kvm' name='mpc8266_hip3'/>
-  <cpu type='kvm' name='mpc8266'/>
-  <cpu type='kvm' name='mpc8265_hip4'/>
-  <cpu type='kvm' name='mpc8265_hip3'/>
-  <cpu type='kvm' name='mpc8265'/>
-  <cpu type='kvm' name='mpc8264_hip4'/>
-  <cpu type='kvm' name='mpc8264_hip3'/>
-  <cpu type='kvm' name='mpc8264'/>
-  <cpu type='kvm' name='mpc8260_hip4'/>
-  <cpu type='kvm' name='mpc8260_hip3'/>
-  <cpu type='kvm' name='mpc8260'/>
-  <cpu type='kvm' name='mpc8255_hip4'/>
-  <cpu type='kvm' name='mpc8255_hip3'/>
-  <cpu type='kvm' name='mpc8255'/>
-  <cpu type='kvm' name='mpc8250_hip4'/>
-  <cpu type='kvm' name='mpc8250_hip3'/>
-  <cpu type='kvm' name='mpc8250'/>
-  <cpu type='kvm' name='mpc8248'/>
-  <cpu type='kvm' name='mpc8247'/>
-  <cpu type='kvm' name='mpc8245'/>
-  <cpu type='kvm' name='mpc8241'/>
-  <cpu type='kvm' name='powerquicc-ii'/>
-  <cpu type='kvm' name='mpc82xx'/>
-  <cpu type='kvm' name='mpc5200b'/>
-  <cpu type='kvm' name='mpc5200'/>
-  <cpu type='kvm' name='mpc52xx'/>
-  <cpu type='kvm' name='mpc8240'/>
-  <cpu type='kvm' name='460ex'/>
-  <cpu type='kvm' name='440ep'/>
-  <cpu type='kvm' name='x2vp50'/>
-  <cpu type='kvm' name='x2vp7'/>
-  <cpu type='kvm' name='405gpe'/>
-  <cpu type='kvm' name='405gp'/>
-  <cpu type='kvm' name='405cr'/>
-  <cpu type='kvm' name='405'/>
-  <cpu type='kvm' name='403'/>
+  <cpu type='kvm' name='default' typename='604-powerpc64-cpu'/>
+  <cpu type='kvm' name='ppc' typename='604-powerpc64-cpu'/>
+  <cpu type='kvm' name='ppc32' typename='604-powerpc64-cpu'/>
+  <cpu type='kvm' name='ppc64' typename='970fx_v3.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='POWER9' typename='power9_v2.0-powerpc64-cpu'/>
+  <cpu type='kvm' name='power8nvl' typename='power8nvl_v1.0-powerpc64-cpu'/>
+  <cpu type='kvm' name='POWER8' typename='host-powerpc64-cpu'/>
+  <cpu type='kvm' name='power8e' typename='power8e_v2.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='power7+' typename='power7+_v2.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='POWER7' typename='power7_v2.3-powerpc64-cpu'/>
+  <cpu type='kvm' name='power5gs' typename='power5+_v2.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='power5+' typename='power5+_v2.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='970mp' typename='970mp_v1.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='970fx' typename='970fx_v3.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='970' typename='970_v2.2-powerpc64-cpu'/>
+  <cpu type='kvm' name='apollo7pm' typename='7457a_v1.0-powerpc64-cpu'/>
+  <cpu type='kvm' name='7457a' typename='7457a_v1.2-powerpc64-cpu'/>
+  <cpu type='kvm' name='7447a' typename='7447a_v1.2-powerpc64-cpu'/>
+  <cpu type='kvm' name='apollo7' typename='7457_v1.2-powerpc64-cpu'/>
+  <cpu type='kvm' name='7457' typename='7457_v1.2-powerpc64-cpu'/>
+  <cpu type='kvm' name='7447' typename='7447_v1.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='apollo6' typename='7455_v3.2-powerpc64-cpu'/>
+  <cpu type='kvm' name='7455' typename='7455_v3.2-powerpc64-cpu'/>
+  <cpu type='kvm' name='7445' typename='7445_v3.2-powerpc64-cpu'/>
+  <cpu type='kvm' name='7451' typename='7451_v2.3-powerpc64-cpu'/>
+  <cpu type='kvm' name='7441' typename='7441_v2.3-powerpc64-cpu'/>
+  <cpu type='kvm' name='vger' typename='7450_v2.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='7450' typename='7450_v2.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='7448' typename='7448_v2.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='nitro' typename='7410_v1.4-powerpc64-cpu'/>
+  <cpu type='kvm' name='7410' typename='7410_v1.4-powerpc64-cpu'/>
+  <cpu type='kvm' name='g4' typename='7400_v2.9-powerpc64-cpu'/>
+  <cpu type='kvm' name='max' typename='7400_v2.9-powerpc64-cpu'/>
+  <cpu type='kvm' name='7400' typename='7400_v2.9-powerpc64-cpu'/>
+  <cpu type='kvm' name='goldfinger' typename='755_v2.8-powerpc64-cpu'/>
+  <cpu type='kvm' name='755' typename='755_v2.8-powerpc64-cpu'/>
+  <cpu type='kvm' name='745' typename='745_v2.8-powerpc64-cpu'/>
+  <cpu type='kvm' name='lonestar' typename='750l_v3.2-powerpc64-cpu'/>
+  <cpu type='kvm' name='750l' typename='750l_v3.2-powerpc64-cpu'/>
+  <cpu type='kvm' name='750gx' typename='750gx_v1.2-powerpc64-cpu'/>
+  <cpu type='kvm' name='750fx' typename='750fx_v2.3-powerpc64-cpu'/>
+  <cpu type='kvm' name='750cxe' typename='750cxe_v3.1b-powerpc64-cpu'/>
+  <cpu type='kvm' name='750cx' typename='750cx_v2.2-powerpc64-cpu'/>
+  <cpu type='kvm' name='750cl' typename='750cl_v2.0-powerpc64-cpu'/>
+  <cpu type='kvm' name='conan/doyle' typename='750p-powerpc64-cpu'/>
+  <cpu type='kvm' name='g3' typename='750_v3.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='typhoon' typename='750_v3.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='750' typename='750_v3.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='arthur' typename='740_v3.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='740' typename='740_v3.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='mach5' typename='604r-powerpc64-cpu'/>
+  <cpu type='kvm' name='sirocco' typename='604e_v2.4-powerpc64-cpu'/>
+  <cpu type='kvm' name='604e' typename='604e_v2.4-powerpc64-cpu'/>
+  <cpu type='kvm' name='goldeneye' typename='603e7t-powerpc64-cpu'/>
+  <cpu type='kvm' name='603r' typename='603e7t-powerpc64-cpu'/>
+  <cpu type='kvm' name='vaillant' typename='603e7v-powerpc64-cpu'/>
+  <cpu type='kvm' name='stretch' typename='603e_v4.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='603e' typename='603e_v4.1-powerpc64-cpu'/>
+  <cpu type='kvm' name='vanilla' typename='603-powerpc64-cpu'/>
+  <cpu type='kvm' name='601v' typename='601_v2-powerpc64-cpu'/>
+  <cpu type='kvm' name='601' typename='601_v2-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8560' typename='mpc8560_v21-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8555e' typename='mpc8555e_v11-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8555' typename='mpc8555_v11-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8548e' typename='mpc8548e_v21-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8548' typename='mpc8548_v21-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8547e' typename='mpc8547e_v21-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8545e' typename='mpc8545e_v21-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8545' typename='mpc8545_v21-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8544e' typename='mpc8544e_v11-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8544' typename='mpc8544_v11-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8543e' typename='mpc8543e_v21-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8543' typename='mpc8543_v21-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8541e' typename='mpc8541e_v11-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8541' typename='mpc8541_v11-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8540' typename='mpc8540_v21-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8533e' typename='mpc8533e_v11-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8533' typename='mpc8533_v11-powerpc64-cpu'/>
+  <cpu type='kvm' name='e500v2' typename='e500v2_v22-powerpc64-cpu'/>
+  <cpu type='kvm' name='e500v1' typename='e500_v20-powerpc64-cpu'/>
+  <cpu type='kvm' name='e500' typename='e500v2_v22-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8347ea' typename='mpc8347eat-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8347e' typename='mpc8347et-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8347a' typename='mpc8347at-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8347' typename='mpc8347t-powerpc64-cpu'/>
+  <cpu type='kvm' name='e300' typename='e300c3-powerpc64-cpu'/>
+  <cpu type='kvm' name='e200' typename='e200z6-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8280' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8275' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8272' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8271' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8270' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8266_hip4' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8266_hip3' typename='g2hip3-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8266' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8265_hip4' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8265_hip3' typename='g2hip3-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8265' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8264_hip4' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8264_hip3' typename='g2hip3-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8264' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8260_hip4' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8260_hip3' typename='g2hip3-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8260' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8255_hip4' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8255_hip3' typename='g2hip3-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8255' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8250_hip4' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8250_hip3' typename='g2hip3-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8250' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8248' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8247' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8245' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8241' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='kvm' name='powerquicc-ii' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc82xx' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc5200b' typename='mpc5200b_v21-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc5200' typename='mpc5200_v12-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc52xx' typename='mpc5200_v12-powerpc64-cpu'/>
+  <cpu type='kvm' name='mpc8240' typename='603-powerpc64-cpu'/>
+  <cpu type='kvm' name='460ex' typename='460exb-powerpc64-cpu'/>
+  <cpu type='kvm' name='440ep' typename='440epb-powerpc64-cpu'/>
+  <cpu type='kvm' name='x2vp50' typename='x2vp20-powerpc64-cpu'/>
+  <cpu type='kvm' name='x2vp7' typename='x2vp4-powerpc64-cpu'/>
+  <cpu type='kvm' name='405gpe' typename='405crc-powerpc64-cpu'/>
+  <cpu type='kvm' name='405gp' typename='405gpd-powerpc64-cpu'/>
+  <cpu type='kvm' name='405cr' typename='405crc-powerpc64-cpu'/>
+  <cpu type='kvm' name='405' typename='405d4-powerpc64-cpu'/>
+  <cpu type='kvm' name='403' typename='403gc-powerpc64-cpu'/>
   <cpu type='kvm' name='mpc8547e_v21'/>
   <cpu type='kvm' name='g2gp'/>
   <cpu type='kvm' name='7457a_v1.1'/>
@@ -616,135 +616,135 @@
   <cpu type='kvm' name='750_v3.1'/>
   <cpu type='kvm' name='power8e_v2.1'/>
   <cpu type='kvm' name='mpc8568e'/>
-  <cpu type='tcg' name='default'/>
-  <cpu type='tcg' name='ppc'/>
-  <cpu type='tcg' name='ppc32'/>
-  <cpu type='tcg' name='ppc64'/>
-  <cpu type='tcg' name='POWER9'/>
-  <cpu type='tcg' name='power8nvl'/>
-  <cpu type='tcg' name='POWER8'/>
-  <cpu type='tcg' name='power8e'/>
-  <cpu type='tcg' name='power7+'/>
-  <cpu type='tcg' name='POWER7'/>
-  <cpu type='tcg' name='power5gs'/>
-  <cpu type='tcg' name='power5+'/>
-  <cpu type='tcg' name='970mp'/>
-  <cpu type='tcg' name='970fx'/>
-  <cpu type='tcg' name='970'/>
-  <cpu type='tcg' name='apollo7pm'/>
-  <cpu type='tcg' name='7457a'/>
-  <cpu type='tcg' name='7447a'/>
-  <cpu type='tcg' name='apollo7'/>
-  <cpu type='tcg' name='7457'/>
-  <cpu type='tcg' name='7447'/>
-  <cpu type='tcg' name='apollo6'/>
-  <cpu type='tcg' name='7455'/>
-  <cpu type='tcg' name='7445'/>
-  <cpu type='tcg' name='7451'/>
-  <cpu type='tcg' name='7441'/>
-  <cpu type='tcg' name='vger'/>
-  <cpu type='tcg' name='7450'/>
-  <cpu type='tcg' name='7448'/>
-  <cpu type='tcg' name='nitro'/>
-  <cpu type='tcg' name='7410'/>
-  <cpu type='tcg' name='g4'/>
-  <cpu type='tcg' name='max'/>
-  <cpu type='tcg' name='7400'/>
-  <cpu type='tcg' name='goldfinger'/>
-  <cpu type='tcg' name='755'/>
-  <cpu type='tcg' name='745'/>
-  <cpu type='tcg' name='lonestar'/>
-  <cpu type='tcg' name='750l'/>
-  <cpu type='tcg' name='750gx'/>
-  <cpu type='tcg' name='750fx'/>
-  <cpu type='tcg' name='750cxe'/>
-  <cpu type='tcg' name='750cx'/>
-  <cpu type='tcg' name='750cl'/>
-  <cpu type='tcg' name='conan/doyle'/>
-  <cpu type='tcg' name='g3'/>
-  <cpu type='tcg' name='typhoon'/>
-  <cpu type='tcg' name='750'/>
-  <cpu type='tcg' name='arthur'/>
-  <cpu type='tcg' name='740'/>
-  <cpu type='tcg' name='mach5'/>
-  <cpu type='tcg' name='sirocco'/>
-  <cpu type='tcg' name='604e'/>
-  <cpu type='tcg' name='goldeneye'/>
-  <cpu type='tcg' name='603r'/>
-  <cpu type='tcg' name='vaillant'/>
-  <cpu type='tcg' name='stretch'/>
-  <cpu type='tcg' name='603e'/>
-  <cpu type='tcg' name='vanilla'/>
-  <cpu type='tcg' name='601v'/>
-  <cpu type='tcg' name='601'/>
-  <cpu type='tcg' name='mpc8560'/>
-  <cpu type='tcg' name='mpc8555e'/>
-  <cpu type='tcg' name='mpc8555'/>
-  <cpu type='tcg' name='mpc8548e'/>
-  <cpu type='tcg' name='mpc8548'/>
-  <cpu type='tcg' name='mpc8547e'/>
-  <cpu type='tcg' name='mpc8545e'/>
-  <cpu type='tcg' name='mpc8545'/>
-  <cpu type='tcg' name='mpc8544e'/>
-  <cpu type='tcg' name='mpc8544'/>
-  <cpu type='tcg' name='mpc8543e'/>
-  <cpu type='tcg' name='mpc8543'/>
-  <cpu type='tcg' name='mpc8541e'/>
-  <cpu type='tcg' name='mpc8541'/>
-  <cpu type='tcg' name='mpc8540'/>
-  <cpu type='tcg' name='mpc8533e'/>
-  <cpu type='tcg' name='mpc8533'/>
-  <cpu type='tcg' name='e500v2'/>
-  <cpu type='tcg' name='e500v1'/>
-  <cpu type='tcg' name='e500'/>
-  <cpu type='tcg' name='mpc8347ea'/>
-  <cpu type='tcg' name='mpc8347e'/>
-  <cpu type='tcg' name='mpc8347a'/>
-  <cpu type='tcg' name='mpc8347'/>
-  <cpu type='tcg' name='e300'/>
-  <cpu type='tcg' name='e200'/>
-  <cpu type='tcg' name='mpc8280'/>
-  <cpu type='tcg' name='mpc8275'/>
-  <cpu type='tcg' name='mpc8272'/>
-  <cpu type='tcg' name='mpc8271'/>
-  <cpu type='tcg' name='mpc8270'/>
-  <cpu type='tcg' name='mpc8266_hip4'/>
-  <cpu type='tcg' name='mpc8266_hip3'/>
-  <cpu type='tcg' name='mpc8266'/>
-  <cpu type='tcg' name='mpc8265_hip4'/>
-  <cpu type='tcg' name='mpc8265_hip3'/>
-  <cpu type='tcg' name='mpc8265'/>
-  <cpu type='tcg' name='mpc8264_hip4'/>
-  <cpu type='tcg' name='mpc8264_hip3'/>
-  <cpu type='tcg' name='mpc8264'/>
-  <cpu type='tcg' name='mpc8260_hip4'/>
-  <cpu type='tcg' name='mpc8260_hip3'/>
-  <cpu type='tcg' name='mpc8260'/>
-  <cpu type='tcg' name='mpc8255_hip4'/>
-  <cpu type='tcg' name='mpc8255_hip3'/>
-  <cpu type='tcg' name='mpc8255'/>
-  <cpu type='tcg' name='mpc8250_hip4'/>
-  <cpu type='tcg' name='mpc8250_hip3'/>
-  <cpu type='tcg' name='mpc8250'/>
-  <cpu type='tcg' name='mpc8248'/>
-  <cpu type='tcg' name='mpc8247'/>
-  <cpu type='tcg' name='mpc8245'/>
-  <cpu type='tcg' name='mpc8241'/>
-  <cpu type='tcg' name='powerquicc-ii'/>
-  <cpu type='tcg' name='mpc82xx'/>
-  <cpu type='tcg' name='mpc5200b'/>
-  <cpu type='tcg' name='mpc5200'/>
-  <cpu type='tcg' name='mpc52xx'/>
-  <cpu type='tcg' name='mpc8240'/>
-  <cpu type='tcg' name='460ex'/>
-  <cpu type='tcg' name='440ep'/>
-  <cpu type='tcg' name='x2vp50'/>
-  <cpu type='tcg' name='x2vp7'/>
-  <cpu type='tcg' name='405gpe'/>
-  <cpu type='tcg' name='405gp'/>
-  <cpu type='tcg' name='405cr'/>
-  <cpu type='tcg' name='405'/>
-  <cpu type='tcg' name='403'/>
+  <cpu type='tcg' name='default' typename='604-powerpc64-cpu'/>
+  <cpu type='tcg' name='ppc' typename='604-powerpc64-cpu'/>
+  <cpu type='tcg' name='ppc32' typename='604-powerpc64-cpu'/>
+  <cpu type='tcg' name='ppc64' typename='970fx_v3.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='POWER9' typename='power9_v2.0-powerpc64-cpu'/>
+  <cpu type='tcg' name='power8nvl' typename='power8nvl_v1.0-powerpc64-cpu'/>
+  <cpu type='tcg' name='POWER8' typename='power8_v2.0-powerpc64-cpu'/>
+  <cpu type='tcg' name='power8e' typename='power8e_v2.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='power7+' typename='power7+_v2.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='POWER7' typename='power7_v2.3-powerpc64-cpu'/>
+  <cpu type='tcg' name='power5gs' typename='power5+_v2.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='power5+' typename='power5+_v2.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='970mp' typename='970mp_v1.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='970fx' typename='970fx_v3.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='970' typename='970_v2.2-powerpc64-cpu'/>
+  <cpu type='tcg' name='apollo7pm' typename='7457a_v1.0-powerpc64-cpu'/>
+  <cpu type='tcg' name='7457a' typename='7457a_v1.2-powerpc64-cpu'/>
+  <cpu type='tcg' name='7447a' typename='7447a_v1.2-powerpc64-cpu'/>
+  <cpu type='tcg' name='apollo7' typename='7457_v1.2-powerpc64-cpu'/>
+  <cpu type='tcg' name='7457' typename='7457_v1.2-powerpc64-cpu'/>
+  <cpu type='tcg' name='7447' typename='7447_v1.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='apollo6' typename='7455_v3.2-powerpc64-cpu'/>
+  <cpu type='tcg' name='7455' typename='7455_v3.2-powerpc64-cpu'/>
+  <cpu type='tcg' name='7445' typename='7445_v3.2-powerpc64-cpu'/>
+  <cpu type='tcg' name='7451' typename='7451_v2.3-powerpc64-cpu'/>
+  <cpu type='tcg' name='7441' typename='7441_v2.3-powerpc64-cpu'/>
+  <cpu type='tcg' name='vger' typename='7450_v2.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='7450' typename='7450_v2.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='7448' typename='7448_v2.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='nitro' typename='7410_v1.4-powerpc64-cpu'/>
+  <cpu type='tcg' name='7410' typename='7410_v1.4-powerpc64-cpu'/>
+  <cpu type='tcg' name='g4' typename='7400_v2.9-powerpc64-cpu'/>
+  <cpu type='tcg' name='max' typename='7400_v2.9-powerpc64-cpu'/>
+  <cpu type='tcg' name='7400' typename='7400_v2.9-powerpc64-cpu'/>
+  <cpu type='tcg' name='goldfinger' typename='755_v2.8-powerpc64-cpu'/>
+  <cpu type='tcg' name='755' typename='755_v2.8-powerpc64-cpu'/>
+  <cpu type='tcg' name='745' typename='745_v2.8-powerpc64-cpu'/>
+  <cpu type='tcg' name='lonestar' typename='750l_v3.2-powerpc64-cpu'/>
+  <cpu type='tcg' name='750l' typename='750l_v3.2-powerpc64-cpu'/>
+  <cpu type='tcg' name='750gx' typename='750gx_v1.2-powerpc64-cpu'/>
+  <cpu type='tcg' name='750fx' typename='750fx_v2.3-powerpc64-cpu'/>
+  <cpu type='tcg' name='750cxe' typename='750cxe_v3.1b-powerpc64-cpu'/>
+  <cpu type='tcg' name='750cx' typename='750cx_v2.2-powerpc64-cpu'/>
+  <cpu type='tcg' name='750cl' typename='750cl_v2.0-powerpc64-cpu'/>
+  <cpu type='tcg' name='conan/doyle' typename='750p-powerpc64-cpu'/>
+  <cpu type='tcg' name='g3' typename='750_v3.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='typhoon' typename='750_v3.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='750' typename='750_v3.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='arthur' typename='740_v3.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='740' typename='740_v3.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='mach5' typename='604r-powerpc64-cpu'/>
+  <cpu type='tcg' name='sirocco' typename='604e_v2.4-powerpc64-cpu'/>
+  <cpu type='tcg' name='604e' typename='604e_v2.4-powerpc64-cpu'/>
+  <cpu type='tcg' name='goldeneye' typename='603e7t-powerpc64-cpu'/>
+  <cpu type='tcg' name='603r' typename='603e7t-powerpc64-cpu'/>
+  <cpu type='tcg' name='vaillant' typename='603e7v-powerpc64-cpu'/>
+  <cpu type='tcg' name='stretch' typename='603e_v4.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='603e' typename='603e_v4.1-powerpc64-cpu'/>
+  <cpu type='tcg' name='vanilla' typename='603-powerpc64-cpu'/>
+  <cpu type='tcg' name='601v' typename='601_v2-powerpc64-cpu'/>
+  <cpu type='tcg' name='601' typename='601_v2-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8560' typename='mpc8560_v21-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8555e' typename='mpc8555e_v11-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8555' typename='mpc8555_v11-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8548e' typename='mpc8548e_v21-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8548' typename='mpc8548_v21-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8547e' typename='mpc8547e_v21-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8545e' typename='mpc8545e_v21-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8545' typename='mpc8545_v21-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8544e' typename='mpc8544e_v11-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8544' typename='mpc8544_v11-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8543e' typename='mpc8543e_v21-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8543' typename='mpc8543_v21-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8541e' typename='mpc8541e_v11-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8541' typename='mpc8541_v11-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8540' typename='mpc8540_v21-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8533e' typename='mpc8533e_v11-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8533' typename='mpc8533_v11-powerpc64-cpu'/>
+  <cpu type='tcg' name='e500v2' typename='e500v2_v22-powerpc64-cpu'/>
+  <cpu type='tcg' name='e500v1' typename='e500_v20-powerpc64-cpu'/>
+  <cpu type='tcg' name='e500' typename='e500v2_v22-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8347ea' typename='mpc8347eat-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8347e' typename='mpc8347et-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8347a' typename='mpc8347at-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8347' typename='mpc8347t-powerpc64-cpu'/>
+  <cpu type='tcg' name='e300' typename='e300c3-powerpc64-cpu'/>
+  <cpu type='tcg' name='e200' typename='e200z6-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8280' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8275' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8272' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8271' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8270' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8266_hip4' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8266_hip3' typename='g2hip3-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8266' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8265_hip4' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8265_hip3' typename='g2hip3-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8265' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8264_hip4' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8264_hip3' typename='g2hip3-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8264' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8260_hip4' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8260_hip3' typename='g2hip3-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8260' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8255_hip4' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8255_hip3' typename='g2hip3-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8255' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8250_hip4' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8250_hip3' typename='g2hip3-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8250' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8248' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8247' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8245' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8241' typename='g2hip4-powerpc64-cpu'/>
+  <cpu type='tcg' name='powerquicc-ii' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc82xx' typename='g2legp3-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc5200b' typename='mpc5200b_v21-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc5200' typename='mpc5200_v12-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc52xx' typename='mpc5200_v12-powerpc64-cpu'/>
+  <cpu type='tcg' name='mpc8240' typename='603-powerpc64-cpu'/>
+  <cpu type='tcg' name='460ex' typename='460exb-powerpc64-cpu'/>
+  <cpu type='tcg' name='440ep' typename='440epb-powerpc64-cpu'/>
+  <cpu type='tcg' name='x2vp50' typename='x2vp20-powerpc64-cpu'/>
+  <cpu type='tcg' name='x2vp7' typename='x2vp4-powerpc64-cpu'/>
+  <cpu type='tcg' name='405gpe' typename='405crc-powerpc64-cpu'/>
+  <cpu type='tcg' name='405gp' typename='405gpd-powerpc64-cpu'/>
+  <cpu type='tcg' name='405cr' typename='405crc-powerpc64-cpu'/>
+  <cpu type='tcg' name='405' typename='405d4-powerpc64-cpu'/>
+  <cpu type='tcg' name='403' typename='403gc-powerpc64-cpu'/>
   <cpu type='tcg' name='mpc8547e_v21'/>
   <cpu type='tcg' name='g2gp'/>
   <cpu type='tcg' name='7457a_v1.1'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
index ebc5b48999..65cc198976 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
@@ -203,23 +203,23 @@
     <property name='msa5-base' type='boolean' value='true'/>
     <property name='tods' type='boolean' value='false'/>
   </hostCPU>
-  <cpu type='kvm' name='z800-base' usable='yes'/>
-  <cpu type='kvm' name='z890.2-base' usable='yes'/>
-  <cpu type='kvm' name='z9EC.2' usable='yes'/>
-  <cpu type='kvm' name='z13.2' usable='yes'/>
-  <cpu type='kvm' name='z990.5-base' usable='yes'/>
-  <cpu type='kvm' name='z9BC-base' usable='yes'/>
-  <cpu type='kvm' name='z890.2' usable='yes'/>
-  <cpu type='kvm' name='z890' usable='yes'/>
-  <cpu type='kvm' name='z9BC' usable='yes'/>
-  <cpu type='kvm' name='z13' usable='yes'/>
-  <cpu type='kvm' name='z196' usable='yes'/>
-  <cpu type='kvm' name='z13s' usable='yes'/>
-  <cpu type='kvm' name='host' usable='yes'/>
-  <cpu type='kvm' name='z990.3' usable='yes'/>
-  <cpu type='kvm' name='z13s-base' usable='yes'/>
-  <cpu type='kvm' name='z9EC' usable='yes'/>
-  <cpu type='kvm' name='gen15a' usable='no'>
+  <cpu type='kvm' name='z800-base' typename='z800-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z890.2-base' typename='z890.2-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z9EC.2' typename='z9EC.2-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z13.2' typename='z13.2-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z990.5-base' typename='z990.5-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z9BC-base' typename='z9BC-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z890.2' typename='z890.2-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z890' typename='z890-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z9BC' typename='z9BC-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z13' typename='z13-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z196' typename='z196-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z13s' typename='z13s-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='host' typename='host-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z990.3' typename='z990.3-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z13s-base' typename='z13s-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z9EC' typename='z9EC-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='gen15a' typename='gen15a-s390x-cpu' usable='no'>
     <blocker name='etoken'/>
     <blocker name='vxpdeh'/>
     <blocker name='vxeh2'/>
@@ -243,7 +243,7 @@
     <blocker name='msa6'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='kvm' name='z14ZR1-base' usable='no'>
+  <cpu type='kvm' name='z14ZR1-base' typename='z14ZR1-base-s390x-cpu' usable='no'>
     <blocker name='tsi'/>
     <blocker name='sema'/>
     <blocker name='minste2'/>
@@ -251,7 +251,7 @@
     <blocker name='opc'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='kvm' name='z14.2-base' usable='no'>
+  <cpu type='kvm' name='z14.2-base' typename='z14.2-base-s390x-cpu' usable='no'>
     <blocker name='tsi'/>
     <blocker name='sema'/>
     <blocker name='minste2'/>
@@ -259,21 +259,21 @@
     <blocker name='opc'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='kvm' name='z900.3-base' usable='yes'/>
-  <cpu type='kvm' name='z13.2-base' usable='yes'/>
-  <cpu type='kvm' name='z196.2-base' usable='yes'/>
-  <cpu type='kvm' name='zBC12-base' usable='yes'/>
-  <cpu type='kvm' name='z9BC.2-base' usable='yes'/>
-  <cpu type='kvm' name='z900.2-base' usable='yes'/>
-  <cpu type='kvm' name='z9EC.3' usable='yes'/>
-  <cpu type='kvm' name='zEC12' usable='yes'/>
-  <cpu type='kvm' name='z900' usable='yes'/>
-  <cpu type='kvm' name='z114-base' usable='yes'/>
-  <cpu type='kvm' name='zEC12-base' usable='yes'/>
-  <cpu type='kvm' name='z10EC.2' usable='yes'/>
-  <cpu type='kvm' name='z10EC-base' usable='yes'/>
-  <cpu type='kvm' name='z900.3' usable='yes'/>
-  <cpu type='kvm' name='z14ZR1' usable='no'>
+  <cpu type='kvm' name='z900.3-base' typename='z900.3-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z13.2-base' typename='z13.2-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z196.2-base' typename='z196.2-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='zBC12-base' typename='zBC12-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z9BC.2-base' typename='z9BC.2-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z900.2-base' typename='z900.2-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z9EC.3' typename='z9EC.3-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='zEC12' typename='zEC12-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z900' typename='z900-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z114-base' typename='z114-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='zEC12-base' typename='zEC12-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z10EC.2' typename='z10EC.2-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z10EC-base' typename='z10EC-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z900.3' typename='z900.3-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z14ZR1' typename='z14ZR1-s390x-cpu' usable='no'>
     <blocker name='mepoch'/>
     <blocker name='vxeh'/>
     <blocker name='vxpd'/>
@@ -290,12 +290,12 @@
     <blocker name='msa6'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='kvm' name='z10BC' usable='yes'/>
-  <cpu type='kvm' name='z10BC.2-base' usable='yes'/>
-  <cpu type='kvm' name='z9BC.2' usable='yes'/>
-  <cpu type='kvm' name='z990.2' usable='yes'/>
-  <cpu type='kvm' name='z990' usable='yes'/>
-  <cpu type='kvm' name='z14' usable='no'>
+  <cpu type='kvm' name='z10BC' typename='z10BC-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z10BC.2-base' typename='z10BC.2-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z9BC.2' typename='z9BC.2-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z990.2' typename='z990.2-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z990' typename='z990-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z14' typename='z14-s390x-cpu' usable='no'>
     <blocker name='mepoch'/>
     <blocker name='vxeh'/>
     <blocker name='vxpd'/>
@@ -312,7 +312,7 @@
     <blocker name='msa6'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='kvm' name='gen15b-base' usable='no'>
+  <cpu type='kvm' name='gen15b-base' typename='gen15b-base-s390x-cpu' usable='no'>
     <blocker name='minste3'/>
     <blocker name='tsi'/>
     <blocker name='sema'/>
@@ -321,10 +321,10 @@
     <blocker name='opc'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='kvm' name='z990.4' usable='yes'/>
-  <cpu type='kvm' name='max' usable='yes'/>
-  <cpu type='kvm' name='z10EC.2-base' usable='yes'/>
-  <cpu type='kvm' name='gen15a-base' usable='no'>
+  <cpu type='kvm' name='z990.4' typename='z990.4-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='max' typename='max-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z10EC.2-base' typename='z10EC.2-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='gen15a-base' typename='gen15a-base-s390x-cpu' usable='no'>
     <blocker name='minste3'/>
     <blocker name='tsi'/>
     <blocker name='sema'/>
@@ -333,20 +333,20 @@
     <blocker name='opc'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='kvm' name='z800' usable='yes'/>
-  <cpu type='kvm' name='zEC12.2' usable='yes'/>
-  <cpu type='kvm' name='z10EC' usable='yes'/>
-  <cpu type='kvm' name='z990.2-base' usable='yes'/>
-  <cpu type='kvm' name='z900-base' usable='yes'/>
-  <cpu type='kvm' name='z10BC.2' usable='yes'/>
-  <cpu type='kvm' name='z9EC-base' usable='yes'/>
-  <cpu type='kvm' name='z9EC.3-base' usable='yes'/>
-  <cpu type='kvm' name='z114' usable='yes'/>
-  <cpu type='kvm' name='z890.3' usable='yes'/>
-  <cpu type='kvm' name='z196-base' usable='yes'/>
-  <cpu type='kvm' name='z9EC.2-base' usable='yes'/>
-  <cpu type='kvm' name='z196.2' usable='yes'/>
-  <cpu type='kvm' name='z14.2' usable='no'>
+  <cpu type='kvm' name='z800' typename='z800-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='zEC12.2' typename='zEC12.2-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z10EC' typename='z10EC-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z990.2-base' typename='z990.2-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z900-base' typename='z900-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z10BC.2' typename='z10BC.2-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z9EC-base' typename='z9EC-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z9EC.3-base' typename='z9EC.3-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z114' typename='z114-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z890.3' typename='z890.3-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z196-base' typename='z196-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z9EC.2-base' typename='z9EC.2-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z196.2' typename='z196.2-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z14.2' typename='z14.2-s390x-cpu' usable='no'>
     <blocker name='mepoch'/>
     <blocker name='vxeh'/>
     <blocker name='vxpd'/>
@@ -363,11 +363,11 @@
     <blocker name='msa6'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='kvm' name='z990-base' usable='yes'/>
-  <cpu type='kvm' name='z900.2' usable='yes'/>
-  <cpu type='kvm' name='z890-base' usable='yes'/>
-  <cpu type='kvm' name='z10EC.3' usable='yes'/>
-  <cpu type='kvm' name='z14-base' usable='no'>
+  <cpu type='kvm' name='z990-base' typename='z990-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z900.2' typename='z900.2-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z890-base' typename='z890-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z10EC.3' typename='z10EC.3-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z14-base' typename='z14-base-s390x-cpu' usable='no'>
     <blocker name='tsi'/>
     <blocker name='sema'/>
     <blocker name='minste2'/>
@@ -375,16 +375,16 @@
     <blocker name='opc'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='kvm' name='z990.4-base' usable='yes'/>
-  <cpu type='kvm' name='z10EC.3-base' usable='yes'/>
-  <cpu type='kvm' name='z10BC-base' usable='yes'/>
-  <cpu type='kvm' name='z13-base' usable='yes'/>
-  <cpu type='kvm' name='z990.3-base' usable='yes'/>
-  <cpu type='kvm' name='zEC12.2-base' usable='yes'/>
-  <cpu type='kvm' name='zBC12' usable='yes'/>
-  <cpu type='kvm' name='z890.3-base' usable='yes'/>
-  <cpu type='kvm' name='z990.5' usable='yes'/>
-  <cpu type='kvm' name='gen15b' usable='no'>
+  <cpu type='kvm' name='z990.4-base' typename='z990.4-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z10EC.3-base' typename='z10EC.3-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z10BC-base' typename='z10BC-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z13-base' typename='z13-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z990.3-base' typename='z990.3-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='zEC12.2-base' typename='zEC12.2-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='zBC12' typename='zBC12-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z890.3-base' typename='z890.3-base-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='z990.5' typename='z990.5-s390x-cpu' usable='yes'/>
+  <cpu type='kvm' name='gen15b' typename='gen15b-s390x-cpu' usable='no'>
     <blocker name='etoken'/>
     <blocker name='vxpdeh'/>
     <blocker name='vxeh2'/>
@@ -408,11 +408,11 @@
     <blocker name='msa6'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='kvm' name='qemu' usable='no'>
+  <cpu type='kvm' name='qemu' typename='qemu-s390x-cpu' usable='no'>
     <blocker name='ais'/>
   </cpu>
-  <cpu type='tcg' name='z800-base' usable='yes'/>
-  <cpu type='tcg' name='z890.2-base' usable='no'>
+  <cpu type='tcg' name='z800-base' typename='z800-base-s390x-cpu' usable='yes'/>
+  <cpu type='tcg' name='z890.2-base' typename='z890.2-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -426,7 +426,7 @@
     <blocker name='kmac-dea'/>
     <blocker name='hfpm'/>
   </cpu>
-  <cpu type='tcg' name='z9EC.2' usable='no'>
+  <cpu type='tcg' name='z9EC.2' typename='z9EC.2-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -447,7 +447,7 @@
     <blocker name='msa1'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z13.2' usable='no'>
+  <cpu type='tcg' name='z13.2' typename='z13.2-s390x-cpu' usable='no'>
     <blocker name='ppno-sha-512-drng'/>
     <blocker name='pcc-xts-eaes-256'/>
     <blocker name='pcc-xts-eaes-128'/>
@@ -573,7 +573,7 @@
     <blocker name='gen13ptff'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z990.5-base' usable='no'>
+  <cpu type='tcg' name='z990.5-base' typename='z990.5-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -587,7 +587,7 @@
     <blocker name='kmac-dea'/>
     <blocker name='hfpm'/>
   </cpu>
-  <cpu type='tcg' name='z9BC-base' usable='no'>
+  <cpu type='tcg' name='z9BC-base' typename='z9BC-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -605,7 +605,7 @@
     <blocker name='asnlxr'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z890.2' usable='no'>
+  <cpu type='tcg' name='z890.2' typename='z890.2-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -619,7 +619,7 @@
     <blocker name='kmac-dea'/>
     <blocker name='hfpm'/>
   </cpu>
-  <cpu type='tcg' name='z890' usable='no'>
+  <cpu type='tcg' name='z890' typename='z890-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -633,7 +633,7 @@
     <blocker name='kmac-dea'/>
     <blocker name='hfpm'/>
   </cpu>
-  <cpu type='tcg' name='z9BC' usable='no'>
+  <cpu type='tcg' name='z9BC' typename='z9BC-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -654,7 +654,7 @@
     <blocker name='msa1'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z13' usable='no'>
+  <cpu type='tcg' name='z13' typename='z13-s390x-cpu' usable='no'>
     <blocker name='ppno-sha-512-drng'/>
     <blocker name='pcc-xts-eaes-256'/>
     <blocker name='pcc-xts-eaes-128'/>
@@ -780,7 +780,7 @@
     <blocker name='gen13ptff'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z196' usable='no'>
+  <cpu type='tcg' name='z196' typename='z196-s390x-cpu' usable='no'>
     <blocker name='pcc-xts-eaes-256'/>
     <blocker name='pcc-xts-eaes-128'/>
     <blocker name='pcc-xts-aes-256'/>
@@ -898,7 +898,7 @@
     <blocker name='msa1'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z13s' usable='no'>
+  <cpu type='tcg' name='z13s' typename='z13s-s390x-cpu' usable='no'>
     <blocker name='ppno-sha-512-drng'/>
     <blocker name='pcc-xts-eaes-256'/>
     <blocker name='pcc-xts-eaes-128'/>
@@ -1024,8 +1024,8 @@
     <blocker name='gen13ptff'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='host' usable='yes'/>
-  <cpu type='tcg' name='z990.3' usable='no'>
+  <cpu type='tcg' name='host' typename='host-s390x-cpu' usable='yes'/>
+  <cpu type='tcg' name='z990.3' typename='z990.3-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1039,7 +1039,7 @@
     <blocker name='kmac-dea'/>
     <blocker name='hfpm'/>
   </cpu>
-  <cpu type='tcg' name='z13s-base' usable='no'>
+  <cpu type='tcg' name='z13s-base' typename='z13s-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1068,7 +1068,7 @@
     <blocker name='gen13ptff'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z9EC' usable='no'>
+  <cpu type='tcg' name='z9EC' typename='z9EC-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1089,7 +1089,7 @@
     <blocker name='msa1'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='gen15a' usable='no'>
+  <cpu type='tcg' name='gen15a' typename='gen15a-s390x-cpu' usable='no'>
     <blocker name='ppno-sha-512-drng'/>
     <blocker name='pcc-xts-eaes-256'/>
     <blocker name='pcc-xts-eaes-128'/>
@@ -1234,7 +1234,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z14ZR1-base' usable='no'>
+  <cpu type='tcg' name='z14ZR1-base' typename='z14ZR1-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1269,7 +1269,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z14.2-base' usable='no'>
+  <cpu type='tcg' name='z14.2-base' typename='z14.2-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1304,8 +1304,8 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z900.3-base' usable='yes'/>
-  <cpu type='tcg' name='z13.2-base' usable='no'>
+  <cpu type='tcg' name='z900.3-base' typename='z900.3-base-s390x-cpu' usable='yes'/>
+  <cpu type='tcg' name='z13.2-base' typename='z13.2-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1334,7 +1334,7 @@
     <blocker name='gen13ptff'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z196.2-base' usable='no'>
+  <cpu type='tcg' name='z196.2-base' typename='z196.2-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1360,7 +1360,7 @@
     <blocker name='asnlxr'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='zBC12-base' usable='no'>
+  <cpu type='tcg' name='zBC12-base' typename='zBC12-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1387,7 +1387,7 @@
     <blocker name='asnlxr'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z9BC.2-base' usable='no'>
+  <cpu type='tcg' name='z9BC.2-base' typename='z9BC.2-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1405,8 +1405,8 @@
     <blocker name='asnlxr'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z900.2-base' usable='yes'/>
-  <cpu type='tcg' name='z9EC.3' usable='no'>
+  <cpu type='tcg' name='z900.2-base' typename='z900.2-base-s390x-cpu' usable='yes'/>
+  <cpu type='tcg' name='z9EC.3' typename='z9EC.3-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1427,7 +1427,7 @@
     <blocker name='msa1'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='zEC12' usable='no'>
+  <cpu type='tcg' name='zEC12' typename='zEC12-s390x-cpu' usable='no'>
     <blocker name='pcc-xts-eaes-256'/>
     <blocker name='pcc-xts-eaes-128'/>
     <blocker name='pcc-xts-aes-256'/>
@@ -1550,8 +1550,8 @@
     <blocker name='msa1'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z900' usable='yes'/>
-  <cpu type='tcg' name='z114-base' usable='no'>
+  <cpu type='tcg' name='z900' typename='z900-s390x-cpu' usable='yes'/>
+  <cpu type='tcg' name='z114-base' typename='z114-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1577,7 +1577,7 @@
     <blocker name='asnlxr'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='zEC12-base' usable='no'>
+  <cpu type='tcg' name='zEC12-base' typename='zEC12-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1604,7 +1604,7 @@
     <blocker name='asnlxr'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z10EC.2' usable='no'>
+  <cpu type='tcg' name='z10EC.2' typename='z10EC.2-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1632,7 +1632,7 @@
     <blocker name='msa1'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z10EC-base' usable='no'>
+  <cpu type='tcg' name='z10EC-base' typename='z10EC-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1655,8 +1655,8 @@
     <blocker name='asnlxr'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z900.3' usable='yes'/>
-  <cpu type='tcg' name='z14ZR1' usable='no'>
+  <cpu type='tcg' name='z900.3' typename='z900.3-s390x-cpu' usable='yes'/>
+  <cpu type='tcg' name='z14ZR1' typename='z14ZR1-s390x-cpu' usable='no'>
     <blocker name='ppno-sha-512-drng'/>
     <blocker name='pcc-xts-eaes-256'/>
     <blocker name='pcc-xts-eaes-128'/>
@@ -1796,7 +1796,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z10BC' usable='no'>
+  <cpu type='tcg' name='z10BC' typename='z10BC-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1824,7 +1824,7 @@
     <blocker name='msa1'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z10BC.2-base' usable='no'>
+  <cpu type='tcg' name='z10BC.2-base' typename='z10BC.2-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1847,7 +1847,7 @@
     <blocker name='asnlxr'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z9BC.2' usable='no'>
+  <cpu type='tcg' name='z9BC.2' typename='z9BC.2-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1868,7 +1868,7 @@
     <blocker name='msa1'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z990.2' usable='no'>
+  <cpu type='tcg' name='z990.2' typename='z990.2-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1882,7 +1882,7 @@
     <blocker name='kmac-dea'/>
     <blocker name='hfpm'/>
   </cpu>
-  <cpu type='tcg' name='z990' usable='no'>
+  <cpu type='tcg' name='z990' typename='z990-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -1896,7 +1896,7 @@
     <blocker name='kmac-dea'/>
     <blocker name='hfpm'/>
   </cpu>
-  <cpu type='tcg' name='z14' usable='no'>
+  <cpu type='tcg' name='z14' typename='z14-s390x-cpu' usable='no'>
     <blocker name='ppno-sha-512-drng'/>
     <blocker name='pcc-xts-eaes-256'/>
     <blocker name='pcc-xts-eaes-128'/>
@@ -2036,7 +2036,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='gen15b-base' usable='no'>
+  <cpu type='tcg' name='gen15b-base' typename='gen15b-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -2071,7 +2071,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z990.4' usable='no'>
+  <cpu type='tcg' name='z990.4' typename='z990.4-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -2085,8 +2085,8 @@
     <blocker name='kmac-dea'/>
     <blocker name='hfpm'/>
   </cpu>
-  <cpu type='tcg' name='max' usable='yes'/>
-  <cpu type='tcg' name='z10EC.2-base' usable='no'>
+  <cpu type='tcg' name='max' typename='max-s390x-cpu' usable='yes'/>
+  <cpu type='tcg' name='z10EC.2-base' typename='z10EC.2-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -2109,7 +2109,7 @@
     <blocker name='asnlxr'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='gen15a-base' usable='no'>
+  <cpu type='tcg' name='gen15a-base' typename='gen15a-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -2144,8 +2144,8 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z800' usable='yes'/>
-  <cpu type='tcg' name='zEC12.2' usable='no'>
+  <cpu type='tcg' name='z800' typename='z800-s390x-cpu' usable='yes'/>
+  <cpu type='tcg' name='zEC12.2' typename='zEC12.2-s390x-cpu' usable='no'>
     <blocker name='pcc-xts-eaes-256'/>
     <blocker name='pcc-xts-eaes-128'/>
     <blocker name='pcc-xts-aes-256'/>
@@ -2268,7 +2268,7 @@
     <blocker name='msa1'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z10EC' usable='no'>
+  <cpu type='tcg' name='z10EC' typename='z10EC-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -2296,7 +2296,7 @@
     <blocker name='msa1'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z990.2-base' usable='no'>
+  <cpu type='tcg' name='z990.2-base' typename='z990.2-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -2310,8 +2310,8 @@
     <blocker name='kmac-dea'/>
     <blocker name='hfpm'/>
   </cpu>
-  <cpu type='tcg' name='z900-base' usable='yes'/>
-  <cpu type='tcg' name='z10BC.2' usable='no'>
+  <cpu type='tcg' name='z900-base' typename='z900-base-s390x-cpu' usable='yes'/>
+  <cpu type='tcg' name='z10BC.2' typename='z10BC.2-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -2339,7 +2339,7 @@
     <blocker name='msa1'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z9EC-base' usable='no'>
+  <cpu type='tcg' name='z9EC-base' typename='z9EC-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -2357,7 +2357,7 @@
     <blocker name='asnlxr'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z9EC.3-base' usable='no'>
+  <cpu type='tcg' name='z9EC.3-base' typename='z9EC.3-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -2375,7 +2375,7 @@
     <blocker name='asnlxr'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z114' usable='no'>
+  <cpu type='tcg' name='z114' typename='z114-s390x-cpu' usable='no'>
     <blocker name='pcc-xts-eaes-256'/>
     <blocker name='pcc-xts-eaes-128'/>
     <blocker name='pcc-xts-aes-256'/>
@@ -2493,7 +2493,7 @@
     <blocker name='msa1'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z890.3' usable='no'>
+  <cpu type='tcg' name='z890.3' typename='z890.3-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -2507,7 +2507,7 @@
     <blocker name='kmac-dea'/>
     <blocker name='hfpm'/>
   </cpu>
-  <cpu type='tcg' name='z196-base' usable='no'>
+  <cpu type='tcg' name='z196-base' typename='z196-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -2533,7 +2533,7 @@
     <blocker name='asnlxr'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z9EC.2-base' usable='no'>
+  <cpu type='tcg' name='z9EC.2-base' typename='z9EC.2-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -2551,7 +2551,7 @@
     <blocker name='asnlxr'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z196.2' usable='no'>
+  <cpu type='tcg' name='z196.2' typename='z196.2-s390x-cpu' usable='no'>
     <blocker name='pcc-xts-eaes-256'/>
     <blocker name='pcc-xts-eaes-128'/>
     <blocker name='pcc-xts-aes-256'/>
@@ -2669,7 +2669,7 @@
     <blocker name='msa1'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z14.2' usable='no'>
+  <cpu type='tcg' name='z14.2' typename='z14.2-s390x-cpu' usable='no'>
     <blocker name='ppno-sha-512-drng'/>
     <blocker name='pcc-xts-eaes-256'/>
     <blocker name='pcc-xts-eaes-128'/>
@@ -2809,7 +2809,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z990-base' usable='no'>
+  <cpu type='tcg' name='z990-base' typename='z990-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -2823,8 +2823,8 @@
     <blocker name='kmac-dea'/>
     <blocker name='hfpm'/>
   </cpu>
-  <cpu type='tcg' name='z900.2' usable='yes'/>
-  <cpu type='tcg' name='z890-base' usable='no'>
+  <cpu type='tcg' name='z900.2' typename='z900.2-s390x-cpu' usable='yes'/>
+  <cpu type='tcg' name='z890-base' typename='z890-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -2838,7 +2838,7 @@
     <blocker name='kmac-dea'/>
     <blocker name='hfpm'/>
   </cpu>
-  <cpu type='tcg' name='z10EC.3' usable='no'>
+  <cpu type='tcg' name='z10EC.3' typename='z10EC.3-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -2866,7 +2866,7 @@
     <blocker name='msa1'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z14-base' usable='no'>
+  <cpu type='tcg' name='z14-base' typename='z14-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -2901,7 +2901,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='z990.4-base' usable='no'>
+  <cpu type='tcg' name='z990.4-base' typename='z990.4-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -2915,7 +2915,7 @@
     <blocker name='kmac-dea'/>
     <blocker name='hfpm'/>
   </cpu>
-  <cpu type='tcg' name='z10EC.3-base' usable='no'>
+  <cpu type='tcg' name='z10EC.3-base' typename='z10EC.3-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -2938,7 +2938,7 @@
     <blocker name='asnlxr'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z10BC-base' usable='no'>
+  <cpu type='tcg' name='z10BC-base' typename='z10BC-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -2961,7 +2961,7 @@
     <blocker name='asnlxr'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z13-base' usable='no'>
+  <cpu type='tcg' name='z13-base' typename='z13-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -2990,7 +2990,7 @@
     <blocker name='gen13ptff'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z990.3-base' usable='no'>
+  <cpu type='tcg' name='z990.3-base' typename='z990.3-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -3004,7 +3004,7 @@
     <blocker name='kmac-dea'/>
     <blocker name='hfpm'/>
   </cpu>
-  <cpu type='tcg' name='zEC12.2-base' usable='no'>
+  <cpu type='tcg' name='zEC12.2-base' typename='zEC12.2-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -3031,7 +3031,7 @@
     <blocker name='asnlxr'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='zBC12' usable='no'>
+  <cpu type='tcg' name='zBC12' typename='zBC12-s390x-cpu' usable='no'>
     <blocker name='pcc-xts-eaes-256'/>
     <blocker name='pcc-xts-eaes-128'/>
     <blocker name='pcc-xts-aes-256'/>
@@ -3154,7 +3154,7 @@
     <blocker name='msa1'/>
     <blocker name='tods'/>
   </cpu>
-  <cpu type='tcg' name='z890.3-base' usable='no'>
+  <cpu type='tcg' name='z890.3-base' typename='z890.3-base-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -3168,7 +3168,7 @@
     <blocker name='kmac-dea'/>
     <blocker name='hfpm'/>
   </cpu>
-  <cpu type='tcg' name='z990.5' usable='no'>
+  <cpu type='tcg' name='z990.5' typename='z990.5-s390x-cpu' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
     <blocker name='km-tdea-192'/>
@@ -3182,7 +3182,7 @@
     <blocker name='kmac-dea'/>
     <blocker name='hfpm'/>
   </cpu>
-  <cpu type='tcg' name='gen15b' usable='no'>
+  <cpu type='tcg' name='gen15b' typename='gen15b-s390x-cpu' usable='no'>
     <blocker name='ppno-sha-512-drng'/>
     <blocker name='pcc-xts-eaes-256'/>
     <blocker name='pcc-xts-eaes-128'/>
@@ -3327,7 +3327,7 @@
     <blocker name='tods'/>
     <blocker name='type'/>
   </cpu>
-  <cpu type='tcg' name='qemu' usable='yes'/>
+  <cpu type='tcg' name='qemu' typename='qemu-s390x-cpu' usable='yes'/>
   <machine name='s390-ccw-virtio-4.2' alias='s390-ccw-virtio' hotplugCpus='yes' maxCpus='248' default='yes'/>
   <machine name='s390-ccw-virtio-4.0' hotplugCpus='yes' maxCpus='248'/>
   <machine name='s390-ccw-virtio-3.1' hotplugCpus='yes' maxCpus='248'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
index 963afbbc9e..294c605df9 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@@ -621,14 +621,14 @@
     <property name='avx512pf' type='boolean' value='false'/>
     <property name='xstore-en' type='boolean' value='false'/>
   </hostCPU>
-  <cpu type='kvm' name='max' usable='yes'/>
-  <cpu type='kvm' name='host' usable='yes'/>
-  <cpu type='kvm' name='base' usable='yes'/>
-  <cpu type='kvm' name='qemu64-v1' usable='yes'/>
-  <cpu type='kvm' name='qemu64' usable='yes'/>
-  <cpu type='kvm' name='qemu32-v1' usable='yes'/>
-  <cpu type='kvm' name='qemu32' usable='yes'/>
-  <cpu type='kvm' name='phenom-v1' usable='no'>
+  <cpu type='kvm' name='max' typename='max-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='host' typename='host-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='base' typename='base-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='qemu64-v1' typename='qemu64-v1-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='qemu64' typename='qemu64-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='qemu32-v1' typename='qemu32-v1-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='qemu32' typename='qemu32-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='phenom-v1' typename='phenom-v1-x86_64-cpu' usable='no'>
     <blocker name='mmxext'/>
     <blocker name='fxsr-opt'/>
     <blocker name='3dnowext'/>
@@ -636,7 +636,7 @@
     <blocker name='sse4a'/>
     <blocker name='npt'/>
   </cpu>
-  <cpu type='kvm' name='phenom' usable='no'>
+  <cpu type='kvm' name='phenom' typename='phenom-x86_64-cpu' usable='no'>
     <blocker name='mmxext'/>
     <blocker name='fxsr-opt'/>
     <blocker name='3dnowext'/>
@@ -644,37 +644,37 @@
     <blocker name='sse4a'/>
     <blocker name='npt'/>
   </cpu>
-  <cpu type='kvm' name='pentium3-v1' usable='yes'/>
-  <cpu type='kvm' name='pentium3' usable='yes'/>
-  <cpu type='kvm' name='pentium2-v1' usable='yes'/>
-  <cpu type='kvm' name='pentium2' usable='yes'/>
-  <cpu type='kvm' name='pentium-v1' usable='yes'/>
-  <cpu type='kvm' name='pentium' usable='yes'/>
-  <cpu type='kvm' name='n270-v1' usable='yes'/>
-  <cpu type='kvm' name='n270' usable='yes'/>
-  <cpu type='kvm' name='kvm64-v1' usable='yes'/>
-  <cpu type='kvm' name='kvm64' usable='yes'/>
-  <cpu type='kvm' name='kvm32-v1' usable='yes'/>
-  <cpu type='kvm' name='kvm32' usable='yes'/>
-  <cpu type='kvm' name='coreduo-v1' usable='yes'/>
-  <cpu type='kvm' name='coreduo' usable='yes'/>
-  <cpu type='kvm' name='core2duo-v1' usable='yes'/>
-  <cpu type='kvm' name='core2duo' usable='yes'/>
-  <cpu type='kvm' name='athlon-v1' usable='no'>
+  <cpu type='kvm' name='pentium3-v1' typename='pentium3-v1-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='pentium3' typename='pentium3-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='pentium2-v1' typename='pentium2-v1-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='pentium2' typename='pentium2-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='pentium-v1' typename='pentium-v1-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='pentium' typename='pentium-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='n270-v1' typename='n270-v1-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='n270' typename='n270-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='kvm64-v1' typename='kvm64-v1-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='kvm64' typename='kvm64-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='kvm32-v1' typename='kvm32-v1-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='kvm32' typename='kvm32-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='coreduo-v1' typename='coreduo-v1-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='coreduo' typename='coreduo-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='core2duo-v1' typename='core2duo-v1-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='core2duo' typename='core2duo-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='athlon-v1' typename='athlon-v1-x86_64-cpu' usable='no'>
     <blocker name='mmxext'/>
     <blocker name='3dnowext'/>
     <blocker name='3dnow'/>
   </cpu>
-  <cpu type='kvm' name='athlon' usable='no'>
+  <cpu type='kvm' name='athlon' typename='athlon-x86_64-cpu' usable='no'>
     <blocker name='mmxext'/>
     <blocker name='3dnowext'/>
     <blocker name='3dnow'/>
   </cpu>
-  <cpu type='kvm' name='Westmere-v2' usable='yes'/>
-  <cpu type='kvm' name='Westmere-v1' usable='yes'/>
-  <cpu type='kvm' name='Westmere-IBRS' usable='yes'/>
-  <cpu type='kvm' name='Westmere' usable='yes'/>
-  <cpu type='kvm' name='Snowridge-v1' usable='no'>
+  <cpu type='kvm' name='Westmere-v2' typename='Westmere-v2-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Westmere-v1' typename='Westmere-v1-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Westmere-IBRS' typename='Westmere-IBRS-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Westmere' typename='Westmere-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Snowridge-v1' typename='Snowridge-v1-x86_64-cpu' usable='no'>
     <blocker name='clwb'/>
     <blocker name='sha-ni'/>
     <blocker name='gfni'/>
@@ -684,7 +684,7 @@
     <blocker name='core-capability'/>
     <blocker name='split-lock-detect'/>
   </cpu>
-  <cpu type='kvm' name='Snowridge' usable='no'>
+  <cpu type='kvm' name='Snowridge' typename='Snowridge-x86_64-cpu' usable='no'>
     <blocker name='clwb'/>
     <blocker name='sha-ni'/>
     <blocker name='gfni'/>
@@ -694,7 +694,7 @@
     <blocker name='core-capability'/>
     <blocker name='split-lock-detect'/>
   </cpu>
-  <cpu type='kvm' name='Skylake-Server-v2' usable='no'>
+  <cpu type='kvm' name='Skylake-Server-v2' typename='Skylake-Server-v2-x86_64-cpu' usable='no'>
     <blocker name='avx512f'/>
     <blocker name='avx512dq'/>
     <blocker name='clwb'/>
@@ -707,7 +707,7 @@
     <blocker name='avx512f'/>
     <blocker name='pku'/>
   </cpu>
-  <cpu type='kvm' name='Skylake-Server-v1' usable='no'>
+  <cpu type='kvm' name='Skylake-Server-v1' typename='Skylake-Server-v1-x86_64-cpu' usable='no'>
     <blocker name='avx512f'/>
     <blocker name='avx512dq'/>
     <blocker name='clwb'/>
@@ -720,7 +720,7 @@
     <blocker name='avx512f'/>
     <blocker name='pku'/>
   </cpu>
-  <cpu type='kvm' name='Skylake-Server-IBRS' usable='no'>
+  <cpu type='kvm' name='Skylake-Server-IBRS' typename='Skylake-Server-IBRS-x86_64-cpu' usable='no'>
     <blocker name='avx512f'/>
     <blocker name='avx512dq'/>
     <blocker name='clwb'/>
@@ -733,7 +733,7 @@
     <blocker name='avx512f'/>
     <blocker name='pku'/>
   </cpu>
-  <cpu type='kvm' name='Skylake-Server' usable='no'>
+  <cpu type='kvm' name='Skylake-Server' typename='Skylake-Server-x86_64-cpu' usable='no'>
     <blocker name='avx512f'/>
     <blocker name='avx512dq'/>
     <blocker name='clwb'/>
@@ -746,17 +746,17 @@
     <blocker name='avx512f'/>
     <blocker name='pku'/>
   </cpu>
-  <cpu type='kvm' name='Skylake-Client-v2' usable='yes'/>
-  <cpu type='kvm' name='Skylake-Client-v1' usable='yes'/>
-  <cpu type='kvm' name='Skylake-Client-IBRS' usable='yes'/>
-  <cpu type='kvm' name='Skylake-Client' usable='yes'/>
-  <cpu type='kvm' name='SandyBridge-v2' usable='yes'/>
-  <cpu type='kvm' name='SandyBridge-v1' usable='yes'/>
-  <cpu type='kvm' name='SandyBridge-IBRS' usable='yes'/>
-  <cpu type='kvm' name='SandyBridge' usable='yes'/>
-  <cpu type='kvm' name='Penryn-v1' usable='yes'/>
-  <cpu type='kvm' name='Penryn' usable='yes'/>
-  <cpu type='kvm' name='Opteron_G5-v1' usable='no'>
+  <cpu type='kvm' name='Skylake-Client-v2' typename='Skylake-Client-v2-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Skylake-Client-v1' typename='Skylake-Client-v1-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Skylake-Client-IBRS' typename='Skylake-Client-IBRS-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Skylake-Client' typename='Skylake-Client-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='SandyBridge-v2' typename='SandyBridge-v2-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='SandyBridge-v1' typename='SandyBridge-v1-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='SandyBridge-IBRS' typename='SandyBridge-IBRS-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='SandyBridge' typename='SandyBridge-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Penryn-v1' typename='Penryn-v1-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Penryn' typename='Penryn-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Opteron_G5-v1' typename='Opteron_G5-v1-x86_64-cpu' usable='no'>
     <blocker name='sse4a'/>
     <blocker name='misalignsse'/>
     <blocker name='xop'/>
@@ -765,7 +765,7 @@
     <blocker name='npt'/>
     <blocker name='nrip-save'/>
   </cpu>
-  <cpu type='kvm' name='Opteron_G5' usable='no'>
+  <cpu type='kvm' name='Opteron_G5' typename='Opteron_G5-x86_64-cpu' usable='no'>
     <blocker name='sse4a'/>
     <blocker name='misalignsse'/>
     <blocker name='xop'/>
@@ -774,7 +774,7 @@
     <blocker name='npt'/>
     <blocker name='nrip-save'/>
   </cpu>
-  <cpu type='kvm' name='Opteron_G4-v1' usable='no'>
+  <cpu type='kvm' name='Opteron_G4-v1' typename='Opteron_G4-v1-x86_64-cpu' usable='no'>
     <blocker name='sse4a'/>
     <blocker name='misalignsse'/>
     <blocker name='xop'/>
@@ -782,7 +782,7 @@
     <blocker name='npt'/>
     <blocker name='nrip-save'/>
   </cpu>
-  <cpu type='kvm' name='Opteron_G4' usable='no'>
+  <cpu type='kvm' name='Opteron_G4' typename='Opteron_G4-x86_64-cpu' usable='no'>
     <blocker name='sse4a'/>
     <blocker name='misalignsse'/>
     <blocker name='xop'/>
@@ -790,23 +790,23 @@
     <blocker name='npt'/>
     <blocker name='nrip-save'/>
   </cpu>
-  <cpu type='kvm' name='Opteron_G3-v1' usable='no'>
+  <cpu type='kvm' name='Opteron_G3-v1' typename='Opteron_G3-v1-x86_64-cpu' usable='no'>
     <blocker name='sse4a'/>
     <blocker name='misalignsse'/>
   </cpu>
-  <cpu type='kvm' name='Opteron_G3' usable='no'>
+  <cpu type='kvm' name='Opteron_G3' typename='Opteron_G3-x86_64-cpu' usable='no'>
     <blocker name='sse4a'/>
     <blocker name='misalignsse'/>
   </cpu>
-  <cpu type='kvm' name='Opteron_G2-v1' usable='yes'/>
-  <cpu type='kvm' name='Opteron_G2' usable='yes'/>
-  <cpu type='kvm' name='Opteron_G1-v1' usable='yes'/>
-  <cpu type='kvm' name='Opteron_G1' usable='yes'/>
-  <cpu type='kvm' name='Nehalem-v2' usable='yes'/>
-  <cpu type='kvm' name='Nehalem-v1' usable='yes'/>
-  <cpu type='kvm' name='Nehalem-IBRS' usable='yes'/>
-  <cpu type='kvm' name='Nehalem' usable='yes'/>
-  <cpu type='kvm' name='KnightsMill-v1' usable='no'>
+  <cpu type='kvm' name='Opteron_G2-v1' typename='Opteron_G2-v1-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Opteron_G2' typename='Opteron_G2-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Opteron_G1-v1' typename='Opteron_G1-v1-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Opteron_G1' typename='Opteron_G1-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Nehalem-v2' typename='Nehalem-v2-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Nehalem-v1' typename='Nehalem-v1-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Nehalem-IBRS' typename='Nehalem-IBRS-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Nehalem' typename='Nehalem-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='KnightsMill-v1' typename='KnightsMill-v1-x86_64-cpu' usable='no'>
     <blocker name='avx512f'/>
     <blocker name='avx512pf'/>
     <blocker name='avx512er'/>
@@ -818,7 +818,7 @@
     <blocker name='avx512f'/>
     <blocker name='avx512f'/>
   </cpu>
-  <cpu type='kvm' name='KnightsMill' usable='no'>
+  <cpu type='kvm' name='KnightsMill' typename='KnightsMill-x86_64-cpu' usable='no'>
     <blocker name='avx512f'/>
     <blocker name='avx512pf'/>
     <blocker name='avx512er'/>
@@ -830,11 +830,11 @@
     <blocker name='avx512f'/>
     <blocker name='avx512f'/>
   </cpu>
-  <cpu type='kvm' name='IvyBridge-v2' usable='yes'/>
-  <cpu type='kvm' name='IvyBridge-v1' usable='yes'/>
-  <cpu type='kvm' name='IvyBridge-IBRS' usable='yes'/>
-  <cpu type='kvm' name='IvyBridge' usable='yes'/>
-  <cpu type='kvm' name='Icelake-Server-v1' usable='no'>
+  <cpu type='kvm' name='IvyBridge-v2' typename='IvyBridge-v2-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='IvyBridge-v1' typename='IvyBridge-v1-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='IvyBridge-IBRS' typename='IvyBridge-IBRS-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='IvyBridge' typename='IvyBridge-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Icelake-Server-v1' typename='Icelake-Server-v1-x86_64-cpu' usable='no'>
     <blocker name='avx512f'/>
     <blocker name='avx512dq'/>
     <blocker name='clwb'/>
@@ -857,7 +857,7 @@
     <blocker name='avx512f'/>
     <blocker name='pku'/>
   </cpu>
-  <cpu type='kvm' name='Icelake-Server' usable='no'>
+  <cpu type='kvm' name='Icelake-Server' typename='Icelake-Server-x86_64-cpu' usable='no'>
     <blocker name='avx512f'/>
     <blocker name='avx512dq'/>
     <blocker name='clwb'/>
@@ -880,7 +880,7 @@
     <blocker name='avx512f'/>
     <blocker name='pku'/>
   </cpu>
-  <cpu type='kvm' name='Icelake-Client-v1' usable='no'>
+  <cpu type='kvm' name='Icelake-Client-v1' typename='Icelake-Client-v1-x86_64-cpu' usable='no'>
     <blocker name='avx512vbmi'/>
     <blocker name='pku'/>
     <blocker name='avx512vbmi2'/>
@@ -893,7 +893,7 @@
     <blocker name='wbnoinvd'/>
     <blocker name='pku'/>
   </cpu>
-  <cpu type='kvm' name='Icelake-Client' usable='no'>
+  <cpu type='kvm' name='Icelake-Client' typename='Icelake-Client-x86_64-cpu' usable='no'>
     <blocker name='avx512vbmi'/>
     <blocker name='pku'/>
     <blocker name='avx512vbmi2'/>
@@ -906,15 +906,15 @@
     <blocker name='wbnoinvd'/>
     <blocker name='pku'/>
   </cpu>
-  <cpu type='kvm' name='Haswell-v4' usable='yes'/>
-  <cpu type='kvm' name='Haswell-v3' usable='yes'/>
-  <cpu type='kvm' name='Haswell-v2' usable='yes'/>
-  <cpu type='kvm' name='Haswell-v1' usable='yes'/>
-  <cpu type='kvm' name='Haswell-noTSX-IBRS' usable='yes'/>
-  <cpu type='kvm' name='Haswell-noTSX' usable='yes'/>
-  <cpu type='kvm' name='Haswell-IBRS' usable='yes'/>
-  <cpu type='kvm' name='Haswell' usable='yes'/>
-  <cpu type='kvm' name='EPYC-v2' usable='no'>
+  <cpu type='kvm' name='Haswell-v4' typename='Haswell-v4-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Haswell-v3' typename='Haswell-v3-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Haswell-v2' typename='Haswell-v2-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Haswell-v1' typename='Haswell-v1-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Haswell-noTSX-IBRS' typename='Haswell-noTSX-IBRS-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Haswell-noTSX' typename='Haswell-noTSX-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Haswell-IBRS' typename='Haswell-IBRS-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Haswell' typename='Haswell-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='EPYC-v2' typename='EPYC-v2-x86_64-cpu' usable='no'>
     <blocker name='sha-ni'/>
     <blocker name='mmxext'/>
     <blocker name='fxsr-opt'/>
@@ -926,7 +926,7 @@
     <blocker name='npt'/>
     <blocker name='nrip-save'/>
   </cpu>
-  <cpu type='kvm' name='EPYC-v1' usable='no'>
+  <cpu type='kvm' name='EPYC-v1' typename='EPYC-v1-x86_64-cpu' usable='no'>
     <blocker name='sha-ni'/>
     <blocker name='mmxext'/>
     <blocker name='fxsr-opt'/>
@@ -937,7 +937,7 @@
     <blocker name='npt'/>
     <blocker name='nrip-save'/>
   </cpu>
-  <cpu type='kvm' name='EPYC-IBPB' usable='no'>
+  <cpu type='kvm' name='EPYC-IBPB' typename='EPYC-IBPB-x86_64-cpu' usable='no'>
     <blocker name='sha-ni'/>
     <blocker name='mmxext'/>
     <blocker name='fxsr-opt'/>
@@ -949,7 +949,7 @@
     <blocker name='npt'/>
     <blocker name='nrip-save'/>
   </cpu>
-  <cpu type='kvm' name='EPYC' usable='no'>
+  <cpu type='kvm' name='EPYC' typename='EPYC-x86_64-cpu' usable='no'>
     <blocker name='sha-ni'/>
     <blocker name='mmxext'/>
     <blocker name='fxsr-opt'/>
@@ -961,7 +961,7 @@
     <blocker name='npt'/>
     <blocker name='nrip-save'/>
   </cpu>
-  <cpu type='kvm' name='Dhyana-v1' usable='no'>
+  <cpu type='kvm' name='Dhyana-v1' typename='Dhyana-v1-x86_64-cpu' usable='no'>
     <blocker name='mmxext'/>
     <blocker name='fxsr-opt'/>
     <blocker name='cr8legacy'/>
@@ -972,7 +972,7 @@
     <blocker name='npt'/>
     <blocker name='nrip-save'/>
   </cpu>
-  <cpu type='kvm' name='Dhyana' usable='no'>
+  <cpu type='kvm' name='Dhyana' typename='Dhyana-x86_64-cpu' usable='no'>
     <blocker name='mmxext'/>
     <blocker name='fxsr-opt'/>
     <blocker name='cr8legacy'/>
@@ -983,9 +983,9 @@
     <blocker name='npt'/>
     <blocker name='nrip-save'/>
   </cpu>
-  <cpu type='kvm' name='Conroe-v1' usable='yes'/>
-  <cpu type='kvm' name='Conroe' usable='yes'/>
-  <cpu type='kvm' name='Cascadelake-Server-v2' usable='no'>
+  <cpu type='kvm' name='Conroe-v1' typename='Conroe-v1-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Conroe' typename='Conroe-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Cascadelake-Server-v2' typename='Cascadelake-Server-v2-x86_64-cpu' usable='no'>
     <blocker name='avx512f'/>
     <blocker name='avx512dq'/>
     <blocker name='clwb'/>
@@ -1002,7 +1002,7 @@
     <blocker name='ibrs-all'/>
     <blocker name='mds-no'/>
   </cpu>
-  <cpu type='kvm' name='Cascadelake-Server-v1' usable='no'>
+  <cpu type='kvm' name='Cascadelake-Server-v1' typename='Cascadelake-Server-v1-x86_64-cpu' usable='no'>
     <blocker name='avx512f'/>
     <blocker name='avx512dq'/>
     <blocker name='clwb'/>
@@ -1016,7 +1016,7 @@
     <blocker name='avx512f'/>
     <blocker name='pku'/>
   </cpu>
-  <cpu type='kvm' name='Cascadelake-Server' usable='no'>
+  <cpu type='kvm' name='Cascadelake-Server' typename='Cascadelake-Server-x86_64-cpu' usable='no'>
     <blocker name='avx512f'/>
     <blocker name='avx512dq'/>
     <blocker name='clwb'/>
@@ -1033,60 +1033,60 @@
     <blocker name='ibrs-all'/>
     <blocker name='mds-no'/>
   </cpu>
-  <cpu type='kvm' name='Broadwell-v4' usable='yes'/>
-  <cpu type='kvm' name='Broadwell-v3' usable='yes'/>
-  <cpu type='kvm' name='Broadwell-v2' usable='yes'/>
-  <cpu type='kvm' name='Broadwell-v1' usable='yes'/>
-  <cpu type='kvm' name='Broadwell-noTSX-IBRS' usable='yes'/>
-  <cpu type='kvm' name='Broadwell-noTSX' usable='yes'/>
-  <cpu type='kvm' name='Broadwell-IBRS' usable='yes'/>
-  <cpu type='kvm' name='Broadwell' usable='yes'/>
-  <cpu type='kvm' name='486-v1' usable='yes'/>
-  <cpu type='kvm' name='486' usable='yes'/>
-  <cpu type='tcg' name='max' usable='yes'/>
-  <cpu type='tcg' name='host' usable='no'>
+  <cpu type='kvm' name='Broadwell-v4' typename='Broadwell-v4-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Broadwell-v3' typename='Broadwell-v3-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Broadwell-v2' typename='Broadwell-v2-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Broadwell-v1' typename='Broadwell-v1-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Broadwell-noTSX-IBRS' typename='Broadwell-noTSX-IBRS-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Broadwell-noTSX' typename='Broadwell-noTSX-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Broadwell-IBRS' typename='Broadwell-IBRS-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='Broadwell' typename='Broadwell-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='486-v1' typename='486-v1-x86_64-cpu' usable='yes'/>
+  <cpu type='kvm' name='486' typename='486-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='max' typename='max-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='host' typename='host-x86_64-cpu' usable='no'>
     <blocker name='kvm'/>
   </cpu>
-  <cpu type='tcg' name='base' usable='yes'/>
-  <cpu type='tcg' name='qemu64-v1' usable='yes'/>
-  <cpu type='tcg' name='qemu64' usable='yes'/>
-  <cpu type='tcg' name='qemu32-v1' usable='yes'/>
-  <cpu type='tcg' name='qemu32' usable='yes'/>
-  <cpu type='tcg' name='phenom-v1' usable='no'>
+  <cpu type='tcg' name='base' typename='base-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='qemu64-v1' typename='qemu64-v1-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='qemu64' typename='qemu64-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='qemu32-v1' typename='qemu32-v1-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='qemu32' typename='qemu32-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='phenom-v1' typename='phenom-v1-x86_64-cpu' usable='no'>
     <blocker name='fxsr-opt'/>
   </cpu>
-  <cpu type='tcg' name='phenom' usable='no'>
+  <cpu type='tcg' name='phenom' typename='phenom-x86_64-cpu' usable='no'>
     <blocker name='fxsr-opt'/>
   </cpu>
-  <cpu type='tcg' name='pentium3-v1' usable='yes'/>
-  <cpu type='tcg' name='pentium3' usable='yes'/>
-  <cpu type='tcg' name='pentium2-v1' usable='yes'/>
-  <cpu type='tcg' name='pentium2' usable='yes'/>
-  <cpu type='tcg' name='pentium-v1' usable='yes'/>
-  <cpu type='tcg' name='pentium' usable='yes'/>
-  <cpu type='tcg' name='n270-v1' usable='yes'/>
-  <cpu type='tcg' name='n270' usable='yes'/>
-  <cpu type='tcg' name='kvm64-v1' usable='yes'/>
-  <cpu type='tcg' name='kvm64' usable='yes'/>
-  <cpu type='tcg' name='kvm32-v1' usable='yes'/>
-  <cpu type='tcg' name='kvm32' usable='yes'/>
-  <cpu type='tcg' name='coreduo-v1' usable='yes'/>
-  <cpu type='tcg' name='coreduo' usable='yes'/>
-  <cpu type='tcg' name='core2duo-v1' usable='yes'/>
-  <cpu type='tcg' name='core2duo' usable='yes'/>
-  <cpu type='tcg' name='athlon-v1' usable='yes'/>
-  <cpu type='tcg' name='athlon' usable='yes'/>
-  <cpu type='tcg' name='Westmere-v2' usable='no'>
+  <cpu type='tcg' name='pentium3-v1' typename='pentium3-v1-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='pentium3' typename='pentium3-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='pentium2-v1' typename='pentium2-v1-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='pentium2' typename='pentium2-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='pentium-v1' typename='pentium-v1-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='pentium' typename='pentium-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='n270-v1' typename='n270-v1-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='n270' typename='n270-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='kvm64-v1' typename='kvm64-v1-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='kvm64' typename='kvm64-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='kvm32-v1' typename='kvm32-v1-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='kvm32' typename='kvm32-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='coreduo-v1' typename='coreduo-v1-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='coreduo' typename='coreduo-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='core2duo-v1' typename='core2duo-v1-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='core2duo' typename='core2duo-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='athlon-v1' typename='athlon-v1-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='athlon' typename='athlon-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='Westmere-v2' typename='Westmere-v2-x86_64-cpu' usable='no'>
     <blocker name='spec-ctrl'/>
   </cpu>
-  <cpu type='tcg' name='Westmere-v1' usable='yes'/>
-  <cpu type='tcg' name='Westmere-IBRS' usable='no'>
+  <cpu type='tcg' name='Westmere-v1' typename='Westmere-v1-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='Westmere-IBRS' typename='Westmere-IBRS-x86_64-cpu' usable='no'>
     <blocker name='spec-ctrl'/>
   </cpu>
-  <cpu type='tcg' name='Westmere' usable='no'>
+  <cpu type='tcg' name='Westmere' typename='Westmere-x86_64-cpu' usable='no'>
     <blocker name='spec-ctrl'/>
   </cpu>
-  <cpu type='tcg' name='Snowridge-v1' usable='no'>
+  <cpu type='tcg' name='Snowridge-v1' typename='Snowridge-v1-x86_64-cpu' usable='no'>
     <blocker name='x2apic'/>
     <blocker name='tsc-deadline'/>
     <blocker name='rdseed'/>
@@ -1104,7 +1104,7 @@
     <blocker name='xsavec'/>
     <blocker name='split-lock-detect'/>
   </cpu>
-  <cpu type='tcg' name='Snowridge' usable='no'>
+  <cpu type='tcg' name='Snowridge' typename='Snowridge-x86_64-cpu' usable='no'>
     <blocker name='x2apic'/>
     <blocker name='tsc-deadline'/>
     <blocker name='rdseed'/>
@@ -1122,7 +1122,7 @@
     <blocker name='xsavec'/>
     <blocker name='split-lock-detect'/>
   </cpu>
-  <cpu type='tcg' name='Skylake-Server-v2' usable='no'>
+  <cpu type='tcg' name='Skylake-Server-v2' typename='Skylake-Server-v2-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1143,7 +1143,7 @@
     <blocker name='3dnowprefetch'/>
     <blocker name='xsavec'/>
   </cpu>
-  <cpu type='tcg' name='Skylake-Server-v1' usable='no'>
+  <cpu type='tcg' name='Skylake-Server-v1' typename='Skylake-Server-v1-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1163,7 +1163,7 @@
     <blocker name='3dnowprefetch'/>
     <blocker name='xsavec'/>
   </cpu>
-  <cpu type='tcg' name='Skylake-Server-IBRS' usable='no'>
+  <cpu type='tcg' name='Skylake-Server-IBRS' typename='Skylake-Server-IBRS-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1184,7 +1184,7 @@
     <blocker name='3dnowprefetch'/>
     <blocker name='xsavec'/>
   </cpu>
-  <cpu type='tcg' name='Skylake-Server' usable='no'>
+  <cpu type='tcg' name='Skylake-Server' typename='Skylake-Server-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1205,7 +1205,7 @@
     <blocker name='3dnowprefetch'/>
     <blocker name='xsavec'/>
   </cpu>
-  <cpu type='tcg' name='Skylake-Client-v2' usable='no'>
+  <cpu type='tcg' name='Skylake-Client-v2' typename='Skylake-Client-v2-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1221,7 +1221,7 @@
     <blocker name='3dnowprefetch'/>
     <blocker name='xsavec'/>
   </cpu>
-  <cpu type='tcg' name='Skylake-Client-v1' usable='no'>
+  <cpu type='tcg' name='Skylake-Client-v1' typename='Skylake-Client-v1-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1236,7 +1236,7 @@
     <blocker name='3dnowprefetch'/>
     <blocker name='xsavec'/>
   </cpu>
-  <cpu type='tcg' name='Skylake-Client-IBRS' usable='no'>
+  <cpu type='tcg' name='Skylake-Client-IBRS' typename='Skylake-Client-IBRS-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1252,7 +1252,7 @@
     <blocker name='3dnowprefetch'/>
     <blocker name='xsavec'/>
   </cpu>
-  <cpu type='tcg' name='Skylake-Client' usable='no'>
+  <cpu type='tcg' name='Skylake-Client' typename='Skylake-Client-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1268,32 +1268,32 @@
     <blocker name='3dnowprefetch'/>
     <blocker name='xsavec'/>
   </cpu>
-  <cpu type='tcg' name='SandyBridge-v2' usable='no'>
+  <cpu type='tcg' name='SandyBridge-v2' typename='SandyBridge-v2-x86_64-cpu' usable='no'>
     <blocker name='x2apic'/>
     <blocker name='tsc-deadline'/>
     <blocker name='avx'/>
     <blocker name='spec-ctrl'/>
   </cpu>
-  <cpu type='tcg' name='SandyBridge-v1' usable='no'>
+  <cpu type='tcg' name='SandyBridge-v1' typename='SandyBridge-v1-x86_64-cpu' usable='no'>
     <blocker name='x2apic'/>
     <blocker name='tsc-deadline'/>
     <blocker name='avx'/>
   </cpu>
-  <cpu type='tcg' name='SandyBridge-IBRS' usable='no'>
+  <cpu type='tcg' name='SandyBridge-IBRS' typename='SandyBridge-IBRS-x86_64-cpu' usable='no'>
     <blocker name='x2apic'/>
     <blocker name='tsc-deadline'/>
     <blocker name='avx'/>
     <blocker name='spec-ctrl'/>
   </cpu>
-  <cpu type='tcg' name='SandyBridge' usable='no'>
+  <cpu type='tcg' name='SandyBridge' typename='SandyBridge-x86_64-cpu' usable='no'>
     <blocker name='x2apic'/>
     <blocker name='tsc-deadline'/>
     <blocker name='avx'/>
     <blocker name='spec-ctrl'/>
   </cpu>
-  <cpu type='tcg' name='Penryn-v1' usable='yes'/>
-  <cpu type='tcg' name='Penryn' usable='yes'/>
-  <cpu type='tcg' name='Opteron_G5-v1' usable='no'>
+  <cpu type='tcg' name='Penryn-v1' typename='Penryn-v1-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='Penryn' typename='Penryn-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='Opteron_G5-v1' typename='Opteron_G5-v1-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='avx'/>
     <blocker name='f16c'/>
@@ -1304,7 +1304,7 @@
     <blocker name='tbm'/>
     <blocker name='nrip-save'/>
   </cpu>
-  <cpu type='tcg' name='Opteron_G5' usable='no'>
+  <cpu type='tcg' name='Opteron_G5' typename='Opteron_G5-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='avx'/>
     <blocker name='f16c'/>
@@ -1315,7 +1315,7 @@
     <blocker name='tbm'/>
     <blocker name='nrip-save'/>
   </cpu>
-  <cpu type='tcg' name='Opteron_G4-v1' usable='no'>
+  <cpu type='tcg' name='Opteron_G4-v1' typename='Opteron_G4-v1-x86_64-cpu' usable='no'>
     <blocker name='avx'/>
     <blocker name='misalignsse'/>
     <blocker name='3dnowprefetch'/>
@@ -1323,7 +1323,7 @@
     <blocker name='fma4'/>
     <blocker name='nrip-save'/>
   </cpu>
-  <cpu type='tcg' name='Opteron_G4' usable='no'>
+  <cpu type='tcg' name='Opteron_G4' typename='Opteron_G4-x86_64-cpu' usable='no'>
     <blocker name='avx'/>
     <blocker name='misalignsse'/>
     <blocker name='3dnowprefetch'/>
@@ -1331,27 +1331,27 @@
     <blocker name='fma4'/>
     <blocker name='nrip-save'/>
   </cpu>
-  <cpu type='tcg' name='Opteron_G3-v1' usable='no'>
+  <cpu type='tcg' name='Opteron_G3-v1' typename='Opteron_G3-v1-x86_64-cpu' usable='no'>
     <blocker name='misalignsse'/>
   </cpu>
-  <cpu type='tcg' name='Opteron_G3' usable='no'>
+  <cpu type='tcg' name='Opteron_G3' typename='Opteron_G3-x86_64-cpu' usable='no'>
     <blocker name='misalignsse'/>
   </cpu>
-  <cpu type='tcg' name='Opteron_G2-v1' usable='yes'/>
-  <cpu type='tcg' name='Opteron_G2' usable='yes'/>
-  <cpu type='tcg' name='Opteron_G1-v1' usable='yes'/>
-  <cpu type='tcg' name='Opteron_G1' usable='yes'/>
-  <cpu type='tcg' name='Nehalem-v2' usable='no'>
+  <cpu type='tcg' name='Opteron_G2-v1' typename='Opteron_G2-v1-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='Opteron_G2' typename='Opteron_G2-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='Opteron_G1-v1' typename='Opteron_G1-v1-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='Opteron_G1' typename='Opteron_G1-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='Nehalem-v2' typename='Nehalem-v2-x86_64-cpu' usable='no'>
     <blocker name='spec-ctrl'/>
   </cpu>
-  <cpu type='tcg' name='Nehalem-v1' usable='yes'/>
-  <cpu type='tcg' name='Nehalem-IBRS' usable='no'>
+  <cpu type='tcg' name='Nehalem-v1' typename='Nehalem-v1-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='Nehalem-IBRS' typename='Nehalem-IBRS-x86_64-cpu' usable='no'>
     <blocker name='spec-ctrl'/>
   </cpu>
-  <cpu type='tcg' name='Nehalem' usable='no'>
+  <cpu type='tcg' name='Nehalem' typename='Nehalem-x86_64-cpu' usable='no'>
     <blocker name='spec-ctrl'/>
   </cpu>
-  <cpu type='tcg' name='KnightsMill-v1' usable='no'>
+  <cpu type='tcg' name='KnightsMill-v1' typename='KnightsMill-v1-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='x2apic'/>
     <blocker name='tsc-deadline'/>
@@ -1368,7 +1368,7 @@
     <blocker name='avx512-4fmaps'/>
     <blocker name='3dnowprefetch'/>
   </cpu>
-  <cpu type='tcg' name='KnightsMill' usable='no'>
+  <cpu type='tcg' name='KnightsMill' typename='KnightsMill-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='x2apic'/>
     <blocker name='tsc-deadline'/>
@@ -1385,34 +1385,34 @@
     <blocker name='avx512-4fmaps'/>
     <blocker name='3dnowprefetch'/>
   </cpu>
-  <cpu type='tcg' name='IvyBridge-v2' usable='no'>
+  <cpu type='tcg' name='IvyBridge-v2' typename='IvyBridge-v2-x86_64-cpu' usable='no'>
     <blocker name='x2apic'/>
     <blocker name='tsc-deadline'/>
     <blocker name='avx'/>
     <blocker name='f16c'/>
     <blocker name='spec-ctrl'/>
   </cpu>
-  <cpu type='tcg' name='IvyBridge-v1' usable='no'>
+  <cpu type='tcg' name='IvyBridge-v1' typename='IvyBridge-v1-x86_64-cpu' usable='no'>
     <blocker name='x2apic'/>
     <blocker name='tsc-deadline'/>
     <blocker name='avx'/>
     <blocker name='f16c'/>
   </cpu>
-  <cpu type='tcg' name='IvyBridge-IBRS' usable='no'>
+  <cpu type='tcg' name='IvyBridge-IBRS' typename='IvyBridge-IBRS-x86_64-cpu' usable='no'>
     <blocker name='x2apic'/>
     <blocker name='tsc-deadline'/>
     <blocker name='avx'/>
     <blocker name='f16c'/>
     <blocker name='spec-ctrl'/>
   </cpu>
-  <cpu type='tcg' name='IvyBridge' usable='no'>
+  <cpu type='tcg' name='IvyBridge' typename='IvyBridge-x86_64-cpu' usable='no'>
     <blocker name='x2apic'/>
     <blocker name='tsc-deadline'/>
     <blocker name='avx'/>
     <blocker name='f16c'/>
     <blocker name='spec-ctrl'/>
   </cpu>
-  <cpu type='tcg' name='Icelake-Server-v1' usable='no'>
+  <cpu type='tcg' name='Icelake-Server-v1' typename='Icelake-Server-v1-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1444,7 +1444,7 @@
     <blocker name='wbnoinvd'/>
     <blocker name='xsavec'/>
   </cpu>
-  <cpu type='tcg' name='Icelake-Server' usable='no'>
+  <cpu type='tcg' name='Icelake-Server' typename='Icelake-Server-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1476,7 +1476,7 @@
     <blocker name='wbnoinvd'/>
     <blocker name='xsavec'/>
   </cpu>
-  <cpu type='tcg' name='Icelake-Client-v1' usable='no'>
+  <cpu type='tcg' name='Icelake-Client-v1' typename='Icelake-Client-v1-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1503,7 +1503,7 @@
     <blocker name='wbnoinvd'/>
     <blocker name='xsavec'/>
   </cpu>
-  <cpu type='tcg' name='Icelake-Client' usable='no'>
+  <cpu type='tcg' name='Icelake-Client' typename='Icelake-Client-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1530,7 +1530,7 @@
     <blocker name='wbnoinvd'/>
     <blocker name='xsavec'/>
   </cpu>
-  <cpu type='tcg' name='Haswell-v4' usable='no'>
+  <cpu type='tcg' name='Haswell-v4' typename='Haswell-v4-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1541,7 +1541,7 @@
     <blocker name='invpcid'/>
     <blocker name='spec-ctrl'/>
   </cpu>
-  <cpu type='tcg' name='Haswell-v3' usable='no'>
+  <cpu type='tcg' name='Haswell-v3' typename='Haswell-v3-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1554,7 +1554,7 @@
     <blocker name='rtm'/>
     <blocker name='spec-ctrl'/>
   </cpu>
-  <cpu type='tcg' name='Haswell-v2' usable='no'>
+  <cpu type='tcg' name='Haswell-v2' typename='Haswell-v2-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1564,7 +1564,7 @@
     <blocker name='avx2'/>
     <blocker name='invpcid'/>
   </cpu>
-  <cpu type='tcg' name='Haswell-v1' usable='no'>
+  <cpu type='tcg' name='Haswell-v1' typename='Haswell-v1-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1576,7 +1576,7 @@
     <blocker name='invpcid'/>
     <blocker name='rtm'/>
   </cpu>
-  <cpu type='tcg' name='Haswell-noTSX-IBRS' usable='no'>
+  <cpu type='tcg' name='Haswell-noTSX-IBRS' typename='Haswell-noTSX-IBRS-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1587,7 +1587,7 @@
     <blocker name='invpcid'/>
     <blocker name='spec-ctrl'/>
   </cpu>
-  <cpu type='tcg' name='Haswell-noTSX' usable='no'>
+  <cpu type='tcg' name='Haswell-noTSX' typename='Haswell-noTSX-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1597,7 +1597,7 @@
     <blocker name='avx2'/>
     <blocker name='invpcid'/>
   </cpu>
-  <cpu type='tcg' name='Haswell-IBRS' usable='no'>
+  <cpu type='tcg' name='Haswell-IBRS' typename='Haswell-IBRS-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1610,7 +1610,7 @@
     <blocker name='rtm'/>
     <blocker name='spec-ctrl'/>
   </cpu>
-  <cpu type='tcg' name='Haswell' usable='no'>
+  <cpu type='tcg' name='Haswell' typename='Haswell-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1621,7 +1621,7 @@
     <blocker name='invpcid'/>
     <blocker name='spec-ctrl'/>
   </cpu>
-  <cpu type='tcg' name='EPYC-v2' usable='no'>
+  <cpu type='tcg' name='EPYC-v2' typename='EPYC-v2-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='avx'/>
     <blocker name='f16c'/>
@@ -1637,7 +1637,7 @@
     <blocker name='nrip-save'/>
     <blocker name='xsavec'/>
   </cpu>
-  <cpu type='tcg' name='EPYC-v1' usable='no'>
+  <cpu type='tcg' name='EPYC-v1' typename='EPYC-v1-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='avx'/>
     <blocker name='f16c'/>
@@ -1652,7 +1652,7 @@
     <blocker name='nrip-save'/>
     <blocker name='xsavec'/>
   </cpu>
-  <cpu type='tcg' name='EPYC-IBPB' usable='no'>
+  <cpu type='tcg' name='EPYC-IBPB' typename='EPYC-IBPB-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='avx'/>
     <blocker name='f16c'/>
@@ -1668,7 +1668,7 @@
     <blocker name='nrip-save'/>
     <blocker name='xsavec'/>
   </cpu>
-  <cpu type='tcg' name='EPYC' usable='no'>
+  <cpu type='tcg' name='EPYC' typename='EPYC-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='avx'/>
     <blocker name='f16c'/>
@@ -1684,7 +1684,7 @@
     <blocker name='nrip-save'/>
     <blocker name='xsavec'/>
   </cpu>
-  <cpu type='tcg' name='Dhyana-v1' usable='no'>
+  <cpu type='tcg' name='Dhyana-v1' typename='Dhyana-v1-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='avx'/>
     <blocker name='f16c'/>
@@ -1699,7 +1699,7 @@
     <blocker name='nrip-save'/>
     <blocker name='xsavec'/>
   </cpu>
-  <cpu type='tcg' name='Dhyana' usable='no'>
+  <cpu type='tcg' name='Dhyana' typename='Dhyana-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='avx'/>
     <blocker name='f16c'/>
@@ -1714,9 +1714,9 @@
     <blocker name='nrip-save'/>
     <blocker name='xsavec'/>
   </cpu>
-  <cpu type='tcg' name='Conroe-v1' usable='yes'/>
-  <cpu type='tcg' name='Conroe' usable='yes'/>
-  <cpu type='tcg' name='Cascadelake-Server-v2' usable='no'>
+  <cpu type='tcg' name='Conroe-v1' typename='Conroe-v1-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='Conroe' typename='Conroe-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='Cascadelake-Server-v2' typename='Cascadelake-Server-v2-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1744,7 +1744,7 @@
     <blocker name='skip-l1dfl-vmentry'/>
     <blocker name='mds-no'/>
   </cpu>
-  <cpu type='tcg' name='Cascadelake-Server-v1' usable='no'>
+  <cpu type='tcg' name='Cascadelake-Server-v1' typename='Cascadelake-Server-v1-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1767,7 +1767,7 @@
     <blocker name='3dnowprefetch'/>
     <blocker name='xsavec'/>
   </cpu>
-  <cpu type='tcg' name='Cascadelake-Server' usable='no'>
+  <cpu type='tcg' name='Cascadelake-Server' typename='Cascadelake-Server-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1795,7 +1795,7 @@
     <blocker name='skip-l1dfl-vmentry'/>
     <blocker name='mds-no'/>
   </cpu>
-  <cpu type='tcg' name='Broadwell-v4' usable='no'>
+  <cpu type='tcg' name='Broadwell-v4' typename='Broadwell-v4-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1808,7 +1808,7 @@
     <blocker name='spec-ctrl'/>
     <blocker name='3dnowprefetch'/>
   </cpu>
-  <cpu type='tcg' name='Broadwell-v3' usable='no'>
+  <cpu type='tcg' name='Broadwell-v3' typename='Broadwell-v3-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1823,7 +1823,7 @@
     <blocker name='spec-ctrl'/>
     <blocker name='3dnowprefetch'/>
   </cpu>
-  <cpu type='tcg' name='Broadwell-v2' usable='no'>
+  <cpu type='tcg' name='Broadwell-v2' typename='Broadwell-v2-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1835,7 +1835,7 @@
     <blocker name='rdseed'/>
     <blocker name='3dnowprefetch'/>
   </cpu>
-  <cpu type='tcg' name='Broadwell-v1' usable='no'>
+  <cpu type='tcg' name='Broadwell-v1' typename='Broadwell-v1-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1849,7 +1849,7 @@
     <blocker name='rdseed'/>
     <blocker name='3dnowprefetch'/>
   </cpu>
-  <cpu type='tcg' name='Broadwell-noTSX-IBRS' usable='no'>
+  <cpu type='tcg' name='Broadwell-noTSX-IBRS' typename='Broadwell-noTSX-IBRS-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1862,7 +1862,7 @@
     <blocker name='spec-ctrl'/>
     <blocker name='3dnowprefetch'/>
   </cpu>
-  <cpu type='tcg' name='Broadwell-noTSX' usable='no'>
+  <cpu type='tcg' name='Broadwell-noTSX' typename='Broadwell-noTSX-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1874,7 +1874,7 @@
     <blocker name='rdseed'/>
     <blocker name='3dnowprefetch'/>
   </cpu>
-  <cpu type='tcg' name='Broadwell-IBRS' usable='no'>
+  <cpu type='tcg' name='Broadwell-IBRS' typename='Broadwell-IBRS-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1889,7 +1889,7 @@
     <blocker name='spec-ctrl'/>
     <blocker name='3dnowprefetch'/>
   </cpu>
-  <cpu type='tcg' name='Broadwell' usable='no'>
+  <cpu type='tcg' name='Broadwell' typename='Broadwell-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1902,8 +1902,8 @@
     <blocker name='spec-ctrl'/>
     <blocker name='3dnowprefetch'/>
   </cpu>
-  <cpu type='tcg' name='486-v1' usable='yes'/>
-  <cpu type='tcg' name='486' usable='yes'/>
+  <cpu type='tcg' name='486-v1' typename='486-v1-x86_64-cpu' usable='yes'/>
+  <cpu type='tcg' name='486' typename='486-x86_64-cpu' usable='yes'/>
   <machine name='pc-i440fx-4.2' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/>
   <machine name='pc-0.15' hotplugCpus='yes' maxCpus='255'/>
   <machine name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255'/>