[PATCH 16/22] qemu: Store typename from query-cpu-definitions in qemuCaps

[Jiri Denemark <jdenemar@xxxxxxxxxx>]

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

Signed-off-by: Jiri Denemark <jdenemar@xxxxxxxxxx>
---
 src/qemu/qemu_capabilities.c                  |    4 +
 src/qemu/qemu_monitor.c                       |    2 +
 src/qemu/qemu_monitor.h                       |    1 +
 src/qemu/qemu_monitor_json.c                  |    4 +
 .../caps_2.10.0.aarch64.xml                   |  126 +-
 .../caps_2.10.0.ppc64.xml                     | 1734 ++++++++--------
 .../caps_2.10.0.s390x.xml                     |  264 +--
 .../caps_2.10.0.x86_64.xml                    |  132 +-
 .../caps_2.11.0.s390x.xml                     |  264 +--
 .../caps_2.11.0.x86_64.xml                    |  136 +-
 .../caps_2.12.0.aarch64.xml                   |  136 +-
 .../caps_2.12.0.ppc64.xml                     | 1750 ++++++++---------
 .../caps_2.12.0.s390x.xml                     |  264 +--
 .../caps_2.12.0.x86_64.xml                    |  180 +-
 .../qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1734 ++++++++--------
 .../qemucapabilitiesdata/caps_2.9.0.s390x.xml |  256 +--
 .../caps_2.9.0.x86_64.xml                     |  128 +-
 .../qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 1750 ++++++++---------
 .../qemucapabilitiesdata/caps_3.0.0.s390x.xml |  272 +--
 .../caps_3.0.0.x86_64.xml                     |  184 +-
 .../qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 1750 ++++++++---------
 .../caps_3.1.0.x86_64.xml                     |  196 +-
 .../caps_4.0.0.aarch64.xml                    |  148 +-
 .../qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 1750 ++++++++---------
 .../qemucapabilitiesdata/caps_4.0.0.s390x.xml |  284 +--
 .../caps_4.0.0.x86_64.xml                     |  196 +-
 .../caps_4.1.0.x86_64.xml                     |  400 ++--
 .../caps_4.2.0.x86_64.xml                     |  400 ++--
 28 files changed, 7228 insertions(+), 7217 deletions(-)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 94d9cc3e32..24ef623458 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -3480,6 +3480,8 @@ virQEMUCapsLoadCPUModels(virQEMUCapsPtr qemuCaps,
             return -1;
         }
 
+        cpu->type = virXMLPropString(nodes[i], "typename");
+
         node = ctxt->node;
         ctxt->node = nodes[i];
         nblockers = virXPathNodeSet("./blocker", ctxt, &blockerNodes);
@@ -3942,6 +3944,8 @@ virQEMUCapsFormatCPUModels(virQEMUCapsPtr qemuCaps,
 
         virBufferAsprintf(buf, "<cpu type='%s' ", typeStr);
         virBufferEscapeString(buf, "name='%s'", cpu->name);
+        if (cpu->type)
+            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 ebd7eaa1a9..3bc97b8142 100644
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -3542,6 +3542,7 @@ qemuMonitorCPUDefsFree(qemuMonitorCPUDefsPtr defs)
     for (i = 0; i < defs->ncpus; i++) {
         virStringListFree(defs->cpus[i].blockers);
         VIR_FREE(defs->cpus[i].name);
+        VIR_FREE(defs->cpus[i].type);
     }
 
     VIR_FREE(defs->cpus);
@@ -3588,6 +3589,7 @@ qemuMonitorCPUDefsCopy(qemuMonitorCPUDefsPtr *dst,
         cpuDst->usable = cpuSrc->usable;
 
         if (VIR_STRDUP(cpuDst->name, cpuSrc->name) < 0 ||
+            VIR_STRDUP(cpuDst->type, cpuSrc->type) < 0 ||
             virStringListCopy(&cpuDst->blockers,
                               (const char **)cpuSrc->blockers) < 0)
             return -1;
diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index 0b6d4848a0..416bbb1cba 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -1098,6 +1098,7 @@ typedef qemuMonitorCPUDefInfo *qemuMonitorCPUDefInfoPtr;
 struct _qemuMonitorCPUDefInfo {
     virTristateBool 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 c2a2f6eee6..c0cd195496 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -5571,6 +5571,10 @@ qemuMonitorJSONGetCPUDefinitions(qemuMonitorPtr mon,
         if (VIR_STRDUP(cpu->name, tmp) < 0)
             return -1;
 
+        if ((tmp = virJSONValueObjectGetString(child, "typename")) &&
+            VIR_STRDUP(cpu->type, tmp) < 0)
+            return -1;
+
         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 9404e66144..cc849ba708 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
@@ -144,69 +144,69 @@
   <microcodeVersion>61700805</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 162fb1f035..523b8abd11 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
@@ -143,873 +143,873 @@
   <microcodeVersion>42900805</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='7457A_v1.2'/>
-  <cpu type='kvm' name='750cl_v1.0'/>
-  <cpu type='kvm' name='750cxe_v2.1'/>
-  <cpu type='kvm' name='755_v2.7'/>
-  <cpu type='kvm' name='MPC8347ET'/>
-  <cpu type='kvm' name='MPC8545E_v20'/>
-  <cpu type='kvm' name='750_v2.1'/>
-  <cpu type='kvm' name='755_v2.2'/>
-  <cpu type='kvm' name='745_v2.0'/>
-  <cpu type='kvm' name='7455_v1.0'/>
-  <cpu type='kvm' name='MPC8547E_v21'/>
-  <cpu type='kvm' name='STB25'/>
-  <cpu type='kvm' name='POWER8_v2.0'/>
-  <cpu type='kvm' name='401G2'/>
-  <cpu type='kvm' name='MPC8349A'/>
-  <cpu type='kvm' name='750e'/>
-  <cpu type='kvm' name='MPC8545_v21'/>
-  <cpu type='kvm' name='MPC8548_v11'/>
-  <cpu type='kvm' name='970fx_v2.0'/>
-  <cpu type='kvm' name='750fx_v2.0'/>
-  <cpu type='kvm' name='POWER8E_v2.1'/>
-  <cpu type='kvm' name='Cobra'/>
-  <cpu type='kvm' name='7400_v2.7'/>
-  <cpu type='kvm' name='603p'/>
-  <cpu type='kvm' name='MPC8378E'/>
-  <cpu type='kvm' name='e500v2_v10'/>
-  <cpu type='kvm' name='e500mc'/>
-  <cpu type='kvm' name='603e7v1'/>
-  <cpu type='kvm' name='970mp_v1.0'/>
-  <cpu type='kvm' name='MPC8555E_v11'/>
-  <cpu type='kvm' name='440-Xilinx-w-dfpu'/>
-  <cpu type='kvm' name='740e'/>
-  <cpu type='kvm' name='405CRc'/>
-  <cpu type='kvm' name='7447A_v1.1'/>
-  <cpu type='kvm' name='MPC8533E_v10'/>
-  <cpu type='kvm' name='MPC8543_v11'/>
-  <cpu type='kvm' name='7400_v2.2'/>
-  <cpu type='kvm' name='MPC8540_v21'/>
-  <cpu type='kvm' name='e500v2_v21'/>
-  <cpu type='kvm' name='e300c1'/>
-  <cpu type='kvm' name='970fx_v1.0'/>
-  <cpu type='kvm' name='750gx_v1.2'/>
-  <cpu type='kvm' name='750fx_v1.0'/>
-  <cpu type='kvm' name='MPC8641'/>
-  <cpu type='kvm' name='MPC8544E_v10'/>
-  <cpu type='kvm' name='405D4'/>
-  <cpu type='kvm' name='7457_v1.1'/>
-  <cpu type='kvm' name='970fx_v3.0'/>
-  <cpu type='kvm' name='604e_v2.2'/>
-  <cpu type='kvm' name='755_v2.6'/>
-  <cpu type='kvm' name='Npe4GS3'/>
-  <cpu type='kvm' name='7410_v1.4'/>
-  <cpu type='kvm' name='750_v2.0'/>
-  <cpu type='kvm' name='7445_v3.2'/>
-  <cpu type='kvm' name='745_v2.4'/>
-  <cpu type='kvm' name='750l_v3.2'/>
-  <cpu type='kvm' name='MPC8540_v10'/>
-  <cpu type='kvm' name='750_v1.0'/>
-  <cpu type='kvm' name='STB03'/>
-  <cpu type='kvm' name='MPC8343A'/>
-  <cpu type='kvm' name='MPC8378'/>
-  <cpu type='kvm' name='G2HiP3'/>
-  <cpu type='kvm' name='750cxe_v3.0'/>
-  <cpu type='kvm' name='e500_v10'/>
-  <cpu type='kvm' name='755_v1.1'/>
-  <cpu type='kvm' name='MPC8567'/>
-  <cpu type='kvm' name='MPC8545_v20'/>
-  <cpu type='kvm' name='MPC8548_v10'/>
-  <cpu type='kvm' name='Npe405H'/>
-  <cpu type='kvm' name='603e7v'/>
-  <cpu type='kvm' name='750_v3.0'/>
-  <cpu type='kvm' name='Npe405H2'/>
-  <cpu type='kvm' name='7400_v2.6'/>
-  <cpu type='kvm' name='405GPa'/>
-  <cpu type='kvm' name='MPC8548_v21'/>
-  <cpu type='kvm' name='MPC8541E_v10'/>
-  <cpu type='kvm' name='750l_v2.2'/>
-  <cpu type='kvm' name='MPC8555E_v10'/>
-  <cpu type='kvm' name='7457A_v1.1'/>
-  <cpu type='kvm' name='e200z6'/>
-  <cpu type='kvm' name='MPC8379E'/>
-  <cpu type='kvm' name='e500v2_v20'/>
-  <cpu type='kvm' name='MPC8347AP'/>
-  <cpu type='kvm' name='401B2'/>
-  <cpu type='kvm' name='MPC8349E'/>
-  <cpu type='kvm' name='755_v2.1'/>
-  <cpu type='kvm' name='MPC8543_v21'/>
-  <cpu type='kvm' name='745_v2.8'/>
-  <cpu type='kvm' name='MPC8547E_v20'/>
-  <cpu type='kvm' name='7455_v3.4'/>
-  <cpu type='kvm' name='7448_v1.1'/>
-  <cpu type='kvm' name='740_v2.2'/>
-  <cpu type='kvm' name='7400_v1.1'/>
-  <cpu type='kvm' name='MPC8567E'/>
-  <cpu type='kvm' name='7441_v2.10'/>
-  <cpu type='kvm' name='603e_v1.4'/>
-  <cpu type='kvm' name='G2leGP1'/>
-  <cpu type='kvm' name='7451_v2.10'/>
-  <cpu type='kvm' name='MPC8343E'/>
-  <cpu type='kvm' name='750cx_v2.2'/>
-  <cpu type='kvm' name='Npe405L'/>
-  <cpu type='kvm' name='603e7'/>
-  <cpu type='kvm' name='401A1'/>
-  <cpu type='kvm' name='MPC8377'/>
-  <cpu type='kvm' name='7448_v2.1'/>
-  <cpu type='kvm' name='7441_v2.3'/>
-  <cpu type='kvm' name='7400_v2.1'/>
-  <cpu type='kvm' name='405CRb'/>
-  <cpu type='kvm' name='7447A_v1.0'/>
-  <cpu type='kvm' name='MPC8540_v20'/>
-  <cpu type='kvm' name='MPC8543_v10'/>
-  <cpu type='kvm' name='7445_v2.1'/>
-  <cpu type='kvm' name='e500_v20'/>
-  <cpu type='kvm' name='750gx_v1.1'/>
-  <cpu type='kvm' name='604'/>
-  <cpu type='kvm' name='750cxe_v2.4'/>
-  <cpu type='kvm' name='MPC8548_v20'/>
-  <cpu type='kvm' name='MPC8543E_v11'/>
-  <cpu type='kvm' name='MPC8347AT'/>
-  <cpu type='kvm' name='750l_v2.1'/>
-  <cpu type='kvm' name='POWER8NVL_v1.0'/>
-  <cpu type='kvm' name='7457A_v1.0'/>
-  <cpu type='kvm' name='7457_v1.0'/>
-  <cpu type='kvm' name='7450_v1.2'/>
-  <cpu type='kvm' name='MPC8572'/>
-  <cpu type='kvm' name='755_v2.5'/>
-  <cpu type='kvm' name='7410_v1.3'/>
-  <cpu type='kvm' name='745_v2.3'/>
-  <cpu type='kvm' name='405GPR'/>
-  <cpu type='kvm' name='755_v2.0'/>
-  <cpu type='kvm' name='MPC8541_v11'/>
-  <cpu type='kvm' name='401C2'/>
-  <cpu type='kvm' name='e500v2_v30'/>
-  <cpu type='kvm' name='7455_v3.3'/>
-  <cpu type='kvm' name='405EZ'/>
-  <cpu type='kvm' name='MPC8568E'/>
-  <cpu type='kvm' name='755_v1.0'/>
-  <cpu type='kvm' name='603e_v1.3'/>
-  <cpu type='kvm' name='MPC8560_v10'/>
-  <cpu type='kvm' name='host'/>
-  <cpu type='kvm' name='MPC8560_v21'/>
-  <cpu type='kvm' name='G2H4'/>
-  <cpu type='kvm' name='MPC8533_v11'/>
-  <cpu type='kvm' name='740_v3.1'/>
-  <cpu type='kvm' name='e200z5'/>
-  <cpu type='kvm' name='MPC8349'/>
-  <cpu type='kvm' name='7400_v2.0'/>
-  <cpu type='kvm' name='405CRa'/>
-  <cpu type='kvm' name='MPC8543E_v10'/>
-  <cpu type='kvm' name='MPC8543E_v21'/>
-  <cpu type='kvm' name='750cxe_v2.3'/>
-  <cpu type='kvm' name='MPC8543_v20'/>
-  <cpu type='kvm' name='745_v2.7'/>
-  <cpu type='kvm' name='403GC'/>
-  <cpu type='kvm' name='e5500'/>
-  <cpu type='kvm' name='7448_v1.0'/>
-  <cpu type='kvm' name='MPC5200_v12'/>
-  <cpu type='kvm' name='740_v2.1'/>
-  <cpu type='kvm' name='745_v2.2'/>
-  <cpu type='kvm' name='7400_v1.0'/>
-  <cpu type='kvm' name='7410_v1.2'/>
-  <cpu type='kvm' name='x2vp4'/>
-  <cpu type='kvm' name='MPC8555_v11'/>
-  <cpu type='kvm' name='MPC8541_v10'/>
-  <cpu type='kvm' name='405LP'/>
-  <cpu type='kvm' name='750fx_v2.3'/>
-  <cpu type='kvm' name='405EP'/>
-  <cpu type='kvm' name='601_v2'/>
-  <cpu type='kvm' name='MPC8544_v11'/>
-  <cpu type='kvm' name='401D2'/>
-  <cpu type='kvm' name='MPC8572E'/>
-  <cpu type='kvm' name='604e_v1.0'/>
-  <cpu type='kvm' name='750cx_v2.1'/>
-  <cpu type='kvm' name='MPC5200B_v21'/>
-  <cpu type='kvm' name='750l_v3.0'/>
-  <cpu type='kvm' name='e300c4'/>
-  <cpu type='kvm' name='7448_v2.0'/>
-  <cpu type='kvm' name='7450_v2.1'/>
-  <cpu type='kvm' name='G2leGP'/>
-  <cpu type='kvm' name='750cxe_v3.1b'/>
-  <cpu type='kvm' name='7400_v2.9'/>
-  <cpu type='kvm' name='G2GP'/>
-  <cpu type='kvm' name='603'/>
-  <cpu type='kvm' name='405GPd'/>
-  <cpu type='kvm' name='MPC8548E_v11'/>
-  <cpu type='kvm' name='603e7t'/>
-  <cpu type='kvm' name='IOP480'/>
-  <cpu type='kvm' name='750gx_v1.0'/>
-  <cpu type='kvm' name='MPC8560_v20'/>
-  <cpu type='kvm' name='405D2'/>
-  <cpu type='kvm' name='750fl'/>
-  <cpu type='kvm' name='750l_v2.0'/>
-  <cpu type='kvm' name='x2vp20'/>
-  <cpu type='kvm' name='e600'/>
-  <cpu type='kvm' name='7450_v1.1'/>
-  <cpu type='kvm' name='755_v2.4'/>
-  <cpu type='kvm' name='7445_v1.0'/>
-  <cpu type='kvm' name='G2LS'/>
-  <cpu type='kvm' name='MPC8543E_v20'/>
-  <cpu type='kvm' name='603e_v2.2'/>
-  <cpu type='kvm' name='7447_v1.1'/>
-  <cpu type='kvm' name='603e_v4'/>
-  <cpu type='kvm' name='7455_v3.2'/>
-  <cpu type='kvm' name='740_v2.0'/>
-  <cpu type='kvm' name='MPC8347P'/>
-  <cpu type='kvm' name='440EPb'/>
-  <cpu type='kvm' name='MPC603'/>
-  <cpu type='kvm' name='603e_v1.2'/>
-  <cpu type='kvm' name='750fx_v2.2'/>
-  <cpu type='kvm' name='POWER9_v1.0'/>
-  <cpu type='kvm' name='740_v1.0'/>
-  <cpu type='kvm' name='MPC8544_v10'/>
-  <cpu type='kvm' name='601_v1'/>
-  <cpu type='kvm' name='745_v1.1'/>
-  <cpu type='kvm' name='POWER7+_v2.1'/>
-  <cpu type='kvm' name='750cx_v2.0'/>
-  <cpu type='kvm' name='MPC8347EAP'/>
-  <cpu type='kvm' name='401E2'/>
-  <cpu type='kvm' name='MPC8641D'/>
-  <cpu type='kvm' name='e300c3'/>
-  <cpu type='kvm' name='MPC8533_v10'/>
-  <cpu type='kvm' name='7441_v2.1'/>
-  <cpu type='kvm' name='740_v3.0'/>
-  <cpu type='kvm' name='POWER5+_v2.1'/>
-  <cpu type='kvm' name='602'/>
-  <cpu type='kvm' name='MPC8548E_v10'/>
-  <cpu type='kvm' name='G2leLS'/>
-  <cpu type='kvm' name='MPC8343'/>
-  <cpu type='kvm' name='750cx_v1.0'/>
-  <cpu type='kvm' name='750cxe_v2.2'/>
-  <cpu type='kvm' name='604e_v2.4'/>
-  <cpu type='kvm' name='755_v2.8'/>
-  <cpu type='kvm' name='745_v2.6'/>
-  <cpu type='kvm' name='MPC8548E_v21'/>
-  <cpu type='kvm' name='G2le'/>
-  <cpu type='kvm' name='403GB'/>
-  <cpu type='kvm' name='MPC8545E_v21'/>
-  <cpu type='kvm' name='POWER7_v2.3'/>
-  <cpu type='kvm' name='750_v2.2'/>
-  <cpu type='kvm' name='7450_v1.0'/>
-  <cpu type='kvm' name='MPC5200_v11'/>
-  <cpu type='kvm' name='755_v2.3'/>
-  <cpu type='kvm' name='MPC8347EP'/>
-  <cpu type='kvm' name='7410_v1.1'/>
-  <cpu type='kvm' name='750gl'/>
-  <cpu type='kvm' name='403GCX'/>
-  <cpu type='kvm' name='745_v2.1'/>
-  <cpu type='kvm' name='750p'/>
-  <cpu type='kvm' name='G2'/>
-  <cpu type='kvm' name='MPC8555_v10'/>
-  <cpu type='kvm' name='7445_v3.4'/>
-  <cpu type='kvm' name='MPC8347T'/>
-  <cpu type='kvm' name='603e_v3'/>
-  <cpu type='kvm' name='970_v2.2'/>
-  <cpu type='kvm' name='440-Xilinx'/>
-  <cpu type='kvm' name='740p'/>
-  <cpu type='kvm' name='MPC5200B_v20'/>
-  <cpu type='kvm' name='440EPX'/>
-  <cpu type='kvm' name='603e_v1.1'/>
-  <cpu type='kvm' name='7451_v2.3'/>
-  <cpu type='kvm' name='7450_v2.0'/>
-  <cpu type='kvm' name='7400_v2.8'/>
-  <cpu type='kvm' name='7455_v2.1'/>
-  <cpu type='kvm' name='405GPc'/>
-  <cpu type='kvm' name='MPC8347EAT'/>
-  <cpu type='kvm' name='970mp_v1.1'/>
-  <cpu type='kvm' name='603e7v2'/>
-  <cpu type='kvm' name='604r'/>
-  <cpu type='kvm' name='7447A_v1.2'/>
-  <cpu type='kvm' name='MPC8533E_v11'/>
-  <cpu type='kvm' name='e500v2_v22'/>
-  <cpu type='kvm' name='401F2'/>
-  <cpu type='kvm' name='MPC8343EA'/>
-  <cpu type='kvm' name='7457_v1.2'/>
-  <cpu type='kvm' name='7447_v1.0'/>
-  <cpu type='kvm' name='970fx_v3.1'/>
-  <cpu type='kvm' name='745_v2.5'/>
-  <cpu type='kvm' name='MPC8548E_v20'/>
-  <cpu type='kvm' name='MPC8610'/>
-  <cpu type='kvm' name='750cxe_v2.4b'/>
-  <cpu type='kvm' name='MPC5200_v10'/>
-  <cpu type='kvm' name='403GA'/>
-  <cpu type='kvm' name='7410_v1.0'/>
-  <cpu type='kvm' name='G2leGP3'/>
-  <cpu type='kvm' name='7445_v3.3'/>
-  <cpu type='kvm' name='603e_v4.1'/>
-  <cpu type='kvm' name='440EPa'/>
-  <cpu type='kvm' name='970fx_v2.1'/>
-  <cpu type='kvm' name='MPC8377E'/>
-  <cpu type='kvm' name='750fx_v2.1'/>
-  <cpu type='kvm' name='601_v0'/>
-  <cpu type='kvm' name='STB04'/>
-  <cpu type='kvm' name='745_v1.0'/>
-  <cpu type='kvm' name='G2HiP4'/>
-  <cpu type='kvm' name='750cl_v2.0'/>
-  <cpu type='kvm' name='750cxr'/>
-  <cpu type='kvm' name='MPC8349EA'/>
-  <cpu type='kvm' name='750cxe_v3.1'/>
-  <cpu type='kvm' name='MPC8379'/>
-  <cpu type='kvm' name='401'/>
-  <cpu type='kvm' name='MPC8568'/>
-  <cpu type='kvm' name='e300c2'/>
-  <cpu type='kvm' name='750_v3.1'/>
-  <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='7457A_v1.2'/>
-  <cpu type='tcg' name='750cl_v1.0'/>
-  <cpu type='tcg' name='750cxe_v2.1'/>
-  <cpu type='tcg' name='755_v2.7'/>
-  <cpu type='tcg' name='MPC8347ET'/>
-  <cpu type='tcg' name='MPC8545E_v20'/>
-  <cpu type='tcg' name='750_v2.1'/>
-  <cpu type='tcg' name='755_v2.2'/>
-  <cpu type='tcg' name='745_v2.0'/>
-  <cpu type='tcg' name='7455_v1.0'/>
-  <cpu type='tcg' name='MPC8547E_v21'/>
-  <cpu type='tcg' name='STB25'/>
-  <cpu type='tcg' name='POWER8_v2.0'/>
-  <cpu type='tcg' name='401G2'/>
-  <cpu type='tcg' name='MPC8349A'/>
-  <cpu type='tcg' name='750e'/>
-  <cpu type='tcg' name='MPC8545_v21'/>
-  <cpu type='tcg' name='MPC8548_v11'/>
-  <cpu type='tcg' name='970fx_v2.0'/>
-  <cpu type='tcg' name='750fx_v2.0'/>
-  <cpu type='tcg' name='POWER8E_v2.1'/>
-  <cpu type='tcg' name='Cobra'/>
-  <cpu type='tcg' name='7400_v2.7'/>
-  <cpu type='tcg' name='603p'/>
-  <cpu type='tcg' name='MPC8378E'/>
-  <cpu type='tcg' name='e500v2_v10'/>
-  <cpu type='tcg' name='e500mc'/>
-  <cpu type='tcg' name='603e7v1'/>
-  <cpu type='tcg' name='970mp_v1.0'/>
-  <cpu type='tcg' name='MPC8555E_v11'/>
-  <cpu type='tcg' name='440-Xilinx-w-dfpu'/>
-  <cpu type='tcg' name='740e'/>
-  <cpu type='tcg' name='405CRc'/>
-  <cpu type='tcg' name='7447A_v1.1'/>
-  <cpu type='tcg' name='MPC8533E_v10'/>
-  <cpu type='tcg' name='MPC8543_v11'/>
-  <cpu type='tcg' name='7400_v2.2'/>
-  <cpu type='tcg' name='MPC8540_v21'/>
-  <cpu type='tcg' name='e500v2_v21'/>
-  <cpu type='tcg' name='e300c1'/>
-  <cpu type='tcg' name='970fx_v1.0'/>
-  <cpu type='tcg' name='750gx_v1.2'/>
-  <cpu type='tcg' name='750fx_v1.0'/>
-  <cpu type='tcg' name='MPC8641'/>
-  <cpu type='tcg' name='MPC8544E_v10'/>
-  <cpu type='tcg' name='405D4'/>
-  <cpu type='tcg' name='7457_v1.1'/>
-  <cpu type='tcg' name='970fx_v3.0'/>
-  <cpu type='tcg' name='604e_v2.2'/>
-  <cpu type='tcg' name='755_v2.6'/>
-  <cpu type='tcg' name='Npe4GS3'/>
-  <cpu type='tcg' name='7410_v1.4'/>
-  <cpu type='tcg' name='750_v2.0'/>
-  <cpu type='tcg' name='7445_v3.2'/>
-  <cpu type='tcg' name='745_v2.4'/>
-  <cpu type='tcg' name='750l_v3.2'/>
-  <cpu type='tcg' name='MPC8540_v10'/>
-  <cpu type='tcg' name='750_v1.0'/>
-  <cpu type='tcg' name='STB03'/>
-  <cpu type='tcg' name='MPC8343A'/>
-  <cpu type='tcg' name='MPC8378'/>
-  <cpu type='tcg' name='G2HiP3'/>
-  <cpu type='tcg' name='750cxe_v3.0'/>
-  <cpu type='tcg' name='e500_v10'/>
-  <cpu type='tcg' name='755_v1.1'/>
-  <cpu type='tcg' name='MPC8567'/>
-  <cpu type='tcg' name='MPC8545_v20'/>
-  <cpu type='tcg' name='MPC8548_v10'/>
-  <cpu type='tcg' name='Npe405H'/>
-  <cpu type='tcg' name='603e7v'/>
-  <cpu type='tcg' name='750_v3.0'/>
-  <cpu type='tcg' name='Npe405H2'/>
-  <cpu type='tcg' name='7400_v2.6'/>
-  <cpu type='tcg' name='405GPa'/>
-  <cpu type='tcg' name='MPC8548_v21'/>
-  <cpu type='tcg' name='MPC8541E_v10'/>
-  <cpu type='tcg' name='750l_v2.2'/>
-  <cpu type='tcg' name='MPC8555E_v10'/>
-  <cpu type='tcg' name='7457A_v1.1'/>
-  <cpu type='tcg' name='e200z6'/>
-  <cpu type='tcg' name='MPC8379E'/>
-  <cpu type='tcg' name='e500v2_v20'/>
-  <cpu type='tcg' name='MPC8347AP'/>
-  <cpu type='tcg' name='401B2'/>
-  <cpu type='tcg' name='MPC8349E'/>
-  <cpu type='tcg' name='755_v2.1'/>
-  <cpu type='tcg' name='MPC8543_v21'/>
-  <cpu type='tcg' name='745_v2.8'/>
-  <cpu type='tcg' name='MPC8547E_v20'/>
-  <cpu type='tcg' name='7455_v3.4'/>
-  <cpu type='tcg' name='7448_v1.1'/>
-  <cpu type='tcg' name='740_v2.2'/>
-  <cpu type='tcg' name='7400_v1.1'/>
-  <cpu type='tcg' name='MPC8567E'/>
-  <cpu type='tcg' name='7441_v2.10'/>
-  <cpu type='tcg' name='603e_v1.4'/>
-  <cpu type='tcg' name='G2leGP1'/>
-  <cpu type='tcg' name='7451_v2.10'/>
-  <cpu type='tcg' name='MPC8343E'/>
-  <cpu type='tcg' name='750cx_v2.2'/>
-  <cpu type='tcg' name='Npe405L'/>
-  <cpu type='tcg' name='603e7'/>
-  <cpu type='tcg' name='401A1'/>
-  <cpu type='tcg' name='MPC8377'/>
-  <cpu type='tcg' name='7448_v2.1'/>
-  <cpu type='tcg' name='7441_v2.3'/>
-  <cpu type='tcg' name='7400_v2.1'/>
-  <cpu type='tcg' name='405CRb'/>
-  <cpu type='tcg' name='7447A_v1.0'/>
-  <cpu type='tcg' name='MPC8540_v20'/>
-  <cpu type='tcg' name='MPC8543_v10'/>
-  <cpu type='tcg' name='7445_v2.1'/>
-  <cpu type='tcg' name='e500_v20'/>
-  <cpu type='tcg' name='750gx_v1.1'/>
-  <cpu type='tcg' name='604'/>
-  <cpu type='tcg' name='750cxe_v2.4'/>
-  <cpu type='tcg' name='MPC8548_v20'/>
-  <cpu type='tcg' name='MPC8543E_v11'/>
-  <cpu type='tcg' name='MPC8347AT'/>
-  <cpu type='tcg' name='750l_v2.1'/>
-  <cpu type='tcg' name='POWER8NVL_v1.0'/>
-  <cpu type='tcg' name='7457A_v1.0'/>
-  <cpu type='tcg' name='7457_v1.0'/>
-  <cpu type='tcg' name='7450_v1.2'/>
-  <cpu type='tcg' name='MPC8572'/>
-  <cpu type='tcg' name='755_v2.5'/>
-  <cpu type='tcg' name='7410_v1.3'/>
-  <cpu type='tcg' name='745_v2.3'/>
-  <cpu type='tcg' name='405GPR'/>
-  <cpu type='tcg' name='755_v2.0'/>
-  <cpu type='tcg' name='MPC8541_v11'/>
-  <cpu type='tcg' name='401C2'/>
-  <cpu type='tcg' name='e500v2_v30'/>
-  <cpu type='tcg' name='7455_v3.3'/>
-  <cpu type='tcg' name='405EZ'/>
-  <cpu type='tcg' name='MPC8568E'/>
-  <cpu type='tcg' name='755_v1.0'/>
-  <cpu type='tcg' name='603e_v1.3'/>
-  <cpu type='tcg' name='MPC8560_v10'/>
-  <cpu type='tcg' name='MPC8560_v21'/>
-  <cpu type='tcg' name='G2H4'/>
-  <cpu type='tcg' name='MPC8533_v11'/>
-  <cpu type='tcg' name='740_v3.1'/>
-  <cpu type='tcg' name='e200z5'/>
-  <cpu type='tcg' name='MPC8349'/>
-  <cpu type='tcg' name='7400_v2.0'/>
-  <cpu type='tcg' name='405CRa'/>
-  <cpu type='tcg' name='MPC8543E_v10'/>
-  <cpu type='tcg' name='MPC8543E_v21'/>
-  <cpu type='tcg' name='750cxe_v2.3'/>
-  <cpu type='tcg' name='MPC8543_v20'/>
-  <cpu type='tcg' name='745_v2.7'/>
-  <cpu type='tcg' name='403GC'/>
-  <cpu type='tcg' name='e5500'/>
-  <cpu type='tcg' name='7448_v1.0'/>
-  <cpu type='tcg' name='MPC5200_v12'/>
-  <cpu type='tcg' name='740_v2.1'/>
-  <cpu type='tcg' name='745_v2.2'/>
-  <cpu type='tcg' name='7400_v1.0'/>
-  <cpu type='tcg' name='7410_v1.2'/>
-  <cpu type='tcg' name='x2vp4'/>
-  <cpu type='tcg' name='MPC8555_v11'/>
-  <cpu type='tcg' name='MPC8541_v10'/>
-  <cpu type='tcg' name='405LP'/>
-  <cpu type='tcg' name='750fx_v2.3'/>
-  <cpu type='tcg' name='405EP'/>
-  <cpu type='tcg' name='601_v2'/>
-  <cpu type='tcg' name='MPC8544_v11'/>
-  <cpu type='tcg' name='401D2'/>
-  <cpu type='tcg' name='MPC8572E'/>
-  <cpu type='tcg' name='604e_v1.0'/>
-  <cpu type='tcg' name='750cx_v2.1'/>
-  <cpu type='tcg' name='MPC5200B_v21'/>
-  <cpu type='tcg' name='750l_v3.0'/>
-  <cpu type='tcg' name='e300c4'/>
-  <cpu type='tcg' name='7448_v2.0'/>
-  <cpu type='tcg' name='7450_v2.1'/>
-  <cpu type='tcg' name='G2leGP'/>
-  <cpu type='tcg' name='750cxe_v3.1b'/>
-  <cpu type='tcg' name='7400_v2.9'/>
-  <cpu type='tcg' name='G2GP'/>
-  <cpu type='tcg' name='603'/>
-  <cpu type='tcg' name='405GPd'/>
-  <cpu type='tcg' name='MPC8548E_v11'/>
-  <cpu type='tcg' name='603e7t'/>
-  <cpu type='tcg' name='IOP480'/>
-  <cpu type='tcg' name='750gx_v1.0'/>
-  <cpu type='tcg' name='MPC8560_v20'/>
-  <cpu type='tcg' name='405D2'/>
-  <cpu type='tcg' name='750fl'/>
-  <cpu type='tcg' name='750l_v2.0'/>
-  <cpu type='tcg' name='x2vp20'/>
-  <cpu type='tcg' name='e600'/>
-  <cpu type='tcg' name='7450_v1.1'/>
-  <cpu type='tcg' name='755_v2.4'/>
-  <cpu type='tcg' name='7445_v1.0'/>
-  <cpu type='tcg' name='G2LS'/>
-  <cpu type='tcg' name='MPC8543E_v20'/>
-  <cpu type='tcg' name='603e_v2.2'/>
-  <cpu type='tcg' name='7447_v1.1'/>
-  <cpu type='tcg' name='603e_v4'/>
-  <cpu type='tcg' name='7455_v3.2'/>
-  <cpu type='tcg' name='740_v2.0'/>
-  <cpu type='tcg' name='MPC8347P'/>
-  <cpu type='tcg' name='440EPb'/>
-  <cpu type='tcg' name='MPC603'/>
-  <cpu type='tcg' name='603e_v1.2'/>
-  <cpu type='tcg' name='750fx_v2.2'/>
-  <cpu type='tcg' name='POWER9_v1.0'/>
-  <cpu type='tcg' name='740_v1.0'/>
-  <cpu type='tcg' name='MPC8544_v10'/>
-  <cpu type='tcg' name='601_v1'/>
-  <cpu type='tcg' name='745_v1.1'/>
-  <cpu type='tcg' name='POWER7+_v2.1'/>
-  <cpu type='tcg' name='750cx_v2.0'/>
-  <cpu type='tcg' name='MPC8347EAP'/>
-  <cpu type='tcg' name='401E2'/>
-  <cpu type='tcg' name='MPC8641D'/>
-  <cpu type='tcg' name='e300c3'/>
-  <cpu type='tcg' name='MPC8533_v10'/>
-  <cpu type='tcg' name='7441_v2.1'/>
-  <cpu type='tcg' name='740_v3.0'/>
-  <cpu type='tcg' name='POWER5+_v2.1'/>
-  <cpu type='tcg' name='602'/>
-  <cpu type='tcg' name='MPC8548E_v10'/>
-  <cpu type='tcg' name='G2leLS'/>
-  <cpu type='tcg' name='MPC8343'/>
-  <cpu type='tcg' name='750cx_v1.0'/>
-  <cpu type='tcg' name='750cxe_v2.2'/>
-  <cpu type='tcg' name='604e_v2.4'/>
-  <cpu type='tcg' name='755_v2.8'/>
-  <cpu type='tcg' name='745_v2.6'/>
-  <cpu type='tcg' name='MPC8548E_v21'/>
-  <cpu type='tcg' name='G2le'/>
-  <cpu type='tcg' name='403GB'/>
-  <cpu type='tcg' name='MPC8545E_v21'/>
-  <cpu type='tcg' name='POWER7_v2.3'/>
-  <cpu type='tcg' name='750_v2.2'/>
-  <cpu type='tcg' name='7450_v1.0'/>
-  <cpu type='tcg' name='MPC5200_v11'/>
-  <cpu type='tcg' name='755_v2.3'/>
-  <cpu type='tcg' name='MPC8347EP'/>
-  <cpu type='tcg' name='7410_v1.1'/>
-  <cpu type='tcg' name='750gl'/>
-  <cpu type='tcg' name='403GCX'/>
-  <cpu type='tcg' name='745_v2.1'/>
-  <cpu type='tcg' name='750p'/>
-  <cpu type='tcg' name='G2'/>
-  <cpu type='tcg' name='MPC8555_v10'/>
-  <cpu type='tcg' name='7445_v3.4'/>
-  <cpu type='tcg' name='MPC8347T'/>
-  <cpu type='tcg' name='603e_v3'/>
-  <cpu type='tcg' name='970_v2.2'/>
-  <cpu type='tcg' name='440-Xilinx'/>
-  <cpu type='tcg' name='740p'/>
-  <cpu type='tcg' name='MPC5200B_v20'/>
-  <cpu type='tcg' name='440EPX'/>
-  <cpu type='tcg' name='603e_v1.1'/>
-  <cpu type='tcg' name='7451_v2.3'/>
-  <cpu type='tcg' name='7450_v2.0'/>
-  <cpu type='tcg' name='7400_v2.8'/>
-  <cpu type='tcg' name='7455_v2.1'/>
-  <cpu type='tcg' name='405GPc'/>
-  <cpu type='tcg' name='MPC8347EAT'/>
-  <cpu type='tcg' name='970mp_v1.1'/>
-  <cpu type='tcg' name='603e7v2'/>
-  <cpu type='tcg' name='604r'/>
-  <cpu type='tcg' name='7447A_v1.2'/>
-  <cpu type='tcg' name='MPC8533E_v11'/>
-  <cpu type='tcg' name='e500v2_v22'/>
-  <cpu type='tcg' name='401F2'/>
-  <cpu type='tcg' name='MPC8343EA'/>
-  <cpu type='tcg' name='7457_v1.2'/>
-  <cpu type='tcg' name='7447_v1.0'/>
-  <cpu type='tcg' name='970fx_v3.1'/>
-  <cpu type='tcg' name='745_v2.5'/>
-  <cpu type='tcg' name='MPC8548E_v20'/>
-  <cpu type='tcg' name='MPC8610'/>
-  <cpu type='tcg' name='750cxe_v2.4b'/>
-  <cpu type='tcg' name='MPC5200_v10'/>
-  <cpu type='tcg' name='403GA'/>
-  <cpu type='tcg' name='7410_v1.0'/>
-  <cpu type='tcg' name='G2leGP3'/>
-  <cpu type='tcg' name='7445_v3.3'/>
-  <cpu type='tcg' name='603e_v4.1'/>
-  <cpu type='tcg' name='440EPa'/>
-  <cpu type='tcg' name='970fx_v2.1'/>
-  <cpu type='tcg' name='MPC8377E'/>
-  <cpu type='tcg' name='750fx_v2.1'/>
-  <cpu type='tcg' name='601_v0'/>
-  <cpu type='tcg' name='STB04'/>
-  <cpu type='tcg' name='745_v1.0'/>
-  <cpu type='tcg' name='G2HiP4'/>
-  <cpu type='tcg' name='750cl_v2.0'/>
-  <cpu type='tcg' name='750cxr'/>
-  <cpu type='tcg' name='MPC8349EA'/>
-  <cpu type='tcg' name='750cxe_v3.1'/>
-  <cpu type='tcg' name='MPC8379'/>
-  <cpu type='tcg' name='401'/>
-  <cpu type='tcg' name='MPC8568'/>
-  <cpu type='tcg' name='e300c2'/>
-  <cpu type='tcg' name='750_v3.1'/>
-  <cpu type='tcg' name='MPC8544E_v11'/>
-  <cpu type='tcg' name='405GPb'/>
-  <cpu type='tcg' name='MPC8541E_v11'/>
+  <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' typename=''/>
+  <cpu type='kvm' name='750cl_v1.0' typename=''/>
+  <cpu type='kvm' name='750cxe_v2.1' typename=''/>
+  <cpu type='kvm' name='755_v2.7' typename=''/>
+  <cpu type='kvm' name='MPC8347ET' typename=''/>
+  <cpu type='kvm' name='MPC8545E_v20' typename=''/>
+  <cpu type='kvm' name='750_v2.1' typename=''/>
+  <cpu type='kvm' name='755_v2.2' typename=''/>
+  <cpu type='kvm' name='745_v2.0' typename=''/>
+  <cpu type='kvm' name='7455_v1.0' typename=''/>
+  <cpu type='kvm' name='MPC8547E_v21' typename=''/>
+  <cpu type='kvm' name='STB25' typename=''/>
+  <cpu type='kvm' name='POWER8_v2.0' typename=''/>
+  <cpu type='kvm' name='401G2' typename=''/>
+  <cpu type='kvm' name='MPC8349A' typename=''/>
+  <cpu type='kvm' name='750e' typename=''/>
+  <cpu type='kvm' name='MPC8545_v21' typename=''/>
+  <cpu type='kvm' name='MPC8548_v11' typename=''/>
+  <cpu type='kvm' name='970fx_v2.0' typename=''/>
+  <cpu type='kvm' name='750fx_v2.0' typename=''/>
+  <cpu type='kvm' name='POWER8E_v2.1' typename=''/>
+  <cpu type='kvm' name='Cobra' typename=''/>
+  <cpu type='kvm' name='7400_v2.7' typename=''/>
+  <cpu type='kvm' name='603p' typename=''/>
+  <cpu type='kvm' name='MPC8378E' typename=''/>
+  <cpu type='kvm' name='e500v2_v10' typename=''/>
+  <cpu type='kvm' name='e500mc' typename=''/>
+  <cpu type='kvm' name='603e7v1' typename=''/>
+  <cpu type='kvm' name='970mp_v1.0' typename=''/>
+  <cpu type='kvm' name='MPC8555E_v11' typename=''/>
+  <cpu type='kvm' name='440-Xilinx-w-dfpu' typename=''/>
+  <cpu type='kvm' name='740e' typename=''/>
+  <cpu type='kvm' name='405CRc' typename=''/>
+  <cpu type='kvm' name='7447A_v1.1' typename=''/>
+  <cpu type='kvm' name='MPC8533E_v10' typename=''/>
+  <cpu type='kvm' name='MPC8543_v11' typename=''/>
+  <cpu type='kvm' name='7400_v2.2' typename=''/>
+  <cpu type='kvm' name='MPC8540_v21' typename=''/>
+  <cpu type='kvm' name='e500v2_v21' typename=''/>
+  <cpu type='kvm' name='e300c1' typename=''/>
+  <cpu type='kvm' name='970fx_v1.0' typename=''/>
+  <cpu type='kvm' name='750gx_v1.2' typename=''/>
+  <cpu type='kvm' name='750fx_v1.0' typename=''/>
+  <cpu type='kvm' name='MPC8641' typename=''/>
+  <cpu type='kvm' name='MPC8544E_v10' typename=''/>
+  <cpu type='kvm' name='405D4' typename=''/>
+  <cpu type='kvm' name='7457_v1.1' typename=''/>
+  <cpu type='kvm' name='970fx_v3.0' typename=''/>
+  <cpu type='kvm' name='604e_v2.2' typename=''/>
+  <cpu type='kvm' name='755_v2.6' typename=''/>
+  <cpu type='kvm' name='Npe4GS3' typename=''/>
+  <cpu type='kvm' name='7410_v1.4' typename=''/>
+  <cpu type='kvm' name='750_v2.0' typename=''/>
+  <cpu type='kvm' name='7445_v3.2' typename=''/>
+  <cpu type='kvm' name='745_v2.4' typename=''/>
+  <cpu type='kvm' name='750l_v3.2' typename=''/>
+  <cpu type='kvm' name='MPC8540_v10' typename=''/>
+  <cpu type='kvm' name='750_v1.0' typename=''/>
+  <cpu type='kvm' name='STB03' typename=''/>
+  <cpu type='kvm' name='MPC8343A' typename=''/>
+  <cpu type='kvm' name='MPC8378' typename=''/>
+  <cpu type='kvm' name='G2HiP3' typename=''/>
+  <cpu type='kvm' name='750cxe_v3.0' typename=''/>
+  <cpu type='kvm' name='e500_v10' typename=''/>
+  <cpu type='kvm' name='755_v1.1' typename=''/>
+  <cpu type='kvm' name='MPC8567' typename=''/>
+  <cpu type='kvm' name='MPC8545_v20' typename=''/>
+  <cpu type='kvm' name='MPC8548_v10' typename=''/>
+  <cpu type='kvm' name='Npe405H' typename=''/>
+  <cpu type='kvm' name='603e7v' typename=''/>
+  <cpu type='kvm' name='750_v3.0' typename=''/>
+  <cpu type='kvm' name='Npe405H2' typename=''/>
+  <cpu type='kvm' name='7400_v2.6' typename=''/>
+  <cpu type='kvm' name='405GPa' typename=''/>
+  <cpu type='kvm' name='MPC8548_v21' typename=''/>
+  <cpu type='kvm' name='MPC8541E_v10' typename=''/>
+  <cpu type='kvm' name='750l_v2.2' typename=''/>
+  <cpu type='kvm' name='MPC8555E_v10' typename=''/>
+  <cpu type='kvm' name='7457A_v1.1' typename=''/>
+  <cpu type='kvm' name='e200z6' typename=''/>
+  <cpu type='kvm' name='MPC8379E' typename=''/>
+  <cpu type='kvm' name='e500v2_v20' typename=''/>
+  <cpu type='kvm' name='MPC8347AP' typename=''/>
+  <cpu type='kvm' name='401B2' typename=''/>
+  <cpu type='kvm' name='MPC8349E' typename=''/>
+  <cpu type='kvm' name='755_v2.1' typename=''/>
+  <cpu type='kvm' name='MPC8543_v21' typename=''/>
+  <cpu type='kvm' name='745_v2.8' typename=''/>
+  <cpu type='kvm' name='MPC8547E_v20' typename=''/>
+  <cpu type='kvm' name='7455_v3.4' typename=''/>
+  <cpu type='kvm' name='7448_v1.1' typename=''/>
+  <cpu type='kvm' name='740_v2.2' typename=''/>
+  <cpu type='kvm' name='7400_v1.1' typename=''/>
+  <cpu type='kvm' name='MPC8567E' typename=''/>
+  <cpu type='kvm' name='7441_v2.10' typename=''/>
+  <cpu type='kvm' name='603e_v1.4' typename=''/>
+  <cpu type='kvm' name='G2leGP1' typename=''/>
+  <cpu type='kvm' name='7451_v2.10' typename=''/>
+  <cpu type='kvm' name='MPC8343E' typename=''/>
+  <cpu type='kvm' name='750cx_v2.2' typename=''/>
+  <cpu type='kvm' name='Npe405L' typename=''/>
+  <cpu type='kvm' name='603e7' typename=''/>
+  <cpu type='kvm' name='401A1' typename=''/>
+  <cpu type='kvm' name='MPC8377' typename=''/>
+  <cpu type='kvm' name='7448_v2.1' typename=''/>
+  <cpu type='kvm' name='7441_v2.3' typename=''/>
+  <cpu type='kvm' name='7400_v2.1' typename=''/>
+  <cpu type='kvm' name='405CRb' typename=''/>
+  <cpu type='kvm' name='7447A_v1.0' typename=''/>
+  <cpu type='kvm' name='MPC8540_v20' typename=''/>
+  <cpu type='kvm' name='MPC8543_v10' typename=''/>
+  <cpu type='kvm' name='7445_v2.1' typename=''/>
+  <cpu type='kvm' name='e500_v20' typename=''/>
+  <cpu type='kvm' name='750gx_v1.1' typename=''/>
+  <cpu type='kvm' name='604' typename=''/>
+  <cpu type='kvm' name='750cxe_v2.4' typename=''/>
+  <cpu type='kvm' name='MPC8548_v20' typename=''/>
+  <cpu type='kvm' name='MPC8543E_v11' typename=''/>
+  <cpu type='kvm' name='MPC8347AT' typename=''/>
+  <cpu type='kvm' name='750l_v2.1' typename=''/>
+  <cpu type='kvm' name='POWER8NVL_v1.0' typename=''/>
+  <cpu type='kvm' name='7457A_v1.0' typename=''/>
+  <cpu type='kvm' name='7457_v1.0' typename=''/>
+  <cpu type='kvm' name='7450_v1.2' typename=''/>
+  <cpu type='kvm' name='MPC8572' typename=''/>
+  <cpu type='kvm' name='755_v2.5' typename=''/>
+  <cpu type='kvm' name='7410_v1.3' typename=''/>
+  <cpu type='kvm' name='745_v2.3' typename=''/>
+  <cpu type='kvm' name='405GPR' typename=''/>
+  <cpu type='kvm' name='755_v2.0' typename=''/>
+  <cpu type='kvm' name='MPC8541_v11' typename=''/>
+  <cpu type='kvm' name='401C2' typename=''/>
+  <cpu type='kvm' name='e500v2_v30' typename=''/>
+  <cpu type='kvm' name='7455_v3.3' typename=''/>
+  <cpu type='kvm' name='405EZ' typename=''/>
+  <cpu type='kvm' name='MPC8568E' typename=''/>
+  <cpu type='kvm' name='755_v1.0' typename=''/>
+  <cpu type='kvm' name='603e_v1.3' typename=''/>
+  <cpu type='kvm' name='MPC8560_v10' typename=''/>
+  <cpu type='kvm' name='host' typename=''/>
+  <cpu type='kvm' name='MPC8560_v21' typename=''/>
+  <cpu type='kvm' name='G2H4' typename=''/>
+  <cpu type='kvm' name='MPC8533_v11' typename=''/>
+  <cpu type='kvm' name='740_v3.1' typename=''/>
+  <cpu type='kvm' name='e200z5' typename=''/>
+  <cpu type='kvm' name='MPC8349' typename=''/>
+  <cpu type='kvm' name='7400_v2.0' typename=''/>
+  <cpu type='kvm' name='405CRa' typename=''/>
+  <cpu type='kvm' name='MPC8543E_v10' typename=''/>
+  <cpu type='kvm' name='MPC8543E_v21' typename=''/>
+  <cpu type='kvm' name='750cxe_v2.3' typename=''/>
+  <cpu type='kvm' name='MPC8543_v20' typename=''/>
+  <cpu type='kvm' name='745_v2.7' typename=''/>
+  <cpu type='kvm' name='403GC' typename=''/>
+  <cpu type='kvm' name='e5500' typename=''/>
+  <cpu type='kvm' name='7448_v1.0' typename=''/>
+  <cpu type='kvm' name='MPC5200_v12' typename=''/>
+  <cpu type='kvm' name='740_v2.1' typename=''/>
+  <cpu type='kvm' name='745_v2.2' typename=''/>
+  <cpu type='kvm' name='7400_v1.0' typename=''/>
+  <cpu type='kvm' name='7410_v1.2' typename=''/>
+  <cpu type='kvm' name='x2vp4' typename=''/>
+  <cpu type='kvm' name='MPC8555_v11' typename=''/>
+  <cpu type='kvm' name='MPC8541_v10' typename=''/>
+  <cpu type='kvm' name='405LP' typename=''/>
+  <cpu type='kvm' name='750fx_v2.3' typename=''/>
+  <cpu type='kvm' name='405EP' typename=''/>
+  <cpu type='kvm' name='601_v2' typename=''/>
+  <cpu type='kvm' name='MPC8544_v11' typename=''/>
+  <cpu type='kvm' name='401D2' typename=''/>
+  <cpu type='kvm' name='MPC8572E' typename=''/>
+  <cpu type='kvm' name='604e_v1.0' typename=''/>
+  <cpu type='kvm' name='750cx_v2.1' typename=''/>
+  <cpu type='kvm' name='MPC5200B_v21' typename=''/>
+  <cpu type='kvm' name='750l_v3.0' typename=''/>
+  <cpu type='kvm' name='e300c4' typename=''/>
+  <cpu type='kvm' name='7448_v2.0' typename=''/>
+  <cpu type='kvm' name='7450_v2.1' typename=''/>
+  <cpu type='kvm' name='G2leGP' typename=''/>
+  <cpu type='kvm' name='750cxe_v3.1b' typename=''/>
+  <cpu type='kvm' name='7400_v2.9' typename=''/>
+  <cpu type='kvm' name='G2GP' typename=''/>
+  <cpu type='kvm' name='603' typename=''/>
+  <cpu type='kvm' name='405GPd' typename=''/>
+  <cpu type='kvm' name='MPC8548E_v11' typename=''/>
+  <cpu type='kvm' name='603e7t' typename=''/>
+  <cpu type='kvm' name='IOP480' typename=''/>
+  <cpu type='kvm' name='750gx_v1.0' typename=''/>
+  <cpu type='kvm' name='MPC8560_v20' typename=''/>
+  <cpu type='kvm' name='405D2' typename=''/>
+  <cpu type='kvm' name='750fl' typename=''/>
+  <cpu type='kvm' name='750l_v2.0' typename=''/>
+  <cpu type='kvm' name='x2vp20' typename=''/>
+  <cpu type='kvm' name='e600' typename=''/>
+  <cpu type='kvm' name='7450_v1.1' typename=''/>
+  <cpu type='kvm' name='755_v2.4' typename=''/>
+  <cpu type='kvm' name='7445_v1.0' typename=''/>
+  <cpu type='kvm' name='G2LS' typename=''/>
+  <cpu type='kvm' name='MPC8543E_v20' typename=''/>
+  <cpu type='kvm' name='603e_v2.2' typename=''/>
+  <cpu type='kvm' name='7447_v1.1' typename=''/>
+  <cpu type='kvm' name='603e_v4' typename=''/>
+  <cpu type='kvm' name='7455_v3.2' typename=''/>
+  <cpu type='kvm' name='740_v2.0' typename=''/>
+  <cpu type='kvm' name='MPC8347P' typename=''/>
+  <cpu type='kvm' name='440EPb' typename=''/>
+  <cpu type='kvm' name='MPC603' typename=''/>
+  <cpu type='kvm' name='603e_v1.2' typename=''/>
+  <cpu type='kvm' name='750fx_v2.2' typename=''/>
+  <cpu type='kvm' name='POWER9_v1.0' typename=''/>
+  <cpu type='kvm' name='740_v1.0' typename=''/>
+  <cpu type='kvm' name='MPC8544_v10' typename=''/>
+  <cpu type='kvm' name='601_v1' typename=''/>
+  <cpu type='kvm' name='745_v1.1' typename=''/>
+  <cpu type='kvm' name='POWER7+_v2.1' typename=''/>
+  <cpu type='kvm' name='750cx_v2.0' typename=''/>
+  <cpu type='kvm' name='MPC8347EAP' typename=''/>
+  <cpu type='kvm' name='401E2' typename=''/>
+  <cpu type='kvm' name='MPC8641D' typename=''/>
+  <cpu type='kvm' name='e300c3' typename=''/>
+  <cpu type='kvm' name='MPC8533_v10' typename=''/>
+  <cpu type='kvm' name='7441_v2.1' typename=''/>
+  <cpu type='kvm' name='740_v3.0' typename=''/>
+  <cpu type='kvm' name='POWER5+_v2.1' typename=''/>
+  <cpu type='kvm' name='602' typename=''/>
+  <cpu type='kvm' name='MPC8548E_v10' typename=''/>
+  <cpu type='kvm' name='G2leLS' typename=''/>
+  <cpu type='kvm' name='MPC8343' typename=''/>
+  <cpu type='kvm' name='750cx_v1.0' typename=''/>
+  <cpu type='kvm' name='750cxe_v2.2' typename=''/>
+  <cpu type='kvm' name='604e_v2.4' typename=''/>
+  <cpu type='kvm' name='755_v2.8' typename=''/>
+  <cpu type='kvm' name='745_v2.6' typename=''/>
+  <cpu type='kvm' name='MPC8548E_v21' typename=''/>
+  <cpu type='kvm' name='G2le' typename=''/>
+  <cpu type='kvm' name='403GB' typename=''/>
+  <cpu type='kvm' name='MPC8545E_v21' typename=''/>
+  <cpu type='kvm' name='POWER7_v2.3' typename=''/>
+  <cpu type='kvm' name='750_v2.2' typename=''/>
+  <cpu type='kvm' name='7450_v1.0' typename=''/>
+  <cpu type='kvm' name='MPC5200_v11' typename=''/>
+  <cpu type='kvm' name='755_v2.3' typename=''/>
+  <cpu type='kvm' name='MPC8347EP' typename=''/>
+  <cpu type='kvm' name='7410_v1.1' typename=''/>
+  <cpu type='kvm' name='750gl' typename=''/>
+  <cpu type='kvm' name='403GCX' typename=''/>
+  <cpu type='kvm' name='745_v2.1' typename=''/>
+  <cpu type='kvm' name='750p' typename=''/>
+  <cpu type='kvm' name='G2' typename=''/>
+  <cpu type='kvm' name='MPC8555_v10' typename=''/>
+  <cpu type='kvm' name='7445_v3.4' typename=''/>
+  <cpu type='kvm' name='MPC8347T' typename=''/>
+  <cpu type='kvm' name='603e_v3' typename=''/>
+  <cpu type='kvm' name='970_v2.2' typename=''/>
+  <cpu type='kvm' name='440-Xilinx' typename=''/>
+  <cpu type='kvm' name='740p' typename=''/>
+  <cpu type='kvm' name='MPC5200B_v20' typename=''/>
+  <cpu type='kvm' name='440EPX' typename=''/>
+  <cpu type='kvm' name='603e_v1.1' typename=''/>
+  <cpu type='kvm' name='7451_v2.3' typename=''/>
+  <cpu type='kvm' name='7450_v2.0' typename=''/>
+  <cpu type='kvm' name='7400_v2.8' typename=''/>
+  <cpu type='kvm' name='7455_v2.1' typename=''/>
+  <cpu type='kvm' name='405GPc' typename=''/>
+  <cpu type='kvm' name='MPC8347EAT' typename=''/>
+  <cpu type='kvm' name='970mp_v1.1' typename=''/>
+  <cpu type='kvm' name='603e7v2' typename=''/>
+  <cpu type='kvm' name='604r' typename=''/>
+  <cpu type='kvm' name='7447A_v1.2' typename=''/>
+  <cpu type='kvm' name='MPC8533E_v11' typename=''/>
+  <cpu type='kvm' name='e500v2_v22' typename=''/>
+  <cpu type='kvm' name='401F2' typename=''/>
+  <cpu type='kvm' name='MPC8343EA' typename=''/>
+  <cpu type='kvm' name='7457_v1.2' typename=''/>
+  <cpu type='kvm' name='7447_v1.0' typename=''/>
+  <cpu type='kvm' name='970fx_v3.1' typename=''/>
+  <cpu type='kvm' name='745_v2.5' typename=''/>
+  <cpu type='kvm' name='MPC8548E_v20' typename=''/>
+  <cpu type='kvm' name='MPC8610' typename=''/>
+  <cpu type='kvm' name='750cxe_v2.4b' typename=''/>
+  <cpu type='kvm' name='MPC5200_v10' typename=''/>
+  <cpu type='kvm' name='403GA' typename=''/>
+  <cpu type='kvm' name='7410_v1.0' typename=''/>
+  <cpu type='kvm' name='G2leGP3' typename=''/>
+  <cpu type='kvm' name='7445_v3.3' typename=''/>
+  <cpu type='kvm' name='603e_v4.1' typename=''/>
+  <cpu type='kvm' name='440EPa' typename=''/>
+  <cpu type='kvm' name='970fx_v2.1' typename=''/>
+  <cpu type='kvm' name='MPC8377E' typename=''/>
+  <cpu type='kvm' name='750fx_v2.1' typename=''/>
+  <cpu type='kvm' name='601_v0' typename=''/>
+  <cpu type='kvm' name='STB04' typename=''/>
+  <cpu type='kvm' name='745_v1.0' typename=''/>
+  <cpu type='kvm' name='G2HiP4' typename=''/>
+  <cpu type='kvm' name='750cl_v2.0' typename=''/>
+  <cpu type='kvm' name='750cxr' typename=''/>
+  <cpu type='kvm' name='MPC8349EA' typename=''/>
+  <cpu type='kvm' name='750cxe_v3.1' typename=''/>
+  <cpu type='kvm' name='MPC8379' typename=''/>
+  <cpu type='kvm' name='401' typename=''/>
+  <cpu type='kvm' name='MPC8568' typename=''/>
+  <cpu type='kvm' name='e300c2' typename=''/>
+  <cpu type='kvm' name='750_v3.1' typename=''/>
+  <cpu type='kvm' name='MPC8544E_v11' typename=''/>
+  <cpu type='kvm' name='405GPb' typename=''/>
+  <cpu type='kvm' name='MPC8541E_v11' typename=''/>
+  <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' typename=''/>
+  <cpu type='tcg' name='750cl_v1.0' typename=''/>
+  <cpu type='tcg' name='750cxe_v2.1' typename=''/>
+  <cpu type='tcg' name='755_v2.7' typename=''/>
+  <cpu type='tcg' name='MPC8347ET' typename=''/>
+  <cpu type='tcg' name='MPC8545E_v20' typename=''/>
+  <cpu type='tcg' name='750_v2.1' typename=''/>
+  <cpu type='tcg' name='755_v2.2' typename=''/>
+  <cpu type='tcg' name='745_v2.0' typename=''/>
+  <cpu type='tcg' name='7455_v1.0' typename=''/>
+  <cpu type='tcg' name='MPC8547E_v21' typename=''/>
+  <cpu type='tcg' name='STB25' typename=''/>
+  <cpu type='tcg' name='POWER8_v2.0' typename=''/>
+  <cpu type='tcg' name='401G2' typename=''/>
+  <cpu type='tcg' name='MPC8349A' typename=''/>
+  <cpu type='tcg' name='750e' typename=''/>
+  <cpu type='tcg' name='MPC8545_v21' typename=''/>
+  <cpu type='tcg' name='MPC8548_v11' typename=''/>
+  <cpu type='tcg' name='970fx_v2.0' typename=''/>
+  <cpu type='tcg' name='750fx_v2.0' typename=''/>
+  <cpu type='tcg' name='POWER8E_v2.1' typename=''/>
+  <cpu type='tcg' name='Cobra' typename=''/>
+  <cpu type='tcg' name='7400_v2.7' typename=''/>
+  <cpu type='tcg' name='603p' typename=''/>
+  <cpu type='tcg' name='MPC8378E' typename=''/>
+  <cpu type='tcg' name='e500v2_v10' typename=''/>
+  <cpu type='tcg' name='e500mc' typename=''/>
+  <cpu type='tcg' name='603e7v1' typename=''/>
+  <cpu type='tcg' name='970mp_v1.0' typename=''/>
+  <cpu type='tcg' name='MPC8555E_v11' typename=''/>
+  <cpu type='tcg' name='440-Xilinx-w-dfpu' typename=''/>
+  <cpu type='tcg' name='740e' typename=''/>
+  <cpu type='tcg' name='405CRc' typename=''/>
+  <cpu type='tcg' name='7447A_v1.1' typename=''/>
+  <cpu type='tcg' name='MPC8533E_v10' typename=''/>
+  <cpu type='tcg' name='MPC8543_v11' typename=''/>
+  <cpu type='tcg' name='7400_v2.2' typename=''/>
+  <cpu type='tcg' name='MPC8540_v21' typename=''/>
+  <cpu type='tcg' name='e500v2_v21' typename=''/>
+  <cpu type='tcg' name='e300c1' typename=''/>
+  <cpu type='tcg' name='970fx_v1.0' typename=''/>
+  <cpu type='tcg' name='750gx_v1.2' typename=''/>
+  <cpu type='tcg' name='750fx_v1.0' typename=''/>
+  <cpu type='tcg' name='MPC8641' typename=''/>
+  <cpu type='tcg' name='MPC8544E_v10' typename=''/>
+  <cpu type='tcg' name='405D4' typename=''/>
+  <cpu type='tcg' name='7457_v1.1' typename=''/>
+  <cpu type='tcg' name='970fx_v3.0' typename=''/>
+  <cpu type='tcg' name='604e_v2.2' typename=''/>
+  <cpu type='tcg' name='755_v2.6' typename=''/>
+  <cpu type='tcg' name='Npe4GS3' typename=''/>
+  <cpu type='tcg' name='7410_v1.4' typename=''/>
+  <cpu type='tcg' name='750_v2.0' typename=''/>
+  <cpu type='tcg' name='7445_v3.2' typename=''/>
+  <cpu type='tcg' name='745_v2.4' typename=''/>
+  <cpu type='tcg' name='750l_v3.2' typename=''/>
+  <cpu type='tcg' name='MPC8540_v10' typename=''/>
+  <cpu type='tcg' name='750_v1.0' typename=''/>
+  <cpu type='tcg' name='STB03' typename=''/>
+  <cpu type='tcg' name='MPC8343A' typename=''/>
+  <cpu type='tcg' name='MPC8378' typename=''/>
+  <cpu type='tcg' name='G2HiP3' typename=''/>
+  <cpu type='tcg' name='750cxe_v3.0' typename=''/>
+  <cpu type='tcg' name='e500_v10' typename=''/>
+  <cpu type='tcg' name='755_v1.1' typename=''/>
+  <cpu type='tcg' name='MPC8567' typename=''/>
+  <cpu type='tcg' name='MPC8545_v20' typename=''/>
+  <cpu type='tcg' name='MPC8548_v10' typename=''/>
+  <cpu type='tcg' name='Npe405H' typename=''/>
+  <cpu type='tcg' name='603e7v' typename=''/>
+  <cpu type='tcg' name='750_v3.0' typename=''/>
+  <cpu type='tcg' name='Npe405H2' typename=''/>
+  <cpu type='tcg' name='7400_v2.6' typename=''/>
+  <cpu type='tcg' name='405GPa' typename=''/>
+  <cpu type='tcg' name='MPC8548_v21' typename=''/>
+  <cpu type='tcg' name='MPC8541E_v10' typename=''/>
+  <cpu type='tcg' name='750l_v2.2' typename=''/>
+  <cpu type='tcg' name='MPC8555E_v10' typename=''/>
+  <cpu type='tcg' name='7457A_v1.1' typename=''/>
+  <cpu type='tcg' name='e200z6' typename=''/>
+  <cpu type='tcg' name='MPC8379E' typename=''/>
+  <cpu type='tcg' name='e500v2_v20' typename=''/>
+  <cpu type='tcg' name='MPC8347AP' typename=''/>
+  <cpu type='tcg' name='401B2' typename=''/>
+  <cpu type='tcg' name='MPC8349E' typename=''/>
+  <cpu type='tcg' name='755_v2.1' typename=''/>
+  <cpu type='tcg' name='MPC8543_v21' typename=''/>
+  <cpu type='tcg' name='745_v2.8' typename=''/>
+  <cpu type='tcg' name='MPC8547E_v20' typename=''/>
+  <cpu type='tcg' name='7455_v3.4' typename=''/>
+  <cpu type='tcg' name='7448_v1.1' typename=''/>
+  <cpu type='tcg' name='740_v2.2' typename=''/>
+  <cpu type='tcg' name='7400_v1.1' typename=''/>
+  <cpu type='tcg' name='MPC8567E' typename=''/>
+  <cpu type='tcg' name='7441_v2.10' typename=''/>
+  <cpu type='tcg' name='603e_v1.4' typename=''/>
+  <cpu type='tcg' name='G2leGP1' typename=''/>
+  <cpu type='tcg' name='7451_v2.10' typename=''/>
+  <cpu type='tcg' name='MPC8343E' typename=''/>
+  <cpu type='tcg' name='750cx_v2.2' typename=''/>
+  <cpu type='tcg' name='Npe405L' typename=''/>
+  <cpu type='tcg' name='603e7' typename=''/>
+  <cpu type='tcg' name='401A1' typename=''/>
+  <cpu type='tcg' name='MPC8377' typename=''/>
+  <cpu type='tcg' name='7448_v2.1' typename=''/>
+  <cpu type='tcg' name='7441_v2.3' typename=''/>
+  <cpu type='tcg' name='7400_v2.1' typename=''/>
+  <cpu type='tcg' name='405CRb' typename=''/>
+  <cpu type='tcg' name='7447A_v1.0' typename=''/>
+  <cpu type='tcg' name='MPC8540_v20' typename=''/>
+  <cpu type='tcg' name='MPC8543_v10' typename=''/>
+  <cpu type='tcg' name='7445_v2.1' typename=''/>
+  <cpu type='tcg' name='e500_v20' typename=''/>
+  <cpu type='tcg' name='750gx_v1.1' typename=''/>
+  <cpu type='tcg' name='604' typename=''/>
+  <cpu type='tcg' name='750cxe_v2.4' typename=''/>
+  <cpu type='tcg' name='MPC8548_v20' typename=''/>
+  <cpu type='tcg' name='MPC8543E_v11' typename=''/>
+  <cpu type='tcg' name='MPC8347AT' typename=''/>
+  <cpu type='tcg' name='750l_v2.1' typename=''/>
+  <cpu type='tcg' name='POWER8NVL_v1.0' typename=''/>
+  <cpu type='tcg' name='7457A_v1.0' typename=''/>
+  <cpu type='tcg' name='7457_v1.0' typename=''/>
+  <cpu type='tcg' name='7450_v1.2' typename=''/>
+  <cpu type='tcg' name='MPC8572' typename=''/>
+  <cpu type='tcg' name='755_v2.5' typename=''/>
+  <cpu type='tcg' name='7410_v1.3' typename=''/>
+  <cpu type='tcg' name='745_v2.3' typename=''/>
+  <cpu type='tcg' name='405GPR' typename=''/>
+  <cpu type='tcg' name='755_v2.0' typename=''/>
+  <cpu type='tcg' name='MPC8541_v11' typename=''/>
+  <cpu type='tcg' name='401C2' typename=''/>
+  <cpu type='tcg' name='e500v2_v30' typename=''/>
+  <cpu type='tcg' name='7455_v3.3' typename=''/>
+  <cpu type='tcg' name='405EZ' typename=''/>
+  <cpu type='tcg' name='MPC8568E' typename=''/>
+  <cpu type='tcg' name='755_v1.0' typename=''/>
+  <cpu type='tcg' name='603e_v1.3' typename=''/>
+  <cpu type='tcg' name='MPC8560_v10' typename=''/>
+  <cpu type='tcg' name='MPC8560_v21' typename=''/>
+  <cpu type='tcg' name='G2H4' typename=''/>
+  <cpu type='tcg' name='MPC8533_v11' typename=''/>
+  <cpu type='tcg' name='740_v3.1' typename=''/>
+  <cpu type='tcg' name='e200z5' typename=''/>
+  <cpu type='tcg' name='MPC8349' typename=''/>
+  <cpu type='tcg' name='7400_v2.0' typename=''/>
+  <cpu type='tcg' name='405CRa' typename=''/>
+  <cpu type='tcg' name='MPC8543E_v10' typename=''/>
+  <cpu type='tcg' name='MPC8543E_v21' typename=''/>
+  <cpu type='tcg' name='750cxe_v2.3' typename=''/>
+  <cpu type='tcg' name='MPC8543_v20' typename=''/>
+  <cpu type='tcg' name='745_v2.7' typename=''/>
+  <cpu type='tcg' name='403GC' typename=''/>
+  <cpu type='tcg' name='e5500' typename=''/>
+  <cpu type='tcg' name='7448_v1.0' typename=''/>
+  <cpu type='tcg' name='MPC5200_v12' typename=''/>
+  <cpu type='tcg' name='740_v2.1' typename=''/>
+  <cpu type='tcg' name='745_v2.2' typename=''/>
+  <cpu type='tcg' name='7400_v1.0' typename=''/>
+  <cpu type='tcg' name='7410_v1.2' typename=''/>
+  <cpu type='tcg' name='x2vp4' typename=''/>
+  <cpu type='tcg' name='MPC8555_v11' typename=''/>
+  <cpu type='tcg' name='MPC8541_v10' typename=''/>
+  <cpu type='tcg' name='405LP' typename=''/>
+  <cpu type='tcg' name='750fx_v2.3' typename=''/>
+  <cpu type='tcg' name='405EP' typename=''/>
+  <cpu type='tcg' name='601_v2' typename=''/>
+  <cpu type='tcg' name='MPC8544_v11' typename=''/>
+  <cpu type='tcg' name='401D2' typename=''/>
+  <cpu type='tcg' name='MPC8572E' typename=''/>
+  <cpu type='tcg' name='604e_v1.0' typename=''/>
+  <cpu type='tcg' name='750cx_v2.1' typename=''/>
+  <cpu type='tcg' name='MPC5200B_v21' typename=''/>
+  <cpu type='tcg' name='750l_v3.0' typename=''/>
+  <cpu type='tcg' name='e300c4' typename=''/>
+  <cpu type='tcg' name='7448_v2.0' typename=''/>
+  <cpu type='tcg' name='7450_v2.1' typename=''/>
+  <cpu type='tcg' name='G2leGP' typename=''/>
+  <cpu type='tcg' name='750cxe_v3.1b' typename=''/>
+  <cpu type='tcg' name='7400_v2.9' typename=''/>
+  <cpu type='tcg' name='G2GP' typename=''/>
+  <cpu type='tcg' name='603' typename=''/>
+  <cpu type='tcg' name='405GPd' typename=''/>
+  <cpu type='tcg' name='MPC8548E_v11' typename=''/>
+  <cpu type='tcg' name='603e7t' typename=''/>
+  <cpu type='tcg' name='IOP480' typename=''/>
+  <cpu type='tcg' name='750gx_v1.0' typename=''/>
+  <cpu type='tcg' name='MPC8560_v20' typename=''/>
+  <cpu type='tcg' name='405D2' typename=''/>
+  <cpu type='tcg' name='750fl' typename=''/>
+  <cpu type='tcg' name='750l_v2.0' typename=''/>
+  <cpu type='tcg' name='x2vp20' typename=''/>
+  <cpu type='tcg' name='e600' typename=''/>
+  <cpu type='tcg' name='7450_v1.1' typename=''/>
+  <cpu type='tcg' name='755_v2.4' typename=''/>
+  <cpu type='tcg' name='7445_v1.0' typename=''/>
+  <cpu type='tcg' name='G2LS' typename=''/>
+  <cpu type='tcg' name='MPC8543E_v20' typename=''/>
+  <cpu type='tcg' name='603e_v2.2' typename=''/>
+  <cpu type='tcg' name='7447_v1.1' typename=''/>
+  <cpu type='tcg' name='603e_v4' typename=''/>
+  <cpu type='tcg' name='7455_v3.2' typename=''/>
+  <cpu type='tcg' name='740_v2.0' typename=''/>
+  <cpu type='tcg' name='MPC8347P' typename=''/>
+  <cpu type='tcg' name='440EPb' typename=''/>
+  <cpu type='tcg' name='MPC603' typename=''/>
+  <cpu type='tcg' name='603e_v1.2' typename=''/>
+  <cpu type='tcg' name='750fx_v2.2' typename=''/>
+  <cpu type='tcg' name='POWER9_v1.0' typename=''/>
+  <cpu type='tcg' name='740_v1.0' typename=''/>
+  <cpu type='tcg' name='MPC8544_v10' typename=''/>
+  <cpu type='tcg' name='601_v1' typename=''/>
+  <cpu type='tcg' name='745_v1.1' typename=''/>
+  <cpu type='tcg' name='POWER7+_v2.1' typename=''/>
+  <cpu type='tcg' name='750cx_v2.0' typename=''/>
+  <cpu type='tcg' name='MPC8347EAP' typename=''/>
+  <cpu type='tcg' name='401E2' typename=''/>
+  <cpu type='tcg' name='MPC8641D' typename=''/>
+  <cpu type='tcg' name='e300c3' typename=''/>
+  <cpu type='tcg' name='MPC8533_v10' typename=''/>
+  <cpu type='tcg' name='7441_v2.1' typename=''/>
+  <cpu type='tcg' name='740_v3.0' typename=''/>
+  <cpu type='tcg' name='POWER5+_v2.1' typename=''/>
+  <cpu type='tcg' name='602' typename=''/>
+  <cpu type='tcg' name='MPC8548E_v10' typename=''/>
+  <cpu type='tcg' name='G2leLS' typename=''/>
+  <cpu type='tcg' name='MPC8343' typename=''/>
+  <cpu type='tcg' name='750cx_v1.0' typename=''/>
+  <cpu type='tcg' name='750cxe_v2.2' typename=''/>
+  <cpu type='tcg' name='604e_v2.4' typename=''/>
+  <cpu type='tcg' name='755_v2.8' typename=''/>
+  <cpu type='tcg' name='745_v2.6' typename=''/>
+  <cpu type='tcg' name='MPC8548E_v21' typename=''/>
+  <cpu type='tcg' name='G2le' typename=''/>
+  <cpu type='tcg' name='403GB' typename=''/>
+  <cpu type='tcg' name='MPC8545E_v21' typename=''/>
+  <cpu type='tcg' name='POWER7_v2.3' typename=''/>
+  <cpu type='tcg' name='750_v2.2' typename=''/>
+  <cpu type='tcg' name='7450_v1.0' typename=''/>
+  <cpu type='tcg' name='MPC5200_v11' typename=''/>
+  <cpu type='tcg' name='755_v2.3' typename=''/>
+  <cpu type='tcg' name='MPC8347EP' typename=''/>
+  <cpu type='tcg' name='7410_v1.1' typename=''/>
+  <cpu type='tcg' name='750gl' typename=''/>
+  <cpu type='tcg' name='403GCX' typename=''/>
+  <cpu type='tcg' name='745_v2.1' typename=''/>
+  <cpu type='tcg' name='750p' typename=''/>
+  <cpu type='tcg' name='G2' typename=''/>
+  <cpu type='tcg' name='MPC8555_v10' typename=''/>
+  <cpu type='tcg' name='7445_v3.4' typename=''/>
+  <cpu type='tcg' name='MPC8347T' typename=''/>
+  <cpu type='tcg' name='603e_v3' typename=''/>
+  <cpu type='tcg' name='970_v2.2' typename=''/>
+  <cpu type='tcg' name='440-Xilinx' typename=''/>
+  <cpu type='tcg' name='740p' typename=''/>
+  <cpu type='tcg' name='MPC5200B_v20' typename=''/>
+  <cpu type='tcg' name='440EPX' typename=''/>
+  <cpu type='tcg' name='603e_v1.1' typename=''/>
+  <cpu type='tcg' name='7451_v2.3' typename=''/>
+  <cpu type='tcg' name='7450_v2.0' typename=''/>
+  <cpu type='tcg' name='7400_v2.8' typename=''/>
+  <cpu type='tcg' name='7455_v2.1' typename=''/>
+  <cpu type='tcg' name='405GPc' typename=''/>
+  <cpu type='tcg' name='MPC8347EAT' typename=''/>
+  <cpu type='tcg' name='970mp_v1.1' typename=''/>
+  <cpu type='tcg' name='603e7v2' typename=''/>
+  <cpu type='tcg' name='604r' typename=''/>
+  <cpu type='tcg' name='7447A_v1.2' typename=''/>
+  <cpu type='tcg' name='MPC8533E_v11' typename=''/>
+  <cpu type='tcg' name='e500v2_v22' typename=''/>
+  <cpu type='tcg' name='401F2' typename=''/>
+  <cpu type='tcg' name='MPC8343EA' typename=''/>
+  <cpu type='tcg' name='7457_v1.2' typename=''/>
+  <cpu type='tcg' name='7447_v1.0' typename=''/>
+  <cpu type='tcg' name='970fx_v3.1' typename=''/>
+  <cpu type='tcg' name='745_v2.5' typename=''/>
+  <cpu type='tcg' name='MPC8548E_v20' typename=''/>
+  <cpu type='tcg' name='MPC8610' typename=''/>
+  <cpu type='tcg' name='750cxe_v2.4b' typename=''/>
+  <cpu type='tcg' name='MPC5200_v10' typename=''/>
+  <cpu type='tcg' name='403GA' typename=''/>
+  <cpu type='tcg' name='7410_v1.0' typename=''/>
+  <cpu type='tcg' name='G2leGP3' typename=''/>
+  <cpu type='tcg' name='7445_v3.3' typename=''/>
+  <cpu type='tcg' name='603e_v4.1' typename=''/>
+  <cpu type='tcg' name='440EPa' typename=''/>
+  <cpu type='tcg' name='970fx_v2.1' typename=''/>
+  <cpu type='tcg' name='MPC8377E' typename=''/>
+  <cpu type='tcg' name='750fx_v2.1' typename=''/>
+  <cpu type='tcg' name='601_v0' typename=''/>
+  <cpu type='tcg' name='STB04' typename=''/>
+  <cpu type='tcg' name='745_v1.0' typename=''/>
+  <cpu type='tcg' name='G2HiP4' typename=''/>
+  <cpu type='tcg' name='750cl_v2.0' typename=''/>
+  <cpu type='tcg' name='750cxr' typename=''/>
+  <cpu type='tcg' name='MPC8349EA' typename=''/>
+  <cpu type='tcg' name='750cxe_v3.1' typename=''/>
+  <cpu type='tcg' name='MPC8379' typename=''/>
+  <cpu type='tcg' name='401' typename=''/>
+  <cpu type='tcg' name='MPC8568' typename=''/>
+  <cpu type='tcg' name='e300c2' typename=''/>
+  <cpu type='tcg' name='750_v3.1' typename=''/>
+  <cpu type='tcg' name='MPC8544E_v11' typename=''/>
+  <cpu type='tcg' name='405GPb' typename=''/>
+  <cpu type='tcg' name='MPC8541E_v11' typename=''/>
   <machine name='pseries-2.10' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes'/>
   <machine name='ref405ep' maxCpus='1'/>
   <machine name='virtex-ml507' maxCpus='1'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
index 21b918f8d4..236589f90f 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
@@ -139,73 +139,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'/>
@@ -221,7 +221,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'/>
@@ -231,7 +231,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'/>
@@ -253,20 +253,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'/>
@@ -297,12 +297,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'/>
@@ -327,7 +327,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'/>
@@ -367,7 +367,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'/>
@@ -388,10 +388,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'/>
@@ -412,7 +412,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'/>
@@ -443,7 +443,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'/>
@@ -456,12 +456,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'/>
@@ -482,8 +482,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'/>
@@ -493,12 +493,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'/>
@@ -519,7 +519,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'/>
@@ -532,7 +532,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'/>
@@ -553,12 +553,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'/>
@@ -615,7 +615,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'/>
@@ -659,7 +659,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'/>
@@ -675,7 +675,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'/>
@@ -698,12 +698,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'/>
@@ -716,12 +716,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'/>
@@ -765,7 +765,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'/>
@@ -790,7 +790,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'/>
@@ -820,7 +820,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'/>
@@ -833,12 +833,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'/>
@@ -861,7 +861,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'/>
@@ -871,7 +871,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'/>
@@ -911,7 +911,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'/>
@@ -942,25 +942,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'/>
@@ -976,17 +976,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'/>
@@ -1009,10 +1009,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'/>
@@ -1052,7 +1052,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'/>
@@ -1062,7 +1062,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'/>
@@ -1075,7 +1075,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'/>
@@ -1091,13 +1091,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'/>
@@ -1113,7 +1113,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'/>
@@ -1123,15 +1123,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'/>
@@ -1175,7 +1175,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'/>
@@ -1197,7 +1197,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'/>
@@ -1219,7 +1219,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'/>
@@ -1244,7 +1244,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 2788fd9afe..1d49903ab6 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 6cb997d299..62d6ea4774 100644
--- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
@@ -145,73 +145,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'/>
@@ -226,7 +226,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'/>
@@ -241,7 +241,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'/>
@@ -271,7 +271,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'/>
@@ -393,7 +393,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'/>
@@ -540,7 +540,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='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'/>
@@ -591,7 +591,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'/>
@@ -622,7 +622,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'/>
@@ -656,7 +656,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'/>
@@ -671,8 +671,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'/>
@@ -694,7 +694,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'/>
@@ -825,7 +825,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'/>
@@ -847,7 +847,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'/>
@@ -878,8 +878,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'/>
@@ -911,10 +911,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'/>
@@ -936,13 +936,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'/>
@@ -957,7 +957,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'/>
@@ -972,7 +972,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'/>
@@ -987,7 +987,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'/>
@@ -1012,10 +1012,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'/>
@@ -1034,10 +1034,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'/>
@@ -1159,7 +1159,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'/>
@@ -1294,7 +1294,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'/>
@@ -1309,7 +1309,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'/>
@@ -1343,7 +1343,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'/>
@@ -1358,7 +1358,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'/>
@@ -1397,7 +1397,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'/>
@@ -1412,7 +1412,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'/>
@@ -1534,7 +1534,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'/>
@@ -1564,7 +1564,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'/>
@@ -1699,8 +1699,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'/>
@@ -1730,7 +1730,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'/>
@@ -1755,7 +1755,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'/>
@@ -1786,7 +1786,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'/>
@@ -1801,7 +1801,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'/>
@@ -1820,7 +1820,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'/>
@@ -1835,10 +1835,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'/>
@@ -1860,7 +1860,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'/>
@@ -1890,7 +1890,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'/>
@@ -1905,7 +1905,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'/>
@@ -2036,7 +2036,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'/>
@@ -2061,7 +2061,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'/>
@@ -2080,7 +2080,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'/>
@@ -2099,7 +2099,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'/>
@@ -2230,7 +2230,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'/>
@@ -2245,7 +2245,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'/>
@@ -2270,8 +2270,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'/>
@@ -2406,7 +2406,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'/>
@@ -2438,7 +2438,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'/>
@@ -2472,7 +2472,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'/>
@@ -2487,7 +2487,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'/>
@@ -2502,7 +2502,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'/>
@@ -2532,7 +2532,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'/>
@@ -2554,7 +2554,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'/>
@@ -2579,7 +2579,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 69f7fc2e4a..6c79481ec7 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 614fd14fb1..956ae1055f 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
@@ -158,74 +158,74 @@
   <microcodeVersion>61700807</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 fd9ae0bcb8..08a7c2cf11 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
@@ -156,881 +156,881 @@
   <microcodeVersion>42900807</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='mpc8547e_v21'/>
-  <cpu type='kvm' name='750cl_v1.0'/>
-  <cpu type='kvm' name='7457a_v1.1'/>
-  <cpu type='kvm' name='g2gp'/>
-  <cpu type='kvm' name='750cxe_v2.1'/>
-  <cpu type='kvm' name='755_v2.7'/>
-  <cpu type='kvm' name='750_v2.1'/>
-  <cpu type='kvm' name='755_v2.2'/>
-  <cpu type='kvm' name='745_v2.0'/>
-  <cpu type='kvm' name='mpc8377'/>
-  <cpu type='kvm' name='7455_v1.0'/>
-  <cpu type='kvm' name='mpc8545_v21'/>
-  <cpu type='kvm' name='mpc8548_v11'/>
-  <cpu type='kvm' name='405d4'/>
-  <cpu type='kvm' name='g2le'/>
-  <cpu type='kvm' name='g2hip3'/>
-  <cpu type='kvm' name='750e'/>
-  <cpu type='kvm' name='mpc8572'/>
-  <cpu type='kvm' name='970fx_v2.0'/>
-  <cpu type='kvm' name='750fx_v2.0'/>
-  <cpu type='kvm' name='603p'/>
-  <cpu type='kvm' name='405gpb'/>
-  <cpu type='kvm' name='7400_v2.7'/>
-  <cpu type='kvm' name='mpc8544e_v10'/>
-  <cpu type='kvm' name='e500v2_v10'/>
-  <cpu type='kvm' name='e500mc'/>
-  <cpu type='kvm' name='603e7v1'/>
-  <cpu type='kvm' name='970mp_v1.0'/>
-  <cpu type='kvm' name='740e'/>
-  <cpu type='kvm' name='405crc'/>
-  <cpu type='kvm' name='403ga'/>
-  <cpu type='kvm' name='7447a_v1.0'/>
-  <cpu type='kvm' name='7400_v2.2'/>
-  <cpu type='kvm' name='e300c1'/>
-  <cpu type='kvm' name='mpc8572e'/>
-  <cpu type='kvm' name='e500v2_v21'/>
-  <cpu type='kvm' name='970fx_v1.0'/>
-  <cpu type='kvm' name='750gx_v1.2'/>
-  <cpu type='kvm' name='750fx_v1.0'/>
-  <cpu type='kvm' name='7457_v1.1'/>
-  <cpu type='kvm' name='970fx_v3.0'/>
-  <cpu type='kvm' name='604e_v2.2'/>
-  <cpu type='kvm' name='755_v2.6'/>
-  <cpu type='kvm' name='401a1'/>
-  <cpu type='kvm' name='power9_v1.0'/>
-  <cpu type='kvm' name='npe405h'/>
-  <cpu type='kvm' name='7410_v1.4'/>
-  <cpu type='kvm' name='g2ls'/>
-  <cpu type='kvm' name='750_v2.0'/>
-  <cpu type='kvm' name='401b2'/>
-  <cpu type='kvm' name='mpc8349'/>
-  <cpu type='kvm' name='mpc8347ep'/>
-  <cpu type='kvm' name='7445_v3.2'/>
-  <cpu type='kvm' name='mpc8540_v21'/>
-  <cpu type='kvm' name='mpc8543_v11'/>
-  <cpu type='kvm' name='403gcx'/>
-  <cpu type='kvm' name='745_v2.4'/>
-  <cpu type='kvm' name='mpc8548_v21'/>
-  <cpu type='kvm' name='750l_v3.2'/>
-  <cpu type='kvm' name='750_v1.0'/>
-  <cpu type='kvm' name='755_v1.1'/>
-  <cpu type='kvm' name='e500_v10'/>
-  <cpu type='kvm' name='750cxe_v3.0'/>
-  <cpu type='kvm' name='mpc8541e_v10'/>
-  <cpu type='kvm' name='mpc8347p'/>
-  <cpu type='kvm' name='mpc8555e_v10'/>
-  <cpu type='kvm' name='power9_v2.0'/>
-  <cpu type='kvm' name='power7_v2.3'/>
-  <cpu type='kvm' name='603e7v'/>
-  <cpu type='kvm' name='mpc8543e_v11'/>
-  <cpu type='kvm' name='750_v3.0'/>
-  <cpu type='kvm' name='7400_v2.6'/>
-  <cpu type='kvm' name='405gpa'/>
-  <cpu type='kvm' name='440epx'/>
-  <cpu type='kvm' name='750l_v2.2'/>
-  <cpu type='kvm' name='e200z6'/>
-  <cpu type='kvm' name='mpc8547e_v20'/>
-  <cpu type='kvm' name='7457a_v1.0'/>
-  <cpu type='kvm' name='mpc8349ea'/>
-  <cpu type='kvm' name='e500v2_v20'/>
-  <cpu type='kvm' name='power8nvl_v1.0'/>
-  <cpu type='kvm' name='mpc8540_v10'/>
-  <cpu type='kvm' name='755_v2.1'/>
-  <cpu type='kvm' name='745_v2.8'/>
-  <cpu type='kvm' name='npe405l'/>
-  <cpu type='kvm' name='mpc8343ea'/>
-  <cpu type='kvm' name='mpc8545_v20'/>
-  <cpu type='kvm' name='mpc8548_v10'/>
-  <cpu type='kvm' name='7448_v1.1'/>
-  <cpu type='kvm' name='7455_v3.4'/>
-  <cpu type='kvm' name='740_v2.2'/>
-  <cpu type='kvm' name='7400_v1.1'/>
-  <cpu type='kvm' name='mpc8347et'/>
-  <cpu type='kvm' name='7441_v2.10'/>
-  <cpu type='kvm' name='603e_v1.4'/>
-  <cpu type='kvm' name='mpc8543_v10'/>
-  <cpu type='kvm' name='401c2'/>
-  <cpu type='kvm' name='7451_v2.10'/>
-  <cpu type='kvm' name='750cx_v2.2'/>
-  <cpu type='kvm' name='mpc8543_v21'/>
-  <cpu type='kvm' name='603e7'/>
-  <cpu type='kvm' name='7448_v2.1'/>
-  <cpu type='kvm' name='7441_v2.3'/>
-  <cpu type='kvm' name='405crb'/>
-  <cpu type='kvm' name='604'/>
-  <cpu type='kvm' name='7400_v2.1'/>
-  <cpu type='kvm' name='440-xilinx-w-dfpu'/>
-  <cpu type='kvm' name='7445_v2.1'/>
-  <cpu type='kvm' name='cobra'/>
-  <cpu type='kvm' name='e500_v20'/>
-  <cpu type='kvm' name='mpc8541_v11'/>
-  <cpu type='kvm' name='750gx_v1.1'/>
-  <cpu type='kvm' name='750cxe_v2.4'/>
-  <cpu type='kvm' name='mpc8641d'/>
-  <cpu type='kvm' name='mpc8543e_v21'/>
-  <cpu type='kvm' name='750l_v2.1'/>
-  <cpu type='kvm' name='7457_v1.0'/>
-  <cpu type='kvm' name='7450_v1.2'/>
-  <cpu type='kvm' name='755_v2.5'/>
-  <cpu type='kvm' name='7410_v1.3'/>
-  <cpu type='kvm' name='745_v2.3'/>
-  <cpu type='kvm' name='755_v2.0'/>
-  <cpu type='kvm' name='e500v2_v30'/>
-  <cpu type='kvm' name='7455_v3.3'/>
-  <cpu type='kvm' name='mpc8540_v20'/>
-  <cpu type='kvm' name='405d2'/>
-  <cpu type='kvm' name='mpc8560_v21'/>
-  <cpu type='kvm' name='mpc8343'/>
-  <cpu type='kvm' name='mpc8548_v20'/>
-  <cpu type='kvm' name='mpc8347t'/>
-  <cpu type='kvm' name='755_v1.0'/>
-  <cpu type='kvm' name='603e_v1.3'/>
-  <cpu type='kvm' name='host'/>
-  <cpu type='kvm' name='mpc8543e_v10'/>
-  <cpu type='kvm' name='mpc8347eap'/>
-  <cpu type='kvm' name='mpc8548e_v11'/>
-  <cpu type='kvm' name='mpc8543_v20'/>
-  <cpu type='kvm' name='401d2'/>
-  <cpu type='kvm' name='power8_v2.0'/>
-  <cpu type='kvm' name='740_v3.1'/>
-  <cpu type='kvm' name='e200z5'/>
-  <cpu type='kvm' name='405cra'/>
-  <cpu type='kvm' name='7400_v2.0'/>
-  <cpu type='kvm' name='750cxe_v2.3'/>
-  <cpu type='kvm' name='745_v2.7'/>
-  <cpu type='kvm' name='mpc8560_v10'/>
-  <cpu type='kvm' name='e5500'/>
-  <cpu type='kvm' name='mpc8544_v11'/>
-  <cpu type='kvm' name='7448_v1.0'/>
-  <cpu type='kvm' name='401e2'/>
-  <cpu type='kvm' name='740_v2.1'/>
-  <cpu type='kvm' name='745_v2.2'/>
-  <cpu type='kvm' name='7400_v1.0'/>
-  <cpu type='kvm' name='7410_v1.2'/>
-  <cpu type='kvm' name='x2vp4'/>
-  <cpu type='kvm' name='mpc8347ap'/>
-  <cpu type='kvm' name='mpc8533_v11'/>
-  <cpu type='kvm' name='mpc5200b_v21'/>
-  <cpu type='kvm' name='750fx_v2.3'/>
-  <cpu type='kvm' name='601_v2'/>
-  <cpu type='kvm' name='g2legp3'/>
-  <cpu type='kvm' name='604e_v1.0'/>
-  <cpu type='kvm' name='750cx_v2.1'/>
-  <cpu type='kvm' name='mpc8610'/>
-  <cpu type='kvm' name='g2h4'/>
-  <cpu type='kvm' name='750l_v3.0'/>
-  <cpu type='kvm' name='mpc8377e'/>
-  <cpu type='kvm' name='e300c4'/>
-  <cpu type='kvm' name='mpc5200_v12'/>
-  <cpu type='kvm' name='7448_v2.0'/>
-  <cpu type='kvm' name='7450_v2.1'/>
-  <cpu type='kvm' name='750cxe_v3.1b'/>
-  <cpu type='kvm' name='g2'/>
-  <cpu type='kvm' name='7400_v2.9'/>
-  <cpu type='kvm' name='405gpd'/>
-  <cpu type='kvm' name='603'/>
-  <cpu type='kvm' name='603e7t'/>
-  <cpu type='kvm' name='mpc8555_v11'/>
-  <cpu type='kvm' name='750gx_v1.0'/>
-  <cpu type='kvm' name='mpc8541_v10'/>
-  <cpu type='kvm' name='mpc8543e_v20'/>
-  <cpu type='kvm' name='750fl'/>
-  <cpu type='kvm' name='750l_v2.0'/>
-  <cpu type='kvm' name='stb04'/>
-  <cpu type='kvm' name='mpc8548e_v21'/>
-  <cpu type='kvm' name='x2vp20'/>
-  <cpu type='kvm' name='405ez'/>
-  <cpu type='kvm' name='e600'/>
-  <cpu type='kvm' name='7450_v1.1'/>
-  <cpu type='kvm' name='755_v2.4'/>
-  <cpu type='kvm' name='mpc8379'/>
-  <cpu type='kvm' name='7445_v1.0'/>
-  <cpu type='kvm' name='7447_v1.1'/>
-  <cpu type='kvm' name='603e_v2.2'/>
-  <cpu type='kvm' name='603e_v4'/>
-  <cpu type='kvm' name='g2legp'/>
-  <cpu type='kvm' name='7455_v3.2'/>
-  <cpu type='kvm' name='740_v2.0'/>
-  <cpu type='kvm' name='mpc8560_v20'/>
-  <cpu type='kvm' name='440-xilinx'/>
-  <cpu type='kvm' name='401f2'/>
-  <cpu type='kvm' name='mpc8533_v10'/>
-  <cpu type='kvm' name='405gpr'/>
-  <cpu type='kvm' name='mpc8349a'/>
-  <cpu type='kvm' name='stb25'/>
-  <cpu type='kvm' name='603e_v1.2'/>
-  <cpu type='kvm' name='mpc5200b_v20'/>
-  <cpu type='kvm' name='750fx_v2.2'/>
-  <cpu type='kvm' name='mpc8347eat'/>
-  <cpu type='kvm' name='740_v1.0'/>
-  <cpu type='kvm' name='601_v1'/>
-  <cpu type='kvm' name='745_v1.1'/>
-  <cpu type='kvm' name='750cx_v2.0'/>
-  <cpu type='kvm' name='mpc8548e_v10'/>
-  <cpu type='kvm' name='7447a_v1.2'/>
-  <cpu type='kvm' name='403gc'/>
-  <cpu type='kvm' name='e300c3'/>
-  <cpu type='kvm' name='mpc5200_v11'/>
-  <cpu type='kvm' name='7441_v2.1'/>
-  <cpu type='kvm' name='740_v3.0'/>
-  <cpu type='kvm' name='mpc8545e_v21'/>
-  <cpu type='kvm' name='602'/>
-  <cpu type='kvm' name='mpc8378e'/>
-  <cpu type='kvm' name='mpc8343a'/>
-  <cpu type='kvm' name='460exb'/>
-  <cpu type='kvm' name='mpc8555_v10'/>
-  <cpu type='kvm' name='mpc8568'/>
-  <cpu type='kvm' name='7457a_v1.2'/>
-  <cpu type='kvm' name='750cx_v1.0'/>
-  <cpu type='kvm' name='750cxe_v2.2'/>
-  <cpu type='kvm' name='604e_v2.4'/>
-  <cpu type='kvm' name='755_v2.8'/>
-  <cpu type='kvm' name='405lp'/>
-  <cpu type='kvm' name='745_v2.6'/>
-  <cpu type='kvm' name='stb03'/>
-  <cpu type='kvm' name='405ep'/>
-  <cpu type='kvm' name='mpc8544_v10'/>
-  <cpu type='kvm' name='mpc8347at'/>
-  <cpu type='kvm' name='750_v2.2'/>
-  <cpu type='kvm' name='7450_v1.0'/>
-  <cpu type='kvm' name='755_v2.3'/>
-  <cpu type='kvm' name='7410_v1.1'/>
-  <cpu type='kvm' name='745_v2.1'/>
-  <cpu type='kvm' name='750gl'/>
-  <cpu type='kvm' name='e6500'/>
-  <cpu type='kvm' name='750p'/>
-  <cpu type='kvm' name='7445_v3.4'/>
-  <cpu type='kvm' name='440epb'/>
-  <cpu type='kvm' name='npe4gs3'/>
-  <cpu type='kvm' name='603e_v3'/>
-  <cpu type='kvm' name='mpc8349e'/>
-  <cpu type='kvm' name='970_v2.2'/>
-  <cpu type='kvm' name='g2lels'/>
-  <cpu type='kvm' name='g2hip4'/>
-  <cpu type='kvm' name='740p'/>
-  <cpu type='kvm' name='mpc8567e'/>
-  <cpu type='kvm' name='mpc8533e_v11'/>
-  <cpu type='kvm' name='7451_v2.3'/>
-  <cpu type='kvm' name='603e_v1.1'/>
-  <cpu type='kvm' name='401g2'/>
-  <cpu type='kvm' name='7400_v2.8'/>
-  <cpu type='kvm' name='7455_v2.1'/>
-  <cpu type='kvm' name='405gpc'/>
-  <cpu type='kvm' name='power7+_v2.1'/>
-  <cpu type='kvm' name='mpc8544e_v11'/>
-  <cpu type='kvm' name='7450_v2.0'/>
-  <cpu type='kvm' name='970mp_v1.1'/>
-  <cpu type='kvm' name='603e7v2'/>
-  <cpu type='kvm' name='604r'/>
-  <cpu type='kvm' name='e500v2_v22'/>
-  <cpu type='kvm' name='mpc8548e_v20'/>
-  <cpu type='kvm' name='mpc8545e_v20'/>
-  <cpu type='kvm' name='mpc8378'/>
-  <cpu type='kvm' name='mpc8567'/>
-  <cpu type='kvm' name='7457_v1.2'/>
-  <cpu type='kvm' name='7447_v1.0'/>
-  <cpu type='kvm' name='970fx_v3.1'/>
-  <cpu type='kvm' name='745_v2.5'/>
-  <cpu type='kvm' name='mpc8379e'/>
-  <cpu type='kvm' name='mpc8641'/>
-  <cpu type='kvm' name='750cxe_v2.4b'/>
-  <cpu type='kvm' name='7410_v1.0'/>
-  <cpu type='kvm' name='mpc603'/>
-  <cpu type='kvm' name='603e_v4.1'/>
-  <cpu type='kvm' name='7445_v3.3'/>
-  <cpu type='kvm' name='440epa'/>
-  <cpu type='kvm' name='970fx_v2.1'/>
-  <cpu type='kvm' name='iop480'/>
-  <cpu type='kvm' name='750fx_v2.1'/>
-  <cpu type='kvm' name='601_v0'/>
-  <cpu type='kvm' name='g2legp1'/>
-  <cpu type='kvm' name='745_v1.0'/>
-  <cpu type='kvm' name='750cl_v2.0'/>
-  <cpu type='kvm' name='750cxr'/>
-  <cpu type='kvm' name='401'/>
-  <cpu type='kvm' name='mpc8541e_v11'/>
-  <cpu type='kvm' name='750cxe_v3.1'/>
-  <cpu type='kvm' name='mpc8555e_v11'/>
-  <cpu type='kvm' name='power5+_v2.1'/>
-  <cpu type='kvm' name='7447a_v1.1'/>
-  <cpu type='kvm' name='403gb'/>
-  <cpu type='kvm' name='e300c2'/>
-  <cpu type='kvm' name='npe405h2'/>
-  <cpu type='kvm' name='mpc8343e'/>
-  <cpu type='kvm' name='mpc8533e_v10'/>
-  <cpu type='kvm' name='mpc5200_v10'/>
-  <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='mpc8547e_v21'/>
-  <cpu type='tcg' name='750cl_v1.0'/>
-  <cpu type='tcg' name='7457a_v1.1'/>
-  <cpu type='tcg' name='g2gp'/>
-  <cpu type='tcg' name='750cxe_v2.1'/>
-  <cpu type='tcg' name='755_v2.7'/>
-  <cpu type='tcg' name='750_v2.1'/>
-  <cpu type='tcg' name='755_v2.2'/>
-  <cpu type='tcg' name='745_v2.0'/>
-  <cpu type='tcg' name='mpc8377'/>
-  <cpu type='tcg' name='7455_v1.0'/>
-  <cpu type='tcg' name='mpc8545_v21'/>
-  <cpu type='tcg' name='mpc8548_v11'/>
-  <cpu type='tcg' name='405d4'/>
-  <cpu type='tcg' name='g2le'/>
-  <cpu type='tcg' name='g2hip3'/>
-  <cpu type='tcg' name='750e'/>
-  <cpu type='tcg' name='mpc8572'/>
-  <cpu type='tcg' name='970fx_v2.0'/>
-  <cpu type='tcg' name='750fx_v2.0'/>
-  <cpu type='tcg' name='603p'/>
-  <cpu type='tcg' name='405gpb'/>
-  <cpu type='tcg' name='7400_v2.7'/>
-  <cpu type='tcg' name='mpc8544e_v10'/>
-  <cpu type='tcg' name='e500v2_v10'/>
-  <cpu type='tcg' name='e500mc'/>
-  <cpu type='tcg' name='603e7v1'/>
-  <cpu type='tcg' name='970mp_v1.0'/>
-  <cpu type='tcg' name='740e'/>
-  <cpu type='tcg' name='405crc'/>
-  <cpu type='tcg' name='403ga'/>
-  <cpu type='tcg' name='7447a_v1.0'/>
-  <cpu type='tcg' name='7400_v2.2'/>
-  <cpu type='tcg' name='e300c1'/>
-  <cpu type='tcg' name='mpc8572e'/>
-  <cpu type='tcg' name='e500v2_v21'/>
-  <cpu type='tcg' name='970fx_v1.0'/>
-  <cpu type='tcg' name='750gx_v1.2'/>
-  <cpu type='tcg' name='750fx_v1.0'/>
-  <cpu type='tcg' name='7457_v1.1'/>
-  <cpu type='tcg' name='970fx_v3.0'/>
-  <cpu type='tcg' name='604e_v2.2'/>
-  <cpu type='tcg' name='755_v2.6'/>
-  <cpu type='tcg' name='401a1'/>
-  <cpu type='tcg' name='power9_v1.0'/>
-  <cpu type='tcg' name='npe405h'/>
-  <cpu type='tcg' name='7410_v1.4'/>
-  <cpu type='tcg' name='g2ls'/>
-  <cpu type='tcg' name='750_v2.0'/>
-  <cpu type='tcg' name='401b2'/>
-  <cpu type='tcg' name='mpc8349'/>
-  <cpu type='tcg' name='mpc8347ep'/>
-  <cpu type='tcg' name='7445_v3.2'/>
-  <cpu type='tcg' name='mpc8540_v21'/>
-  <cpu type='tcg' name='mpc8543_v11'/>
-  <cpu type='tcg' name='403gcx'/>
-  <cpu type='tcg' name='745_v2.4'/>
-  <cpu type='tcg' name='mpc8548_v21'/>
-  <cpu type='tcg' name='750l_v3.2'/>
-  <cpu type='tcg' name='750_v1.0'/>
-  <cpu type='tcg' name='755_v1.1'/>
-  <cpu type='tcg' name='e500_v10'/>
-  <cpu type='tcg' name='750cxe_v3.0'/>
-  <cpu type='tcg' name='mpc8541e_v10'/>
-  <cpu type='tcg' name='mpc8347p'/>
-  <cpu type='tcg' name='mpc8555e_v10'/>
-  <cpu type='tcg' name='power9_v2.0'/>
-  <cpu type='tcg' name='power7_v2.3'/>
-  <cpu type='tcg' name='603e7v'/>
-  <cpu type='tcg' name='mpc8543e_v11'/>
-  <cpu type='tcg' name='750_v3.0'/>
-  <cpu type='tcg' name='7400_v2.6'/>
-  <cpu type='tcg' name='405gpa'/>
-  <cpu type='tcg' name='440epx'/>
-  <cpu type='tcg' name='750l_v2.2'/>
-  <cpu type='tcg' name='e200z6'/>
-  <cpu type='tcg' name='mpc8547e_v20'/>
-  <cpu type='tcg' name='7457a_v1.0'/>
-  <cpu type='tcg' name='mpc8349ea'/>
-  <cpu type='tcg' name='e500v2_v20'/>
-  <cpu type='tcg' name='power8nvl_v1.0'/>
-  <cpu type='tcg' name='mpc8540_v10'/>
-  <cpu type='tcg' name='755_v2.1'/>
-  <cpu type='tcg' name='745_v2.8'/>
-  <cpu type='tcg' name='npe405l'/>
-  <cpu type='tcg' name='mpc8343ea'/>
-  <cpu type='tcg' name='mpc8545_v20'/>
-  <cpu type='tcg' name='mpc8548_v10'/>
-  <cpu type='tcg' name='7448_v1.1'/>
-  <cpu type='tcg' name='7455_v3.4'/>
-  <cpu type='tcg' name='740_v2.2'/>
-  <cpu type='tcg' name='7400_v1.1'/>
-  <cpu type='tcg' name='mpc8347et'/>
-  <cpu type='tcg' name='7441_v2.10'/>
-  <cpu type='tcg' name='603e_v1.4'/>
-  <cpu type='tcg' name='mpc8543_v10'/>
-  <cpu type='tcg' name='401c2'/>
-  <cpu type='tcg' name='7451_v2.10'/>
-  <cpu type='tcg' name='750cx_v2.2'/>
-  <cpu type='tcg' name='mpc8543_v21'/>
-  <cpu type='tcg' name='603e7'/>
-  <cpu type='tcg' name='7448_v2.1'/>
-  <cpu type='tcg' name='7441_v2.3'/>
-  <cpu type='tcg' name='405crb'/>
-  <cpu type='tcg' name='604'/>
-  <cpu type='tcg' name='7400_v2.1'/>
-  <cpu type='tcg' name='440-xilinx-w-dfpu'/>
-  <cpu type='tcg' name='7445_v2.1'/>
-  <cpu type='tcg' name='cobra'/>
-  <cpu type='tcg' name='e500_v20'/>
-  <cpu type='tcg' name='mpc8541_v11'/>
-  <cpu type='tcg' name='750gx_v1.1'/>
-  <cpu type='tcg' name='750cxe_v2.4'/>
-  <cpu type='tcg' name='mpc8641d'/>
-  <cpu type='tcg' name='mpc8543e_v21'/>
-  <cpu type='tcg' name='750l_v2.1'/>
-  <cpu type='tcg' name='7457_v1.0'/>
-  <cpu type='tcg' name='7450_v1.2'/>
-  <cpu type='tcg' name='755_v2.5'/>
-  <cpu type='tcg' name='7410_v1.3'/>
-  <cpu type='tcg' name='745_v2.3'/>
-  <cpu type='tcg' name='755_v2.0'/>
-  <cpu type='tcg' name='e500v2_v30'/>
-  <cpu type='tcg' name='7455_v3.3'/>
-  <cpu type='tcg' name='mpc8540_v20'/>
-  <cpu type='tcg' name='405d2'/>
-  <cpu type='tcg' name='mpc8560_v21'/>
-  <cpu type='tcg' name='mpc8343'/>
-  <cpu type='tcg' name='mpc8548_v20'/>
-  <cpu type='tcg' name='mpc8347t'/>
-  <cpu type='tcg' name='755_v1.0'/>
-  <cpu type='tcg' name='603e_v1.3'/>
-  <cpu type='tcg' name='mpc8543e_v10'/>
-  <cpu type='tcg' name='mpc8347eap'/>
-  <cpu type='tcg' name='mpc8548e_v11'/>
-  <cpu type='tcg' name='mpc8543_v20'/>
-  <cpu type='tcg' name='401d2'/>
-  <cpu type='tcg' name='power8_v2.0'/>
-  <cpu type='tcg' name='740_v3.1'/>
-  <cpu type='tcg' name='e200z5'/>
-  <cpu type='tcg' name='405cra'/>
-  <cpu type='tcg' name='7400_v2.0'/>
-  <cpu type='tcg' name='750cxe_v2.3'/>
-  <cpu type='tcg' name='745_v2.7'/>
-  <cpu type='tcg' name='mpc8560_v10'/>
-  <cpu type='tcg' name='e5500'/>
-  <cpu type='tcg' name='mpc8544_v11'/>
-  <cpu type='tcg' name='7448_v1.0'/>
-  <cpu type='tcg' name='401e2'/>
-  <cpu type='tcg' name='740_v2.1'/>
-  <cpu type='tcg' name='745_v2.2'/>
-  <cpu type='tcg' name='7400_v1.0'/>
-  <cpu type='tcg' name='7410_v1.2'/>
-  <cpu type='tcg' name='x2vp4'/>
-  <cpu type='tcg' name='mpc8347ap'/>
-  <cpu type='tcg' name='mpc8533_v11'/>
-  <cpu type='tcg' name='mpc5200b_v21'/>
-  <cpu type='tcg' name='750fx_v2.3'/>
-  <cpu type='tcg' name='601_v2'/>
-  <cpu type='tcg' name='g2legp3'/>
-  <cpu type='tcg' name='604e_v1.0'/>
-  <cpu type='tcg' name='750cx_v2.1'/>
-  <cpu type='tcg' name='mpc8610'/>
-  <cpu type='tcg' name='g2h4'/>
-  <cpu type='tcg' name='750l_v3.0'/>
-  <cpu type='tcg' name='mpc8377e'/>
-  <cpu type='tcg' name='e300c4'/>
-  <cpu type='tcg' name='mpc5200_v12'/>
-  <cpu type='tcg' name='7448_v2.0'/>
-  <cpu type='tcg' name='7450_v2.1'/>
-  <cpu type='tcg' name='750cxe_v3.1b'/>
-  <cpu type='tcg' name='g2'/>
-  <cpu type='tcg' name='7400_v2.9'/>
-  <cpu type='tcg' name='405gpd'/>
-  <cpu type='tcg' name='603'/>
-  <cpu type='tcg' name='603e7t'/>
-  <cpu type='tcg' name='mpc8555_v11'/>
-  <cpu type='tcg' name='750gx_v1.0'/>
-  <cpu type='tcg' name='mpc8541_v10'/>
-  <cpu type='tcg' name='mpc8543e_v20'/>
-  <cpu type='tcg' name='750fl'/>
-  <cpu type='tcg' name='750l_v2.0'/>
-  <cpu type='tcg' name='stb04'/>
-  <cpu type='tcg' name='mpc8548e_v21'/>
-  <cpu type='tcg' name='x2vp20'/>
-  <cpu type='tcg' name='405ez'/>
-  <cpu type='tcg' name='e600'/>
-  <cpu type='tcg' name='7450_v1.1'/>
-  <cpu type='tcg' name='755_v2.4'/>
-  <cpu type='tcg' name='mpc8379'/>
-  <cpu type='tcg' name='7445_v1.0'/>
-  <cpu type='tcg' name='7447_v1.1'/>
-  <cpu type='tcg' name='603e_v2.2'/>
-  <cpu type='tcg' name='603e_v4'/>
-  <cpu type='tcg' name='g2legp'/>
-  <cpu type='tcg' name='7455_v3.2'/>
-  <cpu type='tcg' name='740_v2.0'/>
-  <cpu type='tcg' name='mpc8560_v20'/>
-  <cpu type='tcg' name='440-xilinx'/>
-  <cpu type='tcg' name='401f2'/>
-  <cpu type='tcg' name='mpc8533_v10'/>
-  <cpu type='tcg' name='405gpr'/>
-  <cpu type='tcg' name='mpc8349a'/>
-  <cpu type='tcg' name='stb25'/>
-  <cpu type='tcg' name='603e_v1.2'/>
-  <cpu type='tcg' name='mpc5200b_v20'/>
-  <cpu type='tcg' name='750fx_v2.2'/>
-  <cpu type='tcg' name='mpc8347eat'/>
-  <cpu type='tcg' name='740_v1.0'/>
-  <cpu type='tcg' name='601_v1'/>
-  <cpu type='tcg' name='745_v1.1'/>
-  <cpu type='tcg' name='750cx_v2.0'/>
-  <cpu type='tcg' name='mpc8548e_v10'/>
-  <cpu type='tcg' name='7447a_v1.2'/>
-  <cpu type='tcg' name='403gc'/>
-  <cpu type='tcg' name='e300c3'/>
-  <cpu type='tcg' name='mpc5200_v11'/>
-  <cpu type='tcg' name='7441_v2.1'/>
-  <cpu type='tcg' name='740_v3.0'/>
-  <cpu type='tcg' name='mpc8545e_v21'/>
-  <cpu type='tcg' name='602'/>
-  <cpu type='tcg' name='mpc8378e'/>
-  <cpu type='tcg' name='mpc8343a'/>
-  <cpu type='tcg' name='460exb'/>
-  <cpu type='tcg' name='mpc8555_v10'/>
-  <cpu type='tcg' name='mpc8568'/>
-  <cpu type='tcg' name='7457a_v1.2'/>
-  <cpu type='tcg' name='750cx_v1.0'/>
-  <cpu type='tcg' name='750cxe_v2.2'/>
-  <cpu type='tcg' name='604e_v2.4'/>
-  <cpu type='tcg' name='755_v2.8'/>
-  <cpu type='tcg' name='405lp'/>
-  <cpu type='tcg' name='745_v2.6'/>
-  <cpu type='tcg' name='stb03'/>
-  <cpu type='tcg' name='405ep'/>
-  <cpu type='tcg' name='mpc8544_v10'/>
-  <cpu type='tcg' name='mpc8347at'/>
-  <cpu type='tcg' name='750_v2.2'/>
-  <cpu type='tcg' name='7450_v1.0'/>
-  <cpu type='tcg' name='755_v2.3'/>
-  <cpu type='tcg' name='7410_v1.1'/>
-  <cpu type='tcg' name='745_v2.1'/>
-  <cpu type='tcg' name='750gl'/>
-  <cpu type='tcg' name='e6500'/>
-  <cpu type='tcg' name='750p'/>
-  <cpu type='tcg' name='7445_v3.4'/>
-  <cpu type='tcg' name='440epb'/>
-  <cpu type='tcg' name='npe4gs3'/>
-  <cpu type='tcg' name='603e_v3'/>
-  <cpu type='tcg' name='mpc8349e'/>
-  <cpu type='tcg' name='970_v2.2'/>
-  <cpu type='tcg' name='g2lels'/>
-  <cpu type='tcg' name='g2hip4'/>
-  <cpu type='tcg' name='740p'/>
-  <cpu type='tcg' name='mpc8567e'/>
-  <cpu type='tcg' name='mpc8533e_v11'/>
-  <cpu type='tcg' name='7451_v2.3'/>
-  <cpu type='tcg' name='603e_v1.1'/>
-  <cpu type='tcg' name='401g2'/>
-  <cpu type='tcg' name='7400_v2.8'/>
-  <cpu type='tcg' name='7455_v2.1'/>
-  <cpu type='tcg' name='405gpc'/>
-  <cpu type='tcg' name='power7+_v2.1'/>
-  <cpu type='tcg' name='mpc8544e_v11'/>
-  <cpu type='tcg' name='7450_v2.0'/>
-  <cpu type='tcg' name='970mp_v1.1'/>
-  <cpu type='tcg' name='603e7v2'/>
-  <cpu type='tcg' name='604r'/>
-  <cpu type='tcg' name='e500v2_v22'/>
-  <cpu type='tcg' name='mpc8548e_v20'/>
-  <cpu type='tcg' name='mpc8545e_v20'/>
-  <cpu type='tcg' name='mpc8378'/>
-  <cpu type='tcg' name='mpc8567'/>
-  <cpu type='tcg' name='7457_v1.2'/>
-  <cpu type='tcg' name='7447_v1.0'/>
-  <cpu type='tcg' name='970fx_v3.1'/>
-  <cpu type='tcg' name='745_v2.5'/>
-  <cpu type='tcg' name='mpc8379e'/>
-  <cpu type='tcg' name='mpc8641'/>
-  <cpu type='tcg' name='750cxe_v2.4b'/>
-  <cpu type='tcg' name='7410_v1.0'/>
-  <cpu type='tcg' name='mpc603'/>
-  <cpu type='tcg' name='603e_v4.1'/>
-  <cpu type='tcg' name='7445_v3.3'/>
-  <cpu type='tcg' name='440epa'/>
-  <cpu type='tcg' name='970fx_v2.1'/>
-  <cpu type='tcg' name='iop480'/>
-  <cpu type='tcg' name='750fx_v2.1'/>
-  <cpu type='tcg' name='601_v0'/>
-  <cpu type='tcg' name='g2legp1'/>
-  <cpu type='tcg' name='745_v1.0'/>
-  <cpu type='tcg' name='750cl_v2.0'/>
-  <cpu type='tcg' name='750cxr'/>
-  <cpu type='tcg' name='401'/>
-  <cpu type='tcg' name='mpc8541e_v11'/>
-  <cpu type='tcg' name='750cxe_v3.1'/>
-  <cpu type='tcg' name='mpc8555e_v11'/>
-  <cpu type='tcg' name='power5+_v2.1'/>
-  <cpu type='tcg' name='7447a_v1.1'/>
-  <cpu type='tcg' name='403gb'/>
-  <cpu type='tcg' name='e300c2'/>
-  <cpu type='tcg' name='npe405h2'/>
-  <cpu type='tcg' name='mpc8343e'/>
-  <cpu type='tcg' name='mpc8533e_v10'/>
-  <cpu type='tcg' name='mpc5200_v10'/>
-  <cpu type='tcg' name='750_v3.1'/>
-  <cpu type='tcg' name='power8e_v2.1'/>
-  <cpu type='tcg' name='mpc8568e'/>
+  <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' typename=''/>
+  <cpu type='kvm' name='750cl_v1.0' typename=''/>
+  <cpu type='kvm' name='7457a_v1.1' typename=''/>
+  <cpu type='kvm' name='g2gp' typename=''/>
+  <cpu type='kvm' name='750cxe_v2.1' typename=''/>
+  <cpu type='kvm' name='755_v2.7' typename=''/>
+  <cpu type='kvm' name='750_v2.1' typename=''/>
+  <cpu type='kvm' name='755_v2.2' typename=''/>
+  <cpu type='kvm' name='745_v2.0' typename=''/>
+  <cpu type='kvm' name='mpc8377' typename=''/>
+  <cpu type='kvm' name='7455_v1.0' typename=''/>
+  <cpu type='kvm' name='mpc8545_v21' typename=''/>
+  <cpu type='kvm' name='mpc8548_v11' typename=''/>
+  <cpu type='kvm' name='405d4' typename=''/>
+  <cpu type='kvm' name='g2le' typename=''/>
+  <cpu type='kvm' name='g2hip3' typename=''/>
+  <cpu type='kvm' name='750e' typename=''/>
+  <cpu type='kvm' name='mpc8572' typename=''/>
+  <cpu type='kvm' name='970fx_v2.0' typename=''/>
+  <cpu type='kvm' name='750fx_v2.0' typename=''/>
+  <cpu type='kvm' name='603p' typename=''/>
+  <cpu type='kvm' name='405gpb' typename=''/>
+  <cpu type='kvm' name='7400_v2.7' typename=''/>
+  <cpu type='kvm' name='mpc8544e_v10' typename=''/>
+  <cpu type='kvm' name='e500v2_v10' typename=''/>
+  <cpu type='kvm' name='e500mc' typename=''/>
+  <cpu type='kvm' name='603e7v1' typename=''/>
+  <cpu type='kvm' name='970mp_v1.0' typename=''/>
+  <cpu type='kvm' name='740e' typename=''/>
+  <cpu type='kvm' name='405crc' typename=''/>
+  <cpu type='kvm' name='403ga' typename=''/>
+  <cpu type='kvm' name='7447a_v1.0' typename=''/>
+  <cpu type='kvm' name='7400_v2.2' typename=''/>
+  <cpu type='kvm' name='e300c1' typename=''/>
+  <cpu type='kvm' name='mpc8572e' typename=''/>
+  <cpu type='kvm' name='e500v2_v21' typename=''/>
+  <cpu type='kvm' name='970fx_v1.0' typename=''/>
+  <cpu type='kvm' name='750gx_v1.2' typename=''/>
+  <cpu type='kvm' name='750fx_v1.0' typename=''/>
+  <cpu type='kvm' name='7457_v1.1' typename=''/>
+  <cpu type='kvm' name='970fx_v3.0' typename=''/>
+  <cpu type='kvm' name='604e_v2.2' typename=''/>
+  <cpu type='kvm' name='755_v2.6' typename=''/>
+  <cpu type='kvm' name='401a1' typename=''/>
+  <cpu type='kvm' name='power9_v1.0' typename=''/>
+  <cpu type='kvm' name='npe405h' typename=''/>
+  <cpu type='kvm' name='7410_v1.4' typename=''/>
+  <cpu type='kvm' name='g2ls' typename=''/>
+  <cpu type='kvm' name='750_v2.0' typename=''/>
+  <cpu type='kvm' name='401b2' typename=''/>
+  <cpu type='kvm' name='mpc8349' typename=''/>
+  <cpu type='kvm' name='mpc8347ep' typename=''/>
+  <cpu type='kvm' name='7445_v3.2' typename=''/>
+  <cpu type='kvm' name='mpc8540_v21' typename=''/>
+  <cpu type='kvm' name='mpc8543_v11' typename=''/>
+  <cpu type='kvm' name='403gcx' typename=''/>
+  <cpu type='kvm' name='745_v2.4' typename=''/>
+  <cpu type='kvm' name='mpc8548_v21' typename=''/>
+  <cpu type='kvm' name='750l_v3.2' typename=''/>
+  <cpu type='kvm' name='750_v1.0' typename=''/>
+  <cpu type='kvm' name='755_v1.1' typename=''/>
+  <cpu type='kvm' name='e500_v10' typename=''/>
+  <cpu type='kvm' name='750cxe_v3.0' typename=''/>
+  <cpu type='kvm' name='mpc8541e_v10' typename=''/>
+  <cpu type='kvm' name='mpc8347p' typename=''/>
+  <cpu type='kvm' name='mpc8555e_v10' typename=''/>
+  <cpu type='kvm' name='power9_v2.0' typename=''/>
+  <cpu type='kvm' name='power7_v2.3' typename=''/>
+  <cpu type='kvm' name='603e7v' typename=''/>
+  <cpu type='kvm' name='mpc8543e_v11' typename=''/>
+  <cpu type='kvm' name='750_v3.0' typename=''/>
+  <cpu type='kvm' name='7400_v2.6' typename=''/>
+  <cpu type='kvm' name='405gpa' typename=''/>
+  <cpu type='kvm' name='440epx' typename=''/>
+  <cpu type='kvm' name='750l_v2.2' typename=''/>
+  <cpu type='kvm' name='e200z6' typename=''/>
+  <cpu type='kvm' name='mpc8547e_v20' typename=''/>
+  <cpu type='kvm' name='7457a_v1.0' typename=''/>
+  <cpu type='kvm' name='mpc8349ea' typename=''/>
+  <cpu type='kvm' name='e500v2_v20' typename=''/>
+  <cpu type='kvm' name='power8nvl_v1.0' typename=''/>
+  <cpu type='kvm' name='mpc8540_v10' typename=''/>
+  <cpu type='kvm' name='755_v2.1' typename=''/>
+  <cpu type='kvm' name='745_v2.8' typename=''/>
+  <cpu type='kvm' name='npe405l' typename=''/>
+  <cpu type='kvm' name='mpc8343ea' typename=''/>
+  <cpu type='kvm' name='mpc8545_v20' typename=''/>
+  <cpu type='kvm' name='mpc8548_v10' typename=''/>
+  <cpu type='kvm' name='7448_v1.1' typename=''/>
+  <cpu type='kvm' name='7455_v3.4' typename=''/>
+  <cpu type='kvm' name='740_v2.2' typename=''/>
+  <cpu type='kvm' name='7400_v1.1' typename=''/>
+  <cpu type='kvm' name='mpc8347et' typename=''/>
+  <cpu type='kvm' name='7441_v2.10' typename=''/>
+  <cpu type='kvm' name='603e_v1.4' typename=''/>
+  <cpu type='kvm' name='mpc8543_v10' typename=''/>
+  <cpu type='kvm' name='401c2' typename=''/>
+  <cpu type='kvm' name='7451_v2.10' typename=''/>
+  <cpu type='kvm' name='750cx_v2.2' typename=''/>
+  <cpu type='kvm' name='mpc8543_v21' typename=''/>
+  <cpu type='kvm' name='603e7' typename=''/>
+  <cpu type='kvm' name='7448_v2.1' typename=''/>
+  <cpu type='kvm' name='7441_v2.3' typename=''/>
+  <cpu type='kvm' name='405crb' typename=''/>
+  <cpu type='kvm' name='604' typename=''/>
+  <cpu type='kvm' name='7400_v2.1' typename=''/>
+  <cpu type='kvm' name='440-xilinx-w-dfpu' typename=''/>
+  <cpu type='kvm' name='7445_v2.1' typename=''/>
+  <cpu type='kvm' name='cobra' typename=''/>
+  <cpu type='kvm' name='e500_v20' typename=''/>
+  <cpu type='kvm' name='mpc8541_v11' typename=''/>
+  <cpu type='kvm' name='750gx_v1.1' typename=''/>
+  <cpu type='kvm' name='750cxe_v2.4' typename=''/>
+  <cpu type='kvm' name='mpc8641d' typename=''/>
+  <cpu type='kvm' name='mpc8543e_v21' typename=''/>
+  <cpu type='kvm' name='750l_v2.1' typename=''/>
+  <cpu type='kvm' name='7457_v1.0' typename=''/>
+  <cpu type='kvm' name='7450_v1.2' typename=''/>
+  <cpu type='kvm' name='755_v2.5' typename=''/>
+  <cpu type='kvm' name='7410_v1.3' typename=''/>
+  <cpu type='kvm' name='745_v2.3' typename=''/>
+  <cpu type='kvm' name='755_v2.0' typename=''/>
+  <cpu type='kvm' name='e500v2_v30' typename=''/>
+  <cpu type='kvm' name='7455_v3.3' typename=''/>
+  <cpu type='kvm' name='mpc8540_v20' typename=''/>
+  <cpu type='kvm' name='405d2' typename=''/>
+  <cpu type='kvm' name='mpc8560_v21' typename=''/>
+  <cpu type='kvm' name='mpc8343' typename=''/>
+  <cpu type='kvm' name='mpc8548_v20' typename=''/>
+  <cpu type='kvm' name='mpc8347t' typename=''/>
+  <cpu type='kvm' name='755_v1.0' typename=''/>
+  <cpu type='kvm' name='603e_v1.3' typename=''/>
+  <cpu type='kvm' name='host' typename=''/>
+  <cpu type='kvm' name='mpc8543e_v10' typename=''/>
+  <cpu type='kvm' name='mpc8347eap' typename=''/>
+  <cpu type='kvm' name='mpc8548e_v11' typename=''/>
+  <cpu type='kvm' name='mpc8543_v20' typename=''/>
+  <cpu type='kvm' name='401d2' typename=''/>
+  <cpu type='kvm' name='power8_v2.0' typename=''/>
+  <cpu type='kvm' name='740_v3.1' typename=''/>
+  <cpu type='kvm' name='e200z5' typename=''/>
+  <cpu type='kvm' name='405cra' typename=''/>
+  <cpu type='kvm' name='7400_v2.0' typename=''/>
+  <cpu type='kvm' name='750cxe_v2.3' typename=''/>
+  <cpu type='kvm' name='745_v2.7' typename=''/>
+  <cpu type='kvm' name='mpc8560_v10' typename=''/>
+  <cpu type='kvm' name='e5500' typename=''/>
+  <cpu type='kvm' name='mpc8544_v11' typename=''/>
+  <cpu type='kvm' name='7448_v1.0' typename=''/>
+  <cpu type='kvm' name='401e2' typename=''/>
+  <cpu type='kvm' name='740_v2.1' typename=''/>
+  <cpu type='kvm' name='745_v2.2' typename=''/>
+  <cpu type='kvm' name='7400_v1.0' typename=''/>
+  <cpu type='kvm' name='7410_v1.2' typename=''/>
+  <cpu type='kvm' name='x2vp4' typename=''/>
+  <cpu type='kvm' name='mpc8347ap' typename=''/>
+  <cpu type='kvm' name='mpc8533_v11' typename=''/>
+  <cpu type='kvm' name='mpc5200b_v21' typename=''/>
+  <cpu type='kvm' name='750fx_v2.3' typename=''/>
+  <cpu type='kvm' name='601_v2' typename=''/>
+  <cpu type='kvm' name='g2legp3' typename=''/>
+  <cpu type='kvm' name='604e_v1.0' typename=''/>
+  <cpu type='kvm' name='750cx_v2.1' typename=''/>
+  <cpu type='kvm' name='mpc8610' typename=''/>
+  <cpu type='kvm' name='g2h4' typename=''/>
+  <cpu type='kvm' name='750l_v3.0' typename=''/>
+  <cpu type='kvm' name='mpc8377e' typename=''/>
+  <cpu type='kvm' name='e300c4' typename=''/>
+  <cpu type='kvm' name='mpc5200_v12' typename=''/>
+  <cpu type='kvm' name='7448_v2.0' typename=''/>
+  <cpu type='kvm' name='7450_v2.1' typename=''/>
+  <cpu type='kvm' name='750cxe_v3.1b' typename=''/>
+  <cpu type='kvm' name='g2' typename=''/>
+  <cpu type='kvm' name='7400_v2.9' typename=''/>
+  <cpu type='kvm' name='405gpd' typename=''/>
+  <cpu type='kvm' name='603' typename=''/>
+  <cpu type='kvm' name='603e7t' typename=''/>
+  <cpu type='kvm' name='mpc8555_v11' typename=''/>
+  <cpu type='kvm' name='750gx_v1.0' typename=''/>
+  <cpu type='kvm' name='mpc8541_v10' typename=''/>
+  <cpu type='kvm' name='mpc8543e_v20' typename=''/>
+  <cpu type='kvm' name='750fl' typename=''/>
+  <cpu type='kvm' name='750l_v2.0' typename=''/>
+  <cpu type='kvm' name='stb04' typename=''/>
+  <cpu type='kvm' name='mpc8548e_v21' typename=''/>
+  <cpu type='kvm' name='x2vp20' typename=''/>
+  <cpu type='kvm' name='405ez' typename=''/>
+  <cpu type='kvm' name='e600' typename=''/>
+  <cpu type='kvm' name='7450_v1.1' typename=''/>
+  <cpu type='kvm' name='755_v2.4' typename=''/>
+  <cpu type='kvm' name='mpc8379' typename=''/>
+  <cpu type='kvm' name='7445_v1.0' typename=''/>
+  <cpu type='kvm' name='7447_v1.1' typename=''/>
+  <cpu type='kvm' name='603e_v2.2' typename=''/>
+  <cpu type='kvm' name='603e_v4' typename=''/>
+  <cpu type='kvm' name='g2legp' typename=''/>
+  <cpu type='kvm' name='7455_v3.2' typename=''/>
+  <cpu type='kvm' name='740_v2.0' typename=''/>
+  <cpu type='kvm' name='mpc8560_v20' typename=''/>
+  <cpu type='kvm' name='440-xilinx' typename=''/>
+  <cpu type='kvm' name='401f2' typename=''/>
+  <cpu type='kvm' name='mpc8533_v10' typename=''/>
+  <cpu type='kvm' name='405gpr' typename=''/>
+  <cpu type='kvm' name='mpc8349a' typename=''/>
+  <cpu type='kvm' name='stb25' typename=''/>
+  <cpu type='kvm' name='603e_v1.2' typename=''/>
+  <cpu type='kvm' name='mpc5200b_v20' typename=''/>
+  <cpu type='kvm' name='750fx_v2.2' typename=''/>
+  <cpu type='kvm' name='mpc8347eat' typename=''/>
+  <cpu type='kvm' name='740_v1.0' typename=''/>
+  <cpu type='kvm' name='601_v1' typename=''/>
+  <cpu type='kvm' name='745_v1.1' typename=''/>
+  <cpu type='kvm' name='750cx_v2.0' typename=''/>
+  <cpu type='kvm' name='mpc8548e_v10' typename=''/>
+  <cpu type='kvm' name='7447a_v1.2' typename=''/>
+  <cpu type='kvm' name='403gc' typename=''/>
+  <cpu type='kvm' name='e300c3' typename=''/>
+  <cpu type='kvm' name='mpc5200_v11' typename=''/>
+  <cpu type='kvm' name='7441_v2.1' typename=''/>
+  <cpu type='kvm' name='740_v3.0' typename=''/>
+  <cpu type='kvm' name='mpc8545e_v21' typename=''/>
+  <cpu type='kvm' name='602' typename=''/>
+  <cpu type='kvm' name='mpc8378e' typename=''/>
+  <cpu type='kvm' name='mpc8343a' typename=''/>
+  <cpu type='kvm' name='460exb' typename=''/>
+  <cpu type='kvm' name='mpc8555_v10' typename=''/>
+  <cpu type='kvm' name='mpc8568' typename=''/>
+  <cpu type='kvm' name='7457a_v1.2' typename=''/>
+  <cpu type='kvm' name='750cx_v1.0' typename=''/>
+  <cpu type='kvm' name='750cxe_v2.2' typename=''/>
+  <cpu type='kvm' name='604e_v2.4' typename=''/>
+  <cpu type='kvm' name='755_v2.8' typename=''/>
+  <cpu type='kvm' name='405lp' typename=''/>
+  <cpu type='kvm' name='745_v2.6' typename=''/>
+  <cpu type='kvm' name='stb03' typename=''/>
+  <cpu type='kvm' name='405ep' typename=''/>
+  <cpu type='kvm' name='mpc8544_v10' typename=''/>
+  <cpu type='kvm' name='mpc8347at' typename=''/>
+  <cpu type='kvm' name='750_v2.2' typename=''/>
+  <cpu type='kvm' name='7450_v1.0' typename=''/>
+  <cpu type='kvm' name='755_v2.3' typename=''/>
+  <cpu type='kvm' name='7410_v1.1' typename=''/>
+  <cpu type='kvm' name='745_v2.1' typename=''/>
+  <cpu type='kvm' name='750gl' typename=''/>
+  <cpu type='kvm' name='e6500' typename=''/>
+  <cpu type='kvm' name='750p' typename=''/>
+  <cpu type='kvm' name='7445_v3.4' typename=''/>
+  <cpu type='kvm' name='440epb' typename=''/>
+  <cpu type='kvm' name='npe4gs3' typename=''/>
+  <cpu type='kvm' name='603e_v3' typename=''/>
+  <cpu type='kvm' name='mpc8349e' typename=''/>
+  <cpu type='kvm' name='970_v2.2' typename=''/>
+  <cpu type='kvm' name='g2lels' typename=''/>
+  <cpu type='kvm' name='g2hip4' typename=''/>
+  <cpu type='kvm' name='740p' typename=''/>
+  <cpu type='kvm' name='mpc8567e' typename=''/>
+  <cpu type='kvm' name='mpc8533e_v11' typename=''/>
+  <cpu type='kvm' name='7451_v2.3' typename=''/>
+  <cpu type='kvm' name='603e_v1.1' typename=''/>
+  <cpu type='kvm' name='401g2' typename=''/>
+  <cpu type='kvm' name='7400_v2.8' typename=''/>
+  <cpu type='kvm' name='7455_v2.1' typename=''/>
+  <cpu type='kvm' name='405gpc' typename=''/>
+  <cpu type='kvm' name='power7+_v2.1' typename=''/>
+  <cpu type='kvm' name='mpc8544e_v11' typename=''/>
+  <cpu type='kvm' name='7450_v2.0' typename=''/>
+  <cpu type='kvm' name='970mp_v1.1' typename=''/>
+  <cpu type='kvm' name='603e7v2' typename=''/>
+  <cpu type='kvm' name='604r' typename=''/>
+  <cpu type='kvm' name='e500v2_v22' typename=''/>
+  <cpu type='kvm' name='mpc8548e_v20' typename=''/>
+  <cpu type='kvm' name='mpc8545e_v20' typename=''/>
+  <cpu type='kvm' name='mpc8378' typename=''/>
+  <cpu type='kvm' name='mpc8567' typename=''/>
+  <cpu type='kvm' name='7457_v1.2' typename=''/>
+  <cpu type='kvm' name='7447_v1.0' typename=''/>
+  <cpu type='kvm' name='970fx_v3.1' typename=''/>
+  <cpu type='kvm' name='745_v2.5' typename=''/>
+  <cpu type='kvm' name='mpc8379e' typename=''/>
+  <cpu type='kvm' name='mpc8641' typename=''/>
+  <cpu type='kvm' name='750cxe_v2.4b' typename=''/>
+  <cpu type='kvm' name='7410_v1.0' typename=''/>
+  <cpu type='kvm' name='mpc603' typename=''/>
+  <cpu type='kvm' name='603e_v4.1' typename=''/>
+  <cpu type='kvm' name='7445_v3.3' typename=''/>
+  <cpu type='kvm' name='440epa' typename=''/>
+  <cpu type='kvm' name='970fx_v2.1' typename=''/>
+  <cpu type='kvm' name='iop480' typename=''/>
+  <cpu type='kvm' name='750fx_v2.1' typename=''/>
+  <cpu type='kvm' name='601_v0' typename=''/>
+  <cpu type='kvm' name='g2legp1' typename=''/>
+  <cpu type='kvm' name='745_v1.0' typename=''/>
+  <cpu type='kvm' name='750cl_v2.0' typename=''/>
+  <cpu type='kvm' name='750cxr' typename=''/>
+  <cpu type='kvm' name='401' typename=''/>
+  <cpu type='kvm' name='mpc8541e_v11' typename=''/>
+  <cpu type='kvm' name='750cxe_v3.1' typename=''/>
+  <cpu type='kvm' name='mpc8555e_v11' typename=''/>
+  <cpu type='kvm' name='power5+_v2.1' typename=''/>
+  <cpu type='kvm' name='7447a_v1.1' typename=''/>
+  <cpu type='kvm' name='403gb' typename=''/>
+  <cpu type='kvm' name='e300c2' typename=''/>
+  <cpu type='kvm' name='npe405h2' typename=''/>
+  <cpu type='kvm' name='mpc8343e' typename=''/>
+  <cpu type='kvm' name='mpc8533e_v10' typename=''/>
+  <cpu type='kvm' name='mpc5200_v10' typename=''/>
+  <cpu type='kvm' name='750_v3.1' typename=''/>
+  <cpu type='kvm' name='power8e_v2.1' typename=''/>
+  <cpu type='kvm' name='mpc8568e' typename=''/>
+  <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' typename=''/>
+  <cpu type='tcg' name='750cl_v1.0' typename=''/>
+  <cpu type='tcg' name='7457a_v1.1' typename=''/>
+  <cpu type='tcg' name='g2gp' typename=''/>
+  <cpu type='tcg' name='750cxe_v2.1' typename=''/>
+  <cpu type='tcg' name='755_v2.7' typename=''/>
+  <cpu type='tcg' name='750_v2.1' typename=''/>
+  <cpu type='tcg' name='755_v2.2' typename=''/>
+  <cpu type='tcg' name='745_v2.0' typename=''/>
+  <cpu type='tcg' name='mpc8377' typename=''/>
+  <cpu type='tcg' name='7455_v1.0' typename=''/>
+  <cpu type='tcg' name='mpc8545_v21' typename=''/>
+  <cpu type='tcg' name='mpc8548_v11' typename=''/>
+  <cpu type='tcg' name='405d4' typename=''/>
+  <cpu type='tcg' name='g2le' typename=''/>
+  <cpu type='tcg' name='g2hip3' typename=''/>
+  <cpu type='tcg' name='750e' typename=''/>
+  <cpu type='tcg' name='mpc8572' typename=''/>
+  <cpu type='tcg' name='970fx_v2.0' typename=''/>
+  <cpu type='tcg' name='750fx_v2.0' typename=''/>
+  <cpu type='tcg' name='603p' typename=''/>
+  <cpu type='tcg' name='405gpb' typename=''/>
+  <cpu type='tcg' name='7400_v2.7' typename=''/>
+  <cpu type='tcg' name='mpc8544e_v10' typename=''/>
+  <cpu type='tcg' name='e500v2_v10' typename=''/>
+  <cpu type='tcg' name='e500mc' typename=''/>
+  <cpu type='tcg' name='603e7v1' typename=''/>
+  <cpu type='tcg' name='970mp_v1.0' typename=''/>
+  <cpu type='tcg' name='740e' typename=''/>
+  <cpu type='tcg' name='405crc' typename=''/>
+  <cpu type='tcg' name='403ga' typename=''/>
+  <cpu type='tcg' name='7447a_v1.0' typename=''/>
+  <cpu type='tcg' name='7400_v2.2' typename=''/>
+  <cpu type='tcg' name='e300c1' typename=''/>
+  <cpu type='tcg' name='mpc8572e' typename=''/>
+  <cpu type='tcg' name='e500v2_v21' typename=''/>
+  <cpu type='tcg' name='970fx_v1.0' typename=''/>
+  <cpu type='tcg' name='750gx_v1.2' typename=''/>
+  <cpu type='tcg' name='750fx_v1.0' typename=''/>
+  <cpu type='tcg' name='7457_v1.1' typename=''/>
+  <cpu type='tcg' name='970fx_v3.0' typename=''/>
+  <cpu type='tcg' name='604e_v2.2' typename=''/>
+  <cpu type='tcg' name='755_v2.6' typename=''/>
+  <cpu type='tcg' name='401a1' typename=''/>
+  <cpu type='tcg' name='power9_v1.0' typename=''/>
+  <cpu type='tcg' name='npe405h' typename=''/>
+  <cpu type='tcg' name='7410_v1.4' typename=''/>
+  <cpu type='tcg' name='g2ls' typename=''/>
+  <cpu type='tcg' name='750_v2.0' typename=''/>
+  <cpu type='tcg' name='401b2' typename=''/>
+  <cpu type='tcg' name='mpc8349' typename=''/>
+  <cpu type='tcg' name='mpc8347ep' typename=''/>
+  <cpu type='tcg' name='7445_v3.2' typename=''/>
+  <cpu type='tcg' name='mpc8540_v21' typename=''/>
+  <cpu type='tcg' name='mpc8543_v11' typename=''/>
+  <cpu type='tcg' name='403gcx' typename=''/>
+  <cpu type='tcg' name='745_v2.4' typename=''/>
+  <cpu type='tcg' name='mpc8548_v21' typename=''/>
+  <cpu type='tcg' name='750l_v3.2' typename=''/>
+  <cpu type='tcg' name='750_v1.0' typename=''/>
+  <cpu type='tcg' name='755_v1.1' typename=''/>
+  <cpu type='tcg' name='e500_v10' typename=''/>
+  <cpu type='tcg' name='750cxe_v3.0' typename=''/>
+  <cpu type='tcg' name='mpc8541e_v10' typename=''/>
+  <cpu type='tcg' name='mpc8347p' typename=''/>
+  <cpu type='tcg' name='mpc8555e_v10' typename=''/>
+  <cpu type='tcg' name='power9_v2.0' typename=''/>
+  <cpu type='tcg' name='power7_v2.3' typename=''/>
+  <cpu type='tcg' name='603e7v' typename=''/>
+  <cpu type='tcg' name='mpc8543e_v11' typename=''/>
+  <cpu type='tcg' name='750_v3.0' typename=''/>
+  <cpu type='tcg' name='7400_v2.6' typename=''/>
+  <cpu type='tcg' name='405gpa' typename=''/>
+  <cpu type='tcg' name='440epx' typename=''/>
+  <cpu type='tcg' name='750l_v2.2' typename=''/>
+  <cpu type='tcg' name='e200z6' typename=''/>
+  <cpu type='tcg' name='mpc8547e_v20' typename=''/>
+  <cpu type='tcg' name='7457a_v1.0' typename=''/>
+  <cpu type='tcg' name='mpc8349ea' typename=''/>
+  <cpu type='tcg' name='e500v2_v20' typename=''/>
+  <cpu type='tcg' name='power8nvl_v1.0' typename=''/>
+  <cpu type='tcg' name='mpc8540_v10' typename=''/>
+  <cpu type='tcg' name='755_v2.1' typename=''/>
+  <cpu type='tcg' name='745_v2.8' typename=''/>
+  <cpu type='tcg' name='npe405l' typename=''/>
+  <cpu type='tcg' name='mpc8343ea' typename=''/>
+  <cpu type='tcg' name='mpc8545_v20' typename=''/>
+  <cpu type='tcg' name='mpc8548_v10' typename=''/>
+  <cpu type='tcg' name='7448_v1.1' typename=''/>
+  <cpu type='tcg' name='7455_v3.4' typename=''/>
+  <cpu type='tcg' name='740_v2.2' typename=''/>
+  <cpu type='tcg' name='7400_v1.1' typename=''/>
+  <cpu type='tcg' name='mpc8347et' typename=''/>
+  <cpu type='tcg' name='7441_v2.10' typename=''/>
+  <cpu type='tcg' name='603e_v1.4' typename=''/>
+  <cpu type='tcg' name='mpc8543_v10' typename=''/>
+  <cpu type='tcg' name='401c2' typename=''/>
+  <cpu type='tcg' name='7451_v2.10' typename=''/>
+  <cpu type='tcg' name='750cx_v2.2' typename=''/>
+  <cpu type='tcg' name='mpc8543_v21' typename=''/>
+  <cpu type='tcg' name='603e7' typename=''/>
+  <cpu type='tcg' name='7448_v2.1' typename=''/>
+  <cpu type='tcg' name='7441_v2.3' typename=''/>
+  <cpu type='tcg' name='405crb' typename=''/>
+  <cpu type='tcg' name='604' typename=''/>
+  <cpu type='tcg' name='7400_v2.1' typename=''/>
+  <cpu type='tcg' name='440-xilinx-w-dfpu' typename=''/>
+  <cpu type='tcg' name='7445_v2.1' typename=''/>
+  <cpu type='tcg' name='cobra' typename=''/>
+  <cpu type='tcg' name='e500_v20' typename=''/>
+  <cpu type='tcg' name='mpc8541_v11' typename=''/>
+  <cpu type='tcg' name='750gx_v1.1' typename=''/>
+  <cpu type='tcg' name='750cxe_v2.4' typename=''/>
+  <cpu type='tcg' name='mpc8641d' typename=''/>
+  <cpu type='tcg' name='mpc8543e_v21' typename=''/>
+  <cpu type='tcg' name='750l_v2.1' typename=''/>
+  <cpu type='tcg' name='7457_v1.0' typename=''/>
+  <cpu type='tcg' name='7450_v1.2' typename=''/>
+  <cpu type='tcg' name='755_v2.5' typename=''/>
+  <cpu type='tcg' name='7410_v1.3' typename=''/>
+  <cpu type='tcg' name='745_v2.3' typename=''/>
+  <cpu type='tcg' name='755_v2.0' typename=''/>
+  <cpu type='tcg' name='e500v2_v30' typename=''/>
+  <cpu type='tcg' name='7455_v3.3' typename=''/>
+  <cpu type='tcg' name='mpc8540_v20' typename=''/>
+  <cpu type='tcg' name='405d2' typename=''/>
+  <cpu type='tcg' name='mpc8560_v21' typename=''/>
+  <cpu type='tcg' name='mpc8343' typename=''/>
+  <cpu type='tcg' name='mpc8548_v20' typename=''/>
+  <cpu type='tcg' name='mpc8347t' typename=''/>
+  <cpu type='tcg' name='755_v1.0' typename=''/>
+  <cpu type='tcg' name='603e_v1.3' typename=''/>
+  <cpu type='tcg' name='mpc8543e_v10' typename=''/>
+  <cpu type='tcg' name='mpc8347eap' typename=''/>
+  <cpu type='tcg' name='mpc8548e_v11' typename=''/>
+  <cpu type='tcg' name='mpc8543_v20' typename=''/>
+  <cpu type='tcg' name='401d2' typename=''/>
+  <cpu type='tcg' name='power8_v2.0' typename=''/>
+  <cpu type='tcg' name='740_v3.1' typename=''/>
+  <cpu type='tcg' name='e200z5' typename=''/>
+  <cpu type='tcg' name='405cra' typename=''/>
+  <cpu type='tcg' name='7400_v2.0' typename=''/>
+  <cpu type='tcg' name='750cxe_v2.3' typename=''/>
+  <cpu type='tcg' name='745_v2.7' typename=''/>
+  <cpu type='tcg' name='mpc8560_v10' typename=''/>
+  <cpu type='tcg' name='e5500' typename=''/>
+  <cpu type='tcg' name='mpc8544_v11' typename=''/>
+  <cpu type='tcg' name='7448_v1.0' typename=''/>
+  <cpu type='tcg' name='401e2' typename=''/>
+  <cpu type='tcg' name='740_v2.1' typename=''/>
+  <cpu type='tcg' name='745_v2.2' typename=''/>
+  <cpu type='tcg' name='7400_v1.0' typename=''/>
+  <cpu type='tcg' name='7410_v1.2' typename=''/>
+  <cpu type='tcg' name='x2vp4' typename=''/>
+  <cpu type='tcg' name='mpc8347ap' typename=''/>
+  <cpu type='tcg' name='mpc8533_v11' typename=''/>
+  <cpu type='tcg' name='mpc5200b_v21' typename=''/>
+  <cpu type='tcg' name='750fx_v2.3' typename=''/>
+  <cpu type='tcg' name='601_v2' typename=''/>
+  <cpu type='tcg' name='g2legp3' typename=''/>
+  <cpu type='tcg' name='604e_v1.0' typename=''/>
+  <cpu type='tcg' name='750cx_v2.1' typename=''/>
+  <cpu type='tcg' name='mpc8610' typename=''/>
+  <cpu type='tcg' name='g2h4' typename=''/>
+  <cpu type='tcg' name='750l_v3.0' typename=''/>
+  <cpu type='tcg' name='mpc8377e' typename=''/>
+  <cpu type='tcg' name='e300c4' typename=''/>
+  <cpu type='tcg' name='mpc5200_v12' typename=''/>
+  <cpu type='tcg' name='7448_v2.0' typename=''/>
+  <cpu type='tcg' name='7450_v2.1' typename=''/>
+  <cpu type='tcg' name='750cxe_v3.1b' typename=''/>
+  <cpu type='tcg' name='g2' typename=''/>
+  <cpu type='tcg' name='7400_v2.9' typename=''/>
+  <cpu type='tcg' name='405gpd' typename=''/>
+  <cpu type='tcg' name='603' typename=''/>
+  <cpu type='tcg' name='603e7t' typename=''/>
+  <cpu type='tcg' name='mpc8555_v11' typename=''/>
+  <cpu type='tcg' name='750gx_v1.0' typename=''/>
+  <cpu type='tcg' name='mpc8541_v10' typename=''/>
+  <cpu type='tcg' name='mpc8543e_v20' typename=''/>
+  <cpu type='tcg' name='750fl' typename=''/>
+  <cpu type='tcg' name='750l_v2.0' typename=''/>
+  <cpu type='tcg' name='stb04' typename=''/>
+  <cpu type='tcg' name='mpc8548e_v21' typename=''/>
+  <cpu type='tcg' name='x2vp20' typename=''/>
+  <cpu type='tcg' name='405ez' typename=''/>
+  <cpu type='tcg' name='e600' typename=''/>
+  <cpu type='tcg' name='7450_v1.1' typename=''/>
+  <cpu type='tcg' name='755_v2.4' typename=''/>
+  <cpu type='tcg' name='mpc8379' typename=''/>
+  <cpu type='tcg' name='7445_v1.0' typename=''/>
+  <cpu type='tcg' name='7447_v1.1' typename=''/>
+  <cpu type='tcg' name='603e_v2.2' typename=''/>
+  <cpu type='tcg' name='603e_v4' typename=''/>
+  <cpu type='tcg' name='g2legp' typename=''/>
+  <cpu type='tcg' name='7455_v3.2' typename=''/>
+  <cpu type='tcg' name='740_v2.0' typename=''/>
+  <cpu type='tcg' name='mpc8560_v20' typename=''/>
+  <cpu type='tcg' name='440-xilinx' typename=''/>
+  <cpu type='tcg' name='401f2' typename=''/>
+  <cpu type='tcg' name='mpc8533_v10' typename=''/>
+  <cpu type='tcg' name='405gpr' typename=''/>
+  <cpu type='tcg' name='mpc8349a' typename=''/>
+  <cpu type='tcg' name='stb25' typename=''/>
+  <cpu type='tcg' name='603e_v1.2' typename=''/>
+  <cpu type='tcg' name='mpc5200b_v20' typename=''/>
+  <cpu type='tcg' name='750fx_v2.2' typename=''/>
+  <cpu type='tcg' name='mpc8347eat' typename=''/>
+  <cpu type='tcg' name='740_v1.0' typename=''/>
+  <cpu type='tcg' name='601_v1' typename=''/>
+  <cpu type='tcg' name='745_v1.1' typename=''/>
+  <cpu type='tcg' name='750cx_v2.0' typename=''/>
+  <cpu type='tcg' name='mpc8548e_v10' typename=''/>
+  <cpu type='tcg' name='7447a_v1.2' typename=''/>
+  <cpu type='tcg' name='403gc' typename=''/>
+  <cpu type='tcg' name='e300c3' typename=''/>
+  <cpu type='tcg' name='mpc5200_v11' typename=''/>
+  <cpu type='tcg' name='7441_v2.1' typename=''/>
+  <cpu type='tcg' name='740_v3.0' typename=''/>
+  <cpu type='tcg' name='mpc8545e_v21' typename=''/>
+  <cpu type='tcg' name='602' typename=''/>
+  <cpu type='tcg' name='mpc8378e' typename=''/>
+  <cpu type='tcg' name='mpc8343a' typename=''/>
+  <cpu type='tcg' name='460exb' typename=''/>
+  <cpu type='tcg' name='mpc8555_v10' typename=''/>
+  <cpu type='tcg' name='mpc8568' typename=''/>
+  <cpu type='tcg' name='7457a_v1.2' typename=''/>
+  <cpu type='tcg' name='750cx_v1.0' typename=''/>
+  <cpu type='tcg' name='750cxe_v2.2' typename=''/>
+  <cpu type='tcg' name='604e_v2.4' typename=''/>
+  <cpu type='tcg' name='755_v2.8' typename=''/>
+  <cpu type='tcg' name='405lp' typename=''/>
+  <cpu type='tcg' name='745_v2.6' typename=''/>
+  <cpu type='tcg' name='stb03' typename=''/>
+  <cpu type='tcg' name='405ep' typename=''/>
+  <cpu type='tcg' name='mpc8544_v10' typename=''/>
+  <cpu type='tcg' name='mpc8347at' typename=''/>
+  <cpu type='tcg' name='750_v2.2' typename=''/>
+  <cpu type='tcg' name='7450_v1.0' typename=''/>
+  <cpu type='tcg' name='755_v2.3' typename=''/>
+  <cpu type='tcg' name='7410_v1.1' typename=''/>
+  <cpu type='tcg' name='745_v2.1' typename=''/>
+  <cpu type='tcg' name='750gl' typename=''/>
+  <cpu type='tcg' name='e6500' typename=''/>
+  <cpu type='tcg' name='750p' typename=''/>
+  <cpu type='tcg' name='7445_v3.4' typename=''/>
+  <cpu type='tcg' name='440epb' typename=''/>
+  <cpu type='tcg' name='npe4gs3' typename=''/>
+  <cpu type='tcg' name='603e_v3' typename=''/>
+  <cpu type='tcg' name='mpc8349e' typename=''/>
+  <cpu type='tcg' name='970_v2.2' typename=''/>
+  <cpu type='tcg' name='g2lels' typename=''/>
+  <cpu type='tcg' name='g2hip4' typename=''/>
+  <cpu type='tcg' name='740p' typename=''/>
+  <cpu type='tcg' name='mpc8567e' typename=''/>
+  <cpu type='tcg' name='mpc8533e_v11' typename=''/>
+  <cpu type='tcg' name='7451_v2.3' typename=''/>
+  <cpu type='tcg' name='603e_v1.1' typename=''/>
+  <cpu type='tcg' name='401g2' typename=''/>
+  <cpu type='tcg' name='7400_v2.8' typename=''/>
+  <cpu type='tcg' name='7455_v2.1' typename=''/>
+  <cpu type='tcg' name='405gpc' typename=''/>
+  <cpu type='tcg' name='power7+_v2.1' typename=''/>
+  <cpu type='tcg' name='mpc8544e_v11' typename=''/>
+  <cpu type='tcg' name='7450_v2.0' typename=''/>
+  <cpu type='tcg' name='970mp_v1.1' typename=''/>
+  <cpu type='tcg' name='603e7v2' typename=''/>
+  <cpu type='tcg' name='604r' typename=''/>
+  <cpu type='tcg' name='e500v2_v22' typename=''/>
+  <cpu type='tcg' name='mpc8548e_v20' typename=''/>
+  <cpu type='tcg' name='mpc8545e_v20' typename=''/>
+  <cpu type='tcg' name='mpc8378' typename=''/>
+  <cpu type='tcg' name='mpc8567' typename=''/>
+  <cpu type='tcg' name='7457_v1.2' typename=''/>
+  <cpu type='tcg' name='7447_v1.0' typename=''/>
+  <cpu type='tcg' name='970fx_v3.1' typename=''/>
+  <cpu type='tcg' name='745_v2.5' typename=''/>
+  <cpu type='tcg' name='mpc8379e' typename=''/>
+  <cpu type='tcg' name='mpc8641' typename=''/>
+  <cpu type='tcg' name='750cxe_v2.4b' typename=''/>
+  <cpu type='tcg' name='7410_v1.0' typename=''/>
+  <cpu type='tcg' name='mpc603' typename=''/>
+  <cpu type='tcg' name='603e_v4.1' typename=''/>
+  <cpu type='tcg' name='7445_v3.3' typename=''/>
+  <cpu type='tcg' name='440epa' typename=''/>
+  <cpu type='tcg' name='970fx_v2.1' typename=''/>
+  <cpu type='tcg' name='iop480' typename=''/>
+  <cpu type='tcg' name='750fx_v2.1' typename=''/>
+  <cpu type='tcg' name='601_v0' typename=''/>
+  <cpu type='tcg' name='g2legp1' typename=''/>
+  <cpu type='tcg' name='745_v1.0' typename=''/>
+  <cpu type='tcg' name='750cl_v2.0' typename=''/>
+  <cpu type='tcg' name='750cxr' typename=''/>
+  <cpu type='tcg' name='401' typename=''/>
+  <cpu type='tcg' name='mpc8541e_v11' typename=''/>
+  <cpu type='tcg' name='750cxe_v3.1' typename=''/>
+  <cpu type='tcg' name='mpc8555e_v11' typename=''/>
+  <cpu type='tcg' name='power5+_v2.1' typename=''/>
+  <cpu type='tcg' name='7447a_v1.1' typename=''/>
+  <cpu type='tcg' name='403gb' typename=''/>
+  <cpu type='tcg' name='e300c2' typename=''/>
+  <cpu type='tcg' name='npe405h2' typename=''/>
+  <cpu type='tcg' name='mpc8343e' typename=''/>
+  <cpu type='tcg' name='mpc8533e_v10' typename=''/>
+  <cpu type='tcg' name='mpc5200_v10' typename=''/>
+  <cpu type='tcg' name='750_v3.1' typename=''/>
+  <cpu type='tcg' name='power8e_v2.1' typename=''/>
+  <cpu type='tcg' name='mpc8568e' typename=''/>
   <machine name='pseries-2.12' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes'/>
   <machine name='ref405ep' maxCpus='1'/>
   <machine name='sam460ex' maxCpus='1'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
index 2930381068..482a52da24 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
@@ -155,75 +155,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'/>
@@ -237,7 +237,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'/>
@@ -251,7 +251,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'/>
@@ -279,7 +279,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'/>
@@ -397,7 +397,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'/>
@@ -539,7 +539,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'/>
@@ -557,7 +557,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'/>
@@ -585,7 +585,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'/>
@@ -612,7 +612,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'/>
@@ -643,7 +643,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'/>
@@ -657,8 +657,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'/>
@@ -679,7 +679,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'/>
@@ -804,7 +804,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'/>
@@ -825,7 +825,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'/>
@@ -852,8 +852,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'/>
@@ -881,8 +881,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'/>
@@ -903,9 +903,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'/>
@@ -919,7 +919,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'/>
@@ -933,7 +933,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'/>
@@ -947,7 +947,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'/>
@@ -970,8 +970,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'/>
@@ -989,8 +989,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'/>
@@ -1108,7 +1108,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'/>
@@ -1238,7 +1238,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'/>
@@ -1269,7 +1269,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'/>
@@ -1283,7 +1283,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'/>
@@ -1297,7 +1297,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'/>
@@ -1333,7 +1333,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'/>
@@ -1347,7 +1347,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'/>
@@ -1465,7 +1465,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'/>
@@ -1493,7 +1493,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'/>
@@ -1623,8 +1623,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'/>
@@ -1652,7 +1652,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'/>
@@ -1675,7 +1675,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'/>
@@ -1702,7 +1702,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'/>
@@ -1716,7 +1716,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'/>
@@ -1734,7 +1734,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'/>
@@ -1748,8 +1748,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'/>
@@ -1770,7 +1770,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'/>
@@ -1798,7 +1798,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'/>
@@ -1812,7 +1812,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'/>
@@ -1937,7 +1937,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'/>
@@ -1960,7 +1960,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'/>
@@ -1978,7 +1978,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'/>
@@ -1996,7 +1996,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'/>
@@ -2121,7 +2121,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'/>
@@ -2135,7 +2135,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'/>
@@ -2158,8 +2158,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'/>
@@ -2289,7 +2289,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'/>
@@ -2303,7 +2303,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'/>
@@ -2331,7 +2331,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'/>
@@ -2362,7 +2362,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'/>
@@ -2376,7 +2376,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'/>
@@ -2404,7 +2404,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'/>
@@ -2425,7 +2425,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'/>
@@ -2448,7 +2448,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 61b3602c48..897962bde3 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 17c2c8e12e..8972ebcfa3 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
@@ -135,873 +135,873 @@
   <microcodeVersion>42900765</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='7457A_v1.2'/>
-  <cpu type='kvm' name='750cl_v1.0'/>
-  <cpu type='kvm' name='750cxe_v2.1'/>
-  <cpu type='kvm' name='755_v2.7'/>
-  <cpu type='kvm' name='MPC8347ET'/>
-  <cpu type='kvm' name='MPC8545E_v20'/>
-  <cpu type='kvm' name='750_v2.1'/>
-  <cpu type='kvm' name='755_v2.2'/>
-  <cpu type='kvm' name='745_v2.0'/>
-  <cpu type='kvm' name='7455_v1.0'/>
-  <cpu type='kvm' name='MPC8547E_v21'/>
-  <cpu type='kvm' name='STB25'/>
-  <cpu type='kvm' name='POWER8_v2.0'/>
-  <cpu type='kvm' name='401G2'/>
-  <cpu type='kvm' name='MPC8349A'/>
-  <cpu type='kvm' name='750e'/>
-  <cpu type='kvm' name='MPC8545_v21'/>
-  <cpu type='kvm' name='MPC8548_v11'/>
-  <cpu type='kvm' name='970fx_v2.0'/>
-  <cpu type='kvm' name='750fx_v2.0'/>
-  <cpu type='kvm' name='POWER8E_v2.1'/>
-  <cpu type='kvm' name='Cobra'/>
-  <cpu type='kvm' name='603p'/>
-  <cpu type='kvm' name='7400_v2.7'/>
-  <cpu type='kvm' name='MPC8378E'/>
-  <cpu type='kvm' name='e500v2_v10'/>
-  <cpu type='kvm' name='e500mc'/>
-  <cpu type='kvm' name='603e7v1'/>
-  <cpu type='kvm' name='970mp_v1.0'/>
-  <cpu type='kvm' name='MPC8555E_v11'/>
-  <cpu type='kvm' name='440-Xilinx-w-dfpu'/>
-  <cpu type='kvm' name='740e'/>
-  <cpu type='kvm' name='405CRc'/>
-  <cpu type='kvm' name='7447A_v1.1'/>
-  <cpu type='kvm' name='MPC8533E_v10'/>
-  <cpu type='kvm' name='MPC8543_v11'/>
-  <cpu type='kvm' name='7400_v2.2'/>
-  <cpu type='kvm' name='MPC8540_v21'/>
-  <cpu type='kvm' name='e500v2_v21'/>
-  <cpu type='kvm' name='e300c1'/>
-  <cpu type='kvm' name='970fx_v1.0'/>
-  <cpu type='kvm' name='750gx_v1.2'/>
-  <cpu type='kvm' name='750fx_v1.0'/>
-  <cpu type='kvm' name='MPC8641'/>
-  <cpu type='kvm' name='MPC8544E_v10'/>
-  <cpu type='kvm' name='405D4'/>
-  <cpu type='kvm' name='7457_v1.1'/>
-  <cpu type='kvm' name='970fx_v3.0'/>
-  <cpu type='kvm' name='604e_v2.2'/>
-  <cpu type='kvm' name='755_v2.6'/>
-  <cpu type='kvm' name='Npe4GS3'/>
-  <cpu type='kvm' name='7410_v1.4'/>
-  <cpu type='kvm' name='750_v2.0'/>
-  <cpu type='kvm' name='7445_v3.2'/>
-  <cpu type='kvm' name='745_v2.4'/>
-  <cpu type='kvm' name='750l_v3.2'/>
-  <cpu type='kvm' name='MPC8540_v10'/>
-  <cpu type='kvm' name='750_v1.0'/>
-  <cpu type='kvm' name='STB03'/>
-  <cpu type='kvm' name='MPC8343A'/>
-  <cpu type='kvm' name='MPC8378'/>
-  <cpu type='kvm' name='G2HiP3'/>
-  <cpu type='kvm' name='750cxe_v3.0'/>
-  <cpu type='kvm' name='e500_v10'/>
-  <cpu type='kvm' name='755_v1.1'/>
-  <cpu type='kvm' name='MPC8567'/>
-  <cpu type='kvm' name='MPC8545_v20'/>
-  <cpu type='kvm' name='MPC8548_v10'/>
-  <cpu type='kvm' name='Npe405H'/>
-  <cpu type='kvm' name='603e7v'/>
-  <cpu type='kvm' name='750_v3.0'/>
-  <cpu type='kvm' name='Npe405H2'/>
-  <cpu type='kvm' name='7400_v2.6'/>
-  <cpu type='kvm' name='405GPa'/>
-  <cpu type='kvm' name='MPC8548_v21'/>
-  <cpu type='kvm' name='MPC8541E_v10'/>
-  <cpu type='kvm' name='750l_v2.2'/>
-  <cpu type='kvm' name='MPC8555E_v10'/>
-  <cpu type='kvm' name='7457A_v1.1'/>
-  <cpu type='kvm' name='e200z6'/>
-  <cpu type='kvm' name='MPC8379E'/>
-  <cpu type='kvm' name='e500v2_v20'/>
-  <cpu type='kvm' name='MPC8347AP'/>
-  <cpu type='kvm' name='401B2'/>
-  <cpu type='kvm' name='MPC8349E'/>
-  <cpu type='kvm' name='755_v2.1'/>
-  <cpu type='kvm' name='MPC8543_v21'/>
-  <cpu type='kvm' name='745_v2.8'/>
-  <cpu type='kvm' name='MPC8547E_v20'/>
-  <cpu type='kvm' name='7455_v3.4'/>
-  <cpu type='kvm' name='7448_v1.1'/>
-  <cpu type='kvm' name='740_v2.2'/>
-  <cpu type='kvm' name='7400_v1.1'/>
-  <cpu type='kvm' name='MPC8567E'/>
-  <cpu type='kvm' name='7441_v2.10'/>
-  <cpu type='kvm' name='603e_v1.4'/>
-  <cpu type='kvm' name='G2leGP1'/>
-  <cpu type='kvm' name='7451_v2.10'/>
-  <cpu type='kvm' name='MPC8343E'/>
-  <cpu type='kvm' name='750cx_v2.2'/>
-  <cpu type='kvm' name='Npe405L'/>
-  <cpu type='kvm' name='603e7'/>
-  <cpu type='kvm' name='401A1'/>
-  <cpu type='kvm' name='MPC8377'/>
-  <cpu type='kvm' name='7448_v2.1'/>
-  <cpu type='kvm' name='7441_v2.3'/>
-  <cpu type='kvm' name='7400_v2.1'/>
-  <cpu type='kvm' name='405CRb'/>
-  <cpu type='kvm' name='604'/>
-  <cpu type='kvm' name='MPC8540_v20'/>
-  <cpu type='kvm' name='MPC8543_v10'/>
-  <cpu type='kvm' name='7445_v2.1'/>
-  <cpu type='kvm' name='e500_v20'/>
-  <cpu type='kvm' name='750gx_v1.1'/>
-  <cpu type='kvm' name='7447A_v1.0'/>
-  <cpu type='kvm' name='750cxe_v2.4'/>
-  <cpu type='kvm' name='MPC8548_v20'/>
-  <cpu type='kvm' name='MPC8543E_v11'/>
-  <cpu type='kvm' name='MPC8347AT'/>
-  <cpu type='kvm' name='POWER8NVL_v1.0'/>
-  <cpu type='kvm' name='7457A_v1.0'/>
-  <cpu type='kvm' name='7457_v1.0'/>
-  <cpu type='kvm' name='7450_v1.2'/>
-  <cpu type='kvm' name='MPC8572'/>
-  <cpu type='kvm' name='755_v2.5'/>
-  <cpu type='kvm' name='7410_v1.3'/>
-  <cpu type='kvm' name='745_v2.3'/>
-  <cpu type='kvm' name='750l_v2.1'/>
-  <cpu type='kvm' name='405GPR'/>
-  <cpu type='kvm' name='755_v2.0'/>
-  <cpu type='kvm' name='MPC8541_v11'/>
-  <cpu type='kvm' name='401C2'/>
-  <cpu type='kvm' name='e500v2_v30'/>
-  <cpu type='kvm' name='7455_v3.3'/>
-  <cpu type='kvm' name='405EZ'/>
-  <cpu type='kvm' name='MPC8568E'/>
-  <cpu type='kvm' name='755_v1.0'/>
-  <cpu type='kvm' name='603e_v1.3'/>
-  <cpu type='kvm' name='MPC8560_v10'/>
-  <cpu type='kvm' name='host'/>
-  <cpu type='kvm' name='MPC8560_v21'/>
-  <cpu type='kvm' name='G2H4'/>
-  <cpu type='kvm' name='MPC8533_v11'/>
-  <cpu type='kvm' name='740_v3.1'/>
-  <cpu type='kvm' name='e200z5'/>
-  <cpu type='kvm' name='MPC8349'/>
-  <cpu type='kvm' name='7400_v2.0'/>
-  <cpu type='kvm' name='405CRa'/>
-  <cpu type='kvm' name='MPC8543E_v10'/>
-  <cpu type='kvm' name='MPC8543E_v21'/>
-  <cpu type='kvm' name='750cxe_v2.3'/>
-  <cpu type='kvm' name='MPC8543_v20'/>
-  <cpu type='kvm' name='745_v2.7'/>
-  <cpu type='kvm' name='403GC'/>
-  <cpu type='kvm' name='e5500'/>
-  <cpu type='kvm' name='7448_v1.0'/>
-  <cpu type='kvm' name='MPC5200_v12'/>
-  <cpu type='kvm' name='740_v2.1'/>
-  <cpu type='kvm' name='745_v2.2'/>
-  <cpu type='kvm' name='7400_v1.0'/>
-  <cpu type='kvm' name='7410_v1.2'/>
-  <cpu type='kvm' name='x2vp4'/>
-  <cpu type='kvm' name='MPC8555_v11'/>
-  <cpu type='kvm' name='MPC8541_v10'/>
-  <cpu type='kvm' name='405LP'/>
-  <cpu type='kvm' name='750fx_v2.3'/>
-  <cpu type='kvm' name='405EP'/>
-  <cpu type='kvm' name='601_v2'/>
-  <cpu type='kvm' name='MPC8544_v11'/>
-  <cpu type='kvm' name='401D2'/>
-  <cpu type='kvm' name='MPC8572E'/>
-  <cpu type='kvm' name='604e_v1.0'/>
-  <cpu type='kvm' name='750cx_v2.1'/>
-  <cpu type='kvm' name='MPC5200B_v21'/>
-  <cpu type='kvm' name='750l_v3.0'/>
-  <cpu type='kvm' name='e300c4'/>
-  <cpu type='kvm' name='7448_v2.0'/>
-  <cpu type='kvm' name='7450_v2.1'/>
-  <cpu type='kvm' name='G2leGP'/>
-  <cpu type='kvm' name='750cxe_v3.1b'/>
-  <cpu type='kvm' name='7400_v2.9'/>
-  <cpu type='kvm' name='G2GP'/>
-  <cpu type='kvm' name='603'/>
-  <cpu type='kvm' name='405GPd'/>
-  <cpu type='kvm' name='MPC8548E_v11'/>
-  <cpu type='kvm' name='603e7t'/>
-  <cpu type='kvm' name='IOP480'/>
-  <cpu type='kvm' name='750gx_v1.0'/>
-  <cpu type='kvm' name='MPC8560_v20'/>
-  <cpu type='kvm' name='405D2'/>
-  <cpu type='kvm' name='750fl'/>
-  <cpu type='kvm' name='750l_v2.0'/>
-  <cpu type='kvm' name='x2vp20'/>
-  <cpu type='kvm' name='e600'/>
-  <cpu type='kvm' name='7450_v1.1'/>
-  <cpu type='kvm' name='755_v2.4'/>
-  <cpu type='kvm' name='7445_v1.0'/>
-  <cpu type='kvm' name='G2LS'/>
-  <cpu type='kvm' name='MPC8543E_v20'/>
-  <cpu type='kvm' name='603e_v2.2'/>
-  <cpu type='kvm' name='7447_v1.1'/>
-  <cpu type='kvm' name='603e_v4'/>
-  <cpu type='kvm' name='7455_v3.2'/>
-  <cpu type='kvm' name='740_v2.0'/>
-  <cpu type='kvm' name='MPC8347P'/>
-  <cpu type='kvm' name='440EPb'/>
-  <cpu type='kvm' name='MPC603'/>
-  <cpu type='kvm' name='603e_v1.2'/>
-  <cpu type='kvm' name='750fx_v2.2'/>
-  <cpu type='kvm' name='POWER9_v1.0'/>
-  <cpu type='kvm' name='740_v1.0'/>
-  <cpu type='kvm' name='MPC8544_v10'/>
-  <cpu type='kvm' name='601_v1'/>
-  <cpu type='kvm' name='745_v1.1'/>
-  <cpu type='kvm' name='POWER7+_v2.1'/>
-  <cpu type='kvm' name='750cx_v2.0'/>
-  <cpu type='kvm' name='MPC8347EAP'/>
-  <cpu type='kvm' name='401E2'/>
-  <cpu type='kvm' name='MPC8641D'/>
-  <cpu type='kvm' name='e300c3'/>
-  <cpu type='kvm' name='MPC8533_v10'/>
-  <cpu type='kvm' name='7441_v2.1'/>
-  <cpu type='kvm' name='740_v3.0'/>
-  <cpu type='kvm' name='POWER5+_v2.1'/>
-  <cpu type='kvm' name='602'/>
-  <cpu type='kvm' name='MPC8548E_v10'/>
-  <cpu type='kvm' name='G2leLS'/>
-  <cpu type='kvm' name='MPC8343'/>
-  <cpu type='kvm' name='750cx_v1.0'/>
-  <cpu type='kvm' name='750cxe_v2.2'/>
-  <cpu type='kvm' name='604e_v2.4'/>
-  <cpu type='kvm' name='755_v2.8'/>
-  <cpu type='kvm' name='745_v2.6'/>
-  <cpu type='kvm' name='MPC8548E_v21'/>
-  <cpu type='kvm' name='G2le'/>
-  <cpu type='kvm' name='403GB'/>
-  <cpu type='kvm' name='MPC8545E_v21'/>
-  <cpu type='kvm' name='POWER7_v2.3'/>
-  <cpu type='kvm' name='750_v2.2'/>
-  <cpu type='kvm' name='7450_v1.0'/>
-  <cpu type='kvm' name='MPC5200_v11'/>
-  <cpu type='kvm' name='755_v2.3'/>
-  <cpu type='kvm' name='MPC8347EP'/>
-  <cpu type='kvm' name='7410_v1.1'/>
-  <cpu type='kvm' name='750gl'/>
-  <cpu type='kvm' name='403GCX'/>
-  <cpu type='kvm' name='745_v2.1'/>
-  <cpu type='kvm' name='750p'/>
-  <cpu type='kvm' name='G2'/>
-  <cpu type='kvm' name='MPC8555_v10'/>
-  <cpu type='kvm' name='7445_v3.4'/>
-  <cpu type='kvm' name='MPC8347T'/>
-  <cpu type='kvm' name='603e_v3'/>
-  <cpu type='kvm' name='970_v2.2'/>
-  <cpu type='kvm' name='440-Xilinx'/>
-  <cpu type='kvm' name='740p'/>
-  <cpu type='kvm' name='MPC5200B_v20'/>
-  <cpu type='kvm' name='440EPX'/>
-  <cpu type='kvm' name='603e_v1.1'/>
-  <cpu type='kvm' name='7451_v2.3'/>
-  <cpu type='kvm' name='7450_v2.0'/>
-  <cpu type='kvm' name='7400_v2.8'/>
-  <cpu type='kvm' name='7455_v2.1'/>
-  <cpu type='kvm' name='405GPc'/>
-  <cpu type='kvm' name='MPC8347EAT'/>
-  <cpu type='kvm' name='970mp_v1.1'/>
-  <cpu type='kvm' name='603e7v2'/>
-  <cpu type='kvm' name='604r'/>
-  <cpu type='kvm' name='7447A_v1.2'/>
-  <cpu type='kvm' name='MPC8533E_v11'/>
-  <cpu type='kvm' name='e500v2_v22'/>
-  <cpu type='kvm' name='401F2'/>
-  <cpu type='kvm' name='MPC8343EA'/>
-  <cpu type='kvm' name='7457_v1.2'/>
-  <cpu type='kvm' name='970fx_v3.1'/>
-  <cpu type='kvm' name='7447_v1.0'/>
-  <cpu type='kvm' name='745_v2.5'/>
-  <cpu type='kvm' name='MPC8548E_v20'/>
-  <cpu type='kvm' name='MPC8610'/>
-  <cpu type='kvm' name='750cxe_v2.4b'/>
-  <cpu type='kvm' name='MPC5200_v10'/>
-  <cpu type='kvm' name='403GA'/>
-  <cpu type='kvm' name='7410_v1.0'/>
-  <cpu type='kvm' name='G2leGP3'/>
-  <cpu type='kvm' name='7445_v3.3'/>
-  <cpu type='kvm' name='603e_v4.1'/>
-  <cpu type='kvm' name='440EPa'/>
-  <cpu type='kvm' name='970fx_v2.1'/>
-  <cpu type='kvm' name='MPC8377E'/>
-  <cpu type='kvm' name='750fx_v2.1'/>
-  <cpu type='kvm' name='601_v0'/>
-  <cpu type='kvm' name='STB04'/>
-  <cpu type='kvm' name='745_v1.0'/>
-  <cpu type='kvm' name='G2HiP4'/>
-  <cpu type='kvm' name='750cl_v2.0'/>
-  <cpu type='kvm' name='750cxr'/>
-  <cpu type='kvm' name='MPC8349EA'/>
-  <cpu type='kvm' name='750cxe_v3.1'/>
-  <cpu type='kvm' name='MPC8379'/>
-  <cpu type='kvm' name='401'/>
-  <cpu type='kvm' name='MPC8568'/>
-  <cpu type='kvm' name='e300c2'/>
-  <cpu type='kvm' name='750_v3.1'/>
-  <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='7457A_v1.2'/>
-  <cpu type='tcg' name='750cl_v1.0'/>
-  <cpu type='tcg' name='750cxe_v2.1'/>
-  <cpu type='tcg' name='755_v2.7'/>
-  <cpu type='tcg' name='MPC8347ET'/>
-  <cpu type='tcg' name='MPC8545E_v20'/>
-  <cpu type='tcg' name='750_v2.1'/>
-  <cpu type='tcg' name='755_v2.2'/>
-  <cpu type='tcg' name='745_v2.0'/>
-  <cpu type='tcg' name='7455_v1.0'/>
-  <cpu type='tcg' name='MPC8547E_v21'/>
-  <cpu type='tcg' name='STB25'/>
-  <cpu type='tcg' name='POWER8_v2.0'/>
-  <cpu type='tcg' name='401G2'/>
-  <cpu type='tcg' name='MPC8349A'/>
-  <cpu type='tcg' name='750e'/>
-  <cpu type='tcg' name='MPC8545_v21'/>
-  <cpu type='tcg' name='MPC8548_v11'/>
-  <cpu type='tcg' name='970fx_v2.0'/>
-  <cpu type='tcg' name='750fx_v2.0'/>
-  <cpu type='tcg' name='POWER8E_v2.1'/>
-  <cpu type='tcg' name='Cobra'/>
-  <cpu type='tcg' name='603p'/>
-  <cpu type='tcg' name='7400_v2.7'/>
-  <cpu type='tcg' name='MPC8378E'/>
-  <cpu type='tcg' name='e500v2_v10'/>
-  <cpu type='tcg' name='e500mc'/>
-  <cpu type='tcg' name='603e7v1'/>
-  <cpu type='tcg' name='970mp_v1.0'/>
-  <cpu type='tcg' name='MPC8555E_v11'/>
-  <cpu type='tcg' name='440-Xilinx-w-dfpu'/>
-  <cpu type='tcg' name='740e'/>
-  <cpu type='tcg' name='405CRc'/>
-  <cpu type='tcg' name='7447A_v1.1'/>
-  <cpu type='tcg' name='MPC8533E_v10'/>
-  <cpu type='tcg' name='MPC8543_v11'/>
-  <cpu type='tcg' name='7400_v2.2'/>
-  <cpu type='tcg' name='MPC8540_v21'/>
-  <cpu type='tcg' name='e500v2_v21'/>
-  <cpu type='tcg' name='e300c1'/>
-  <cpu type='tcg' name='970fx_v1.0'/>
-  <cpu type='tcg' name='750gx_v1.2'/>
-  <cpu type='tcg' name='750fx_v1.0'/>
-  <cpu type='tcg' name='MPC8641'/>
-  <cpu type='tcg' name='MPC8544E_v10'/>
-  <cpu type='tcg' name='405D4'/>
-  <cpu type='tcg' name='7457_v1.1'/>
-  <cpu type='tcg' name='970fx_v3.0'/>
-  <cpu type='tcg' name='604e_v2.2'/>
-  <cpu type='tcg' name='755_v2.6'/>
-  <cpu type='tcg' name='Npe4GS3'/>
-  <cpu type='tcg' name='7410_v1.4'/>
-  <cpu type='tcg' name='750_v2.0'/>
-  <cpu type='tcg' name='7445_v3.2'/>
-  <cpu type='tcg' name='745_v2.4'/>
-  <cpu type='tcg' name='750l_v3.2'/>
-  <cpu type='tcg' name='MPC8540_v10'/>
-  <cpu type='tcg' name='750_v1.0'/>
-  <cpu type='tcg' name='STB03'/>
-  <cpu type='tcg' name='MPC8343A'/>
-  <cpu type='tcg' name='MPC8378'/>
-  <cpu type='tcg' name='G2HiP3'/>
-  <cpu type='tcg' name='750cxe_v3.0'/>
-  <cpu type='tcg' name='e500_v10'/>
-  <cpu type='tcg' name='755_v1.1'/>
-  <cpu type='tcg' name='MPC8567'/>
-  <cpu type='tcg' name='MPC8545_v20'/>
-  <cpu type='tcg' name='MPC8548_v10'/>
-  <cpu type='tcg' name='Npe405H'/>
-  <cpu type='tcg' name='603e7v'/>
-  <cpu type='tcg' name='750_v3.0'/>
-  <cpu type='tcg' name='Npe405H2'/>
-  <cpu type='tcg' name='7400_v2.6'/>
-  <cpu type='tcg' name='405GPa'/>
-  <cpu type='tcg' name='MPC8548_v21'/>
-  <cpu type='tcg' name='MPC8541E_v10'/>
-  <cpu type='tcg' name='750l_v2.2'/>
-  <cpu type='tcg' name='MPC8555E_v10'/>
-  <cpu type='tcg' name='7457A_v1.1'/>
-  <cpu type='tcg' name='e200z6'/>
-  <cpu type='tcg' name='MPC8379E'/>
-  <cpu type='tcg' name='e500v2_v20'/>
-  <cpu type='tcg' name='MPC8347AP'/>
-  <cpu type='tcg' name='401B2'/>
-  <cpu type='tcg' name='MPC8349E'/>
-  <cpu type='tcg' name='755_v2.1'/>
-  <cpu type='tcg' name='MPC8543_v21'/>
-  <cpu type='tcg' name='745_v2.8'/>
-  <cpu type='tcg' name='MPC8547E_v20'/>
-  <cpu type='tcg' name='7455_v3.4'/>
-  <cpu type='tcg' name='7448_v1.1'/>
-  <cpu type='tcg' name='740_v2.2'/>
-  <cpu type='tcg' name='7400_v1.1'/>
-  <cpu type='tcg' name='MPC8567E'/>
-  <cpu type='tcg' name='7441_v2.10'/>
-  <cpu type='tcg' name='603e_v1.4'/>
-  <cpu type='tcg' name='G2leGP1'/>
-  <cpu type='tcg' name='7451_v2.10'/>
-  <cpu type='tcg' name='MPC8343E'/>
-  <cpu type='tcg' name='750cx_v2.2'/>
-  <cpu type='tcg' name='Npe405L'/>
-  <cpu type='tcg' name='603e7'/>
-  <cpu type='tcg' name='401A1'/>
-  <cpu type='tcg' name='MPC8377'/>
-  <cpu type='tcg' name='7448_v2.1'/>
-  <cpu type='tcg' name='7441_v2.3'/>
-  <cpu type='tcg' name='7400_v2.1'/>
-  <cpu type='tcg' name='405CRb'/>
-  <cpu type='tcg' name='604'/>
-  <cpu type='tcg' name='MPC8540_v20'/>
-  <cpu type='tcg' name='MPC8543_v10'/>
-  <cpu type='tcg' name='7445_v2.1'/>
-  <cpu type='tcg' name='e500_v20'/>
-  <cpu type='tcg' name='750gx_v1.1'/>
-  <cpu type='tcg' name='7447A_v1.0'/>
-  <cpu type='tcg' name='750cxe_v2.4'/>
-  <cpu type='tcg' name='MPC8548_v20'/>
-  <cpu type='tcg' name='MPC8543E_v11'/>
-  <cpu type='tcg' name='MPC8347AT'/>
-  <cpu type='tcg' name='POWER8NVL_v1.0'/>
-  <cpu type='tcg' name='7457A_v1.0'/>
-  <cpu type='tcg' name='7457_v1.0'/>
-  <cpu type='tcg' name='7450_v1.2'/>
-  <cpu type='tcg' name='MPC8572'/>
-  <cpu type='tcg' name='755_v2.5'/>
-  <cpu type='tcg' name='7410_v1.3'/>
-  <cpu type='tcg' name='745_v2.3'/>
-  <cpu type='tcg' name='750l_v2.1'/>
-  <cpu type='tcg' name='405GPR'/>
-  <cpu type='tcg' name='755_v2.0'/>
-  <cpu type='tcg' name='MPC8541_v11'/>
-  <cpu type='tcg' name='401C2'/>
-  <cpu type='tcg' name='e500v2_v30'/>
-  <cpu type='tcg' name='7455_v3.3'/>
-  <cpu type='tcg' name='405EZ'/>
-  <cpu type='tcg' name='MPC8568E'/>
-  <cpu type='tcg' name='755_v1.0'/>
-  <cpu type='tcg' name='603e_v1.3'/>
-  <cpu type='tcg' name='MPC8560_v10'/>
-  <cpu type='tcg' name='MPC8560_v21'/>
-  <cpu type='tcg' name='G2H4'/>
-  <cpu type='tcg' name='MPC8533_v11'/>
-  <cpu type='tcg' name='740_v3.1'/>
-  <cpu type='tcg' name='e200z5'/>
-  <cpu type='tcg' name='MPC8349'/>
-  <cpu type='tcg' name='7400_v2.0'/>
-  <cpu type='tcg' name='405CRa'/>
-  <cpu type='tcg' name='MPC8543E_v10'/>
-  <cpu type='tcg' name='MPC8543E_v21'/>
-  <cpu type='tcg' name='750cxe_v2.3'/>
-  <cpu type='tcg' name='MPC8543_v20'/>
-  <cpu type='tcg' name='745_v2.7'/>
-  <cpu type='tcg' name='403GC'/>
-  <cpu type='tcg' name='e5500'/>
-  <cpu type='tcg' name='7448_v1.0'/>
-  <cpu type='tcg' name='MPC5200_v12'/>
-  <cpu type='tcg' name='740_v2.1'/>
-  <cpu type='tcg' name='745_v2.2'/>
-  <cpu type='tcg' name='7400_v1.0'/>
-  <cpu type='tcg' name='7410_v1.2'/>
-  <cpu type='tcg' name='x2vp4'/>
-  <cpu type='tcg' name='MPC8555_v11'/>
-  <cpu type='tcg' name='MPC8541_v10'/>
-  <cpu type='tcg' name='405LP'/>
-  <cpu type='tcg' name='750fx_v2.3'/>
-  <cpu type='tcg' name='405EP'/>
-  <cpu type='tcg' name='601_v2'/>
-  <cpu type='tcg' name='MPC8544_v11'/>
-  <cpu type='tcg' name='401D2'/>
-  <cpu type='tcg' name='MPC8572E'/>
-  <cpu type='tcg' name='604e_v1.0'/>
-  <cpu type='tcg' name='750cx_v2.1'/>
-  <cpu type='tcg' name='MPC5200B_v21'/>
-  <cpu type='tcg' name='750l_v3.0'/>
-  <cpu type='tcg' name='e300c4'/>
-  <cpu type='tcg' name='7448_v2.0'/>
-  <cpu type='tcg' name='7450_v2.1'/>
-  <cpu type='tcg' name='G2leGP'/>
-  <cpu type='tcg' name='750cxe_v3.1b'/>
-  <cpu type='tcg' name='7400_v2.9'/>
-  <cpu type='tcg' name='G2GP'/>
-  <cpu type='tcg' name='603'/>
-  <cpu type='tcg' name='405GPd'/>
-  <cpu type='tcg' name='MPC8548E_v11'/>
-  <cpu type='tcg' name='603e7t'/>
-  <cpu type='tcg' name='IOP480'/>
-  <cpu type='tcg' name='750gx_v1.0'/>
-  <cpu type='tcg' name='MPC8560_v20'/>
-  <cpu type='tcg' name='405D2'/>
-  <cpu type='tcg' name='750fl'/>
-  <cpu type='tcg' name='750l_v2.0'/>
-  <cpu type='tcg' name='x2vp20'/>
-  <cpu type='tcg' name='e600'/>
-  <cpu type='tcg' name='7450_v1.1'/>
-  <cpu type='tcg' name='755_v2.4'/>
-  <cpu type='tcg' name='7445_v1.0'/>
-  <cpu type='tcg' name='G2LS'/>
-  <cpu type='tcg' name='MPC8543E_v20'/>
-  <cpu type='tcg' name='603e_v2.2'/>
-  <cpu type='tcg' name='7447_v1.1'/>
-  <cpu type='tcg' name='603e_v4'/>
-  <cpu type='tcg' name='7455_v3.2'/>
-  <cpu type='tcg' name='740_v2.0'/>
-  <cpu type='tcg' name='MPC8347P'/>
-  <cpu type='tcg' name='440EPb'/>
-  <cpu type='tcg' name='MPC603'/>
-  <cpu type='tcg' name='603e_v1.2'/>
-  <cpu type='tcg' name='750fx_v2.2'/>
-  <cpu type='tcg' name='POWER9_v1.0'/>
-  <cpu type='tcg' name='740_v1.0'/>
-  <cpu type='tcg' name='MPC8544_v10'/>
-  <cpu type='tcg' name='601_v1'/>
-  <cpu type='tcg' name='745_v1.1'/>
-  <cpu type='tcg' name='POWER7+_v2.1'/>
-  <cpu type='tcg' name='750cx_v2.0'/>
-  <cpu type='tcg' name='MPC8347EAP'/>
-  <cpu type='tcg' name='401E2'/>
-  <cpu type='tcg' name='MPC8641D'/>
-  <cpu type='tcg' name='e300c3'/>
-  <cpu type='tcg' name='MPC8533_v10'/>
-  <cpu type='tcg' name='7441_v2.1'/>
-  <cpu type='tcg' name='740_v3.0'/>
-  <cpu type='tcg' name='POWER5+_v2.1'/>
-  <cpu type='tcg' name='602'/>
-  <cpu type='tcg' name='MPC8548E_v10'/>
-  <cpu type='tcg' name='G2leLS'/>
-  <cpu type='tcg' name='MPC8343'/>
-  <cpu type='tcg' name='750cx_v1.0'/>
-  <cpu type='tcg' name='750cxe_v2.2'/>
-  <cpu type='tcg' name='604e_v2.4'/>
-  <cpu type='tcg' name='755_v2.8'/>
-  <cpu type='tcg' name='745_v2.6'/>
-  <cpu type='tcg' name='MPC8548E_v21'/>
-  <cpu type='tcg' name='G2le'/>
-  <cpu type='tcg' name='403GB'/>
-  <cpu type='tcg' name='MPC8545E_v21'/>
-  <cpu type='tcg' name='POWER7_v2.3'/>
-  <cpu type='tcg' name='750_v2.2'/>
-  <cpu type='tcg' name='7450_v1.0'/>
-  <cpu type='tcg' name='MPC5200_v11'/>
-  <cpu type='tcg' name='755_v2.3'/>
-  <cpu type='tcg' name='MPC8347EP'/>
-  <cpu type='tcg' name='7410_v1.1'/>
-  <cpu type='tcg' name='750gl'/>
-  <cpu type='tcg' name='403GCX'/>
-  <cpu type='tcg' name='745_v2.1'/>
-  <cpu type='tcg' name='750p'/>
-  <cpu type='tcg' name='G2'/>
-  <cpu type='tcg' name='MPC8555_v10'/>
-  <cpu type='tcg' name='7445_v3.4'/>
-  <cpu type='tcg' name='MPC8347T'/>
-  <cpu type='tcg' name='603e_v3'/>
-  <cpu type='tcg' name='970_v2.2'/>
-  <cpu type='tcg' name='440-Xilinx'/>
-  <cpu type='tcg' name='740p'/>
-  <cpu type='tcg' name='MPC5200B_v20'/>
-  <cpu type='tcg' name='440EPX'/>
-  <cpu type='tcg' name='603e_v1.1'/>
-  <cpu type='tcg' name='7451_v2.3'/>
-  <cpu type='tcg' name='7450_v2.0'/>
-  <cpu type='tcg' name='7400_v2.8'/>
-  <cpu type='tcg' name='7455_v2.1'/>
-  <cpu type='tcg' name='405GPc'/>
-  <cpu type='tcg' name='MPC8347EAT'/>
-  <cpu type='tcg' name='970mp_v1.1'/>
-  <cpu type='tcg' name='603e7v2'/>
-  <cpu type='tcg' name='604r'/>
-  <cpu type='tcg' name='7447A_v1.2'/>
-  <cpu type='tcg' name='MPC8533E_v11'/>
-  <cpu type='tcg' name='e500v2_v22'/>
-  <cpu type='tcg' name='401F2'/>
-  <cpu type='tcg' name='MPC8343EA'/>
-  <cpu type='tcg' name='7457_v1.2'/>
-  <cpu type='tcg' name='970fx_v3.1'/>
-  <cpu type='tcg' name='7447_v1.0'/>
-  <cpu type='tcg' name='745_v2.5'/>
-  <cpu type='tcg' name='MPC8548E_v20'/>
-  <cpu type='tcg' name='MPC8610'/>
-  <cpu type='tcg' name='750cxe_v2.4b'/>
-  <cpu type='tcg' name='MPC5200_v10'/>
-  <cpu type='tcg' name='403GA'/>
-  <cpu type='tcg' name='7410_v1.0'/>
-  <cpu type='tcg' name='G2leGP3'/>
-  <cpu type='tcg' name='7445_v3.3'/>
-  <cpu type='tcg' name='603e_v4.1'/>
-  <cpu type='tcg' name='440EPa'/>
-  <cpu type='tcg' name='970fx_v2.1'/>
-  <cpu type='tcg' name='MPC8377E'/>
-  <cpu type='tcg' name='750fx_v2.1'/>
-  <cpu type='tcg' name='601_v0'/>
-  <cpu type='tcg' name='STB04'/>
-  <cpu type='tcg' name='745_v1.0'/>
-  <cpu type='tcg' name='G2HiP4'/>
-  <cpu type='tcg' name='750cl_v2.0'/>
-  <cpu type='tcg' name='750cxr'/>
-  <cpu type='tcg' name='MPC8349EA'/>
-  <cpu type='tcg' name='750cxe_v3.1'/>
-  <cpu type='tcg' name='MPC8379'/>
-  <cpu type='tcg' name='401'/>
-  <cpu type='tcg' name='MPC8568'/>
-  <cpu type='tcg' name='e300c2'/>
-  <cpu type='tcg' name='750_v3.1'/>
-  <cpu type='tcg' name='MPC8544E_v11'/>
-  <cpu type='tcg' name='405GPb'/>
-  <cpu type='tcg' name='MPC8541E_v11'/>
+  <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' typename=''/>
+  <cpu type='kvm' name='750cl_v1.0' typename=''/>
+  <cpu type='kvm' name='750cxe_v2.1' typename=''/>
+  <cpu type='kvm' name='755_v2.7' typename=''/>
+  <cpu type='kvm' name='MPC8347ET' typename=''/>
+  <cpu type='kvm' name='MPC8545E_v20' typename=''/>
+  <cpu type='kvm' name='750_v2.1' typename=''/>
+  <cpu type='kvm' name='755_v2.2' typename=''/>
+  <cpu type='kvm' name='745_v2.0' typename=''/>
+  <cpu type='kvm' name='7455_v1.0' typename=''/>
+  <cpu type='kvm' name='MPC8547E_v21' typename=''/>
+  <cpu type='kvm' name='STB25' typename=''/>
+  <cpu type='kvm' name='POWER8_v2.0' typename=''/>
+  <cpu type='kvm' name='401G2' typename=''/>
+  <cpu type='kvm' name='MPC8349A' typename=''/>
+  <cpu type='kvm' name='750e' typename=''/>
+  <cpu type='kvm' name='MPC8545_v21' typename=''/>
+  <cpu type='kvm' name='MPC8548_v11' typename=''/>
+  <cpu type='kvm' name='970fx_v2.0' typename=''/>
+  <cpu type='kvm' name='750fx_v2.0' typename=''/>
+  <cpu type='kvm' name='POWER8E_v2.1' typename=''/>
+  <cpu type='kvm' name='Cobra' typename=''/>
+  <cpu type='kvm' name='603p' typename=''/>
+  <cpu type='kvm' name='7400_v2.7' typename=''/>
+  <cpu type='kvm' name='MPC8378E' typename=''/>
+  <cpu type='kvm' name='e500v2_v10' typename=''/>
+  <cpu type='kvm' name='e500mc' typename=''/>
+  <cpu type='kvm' name='603e7v1' typename=''/>
+  <cpu type='kvm' name='970mp_v1.0' typename=''/>
+  <cpu type='kvm' name='MPC8555E_v11' typename=''/>
+  <cpu type='kvm' name='440-Xilinx-w-dfpu' typename=''/>
+  <cpu type='kvm' name='740e' typename=''/>
+  <cpu type='kvm' name='405CRc' typename=''/>
+  <cpu type='kvm' name='7447A_v1.1' typename=''/>
+  <cpu type='kvm' name='MPC8533E_v10' typename=''/>
+  <cpu type='kvm' name='MPC8543_v11' typename=''/>
+  <cpu type='kvm' name='7400_v2.2' typename=''/>
+  <cpu type='kvm' name='MPC8540_v21' typename=''/>
+  <cpu type='kvm' name='e500v2_v21' typename=''/>
+  <cpu type='kvm' name='e300c1' typename=''/>
+  <cpu type='kvm' name='970fx_v1.0' typename=''/>
+  <cpu type='kvm' name='750gx_v1.2' typename=''/>
+  <cpu type='kvm' name='750fx_v1.0' typename=''/>
+  <cpu type='kvm' name='MPC8641' typename=''/>
+  <cpu type='kvm' name='MPC8544E_v10' typename=''/>
+  <cpu type='kvm' name='405D4' typename=''/>
+  <cpu type='kvm' name='7457_v1.1' typename=''/>
+  <cpu type='kvm' name='970fx_v3.0' typename=''/>
+  <cpu type='kvm' name='604e_v2.2' typename=''/>
+  <cpu type='kvm' name='755_v2.6' typename=''/>
+  <cpu type='kvm' name='Npe4GS3' typename=''/>
+  <cpu type='kvm' name='7410_v1.4' typename=''/>
+  <cpu type='kvm' name='750_v2.0' typename=''/>
+  <cpu type='kvm' name='7445_v3.2' typename=''/>
+  <cpu type='kvm' name='745_v2.4' typename=''/>
+  <cpu type='kvm' name='750l_v3.2' typename=''/>
+  <cpu type='kvm' name='MPC8540_v10' typename=''/>
+  <cpu type='kvm' name='750_v1.0' typename=''/>
+  <cpu type='kvm' name='STB03' typename=''/>
+  <cpu type='kvm' name='MPC8343A' typename=''/>
+  <cpu type='kvm' name='MPC8378' typename=''/>
+  <cpu type='kvm' name='G2HiP3' typename=''/>
+  <cpu type='kvm' name='750cxe_v3.0' typename=''/>
+  <cpu type='kvm' name='e500_v10' typename=''/>
+  <cpu type='kvm' name='755_v1.1' typename=''/>
+  <cpu type='kvm' name='MPC8567' typename=''/>
+  <cpu type='kvm' name='MPC8545_v20' typename=''/>
+  <cpu type='kvm' name='MPC8548_v10' typename=''/>
+  <cpu type='kvm' name='Npe405H' typename=''/>
+  <cpu type='kvm' name='603e7v' typename=''/>
+  <cpu type='kvm' name='750_v3.0' typename=''/>
+  <cpu type='kvm' name='Npe405H2' typename=''/>
+  <cpu type='kvm' name='7400_v2.6' typename=''/>
+  <cpu type='kvm' name='405GPa' typename=''/>
+  <cpu type='kvm' name='MPC8548_v21' typename=''/>
+  <cpu type='kvm' name='MPC8541E_v10' typename=''/>
+  <cpu type='kvm' name='750l_v2.2' typename=''/>
+  <cpu type='kvm' name='MPC8555E_v10' typename=''/>
+  <cpu type='kvm' name='7457A_v1.1' typename=''/>
+  <cpu type='kvm' name='e200z6' typename=''/>
+  <cpu type='kvm' name='MPC8379E' typename=''/>
+  <cpu type='kvm' name='e500v2_v20' typename=''/>
+  <cpu type='kvm' name='MPC8347AP' typename=''/>
+  <cpu type='kvm' name='401B2' typename=''/>
+  <cpu type='kvm' name='MPC8349E' typename=''/>
+  <cpu type='kvm' name='755_v2.1' typename=''/>
+  <cpu type='kvm' name='MPC8543_v21' typename=''/>
+  <cpu type='kvm' name='745_v2.8' typename=''/>
+  <cpu type='kvm' name='MPC8547E_v20' typename=''/>
+  <cpu type='kvm' name='7455_v3.4' typename=''/>
+  <cpu type='kvm' name='7448_v1.1' typename=''/>
+  <cpu type='kvm' name='740_v2.2' typename=''/>
+  <cpu type='kvm' name='7400_v1.1' typename=''/>
+  <cpu type='kvm' name='MPC8567E' typename=''/>
+  <cpu type='kvm' name='7441_v2.10' typename=''/>
+  <cpu type='kvm' name='603e_v1.4' typename=''/>
+  <cpu type='kvm' name='G2leGP1' typename=''/>
+  <cpu type='kvm' name='7451_v2.10' typename=''/>
+  <cpu type='kvm' name='MPC8343E' typename=''/>
+  <cpu type='kvm' name='750cx_v2.2' typename=''/>
+  <cpu type='kvm' name='Npe405L' typename=''/>
+  <cpu type='kvm' name='603e7' typename=''/>
+  <cpu type='kvm' name='401A1' typename=''/>
+  <cpu type='kvm' name='MPC8377' typename=''/>
+  <cpu type='kvm' name='7448_v2.1' typename=''/>
+  <cpu type='kvm' name='7441_v2.3' typename=''/>
+  <cpu type='kvm' name='7400_v2.1' typename=''/>
+  <cpu type='kvm' name='405CRb' typename=''/>
+  <cpu type='kvm' name='604' typename=''/>
+  <cpu type='kvm' name='MPC8540_v20' typename=''/>
+  <cpu type='kvm' name='MPC8543_v10' typename=''/>
+  <cpu type='kvm' name='7445_v2.1' typename=''/>
+  <cpu type='kvm' name='e500_v20' typename=''/>
+  <cpu type='kvm' name='750gx_v1.1' typename=''/>
+  <cpu type='kvm' name='7447A_v1.0' typename=''/>
+  <cpu type='kvm' name='750cxe_v2.4' typename=''/>
+  <cpu type='kvm' name='MPC8548_v20' typename=''/>
+  <cpu type='kvm' name='MPC8543E_v11' typename=''/>
+  <cpu type='kvm' name='MPC8347AT' typename=''/>
+  <cpu type='kvm' name='POWER8NVL_v1.0' typename=''/>
+  <cpu type='kvm' name='7457A_v1.0' typename=''/>
+  <cpu type='kvm' name='7457_v1.0' typename=''/>
+  <cpu type='kvm' name='7450_v1.2' typename=''/>
+  <cpu type='kvm' name='MPC8572' typename=''/>
+  <cpu type='kvm' name='755_v2.5' typename=''/>
+  <cpu type='kvm' name='7410_v1.3' typename=''/>
+  <cpu type='kvm' name='745_v2.3' typename=''/>
+  <cpu type='kvm' name='750l_v2.1' typename=''/>
+  <cpu type='kvm' name='405GPR' typename=''/>
+  <cpu type='kvm' name='755_v2.0' typename=''/>
+  <cpu type='kvm' name='MPC8541_v11' typename=''/>
+  <cpu type='kvm' name='401C2' typename=''/>
+  <cpu type='kvm' name='e500v2_v30' typename=''/>
+  <cpu type='kvm' name='7455_v3.3' typename=''/>
+  <cpu type='kvm' name='405EZ' typename=''/>
+  <cpu type='kvm' name='MPC8568E' typename=''/>
+  <cpu type='kvm' name='755_v1.0' typename=''/>
+  <cpu type='kvm' name='603e_v1.3' typename=''/>
+  <cpu type='kvm' name='MPC8560_v10' typename=''/>
+  <cpu type='kvm' name='host' typename=''/>
+  <cpu type='kvm' name='MPC8560_v21' typename=''/>
+  <cpu type='kvm' name='G2H4' typename=''/>
+  <cpu type='kvm' name='MPC8533_v11' typename=''/>
+  <cpu type='kvm' name='740_v3.1' typename=''/>
+  <cpu type='kvm' name='e200z5' typename=''/>
+  <cpu type='kvm' name='MPC8349' typename=''/>
+  <cpu type='kvm' name='7400_v2.0' typename=''/>
+  <cpu type='kvm' name='405CRa' typename=''/>
+  <cpu type='kvm' name='MPC8543E_v10' typename=''/>
+  <cpu type='kvm' name='MPC8543E_v21' typename=''/>
+  <cpu type='kvm' name='750cxe_v2.3' typename=''/>
+  <cpu type='kvm' name='MPC8543_v20' typename=''/>
+  <cpu type='kvm' name='745_v2.7' typename=''/>
+  <cpu type='kvm' name='403GC' typename=''/>
+  <cpu type='kvm' name='e5500' typename=''/>
+  <cpu type='kvm' name='7448_v1.0' typename=''/>
+  <cpu type='kvm' name='MPC5200_v12' typename=''/>
+  <cpu type='kvm' name='740_v2.1' typename=''/>
+  <cpu type='kvm' name='745_v2.2' typename=''/>
+  <cpu type='kvm' name='7400_v1.0' typename=''/>
+  <cpu type='kvm' name='7410_v1.2' typename=''/>
+  <cpu type='kvm' name='x2vp4' typename=''/>
+  <cpu type='kvm' name='MPC8555_v11' typename=''/>
+  <cpu type='kvm' name='MPC8541_v10' typename=''/>
+  <cpu type='kvm' name='405LP' typename=''/>
+  <cpu type='kvm' name='750fx_v2.3' typename=''/>
+  <cpu type='kvm' name='405EP' typename=''/>
+  <cpu type='kvm' name='601_v2' typename=''/>
+  <cpu type='kvm' name='MPC8544_v11' typename=''/>
+  <cpu type='kvm' name='401D2' typename=''/>
+  <cpu type='kvm' name='MPC8572E' typename=''/>
+  <cpu type='kvm' name='604e_v1.0' typename=''/>
+  <cpu type='kvm' name='750cx_v2.1' typename=''/>
+  <cpu type='kvm' name='MPC5200B_v21' typename=''/>
+  <cpu type='kvm' name='750l_v3.0' typename=''/>
+  <cpu type='kvm' name='e300c4' typename=''/>
+  <cpu type='kvm' name='7448_v2.0' typename=''/>
+  <cpu type='kvm' name='7450_v2.1' typename=''/>
+  <cpu type='kvm' name='G2leGP' typename=''/>
+  <cpu type='kvm' name='750cxe_v3.1b' typename=''/>
+  <cpu type='kvm' name='7400_v2.9' typename=''/>
+  <cpu type='kvm' name='G2GP' typename=''/>
+  <cpu type='kvm' name='603' typename=''/>
+  <cpu type='kvm' name='405GPd' typename=''/>
+  <cpu type='kvm' name='MPC8548E_v11' typename=''/>
+  <cpu type='kvm' name='603e7t' typename=''/>
+  <cpu type='kvm' name='IOP480' typename=''/>
+  <cpu type='kvm' name='750gx_v1.0' typename=''/>
+  <cpu type='kvm' name='MPC8560_v20' typename=''/>
+  <cpu type='kvm' name='405D2' typename=''/>
+  <cpu type='kvm' name='750fl' typename=''/>
+  <cpu type='kvm' name='750l_v2.0' typename=''/>
+  <cpu type='kvm' name='x2vp20' typename=''/>
+  <cpu type='kvm' name='e600' typename=''/>
+  <cpu type='kvm' name='7450_v1.1' typename=''/>
+  <cpu type='kvm' name='755_v2.4' typename=''/>
+  <cpu type='kvm' name='7445_v1.0' typename=''/>
+  <cpu type='kvm' name='G2LS' typename=''/>
+  <cpu type='kvm' name='MPC8543E_v20' typename=''/>
+  <cpu type='kvm' name='603e_v2.2' typename=''/>
+  <cpu type='kvm' name='7447_v1.1' typename=''/>
+  <cpu type='kvm' name='603e_v4' typename=''/>
+  <cpu type='kvm' name='7455_v3.2' typename=''/>
+  <cpu type='kvm' name='740_v2.0' typename=''/>
+  <cpu type='kvm' name='MPC8347P' typename=''/>
+  <cpu type='kvm' name='440EPb' typename=''/>
+  <cpu type='kvm' name='MPC603' typename=''/>
+  <cpu type='kvm' name='603e_v1.2' typename=''/>
+  <cpu type='kvm' name='750fx_v2.2' typename=''/>
+  <cpu type='kvm' name='POWER9_v1.0' typename=''/>
+  <cpu type='kvm' name='740_v1.0' typename=''/>
+  <cpu type='kvm' name='MPC8544_v10' typename=''/>
+  <cpu type='kvm' name='601_v1' typename=''/>
+  <cpu type='kvm' name='745_v1.1' typename=''/>
+  <cpu type='kvm' name='POWER7+_v2.1' typename=''/>
+  <cpu type='kvm' name='750cx_v2.0' typename=''/>
+  <cpu type='kvm' name='MPC8347EAP' typename=''/>
+  <cpu type='kvm' name='401E2' typename=''/>
+  <cpu type='kvm' name='MPC8641D' typename=''/>
+  <cpu type='kvm' name='e300c3' typename=''/>
+  <cpu type='kvm' name='MPC8533_v10' typename=''/>
+  <cpu type='kvm' name='7441_v2.1' typename=''/>
+  <cpu type='kvm' name='740_v3.0' typename=''/>
+  <cpu type='kvm' name='POWER5+_v2.1' typename=''/>
+  <cpu type='kvm' name='602' typename=''/>
+  <cpu type='kvm' name='MPC8548E_v10' typename=''/>
+  <cpu type='kvm' name='G2leLS' typename=''/>
+  <cpu type='kvm' name='MPC8343' typename=''/>
+  <cpu type='kvm' name='750cx_v1.0' typename=''/>
+  <cpu type='kvm' name='750cxe_v2.2' typename=''/>
+  <cpu type='kvm' name='604e_v2.4' typename=''/>
+  <cpu type='kvm' name='755_v2.8' typename=''/>
+  <cpu type='kvm' name='745_v2.6' typename=''/>
+  <cpu type='kvm' name='MPC8548E_v21' typename=''/>
+  <cpu type='kvm' name='G2le' typename=''/>
+  <cpu type='kvm' name='403GB' typename=''/>
+  <cpu type='kvm' name='MPC8545E_v21' typename=''/>
+  <cpu type='kvm' name='POWER7_v2.3' typename=''/>
+  <cpu type='kvm' name='750_v2.2' typename=''/>
+  <cpu type='kvm' name='7450_v1.0' typename=''/>
+  <cpu type='kvm' name='MPC5200_v11' typename=''/>
+  <cpu type='kvm' name='755_v2.3' typename=''/>
+  <cpu type='kvm' name='MPC8347EP' typename=''/>
+  <cpu type='kvm' name='7410_v1.1' typename=''/>
+  <cpu type='kvm' name='750gl' typename=''/>
+  <cpu type='kvm' name='403GCX' typename=''/>
+  <cpu type='kvm' name='745_v2.1' typename=''/>
+  <cpu type='kvm' name='750p' typename=''/>
+  <cpu type='kvm' name='G2' typename=''/>
+  <cpu type='kvm' name='MPC8555_v10' typename=''/>
+  <cpu type='kvm' name='7445_v3.4' typename=''/>
+  <cpu type='kvm' name='MPC8347T' typename=''/>
+  <cpu type='kvm' name='603e_v3' typename=''/>
+  <cpu type='kvm' name='970_v2.2' typename=''/>
+  <cpu type='kvm' name='440-Xilinx' typename=''/>
+  <cpu type='kvm' name='740p' typename=''/>
+  <cpu type='kvm' name='MPC5200B_v20' typename=''/>
+  <cpu type='kvm' name='440EPX' typename=''/>
+  <cpu type='kvm' name='603e_v1.1' typename=''/>
+  <cpu type='kvm' name='7451_v2.3' typename=''/>
+  <cpu type='kvm' name='7450_v2.0' typename=''/>
+  <cpu type='kvm' name='7400_v2.8' typename=''/>
+  <cpu type='kvm' name='7455_v2.1' typename=''/>
+  <cpu type='kvm' name='405GPc' typename=''/>
+  <cpu type='kvm' name='MPC8347EAT' typename=''/>
+  <cpu type='kvm' name='970mp_v1.1' typename=''/>
+  <cpu type='kvm' name='603e7v2' typename=''/>
+  <cpu type='kvm' name='604r' typename=''/>
+  <cpu type='kvm' name='7447A_v1.2' typename=''/>
+  <cpu type='kvm' name='MPC8533E_v11' typename=''/>
+  <cpu type='kvm' name='e500v2_v22' typename=''/>
+  <cpu type='kvm' name='401F2' typename=''/>
+  <cpu type='kvm' name='MPC8343EA' typename=''/>
+  <cpu type='kvm' name='7457_v1.2' typename=''/>
+  <cpu type='kvm' name='970fx_v3.1' typename=''/>
+  <cpu type='kvm' name='7447_v1.0' typename=''/>
+  <cpu type='kvm' name='745_v2.5' typename=''/>
+  <cpu type='kvm' name='MPC8548E_v20' typename=''/>
+  <cpu type='kvm' name='MPC8610' typename=''/>
+  <cpu type='kvm' name='750cxe_v2.4b' typename=''/>
+  <cpu type='kvm' name='MPC5200_v10' typename=''/>
+  <cpu type='kvm' name='403GA' typename=''/>
+  <cpu type='kvm' name='7410_v1.0' typename=''/>
+  <cpu type='kvm' name='G2leGP3' typename=''/>
+  <cpu type='kvm' name='7445_v3.3' typename=''/>
+  <cpu type='kvm' name='603e_v4.1' typename=''/>
+  <cpu type='kvm' name='440EPa' typename=''/>
+  <cpu type='kvm' name='970fx_v2.1' typename=''/>
+  <cpu type='kvm' name='MPC8377E' typename=''/>
+  <cpu type='kvm' name='750fx_v2.1' typename=''/>
+  <cpu type='kvm' name='601_v0' typename=''/>
+  <cpu type='kvm' name='STB04' typename=''/>
+  <cpu type='kvm' name='745_v1.0' typename=''/>
+  <cpu type='kvm' name='G2HiP4' typename=''/>
+  <cpu type='kvm' name='750cl_v2.0' typename=''/>
+  <cpu type='kvm' name='750cxr' typename=''/>
+  <cpu type='kvm' name='MPC8349EA' typename=''/>
+  <cpu type='kvm' name='750cxe_v3.1' typename=''/>
+  <cpu type='kvm' name='MPC8379' typename=''/>
+  <cpu type='kvm' name='401' typename=''/>
+  <cpu type='kvm' name='MPC8568' typename=''/>
+  <cpu type='kvm' name='e300c2' typename=''/>
+  <cpu type='kvm' name='750_v3.1' typename=''/>
+  <cpu type='kvm' name='MPC8544E_v11' typename=''/>
+  <cpu type='kvm' name='405GPb' typename=''/>
+  <cpu type='kvm' name='MPC8541E_v11' typename=''/>
+  <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' typename=''/>
+  <cpu type='tcg' name='750cl_v1.0' typename=''/>
+  <cpu type='tcg' name='750cxe_v2.1' typename=''/>
+  <cpu type='tcg' name='755_v2.7' typename=''/>
+  <cpu type='tcg' name='MPC8347ET' typename=''/>
+  <cpu type='tcg' name='MPC8545E_v20' typename=''/>
+  <cpu type='tcg' name='750_v2.1' typename=''/>
+  <cpu type='tcg' name='755_v2.2' typename=''/>
+  <cpu type='tcg' name='745_v2.0' typename=''/>
+  <cpu type='tcg' name='7455_v1.0' typename=''/>
+  <cpu type='tcg' name='MPC8547E_v21' typename=''/>
+  <cpu type='tcg' name='STB25' typename=''/>
+  <cpu type='tcg' name='POWER8_v2.0' typename=''/>
+  <cpu type='tcg' name='401G2' typename=''/>
+  <cpu type='tcg' name='MPC8349A' typename=''/>
+  <cpu type='tcg' name='750e' typename=''/>
+  <cpu type='tcg' name='MPC8545_v21' typename=''/>
+  <cpu type='tcg' name='MPC8548_v11' typename=''/>
+  <cpu type='tcg' name='970fx_v2.0' typename=''/>
+  <cpu type='tcg' name='750fx_v2.0' typename=''/>
+  <cpu type='tcg' name='POWER8E_v2.1' typename=''/>
+  <cpu type='tcg' name='Cobra' typename=''/>
+  <cpu type='tcg' name='603p' typename=''/>
+  <cpu type='tcg' name='7400_v2.7' typename=''/>
+  <cpu type='tcg' name='MPC8378E' typename=''/>
+  <cpu type='tcg' name='e500v2_v10' typename=''/>
+  <cpu type='tcg' name='e500mc' typename=''/>
+  <cpu type='tcg' name='603e7v1' typename=''/>
+  <cpu type='tcg' name='970mp_v1.0' typename=''/>
+  <cpu type='tcg' name='MPC8555E_v11' typename=''/>
+  <cpu type='tcg' name='440-Xilinx-w-dfpu' typename=''/>
+  <cpu type='tcg' name='740e' typename=''/>
+  <cpu type='tcg' name='405CRc' typename=''/>
+  <cpu type='tcg' name='7447A_v1.1' typename=''/>
+  <cpu type='tcg' name='MPC8533E_v10' typename=''/>
+  <cpu type='tcg' name='MPC8543_v11' typename=''/>
+  <cpu type='tcg' name='7400_v2.2' typename=''/>
+  <cpu type='tcg' name='MPC8540_v21' typename=''/>
+  <cpu type='tcg' name='e500v2_v21' typename=''/>
+  <cpu type='tcg' name='e300c1' typename=''/>
+  <cpu type='tcg' name='970fx_v1.0' typename=''/>
+  <cpu type='tcg' name='750gx_v1.2' typename=''/>
+  <cpu type='tcg' name='750fx_v1.0' typename=''/>
+  <cpu type='tcg' name='MPC8641' typename=''/>
+  <cpu type='tcg' name='MPC8544E_v10' typename=''/>
+  <cpu type='tcg' name='405D4' typename=''/>
+  <cpu type='tcg' name='7457_v1.1' typename=''/>
+  <cpu type='tcg' name='970fx_v3.0' typename=''/>
+  <cpu type='tcg' name='604e_v2.2' typename=''/>
+  <cpu type='tcg' name='755_v2.6' typename=''/>
+  <cpu type='tcg' name='Npe4GS3' typename=''/>
+  <cpu type='tcg' name='7410_v1.4' typename=''/>
+  <cpu type='tcg' name='750_v2.0' typename=''/>
+  <cpu type='tcg' name='7445_v3.2' typename=''/>
+  <cpu type='tcg' name='745_v2.4' typename=''/>
+  <cpu type='tcg' name='750l_v3.2' typename=''/>
+  <cpu type='tcg' name='MPC8540_v10' typename=''/>
+  <cpu type='tcg' name='750_v1.0' typename=''/>
+  <cpu type='tcg' name='STB03' typename=''/>
+  <cpu type='tcg' name='MPC8343A' typename=''/>
+  <cpu type='tcg' name='MPC8378' typename=''/>
+  <cpu type='tcg' name='G2HiP3' typename=''/>
+  <cpu type='tcg' name='750cxe_v3.0' typename=''/>
+  <cpu type='tcg' name='e500_v10' typename=''/>
+  <cpu type='tcg' name='755_v1.1' typename=''/>
+  <cpu type='tcg' name='MPC8567' typename=''/>
+  <cpu type='tcg' name='MPC8545_v20' typename=''/>
+  <cpu type='tcg' name='MPC8548_v10' typename=''/>
+  <cpu type='tcg' name='Npe405H' typename=''/>
+  <cpu type='tcg' name='603e7v' typename=''/>
+  <cpu type='tcg' name='750_v3.0' typename=''/>
+  <cpu type='tcg' name='Npe405H2' typename=''/>
+  <cpu type='tcg' name='7400_v2.6' typename=''/>
+  <cpu type='tcg' name='405GPa' typename=''/>
+  <cpu type='tcg' name='MPC8548_v21' typename=''/>
+  <cpu type='tcg' name='MPC8541E_v10' typename=''/>
+  <cpu type='tcg' name='750l_v2.2' typename=''/>
+  <cpu type='tcg' name='MPC8555E_v10' typename=''/>
+  <cpu type='tcg' name='7457A_v1.1' typename=''/>
+  <cpu type='tcg' name='e200z6' typename=''/>
+  <cpu type='tcg' name='MPC8379E' typename=''/>
+  <cpu type='tcg' name='e500v2_v20' typename=''/>
+  <cpu type='tcg' name='MPC8347AP' typename=''/>
+  <cpu type='tcg' name='401B2' typename=''/>
+  <cpu type='tcg' name='MPC8349E' typename=''/>
+  <cpu type='tcg' name='755_v2.1' typename=''/>
+  <cpu type='tcg' name='MPC8543_v21' typename=''/>
+  <cpu type='tcg' name='745_v2.8' typename=''/>
+  <cpu type='tcg' name='MPC8547E_v20' typename=''/>
+  <cpu type='tcg' name='7455_v3.4' typename=''/>
+  <cpu type='tcg' name='7448_v1.1' typename=''/>
+  <cpu type='tcg' name='740_v2.2' typename=''/>
+  <cpu type='tcg' name='7400_v1.1' typename=''/>
+  <cpu type='tcg' name='MPC8567E' typename=''/>
+  <cpu type='tcg' name='7441_v2.10' typename=''/>
+  <cpu type='tcg' name='603e_v1.4' typename=''/>
+  <cpu type='tcg' name='G2leGP1' typename=''/>
+  <cpu type='tcg' name='7451_v2.10' typename=''/>
+  <cpu type='tcg' name='MPC8343E' typename=''/>
+  <cpu type='tcg' name='750cx_v2.2' typename=''/>
+  <cpu type='tcg' name='Npe405L' typename=''/>
+  <cpu type='tcg' name='603e7' typename=''/>
+  <cpu type='tcg' name='401A1' typename=''/>
+  <cpu type='tcg' name='MPC8377' typename=''/>
+  <cpu type='tcg' name='7448_v2.1' typename=''/>
+  <cpu type='tcg' name='7441_v2.3' typename=''/>
+  <cpu type='tcg' name='7400_v2.1' typename=''/>
+  <cpu type='tcg' name='405CRb' typename=''/>
+  <cpu type='tcg' name='604' typename=''/>
+  <cpu type='tcg' name='MPC8540_v20' typename=''/>
+  <cpu type='tcg' name='MPC8543_v10' typename=''/>
+  <cpu type='tcg' name='7445_v2.1' typename=''/>
+  <cpu type='tcg' name='e500_v20' typename=''/>
+  <cpu type='tcg' name='750gx_v1.1' typename=''/>
+  <cpu type='tcg' name='7447A_v1.0' typename=''/>
+  <cpu type='tcg' name='750cxe_v2.4' typename=''/>
+  <cpu type='tcg' name='MPC8548_v20' typename=''/>
+  <cpu type='tcg' name='MPC8543E_v11' typename=''/>
+  <cpu type='tcg' name='MPC8347AT' typename=''/>
+  <cpu type='tcg' name='POWER8NVL_v1.0' typename=''/>
+  <cpu type='tcg' name='7457A_v1.0' typename=''/>
+  <cpu type='tcg' name='7457_v1.0' typename=''/>
+  <cpu type='tcg' name='7450_v1.2' typename=''/>
+  <cpu type='tcg' name='MPC8572' typename=''/>
+  <cpu type='tcg' name='755_v2.5' typename=''/>
+  <cpu type='tcg' name='7410_v1.3' typename=''/>
+  <cpu type='tcg' name='745_v2.3' typename=''/>
+  <cpu type='tcg' name='750l_v2.1' typename=''/>
+  <cpu type='tcg' name='405GPR' typename=''/>
+  <cpu type='tcg' name='755_v2.0' typename=''/>
+  <cpu type='tcg' name='MPC8541_v11' typename=''/>
+  <cpu type='tcg' name='401C2' typename=''/>
+  <cpu type='tcg' name='e500v2_v30' typename=''/>
+  <cpu type='tcg' name='7455_v3.3' typename=''/>
+  <cpu type='tcg' name='405EZ' typename=''/>
+  <cpu type='tcg' name='MPC8568E' typename=''/>
+  <cpu type='tcg' name='755_v1.0' typename=''/>
+  <cpu type='tcg' name='603e_v1.3' typename=''/>
+  <cpu type='tcg' name='MPC8560_v10' typename=''/>
+  <cpu type='tcg' name='MPC8560_v21' typename=''/>
+  <cpu type='tcg' name='G2H4' typename=''/>
+  <cpu type='tcg' name='MPC8533_v11' typename=''/>
+  <cpu type='tcg' name='740_v3.1' typename=''/>
+  <cpu type='tcg' name='e200z5' typename=''/>
+  <cpu type='tcg' name='MPC8349' typename=''/>
+  <cpu type='tcg' name='7400_v2.0' typename=''/>
+  <cpu type='tcg' name='405CRa' typename=''/>
+  <cpu type='tcg' name='MPC8543E_v10' typename=''/>
+  <cpu type='tcg' name='MPC8543E_v21' typename=''/>
+  <cpu type='tcg' name='750cxe_v2.3' typename=''/>
+  <cpu type='tcg' name='MPC8543_v20' typename=''/>
+  <cpu type='tcg' name='745_v2.7' typename=''/>
+  <cpu type='tcg' name='403GC' typename=''/>
+  <cpu type='tcg' name='e5500' typename=''/>
+  <cpu type='tcg' name='7448_v1.0' typename=''/>
+  <cpu type='tcg' name='MPC5200_v12' typename=''/>
+  <cpu type='tcg' name='740_v2.1' typename=''/>
+  <cpu type='tcg' name='745_v2.2' typename=''/>
+  <cpu type='tcg' name='7400_v1.0' typename=''/>
+  <cpu type='tcg' name='7410_v1.2' typename=''/>
+  <cpu type='tcg' name='x2vp4' typename=''/>
+  <cpu type='tcg' name='MPC8555_v11' typename=''/>
+  <cpu type='tcg' name='MPC8541_v10' typename=''/>
+  <cpu type='tcg' name='405LP' typename=''/>
+  <cpu type='tcg' name='750fx_v2.3' typename=''/>
+  <cpu type='tcg' name='405EP' typename=''/>
+  <cpu type='tcg' name='601_v2' typename=''/>
+  <cpu type='tcg' name='MPC8544_v11' typename=''/>
+  <cpu type='tcg' name='401D2' typename=''/>
+  <cpu type='tcg' name='MPC8572E' typename=''/>
+  <cpu type='tcg' name='604e_v1.0' typename=''/>
+  <cpu type='tcg' name='750cx_v2.1' typename=''/>
+  <cpu type='tcg' name='MPC5200B_v21' typename=''/>
+  <cpu type='tcg' name='750l_v3.0' typename=''/>
+  <cpu type='tcg' name='e300c4' typename=''/>
+  <cpu type='tcg' name='7448_v2.0' typename=''/>
+  <cpu type='tcg' name='7450_v2.1' typename=''/>
+  <cpu type='tcg' name='G2leGP' typename=''/>
+  <cpu type='tcg' name='750cxe_v3.1b' typename=''/>
+  <cpu type='tcg' name='7400_v2.9' typename=''/>
+  <cpu type='tcg' name='G2GP' typename=''/>
+  <cpu type='tcg' name='603' typename=''/>
+  <cpu type='tcg' name='405GPd' typename=''/>
+  <cpu type='tcg' name='MPC8548E_v11' typename=''/>
+  <cpu type='tcg' name='603e7t' typename=''/>
+  <cpu type='tcg' name='IOP480' typename=''/>
+  <cpu type='tcg' name='750gx_v1.0' typename=''/>
+  <cpu type='tcg' name='MPC8560_v20' typename=''/>
+  <cpu type='tcg' name='405D2' typename=''/>
+  <cpu type='tcg' name='750fl' typename=''/>
+  <cpu type='tcg' name='750l_v2.0' typename=''/>
+  <cpu type='tcg' name='x2vp20' typename=''/>
+  <cpu type='tcg' name='e600' typename=''/>
+  <cpu type='tcg' name='7450_v1.1' typename=''/>
+  <cpu type='tcg' name='755_v2.4' typename=''/>
+  <cpu type='tcg' name='7445_v1.0' typename=''/>
+  <cpu type='tcg' name='G2LS' typename=''/>
+  <cpu type='tcg' name='MPC8543E_v20' typename=''/>
+  <cpu type='tcg' name='603e_v2.2' typename=''/>
+  <cpu type='tcg' name='7447_v1.1' typename=''/>
+  <cpu type='tcg' name='603e_v4' typename=''/>
+  <cpu type='tcg' name='7455_v3.2' typename=''/>
+  <cpu type='tcg' name='740_v2.0' typename=''/>
+  <cpu type='tcg' name='MPC8347P' typename=''/>
+  <cpu type='tcg' name='440EPb' typename=''/>
+  <cpu type='tcg' name='MPC603' typename=''/>
+  <cpu type='tcg' name='603e_v1.2' typename=''/>
+  <cpu type='tcg' name='750fx_v2.2' typename=''/>
+  <cpu type='tcg' name='POWER9_v1.0' typename=''/>
+  <cpu type='tcg' name='740_v1.0' typename=''/>
+  <cpu type='tcg' name='MPC8544_v10' typename=''/>
+  <cpu type='tcg' name='601_v1' typename=''/>
+  <cpu type='tcg' name='745_v1.1' typename=''/>
+  <cpu type='tcg' name='POWER7+_v2.1' typename=''/>
+  <cpu type='tcg' name='750cx_v2.0' typename=''/>
+  <cpu type='tcg' name='MPC8347EAP' typename=''/>
+  <cpu type='tcg' name='401E2' typename=''/>
+  <cpu type='tcg' name='MPC8641D' typename=''/>
+  <cpu type='tcg' name='e300c3' typename=''/>
+  <cpu type='tcg' name='MPC8533_v10' typename=''/>
+  <cpu type='tcg' name='7441_v2.1' typename=''/>
+  <cpu type='tcg' name='740_v3.0' typename=''/>
+  <cpu type='tcg' name='POWER5+_v2.1' typename=''/>
+  <cpu type='tcg' name='602' typename=''/>
+  <cpu type='tcg' name='MPC8548E_v10' typename=''/>
+  <cpu type='tcg' name='G2leLS' typename=''/>
+  <cpu type='tcg' name='MPC8343' typename=''/>
+  <cpu type='tcg' name='750cx_v1.0' typename=''/>
+  <cpu type='tcg' name='750cxe_v2.2' typename=''/>
+  <cpu type='tcg' name='604e_v2.4' typename=''/>
+  <cpu type='tcg' name='755_v2.8' typename=''/>
+  <cpu type='tcg' name='745_v2.6' typename=''/>
+  <cpu type='tcg' name='MPC8548E_v21' typename=''/>
+  <cpu type='tcg' name='G2le' typename=''/>
+  <cpu type='tcg' name='403GB' typename=''/>
+  <cpu type='tcg' name='MPC8545E_v21' typename=''/>
+  <cpu type='tcg' name='POWER7_v2.3' typename=''/>
+  <cpu type='tcg' name='750_v2.2' typename=''/>
+  <cpu type='tcg' name='7450_v1.0' typename=''/>
+  <cpu type='tcg' name='MPC5200_v11' typename=''/>
+  <cpu type='tcg' name='755_v2.3' typename=''/>
+  <cpu type='tcg' name='MPC8347EP' typename=''/>
+  <cpu type='tcg' name='7410_v1.1' typename=''/>
+  <cpu type='tcg' name='750gl' typename=''/>
+  <cpu type='tcg' name='403GCX' typename=''/>
+  <cpu type='tcg' name='745_v2.1' typename=''/>
+  <cpu type='tcg' name='750p' typename=''/>
+  <cpu type='tcg' name='G2' typename=''/>
+  <cpu type='tcg' name='MPC8555_v10' typename=''/>
+  <cpu type='tcg' name='7445_v3.4' typename=''/>
+  <cpu type='tcg' name='MPC8347T' typename=''/>
+  <cpu type='tcg' name='603e_v3' typename=''/>
+  <cpu type='tcg' name='970_v2.2' typename=''/>
+  <cpu type='tcg' name='440-Xilinx' typename=''/>
+  <cpu type='tcg' name='740p' typename=''/>
+  <cpu type='tcg' name='MPC5200B_v20' typename=''/>
+  <cpu type='tcg' name='440EPX' typename=''/>
+  <cpu type='tcg' name='603e_v1.1' typename=''/>
+  <cpu type='tcg' name='7451_v2.3' typename=''/>
+  <cpu type='tcg' name='7450_v2.0' typename=''/>
+  <cpu type='tcg' name='7400_v2.8' typename=''/>
+  <cpu type='tcg' name='7455_v2.1' typename=''/>
+  <cpu type='tcg' name='405GPc' typename=''/>
+  <cpu type='tcg' name='MPC8347EAT' typename=''/>
+  <cpu type='tcg' name='970mp_v1.1' typename=''/>
+  <cpu type='tcg' name='603e7v2' typename=''/>
+  <cpu type='tcg' name='604r' typename=''/>
+  <cpu type='tcg' name='7447A_v1.2' typename=''/>
+  <cpu type='tcg' name='MPC8533E_v11' typename=''/>
+  <cpu type='tcg' name='e500v2_v22' typename=''/>
+  <cpu type='tcg' name='401F2' typename=''/>
+  <cpu type='tcg' name='MPC8343EA' typename=''/>
+  <cpu type='tcg' name='7457_v1.2' typename=''/>
+  <cpu type='tcg' name='970fx_v3.1' typename=''/>
+  <cpu type='tcg' name='7447_v1.0' typename=''/>
+  <cpu type='tcg' name='745_v2.5' typename=''/>
+  <cpu type='tcg' name='MPC8548E_v20' typename=''/>
+  <cpu type='tcg' name='MPC8610' typename=''/>
+  <cpu type='tcg' name='750cxe_v2.4b' typename=''/>
+  <cpu type='tcg' name='MPC5200_v10' typename=''/>
+  <cpu type='tcg' name='403GA' typename=''/>
+  <cpu type='tcg' name='7410_v1.0' typename=''/>
+  <cpu type='tcg' name='G2leGP3' typename=''/>
+  <cpu type='tcg' name='7445_v3.3' typename=''/>
+  <cpu type='tcg' name='603e_v4.1' typename=''/>
+  <cpu type='tcg' name='440EPa' typename=''/>
+  <cpu type='tcg' name='970fx_v2.1' typename=''/>
+  <cpu type='tcg' name='MPC8377E' typename=''/>
+  <cpu type='tcg' name='750fx_v2.1' typename=''/>
+  <cpu type='tcg' name='601_v0' typename=''/>
+  <cpu type='tcg' name='STB04' typename=''/>
+  <cpu type='tcg' name='745_v1.0' typename=''/>
+  <cpu type='tcg' name='G2HiP4' typename=''/>
+  <cpu type='tcg' name='750cl_v2.0' typename=''/>
+  <cpu type='tcg' name='750cxr' typename=''/>
+  <cpu type='tcg' name='MPC8349EA' typename=''/>
+  <cpu type='tcg' name='750cxe_v3.1' typename=''/>
+  <cpu type='tcg' name='MPC8379' typename=''/>
+  <cpu type='tcg' name='401' typename=''/>
+  <cpu type='tcg' name='MPC8568' typename=''/>
+  <cpu type='tcg' name='e300c2' typename=''/>
+  <cpu type='tcg' name='750_v3.1' typename=''/>
+  <cpu type='tcg' name='MPC8544E_v11' typename=''/>
+  <cpu type='tcg' name='405GPb' typename=''/>
+  <cpu type='tcg' name='MPC8541E_v11' typename=''/>
   <machine name='pseries-2.9' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes'/>
   <machine name='ref405ep' maxCpus='1'/>
   <machine name='virtex-ml507' maxCpus='1'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
index 72ae100a76..6b8757c32d 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
@@ -120,134 +120,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 0c2586e0e5..e9b1cbc87c 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 61be1df782..3ff4694ff8 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
@@ -157,881 +157,881 @@
   <microcodeVersion>42900757</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='mpc8547e_v21'/>
-  <cpu type='kvm' name='750cl_v1.0'/>
-  <cpu type='kvm' name='7457a_v1.1'/>
-  <cpu type='kvm' name='g2gp'/>
-  <cpu type='kvm' name='750cxe_v2.1'/>
-  <cpu type='kvm' name='755_v2.7'/>
-  <cpu type='kvm' name='750_v2.1'/>
-  <cpu type='kvm' name='755_v2.2'/>
-  <cpu type='kvm' name='745_v2.0'/>
-  <cpu type='kvm' name='mpc8377'/>
-  <cpu type='kvm' name='7455_v1.0'/>
-  <cpu type='kvm' name='mpc8545_v21'/>
-  <cpu type='kvm' name='mpc8548_v11'/>
-  <cpu type='kvm' name='405d4'/>
-  <cpu type='kvm' name='g2le'/>
-  <cpu type='kvm' name='g2hip3'/>
-  <cpu type='kvm' name='750e'/>
-  <cpu type='kvm' name='mpc8572'/>
-  <cpu type='kvm' name='970fx_v2.0'/>
-  <cpu type='kvm' name='750fx_v2.0'/>
-  <cpu type='kvm' name='603p'/>
-  <cpu type='kvm' name='405gpb'/>
-  <cpu type='kvm' name='7400_v2.7'/>
-  <cpu type='kvm' name='mpc8544e_v10'/>
-  <cpu type='kvm' name='e500v2_v10'/>
-  <cpu type='kvm' name='e500mc'/>
-  <cpu type='kvm' name='603e7v1'/>
-  <cpu type='kvm' name='970mp_v1.0'/>
-  <cpu type='kvm' name='740e'/>
-  <cpu type='kvm' name='405crc'/>
-  <cpu type='kvm' name='403ga'/>
-  <cpu type='kvm' name='7447a_v1.0'/>
-  <cpu type='kvm' name='7400_v2.2'/>
-  <cpu type='kvm' name='e300c1'/>
-  <cpu type='kvm' name='mpc8572e'/>
-  <cpu type='kvm' name='e500v2_v21'/>
-  <cpu type='kvm' name='970fx_v1.0'/>
-  <cpu type='kvm' name='750gx_v1.2'/>
-  <cpu type='kvm' name='750fx_v1.0'/>
-  <cpu type='kvm' name='7457_v1.1'/>
-  <cpu type='kvm' name='970fx_v3.0'/>
-  <cpu type='kvm' name='604e_v2.2'/>
-  <cpu type='kvm' name='755_v2.6'/>
-  <cpu type='kvm' name='401a1'/>
-  <cpu type='kvm' name='power9_v1.0'/>
-  <cpu type='kvm' name='npe405h'/>
-  <cpu type='kvm' name='7410_v1.4'/>
-  <cpu type='kvm' name='g2ls'/>
-  <cpu type='kvm' name='750_v2.0'/>
-  <cpu type='kvm' name='401b2'/>
-  <cpu type='kvm' name='mpc8349'/>
-  <cpu type='kvm' name='mpc8347ep'/>
-  <cpu type='kvm' name='7445_v3.2'/>
-  <cpu type='kvm' name='mpc8540_v21'/>
-  <cpu type='kvm' name='mpc8543_v11'/>
-  <cpu type='kvm' name='403gcx'/>
-  <cpu type='kvm' name='745_v2.4'/>
-  <cpu type='kvm' name='mpc8548_v21'/>
-  <cpu type='kvm' name='750l_v3.2'/>
-  <cpu type='kvm' name='750_v1.0'/>
-  <cpu type='kvm' name='755_v1.1'/>
-  <cpu type='kvm' name='e500_v10'/>
-  <cpu type='kvm' name='750cxe_v3.0'/>
-  <cpu type='kvm' name='mpc8541e_v10'/>
-  <cpu type='kvm' name='mpc8347p'/>
-  <cpu type='kvm' name='mpc8555e_v10'/>
-  <cpu type='kvm' name='power9_v2.0'/>
-  <cpu type='kvm' name='power7_v2.3'/>
-  <cpu type='kvm' name='603e7v'/>
-  <cpu type='kvm' name='mpc8543e_v11'/>
-  <cpu type='kvm' name='750_v3.0'/>
-  <cpu type='kvm' name='7400_v2.6'/>
-  <cpu type='kvm' name='405gpa'/>
-  <cpu type='kvm' name='440epx'/>
-  <cpu type='kvm' name='750l_v2.2'/>
-  <cpu type='kvm' name='e200z6'/>
-  <cpu type='kvm' name='mpc8547e_v20'/>
-  <cpu type='kvm' name='7457a_v1.0'/>
-  <cpu type='kvm' name='mpc8349ea'/>
-  <cpu type='kvm' name='e500v2_v20'/>
-  <cpu type='kvm' name='power8nvl_v1.0'/>
-  <cpu type='kvm' name='mpc8540_v10'/>
-  <cpu type='kvm' name='755_v2.1'/>
-  <cpu type='kvm' name='745_v2.8'/>
-  <cpu type='kvm' name='npe405l'/>
-  <cpu type='kvm' name='mpc8343ea'/>
-  <cpu type='kvm' name='mpc8545_v20'/>
-  <cpu type='kvm' name='mpc8548_v10'/>
-  <cpu type='kvm' name='7448_v1.1'/>
-  <cpu type='kvm' name='7455_v3.4'/>
-  <cpu type='kvm' name='740_v2.2'/>
-  <cpu type='kvm' name='7400_v1.1'/>
-  <cpu type='kvm' name='mpc8347et'/>
-  <cpu type='kvm' name='7441_v2.10'/>
-  <cpu type='kvm' name='603e_v1.4'/>
-  <cpu type='kvm' name='mpc8543_v10'/>
-  <cpu type='kvm' name='401c2'/>
-  <cpu type='kvm' name='7451_v2.10'/>
-  <cpu type='kvm' name='750cx_v2.2'/>
-  <cpu type='kvm' name='mpc8543_v21'/>
-  <cpu type='kvm' name='603e7'/>
-  <cpu type='kvm' name='7448_v2.1'/>
-  <cpu type='kvm' name='7441_v2.3'/>
-  <cpu type='kvm' name='405crb'/>
-  <cpu type='kvm' name='604'/>
-  <cpu type='kvm' name='7400_v2.1'/>
-  <cpu type='kvm' name='440-xilinx-w-dfpu'/>
-  <cpu type='kvm' name='7445_v2.1'/>
-  <cpu type='kvm' name='cobra'/>
-  <cpu type='kvm' name='e500_v20'/>
-  <cpu type='kvm' name='mpc8541_v11'/>
-  <cpu type='kvm' name='750gx_v1.1'/>
-  <cpu type='kvm' name='750cxe_v2.4'/>
-  <cpu type='kvm' name='mpc8641d'/>
-  <cpu type='kvm' name='mpc8543e_v21'/>
-  <cpu type='kvm' name='750l_v2.1'/>
-  <cpu type='kvm' name='7457_v1.0'/>
-  <cpu type='kvm' name='7450_v1.2'/>
-  <cpu type='kvm' name='755_v2.5'/>
-  <cpu type='kvm' name='7410_v1.3'/>
-  <cpu type='kvm' name='745_v2.3'/>
-  <cpu type='kvm' name='755_v2.0'/>
-  <cpu type='kvm' name='e500v2_v30'/>
-  <cpu type='kvm' name='7455_v3.3'/>
-  <cpu type='kvm' name='mpc8540_v20'/>
-  <cpu type='kvm' name='405d2'/>
-  <cpu type='kvm' name='mpc8560_v21'/>
-  <cpu type='kvm' name='mpc8343'/>
-  <cpu type='kvm' name='mpc8548_v20'/>
-  <cpu type='kvm' name='mpc8347t'/>
-  <cpu type='kvm' name='755_v1.0'/>
-  <cpu type='kvm' name='603e_v1.3'/>
-  <cpu type='kvm' name='host'/>
-  <cpu type='kvm' name='mpc8543e_v10'/>
-  <cpu type='kvm' name='mpc8347eap'/>
-  <cpu type='kvm' name='mpc8548e_v11'/>
-  <cpu type='kvm' name='mpc8543_v20'/>
-  <cpu type='kvm' name='401d2'/>
-  <cpu type='kvm' name='power8_v2.0'/>
-  <cpu type='kvm' name='740_v3.1'/>
-  <cpu type='kvm' name='e200z5'/>
-  <cpu type='kvm' name='405cra'/>
-  <cpu type='kvm' name='7400_v2.0'/>
-  <cpu type='kvm' name='750cxe_v2.3'/>
-  <cpu type='kvm' name='745_v2.7'/>
-  <cpu type='kvm' name='mpc8560_v10'/>
-  <cpu type='kvm' name='e5500'/>
-  <cpu type='kvm' name='mpc8544_v11'/>
-  <cpu type='kvm' name='7448_v1.0'/>
-  <cpu type='kvm' name='401e2'/>
-  <cpu type='kvm' name='740_v2.1'/>
-  <cpu type='kvm' name='745_v2.2'/>
-  <cpu type='kvm' name='7400_v1.0'/>
-  <cpu type='kvm' name='7410_v1.2'/>
-  <cpu type='kvm' name='x2vp4'/>
-  <cpu type='kvm' name='mpc8347ap'/>
-  <cpu type='kvm' name='mpc8533_v11'/>
-  <cpu type='kvm' name='mpc5200b_v21'/>
-  <cpu type='kvm' name='750fx_v2.3'/>
-  <cpu type='kvm' name='601_v2'/>
-  <cpu type='kvm' name='g2legp3'/>
-  <cpu type='kvm' name='604e_v1.0'/>
-  <cpu type='kvm' name='750cx_v2.1'/>
-  <cpu type='kvm' name='mpc8610'/>
-  <cpu type='kvm' name='g2h4'/>
-  <cpu type='kvm' name='750l_v3.0'/>
-  <cpu type='kvm' name='mpc8377e'/>
-  <cpu type='kvm' name='e300c4'/>
-  <cpu type='kvm' name='mpc5200_v12'/>
-  <cpu type='kvm' name='7448_v2.0'/>
-  <cpu type='kvm' name='7450_v2.1'/>
-  <cpu type='kvm' name='750cxe_v3.1b'/>
-  <cpu type='kvm' name='g2'/>
-  <cpu type='kvm' name='7400_v2.9'/>
-  <cpu type='kvm' name='405gpd'/>
-  <cpu type='kvm' name='603'/>
-  <cpu type='kvm' name='603e7t'/>
-  <cpu type='kvm' name='mpc8555_v11'/>
-  <cpu type='kvm' name='750gx_v1.0'/>
-  <cpu type='kvm' name='mpc8541_v10'/>
-  <cpu type='kvm' name='mpc8543e_v20'/>
-  <cpu type='kvm' name='750fl'/>
-  <cpu type='kvm' name='750l_v2.0'/>
-  <cpu type='kvm' name='stb04'/>
-  <cpu type='kvm' name='mpc8548e_v21'/>
-  <cpu type='kvm' name='x2vp20'/>
-  <cpu type='kvm' name='405ez'/>
-  <cpu type='kvm' name='e600'/>
-  <cpu type='kvm' name='7450_v1.1'/>
-  <cpu type='kvm' name='755_v2.4'/>
-  <cpu type='kvm' name='mpc8379'/>
-  <cpu type='kvm' name='7445_v1.0'/>
-  <cpu type='kvm' name='7447_v1.1'/>
-  <cpu type='kvm' name='603e_v2.2'/>
-  <cpu type='kvm' name='603e_v4'/>
-  <cpu type='kvm' name='g2legp'/>
-  <cpu type='kvm' name='7455_v3.2'/>
-  <cpu type='kvm' name='740_v2.0'/>
-  <cpu type='kvm' name='mpc8560_v20'/>
-  <cpu type='kvm' name='440-xilinx'/>
-  <cpu type='kvm' name='401f2'/>
-  <cpu type='kvm' name='mpc8533_v10'/>
-  <cpu type='kvm' name='405gpr'/>
-  <cpu type='kvm' name='mpc8349a'/>
-  <cpu type='kvm' name='stb25'/>
-  <cpu type='kvm' name='603e_v1.2'/>
-  <cpu type='kvm' name='mpc5200b_v20'/>
-  <cpu type='kvm' name='750fx_v2.2'/>
-  <cpu type='kvm' name='mpc8347eat'/>
-  <cpu type='kvm' name='740_v1.0'/>
-  <cpu type='kvm' name='601_v1'/>
-  <cpu type='kvm' name='745_v1.1'/>
-  <cpu type='kvm' name='750cx_v2.0'/>
-  <cpu type='kvm' name='mpc8548e_v10'/>
-  <cpu type='kvm' name='7447a_v1.2'/>
-  <cpu type='kvm' name='403gc'/>
-  <cpu type='kvm' name='e300c3'/>
-  <cpu type='kvm' name='mpc5200_v11'/>
-  <cpu type='kvm' name='7441_v2.1'/>
-  <cpu type='kvm' name='740_v3.0'/>
-  <cpu type='kvm' name='mpc8545e_v21'/>
-  <cpu type='kvm' name='602'/>
-  <cpu type='kvm' name='mpc8378e'/>
-  <cpu type='kvm' name='mpc8343a'/>
-  <cpu type='kvm' name='460exb'/>
-  <cpu type='kvm' name='mpc8555_v10'/>
-  <cpu type='kvm' name='mpc8568'/>
-  <cpu type='kvm' name='7457a_v1.2'/>
-  <cpu type='kvm' name='750cx_v1.0'/>
-  <cpu type='kvm' name='750cxe_v2.2'/>
-  <cpu type='kvm' name='604e_v2.4'/>
-  <cpu type='kvm' name='755_v2.8'/>
-  <cpu type='kvm' name='405lp'/>
-  <cpu type='kvm' name='745_v2.6'/>
-  <cpu type='kvm' name='stb03'/>
-  <cpu type='kvm' name='405ep'/>
-  <cpu type='kvm' name='mpc8544_v10'/>
-  <cpu type='kvm' name='mpc8347at'/>
-  <cpu type='kvm' name='750_v2.2'/>
-  <cpu type='kvm' name='7450_v1.0'/>
-  <cpu type='kvm' name='755_v2.3'/>
-  <cpu type='kvm' name='7410_v1.1'/>
-  <cpu type='kvm' name='745_v2.1'/>
-  <cpu type='kvm' name='750gl'/>
-  <cpu type='kvm' name='e6500'/>
-  <cpu type='kvm' name='750p'/>
-  <cpu type='kvm' name='7445_v3.4'/>
-  <cpu type='kvm' name='440epb'/>
-  <cpu type='kvm' name='npe4gs3'/>
-  <cpu type='kvm' name='603e_v3'/>
-  <cpu type='kvm' name='mpc8349e'/>
-  <cpu type='kvm' name='970_v2.2'/>
-  <cpu type='kvm' name='g2lels'/>
-  <cpu type='kvm' name='g2hip4'/>
-  <cpu type='kvm' name='740p'/>
-  <cpu type='kvm' name='mpc8567e'/>
-  <cpu type='kvm' name='mpc8533e_v11'/>
-  <cpu type='kvm' name='7451_v2.3'/>
-  <cpu type='kvm' name='603e_v1.1'/>
-  <cpu type='kvm' name='401g2'/>
-  <cpu type='kvm' name='7400_v2.8'/>
-  <cpu type='kvm' name='7455_v2.1'/>
-  <cpu type='kvm' name='405gpc'/>
-  <cpu type='kvm' name='power7+_v2.1'/>
-  <cpu type='kvm' name='mpc8544e_v11'/>
-  <cpu type='kvm' name='7450_v2.0'/>
-  <cpu type='kvm' name='970mp_v1.1'/>
-  <cpu type='kvm' name='603e7v2'/>
-  <cpu type='kvm' name='604r'/>
-  <cpu type='kvm' name='e500v2_v22'/>
-  <cpu type='kvm' name='mpc8548e_v20'/>
-  <cpu type='kvm' name='mpc8545e_v20'/>
-  <cpu type='kvm' name='mpc8378'/>
-  <cpu type='kvm' name='mpc8567'/>
-  <cpu type='kvm' name='7457_v1.2'/>
-  <cpu type='kvm' name='7447_v1.0'/>
-  <cpu type='kvm' name='970fx_v3.1'/>
-  <cpu type='kvm' name='745_v2.5'/>
-  <cpu type='kvm' name='mpc8379e'/>
-  <cpu type='kvm' name='mpc8641'/>
-  <cpu type='kvm' name='750cxe_v2.4b'/>
-  <cpu type='kvm' name='7410_v1.0'/>
-  <cpu type='kvm' name='mpc603'/>
-  <cpu type='kvm' name='603e_v4.1'/>
-  <cpu type='kvm' name='7445_v3.3'/>
-  <cpu type='kvm' name='440epa'/>
-  <cpu type='kvm' name='970fx_v2.1'/>
-  <cpu type='kvm' name='iop480'/>
-  <cpu type='kvm' name='750fx_v2.1'/>
-  <cpu type='kvm' name='601_v0'/>
-  <cpu type='kvm' name='g2legp1'/>
-  <cpu type='kvm' name='745_v1.0'/>
-  <cpu type='kvm' name='750cl_v2.0'/>
-  <cpu type='kvm' name='750cxr'/>
-  <cpu type='kvm' name='401'/>
-  <cpu type='kvm' name='mpc8541e_v11'/>
-  <cpu type='kvm' name='750cxe_v3.1'/>
-  <cpu type='kvm' name='mpc8555e_v11'/>
-  <cpu type='kvm' name='power8e_v2.1'/>
-  <cpu type='kvm' name='7447a_v1.1'/>
-  <cpu type='kvm' name='403gb'/>
-  <cpu type='kvm' name='e300c2'/>
-  <cpu type='kvm' name='npe405h2'/>
-  <cpu type='kvm' name='mpc8343e'/>
-  <cpu type='kvm' name='mpc8533e_v10'/>
-  <cpu type='kvm' name='mpc5200_v10'/>
-  <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='mpc8547e_v21'/>
-  <cpu type='tcg' name='750cl_v1.0'/>
-  <cpu type='tcg' name='7457a_v1.1'/>
-  <cpu type='tcg' name='g2gp'/>
-  <cpu type='tcg' name='750cxe_v2.1'/>
-  <cpu type='tcg' name='755_v2.7'/>
-  <cpu type='tcg' name='750_v2.1'/>
-  <cpu type='tcg' name='755_v2.2'/>
-  <cpu type='tcg' name='745_v2.0'/>
-  <cpu type='tcg' name='mpc8377'/>
-  <cpu type='tcg' name='7455_v1.0'/>
-  <cpu type='tcg' name='mpc8545_v21'/>
-  <cpu type='tcg' name='mpc8548_v11'/>
-  <cpu type='tcg' name='405d4'/>
-  <cpu type='tcg' name='g2le'/>
-  <cpu type='tcg' name='g2hip3'/>
-  <cpu type='tcg' name='750e'/>
-  <cpu type='tcg' name='mpc8572'/>
-  <cpu type='tcg' name='970fx_v2.0'/>
-  <cpu type='tcg' name='750fx_v2.0'/>
-  <cpu type='tcg' name='603p'/>
-  <cpu type='tcg' name='405gpb'/>
-  <cpu type='tcg' name='7400_v2.7'/>
-  <cpu type='tcg' name='mpc8544e_v10'/>
-  <cpu type='tcg' name='e500v2_v10'/>
-  <cpu type='tcg' name='e500mc'/>
-  <cpu type='tcg' name='603e7v1'/>
-  <cpu type='tcg' name='970mp_v1.0'/>
-  <cpu type='tcg' name='740e'/>
-  <cpu type='tcg' name='405crc'/>
-  <cpu type='tcg' name='403ga'/>
-  <cpu type='tcg' name='7447a_v1.0'/>
-  <cpu type='tcg' name='7400_v2.2'/>
-  <cpu type='tcg' name='e300c1'/>
-  <cpu type='tcg' name='mpc8572e'/>
-  <cpu type='tcg' name='e500v2_v21'/>
-  <cpu type='tcg' name='970fx_v1.0'/>
-  <cpu type='tcg' name='750gx_v1.2'/>
-  <cpu type='tcg' name='750fx_v1.0'/>
-  <cpu type='tcg' name='7457_v1.1'/>
-  <cpu type='tcg' name='970fx_v3.0'/>
-  <cpu type='tcg' name='604e_v2.2'/>
-  <cpu type='tcg' name='755_v2.6'/>
-  <cpu type='tcg' name='401a1'/>
-  <cpu type='tcg' name='power9_v1.0'/>
-  <cpu type='tcg' name='npe405h'/>
-  <cpu type='tcg' name='7410_v1.4'/>
-  <cpu type='tcg' name='g2ls'/>
-  <cpu type='tcg' name='750_v2.0'/>
-  <cpu type='tcg' name='401b2'/>
-  <cpu type='tcg' name='mpc8349'/>
-  <cpu type='tcg' name='mpc8347ep'/>
-  <cpu type='tcg' name='7445_v3.2'/>
-  <cpu type='tcg' name='mpc8540_v21'/>
-  <cpu type='tcg' name='mpc8543_v11'/>
-  <cpu type='tcg' name='403gcx'/>
-  <cpu type='tcg' name='745_v2.4'/>
-  <cpu type='tcg' name='mpc8548_v21'/>
-  <cpu type='tcg' name='750l_v3.2'/>
-  <cpu type='tcg' name='750_v1.0'/>
-  <cpu type='tcg' name='755_v1.1'/>
-  <cpu type='tcg' name='e500_v10'/>
-  <cpu type='tcg' name='750cxe_v3.0'/>
-  <cpu type='tcg' name='mpc8541e_v10'/>
-  <cpu type='tcg' name='mpc8347p'/>
-  <cpu type='tcg' name='mpc8555e_v10'/>
-  <cpu type='tcg' name='power9_v2.0'/>
-  <cpu type='tcg' name='power7_v2.3'/>
-  <cpu type='tcg' name='603e7v'/>
-  <cpu type='tcg' name='mpc8543e_v11'/>
-  <cpu type='tcg' name='750_v3.0'/>
-  <cpu type='tcg' name='7400_v2.6'/>
-  <cpu type='tcg' name='405gpa'/>
-  <cpu type='tcg' name='440epx'/>
-  <cpu type='tcg' name='750l_v2.2'/>
-  <cpu type='tcg' name='e200z6'/>
-  <cpu type='tcg' name='mpc8547e_v20'/>
-  <cpu type='tcg' name='7457a_v1.0'/>
-  <cpu type='tcg' name='mpc8349ea'/>
-  <cpu type='tcg' name='e500v2_v20'/>
-  <cpu type='tcg' name='power8nvl_v1.0'/>
-  <cpu type='tcg' name='mpc8540_v10'/>
-  <cpu type='tcg' name='755_v2.1'/>
-  <cpu type='tcg' name='745_v2.8'/>
-  <cpu type='tcg' name='npe405l'/>
-  <cpu type='tcg' name='mpc8343ea'/>
-  <cpu type='tcg' name='mpc8545_v20'/>
-  <cpu type='tcg' name='mpc8548_v10'/>
-  <cpu type='tcg' name='7448_v1.1'/>
-  <cpu type='tcg' name='7455_v3.4'/>
-  <cpu type='tcg' name='740_v2.2'/>
-  <cpu type='tcg' name='7400_v1.1'/>
-  <cpu type='tcg' name='mpc8347et'/>
-  <cpu type='tcg' name='7441_v2.10'/>
-  <cpu type='tcg' name='603e_v1.4'/>
-  <cpu type='tcg' name='mpc8543_v10'/>
-  <cpu type='tcg' name='401c2'/>
-  <cpu type='tcg' name='7451_v2.10'/>
-  <cpu type='tcg' name='750cx_v2.2'/>
-  <cpu type='tcg' name='mpc8543_v21'/>
-  <cpu type='tcg' name='603e7'/>
-  <cpu type='tcg' name='7448_v2.1'/>
-  <cpu type='tcg' name='7441_v2.3'/>
-  <cpu type='tcg' name='405crb'/>
-  <cpu type='tcg' name='604'/>
-  <cpu type='tcg' name='7400_v2.1'/>
-  <cpu type='tcg' name='440-xilinx-w-dfpu'/>
-  <cpu type='tcg' name='7445_v2.1'/>
-  <cpu type='tcg' name='cobra'/>
-  <cpu type='tcg' name='e500_v20'/>
-  <cpu type='tcg' name='mpc8541_v11'/>
-  <cpu type='tcg' name='750gx_v1.1'/>
-  <cpu type='tcg' name='750cxe_v2.4'/>
-  <cpu type='tcg' name='mpc8641d'/>
-  <cpu type='tcg' name='mpc8543e_v21'/>
-  <cpu type='tcg' name='750l_v2.1'/>
-  <cpu type='tcg' name='7457_v1.0'/>
-  <cpu type='tcg' name='7450_v1.2'/>
-  <cpu type='tcg' name='755_v2.5'/>
-  <cpu type='tcg' name='7410_v1.3'/>
-  <cpu type='tcg' name='745_v2.3'/>
-  <cpu type='tcg' name='755_v2.0'/>
-  <cpu type='tcg' name='e500v2_v30'/>
-  <cpu type='tcg' name='7455_v3.3'/>
-  <cpu type='tcg' name='mpc8540_v20'/>
-  <cpu type='tcg' name='405d2'/>
-  <cpu type='tcg' name='mpc8560_v21'/>
-  <cpu type='tcg' name='mpc8343'/>
-  <cpu type='tcg' name='mpc8548_v20'/>
-  <cpu type='tcg' name='mpc8347t'/>
-  <cpu type='tcg' name='755_v1.0'/>
-  <cpu type='tcg' name='603e_v1.3'/>
-  <cpu type='tcg' name='mpc8543e_v10'/>
-  <cpu type='tcg' name='mpc8347eap'/>
-  <cpu type='tcg' name='mpc8548e_v11'/>
-  <cpu type='tcg' name='mpc8543_v20'/>
-  <cpu type='tcg' name='401d2'/>
-  <cpu type='tcg' name='power8_v2.0'/>
-  <cpu type='tcg' name='740_v3.1'/>
-  <cpu type='tcg' name='e200z5'/>
-  <cpu type='tcg' name='405cra'/>
-  <cpu type='tcg' name='7400_v2.0'/>
-  <cpu type='tcg' name='750cxe_v2.3'/>
-  <cpu type='tcg' name='745_v2.7'/>
-  <cpu type='tcg' name='mpc8560_v10'/>
-  <cpu type='tcg' name='e5500'/>
-  <cpu type='tcg' name='mpc8544_v11'/>
-  <cpu type='tcg' name='7448_v1.0'/>
-  <cpu type='tcg' name='401e2'/>
-  <cpu type='tcg' name='740_v2.1'/>
-  <cpu type='tcg' name='745_v2.2'/>
-  <cpu type='tcg' name='7400_v1.0'/>
-  <cpu type='tcg' name='7410_v1.2'/>
-  <cpu type='tcg' name='x2vp4'/>
-  <cpu type='tcg' name='mpc8347ap'/>
-  <cpu type='tcg' name='mpc8533_v11'/>
-  <cpu type='tcg' name='mpc5200b_v21'/>
-  <cpu type='tcg' name='750fx_v2.3'/>
-  <cpu type='tcg' name='601_v2'/>
-  <cpu type='tcg' name='g2legp3'/>
-  <cpu type='tcg' name='604e_v1.0'/>
-  <cpu type='tcg' name='750cx_v2.1'/>
-  <cpu type='tcg' name='mpc8610'/>
-  <cpu type='tcg' name='g2h4'/>
-  <cpu type='tcg' name='750l_v3.0'/>
-  <cpu type='tcg' name='mpc8377e'/>
-  <cpu type='tcg' name='e300c4'/>
-  <cpu type='tcg' name='mpc5200_v12'/>
-  <cpu type='tcg' name='7448_v2.0'/>
-  <cpu type='tcg' name='7450_v2.1'/>
-  <cpu type='tcg' name='750cxe_v3.1b'/>
-  <cpu type='tcg' name='g2'/>
-  <cpu type='tcg' name='7400_v2.9'/>
-  <cpu type='tcg' name='405gpd'/>
-  <cpu type='tcg' name='603'/>
-  <cpu type='tcg' name='603e7t'/>
-  <cpu type='tcg' name='mpc8555_v11'/>
-  <cpu type='tcg' name='750gx_v1.0'/>
-  <cpu type='tcg' name='mpc8541_v10'/>
-  <cpu type='tcg' name='mpc8543e_v20'/>
-  <cpu type='tcg' name='750fl'/>
-  <cpu type='tcg' name='750l_v2.0'/>
-  <cpu type='tcg' name='stb04'/>
-  <cpu type='tcg' name='mpc8548e_v21'/>
-  <cpu type='tcg' name='x2vp20'/>
-  <cpu type='tcg' name='405ez'/>
-  <cpu type='tcg' name='e600'/>
-  <cpu type='tcg' name='7450_v1.1'/>
-  <cpu type='tcg' name='755_v2.4'/>
-  <cpu type='tcg' name='mpc8379'/>
-  <cpu type='tcg' name='7445_v1.0'/>
-  <cpu type='tcg' name='7447_v1.1'/>
-  <cpu type='tcg' name='603e_v2.2'/>
-  <cpu type='tcg' name='603e_v4'/>
-  <cpu type='tcg' name='g2legp'/>
-  <cpu type='tcg' name='7455_v3.2'/>
-  <cpu type='tcg' name='740_v2.0'/>
-  <cpu type='tcg' name='mpc8560_v20'/>
-  <cpu type='tcg' name='440-xilinx'/>
-  <cpu type='tcg' name='401f2'/>
-  <cpu type='tcg' name='mpc8533_v10'/>
-  <cpu type='tcg' name='405gpr'/>
-  <cpu type='tcg' name='mpc8349a'/>
-  <cpu type='tcg' name='stb25'/>
-  <cpu type='tcg' name='603e_v1.2'/>
-  <cpu type='tcg' name='mpc5200b_v20'/>
-  <cpu type='tcg' name='750fx_v2.2'/>
-  <cpu type='tcg' name='mpc8347eat'/>
-  <cpu type='tcg' name='740_v1.0'/>
-  <cpu type='tcg' name='601_v1'/>
-  <cpu type='tcg' name='745_v1.1'/>
-  <cpu type='tcg' name='750cx_v2.0'/>
-  <cpu type='tcg' name='mpc8548e_v10'/>
-  <cpu type='tcg' name='7447a_v1.2'/>
-  <cpu type='tcg' name='403gc'/>
-  <cpu type='tcg' name='e300c3'/>
-  <cpu type='tcg' name='mpc5200_v11'/>
-  <cpu type='tcg' name='7441_v2.1'/>
-  <cpu type='tcg' name='740_v3.0'/>
-  <cpu type='tcg' name='mpc8545e_v21'/>
-  <cpu type='tcg' name='602'/>
-  <cpu type='tcg' name='mpc8378e'/>
-  <cpu type='tcg' name='mpc8343a'/>
-  <cpu type='tcg' name='460exb'/>
-  <cpu type='tcg' name='mpc8555_v10'/>
-  <cpu type='tcg' name='mpc8568'/>
-  <cpu type='tcg' name='7457a_v1.2'/>
-  <cpu type='tcg' name='750cx_v1.0'/>
-  <cpu type='tcg' name='750cxe_v2.2'/>
-  <cpu type='tcg' name='604e_v2.4'/>
-  <cpu type='tcg' name='755_v2.8'/>
-  <cpu type='tcg' name='405lp'/>
-  <cpu type='tcg' name='745_v2.6'/>
-  <cpu type='tcg' name='stb03'/>
-  <cpu type='tcg' name='405ep'/>
-  <cpu type='tcg' name='mpc8544_v10'/>
-  <cpu type='tcg' name='mpc8347at'/>
-  <cpu type='tcg' name='750_v2.2'/>
-  <cpu type='tcg' name='7450_v1.0'/>
-  <cpu type='tcg' name='755_v2.3'/>
-  <cpu type='tcg' name='7410_v1.1'/>
-  <cpu type='tcg' name='745_v2.1'/>
-  <cpu type='tcg' name='750gl'/>
-  <cpu type='tcg' name='e6500'/>
-  <cpu type='tcg' name='750p'/>
-  <cpu type='tcg' name='7445_v3.4'/>
-  <cpu type='tcg' name='440epb'/>
-  <cpu type='tcg' name='npe4gs3'/>
-  <cpu type='tcg' name='603e_v3'/>
-  <cpu type='tcg' name='mpc8349e'/>
-  <cpu type='tcg' name='970_v2.2'/>
-  <cpu type='tcg' name='g2lels'/>
-  <cpu type='tcg' name='g2hip4'/>
-  <cpu type='tcg' name='740p'/>
-  <cpu type='tcg' name='mpc8567e'/>
-  <cpu type='tcg' name='mpc8533e_v11'/>
-  <cpu type='tcg' name='7451_v2.3'/>
-  <cpu type='tcg' name='603e_v1.1'/>
-  <cpu type='tcg' name='401g2'/>
-  <cpu type='tcg' name='7400_v2.8'/>
-  <cpu type='tcg' name='7455_v2.1'/>
-  <cpu type='tcg' name='405gpc'/>
-  <cpu type='tcg' name='power7+_v2.1'/>
-  <cpu type='tcg' name='mpc8544e_v11'/>
-  <cpu type='tcg' name='7450_v2.0'/>
-  <cpu type='tcg' name='970mp_v1.1'/>
-  <cpu type='tcg' name='603e7v2'/>
-  <cpu type='tcg' name='604r'/>
-  <cpu type='tcg' name='e500v2_v22'/>
-  <cpu type='tcg' name='mpc8548e_v20'/>
-  <cpu type='tcg' name='mpc8545e_v20'/>
-  <cpu type='tcg' name='mpc8378'/>
-  <cpu type='tcg' name='mpc8567'/>
-  <cpu type='tcg' name='7457_v1.2'/>
-  <cpu type='tcg' name='7447_v1.0'/>
-  <cpu type='tcg' name='970fx_v3.1'/>
-  <cpu type='tcg' name='745_v2.5'/>
-  <cpu type='tcg' name='mpc8379e'/>
-  <cpu type='tcg' name='mpc8641'/>
-  <cpu type='tcg' name='750cxe_v2.4b'/>
-  <cpu type='tcg' name='7410_v1.0'/>
-  <cpu type='tcg' name='mpc603'/>
-  <cpu type='tcg' name='603e_v4.1'/>
-  <cpu type='tcg' name='7445_v3.3'/>
-  <cpu type='tcg' name='440epa'/>
-  <cpu type='tcg' name='970fx_v2.1'/>
-  <cpu type='tcg' name='iop480'/>
-  <cpu type='tcg' name='750fx_v2.1'/>
-  <cpu type='tcg' name='601_v0'/>
-  <cpu type='tcg' name='g2legp1'/>
-  <cpu type='tcg' name='745_v1.0'/>
-  <cpu type='tcg' name='750cl_v2.0'/>
-  <cpu type='tcg' name='750cxr'/>
-  <cpu type='tcg' name='401'/>
-  <cpu type='tcg' name='mpc8541e_v11'/>
-  <cpu type='tcg' name='750cxe_v3.1'/>
-  <cpu type='tcg' name='mpc8555e_v11'/>
-  <cpu type='tcg' name='power8e_v2.1'/>
-  <cpu type='tcg' name='7447a_v1.1'/>
-  <cpu type='tcg' name='403gb'/>
-  <cpu type='tcg' name='e300c2'/>
-  <cpu type='tcg' name='npe405h2'/>
-  <cpu type='tcg' name='mpc8343e'/>
-  <cpu type='tcg' name='mpc8533e_v10'/>
-  <cpu type='tcg' name='mpc5200_v10'/>
-  <cpu type='tcg' name='750_v3.1'/>
-  <cpu type='tcg' name='power5+_v2.1'/>
-  <cpu type='tcg' name='mpc8568e'/>
+  <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' typename=''/>
+  <cpu type='kvm' name='750cl_v1.0' typename=''/>
+  <cpu type='kvm' name='7457a_v1.1' typename=''/>
+  <cpu type='kvm' name='g2gp' typename=''/>
+  <cpu type='kvm' name='750cxe_v2.1' typename=''/>
+  <cpu type='kvm' name='755_v2.7' typename=''/>
+  <cpu type='kvm' name='750_v2.1' typename=''/>
+  <cpu type='kvm' name='755_v2.2' typename=''/>
+  <cpu type='kvm' name='745_v2.0' typename=''/>
+  <cpu type='kvm' name='mpc8377' typename=''/>
+  <cpu type='kvm' name='7455_v1.0' typename=''/>
+  <cpu type='kvm' name='mpc8545_v21' typename=''/>
+  <cpu type='kvm' name='mpc8548_v11' typename=''/>
+  <cpu type='kvm' name='405d4' typename=''/>
+  <cpu type='kvm' name='g2le' typename=''/>
+  <cpu type='kvm' name='g2hip3' typename=''/>
+  <cpu type='kvm' name='750e' typename=''/>
+  <cpu type='kvm' name='mpc8572' typename=''/>
+  <cpu type='kvm' name='970fx_v2.0' typename=''/>
+  <cpu type='kvm' name='750fx_v2.0' typename=''/>
+  <cpu type='kvm' name='603p' typename=''/>
+  <cpu type='kvm' name='405gpb' typename=''/>
+  <cpu type='kvm' name='7400_v2.7' typename=''/>
+  <cpu type='kvm' name='mpc8544e_v10' typename=''/>
+  <cpu type='kvm' name='e500v2_v10' typename=''/>
+  <cpu type='kvm' name='e500mc' typename=''/>
+  <cpu type='kvm' name='603e7v1' typename=''/>
+  <cpu type='kvm' name='970mp_v1.0' typename=''/>
+  <cpu type='kvm' name='740e' typename=''/>
+  <cpu type='kvm' name='405crc' typename=''/>
+  <cpu type='kvm' name='403ga' typename=''/>
+  <cpu type='kvm' name='7447a_v1.0' typename=''/>
+  <cpu type='kvm' name='7400_v2.2' typename=''/>
+  <cpu type='kvm' name='e300c1' typename=''/>
+  <cpu type='kvm' name='mpc8572e' typename=''/>
+  <cpu type='kvm' name='e500v2_v21' typename=''/>
+  <cpu type='kvm' name='970fx_v1.0' typename=''/>
+  <cpu type='kvm' name='750gx_v1.2' typename=''/>
+  <cpu type='kvm' name='750fx_v1.0' typename=''/>
+  <cpu type='kvm' name='7457_v1.1' typename=''/>
+  <cpu type='kvm' name='970fx_v3.0' typename=''/>
+  <cpu type='kvm' name='604e_v2.2' typename=''/>
+  <cpu type='kvm' name='755_v2.6' typename=''/>
+  <cpu type='kvm' name='401a1' typename=''/>
+  <cpu type='kvm' name='power9_v1.0' typename=''/>
+  <cpu type='kvm' name='npe405h' typename=''/>
+  <cpu type='kvm' name='7410_v1.4' typename=''/>
+  <cpu type='kvm' name='g2ls' typename=''/>
+  <cpu type='kvm' name='750_v2.0' typename=''/>
+  <cpu type='kvm' name='401b2' typename=''/>
+  <cpu type='kvm' name='mpc8349' typename=''/>
+  <cpu type='kvm' name='mpc8347ep' typename=''/>
+  <cpu type='kvm' name='7445_v3.2' typename=''/>
+  <cpu type='kvm' name='mpc8540_v21' typename=''/>
+  <cpu type='kvm' name='mpc8543_v11' typename=''/>
+  <cpu type='kvm' name='403gcx' typename=''/>
+  <cpu type='kvm' name='745_v2.4' typename=''/>
+  <cpu type='kvm' name='mpc8548_v21' typename=''/>
+  <cpu type='kvm' name='750l_v3.2' typename=''/>
+  <cpu type='kvm' name='750_v1.0' typename=''/>
+  <cpu type='kvm' name='755_v1.1' typename=''/>
+  <cpu type='kvm' name='e500_v10' typename=''/>
+  <cpu type='kvm' name='750cxe_v3.0' typename=''/>
+  <cpu type='kvm' name='mpc8541e_v10' typename=''/>
+  <cpu type='kvm' name='mpc8347p' typename=''/>
+  <cpu type='kvm' name='mpc8555e_v10' typename=''/>
+  <cpu type='kvm' name='power9_v2.0' typename=''/>
+  <cpu type='kvm' name='power7_v2.3' typename=''/>
+  <cpu type='kvm' name='603e7v' typename=''/>
+  <cpu type='kvm' name='mpc8543e_v11' typename=''/>
+  <cpu type='kvm' name='750_v3.0' typename=''/>
+  <cpu type='kvm' name='7400_v2.6' typename=''/>
+  <cpu type='kvm' name='405gpa' typename=''/>
+  <cpu type='kvm' name='440epx' typename=''/>
+  <cpu type='kvm' name='750l_v2.2' typename=''/>
+  <cpu type='kvm' name='e200z6' typename=''/>
+  <cpu type='kvm' name='mpc8547e_v20' typename=''/>
+  <cpu type='kvm' name='7457a_v1.0' typename=''/>
+  <cpu type='kvm' name='mpc8349ea' typename=''/>
+  <cpu type='kvm' name='e500v2_v20' typename=''/>
+  <cpu type='kvm' name='power8nvl_v1.0' typename=''/>
+  <cpu type='kvm' name='mpc8540_v10' typename=''/>
+  <cpu type='kvm' name='755_v2.1' typename=''/>
+  <cpu type='kvm' name='745_v2.8' typename=''/>
+  <cpu type='kvm' name='npe405l' typename=''/>
+  <cpu type='kvm' name='mpc8343ea' typename=''/>
+  <cpu type='kvm' name='mpc8545_v20' typename=''/>
+  <cpu type='kvm' name='mpc8548_v10' typename=''/>
+  <cpu type='kvm' name='7448_v1.1' typename=''/>
+  <cpu type='kvm' name='7455_v3.4' typename=''/>
+  <cpu type='kvm' name='740_v2.2' typename=''/>
+  <cpu type='kvm' name='7400_v1.1' typename=''/>
+  <cpu type='kvm' name='mpc8347et' typename=''/>
+  <cpu type='kvm' name='7441_v2.10' typename=''/>
+  <cpu type='kvm' name='603e_v1.4' typename=''/>
+  <cpu type='kvm' name='mpc8543_v10' typename=''/>
+  <cpu type='kvm' name='401c2' typename=''/>
+  <cpu type='kvm' name='7451_v2.10' typename=''/>
+  <cpu type='kvm' name='750cx_v2.2' typename=''/>
+  <cpu type='kvm' name='mpc8543_v21' typename=''/>
+  <cpu type='kvm' name='603e7' typename=''/>
+  <cpu type='kvm' name='7448_v2.1' typename=''/>
+  <cpu type='kvm' name='7441_v2.3' typename=''/>
+  <cpu type='kvm' name='405crb' typename=''/>
+  <cpu type='kvm' name='604' typename=''/>
+  <cpu type='kvm' name='7400_v2.1' typename=''/>
+  <cpu type='kvm' name='440-xilinx-w-dfpu' typename=''/>
+  <cpu type='kvm' name='7445_v2.1' typename=''/>
+  <cpu type='kvm' name='cobra' typename=''/>
+  <cpu type='kvm' name='e500_v20' typename=''/>
+  <cpu type='kvm' name='mpc8541_v11' typename=''/>
+  <cpu type='kvm' name='750gx_v1.1' typename=''/>
+  <cpu type='kvm' name='750cxe_v2.4' typename=''/>
+  <cpu type='kvm' name='mpc8641d' typename=''/>
+  <cpu type='kvm' name='mpc8543e_v21' typename=''/>
+  <cpu type='kvm' name='750l_v2.1' typename=''/>
+  <cpu type='kvm' name='7457_v1.0' typename=''/>
+  <cpu type='kvm' name='7450_v1.2' typename=''/>
+  <cpu type='kvm' name='755_v2.5' typename=''/>
+  <cpu type='kvm' name='7410_v1.3' typename=''/>
+  <cpu type='kvm' name='745_v2.3' typename=''/>
+  <cpu type='kvm' name='755_v2.0' typename=''/>
+  <cpu type='kvm' name='e500v2_v30' typename=''/>
+  <cpu type='kvm' name='7455_v3.3' typename=''/>
+  <cpu type='kvm' name='mpc8540_v20' typename=''/>
+  <cpu type='kvm' name='405d2' typename=''/>
+  <cpu type='kvm' name='mpc8560_v21' typename=''/>
+  <cpu type='kvm' name='mpc8343' typename=''/>
+  <cpu type='kvm' name='mpc8548_v20' typename=''/>
+  <cpu type='kvm' name='mpc8347t' typename=''/>
+  <cpu type='kvm' name='755_v1.0' typename=''/>
+  <cpu type='kvm' name='603e_v1.3' typename=''/>
+  <cpu type='kvm' name='host' typename=''/>
+  <cpu type='kvm' name='mpc8543e_v10' typename=''/>
+  <cpu type='kvm' name='mpc8347eap' typename=''/>
+  <cpu type='kvm' name='mpc8548e_v11' typename=''/>
+  <cpu type='kvm' name='mpc8543_v20' typename=''/>
+  <cpu type='kvm' name='401d2' typename=''/>
+  <cpu type='kvm' name='power8_v2.0' typename=''/>
+  <cpu type='kvm' name='740_v3.1' typename=''/>
+  <cpu type='kvm' name='e200z5' typename=''/>
+  <cpu type='kvm' name='405cra' typename=''/>
+  <cpu type='kvm' name='7400_v2.0' typename=''/>
+  <cpu type='kvm' name='750cxe_v2.3' typename=''/>
+  <cpu type='kvm' name='745_v2.7' typename=''/>
+  <cpu type='kvm' name='mpc8560_v10' typename=''/>
+  <cpu type='kvm' name='e5500' typename=''/>
+  <cpu type='kvm' name='mpc8544_v11' typename=''/>
+  <cpu type='kvm' name='7448_v1.0' typename=''/>
+  <cpu type='kvm' name='401e2' typename=''/>
+  <cpu type='kvm' name='740_v2.1' typename=''/>
+  <cpu type='kvm' name='745_v2.2' typename=''/>
+  <cpu type='kvm' name='7400_v1.0' typename=''/>
+  <cpu type='kvm' name='7410_v1.2' typename=''/>
+  <cpu type='kvm' name='x2vp4' typename=''/>
+  <cpu type='kvm' name='mpc8347ap' typename=''/>
+  <cpu type='kvm' name='mpc8533_v11' typename=''/>
+  <cpu type='kvm' name='mpc5200b_v21' typename=''/>
+  <cpu type='kvm' name='750fx_v2.3' typename=''/>
+  <cpu type='kvm' name='601_v2' typename=''/>
+  <cpu type='kvm' name='g2legp3' typename=''/>
+  <cpu type='kvm' name='604e_v1.0' typename=''/>
+  <cpu type='kvm' name='750cx_v2.1' typename=''/>
+  <cpu type='kvm' name='mpc8610' typename=''/>
+  <cpu type='kvm' name='g2h4' typename=''/>
+  <cpu type='kvm' name='750l_v3.0' typename=''/>
+  <cpu type='kvm' name='mpc8377e' typename=''/>
+  <cpu type='kvm' name='e300c4' typename=''/>
+  <cpu type='kvm' name='mpc5200_v12' typename=''/>
+  <cpu type='kvm' name='7448_v2.0' typename=''/>
+  <cpu type='kvm' name='7450_v2.1' typename=''/>
+  <cpu type='kvm' name='750cxe_v3.1b' typename=''/>
+  <cpu type='kvm' name='g2' typename=''/>
+  <cpu type='kvm' name='7400_v2.9' typename=''/>
+  <cpu type='kvm' name='405gpd' typename=''/>
+  <cpu type='kvm' name='603' typename=''/>
+  <cpu type='kvm' name='603e7t' typename=''/>
+  <cpu type='kvm' name='mpc8555_v11' typename=''/>
+  <cpu type='kvm' name='750gx_v1.0' typename=''/>
+  <cpu type='kvm' name='mpc8541_v10' typename=''/>
+  <cpu type='kvm' name='mpc8543e_v20' typename=''/>
+  <cpu type='kvm' name='750fl' typename=''/>
+  <cpu type='kvm' name='750l_v2.0' typename=''/>
+  <cpu type='kvm' name='stb04' typename=''/>
+  <cpu type='kvm' name='mpc8548e_v21' typename=''/>
+  <cpu type='kvm' name='x2vp20' typename=''/>
+  <cpu type='kvm' name='405ez' typename=''/>
+  <cpu type='kvm' name='e600' typename=''/>
+  <cpu type='kvm' name='7450_v1.1' typename=''/>
+  <cpu type='kvm' name='755_v2.4' typename=''/>
+  <cpu type='kvm' name='mpc8379' typename=''/>
+  <cpu type='kvm' name='7445_v1.0' typename=''/>
+  <cpu type='kvm' name='7447_v1.1' typename=''/>
+  <cpu type='kvm' name='603e_v2.2' typename=''/>
+  <cpu type='kvm' name='603e_v4' typename=''/>
+  <cpu type='kvm' name='g2legp' typename=''/>
+  <cpu type='kvm' name='7455_v3.2' typename=''/>
+  <cpu type='kvm' name='740_v2.0' typename=''/>
+  <cpu type='kvm' name='mpc8560_v20' typename=''/>
+  <cpu type='kvm' name='440-xilinx' typename=''/>
+  <cpu type='kvm' name='401f2' typename=''/>
+  <cpu type='kvm' name='mpc8533_v10' typename=''/>
+  <cpu type='kvm' name='405gpr' typename=''/>
+  <cpu type='kvm' name='mpc8349a' typename=''/>
+  <cpu type='kvm' name='stb25' typename=''/>
+  <cpu type='kvm' name='603e_v1.2' typename=''/>
+  <cpu type='kvm' name='mpc5200b_v20' typename=''/>
+  <cpu type='kvm' name='750fx_v2.2' typename=''/>
+  <cpu type='kvm' name='mpc8347eat' typename=''/>
+  <cpu type='kvm' name='740_v1.0' typename=''/>
+  <cpu type='kvm' name='601_v1' typename=''/>
+  <cpu type='kvm' name='745_v1.1' typename=''/>
+  <cpu type='kvm' name='750cx_v2.0' typename=''/>
+  <cpu type='kvm' name='mpc8548e_v10' typename=''/>
+  <cpu type='kvm' name='7447a_v1.2' typename=''/>
+  <cpu type='kvm' name='403gc' typename=''/>
+  <cpu type='kvm' name='e300c3' typename=''/>
+  <cpu type='kvm' name='mpc5200_v11' typename=''/>
+  <cpu type='kvm' name='7441_v2.1' typename=''/>
+  <cpu type='kvm' name='740_v3.0' typename=''/>
+  <cpu type='kvm' name='mpc8545e_v21' typename=''/>
+  <cpu type='kvm' name='602' typename=''/>
+  <cpu type='kvm' name='mpc8378e' typename=''/>
+  <cpu type='kvm' name='mpc8343a' typename=''/>
+  <cpu type='kvm' name='460exb' typename=''/>
+  <cpu type='kvm' name='mpc8555_v10' typename=''/>
+  <cpu type='kvm' name='mpc8568' typename=''/>
+  <cpu type='kvm' name='7457a_v1.2' typename=''/>
+  <cpu type='kvm' name='750cx_v1.0' typename=''/>
+  <cpu type='kvm' name='750cxe_v2.2' typename=''/>
+  <cpu type='kvm' name='604e_v2.4' typename=''/>
+  <cpu type='kvm' name='755_v2.8' typename=''/>
+  <cpu type='kvm' name='405lp' typename=''/>
+  <cpu type='kvm' name='745_v2.6' typename=''/>
+  <cpu type='kvm' name='stb03' typename=''/>
+  <cpu type='kvm' name='405ep' typename=''/>
+  <cpu type='kvm' name='mpc8544_v10' typename=''/>
+  <cpu type='kvm' name='mpc8347at' typename=''/>
+  <cpu type='kvm' name='750_v2.2' typename=''/>
+  <cpu type='kvm' name='7450_v1.0' typename=''/>
+  <cpu type='kvm' name='755_v2.3' typename=''/>
+  <cpu type='kvm' name='7410_v1.1' typename=''/>
+  <cpu type='kvm' name='745_v2.1' typename=''/>
+  <cpu type='kvm' name='750gl' typename=''/>
+  <cpu type='kvm' name='e6500' typename=''/>
+  <cpu type='kvm' name='750p' typename=''/>
+  <cpu type='kvm' name='7445_v3.4' typename=''/>
+  <cpu type='kvm' name='440epb' typename=''/>
+  <cpu type='kvm' name='npe4gs3' typename=''/>
+  <cpu type='kvm' name='603e_v3' typename=''/>
+  <cpu type='kvm' name='mpc8349e' typename=''/>
+  <cpu type='kvm' name='970_v2.2' typename=''/>
+  <cpu type='kvm' name='g2lels' typename=''/>
+  <cpu type='kvm' name='g2hip4' typename=''/>
+  <cpu type='kvm' name='740p' typename=''/>
+  <cpu type='kvm' name='mpc8567e' typename=''/>
+  <cpu type='kvm' name='mpc8533e_v11' typename=''/>
+  <cpu type='kvm' name='7451_v2.3' typename=''/>
+  <cpu type='kvm' name='603e_v1.1' typename=''/>
+  <cpu type='kvm' name='401g2' typename=''/>
+  <cpu type='kvm' name='7400_v2.8' typename=''/>
+  <cpu type='kvm' name='7455_v2.1' typename=''/>
+  <cpu type='kvm' name='405gpc' typename=''/>
+  <cpu type='kvm' name='power7+_v2.1' typename=''/>
+  <cpu type='kvm' name='mpc8544e_v11' typename=''/>
+  <cpu type='kvm' name='7450_v2.0' typename=''/>
+  <cpu type='kvm' name='970mp_v1.1' typename=''/>
+  <cpu type='kvm' name='603e7v2' typename=''/>
+  <cpu type='kvm' name='604r' typename=''/>
+  <cpu type='kvm' name='e500v2_v22' typename=''/>
+  <cpu type='kvm' name='mpc8548e_v20' typename=''/>
+  <cpu type='kvm' name='mpc8545e_v20' typename=''/>
+  <cpu type='kvm' name='mpc8378' typename=''/>
+  <cpu type='kvm' name='mpc8567' typename=''/>
+  <cpu type='kvm' name='7457_v1.2' typename=''/>
+  <cpu type='kvm' name='7447_v1.0' typename=''/>
+  <cpu type='kvm' name='970fx_v3.1' typename=''/>
+  <cpu type='kvm' name='745_v2.5' typename=''/>
+  <cpu type='kvm' name='mpc8379e' typename=''/>
+  <cpu type='kvm' name='mpc8641' typename=''/>
+  <cpu type='kvm' name='750cxe_v2.4b' typename=''/>
+  <cpu type='kvm' name='7410_v1.0' typename=''/>
+  <cpu type='kvm' name='mpc603' typename=''/>
+  <cpu type='kvm' name='603e_v4.1' typename=''/>
+  <cpu type='kvm' name='7445_v3.3' typename=''/>
+  <cpu type='kvm' name='440epa' typename=''/>
+  <cpu type='kvm' name='970fx_v2.1' typename=''/>
+  <cpu type='kvm' name='iop480' typename=''/>
+  <cpu type='kvm' name='750fx_v2.1' typename=''/>
+  <cpu type='kvm' name='601_v0' typename=''/>
+  <cpu type='kvm' name='g2legp1' typename=''/>
+  <cpu type='kvm' name='745_v1.0' typename=''/>
+  <cpu type='kvm' name='750cl_v2.0' typename=''/>
+  <cpu type='kvm' name='750cxr' typename=''/>
+  <cpu type='kvm' name='401' typename=''/>
+  <cpu type='kvm' name='mpc8541e_v11' typename=''/>
+  <cpu type='kvm' name='750cxe_v3.1' typename=''/>
+  <cpu type='kvm' name='mpc8555e_v11' typename=''/>
+  <cpu type='kvm' name='power8e_v2.1' typename=''/>
+  <cpu type='kvm' name='7447a_v1.1' typename=''/>
+  <cpu type='kvm' name='403gb' typename=''/>
+  <cpu type='kvm' name='e300c2' typename=''/>
+  <cpu type='kvm' name='npe405h2' typename=''/>
+  <cpu type='kvm' name='mpc8343e' typename=''/>
+  <cpu type='kvm' name='mpc8533e_v10' typename=''/>
+  <cpu type='kvm' name='mpc5200_v10' typename=''/>
+  <cpu type='kvm' name='750_v3.1' typename=''/>
+  <cpu type='kvm' name='power5+_v2.1' typename=''/>
+  <cpu type='kvm' name='mpc8568e' typename=''/>
+  <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' typename=''/>
+  <cpu type='tcg' name='750cl_v1.0' typename=''/>
+  <cpu type='tcg' name='7457a_v1.1' typename=''/>
+  <cpu type='tcg' name='g2gp' typename=''/>
+  <cpu type='tcg' name='750cxe_v2.1' typename=''/>
+  <cpu type='tcg' name='755_v2.7' typename=''/>
+  <cpu type='tcg' name='750_v2.1' typename=''/>
+  <cpu type='tcg' name='755_v2.2' typename=''/>
+  <cpu type='tcg' name='745_v2.0' typename=''/>
+  <cpu type='tcg' name='mpc8377' typename=''/>
+  <cpu type='tcg' name='7455_v1.0' typename=''/>
+  <cpu type='tcg' name='mpc8545_v21' typename=''/>
+  <cpu type='tcg' name='mpc8548_v11' typename=''/>
+  <cpu type='tcg' name='405d4' typename=''/>
+  <cpu type='tcg' name='g2le' typename=''/>
+  <cpu type='tcg' name='g2hip3' typename=''/>
+  <cpu type='tcg' name='750e' typename=''/>
+  <cpu type='tcg' name='mpc8572' typename=''/>
+  <cpu type='tcg' name='970fx_v2.0' typename=''/>
+  <cpu type='tcg' name='750fx_v2.0' typename=''/>
+  <cpu type='tcg' name='603p' typename=''/>
+  <cpu type='tcg' name='405gpb' typename=''/>
+  <cpu type='tcg' name='7400_v2.7' typename=''/>
+  <cpu type='tcg' name='mpc8544e_v10' typename=''/>
+  <cpu type='tcg' name='e500v2_v10' typename=''/>
+  <cpu type='tcg' name='e500mc' typename=''/>
+  <cpu type='tcg' name='603e7v1' typename=''/>
+  <cpu type='tcg' name='970mp_v1.0' typename=''/>
+  <cpu type='tcg' name='740e' typename=''/>
+  <cpu type='tcg' name='405crc' typename=''/>
+  <cpu type='tcg' name='403ga' typename=''/>
+  <cpu type='tcg' name='7447a_v1.0' typename=''/>
+  <cpu type='tcg' name='7400_v2.2' typename=''/>
+  <cpu type='tcg' name='e300c1' typename=''/>
+  <cpu type='tcg' name='mpc8572e' typename=''/>
+  <cpu type='tcg' name='e500v2_v21' typename=''/>
+  <cpu type='tcg' name='970fx_v1.0' typename=''/>
+  <cpu type='tcg' name='750gx_v1.2' typename=''/>
+  <cpu type='tcg' name='750fx_v1.0' typename=''/>
+  <cpu type='tcg' name='7457_v1.1' typename=''/>
+  <cpu type='tcg' name='970fx_v3.0' typename=''/>
+  <cpu type='tcg' name='604e_v2.2' typename=''/>
+  <cpu type='tcg' name='755_v2.6' typename=''/>
+  <cpu type='tcg' name='401a1' typename=''/>
+  <cpu type='tcg' name='power9_v1.0' typename=''/>
+  <cpu type='tcg' name='npe405h' typename=''/>
+  <cpu type='tcg' name='7410_v1.4' typename=''/>
+  <cpu type='tcg' name='g2ls' typename=''/>
+  <cpu type='tcg' name='750_v2.0' typename=''/>
+  <cpu type='tcg' name='401b2' typename=''/>
+  <cpu type='tcg' name='mpc8349' typename=''/>
+  <cpu type='tcg' name='mpc8347ep' typename=''/>
+  <cpu type='tcg' name='7445_v3.2' typename=''/>
+  <cpu type='tcg' name='mpc8540_v21' typename=''/>
+  <cpu type='tcg' name='mpc8543_v11' typename=''/>
+  <cpu type='tcg' name='403gcx' typename=''/>
+  <cpu type='tcg' name='745_v2.4' typename=''/>
+  <cpu type='tcg' name='mpc8548_v21' typename=''/>
+  <cpu type='tcg' name='750l_v3.2' typename=''/>
+  <cpu type='tcg' name='750_v1.0' typename=''/>
+  <cpu type='tcg' name='755_v1.1' typename=''/>
+  <cpu type='tcg' name='e500_v10' typename=''/>
+  <cpu type='tcg' name='750cxe_v3.0' typename=''/>
+  <cpu type='tcg' name='mpc8541e_v10' typename=''/>
+  <cpu type='tcg' name='mpc8347p' typename=''/>
+  <cpu type='tcg' name='mpc8555e_v10' typename=''/>
+  <cpu type='tcg' name='power9_v2.0' typename=''/>
+  <cpu type='tcg' name='power7_v2.3' typename=''/>
+  <cpu type='tcg' name='603e7v' typename=''/>
+  <cpu type='tcg' name='mpc8543e_v11' typename=''/>
+  <cpu type='tcg' name='750_v3.0' typename=''/>
+  <cpu type='tcg' name='7400_v2.6' typename=''/>
+  <cpu type='tcg' name='405gpa' typename=''/>
+  <cpu type='tcg' name='440epx' typename=''/>
+  <cpu type='tcg' name='750l_v2.2' typename=''/>
+  <cpu type='tcg' name='e200z6' typename=''/>
+  <cpu type='tcg' name='mpc8547e_v20' typename=''/>
+  <cpu type='tcg' name='7457a_v1.0' typename=''/>
+  <cpu type='tcg' name='mpc8349ea' typename=''/>
+  <cpu type='tcg' name='e500v2_v20' typename=''/>
+  <cpu type='tcg' name='power8nvl_v1.0' typename=''/>
+  <cpu type='tcg' name='mpc8540_v10' typename=''/>
+  <cpu type='tcg' name='755_v2.1' typename=''/>
+  <cpu type='tcg' name='745_v2.8' typename=''/>
+  <cpu type='tcg' name='npe405l' typename=''/>
+  <cpu type='tcg' name='mpc8343ea' typename=''/>
+  <cpu type='tcg' name='mpc8545_v20' typename=''/>
+  <cpu type='tcg' name='mpc8548_v10' typename=''/>
+  <cpu type='tcg' name='7448_v1.1' typename=''/>
+  <cpu type='tcg' name='7455_v3.4' typename=''/>
+  <cpu type='tcg' name='740_v2.2' typename=''/>
+  <cpu type='tcg' name='7400_v1.1' typename=''/>
+  <cpu type='tcg' name='mpc8347et' typename=''/>
+  <cpu type='tcg' name='7441_v2.10' typename=''/>
+  <cpu type='tcg' name='603e_v1.4' typename=''/>
+  <cpu type='tcg' name='mpc8543_v10' typename=''/>
+  <cpu type='tcg' name='401c2' typename=''/>
+  <cpu type='tcg' name='7451_v2.10' typename=''/>
+  <cpu type='tcg' name='750cx_v2.2' typename=''/>
+  <cpu type='tcg' name='mpc8543_v21' typename=''/>
+  <cpu type='tcg' name='603e7' typename=''/>
+  <cpu type='tcg' name='7448_v2.1' typename=''/>
+  <cpu type='tcg' name='7441_v2.3' typename=''/>
+  <cpu type='tcg' name='405crb' typename=''/>
+  <cpu type='tcg' name='604' typename=''/>
+  <cpu type='tcg' name='7400_v2.1' typename=''/>
+  <cpu type='tcg' name='440-xilinx-w-dfpu' typename=''/>
+  <cpu type='tcg' name='7445_v2.1' typename=''/>
+  <cpu type='tcg' name='cobra' typename=''/>
+  <cpu type='tcg' name='e500_v20' typename=''/>
+  <cpu type='tcg' name='mpc8541_v11' typename=''/>
+  <cpu type='tcg' name='750gx_v1.1' typename=''/>
+  <cpu type='tcg' name='750cxe_v2.4' typename=''/>
+  <cpu type='tcg' name='mpc8641d' typename=''/>
+  <cpu type='tcg' name='mpc8543e_v21' typename=''/>
+  <cpu type='tcg' name='750l_v2.1' typename=''/>
+  <cpu type='tcg' name='7457_v1.0' typename=''/>
+  <cpu type='tcg' name='7450_v1.2' typename=''/>
+  <cpu type='tcg' name='755_v2.5' typename=''/>
+  <cpu type='tcg' name='7410_v1.3' typename=''/>
+  <cpu type='tcg' name='745_v2.3' typename=''/>
+  <cpu type='tcg' name='755_v2.0' typename=''/>
+  <cpu type='tcg' name='e500v2_v30' typename=''/>
+  <cpu type='tcg' name='7455_v3.3' typename=''/>
+  <cpu type='tcg' name='mpc8540_v20' typename=''/>
+  <cpu type='tcg' name='405d2' typename=''/>
+  <cpu type='tcg' name='mpc8560_v21' typename=''/>
+  <cpu type='tcg' name='mpc8343' typename=''/>
+  <cpu type='tcg' name='mpc8548_v20' typename=''/>
+  <cpu type='tcg' name='mpc8347t' typename=''/>
+  <cpu type='tcg' name='755_v1.0' typename=''/>
+  <cpu type='tcg' name='603e_v1.3' typename=''/>
+  <cpu type='tcg' name='mpc8543e_v10' typename=''/>
+  <cpu type='tcg' name='mpc8347eap' typename=''/>
+  <cpu type='tcg' name='mpc8548e_v11' typename=''/>
+  <cpu type='tcg' name='mpc8543_v20' typename=''/>
+  <cpu type='tcg' name='401d2' typename=''/>
+  <cpu type='tcg' name='power8_v2.0' typename=''/>
+  <cpu type='tcg' name='740_v3.1' typename=''/>
+  <cpu type='tcg' name='e200z5' typename=''/>
+  <cpu type='tcg' name='405cra' typename=''/>
+  <cpu type='tcg' name='7400_v2.0' typename=''/>
+  <cpu type='tcg' name='750cxe_v2.3' typename=''/>
+  <cpu type='tcg' name='745_v2.7' typename=''/>
+  <cpu type='tcg' name='mpc8560_v10' typename=''/>
+  <cpu type='tcg' name='e5500' typename=''/>
+  <cpu type='tcg' name='mpc8544_v11' typename=''/>
+  <cpu type='tcg' name='7448_v1.0' typename=''/>
+  <cpu type='tcg' name='401e2' typename=''/>
+  <cpu type='tcg' name='740_v2.1' typename=''/>
+  <cpu type='tcg' name='745_v2.2' typename=''/>
+  <cpu type='tcg' name='7400_v1.0' typename=''/>
+  <cpu type='tcg' name='7410_v1.2' typename=''/>
+  <cpu type='tcg' name='x2vp4' typename=''/>
+  <cpu type='tcg' name='mpc8347ap' typename=''/>
+  <cpu type='tcg' name='mpc8533_v11' typename=''/>
+  <cpu type='tcg' name='mpc5200b_v21' typename=''/>
+  <cpu type='tcg' name='750fx_v2.3' typename=''/>
+  <cpu type='tcg' name='601_v2' typename=''/>
+  <cpu type='tcg' name='g2legp3' typename=''/>
+  <cpu type='tcg' name='604e_v1.0' typename=''/>
+  <cpu type='tcg' name='750cx_v2.1' typename=''/>
+  <cpu type='tcg' name='mpc8610' typename=''/>
+  <cpu type='tcg' name='g2h4' typename=''/>
+  <cpu type='tcg' name='750l_v3.0' typename=''/>
+  <cpu type='tcg' name='mpc8377e' typename=''/>
+  <cpu type='tcg' name='e300c4' typename=''/>
+  <cpu type='tcg' name='mpc5200_v12' typename=''/>
+  <cpu type='tcg' name='7448_v2.0' typename=''/>
+  <cpu type='tcg' name='7450_v2.1' typename=''/>
+  <cpu type='tcg' name='750cxe_v3.1b' typename=''/>
+  <cpu type='tcg' name='g2' typename=''/>
+  <cpu type='tcg' name='7400_v2.9' typename=''/>
+  <cpu type='tcg' name='405gpd' typename=''/>
+  <cpu type='tcg' name='603' typename=''/>
+  <cpu type='tcg' name='603e7t' typename=''/>
+  <cpu type='tcg' name='mpc8555_v11' typename=''/>
+  <cpu type='tcg' name='750gx_v1.0' typename=''/>
+  <cpu type='tcg' name='mpc8541_v10' typename=''/>
+  <cpu type='tcg' name='mpc8543e_v20' typename=''/>
+  <cpu type='tcg' name='750fl' typename=''/>
+  <cpu type='tcg' name='750l_v2.0' typename=''/>
+  <cpu type='tcg' name='stb04' typename=''/>
+  <cpu type='tcg' name='mpc8548e_v21' typename=''/>
+  <cpu type='tcg' name='x2vp20' typename=''/>
+  <cpu type='tcg' name='405ez' typename=''/>
+  <cpu type='tcg' name='e600' typename=''/>
+  <cpu type='tcg' name='7450_v1.1' typename=''/>
+  <cpu type='tcg' name='755_v2.4' typename=''/>
+  <cpu type='tcg' name='mpc8379' typename=''/>
+  <cpu type='tcg' name='7445_v1.0' typename=''/>
+  <cpu type='tcg' name='7447_v1.1' typename=''/>
+  <cpu type='tcg' name='603e_v2.2' typename=''/>
+  <cpu type='tcg' name='603e_v4' typename=''/>
+  <cpu type='tcg' name='g2legp' typename=''/>
+  <cpu type='tcg' name='7455_v3.2' typename=''/>
+  <cpu type='tcg' name='740_v2.0' typename=''/>
+  <cpu type='tcg' name='mpc8560_v20' typename=''/>
+  <cpu type='tcg' name='440-xilinx' typename=''/>
+  <cpu type='tcg' name='401f2' typename=''/>
+  <cpu type='tcg' name='mpc8533_v10' typename=''/>
+  <cpu type='tcg' name='405gpr' typename=''/>
+  <cpu type='tcg' name='mpc8349a' typename=''/>
+  <cpu type='tcg' name='stb25' typename=''/>
+  <cpu type='tcg' name='603e_v1.2' typename=''/>
+  <cpu type='tcg' name='mpc5200b_v20' typename=''/>
+  <cpu type='tcg' name='750fx_v2.2' typename=''/>
+  <cpu type='tcg' name='mpc8347eat' typename=''/>
+  <cpu type='tcg' name='740_v1.0' typename=''/>
+  <cpu type='tcg' name='601_v1' typename=''/>
+  <cpu type='tcg' name='745_v1.1' typename=''/>
+  <cpu type='tcg' name='750cx_v2.0' typename=''/>
+  <cpu type='tcg' name='mpc8548e_v10' typename=''/>
+  <cpu type='tcg' name='7447a_v1.2' typename=''/>
+  <cpu type='tcg' name='403gc' typename=''/>
+  <cpu type='tcg' name='e300c3' typename=''/>
+  <cpu type='tcg' name='mpc5200_v11' typename=''/>
+  <cpu type='tcg' name='7441_v2.1' typename=''/>
+  <cpu type='tcg' name='740_v3.0' typename=''/>
+  <cpu type='tcg' name='mpc8545e_v21' typename=''/>
+  <cpu type='tcg' name='602' typename=''/>
+  <cpu type='tcg' name='mpc8378e' typename=''/>
+  <cpu type='tcg' name='mpc8343a' typename=''/>
+  <cpu type='tcg' name='460exb' typename=''/>
+  <cpu type='tcg' name='mpc8555_v10' typename=''/>
+  <cpu type='tcg' name='mpc8568' typename=''/>
+  <cpu type='tcg' name='7457a_v1.2' typename=''/>
+  <cpu type='tcg' name='750cx_v1.0' typename=''/>
+  <cpu type='tcg' name='750cxe_v2.2' typename=''/>
+  <cpu type='tcg' name='604e_v2.4' typename=''/>
+  <cpu type='tcg' name='755_v2.8' typename=''/>
+  <cpu type='tcg' name='405lp' typename=''/>
+  <cpu type='tcg' name='745_v2.6' typename=''/>
+  <cpu type='tcg' name='stb03' typename=''/>
+  <cpu type='tcg' name='405ep' typename=''/>
+  <cpu type='tcg' name='mpc8544_v10' typename=''/>
+  <cpu type='tcg' name='mpc8347at' typename=''/>
+  <cpu type='tcg' name='750_v2.2' typename=''/>
+  <cpu type='tcg' name='7450_v1.0' typename=''/>
+  <cpu type='tcg' name='755_v2.3' typename=''/>
+  <cpu type='tcg' name='7410_v1.1' typename=''/>
+  <cpu type='tcg' name='745_v2.1' typename=''/>
+  <cpu type='tcg' name='750gl' typename=''/>
+  <cpu type='tcg' name='e6500' typename=''/>
+  <cpu type='tcg' name='750p' typename=''/>
+  <cpu type='tcg' name='7445_v3.4' typename=''/>
+  <cpu type='tcg' name='440epb' typename=''/>
+  <cpu type='tcg' name='npe4gs3' typename=''/>
+  <cpu type='tcg' name='603e_v3' typename=''/>
+  <cpu type='tcg' name='mpc8349e' typename=''/>
+  <cpu type='tcg' name='970_v2.2' typename=''/>
+  <cpu type='tcg' name='g2lels' typename=''/>
+  <cpu type='tcg' name='g2hip4' typename=''/>
+  <cpu type='tcg' name='740p' typename=''/>
+  <cpu type='tcg' name='mpc8567e' typename=''/>
+  <cpu type='tcg' name='mpc8533e_v11' typename=''/>
+  <cpu type='tcg' name='7451_v2.3' typename=''/>
+  <cpu type='tcg' name='603e_v1.1' typename=''/>
+  <cpu type='tcg' name='401g2' typename=''/>
+  <cpu type='tcg' name='7400_v2.8' typename=''/>
+  <cpu type='tcg' name='7455_v2.1' typename=''/>
+  <cpu type='tcg' name='405gpc' typename=''/>
+  <cpu type='tcg' name='power7+_v2.1' typename=''/>
+  <cpu type='tcg' name='mpc8544e_v11' typename=''/>
+  <cpu type='tcg' name='7450_v2.0' typename=''/>
+  <cpu type='tcg' name='970mp_v1.1' typename=''/>
+  <cpu type='tcg' name='603e7v2' typename=''/>
+  <cpu type='tcg' name='604r' typename=''/>
+  <cpu type='tcg' name='e500v2_v22' typename=''/>
+  <cpu type='tcg' name='mpc8548e_v20' typename=''/>
+  <cpu type='tcg' name='mpc8545e_v20' typename=''/>
+  <cpu type='tcg' name='mpc8378' typename=''/>
+  <cpu type='tcg' name='mpc8567' typename=''/>
+  <cpu type='tcg' name='7457_v1.2' typename=''/>
+  <cpu type='tcg' name='7447_v1.0' typename=''/>
+  <cpu type='tcg' name='970fx_v3.1' typename=''/>
+  <cpu type='tcg' name='745_v2.5' typename=''/>
+  <cpu type='tcg' name='mpc8379e' typename=''/>
+  <cpu type='tcg' name='mpc8641' typename=''/>
+  <cpu type='tcg' name='750cxe_v2.4b' typename=''/>
+  <cpu type='tcg' name='7410_v1.0' typename=''/>
+  <cpu type='tcg' name='mpc603' typename=''/>
+  <cpu type='tcg' name='603e_v4.1' typename=''/>
+  <cpu type='tcg' name='7445_v3.3' typename=''/>
+  <cpu type='tcg' name='440epa' typename=''/>
+  <cpu type='tcg' name='970fx_v2.1' typename=''/>
+  <cpu type='tcg' name='iop480' typename=''/>
+  <cpu type='tcg' name='750fx_v2.1' typename=''/>
+  <cpu type='tcg' name='601_v0' typename=''/>
+  <cpu type='tcg' name='g2legp1' typename=''/>
+  <cpu type='tcg' name='745_v1.0' typename=''/>
+  <cpu type='tcg' name='750cl_v2.0' typename=''/>
+  <cpu type='tcg' name='750cxr' typename=''/>
+  <cpu type='tcg' name='401' typename=''/>
+  <cpu type='tcg' name='mpc8541e_v11' typename=''/>
+  <cpu type='tcg' name='750cxe_v3.1' typename=''/>
+  <cpu type='tcg' name='mpc8555e_v11' typename=''/>
+  <cpu type='tcg' name='power8e_v2.1' typename=''/>
+  <cpu type='tcg' name='7447a_v1.1' typename=''/>
+  <cpu type='tcg' name='403gb' typename=''/>
+  <cpu type='tcg' name='e300c2' typename=''/>
+  <cpu type='tcg' name='npe405h2' typename=''/>
+  <cpu type='tcg' name='mpc8343e' typename=''/>
+  <cpu type='tcg' name='mpc8533e_v10' typename=''/>
+  <cpu type='tcg' name='mpc5200_v10' typename=''/>
+  <cpu type='tcg' name='750_v3.1' typename=''/>
+  <cpu type='tcg' name='power5+_v2.1' typename=''/>
+  <cpu type='tcg' name='mpc8568e' typename=''/>
   <machine name='pseries-3.0' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes'/>
   <machine name='ref405ep' maxCpus='1'/>
   <machine name='sam460ex' maxCpus='1'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
index d511377262..1241a2fe5c 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
@@ -161,77 +161,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'/>
@@ -245,7 +245,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'/>
@@ -259,7 +259,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'/>
@@ -403,7 +403,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'/>
@@ -431,7 +431,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'/>
@@ -551,7 +551,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'/>
@@ -695,7 +695,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'/>
@@ -713,7 +713,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'/>
@@ -741,7 +741,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'/>
@@ -768,7 +768,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'/>
@@ -799,7 +799,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'/>
@@ -813,8 +813,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'/>
@@ -835,7 +835,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'/>
@@ -962,7 +962,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'/>
@@ -983,7 +983,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'/>
@@ -1010,8 +1010,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'/>
@@ -1039,8 +1039,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'/>
@@ -1061,8 +1061,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'/>
@@ -1098,8 +1098,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'/>
@@ -1113,7 +1113,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'/>
@@ -1127,7 +1127,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'/>
@@ -1141,7 +1141,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'/>
@@ -1164,8 +1164,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'/>
@@ -1183,8 +1183,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'/>
@@ -1304,7 +1304,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'/>
@@ -1436,7 +1436,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'/>
@@ -1467,7 +1467,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'/>
@@ -1481,7 +1481,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'/>
@@ -1495,7 +1495,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'/>
@@ -1531,7 +1531,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'/>
@@ -1545,7 +1545,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'/>
@@ -1665,7 +1665,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'/>
@@ -1693,7 +1693,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'/>
@@ -1825,8 +1825,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'/>
@@ -1854,7 +1854,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'/>
@@ -1877,7 +1877,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'/>
@@ -1904,7 +1904,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'/>
@@ -1918,7 +1918,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'/>
@@ -1936,7 +1936,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'/>
@@ -1950,8 +1950,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'/>
@@ -1972,7 +1972,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'/>
@@ -2000,7 +2000,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'/>
@@ -2014,7 +2014,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'/>
@@ -2141,7 +2141,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'/>
@@ -2164,7 +2164,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'/>
@@ -2182,7 +2182,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'/>
@@ -2200,7 +2200,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'/>
@@ -2327,7 +2327,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'/>
@@ -2341,7 +2341,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'/>
@@ -2364,8 +2364,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'/>
@@ -2497,7 +2497,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'/>
@@ -2525,7 +2525,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'/>
@@ -2556,7 +2556,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'/>
@@ -2570,7 +2570,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'/>
@@ -2584,7 +2584,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'/>
@@ -2612,7 +2612,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'/>
@@ -2633,7 +2633,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'/>
@@ -2656,7 +2656,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 7a322030bd..1cf9189efd 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
@@ -712,12 +712,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'/>
@@ -725,22 +725,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'/>
@@ -751,7 +751,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'/>
@@ -762,33 +762,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'/>
@@ -800,13 +800,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'/>
@@ -816,7 +816,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'/>
@@ -825,36 +825,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'/>
@@ -876,7 +876,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'/>
@@ -897,7 +897,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'/>
@@ -914,7 +914,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'/>
@@ -930,19 +930,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'/>
@@ -952,23 +952,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'/>
@@ -986,7 +986,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'/>
@@ -994,14 +994,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'/>
@@ -1013,7 +1013,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'/>
@@ -1024,7 +1024,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'/>
@@ -1038,7 +1038,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'/>
@@ -1051,7 +1051,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'/>
@@ -1067,7 +1067,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'/>
@@ -1082,8 +1082,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'/>
@@ -1097,7 +1097,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'/>
@@ -1110,7 +1110,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'/>
@@ -1126,7 +1126,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'/>
@@ -1141,7 +1141,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 400dc45be4..85f44edbb4 100644
--- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
@@ -162,881 +162,881 @@
   <microcodeVersion>42900758</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='mpc8547e_v21'/>
-  <cpu type='kvm' name='750cl_v1.0'/>
-  <cpu type='kvm' name='7457a_v1.1'/>
-  <cpu type='kvm' name='g2gp'/>
-  <cpu type='kvm' name='750cxe_v2.1'/>
-  <cpu type='kvm' name='755_v2.7'/>
-  <cpu type='kvm' name='750_v2.1'/>
-  <cpu type='kvm' name='755_v2.2'/>
-  <cpu type='kvm' name='745_v2.0'/>
-  <cpu type='kvm' name='mpc8377'/>
-  <cpu type='kvm' name='7455_v1.0'/>
-  <cpu type='kvm' name='mpc8545_v21'/>
-  <cpu type='kvm' name='mpc8548_v11'/>
-  <cpu type='kvm' name='405d4'/>
-  <cpu type='kvm' name='g2le'/>
-  <cpu type='kvm' name='g2hip3'/>
-  <cpu type='kvm' name='750e'/>
-  <cpu type='kvm' name='mpc8572'/>
-  <cpu type='kvm' name='970fx_v2.0'/>
-  <cpu type='kvm' name='750fx_v2.0'/>
-  <cpu type='kvm' name='603p'/>
-  <cpu type='kvm' name='405gpb'/>
-  <cpu type='kvm' name='7400_v2.7'/>
-  <cpu type='kvm' name='mpc8544e_v10'/>
-  <cpu type='kvm' name='e500v2_v10'/>
-  <cpu type='kvm' name='e500mc'/>
-  <cpu type='kvm' name='603e7v1'/>
-  <cpu type='kvm' name='970mp_v1.0'/>
-  <cpu type='kvm' name='740e'/>
-  <cpu type='kvm' name='405crc'/>
-  <cpu type='kvm' name='403ga'/>
-  <cpu type='kvm' name='7447a_v1.0'/>
-  <cpu type='kvm' name='7400_v2.2'/>
-  <cpu type='kvm' name='e300c1'/>
-  <cpu type='kvm' name='mpc8572e'/>
-  <cpu type='kvm' name='e500v2_v21'/>
-  <cpu type='kvm' name='970fx_v1.0'/>
-  <cpu type='kvm' name='750gx_v1.2'/>
-  <cpu type='kvm' name='750fx_v1.0'/>
-  <cpu type='kvm' name='7457_v1.1'/>
-  <cpu type='kvm' name='970fx_v3.0'/>
-  <cpu type='kvm' name='604e_v2.2'/>
-  <cpu type='kvm' name='755_v2.6'/>
-  <cpu type='kvm' name='401a1'/>
-  <cpu type='kvm' name='power9_v1.0'/>
-  <cpu type='kvm' name='npe405h'/>
-  <cpu type='kvm' name='g2ls'/>
-  <cpu type='kvm' name='7410_v1.4'/>
-  <cpu type='kvm' name='750_v2.0'/>
-  <cpu type='kvm' name='401b2'/>
-  <cpu type='kvm' name='mpc8349'/>
-  <cpu type='kvm' name='mpc8347ep'/>
-  <cpu type='kvm' name='7445_v3.2'/>
-  <cpu type='kvm' name='mpc8540_v21'/>
-  <cpu type='kvm' name='mpc8543_v11'/>
-  <cpu type='kvm' name='403gcx'/>
-  <cpu type='kvm' name='745_v2.4'/>
-  <cpu type='kvm' name='mpc8548_v21'/>
-  <cpu type='kvm' name='750l_v3.2'/>
-  <cpu type='kvm' name='750_v1.0'/>
-  <cpu type='kvm' name='755_v1.1'/>
-  <cpu type='kvm' name='e500_v10'/>
-  <cpu type='kvm' name='750cxe_v3.0'/>
-  <cpu type='kvm' name='mpc8541e_v10'/>
-  <cpu type='kvm' name='mpc8347p'/>
-  <cpu type='kvm' name='mpc8555e_v10'/>
-  <cpu type='kvm' name='power9_v2.0'/>
-  <cpu type='kvm' name='power7_v2.3'/>
-  <cpu type='kvm' name='603e7v'/>
-  <cpu type='kvm' name='mpc8543e_v11'/>
-  <cpu type='kvm' name='750_v3.0'/>
-  <cpu type='kvm' name='7400_v2.6'/>
-  <cpu type='kvm' name='405gpa'/>
-  <cpu type='kvm' name='440epx'/>
-  <cpu type='kvm' name='750l_v2.2'/>
-  <cpu type='kvm' name='e200z6'/>
-  <cpu type='kvm' name='mpc8547e_v20'/>
-  <cpu type='kvm' name='7457a_v1.0'/>
-  <cpu type='kvm' name='mpc8349ea'/>
-  <cpu type='kvm' name='e500v2_v20'/>
-  <cpu type='kvm' name='power8nvl_v1.0'/>
-  <cpu type='kvm' name='mpc8540_v10'/>
-  <cpu type='kvm' name='755_v2.1'/>
-  <cpu type='kvm' name='745_v2.8'/>
-  <cpu type='kvm' name='npe405l'/>
-  <cpu type='kvm' name='mpc8343ea'/>
-  <cpu type='kvm' name='mpc8545_v20'/>
-  <cpu type='kvm' name='mpc8548_v10'/>
-  <cpu type='kvm' name='7455_v3.4'/>
-  <cpu type='kvm' name='740_v2.2'/>
-  <cpu type='kvm' name='7448_v1.1'/>
-  <cpu type='kvm' name='7400_v1.1'/>
-  <cpu type='kvm' name='mpc8347et'/>
-  <cpu type='kvm' name='7441_v2.10'/>
-  <cpu type='kvm' name='603e_v1.4'/>
-  <cpu type='kvm' name='mpc8543_v10'/>
-  <cpu type='kvm' name='401c2'/>
-  <cpu type='kvm' name='7451_v2.10'/>
-  <cpu type='kvm' name='750cx_v2.2'/>
-  <cpu type='kvm' name='mpc8543_v21'/>
-  <cpu type='kvm' name='603e7'/>
-  <cpu type='kvm' name='7448_v2.1'/>
-  <cpu type='kvm' name='7441_v2.3'/>
-  <cpu type='kvm' name='405crb'/>
-  <cpu type='kvm' name='604'/>
-  <cpu type='kvm' name='7400_v2.1'/>
-  <cpu type='kvm' name='440-xilinx-w-dfpu'/>
-  <cpu type='kvm' name='7445_v2.1'/>
-  <cpu type='kvm' name='cobra'/>
-  <cpu type='kvm' name='e500_v20'/>
-  <cpu type='kvm' name='mpc8541_v11'/>
-  <cpu type='kvm' name='750gx_v1.1'/>
-  <cpu type='kvm' name='750cxe_v2.4'/>
-  <cpu type='kvm' name='mpc8641d'/>
-  <cpu type='kvm' name='mpc8543e_v21'/>
-  <cpu type='kvm' name='750l_v2.1'/>
-  <cpu type='kvm' name='7457_v1.0'/>
-  <cpu type='kvm' name='7450_v1.2'/>
-  <cpu type='kvm' name='755_v2.5'/>
-  <cpu type='kvm' name='7410_v1.3'/>
-  <cpu type='kvm' name='745_v2.3'/>
-  <cpu type='kvm' name='755_v2.0'/>
-  <cpu type='kvm' name='e500v2_v30'/>
-  <cpu type='kvm' name='7455_v3.3'/>
-  <cpu type='kvm' name='mpc8540_v20'/>
-  <cpu type='kvm' name='405d2'/>
-  <cpu type='kvm' name='mpc8560_v21'/>
-  <cpu type='kvm' name='mpc8343'/>
-  <cpu type='kvm' name='mpc8548_v20'/>
-  <cpu type='kvm' name='mpc8347t'/>
-  <cpu type='kvm' name='755_v1.0'/>
-  <cpu type='kvm' name='603e_v1.3'/>
-  <cpu type='kvm' name='host'/>
-  <cpu type='kvm' name='mpc8543e_v10'/>
-  <cpu type='kvm' name='mpc8347eap'/>
-  <cpu type='kvm' name='mpc8548e_v11'/>
-  <cpu type='kvm' name='mpc8543_v20'/>
-  <cpu type='kvm' name='401d2'/>
-  <cpu type='kvm' name='power8_v2.0'/>
-  <cpu type='kvm' name='740_v3.1'/>
-  <cpu type='kvm' name='e200z5'/>
-  <cpu type='kvm' name='405cra'/>
-  <cpu type='kvm' name='7400_v2.0'/>
-  <cpu type='kvm' name='750cxe_v2.3'/>
-  <cpu type='kvm' name='745_v2.7'/>
-  <cpu type='kvm' name='mpc8560_v10'/>
-  <cpu type='kvm' name='e5500'/>
-  <cpu type='kvm' name='mpc8544_v11'/>
-  <cpu type='kvm' name='7448_v1.0'/>
-  <cpu type='kvm' name='401e2'/>
-  <cpu type='kvm' name='740_v2.1'/>
-  <cpu type='kvm' name='745_v2.2'/>
-  <cpu type='kvm' name='7400_v1.0'/>
-  <cpu type='kvm' name='7410_v1.2'/>
-  <cpu type='kvm' name='x2vp4'/>
-  <cpu type='kvm' name='mpc8347ap'/>
-  <cpu type='kvm' name='mpc8533_v11'/>
-  <cpu type='kvm' name='mpc5200b_v21'/>
-  <cpu type='kvm' name='750fx_v2.3'/>
-  <cpu type='kvm' name='601_v2'/>
-  <cpu type='kvm' name='g2legp3'/>
-  <cpu type='kvm' name='604e_v1.0'/>
-  <cpu type='kvm' name='750cx_v2.1'/>
-  <cpu type='kvm' name='mpc8610'/>
-  <cpu type='kvm' name='g2h4'/>
-  <cpu type='kvm' name='750l_v3.0'/>
-  <cpu type='kvm' name='mpc8377e'/>
-  <cpu type='kvm' name='e300c4'/>
-  <cpu type='kvm' name='mpc5200_v12'/>
-  <cpu type='kvm' name='7448_v2.0'/>
-  <cpu type='kvm' name='7450_v2.1'/>
-  <cpu type='kvm' name='750cxe_v3.1b'/>
-  <cpu type='kvm' name='g2'/>
-  <cpu type='kvm' name='7400_v2.9'/>
-  <cpu type='kvm' name='405gpd'/>
-  <cpu type='kvm' name='603'/>
-  <cpu type='kvm' name='603e7t'/>
-  <cpu type='kvm' name='mpc8555_v11'/>
-  <cpu type='kvm' name='750gx_v1.0'/>
-  <cpu type='kvm' name='mpc8541_v10'/>
-  <cpu type='kvm' name='mpc8543e_v20'/>
-  <cpu type='kvm' name='750fl'/>
-  <cpu type='kvm' name='750l_v2.0'/>
-  <cpu type='kvm' name='stb04'/>
-  <cpu type='kvm' name='mpc8548e_v21'/>
-  <cpu type='kvm' name='x2vp20'/>
-  <cpu type='kvm' name='405ez'/>
-  <cpu type='kvm' name='e600'/>
-  <cpu type='kvm' name='7450_v1.1'/>
-  <cpu type='kvm' name='755_v2.4'/>
-  <cpu type='kvm' name='mpc8379'/>
-  <cpu type='kvm' name='7445_v1.0'/>
-  <cpu type='kvm' name='7447_v1.1'/>
-  <cpu type='kvm' name='603e_v2.2'/>
-  <cpu type='kvm' name='603e_v4'/>
-  <cpu type='kvm' name='g2legp'/>
-  <cpu type='kvm' name='7455_v3.2'/>
-  <cpu type='kvm' name='740_v2.0'/>
-  <cpu type='kvm' name='mpc8560_v20'/>
-  <cpu type='kvm' name='440-xilinx'/>
-  <cpu type='kvm' name='401f2'/>
-  <cpu type='kvm' name='mpc8533_v10'/>
-  <cpu type='kvm' name='mpc8349a'/>
-  <cpu type='kvm' name='405gpr'/>
-  <cpu type='kvm' name='stb25'/>
-  <cpu type='kvm' name='603e_v1.2'/>
-  <cpu type='kvm' name='mpc5200b_v20'/>
-  <cpu type='kvm' name='750fx_v2.2'/>
-  <cpu type='kvm' name='mpc8347eat'/>
-  <cpu type='kvm' name='740_v1.0'/>
-  <cpu type='kvm' name='601_v1'/>
-  <cpu type='kvm' name='745_v1.1'/>
-  <cpu type='kvm' name='750cx_v2.0'/>
-  <cpu type='kvm' name='mpc8548e_v10'/>
-  <cpu type='kvm' name='7447a_v1.2'/>
-  <cpu type='kvm' name='403gc'/>
-  <cpu type='kvm' name='e300c3'/>
-  <cpu type='kvm' name='mpc5200_v11'/>
-  <cpu type='kvm' name='7441_v2.1'/>
-  <cpu type='kvm' name='740_v3.0'/>
-  <cpu type='kvm' name='mpc8545e_v21'/>
-  <cpu type='kvm' name='602'/>
-  <cpu type='kvm' name='mpc8378e'/>
-  <cpu type='kvm' name='mpc8343a'/>
-  <cpu type='kvm' name='460exb'/>
-  <cpu type='kvm' name='mpc8555_v10'/>
-  <cpu type='kvm' name='mpc8568'/>
-  <cpu type='kvm' name='7457a_v1.2'/>
-  <cpu type='kvm' name='750cx_v1.0'/>
-  <cpu type='kvm' name='750cxe_v2.2'/>
-  <cpu type='kvm' name='604e_v2.4'/>
-  <cpu type='kvm' name='755_v2.8'/>
-  <cpu type='kvm' name='405lp'/>
-  <cpu type='kvm' name='745_v2.6'/>
-  <cpu type='kvm' name='stb03'/>
-  <cpu type='kvm' name='405ep'/>
-  <cpu type='kvm' name='mpc8544_v10'/>
-  <cpu type='kvm' name='mpc8347at'/>
-  <cpu type='kvm' name='750_v2.2'/>
-  <cpu type='kvm' name='7450_v1.0'/>
-  <cpu type='kvm' name='755_v2.3'/>
-  <cpu type='kvm' name='7410_v1.1'/>
-  <cpu type='kvm' name='745_v2.1'/>
-  <cpu type='kvm' name='750gl'/>
-  <cpu type='kvm' name='e6500'/>
-  <cpu type='kvm' name='750p'/>
-  <cpu type='kvm' name='7445_v3.4'/>
-  <cpu type='kvm' name='440epb'/>
-  <cpu type='kvm' name='npe4gs3'/>
-  <cpu type='kvm' name='603e_v3'/>
-  <cpu type='kvm' name='mpc8349e'/>
-  <cpu type='kvm' name='970_v2.2'/>
-  <cpu type='kvm' name='g2lels'/>
-  <cpu type='kvm' name='g2hip4'/>
-  <cpu type='kvm' name='740p'/>
-  <cpu type='kvm' name='mpc8567e'/>
-  <cpu type='kvm' name='mpc8533e_v11'/>
-  <cpu type='kvm' name='7451_v2.3'/>
-  <cpu type='kvm' name='603e_v1.1'/>
-  <cpu type='kvm' name='401g2'/>
-  <cpu type='kvm' name='7400_v2.8'/>
-  <cpu type='kvm' name='7455_v2.1'/>
-  <cpu type='kvm' name='405gpc'/>
-  <cpu type='kvm' name='power7+_v2.1'/>
-  <cpu type='kvm' name='mpc8544e_v11'/>
-  <cpu type='kvm' name='7450_v2.0'/>
-  <cpu type='kvm' name='970mp_v1.1'/>
-  <cpu type='kvm' name='603e7v2'/>
-  <cpu type='kvm' name='604r'/>
-  <cpu type='kvm' name='e500v2_v22'/>
-  <cpu type='kvm' name='mpc8548e_v20'/>
-  <cpu type='kvm' name='mpc8545e_v20'/>
-  <cpu type='kvm' name='mpc8378'/>
-  <cpu type='kvm' name='mpc8567'/>
-  <cpu type='kvm' name='7457_v1.2'/>
-  <cpu type='kvm' name='7447_v1.0'/>
-  <cpu type='kvm' name='970fx_v3.1'/>
-  <cpu type='kvm' name='745_v2.5'/>
-  <cpu type='kvm' name='mpc8379e'/>
-  <cpu type='kvm' name='mpc8641'/>
-  <cpu type='kvm' name='750cxe_v2.4b'/>
-  <cpu type='kvm' name='7410_v1.0'/>
-  <cpu type='kvm' name='mpc603'/>
-  <cpu type='kvm' name='603e_v4.1'/>
-  <cpu type='kvm' name='7445_v3.3'/>
-  <cpu type='kvm' name='440epa'/>
-  <cpu type='kvm' name='970fx_v2.1'/>
-  <cpu type='kvm' name='iop480'/>
-  <cpu type='kvm' name='750fx_v2.1'/>
-  <cpu type='kvm' name='601_v0'/>
-  <cpu type='kvm' name='g2legp1'/>
-  <cpu type='kvm' name='745_v1.0'/>
-  <cpu type='kvm' name='750cl_v2.0'/>
-  <cpu type='kvm' name='750cxr'/>
-  <cpu type='kvm' name='401'/>
-  <cpu type='kvm' name='mpc8541e_v11'/>
-  <cpu type='kvm' name='750cxe_v3.1'/>
-  <cpu type='kvm' name='mpc8555e_v11'/>
-  <cpu type='kvm' name='power8e_v2.1'/>
-  <cpu type='kvm' name='7447a_v1.1'/>
-  <cpu type='kvm' name='403gb'/>
-  <cpu type='kvm' name='e300c2'/>
-  <cpu type='kvm' name='npe405h2'/>
-  <cpu type='kvm' name='mpc8343e'/>
-  <cpu type='kvm' name='mpc8533e_v10'/>
-  <cpu type='kvm' name='mpc5200_v10'/>
-  <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='mpc8547e_v21'/>
-  <cpu type='tcg' name='750cl_v1.0'/>
-  <cpu type='tcg' name='7457a_v1.1'/>
-  <cpu type='tcg' name='g2gp'/>
-  <cpu type='tcg' name='750cxe_v2.1'/>
-  <cpu type='tcg' name='755_v2.7'/>
-  <cpu type='tcg' name='750_v2.1'/>
-  <cpu type='tcg' name='755_v2.2'/>
-  <cpu type='tcg' name='745_v2.0'/>
-  <cpu type='tcg' name='mpc8377'/>
-  <cpu type='tcg' name='7455_v1.0'/>
-  <cpu type='tcg' name='mpc8545_v21'/>
-  <cpu type='tcg' name='mpc8548_v11'/>
-  <cpu type='tcg' name='405d4'/>
-  <cpu type='tcg' name='g2le'/>
-  <cpu type='tcg' name='g2hip3'/>
-  <cpu type='tcg' name='750e'/>
-  <cpu type='tcg' name='mpc8572'/>
-  <cpu type='tcg' name='970fx_v2.0'/>
-  <cpu type='tcg' name='750fx_v2.0'/>
-  <cpu type='tcg' name='603p'/>
-  <cpu type='tcg' name='405gpb'/>
-  <cpu type='tcg' name='7400_v2.7'/>
-  <cpu type='tcg' name='mpc8544e_v10'/>
-  <cpu type='tcg' name='e500v2_v10'/>
-  <cpu type='tcg' name='e500mc'/>
-  <cpu type='tcg' name='603e7v1'/>
-  <cpu type='tcg' name='970mp_v1.0'/>
-  <cpu type='tcg' name='740e'/>
-  <cpu type='tcg' name='405crc'/>
-  <cpu type='tcg' name='403ga'/>
-  <cpu type='tcg' name='7447a_v1.0'/>
-  <cpu type='tcg' name='7400_v2.2'/>
-  <cpu type='tcg' name='e300c1'/>
-  <cpu type='tcg' name='mpc8572e'/>
-  <cpu type='tcg' name='e500v2_v21'/>
-  <cpu type='tcg' name='970fx_v1.0'/>
-  <cpu type='tcg' name='750gx_v1.2'/>
-  <cpu type='tcg' name='750fx_v1.0'/>
-  <cpu type='tcg' name='7457_v1.1'/>
-  <cpu type='tcg' name='970fx_v3.0'/>
-  <cpu type='tcg' name='604e_v2.2'/>
-  <cpu type='tcg' name='755_v2.6'/>
-  <cpu type='tcg' name='401a1'/>
-  <cpu type='tcg' name='power9_v1.0'/>
-  <cpu type='tcg' name='npe405h'/>
-  <cpu type='tcg' name='g2ls'/>
-  <cpu type='tcg' name='7410_v1.4'/>
-  <cpu type='tcg' name='750_v2.0'/>
-  <cpu type='tcg' name='401b2'/>
-  <cpu type='tcg' name='mpc8349'/>
-  <cpu type='tcg' name='mpc8347ep'/>
-  <cpu type='tcg' name='7445_v3.2'/>
-  <cpu type='tcg' name='mpc8540_v21'/>
-  <cpu type='tcg' name='mpc8543_v11'/>
-  <cpu type='tcg' name='403gcx'/>
-  <cpu type='tcg' name='745_v2.4'/>
-  <cpu type='tcg' name='mpc8548_v21'/>
-  <cpu type='tcg' name='750l_v3.2'/>
-  <cpu type='tcg' name='750_v1.0'/>
-  <cpu type='tcg' name='755_v1.1'/>
-  <cpu type='tcg' name='e500_v10'/>
-  <cpu type='tcg' name='750cxe_v3.0'/>
-  <cpu type='tcg' name='mpc8541e_v10'/>
-  <cpu type='tcg' name='mpc8347p'/>
-  <cpu type='tcg' name='mpc8555e_v10'/>
-  <cpu type='tcg' name='power9_v2.0'/>
-  <cpu type='tcg' name='power7_v2.3'/>
-  <cpu type='tcg' name='603e7v'/>
-  <cpu type='tcg' name='mpc8543e_v11'/>
-  <cpu type='tcg' name='750_v3.0'/>
-  <cpu type='tcg' name='7400_v2.6'/>
-  <cpu type='tcg' name='405gpa'/>
-  <cpu type='tcg' name='440epx'/>
-  <cpu type='tcg' name='750l_v2.2'/>
-  <cpu type='tcg' name='e200z6'/>
-  <cpu type='tcg' name='mpc8547e_v20'/>
-  <cpu type='tcg' name='7457a_v1.0'/>
-  <cpu type='tcg' name='mpc8349ea'/>
-  <cpu type='tcg' name='e500v2_v20'/>
-  <cpu type='tcg' name='power8nvl_v1.0'/>
-  <cpu type='tcg' name='mpc8540_v10'/>
-  <cpu type='tcg' name='755_v2.1'/>
-  <cpu type='tcg' name='745_v2.8'/>
-  <cpu type='tcg' name='npe405l'/>
-  <cpu type='tcg' name='mpc8343ea'/>
-  <cpu type='tcg' name='mpc8545_v20'/>
-  <cpu type='tcg' name='mpc8548_v10'/>
-  <cpu type='tcg' name='7455_v3.4'/>
-  <cpu type='tcg' name='740_v2.2'/>
-  <cpu type='tcg' name='7448_v1.1'/>
-  <cpu type='tcg' name='7400_v1.1'/>
-  <cpu type='tcg' name='mpc8347et'/>
-  <cpu type='tcg' name='7441_v2.10'/>
-  <cpu type='tcg' name='603e_v1.4'/>
-  <cpu type='tcg' name='mpc8543_v10'/>
-  <cpu type='tcg' name='401c2'/>
-  <cpu type='tcg' name='7451_v2.10'/>
-  <cpu type='tcg' name='750cx_v2.2'/>
-  <cpu type='tcg' name='mpc8543_v21'/>
-  <cpu type='tcg' name='603e7'/>
-  <cpu type='tcg' name='7448_v2.1'/>
-  <cpu type='tcg' name='7441_v2.3'/>
-  <cpu type='tcg' name='405crb'/>
-  <cpu type='tcg' name='604'/>
-  <cpu type='tcg' name='7400_v2.1'/>
-  <cpu type='tcg' name='440-xilinx-w-dfpu'/>
-  <cpu type='tcg' name='7445_v2.1'/>
-  <cpu type='tcg' name='cobra'/>
-  <cpu type='tcg' name='e500_v20'/>
-  <cpu type='tcg' name='mpc8541_v11'/>
-  <cpu type='tcg' name='750gx_v1.1'/>
-  <cpu type='tcg' name='750cxe_v2.4'/>
-  <cpu type='tcg' name='mpc8641d'/>
-  <cpu type='tcg' name='mpc8543e_v21'/>
-  <cpu type='tcg' name='750l_v2.1'/>
-  <cpu type='tcg' name='7457_v1.0'/>
-  <cpu type='tcg' name='7450_v1.2'/>
-  <cpu type='tcg' name='755_v2.5'/>
-  <cpu type='tcg' name='7410_v1.3'/>
-  <cpu type='tcg' name='745_v2.3'/>
-  <cpu type='tcg' name='755_v2.0'/>
-  <cpu type='tcg' name='e500v2_v30'/>
-  <cpu type='tcg' name='7455_v3.3'/>
-  <cpu type='tcg' name='mpc8540_v20'/>
-  <cpu type='tcg' name='405d2'/>
-  <cpu type='tcg' name='mpc8560_v21'/>
-  <cpu type='tcg' name='mpc8343'/>
-  <cpu type='tcg' name='mpc8548_v20'/>
-  <cpu type='tcg' name='mpc8347t'/>
-  <cpu type='tcg' name='755_v1.0'/>
-  <cpu type='tcg' name='603e_v1.3'/>
-  <cpu type='tcg' name='mpc8543e_v10'/>
-  <cpu type='tcg' name='mpc8347eap'/>
-  <cpu type='tcg' name='mpc8548e_v11'/>
-  <cpu type='tcg' name='mpc8543_v20'/>
-  <cpu type='tcg' name='401d2'/>
-  <cpu type='tcg' name='power8_v2.0'/>
-  <cpu type='tcg' name='740_v3.1'/>
-  <cpu type='tcg' name='e200z5'/>
-  <cpu type='tcg' name='405cra'/>
-  <cpu type='tcg' name='7400_v2.0'/>
-  <cpu type='tcg' name='750cxe_v2.3'/>
-  <cpu type='tcg' name='745_v2.7'/>
-  <cpu type='tcg' name='mpc8560_v10'/>
-  <cpu type='tcg' name='e5500'/>
-  <cpu type='tcg' name='mpc8544_v11'/>
-  <cpu type='tcg' name='7448_v1.0'/>
-  <cpu type='tcg' name='401e2'/>
-  <cpu type='tcg' name='740_v2.1'/>
-  <cpu type='tcg' name='745_v2.2'/>
-  <cpu type='tcg' name='7400_v1.0'/>
-  <cpu type='tcg' name='7410_v1.2'/>
-  <cpu type='tcg' name='x2vp4'/>
-  <cpu type='tcg' name='mpc8347ap'/>
-  <cpu type='tcg' name='mpc8533_v11'/>
-  <cpu type='tcg' name='mpc5200b_v21'/>
-  <cpu type='tcg' name='750fx_v2.3'/>
-  <cpu type='tcg' name='601_v2'/>
-  <cpu type='tcg' name='g2legp3'/>
-  <cpu type='tcg' name='604e_v1.0'/>
-  <cpu type='tcg' name='750cx_v2.1'/>
-  <cpu type='tcg' name='mpc8610'/>
-  <cpu type='tcg' name='g2h4'/>
-  <cpu type='tcg' name='750l_v3.0'/>
-  <cpu type='tcg' name='mpc8377e'/>
-  <cpu type='tcg' name='e300c4'/>
-  <cpu type='tcg' name='mpc5200_v12'/>
-  <cpu type='tcg' name='7448_v2.0'/>
-  <cpu type='tcg' name='7450_v2.1'/>
-  <cpu type='tcg' name='750cxe_v3.1b'/>
-  <cpu type='tcg' name='g2'/>
-  <cpu type='tcg' name='7400_v2.9'/>
-  <cpu type='tcg' name='405gpd'/>
-  <cpu type='tcg' name='603'/>
-  <cpu type='tcg' name='603e7t'/>
-  <cpu type='tcg' name='mpc8555_v11'/>
-  <cpu type='tcg' name='750gx_v1.0'/>
-  <cpu type='tcg' name='mpc8541_v10'/>
-  <cpu type='tcg' name='mpc8543e_v20'/>
-  <cpu type='tcg' name='750fl'/>
-  <cpu type='tcg' name='750l_v2.0'/>
-  <cpu type='tcg' name='stb04'/>
-  <cpu type='tcg' name='mpc8548e_v21'/>
-  <cpu type='tcg' name='x2vp20'/>
-  <cpu type='tcg' name='405ez'/>
-  <cpu type='tcg' name='e600'/>
-  <cpu type='tcg' name='7450_v1.1'/>
-  <cpu type='tcg' name='755_v2.4'/>
-  <cpu type='tcg' name='mpc8379'/>
-  <cpu type='tcg' name='7445_v1.0'/>
-  <cpu type='tcg' name='7447_v1.1'/>
-  <cpu type='tcg' name='603e_v2.2'/>
-  <cpu type='tcg' name='603e_v4'/>
-  <cpu type='tcg' name='g2legp'/>
-  <cpu type='tcg' name='7455_v3.2'/>
-  <cpu type='tcg' name='740_v2.0'/>
-  <cpu type='tcg' name='mpc8560_v20'/>
-  <cpu type='tcg' name='440-xilinx'/>
-  <cpu type='tcg' name='401f2'/>
-  <cpu type='tcg' name='mpc8533_v10'/>
-  <cpu type='tcg' name='mpc8349a'/>
-  <cpu type='tcg' name='405gpr'/>
-  <cpu type='tcg' name='stb25'/>
-  <cpu type='tcg' name='603e_v1.2'/>
-  <cpu type='tcg' name='mpc5200b_v20'/>
-  <cpu type='tcg' name='750fx_v2.2'/>
-  <cpu type='tcg' name='mpc8347eat'/>
-  <cpu type='tcg' name='740_v1.0'/>
-  <cpu type='tcg' name='601_v1'/>
-  <cpu type='tcg' name='745_v1.1'/>
-  <cpu type='tcg' name='750cx_v2.0'/>
-  <cpu type='tcg' name='mpc8548e_v10'/>
-  <cpu type='tcg' name='7447a_v1.2'/>
-  <cpu type='tcg' name='403gc'/>
-  <cpu type='tcg' name='e300c3'/>
-  <cpu type='tcg' name='mpc5200_v11'/>
-  <cpu type='tcg' name='7441_v2.1'/>
-  <cpu type='tcg' name='740_v3.0'/>
-  <cpu type='tcg' name='mpc8545e_v21'/>
-  <cpu type='tcg' name='602'/>
-  <cpu type='tcg' name='mpc8378e'/>
-  <cpu type='tcg' name='mpc8343a'/>
-  <cpu type='tcg' name='460exb'/>
-  <cpu type='tcg' name='mpc8555_v10'/>
-  <cpu type='tcg' name='mpc8568'/>
-  <cpu type='tcg' name='7457a_v1.2'/>
-  <cpu type='tcg' name='750cx_v1.0'/>
-  <cpu type='tcg' name='750cxe_v2.2'/>
-  <cpu type='tcg' name='604e_v2.4'/>
-  <cpu type='tcg' name='755_v2.8'/>
-  <cpu type='tcg' name='405lp'/>
-  <cpu type='tcg' name='745_v2.6'/>
-  <cpu type='tcg' name='stb03'/>
-  <cpu type='tcg' name='405ep'/>
-  <cpu type='tcg' name='mpc8544_v10'/>
-  <cpu type='tcg' name='mpc8347at'/>
-  <cpu type='tcg' name='750_v2.2'/>
-  <cpu type='tcg' name='7450_v1.0'/>
-  <cpu type='tcg' name='755_v2.3'/>
-  <cpu type='tcg' name='7410_v1.1'/>
-  <cpu type='tcg' name='745_v2.1'/>
-  <cpu type='tcg' name='750gl'/>
-  <cpu type='tcg' name='e6500'/>
-  <cpu type='tcg' name='750p'/>
-  <cpu type='tcg' name='7445_v3.4'/>
-  <cpu type='tcg' name='440epb'/>
-  <cpu type='tcg' name='npe4gs3'/>
-  <cpu type='tcg' name='603e_v3'/>
-  <cpu type='tcg' name='mpc8349e'/>
-  <cpu type='tcg' name='970_v2.2'/>
-  <cpu type='tcg' name='g2lels'/>
-  <cpu type='tcg' name='g2hip4'/>
-  <cpu type='tcg' name='740p'/>
-  <cpu type='tcg' name='mpc8567e'/>
-  <cpu type='tcg' name='mpc8533e_v11'/>
-  <cpu type='tcg' name='7451_v2.3'/>
-  <cpu type='tcg' name='603e_v1.1'/>
-  <cpu type='tcg' name='401g2'/>
-  <cpu type='tcg' name='7400_v2.8'/>
-  <cpu type='tcg' name='7455_v2.1'/>
-  <cpu type='tcg' name='405gpc'/>
-  <cpu type='tcg' name='power7+_v2.1'/>
-  <cpu type='tcg' name='mpc8544e_v11'/>
-  <cpu type='tcg' name='7450_v2.0'/>
-  <cpu type='tcg' name='970mp_v1.1'/>
-  <cpu type='tcg' name='603e7v2'/>
-  <cpu type='tcg' name='604r'/>
-  <cpu type='tcg' name='e500v2_v22'/>
-  <cpu type='tcg' name='mpc8548e_v20'/>
-  <cpu type='tcg' name='mpc8545e_v20'/>
-  <cpu type='tcg' name='mpc8378'/>
-  <cpu type='tcg' name='mpc8567'/>
-  <cpu type='tcg' name='7457_v1.2'/>
-  <cpu type='tcg' name='7447_v1.0'/>
-  <cpu type='tcg' name='970fx_v3.1'/>
-  <cpu type='tcg' name='745_v2.5'/>
-  <cpu type='tcg' name='mpc8379e'/>
-  <cpu type='tcg' name='mpc8641'/>
-  <cpu type='tcg' name='750cxe_v2.4b'/>
-  <cpu type='tcg' name='7410_v1.0'/>
-  <cpu type='tcg' name='mpc603'/>
-  <cpu type='tcg' name='603e_v4.1'/>
-  <cpu type='tcg' name='7445_v3.3'/>
-  <cpu type='tcg' name='440epa'/>
-  <cpu type='tcg' name='970fx_v2.1'/>
-  <cpu type='tcg' name='iop480'/>
-  <cpu type='tcg' name='750fx_v2.1'/>
-  <cpu type='tcg' name='601_v0'/>
-  <cpu type='tcg' name='g2legp1'/>
-  <cpu type='tcg' name='745_v1.0'/>
-  <cpu type='tcg' name='750cl_v2.0'/>
-  <cpu type='tcg' name='750cxr'/>
-  <cpu type='tcg' name='401'/>
-  <cpu type='tcg' name='mpc8541e_v11'/>
-  <cpu type='tcg' name='750cxe_v3.1'/>
-  <cpu type='tcg' name='mpc8555e_v11'/>
-  <cpu type='tcg' name='power8e_v2.1'/>
-  <cpu type='tcg' name='7447a_v1.1'/>
-  <cpu type='tcg' name='403gb'/>
-  <cpu type='tcg' name='e300c2'/>
-  <cpu type='tcg' name='npe405h2'/>
-  <cpu type='tcg' name='mpc8343e'/>
-  <cpu type='tcg' name='mpc8533e_v10'/>
-  <cpu type='tcg' name='mpc5200_v10'/>
-  <cpu type='tcg' name='750_v3.1'/>
-  <cpu type='tcg' name='power5+_v2.1'/>
-  <cpu type='tcg' name='mpc8568e'/>
+  <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' typename=''/>
+  <cpu type='kvm' name='750cl_v1.0' typename=''/>
+  <cpu type='kvm' name='7457a_v1.1' typename=''/>
+  <cpu type='kvm' name='g2gp' typename=''/>
+  <cpu type='kvm' name='750cxe_v2.1' typename=''/>
+  <cpu type='kvm' name='755_v2.7' typename=''/>
+  <cpu type='kvm' name='750_v2.1' typename=''/>
+  <cpu type='kvm' name='755_v2.2' typename=''/>
+  <cpu type='kvm' name='745_v2.0' typename=''/>
+  <cpu type='kvm' name='mpc8377' typename=''/>
+  <cpu type='kvm' name='7455_v1.0' typename=''/>
+  <cpu type='kvm' name='mpc8545_v21' typename=''/>
+  <cpu type='kvm' name='mpc8548_v11' typename=''/>
+  <cpu type='kvm' name='405d4' typename=''/>
+  <cpu type='kvm' name='g2le' typename=''/>
+  <cpu type='kvm' name='g2hip3' typename=''/>
+  <cpu type='kvm' name='750e' typename=''/>
+  <cpu type='kvm' name='mpc8572' typename=''/>
+  <cpu type='kvm' name='970fx_v2.0' typename=''/>
+  <cpu type='kvm' name='750fx_v2.0' typename=''/>
+  <cpu type='kvm' name='603p' typename=''/>
+  <cpu type='kvm' name='405gpb' typename=''/>
+  <cpu type='kvm' name='7400_v2.7' typename=''/>
+  <cpu type='kvm' name='mpc8544e_v10' typename=''/>
+  <cpu type='kvm' name='e500v2_v10' typename=''/>
+  <cpu type='kvm' name='e500mc' typename=''/>
+  <cpu type='kvm' name='603e7v1' typename=''/>
+  <cpu type='kvm' name='970mp_v1.0' typename=''/>
+  <cpu type='kvm' name='740e' typename=''/>
+  <cpu type='kvm' name='405crc' typename=''/>
+  <cpu type='kvm' name='403ga' typename=''/>
+  <cpu type='kvm' name='7447a_v1.0' typename=''/>
+  <cpu type='kvm' name='7400_v2.2' typename=''/>
+  <cpu type='kvm' name='e300c1' typename=''/>
+  <cpu type='kvm' name='mpc8572e' typename=''/>
+  <cpu type='kvm' name='e500v2_v21' typename=''/>
+  <cpu type='kvm' name='970fx_v1.0' typename=''/>
+  <cpu type='kvm' name='750gx_v1.2' typename=''/>
+  <cpu type='kvm' name='750fx_v1.0' typename=''/>
+  <cpu type='kvm' name='7457_v1.1' typename=''/>
+  <cpu type='kvm' name='970fx_v3.0' typename=''/>
+  <cpu type='kvm' name='604e_v2.2' typename=''/>
+  <cpu type='kvm' name='755_v2.6' typename=''/>
+  <cpu type='kvm' name='401a1' typename=''/>
+  <cpu type='kvm' name='power9_v1.0' typename=''/>
+  <cpu type='kvm' name='npe405h' typename=''/>
+  <cpu type='kvm' name='g2ls' typename=''/>
+  <cpu type='kvm' name='7410_v1.4' typename=''/>
+  <cpu type='kvm' name='750_v2.0' typename=''/>
+  <cpu type='kvm' name='401b2' typename=''/>
+  <cpu type='kvm' name='mpc8349' typename=''/>
+  <cpu type='kvm' name='mpc8347ep' typename=''/>
+  <cpu type='kvm' name='7445_v3.2' typename=''/>
+  <cpu type='kvm' name='mpc8540_v21' typename=''/>
+  <cpu type='kvm' name='mpc8543_v11' typename=''/>
+  <cpu type='kvm' name='403gcx' typename=''/>
+  <cpu type='kvm' name='745_v2.4' typename=''/>
+  <cpu type='kvm' name='mpc8548_v21' typename=''/>
+  <cpu type='kvm' name='750l_v3.2' typename=''/>
+  <cpu type='kvm' name='750_v1.0' typename=''/>
+  <cpu type='kvm' name='755_v1.1' typename=''/>
+  <cpu type='kvm' name='e500_v10' typename=''/>
+  <cpu type='kvm' name='750cxe_v3.0' typename=''/>
+  <cpu type='kvm' name='mpc8541e_v10' typename=''/>
+  <cpu type='kvm' name='mpc8347p' typename=''/>
+  <cpu type='kvm' name='mpc8555e_v10' typename=''/>
+  <cpu type='kvm' name='power9_v2.0' typename=''/>
+  <cpu type='kvm' name='power7_v2.3' typename=''/>
+  <cpu type='kvm' name='603e7v' typename=''/>
+  <cpu type='kvm' name='mpc8543e_v11' typename=''/>
+  <cpu type='kvm' name='750_v3.0' typename=''/>
+  <cpu type='kvm' name='7400_v2.6' typename=''/>
+  <cpu type='kvm' name='405gpa' typename=''/>
+  <cpu type='kvm' name='440epx' typename=''/>
+  <cpu type='kvm' name='750l_v2.2' typename=''/>
+  <cpu type='kvm' name='e200z6' typename=''/>
+  <cpu type='kvm' name='mpc8547e_v20' typename=''/>
+  <cpu type='kvm' name='7457a_v1.0' typename=''/>
+  <cpu type='kvm' name='mpc8349ea' typename=''/>
+  <cpu type='kvm' name='e500v2_v20' typename=''/>
+  <cpu type='kvm' name='power8nvl_v1.0' typename=''/>
+  <cpu type='kvm' name='mpc8540_v10' typename=''/>
+  <cpu type='kvm' name='755_v2.1' typename=''/>
+  <cpu type='kvm' name='745_v2.8' typename=''/>
+  <cpu type='kvm' name='npe405l' typename=''/>
+  <cpu type='kvm' name='mpc8343ea' typename=''/>
+  <cpu type='kvm' name='mpc8545_v20' typename=''/>
+  <cpu type='kvm' name='mpc8548_v10' typename=''/>
+  <cpu type='kvm' name='7455_v3.4' typename=''/>
+  <cpu type='kvm' name='740_v2.2' typename=''/>
+  <cpu type='kvm' name='7448_v1.1' typename=''/>
+  <cpu type='kvm' name='7400_v1.1' typename=''/>
+  <cpu type='kvm' name='mpc8347et' typename=''/>
+  <cpu type='kvm' name='7441_v2.10' typename=''/>
+  <cpu type='kvm' name='603e_v1.4' typename=''/>
+  <cpu type='kvm' name='mpc8543_v10' typename=''/>
+  <cpu type='kvm' name='401c2' typename=''/>
+  <cpu type='kvm' name='7451_v2.10' typename=''/>
+  <cpu type='kvm' name='750cx_v2.2' typename=''/>
+  <cpu type='kvm' name='mpc8543_v21' typename=''/>
+  <cpu type='kvm' name='603e7' typename=''/>
+  <cpu type='kvm' name='7448_v2.1' typename=''/>
+  <cpu type='kvm' name='7441_v2.3' typename=''/>
+  <cpu type='kvm' name='405crb' typename=''/>
+  <cpu type='kvm' name='604' typename=''/>
+  <cpu type='kvm' name='7400_v2.1' typename=''/>
+  <cpu type='kvm' name='440-xilinx-w-dfpu' typename=''/>
+  <cpu type='kvm' name='7445_v2.1' typename=''/>
+  <cpu type='kvm' name='cobra' typename=''/>
+  <cpu type='kvm' name='e500_v20' typename=''/>
+  <cpu type='kvm' name='mpc8541_v11' typename=''/>
+  <cpu type='kvm' name='750gx_v1.1' typename=''/>
+  <cpu type='kvm' name='750cxe_v2.4' typename=''/>
+  <cpu type='kvm' name='mpc8641d' typename=''/>
+  <cpu type='kvm' name='mpc8543e_v21' typename=''/>
+  <cpu type='kvm' name='750l_v2.1' typename=''/>
+  <cpu type='kvm' name='7457_v1.0' typename=''/>
+  <cpu type='kvm' name='7450_v1.2' typename=''/>
+  <cpu type='kvm' name='755_v2.5' typename=''/>
+  <cpu type='kvm' name='7410_v1.3' typename=''/>
+  <cpu type='kvm' name='745_v2.3' typename=''/>
+  <cpu type='kvm' name='755_v2.0' typename=''/>
+  <cpu type='kvm' name='e500v2_v30' typename=''/>
+  <cpu type='kvm' name='7455_v3.3' typename=''/>
+  <cpu type='kvm' name='mpc8540_v20' typename=''/>
+  <cpu type='kvm' name='405d2' typename=''/>
+  <cpu type='kvm' name='mpc8560_v21' typename=''/>
+  <cpu type='kvm' name='mpc8343' typename=''/>
+  <cpu type='kvm' name='mpc8548_v20' typename=''/>
+  <cpu type='kvm' name='mpc8347t' typename=''/>
+  <cpu type='kvm' name='755_v1.0' typename=''/>
+  <cpu type='kvm' name='603e_v1.3' typename=''/>
+  <cpu type='kvm' name='host' typename=''/>
+  <cpu type='kvm' name='mpc8543e_v10' typename=''/>
+  <cpu type='kvm' name='mpc8347eap' typename=''/>
+  <cpu type='kvm' name='mpc8548e_v11' typename=''/>
+  <cpu type='kvm' name='mpc8543_v20' typename=''/>
+  <cpu type='kvm' name='401d2' typename=''/>
+  <cpu type='kvm' name='power8_v2.0' typename=''/>
+  <cpu type='kvm' name='740_v3.1' typename=''/>
+  <cpu type='kvm' name='e200z5' typename=''/>
+  <cpu type='kvm' name='405cra' typename=''/>
+  <cpu type='kvm' name='7400_v2.0' typename=''/>
+  <cpu type='kvm' name='750cxe_v2.3' typename=''/>
+  <cpu type='kvm' name='745_v2.7' typename=''/>
+  <cpu type='kvm' name='mpc8560_v10' typename=''/>
+  <cpu type='kvm' name='e5500' typename=''/>
+  <cpu type='kvm' name='mpc8544_v11' typename=''/>
+  <cpu type='kvm' name='7448_v1.0' typename=''/>
+  <cpu type='kvm' name='401e2' typename=''/>
+  <cpu type='kvm' name='740_v2.1' typename=''/>
+  <cpu type='kvm' name='745_v2.2' typename=''/>
+  <cpu type='kvm' name='7400_v1.0' typename=''/>
+  <cpu type='kvm' name='7410_v1.2' typename=''/>
+  <cpu type='kvm' name='x2vp4' typename=''/>
+  <cpu type='kvm' name='mpc8347ap' typename=''/>
+  <cpu type='kvm' name='mpc8533_v11' typename=''/>
+  <cpu type='kvm' name='mpc5200b_v21' typename=''/>
+  <cpu type='kvm' name='750fx_v2.3' typename=''/>
+  <cpu type='kvm' name='601_v2' typename=''/>
+  <cpu type='kvm' name='g2legp3' typename=''/>
+  <cpu type='kvm' name='604e_v1.0' typename=''/>
+  <cpu type='kvm' name='750cx_v2.1' typename=''/>
+  <cpu type='kvm' name='mpc8610' typename=''/>
+  <cpu type='kvm' name='g2h4' typename=''/>
+  <cpu type='kvm' name='750l_v3.0' typename=''/>
+  <cpu type='kvm' name='mpc8377e' typename=''/>
+  <cpu type='kvm' name='e300c4' typename=''/>
+  <cpu type='kvm' name='mpc5200_v12' typename=''/>
+  <cpu type='kvm' name='7448_v2.0' typename=''/>
+  <cpu type='kvm' name='7450_v2.1' typename=''/>
+  <cpu type='kvm' name='750cxe_v3.1b' typename=''/>
+  <cpu type='kvm' name='g2' typename=''/>
+  <cpu type='kvm' name='7400_v2.9' typename=''/>
+  <cpu type='kvm' name='405gpd' typename=''/>
+  <cpu type='kvm' name='603' typename=''/>
+  <cpu type='kvm' name='603e7t' typename=''/>
+  <cpu type='kvm' name='mpc8555_v11' typename=''/>
+  <cpu type='kvm' name='750gx_v1.0' typename=''/>
+  <cpu type='kvm' name='mpc8541_v10' typename=''/>
+  <cpu type='kvm' name='mpc8543e_v20' typename=''/>
+  <cpu type='kvm' name='750fl' typename=''/>
+  <cpu type='kvm' name='750l_v2.0' typename=''/>
+  <cpu type='kvm' name='stb04' typename=''/>
+  <cpu type='kvm' name='mpc8548e_v21' typename=''/>
+  <cpu type='kvm' name='x2vp20' typename=''/>
+  <cpu type='kvm' name='405ez' typename=''/>
+  <cpu type='kvm' name='e600' typename=''/>
+  <cpu type='kvm' name='7450_v1.1' typename=''/>
+  <cpu type='kvm' name='755_v2.4' typename=''/>
+  <cpu type='kvm' name='mpc8379' typename=''/>
+  <cpu type='kvm' name='7445_v1.0' typename=''/>
+  <cpu type='kvm' name='7447_v1.1' typename=''/>
+  <cpu type='kvm' name='603e_v2.2' typename=''/>
+  <cpu type='kvm' name='603e_v4' typename=''/>
+  <cpu type='kvm' name='g2legp' typename=''/>
+  <cpu type='kvm' name='7455_v3.2' typename=''/>
+  <cpu type='kvm' name='740_v2.0' typename=''/>
+  <cpu type='kvm' name='mpc8560_v20' typename=''/>
+  <cpu type='kvm' name='440-xilinx' typename=''/>
+  <cpu type='kvm' name='401f2' typename=''/>
+  <cpu type='kvm' name='mpc8533_v10' typename=''/>
+  <cpu type='kvm' name='mpc8349a' typename=''/>
+  <cpu type='kvm' name='405gpr' typename=''/>
+  <cpu type='kvm' name='stb25' typename=''/>
+  <cpu type='kvm' name='603e_v1.2' typename=''/>
+  <cpu type='kvm' name='mpc5200b_v20' typename=''/>
+  <cpu type='kvm' name='750fx_v2.2' typename=''/>
+  <cpu type='kvm' name='mpc8347eat' typename=''/>
+  <cpu type='kvm' name='740_v1.0' typename=''/>
+  <cpu type='kvm' name='601_v1' typename=''/>
+  <cpu type='kvm' name='745_v1.1' typename=''/>
+  <cpu type='kvm' name='750cx_v2.0' typename=''/>
+  <cpu type='kvm' name='mpc8548e_v10' typename=''/>
+  <cpu type='kvm' name='7447a_v1.2' typename=''/>
+  <cpu type='kvm' name='403gc' typename=''/>
+  <cpu type='kvm' name='e300c3' typename=''/>
+  <cpu type='kvm' name='mpc5200_v11' typename=''/>
+  <cpu type='kvm' name='7441_v2.1' typename=''/>
+  <cpu type='kvm' name='740_v3.0' typename=''/>
+  <cpu type='kvm' name='mpc8545e_v21' typename=''/>
+  <cpu type='kvm' name='602' typename=''/>
+  <cpu type='kvm' name='mpc8378e' typename=''/>
+  <cpu type='kvm' name='mpc8343a' typename=''/>
+  <cpu type='kvm' name='460exb' typename=''/>
+  <cpu type='kvm' name='mpc8555_v10' typename=''/>
+  <cpu type='kvm' name='mpc8568' typename=''/>
+  <cpu type='kvm' name='7457a_v1.2' typename=''/>
+  <cpu type='kvm' name='750cx_v1.0' typename=''/>
+  <cpu type='kvm' name='750cxe_v2.2' typename=''/>
+  <cpu type='kvm' name='604e_v2.4' typename=''/>
+  <cpu type='kvm' name='755_v2.8' typename=''/>
+  <cpu type='kvm' name='405lp' typename=''/>
+  <cpu type='kvm' name='745_v2.6' typename=''/>
+  <cpu type='kvm' name='stb03' typename=''/>
+  <cpu type='kvm' name='405ep' typename=''/>
+  <cpu type='kvm' name='mpc8544_v10' typename=''/>
+  <cpu type='kvm' name='mpc8347at' typename=''/>
+  <cpu type='kvm' name='750_v2.2' typename=''/>
+  <cpu type='kvm' name='7450_v1.0' typename=''/>
+  <cpu type='kvm' name='755_v2.3' typename=''/>
+  <cpu type='kvm' name='7410_v1.1' typename=''/>
+  <cpu type='kvm' name='745_v2.1' typename=''/>
+  <cpu type='kvm' name='750gl' typename=''/>
+  <cpu type='kvm' name='e6500' typename=''/>
+  <cpu type='kvm' name='750p' typename=''/>
+  <cpu type='kvm' name='7445_v3.4' typename=''/>
+  <cpu type='kvm' name='440epb' typename=''/>
+  <cpu type='kvm' name='npe4gs3' typename=''/>
+  <cpu type='kvm' name='603e_v3' typename=''/>
+  <cpu type='kvm' name='mpc8349e' typename=''/>
+  <cpu type='kvm' name='970_v2.2' typename=''/>
+  <cpu type='kvm' name='g2lels' typename=''/>
+  <cpu type='kvm' name='g2hip4' typename=''/>
+  <cpu type='kvm' name='740p' typename=''/>
+  <cpu type='kvm' name='mpc8567e' typename=''/>
+  <cpu type='kvm' name='mpc8533e_v11' typename=''/>
+  <cpu type='kvm' name='7451_v2.3' typename=''/>
+  <cpu type='kvm' name='603e_v1.1' typename=''/>
+  <cpu type='kvm' name='401g2' typename=''/>
+  <cpu type='kvm' name='7400_v2.8' typename=''/>
+  <cpu type='kvm' name='7455_v2.1' typename=''/>
+  <cpu type='kvm' name='405gpc' typename=''/>
+  <cpu type='kvm' name='power7+_v2.1' typename=''/>
+  <cpu type='kvm' name='mpc8544e_v11' typename=''/>
+  <cpu type='kvm' name='7450_v2.0' typename=''/>
+  <cpu type='kvm' name='970mp_v1.1' typename=''/>
+  <cpu type='kvm' name='603e7v2' typename=''/>
+  <cpu type='kvm' name='604r' typename=''/>
+  <cpu type='kvm' name='e500v2_v22' typename=''/>
+  <cpu type='kvm' name='mpc8548e_v20' typename=''/>
+  <cpu type='kvm' name='mpc8545e_v20' typename=''/>
+  <cpu type='kvm' name='mpc8378' typename=''/>
+  <cpu type='kvm' name='mpc8567' typename=''/>
+  <cpu type='kvm' name='7457_v1.2' typename=''/>
+  <cpu type='kvm' name='7447_v1.0' typename=''/>
+  <cpu type='kvm' name='970fx_v3.1' typename=''/>
+  <cpu type='kvm' name='745_v2.5' typename=''/>
+  <cpu type='kvm' name='mpc8379e' typename=''/>
+  <cpu type='kvm' name='mpc8641' typename=''/>
+  <cpu type='kvm' name='750cxe_v2.4b' typename=''/>
+  <cpu type='kvm' name='7410_v1.0' typename=''/>
+  <cpu type='kvm' name='mpc603' typename=''/>
+  <cpu type='kvm' name='603e_v4.1' typename=''/>
+  <cpu type='kvm' name='7445_v3.3' typename=''/>
+  <cpu type='kvm' name='440epa' typename=''/>
+  <cpu type='kvm' name='970fx_v2.1' typename=''/>
+  <cpu type='kvm' name='iop480' typename=''/>
+  <cpu type='kvm' name='750fx_v2.1' typename=''/>
+  <cpu type='kvm' name='601_v0' typename=''/>
+  <cpu type='kvm' name='g2legp1' typename=''/>
+  <cpu type='kvm' name='745_v1.0' typename=''/>
+  <cpu type='kvm' name='750cl_v2.0' typename=''/>
+  <cpu type='kvm' name='750cxr' typename=''/>
+  <cpu type='kvm' name='401' typename=''/>
+  <cpu type='kvm' name='mpc8541e_v11' typename=''/>
+  <cpu type='kvm' name='750cxe_v3.1' typename=''/>
+  <cpu type='kvm' name='mpc8555e_v11' typename=''/>
+  <cpu type='kvm' name='power8e_v2.1' typename=''/>
+  <cpu type='kvm' name='7447a_v1.1' typename=''/>
+  <cpu type='kvm' name='403gb' typename=''/>
+  <cpu type='kvm' name='e300c2' typename=''/>
+  <cpu type='kvm' name='npe405h2' typename=''/>
+  <cpu type='kvm' name='mpc8343e' typename=''/>
+  <cpu type='kvm' name='mpc8533e_v10' typename=''/>
+  <cpu type='kvm' name='mpc5200_v10' typename=''/>
+  <cpu type='kvm' name='750_v3.1' typename=''/>
+  <cpu type='kvm' name='power5+_v2.1' typename=''/>
+  <cpu type='kvm' name='mpc8568e' typename=''/>
+  <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' typename=''/>
+  <cpu type='tcg' name='750cl_v1.0' typename=''/>
+  <cpu type='tcg' name='7457a_v1.1' typename=''/>
+  <cpu type='tcg' name='g2gp' typename=''/>
+  <cpu type='tcg' name='750cxe_v2.1' typename=''/>
+  <cpu type='tcg' name='755_v2.7' typename=''/>
+  <cpu type='tcg' name='750_v2.1' typename=''/>
+  <cpu type='tcg' name='755_v2.2' typename=''/>
+  <cpu type='tcg' name='745_v2.0' typename=''/>
+  <cpu type='tcg' name='mpc8377' typename=''/>
+  <cpu type='tcg' name='7455_v1.0' typename=''/>
+  <cpu type='tcg' name='mpc8545_v21' typename=''/>
+  <cpu type='tcg' name='mpc8548_v11' typename=''/>
+  <cpu type='tcg' name='405d4' typename=''/>
+  <cpu type='tcg' name='g2le' typename=''/>
+  <cpu type='tcg' name='g2hip3' typename=''/>
+  <cpu type='tcg' name='750e' typename=''/>
+  <cpu type='tcg' name='mpc8572' typename=''/>
+  <cpu type='tcg' name='970fx_v2.0' typename=''/>
+  <cpu type='tcg' name='750fx_v2.0' typename=''/>
+  <cpu type='tcg' name='603p' typename=''/>
+  <cpu type='tcg' name='405gpb' typename=''/>
+  <cpu type='tcg' name='7400_v2.7' typename=''/>
+  <cpu type='tcg' name='mpc8544e_v10' typename=''/>
+  <cpu type='tcg' name='e500v2_v10' typename=''/>
+  <cpu type='tcg' name='e500mc' typename=''/>
+  <cpu type='tcg' name='603e7v1' typename=''/>
+  <cpu type='tcg' name='970mp_v1.0' typename=''/>
+  <cpu type='tcg' name='740e' typename=''/>
+  <cpu type='tcg' name='405crc' typename=''/>
+  <cpu type='tcg' name='403ga' typename=''/>
+  <cpu type='tcg' name='7447a_v1.0' typename=''/>
+  <cpu type='tcg' name='7400_v2.2' typename=''/>
+  <cpu type='tcg' name='e300c1' typename=''/>
+  <cpu type='tcg' name='mpc8572e' typename=''/>
+  <cpu type='tcg' name='e500v2_v21' typename=''/>
+  <cpu type='tcg' name='970fx_v1.0' typename=''/>
+  <cpu type='tcg' name='750gx_v1.2' typename=''/>
+  <cpu type='tcg' name='750fx_v1.0' typename=''/>
+  <cpu type='tcg' name='7457_v1.1' typename=''/>
+  <cpu type='tcg' name='970fx_v3.0' typename=''/>
+  <cpu type='tcg' name='604e_v2.2' typename=''/>
+  <cpu type='tcg' name='755_v2.6' typename=''/>
+  <cpu type='tcg' name='401a1' typename=''/>
+  <cpu type='tcg' name='power9_v1.0' typename=''/>
+  <cpu type='tcg' name='npe405h' typename=''/>
+  <cpu type='tcg' name='g2ls' typename=''/>
+  <cpu type='tcg' name='7410_v1.4' typename=''/>
+  <cpu type='tcg' name='750_v2.0' typename=''/>
+  <cpu type='tcg' name='401b2' typename=''/>
+  <cpu type='tcg' name='mpc8349' typename=''/>
+  <cpu type='tcg' name='mpc8347ep' typename=''/>
+  <cpu type='tcg' name='7445_v3.2' typename=''/>
+  <cpu type='tcg' name='mpc8540_v21' typename=''/>
+  <cpu type='tcg' name='mpc8543_v11' typename=''/>
+  <cpu type='tcg' name='403gcx' typename=''/>
+  <cpu type='tcg' name='745_v2.4' typename=''/>
+  <cpu type='tcg' name='mpc8548_v21' typename=''/>
+  <cpu type='tcg' name='750l_v3.2' typename=''/>
+  <cpu type='tcg' name='750_v1.0' typename=''/>
+  <cpu type='tcg' name='755_v1.1' typename=''/>
+  <cpu type='tcg' name='e500_v10' typename=''/>
+  <cpu type='tcg' name='750cxe_v3.0' typename=''/>
+  <cpu type='tcg' name='mpc8541e_v10' typename=''/>
+  <cpu type='tcg' name='mpc8347p' typename=''/>
+  <cpu type='tcg' name='mpc8555e_v10' typename=''/>
+  <cpu type='tcg' name='power9_v2.0' typename=''/>
+  <cpu type='tcg' name='power7_v2.3' typename=''/>
+  <cpu type='tcg' name='603e7v' typename=''/>
+  <cpu type='tcg' name='mpc8543e_v11' typename=''/>
+  <cpu type='tcg' name='750_v3.0' typename=''/>
+  <cpu type='tcg' name='7400_v2.6' typename=''/>
+  <cpu type='tcg' name='405gpa' typename=''/>
+  <cpu type='tcg' name='440epx' typename=''/>
+  <cpu type='tcg' name='750l_v2.2' typename=''/>
+  <cpu type='tcg' name='e200z6' typename=''/>
+  <cpu type='tcg' name='mpc8547e_v20' typename=''/>
+  <cpu type='tcg' name='7457a_v1.0' typename=''/>
+  <cpu type='tcg' name='mpc8349ea' typename=''/>
+  <cpu type='tcg' name='e500v2_v20' typename=''/>
+  <cpu type='tcg' name='power8nvl_v1.0' typename=''/>
+  <cpu type='tcg' name='mpc8540_v10' typename=''/>
+  <cpu type='tcg' name='755_v2.1' typename=''/>
+  <cpu type='tcg' name='745_v2.8' typename=''/>
+  <cpu type='tcg' name='npe405l' typename=''/>
+  <cpu type='tcg' name='mpc8343ea' typename=''/>
+  <cpu type='tcg' name='mpc8545_v20' typename=''/>
+  <cpu type='tcg' name='mpc8548_v10' typename=''/>
+  <cpu type='tcg' name='7455_v3.4' typename=''/>
+  <cpu type='tcg' name='740_v2.2' typename=''/>
+  <cpu type='tcg' name='7448_v1.1' typename=''/>
+  <cpu type='tcg' name='7400_v1.1' typename=''/>
+  <cpu type='tcg' name='mpc8347et' typename=''/>
+  <cpu type='tcg' name='7441_v2.10' typename=''/>
+  <cpu type='tcg' name='603e_v1.4' typename=''/>
+  <cpu type='tcg' name='mpc8543_v10' typename=''/>
+  <cpu type='tcg' name='401c2' typename=''/>
+  <cpu type='tcg' name='7451_v2.10' typename=''/>
+  <cpu type='tcg' name='750cx_v2.2' typename=''/>
+  <cpu type='tcg' name='mpc8543_v21' typename=''/>
+  <cpu type='tcg' name='603e7' typename=''/>
+  <cpu type='tcg' name='7448_v2.1' typename=''/>
+  <cpu type='tcg' name='7441_v2.3' typename=''/>
+  <cpu type='tcg' name='405crb' typename=''/>
+  <cpu type='tcg' name='604' typename=''/>
+  <cpu type='tcg' name='7400_v2.1' typename=''/>
+  <cpu type='tcg' name='440-xilinx-w-dfpu' typename=''/>
+  <cpu type='tcg' name='7445_v2.1' typename=''/>
+  <cpu type='tcg' name='cobra' typename=''/>
+  <cpu type='tcg' name='e500_v20' typename=''/>
+  <cpu type='tcg' name='mpc8541_v11' typename=''/>
+  <cpu type='tcg' name='750gx_v1.1' typename=''/>
+  <cpu type='tcg' name='750cxe_v2.4' typename=''/>
+  <cpu type='tcg' name='mpc8641d' typename=''/>
+  <cpu type='tcg' name='mpc8543e_v21' typename=''/>
+  <cpu type='tcg' name='750l_v2.1' typename=''/>
+  <cpu type='tcg' name='7457_v1.0' typename=''/>
+  <cpu type='tcg' name='7450_v1.2' typename=''/>
+  <cpu type='tcg' name='755_v2.5' typename=''/>
+  <cpu type='tcg' name='7410_v1.3' typename=''/>
+  <cpu type='tcg' name='745_v2.3' typename=''/>
+  <cpu type='tcg' name='755_v2.0' typename=''/>
+  <cpu type='tcg' name='e500v2_v30' typename=''/>
+  <cpu type='tcg' name='7455_v3.3' typename=''/>
+  <cpu type='tcg' name='mpc8540_v20' typename=''/>
+  <cpu type='tcg' name='405d2' typename=''/>
+  <cpu type='tcg' name='mpc8560_v21' typename=''/>
+  <cpu type='tcg' name='mpc8343' typename=''/>
+  <cpu type='tcg' name='mpc8548_v20' typename=''/>
+  <cpu type='tcg' name='mpc8347t' typename=''/>
+  <cpu type='tcg' name='755_v1.0' typename=''/>
+  <cpu type='tcg' name='603e_v1.3' typename=''/>
+  <cpu type='tcg' name='mpc8543e_v10' typename=''/>
+  <cpu type='tcg' name='mpc8347eap' typename=''/>
+  <cpu type='tcg' name='mpc8548e_v11' typename=''/>
+  <cpu type='tcg' name='mpc8543_v20' typename=''/>
+  <cpu type='tcg' name='401d2' typename=''/>
+  <cpu type='tcg' name='power8_v2.0' typename=''/>
+  <cpu type='tcg' name='740_v3.1' typename=''/>
+  <cpu type='tcg' name='e200z5' typename=''/>
+  <cpu type='tcg' name='405cra' typename=''/>
+  <cpu type='tcg' name='7400_v2.0' typename=''/>
+  <cpu type='tcg' name='750cxe_v2.3' typename=''/>
+  <cpu type='tcg' name='745_v2.7' typename=''/>
+  <cpu type='tcg' name='mpc8560_v10' typename=''/>
+  <cpu type='tcg' name='e5500' typename=''/>
+  <cpu type='tcg' name='mpc8544_v11' typename=''/>
+  <cpu type='tcg' name='7448_v1.0' typename=''/>
+  <cpu type='tcg' name='401e2' typename=''/>
+  <cpu type='tcg' name='740_v2.1' typename=''/>
+  <cpu type='tcg' name='745_v2.2' typename=''/>
+  <cpu type='tcg' name='7400_v1.0' typename=''/>
+  <cpu type='tcg' name='7410_v1.2' typename=''/>
+  <cpu type='tcg' name='x2vp4' typename=''/>
+  <cpu type='tcg' name='mpc8347ap' typename=''/>
+  <cpu type='tcg' name='mpc8533_v11' typename=''/>
+  <cpu type='tcg' name='mpc5200b_v21' typename=''/>
+  <cpu type='tcg' name='750fx_v2.3' typename=''/>
+  <cpu type='tcg' name='601_v2' typename=''/>
+  <cpu type='tcg' name='g2legp3' typename=''/>
+  <cpu type='tcg' name='604e_v1.0' typename=''/>
+  <cpu type='tcg' name='750cx_v2.1' typename=''/>
+  <cpu type='tcg' name='mpc8610' typename=''/>
+  <cpu type='tcg' name='g2h4' typename=''/>
+  <cpu type='tcg' name='750l_v3.0' typename=''/>
+  <cpu type='tcg' name='mpc8377e' typename=''/>
+  <cpu type='tcg' name='e300c4' typename=''/>
+  <cpu type='tcg' name='mpc5200_v12' typename=''/>
+  <cpu type='tcg' name='7448_v2.0' typename=''/>
+  <cpu type='tcg' name='7450_v2.1' typename=''/>
+  <cpu type='tcg' name='750cxe_v3.1b' typename=''/>
+  <cpu type='tcg' name='g2' typename=''/>
+  <cpu type='tcg' name='7400_v2.9' typename=''/>
+  <cpu type='tcg' name='405gpd' typename=''/>
+  <cpu type='tcg' name='603' typename=''/>
+  <cpu type='tcg' name='603e7t' typename=''/>
+  <cpu type='tcg' name='mpc8555_v11' typename=''/>
+  <cpu type='tcg' name='750gx_v1.0' typename=''/>
+  <cpu type='tcg' name='mpc8541_v10' typename=''/>
+  <cpu type='tcg' name='mpc8543e_v20' typename=''/>
+  <cpu type='tcg' name='750fl' typename=''/>
+  <cpu type='tcg' name='750l_v2.0' typename=''/>
+  <cpu type='tcg' name='stb04' typename=''/>
+  <cpu type='tcg' name='mpc8548e_v21' typename=''/>
+  <cpu type='tcg' name='x2vp20' typename=''/>
+  <cpu type='tcg' name='405ez' typename=''/>
+  <cpu type='tcg' name='e600' typename=''/>
+  <cpu type='tcg' name='7450_v1.1' typename=''/>
+  <cpu type='tcg' name='755_v2.4' typename=''/>
+  <cpu type='tcg' name='mpc8379' typename=''/>
+  <cpu type='tcg' name='7445_v1.0' typename=''/>
+  <cpu type='tcg' name='7447_v1.1' typename=''/>
+  <cpu type='tcg' name='603e_v2.2' typename=''/>
+  <cpu type='tcg' name='603e_v4' typename=''/>
+  <cpu type='tcg' name='g2legp' typename=''/>
+  <cpu type='tcg' name='7455_v3.2' typename=''/>
+  <cpu type='tcg' name='740_v2.0' typename=''/>
+  <cpu type='tcg' name='mpc8560_v20' typename=''/>
+  <cpu type='tcg' name='440-xilinx' typename=''/>
+  <cpu type='tcg' name='401f2' typename=''/>
+  <cpu type='tcg' name='mpc8533_v10' typename=''/>
+  <cpu type='tcg' name='mpc8349a' typename=''/>
+  <cpu type='tcg' name='405gpr' typename=''/>
+  <cpu type='tcg' name='stb25' typename=''/>
+  <cpu type='tcg' name='603e_v1.2' typename=''/>
+  <cpu type='tcg' name='mpc5200b_v20' typename=''/>
+  <cpu type='tcg' name='750fx_v2.2' typename=''/>
+  <cpu type='tcg' name='mpc8347eat' typename=''/>
+  <cpu type='tcg' name='740_v1.0' typename=''/>
+  <cpu type='tcg' name='601_v1' typename=''/>
+  <cpu type='tcg' name='745_v1.1' typename=''/>
+  <cpu type='tcg' name='750cx_v2.0' typename=''/>
+  <cpu type='tcg' name='mpc8548e_v10' typename=''/>
+  <cpu type='tcg' name='7447a_v1.2' typename=''/>
+  <cpu type='tcg' name='403gc' typename=''/>
+  <cpu type='tcg' name='e300c3' typename=''/>
+  <cpu type='tcg' name='mpc5200_v11' typename=''/>
+  <cpu type='tcg' name='7441_v2.1' typename=''/>
+  <cpu type='tcg' name='740_v3.0' typename=''/>
+  <cpu type='tcg' name='mpc8545e_v21' typename=''/>
+  <cpu type='tcg' name='602' typename=''/>
+  <cpu type='tcg' name='mpc8378e' typename=''/>
+  <cpu type='tcg' name='mpc8343a' typename=''/>
+  <cpu type='tcg' name='460exb' typename=''/>
+  <cpu type='tcg' name='mpc8555_v10' typename=''/>
+  <cpu type='tcg' name='mpc8568' typename=''/>
+  <cpu type='tcg' name='7457a_v1.2' typename=''/>
+  <cpu type='tcg' name='750cx_v1.0' typename=''/>
+  <cpu type='tcg' name='750cxe_v2.2' typename=''/>
+  <cpu type='tcg' name='604e_v2.4' typename=''/>
+  <cpu type='tcg' name='755_v2.8' typename=''/>
+  <cpu type='tcg' name='405lp' typename=''/>
+  <cpu type='tcg' name='745_v2.6' typename=''/>
+  <cpu type='tcg' name='stb03' typename=''/>
+  <cpu type='tcg' name='405ep' typename=''/>
+  <cpu type='tcg' name='mpc8544_v10' typename=''/>
+  <cpu type='tcg' name='mpc8347at' typename=''/>
+  <cpu type='tcg' name='750_v2.2' typename=''/>
+  <cpu type='tcg' name='7450_v1.0' typename=''/>
+  <cpu type='tcg' name='755_v2.3' typename=''/>
+  <cpu type='tcg' name='7410_v1.1' typename=''/>
+  <cpu type='tcg' name='745_v2.1' typename=''/>
+  <cpu type='tcg' name='750gl' typename=''/>
+  <cpu type='tcg' name='e6500' typename=''/>
+  <cpu type='tcg' name='750p' typename=''/>
+  <cpu type='tcg' name='7445_v3.4' typename=''/>
+  <cpu type='tcg' name='440epb' typename=''/>
+  <cpu type='tcg' name='npe4gs3' typename=''/>
+  <cpu type='tcg' name='603e_v3' typename=''/>
+  <cpu type='tcg' name='mpc8349e' typename=''/>
+  <cpu type='tcg' name='970_v2.2' typename=''/>
+  <cpu type='tcg' name='g2lels' typename=''/>
+  <cpu type='tcg' name='g2hip4' typename=''/>
+  <cpu type='tcg' name='740p' typename=''/>
+  <cpu type='tcg' name='mpc8567e' typename=''/>
+  <cpu type='tcg' name='mpc8533e_v11' typename=''/>
+  <cpu type='tcg' name='7451_v2.3' typename=''/>
+  <cpu type='tcg' name='603e_v1.1' typename=''/>
+  <cpu type='tcg' name='401g2' typename=''/>
+  <cpu type='tcg' name='7400_v2.8' typename=''/>
+  <cpu type='tcg' name='7455_v2.1' typename=''/>
+  <cpu type='tcg' name='405gpc' typename=''/>
+  <cpu type='tcg' name='power7+_v2.1' typename=''/>
+  <cpu type='tcg' name='mpc8544e_v11' typename=''/>
+  <cpu type='tcg' name='7450_v2.0' typename=''/>
+  <cpu type='tcg' name='970mp_v1.1' typename=''/>
+  <cpu type='tcg' name='603e7v2' typename=''/>
+  <cpu type='tcg' name='604r' typename=''/>
+  <cpu type='tcg' name='e500v2_v22' typename=''/>
+  <cpu type='tcg' name='mpc8548e_v20' typename=''/>
+  <cpu type='tcg' name='mpc8545e_v20' typename=''/>
+  <cpu type='tcg' name='mpc8378' typename=''/>
+  <cpu type='tcg' name='mpc8567' typename=''/>
+  <cpu type='tcg' name='7457_v1.2' typename=''/>
+  <cpu type='tcg' name='7447_v1.0' typename=''/>
+  <cpu type='tcg' name='970fx_v3.1' typename=''/>
+  <cpu type='tcg' name='745_v2.5' typename=''/>
+  <cpu type='tcg' name='mpc8379e' typename=''/>
+  <cpu type='tcg' name='mpc8641' typename=''/>
+  <cpu type='tcg' name='750cxe_v2.4b' typename=''/>
+  <cpu type='tcg' name='7410_v1.0' typename=''/>
+  <cpu type='tcg' name='mpc603' typename=''/>
+  <cpu type='tcg' name='603e_v4.1' typename=''/>
+  <cpu type='tcg' name='7445_v3.3' typename=''/>
+  <cpu type='tcg' name='440epa' typename=''/>
+  <cpu type='tcg' name='970fx_v2.1' typename=''/>
+  <cpu type='tcg' name='iop480' typename=''/>
+  <cpu type='tcg' name='750fx_v2.1' typename=''/>
+  <cpu type='tcg' name='601_v0' typename=''/>
+  <cpu type='tcg' name='g2legp1' typename=''/>
+  <cpu type='tcg' name='745_v1.0' typename=''/>
+  <cpu type='tcg' name='750cl_v2.0' typename=''/>
+  <cpu type='tcg' name='750cxr' typename=''/>
+  <cpu type='tcg' name='401' typename=''/>
+  <cpu type='tcg' name='mpc8541e_v11' typename=''/>
+  <cpu type='tcg' name='750cxe_v3.1' typename=''/>
+  <cpu type='tcg' name='mpc8555e_v11' typename=''/>
+  <cpu type='tcg' name='power8e_v2.1' typename=''/>
+  <cpu type='tcg' name='7447a_v1.1' typename=''/>
+  <cpu type='tcg' name='403gb' typename=''/>
+  <cpu type='tcg' name='e300c2' typename=''/>
+  <cpu type='tcg' name='npe405h2' typename=''/>
+  <cpu type='tcg' name='mpc8343e' typename=''/>
+  <cpu type='tcg' name='mpc8533e_v10' typename=''/>
+  <cpu type='tcg' name='mpc5200_v10' typename=''/>
+  <cpu type='tcg' name='750_v3.1' typename=''/>
+  <cpu type='tcg' name='power5+_v2.1' typename=''/>
+  <cpu type='tcg' name='mpc8568e' typename=''/>
   <machine name='pseries-3.1' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes'/>
   <machine name='ref405ep' maxCpus='1'/>
   <machine name='sam460ex' maxCpus='1'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
index 434c644ad4..ef39245a47 100644
--- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
@@ -739,12 +739,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'/>
@@ -752,22 +752,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'/>
@@ -780,7 +780,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'/>
@@ -793,33 +793,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'/>
@@ -831,9 +831,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'/>
@@ -860,7 +860,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'/>
@@ -876,11 +876,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'/>
@@ -890,7 +890,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'/>
@@ -899,8 +899,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'/>
@@ -917,35 +917,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'/>
@@ -967,7 +967,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'/>
@@ -988,7 +988,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'/>
@@ -1005,7 +1005,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'/>
@@ -1021,19 +1021,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'/>
@@ -1043,23 +1043,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'/>
@@ -1077,7 +1077,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'/>
@@ -1085,14 +1085,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'/>
@@ -1128,7 +1128,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'/>
@@ -1158,7 +1158,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'/>
@@ -1170,7 +1170,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'/>
@@ -1181,7 +1181,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'/>
@@ -1195,7 +1195,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'/>
@@ -1208,7 +1208,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'/>
@@ -1224,7 +1224,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'/>
@@ -1239,8 +1239,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'/>
@@ -1266,7 +1266,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'/>
@@ -1280,7 +1280,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'/>
@@ -1293,7 +1293,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'/>
@@ -1309,7 +1309,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'/>
@@ -1324,7 +1324,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 20f119665b..bf5d1ad81b 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
@@ -170,80 +170,80 @@
   <microcodeVersion>61700758</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 9ea6f4d046..ab865688ce 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
@@ -175,881 +175,881 @@
   <microcodeVersion>42900758</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='mpc8547e_v21'/>
-  <cpu type='kvm' name='g2gp'/>
-  <cpu type='kvm' name='7457a_v1.1'/>
-  <cpu type='kvm' name='750cl_v1.0'/>
-  <cpu type='kvm' name='750cxe_v2.1'/>
-  <cpu type='kvm' name='755_v2.7'/>
-  <cpu type='kvm' name='750_v2.1'/>
-  <cpu type='kvm' name='755_v2.2'/>
-  <cpu type='kvm' name='745_v2.0'/>
-  <cpu type='kvm' name='mpc8377'/>
-  <cpu type='kvm' name='7455_v1.0'/>
-  <cpu type='kvm' name='mpc8545_v21'/>
-  <cpu type='kvm' name='mpc8548_v11'/>
-  <cpu type='kvm' name='405d4'/>
-  <cpu type='kvm' name='g2le'/>
-  <cpu type='kvm' name='g2hip3'/>
-  <cpu type='kvm' name='750e'/>
-  <cpu type='kvm' name='mpc8572'/>
-  <cpu type='kvm' name='970fx_v2.0'/>
-  <cpu type='kvm' name='750fx_v2.0'/>
-  <cpu type='kvm' name='603p'/>
-  <cpu type='kvm' name='405gpb'/>
-  <cpu type='kvm' name='7400_v2.7'/>
-  <cpu type='kvm' name='mpc8544e_v10'/>
-  <cpu type='kvm' name='e500v2_v10'/>
-  <cpu type='kvm' name='e500mc'/>
-  <cpu type='kvm' name='603e7v1'/>
-  <cpu type='kvm' name='970mp_v1.0'/>
-  <cpu type='kvm' name='740e'/>
-  <cpu type='kvm' name='405crc'/>
-  <cpu type='kvm' name='403ga'/>
-  <cpu type='kvm' name='7447a_v1.0'/>
-  <cpu type='kvm' name='e300c1'/>
-  <cpu type='kvm' name='mpc8572e'/>
-  <cpu type='kvm' name='e500v2_v21'/>
-  <cpu type='kvm' name='7400_v2.2'/>
-  <cpu type='kvm' name='970fx_v1.0'/>
-  <cpu type='kvm' name='750gx_v1.2'/>
-  <cpu type='kvm' name='750fx_v1.0'/>
-  <cpu type='kvm' name='7457_v1.1'/>
-  <cpu type='kvm' name='970fx_v3.0'/>
-  <cpu type='kvm' name='604e_v2.2'/>
-  <cpu type='kvm' name='745_v2.4'/>
-  <cpu type='kvm' name='401a1'/>
-  <cpu type='kvm' name='755_v2.6'/>
-  <cpu type='kvm' name='npe405h'/>
-  <cpu type='kvm' name='power9_v1.0'/>
-  <cpu type='kvm' name='g2ls'/>
-  <cpu type='kvm' name='7410_v1.4'/>
-  <cpu type='kvm' name='750_v2.0'/>
-  <cpu type='kvm' name='401b2'/>
-  <cpu type='kvm' name='mpc8349'/>
-  <cpu type='kvm' name='mpc8347ep'/>
-  <cpu type='kvm' name='7445_v3.2'/>
-  <cpu type='kvm' name='mpc8540_v21'/>
-  <cpu type='kvm' name='mpc8543_v11'/>
-  <cpu type='kvm' name='403gcx'/>
-  <cpu type='kvm' name='mpc8548_v21'/>
-  <cpu type='kvm' name='750l_v3.2'/>
-  <cpu type='kvm' name='750_v1.0'/>
-  <cpu type='kvm' name='755_v1.1'/>
-  <cpu type='kvm' name='750cxe_v3.0'/>
-  <cpu type='kvm' name='e500_v10'/>
-  <cpu type='kvm' name='mpc8541e_v10'/>
-  <cpu type='kvm' name='power9_v2.0'/>
-  <cpu type='kvm' name='mpc8347p'/>
-  <cpu type='kvm' name='mpc8555e_v10'/>
-  <cpu type='kvm' name='power7_v2.3'/>
-  <cpu type='kvm' name='603e7v'/>
-  <cpu type='kvm' name='mpc8543e_v11'/>
-  <cpu type='kvm' name='750_v3.0'/>
-  <cpu type='kvm' name='7400_v2.6'/>
-  <cpu type='kvm' name='405gpa'/>
-  <cpu type='kvm' name='440epx'/>
-  <cpu type='kvm' name='750l_v2.2'/>
-  <cpu type='kvm' name='e200z6'/>
-  <cpu type='kvm' name='mpc8547e_v20'/>
-  <cpu type='kvm' name='7457a_v1.0'/>
-  <cpu type='kvm' name='mpc8349ea'/>
-  <cpu type='kvm' name='e500v2_v20'/>
-  <cpu type='kvm' name='power8nvl_v1.0'/>
-  <cpu type='kvm' name='mpc8540_v10'/>
-  <cpu type='kvm' name='755_v2.1'/>
-  <cpu type='kvm' name='745_v2.8'/>
-  <cpu type='kvm' name='npe405l'/>
-  <cpu type='kvm' name='mpc8343ea'/>
-  <cpu type='kvm' name='mpc8545_v20'/>
-  <cpu type='kvm' name='mpc8548_v10'/>
-  <cpu type='kvm' name='7448_v1.1'/>
-  <cpu type='kvm' name='740_v2.2'/>
-  <cpu type='kvm' name='7455_v3.4'/>
-  <cpu type='kvm' name='7400_v1.1'/>
-  <cpu type='kvm' name='mpc8347et'/>
-  <cpu type='kvm' name='7441_v2.10'/>
-  <cpu type='kvm' name='603e_v1.4'/>
-  <cpu type='kvm' name='mpc8543_v10'/>
-  <cpu type='kvm' name='401c2'/>
-  <cpu type='kvm' name='7451_v2.10'/>
-  <cpu type='kvm' name='750cx_v2.2'/>
-  <cpu type='kvm' name='mpc8543_v21'/>
-  <cpu type='kvm' name='603e7'/>
-  <cpu type='kvm' name='7448_v2.1'/>
-  <cpu type='kvm' name='7441_v2.3'/>
-  <cpu type='kvm' name='405crb'/>
-  <cpu type='kvm' name='7445_v2.1'/>
-  <cpu type='kvm' name='7400_v2.1'/>
-  <cpu type='kvm' name='440-xilinx-w-dfpu'/>
-  <cpu type='kvm' name='604'/>
-  <cpu type='kvm' name='cobra'/>
-  <cpu type='kvm' name='e500_v20'/>
-  <cpu type='kvm' name='mpc8541_v11'/>
-  <cpu type='kvm' name='750gx_v1.1'/>
-  <cpu type='kvm' name='750cxe_v2.4'/>
-  <cpu type='kvm' name='mpc8641d'/>
-  <cpu type='kvm' name='mpc8543e_v21'/>
-  <cpu type='kvm' name='750l_v2.1'/>
-  <cpu type='kvm' name='7457_v1.0'/>
-  <cpu type='kvm' name='7450_v1.2'/>
-  <cpu type='kvm' name='755_v2.5'/>
-  <cpu type='kvm' name='7410_v1.3'/>
-  <cpu type='kvm' name='745_v2.3'/>
-  <cpu type='kvm' name='755_v2.0'/>
-  <cpu type='kvm' name='e500v2_v30'/>
-  <cpu type='kvm' name='7455_v3.3'/>
-  <cpu type='kvm' name='mpc8540_v20'/>
-  <cpu type='kvm' name='405d2'/>
-  <cpu type='kvm' name='mpc8560_v21'/>
-  <cpu type='kvm' name='mpc8343'/>
-  <cpu type='kvm' name='mpc8548_v20'/>
-  <cpu type='kvm' name='mpc8347t'/>
-  <cpu type='kvm' name='755_v1.0'/>
-  <cpu type='kvm' name='603e_v1.3'/>
-  <cpu type='kvm' name='host'/>
-  <cpu type='kvm' name='mpc8543e_v10'/>
-  <cpu type='kvm' name='mpc8347eap'/>
-  <cpu type='kvm' name='mpc8548e_v11'/>
-  <cpu type='kvm' name='mpc8543_v20'/>
-  <cpu type='kvm' name='401d2'/>
-  <cpu type='kvm' name='power8_v2.0'/>
-  <cpu type='kvm' name='740_v3.1'/>
-  <cpu type='kvm' name='e200z5'/>
-  <cpu type='kvm' name='405cra'/>
-  <cpu type='kvm' name='7400_v2.0'/>
-  <cpu type='kvm' name='750cxe_v2.3'/>
-  <cpu type='kvm' name='745_v2.7'/>
-  <cpu type='kvm' name='mpc8560_v10'/>
-  <cpu type='kvm' name='e5500'/>
-  <cpu type='kvm' name='mpc8544_v11'/>
-  <cpu type='kvm' name='7448_v1.0'/>
-  <cpu type='kvm' name='401e2'/>
-  <cpu type='kvm' name='740_v2.1'/>
-  <cpu type='kvm' name='7410_v1.2'/>
-  <cpu type='kvm' name='745_v2.2'/>
-  <cpu type='kvm' name='7400_v1.0'/>
-  <cpu type='kvm' name='x2vp4'/>
-  <cpu type='kvm' name='mpc8347ap'/>
-  <cpu type='kvm' name='mpc8533_v11'/>
-  <cpu type='kvm' name='mpc5200b_v21'/>
-  <cpu type='kvm' name='750fx_v2.3'/>
-  <cpu type='kvm' name='601_v2'/>
-  <cpu type='kvm' name='g2legp3'/>
-  <cpu type='kvm' name='604e_v1.0'/>
-  <cpu type='kvm' name='750cx_v2.1'/>
-  <cpu type='kvm' name='mpc8610'/>
-  <cpu type='kvm' name='g2h4'/>
-  <cpu type='kvm' name='750l_v3.0'/>
-  <cpu type='kvm' name='mpc8377e'/>
-  <cpu type='kvm' name='e300c4'/>
-  <cpu type='kvm' name='mpc5200_v12'/>
-  <cpu type='kvm' name='7448_v2.0'/>
-  <cpu type='kvm' name='7450_v2.1'/>
-  <cpu type='kvm' name='750cxe_v3.1b'/>
-  <cpu type='kvm' name='g2'/>
-  <cpu type='kvm' name='7400_v2.9'/>
-  <cpu type='kvm' name='405gpd'/>
-  <cpu type='kvm' name='603'/>
-  <cpu type='kvm' name='603e7t'/>
-  <cpu type='kvm' name='mpc8555_v11'/>
-  <cpu type='kvm' name='750gx_v1.0'/>
-  <cpu type='kvm' name='mpc8541_v10'/>
-  <cpu type='kvm' name='mpc8543e_v20'/>
-  <cpu type='kvm' name='750fl'/>
-  <cpu type='kvm' name='750l_v2.0'/>
-  <cpu type='kvm' name='stb04'/>
-  <cpu type='kvm' name='mpc8548e_v21'/>
-  <cpu type='kvm' name='x2vp20'/>
-  <cpu type='kvm' name='e600'/>
-  <cpu type='kvm' name='7450_v1.1'/>
-  <cpu type='kvm' name='755_v2.4'/>
-  <cpu type='kvm' name='mpc8379'/>
-  <cpu type='kvm' name='7445_v1.0'/>
-  <cpu type='kvm' name='405ez'/>
-  <cpu type='kvm' name='7447_v1.1'/>
-  <cpu type='kvm' name='603e_v2.2'/>
-  <cpu type='kvm' name='603e_v4'/>
-  <cpu type='kvm' name='g2legp'/>
-  <cpu type='kvm' name='7455_v3.2'/>
-  <cpu type='kvm' name='740_v2.0'/>
-  <cpu type='kvm' name='mpc8560_v20'/>
-  <cpu type='kvm' name='440-xilinx'/>
-  <cpu type='kvm' name='401f2'/>
-  <cpu type='kvm' name='mpc8533_v10'/>
-  <cpu type='kvm' name='mpc8349a'/>
-  <cpu type='kvm' name='405gpr'/>
-  <cpu type='kvm' name='stb25'/>
-  <cpu type='kvm' name='603e_v1.2'/>
-  <cpu type='kvm' name='mpc5200b_v20'/>
-  <cpu type='kvm' name='750fx_v2.2'/>
-  <cpu type='kvm' name='mpc8347eat'/>
-  <cpu type='kvm' name='740_v1.0'/>
-  <cpu type='kvm' name='601_v1'/>
-  <cpu type='kvm' name='745_v1.1'/>
-  <cpu type='kvm' name='750cx_v2.0'/>
-  <cpu type='kvm' name='mpc8548e_v10'/>
-  <cpu type='kvm' name='403gc'/>
-  <cpu type='kvm' name='7447a_v1.2'/>
-  <cpu type='kvm' name='e300c3'/>
-  <cpu type='kvm' name='mpc5200_v11'/>
-  <cpu type='kvm' name='7441_v2.1'/>
-  <cpu type='kvm' name='740_v3.0'/>
-  <cpu type='kvm' name='mpc8545e_v21'/>
-  <cpu type='kvm' name='602'/>
-  <cpu type='kvm' name='mpc8378e'/>
-  <cpu type='kvm' name='mpc8343a'/>
-  <cpu type='kvm' name='460exb'/>
-  <cpu type='kvm' name='mpc8555_v10'/>
-  <cpu type='kvm' name='mpc8568'/>
-  <cpu type='kvm' name='7457a_v1.2'/>
-  <cpu type='kvm' name='750cx_v1.0'/>
-  <cpu type='kvm' name='750cxe_v2.2'/>
-  <cpu type='kvm' name='604e_v2.4'/>
-  <cpu type='kvm' name='755_v2.8'/>
-  <cpu type='kvm' name='405lp'/>
-  <cpu type='kvm' name='745_v2.6'/>
-  <cpu type='kvm' name='stb03'/>
-  <cpu type='kvm' name='405ep'/>
-  <cpu type='kvm' name='mpc8544_v10'/>
-  <cpu type='kvm' name='mpc8347at'/>
-  <cpu type='kvm' name='750_v2.2'/>
-  <cpu type='kvm' name='7450_v1.0'/>
-  <cpu type='kvm' name='755_v2.3'/>
-  <cpu type='kvm' name='7410_v1.1'/>
-  <cpu type='kvm' name='745_v2.1'/>
-  <cpu type='kvm' name='750gl'/>
-  <cpu type='kvm' name='e6500'/>
-  <cpu type='kvm' name='750p'/>
-  <cpu type='kvm' name='7445_v3.4'/>
-  <cpu type='kvm' name='440epb'/>
-  <cpu type='kvm' name='npe4gs3'/>
-  <cpu type='kvm' name='603e_v3'/>
-  <cpu type='kvm' name='mpc8349e'/>
-  <cpu type='kvm' name='970_v2.2'/>
-  <cpu type='kvm' name='g2lels'/>
-  <cpu type='kvm' name='g2hip4'/>
-  <cpu type='kvm' name='740p'/>
-  <cpu type='kvm' name='mpc8567e'/>
-  <cpu type='kvm' name='mpc8533e_v11'/>
-  <cpu type='kvm' name='7451_v2.3'/>
-  <cpu type='kvm' name='7450_v2.0'/>
-  <cpu type='kvm' name='401g2'/>
-  <cpu type='kvm' name='7400_v2.8'/>
-  <cpu type='kvm' name='405gpc'/>
-  <cpu type='kvm' name='7455_v2.1'/>
-  <cpu type='kvm' name='power7+_v2.1'/>
-  <cpu type='kvm' name='mpc8544e_v11'/>
-  <cpu type='kvm' name='970mp_v1.1'/>
-  <cpu type='kvm' name='603e7v2'/>
-  <cpu type='kvm' name='603e_v1.1'/>
-  <cpu type='kvm' name='604r'/>
-  <cpu type='kvm' name='e500v2_v22'/>
-  <cpu type='kvm' name='mpc8548e_v20'/>
-  <cpu type='kvm' name='mpc8545e_v20'/>
-  <cpu type='kvm' name='mpc8378'/>
-  <cpu type='kvm' name='mpc8567'/>
-  <cpu type='kvm' name='7457_v1.2'/>
-  <cpu type='kvm' name='7447_v1.0'/>
-  <cpu type='kvm' name='970fx_v3.1'/>
-  <cpu type='kvm' name='745_v2.5'/>
-  <cpu type='kvm' name='mpc8379e'/>
-  <cpu type='kvm' name='mpc8641'/>
-  <cpu type='kvm' name='750cxe_v2.4b'/>
-  <cpu type='kvm' name='7410_v1.0'/>
-  <cpu type='kvm' name='mpc603'/>
-  <cpu type='kvm' name='603e_v4.1'/>
-  <cpu type='kvm' name='7445_v3.3'/>
-  <cpu type='kvm' name='440epa'/>
-  <cpu type='kvm' name='970fx_v2.1'/>
-  <cpu type='kvm' name='iop480'/>
-  <cpu type='kvm' name='750fx_v2.1'/>
-  <cpu type='kvm' name='601_v0'/>
-  <cpu type='kvm' name='g2legp1'/>
-  <cpu type='kvm' name='745_v1.0'/>
-  <cpu type='kvm' name='750cl_v2.0'/>
-  <cpu type='kvm' name='401'/>
-  <cpu type='kvm' name='mpc8541e_v11'/>
-  <cpu type='kvm' name='750cxe_v3.1'/>
-  <cpu type='kvm' name='750cxr'/>
-  <cpu type='kvm' name='mpc8555e_v11'/>
-  <cpu type='kvm' name='power5+_v2.1'/>
-  <cpu type='kvm' name='403gb'/>
-  <cpu type='kvm' name='7447a_v1.1'/>
-  <cpu type='kvm' name='e300c2'/>
-  <cpu type='kvm' name='npe405h2'/>
-  <cpu type='kvm' name='mpc8343e'/>
-  <cpu type='kvm' name='mpc8533e_v10'/>
-  <cpu type='kvm' name='mpc5200_v10'/>
-  <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='mpc8547e_v21'/>
-  <cpu type='tcg' name='g2gp'/>
-  <cpu type='tcg' name='7457a_v1.1'/>
-  <cpu type='tcg' name='750cl_v1.0'/>
-  <cpu type='tcg' name='750cxe_v2.1'/>
-  <cpu type='tcg' name='755_v2.7'/>
-  <cpu type='tcg' name='750_v2.1'/>
-  <cpu type='tcg' name='755_v2.2'/>
-  <cpu type='tcg' name='745_v2.0'/>
-  <cpu type='tcg' name='mpc8377'/>
-  <cpu type='tcg' name='7455_v1.0'/>
-  <cpu type='tcg' name='mpc8545_v21'/>
-  <cpu type='tcg' name='mpc8548_v11'/>
-  <cpu type='tcg' name='405d4'/>
-  <cpu type='tcg' name='g2le'/>
-  <cpu type='tcg' name='g2hip3'/>
-  <cpu type='tcg' name='750e'/>
-  <cpu type='tcg' name='mpc8572'/>
-  <cpu type='tcg' name='970fx_v2.0'/>
-  <cpu type='tcg' name='750fx_v2.0'/>
-  <cpu type='tcg' name='603p'/>
-  <cpu type='tcg' name='405gpb'/>
-  <cpu type='tcg' name='7400_v2.7'/>
-  <cpu type='tcg' name='mpc8544e_v10'/>
-  <cpu type='tcg' name='e500v2_v10'/>
-  <cpu type='tcg' name='e500mc'/>
-  <cpu type='tcg' name='603e7v1'/>
-  <cpu type='tcg' name='970mp_v1.0'/>
-  <cpu type='tcg' name='740e'/>
-  <cpu type='tcg' name='405crc'/>
-  <cpu type='tcg' name='403ga'/>
-  <cpu type='tcg' name='7447a_v1.0'/>
-  <cpu type='tcg' name='e300c1'/>
-  <cpu type='tcg' name='mpc8572e'/>
-  <cpu type='tcg' name='e500v2_v21'/>
-  <cpu type='tcg' name='7400_v2.2'/>
-  <cpu type='tcg' name='970fx_v1.0'/>
-  <cpu type='tcg' name='750gx_v1.2'/>
-  <cpu type='tcg' name='750fx_v1.0'/>
-  <cpu type='tcg' name='7457_v1.1'/>
-  <cpu type='tcg' name='970fx_v3.0'/>
-  <cpu type='tcg' name='604e_v2.2'/>
-  <cpu type='tcg' name='745_v2.4'/>
-  <cpu type='tcg' name='401a1'/>
-  <cpu type='tcg' name='755_v2.6'/>
-  <cpu type='tcg' name='npe405h'/>
-  <cpu type='tcg' name='power9_v1.0'/>
-  <cpu type='tcg' name='g2ls'/>
-  <cpu type='tcg' name='7410_v1.4'/>
-  <cpu type='tcg' name='750_v2.0'/>
-  <cpu type='tcg' name='401b2'/>
-  <cpu type='tcg' name='mpc8349'/>
-  <cpu type='tcg' name='mpc8347ep'/>
-  <cpu type='tcg' name='7445_v3.2'/>
-  <cpu type='tcg' name='mpc8540_v21'/>
-  <cpu type='tcg' name='mpc8543_v11'/>
-  <cpu type='tcg' name='403gcx'/>
-  <cpu type='tcg' name='mpc8548_v21'/>
-  <cpu type='tcg' name='750l_v3.2'/>
-  <cpu type='tcg' name='750_v1.0'/>
-  <cpu type='tcg' name='755_v1.1'/>
-  <cpu type='tcg' name='750cxe_v3.0'/>
-  <cpu type='tcg' name='e500_v10'/>
-  <cpu type='tcg' name='mpc8541e_v10'/>
-  <cpu type='tcg' name='power9_v2.0'/>
-  <cpu type='tcg' name='mpc8347p'/>
-  <cpu type='tcg' name='mpc8555e_v10'/>
-  <cpu type='tcg' name='power7_v2.3'/>
-  <cpu type='tcg' name='603e7v'/>
-  <cpu type='tcg' name='mpc8543e_v11'/>
-  <cpu type='tcg' name='750_v3.0'/>
-  <cpu type='tcg' name='7400_v2.6'/>
-  <cpu type='tcg' name='405gpa'/>
-  <cpu type='tcg' name='440epx'/>
-  <cpu type='tcg' name='750l_v2.2'/>
-  <cpu type='tcg' name='e200z6'/>
-  <cpu type='tcg' name='mpc8547e_v20'/>
-  <cpu type='tcg' name='7457a_v1.0'/>
-  <cpu type='tcg' name='mpc8349ea'/>
-  <cpu type='tcg' name='e500v2_v20'/>
-  <cpu type='tcg' name='power8nvl_v1.0'/>
-  <cpu type='tcg' name='mpc8540_v10'/>
-  <cpu type='tcg' name='755_v2.1'/>
-  <cpu type='tcg' name='745_v2.8'/>
-  <cpu type='tcg' name='npe405l'/>
-  <cpu type='tcg' name='mpc8343ea'/>
-  <cpu type='tcg' name='mpc8545_v20'/>
-  <cpu type='tcg' name='mpc8548_v10'/>
-  <cpu type='tcg' name='7448_v1.1'/>
-  <cpu type='tcg' name='740_v2.2'/>
-  <cpu type='tcg' name='7455_v3.4'/>
-  <cpu type='tcg' name='7400_v1.1'/>
-  <cpu type='tcg' name='mpc8347et'/>
-  <cpu type='tcg' name='7441_v2.10'/>
-  <cpu type='tcg' name='603e_v1.4'/>
-  <cpu type='tcg' name='mpc8543_v10'/>
-  <cpu type='tcg' name='401c2'/>
-  <cpu type='tcg' name='7451_v2.10'/>
-  <cpu type='tcg' name='750cx_v2.2'/>
-  <cpu type='tcg' name='mpc8543_v21'/>
-  <cpu type='tcg' name='603e7'/>
-  <cpu type='tcg' name='7448_v2.1'/>
-  <cpu type='tcg' name='7441_v2.3'/>
-  <cpu type='tcg' name='405crb'/>
-  <cpu type='tcg' name='7445_v2.1'/>
-  <cpu type='tcg' name='7400_v2.1'/>
-  <cpu type='tcg' name='440-xilinx-w-dfpu'/>
-  <cpu type='tcg' name='604'/>
-  <cpu type='tcg' name='cobra'/>
-  <cpu type='tcg' name='e500_v20'/>
-  <cpu type='tcg' name='mpc8541_v11'/>
-  <cpu type='tcg' name='750gx_v1.1'/>
-  <cpu type='tcg' name='750cxe_v2.4'/>
-  <cpu type='tcg' name='mpc8641d'/>
-  <cpu type='tcg' name='mpc8543e_v21'/>
-  <cpu type='tcg' name='750l_v2.1'/>
-  <cpu type='tcg' name='7457_v1.0'/>
-  <cpu type='tcg' name='7450_v1.2'/>
-  <cpu type='tcg' name='755_v2.5'/>
-  <cpu type='tcg' name='7410_v1.3'/>
-  <cpu type='tcg' name='745_v2.3'/>
-  <cpu type='tcg' name='755_v2.0'/>
-  <cpu type='tcg' name='e500v2_v30'/>
-  <cpu type='tcg' name='7455_v3.3'/>
-  <cpu type='tcg' name='mpc8540_v20'/>
-  <cpu type='tcg' name='405d2'/>
-  <cpu type='tcg' name='mpc8560_v21'/>
-  <cpu type='tcg' name='mpc8343'/>
-  <cpu type='tcg' name='mpc8548_v20'/>
-  <cpu type='tcg' name='mpc8347t'/>
-  <cpu type='tcg' name='755_v1.0'/>
-  <cpu type='tcg' name='603e_v1.3'/>
-  <cpu type='tcg' name='mpc8543e_v10'/>
-  <cpu type='tcg' name='mpc8347eap'/>
-  <cpu type='tcg' name='mpc8548e_v11'/>
-  <cpu type='tcg' name='mpc8543_v20'/>
-  <cpu type='tcg' name='401d2'/>
-  <cpu type='tcg' name='power8_v2.0'/>
-  <cpu type='tcg' name='740_v3.1'/>
-  <cpu type='tcg' name='e200z5'/>
-  <cpu type='tcg' name='405cra'/>
-  <cpu type='tcg' name='7400_v2.0'/>
-  <cpu type='tcg' name='750cxe_v2.3'/>
-  <cpu type='tcg' name='745_v2.7'/>
-  <cpu type='tcg' name='mpc8560_v10'/>
-  <cpu type='tcg' name='e5500'/>
-  <cpu type='tcg' name='mpc8544_v11'/>
-  <cpu type='tcg' name='7448_v1.0'/>
-  <cpu type='tcg' name='401e2'/>
-  <cpu type='tcg' name='740_v2.1'/>
-  <cpu type='tcg' name='7410_v1.2'/>
-  <cpu type='tcg' name='745_v2.2'/>
-  <cpu type='tcg' name='7400_v1.0'/>
-  <cpu type='tcg' name='x2vp4'/>
-  <cpu type='tcg' name='mpc8347ap'/>
-  <cpu type='tcg' name='mpc8533_v11'/>
-  <cpu type='tcg' name='mpc5200b_v21'/>
-  <cpu type='tcg' name='750fx_v2.3'/>
-  <cpu type='tcg' name='601_v2'/>
-  <cpu type='tcg' name='g2legp3'/>
-  <cpu type='tcg' name='604e_v1.0'/>
-  <cpu type='tcg' name='750cx_v2.1'/>
-  <cpu type='tcg' name='mpc8610'/>
-  <cpu type='tcg' name='g2h4'/>
-  <cpu type='tcg' name='750l_v3.0'/>
-  <cpu type='tcg' name='mpc8377e'/>
-  <cpu type='tcg' name='e300c4'/>
-  <cpu type='tcg' name='mpc5200_v12'/>
-  <cpu type='tcg' name='7448_v2.0'/>
-  <cpu type='tcg' name='7450_v2.1'/>
-  <cpu type='tcg' name='750cxe_v3.1b'/>
-  <cpu type='tcg' name='g2'/>
-  <cpu type='tcg' name='7400_v2.9'/>
-  <cpu type='tcg' name='405gpd'/>
-  <cpu type='tcg' name='603'/>
-  <cpu type='tcg' name='603e7t'/>
-  <cpu type='tcg' name='mpc8555_v11'/>
-  <cpu type='tcg' name='750gx_v1.0'/>
-  <cpu type='tcg' name='mpc8541_v10'/>
-  <cpu type='tcg' name='mpc8543e_v20'/>
-  <cpu type='tcg' name='750fl'/>
-  <cpu type='tcg' name='750l_v2.0'/>
-  <cpu type='tcg' name='stb04'/>
-  <cpu type='tcg' name='mpc8548e_v21'/>
-  <cpu type='tcg' name='x2vp20'/>
-  <cpu type='tcg' name='e600'/>
-  <cpu type='tcg' name='7450_v1.1'/>
-  <cpu type='tcg' name='755_v2.4'/>
-  <cpu type='tcg' name='mpc8379'/>
-  <cpu type='tcg' name='7445_v1.0'/>
-  <cpu type='tcg' name='405ez'/>
-  <cpu type='tcg' name='7447_v1.1'/>
-  <cpu type='tcg' name='603e_v2.2'/>
-  <cpu type='tcg' name='603e_v4'/>
-  <cpu type='tcg' name='g2legp'/>
-  <cpu type='tcg' name='7455_v3.2'/>
-  <cpu type='tcg' name='740_v2.0'/>
-  <cpu type='tcg' name='mpc8560_v20'/>
-  <cpu type='tcg' name='440-xilinx'/>
-  <cpu type='tcg' name='401f2'/>
-  <cpu type='tcg' name='mpc8533_v10'/>
-  <cpu type='tcg' name='mpc8349a'/>
-  <cpu type='tcg' name='405gpr'/>
-  <cpu type='tcg' name='stb25'/>
-  <cpu type='tcg' name='603e_v1.2'/>
-  <cpu type='tcg' name='mpc5200b_v20'/>
-  <cpu type='tcg' name='750fx_v2.2'/>
-  <cpu type='tcg' name='mpc8347eat'/>
-  <cpu type='tcg' name='740_v1.0'/>
-  <cpu type='tcg' name='601_v1'/>
-  <cpu type='tcg' name='745_v1.1'/>
-  <cpu type='tcg' name='750cx_v2.0'/>
-  <cpu type='tcg' name='mpc8548e_v10'/>
-  <cpu type='tcg' name='403gc'/>
-  <cpu type='tcg' name='7447a_v1.2'/>
-  <cpu type='tcg' name='e300c3'/>
-  <cpu type='tcg' name='mpc5200_v11'/>
-  <cpu type='tcg' name='7441_v2.1'/>
-  <cpu type='tcg' name='740_v3.0'/>
-  <cpu type='tcg' name='mpc8545e_v21'/>
-  <cpu type='tcg' name='602'/>
-  <cpu type='tcg' name='mpc8378e'/>
-  <cpu type='tcg' name='mpc8343a'/>
-  <cpu type='tcg' name='460exb'/>
-  <cpu type='tcg' name='mpc8555_v10'/>
-  <cpu type='tcg' name='mpc8568'/>
-  <cpu type='tcg' name='7457a_v1.2'/>
-  <cpu type='tcg' name='750cx_v1.0'/>
-  <cpu type='tcg' name='750cxe_v2.2'/>
-  <cpu type='tcg' name='604e_v2.4'/>
-  <cpu type='tcg' name='755_v2.8'/>
-  <cpu type='tcg' name='405lp'/>
-  <cpu type='tcg' name='745_v2.6'/>
-  <cpu type='tcg' name='stb03'/>
-  <cpu type='tcg' name='405ep'/>
-  <cpu type='tcg' name='mpc8544_v10'/>
-  <cpu type='tcg' name='mpc8347at'/>
-  <cpu type='tcg' name='750_v2.2'/>
-  <cpu type='tcg' name='7450_v1.0'/>
-  <cpu type='tcg' name='755_v2.3'/>
-  <cpu type='tcg' name='7410_v1.1'/>
-  <cpu type='tcg' name='745_v2.1'/>
-  <cpu type='tcg' name='750gl'/>
-  <cpu type='tcg' name='e6500'/>
-  <cpu type='tcg' name='750p'/>
-  <cpu type='tcg' name='7445_v3.4'/>
-  <cpu type='tcg' name='440epb'/>
-  <cpu type='tcg' name='npe4gs3'/>
-  <cpu type='tcg' name='603e_v3'/>
-  <cpu type='tcg' name='mpc8349e'/>
-  <cpu type='tcg' name='970_v2.2'/>
-  <cpu type='tcg' name='g2lels'/>
-  <cpu type='tcg' name='g2hip4'/>
-  <cpu type='tcg' name='740p'/>
-  <cpu type='tcg' name='mpc8567e'/>
-  <cpu type='tcg' name='mpc8533e_v11'/>
-  <cpu type='tcg' name='7451_v2.3'/>
-  <cpu type='tcg' name='7450_v2.0'/>
-  <cpu type='tcg' name='401g2'/>
-  <cpu type='tcg' name='7400_v2.8'/>
-  <cpu type='tcg' name='405gpc'/>
-  <cpu type='tcg' name='7455_v2.1'/>
-  <cpu type='tcg' name='power7+_v2.1'/>
-  <cpu type='tcg' name='mpc8544e_v11'/>
-  <cpu type='tcg' name='970mp_v1.1'/>
-  <cpu type='tcg' name='603e7v2'/>
-  <cpu type='tcg' name='603e_v1.1'/>
-  <cpu type='tcg' name='604r'/>
-  <cpu type='tcg' name='e500v2_v22'/>
-  <cpu type='tcg' name='mpc8548e_v20'/>
-  <cpu type='tcg' name='mpc8545e_v20'/>
-  <cpu type='tcg' name='mpc8378'/>
-  <cpu type='tcg' name='mpc8567'/>
-  <cpu type='tcg' name='7457_v1.2'/>
-  <cpu type='tcg' name='7447_v1.0'/>
-  <cpu type='tcg' name='970fx_v3.1'/>
-  <cpu type='tcg' name='745_v2.5'/>
-  <cpu type='tcg' name='mpc8379e'/>
-  <cpu type='tcg' name='mpc8641'/>
-  <cpu type='tcg' name='750cxe_v2.4b'/>
-  <cpu type='tcg' name='7410_v1.0'/>
-  <cpu type='tcg' name='mpc603'/>
-  <cpu type='tcg' name='603e_v4.1'/>
-  <cpu type='tcg' name='7445_v3.3'/>
-  <cpu type='tcg' name='440epa'/>
-  <cpu type='tcg' name='970fx_v2.1'/>
-  <cpu type='tcg' name='iop480'/>
-  <cpu type='tcg' name='750fx_v2.1'/>
-  <cpu type='tcg' name='601_v0'/>
-  <cpu type='tcg' name='g2legp1'/>
-  <cpu type='tcg' name='745_v1.0'/>
-  <cpu type='tcg' name='750cl_v2.0'/>
-  <cpu type='tcg' name='401'/>
-  <cpu type='tcg' name='mpc8541e_v11'/>
-  <cpu type='tcg' name='750cxe_v3.1'/>
-  <cpu type='tcg' name='750cxr'/>
-  <cpu type='tcg' name='mpc8555e_v11'/>
-  <cpu type='tcg' name='power5+_v2.1'/>
-  <cpu type='tcg' name='403gb'/>
-  <cpu type='tcg' name='7447a_v1.1'/>
-  <cpu type='tcg' name='e300c2'/>
-  <cpu type='tcg' name='npe405h2'/>
-  <cpu type='tcg' name='mpc8343e'/>
-  <cpu type='tcg' name='mpc8533e_v10'/>
-  <cpu type='tcg' name='mpc5200_v10'/>
-  <cpu type='tcg' name='750_v3.1'/>
-  <cpu type='tcg' name='power8e_v2.1'/>
-  <cpu type='tcg' name='mpc8568e'/>
+  <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' typename=''/>
+  <cpu type='kvm' name='g2gp' typename=''/>
+  <cpu type='kvm' name='7457a_v1.1' typename=''/>
+  <cpu type='kvm' name='750cl_v1.0' typename=''/>
+  <cpu type='kvm' name='750cxe_v2.1' typename=''/>
+  <cpu type='kvm' name='755_v2.7' typename=''/>
+  <cpu type='kvm' name='750_v2.1' typename=''/>
+  <cpu type='kvm' name='755_v2.2' typename=''/>
+  <cpu type='kvm' name='745_v2.0' typename=''/>
+  <cpu type='kvm' name='mpc8377' typename=''/>
+  <cpu type='kvm' name='7455_v1.0' typename=''/>
+  <cpu type='kvm' name='mpc8545_v21' typename=''/>
+  <cpu type='kvm' name='mpc8548_v11' typename=''/>
+  <cpu type='kvm' name='405d4' typename=''/>
+  <cpu type='kvm' name='g2le' typename=''/>
+  <cpu type='kvm' name='g2hip3' typename=''/>
+  <cpu type='kvm' name='750e' typename=''/>
+  <cpu type='kvm' name='mpc8572' typename=''/>
+  <cpu type='kvm' name='970fx_v2.0' typename=''/>
+  <cpu type='kvm' name='750fx_v2.0' typename=''/>
+  <cpu type='kvm' name='603p' typename=''/>
+  <cpu type='kvm' name='405gpb' typename=''/>
+  <cpu type='kvm' name='7400_v2.7' typename=''/>
+  <cpu type='kvm' name='mpc8544e_v10' typename=''/>
+  <cpu type='kvm' name='e500v2_v10' typename=''/>
+  <cpu type='kvm' name='e500mc' typename=''/>
+  <cpu type='kvm' name='603e7v1' typename=''/>
+  <cpu type='kvm' name='970mp_v1.0' typename=''/>
+  <cpu type='kvm' name='740e' typename=''/>
+  <cpu type='kvm' name='405crc' typename=''/>
+  <cpu type='kvm' name='403ga' typename=''/>
+  <cpu type='kvm' name='7447a_v1.0' typename=''/>
+  <cpu type='kvm' name='e300c1' typename=''/>
+  <cpu type='kvm' name='mpc8572e' typename=''/>
+  <cpu type='kvm' name='e500v2_v21' typename=''/>
+  <cpu type='kvm' name='7400_v2.2' typename=''/>
+  <cpu type='kvm' name='970fx_v1.0' typename=''/>
+  <cpu type='kvm' name='750gx_v1.2' typename=''/>
+  <cpu type='kvm' name='750fx_v1.0' typename=''/>
+  <cpu type='kvm' name='7457_v1.1' typename=''/>
+  <cpu type='kvm' name='970fx_v3.0' typename=''/>
+  <cpu type='kvm' name='604e_v2.2' typename=''/>
+  <cpu type='kvm' name='745_v2.4' typename=''/>
+  <cpu type='kvm' name='401a1' typename=''/>
+  <cpu type='kvm' name='755_v2.6' typename=''/>
+  <cpu type='kvm' name='npe405h' typename=''/>
+  <cpu type='kvm' name='power9_v1.0' typename=''/>
+  <cpu type='kvm' name='g2ls' typename=''/>
+  <cpu type='kvm' name='7410_v1.4' typename=''/>
+  <cpu type='kvm' name='750_v2.0' typename=''/>
+  <cpu type='kvm' name='401b2' typename=''/>
+  <cpu type='kvm' name='mpc8349' typename=''/>
+  <cpu type='kvm' name='mpc8347ep' typename=''/>
+  <cpu type='kvm' name='7445_v3.2' typename=''/>
+  <cpu type='kvm' name='mpc8540_v21' typename=''/>
+  <cpu type='kvm' name='mpc8543_v11' typename=''/>
+  <cpu type='kvm' name='403gcx' typename=''/>
+  <cpu type='kvm' name='mpc8548_v21' typename=''/>
+  <cpu type='kvm' name='750l_v3.2' typename=''/>
+  <cpu type='kvm' name='750_v1.0' typename=''/>
+  <cpu type='kvm' name='755_v1.1' typename=''/>
+  <cpu type='kvm' name='750cxe_v3.0' typename=''/>
+  <cpu type='kvm' name='e500_v10' typename=''/>
+  <cpu type='kvm' name='mpc8541e_v10' typename=''/>
+  <cpu type='kvm' name='power9_v2.0' typename=''/>
+  <cpu type='kvm' name='mpc8347p' typename=''/>
+  <cpu type='kvm' name='mpc8555e_v10' typename=''/>
+  <cpu type='kvm' name='power7_v2.3' typename=''/>
+  <cpu type='kvm' name='603e7v' typename=''/>
+  <cpu type='kvm' name='mpc8543e_v11' typename=''/>
+  <cpu type='kvm' name='750_v3.0' typename=''/>
+  <cpu type='kvm' name='7400_v2.6' typename=''/>
+  <cpu type='kvm' name='405gpa' typename=''/>
+  <cpu type='kvm' name='440epx' typename=''/>
+  <cpu type='kvm' name='750l_v2.2' typename=''/>
+  <cpu type='kvm' name='e200z6' typename=''/>
+  <cpu type='kvm' name='mpc8547e_v20' typename=''/>
+  <cpu type='kvm' name='7457a_v1.0' typename=''/>
+  <cpu type='kvm' name='mpc8349ea' typename=''/>
+  <cpu type='kvm' name='e500v2_v20' typename=''/>
+  <cpu type='kvm' name='power8nvl_v1.0' typename=''/>
+  <cpu type='kvm' name='mpc8540_v10' typename=''/>
+  <cpu type='kvm' name='755_v2.1' typename=''/>
+  <cpu type='kvm' name='745_v2.8' typename=''/>
+  <cpu type='kvm' name='npe405l' typename=''/>
+  <cpu type='kvm' name='mpc8343ea' typename=''/>
+  <cpu type='kvm' name='mpc8545_v20' typename=''/>
+  <cpu type='kvm' name='mpc8548_v10' typename=''/>
+  <cpu type='kvm' name='7448_v1.1' typename=''/>
+  <cpu type='kvm' name='740_v2.2' typename=''/>
+  <cpu type='kvm' name='7455_v3.4' typename=''/>
+  <cpu type='kvm' name='7400_v1.1' typename=''/>
+  <cpu type='kvm' name='mpc8347et' typename=''/>
+  <cpu type='kvm' name='7441_v2.10' typename=''/>
+  <cpu type='kvm' name='603e_v1.4' typename=''/>
+  <cpu type='kvm' name='mpc8543_v10' typename=''/>
+  <cpu type='kvm' name='401c2' typename=''/>
+  <cpu type='kvm' name='7451_v2.10' typename=''/>
+  <cpu type='kvm' name='750cx_v2.2' typename=''/>
+  <cpu type='kvm' name='mpc8543_v21' typename=''/>
+  <cpu type='kvm' name='603e7' typename=''/>
+  <cpu type='kvm' name='7448_v2.1' typename=''/>
+  <cpu type='kvm' name='7441_v2.3' typename=''/>
+  <cpu type='kvm' name='405crb' typename=''/>
+  <cpu type='kvm' name='7445_v2.1' typename=''/>
+  <cpu type='kvm' name='7400_v2.1' typename=''/>
+  <cpu type='kvm' name='440-xilinx-w-dfpu' typename=''/>
+  <cpu type='kvm' name='604' typename=''/>
+  <cpu type='kvm' name='cobra' typename=''/>
+  <cpu type='kvm' name='e500_v20' typename=''/>
+  <cpu type='kvm' name='mpc8541_v11' typename=''/>
+  <cpu type='kvm' name='750gx_v1.1' typename=''/>
+  <cpu type='kvm' name='750cxe_v2.4' typename=''/>
+  <cpu type='kvm' name='mpc8641d' typename=''/>
+  <cpu type='kvm' name='mpc8543e_v21' typename=''/>
+  <cpu type='kvm' name='750l_v2.1' typename=''/>
+  <cpu type='kvm' name='7457_v1.0' typename=''/>
+  <cpu type='kvm' name='7450_v1.2' typename=''/>
+  <cpu type='kvm' name='755_v2.5' typename=''/>
+  <cpu type='kvm' name='7410_v1.3' typename=''/>
+  <cpu type='kvm' name='745_v2.3' typename=''/>
+  <cpu type='kvm' name='755_v2.0' typename=''/>
+  <cpu type='kvm' name='e500v2_v30' typename=''/>
+  <cpu type='kvm' name='7455_v3.3' typename=''/>
+  <cpu type='kvm' name='mpc8540_v20' typename=''/>
+  <cpu type='kvm' name='405d2' typename=''/>
+  <cpu type='kvm' name='mpc8560_v21' typename=''/>
+  <cpu type='kvm' name='mpc8343' typename=''/>
+  <cpu type='kvm' name='mpc8548_v20' typename=''/>
+  <cpu type='kvm' name='mpc8347t' typename=''/>
+  <cpu type='kvm' name='755_v1.0' typename=''/>
+  <cpu type='kvm' name='603e_v1.3' typename=''/>
+  <cpu type='kvm' name='host' typename=''/>
+  <cpu type='kvm' name='mpc8543e_v10' typename=''/>
+  <cpu type='kvm' name='mpc8347eap' typename=''/>
+  <cpu type='kvm' name='mpc8548e_v11' typename=''/>
+  <cpu type='kvm' name='mpc8543_v20' typename=''/>
+  <cpu type='kvm' name='401d2' typename=''/>
+  <cpu type='kvm' name='power8_v2.0' typename=''/>
+  <cpu type='kvm' name='740_v3.1' typename=''/>
+  <cpu type='kvm' name='e200z5' typename=''/>
+  <cpu type='kvm' name='405cra' typename=''/>
+  <cpu type='kvm' name='7400_v2.0' typename=''/>
+  <cpu type='kvm' name='750cxe_v2.3' typename=''/>
+  <cpu type='kvm' name='745_v2.7' typename=''/>
+  <cpu type='kvm' name='mpc8560_v10' typename=''/>
+  <cpu type='kvm' name='e5500' typename=''/>
+  <cpu type='kvm' name='mpc8544_v11' typename=''/>
+  <cpu type='kvm' name='7448_v1.0' typename=''/>
+  <cpu type='kvm' name='401e2' typename=''/>
+  <cpu type='kvm' name='740_v2.1' typename=''/>
+  <cpu type='kvm' name='7410_v1.2' typename=''/>
+  <cpu type='kvm' name='745_v2.2' typename=''/>
+  <cpu type='kvm' name='7400_v1.0' typename=''/>
+  <cpu type='kvm' name='x2vp4' typename=''/>
+  <cpu type='kvm' name='mpc8347ap' typename=''/>
+  <cpu type='kvm' name='mpc8533_v11' typename=''/>
+  <cpu type='kvm' name='mpc5200b_v21' typename=''/>
+  <cpu type='kvm' name='750fx_v2.3' typename=''/>
+  <cpu type='kvm' name='601_v2' typename=''/>
+  <cpu type='kvm' name='g2legp3' typename=''/>
+  <cpu type='kvm' name='604e_v1.0' typename=''/>
+  <cpu type='kvm' name='750cx_v2.1' typename=''/>
+  <cpu type='kvm' name='mpc8610' typename=''/>
+  <cpu type='kvm' name='g2h4' typename=''/>
+  <cpu type='kvm' name='750l_v3.0' typename=''/>
+  <cpu type='kvm' name='mpc8377e' typename=''/>
+  <cpu type='kvm' name='e300c4' typename=''/>
+  <cpu type='kvm' name='mpc5200_v12' typename=''/>
+  <cpu type='kvm' name='7448_v2.0' typename=''/>
+  <cpu type='kvm' name='7450_v2.1' typename=''/>
+  <cpu type='kvm' name='750cxe_v3.1b' typename=''/>
+  <cpu type='kvm' name='g2' typename=''/>
+  <cpu type='kvm' name='7400_v2.9' typename=''/>
+  <cpu type='kvm' name='405gpd' typename=''/>
+  <cpu type='kvm' name='603' typename=''/>
+  <cpu type='kvm' name='603e7t' typename=''/>
+  <cpu type='kvm' name='mpc8555_v11' typename=''/>
+  <cpu type='kvm' name='750gx_v1.0' typename=''/>
+  <cpu type='kvm' name='mpc8541_v10' typename=''/>
+  <cpu type='kvm' name='mpc8543e_v20' typename=''/>
+  <cpu type='kvm' name='750fl' typename=''/>
+  <cpu type='kvm' name='750l_v2.0' typename=''/>
+  <cpu type='kvm' name='stb04' typename=''/>
+  <cpu type='kvm' name='mpc8548e_v21' typename=''/>
+  <cpu type='kvm' name='x2vp20' typename=''/>
+  <cpu type='kvm' name='e600' typename=''/>
+  <cpu type='kvm' name='7450_v1.1' typename=''/>
+  <cpu type='kvm' name='755_v2.4' typename=''/>
+  <cpu type='kvm' name='mpc8379' typename=''/>
+  <cpu type='kvm' name='7445_v1.0' typename=''/>
+  <cpu type='kvm' name='405ez' typename=''/>
+  <cpu type='kvm' name='7447_v1.1' typename=''/>
+  <cpu type='kvm' name='603e_v2.2' typename=''/>
+  <cpu type='kvm' name='603e_v4' typename=''/>
+  <cpu type='kvm' name='g2legp' typename=''/>
+  <cpu type='kvm' name='7455_v3.2' typename=''/>
+  <cpu type='kvm' name='740_v2.0' typename=''/>
+  <cpu type='kvm' name='mpc8560_v20' typename=''/>
+  <cpu type='kvm' name='440-xilinx' typename=''/>
+  <cpu type='kvm' name='401f2' typename=''/>
+  <cpu type='kvm' name='mpc8533_v10' typename=''/>
+  <cpu type='kvm' name='mpc8349a' typename=''/>
+  <cpu type='kvm' name='405gpr' typename=''/>
+  <cpu type='kvm' name='stb25' typename=''/>
+  <cpu type='kvm' name='603e_v1.2' typename=''/>
+  <cpu type='kvm' name='mpc5200b_v20' typename=''/>
+  <cpu type='kvm' name='750fx_v2.2' typename=''/>
+  <cpu type='kvm' name='mpc8347eat' typename=''/>
+  <cpu type='kvm' name='740_v1.0' typename=''/>
+  <cpu type='kvm' name='601_v1' typename=''/>
+  <cpu type='kvm' name='745_v1.1' typename=''/>
+  <cpu type='kvm' name='750cx_v2.0' typename=''/>
+  <cpu type='kvm' name='mpc8548e_v10' typename=''/>
+  <cpu type='kvm' name='403gc' typename=''/>
+  <cpu type='kvm' name='7447a_v1.2' typename=''/>
+  <cpu type='kvm' name='e300c3' typename=''/>
+  <cpu type='kvm' name='mpc5200_v11' typename=''/>
+  <cpu type='kvm' name='7441_v2.1' typename=''/>
+  <cpu type='kvm' name='740_v3.0' typename=''/>
+  <cpu type='kvm' name='mpc8545e_v21' typename=''/>
+  <cpu type='kvm' name='602' typename=''/>
+  <cpu type='kvm' name='mpc8378e' typename=''/>
+  <cpu type='kvm' name='mpc8343a' typename=''/>
+  <cpu type='kvm' name='460exb' typename=''/>
+  <cpu type='kvm' name='mpc8555_v10' typename=''/>
+  <cpu type='kvm' name='mpc8568' typename=''/>
+  <cpu type='kvm' name='7457a_v1.2' typename=''/>
+  <cpu type='kvm' name='750cx_v1.0' typename=''/>
+  <cpu type='kvm' name='750cxe_v2.2' typename=''/>
+  <cpu type='kvm' name='604e_v2.4' typename=''/>
+  <cpu type='kvm' name='755_v2.8' typename=''/>
+  <cpu type='kvm' name='405lp' typename=''/>
+  <cpu type='kvm' name='745_v2.6' typename=''/>
+  <cpu type='kvm' name='stb03' typename=''/>
+  <cpu type='kvm' name='405ep' typename=''/>
+  <cpu type='kvm' name='mpc8544_v10' typename=''/>
+  <cpu type='kvm' name='mpc8347at' typename=''/>
+  <cpu type='kvm' name='750_v2.2' typename=''/>
+  <cpu type='kvm' name='7450_v1.0' typename=''/>
+  <cpu type='kvm' name='755_v2.3' typename=''/>
+  <cpu type='kvm' name='7410_v1.1' typename=''/>
+  <cpu type='kvm' name='745_v2.1' typename=''/>
+  <cpu type='kvm' name='750gl' typename=''/>
+  <cpu type='kvm' name='e6500' typename=''/>
+  <cpu type='kvm' name='750p' typename=''/>
+  <cpu type='kvm' name='7445_v3.4' typename=''/>
+  <cpu type='kvm' name='440epb' typename=''/>
+  <cpu type='kvm' name='npe4gs3' typename=''/>
+  <cpu type='kvm' name='603e_v3' typename=''/>
+  <cpu type='kvm' name='mpc8349e' typename=''/>
+  <cpu type='kvm' name='970_v2.2' typename=''/>
+  <cpu type='kvm' name='g2lels' typename=''/>
+  <cpu type='kvm' name='g2hip4' typename=''/>
+  <cpu type='kvm' name='740p' typename=''/>
+  <cpu type='kvm' name='mpc8567e' typename=''/>
+  <cpu type='kvm' name='mpc8533e_v11' typename=''/>
+  <cpu type='kvm' name='7451_v2.3' typename=''/>
+  <cpu type='kvm' name='7450_v2.0' typename=''/>
+  <cpu type='kvm' name='401g2' typename=''/>
+  <cpu type='kvm' name='7400_v2.8' typename=''/>
+  <cpu type='kvm' name='405gpc' typename=''/>
+  <cpu type='kvm' name='7455_v2.1' typename=''/>
+  <cpu type='kvm' name='power7+_v2.1' typename=''/>
+  <cpu type='kvm' name='mpc8544e_v11' typename=''/>
+  <cpu type='kvm' name='970mp_v1.1' typename=''/>
+  <cpu type='kvm' name='603e7v2' typename=''/>
+  <cpu type='kvm' name='603e_v1.1' typename=''/>
+  <cpu type='kvm' name='604r' typename=''/>
+  <cpu type='kvm' name='e500v2_v22' typename=''/>
+  <cpu type='kvm' name='mpc8548e_v20' typename=''/>
+  <cpu type='kvm' name='mpc8545e_v20' typename=''/>
+  <cpu type='kvm' name='mpc8378' typename=''/>
+  <cpu type='kvm' name='mpc8567' typename=''/>
+  <cpu type='kvm' name='7457_v1.2' typename=''/>
+  <cpu type='kvm' name='7447_v1.0' typename=''/>
+  <cpu type='kvm' name='970fx_v3.1' typename=''/>
+  <cpu type='kvm' name='745_v2.5' typename=''/>
+  <cpu type='kvm' name='mpc8379e' typename=''/>
+  <cpu type='kvm' name='mpc8641' typename=''/>
+  <cpu type='kvm' name='750cxe_v2.4b' typename=''/>
+  <cpu type='kvm' name='7410_v1.0' typename=''/>
+  <cpu type='kvm' name='mpc603' typename=''/>
+  <cpu type='kvm' name='603e_v4.1' typename=''/>
+  <cpu type='kvm' name='7445_v3.3' typename=''/>
+  <cpu type='kvm' name='440epa' typename=''/>
+  <cpu type='kvm' name='970fx_v2.1' typename=''/>
+  <cpu type='kvm' name='iop480' typename=''/>
+  <cpu type='kvm' name='750fx_v2.1' typename=''/>
+  <cpu type='kvm' name='601_v0' typename=''/>
+  <cpu type='kvm' name='g2legp1' typename=''/>
+  <cpu type='kvm' name='745_v1.0' typename=''/>
+  <cpu type='kvm' name='750cl_v2.0' typename=''/>
+  <cpu type='kvm' name='401' typename=''/>
+  <cpu type='kvm' name='mpc8541e_v11' typename=''/>
+  <cpu type='kvm' name='750cxe_v3.1' typename=''/>
+  <cpu type='kvm' name='750cxr' typename=''/>
+  <cpu type='kvm' name='mpc8555e_v11' typename=''/>
+  <cpu type='kvm' name='power5+_v2.1' typename=''/>
+  <cpu type='kvm' name='403gb' typename=''/>
+  <cpu type='kvm' name='7447a_v1.1' typename=''/>
+  <cpu type='kvm' name='e300c2' typename=''/>
+  <cpu type='kvm' name='npe405h2' typename=''/>
+  <cpu type='kvm' name='mpc8343e' typename=''/>
+  <cpu type='kvm' name='mpc8533e_v10' typename=''/>
+  <cpu type='kvm' name='mpc5200_v10' typename=''/>
+  <cpu type='kvm' name='750_v3.1' typename=''/>
+  <cpu type='kvm' name='power8e_v2.1' typename=''/>
+  <cpu type='kvm' name='mpc8568e' typename=''/>
+  <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' typename=''/>
+  <cpu type='tcg' name='g2gp' typename=''/>
+  <cpu type='tcg' name='7457a_v1.1' typename=''/>
+  <cpu type='tcg' name='750cl_v1.0' typename=''/>
+  <cpu type='tcg' name='750cxe_v2.1' typename=''/>
+  <cpu type='tcg' name='755_v2.7' typename=''/>
+  <cpu type='tcg' name='750_v2.1' typename=''/>
+  <cpu type='tcg' name='755_v2.2' typename=''/>
+  <cpu type='tcg' name='745_v2.0' typename=''/>
+  <cpu type='tcg' name='mpc8377' typename=''/>
+  <cpu type='tcg' name='7455_v1.0' typename=''/>
+  <cpu type='tcg' name='mpc8545_v21' typename=''/>
+  <cpu type='tcg' name='mpc8548_v11' typename=''/>
+  <cpu type='tcg' name='405d4' typename=''/>
+  <cpu type='tcg' name='g2le' typename=''/>
+  <cpu type='tcg' name='g2hip3' typename=''/>
+  <cpu type='tcg' name='750e' typename=''/>
+  <cpu type='tcg' name='mpc8572' typename=''/>
+  <cpu type='tcg' name='970fx_v2.0' typename=''/>
+  <cpu type='tcg' name='750fx_v2.0' typename=''/>
+  <cpu type='tcg' name='603p' typename=''/>
+  <cpu type='tcg' name='405gpb' typename=''/>
+  <cpu type='tcg' name='7400_v2.7' typename=''/>
+  <cpu type='tcg' name='mpc8544e_v10' typename=''/>
+  <cpu type='tcg' name='e500v2_v10' typename=''/>
+  <cpu type='tcg' name='e500mc' typename=''/>
+  <cpu type='tcg' name='603e7v1' typename=''/>
+  <cpu type='tcg' name='970mp_v1.0' typename=''/>
+  <cpu type='tcg' name='740e' typename=''/>
+  <cpu type='tcg' name='405crc' typename=''/>
+  <cpu type='tcg' name='403ga' typename=''/>
+  <cpu type='tcg' name='7447a_v1.0' typename=''/>
+  <cpu type='tcg' name='e300c1' typename=''/>
+  <cpu type='tcg' name='mpc8572e' typename=''/>
+  <cpu type='tcg' name='e500v2_v21' typename=''/>
+  <cpu type='tcg' name='7400_v2.2' typename=''/>
+  <cpu type='tcg' name='970fx_v1.0' typename=''/>
+  <cpu type='tcg' name='750gx_v1.2' typename=''/>
+  <cpu type='tcg' name='750fx_v1.0' typename=''/>
+  <cpu type='tcg' name='7457_v1.1' typename=''/>
+  <cpu type='tcg' name='970fx_v3.0' typename=''/>
+  <cpu type='tcg' name='604e_v2.2' typename=''/>
+  <cpu type='tcg' name='745_v2.4' typename=''/>
+  <cpu type='tcg' name='401a1' typename=''/>
+  <cpu type='tcg' name='755_v2.6' typename=''/>
+  <cpu type='tcg' name='npe405h' typename=''/>
+  <cpu type='tcg' name='power9_v1.0' typename=''/>
+  <cpu type='tcg' name='g2ls' typename=''/>
+  <cpu type='tcg' name='7410_v1.4' typename=''/>
+  <cpu type='tcg' name='750_v2.0' typename=''/>
+  <cpu type='tcg' name='401b2' typename=''/>
+  <cpu type='tcg' name='mpc8349' typename=''/>
+  <cpu type='tcg' name='mpc8347ep' typename=''/>
+  <cpu type='tcg' name='7445_v3.2' typename=''/>
+  <cpu type='tcg' name='mpc8540_v21' typename=''/>
+  <cpu type='tcg' name='mpc8543_v11' typename=''/>
+  <cpu type='tcg' name='403gcx' typename=''/>
+  <cpu type='tcg' name='mpc8548_v21' typename=''/>
+  <cpu type='tcg' name='750l_v3.2' typename=''/>
+  <cpu type='tcg' name='750_v1.0' typename=''/>
+  <cpu type='tcg' name='755_v1.1' typename=''/>
+  <cpu type='tcg' name='750cxe_v3.0' typename=''/>
+  <cpu type='tcg' name='e500_v10' typename=''/>
+  <cpu type='tcg' name='mpc8541e_v10' typename=''/>
+  <cpu type='tcg' name='power9_v2.0' typename=''/>
+  <cpu type='tcg' name='mpc8347p' typename=''/>
+  <cpu type='tcg' name='mpc8555e_v10' typename=''/>
+  <cpu type='tcg' name='power7_v2.3' typename=''/>
+  <cpu type='tcg' name='603e7v' typename=''/>
+  <cpu type='tcg' name='mpc8543e_v11' typename=''/>
+  <cpu type='tcg' name='750_v3.0' typename=''/>
+  <cpu type='tcg' name='7400_v2.6' typename=''/>
+  <cpu type='tcg' name='405gpa' typename=''/>
+  <cpu type='tcg' name='440epx' typename=''/>
+  <cpu type='tcg' name='750l_v2.2' typename=''/>
+  <cpu type='tcg' name='e200z6' typename=''/>
+  <cpu type='tcg' name='mpc8547e_v20' typename=''/>
+  <cpu type='tcg' name='7457a_v1.0' typename=''/>
+  <cpu type='tcg' name='mpc8349ea' typename=''/>
+  <cpu type='tcg' name='e500v2_v20' typename=''/>
+  <cpu type='tcg' name='power8nvl_v1.0' typename=''/>
+  <cpu type='tcg' name='mpc8540_v10' typename=''/>
+  <cpu type='tcg' name='755_v2.1' typename=''/>
+  <cpu type='tcg' name='745_v2.8' typename=''/>
+  <cpu type='tcg' name='npe405l' typename=''/>
+  <cpu type='tcg' name='mpc8343ea' typename=''/>
+  <cpu type='tcg' name='mpc8545_v20' typename=''/>
+  <cpu type='tcg' name='mpc8548_v10' typename=''/>
+  <cpu type='tcg' name='7448_v1.1' typename=''/>
+  <cpu type='tcg' name='740_v2.2' typename=''/>
+  <cpu type='tcg' name='7455_v3.4' typename=''/>
+  <cpu type='tcg' name='7400_v1.1' typename=''/>
+  <cpu type='tcg' name='mpc8347et' typename=''/>
+  <cpu type='tcg' name='7441_v2.10' typename=''/>
+  <cpu type='tcg' name='603e_v1.4' typename=''/>
+  <cpu type='tcg' name='mpc8543_v10' typename=''/>
+  <cpu type='tcg' name='401c2' typename=''/>
+  <cpu type='tcg' name='7451_v2.10' typename=''/>
+  <cpu type='tcg' name='750cx_v2.2' typename=''/>
+  <cpu type='tcg' name='mpc8543_v21' typename=''/>
+  <cpu type='tcg' name='603e7' typename=''/>
+  <cpu type='tcg' name='7448_v2.1' typename=''/>
+  <cpu type='tcg' name='7441_v2.3' typename=''/>
+  <cpu type='tcg' name='405crb' typename=''/>
+  <cpu type='tcg' name='7445_v2.1' typename=''/>
+  <cpu type='tcg' name='7400_v2.1' typename=''/>
+  <cpu type='tcg' name='440-xilinx-w-dfpu' typename=''/>
+  <cpu type='tcg' name='604' typename=''/>
+  <cpu type='tcg' name='cobra' typename=''/>
+  <cpu type='tcg' name='e500_v20' typename=''/>
+  <cpu type='tcg' name='mpc8541_v11' typename=''/>
+  <cpu type='tcg' name='750gx_v1.1' typename=''/>
+  <cpu type='tcg' name='750cxe_v2.4' typename=''/>
+  <cpu type='tcg' name='mpc8641d' typename=''/>
+  <cpu type='tcg' name='mpc8543e_v21' typename=''/>
+  <cpu type='tcg' name='750l_v2.1' typename=''/>
+  <cpu type='tcg' name='7457_v1.0' typename=''/>
+  <cpu type='tcg' name='7450_v1.2' typename=''/>
+  <cpu type='tcg' name='755_v2.5' typename=''/>
+  <cpu type='tcg' name='7410_v1.3' typename=''/>
+  <cpu type='tcg' name='745_v2.3' typename=''/>
+  <cpu type='tcg' name='755_v2.0' typename=''/>
+  <cpu type='tcg' name='e500v2_v30' typename=''/>
+  <cpu type='tcg' name='7455_v3.3' typename=''/>
+  <cpu type='tcg' name='mpc8540_v20' typename=''/>
+  <cpu type='tcg' name='405d2' typename=''/>
+  <cpu type='tcg' name='mpc8560_v21' typename=''/>
+  <cpu type='tcg' name='mpc8343' typename=''/>
+  <cpu type='tcg' name='mpc8548_v20' typename=''/>
+  <cpu type='tcg' name='mpc8347t' typename=''/>
+  <cpu type='tcg' name='755_v1.0' typename=''/>
+  <cpu type='tcg' name='603e_v1.3' typename=''/>
+  <cpu type='tcg' name='mpc8543e_v10' typename=''/>
+  <cpu type='tcg' name='mpc8347eap' typename=''/>
+  <cpu type='tcg' name='mpc8548e_v11' typename=''/>
+  <cpu type='tcg' name='mpc8543_v20' typename=''/>
+  <cpu type='tcg' name='401d2' typename=''/>
+  <cpu type='tcg' name='power8_v2.0' typename=''/>
+  <cpu type='tcg' name='740_v3.1' typename=''/>
+  <cpu type='tcg' name='e200z5' typename=''/>
+  <cpu type='tcg' name='405cra' typename=''/>
+  <cpu type='tcg' name='7400_v2.0' typename=''/>
+  <cpu type='tcg' name='750cxe_v2.3' typename=''/>
+  <cpu type='tcg' name='745_v2.7' typename=''/>
+  <cpu type='tcg' name='mpc8560_v10' typename=''/>
+  <cpu type='tcg' name='e5500' typename=''/>
+  <cpu type='tcg' name='mpc8544_v11' typename=''/>
+  <cpu type='tcg' name='7448_v1.0' typename=''/>
+  <cpu type='tcg' name='401e2' typename=''/>
+  <cpu type='tcg' name='740_v2.1' typename=''/>
+  <cpu type='tcg' name='7410_v1.2' typename=''/>
+  <cpu type='tcg' name='745_v2.2' typename=''/>
+  <cpu type='tcg' name='7400_v1.0' typename=''/>
+  <cpu type='tcg' name='x2vp4' typename=''/>
+  <cpu type='tcg' name='mpc8347ap' typename=''/>
+  <cpu type='tcg' name='mpc8533_v11' typename=''/>
+  <cpu type='tcg' name='mpc5200b_v21' typename=''/>
+  <cpu type='tcg' name='750fx_v2.3' typename=''/>
+  <cpu type='tcg' name='601_v2' typename=''/>
+  <cpu type='tcg' name='g2legp3' typename=''/>
+  <cpu type='tcg' name='604e_v1.0' typename=''/>
+  <cpu type='tcg' name='750cx_v2.1' typename=''/>
+  <cpu type='tcg' name='mpc8610' typename=''/>
+  <cpu type='tcg' name='g2h4' typename=''/>
+  <cpu type='tcg' name='750l_v3.0' typename=''/>
+  <cpu type='tcg' name='mpc8377e' typename=''/>
+  <cpu type='tcg' name='e300c4' typename=''/>
+  <cpu type='tcg' name='mpc5200_v12' typename=''/>
+  <cpu type='tcg' name='7448_v2.0' typename=''/>
+  <cpu type='tcg' name='7450_v2.1' typename=''/>
+  <cpu type='tcg' name='750cxe_v3.1b' typename=''/>
+  <cpu type='tcg' name='g2' typename=''/>
+  <cpu type='tcg' name='7400_v2.9' typename=''/>
+  <cpu type='tcg' name='405gpd' typename=''/>
+  <cpu type='tcg' name='603' typename=''/>
+  <cpu type='tcg' name='603e7t' typename=''/>
+  <cpu type='tcg' name='mpc8555_v11' typename=''/>
+  <cpu type='tcg' name='750gx_v1.0' typename=''/>
+  <cpu type='tcg' name='mpc8541_v10' typename=''/>
+  <cpu type='tcg' name='mpc8543e_v20' typename=''/>
+  <cpu type='tcg' name='750fl' typename=''/>
+  <cpu type='tcg' name='750l_v2.0' typename=''/>
+  <cpu type='tcg' name='stb04' typename=''/>
+  <cpu type='tcg' name='mpc8548e_v21' typename=''/>
+  <cpu type='tcg' name='x2vp20' typename=''/>
+  <cpu type='tcg' name='e600' typename=''/>
+  <cpu type='tcg' name='7450_v1.1' typename=''/>
+  <cpu type='tcg' name='755_v2.4' typename=''/>
+  <cpu type='tcg' name='mpc8379' typename=''/>
+  <cpu type='tcg' name='7445_v1.0' typename=''/>
+  <cpu type='tcg' name='405ez' typename=''/>
+  <cpu type='tcg' name='7447_v1.1' typename=''/>
+  <cpu type='tcg' name='603e_v2.2' typename=''/>
+  <cpu type='tcg' name='603e_v4' typename=''/>
+  <cpu type='tcg' name='g2legp' typename=''/>
+  <cpu type='tcg' name='7455_v3.2' typename=''/>
+  <cpu type='tcg' name='740_v2.0' typename=''/>
+  <cpu type='tcg' name='mpc8560_v20' typename=''/>
+  <cpu type='tcg' name='440-xilinx' typename=''/>
+  <cpu type='tcg' name='401f2' typename=''/>
+  <cpu type='tcg' name='mpc8533_v10' typename=''/>
+  <cpu type='tcg' name='mpc8349a' typename=''/>
+  <cpu type='tcg' name='405gpr' typename=''/>
+  <cpu type='tcg' name='stb25' typename=''/>
+  <cpu type='tcg' name='603e_v1.2' typename=''/>
+  <cpu type='tcg' name='mpc5200b_v20' typename=''/>
+  <cpu type='tcg' name='750fx_v2.2' typename=''/>
+  <cpu type='tcg' name='mpc8347eat' typename=''/>
+  <cpu type='tcg' name='740_v1.0' typename=''/>
+  <cpu type='tcg' name='601_v1' typename=''/>
+  <cpu type='tcg' name='745_v1.1' typename=''/>
+  <cpu type='tcg' name='750cx_v2.0' typename=''/>
+  <cpu type='tcg' name='mpc8548e_v10' typename=''/>
+  <cpu type='tcg' name='403gc' typename=''/>
+  <cpu type='tcg' name='7447a_v1.2' typename=''/>
+  <cpu type='tcg' name='e300c3' typename=''/>
+  <cpu type='tcg' name='mpc5200_v11' typename=''/>
+  <cpu type='tcg' name='7441_v2.1' typename=''/>
+  <cpu type='tcg' name='740_v3.0' typename=''/>
+  <cpu type='tcg' name='mpc8545e_v21' typename=''/>
+  <cpu type='tcg' name='602' typename=''/>
+  <cpu type='tcg' name='mpc8378e' typename=''/>
+  <cpu type='tcg' name='mpc8343a' typename=''/>
+  <cpu type='tcg' name='460exb' typename=''/>
+  <cpu type='tcg' name='mpc8555_v10' typename=''/>
+  <cpu type='tcg' name='mpc8568' typename=''/>
+  <cpu type='tcg' name='7457a_v1.2' typename=''/>
+  <cpu type='tcg' name='750cx_v1.0' typename=''/>
+  <cpu type='tcg' name='750cxe_v2.2' typename=''/>
+  <cpu type='tcg' name='604e_v2.4' typename=''/>
+  <cpu type='tcg' name='755_v2.8' typename=''/>
+  <cpu type='tcg' name='405lp' typename=''/>
+  <cpu type='tcg' name='745_v2.6' typename=''/>
+  <cpu type='tcg' name='stb03' typename=''/>
+  <cpu type='tcg' name='405ep' typename=''/>
+  <cpu type='tcg' name='mpc8544_v10' typename=''/>
+  <cpu type='tcg' name='mpc8347at' typename=''/>
+  <cpu type='tcg' name='750_v2.2' typename=''/>
+  <cpu type='tcg' name='7450_v1.0' typename=''/>
+  <cpu type='tcg' name='755_v2.3' typename=''/>
+  <cpu type='tcg' name='7410_v1.1' typename=''/>
+  <cpu type='tcg' name='745_v2.1' typename=''/>
+  <cpu type='tcg' name='750gl' typename=''/>
+  <cpu type='tcg' name='e6500' typename=''/>
+  <cpu type='tcg' name='750p' typename=''/>
+  <cpu type='tcg' name='7445_v3.4' typename=''/>
+  <cpu type='tcg' name='440epb' typename=''/>
+  <cpu type='tcg' name='npe4gs3' typename=''/>
+  <cpu type='tcg' name='603e_v3' typename=''/>
+  <cpu type='tcg' name='mpc8349e' typename=''/>
+  <cpu type='tcg' name='970_v2.2' typename=''/>
+  <cpu type='tcg' name='g2lels' typename=''/>
+  <cpu type='tcg' name='g2hip4' typename=''/>
+  <cpu type='tcg' name='740p' typename=''/>
+  <cpu type='tcg' name='mpc8567e' typename=''/>
+  <cpu type='tcg' name='mpc8533e_v11' typename=''/>
+  <cpu type='tcg' name='7451_v2.3' typename=''/>
+  <cpu type='tcg' name='7450_v2.0' typename=''/>
+  <cpu type='tcg' name='401g2' typename=''/>
+  <cpu type='tcg' name='7400_v2.8' typename=''/>
+  <cpu type='tcg' name='405gpc' typename=''/>
+  <cpu type='tcg' name='7455_v2.1' typename=''/>
+  <cpu type='tcg' name='power7+_v2.1' typename=''/>
+  <cpu type='tcg' name='mpc8544e_v11' typename=''/>
+  <cpu type='tcg' name='970mp_v1.1' typename=''/>
+  <cpu type='tcg' name='603e7v2' typename=''/>
+  <cpu type='tcg' name='603e_v1.1' typename=''/>
+  <cpu type='tcg' name='604r' typename=''/>
+  <cpu type='tcg' name='e500v2_v22' typename=''/>
+  <cpu type='tcg' name='mpc8548e_v20' typename=''/>
+  <cpu type='tcg' name='mpc8545e_v20' typename=''/>
+  <cpu type='tcg' name='mpc8378' typename=''/>
+  <cpu type='tcg' name='mpc8567' typename=''/>
+  <cpu type='tcg' name='7457_v1.2' typename=''/>
+  <cpu type='tcg' name='7447_v1.0' typename=''/>
+  <cpu type='tcg' name='970fx_v3.1' typename=''/>
+  <cpu type='tcg' name='745_v2.5' typename=''/>
+  <cpu type='tcg' name='mpc8379e' typename=''/>
+  <cpu type='tcg' name='mpc8641' typename=''/>
+  <cpu type='tcg' name='750cxe_v2.4b' typename=''/>
+  <cpu type='tcg' name='7410_v1.0' typename=''/>
+  <cpu type='tcg' name='mpc603' typename=''/>
+  <cpu type='tcg' name='603e_v4.1' typename=''/>
+  <cpu type='tcg' name='7445_v3.3' typename=''/>
+  <cpu type='tcg' name='440epa' typename=''/>
+  <cpu type='tcg' name='970fx_v2.1' typename=''/>
+  <cpu type='tcg' name='iop480' typename=''/>
+  <cpu type='tcg' name='750fx_v2.1' typename=''/>
+  <cpu type='tcg' name='601_v0' typename=''/>
+  <cpu type='tcg' name='g2legp1' typename=''/>
+  <cpu type='tcg' name='745_v1.0' typename=''/>
+  <cpu type='tcg' name='750cl_v2.0' typename=''/>
+  <cpu type='tcg' name='401' typename=''/>
+  <cpu type='tcg' name='mpc8541e_v11' typename=''/>
+  <cpu type='tcg' name='750cxe_v3.1' typename=''/>
+  <cpu type='tcg' name='750cxr' typename=''/>
+  <cpu type='tcg' name='mpc8555e_v11' typename=''/>
+  <cpu type='tcg' name='power5+_v2.1' typename=''/>
+  <cpu type='tcg' name='403gb' typename=''/>
+  <cpu type='tcg' name='7447a_v1.1' typename=''/>
+  <cpu type='tcg' name='e300c2' typename=''/>
+  <cpu type='tcg' name='npe405h2' typename=''/>
+  <cpu type='tcg' name='mpc8343e' typename=''/>
+  <cpu type='tcg' name='mpc8533e_v10' typename=''/>
+  <cpu type='tcg' name='mpc5200_v10' typename=''/>
+  <cpu type='tcg' name='750_v3.1' typename=''/>
+  <cpu type='tcg' name='power8e_v2.1' typename=''/>
+  <cpu type='tcg' name='mpc8568e' typename=''/>
   <machine name='pseries-4.0' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes'/>
   <machine name='ref405ep' maxCpus='1'/>
   <machine name='sam460ex' maxCpus='1'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
index ef802f3d1f..147b070b06 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
@@ -207,80 +207,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'/>
@@ -425,7 +425,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'/>
@@ -439,7 +439,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'/>
@@ -453,7 +453,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'/>
@@ -598,7 +598,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'/>
@@ -626,7 +626,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'/>
@@ -745,7 +745,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'/>
@@ -890,7 +890,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'/>
@@ -908,7 +908,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'/>
@@ -935,7 +935,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'/>
@@ -961,7 +961,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'/>
@@ -991,7 +991,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'/>
@@ -1005,8 +1005,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'/>
@@ -1027,7 +1027,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'/>
@@ -1153,7 +1153,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'/>
@@ -1174,7 +1174,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'/>
@@ -1200,8 +1200,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'/>
@@ -1228,8 +1228,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'/>
@@ -1250,8 +1250,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'/>
@@ -1286,8 +1286,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'/>
@@ -1301,7 +1301,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'/>
@@ -1315,7 +1315,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'/>
@@ -1329,7 +1329,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'/>
@@ -1352,8 +1352,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'/>
@@ -1371,8 +1371,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'/>
@@ -1491,7 +1491,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'/>
@@ -1622,7 +1622,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'/>
@@ -1636,7 +1636,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'/>
@@ -1666,7 +1666,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'/>
@@ -1680,7 +1680,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'/>
@@ -1715,7 +1715,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'/>
@@ -1750,7 +1750,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'/>
@@ -1764,7 +1764,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'/>
@@ -1883,7 +1883,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'/>
@@ -1911,7 +1911,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'/>
@@ -2042,8 +2042,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'/>
@@ -2071,7 +2071,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'/>
@@ -2094,7 +2094,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'/>
@@ -2120,7 +2120,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'/>
@@ -2134,7 +2134,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'/>
@@ -2152,7 +2152,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'/>
@@ -2166,8 +2166,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'/>
@@ -2188,7 +2188,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'/>
@@ -2216,7 +2216,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'/>
@@ -2230,7 +2230,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'/>
@@ -2356,7 +2356,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'/>
@@ -2379,7 +2379,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'/>
@@ -2397,7 +2397,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'/>
@@ -2415,7 +2415,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'/>
@@ -2541,7 +2541,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'/>
@@ -2555,7 +2555,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'/>
@@ -2578,9 +2578,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'/>
@@ -2711,7 +2711,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'/>
@@ -2738,7 +2738,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'/>
@@ -2768,7 +2768,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'/>
@@ -2782,7 +2782,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'/>
@@ -2796,7 +2796,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'/>
@@ -2824,7 +2824,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'/>
@@ -2845,7 +2845,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'/>
@@ -2868,7 +2868,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 87c95f4d18..b0e1855240 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
@@ -752,12 +752,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'/>
@@ -765,22 +765,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'/>
@@ -793,7 +793,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'/>
@@ -806,12 +806,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'/>
@@ -820,7 +820,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'/>
@@ -828,15 +828,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'/>
@@ -848,9 +848,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'/>
@@ -873,7 +873,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'/>
@@ -886,11 +886,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'/>
@@ -902,7 +902,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'/>
@@ -913,8 +913,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'/>
@@ -928,35 +928,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'/>
@@ -978,7 +978,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'/>
@@ -999,7 +999,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'/>
@@ -1016,7 +1016,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'/>
@@ -1032,19 +1032,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'/>
@@ -1055,7 +1055,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'/>
@@ -1063,16 +1063,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'/>
@@ -1090,7 +1090,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'/>
@@ -1098,14 +1098,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'/>
@@ -1138,7 +1138,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'/>
@@ -1166,7 +1166,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'/>
@@ -1178,7 +1178,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'/>
@@ -1189,7 +1189,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'/>
@@ -1203,7 +1203,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'/>
@@ -1216,7 +1216,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'/>
@@ -1233,7 +1233,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'/>
@@ -1249,8 +1249,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'/>
@@ -1274,7 +1274,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'/>
@@ -1288,7 +1288,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'/>
@@ -1301,7 +1301,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'/>
@@ -1317,7 +1317,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'/>
@@ -1332,7 +1332,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 660ead8555..39f6f51684 100644
--- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
@@ -614,14 +614,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'/>
@@ -629,7 +629,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'/>
@@ -637,37 +637,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'/>
@@ -677,7 +677,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'/>
@@ -687,7 +687,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'/>
@@ -700,7 +700,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'/>
@@ -713,7 +713,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'/>
@@ -726,7 +726,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'/>
@@ -739,17 +739,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'/>
@@ -758,7 +758,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'/>
@@ -767,7 +767,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'/>
@@ -775,7 +775,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'/>
@@ -783,23 +783,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'/>
@@ -811,7 +811,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'/>
@@ -823,11 +823,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'/>
@@ -850,7 +850,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'/>
@@ -873,7 +873,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'/>
@@ -886,7 +886,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'/>
@@ -899,15 +899,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'/>
@@ -919,7 +919,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'/>
@@ -930,7 +930,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'/>
@@ -942,7 +942,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'/>
@@ -954,7 +954,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'/>
@@ -965,7 +965,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'/>
@@ -976,9 +976,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'/>
@@ -995,7 +995,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'/>
@@ -1009,7 +1009,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'/>
@@ -1026,60 +1026,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'/>
@@ -1097,7 +1097,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'/>
@@ -1115,7 +1115,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'/>
@@ -1136,7 +1136,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'/>
@@ -1156,7 +1156,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'/>
@@ -1177,7 +1177,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'/>
@@ -1198,7 +1198,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'/>
@@ -1214,7 +1214,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'/>
@@ -1229,7 +1229,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'/>
@@ -1245,7 +1245,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'/>
@@ -1261,32 +1261,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'/>
@@ -1297,7 +1297,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'/>
@@ -1308,7 +1308,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'/>
@@ -1316,7 +1316,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'/>
@@ -1324,27 +1324,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'/>
@@ -1361,7 +1361,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'/>
@@ -1378,34 +1378,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'/>
@@ -1437,7 +1437,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'/>
@@ -1469,7 +1469,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'/>
@@ -1496,7 +1496,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'/>
@@ -1523,7 +1523,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'/>
@@ -1534,7 +1534,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'/>
@@ -1547,7 +1547,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'/>
@@ -1557,7 +1557,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'/>
@@ -1569,7 +1569,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'/>
@@ -1580,7 +1580,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'/>
@@ -1590,7 +1590,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'/>
@@ -1603,7 +1603,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'/>
@@ -1614,7 +1614,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'/>
@@ -1630,7 +1630,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'/>
@@ -1645,7 +1645,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'/>
@@ -1661,7 +1661,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'/>
@@ -1677,7 +1677,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'/>
@@ -1692,7 +1692,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'/>
@@ -1707,9 +1707,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'/>
@@ -1737,7 +1737,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'/>
@@ -1760,7 +1760,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'/>
@@ -1788,7 +1788,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'/>
@@ -1801,7 +1801,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'/>
@@ -1816,7 +1816,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'/>
@@ -1828,7 +1828,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'/>
@@ -1842,7 +1842,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'/>
@@ -1855,7 +1855,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'/>
@@ -1867,7 +1867,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'/>
@@ -1882,7 +1882,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'/>
@@ -1895,8 +1895,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.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
index 4d43632ced..d08e4bebde 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@@ -620,14 +620,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'/>
@@ -635,7 +635,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'/>
@@ -643,37 +643,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'/>
@@ -683,7 +683,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'/>
@@ -693,7 +693,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'/>
@@ -706,7 +706,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'/>
@@ -719,7 +719,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'/>
@@ -732,7 +732,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'/>
@@ -745,17 +745,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'/>
@@ -764,7 +764,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'/>
@@ -773,7 +773,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'/>
@@ -781,7 +781,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'/>
@@ -789,23 +789,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'/>
@@ -817,7 +817,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'/>
@@ -829,11 +829,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'/>
@@ -856,7 +856,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'/>
@@ -879,7 +879,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'/>
@@ -892,7 +892,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'/>
@@ -905,15 +905,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'/>
@@ -925,7 +925,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'/>
@@ -936,7 +936,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'/>
@@ -948,7 +948,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'/>
@@ -960,7 +960,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'/>
@@ -971,7 +971,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'/>
@@ -982,9 +982,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'/>
@@ -1001,7 +1001,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'/>
@@ -1015,7 +1015,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'/>
@@ -1032,60 +1032,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'/>
@@ -1103,7 +1103,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'/>
@@ -1121,7 +1121,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'/>
@@ -1142,7 +1142,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'/>
@@ -1162,7 +1162,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'/>
@@ -1183,7 +1183,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'/>
@@ -1204,7 +1204,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'/>
@@ -1220,7 +1220,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'/>
@@ -1235,7 +1235,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'/>
@@ -1251,7 +1251,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'/>
@@ -1267,32 +1267,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'/>
@@ -1303,7 +1303,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'/>
@@ -1314,7 +1314,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'/>
@@ -1322,7 +1322,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'/>
@@ -1330,27 +1330,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'/>
@@ -1367,7 +1367,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'/>
@@ -1384,34 +1384,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'/>
@@ -1443,7 +1443,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'/>
@@ -1475,7 +1475,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'/>
@@ -1502,7 +1502,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'/>
@@ -1529,7 +1529,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'/>
@@ -1540,7 +1540,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'/>
@@ -1553,7 +1553,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'/>
@@ -1563,7 +1563,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'/>
@@ -1575,7 +1575,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'/>
@@ -1586,7 +1586,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'/>
@@ -1596,7 +1596,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'/>
@@ -1609,7 +1609,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'/>
@@ -1620,7 +1620,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'/>
@@ -1636,7 +1636,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'/>
@@ -1651,7 +1651,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'/>
@@ -1667,7 +1667,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'/>
@@ -1683,7 +1683,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'/>
@@ -1698,7 +1698,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'/>
@@ -1713,9 +1713,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'/>
@@ -1743,7 +1743,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'/>
@@ -1766,7 +1766,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'/>
@@ -1794,7 +1794,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'/>
@@ -1807,7 +1807,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'/>
@@ -1822,7 +1822,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'/>
@@ -1834,7 +1834,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'/>
@@ -1848,7 +1848,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'/>
@@ -1861,7 +1861,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'/>
@@ -1873,7 +1873,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'/>
@@ -1888,7 +1888,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'/>
@@ -1901,8 +1901,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'/>
-- 
2.23.0

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list