From nobody Sun Feb  8 14:35:04 2026
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28
 as permitted sender) client-ip=209.132.183.28;
 envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com;
Authentication-Results: mx.zohomail.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass(p=none dis=none)  header.from=redhat.com
ARC-Seal: i=1; a=rsa-sha256; t=1570111961; cv=none;
	d=zoho.com; s=zohoarc;
	b=RMQy0ig/vyr7tR0DZFjpzSJlRzogPswWyf5BurEvGAGFXt9rtb3xBKkDsBBaz2yKre/aF1uZrg1Vs2RSjxLswcZAtdhkn4hRvCga0YyNtGI8uuuifOVEebW6hz4e8DB7svgxoGYPVnq/AhjmdbBS02Jr5QUQb7Uvf7n3A5wU5Is=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1570111961;
 h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=8qARbheMTkxaCXG2KEKpCUnR9xANXlMZvnTRd/StDts=;
	b=TKZGYK682YG3ypYeP2QtIWeBOvxckvTi6+IvVvPtPFvcVYq6fluD2SsRYeC2F+eZHGA2OBoSZc97EZamXIcsQhXFsaV3Sl9yfaM4tq2r3tN+PpUIZ6Jj+q6CI+gmU8C6nrvJjgQWGkw4Pb57idBOFtVrMe9KloVWGjE+CPG4zxo=
ARC-Authentication-Results: i=1; mx.zoho.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass header.from=<jdenemar@redhat.com> (p=none dis=none)
 header.from=<jdenemar@redhat.com>
Return-Path: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 1570111961208662.9527119594818;
 Thu, 3 Oct 2019 07:12:41 -0700 (PDT)
Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com
 [10.5.11.22])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id 29A0E10C094E;
	Thu,  3 Oct 2019 14:12:39 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
 (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id C56CF1001B13;
	Thu,  3 Oct 2019 14:12:38 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
 (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
	by colo-mx.corp.redhat.com (Postfix) with ESMTP id 039754E58A;
	Thu,  3 Oct 2019 14:12:38 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com
	[10.5.11.23])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x93E5qwE021140 for <libvir-list@listman.util.phx.redhat.com>;
	Thu, 3 Oct 2019 10:05:52 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 2D83B196B2; Thu,  3 Oct 2019 14:05:52 +0000 (UTC)
Received: from virval.usersys.redhat.com (unknown [10.43.2.188])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id 6131C19D70
	for <libvir-list@redhat.com>; Thu,  3 Oct 2019 14:05:50 +0000 (UTC)
Received: by virval.usersys.redhat.com (Postfix, from userid 500)
	id 8F72B10060D; Thu,  3 Oct 2019 16:05:43 +0200 (CEST)
From: Jiri Denemark <jdenemar@redhat.com>
To: libvir-list@redhat.com
Date: Thu,  3 Oct 2019 16:00:34 +0200
Message-Id: 
 <a355bcd9f68e86449fbf31700a7ba4c9f4ad00fc.1570111135.git.jdenemar@redhat.com>
In-Reply-To: <cover.1570111135.git.jdenemar@redhat.com>
References: <cover.1570111135.git.jdenemar@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23
X-loop: libvir-list@redhat.com
X-Mailman-Approved-At: Thu, 03 Oct 2019 10:12:36 -0400
Subject: [libvirt] [PATCH 16/22] qemu: Store typename from
	query-cpu-definitions in qemuCaps
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.66]);
 Thu, 03 Oct 2019 14:12:39 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"

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

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
---
 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;
         }
=20
+        cpu->type =3D virXMLPropString(nodes[i], "typename");
+
         node =3D ctxt->node;
         ctxt->node =3D nodes[i];
         nblockers =3D virXPathNodeSet("./blocker", ctxt, &blockerNodes);
@@ -3942,6 +3944,8 @@ virQEMUCapsFormatCPUModels(virQEMUCapsPtr qemuCaps,
=20
         virBufferAsprintf(buf, "<cpu type=3D'%s' ", typeStr);
         virBufferEscapeString(buf, "name=3D'%s'", cpu->name);
+        if (cpu->type)
+            virBufferEscapeString(buf, " typename=3D'%s'", cpu->type);
         if (cpu->usable) {
             virBufferAsprintf(buf, " usable=3D'%s'",
                               virDomainCapsCPUUsableTypeToString(cpu->usab=
le));
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 =3D 0; i < defs->ncpus; i++) {
         virStringListFree(defs->cpus[i].blockers);
         VIR_FREE(defs->cpus[i].name);
+        VIR_FREE(defs->cpus[i].type);
     }
=20
     VIR_FREE(defs->cpus);
@@ -3588,6 +3589,7 @@ qemuMonitorCPUDefsCopy(qemuMonitorCPUDefsPtr *dst,
         cpuDst->usable =3D cpuSrc->usable;
=20
         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 *qemuMonitorCPUDefInfoP=
tr;
 struct _qemuMonitorCPUDefInfo {
     virTristateBool usable;
     char *name;
+    char *type;
     char **blockers; /* NULL-terminated string list */
 };
=20
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;
=20
+        if ((tmp =3D 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/qem=
ucapabilitiesdata/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=3D'kvm' name=3D'pxa262'/>
-  <cpu type=3D'kvm' name=3D'pxa270-a0'/>
-  <cpu type=3D'kvm' name=3D'arm1136'/>
-  <cpu type=3D'kvm' name=3D'cortex-a15'/>
-  <cpu type=3D'kvm' name=3D'pxa260'/>
-  <cpu type=3D'kvm' name=3D'arm1136-r2'/>
-  <cpu type=3D'kvm' name=3D'pxa261'/>
-  <cpu type=3D'kvm' name=3D'pxa255'/>
-  <cpu type=3D'kvm' name=3D'arm926'/>
-  <cpu type=3D'kvm' name=3D'arm11mpcore'/>
-  <cpu type=3D'kvm' name=3D'pxa250'/>
-  <cpu type=3D'kvm' name=3D'ti925t'/>
-  <cpu type=3D'kvm' name=3D'cortex-a57'/>
-  <cpu type=3D'kvm' name=3D'sa1110'/>
-  <cpu type=3D'kvm' name=3D'arm1176'/>
-  <cpu type=3D'kvm' name=3D'cortex-a53'/>
-  <cpu type=3D'kvm' name=3D'host'/>
-  <cpu type=3D'kvm' name=3D'sa1100'/>
-  <cpu type=3D'kvm' name=3D'pxa270-c5'/>
-  <cpu type=3D'kvm' name=3D'cortex-a9'/>
-  <cpu type=3D'kvm' name=3D'cortex-a8'/>
-  <cpu type=3D'kvm' name=3D'pxa270-c0'/>
-  <cpu type=3D'kvm' name=3D'cortex-a7'/>
-  <cpu type=3D'kvm' name=3D'arm1026'/>
-  <cpu type=3D'kvm' name=3D'pxa270-b1'/>
-  <cpu type=3D'kvm' name=3D'cortex-m3'/>
-  <cpu type=3D'kvm' name=3D'cortex-m4'/>
-  <cpu type=3D'kvm' name=3D'pxa270-b0'/>
-  <cpu type=3D'kvm' name=3D'arm946'/>
-  <cpu type=3D'kvm' name=3D'cortex-r5'/>
-  <cpu type=3D'kvm' name=3D'pxa270-a1'/>
-  <cpu type=3D'kvm' name=3D'pxa270'/>
-  <cpu type=3D'tcg' name=3D'pxa262'/>
-  <cpu type=3D'tcg' name=3D'pxa270-a0'/>
-  <cpu type=3D'tcg' name=3D'arm1136'/>
-  <cpu type=3D'tcg' name=3D'cortex-a15'/>
-  <cpu type=3D'tcg' name=3D'pxa260'/>
-  <cpu type=3D'tcg' name=3D'arm1136-r2'/>
-  <cpu type=3D'tcg' name=3D'pxa261'/>
-  <cpu type=3D'tcg' name=3D'pxa255'/>
-  <cpu type=3D'tcg' name=3D'arm926'/>
-  <cpu type=3D'tcg' name=3D'arm11mpcore'/>
-  <cpu type=3D'tcg' name=3D'pxa250'/>
-  <cpu type=3D'tcg' name=3D'ti925t'/>
-  <cpu type=3D'tcg' name=3D'cortex-a57'/>
-  <cpu type=3D'tcg' name=3D'sa1110'/>
-  <cpu type=3D'tcg' name=3D'arm1176'/>
-  <cpu type=3D'tcg' name=3D'cortex-a53'/>
-  <cpu type=3D'tcg' name=3D'sa1100'/>
-  <cpu type=3D'tcg' name=3D'pxa270-c5'/>
-  <cpu type=3D'tcg' name=3D'cortex-a9'/>
-  <cpu type=3D'tcg' name=3D'cortex-a8'/>
-  <cpu type=3D'tcg' name=3D'pxa270-c0'/>
-  <cpu type=3D'tcg' name=3D'cortex-a7'/>
-  <cpu type=3D'tcg' name=3D'arm1026'/>
-  <cpu type=3D'tcg' name=3D'pxa270-b1'/>
-  <cpu type=3D'tcg' name=3D'cortex-m3'/>
-  <cpu type=3D'tcg' name=3D'cortex-m4'/>
-  <cpu type=3D'tcg' name=3D'pxa270-b0'/>
-  <cpu type=3D'tcg' name=3D'arm946'/>
-  <cpu type=3D'tcg' name=3D'cortex-r5'/>
-  <cpu type=3D'tcg' name=3D'pxa270-a1'/>
-  <cpu type=3D'tcg' name=3D'pxa270'/>
+  <cpu type=3D'kvm' name=3D'pxa262' typename=3D'pxa262-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'pxa270-a0' typename=3D'pxa270-a0-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'arm1136' typename=3D'arm1136-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'cortex-a15' typename=3D'cortex-a15-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'pxa260' typename=3D'pxa260-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'arm1136-r2' typename=3D'arm1136-r2-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'pxa261' typename=3D'pxa261-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'pxa255' typename=3D'pxa255-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'arm926' typename=3D'arm926-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'arm11mpcore' typename=3D'arm11mpcore-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'pxa250' typename=3D'pxa250-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'ti925t' typename=3D'ti925t-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'cortex-a57' typename=3D'cortex-a57-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'sa1110' typename=3D'sa1110-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'arm1176' typename=3D'arm1176-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'cortex-a53' typename=3D'cortex-a53-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'host' typename=3D'host-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'sa1100' typename=3D'sa1100-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'pxa270-c5' typename=3D'pxa270-c5-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'cortex-a9' typename=3D'cortex-a9-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'cortex-a8' typename=3D'cortex-a8-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'pxa270-c0' typename=3D'pxa270-c0-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'cortex-a7' typename=3D'cortex-a7-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'arm1026' typename=3D'arm1026-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'pxa270-b1' typename=3D'pxa270-b1-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'cortex-m3' typename=3D'cortex-m3-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'cortex-m4' typename=3D'cortex-m4-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'pxa270-b0' typename=3D'pxa270-b0-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'arm946' typename=3D'arm946-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'cortex-r5' typename=3D'cortex-r5-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'pxa270-a1' typename=3D'pxa270-a1-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'pxa270' typename=3D'pxa270-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'pxa262' typename=3D'pxa262-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'pxa270-a0' typename=3D'pxa270-a0-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'arm1136' typename=3D'arm1136-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'cortex-a15' typename=3D'cortex-a15-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'pxa260' typename=3D'pxa260-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'arm1136-r2' typename=3D'arm1136-r2-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'pxa261' typename=3D'pxa261-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'pxa255' typename=3D'pxa255-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'arm926' typename=3D'arm926-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'arm11mpcore' typename=3D'arm11mpcore-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'pxa250' typename=3D'pxa250-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'ti925t' typename=3D'ti925t-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'cortex-a57' typename=3D'cortex-a57-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'sa1110' typename=3D'sa1110-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'arm1176' typename=3D'arm1176-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'cortex-a53' typename=3D'cortex-a53-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'sa1100' typename=3D'sa1100-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'pxa270-c5' typename=3D'pxa270-c5-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'cortex-a9' typename=3D'cortex-a9-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'cortex-a8' typename=3D'cortex-a8-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'pxa270-c0' typename=3D'pxa270-c0-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'cortex-a7' typename=3D'cortex-a7-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'arm1026' typename=3D'arm1026-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'pxa270-b1' typename=3D'pxa270-b1-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'cortex-m3' typename=3D'cortex-m3-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'cortex-m4' typename=3D'cortex-m4-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'pxa270-b0' typename=3D'pxa270-b0-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'arm946' typename=3D'arm946-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'cortex-r5' typename=3D'cortex-r5-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'pxa270-a1' typename=3D'pxa270-a1-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'pxa270' typename=3D'pxa270-arm-cpu'/>
   <machine name=3D'integratorcp' maxCpus=3D'1'/>
   <machine name=3D'nuri' maxCpus=3D'2'/>
   <machine name=3D'mps2-an511' maxCpus=3D'1'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemuc=
apabilitiesdata/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=3D'kvm' name=3D'default'/>
-  <cpu type=3D'kvm' name=3D'ppc'/>
-  <cpu type=3D'kvm' name=3D'ppc32'/>
-  <cpu type=3D'kvm' name=3D'ppc64'/>
-  <cpu type=3D'kvm' name=3D'970mp'/>
-  <cpu type=3D'kvm' name=3D'970fx'/>
-  <cpu type=3D'kvm' name=3D'970'/>
-  <cpu type=3D'kvm' name=3D'POWER9'/>
-  <cpu type=3D'kvm' name=3D'POWER8NVL'/>
-  <cpu type=3D'kvm' name=3D'POWER8'/>
-  <cpu type=3D'kvm' name=3D'POWER8E'/>
-  <cpu type=3D'kvm' name=3D'POWER7+'/>
-  <cpu type=3D'kvm' name=3D'POWER7'/>
-  <cpu type=3D'kvm' name=3D'POWER5gs'/>
-  <cpu type=3D'kvm' name=3D'POWER5+'/>
-  <cpu type=3D'kvm' name=3D'Apollo7PM'/>
-  <cpu type=3D'kvm' name=3D'7457A'/>
-  <cpu type=3D'kvm' name=3D'7447A'/>
-  <cpu type=3D'kvm' name=3D'Apollo7'/>
-  <cpu type=3D'kvm' name=3D'7457'/>
-  <cpu type=3D'kvm' name=3D'7447'/>
-  <cpu type=3D'kvm' name=3D'Apollo6'/>
-  <cpu type=3D'kvm' name=3D'7455'/>
-  <cpu type=3D'kvm' name=3D'7445'/>
-  <cpu type=3D'kvm' name=3D'7451'/>
-  <cpu type=3D'kvm' name=3D'7441'/>
-  <cpu type=3D'kvm' name=3D'Vger'/>
-  <cpu type=3D'kvm' name=3D'7450'/>
-  <cpu type=3D'kvm' name=3D'7448'/>
-  <cpu type=3D'kvm' name=3D'Nitro'/>
-  <cpu type=3D'kvm' name=3D'7410'/>
-  <cpu type=3D'kvm' name=3D'G4'/>
-  <cpu type=3D'kvm' name=3D'Max'/>
-  <cpu type=3D'kvm' name=3D'7400'/>
-  <cpu type=3D'kvm' name=3D'Goldfinger'/>
-  <cpu type=3D'kvm' name=3D'755'/>
-  <cpu type=3D'kvm' name=3D'745'/>
-  <cpu type=3D'kvm' name=3D'LoneStar'/>
-  <cpu type=3D'kvm' name=3D'750l'/>
-  <cpu type=3D'kvm' name=3D'750gx'/>
-  <cpu type=3D'kvm' name=3D'750fx'/>
-  <cpu type=3D'kvm' name=3D'750cxe'/>
-  <cpu type=3D'kvm' name=3D'750cx'/>
-  <cpu type=3D'kvm' name=3D'750cl'/>
-  <cpu type=3D'kvm' name=3D'Conan/Doyle'/>
-  <cpu type=3D'kvm' name=3D'G3'/>
-  <cpu type=3D'kvm' name=3D'Typhoon'/>
-  <cpu type=3D'kvm' name=3D'750'/>
-  <cpu type=3D'kvm' name=3D'Arthur'/>
-  <cpu type=3D'kvm' name=3D'740'/>
-  <cpu type=3D'kvm' name=3D'Mach5'/>
-  <cpu type=3D'kvm' name=3D'Sirocco'/>
-  <cpu type=3D'kvm' name=3D'604e'/>
-  <cpu type=3D'kvm' name=3D'Goldeneye'/>
-  <cpu type=3D'kvm' name=3D'603r'/>
-  <cpu type=3D'kvm' name=3D'Vaillant'/>
-  <cpu type=3D'kvm' name=3D'Stretch'/>
-  <cpu type=3D'kvm' name=3D'603e'/>
-  <cpu type=3D'kvm' name=3D'Vanilla'/>
-  <cpu type=3D'kvm' name=3D'601v'/>
-  <cpu type=3D'kvm' name=3D'601'/>
-  <cpu type=3D'kvm' name=3D'MPC8560'/>
-  <cpu type=3D'kvm' name=3D'MPC8555E'/>
-  <cpu type=3D'kvm' name=3D'MPC8555'/>
-  <cpu type=3D'kvm' name=3D'MPC8548E'/>
-  <cpu type=3D'kvm' name=3D'MPC8548'/>
-  <cpu type=3D'kvm' name=3D'MPC8547E'/>
-  <cpu type=3D'kvm' name=3D'MPC8545E'/>
-  <cpu type=3D'kvm' name=3D'MPC8545'/>
-  <cpu type=3D'kvm' name=3D'MPC8544E'/>
-  <cpu type=3D'kvm' name=3D'MPC8544'/>
-  <cpu type=3D'kvm' name=3D'MPC8543E'/>
-  <cpu type=3D'kvm' name=3D'MPC8543'/>
-  <cpu type=3D'kvm' name=3D'MPC8541E'/>
-  <cpu type=3D'kvm' name=3D'MPC8541'/>
-  <cpu type=3D'kvm' name=3D'MPC8540'/>
-  <cpu type=3D'kvm' name=3D'MPC8533E'/>
-  <cpu type=3D'kvm' name=3D'MPC8533'/>
-  <cpu type=3D'kvm' name=3D'e500v2'/>
-  <cpu type=3D'kvm' name=3D'e500v1'/>
-  <cpu type=3D'kvm' name=3D'e500'/>
-  <cpu type=3D'kvm' name=3D'MPC8347EA'/>
-  <cpu type=3D'kvm' name=3D'MPC8347E'/>
-  <cpu type=3D'kvm' name=3D'MPC8347A'/>
-  <cpu type=3D'kvm' name=3D'MPC8347'/>
-  <cpu type=3D'kvm' name=3D'e300'/>
-  <cpu type=3D'kvm' name=3D'e200'/>
-  <cpu type=3D'kvm' name=3D'MPC8280'/>
-  <cpu type=3D'kvm' name=3D'MPC8275'/>
-  <cpu type=3D'kvm' name=3D'MPC8272'/>
-  <cpu type=3D'kvm' name=3D'MPC8271'/>
-  <cpu type=3D'kvm' name=3D'MPC8270'/>
-  <cpu type=3D'kvm' name=3D'MPC8266_HiP4'/>
-  <cpu type=3D'kvm' name=3D'MPC8266_HiP3'/>
-  <cpu type=3D'kvm' name=3D'MPC8266'/>
-  <cpu type=3D'kvm' name=3D'MPC8265_HiP4'/>
-  <cpu type=3D'kvm' name=3D'MPC8265_HiP3'/>
-  <cpu type=3D'kvm' name=3D'MPC8265'/>
-  <cpu type=3D'kvm' name=3D'MPC8264_HiP4'/>
-  <cpu type=3D'kvm' name=3D'MPC8264_HiP3'/>
-  <cpu type=3D'kvm' name=3D'MPC8264'/>
-  <cpu type=3D'kvm' name=3D'MPC8260_HiP4'/>
-  <cpu type=3D'kvm' name=3D'MPC8260_HiP3'/>
-  <cpu type=3D'kvm' name=3D'MPC8260'/>
-  <cpu type=3D'kvm' name=3D'MPC8255_HiP4'/>
-  <cpu type=3D'kvm' name=3D'MPC8255_HiP3'/>
-  <cpu type=3D'kvm' name=3D'MPC8255'/>
-  <cpu type=3D'kvm' name=3D'MPC8250_HiP4'/>
-  <cpu type=3D'kvm' name=3D'MPC8250_HiP3'/>
-  <cpu type=3D'kvm' name=3D'MPC8250'/>
-  <cpu type=3D'kvm' name=3D'MPC8248'/>
-  <cpu type=3D'kvm' name=3D'MPC8247'/>
-  <cpu type=3D'kvm' name=3D'MPC8245'/>
-  <cpu type=3D'kvm' name=3D'MPC8241'/>
-  <cpu type=3D'kvm' name=3D'PowerQUICC-II'/>
-  <cpu type=3D'kvm' name=3D'MPC82xx'/>
-  <cpu type=3D'kvm' name=3D'MPC5200B'/>
-  <cpu type=3D'kvm' name=3D'MPC5200'/>
-  <cpu type=3D'kvm' name=3D'MPC52xx'/>
-  <cpu type=3D'kvm' name=3D'MPC8240'/>
-  <cpu type=3D'kvm' name=3D'440EP'/>
-  <cpu type=3D'kvm' name=3D'x2vp50'/>
-  <cpu type=3D'kvm' name=3D'x2vp7'/>
-  <cpu type=3D'kvm' name=3D'405GPe'/>
-  <cpu type=3D'kvm' name=3D'405GP'/>
-  <cpu type=3D'kvm' name=3D'405CR'/>
-  <cpu type=3D'kvm' name=3D'405'/>
-  <cpu type=3D'kvm' name=3D'403'/>
-  <cpu type=3D'kvm' name=3D'7457A_v1.2'/>
-  <cpu type=3D'kvm' name=3D'750cl_v1.0'/>
-  <cpu type=3D'kvm' name=3D'750cxe_v2.1'/>
-  <cpu type=3D'kvm' name=3D'755_v2.7'/>
-  <cpu type=3D'kvm' name=3D'MPC8347ET'/>
-  <cpu type=3D'kvm' name=3D'MPC8545E_v20'/>
-  <cpu type=3D'kvm' name=3D'750_v2.1'/>
-  <cpu type=3D'kvm' name=3D'755_v2.2'/>
-  <cpu type=3D'kvm' name=3D'745_v2.0'/>
-  <cpu type=3D'kvm' name=3D'7455_v1.0'/>
-  <cpu type=3D'kvm' name=3D'MPC8547E_v21'/>
-  <cpu type=3D'kvm' name=3D'STB25'/>
-  <cpu type=3D'kvm' name=3D'POWER8_v2.0'/>
-  <cpu type=3D'kvm' name=3D'401G2'/>
-  <cpu type=3D'kvm' name=3D'MPC8349A'/>
-  <cpu type=3D'kvm' name=3D'750e'/>
-  <cpu type=3D'kvm' name=3D'MPC8545_v21'/>
-  <cpu type=3D'kvm' name=3D'MPC8548_v11'/>
-  <cpu type=3D'kvm' name=3D'970fx_v2.0'/>
-  <cpu type=3D'kvm' name=3D'750fx_v2.0'/>
-  <cpu type=3D'kvm' name=3D'POWER8E_v2.1'/>
-  <cpu type=3D'kvm' name=3D'Cobra'/>
-  <cpu type=3D'kvm' name=3D'7400_v2.7'/>
-  <cpu type=3D'kvm' name=3D'603p'/>
-  <cpu type=3D'kvm' name=3D'MPC8378E'/>
-  <cpu type=3D'kvm' name=3D'e500v2_v10'/>
-  <cpu type=3D'kvm' name=3D'e500mc'/>
-  <cpu type=3D'kvm' name=3D'603e7v1'/>
-  <cpu type=3D'kvm' name=3D'970mp_v1.0'/>
-  <cpu type=3D'kvm' name=3D'MPC8555E_v11'/>
-  <cpu type=3D'kvm' name=3D'440-Xilinx-w-dfpu'/>
-  <cpu type=3D'kvm' name=3D'740e'/>
-  <cpu type=3D'kvm' name=3D'405CRc'/>
-  <cpu type=3D'kvm' name=3D'7447A_v1.1'/>
-  <cpu type=3D'kvm' name=3D'MPC8533E_v10'/>
-  <cpu type=3D'kvm' name=3D'MPC8543_v11'/>
-  <cpu type=3D'kvm' name=3D'7400_v2.2'/>
-  <cpu type=3D'kvm' name=3D'MPC8540_v21'/>
-  <cpu type=3D'kvm' name=3D'e500v2_v21'/>
-  <cpu type=3D'kvm' name=3D'e300c1'/>
-  <cpu type=3D'kvm' name=3D'970fx_v1.0'/>
-  <cpu type=3D'kvm' name=3D'750gx_v1.2'/>
-  <cpu type=3D'kvm' name=3D'750fx_v1.0'/>
-  <cpu type=3D'kvm' name=3D'MPC8641'/>
-  <cpu type=3D'kvm' name=3D'MPC8544E_v10'/>
-  <cpu type=3D'kvm' name=3D'405D4'/>
-  <cpu type=3D'kvm' name=3D'7457_v1.1'/>
-  <cpu type=3D'kvm' name=3D'970fx_v3.0'/>
-  <cpu type=3D'kvm' name=3D'604e_v2.2'/>
-  <cpu type=3D'kvm' name=3D'755_v2.6'/>
-  <cpu type=3D'kvm' name=3D'Npe4GS3'/>
-  <cpu type=3D'kvm' name=3D'7410_v1.4'/>
-  <cpu type=3D'kvm' name=3D'750_v2.0'/>
-  <cpu type=3D'kvm' name=3D'7445_v3.2'/>
-  <cpu type=3D'kvm' name=3D'745_v2.4'/>
-  <cpu type=3D'kvm' name=3D'750l_v3.2'/>
-  <cpu type=3D'kvm' name=3D'MPC8540_v10'/>
-  <cpu type=3D'kvm' name=3D'750_v1.0'/>
-  <cpu type=3D'kvm' name=3D'STB03'/>
-  <cpu type=3D'kvm' name=3D'MPC8343A'/>
-  <cpu type=3D'kvm' name=3D'MPC8378'/>
-  <cpu type=3D'kvm' name=3D'G2HiP3'/>
-  <cpu type=3D'kvm' name=3D'750cxe_v3.0'/>
-  <cpu type=3D'kvm' name=3D'e500_v10'/>
-  <cpu type=3D'kvm' name=3D'755_v1.1'/>
-  <cpu type=3D'kvm' name=3D'MPC8567'/>
-  <cpu type=3D'kvm' name=3D'MPC8545_v20'/>
-  <cpu type=3D'kvm' name=3D'MPC8548_v10'/>
-  <cpu type=3D'kvm' name=3D'Npe405H'/>
-  <cpu type=3D'kvm' name=3D'603e7v'/>
-  <cpu type=3D'kvm' name=3D'750_v3.0'/>
-  <cpu type=3D'kvm' name=3D'Npe405H2'/>
-  <cpu type=3D'kvm' name=3D'7400_v2.6'/>
-  <cpu type=3D'kvm' name=3D'405GPa'/>
-  <cpu type=3D'kvm' name=3D'MPC8548_v21'/>
-  <cpu type=3D'kvm' name=3D'MPC8541E_v10'/>
-  <cpu type=3D'kvm' name=3D'750l_v2.2'/>
-  <cpu type=3D'kvm' name=3D'MPC8555E_v10'/>
-  <cpu type=3D'kvm' name=3D'7457A_v1.1'/>
-  <cpu type=3D'kvm' name=3D'e200z6'/>
-  <cpu type=3D'kvm' name=3D'MPC8379E'/>
-  <cpu type=3D'kvm' name=3D'e500v2_v20'/>
-  <cpu type=3D'kvm' name=3D'MPC8347AP'/>
-  <cpu type=3D'kvm' name=3D'401B2'/>
-  <cpu type=3D'kvm' name=3D'MPC8349E'/>
-  <cpu type=3D'kvm' name=3D'755_v2.1'/>
-  <cpu type=3D'kvm' name=3D'MPC8543_v21'/>
-  <cpu type=3D'kvm' name=3D'745_v2.8'/>
-  <cpu type=3D'kvm' name=3D'MPC8547E_v20'/>
-  <cpu type=3D'kvm' name=3D'7455_v3.4'/>
-  <cpu type=3D'kvm' name=3D'7448_v1.1'/>
-  <cpu type=3D'kvm' name=3D'740_v2.2'/>
-  <cpu type=3D'kvm' name=3D'7400_v1.1'/>
-  <cpu type=3D'kvm' name=3D'MPC8567E'/>
-  <cpu type=3D'kvm' name=3D'7441_v2.10'/>
-  <cpu type=3D'kvm' name=3D'603e_v1.4'/>
-  <cpu type=3D'kvm' name=3D'G2leGP1'/>
-  <cpu type=3D'kvm' name=3D'7451_v2.10'/>
-  <cpu type=3D'kvm' name=3D'MPC8343E'/>
-  <cpu type=3D'kvm' name=3D'750cx_v2.2'/>
-  <cpu type=3D'kvm' name=3D'Npe405L'/>
-  <cpu type=3D'kvm' name=3D'603e7'/>
-  <cpu type=3D'kvm' name=3D'401A1'/>
-  <cpu type=3D'kvm' name=3D'MPC8377'/>
-  <cpu type=3D'kvm' name=3D'7448_v2.1'/>
-  <cpu type=3D'kvm' name=3D'7441_v2.3'/>
-  <cpu type=3D'kvm' name=3D'7400_v2.1'/>
-  <cpu type=3D'kvm' name=3D'405CRb'/>
-  <cpu type=3D'kvm' name=3D'7447A_v1.0'/>
-  <cpu type=3D'kvm' name=3D'MPC8540_v20'/>
-  <cpu type=3D'kvm' name=3D'MPC8543_v10'/>
-  <cpu type=3D'kvm' name=3D'7445_v2.1'/>
-  <cpu type=3D'kvm' name=3D'e500_v20'/>
-  <cpu type=3D'kvm' name=3D'750gx_v1.1'/>
-  <cpu type=3D'kvm' name=3D'604'/>
-  <cpu type=3D'kvm' name=3D'750cxe_v2.4'/>
-  <cpu type=3D'kvm' name=3D'MPC8548_v20'/>
-  <cpu type=3D'kvm' name=3D'MPC8543E_v11'/>
-  <cpu type=3D'kvm' name=3D'MPC8347AT'/>
-  <cpu type=3D'kvm' name=3D'750l_v2.1'/>
-  <cpu type=3D'kvm' name=3D'POWER8NVL_v1.0'/>
-  <cpu type=3D'kvm' name=3D'7457A_v1.0'/>
-  <cpu type=3D'kvm' name=3D'7457_v1.0'/>
-  <cpu type=3D'kvm' name=3D'7450_v1.2'/>
-  <cpu type=3D'kvm' name=3D'MPC8572'/>
-  <cpu type=3D'kvm' name=3D'755_v2.5'/>
-  <cpu type=3D'kvm' name=3D'7410_v1.3'/>
-  <cpu type=3D'kvm' name=3D'745_v2.3'/>
-  <cpu type=3D'kvm' name=3D'405GPR'/>
-  <cpu type=3D'kvm' name=3D'755_v2.0'/>
-  <cpu type=3D'kvm' name=3D'MPC8541_v11'/>
-  <cpu type=3D'kvm' name=3D'401C2'/>
-  <cpu type=3D'kvm' name=3D'e500v2_v30'/>
-  <cpu type=3D'kvm' name=3D'7455_v3.3'/>
-  <cpu type=3D'kvm' name=3D'405EZ'/>
-  <cpu type=3D'kvm' name=3D'MPC8568E'/>
-  <cpu type=3D'kvm' name=3D'755_v1.0'/>
-  <cpu type=3D'kvm' name=3D'603e_v1.3'/>
-  <cpu type=3D'kvm' name=3D'MPC8560_v10'/>
-  <cpu type=3D'kvm' name=3D'host'/>
-  <cpu type=3D'kvm' name=3D'MPC8560_v21'/>
-  <cpu type=3D'kvm' name=3D'G2H4'/>
-  <cpu type=3D'kvm' name=3D'MPC8533_v11'/>
-  <cpu type=3D'kvm' name=3D'740_v3.1'/>
-  <cpu type=3D'kvm' name=3D'e200z5'/>
-  <cpu type=3D'kvm' name=3D'MPC8349'/>
-  <cpu type=3D'kvm' name=3D'7400_v2.0'/>
-  <cpu type=3D'kvm' name=3D'405CRa'/>
-  <cpu type=3D'kvm' name=3D'MPC8543E_v10'/>
-  <cpu type=3D'kvm' name=3D'MPC8543E_v21'/>
-  <cpu type=3D'kvm' name=3D'750cxe_v2.3'/>
-  <cpu type=3D'kvm' name=3D'MPC8543_v20'/>
-  <cpu type=3D'kvm' name=3D'745_v2.7'/>
-  <cpu type=3D'kvm' name=3D'403GC'/>
-  <cpu type=3D'kvm' name=3D'e5500'/>
-  <cpu type=3D'kvm' name=3D'7448_v1.0'/>
-  <cpu type=3D'kvm' name=3D'MPC5200_v12'/>
-  <cpu type=3D'kvm' name=3D'740_v2.1'/>
-  <cpu type=3D'kvm' name=3D'745_v2.2'/>
-  <cpu type=3D'kvm' name=3D'7400_v1.0'/>
-  <cpu type=3D'kvm' name=3D'7410_v1.2'/>
-  <cpu type=3D'kvm' name=3D'x2vp4'/>
-  <cpu type=3D'kvm' name=3D'MPC8555_v11'/>
-  <cpu type=3D'kvm' name=3D'MPC8541_v10'/>
-  <cpu type=3D'kvm' name=3D'405LP'/>
-  <cpu type=3D'kvm' name=3D'750fx_v2.3'/>
-  <cpu type=3D'kvm' name=3D'405EP'/>
-  <cpu type=3D'kvm' name=3D'601_v2'/>
-  <cpu type=3D'kvm' name=3D'MPC8544_v11'/>
-  <cpu type=3D'kvm' name=3D'401D2'/>
-  <cpu type=3D'kvm' name=3D'MPC8572E'/>
-  <cpu type=3D'kvm' name=3D'604e_v1.0'/>
-  <cpu type=3D'kvm' name=3D'750cx_v2.1'/>
-  <cpu type=3D'kvm' name=3D'MPC5200B_v21'/>
-  <cpu type=3D'kvm' name=3D'750l_v3.0'/>
-  <cpu type=3D'kvm' name=3D'e300c4'/>
-  <cpu type=3D'kvm' name=3D'7448_v2.0'/>
-  <cpu type=3D'kvm' name=3D'7450_v2.1'/>
-  <cpu type=3D'kvm' name=3D'G2leGP'/>
-  <cpu type=3D'kvm' name=3D'750cxe_v3.1b'/>
-  <cpu type=3D'kvm' name=3D'7400_v2.9'/>
-  <cpu type=3D'kvm' name=3D'G2GP'/>
-  <cpu type=3D'kvm' name=3D'603'/>
-  <cpu type=3D'kvm' name=3D'405GPd'/>
-  <cpu type=3D'kvm' name=3D'MPC8548E_v11'/>
-  <cpu type=3D'kvm' name=3D'603e7t'/>
-  <cpu type=3D'kvm' name=3D'IOP480'/>
-  <cpu type=3D'kvm' name=3D'750gx_v1.0'/>
-  <cpu type=3D'kvm' name=3D'MPC8560_v20'/>
-  <cpu type=3D'kvm' name=3D'405D2'/>
-  <cpu type=3D'kvm' name=3D'750fl'/>
-  <cpu type=3D'kvm' name=3D'750l_v2.0'/>
-  <cpu type=3D'kvm' name=3D'x2vp20'/>
-  <cpu type=3D'kvm' name=3D'e600'/>
-  <cpu type=3D'kvm' name=3D'7450_v1.1'/>
-  <cpu type=3D'kvm' name=3D'755_v2.4'/>
-  <cpu type=3D'kvm' name=3D'7445_v1.0'/>
-  <cpu type=3D'kvm' name=3D'G2LS'/>
-  <cpu type=3D'kvm' name=3D'MPC8543E_v20'/>
-  <cpu type=3D'kvm' name=3D'603e_v2.2'/>
-  <cpu type=3D'kvm' name=3D'7447_v1.1'/>
-  <cpu type=3D'kvm' name=3D'603e_v4'/>
-  <cpu type=3D'kvm' name=3D'7455_v3.2'/>
-  <cpu type=3D'kvm' name=3D'740_v2.0'/>
-  <cpu type=3D'kvm' name=3D'MPC8347P'/>
-  <cpu type=3D'kvm' name=3D'440EPb'/>
-  <cpu type=3D'kvm' name=3D'MPC603'/>
-  <cpu type=3D'kvm' name=3D'603e_v1.2'/>
-  <cpu type=3D'kvm' name=3D'750fx_v2.2'/>
-  <cpu type=3D'kvm' name=3D'POWER9_v1.0'/>
-  <cpu type=3D'kvm' name=3D'740_v1.0'/>
-  <cpu type=3D'kvm' name=3D'MPC8544_v10'/>
-  <cpu type=3D'kvm' name=3D'601_v1'/>
-  <cpu type=3D'kvm' name=3D'745_v1.1'/>
-  <cpu type=3D'kvm' name=3D'POWER7+_v2.1'/>
-  <cpu type=3D'kvm' name=3D'750cx_v2.0'/>
-  <cpu type=3D'kvm' name=3D'MPC8347EAP'/>
-  <cpu type=3D'kvm' name=3D'401E2'/>
-  <cpu type=3D'kvm' name=3D'MPC8641D'/>
-  <cpu type=3D'kvm' name=3D'e300c3'/>
-  <cpu type=3D'kvm' name=3D'MPC8533_v10'/>
-  <cpu type=3D'kvm' name=3D'7441_v2.1'/>
-  <cpu type=3D'kvm' name=3D'740_v3.0'/>
-  <cpu type=3D'kvm' name=3D'POWER5+_v2.1'/>
-  <cpu type=3D'kvm' name=3D'602'/>
-  <cpu type=3D'kvm' name=3D'MPC8548E_v10'/>
-  <cpu type=3D'kvm' name=3D'G2leLS'/>
-  <cpu type=3D'kvm' name=3D'MPC8343'/>
-  <cpu type=3D'kvm' name=3D'750cx_v1.0'/>
-  <cpu type=3D'kvm' name=3D'750cxe_v2.2'/>
-  <cpu type=3D'kvm' name=3D'604e_v2.4'/>
-  <cpu type=3D'kvm' name=3D'755_v2.8'/>
-  <cpu type=3D'kvm' name=3D'745_v2.6'/>
-  <cpu type=3D'kvm' name=3D'MPC8548E_v21'/>
-  <cpu type=3D'kvm' name=3D'G2le'/>
-  <cpu type=3D'kvm' name=3D'403GB'/>
-  <cpu type=3D'kvm' name=3D'MPC8545E_v21'/>
-  <cpu type=3D'kvm' name=3D'POWER7_v2.3'/>
-  <cpu type=3D'kvm' name=3D'750_v2.2'/>
-  <cpu type=3D'kvm' name=3D'7450_v1.0'/>
-  <cpu type=3D'kvm' name=3D'MPC5200_v11'/>
-  <cpu type=3D'kvm' name=3D'755_v2.3'/>
-  <cpu type=3D'kvm' name=3D'MPC8347EP'/>
-  <cpu type=3D'kvm' name=3D'7410_v1.1'/>
-  <cpu type=3D'kvm' name=3D'750gl'/>
-  <cpu type=3D'kvm' name=3D'403GCX'/>
-  <cpu type=3D'kvm' name=3D'745_v2.1'/>
-  <cpu type=3D'kvm' name=3D'750p'/>
-  <cpu type=3D'kvm' name=3D'G2'/>
-  <cpu type=3D'kvm' name=3D'MPC8555_v10'/>
-  <cpu type=3D'kvm' name=3D'7445_v3.4'/>
-  <cpu type=3D'kvm' name=3D'MPC8347T'/>
-  <cpu type=3D'kvm' name=3D'603e_v3'/>
-  <cpu type=3D'kvm' name=3D'970_v2.2'/>
-  <cpu type=3D'kvm' name=3D'440-Xilinx'/>
-  <cpu type=3D'kvm' name=3D'740p'/>
-  <cpu type=3D'kvm' name=3D'MPC5200B_v20'/>
-  <cpu type=3D'kvm' name=3D'440EPX'/>
-  <cpu type=3D'kvm' name=3D'603e_v1.1'/>
-  <cpu type=3D'kvm' name=3D'7451_v2.3'/>
-  <cpu type=3D'kvm' name=3D'7450_v2.0'/>
-  <cpu type=3D'kvm' name=3D'7400_v2.8'/>
-  <cpu type=3D'kvm' name=3D'7455_v2.1'/>
-  <cpu type=3D'kvm' name=3D'405GPc'/>
-  <cpu type=3D'kvm' name=3D'MPC8347EAT'/>
-  <cpu type=3D'kvm' name=3D'970mp_v1.1'/>
-  <cpu type=3D'kvm' name=3D'603e7v2'/>
-  <cpu type=3D'kvm' name=3D'604r'/>
-  <cpu type=3D'kvm' name=3D'7447A_v1.2'/>
-  <cpu type=3D'kvm' name=3D'MPC8533E_v11'/>
-  <cpu type=3D'kvm' name=3D'e500v2_v22'/>
-  <cpu type=3D'kvm' name=3D'401F2'/>
-  <cpu type=3D'kvm' name=3D'MPC8343EA'/>
-  <cpu type=3D'kvm' name=3D'7457_v1.2'/>
-  <cpu type=3D'kvm' name=3D'7447_v1.0'/>
-  <cpu type=3D'kvm' name=3D'970fx_v3.1'/>
-  <cpu type=3D'kvm' name=3D'745_v2.5'/>
-  <cpu type=3D'kvm' name=3D'MPC8548E_v20'/>
-  <cpu type=3D'kvm' name=3D'MPC8610'/>
-  <cpu type=3D'kvm' name=3D'750cxe_v2.4b'/>
-  <cpu type=3D'kvm' name=3D'MPC5200_v10'/>
-  <cpu type=3D'kvm' name=3D'403GA'/>
-  <cpu type=3D'kvm' name=3D'7410_v1.0'/>
-  <cpu type=3D'kvm' name=3D'G2leGP3'/>
-  <cpu type=3D'kvm' name=3D'7445_v3.3'/>
-  <cpu type=3D'kvm' name=3D'603e_v4.1'/>
-  <cpu type=3D'kvm' name=3D'440EPa'/>
-  <cpu type=3D'kvm' name=3D'970fx_v2.1'/>
-  <cpu type=3D'kvm' name=3D'MPC8377E'/>
-  <cpu type=3D'kvm' name=3D'750fx_v2.1'/>
-  <cpu type=3D'kvm' name=3D'601_v0'/>
-  <cpu type=3D'kvm' name=3D'STB04'/>
-  <cpu type=3D'kvm' name=3D'745_v1.0'/>
-  <cpu type=3D'kvm' name=3D'G2HiP4'/>
-  <cpu type=3D'kvm' name=3D'750cl_v2.0'/>
-  <cpu type=3D'kvm' name=3D'750cxr'/>
-  <cpu type=3D'kvm' name=3D'MPC8349EA'/>
-  <cpu type=3D'kvm' name=3D'750cxe_v3.1'/>
-  <cpu type=3D'kvm' name=3D'MPC8379'/>
-  <cpu type=3D'kvm' name=3D'401'/>
-  <cpu type=3D'kvm' name=3D'MPC8568'/>
-  <cpu type=3D'kvm' name=3D'e300c2'/>
-  <cpu type=3D'kvm' name=3D'750_v3.1'/>
-  <cpu type=3D'kvm' name=3D'MPC8544E_v11'/>
-  <cpu type=3D'kvm' name=3D'405GPb'/>
-  <cpu type=3D'kvm' name=3D'MPC8541E_v11'/>
-  <cpu type=3D'tcg' name=3D'default'/>
-  <cpu type=3D'tcg' name=3D'ppc'/>
-  <cpu type=3D'tcg' name=3D'ppc32'/>
-  <cpu type=3D'tcg' name=3D'ppc64'/>
-  <cpu type=3D'tcg' name=3D'970mp'/>
-  <cpu type=3D'tcg' name=3D'970fx'/>
-  <cpu type=3D'tcg' name=3D'970'/>
-  <cpu type=3D'tcg' name=3D'POWER9'/>
-  <cpu type=3D'tcg' name=3D'POWER8NVL'/>
-  <cpu type=3D'tcg' name=3D'POWER8'/>
-  <cpu type=3D'tcg' name=3D'POWER8E'/>
-  <cpu type=3D'tcg' name=3D'POWER7+'/>
-  <cpu type=3D'tcg' name=3D'POWER7'/>
-  <cpu type=3D'tcg' name=3D'POWER5gs'/>
-  <cpu type=3D'tcg' name=3D'POWER5+'/>
-  <cpu type=3D'tcg' name=3D'Apollo7PM'/>
-  <cpu type=3D'tcg' name=3D'7457A'/>
-  <cpu type=3D'tcg' name=3D'7447A'/>
-  <cpu type=3D'tcg' name=3D'Apollo7'/>
-  <cpu type=3D'tcg' name=3D'7457'/>
-  <cpu type=3D'tcg' name=3D'7447'/>
-  <cpu type=3D'tcg' name=3D'Apollo6'/>
-  <cpu type=3D'tcg' name=3D'7455'/>
-  <cpu type=3D'tcg' name=3D'7445'/>
-  <cpu type=3D'tcg' name=3D'7451'/>
-  <cpu type=3D'tcg' name=3D'7441'/>
-  <cpu type=3D'tcg' name=3D'Vger'/>
-  <cpu type=3D'tcg' name=3D'7450'/>
-  <cpu type=3D'tcg' name=3D'7448'/>
-  <cpu type=3D'tcg' name=3D'Nitro'/>
-  <cpu type=3D'tcg' name=3D'7410'/>
-  <cpu type=3D'tcg' name=3D'G4'/>
-  <cpu type=3D'tcg' name=3D'Max'/>
-  <cpu type=3D'tcg' name=3D'7400'/>
-  <cpu type=3D'tcg' name=3D'Goldfinger'/>
-  <cpu type=3D'tcg' name=3D'755'/>
-  <cpu type=3D'tcg' name=3D'745'/>
-  <cpu type=3D'tcg' name=3D'LoneStar'/>
-  <cpu type=3D'tcg' name=3D'750l'/>
-  <cpu type=3D'tcg' name=3D'750gx'/>
-  <cpu type=3D'tcg' name=3D'750fx'/>
-  <cpu type=3D'tcg' name=3D'750cxe'/>
-  <cpu type=3D'tcg' name=3D'750cx'/>
-  <cpu type=3D'tcg' name=3D'750cl'/>
-  <cpu type=3D'tcg' name=3D'Conan/Doyle'/>
-  <cpu type=3D'tcg' name=3D'G3'/>
-  <cpu type=3D'tcg' name=3D'Typhoon'/>
-  <cpu type=3D'tcg' name=3D'750'/>
-  <cpu type=3D'tcg' name=3D'Arthur'/>
-  <cpu type=3D'tcg' name=3D'740'/>
-  <cpu type=3D'tcg' name=3D'Mach5'/>
-  <cpu type=3D'tcg' name=3D'Sirocco'/>
-  <cpu type=3D'tcg' name=3D'604e'/>
-  <cpu type=3D'tcg' name=3D'Goldeneye'/>
-  <cpu type=3D'tcg' name=3D'603r'/>
-  <cpu type=3D'tcg' name=3D'Vaillant'/>
-  <cpu type=3D'tcg' name=3D'Stretch'/>
-  <cpu type=3D'tcg' name=3D'603e'/>
-  <cpu type=3D'tcg' name=3D'Vanilla'/>
-  <cpu type=3D'tcg' name=3D'601v'/>
-  <cpu type=3D'tcg' name=3D'601'/>
-  <cpu type=3D'tcg' name=3D'MPC8560'/>
-  <cpu type=3D'tcg' name=3D'MPC8555E'/>
-  <cpu type=3D'tcg' name=3D'MPC8555'/>
-  <cpu type=3D'tcg' name=3D'MPC8548E'/>
-  <cpu type=3D'tcg' name=3D'MPC8548'/>
-  <cpu type=3D'tcg' name=3D'MPC8547E'/>
-  <cpu type=3D'tcg' name=3D'MPC8545E'/>
-  <cpu type=3D'tcg' name=3D'MPC8545'/>
-  <cpu type=3D'tcg' name=3D'MPC8544E'/>
-  <cpu type=3D'tcg' name=3D'MPC8544'/>
-  <cpu type=3D'tcg' name=3D'MPC8543E'/>
-  <cpu type=3D'tcg' name=3D'MPC8543'/>
-  <cpu type=3D'tcg' name=3D'MPC8541E'/>
-  <cpu type=3D'tcg' name=3D'MPC8541'/>
-  <cpu type=3D'tcg' name=3D'MPC8540'/>
-  <cpu type=3D'tcg' name=3D'MPC8533E'/>
-  <cpu type=3D'tcg' name=3D'MPC8533'/>
-  <cpu type=3D'tcg' name=3D'e500v2'/>
-  <cpu type=3D'tcg' name=3D'e500v1'/>
-  <cpu type=3D'tcg' name=3D'e500'/>
-  <cpu type=3D'tcg' name=3D'MPC8347EA'/>
-  <cpu type=3D'tcg' name=3D'MPC8347E'/>
-  <cpu type=3D'tcg' name=3D'MPC8347A'/>
-  <cpu type=3D'tcg' name=3D'MPC8347'/>
-  <cpu type=3D'tcg' name=3D'e300'/>
-  <cpu type=3D'tcg' name=3D'e200'/>
-  <cpu type=3D'tcg' name=3D'MPC8280'/>
-  <cpu type=3D'tcg' name=3D'MPC8275'/>
-  <cpu type=3D'tcg' name=3D'MPC8272'/>
-  <cpu type=3D'tcg' name=3D'MPC8271'/>
-  <cpu type=3D'tcg' name=3D'MPC8270'/>
-  <cpu type=3D'tcg' name=3D'MPC8266_HiP4'/>
-  <cpu type=3D'tcg' name=3D'MPC8266_HiP3'/>
-  <cpu type=3D'tcg' name=3D'MPC8266'/>
-  <cpu type=3D'tcg' name=3D'MPC8265_HiP4'/>
-  <cpu type=3D'tcg' name=3D'MPC8265_HiP3'/>
-  <cpu type=3D'tcg' name=3D'MPC8265'/>
-  <cpu type=3D'tcg' name=3D'MPC8264_HiP4'/>
-  <cpu type=3D'tcg' name=3D'MPC8264_HiP3'/>
-  <cpu type=3D'tcg' name=3D'MPC8264'/>
-  <cpu type=3D'tcg' name=3D'MPC8260_HiP4'/>
-  <cpu type=3D'tcg' name=3D'MPC8260_HiP3'/>
-  <cpu type=3D'tcg' name=3D'MPC8260'/>
-  <cpu type=3D'tcg' name=3D'MPC8255_HiP4'/>
-  <cpu type=3D'tcg' name=3D'MPC8255_HiP3'/>
-  <cpu type=3D'tcg' name=3D'MPC8255'/>
-  <cpu type=3D'tcg' name=3D'MPC8250_HiP4'/>
-  <cpu type=3D'tcg' name=3D'MPC8250_HiP3'/>
-  <cpu type=3D'tcg' name=3D'MPC8250'/>
-  <cpu type=3D'tcg' name=3D'MPC8248'/>
-  <cpu type=3D'tcg' name=3D'MPC8247'/>
-  <cpu type=3D'tcg' name=3D'MPC8245'/>
-  <cpu type=3D'tcg' name=3D'MPC8241'/>
-  <cpu type=3D'tcg' name=3D'PowerQUICC-II'/>
-  <cpu type=3D'tcg' name=3D'MPC82xx'/>
-  <cpu type=3D'tcg' name=3D'MPC5200B'/>
-  <cpu type=3D'tcg' name=3D'MPC5200'/>
-  <cpu type=3D'tcg' name=3D'MPC52xx'/>
-  <cpu type=3D'tcg' name=3D'MPC8240'/>
-  <cpu type=3D'tcg' name=3D'440EP'/>
-  <cpu type=3D'tcg' name=3D'x2vp50'/>
-  <cpu type=3D'tcg' name=3D'x2vp7'/>
-  <cpu type=3D'tcg' name=3D'405GPe'/>
-  <cpu type=3D'tcg' name=3D'405GP'/>
-  <cpu type=3D'tcg' name=3D'405CR'/>
-  <cpu type=3D'tcg' name=3D'405'/>
-  <cpu type=3D'tcg' name=3D'403'/>
-  <cpu type=3D'tcg' name=3D'7457A_v1.2'/>
-  <cpu type=3D'tcg' name=3D'750cl_v1.0'/>
-  <cpu type=3D'tcg' name=3D'750cxe_v2.1'/>
-  <cpu type=3D'tcg' name=3D'755_v2.7'/>
-  <cpu type=3D'tcg' name=3D'MPC8347ET'/>
-  <cpu type=3D'tcg' name=3D'MPC8545E_v20'/>
-  <cpu type=3D'tcg' name=3D'750_v2.1'/>
-  <cpu type=3D'tcg' name=3D'755_v2.2'/>
-  <cpu type=3D'tcg' name=3D'745_v2.0'/>
-  <cpu type=3D'tcg' name=3D'7455_v1.0'/>
-  <cpu type=3D'tcg' name=3D'MPC8547E_v21'/>
-  <cpu type=3D'tcg' name=3D'STB25'/>
-  <cpu type=3D'tcg' name=3D'POWER8_v2.0'/>
-  <cpu type=3D'tcg' name=3D'401G2'/>
-  <cpu type=3D'tcg' name=3D'MPC8349A'/>
-  <cpu type=3D'tcg' name=3D'750e'/>
-  <cpu type=3D'tcg' name=3D'MPC8545_v21'/>
-  <cpu type=3D'tcg' name=3D'MPC8548_v11'/>
-  <cpu type=3D'tcg' name=3D'970fx_v2.0'/>
-  <cpu type=3D'tcg' name=3D'750fx_v2.0'/>
-  <cpu type=3D'tcg' name=3D'POWER8E_v2.1'/>
-  <cpu type=3D'tcg' name=3D'Cobra'/>
-  <cpu type=3D'tcg' name=3D'7400_v2.7'/>
-  <cpu type=3D'tcg' name=3D'603p'/>
-  <cpu type=3D'tcg' name=3D'MPC8378E'/>
-  <cpu type=3D'tcg' name=3D'e500v2_v10'/>
-  <cpu type=3D'tcg' name=3D'e500mc'/>
-  <cpu type=3D'tcg' name=3D'603e7v1'/>
-  <cpu type=3D'tcg' name=3D'970mp_v1.0'/>
-  <cpu type=3D'tcg' name=3D'MPC8555E_v11'/>
-  <cpu type=3D'tcg' name=3D'440-Xilinx-w-dfpu'/>
-  <cpu type=3D'tcg' name=3D'740e'/>
-  <cpu type=3D'tcg' name=3D'405CRc'/>
-  <cpu type=3D'tcg' name=3D'7447A_v1.1'/>
-  <cpu type=3D'tcg' name=3D'MPC8533E_v10'/>
-  <cpu type=3D'tcg' name=3D'MPC8543_v11'/>
-  <cpu type=3D'tcg' name=3D'7400_v2.2'/>
-  <cpu type=3D'tcg' name=3D'MPC8540_v21'/>
-  <cpu type=3D'tcg' name=3D'e500v2_v21'/>
-  <cpu type=3D'tcg' name=3D'e300c1'/>
-  <cpu type=3D'tcg' name=3D'970fx_v1.0'/>
-  <cpu type=3D'tcg' name=3D'750gx_v1.2'/>
-  <cpu type=3D'tcg' name=3D'750fx_v1.0'/>
-  <cpu type=3D'tcg' name=3D'MPC8641'/>
-  <cpu type=3D'tcg' name=3D'MPC8544E_v10'/>
-  <cpu type=3D'tcg' name=3D'405D4'/>
-  <cpu type=3D'tcg' name=3D'7457_v1.1'/>
-  <cpu type=3D'tcg' name=3D'970fx_v3.0'/>
-  <cpu type=3D'tcg' name=3D'604e_v2.2'/>
-  <cpu type=3D'tcg' name=3D'755_v2.6'/>
-  <cpu type=3D'tcg' name=3D'Npe4GS3'/>
-  <cpu type=3D'tcg' name=3D'7410_v1.4'/>
-  <cpu type=3D'tcg' name=3D'750_v2.0'/>
-  <cpu type=3D'tcg' name=3D'7445_v3.2'/>
-  <cpu type=3D'tcg' name=3D'745_v2.4'/>
-  <cpu type=3D'tcg' name=3D'750l_v3.2'/>
-  <cpu type=3D'tcg' name=3D'MPC8540_v10'/>
-  <cpu type=3D'tcg' name=3D'750_v1.0'/>
-  <cpu type=3D'tcg' name=3D'STB03'/>
-  <cpu type=3D'tcg' name=3D'MPC8343A'/>
-  <cpu type=3D'tcg' name=3D'MPC8378'/>
-  <cpu type=3D'tcg' name=3D'G2HiP3'/>
-  <cpu type=3D'tcg' name=3D'750cxe_v3.0'/>
-  <cpu type=3D'tcg' name=3D'e500_v10'/>
-  <cpu type=3D'tcg' name=3D'755_v1.1'/>
-  <cpu type=3D'tcg' name=3D'MPC8567'/>
-  <cpu type=3D'tcg' name=3D'MPC8545_v20'/>
-  <cpu type=3D'tcg' name=3D'MPC8548_v10'/>
-  <cpu type=3D'tcg' name=3D'Npe405H'/>
-  <cpu type=3D'tcg' name=3D'603e7v'/>
-  <cpu type=3D'tcg' name=3D'750_v3.0'/>
-  <cpu type=3D'tcg' name=3D'Npe405H2'/>
-  <cpu type=3D'tcg' name=3D'7400_v2.6'/>
-  <cpu type=3D'tcg' name=3D'405GPa'/>
-  <cpu type=3D'tcg' name=3D'MPC8548_v21'/>
-  <cpu type=3D'tcg' name=3D'MPC8541E_v10'/>
-  <cpu type=3D'tcg' name=3D'750l_v2.2'/>
-  <cpu type=3D'tcg' name=3D'MPC8555E_v10'/>
-  <cpu type=3D'tcg' name=3D'7457A_v1.1'/>
-  <cpu type=3D'tcg' name=3D'e200z6'/>
-  <cpu type=3D'tcg' name=3D'MPC8379E'/>
-  <cpu type=3D'tcg' name=3D'e500v2_v20'/>
-  <cpu type=3D'tcg' name=3D'MPC8347AP'/>
-  <cpu type=3D'tcg' name=3D'401B2'/>
-  <cpu type=3D'tcg' name=3D'MPC8349E'/>
-  <cpu type=3D'tcg' name=3D'755_v2.1'/>
-  <cpu type=3D'tcg' name=3D'MPC8543_v21'/>
-  <cpu type=3D'tcg' name=3D'745_v2.8'/>
-  <cpu type=3D'tcg' name=3D'MPC8547E_v20'/>
-  <cpu type=3D'tcg' name=3D'7455_v3.4'/>
-  <cpu type=3D'tcg' name=3D'7448_v1.1'/>
-  <cpu type=3D'tcg' name=3D'740_v2.2'/>
-  <cpu type=3D'tcg' name=3D'7400_v1.1'/>
-  <cpu type=3D'tcg' name=3D'MPC8567E'/>
-  <cpu type=3D'tcg' name=3D'7441_v2.10'/>
-  <cpu type=3D'tcg' name=3D'603e_v1.4'/>
-  <cpu type=3D'tcg' name=3D'G2leGP1'/>
-  <cpu type=3D'tcg' name=3D'7451_v2.10'/>
-  <cpu type=3D'tcg' name=3D'MPC8343E'/>
-  <cpu type=3D'tcg' name=3D'750cx_v2.2'/>
-  <cpu type=3D'tcg' name=3D'Npe405L'/>
-  <cpu type=3D'tcg' name=3D'603e7'/>
-  <cpu type=3D'tcg' name=3D'401A1'/>
-  <cpu type=3D'tcg' name=3D'MPC8377'/>
-  <cpu type=3D'tcg' name=3D'7448_v2.1'/>
-  <cpu type=3D'tcg' name=3D'7441_v2.3'/>
-  <cpu type=3D'tcg' name=3D'7400_v2.1'/>
-  <cpu type=3D'tcg' name=3D'405CRb'/>
-  <cpu type=3D'tcg' name=3D'7447A_v1.0'/>
-  <cpu type=3D'tcg' name=3D'MPC8540_v20'/>
-  <cpu type=3D'tcg' name=3D'MPC8543_v10'/>
-  <cpu type=3D'tcg' name=3D'7445_v2.1'/>
-  <cpu type=3D'tcg' name=3D'e500_v20'/>
-  <cpu type=3D'tcg' name=3D'750gx_v1.1'/>
-  <cpu type=3D'tcg' name=3D'604'/>
-  <cpu type=3D'tcg' name=3D'750cxe_v2.4'/>
-  <cpu type=3D'tcg' name=3D'MPC8548_v20'/>
-  <cpu type=3D'tcg' name=3D'MPC8543E_v11'/>
-  <cpu type=3D'tcg' name=3D'MPC8347AT'/>
-  <cpu type=3D'tcg' name=3D'750l_v2.1'/>
-  <cpu type=3D'tcg' name=3D'POWER8NVL_v1.0'/>
-  <cpu type=3D'tcg' name=3D'7457A_v1.0'/>
-  <cpu type=3D'tcg' name=3D'7457_v1.0'/>
-  <cpu type=3D'tcg' name=3D'7450_v1.2'/>
-  <cpu type=3D'tcg' name=3D'MPC8572'/>
-  <cpu type=3D'tcg' name=3D'755_v2.5'/>
-  <cpu type=3D'tcg' name=3D'7410_v1.3'/>
-  <cpu type=3D'tcg' name=3D'745_v2.3'/>
-  <cpu type=3D'tcg' name=3D'405GPR'/>
-  <cpu type=3D'tcg' name=3D'755_v2.0'/>
-  <cpu type=3D'tcg' name=3D'MPC8541_v11'/>
-  <cpu type=3D'tcg' name=3D'401C2'/>
-  <cpu type=3D'tcg' name=3D'e500v2_v30'/>
-  <cpu type=3D'tcg' name=3D'7455_v3.3'/>
-  <cpu type=3D'tcg' name=3D'405EZ'/>
-  <cpu type=3D'tcg' name=3D'MPC8568E'/>
-  <cpu type=3D'tcg' name=3D'755_v1.0'/>
-  <cpu type=3D'tcg' name=3D'603e_v1.3'/>
-  <cpu type=3D'tcg' name=3D'MPC8560_v10'/>
-  <cpu type=3D'tcg' name=3D'MPC8560_v21'/>
-  <cpu type=3D'tcg' name=3D'G2H4'/>
-  <cpu type=3D'tcg' name=3D'MPC8533_v11'/>
-  <cpu type=3D'tcg' name=3D'740_v3.1'/>
-  <cpu type=3D'tcg' name=3D'e200z5'/>
-  <cpu type=3D'tcg' name=3D'MPC8349'/>
-  <cpu type=3D'tcg' name=3D'7400_v2.0'/>
-  <cpu type=3D'tcg' name=3D'405CRa'/>
-  <cpu type=3D'tcg' name=3D'MPC8543E_v10'/>
-  <cpu type=3D'tcg' name=3D'MPC8543E_v21'/>
-  <cpu type=3D'tcg' name=3D'750cxe_v2.3'/>
-  <cpu type=3D'tcg' name=3D'MPC8543_v20'/>
-  <cpu type=3D'tcg' name=3D'745_v2.7'/>
-  <cpu type=3D'tcg' name=3D'403GC'/>
-  <cpu type=3D'tcg' name=3D'e5500'/>
-  <cpu type=3D'tcg' name=3D'7448_v1.0'/>
-  <cpu type=3D'tcg' name=3D'MPC5200_v12'/>
-  <cpu type=3D'tcg' name=3D'740_v2.1'/>
-  <cpu type=3D'tcg' name=3D'745_v2.2'/>
-  <cpu type=3D'tcg' name=3D'7400_v1.0'/>
-  <cpu type=3D'tcg' name=3D'7410_v1.2'/>
-  <cpu type=3D'tcg' name=3D'x2vp4'/>
-  <cpu type=3D'tcg' name=3D'MPC8555_v11'/>
-  <cpu type=3D'tcg' name=3D'MPC8541_v10'/>
-  <cpu type=3D'tcg' name=3D'405LP'/>
-  <cpu type=3D'tcg' name=3D'750fx_v2.3'/>
-  <cpu type=3D'tcg' name=3D'405EP'/>
-  <cpu type=3D'tcg' name=3D'601_v2'/>
-  <cpu type=3D'tcg' name=3D'MPC8544_v11'/>
-  <cpu type=3D'tcg' name=3D'401D2'/>
-  <cpu type=3D'tcg' name=3D'MPC8572E'/>
-  <cpu type=3D'tcg' name=3D'604e_v1.0'/>
-  <cpu type=3D'tcg' name=3D'750cx_v2.1'/>
-  <cpu type=3D'tcg' name=3D'MPC5200B_v21'/>
-  <cpu type=3D'tcg' name=3D'750l_v3.0'/>
-  <cpu type=3D'tcg' name=3D'e300c4'/>
-  <cpu type=3D'tcg' name=3D'7448_v2.0'/>
-  <cpu type=3D'tcg' name=3D'7450_v2.1'/>
-  <cpu type=3D'tcg' name=3D'G2leGP'/>
-  <cpu type=3D'tcg' name=3D'750cxe_v3.1b'/>
-  <cpu type=3D'tcg' name=3D'7400_v2.9'/>
-  <cpu type=3D'tcg' name=3D'G2GP'/>
-  <cpu type=3D'tcg' name=3D'603'/>
-  <cpu type=3D'tcg' name=3D'405GPd'/>
-  <cpu type=3D'tcg' name=3D'MPC8548E_v11'/>
-  <cpu type=3D'tcg' name=3D'603e7t'/>
-  <cpu type=3D'tcg' name=3D'IOP480'/>
-  <cpu type=3D'tcg' name=3D'750gx_v1.0'/>
-  <cpu type=3D'tcg' name=3D'MPC8560_v20'/>
-  <cpu type=3D'tcg' name=3D'405D2'/>
-  <cpu type=3D'tcg' name=3D'750fl'/>
-  <cpu type=3D'tcg' name=3D'750l_v2.0'/>
-  <cpu type=3D'tcg' name=3D'x2vp20'/>
-  <cpu type=3D'tcg' name=3D'e600'/>
-  <cpu type=3D'tcg' name=3D'7450_v1.1'/>
-  <cpu type=3D'tcg' name=3D'755_v2.4'/>
-  <cpu type=3D'tcg' name=3D'7445_v1.0'/>
-  <cpu type=3D'tcg' name=3D'G2LS'/>
-  <cpu type=3D'tcg' name=3D'MPC8543E_v20'/>
-  <cpu type=3D'tcg' name=3D'603e_v2.2'/>
-  <cpu type=3D'tcg' name=3D'7447_v1.1'/>
-  <cpu type=3D'tcg' name=3D'603e_v4'/>
-  <cpu type=3D'tcg' name=3D'7455_v3.2'/>
-  <cpu type=3D'tcg' name=3D'740_v2.0'/>
-  <cpu type=3D'tcg' name=3D'MPC8347P'/>
-  <cpu type=3D'tcg' name=3D'440EPb'/>
-  <cpu type=3D'tcg' name=3D'MPC603'/>
-  <cpu type=3D'tcg' name=3D'603e_v1.2'/>
-  <cpu type=3D'tcg' name=3D'750fx_v2.2'/>
-  <cpu type=3D'tcg' name=3D'POWER9_v1.0'/>
-  <cpu type=3D'tcg' name=3D'740_v1.0'/>
-  <cpu type=3D'tcg' name=3D'MPC8544_v10'/>
-  <cpu type=3D'tcg' name=3D'601_v1'/>
-  <cpu type=3D'tcg' name=3D'745_v1.1'/>
-  <cpu type=3D'tcg' name=3D'POWER7+_v2.1'/>
-  <cpu type=3D'tcg' name=3D'750cx_v2.0'/>
-  <cpu type=3D'tcg' name=3D'MPC8347EAP'/>
-  <cpu type=3D'tcg' name=3D'401E2'/>
-  <cpu type=3D'tcg' name=3D'MPC8641D'/>
-  <cpu type=3D'tcg' name=3D'e300c3'/>
-  <cpu type=3D'tcg' name=3D'MPC8533_v10'/>
-  <cpu type=3D'tcg' name=3D'7441_v2.1'/>
-  <cpu type=3D'tcg' name=3D'740_v3.0'/>
-  <cpu type=3D'tcg' name=3D'POWER5+_v2.1'/>
-  <cpu type=3D'tcg' name=3D'602'/>
-  <cpu type=3D'tcg' name=3D'MPC8548E_v10'/>
-  <cpu type=3D'tcg' name=3D'G2leLS'/>
-  <cpu type=3D'tcg' name=3D'MPC8343'/>
-  <cpu type=3D'tcg' name=3D'750cx_v1.0'/>
-  <cpu type=3D'tcg' name=3D'750cxe_v2.2'/>
-  <cpu type=3D'tcg' name=3D'604e_v2.4'/>
-  <cpu type=3D'tcg' name=3D'755_v2.8'/>
-  <cpu type=3D'tcg' name=3D'745_v2.6'/>
-  <cpu type=3D'tcg' name=3D'MPC8548E_v21'/>
-  <cpu type=3D'tcg' name=3D'G2le'/>
-  <cpu type=3D'tcg' name=3D'403GB'/>
-  <cpu type=3D'tcg' name=3D'MPC8545E_v21'/>
-  <cpu type=3D'tcg' name=3D'POWER7_v2.3'/>
-  <cpu type=3D'tcg' name=3D'750_v2.2'/>
-  <cpu type=3D'tcg' name=3D'7450_v1.0'/>
-  <cpu type=3D'tcg' name=3D'MPC5200_v11'/>
-  <cpu type=3D'tcg' name=3D'755_v2.3'/>
-  <cpu type=3D'tcg' name=3D'MPC8347EP'/>
-  <cpu type=3D'tcg' name=3D'7410_v1.1'/>
-  <cpu type=3D'tcg' name=3D'750gl'/>
-  <cpu type=3D'tcg' name=3D'403GCX'/>
-  <cpu type=3D'tcg' name=3D'745_v2.1'/>
-  <cpu type=3D'tcg' name=3D'750p'/>
-  <cpu type=3D'tcg' name=3D'G2'/>
-  <cpu type=3D'tcg' name=3D'MPC8555_v10'/>
-  <cpu type=3D'tcg' name=3D'7445_v3.4'/>
-  <cpu type=3D'tcg' name=3D'MPC8347T'/>
-  <cpu type=3D'tcg' name=3D'603e_v3'/>
-  <cpu type=3D'tcg' name=3D'970_v2.2'/>
-  <cpu type=3D'tcg' name=3D'440-Xilinx'/>
-  <cpu type=3D'tcg' name=3D'740p'/>
-  <cpu type=3D'tcg' name=3D'MPC5200B_v20'/>
-  <cpu type=3D'tcg' name=3D'440EPX'/>
-  <cpu type=3D'tcg' name=3D'603e_v1.1'/>
-  <cpu type=3D'tcg' name=3D'7451_v2.3'/>
-  <cpu type=3D'tcg' name=3D'7450_v2.0'/>
-  <cpu type=3D'tcg' name=3D'7400_v2.8'/>
-  <cpu type=3D'tcg' name=3D'7455_v2.1'/>
-  <cpu type=3D'tcg' name=3D'405GPc'/>
-  <cpu type=3D'tcg' name=3D'MPC8347EAT'/>
-  <cpu type=3D'tcg' name=3D'970mp_v1.1'/>
-  <cpu type=3D'tcg' name=3D'603e7v2'/>
-  <cpu type=3D'tcg' name=3D'604r'/>
-  <cpu type=3D'tcg' name=3D'7447A_v1.2'/>
-  <cpu type=3D'tcg' name=3D'MPC8533E_v11'/>
-  <cpu type=3D'tcg' name=3D'e500v2_v22'/>
-  <cpu type=3D'tcg' name=3D'401F2'/>
-  <cpu type=3D'tcg' name=3D'MPC8343EA'/>
-  <cpu type=3D'tcg' name=3D'7457_v1.2'/>
-  <cpu type=3D'tcg' name=3D'7447_v1.0'/>
-  <cpu type=3D'tcg' name=3D'970fx_v3.1'/>
-  <cpu type=3D'tcg' name=3D'745_v2.5'/>
-  <cpu type=3D'tcg' name=3D'MPC8548E_v20'/>
-  <cpu type=3D'tcg' name=3D'MPC8610'/>
-  <cpu type=3D'tcg' name=3D'750cxe_v2.4b'/>
-  <cpu type=3D'tcg' name=3D'MPC5200_v10'/>
-  <cpu type=3D'tcg' name=3D'403GA'/>
-  <cpu type=3D'tcg' name=3D'7410_v1.0'/>
-  <cpu type=3D'tcg' name=3D'G2leGP3'/>
-  <cpu type=3D'tcg' name=3D'7445_v3.3'/>
-  <cpu type=3D'tcg' name=3D'603e_v4.1'/>
-  <cpu type=3D'tcg' name=3D'440EPa'/>
-  <cpu type=3D'tcg' name=3D'970fx_v2.1'/>
-  <cpu type=3D'tcg' name=3D'MPC8377E'/>
-  <cpu type=3D'tcg' name=3D'750fx_v2.1'/>
-  <cpu type=3D'tcg' name=3D'601_v0'/>
-  <cpu type=3D'tcg' name=3D'STB04'/>
-  <cpu type=3D'tcg' name=3D'745_v1.0'/>
-  <cpu type=3D'tcg' name=3D'G2HiP4'/>
-  <cpu type=3D'tcg' name=3D'750cl_v2.0'/>
-  <cpu type=3D'tcg' name=3D'750cxr'/>
-  <cpu type=3D'tcg' name=3D'MPC8349EA'/>
-  <cpu type=3D'tcg' name=3D'750cxe_v3.1'/>
-  <cpu type=3D'tcg' name=3D'MPC8379'/>
-  <cpu type=3D'tcg' name=3D'401'/>
-  <cpu type=3D'tcg' name=3D'MPC8568'/>
-  <cpu type=3D'tcg' name=3D'e300c2'/>
-  <cpu type=3D'tcg' name=3D'750_v3.1'/>
-  <cpu type=3D'tcg' name=3D'MPC8544E_v11'/>
-  <cpu type=3D'tcg' name=3D'405GPb'/>
-  <cpu type=3D'tcg' name=3D'MPC8541E_v11'/>
+  <cpu type=3D'kvm' name=3D'default' typename=3D'604-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'ppc' typename=3D'604-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'ppc32' typename=3D'604-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'ppc64' typename=3D'970fx_v3.1-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'970mp' typename=3D'970mp_v1.1-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'970fx' typename=3D'970fx_v3.1-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'970' typename=3D'970_v2.2-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'POWER9' typename=3D'POWER9_v1.0-powerpc64-cpu'=
/>
+  <cpu type=3D'kvm' name=3D'POWER8NVL' typename=3D'POWER8NVL_v1.0-powerpc6=
4-cpu'/>
+  <cpu type=3D'kvm' name=3D'POWER8' typename=3D'host-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'POWER8E' typename=3D'POWER8E_v2.1-powerpc64-cp=
u'/>
+  <cpu type=3D'kvm' name=3D'POWER7+' typename=3D'POWER7+_v2.1-powerpc64-cp=
u'/>
+  <cpu type=3D'kvm' name=3D'POWER7' typename=3D'POWER7_v2.3-powerpc64-cpu'=
/>
+  <cpu type=3D'kvm' name=3D'POWER5gs' typename=3D'POWER5+_v2.1-powerpc64-c=
pu'/>
+  <cpu type=3D'kvm' name=3D'POWER5+' typename=3D'POWER5+_v2.1-powerpc64-cp=
u'/>
+  <cpu type=3D'kvm' name=3D'Apollo7PM' typename=3D'7457A_v1.0-powerpc64-cp=
u'/>
+  <cpu type=3D'kvm' name=3D'7457A' typename=3D'7457A_v1.2-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'7447A' typename=3D'7447A_v1.2-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'Apollo7' typename=3D'7457_v1.2-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'7457' typename=3D'7457_v1.2-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'7447' typename=3D'7447_v1.1-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'Apollo6' typename=3D'7455_v3.2-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'7455' typename=3D'7455_v3.2-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'7445' typename=3D'7445_v3.2-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'7451' typename=3D'7451_v2.3-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'7441' typename=3D'7441_v2.3-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'Vger' typename=3D'7450_v2.1-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'7450' typename=3D'7450_v2.1-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'7448' typename=3D'7448_v2.1-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'Nitro' typename=3D'7410_v1.4-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'7410' typename=3D'7410_v1.4-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'G4' typename=3D'7400_v2.9-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'Max' typename=3D'7400_v2.9-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'7400' typename=3D'7400_v2.9-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'Goldfinger' typename=3D'755_v2.8-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'755' typename=3D'755_v2.8-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'745' typename=3D'745_v2.8-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'LoneStar' typename=3D'750l_v3.2-powerpc64-cpu'=
/>
+  <cpu type=3D'kvm' name=3D'750l' typename=3D'750l_v3.2-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'750gx' typename=3D'750gx_v1.2-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'750fx' typename=3D'750fx_v2.3-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'750cxe' typename=3D'750cxe_v3.1b-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'750cx' typename=3D'750cx_v2.2-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'750cl' typename=3D'750cl_v2.0-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'Conan/Doyle' typename=3D'750p-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'G3' typename=3D'750_v3.1-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'Typhoon' typename=3D'750_v3.1-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'750' typename=3D'750_v3.1-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'Arthur' typename=3D'740_v3.1-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'740' typename=3D'740_v3.1-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'Mach5' typename=3D'604r-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'Sirocco' typename=3D'604e_v2.4-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'604e' typename=3D'604e_v2.4-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'Goldeneye' typename=3D'603e7t-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'603r' typename=3D'603e7t-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'Vaillant' typename=3D'603e7v-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'Stretch' typename=3D'603e_v4.1-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'603e' typename=3D'603e_v4.1-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'Vanilla' typename=3D'603-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'601v' typename=3D'601_v2-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'601' typename=3D'601_v2-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'MPC8560' typename=3D'MPC8560_v21-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'MPC8555E' typename=3D'MPC8555E_v11-powerpc64-c=
pu'/>
+  <cpu type=3D'kvm' name=3D'MPC8555' typename=3D'MPC8555_v11-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'MPC8548E' typename=3D'MPC8548E_v21-powerpc64-c=
pu'/>
+  <cpu type=3D'kvm' name=3D'MPC8548' typename=3D'MPC8548_v21-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'MPC8547E' typename=3D'MPC8547E_v21-powerpc64-c=
pu'/>
+  <cpu type=3D'kvm' name=3D'MPC8545E' typename=3D'MPC8545E_v21-powerpc64-c=
pu'/>
+  <cpu type=3D'kvm' name=3D'MPC8545' typename=3D'MPC8545_v21-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'MPC8544E' typename=3D'MPC8544E_v11-powerpc64-c=
pu'/>
+  <cpu type=3D'kvm' name=3D'MPC8544' typename=3D'MPC8544_v11-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'MPC8543E' typename=3D'MPC8543E_v21-powerpc64-c=
pu'/>
+  <cpu type=3D'kvm' name=3D'MPC8543' typename=3D'MPC8543_v21-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'MPC8541E' typename=3D'MPC8541E_v11-powerpc64-c=
pu'/>
+  <cpu type=3D'kvm' name=3D'MPC8541' typename=3D'MPC8541_v11-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'MPC8540' typename=3D'MPC8540_v21-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'MPC8533E' typename=3D'MPC8533E_v11-powerpc64-c=
pu'/>
+  <cpu type=3D'kvm' name=3D'MPC8533' typename=3D'MPC8533_v11-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'e500v2' typename=3D'e500v2_v22-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'e500v1' typename=3D'e500_v20-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'e500' typename=3D'e500v2_v22-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'MPC8347EA' typename=3D'MPC8347EAT-powerpc64-cp=
u'/>
+  <cpu type=3D'kvm' name=3D'MPC8347E' typename=3D'MPC8347ET-powerpc64-cpu'=
/>
+  <cpu type=3D'kvm' name=3D'MPC8347A' typename=3D'MPC8347AT-powerpc64-cpu'=
/>
+  <cpu type=3D'kvm' name=3D'MPC8347' typename=3D'MPC8347T-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'e300' typename=3D'e300c3-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'e200' typename=3D'e200z6-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'MPC8280' typename=3D'G2leGP3-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'MPC8275' typename=3D'G2leGP3-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'MPC8272' typename=3D'G2leGP3-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'MPC8271' typename=3D'G2leGP3-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'MPC8270' typename=3D'G2leGP3-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'MPC8266_HiP4' typename=3D'G2HiP4-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'MPC8266_HiP3' typename=3D'G2HiP3-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'MPC8266' typename=3D'G2HiP4-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'MPC8265_HiP4' typename=3D'G2HiP4-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'MPC8265_HiP3' typename=3D'G2HiP3-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'MPC8265' typename=3D'G2HiP4-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'MPC8264_HiP4' typename=3D'G2HiP4-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'MPC8264_HiP3' typename=3D'G2HiP3-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'MPC8264' typename=3D'G2HiP4-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'MPC8260_HiP4' typename=3D'G2HiP4-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'MPC8260_HiP3' typename=3D'G2HiP3-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'MPC8260' typename=3D'G2HiP4-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'MPC8255_HiP4' typename=3D'G2HiP4-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'MPC8255_HiP3' typename=3D'G2HiP3-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'MPC8255' typename=3D'G2HiP4-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'MPC8250_HiP4' typename=3D'G2HiP4-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'MPC8250_HiP3' typename=3D'G2HiP3-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'MPC8250' typename=3D'G2HiP4-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'MPC8248' typename=3D'G2leGP3-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'MPC8247' typename=3D'G2leGP3-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'MPC8245' typename=3D'G2HiP4-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'MPC8241' typename=3D'G2HiP4-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'PowerQUICC-II' typename=3D'G2leGP3-powerpc64-c=
pu'/>
+  <cpu type=3D'kvm' name=3D'MPC82xx' typename=3D'G2leGP3-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'MPC5200B' typename=3D'MPC5200B_v21-powerpc64-c=
pu'/>
+  <cpu type=3D'kvm' name=3D'MPC5200' typename=3D'MPC5200_v12-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'MPC52xx' typename=3D'MPC5200_v12-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'MPC8240' typename=3D'603-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'440EP' typename=3D'440EPb-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'x2vp50' typename=3D'x2vp20-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'x2vp7' typename=3D'x2vp4-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'405GPe' typename=3D'405CRc-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'405GP' typename=3D'405GPd-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'405CR' typename=3D'405CRc-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'405' typename=3D'405D4-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'403' typename=3D'403GC-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'7457A_v1.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cl_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cxe_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'755_v2.7' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8347ET' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8545E_v20' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'755_v2.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'745_v2.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7455_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8547E_v21' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'STB25' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'POWER8_v2.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'401G2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8349A' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750e' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8545_v21' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8548_v11' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'970fx_v2.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750fx_v2.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'POWER8E_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'Cobra' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7400_v2.7' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603p' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8378E' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e500v2_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e500mc' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603e7v1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'970mp_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8555E_v11' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'440-Xilinx-w-dfpu' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'740e' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'405CRc' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7447A_v1.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8533E_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8543_v11' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7400_v2.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8540_v21' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e500v2_v21' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e300c1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'970fx_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750gx_v1.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750fx_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8641' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8544E_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'405D4' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7457_v1.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'970fx_v3.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'604e_v2.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'755_v2.6' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'Npe4GS3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7410_v1.4' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750_v2.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7445_v3.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'745_v2.4' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750l_v3.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8540_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'STB03' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8343A' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8378' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'G2HiP3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cxe_v3.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e500_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'755_v1.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8567' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8545_v20' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8548_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'Npe405H' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603e7v' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750_v3.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'Npe405H2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7400_v2.6' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'405GPa' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8548_v21' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8541E_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750l_v2.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8555E_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7457A_v1.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e200z6' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8379E' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e500v2_v20' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8347AP' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'401B2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8349E' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'755_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8543_v21' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'745_v2.8' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8547E_v20' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7455_v3.4' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7448_v1.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'740_v2.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7400_v1.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8567E' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7441_v2.10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603e_v1.4' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'G2leGP1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7451_v2.10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8343E' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cx_v2.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'Npe405L' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603e7' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'401A1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8377' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7448_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7441_v2.3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7400_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'405CRb' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7447A_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8540_v20' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8543_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7445_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e500_v20' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750gx_v1.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'604' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cxe_v2.4' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8548_v20' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8543E_v11' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8347AT' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750l_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'POWER8NVL_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7457A_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7457_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7450_v1.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8572' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'755_v2.5' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7410_v1.3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'745_v2.3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'405GPR' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'755_v2.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8541_v11' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'401C2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e500v2_v30' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7455_v3.3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'405EZ' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8568E' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'755_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603e_v1.3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8560_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'host' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8560_v21' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'G2H4' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8533_v11' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'740_v3.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e200z5' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8349' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7400_v2.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'405CRa' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8543E_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8543E_v21' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cxe_v2.3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8543_v20' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'745_v2.7' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'403GC' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e5500' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7448_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC5200_v12' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'740_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'745_v2.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7400_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7410_v1.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'x2vp4' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8555_v11' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8541_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'405LP' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750fx_v2.3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'405EP' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'601_v2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8544_v11' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'401D2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8572E' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'604e_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cx_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC5200B_v21' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750l_v3.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e300c4' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7448_v2.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7450_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'G2leGP' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cxe_v3.1b' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7400_v2.9' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'G2GP' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'405GPd' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8548E_v11' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603e7t' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'IOP480' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750gx_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8560_v20' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'405D2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750fl' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750l_v2.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'x2vp20' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e600' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7450_v1.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'755_v2.4' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7445_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'G2LS' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8543E_v20' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603e_v2.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7447_v1.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603e_v4' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7455_v3.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'740_v2.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8347P' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'440EPb' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC603' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603e_v1.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750fx_v2.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'POWER9_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'740_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8544_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'601_v1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'745_v1.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'POWER7+_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cx_v2.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8347EAP' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'401E2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8641D' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e300c3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8533_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7441_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'740_v3.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'POWER5+_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'602' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8548E_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'G2leLS' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8343' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cx_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cxe_v2.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'604e_v2.4' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'755_v2.8' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'745_v2.6' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8548E_v21' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'G2le' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'403GB' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8545E_v21' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'POWER7_v2.3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750_v2.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7450_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC5200_v11' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'755_v2.3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8347EP' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7410_v1.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750gl' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'403GCX' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'745_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750p' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'G2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8555_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7445_v3.4' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8347T' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603e_v3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'970_v2.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'440-Xilinx' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'740p' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC5200B_v20' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'440EPX' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603e_v1.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7451_v2.3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7450_v2.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7400_v2.8' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7455_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'405GPc' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8347EAT' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'970mp_v1.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603e7v2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'604r' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7447A_v1.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8533E_v11' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e500v2_v22' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'401F2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8343EA' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7457_v1.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7447_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'970fx_v3.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'745_v2.5' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8548E_v20' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8610' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cxe_v2.4b' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC5200_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'403GA' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7410_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'G2leGP3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7445_v3.3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603e_v4.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'440EPa' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'970fx_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8377E' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750fx_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'601_v0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'STB04' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'745_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'G2HiP4' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cl_v2.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cxr' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8349EA' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cxe_v3.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8379' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'401' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8568' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e300c2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750_v3.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8544E_v11' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'405GPb' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8541E_v11' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'default' typename=3D'604-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'ppc' typename=3D'604-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'ppc32' typename=3D'604-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'ppc64' typename=3D'970fx_v3.1-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'970mp' typename=3D'970mp_v1.1-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'970fx' typename=3D'970fx_v3.1-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'970' typename=3D'970_v2.2-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'POWER9' typename=3D'POWER9_v1.0-powerpc64-cpu'=
/>
+  <cpu type=3D'tcg' name=3D'POWER8NVL' typename=3D'POWER8NVL_v1.0-powerpc6=
4-cpu'/>
+  <cpu type=3D'tcg' name=3D'POWER8' typename=3D'POWER8_v2.0-powerpc64-cpu'=
/>
+  <cpu type=3D'tcg' name=3D'POWER8E' typename=3D'POWER8E_v2.1-powerpc64-cp=
u'/>
+  <cpu type=3D'tcg' name=3D'POWER7+' typename=3D'POWER7+_v2.1-powerpc64-cp=
u'/>
+  <cpu type=3D'tcg' name=3D'POWER7' typename=3D'POWER7_v2.3-powerpc64-cpu'=
/>
+  <cpu type=3D'tcg' name=3D'POWER5gs' typename=3D'POWER5+_v2.1-powerpc64-c=
pu'/>
+  <cpu type=3D'tcg' name=3D'POWER5+' typename=3D'POWER5+_v2.1-powerpc64-cp=
u'/>
+  <cpu type=3D'tcg' name=3D'Apollo7PM' typename=3D'7457A_v1.0-powerpc64-cp=
u'/>
+  <cpu type=3D'tcg' name=3D'7457A' typename=3D'7457A_v1.2-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'7447A' typename=3D'7447A_v1.2-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'Apollo7' typename=3D'7457_v1.2-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'7457' typename=3D'7457_v1.2-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'7447' typename=3D'7447_v1.1-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'Apollo6' typename=3D'7455_v3.2-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'7455' typename=3D'7455_v3.2-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'7445' typename=3D'7445_v3.2-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'7451' typename=3D'7451_v2.3-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'7441' typename=3D'7441_v2.3-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'Vger' typename=3D'7450_v2.1-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'7450' typename=3D'7450_v2.1-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'7448' typename=3D'7448_v2.1-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'Nitro' typename=3D'7410_v1.4-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'7410' typename=3D'7410_v1.4-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'G4' typename=3D'7400_v2.9-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'Max' typename=3D'7400_v2.9-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'7400' typename=3D'7400_v2.9-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'Goldfinger' typename=3D'755_v2.8-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'755' typename=3D'755_v2.8-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'745' typename=3D'745_v2.8-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'LoneStar' typename=3D'750l_v3.2-powerpc64-cpu'=
/>
+  <cpu type=3D'tcg' name=3D'750l' typename=3D'750l_v3.2-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'750gx' typename=3D'750gx_v1.2-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'750fx' typename=3D'750fx_v2.3-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'750cxe' typename=3D'750cxe_v3.1b-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'750cx' typename=3D'750cx_v2.2-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'750cl' typename=3D'750cl_v2.0-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'Conan/Doyle' typename=3D'750p-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'G3' typename=3D'750_v3.1-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'Typhoon' typename=3D'750_v3.1-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'750' typename=3D'750_v3.1-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'Arthur' typename=3D'740_v3.1-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'740' typename=3D'740_v3.1-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'Mach5' typename=3D'604r-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'Sirocco' typename=3D'604e_v2.4-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'604e' typename=3D'604e_v2.4-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'Goldeneye' typename=3D'603e7t-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'603r' typename=3D'603e7t-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'Vaillant' typename=3D'603e7v-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'Stretch' typename=3D'603e_v4.1-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'603e' typename=3D'603e_v4.1-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'Vanilla' typename=3D'603-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'601v' typename=3D'601_v2-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'601' typename=3D'601_v2-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'MPC8560' typename=3D'MPC8560_v21-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'MPC8555E' typename=3D'MPC8555E_v11-powerpc64-c=
pu'/>
+  <cpu type=3D'tcg' name=3D'MPC8555' typename=3D'MPC8555_v11-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'MPC8548E' typename=3D'MPC8548E_v21-powerpc64-c=
pu'/>
+  <cpu type=3D'tcg' name=3D'MPC8548' typename=3D'MPC8548_v21-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'MPC8547E' typename=3D'MPC8547E_v21-powerpc64-c=
pu'/>
+  <cpu type=3D'tcg' name=3D'MPC8545E' typename=3D'MPC8545E_v21-powerpc64-c=
pu'/>
+  <cpu type=3D'tcg' name=3D'MPC8545' typename=3D'MPC8545_v21-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'MPC8544E' typename=3D'MPC8544E_v11-powerpc64-c=
pu'/>
+  <cpu type=3D'tcg' name=3D'MPC8544' typename=3D'MPC8544_v11-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'MPC8543E' typename=3D'MPC8543E_v21-powerpc64-c=
pu'/>
+  <cpu type=3D'tcg' name=3D'MPC8543' typename=3D'MPC8543_v21-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'MPC8541E' typename=3D'MPC8541E_v11-powerpc64-c=
pu'/>
+  <cpu type=3D'tcg' name=3D'MPC8541' typename=3D'MPC8541_v11-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'MPC8540' typename=3D'MPC8540_v21-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'MPC8533E' typename=3D'MPC8533E_v11-powerpc64-c=
pu'/>
+  <cpu type=3D'tcg' name=3D'MPC8533' typename=3D'MPC8533_v11-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'e500v2' typename=3D'e500v2_v22-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'e500v1' typename=3D'e500_v20-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'e500' typename=3D'e500v2_v22-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'MPC8347EA' typename=3D'MPC8347EAT-powerpc64-cp=
u'/>
+  <cpu type=3D'tcg' name=3D'MPC8347E' typename=3D'MPC8347ET-powerpc64-cpu'=
/>
+  <cpu type=3D'tcg' name=3D'MPC8347A' typename=3D'MPC8347AT-powerpc64-cpu'=
/>
+  <cpu type=3D'tcg' name=3D'MPC8347' typename=3D'MPC8347T-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'e300' typename=3D'e300c3-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'e200' typename=3D'e200z6-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'MPC8280' typename=3D'G2leGP3-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'MPC8275' typename=3D'G2leGP3-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'MPC8272' typename=3D'G2leGP3-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'MPC8271' typename=3D'G2leGP3-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'MPC8270' typename=3D'G2leGP3-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'MPC8266_HiP4' typename=3D'G2HiP4-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'MPC8266_HiP3' typename=3D'G2HiP3-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'MPC8266' typename=3D'G2HiP4-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'MPC8265_HiP4' typename=3D'G2HiP4-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'MPC8265_HiP3' typename=3D'G2HiP3-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'MPC8265' typename=3D'G2HiP4-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'MPC8264_HiP4' typename=3D'G2HiP4-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'MPC8264_HiP3' typename=3D'G2HiP3-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'MPC8264' typename=3D'G2HiP4-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'MPC8260_HiP4' typename=3D'G2HiP4-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'MPC8260_HiP3' typename=3D'G2HiP3-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'MPC8260' typename=3D'G2HiP4-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'MPC8255_HiP4' typename=3D'G2HiP4-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'MPC8255_HiP3' typename=3D'G2HiP3-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'MPC8255' typename=3D'G2HiP4-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'MPC8250_HiP4' typename=3D'G2HiP4-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'MPC8250_HiP3' typename=3D'G2HiP3-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'MPC8250' typename=3D'G2HiP4-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'MPC8248' typename=3D'G2leGP3-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'MPC8247' typename=3D'G2leGP3-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'MPC8245' typename=3D'G2HiP4-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'MPC8241' typename=3D'G2HiP4-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'PowerQUICC-II' typename=3D'G2leGP3-powerpc64-c=
pu'/>
+  <cpu type=3D'tcg' name=3D'MPC82xx' typename=3D'G2leGP3-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'MPC5200B' typename=3D'MPC5200B_v21-powerpc64-c=
pu'/>
+  <cpu type=3D'tcg' name=3D'MPC5200' typename=3D'MPC5200_v12-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'MPC52xx' typename=3D'MPC5200_v12-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'MPC8240' typename=3D'603-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'440EP' typename=3D'440EPb-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'x2vp50' typename=3D'x2vp20-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'x2vp7' typename=3D'x2vp4-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'405GPe' typename=3D'405CRc-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'405GP' typename=3D'405GPd-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'405CR' typename=3D'405CRc-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'405' typename=3D'405D4-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'403' typename=3D'403GC-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'7457A_v1.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cl_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cxe_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'755_v2.7' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8347ET' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8545E_v20' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'755_v2.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'745_v2.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7455_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8547E_v21' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'STB25' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'POWER8_v2.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'401G2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8349A' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750e' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8545_v21' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8548_v11' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'970fx_v2.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750fx_v2.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'POWER8E_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'Cobra' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7400_v2.7' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603p' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8378E' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e500v2_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e500mc' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603e7v1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'970mp_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8555E_v11' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'440-Xilinx-w-dfpu' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'740e' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'405CRc' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7447A_v1.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8533E_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8543_v11' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7400_v2.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8540_v21' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e500v2_v21' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e300c1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'970fx_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750gx_v1.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750fx_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8641' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8544E_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'405D4' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7457_v1.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'970fx_v3.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'604e_v2.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'755_v2.6' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'Npe4GS3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7410_v1.4' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750_v2.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7445_v3.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'745_v2.4' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750l_v3.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8540_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'STB03' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8343A' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8378' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'G2HiP3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cxe_v3.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e500_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'755_v1.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8567' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8545_v20' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8548_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'Npe405H' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603e7v' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750_v3.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'Npe405H2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7400_v2.6' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'405GPa' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8548_v21' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8541E_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750l_v2.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8555E_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7457A_v1.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e200z6' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8379E' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e500v2_v20' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8347AP' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'401B2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8349E' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'755_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8543_v21' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'745_v2.8' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8547E_v20' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7455_v3.4' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7448_v1.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'740_v2.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7400_v1.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8567E' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7441_v2.10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603e_v1.4' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'G2leGP1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7451_v2.10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8343E' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cx_v2.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'Npe405L' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603e7' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'401A1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8377' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7448_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7441_v2.3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7400_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'405CRb' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7447A_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8540_v20' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8543_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7445_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e500_v20' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750gx_v1.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'604' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cxe_v2.4' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8548_v20' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8543E_v11' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8347AT' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750l_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'POWER8NVL_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7457A_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7457_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7450_v1.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8572' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'755_v2.5' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7410_v1.3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'745_v2.3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'405GPR' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'755_v2.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8541_v11' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'401C2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e500v2_v30' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7455_v3.3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'405EZ' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8568E' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'755_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603e_v1.3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8560_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8560_v21' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'G2H4' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8533_v11' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'740_v3.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e200z5' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8349' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7400_v2.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'405CRa' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8543E_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8543E_v21' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cxe_v2.3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8543_v20' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'745_v2.7' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'403GC' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e5500' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7448_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC5200_v12' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'740_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'745_v2.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7400_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7410_v1.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'x2vp4' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8555_v11' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8541_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'405LP' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750fx_v2.3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'405EP' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'601_v2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8544_v11' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'401D2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8572E' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'604e_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cx_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC5200B_v21' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750l_v3.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e300c4' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7448_v2.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7450_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'G2leGP' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cxe_v3.1b' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7400_v2.9' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'G2GP' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'405GPd' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8548E_v11' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603e7t' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'IOP480' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750gx_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8560_v20' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'405D2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750fl' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750l_v2.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'x2vp20' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e600' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7450_v1.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'755_v2.4' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7445_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'G2LS' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8543E_v20' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603e_v2.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7447_v1.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603e_v4' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7455_v3.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'740_v2.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8347P' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'440EPb' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC603' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603e_v1.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750fx_v2.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'POWER9_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'740_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8544_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'601_v1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'745_v1.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'POWER7+_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cx_v2.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8347EAP' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'401E2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8641D' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e300c3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8533_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7441_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'740_v3.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'POWER5+_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'602' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8548E_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'G2leLS' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8343' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cx_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cxe_v2.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'604e_v2.4' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'755_v2.8' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'745_v2.6' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8548E_v21' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'G2le' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'403GB' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8545E_v21' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'POWER7_v2.3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750_v2.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7450_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC5200_v11' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'755_v2.3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8347EP' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7410_v1.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750gl' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'403GCX' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'745_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750p' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'G2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8555_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7445_v3.4' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8347T' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603e_v3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'970_v2.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'440-Xilinx' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'740p' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC5200B_v20' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'440EPX' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603e_v1.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7451_v2.3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7450_v2.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7400_v2.8' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7455_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'405GPc' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8347EAT' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'970mp_v1.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603e7v2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'604r' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7447A_v1.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8533E_v11' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e500v2_v22' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'401F2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8343EA' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7457_v1.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7447_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'970fx_v3.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'745_v2.5' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8548E_v20' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8610' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cxe_v2.4b' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC5200_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'403GA' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7410_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'G2leGP3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7445_v3.3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603e_v4.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'440EPa' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'970fx_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8377E' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750fx_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'601_v0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'STB04' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'745_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'G2HiP4' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cl_v2.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cxr' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8349EA' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cxe_v3.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8379' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'401' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8568' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e300c2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750_v3.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8544E_v11' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'405GPb' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8541E_v11' typename=3D''/>
   <machine name=3D'pseries-2.10' alias=3D'pseries' hotplugCpus=3D'yes' max=
Cpus=3D'1024' default=3D'yes'/>
   <machine name=3D'ref405ep' maxCpus=3D'1'/>
   <machine name=3D'virtex-ml507' maxCpus=3D'1'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemuc=
apabilitiesdata/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=3D'te' type=3D'boolean' value=3D'true'/>
     <property name=3D'cmm' type=3D'boolean' value=3D'true'/>
   </hostCPU>
-  <cpu type=3D'kvm' name=3D'z10EC-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z9EC-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z196.2-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z900-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z990' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z900.2-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'host' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z900.3' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z114' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z890-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z13.2-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'zEC12.2' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z10BC' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z900.2' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z10BC.2' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z196' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z9EC' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z990-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z10EC.3' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z900' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z9EC.3-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z990.5-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z10EC.2' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z9BC.2' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z10EC' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z990.3-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z14' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z13s' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z10EC.3-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'zEC12.2-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z890.3-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z9EC.3' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z990.5' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z13' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z13s-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z14-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z9EC.2' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z990.4' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'zEC12-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z9EC.2-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'zBC12' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z196.2' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z990.3' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z990.2-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z900.3-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z890.3' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z10EC.2-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z990.2' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z890.2' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'zBC12-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z800-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'zEC12' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z9BC.2-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z9BC' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z10BC.2-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z990.4-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'qemu' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z10BC-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z9BC-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z800' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z890.2-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z13.2' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z114-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z196-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z13-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z890' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'z10EC-base' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'z10EC-base' typename=3D'z10EC-base-s390-cpu' u=
sable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z9EC-base' typename=3D'z9EC-base-s390-cpu' usa=
ble=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z196.2-base' typename=3D'z196.2-base-s390-cpu'=
 usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z900-base' typename=3D'z900-base-s390-cpu' usa=
ble=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z990' typename=3D'z990-s390-cpu' usable=3D'yes=
'/>
+  <cpu type=3D'kvm' name=3D'z900.2-base' typename=3D'z900.2-base-s390-cpu'=
 usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'host' typename=3D'host-s390-cpu' usable=3D'yes=
'/>
+  <cpu type=3D'kvm' name=3D'z900.3' typename=3D'z900.3-s390-cpu' usable=3D=
'yes'/>
+  <cpu type=3D'kvm' name=3D'z114' typename=3D'z114-s390-cpu' usable=3D'yes=
'/>
+  <cpu type=3D'kvm' name=3D'z890-base' typename=3D'z890-base-s390-cpu' usa=
ble=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z13.2-base' typename=3D'z13.2-base-s390-cpu' u=
sable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'zEC12.2' typename=3D'zEC12.2-s390-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z10BC' typename=3D'z10BC-s390-cpu' usable=3D'y=
es'/>
+  <cpu type=3D'kvm' name=3D'z900.2' typename=3D'z900.2-s390-cpu' usable=3D=
'yes'/>
+  <cpu type=3D'kvm' name=3D'z10BC.2' typename=3D'z10BC.2-s390-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z196' typename=3D'z196-s390-cpu' usable=3D'yes=
'/>
+  <cpu type=3D'kvm' name=3D'z9EC' typename=3D'z9EC-s390-cpu' usable=3D'yes=
'/>
+  <cpu type=3D'kvm' name=3D'z990-base' typename=3D'z990-base-s390-cpu' usa=
ble=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z10EC.3' typename=3D'z10EC.3-s390-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z900' typename=3D'z900-s390-cpu' usable=3D'yes=
'/>
+  <cpu type=3D'kvm' name=3D'z9EC.3-base' typename=3D'z9EC.3-base-s390-cpu'=
 usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z990.5-base' typename=3D'z990.5-base-s390-cpu'=
 usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z10EC.2' typename=3D'z10EC.2-s390-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z9BC.2' typename=3D'z9BC.2-s390-cpu' usable=3D=
'yes'/>
+  <cpu type=3D'kvm' name=3D'z10EC' typename=3D'z10EC-s390-cpu' usable=3D'y=
es'/>
+  <cpu type=3D'kvm' name=3D'z990.3-base' typename=3D'z990.3-base-s390-cpu'=
 usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z14' typename=3D'z14-s390-cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z13s' typename=3D'z13s-s390-cpu' usable=3D'yes=
'/>
+  <cpu type=3D'kvm' name=3D'z10EC.3-base' typename=3D'z10EC.3-base-s390-cp=
u' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'zEC12.2-base' typename=3D'zEC12.2-base-s390-cp=
u' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z890.3-base' typename=3D'z890.3-base-s390-cpu'=
 usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z9EC.3' typename=3D'z9EC.3-s390-cpu' usable=3D=
'yes'/>
+  <cpu type=3D'kvm' name=3D'z990.5' typename=3D'z990.5-s390-cpu' usable=3D=
'yes'/>
+  <cpu type=3D'kvm' name=3D'z13' typename=3D'z13-s390-cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z13s-base' typename=3D'z13s-base-s390-cpu' usa=
ble=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z14-base' typename=3D'z14-base-s390-cpu' usabl=
e=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z9EC.2' typename=3D'z9EC.2-s390-cpu' usable=3D=
'yes'/>
+  <cpu type=3D'kvm' name=3D'z990.4' typename=3D'z990.4-s390-cpu' usable=3D=
'yes'/>
+  <cpu type=3D'kvm' name=3D'zEC12-base' typename=3D'zEC12-base-s390-cpu' u=
sable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z9EC.2-base' typename=3D'z9EC.2-base-s390-cpu'=
 usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'zBC12' typename=3D'zBC12-s390-cpu' usable=3D'y=
es'/>
+  <cpu type=3D'kvm' name=3D'z196.2' typename=3D'z196.2-s390-cpu' usable=3D=
'yes'/>
+  <cpu type=3D'kvm' name=3D'z990.3' typename=3D'z990.3-s390-cpu' usable=3D=
'yes'/>
+  <cpu type=3D'kvm' name=3D'z990.2-base' typename=3D'z990.2-base-s390-cpu'=
 usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z900.3-base' typename=3D'z900.3-base-s390-cpu'=
 usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z890.3' typename=3D'z890.3-s390-cpu' usable=3D=
'yes'/>
+  <cpu type=3D'kvm' name=3D'z10EC.2-base' typename=3D'z10EC.2-base-s390-cp=
u' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z990.2' typename=3D'z990.2-s390-cpu' usable=3D=
'yes'/>
+  <cpu type=3D'kvm' name=3D'z890.2' typename=3D'z890.2-s390-cpu' usable=3D=
'yes'/>
+  <cpu type=3D'kvm' name=3D'zBC12-base' typename=3D'zBC12-base-s390-cpu' u=
sable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z800-base' typename=3D'z800-base-s390-cpu' usa=
ble=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'zEC12' typename=3D'zEC12-s390-cpu' usable=3D'y=
es'/>
+  <cpu type=3D'kvm' name=3D'z9BC.2-base' typename=3D'z9BC.2-base-s390-cpu'=
 usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z9BC' typename=3D'z9BC-s390-cpu' usable=3D'yes=
'/>
+  <cpu type=3D'kvm' name=3D'z10BC.2-base' typename=3D'z10BC.2-base-s390-cp=
u' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z990.4-base' typename=3D'z990.4-base-s390-cpu'=
 usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'qemu' typename=3D'qemu-s390-cpu' usable=3D'yes=
'/>
+  <cpu type=3D'kvm' name=3D'z10BC-base' typename=3D'z10BC-base-s390-cpu' u=
sable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z9BC-base' typename=3D'z9BC-base-s390-cpu' usa=
ble=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z800' typename=3D'z800-s390-cpu' usable=3D'yes=
'/>
+  <cpu type=3D'kvm' name=3D'z890.2-base' typename=3D'z890.2-base-s390-cpu'=
 usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z13.2' typename=3D'z13.2-s390-cpu' usable=3D'y=
es'/>
+  <cpu type=3D'kvm' name=3D'z114-base' typename=3D'z114-base-s390-cpu' usa=
ble=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z196-base' typename=3D'z196-base-s390-cpu' usa=
ble=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z13-base' typename=3D'z13-base-s390-cpu' usabl=
e=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z890' typename=3D'z890-s390-cpu' usable=3D'yes=
'/>
+  <cpu type=3D'tcg' name=3D'z10EC-base' typename=3D'z10EC-base-s390-cpu' u=
sable=3D'no'>
     <blocker name=3D'dateh2'/>
     <blocker name=3D'pfpo'/>
     <blocker name=3D'dfphp'/>
@@ -221,7 +221,7 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z9EC-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z9EC-base' typename=3D'z9EC-base-s390-cpu' usa=
ble=3D'no'>
     <blocker name=3D'dateh2'/>
     <blocker name=3D'hfpue'/>
     <blocker name=3D'hfpm'/>
@@ -231,7 +231,7 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z196.2-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z196.2-base' typename=3D'z196.2-base-s390-cpu'=
 usable=3D'no'>
     <blocker name=3D'dateh2'/>
     <blocker name=3D'iacc2'/>
     <blocker name=3D'cmpsceh'/>
@@ -253,20 +253,20 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z900-base' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'z990' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z900-base' typename=3D'z900-base-s390-cpu' usa=
ble=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'z990' typename=3D'z990-s390-cpu' usable=3D'no'>
     <blocker name=3D'hfpm'/>
     <blocker name=3D'msa'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z900.2-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z900.2-base' typename=3D'z900.2-base-s390-cpu'=
 usable=3D'no'>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'host'/>
-  <cpu type=3D'tcg' name=3D'z900.3' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'host' typename=3D'host-s390-cpu'/>
+  <cpu type=3D'tcg' name=3D'z900.3' typename=3D'z900.3-s390-cpu' usable=3D=
'no'>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z114' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z114' typename=3D'z114-s390-cpu' usable=3D'no'>
     <blocker name=3D'cmm'/>
     <blocker name=3D'dateh2'/>
     <blocker name=3D'aefsi'/>
@@ -297,12 +297,12 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z890-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z890-base' typename=3D'z890-base-s390-cpu' usa=
ble=3D'no'>
     <blocker name=3D'hfpm'/>
     <blocker name=3D'msa'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z13.2-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z13.2-base' typename=3D'z13.2-base-s390-cpu' u=
sable=3D'no'>
     <blocker name=3D'dateh2'/>
     <blocker name=3D'dfppc'/>
     <blocker name=3D'iacc2'/>
@@ -327,7 +327,7 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'zEC12.2' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'zEC12.2' typename=3D'zEC12.2-s390-cpu' usable=
=3D'no'>
     <blocker name=3D'cmm'/>
     <blocker name=3D'dateh2'/>
     <blocker name=3D'esop'/>
@@ -367,7 +367,7 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z10BC' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z10BC' typename=3D'z10BC-s390-cpu' usable=3D'n=
o'>
     <blocker name=3D'cmm'/>
     <blocker name=3D'dateh2'/>
     <blocker name=3D'sthyi'/>
@@ -388,10 +388,10 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z900.2' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z900.2' typename=3D'z900.2-s390-cpu' usable=3D=
'no'>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z10BC.2' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z10BC.2' typename=3D'z10BC.2-s390-cpu' usable=
=3D'no'>
     <blocker name=3D'cmm'/>
     <blocker name=3D'dateh2'/>
     <blocker name=3D'sthyi'/>
@@ -412,7 +412,7 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z196' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z196' typename=3D'z196-s390-cpu' usable=3D'no'>
     <blocker name=3D'cmm'/>
     <blocker name=3D'dateh2'/>
     <blocker name=3D'aefsi'/>
@@ -443,7 +443,7 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z9EC' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z9EC' typename=3D'z9EC-s390-cpu' usable=3D'no'>
     <blocker name=3D'cmm'/>
     <blocker name=3D'dateh2'/>
     <blocker name=3D'sthyi'/>
@@ -456,12 +456,12 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z990-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z990-base' typename=3D'z990-base-s390-cpu' usa=
ble=3D'no'>
     <blocker name=3D'hfpm'/>
     <blocker name=3D'msa'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z10EC.3' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z10EC.3' typename=3D'z10EC.3-s390-cpu' usable=
=3D'no'>
     <blocker name=3D'cmm'/>
     <blocker name=3D'dateh2'/>
     <blocker name=3D'sthyi'/>
@@ -482,8 +482,8 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z900' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'z9EC.3-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z900' typename=3D'z900-s390-cpu' usable=3D'yes=
'/>
+  <cpu type=3D'tcg' name=3D'z9EC.3-base' typename=3D'z9EC.3-base-s390-cpu'=
 usable=3D'no'>
     <blocker name=3D'dateh2'/>
     <blocker name=3D'hfpue'/>
     <blocker name=3D'hfpm'/>
@@ -493,12 +493,12 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z990.5-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z990.5-base' typename=3D'z990.5-base-s390-cpu'=
 usable=3D'no'>
     <blocker name=3D'hfpm'/>
     <blocker name=3D'msa'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z10EC.2' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z10EC.2' typename=3D'z10EC.2-s390-cpu' usable=
=3D'no'>
     <blocker name=3D'cmm'/>
     <blocker name=3D'dateh2'/>
     <blocker name=3D'sthyi'/>
@@ -519,7 +519,7 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z9BC.2' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z9BC.2' typename=3D'z9BC.2-s390-cpu' usable=3D=
'no'>
     <blocker name=3D'cmm'/>
     <blocker name=3D'dateh2'/>
     <blocker name=3D'sthyi'/>
@@ -532,7 +532,7 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z10EC' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z10EC' typename=3D'z10EC-s390-cpu' usable=3D'n=
o'>
     <blocker name=3D'cmm'/>
     <blocker name=3D'dateh2'/>
     <blocker name=3D'sthyi'/>
@@ -553,12 +553,12 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z990.3-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z990.3-base' typename=3D'z990.3-base-s390-cpu'=
 usable=3D'no'>
     <blocker name=3D'hfpm'/>
     <blocker name=3D'msa'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z14' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z14' typename=3D'z14-s390-cpu' usable=3D'no'>
     <blocker name=3D'cmm'/>
     <blocker name=3D'dateh2'/>
     <blocker name=3D'esop'/>
@@ -615,7 +615,7 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z13s' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z13s' typename=3D'z13s-s390-cpu' usable=3D'no'>
     <blocker name=3D'cmm'/>
     <blocker name=3D'dateh2'/>
     <blocker name=3D'esop'/>
@@ -659,7 +659,7 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z10EC.3-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z10EC.3-base' typename=3D'z10EC.3-base-s390-cp=
u' usable=3D'no'>
     <blocker name=3D'dateh2'/>
     <blocker name=3D'pfpo'/>
     <blocker name=3D'dfphp'/>
@@ -675,7 +675,7 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'zEC12.2-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'zEC12.2-base' typename=3D'zEC12.2-base-s390-cp=
u' usable=3D'no'>
     <blocker name=3D'dateh2'/>
     <blocker name=3D'iacc2'/>
     <blocker name=3D'dfpzc'/>
@@ -698,12 +698,12 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z890.3-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z890.3-base' typename=3D'z890.3-base-s390-cpu'=
 usable=3D'no'>
     <blocker name=3D'hfpm'/>
     <blocker name=3D'msa'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z9EC.3' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z9EC.3' typename=3D'z9EC.3-s390-cpu' usable=3D=
'no'>
     <blocker name=3D'cmm'/>
     <blocker name=3D'dateh2'/>
     <blocker name=3D'sthyi'/>
@@ -716,12 +716,12 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z990.5' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z990.5' typename=3D'z990.5-s390-cpu' usable=3D=
'no'>
     <blocker name=3D'hfpm'/>
     <blocker name=3D'msa'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z13' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z13' typename=3D'z13-s390-cpu' usable=3D'no'>
     <blocker name=3D'cmm'/>
     <blocker name=3D'dateh2'/>
     <blocker name=3D'esop'/>
@@ -765,7 +765,7 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z13s-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z13s-base' typename=3D'z13s-base-s390-cpu' usa=
ble=3D'no'>
     <blocker name=3D'dateh2'/>
     <blocker name=3D'dfppc'/>
     <blocker name=3D'iacc2'/>
@@ -790,7 +790,7 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z14-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z14-base' typename=3D'z14-base-s390-cpu' usabl=
e=3D'no'>
     <blocker name=3D'dateh2'/>
     <blocker name=3D'dfppc'/>
     <blocker name=3D'tsi'/>
@@ -820,7 +820,7 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z9EC.2' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z9EC.2' typename=3D'z9EC.2-s390-cpu' usable=3D=
'no'>
     <blocker name=3D'cmm'/>
     <blocker name=3D'dateh2'/>
     <blocker name=3D'sthyi'/>
@@ -833,12 +833,12 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z990.4' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z990.4' typename=3D'z990.4-s390-cpu' usable=3D=
'no'>
     <blocker name=3D'hfpm'/>
     <blocker name=3D'msa'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'zEC12-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'zEC12-base' typename=3D'zEC12-base-s390-cpu' u=
sable=3D'no'>
     <blocker name=3D'dateh2'/>
     <blocker name=3D'iacc2'/>
     <blocker name=3D'dfpzc'/>
@@ -861,7 +861,7 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z9EC.2-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z9EC.2-base' typename=3D'z9EC.2-base-s390-cpu'=
 usable=3D'no'>
     <blocker name=3D'dateh2'/>
     <blocker name=3D'hfpue'/>
     <blocker name=3D'hfpm'/>
@@ -871,7 +871,7 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'zBC12' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'zBC12' typename=3D'zBC12-s390-cpu' usable=3D'n=
o'>
     <blocker name=3D'cmm'/>
     <blocker name=3D'dateh2'/>
     <blocker name=3D'esop'/>
@@ -911,7 +911,7 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z196.2' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z196.2' typename=3D'z196.2-s390-cpu' usable=3D=
'no'>
     <blocker name=3D'cmm'/>
     <blocker name=3D'dateh2'/>
     <blocker name=3D'aefsi'/>
@@ -942,25 +942,25 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z990.3' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z990.3' typename=3D'z990.3-s390-cpu' usable=3D=
'no'>
     <blocker name=3D'hfpm'/>
     <blocker name=3D'msa'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z990.2-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z990.2-base' typename=3D'z990.2-base-s390-cpu'=
 usable=3D'no'>
     <blocker name=3D'hfpm'/>
     <blocker name=3D'msa'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z900.3-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z900.3-base' typename=3D'z900.3-base-s390-cpu'=
 usable=3D'no'>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z890.3' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z890.3' typename=3D'z890.3-s390-cpu' usable=3D=
'no'>
     <blocker name=3D'hfpm'/>
     <blocker name=3D'msa'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z10EC.2-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z10EC.2-base' typename=3D'z10EC.2-base-s390-cp=
u' usable=3D'no'>
     <blocker name=3D'dateh2'/>
     <blocker name=3D'pfpo'/>
     <blocker name=3D'dfphp'/>
@@ -976,17 +976,17 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z990.2' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z990.2' typename=3D'z990.2-s390-cpu' usable=3D=
'no'>
     <blocker name=3D'hfpm'/>
     <blocker name=3D'msa'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z890.2' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z890.2' typename=3D'z890.2-s390-cpu' usable=3D=
'no'>
     <blocker name=3D'hfpm'/>
     <blocker name=3D'msa'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'zBC12-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'zBC12-base' typename=3D'zBC12-base-s390-cpu' u=
sable=3D'no'>
     <blocker name=3D'dateh2'/>
     <blocker name=3D'iacc2'/>
     <blocker name=3D'dfpzc'/>
@@ -1009,10 +1009,10 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z800-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z800-base' typename=3D'z800-base-s390-cpu' usa=
ble=3D'no'>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'zEC12' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'zEC12' typename=3D'zEC12-s390-cpu' usable=3D'n=
o'>
     <blocker name=3D'cmm'/>
     <blocker name=3D'dateh2'/>
     <blocker name=3D'esop'/>
@@ -1052,7 +1052,7 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z9BC.2-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z9BC.2-base' typename=3D'z9BC.2-base-s390-cpu'=
 usable=3D'no'>
     <blocker name=3D'dateh2'/>
     <blocker name=3D'hfpue'/>
     <blocker name=3D'hfpm'/>
@@ -1062,7 +1062,7 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z9BC' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z9BC' typename=3D'z9BC-s390-cpu' usable=3D'no'>
     <blocker name=3D'cmm'/>
     <blocker name=3D'dateh2'/>
     <blocker name=3D'sthyi'/>
@@ -1075,7 +1075,7 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z10BC.2-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z10BC.2-base' typename=3D'z10BC.2-base-s390-cp=
u' usable=3D'no'>
     <blocker name=3D'dateh2'/>
     <blocker name=3D'pfpo'/>
     <blocker name=3D'dfphp'/>
@@ -1091,13 +1091,13 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z990.4-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z990.4-base' typename=3D'z990.4-base-s390-cpu'=
 usable=3D'no'>
     <blocker name=3D'hfpm'/>
     <blocker name=3D'msa'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'qemu' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'z10BC-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'qemu' typename=3D'qemu-s390-cpu' usable=3D'yes=
'/>
+  <cpu type=3D'tcg' name=3D'z10BC-base' typename=3D'z10BC-base-s390-cpu' u=
sable=3D'no'>
     <blocker name=3D'dateh2'/>
     <blocker name=3D'pfpo'/>
     <blocker name=3D'dfphp'/>
@@ -1113,7 +1113,7 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z9BC-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z9BC-base' typename=3D'z9BC-base-s390-cpu' usa=
ble=3D'no'>
     <blocker name=3D'dateh2'/>
     <blocker name=3D'hfpue'/>
     <blocker name=3D'hfpm'/>
@@ -1123,15 +1123,15 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z800' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z800' typename=3D'z800-s390-cpu' usable=3D'no'>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z890.2-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z890.2-base' typename=3D'z890.2-base-s390-cpu'=
 usable=3D'no'>
     <blocker name=3D'hfpm'/>
     <blocker name=3D'msa'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z13.2' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z13.2' typename=3D'z13.2-s390-cpu' usable=3D'n=
o'>
     <blocker name=3D'cmm'/>
     <blocker name=3D'dateh2'/>
     <blocker name=3D'esop'/>
@@ -1175,7 +1175,7 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z114-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z114-base' typename=3D'z114-base-s390-cpu' usa=
ble=3D'no'>
     <blocker name=3D'dateh2'/>
     <blocker name=3D'iacc2'/>
     <blocker name=3D'cmpsceh'/>
@@ -1197,7 +1197,7 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z196-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z196-base' typename=3D'z196-base-s390-cpu' usa=
ble=3D'no'>
     <blocker name=3D'dateh2'/>
     <blocker name=3D'iacc2'/>
     <blocker name=3D'cmpsceh'/>
@@ -1219,7 +1219,7 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z13-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z13-base' typename=3D'z13-base-s390-cpu' usabl=
e=3D'no'>
     <blocker name=3D'dateh2'/>
     <blocker name=3D'dfppc'/>
     <blocker name=3D'iacc2'/>
@@ -1244,7 +1244,7 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z890' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z890' typename=3D'z890-s390-cpu' usable=3D'no'>
     <blocker name=3D'hfpm'/>
     <blocker name=3D'msa'/>
     <blocker name=3D'type'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemu=
capabilitiesdata/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=3D'avx512pf' type=3D'boolean' value=3D'false'/>
     <property name=3D'xstore-en' type=3D'boolean' value=3D'false'/>
   </hostCPU>
-  <cpu type=3D'kvm' name=3D'max' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'host' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'qemu64' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'qemu32' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'phenom' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'max' typename=3D'max-x86_64-cpu' usable=3D'yes=
'/>
+  <cpu type=3D'kvm' name=3D'host' typename=3D'host-x86_64-cpu' usable=3D'y=
es'/>
+  <cpu type=3D'kvm' name=3D'base' typename=3D'base-x86_64-cpu' usable=3D'y=
es'/>
+  <cpu type=3D'kvm' name=3D'qemu64' typename=3D'qemu64-x86_64-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'qemu32' typename=3D'qemu32-x86_64-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'phenom' typename=3D'phenom-x86_64-cpu' usable=
=3D'no'>
     <blocker name=3D'mmxext'/>
     <blocker name=3D'fxsr-opt'/>
     <blocker name=3D'3dnowext'/>
@@ -667,21 +667,21 @@
     <blocker name=3D'sse4a'/>
     <blocker name=3D'npt'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'pentium3' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'pentium2' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'pentium' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'n270' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'kvm64' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'kvm32' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'coreduo' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'core2duo' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'athlon' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'pentium3' typename=3D'pentium3-x86_64-cpu' usa=
ble=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'pentium2' typename=3D'pentium2-x86_64-cpu' usa=
ble=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'pentium' typename=3D'pentium-x86_64-cpu' usabl=
e=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'n270' typename=3D'n270-x86_64-cpu' usable=3D'y=
es'/>
+  <cpu type=3D'kvm' name=3D'kvm64' typename=3D'kvm64-x86_64-cpu' usable=3D=
'yes'/>
+  <cpu type=3D'kvm' name=3D'kvm32' typename=3D'kvm32-x86_64-cpu' usable=3D=
'yes'/>
+  <cpu type=3D'kvm' name=3D'coreduo' typename=3D'coreduo-x86_64-cpu' usabl=
e=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'core2duo' typename=3D'core2duo-x86_64-cpu' usa=
ble=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'athlon' typename=3D'athlon-x86_64-cpu' usable=
=3D'no'>
     <blocker name=3D'mmxext'/>
     <blocker name=3D'3dnowext'/>
     <blocker name=3D'3dnow'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Westmere' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Skylake-Server' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Westmere' typename=3D'Westmere-x86_64-cpu' usa=
ble=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Skylake-Server' typename=3D'Skylake-Server-x86=
_64-cpu' usable=3D'no'>
     <blocker name=3D'hle'/>
     <blocker name=3D'rtm'/>
     <blocker name=3D'mpx'/>
@@ -703,7 +703,7 @@
     <blocker name=3D'avx512f'/>
     <blocker name=3D'avx512f'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Skylake-Client' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Skylake-Client' typename=3D'Skylake-Client-x86=
_64-cpu' usable=3D'no'>
     <blocker name=3D'hle'/>
     <blocker name=3D'rtm'/>
     <blocker name=3D'mpx'/>
@@ -716,9 +716,9 @@
     <blocker name=3D'mpx'/>
     <blocker name=3D'mpx'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'SandyBridge' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Penryn' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Opteron_G5' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'SandyBridge' typename=3D'SandyBridge-x86_64-cp=
u' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Penryn' typename=3D'Penryn-x86_64-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Opteron_G5' typename=3D'Opteron_G5-x86_64-cpu'=
 usable=3D'no'>
     <blocker name=3D'sse4a'/>
     <blocker name=3D'misalignsse'/>
     <blocker name=3D'3dnowprefetch'/>
@@ -726,28 +726,28 @@
     <blocker name=3D'fma4'/>
     <blocker name=3D'tbm'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Opteron_G4' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Opteron_G4' typename=3D'Opteron_G4-x86_64-cpu'=
 usable=3D'no'>
     <blocker name=3D'sse4a'/>
     <blocker name=3D'misalignsse'/>
     <blocker name=3D'3dnowprefetch'/>
     <blocker name=3D'xop'/>
     <blocker name=3D'fma4'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Opteron_G3' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Opteron_G3' typename=3D'Opteron_G3-x86_64-cpu'=
 usable=3D'no'>
     <blocker name=3D'sse4a'/>
     <blocker name=3D'misalignsse'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Opteron_G2' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Opteron_G1' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Nehalem' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'IvyBridge' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Haswell' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Opteron_G2' typename=3D'Opteron_G2-x86_64-cpu'=
 usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Opteron_G1' typename=3D'Opteron_G1-x86_64-cpu'=
 usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Nehalem' typename=3D'Nehalem-x86_64-cpu' usabl=
e=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'IvyBridge' typename=3D'IvyBridge-x86_64-cpu' u=
sable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Haswell' typename=3D'Haswell-x86_64-cpu' usabl=
e=3D'no'>
     <blocker name=3D'hle'/>
     <blocker name=3D'rtm'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Haswell-noTSX' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Conroe' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Broadwell' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Haswell-noTSX' typename=3D'Haswell-noTSX-x86_6=
4-cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Conroe' typename=3D'Conroe-x86_64-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Broadwell' typename=3D'Broadwell-x86_64-cpu' u=
sable=3D'no'>
     <blocker name=3D'hle'/>
     <blocker name=3D'rtm'/>
     <blocker name=3D'rdseed'/>
@@ -755,35 +755,35 @@
     <blocker name=3D'smap'/>
     <blocker name=3D'3dnowprefetch'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Broadwell-noTSX' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Broadwell-noTSX' typename=3D'Broadwell-noTSX-x=
86_64-cpu' usable=3D'no'>
     <blocker name=3D'rdseed'/>
     <blocker name=3D'adx'/>
     <blocker name=3D'smap'/>
     <blocker name=3D'3dnowprefetch'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'486' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'max' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'host' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'486' typename=3D'486-x86_64-cpu' usable=3D'yes=
'/>
+  <cpu type=3D'tcg' name=3D'max' typename=3D'max-x86_64-cpu' usable=3D'yes=
'/>
+  <cpu type=3D'tcg' name=3D'host' typename=3D'host-x86_64-cpu' usable=3D'n=
o'>
     <blocker name=3D'kvm'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'base' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'qemu64' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'qemu32' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'phenom' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'base' typename=3D'base-x86_64-cpu' usable=3D'y=
es'/>
+  <cpu type=3D'tcg' name=3D'qemu64' typename=3D'qemu64-x86_64-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'qemu32' typename=3D'qemu32-x86_64-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'phenom' typename=3D'phenom-x86_64-cpu' usable=
=3D'no'>
     <blocker name=3D'fxsr-opt'/>
     <blocker name=3D'npt'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'pentium3' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'pentium2' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'pentium' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'n270' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'kvm64' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'kvm32' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'coreduo' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'core2duo' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'athlon' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'Westmere' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'Skylake-Server' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'pentium3' typename=3D'pentium3-x86_64-cpu' usa=
ble=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'pentium2' typename=3D'pentium2-x86_64-cpu' usa=
ble=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'pentium' typename=3D'pentium-x86_64-cpu' usabl=
e=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'n270' typename=3D'n270-x86_64-cpu' usable=3D'y=
es'/>
+  <cpu type=3D'tcg' name=3D'kvm64' typename=3D'kvm64-x86_64-cpu' usable=3D=
'yes'/>
+  <cpu type=3D'tcg' name=3D'kvm32' typename=3D'kvm32-x86_64-cpu' usable=3D=
'yes'/>
+  <cpu type=3D'tcg' name=3D'coreduo' typename=3D'coreduo-x86_64-cpu' usabl=
e=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'core2duo' typename=3D'core2duo-x86_64-cpu' usa=
ble=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'athlon' typename=3D'athlon-x86_64-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'Westmere' typename=3D'Westmere-x86_64-cpu' usa=
ble=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'Skylake-Server' typename=3D'Skylake-Server-x86=
_64-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -804,7 +804,7 @@
     <blocker name=3D'3dnowprefetch'/>
     <blocker name=3D'xsavec'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Skylake-Client' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Skylake-Client' typename=3D'Skylake-Client-x86=
_64-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -820,13 +820,13 @@
     <blocker name=3D'3dnowprefetch'/>
     <blocker name=3D'xsavec'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'SandyBridge' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'SandyBridge' typename=3D'SandyBridge-x86_64-cp=
u' usable=3D'no'>
     <blocker name=3D'x2apic'/>
     <blocker name=3D'tsc-deadline'/>
     <blocker name=3D'avx'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Penryn' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'Opteron_G5' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Penryn' typename=3D'Penryn-x86_64-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'Opteron_G5' typename=3D'Opteron_G5-x86_64-cpu'=
 usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'avx'/>
     <blocker name=3D'f16c'/>
@@ -836,27 +836,27 @@
     <blocker name=3D'fma4'/>
     <blocker name=3D'tbm'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Opteron_G4' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Opteron_G4' typename=3D'Opteron_G4-x86_64-cpu'=
 usable=3D'no'>
     <blocker name=3D'avx'/>
     <blocker name=3D'misalignsse'/>
     <blocker name=3D'3dnowprefetch'/>
     <blocker name=3D'xop'/>
     <blocker name=3D'fma4'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Opteron_G3' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Opteron_G3' typename=3D'Opteron_G3-x86_64-cpu'=
 usable=3D'no'>
     <blocker name=3D'misalignsse'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Opteron_G2' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'Opteron_G1' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'Nehalem' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'IvyBridge' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Opteron_G2' typename=3D'Opteron_G2-x86_64-cpu'=
 usable=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'Opteron_G1' typename=3D'Opteron_G1-x86_64-cpu'=
 usable=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'Nehalem' typename=3D'Nehalem-x86_64-cpu' usabl=
e=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'IvyBridge' typename=3D'IvyBridge-x86_64-cpu' u=
sable=3D'no'>
     <blocker name=3D'x2apic'/>
     <blocker name=3D'tsc-deadline'/>
     <blocker name=3D'avx'/>
     <blocker name=3D'f16c'/>
     <blocker name=3D'rdrand'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Haswell' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Haswell' typename=3D'Haswell-x86_64-cpu' usabl=
e=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -869,7 +869,7 @@
     <blocker name=3D'invpcid'/>
     <blocker name=3D'rtm'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Haswell-noTSX' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Haswell-noTSX' typename=3D'Haswell-noTSX-x86_6=
4-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -880,8 +880,8 @@
     <blocker name=3D'avx2'/>
     <blocker name=3D'invpcid'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Conroe' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'Broadwell' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Conroe' typename=3D'Conroe-x86_64-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'Broadwell' typename=3D'Broadwell-x86_64-cpu' u=
sable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -896,7 +896,7 @@
     <blocker name=3D'rdseed'/>
     <blocker name=3D'3dnowprefetch'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Broadwell-noTSX' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Broadwell-noTSX' typename=3D'Broadwell-noTSX-x=
86_64-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -909,7 +909,7 @@
     <blocker name=3D'rdseed'/>
     <blocker name=3D'3dnowprefetch'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'486' usable=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'486' typename=3D'486-x86_64-cpu' usable=3D'yes=
'/>
   <machine name=3D'pc-i440fx-2.10' alias=3D'pc' hotplugCpus=3D'yes' maxCpu=
s=3D'255' default=3D'yes'/>
   <machine name=3D'pc-0.12' hotplugCpus=3D'yes' maxCpus=3D'255'/>
   <machine name=3D'pc-i440fx-2.4' hotplugCpus=3D'yes' maxCpus=3D'255'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemuc=
apabilitiesdata/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=3D'te' type=3D'boolean' value=3D'true'/>
     <property name=3D'cmm' type=3D'boolean' value=3D'true'/>
   </hostCPU>
-  <cpu type=3D'kvm' name=3D'z890.2' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z990.4' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z10BC.2' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z196.2' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z14' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z9BC-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'zEC12-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z196-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z13-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z990.3' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'host' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z9EC' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'zBC12' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z9EC.3' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z196.2-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'qemu' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'zEC12.2-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z800-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z9EC.2' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z900.2-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z900.3' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z890-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z890' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z990.4-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z10BC.2-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z900.2' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z9BC.2-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z800' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z114' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z13' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z990' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z13s-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z990.2' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z14-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z890.2-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z196' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z10EC' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z13s' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z900' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z10EC.3' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z10EC.2-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z114-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z990.2-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z9EC.2-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z890.3' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z900.3-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z9BC.2' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z10BC' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z990.5' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'zEC12.2' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z10EC-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z9EC-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z9EC.3-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'zEC12' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z990.5-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z10BC-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z900-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z13.2' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'zBC12-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z13.2-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z890.3-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z990-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z10EC.2' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z9BC' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z10EC.3-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z990.3-base' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'z890.2' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'z890.2' typename=3D'z890.2-s390x-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z990.4' typename=3D'z990.4-s390x-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z10BC.2' typename=3D'z10BC.2-s390x-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z196.2' typename=3D'z196.2-s390x-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z14' typename=3D'z14-s390x-cpu' usable=3D'yes'=
/>
+  <cpu type=3D'kvm' name=3D'z9BC-base' typename=3D'z9BC-base-s390x-cpu' us=
able=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'zEC12-base' typename=3D'zEC12-base-s390x-cpu' =
usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z196-base' typename=3D'z196-base-s390x-cpu' us=
able=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z13-base' typename=3D'z13-base-s390x-cpu' usab=
le=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z990.3' typename=3D'z990.3-s390x-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'host' typename=3D'host-s390x-cpu' usable=3D'ye=
s'/>
+  <cpu type=3D'kvm' name=3D'z9EC' typename=3D'z9EC-s390x-cpu' usable=3D'ye=
s'/>
+  <cpu type=3D'kvm' name=3D'zBC12' typename=3D'zBC12-s390x-cpu' usable=3D'=
yes'/>
+  <cpu type=3D'kvm' name=3D'z9EC.3' typename=3D'z9EC.3-s390x-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z196.2-base' typename=3D'z196.2-base-s390x-cpu=
' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'qemu' typename=3D'qemu-s390x-cpu' usable=3D'ye=
s'/>
+  <cpu type=3D'kvm' name=3D'zEC12.2-base' typename=3D'zEC12.2-base-s390x-c=
pu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z800-base' typename=3D'z800-base-s390x-cpu' us=
able=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z9EC.2' typename=3D'z9EC.2-s390x-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z900.2-base' typename=3D'z900.2-base-s390x-cpu=
' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z900.3' typename=3D'z900.3-s390x-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z890-base' typename=3D'z890-base-s390x-cpu' us=
able=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z890' typename=3D'z890-s390x-cpu' usable=3D'ye=
s'/>
+  <cpu type=3D'kvm' name=3D'z990.4-base' typename=3D'z990.4-base-s390x-cpu=
' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z10BC.2-base' typename=3D'z10BC.2-base-s390x-c=
pu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z900.2' typename=3D'z900.2-s390x-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z9BC.2-base' typename=3D'z9BC.2-base-s390x-cpu=
' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z800' typename=3D'z800-s390x-cpu' usable=3D'ye=
s'/>
+  <cpu type=3D'kvm' name=3D'z114' typename=3D'z114-s390x-cpu' usable=3D'ye=
s'/>
+  <cpu type=3D'kvm' name=3D'z13' typename=3D'z13-s390x-cpu' usable=3D'yes'=
/>
+  <cpu type=3D'kvm' name=3D'z990' typename=3D'z990-s390x-cpu' usable=3D'ye=
s'/>
+  <cpu type=3D'kvm' name=3D'z13s-base' typename=3D'z13s-base-s390x-cpu' us=
able=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z990.2' typename=3D'z990.2-s390x-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z14-base' typename=3D'z14-base-s390x-cpu' usab=
le=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z890.2-base' typename=3D'z890.2-base-s390x-cpu=
' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z196' typename=3D'z196-s390x-cpu' usable=3D'ye=
s'/>
+  <cpu type=3D'kvm' name=3D'z10EC' typename=3D'z10EC-s390x-cpu' usable=3D'=
yes'/>
+  <cpu type=3D'kvm' name=3D'z13s' typename=3D'z13s-s390x-cpu' usable=3D'ye=
s'/>
+  <cpu type=3D'kvm' name=3D'z900' typename=3D'z900-s390x-cpu' usable=3D'ye=
s'/>
+  <cpu type=3D'kvm' name=3D'z10EC.3' typename=3D'z10EC.3-s390x-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z10EC.2-base' typename=3D'z10EC.2-base-s390x-c=
pu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z114-base' typename=3D'z114-base-s390x-cpu' us=
able=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z990.2-base' typename=3D'z990.2-base-s390x-cpu=
' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z9EC.2-base' typename=3D'z9EC.2-base-s390x-cpu=
' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z890.3' typename=3D'z890.3-s390x-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z900.3-base' typename=3D'z900.3-base-s390x-cpu=
' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z9BC.2' typename=3D'z9BC.2-s390x-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z10BC' typename=3D'z10BC-s390x-cpu' usable=3D'=
yes'/>
+  <cpu type=3D'kvm' name=3D'z990.5' typename=3D'z990.5-s390x-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'zEC12.2' typename=3D'zEC12.2-s390x-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z10EC-base' typename=3D'z10EC-base-s390x-cpu' =
usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z9EC-base' typename=3D'z9EC-base-s390x-cpu' us=
able=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z9EC.3-base' typename=3D'z9EC.3-base-s390x-cpu=
' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'zEC12' typename=3D'zEC12-s390x-cpu' usable=3D'=
yes'/>
+  <cpu type=3D'kvm' name=3D'z990.5-base' typename=3D'z990.5-base-s390x-cpu=
' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z10BC-base' typename=3D'z10BC-base-s390x-cpu' =
usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z900-base' typename=3D'z900-base-s390x-cpu' us=
able=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z13.2' typename=3D'z13.2-s390x-cpu' usable=3D'=
yes'/>
+  <cpu type=3D'kvm' name=3D'zBC12-base' typename=3D'zBC12-base-s390x-cpu' =
usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z13.2-base' typename=3D'z13.2-base-s390x-cpu' =
usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z890.3-base' typename=3D'z890.3-base-s390x-cpu=
' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z990-base' typename=3D'z990-base-s390x-cpu' us=
able=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z10EC.2' typename=3D'z10EC.2-s390x-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z9BC' typename=3D'z9BC-s390x-cpu' usable=3D'ye=
s'/>
+  <cpu type=3D'kvm' name=3D'z10EC.3-base' typename=3D'z10EC.3-base-s390x-c=
pu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z990.3-base' typename=3D'z990.3-base-s390x-cpu=
' usable=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'z890.2' typename=3D'z890.2-s390x-cpu' usable=
=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -226,7 +226,7 @@
     <blocker name=3D'hfpm'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z990.4' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z990.4' typename=3D'z990.4-s390x-cpu' usable=
=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -241,7 +241,7 @@
     <blocker name=3D'hfpm'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z10BC.2' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z10BC.2' typename=3D'z10BC.2-s390x-cpu' usable=
=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -271,7 +271,7 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z196.2' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z196.2' typename=3D'z196.2-s390x-cpu' usable=
=3D'no'>
     <blocker name=3D'pcc-xts-eaes-256'/>
     <blocker name=3D'pcc-xts-eaes-128'/>
     <blocker name=3D'pcc-xts-aes-256'/>
@@ -393,7 +393,7 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z14' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z14' typename=3D'z14-s390x-cpu' usable=3D'no'>
     <blocker name=3D'ppno-sha-512-drng'/>
     <blocker name=3D'pcc-xts-eaes-256'/>
     <blocker name=3D'pcc-xts-eaes-128'/>
@@ -540,7 +540,7 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z9BC-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z9BC-base' typename=3D'z9BC-base-s390x-cpu' us=
able=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -559,7 +559,7 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'zEC12-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'zEC12-base' typename=3D'zEC12-base-s390x-cpu' =
usable=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -591,7 +591,7 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z196-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z196-base' typename=3D'z196-base-s390x-cpu' us=
able=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -622,7 +622,7 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z13-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z13-base' typename=3D'z13-base-s390x-cpu' usab=
le=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -656,7 +656,7 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z990.3' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z990.3' typename=3D'z990.3-s390x-cpu' usable=
=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -671,8 +671,8 @@
     <blocker name=3D'hfpm'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'host'/>
-  <cpu type=3D'tcg' name=3D'z9EC' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'host' typename=3D'host-s390x-cpu'/>
+  <cpu type=3D'tcg' name=3D'z9EC' typename=3D'z9EC-s390x-cpu' usable=3D'no=
'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -694,7 +694,7 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'zBC12' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'zBC12' typename=3D'zBC12-s390x-cpu' usable=3D'=
no'>
     <blocker name=3D'pcc-xts-eaes-256'/>
     <blocker name=3D'pcc-xts-eaes-128'/>
     <blocker name=3D'pcc-xts-aes-256'/>
@@ -825,7 +825,7 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z9EC.3' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z9EC.3' typename=3D'z9EC.3-s390x-cpu' usable=
=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -847,7 +847,7 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z196.2-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z196.2-base' typename=3D'z196.2-base-s390x-cpu=
' usable=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -878,8 +878,8 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'qemu' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'zEC12.2-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'qemu' typename=3D'qemu-s390x-cpu' usable=3D'ye=
s'/>
+  <cpu type=3D'tcg' name=3D'zEC12.2-base' typename=3D'zEC12.2-base-s390x-c=
pu' usable=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -911,10 +911,10 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z800-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z800-base' typename=3D'z800-base-s390x-cpu' us=
able=3D'no'>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z9EC.2' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z9EC.2' typename=3D'z9EC.2-s390x-cpu' usable=
=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -936,13 +936,13 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z900.2-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z900.2-base' typename=3D'z900.2-base-s390x-cpu=
' usable=3D'no'>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z900.3' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z900.3' typename=3D'z900.3-s390x-cpu' usable=
=3D'no'>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z890-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z890-base' typename=3D'z890-base-s390x-cpu' us=
able=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -957,7 +957,7 @@
     <blocker name=3D'hfpm'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z890' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z890' typename=3D'z890-s390x-cpu' usable=3D'no=
'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -972,7 +972,7 @@
     <blocker name=3D'hfpm'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z990.4-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z990.4-base' typename=3D'z990.4-base-s390x-cpu=
' usable=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -987,7 +987,7 @@
     <blocker name=3D'hfpm'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z10BC.2-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z10BC.2-base' typename=3D'z10BC.2-base-s390x-c=
pu' usable=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -1012,10 +1012,10 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z900.2' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z900.2' typename=3D'z900.2-s390x-cpu' usable=
=3D'no'>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z9BC.2-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z9BC.2-base' typename=3D'z9BC.2-base-s390x-cpu=
' usable=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -1034,10 +1034,10 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z800' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z800' typename=3D'z800-s390x-cpu' usable=3D'no=
'>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z114' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z114' typename=3D'z114-s390x-cpu' usable=3D'no=
'>
     <blocker name=3D'pcc-xts-eaes-256'/>
     <blocker name=3D'pcc-xts-eaes-128'/>
     <blocker name=3D'pcc-xts-aes-256'/>
@@ -1159,7 +1159,7 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z13' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z13' typename=3D'z13-s390x-cpu' usable=3D'no'>
     <blocker name=3D'ppno-sha-512-drng'/>
     <blocker name=3D'pcc-xts-eaes-256'/>
     <blocker name=3D'pcc-xts-eaes-128'/>
@@ -1294,7 +1294,7 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z990' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z990' typename=3D'z990-s390x-cpu' usable=3D'no=
'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -1309,7 +1309,7 @@
     <blocker name=3D'hfpm'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z13s-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z13s-base' typename=3D'z13s-base-s390x-cpu' us=
able=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -1343,7 +1343,7 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z990.2' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z990.2' typename=3D'z990.2-s390x-cpu' usable=
=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -1358,7 +1358,7 @@
     <blocker name=3D'hfpm'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z14-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z14-base' typename=3D'z14-base-s390x-cpu' usab=
le=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -1397,7 +1397,7 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z890.2-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z890.2-base' typename=3D'z890.2-base-s390x-cpu=
' usable=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -1412,7 +1412,7 @@
     <blocker name=3D'hfpm'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z196' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z196' typename=3D'z196-s390x-cpu' usable=3D'no=
'>
     <blocker name=3D'pcc-xts-eaes-256'/>
     <blocker name=3D'pcc-xts-eaes-128'/>
     <blocker name=3D'pcc-xts-aes-256'/>
@@ -1534,7 +1534,7 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z10EC' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z10EC' typename=3D'z10EC-s390x-cpu' usable=3D'=
no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -1564,7 +1564,7 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z13s' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z13s' typename=3D'z13s-s390x-cpu' usable=3D'no=
'>
     <blocker name=3D'ppno-sha-512-drng'/>
     <blocker name=3D'pcc-xts-eaes-256'/>
     <blocker name=3D'pcc-xts-eaes-128'/>
@@ -1699,8 +1699,8 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z900' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'z10EC.3' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z900' typename=3D'z900-s390x-cpu' usable=3D'ye=
s'/>
+  <cpu type=3D'tcg' name=3D'z10EC.3' typename=3D'z10EC.3-s390x-cpu' usable=
=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -1730,7 +1730,7 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z10EC.2-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z10EC.2-base' typename=3D'z10EC.2-base-s390x-c=
pu' usable=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -1755,7 +1755,7 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z114-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z114-base' typename=3D'z114-base-s390x-cpu' us=
able=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -1786,7 +1786,7 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z990.2-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z990.2-base' typename=3D'z990.2-base-s390x-cpu=
' usable=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -1801,7 +1801,7 @@
     <blocker name=3D'hfpm'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z9EC.2-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z9EC.2-base' typename=3D'z9EC.2-base-s390x-cpu=
' usable=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -1820,7 +1820,7 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z890.3' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z890.3' typename=3D'z890.3-s390x-cpu' usable=
=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -1835,10 +1835,10 @@
     <blocker name=3D'hfpm'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z900.3-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z900.3-base' typename=3D'z900.3-base-s390x-cpu=
' usable=3D'no'>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z9BC.2' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z9BC.2' typename=3D'z9BC.2-s390x-cpu' usable=
=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -1860,7 +1860,7 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z10BC' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z10BC' typename=3D'z10BC-s390x-cpu' usable=3D'=
no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -1890,7 +1890,7 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z990.5' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z990.5' typename=3D'z990.5-s390x-cpu' usable=
=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -1905,7 +1905,7 @@
     <blocker name=3D'hfpm'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'zEC12.2' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'zEC12.2' typename=3D'zEC12.2-s390x-cpu' usable=
=3D'no'>
     <blocker name=3D'pcc-xts-eaes-256'/>
     <blocker name=3D'pcc-xts-eaes-128'/>
     <blocker name=3D'pcc-xts-aes-256'/>
@@ -2036,7 +2036,7 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z10EC-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z10EC-base' typename=3D'z10EC-base-s390x-cpu' =
usable=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -2061,7 +2061,7 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z9EC-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z9EC-base' typename=3D'z9EC-base-s390x-cpu' us=
able=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -2080,7 +2080,7 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z9EC.3-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z9EC.3-base' typename=3D'z9EC.3-base-s390x-cpu=
' usable=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -2099,7 +2099,7 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'zEC12' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'zEC12' typename=3D'zEC12-s390x-cpu' usable=3D'=
no'>
     <blocker name=3D'pcc-xts-eaes-256'/>
     <blocker name=3D'pcc-xts-eaes-128'/>
     <blocker name=3D'pcc-xts-aes-256'/>
@@ -2230,7 +2230,7 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z990.5-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z990.5-base' typename=3D'z990.5-base-s390x-cpu=
' usable=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -2245,7 +2245,7 @@
     <blocker name=3D'hfpm'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z10BC-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z10BC-base' typename=3D'z10BC-base-s390x-cpu' =
usable=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -2270,8 +2270,8 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z900-base' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'z13.2' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z900-base' typename=3D'z900-base-s390x-cpu' us=
able=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'z13.2' typename=3D'z13.2-s390x-cpu' usable=3D'=
no'>
     <blocker name=3D'ppno-sha-512-drng'/>
     <blocker name=3D'pcc-xts-eaes-256'/>
     <blocker name=3D'pcc-xts-eaes-128'/>
@@ -2406,7 +2406,7 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'zBC12-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'zBC12-base' typename=3D'zBC12-base-s390x-cpu' =
usable=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -2438,7 +2438,7 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z13.2-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z13.2-base' typename=3D'z13.2-base-s390x-cpu' =
usable=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -2472,7 +2472,7 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z890.3-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z890.3-base' typename=3D'z890.3-base-s390x-cpu=
' usable=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -2487,7 +2487,7 @@
     <blocker name=3D'hfpm'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z990-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z990-base' typename=3D'z990-base-s390x-cpu' us=
able=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -2502,7 +2502,7 @@
     <blocker name=3D'hfpm'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z10EC.2' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z10EC.2' typename=3D'z10EC.2-s390x-cpu' usable=
=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -2532,7 +2532,7 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z9BC' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z9BC' typename=3D'z9BC-s390x-cpu' usable=3D'no=
'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -2554,7 +2554,7 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z10EC.3-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z10EC.3-base' typename=3D'z10EC.3-base-s390x-c=
pu' usable=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -2579,7 +2579,7 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z990.3-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z990.3-base' typename=3D'z990.3-base-s390x-cpu=
' usable=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml b/tests/qemu=
capabilitiesdata/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=3D'avx512pf' type=3D'boolean' value=3D'false'/>
     <property name=3D'xstore-en' type=3D'boolean' value=3D'false'/>
   </hostCPU>
-  <cpu type=3D'kvm' name=3D'max' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'host' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'qemu64' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'qemu32' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'phenom' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'max' typename=3D'max-x86_64-cpu' usable=3D'yes=
'/>
+  <cpu type=3D'kvm' name=3D'host' typename=3D'host-x86_64-cpu' usable=3D'y=
es'/>
+  <cpu type=3D'kvm' name=3D'base' typename=3D'base-x86_64-cpu' usable=3D'y=
es'/>
+  <cpu type=3D'kvm' name=3D'qemu64' typename=3D'qemu64-x86_64-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'qemu32' typename=3D'qemu32-x86_64-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'phenom' typename=3D'phenom-x86_64-cpu' usable=
=3D'no'>
     <blocker name=3D'mmxext'/>
     <blocker name=3D'fxsr-opt'/>
     <blocker name=3D'3dnowext'/>
@@ -677,21 +677,21 @@
     <blocker name=3D'sse4a'/>
     <blocker name=3D'npt'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'pentium3' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'pentium2' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'pentium' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'n270' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'kvm64' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'kvm32' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'coreduo' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'core2duo' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'athlon' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'pentium3' typename=3D'pentium3-x86_64-cpu' usa=
ble=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'pentium2' typename=3D'pentium2-x86_64-cpu' usa=
ble=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'pentium' typename=3D'pentium-x86_64-cpu' usabl=
e=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'n270' typename=3D'n270-x86_64-cpu' usable=3D'y=
es'/>
+  <cpu type=3D'kvm' name=3D'kvm64' typename=3D'kvm64-x86_64-cpu' usable=3D=
'yes'/>
+  <cpu type=3D'kvm' name=3D'kvm32' typename=3D'kvm32-x86_64-cpu' usable=3D=
'yes'/>
+  <cpu type=3D'kvm' name=3D'coreduo' typename=3D'coreduo-x86_64-cpu' usabl=
e=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'core2duo' typename=3D'core2duo-x86_64-cpu' usa=
ble=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'athlon' typename=3D'athlon-x86_64-cpu' usable=
=3D'no'>
     <blocker name=3D'mmxext'/>
     <blocker name=3D'3dnowext'/>
     <blocker name=3D'3dnow'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Westmere' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Skylake-Server' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Westmere' typename=3D'Westmere-x86_64-cpu' usa=
ble=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Skylake-Server' typename=3D'Skylake-Server-x86=
_64-cpu' usable=3D'no'>
     <blocker name=3D'avx512f'/>
     <blocker name=3D'avx512dq'/>
     <blocker name=3D'clwb'/>
@@ -702,33 +702,33 @@
     <blocker name=3D'avx512f'/>
     <blocker name=3D'avx512f'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Skylake-Client' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'SandyBridge' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Penryn' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Opteron_G5' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Skylake-Client' typename=3D'Skylake-Client-x86=
_64-cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'SandyBridge' typename=3D'SandyBridge-x86_64-cp=
u' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Penryn' typename=3D'Penryn-x86_64-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Opteron_G5' typename=3D'Opteron_G5-x86_64-cpu'=
 usable=3D'no'>
     <blocker name=3D'sse4a'/>
     <blocker name=3D'misalignsse'/>
     <blocker name=3D'xop'/>
     <blocker name=3D'fma4'/>
     <blocker name=3D'tbm'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Opteron_G4' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Opteron_G4' typename=3D'Opteron_G4-x86_64-cpu'=
 usable=3D'no'>
     <blocker name=3D'sse4a'/>
     <blocker name=3D'misalignsse'/>
     <blocker name=3D'xop'/>
     <blocker name=3D'fma4'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Opteron_G3' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Opteron_G3' typename=3D'Opteron_G3-x86_64-cpu'=
 usable=3D'no'>
     <blocker name=3D'sse4a'/>
     <blocker name=3D'misalignsse'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Opteron_G2' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Opteron_G1' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Nehalem' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'IvyBridge' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Haswell' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Haswell-noTSX' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'EPYC' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Opteron_G2' typename=3D'Opteron_G2-x86_64-cpu'=
 usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Opteron_G1' typename=3D'Opteron_G1-x86_64-cpu'=
 usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Nehalem' typename=3D'Nehalem-x86_64-cpu' usabl=
e=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'IvyBridge' typename=3D'IvyBridge-x86_64-cpu' u=
sable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Haswell' typename=3D'Haswell-x86_64-cpu' usabl=
e=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Haswell-noTSX' typename=3D'Haswell-noTSX-x86_6=
4-cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'EPYC' typename=3D'EPYC-x86_64-cpu' usable=3D'n=
o'>
     <blocker name=3D'sha-ni'/>
     <blocker name=3D'mmxext'/>
     <blocker name=3D'fxsr-opt'/>
@@ -737,32 +737,32 @@
     <blocker name=3D'misalignsse'/>
     <blocker name=3D'osvw'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Conroe' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Broadwell' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Broadwell-noTSX' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'486' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'max' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'host' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Conroe' typename=3D'Conroe-x86_64-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Broadwell' typename=3D'Broadwell-x86_64-cpu' u=
sable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Broadwell-noTSX' typename=3D'Broadwell-noTSX-x=
86_64-cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'486' typename=3D'486-x86_64-cpu' usable=3D'yes=
'/>
+  <cpu type=3D'tcg' name=3D'max' typename=3D'max-x86_64-cpu' usable=3D'yes=
'/>
+  <cpu type=3D'tcg' name=3D'host' typename=3D'host-x86_64-cpu' usable=3D'n=
o'>
     <blocker name=3D'kvm'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'base' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'qemu64' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'qemu32' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'phenom' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'base' typename=3D'base-x86_64-cpu' usable=3D'y=
es'/>
+  <cpu type=3D'tcg' name=3D'qemu64' typename=3D'qemu64-x86_64-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'qemu32' typename=3D'qemu32-x86_64-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'phenom' typename=3D'phenom-x86_64-cpu' usable=
=3D'no'>
     <blocker name=3D'fxsr-opt'/>
     <blocker name=3D'npt'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'pentium3' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'pentium2' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'pentium' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'n270' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'kvm64' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'kvm32' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'coreduo' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'core2duo' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'athlon' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'Westmere' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'Skylake-Server' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'pentium3' typename=3D'pentium3-x86_64-cpu' usa=
ble=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'pentium2' typename=3D'pentium2-x86_64-cpu' usa=
ble=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'pentium' typename=3D'pentium-x86_64-cpu' usabl=
e=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'n270' typename=3D'n270-x86_64-cpu' usable=3D'y=
es'/>
+  <cpu type=3D'tcg' name=3D'kvm64' typename=3D'kvm64-x86_64-cpu' usable=3D=
'yes'/>
+  <cpu type=3D'tcg' name=3D'kvm32' typename=3D'kvm32-x86_64-cpu' usable=3D=
'yes'/>
+  <cpu type=3D'tcg' name=3D'coreduo' typename=3D'coreduo-x86_64-cpu' usabl=
e=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'core2duo' typename=3D'core2duo-x86_64-cpu' usa=
ble=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'athlon' typename=3D'athlon-x86_64-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'Westmere' typename=3D'Westmere-x86_64-cpu' usa=
ble=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'Skylake-Server' typename=3D'Skylake-Server-x86=
_64-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -783,7 +783,7 @@
     <blocker name=3D'3dnowprefetch'/>
     <blocker name=3D'xsavec'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Skylake-Client' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Skylake-Client' typename=3D'Skylake-Client-x86=
_64-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -799,13 +799,13 @@
     <blocker name=3D'3dnowprefetch'/>
     <blocker name=3D'xsavec'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'SandyBridge' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'SandyBridge' typename=3D'SandyBridge-x86_64-cp=
u' usable=3D'no'>
     <blocker name=3D'x2apic'/>
     <blocker name=3D'tsc-deadline'/>
     <blocker name=3D'avx'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Penryn' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'Opteron_G5' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Penryn' typename=3D'Penryn-x86_64-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'Opteron_G5' typename=3D'Opteron_G5-x86_64-cpu'=
 usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'avx'/>
     <blocker name=3D'f16c'/>
@@ -815,27 +815,27 @@
     <blocker name=3D'fma4'/>
     <blocker name=3D'tbm'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Opteron_G4' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Opteron_G4' typename=3D'Opteron_G4-x86_64-cpu'=
 usable=3D'no'>
     <blocker name=3D'avx'/>
     <blocker name=3D'misalignsse'/>
     <blocker name=3D'3dnowprefetch'/>
     <blocker name=3D'xop'/>
     <blocker name=3D'fma4'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Opteron_G3' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Opteron_G3' typename=3D'Opteron_G3-x86_64-cpu'=
 usable=3D'no'>
     <blocker name=3D'misalignsse'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Opteron_G2' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'Opteron_G1' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'Nehalem' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'IvyBridge' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Opteron_G2' typename=3D'Opteron_G2-x86_64-cpu'=
 usable=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'Opteron_G1' typename=3D'Opteron_G1-x86_64-cpu'=
 usable=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'Nehalem' typename=3D'Nehalem-x86_64-cpu' usabl=
e=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'IvyBridge' typename=3D'IvyBridge-x86_64-cpu' u=
sable=3D'no'>
     <blocker name=3D'x2apic'/>
     <blocker name=3D'tsc-deadline'/>
     <blocker name=3D'avx'/>
     <blocker name=3D'f16c'/>
     <blocker name=3D'rdrand'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Haswell' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Haswell' typename=3D'Haswell-x86_64-cpu' usabl=
e=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -848,7 +848,7 @@
     <blocker name=3D'invpcid'/>
     <blocker name=3D'rtm'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Haswell-noTSX' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Haswell-noTSX' typename=3D'Haswell-noTSX-x86_6=
4-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -859,7 +859,7 @@
     <blocker name=3D'avx2'/>
     <blocker name=3D'invpcid'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'EPYC' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'EPYC' typename=3D'EPYC-x86_64-cpu' usable=3D'n=
o'>
     <blocker name=3D'fma'/>
     <blocker name=3D'avx'/>
     <blocker name=3D'f16c'/>
@@ -873,8 +873,8 @@
     <blocker name=3D'osvw'/>
     <blocker name=3D'xsavec'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Conroe' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'Broadwell' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Conroe' typename=3D'Conroe-x86_64-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'Broadwell' typename=3D'Broadwell-x86_64-cpu' u=
sable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -889,7 +889,7 @@
     <blocker name=3D'rdseed'/>
     <blocker name=3D'3dnowprefetch'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Broadwell-noTSX' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Broadwell-noTSX' typename=3D'Broadwell-noTSX-x=
86_64-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -902,7 +902,7 @@
     <blocker name=3D'rdseed'/>
     <blocker name=3D'3dnowprefetch'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'486' usable=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'486' typename=3D'486-x86_64-cpu' usable=3D'yes=
'/>
   <machine name=3D'pc-i440fx-2.11' alias=3D'pc' hotplugCpus=3D'yes' maxCpu=
s=3D'255' default=3D'yes'/>
   <machine name=3D'pc-0.12' hotplugCpus=3D'yes' maxCpus=3D'255'/>
   <machine name=3D'pc-i440fx-2.4' hotplugCpus=3D'yes' maxCpus=3D'255'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qem=
ucapabilitiesdata/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=3D'kvm' name=3D'pxa262'/>
-  <cpu type=3D'kvm' name=3D'pxa270-a0'/>
-  <cpu type=3D'kvm' name=3D'arm1136'/>
-  <cpu type=3D'kvm' name=3D'cortex-a15'/>
-  <cpu type=3D'kvm' name=3D'pxa260'/>
-  <cpu type=3D'kvm' name=3D'arm1136-r2'/>
-  <cpu type=3D'kvm' name=3D'pxa261'/>
-  <cpu type=3D'kvm' name=3D'pxa255'/>
-  <cpu type=3D'kvm' name=3D'cortex-m33'/>
-  <cpu type=3D'kvm' name=3D'arm926'/>
-  <cpu type=3D'kvm' name=3D'arm11mpcore'/>
-  <cpu type=3D'kvm' name=3D'pxa250'/>
-  <cpu type=3D'kvm' name=3D'ti925t'/>
-  <cpu type=3D'kvm' name=3D'cortex-a57'/>
-  <cpu type=3D'kvm' name=3D'sa1110'/>
-  <cpu type=3D'kvm' name=3D'host'/>
-  <cpu type=3D'kvm' name=3D'arm1176'/>
-  <cpu type=3D'kvm' name=3D'cortex-a53'/>
-  <cpu type=3D'kvm' name=3D'sa1100'/>
-  <cpu type=3D'kvm' name=3D'pxa270-c5'/>
-  <cpu type=3D'kvm' name=3D'cortex-a9'/>
-  <cpu type=3D'kvm' name=3D'cortex-a8'/>
-  <cpu type=3D'kvm' name=3D'cortex-a7'/>
-  <cpu type=3D'kvm' name=3D'pxa270-c0'/>
-  <cpu type=3D'kvm' name=3D'arm1026'/>
-  <cpu type=3D'kvm' name=3D'pxa270-b1'/>
-  <cpu type=3D'kvm' name=3D'cortex-m3'/>
-  <cpu type=3D'kvm' name=3D'max'/>
-  <cpu type=3D'kvm' name=3D'cortex-m4'/>
-  <cpu type=3D'kvm' name=3D'pxa270-b0'/>
-  <cpu type=3D'kvm' name=3D'arm946'/>
-  <cpu type=3D'kvm' name=3D'cortex-r5'/>
-  <cpu type=3D'kvm' name=3D'pxa270-a1'/>
-  <cpu type=3D'kvm' name=3D'pxa270'/>
-  <cpu type=3D'tcg' name=3D'pxa262'/>
-  <cpu type=3D'tcg' name=3D'pxa270-a0'/>
-  <cpu type=3D'tcg' name=3D'arm1136'/>
-  <cpu type=3D'tcg' name=3D'cortex-a15'/>
-  <cpu type=3D'tcg' name=3D'pxa260'/>
-  <cpu type=3D'tcg' name=3D'arm1136-r2'/>
-  <cpu type=3D'tcg' name=3D'pxa261'/>
-  <cpu type=3D'tcg' name=3D'pxa255'/>
-  <cpu type=3D'tcg' name=3D'cortex-m33'/>
-  <cpu type=3D'tcg' name=3D'arm926'/>
-  <cpu type=3D'tcg' name=3D'arm11mpcore'/>
-  <cpu type=3D'tcg' name=3D'pxa250'/>
-  <cpu type=3D'tcg' name=3D'ti925t'/>
-  <cpu type=3D'tcg' name=3D'cortex-a57'/>
-  <cpu type=3D'tcg' name=3D'sa1110'/>
-  <cpu type=3D'tcg' name=3D'host'/>
-  <cpu type=3D'tcg' name=3D'arm1176'/>
-  <cpu type=3D'tcg' name=3D'cortex-a53'/>
-  <cpu type=3D'tcg' name=3D'sa1100'/>
-  <cpu type=3D'tcg' name=3D'pxa270-c5'/>
-  <cpu type=3D'tcg' name=3D'cortex-a9'/>
-  <cpu type=3D'tcg' name=3D'cortex-a8'/>
-  <cpu type=3D'tcg' name=3D'cortex-a7'/>
-  <cpu type=3D'tcg' name=3D'pxa270-c0'/>
-  <cpu type=3D'tcg' name=3D'arm1026'/>
-  <cpu type=3D'tcg' name=3D'pxa270-b1'/>
-  <cpu type=3D'tcg' name=3D'cortex-m3'/>
-  <cpu type=3D'tcg' name=3D'max'/>
-  <cpu type=3D'tcg' name=3D'cortex-m4'/>
-  <cpu type=3D'tcg' name=3D'pxa270-b0'/>
-  <cpu type=3D'tcg' name=3D'arm946'/>
-  <cpu type=3D'tcg' name=3D'cortex-r5'/>
-  <cpu type=3D'tcg' name=3D'pxa270-a1'/>
-  <cpu type=3D'tcg' name=3D'pxa270'/>
+  <cpu type=3D'kvm' name=3D'pxa262' typename=3D'pxa262-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'pxa270-a0' typename=3D'pxa270-a0-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'arm1136' typename=3D'arm1136-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'cortex-a15' typename=3D'cortex-a15-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'pxa260' typename=3D'pxa260-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'arm1136-r2' typename=3D'arm1136-r2-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'pxa261' typename=3D'pxa261-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'pxa255' typename=3D'pxa255-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'cortex-m33' typename=3D'cortex-m33-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'arm926' typename=3D'arm926-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'arm11mpcore' typename=3D'arm11mpcore-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'pxa250' typename=3D'pxa250-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'ti925t' typename=3D'ti925t-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'cortex-a57' typename=3D'cortex-a57-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'sa1110' typename=3D'sa1110-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'host' typename=3D'host-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'arm1176' typename=3D'arm1176-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'cortex-a53' typename=3D'cortex-a53-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'sa1100' typename=3D'sa1100-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'pxa270-c5' typename=3D'pxa270-c5-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'cortex-a9' typename=3D'cortex-a9-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'cortex-a8' typename=3D'cortex-a8-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'cortex-a7' typename=3D'cortex-a7-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'pxa270-c0' typename=3D'pxa270-c0-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'arm1026' typename=3D'arm1026-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'pxa270-b1' typename=3D'pxa270-b1-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'cortex-m3' typename=3D'cortex-m3-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'max' typename=3D'max-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'cortex-m4' typename=3D'cortex-m4-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'pxa270-b0' typename=3D'pxa270-b0-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'arm946' typename=3D'arm946-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'cortex-r5' typename=3D'cortex-r5-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'pxa270-a1' typename=3D'pxa270-a1-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'pxa270' typename=3D'pxa270-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'pxa262' typename=3D'pxa262-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'pxa270-a0' typename=3D'pxa270-a0-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'arm1136' typename=3D'arm1136-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'cortex-a15' typename=3D'cortex-a15-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'pxa260' typename=3D'pxa260-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'arm1136-r2' typename=3D'arm1136-r2-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'pxa261' typename=3D'pxa261-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'pxa255' typename=3D'pxa255-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'cortex-m33' typename=3D'cortex-m33-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'arm926' typename=3D'arm926-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'arm11mpcore' typename=3D'arm11mpcore-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'pxa250' typename=3D'pxa250-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'ti925t' typename=3D'ti925t-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'cortex-a57' typename=3D'cortex-a57-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'sa1110' typename=3D'sa1110-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'host' typename=3D'host-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'arm1176' typename=3D'arm1176-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'cortex-a53' typename=3D'cortex-a53-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'sa1100' typename=3D'sa1100-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'pxa270-c5' typename=3D'pxa270-c5-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'cortex-a9' typename=3D'cortex-a9-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'cortex-a8' typename=3D'cortex-a8-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'cortex-a7' typename=3D'cortex-a7-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'pxa270-c0' typename=3D'pxa270-c0-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'arm1026' typename=3D'arm1026-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'pxa270-b1' typename=3D'pxa270-b1-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'cortex-m3' typename=3D'cortex-m3-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'max' typename=3D'max-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'cortex-m4' typename=3D'cortex-m4-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'pxa270-b0' typename=3D'pxa270-b0-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'arm946' typename=3D'arm946-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'cortex-r5' typename=3D'cortex-r5-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'pxa270-a1' typename=3D'pxa270-a1-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'pxa270' typename=3D'pxa270-arm-cpu'/>
   <machine name=3D'integratorcp' maxCpus=3D'1'/>
   <machine name=3D'nuri' maxCpus=3D'2'/>
   <machine name=3D'mps2-an511' maxCpus=3D'1'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemuc=
apabilitiesdata/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=3D'kvm' name=3D'default'/>
-  <cpu type=3D'kvm' name=3D'ppc'/>
-  <cpu type=3D'kvm' name=3D'ppc32'/>
-  <cpu type=3D'kvm' name=3D'ppc64'/>
-  <cpu type=3D'kvm' name=3D'970mp'/>
-  <cpu type=3D'kvm' name=3D'970fx'/>
-  <cpu type=3D'kvm' name=3D'970'/>
-  <cpu type=3D'kvm' name=3D'power9'/>
-  <cpu type=3D'kvm' name=3D'power8nvl'/>
-  <cpu type=3D'kvm' name=3D'power8'/>
-  <cpu type=3D'kvm' name=3D'power8e'/>
-  <cpu type=3D'kvm' name=3D'power7+'/>
-  <cpu type=3D'kvm' name=3D'power7'/>
-  <cpu type=3D'kvm' name=3D'power5gs'/>
-  <cpu type=3D'kvm' name=3D'power5+'/>
-  <cpu type=3D'kvm' name=3D'apollo7pm'/>
-  <cpu type=3D'kvm' name=3D'7457a'/>
-  <cpu type=3D'kvm' name=3D'7447a'/>
-  <cpu type=3D'kvm' name=3D'apollo7'/>
-  <cpu type=3D'kvm' name=3D'7457'/>
-  <cpu type=3D'kvm' name=3D'7447'/>
-  <cpu type=3D'kvm' name=3D'apollo6'/>
-  <cpu type=3D'kvm' name=3D'7455'/>
-  <cpu type=3D'kvm' name=3D'7445'/>
-  <cpu type=3D'kvm' name=3D'7451'/>
-  <cpu type=3D'kvm' name=3D'7441'/>
-  <cpu type=3D'kvm' name=3D'vger'/>
-  <cpu type=3D'kvm' name=3D'7450'/>
-  <cpu type=3D'kvm' name=3D'7448'/>
-  <cpu type=3D'kvm' name=3D'nitro'/>
-  <cpu type=3D'kvm' name=3D'7410'/>
-  <cpu type=3D'kvm' name=3D'g4'/>
-  <cpu type=3D'kvm' name=3D'max'/>
-  <cpu type=3D'kvm' name=3D'7400'/>
-  <cpu type=3D'kvm' name=3D'goldfinger'/>
-  <cpu type=3D'kvm' name=3D'755'/>
-  <cpu type=3D'kvm' name=3D'745'/>
-  <cpu type=3D'kvm' name=3D'lonestar'/>
-  <cpu type=3D'kvm' name=3D'750l'/>
-  <cpu type=3D'kvm' name=3D'750gx'/>
-  <cpu type=3D'kvm' name=3D'750fx'/>
-  <cpu type=3D'kvm' name=3D'750cxe'/>
-  <cpu type=3D'kvm' name=3D'750cx'/>
-  <cpu type=3D'kvm' name=3D'750cl'/>
-  <cpu type=3D'kvm' name=3D'conan/doyle'/>
-  <cpu type=3D'kvm' name=3D'g3'/>
-  <cpu type=3D'kvm' name=3D'typhoon'/>
-  <cpu type=3D'kvm' name=3D'750'/>
-  <cpu type=3D'kvm' name=3D'arthur'/>
-  <cpu type=3D'kvm' name=3D'740'/>
-  <cpu type=3D'kvm' name=3D'mach5'/>
-  <cpu type=3D'kvm' name=3D'sirocco'/>
-  <cpu type=3D'kvm' name=3D'604e'/>
-  <cpu type=3D'kvm' name=3D'goldeneye'/>
-  <cpu type=3D'kvm' name=3D'603r'/>
-  <cpu type=3D'kvm' name=3D'vaillant'/>
-  <cpu type=3D'kvm' name=3D'stretch'/>
-  <cpu type=3D'kvm' name=3D'603e'/>
-  <cpu type=3D'kvm' name=3D'vanilla'/>
-  <cpu type=3D'kvm' name=3D'601v'/>
-  <cpu type=3D'kvm' name=3D'601'/>
-  <cpu type=3D'kvm' name=3D'mpc8560'/>
-  <cpu type=3D'kvm' name=3D'mpc8555e'/>
-  <cpu type=3D'kvm' name=3D'mpc8555'/>
-  <cpu type=3D'kvm' name=3D'mpc8548e'/>
-  <cpu type=3D'kvm' name=3D'mpc8548'/>
-  <cpu type=3D'kvm' name=3D'mpc8547e'/>
-  <cpu type=3D'kvm' name=3D'mpc8545e'/>
-  <cpu type=3D'kvm' name=3D'mpc8545'/>
-  <cpu type=3D'kvm' name=3D'mpc8544e'/>
-  <cpu type=3D'kvm' name=3D'mpc8544'/>
-  <cpu type=3D'kvm' name=3D'mpc8543e'/>
-  <cpu type=3D'kvm' name=3D'mpc8543'/>
-  <cpu type=3D'kvm' name=3D'mpc8541e'/>
-  <cpu type=3D'kvm' name=3D'mpc8541'/>
-  <cpu type=3D'kvm' name=3D'mpc8540'/>
-  <cpu type=3D'kvm' name=3D'mpc8533e'/>
-  <cpu type=3D'kvm' name=3D'mpc8533'/>
-  <cpu type=3D'kvm' name=3D'e500v2'/>
-  <cpu type=3D'kvm' name=3D'e500v1'/>
-  <cpu type=3D'kvm' name=3D'e500'/>
-  <cpu type=3D'kvm' name=3D'mpc8347ea'/>
-  <cpu type=3D'kvm' name=3D'mpc8347e'/>
-  <cpu type=3D'kvm' name=3D'mpc8347a'/>
-  <cpu type=3D'kvm' name=3D'mpc8347'/>
-  <cpu type=3D'kvm' name=3D'e300'/>
-  <cpu type=3D'kvm' name=3D'e200'/>
-  <cpu type=3D'kvm' name=3D'mpc8280'/>
-  <cpu type=3D'kvm' name=3D'mpc8275'/>
-  <cpu type=3D'kvm' name=3D'mpc8272'/>
-  <cpu type=3D'kvm' name=3D'mpc8271'/>
-  <cpu type=3D'kvm' name=3D'mpc8270'/>
-  <cpu type=3D'kvm' name=3D'mpc8266_hip4'/>
-  <cpu type=3D'kvm' name=3D'mpc8266_hip3'/>
-  <cpu type=3D'kvm' name=3D'mpc8266'/>
-  <cpu type=3D'kvm' name=3D'mpc8265_hip4'/>
-  <cpu type=3D'kvm' name=3D'mpc8265_hip3'/>
-  <cpu type=3D'kvm' name=3D'mpc8265'/>
-  <cpu type=3D'kvm' name=3D'mpc8264_hip4'/>
-  <cpu type=3D'kvm' name=3D'mpc8264_hip3'/>
-  <cpu type=3D'kvm' name=3D'mpc8264'/>
-  <cpu type=3D'kvm' name=3D'mpc8260_hip4'/>
-  <cpu type=3D'kvm' name=3D'mpc8260_hip3'/>
-  <cpu type=3D'kvm' name=3D'mpc8260'/>
-  <cpu type=3D'kvm' name=3D'mpc8255_hip4'/>
-  <cpu type=3D'kvm' name=3D'mpc8255_hip3'/>
-  <cpu type=3D'kvm' name=3D'mpc8255'/>
-  <cpu type=3D'kvm' name=3D'mpc8250_hip4'/>
-  <cpu type=3D'kvm' name=3D'mpc8250_hip3'/>
-  <cpu type=3D'kvm' name=3D'mpc8250'/>
-  <cpu type=3D'kvm' name=3D'mpc8248'/>
-  <cpu type=3D'kvm' name=3D'mpc8247'/>
-  <cpu type=3D'kvm' name=3D'mpc8245'/>
-  <cpu type=3D'kvm' name=3D'mpc8241'/>
-  <cpu type=3D'kvm' name=3D'powerquicc-ii'/>
-  <cpu type=3D'kvm' name=3D'mpc82xx'/>
-  <cpu type=3D'kvm' name=3D'mpc5200b'/>
-  <cpu type=3D'kvm' name=3D'mpc5200'/>
-  <cpu type=3D'kvm' name=3D'mpc52xx'/>
-  <cpu type=3D'kvm' name=3D'mpc8240'/>
-  <cpu type=3D'kvm' name=3D'460ex'/>
-  <cpu type=3D'kvm' name=3D'440ep'/>
-  <cpu type=3D'kvm' name=3D'x2vp50'/>
-  <cpu type=3D'kvm' name=3D'x2vp7'/>
-  <cpu type=3D'kvm' name=3D'405gpe'/>
-  <cpu type=3D'kvm' name=3D'405gp'/>
-  <cpu type=3D'kvm' name=3D'405cr'/>
-  <cpu type=3D'kvm' name=3D'405'/>
-  <cpu type=3D'kvm' name=3D'403'/>
-  <cpu type=3D'kvm' name=3D'mpc8547e_v21'/>
-  <cpu type=3D'kvm' name=3D'750cl_v1.0'/>
-  <cpu type=3D'kvm' name=3D'7457a_v1.1'/>
-  <cpu type=3D'kvm' name=3D'g2gp'/>
-  <cpu type=3D'kvm' name=3D'750cxe_v2.1'/>
-  <cpu type=3D'kvm' name=3D'755_v2.7'/>
-  <cpu type=3D'kvm' name=3D'750_v2.1'/>
-  <cpu type=3D'kvm' name=3D'755_v2.2'/>
-  <cpu type=3D'kvm' name=3D'745_v2.0'/>
-  <cpu type=3D'kvm' name=3D'mpc8377'/>
-  <cpu type=3D'kvm' name=3D'7455_v1.0'/>
-  <cpu type=3D'kvm' name=3D'mpc8545_v21'/>
-  <cpu type=3D'kvm' name=3D'mpc8548_v11'/>
-  <cpu type=3D'kvm' name=3D'405d4'/>
-  <cpu type=3D'kvm' name=3D'g2le'/>
-  <cpu type=3D'kvm' name=3D'g2hip3'/>
-  <cpu type=3D'kvm' name=3D'750e'/>
-  <cpu type=3D'kvm' name=3D'mpc8572'/>
-  <cpu type=3D'kvm' name=3D'970fx_v2.0'/>
-  <cpu type=3D'kvm' name=3D'750fx_v2.0'/>
-  <cpu type=3D'kvm' name=3D'603p'/>
-  <cpu type=3D'kvm' name=3D'405gpb'/>
-  <cpu type=3D'kvm' name=3D'7400_v2.7'/>
-  <cpu type=3D'kvm' name=3D'mpc8544e_v10'/>
-  <cpu type=3D'kvm' name=3D'e500v2_v10'/>
-  <cpu type=3D'kvm' name=3D'e500mc'/>
-  <cpu type=3D'kvm' name=3D'603e7v1'/>
-  <cpu type=3D'kvm' name=3D'970mp_v1.0'/>
-  <cpu type=3D'kvm' name=3D'740e'/>
-  <cpu type=3D'kvm' name=3D'405crc'/>
-  <cpu type=3D'kvm' name=3D'403ga'/>
-  <cpu type=3D'kvm' name=3D'7447a_v1.0'/>
-  <cpu type=3D'kvm' name=3D'7400_v2.2'/>
-  <cpu type=3D'kvm' name=3D'e300c1'/>
-  <cpu type=3D'kvm' name=3D'mpc8572e'/>
-  <cpu type=3D'kvm' name=3D'e500v2_v21'/>
-  <cpu type=3D'kvm' name=3D'970fx_v1.0'/>
-  <cpu type=3D'kvm' name=3D'750gx_v1.2'/>
-  <cpu type=3D'kvm' name=3D'750fx_v1.0'/>
-  <cpu type=3D'kvm' name=3D'7457_v1.1'/>
-  <cpu type=3D'kvm' name=3D'970fx_v3.0'/>
-  <cpu type=3D'kvm' name=3D'604e_v2.2'/>
-  <cpu type=3D'kvm' name=3D'755_v2.6'/>
-  <cpu type=3D'kvm' name=3D'401a1'/>
-  <cpu type=3D'kvm' name=3D'power9_v1.0'/>
-  <cpu type=3D'kvm' name=3D'npe405h'/>
-  <cpu type=3D'kvm' name=3D'7410_v1.4'/>
-  <cpu type=3D'kvm' name=3D'g2ls'/>
-  <cpu type=3D'kvm' name=3D'750_v2.0'/>
-  <cpu type=3D'kvm' name=3D'401b2'/>
-  <cpu type=3D'kvm' name=3D'mpc8349'/>
-  <cpu type=3D'kvm' name=3D'mpc8347ep'/>
-  <cpu type=3D'kvm' name=3D'7445_v3.2'/>
-  <cpu type=3D'kvm' name=3D'mpc8540_v21'/>
-  <cpu type=3D'kvm' name=3D'mpc8543_v11'/>
-  <cpu type=3D'kvm' name=3D'403gcx'/>
-  <cpu type=3D'kvm' name=3D'745_v2.4'/>
-  <cpu type=3D'kvm' name=3D'mpc8548_v21'/>
-  <cpu type=3D'kvm' name=3D'750l_v3.2'/>
-  <cpu type=3D'kvm' name=3D'750_v1.0'/>
-  <cpu type=3D'kvm' name=3D'755_v1.1'/>
-  <cpu type=3D'kvm' name=3D'e500_v10'/>
-  <cpu type=3D'kvm' name=3D'750cxe_v3.0'/>
-  <cpu type=3D'kvm' name=3D'mpc8541e_v10'/>
-  <cpu type=3D'kvm' name=3D'mpc8347p'/>
-  <cpu type=3D'kvm' name=3D'mpc8555e_v10'/>
-  <cpu type=3D'kvm' name=3D'power9_v2.0'/>
-  <cpu type=3D'kvm' name=3D'power7_v2.3'/>
-  <cpu type=3D'kvm' name=3D'603e7v'/>
-  <cpu type=3D'kvm' name=3D'mpc8543e_v11'/>
-  <cpu type=3D'kvm' name=3D'750_v3.0'/>
-  <cpu type=3D'kvm' name=3D'7400_v2.6'/>
-  <cpu type=3D'kvm' name=3D'405gpa'/>
-  <cpu type=3D'kvm' name=3D'440epx'/>
-  <cpu type=3D'kvm' name=3D'750l_v2.2'/>
-  <cpu type=3D'kvm' name=3D'e200z6'/>
-  <cpu type=3D'kvm' name=3D'mpc8547e_v20'/>
-  <cpu type=3D'kvm' name=3D'7457a_v1.0'/>
-  <cpu type=3D'kvm' name=3D'mpc8349ea'/>
-  <cpu type=3D'kvm' name=3D'e500v2_v20'/>
-  <cpu type=3D'kvm' name=3D'power8nvl_v1.0'/>
-  <cpu type=3D'kvm' name=3D'mpc8540_v10'/>
-  <cpu type=3D'kvm' name=3D'755_v2.1'/>
-  <cpu type=3D'kvm' name=3D'745_v2.8'/>
-  <cpu type=3D'kvm' name=3D'npe405l'/>
-  <cpu type=3D'kvm' name=3D'mpc8343ea'/>
-  <cpu type=3D'kvm' name=3D'mpc8545_v20'/>
-  <cpu type=3D'kvm' name=3D'mpc8548_v10'/>
-  <cpu type=3D'kvm' name=3D'7448_v1.1'/>
-  <cpu type=3D'kvm' name=3D'7455_v3.4'/>
-  <cpu type=3D'kvm' name=3D'740_v2.2'/>
-  <cpu type=3D'kvm' name=3D'7400_v1.1'/>
-  <cpu type=3D'kvm' name=3D'mpc8347et'/>
-  <cpu type=3D'kvm' name=3D'7441_v2.10'/>
-  <cpu type=3D'kvm' name=3D'603e_v1.4'/>
-  <cpu type=3D'kvm' name=3D'mpc8543_v10'/>
-  <cpu type=3D'kvm' name=3D'401c2'/>
-  <cpu type=3D'kvm' name=3D'7451_v2.10'/>
-  <cpu type=3D'kvm' name=3D'750cx_v2.2'/>
-  <cpu type=3D'kvm' name=3D'mpc8543_v21'/>
-  <cpu type=3D'kvm' name=3D'603e7'/>
-  <cpu type=3D'kvm' name=3D'7448_v2.1'/>
-  <cpu type=3D'kvm' name=3D'7441_v2.3'/>
-  <cpu type=3D'kvm' name=3D'405crb'/>
-  <cpu type=3D'kvm' name=3D'604'/>
-  <cpu type=3D'kvm' name=3D'7400_v2.1'/>
-  <cpu type=3D'kvm' name=3D'440-xilinx-w-dfpu'/>
-  <cpu type=3D'kvm' name=3D'7445_v2.1'/>
-  <cpu type=3D'kvm' name=3D'cobra'/>
-  <cpu type=3D'kvm' name=3D'e500_v20'/>
-  <cpu type=3D'kvm' name=3D'mpc8541_v11'/>
-  <cpu type=3D'kvm' name=3D'750gx_v1.1'/>
-  <cpu type=3D'kvm' name=3D'750cxe_v2.4'/>
-  <cpu type=3D'kvm' name=3D'mpc8641d'/>
-  <cpu type=3D'kvm' name=3D'mpc8543e_v21'/>
-  <cpu type=3D'kvm' name=3D'750l_v2.1'/>
-  <cpu type=3D'kvm' name=3D'7457_v1.0'/>
-  <cpu type=3D'kvm' name=3D'7450_v1.2'/>
-  <cpu type=3D'kvm' name=3D'755_v2.5'/>
-  <cpu type=3D'kvm' name=3D'7410_v1.3'/>
-  <cpu type=3D'kvm' name=3D'745_v2.3'/>
-  <cpu type=3D'kvm' name=3D'755_v2.0'/>
-  <cpu type=3D'kvm' name=3D'e500v2_v30'/>
-  <cpu type=3D'kvm' name=3D'7455_v3.3'/>
-  <cpu type=3D'kvm' name=3D'mpc8540_v20'/>
-  <cpu type=3D'kvm' name=3D'405d2'/>
-  <cpu type=3D'kvm' name=3D'mpc8560_v21'/>
-  <cpu type=3D'kvm' name=3D'mpc8343'/>
-  <cpu type=3D'kvm' name=3D'mpc8548_v20'/>
-  <cpu type=3D'kvm' name=3D'mpc8347t'/>
-  <cpu type=3D'kvm' name=3D'755_v1.0'/>
-  <cpu type=3D'kvm' name=3D'603e_v1.3'/>
-  <cpu type=3D'kvm' name=3D'host'/>
-  <cpu type=3D'kvm' name=3D'mpc8543e_v10'/>
-  <cpu type=3D'kvm' name=3D'mpc8347eap'/>
-  <cpu type=3D'kvm' name=3D'mpc8548e_v11'/>
-  <cpu type=3D'kvm' name=3D'mpc8543_v20'/>
-  <cpu type=3D'kvm' name=3D'401d2'/>
-  <cpu type=3D'kvm' name=3D'power8_v2.0'/>
-  <cpu type=3D'kvm' name=3D'740_v3.1'/>
-  <cpu type=3D'kvm' name=3D'e200z5'/>
-  <cpu type=3D'kvm' name=3D'405cra'/>
-  <cpu type=3D'kvm' name=3D'7400_v2.0'/>
-  <cpu type=3D'kvm' name=3D'750cxe_v2.3'/>
-  <cpu type=3D'kvm' name=3D'745_v2.7'/>
-  <cpu type=3D'kvm' name=3D'mpc8560_v10'/>
-  <cpu type=3D'kvm' name=3D'e5500'/>
-  <cpu type=3D'kvm' name=3D'mpc8544_v11'/>
-  <cpu type=3D'kvm' name=3D'7448_v1.0'/>
-  <cpu type=3D'kvm' name=3D'401e2'/>
-  <cpu type=3D'kvm' name=3D'740_v2.1'/>
-  <cpu type=3D'kvm' name=3D'745_v2.2'/>
-  <cpu type=3D'kvm' name=3D'7400_v1.0'/>
-  <cpu type=3D'kvm' name=3D'7410_v1.2'/>
-  <cpu type=3D'kvm' name=3D'x2vp4'/>
-  <cpu type=3D'kvm' name=3D'mpc8347ap'/>
-  <cpu type=3D'kvm' name=3D'mpc8533_v11'/>
-  <cpu type=3D'kvm' name=3D'mpc5200b_v21'/>
-  <cpu type=3D'kvm' name=3D'750fx_v2.3'/>
-  <cpu type=3D'kvm' name=3D'601_v2'/>
-  <cpu type=3D'kvm' name=3D'g2legp3'/>
-  <cpu type=3D'kvm' name=3D'604e_v1.0'/>
-  <cpu type=3D'kvm' name=3D'750cx_v2.1'/>
-  <cpu type=3D'kvm' name=3D'mpc8610'/>
-  <cpu type=3D'kvm' name=3D'g2h4'/>
-  <cpu type=3D'kvm' name=3D'750l_v3.0'/>
-  <cpu type=3D'kvm' name=3D'mpc8377e'/>
-  <cpu type=3D'kvm' name=3D'e300c4'/>
-  <cpu type=3D'kvm' name=3D'mpc5200_v12'/>
-  <cpu type=3D'kvm' name=3D'7448_v2.0'/>
-  <cpu type=3D'kvm' name=3D'7450_v2.1'/>
-  <cpu type=3D'kvm' name=3D'750cxe_v3.1b'/>
-  <cpu type=3D'kvm' name=3D'g2'/>
-  <cpu type=3D'kvm' name=3D'7400_v2.9'/>
-  <cpu type=3D'kvm' name=3D'405gpd'/>
-  <cpu type=3D'kvm' name=3D'603'/>
-  <cpu type=3D'kvm' name=3D'603e7t'/>
-  <cpu type=3D'kvm' name=3D'mpc8555_v11'/>
-  <cpu type=3D'kvm' name=3D'750gx_v1.0'/>
-  <cpu type=3D'kvm' name=3D'mpc8541_v10'/>
-  <cpu type=3D'kvm' name=3D'mpc8543e_v20'/>
-  <cpu type=3D'kvm' name=3D'750fl'/>
-  <cpu type=3D'kvm' name=3D'750l_v2.0'/>
-  <cpu type=3D'kvm' name=3D'stb04'/>
-  <cpu type=3D'kvm' name=3D'mpc8548e_v21'/>
-  <cpu type=3D'kvm' name=3D'x2vp20'/>
-  <cpu type=3D'kvm' name=3D'405ez'/>
-  <cpu type=3D'kvm' name=3D'e600'/>
-  <cpu type=3D'kvm' name=3D'7450_v1.1'/>
-  <cpu type=3D'kvm' name=3D'755_v2.4'/>
-  <cpu type=3D'kvm' name=3D'mpc8379'/>
-  <cpu type=3D'kvm' name=3D'7445_v1.0'/>
-  <cpu type=3D'kvm' name=3D'7447_v1.1'/>
-  <cpu type=3D'kvm' name=3D'603e_v2.2'/>
-  <cpu type=3D'kvm' name=3D'603e_v4'/>
-  <cpu type=3D'kvm' name=3D'g2legp'/>
-  <cpu type=3D'kvm' name=3D'7455_v3.2'/>
-  <cpu type=3D'kvm' name=3D'740_v2.0'/>
-  <cpu type=3D'kvm' name=3D'mpc8560_v20'/>
-  <cpu type=3D'kvm' name=3D'440-xilinx'/>
-  <cpu type=3D'kvm' name=3D'401f2'/>
-  <cpu type=3D'kvm' name=3D'mpc8533_v10'/>
-  <cpu type=3D'kvm' name=3D'405gpr'/>
-  <cpu type=3D'kvm' name=3D'mpc8349a'/>
-  <cpu type=3D'kvm' name=3D'stb25'/>
-  <cpu type=3D'kvm' name=3D'603e_v1.2'/>
-  <cpu type=3D'kvm' name=3D'mpc5200b_v20'/>
-  <cpu type=3D'kvm' name=3D'750fx_v2.2'/>
-  <cpu type=3D'kvm' name=3D'mpc8347eat'/>
-  <cpu type=3D'kvm' name=3D'740_v1.0'/>
-  <cpu type=3D'kvm' name=3D'601_v1'/>
-  <cpu type=3D'kvm' name=3D'745_v1.1'/>
-  <cpu type=3D'kvm' name=3D'750cx_v2.0'/>
-  <cpu type=3D'kvm' name=3D'mpc8548e_v10'/>
-  <cpu type=3D'kvm' name=3D'7447a_v1.2'/>
-  <cpu type=3D'kvm' name=3D'403gc'/>
-  <cpu type=3D'kvm' name=3D'e300c3'/>
-  <cpu type=3D'kvm' name=3D'mpc5200_v11'/>
-  <cpu type=3D'kvm' name=3D'7441_v2.1'/>
-  <cpu type=3D'kvm' name=3D'740_v3.0'/>
-  <cpu type=3D'kvm' name=3D'mpc8545e_v21'/>
-  <cpu type=3D'kvm' name=3D'602'/>
-  <cpu type=3D'kvm' name=3D'mpc8378e'/>
-  <cpu type=3D'kvm' name=3D'mpc8343a'/>
-  <cpu type=3D'kvm' name=3D'460exb'/>
-  <cpu type=3D'kvm' name=3D'mpc8555_v10'/>
-  <cpu type=3D'kvm' name=3D'mpc8568'/>
-  <cpu type=3D'kvm' name=3D'7457a_v1.2'/>
-  <cpu type=3D'kvm' name=3D'750cx_v1.0'/>
-  <cpu type=3D'kvm' name=3D'750cxe_v2.2'/>
-  <cpu type=3D'kvm' name=3D'604e_v2.4'/>
-  <cpu type=3D'kvm' name=3D'755_v2.8'/>
-  <cpu type=3D'kvm' name=3D'405lp'/>
-  <cpu type=3D'kvm' name=3D'745_v2.6'/>
-  <cpu type=3D'kvm' name=3D'stb03'/>
-  <cpu type=3D'kvm' name=3D'405ep'/>
-  <cpu type=3D'kvm' name=3D'mpc8544_v10'/>
-  <cpu type=3D'kvm' name=3D'mpc8347at'/>
-  <cpu type=3D'kvm' name=3D'750_v2.2'/>
-  <cpu type=3D'kvm' name=3D'7450_v1.0'/>
-  <cpu type=3D'kvm' name=3D'755_v2.3'/>
-  <cpu type=3D'kvm' name=3D'7410_v1.1'/>
-  <cpu type=3D'kvm' name=3D'745_v2.1'/>
-  <cpu type=3D'kvm' name=3D'750gl'/>
-  <cpu type=3D'kvm' name=3D'e6500'/>
-  <cpu type=3D'kvm' name=3D'750p'/>
-  <cpu type=3D'kvm' name=3D'7445_v3.4'/>
-  <cpu type=3D'kvm' name=3D'440epb'/>
-  <cpu type=3D'kvm' name=3D'npe4gs3'/>
-  <cpu type=3D'kvm' name=3D'603e_v3'/>
-  <cpu type=3D'kvm' name=3D'mpc8349e'/>
-  <cpu type=3D'kvm' name=3D'970_v2.2'/>
-  <cpu type=3D'kvm' name=3D'g2lels'/>
-  <cpu type=3D'kvm' name=3D'g2hip4'/>
-  <cpu type=3D'kvm' name=3D'740p'/>
-  <cpu type=3D'kvm' name=3D'mpc8567e'/>
-  <cpu type=3D'kvm' name=3D'mpc8533e_v11'/>
-  <cpu type=3D'kvm' name=3D'7451_v2.3'/>
-  <cpu type=3D'kvm' name=3D'603e_v1.1'/>
-  <cpu type=3D'kvm' name=3D'401g2'/>
-  <cpu type=3D'kvm' name=3D'7400_v2.8'/>
-  <cpu type=3D'kvm' name=3D'7455_v2.1'/>
-  <cpu type=3D'kvm' name=3D'405gpc'/>
-  <cpu type=3D'kvm' name=3D'power7+_v2.1'/>
-  <cpu type=3D'kvm' name=3D'mpc8544e_v11'/>
-  <cpu type=3D'kvm' name=3D'7450_v2.0'/>
-  <cpu type=3D'kvm' name=3D'970mp_v1.1'/>
-  <cpu type=3D'kvm' name=3D'603e7v2'/>
-  <cpu type=3D'kvm' name=3D'604r'/>
-  <cpu type=3D'kvm' name=3D'e500v2_v22'/>
-  <cpu type=3D'kvm' name=3D'mpc8548e_v20'/>
-  <cpu type=3D'kvm' name=3D'mpc8545e_v20'/>
-  <cpu type=3D'kvm' name=3D'mpc8378'/>
-  <cpu type=3D'kvm' name=3D'mpc8567'/>
-  <cpu type=3D'kvm' name=3D'7457_v1.2'/>
-  <cpu type=3D'kvm' name=3D'7447_v1.0'/>
-  <cpu type=3D'kvm' name=3D'970fx_v3.1'/>
-  <cpu type=3D'kvm' name=3D'745_v2.5'/>
-  <cpu type=3D'kvm' name=3D'mpc8379e'/>
-  <cpu type=3D'kvm' name=3D'mpc8641'/>
-  <cpu type=3D'kvm' name=3D'750cxe_v2.4b'/>
-  <cpu type=3D'kvm' name=3D'7410_v1.0'/>
-  <cpu type=3D'kvm' name=3D'mpc603'/>
-  <cpu type=3D'kvm' name=3D'603e_v4.1'/>
-  <cpu type=3D'kvm' name=3D'7445_v3.3'/>
-  <cpu type=3D'kvm' name=3D'440epa'/>
-  <cpu type=3D'kvm' name=3D'970fx_v2.1'/>
-  <cpu type=3D'kvm' name=3D'iop480'/>
-  <cpu type=3D'kvm' name=3D'750fx_v2.1'/>
-  <cpu type=3D'kvm' name=3D'601_v0'/>
-  <cpu type=3D'kvm' name=3D'g2legp1'/>
-  <cpu type=3D'kvm' name=3D'745_v1.0'/>
-  <cpu type=3D'kvm' name=3D'750cl_v2.0'/>
-  <cpu type=3D'kvm' name=3D'750cxr'/>
-  <cpu type=3D'kvm' name=3D'401'/>
-  <cpu type=3D'kvm' name=3D'mpc8541e_v11'/>
-  <cpu type=3D'kvm' name=3D'750cxe_v3.1'/>
-  <cpu type=3D'kvm' name=3D'mpc8555e_v11'/>
-  <cpu type=3D'kvm' name=3D'power5+_v2.1'/>
-  <cpu type=3D'kvm' name=3D'7447a_v1.1'/>
-  <cpu type=3D'kvm' name=3D'403gb'/>
-  <cpu type=3D'kvm' name=3D'e300c2'/>
-  <cpu type=3D'kvm' name=3D'npe405h2'/>
-  <cpu type=3D'kvm' name=3D'mpc8343e'/>
-  <cpu type=3D'kvm' name=3D'mpc8533e_v10'/>
-  <cpu type=3D'kvm' name=3D'mpc5200_v10'/>
-  <cpu type=3D'kvm' name=3D'750_v3.1'/>
-  <cpu type=3D'kvm' name=3D'power8e_v2.1'/>
-  <cpu type=3D'kvm' name=3D'mpc8568e'/>
-  <cpu type=3D'tcg' name=3D'default'/>
-  <cpu type=3D'tcg' name=3D'ppc'/>
-  <cpu type=3D'tcg' name=3D'ppc32'/>
-  <cpu type=3D'tcg' name=3D'ppc64'/>
-  <cpu type=3D'tcg' name=3D'970mp'/>
-  <cpu type=3D'tcg' name=3D'970fx'/>
-  <cpu type=3D'tcg' name=3D'970'/>
-  <cpu type=3D'tcg' name=3D'power9'/>
-  <cpu type=3D'tcg' name=3D'power8nvl'/>
-  <cpu type=3D'tcg' name=3D'power8'/>
-  <cpu type=3D'tcg' name=3D'power8e'/>
-  <cpu type=3D'tcg' name=3D'power7+'/>
-  <cpu type=3D'tcg' name=3D'power7'/>
-  <cpu type=3D'tcg' name=3D'power5gs'/>
-  <cpu type=3D'tcg' name=3D'power5+'/>
-  <cpu type=3D'tcg' name=3D'apollo7pm'/>
-  <cpu type=3D'tcg' name=3D'7457a'/>
-  <cpu type=3D'tcg' name=3D'7447a'/>
-  <cpu type=3D'tcg' name=3D'apollo7'/>
-  <cpu type=3D'tcg' name=3D'7457'/>
-  <cpu type=3D'tcg' name=3D'7447'/>
-  <cpu type=3D'tcg' name=3D'apollo6'/>
-  <cpu type=3D'tcg' name=3D'7455'/>
-  <cpu type=3D'tcg' name=3D'7445'/>
-  <cpu type=3D'tcg' name=3D'7451'/>
-  <cpu type=3D'tcg' name=3D'7441'/>
-  <cpu type=3D'tcg' name=3D'vger'/>
-  <cpu type=3D'tcg' name=3D'7450'/>
-  <cpu type=3D'tcg' name=3D'7448'/>
-  <cpu type=3D'tcg' name=3D'nitro'/>
-  <cpu type=3D'tcg' name=3D'7410'/>
-  <cpu type=3D'tcg' name=3D'g4'/>
-  <cpu type=3D'tcg' name=3D'max'/>
-  <cpu type=3D'tcg' name=3D'7400'/>
-  <cpu type=3D'tcg' name=3D'goldfinger'/>
-  <cpu type=3D'tcg' name=3D'755'/>
-  <cpu type=3D'tcg' name=3D'745'/>
-  <cpu type=3D'tcg' name=3D'lonestar'/>
-  <cpu type=3D'tcg' name=3D'750l'/>
-  <cpu type=3D'tcg' name=3D'750gx'/>
-  <cpu type=3D'tcg' name=3D'750fx'/>
-  <cpu type=3D'tcg' name=3D'750cxe'/>
-  <cpu type=3D'tcg' name=3D'750cx'/>
-  <cpu type=3D'tcg' name=3D'750cl'/>
-  <cpu type=3D'tcg' name=3D'conan/doyle'/>
-  <cpu type=3D'tcg' name=3D'g3'/>
-  <cpu type=3D'tcg' name=3D'typhoon'/>
-  <cpu type=3D'tcg' name=3D'750'/>
-  <cpu type=3D'tcg' name=3D'arthur'/>
-  <cpu type=3D'tcg' name=3D'740'/>
-  <cpu type=3D'tcg' name=3D'mach5'/>
-  <cpu type=3D'tcg' name=3D'sirocco'/>
-  <cpu type=3D'tcg' name=3D'604e'/>
-  <cpu type=3D'tcg' name=3D'goldeneye'/>
-  <cpu type=3D'tcg' name=3D'603r'/>
-  <cpu type=3D'tcg' name=3D'vaillant'/>
-  <cpu type=3D'tcg' name=3D'stretch'/>
-  <cpu type=3D'tcg' name=3D'603e'/>
-  <cpu type=3D'tcg' name=3D'vanilla'/>
-  <cpu type=3D'tcg' name=3D'601v'/>
-  <cpu type=3D'tcg' name=3D'601'/>
-  <cpu type=3D'tcg' name=3D'mpc8560'/>
-  <cpu type=3D'tcg' name=3D'mpc8555e'/>
-  <cpu type=3D'tcg' name=3D'mpc8555'/>
-  <cpu type=3D'tcg' name=3D'mpc8548e'/>
-  <cpu type=3D'tcg' name=3D'mpc8548'/>
-  <cpu type=3D'tcg' name=3D'mpc8547e'/>
-  <cpu type=3D'tcg' name=3D'mpc8545e'/>
-  <cpu type=3D'tcg' name=3D'mpc8545'/>
-  <cpu type=3D'tcg' name=3D'mpc8544e'/>
-  <cpu type=3D'tcg' name=3D'mpc8544'/>
-  <cpu type=3D'tcg' name=3D'mpc8543e'/>
-  <cpu type=3D'tcg' name=3D'mpc8543'/>
-  <cpu type=3D'tcg' name=3D'mpc8541e'/>
-  <cpu type=3D'tcg' name=3D'mpc8541'/>
-  <cpu type=3D'tcg' name=3D'mpc8540'/>
-  <cpu type=3D'tcg' name=3D'mpc8533e'/>
-  <cpu type=3D'tcg' name=3D'mpc8533'/>
-  <cpu type=3D'tcg' name=3D'e500v2'/>
-  <cpu type=3D'tcg' name=3D'e500v1'/>
-  <cpu type=3D'tcg' name=3D'e500'/>
-  <cpu type=3D'tcg' name=3D'mpc8347ea'/>
-  <cpu type=3D'tcg' name=3D'mpc8347e'/>
-  <cpu type=3D'tcg' name=3D'mpc8347a'/>
-  <cpu type=3D'tcg' name=3D'mpc8347'/>
-  <cpu type=3D'tcg' name=3D'e300'/>
-  <cpu type=3D'tcg' name=3D'e200'/>
-  <cpu type=3D'tcg' name=3D'mpc8280'/>
-  <cpu type=3D'tcg' name=3D'mpc8275'/>
-  <cpu type=3D'tcg' name=3D'mpc8272'/>
-  <cpu type=3D'tcg' name=3D'mpc8271'/>
-  <cpu type=3D'tcg' name=3D'mpc8270'/>
-  <cpu type=3D'tcg' name=3D'mpc8266_hip4'/>
-  <cpu type=3D'tcg' name=3D'mpc8266_hip3'/>
-  <cpu type=3D'tcg' name=3D'mpc8266'/>
-  <cpu type=3D'tcg' name=3D'mpc8265_hip4'/>
-  <cpu type=3D'tcg' name=3D'mpc8265_hip3'/>
-  <cpu type=3D'tcg' name=3D'mpc8265'/>
-  <cpu type=3D'tcg' name=3D'mpc8264_hip4'/>
-  <cpu type=3D'tcg' name=3D'mpc8264_hip3'/>
-  <cpu type=3D'tcg' name=3D'mpc8264'/>
-  <cpu type=3D'tcg' name=3D'mpc8260_hip4'/>
-  <cpu type=3D'tcg' name=3D'mpc8260_hip3'/>
-  <cpu type=3D'tcg' name=3D'mpc8260'/>
-  <cpu type=3D'tcg' name=3D'mpc8255_hip4'/>
-  <cpu type=3D'tcg' name=3D'mpc8255_hip3'/>
-  <cpu type=3D'tcg' name=3D'mpc8255'/>
-  <cpu type=3D'tcg' name=3D'mpc8250_hip4'/>
-  <cpu type=3D'tcg' name=3D'mpc8250_hip3'/>
-  <cpu type=3D'tcg' name=3D'mpc8250'/>
-  <cpu type=3D'tcg' name=3D'mpc8248'/>
-  <cpu type=3D'tcg' name=3D'mpc8247'/>
-  <cpu type=3D'tcg' name=3D'mpc8245'/>
-  <cpu type=3D'tcg' name=3D'mpc8241'/>
-  <cpu type=3D'tcg' name=3D'powerquicc-ii'/>
-  <cpu type=3D'tcg' name=3D'mpc82xx'/>
-  <cpu type=3D'tcg' name=3D'mpc5200b'/>
-  <cpu type=3D'tcg' name=3D'mpc5200'/>
-  <cpu type=3D'tcg' name=3D'mpc52xx'/>
-  <cpu type=3D'tcg' name=3D'mpc8240'/>
-  <cpu type=3D'tcg' name=3D'460ex'/>
-  <cpu type=3D'tcg' name=3D'440ep'/>
-  <cpu type=3D'tcg' name=3D'x2vp50'/>
-  <cpu type=3D'tcg' name=3D'x2vp7'/>
-  <cpu type=3D'tcg' name=3D'405gpe'/>
-  <cpu type=3D'tcg' name=3D'405gp'/>
-  <cpu type=3D'tcg' name=3D'405cr'/>
-  <cpu type=3D'tcg' name=3D'405'/>
-  <cpu type=3D'tcg' name=3D'403'/>
-  <cpu type=3D'tcg' name=3D'mpc8547e_v21'/>
-  <cpu type=3D'tcg' name=3D'750cl_v1.0'/>
-  <cpu type=3D'tcg' name=3D'7457a_v1.1'/>
-  <cpu type=3D'tcg' name=3D'g2gp'/>
-  <cpu type=3D'tcg' name=3D'750cxe_v2.1'/>
-  <cpu type=3D'tcg' name=3D'755_v2.7'/>
-  <cpu type=3D'tcg' name=3D'750_v2.1'/>
-  <cpu type=3D'tcg' name=3D'755_v2.2'/>
-  <cpu type=3D'tcg' name=3D'745_v2.0'/>
-  <cpu type=3D'tcg' name=3D'mpc8377'/>
-  <cpu type=3D'tcg' name=3D'7455_v1.0'/>
-  <cpu type=3D'tcg' name=3D'mpc8545_v21'/>
-  <cpu type=3D'tcg' name=3D'mpc8548_v11'/>
-  <cpu type=3D'tcg' name=3D'405d4'/>
-  <cpu type=3D'tcg' name=3D'g2le'/>
-  <cpu type=3D'tcg' name=3D'g2hip3'/>
-  <cpu type=3D'tcg' name=3D'750e'/>
-  <cpu type=3D'tcg' name=3D'mpc8572'/>
-  <cpu type=3D'tcg' name=3D'970fx_v2.0'/>
-  <cpu type=3D'tcg' name=3D'750fx_v2.0'/>
-  <cpu type=3D'tcg' name=3D'603p'/>
-  <cpu type=3D'tcg' name=3D'405gpb'/>
-  <cpu type=3D'tcg' name=3D'7400_v2.7'/>
-  <cpu type=3D'tcg' name=3D'mpc8544e_v10'/>
-  <cpu type=3D'tcg' name=3D'e500v2_v10'/>
-  <cpu type=3D'tcg' name=3D'e500mc'/>
-  <cpu type=3D'tcg' name=3D'603e7v1'/>
-  <cpu type=3D'tcg' name=3D'970mp_v1.0'/>
-  <cpu type=3D'tcg' name=3D'740e'/>
-  <cpu type=3D'tcg' name=3D'405crc'/>
-  <cpu type=3D'tcg' name=3D'403ga'/>
-  <cpu type=3D'tcg' name=3D'7447a_v1.0'/>
-  <cpu type=3D'tcg' name=3D'7400_v2.2'/>
-  <cpu type=3D'tcg' name=3D'e300c1'/>
-  <cpu type=3D'tcg' name=3D'mpc8572e'/>
-  <cpu type=3D'tcg' name=3D'e500v2_v21'/>
-  <cpu type=3D'tcg' name=3D'970fx_v1.0'/>
-  <cpu type=3D'tcg' name=3D'750gx_v1.2'/>
-  <cpu type=3D'tcg' name=3D'750fx_v1.0'/>
-  <cpu type=3D'tcg' name=3D'7457_v1.1'/>
-  <cpu type=3D'tcg' name=3D'970fx_v3.0'/>
-  <cpu type=3D'tcg' name=3D'604e_v2.2'/>
-  <cpu type=3D'tcg' name=3D'755_v2.6'/>
-  <cpu type=3D'tcg' name=3D'401a1'/>
-  <cpu type=3D'tcg' name=3D'power9_v1.0'/>
-  <cpu type=3D'tcg' name=3D'npe405h'/>
-  <cpu type=3D'tcg' name=3D'7410_v1.4'/>
-  <cpu type=3D'tcg' name=3D'g2ls'/>
-  <cpu type=3D'tcg' name=3D'750_v2.0'/>
-  <cpu type=3D'tcg' name=3D'401b2'/>
-  <cpu type=3D'tcg' name=3D'mpc8349'/>
-  <cpu type=3D'tcg' name=3D'mpc8347ep'/>
-  <cpu type=3D'tcg' name=3D'7445_v3.2'/>
-  <cpu type=3D'tcg' name=3D'mpc8540_v21'/>
-  <cpu type=3D'tcg' name=3D'mpc8543_v11'/>
-  <cpu type=3D'tcg' name=3D'403gcx'/>
-  <cpu type=3D'tcg' name=3D'745_v2.4'/>
-  <cpu type=3D'tcg' name=3D'mpc8548_v21'/>
-  <cpu type=3D'tcg' name=3D'750l_v3.2'/>
-  <cpu type=3D'tcg' name=3D'750_v1.0'/>
-  <cpu type=3D'tcg' name=3D'755_v1.1'/>
-  <cpu type=3D'tcg' name=3D'e500_v10'/>
-  <cpu type=3D'tcg' name=3D'750cxe_v3.0'/>
-  <cpu type=3D'tcg' name=3D'mpc8541e_v10'/>
-  <cpu type=3D'tcg' name=3D'mpc8347p'/>
-  <cpu type=3D'tcg' name=3D'mpc8555e_v10'/>
-  <cpu type=3D'tcg' name=3D'power9_v2.0'/>
-  <cpu type=3D'tcg' name=3D'power7_v2.3'/>
-  <cpu type=3D'tcg' name=3D'603e7v'/>
-  <cpu type=3D'tcg' name=3D'mpc8543e_v11'/>
-  <cpu type=3D'tcg' name=3D'750_v3.0'/>
-  <cpu type=3D'tcg' name=3D'7400_v2.6'/>
-  <cpu type=3D'tcg' name=3D'405gpa'/>
-  <cpu type=3D'tcg' name=3D'440epx'/>
-  <cpu type=3D'tcg' name=3D'750l_v2.2'/>
-  <cpu type=3D'tcg' name=3D'e200z6'/>
-  <cpu type=3D'tcg' name=3D'mpc8547e_v20'/>
-  <cpu type=3D'tcg' name=3D'7457a_v1.0'/>
-  <cpu type=3D'tcg' name=3D'mpc8349ea'/>
-  <cpu type=3D'tcg' name=3D'e500v2_v20'/>
-  <cpu type=3D'tcg' name=3D'power8nvl_v1.0'/>
-  <cpu type=3D'tcg' name=3D'mpc8540_v10'/>
-  <cpu type=3D'tcg' name=3D'755_v2.1'/>
-  <cpu type=3D'tcg' name=3D'745_v2.8'/>
-  <cpu type=3D'tcg' name=3D'npe405l'/>
-  <cpu type=3D'tcg' name=3D'mpc8343ea'/>
-  <cpu type=3D'tcg' name=3D'mpc8545_v20'/>
-  <cpu type=3D'tcg' name=3D'mpc8548_v10'/>
-  <cpu type=3D'tcg' name=3D'7448_v1.1'/>
-  <cpu type=3D'tcg' name=3D'7455_v3.4'/>
-  <cpu type=3D'tcg' name=3D'740_v2.2'/>
-  <cpu type=3D'tcg' name=3D'7400_v1.1'/>
-  <cpu type=3D'tcg' name=3D'mpc8347et'/>
-  <cpu type=3D'tcg' name=3D'7441_v2.10'/>
-  <cpu type=3D'tcg' name=3D'603e_v1.4'/>
-  <cpu type=3D'tcg' name=3D'mpc8543_v10'/>
-  <cpu type=3D'tcg' name=3D'401c2'/>
-  <cpu type=3D'tcg' name=3D'7451_v2.10'/>
-  <cpu type=3D'tcg' name=3D'750cx_v2.2'/>
-  <cpu type=3D'tcg' name=3D'mpc8543_v21'/>
-  <cpu type=3D'tcg' name=3D'603e7'/>
-  <cpu type=3D'tcg' name=3D'7448_v2.1'/>
-  <cpu type=3D'tcg' name=3D'7441_v2.3'/>
-  <cpu type=3D'tcg' name=3D'405crb'/>
-  <cpu type=3D'tcg' name=3D'604'/>
-  <cpu type=3D'tcg' name=3D'7400_v2.1'/>
-  <cpu type=3D'tcg' name=3D'440-xilinx-w-dfpu'/>
-  <cpu type=3D'tcg' name=3D'7445_v2.1'/>
-  <cpu type=3D'tcg' name=3D'cobra'/>
-  <cpu type=3D'tcg' name=3D'e500_v20'/>
-  <cpu type=3D'tcg' name=3D'mpc8541_v11'/>
-  <cpu type=3D'tcg' name=3D'750gx_v1.1'/>
-  <cpu type=3D'tcg' name=3D'750cxe_v2.4'/>
-  <cpu type=3D'tcg' name=3D'mpc8641d'/>
-  <cpu type=3D'tcg' name=3D'mpc8543e_v21'/>
-  <cpu type=3D'tcg' name=3D'750l_v2.1'/>
-  <cpu type=3D'tcg' name=3D'7457_v1.0'/>
-  <cpu type=3D'tcg' name=3D'7450_v1.2'/>
-  <cpu type=3D'tcg' name=3D'755_v2.5'/>
-  <cpu type=3D'tcg' name=3D'7410_v1.3'/>
-  <cpu type=3D'tcg' name=3D'745_v2.3'/>
-  <cpu type=3D'tcg' name=3D'755_v2.0'/>
-  <cpu type=3D'tcg' name=3D'e500v2_v30'/>
-  <cpu type=3D'tcg' name=3D'7455_v3.3'/>
-  <cpu type=3D'tcg' name=3D'mpc8540_v20'/>
-  <cpu type=3D'tcg' name=3D'405d2'/>
-  <cpu type=3D'tcg' name=3D'mpc8560_v21'/>
-  <cpu type=3D'tcg' name=3D'mpc8343'/>
-  <cpu type=3D'tcg' name=3D'mpc8548_v20'/>
-  <cpu type=3D'tcg' name=3D'mpc8347t'/>
-  <cpu type=3D'tcg' name=3D'755_v1.0'/>
-  <cpu type=3D'tcg' name=3D'603e_v1.3'/>
-  <cpu type=3D'tcg' name=3D'mpc8543e_v10'/>
-  <cpu type=3D'tcg' name=3D'mpc8347eap'/>
-  <cpu type=3D'tcg' name=3D'mpc8548e_v11'/>
-  <cpu type=3D'tcg' name=3D'mpc8543_v20'/>
-  <cpu type=3D'tcg' name=3D'401d2'/>
-  <cpu type=3D'tcg' name=3D'power8_v2.0'/>
-  <cpu type=3D'tcg' name=3D'740_v3.1'/>
-  <cpu type=3D'tcg' name=3D'e200z5'/>
-  <cpu type=3D'tcg' name=3D'405cra'/>
-  <cpu type=3D'tcg' name=3D'7400_v2.0'/>
-  <cpu type=3D'tcg' name=3D'750cxe_v2.3'/>
-  <cpu type=3D'tcg' name=3D'745_v2.7'/>
-  <cpu type=3D'tcg' name=3D'mpc8560_v10'/>
-  <cpu type=3D'tcg' name=3D'e5500'/>
-  <cpu type=3D'tcg' name=3D'mpc8544_v11'/>
-  <cpu type=3D'tcg' name=3D'7448_v1.0'/>
-  <cpu type=3D'tcg' name=3D'401e2'/>
-  <cpu type=3D'tcg' name=3D'740_v2.1'/>
-  <cpu type=3D'tcg' name=3D'745_v2.2'/>
-  <cpu type=3D'tcg' name=3D'7400_v1.0'/>
-  <cpu type=3D'tcg' name=3D'7410_v1.2'/>
-  <cpu type=3D'tcg' name=3D'x2vp4'/>
-  <cpu type=3D'tcg' name=3D'mpc8347ap'/>
-  <cpu type=3D'tcg' name=3D'mpc8533_v11'/>
-  <cpu type=3D'tcg' name=3D'mpc5200b_v21'/>
-  <cpu type=3D'tcg' name=3D'750fx_v2.3'/>
-  <cpu type=3D'tcg' name=3D'601_v2'/>
-  <cpu type=3D'tcg' name=3D'g2legp3'/>
-  <cpu type=3D'tcg' name=3D'604e_v1.0'/>
-  <cpu type=3D'tcg' name=3D'750cx_v2.1'/>
-  <cpu type=3D'tcg' name=3D'mpc8610'/>
-  <cpu type=3D'tcg' name=3D'g2h4'/>
-  <cpu type=3D'tcg' name=3D'750l_v3.0'/>
-  <cpu type=3D'tcg' name=3D'mpc8377e'/>
-  <cpu type=3D'tcg' name=3D'e300c4'/>
-  <cpu type=3D'tcg' name=3D'mpc5200_v12'/>
-  <cpu type=3D'tcg' name=3D'7448_v2.0'/>
-  <cpu type=3D'tcg' name=3D'7450_v2.1'/>
-  <cpu type=3D'tcg' name=3D'750cxe_v3.1b'/>
-  <cpu type=3D'tcg' name=3D'g2'/>
-  <cpu type=3D'tcg' name=3D'7400_v2.9'/>
-  <cpu type=3D'tcg' name=3D'405gpd'/>
-  <cpu type=3D'tcg' name=3D'603'/>
-  <cpu type=3D'tcg' name=3D'603e7t'/>
-  <cpu type=3D'tcg' name=3D'mpc8555_v11'/>
-  <cpu type=3D'tcg' name=3D'750gx_v1.0'/>
-  <cpu type=3D'tcg' name=3D'mpc8541_v10'/>
-  <cpu type=3D'tcg' name=3D'mpc8543e_v20'/>
-  <cpu type=3D'tcg' name=3D'750fl'/>
-  <cpu type=3D'tcg' name=3D'750l_v2.0'/>
-  <cpu type=3D'tcg' name=3D'stb04'/>
-  <cpu type=3D'tcg' name=3D'mpc8548e_v21'/>
-  <cpu type=3D'tcg' name=3D'x2vp20'/>
-  <cpu type=3D'tcg' name=3D'405ez'/>
-  <cpu type=3D'tcg' name=3D'e600'/>
-  <cpu type=3D'tcg' name=3D'7450_v1.1'/>
-  <cpu type=3D'tcg' name=3D'755_v2.4'/>
-  <cpu type=3D'tcg' name=3D'mpc8379'/>
-  <cpu type=3D'tcg' name=3D'7445_v1.0'/>
-  <cpu type=3D'tcg' name=3D'7447_v1.1'/>
-  <cpu type=3D'tcg' name=3D'603e_v2.2'/>
-  <cpu type=3D'tcg' name=3D'603e_v4'/>
-  <cpu type=3D'tcg' name=3D'g2legp'/>
-  <cpu type=3D'tcg' name=3D'7455_v3.2'/>
-  <cpu type=3D'tcg' name=3D'740_v2.0'/>
-  <cpu type=3D'tcg' name=3D'mpc8560_v20'/>
-  <cpu type=3D'tcg' name=3D'440-xilinx'/>
-  <cpu type=3D'tcg' name=3D'401f2'/>
-  <cpu type=3D'tcg' name=3D'mpc8533_v10'/>
-  <cpu type=3D'tcg' name=3D'405gpr'/>
-  <cpu type=3D'tcg' name=3D'mpc8349a'/>
-  <cpu type=3D'tcg' name=3D'stb25'/>
-  <cpu type=3D'tcg' name=3D'603e_v1.2'/>
-  <cpu type=3D'tcg' name=3D'mpc5200b_v20'/>
-  <cpu type=3D'tcg' name=3D'750fx_v2.2'/>
-  <cpu type=3D'tcg' name=3D'mpc8347eat'/>
-  <cpu type=3D'tcg' name=3D'740_v1.0'/>
-  <cpu type=3D'tcg' name=3D'601_v1'/>
-  <cpu type=3D'tcg' name=3D'745_v1.1'/>
-  <cpu type=3D'tcg' name=3D'750cx_v2.0'/>
-  <cpu type=3D'tcg' name=3D'mpc8548e_v10'/>
-  <cpu type=3D'tcg' name=3D'7447a_v1.2'/>
-  <cpu type=3D'tcg' name=3D'403gc'/>
-  <cpu type=3D'tcg' name=3D'e300c3'/>
-  <cpu type=3D'tcg' name=3D'mpc5200_v11'/>
-  <cpu type=3D'tcg' name=3D'7441_v2.1'/>
-  <cpu type=3D'tcg' name=3D'740_v3.0'/>
-  <cpu type=3D'tcg' name=3D'mpc8545e_v21'/>
-  <cpu type=3D'tcg' name=3D'602'/>
-  <cpu type=3D'tcg' name=3D'mpc8378e'/>
-  <cpu type=3D'tcg' name=3D'mpc8343a'/>
-  <cpu type=3D'tcg' name=3D'460exb'/>
-  <cpu type=3D'tcg' name=3D'mpc8555_v10'/>
-  <cpu type=3D'tcg' name=3D'mpc8568'/>
-  <cpu type=3D'tcg' name=3D'7457a_v1.2'/>
-  <cpu type=3D'tcg' name=3D'750cx_v1.0'/>
-  <cpu type=3D'tcg' name=3D'750cxe_v2.2'/>
-  <cpu type=3D'tcg' name=3D'604e_v2.4'/>
-  <cpu type=3D'tcg' name=3D'755_v2.8'/>
-  <cpu type=3D'tcg' name=3D'405lp'/>
-  <cpu type=3D'tcg' name=3D'745_v2.6'/>
-  <cpu type=3D'tcg' name=3D'stb03'/>
-  <cpu type=3D'tcg' name=3D'405ep'/>
-  <cpu type=3D'tcg' name=3D'mpc8544_v10'/>
-  <cpu type=3D'tcg' name=3D'mpc8347at'/>
-  <cpu type=3D'tcg' name=3D'750_v2.2'/>
-  <cpu type=3D'tcg' name=3D'7450_v1.0'/>
-  <cpu type=3D'tcg' name=3D'755_v2.3'/>
-  <cpu type=3D'tcg' name=3D'7410_v1.1'/>
-  <cpu type=3D'tcg' name=3D'745_v2.1'/>
-  <cpu type=3D'tcg' name=3D'750gl'/>
-  <cpu type=3D'tcg' name=3D'e6500'/>
-  <cpu type=3D'tcg' name=3D'750p'/>
-  <cpu type=3D'tcg' name=3D'7445_v3.4'/>
-  <cpu type=3D'tcg' name=3D'440epb'/>
-  <cpu type=3D'tcg' name=3D'npe4gs3'/>
-  <cpu type=3D'tcg' name=3D'603e_v3'/>
-  <cpu type=3D'tcg' name=3D'mpc8349e'/>
-  <cpu type=3D'tcg' name=3D'970_v2.2'/>
-  <cpu type=3D'tcg' name=3D'g2lels'/>
-  <cpu type=3D'tcg' name=3D'g2hip4'/>
-  <cpu type=3D'tcg' name=3D'740p'/>
-  <cpu type=3D'tcg' name=3D'mpc8567e'/>
-  <cpu type=3D'tcg' name=3D'mpc8533e_v11'/>
-  <cpu type=3D'tcg' name=3D'7451_v2.3'/>
-  <cpu type=3D'tcg' name=3D'603e_v1.1'/>
-  <cpu type=3D'tcg' name=3D'401g2'/>
-  <cpu type=3D'tcg' name=3D'7400_v2.8'/>
-  <cpu type=3D'tcg' name=3D'7455_v2.1'/>
-  <cpu type=3D'tcg' name=3D'405gpc'/>
-  <cpu type=3D'tcg' name=3D'power7+_v2.1'/>
-  <cpu type=3D'tcg' name=3D'mpc8544e_v11'/>
-  <cpu type=3D'tcg' name=3D'7450_v2.0'/>
-  <cpu type=3D'tcg' name=3D'970mp_v1.1'/>
-  <cpu type=3D'tcg' name=3D'603e7v2'/>
-  <cpu type=3D'tcg' name=3D'604r'/>
-  <cpu type=3D'tcg' name=3D'e500v2_v22'/>
-  <cpu type=3D'tcg' name=3D'mpc8548e_v20'/>
-  <cpu type=3D'tcg' name=3D'mpc8545e_v20'/>
-  <cpu type=3D'tcg' name=3D'mpc8378'/>
-  <cpu type=3D'tcg' name=3D'mpc8567'/>
-  <cpu type=3D'tcg' name=3D'7457_v1.2'/>
-  <cpu type=3D'tcg' name=3D'7447_v1.0'/>
-  <cpu type=3D'tcg' name=3D'970fx_v3.1'/>
-  <cpu type=3D'tcg' name=3D'745_v2.5'/>
-  <cpu type=3D'tcg' name=3D'mpc8379e'/>
-  <cpu type=3D'tcg' name=3D'mpc8641'/>
-  <cpu type=3D'tcg' name=3D'750cxe_v2.4b'/>
-  <cpu type=3D'tcg' name=3D'7410_v1.0'/>
-  <cpu type=3D'tcg' name=3D'mpc603'/>
-  <cpu type=3D'tcg' name=3D'603e_v4.1'/>
-  <cpu type=3D'tcg' name=3D'7445_v3.3'/>
-  <cpu type=3D'tcg' name=3D'440epa'/>
-  <cpu type=3D'tcg' name=3D'970fx_v2.1'/>
-  <cpu type=3D'tcg' name=3D'iop480'/>
-  <cpu type=3D'tcg' name=3D'750fx_v2.1'/>
-  <cpu type=3D'tcg' name=3D'601_v0'/>
-  <cpu type=3D'tcg' name=3D'g2legp1'/>
-  <cpu type=3D'tcg' name=3D'745_v1.0'/>
-  <cpu type=3D'tcg' name=3D'750cl_v2.0'/>
-  <cpu type=3D'tcg' name=3D'750cxr'/>
-  <cpu type=3D'tcg' name=3D'401'/>
-  <cpu type=3D'tcg' name=3D'mpc8541e_v11'/>
-  <cpu type=3D'tcg' name=3D'750cxe_v3.1'/>
-  <cpu type=3D'tcg' name=3D'mpc8555e_v11'/>
-  <cpu type=3D'tcg' name=3D'power5+_v2.1'/>
-  <cpu type=3D'tcg' name=3D'7447a_v1.1'/>
-  <cpu type=3D'tcg' name=3D'403gb'/>
-  <cpu type=3D'tcg' name=3D'e300c2'/>
-  <cpu type=3D'tcg' name=3D'npe405h2'/>
-  <cpu type=3D'tcg' name=3D'mpc8343e'/>
-  <cpu type=3D'tcg' name=3D'mpc8533e_v10'/>
-  <cpu type=3D'tcg' name=3D'mpc5200_v10'/>
-  <cpu type=3D'tcg' name=3D'750_v3.1'/>
-  <cpu type=3D'tcg' name=3D'power8e_v2.1'/>
-  <cpu type=3D'tcg' name=3D'mpc8568e'/>
+  <cpu type=3D'kvm' name=3D'default' typename=3D'604-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'ppc' typename=3D'604-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'ppc32' typename=3D'604-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'ppc64' typename=3D'970fx_v3.1-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'970mp' typename=3D'970mp_v1.1-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'970fx' typename=3D'970fx_v3.1-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'970' typename=3D'970_v2.2-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'power9' typename=3D'power9_v2.0-powerpc64-cpu'=
/>
+  <cpu type=3D'kvm' name=3D'power8nvl' typename=3D'power8nvl_v1.0-powerpc6=
4-cpu'/>
+  <cpu type=3D'kvm' name=3D'power8' typename=3D'host-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'power8e' typename=3D'power8e_v2.1-powerpc64-cp=
u'/>
+  <cpu type=3D'kvm' name=3D'power7+' typename=3D'power7+_v2.1-powerpc64-cp=
u'/>
+  <cpu type=3D'kvm' name=3D'power7' typename=3D'power7_v2.3-powerpc64-cpu'=
/>
+  <cpu type=3D'kvm' name=3D'power5gs' typename=3D'power5+_v2.1-powerpc64-c=
pu'/>
+  <cpu type=3D'kvm' name=3D'power5+' typename=3D'power5+_v2.1-powerpc64-cp=
u'/>
+  <cpu type=3D'kvm' name=3D'apollo7pm' typename=3D'7457a_v1.0-powerpc64-cp=
u'/>
+  <cpu type=3D'kvm' name=3D'7457a' typename=3D'7457a_v1.2-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'7447a' typename=3D'7447a_v1.2-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'apollo7' typename=3D'7457_v1.2-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'7457' typename=3D'7457_v1.2-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'7447' typename=3D'7447_v1.1-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'apollo6' typename=3D'7455_v3.2-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'7455' typename=3D'7455_v3.2-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'7445' typename=3D'7445_v3.2-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'7451' typename=3D'7451_v2.3-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'7441' typename=3D'7441_v2.3-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'vger' typename=3D'7450_v2.1-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'7450' typename=3D'7450_v2.1-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'7448' typename=3D'7448_v2.1-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'nitro' typename=3D'7410_v1.4-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'7410' typename=3D'7410_v1.4-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'g4' typename=3D'7400_v2.9-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'max' typename=3D'7400_v2.9-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'7400' typename=3D'7400_v2.9-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'goldfinger' typename=3D'755_v2.8-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'755' typename=3D'755_v2.8-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'745' typename=3D'745_v2.8-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'lonestar' typename=3D'750l_v3.2-powerpc64-cpu'=
/>
+  <cpu type=3D'kvm' name=3D'750l' typename=3D'750l_v3.2-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'750gx' typename=3D'750gx_v1.2-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'750fx' typename=3D'750fx_v2.3-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'750cxe' typename=3D'750cxe_v3.1b-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'750cx' typename=3D'750cx_v2.2-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'750cl' typename=3D'750cl_v2.0-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'conan/doyle' typename=3D'750p-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'g3' typename=3D'750_v3.1-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'typhoon' typename=3D'750_v3.1-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'750' typename=3D'750_v3.1-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'arthur' typename=3D'740_v3.1-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'740' typename=3D'740_v3.1-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'mach5' typename=3D'604r-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'sirocco' typename=3D'604e_v2.4-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'604e' typename=3D'604e_v2.4-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'goldeneye' typename=3D'603e7t-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'603r' typename=3D'603e7t-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'vaillant' typename=3D'603e7v-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'stretch' typename=3D'603e_v4.1-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'603e' typename=3D'603e_v4.1-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'vanilla' typename=3D'603-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'601v' typename=3D'601_v2-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'601' typename=3D'601_v2-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'mpc8560' typename=3D'mpc8560_v21-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'mpc8555e' typename=3D'mpc8555e_v11-powerpc64-c=
pu'/>
+  <cpu type=3D'kvm' name=3D'mpc8555' typename=3D'mpc8555_v11-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'mpc8548e' typename=3D'mpc8548e_v21-powerpc64-c=
pu'/>
+  <cpu type=3D'kvm' name=3D'mpc8548' typename=3D'mpc8548_v21-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'mpc8547e' typename=3D'mpc8547e_v21-powerpc64-c=
pu'/>
+  <cpu type=3D'kvm' name=3D'mpc8545e' typename=3D'mpc8545e_v21-powerpc64-c=
pu'/>
+  <cpu type=3D'kvm' name=3D'mpc8545' typename=3D'mpc8545_v21-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'mpc8544e' typename=3D'mpc8544e_v11-powerpc64-c=
pu'/>
+  <cpu type=3D'kvm' name=3D'mpc8544' typename=3D'mpc8544_v11-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'mpc8543e' typename=3D'mpc8543e_v21-powerpc64-c=
pu'/>
+  <cpu type=3D'kvm' name=3D'mpc8543' typename=3D'mpc8543_v21-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'mpc8541e' typename=3D'mpc8541e_v11-powerpc64-c=
pu'/>
+  <cpu type=3D'kvm' name=3D'mpc8541' typename=3D'mpc8541_v11-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'mpc8540' typename=3D'mpc8540_v21-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'mpc8533e' typename=3D'mpc8533e_v11-powerpc64-c=
pu'/>
+  <cpu type=3D'kvm' name=3D'mpc8533' typename=3D'mpc8533_v11-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'e500v2' typename=3D'e500v2_v22-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'e500v1' typename=3D'e500_v20-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'e500' typename=3D'e500v2_v22-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'mpc8347ea' typename=3D'mpc8347eat-powerpc64-cp=
u'/>
+  <cpu type=3D'kvm' name=3D'mpc8347e' typename=3D'mpc8347et-powerpc64-cpu'=
/>
+  <cpu type=3D'kvm' name=3D'mpc8347a' typename=3D'mpc8347at-powerpc64-cpu'=
/>
+  <cpu type=3D'kvm' name=3D'mpc8347' typename=3D'mpc8347t-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'e300' typename=3D'e300c3-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'e200' typename=3D'e200z6-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'mpc8280' typename=3D'g2legp3-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'mpc8275' typename=3D'g2legp3-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'mpc8272' typename=3D'g2legp3-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'mpc8271' typename=3D'g2legp3-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'mpc8270' typename=3D'g2legp3-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'mpc8266_hip4' typename=3D'g2hip4-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'mpc8266_hip3' typename=3D'g2hip3-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'mpc8266' typename=3D'g2hip4-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'mpc8265_hip4' typename=3D'g2hip4-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'mpc8265_hip3' typename=3D'g2hip3-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'mpc8265' typename=3D'g2hip4-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'mpc8264_hip4' typename=3D'g2hip4-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'mpc8264_hip3' typename=3D'g2hip3-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'mpc8264' typename=3D'g2hip4-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'mpc8260_hip4' typename=3D'g2hip4-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'mpc8260_hip3' typename=3D'g2hip3-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'mpc8260' typename=3D'g2hip4-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'mpc8255_hip4' typename=3D'g2hip4-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'mpc8255_hip3' typename=3D'g2hip3-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'mpc8255' typename=3D'g2hip4-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'mpc8250_hip4' typename=3D'g2hip4-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'mpc8250_hip3' typename=3D'g2hip3-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'mpc8250' typename=3D'g2hip4-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'mpc8248' typename=3D'g2legp3-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'mpc8247' typename=3D'g2legp3-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'mpc8245' typename=3D'g2hip4-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'mpc8241' typename=3D'g2hip4-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'powerquicc-ii' typename=3D'g2legp3-powerpc64-c=
pu'/>
+  <cpu type=3D'kvm' name=3D'mpc82xx' typename=3D'g2legp3-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'mpc5200b' typename=3D'mpc5200b_v21-powerpc64-c=
pu'/>
+  <cpu type=3D'kvm' name=3D'mpc5200' typename=3D'mpc5200_v12-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'mpc52xx' typename=3D'mpc5200_v12-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'mpc8240' typename=3D'603-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'460ex' typename=3D'460exb-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'440ep' typename=3D'440epb-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'x2vp50' typename=3D'x2vp20-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'x2vp7' typename=3D'x2vp4-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'405gpe' typename=3D'405crc-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'405gp' typename=3D'405gpd-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'405cr' typename=3D'405crc-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'405' typename=3D'405d4-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'403' typename=3D'403gc-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'mpc8547e_v21' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cl_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7457a_v1.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'g2gp' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cxe_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'755_v2.7' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'755_v2.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'745_v2.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8377' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7455_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8545_v21' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8548_v11' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'405d4' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'g2le' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'g2hip3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750e' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8572' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'970fx_v2.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750fx_v2.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603p' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'405gpb' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7400_v2.7' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8544e_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e500v2_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e500mc' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603e7v1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'970mp_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'740e' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'405crc' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'403ga' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7447a_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7400_v2.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e300c1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8572e' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e500v2_v21' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'970fx_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750gx_v1.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750fx_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7457_v1.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'970fx_v3.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'604e_v2.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'755_v2.6' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'401a1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'power9_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'npe405h' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7410_v1.4' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'g2ls' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750_v2.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'401b2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8349' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8347ep' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7445_v3.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8540_v21' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8543_v11' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'403gcx' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'745_v2.4' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8548_v21' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750l_v3.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'755_v1.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e500_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cxe_v3.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8541e_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8347p' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8555e_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'power9_v2.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'power7_v2.3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603e7v' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8543e_v11' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750_v3.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7400_v2.6' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'405gpa' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'440epx' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750l_v2.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e200z6' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8547e_v20' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7457a_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8349ea' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e500v2_v20' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'power8nvl_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8540_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'755_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'745_v2.8' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'npe405l' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8343ea' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8545_v20' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8548_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7448_v1.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7455_v3.4' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'740_v2.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7400_v1.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8347et' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7441_v2.10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603e_v1.4' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8543_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'401c2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7451_v2.10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cx_v2.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8543_v21' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603e7' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7448_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7441_v2.3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'405crb' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'604' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7400_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'440-xilinx-w-dfpu' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7445_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'cobra' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e500_v20' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8541_v11' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750gx_v1.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cxe_v2.4' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8641d' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8543e_v21' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750l_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7457_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7450_v1.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'755_v2.5' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7410_v1.3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'745_v2.3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'755_v2.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e500v2_v30' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7455_v3.3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8540_v20' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'405d2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8560_v21' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8343' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8548_v20' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8347t' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'755_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603e_v1.3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'host' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8543e_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8347eap' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8548e_v11' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8543_v20' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'401d2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'power8_v2.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'740_v3.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e200z5' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'405cra' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7400_v2.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cxe_v2.3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'745_v2.7' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8560_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e5500' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8544_v11' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7448_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'401e2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'740_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'745_v2.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7400_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7410_v1.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'x2vp4' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8347ap' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8533_v11' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc5200b_v21' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750fx_v2.3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'601_v2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'g2legp3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'604e_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cx_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8610' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'g2h4' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750l_v3.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8377e' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e300c4' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc5200_v12' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7448_v2.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7450_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cxe_v3.1b' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'g2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7400_v2.9' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'405gpd' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603e7t' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8555_v11' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750gx_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8541_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8543e_v20' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750fl' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750l_v2.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'stb04' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8548e_v21' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'x2vp20' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'405ez' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e600' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7450_v1.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'755_v2.4' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8379' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7445_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7447_v1.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603e_v2.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603e_v4' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'g2legp' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7455_v3.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'740_v2.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8560_v20' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'440-xilinx' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'401f2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8533_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'405gpr' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8349a' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'stb25' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603e_v1.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc5200b_v20' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750fx_v2.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8347eat' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'740_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'601_v1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'745_v1.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cx_v2.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8548e_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7447a_v1.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'403gc' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e300c3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc5200_v11' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7441_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'740_v3.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8545e_v21' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'602' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8378e' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8343a' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'460exb' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8555_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8568' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7457a_v1.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cx_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cxe_v2.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'604e_v2.4' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'755_v2.8' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'405lp' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'745_v2.6' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'stb03' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'405ep' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8544_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8347at' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750_v2.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7450_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'755_v2.3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7410_v1.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'745_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750gl' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e6500' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750p' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7445_v3.4' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'440epb' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'npe4gs3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603e_v3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8349e' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'970_v2.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'g2lels' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'g2hip4' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'740p' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8567e' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8533e_v11' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7451_v2.3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603e_v1.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'401g2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7400_v2.8' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7455_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'405gpc' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'power7+_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8544e_v11' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7450_v2.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'970mp_v1.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603e7v2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'604r' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e500v2_v22' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8548e_v20' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8545e_v20' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8378' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8567' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7457_v1.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7447_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'970fx_v3.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'745_v2.5' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8379e' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8641' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cxe_v2.4b' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7410_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc603' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603e_v4.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7445_v3.3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'440epa' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'970fx_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'iop480' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750fx_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'601_v0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'g2legp1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'745_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cl_v2.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cxr' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'401' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8541e_v11' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cxe_v3.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8555e_v11' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'power5+_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7447a_v1.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'403gb' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e300c2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'npe405h2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8343e' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8533e_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc5200_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750_v3.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'power8e_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8568e' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'default' typename=3D'604-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'ppc' typename=3D'604-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'ppc32' typename=3D'604-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'ppc64' typename=3D'970fx_v3.1-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'970mp' typename=3D'970mp_v1.1-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'970fx' typename=3D'970fx_v3.1-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'970' typename=3D'970_v2.2-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'power9' typename=3D'power9_v2.0-powerpc64-cpu'=
/>
+  <cpu type=3D'tcg' name=3D'power8nvl' typename=3D'power8nvl_v1.0-powerpc6=
4-cpu'/>
+  <cpu type=3D'tcg' name=3D'power8' typename=3D'power8_v2.0-powerpc64-cpu'=
/>
+  <cpu type=3D'tcg' name=3D'power8e' typename=3D'power8e_v2.1-powerpc64-cp=
u'/>
+  <cpu type=3D'tcg' name=3D'power7+' typename=3D'power7+_v2.1-powerpc64-cp=
u'/>
+  <cpu type=3D'tcg' name=3D'power7' typename=3D'power7_v2.3-powerpc64-cpu'=
/>
+  <cpu type=3D'tcg' name=3D'power5gs' typename=3D'power5+_v2.1-powerpc64-c=
pu'/>
+  <cpu type=3D'tcg' name=3D'power5+' typename=3D'power5+_v2.1-powerpc64-cp=
u'/>
+  <cpu type=3D'tcg' name=3D'apollo7pm' typename=3D'7457a_v1.0-powerpc64-cp=
u'/>
+  <cpu type=3D'tcg' name=3D'7457a' typename=3D'7457a_v1.2-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'7447a' typename=3D'7447a_v1.2-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'apollo7' typename=3D'7457_v1.2-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'7457' typename=3D'7457_v1.2-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'7447' typename=3D'7447_v1.1-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'apollo6' typename=3D'7455_v3.2-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'7455' typename=3D'7455_v3.2-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'7445' typename=3D'7445_v3.2-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'7451' typename=3D'7451_v2.3-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'7441' typename=3D'7441_v2.3-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'vger' typename=3D'7450_v2.1-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'7450' typename=3D'7450_v2.1-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'7448' typename=3D'7448_v2.1-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'nitro' typename=3D'7410_v1.4-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'7410' typename=3D'7410_v1.4-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'g4' typename=3D'7400_v2.9-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'max' typename=3D'7400_v2.9-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'7400' typename=3D'7400_v2.9-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'goldfinger' typename=3D'755_v2.8-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'755' typename=3D'755_v2.8-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'745' typename=3D'745_v2.8-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'lonestar' typename=3D'750l_v3.2-powerpc64-cpu'=
/>
+  <cpu type=3D'tcg' name=3D'750l' typename=3D'750l_v3.2-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'750gx' typename=3D'750gx_v1.2-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'750fx' typename=3D'750fx_v2.3-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'750cxe' typename=3D'750cxe_v3.1b-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'750cx' typename=3D'750cx_v2.2-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'750cl' typename=3D'750cl_v2.0-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'conan/doyle' typename=3D'750p-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'g3' typename=3D'750_v3.1-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'typhoon' typename=3D'750_v3.1-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'750' typename=3D'750_v3.1-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'arthur' typename=3D'740_v3.1-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'740' typename=3D'740_v3.1-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'mach5' typename=3D'604r-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'sirocco' typename=3D'604e_v2.4-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'604e' typename=3D'604e_v2.4-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'goldeneye' typename=3D'603e7t-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'603r' typename=3D'603e7t-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'vaillant' typename=3D'603e7v-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'stretch' typename=3D'603e_v4.1-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'603e' typename=3D'603e_v4.1-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'vanilla' typename=3D'603-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'601v' typename=3D'601_v2-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'601' typename=3D'601_v2-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'mpc8560' typename=3D'mpc8560_v21-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'mpc8555e' typename=3D'mpc8555e_v11-powerpc64-c=
pu'/>
+  <cpu type=3D'tcg' name=3D'mpc8555' typename=3D'mpc8555_v11-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'mpc8548e' typename=3D'mpc8548e_v21-powerpc64-c=
pu'/>
+  <cpu type=3D'tcg' name=3D'mpc8548' typename=3D'mpc8548_v21-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'mpc8547e' typename=3D'mpc8547e_v21-powerpc64-c=
pu'/>
+  <cpu type=3D'tcg' name=3D'mpc8545e' typename=3D'mpc8545e_v21-powerpc64-c=
pu'/>
+  <cpu type=3D'tcg' name=3D'mpc8545' typename=3D'mpc8545_v21-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'mpc8544e' typename=3D'mpc8544e_v11-powerpc64-c=
pu'/>
+  <cpu type=3D'tcg' name=3D'mpc8544' typename=3D'mpc8544_v11-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'mpc8543e' typename=3D'mpc8543e_v21-powerpc64-c=
pu'/>
+  <cpu type=3D'tcg' name=3D'mpc8543' typename=3D'mpc8543_v21-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'mpc8541e' typename=3D'mpc8541e_v11-powerpc64-c=
pu'/>
+  <cpu type=3D'tcg' name=3D'mpc8541' typename=3D'mpc8541_v11-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'mpc8540' typename=3D'mpc8540_v21-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'mpc8533e' typename=3D'mpc8533e_v11-powerpc64-c=
pu'/>
+  <cpu type=3D'tcg' name=3D'mpc8533' typename=3D'mpc8533_v11-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'e500v2' typename=3D'e500v2_v22-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'e500v1' typename=3D'e500_v20-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'e500' typename=3D'e500v2_v22-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'mpc8347ea' typename=3D'mpc8347eat-powerpc64-cp=
u'/>
+  <cpu type=3D'tcg' name=3D'mpc8347e' typename=3D'mpc8347et-powerpc64-cpu'=
/>
+  <cpu type=3D'tcg' name=3D'mpc8347a' typename=3D'mpc8347at-powerpc64-cpu'=
/>
+  <cpu type=3D'tcg' name=3D'mpc8347' typename=3D'mpc8347t-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'e300' typename=3D'e300c3-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'e200' typename=3D'e200z6-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'mpc8280' typename=3D'g2legp3-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'mpc8275' typename=3D'g2legp3-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'mpc8272' typename=3D'g2legp3-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'mpc8271' typename=3D'g2legp3-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'mpc8270' typename=3D'g2legp3-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'mpc8266_hip4' typename=3D'g2hip4-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'mpc8266_hip3' typename=3D'g2hip3-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'mpc8266' typename=3D'g2hip4-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'mpc8265_hip4' typename=3D'g2hip4-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'mpc8265_hip3' typename=3D'g2hip3-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'mpc8265' typename=3D'g2hip4-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'mpc8264_hip4' typename=3D'g2hip4-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'mpc8264_hip3' typename=3D'g2hip3-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'mpc8264' typename=3D'g2hip4-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'mpc8260_hip4' typename=3D'g2hip4-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'mpc8260_hip3' typename=3D'g2hip3-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'mpc8260' typename=3D'g2hip4-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'mpc8255_hip4' typename=3D'g2hip4-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'mpc8255_hip3' typename=3D'g2hip3-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'mpc8255' typename=3D'g2hip4-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'mpc8250_hip4' typename=3D'g2hip4-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'mpc8250_hip3' typename=3D'g2hip3-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'mpc8250' typename=3D'g2hip4-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'mpc8248' typename=3D'g2legp3-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'mpc8247' typename=3D'g2legp3-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'mpc8245' typename=3D'g2hip4-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'mpc8241' typename=3D'g2hip4-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'powerquicc-ii' typename=3D'g2legp3-powerpc64-c=
pu'/>
+  <cpu type=3D'tcg' name=3D'mpc82xx' typename=3D'g2legp3-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'mpc5200b' typename=3D'mpc5200b_v21-powerpc64-c=
pu'/>
+  <cpu type=3D'tcg' name=3D'mpc5200' typename=3D'mpc5200_v12-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'mpc52xx' typename=3D'mpc5200_v12-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'mpc8240' typename=3D'603-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'460ex' typename=3D'460exb-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'440ep' typename=3D'440epb-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'x2vp50' typename=3D'x2vp20-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'x2vp7' typename=3D'x2vp4-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'405gpe' typename=3D'405crc-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'405gp' typename=3D'405gpd-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'405cr' typename=3D'405crc-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'405' typename=3D'405d4-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'403' typename=3D'403gc-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'mpc8547e_v21' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cl_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7457a_v1.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'g2gp' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cxe_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'755_v2.7' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'755_v2.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'745_v2.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8377' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7455_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8545_v21' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8548_v11' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'405d4' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'g2le' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'g2hip3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750e' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8572' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'970fx_v2.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750fx_v2.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603p' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'405gpb' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7400_v2.7' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8544e_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e500v2_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e500mc' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603e7v1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'970mp_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'740e' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'405crc' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'403ga' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7447a_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7400_v2.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e300c1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8572e' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e500v2_v21' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'970fx_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750gx_v1.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750fx_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7457_v1.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'970fx_v3.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'604e_v2.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'755_v2.6' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'401a1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'power9_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'npe405h' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7410_v1.4' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'g2ls' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750_v2.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'401b2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8349' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8347ep' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7445_v3.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8540_v21' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8543_v11' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'403gcx' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'745_v2.4' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8548_v21' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750l_v3.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'755_v1.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e500_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cxe_v3.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8541e_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8347p' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8555e_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'power9_v2.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'power7_v2.3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603e7v' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8543e_v11' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750_v3.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7400_v2.6' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'405gpa' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'440epx' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750l_v2.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e200z6' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8547e_v20' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7457a_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8349ea' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e500v2_v20' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'power8nvl_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8540_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'755_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'745_v2.8' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'npe405l' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8343ea' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8545_v20' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8548_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7448_v1.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7455_v3.4' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'740_v2.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7400_v1.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8347et' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7441_v2.10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603e_v1.4' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8543_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'401c2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7451_v2.10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cx_v2.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8543_v21' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603e7' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7448_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7441_v2.3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'405crb' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'604' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7400_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'440-xilinx-w-dfpu' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7445_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'cobra' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e500_v20' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8541_v11' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750gx_v1.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cxe_v2.4' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8641d' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8543e_v21' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750l_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7457_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7450_v1.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'755_v2.5' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7410_v1.3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'745_v2.3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'755_v2.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e500v2_v30' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7455_v3.3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8540_v20' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'405d2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8560_v21' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8343' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8548_v20' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8347t' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'755_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603e_v1.3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8543e_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8347eap' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8548e_v11' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8543_v20' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'401d2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'power8_v2.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'740_v3.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e200z5' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'405cra' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7400_v2.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cxe_v2.3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'745_v2.7' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8560_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e5500' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8544_v11' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7448_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'401e2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'740_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'745_v2.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7400_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7410_v1.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'x2vp4' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8347ap' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8533_v11' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc5200b_v21' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750fx_v2.3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'601_v2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'g2legp3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'604e_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cx_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8610' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'g2h4' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750l_v3.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8377e' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e300c4' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc5200_v12' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7448_v2.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7450_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cxe_v3.1b' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'g2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7400_v2.9' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'405gpd' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603e7t' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8555_v11' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750gx_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8541_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8543e_v20' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750fl' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750l_v2.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'stb04' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8548e_v21' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'x2vp20' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'405ez' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e600' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7450_v1.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'755_v2.4' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8379' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7445_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7447_v1.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603e_v2.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603e_v4' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'g2legp' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7455_v3.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'740_v2.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8560_v20' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'440-xilinx' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'401f2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8533_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'405gpr' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8349a' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'stb25' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603e_v1.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc5200b_v20' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750fx_v2.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8347eat' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'740_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'601_v1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'745_v1.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cx_v2.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8548e_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7447a_v1.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'403gc' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e300c3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc5200_v11' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7441_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'740_v3.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8545e_v21' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'602' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8378e' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8343a' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'460exb' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8555_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8568' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7457a_v1.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cx_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cxe_v2.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'604e_v2.4' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'755_v2.8' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'405lp' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'745_v2.6' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'stb03' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'405ep' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8544_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8347at' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750_v2.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7450_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'755_v2.3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7410_v1.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'745_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750gl' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e6500' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750p' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7445_v3.4' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'440epb' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'npe4gs3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603e_v3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8349e' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'970_v2.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'g2lels' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'g2hip4' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'740p' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8567e' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8533e_v11' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7451_v2.3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603e_v1.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'401g2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7400_v2.8' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7455_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'405gpc' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'power7+_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8544e_v11' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7450_v2.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'970mp_v1.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603e7v2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'604r' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e500v2_v22' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8548e_v20' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8545e_v20' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8378' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8567' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7457_v1.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7447_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'970fx_v3.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'745_v2.5' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8379e' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8641' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cxe_v2.4b' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7410_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc603' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603e_v4.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7445_v3.3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'440epa' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'970fx_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'iop480' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750fx_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'601_v0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'g2legp1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'745_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cl_v2.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cxr' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'401' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8541e_v11' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cxe_v3.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8555e_v11' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'power5+_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7447a_v1.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'403gb' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e300c2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'npe405h2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8343e' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8533e_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc5200_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750_v3.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'power8e_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8568e' typename=3D''/>
   <machine name=3D'pseries-2.12' alias=3D'pseries' hotplugCpus=3D'yes' max=
Cpus=3D'1024' default=3D'yes'/>
   <machine name=3D'ref405ep' maxCpus=3D'1'/>
   <machine name=3D'sam460ex' maxCpus=3D'1'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemuc=
apabilitiesdata/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=3D'te' type=3D'boolean' value=3D'true'/>
     <property name=3D'cmm' type=3D'boolean' value=3D'true'/>
   </hostCPU>
-  <cpu type=3D'kvm' name=3D'z890.2' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z990.4' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z10BC.2' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z196.2' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z14' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z9BC-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'zEC12-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z196-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z13-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z990.3' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'host' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z9EC' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'zBC12' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z9EC.3' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z196.2-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'qemu' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'z890.2' typename=3D'z890.2-s390x-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z990.4' typename=3D'z990.4-s390x-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z10BC.2' typename=3D'z10BC.2-s390x-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z196.2' typename=3D'z196.2-s390x-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z14' typename=3D'z14-s390x-cpu' usable=3D'yes'=
/>
+  <cpu type=3D'kvm' name=3D'z9BC-base' typename=3D'z9BC-base-s390x-cpu' us=
able=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'zEC12-base' typename=3D'zEC12-base-s390x-cpu' =
usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z196-base' typename=3D'z196-base-s390x-cpu' us=
able=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z13-base' typename=3D'z13-base-s390x-cpu' usab=
le=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z990.3' typename=3D'z990.3-s390x-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'host' typename=3D'host-s390x-cpu' usable=3D'ye=
s'/>
+  <cpu type=3D'kvm' name=3D'z9EC' typename=3D'z9EC-s390x-cpu' usable=3D'ye=
s'/>
+  <cpu type=3D'kvm' name=3D'zBC12' typename=3D'zBC12-s390x-cpu' usable=3D'=
yes'/>
+  <cpu type=3D'kvm' name=3D'z9EC.3' typename=3D'z9EC.3-s390x-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z196.2-base' typename=3D'z196.2-base-s390x-cpu=
' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'qemu' typename=3D'qemu-s390x-cpu' usable=3D'no=
'>
     <blocker name=3D'ais'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'zEC12.2-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z800-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z9EC.2' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z900.2-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z900.3' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z890-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z890' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z990.4-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z10BC.2-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z900.2' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z9BC.2-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z800' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z114' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z13' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z13s-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z990' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z990.2' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z14-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z890.2-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z196' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z10EC' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z13s' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z900' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z10EC.3' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z10EC.2-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z114-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z990.2-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z9EC.2-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z890.3' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z900.3-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z9BC.2' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z10BC' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z990.5' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'zEC12.2' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z10EC-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z9EC-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z9EC.3-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'zEC12' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z990.5-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z10BC-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z900-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z13.2' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z890.3-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'zBC12-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z13.2-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z990-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z10EC.2' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z9BC' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z10EC.3-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z990.3-base' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'z890.2' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'zEC12.2-base' typename=3D'zEC12.2-base-s390x-c=
pu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z800-base' typename=3D'z800-base-s390x-cpu' us=
able=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z9EC.2' typename=3D'z9EC.2-s390x-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z900.2-base' typename=3D'z900.2-base-s390x-cpu=
' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z900.3' typename=3D'z900.3-s390x-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z890-base' typename=3D'z890-base-s390x-cpu' us=
able=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z890' typename=3D'z890-s390x-cpu' usable=3D'ye=
s'/>
+  <cpu type=3D'kvm' name=3D'z990.4-base' typename=3D'z990.4-base-s390x-cpu=
' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z10BC.2-base' typename=3D'z10BC.2-base-s390x-c=
pu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z900.2' typename=3D'z900.2-s390x-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z9BC.2-base' typename=3D'z9BC.2-base-s390x-cpu=
' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z800' typename=3D'z800-s390x-cpu' usable=3D'ye=
s'/>
+  <cpu type=3D'kvm' name=3D'z114' typename=3D'z114-s390x-cpu' usable=3D'ye=
s'/>
+  <cpu type=3D'kvm' name=3D'z13' typename=3D'z13-s390x-cpu' usable=3D'yes'=
/>
+  <cpu type=3D'kvm' name=3D'z13s-base' typename=3D'z13s-base-s390x-cpu' us=
able=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z990' typename=3D'z990-s390x-cpu' usable=3D'ye=
s'/>
+  <cpu type=3D'kvm' name=3D'z990.2' typename=3D'z990.2-s390x-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z14-base' typename=3D'z14-base-s390x-cpu' usab=
le=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z890.2-base' typename=3D'z890.2-base-s390x-cpu=
' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z196' typename=3D'z196-s390x-cpu' usable=3D'ye=
s'/>
+  <cpu type=3D'kvm' name=3D'z10EC' typename=3D'z10EC-s390x-cpu' usable=3D'=
yes'/>
+  <cpu type=3D'kvm' name=3D'z13s' typename=3D'z13s-s390x-cpu' usable=3D'ye=
s'/>
+  <cpu type=3D'kvm' name=3D'z900' typename=3D'z900-s390x-cpu' usable=3D'ye=
s'/>
+  <cpu type=3D'kvm' name=3D'z10EC.3' typename=3D'z10EC.3-s390x-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z10EC.2-base' typename=3D'z10EC.2-base-s390x-c=
pu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z114-base' typename=3D'z114-base-s390x-cpu' us=
able=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z990.2-base' typename=3D'z990.2-base-s390x-cpu=
' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z9EC.2-base' typename=3D'z9EC.2-base-s390x-cpu=
' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z890.3' typename=3D'z890.3-s390x-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z900.3-base' typename=3D'z900.3-base-s390x-cpu=
' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z9BC.2' typename=3D'z9BC.2-s390x-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z10BC' typename=3D'z10BC-s390x-cpu' usable=3D'=
yes'/>
+  <cpu type=3D'kvm' name=3D'z990.5' typename=3D'z990.5-s390x-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'zEC12.2' typename=3D'zEC12.2-s390x-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z10EC-base' typename=3D'z10EC-base-s390x-cpu' =
usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z9EC-base' typename=3D'z9EC-base-s390x-cpu' us=
able=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z9EC.3-base' typename=3D'z9EC.3-base-s390x-cpu=
' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'zEC12' typename=3D'zEC12-s390x-cpu' usable=3D'=
yes'/>
+  <cpu type=3D'kvm' name=3D'z990.5-base' typename=3D'z990.5-base-s390x-cpu=
' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z10BC-base' typename=3D'z10BC-base-s390x-cpu' =
usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z900-base' typename=3D'z900-base-s390x-cpu' us=
able=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z13.2' typename=3D'z13.2-s390x-cpu' usable=3D'=
yes'/>
+  <cpu type=3D'kvm' name=3D'z890.3-base' typename=3D'z890.3-base-s390x-cpu=
' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'zBC12-base' typename=3D'zBC12-base-s390x-cpu' =
usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z13.2-base' typename=3D'z13.2-base-s390x-cpu' =
usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z990-base' typename=3D'z990-base-s390x-cpu' us=
able=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z10EC.2' typename=3D'z10EC.2-s390x-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z9BC' typename=3D'z9BC-s390x-cpu' usable=3D'ye=
s'/>
+  <cpu type=3D'kvm' name=3D'z10EC.3-base' typename=3D'z10EC.3-base-s390x-c=
pu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z990.3-base' typename=3D'z990.3-base-s390x-cpu=
' usable=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'z890.2' typename=3D'z890.2-s390x-cpu' usable=
=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -237,7 +237,7 @@
     <blocker name=3D'kmac-dea'/>
     <blocker name=3D'hfpm'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z990.4' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z990.4' typename=3D'z990.4-s390x-cpu' usable=
=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -251,7 +251,7 @@
     <blocker name=3D'kmac-dea'/>
     <blocker name=3D'hfpm'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z10BC.2' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z10BC.2' typename=3D'z10BC.2-s390x-cpu' usable=
=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -279,7 +279,7 @@
     <blocker name=3D'msa1'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z196.2' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z196.2' typename=3D'z196.2-s390x-cpu' usable=
=3D'no'>
     <blocker name=3D'pcc-xts-eaes-256'/>
     <blocker name=3D'pcc-xts-eaes-128'/>
     <blocker name=3D'pcc-xts-aes-256'/>
@@ -397,7 +397,7 @@
     <blocker name=3D'msa1'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z14' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z14' typename=3D'z14-s390x-cpu' usable=3D'no'>
     <blocker name=3D'ppno-sha-512-drng'/>
     <blocker name=3D'pcc-xts-eaes-256'/>
     <blocker name=3D'pcc-xts-eaes-128'/>
@@ -539,7 +539,7 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z9BC-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z9BC-base' typename=3D'z9BC-base-s390x-cpu' us=
able=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -557,7 +557,7 @@
     <blocker name=3D'asnlxr'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'zEC12-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'zEC12-base' typename=3D'zEC12-base-s390x-cpu' =
usable=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -585,7 +585,7 @@
     <blocker name=3D'asnlxr'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z196-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z196-base' typename=3D'z196-base-s390x-cpu' us=
able=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -612,7 +612,7 @@
     <blocker name=3D'asnlxr'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z13-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z13-base' typename=3D'z13-base-s390x-cpu' usab=
le=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -643,7 +643,7 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z990.3' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z990.3' typename=3D'z990.3-s390x-cpu' usable=
=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -657,8 +657,8 @@
     <blocker name=3D'kmac-dea'/>
     <blocker name=3D'hfpm'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'host'/>
-  <cpu type=3D'tcg' name=3D'z9EC' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'host' typename=3D'host-s390x-cpu'/>
+  <cpu type=3D'tcg' name=3D'z9EC' typename=3D'z9EC-s390x-cpu' usable=3D'no=
'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -679,7 +679,7 @@
     <blocker name=3D'msa1'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'zBC12' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'zBC12' typename=3D'zBC12-s390x-cpu' usable=3D'=
no'>
     <blocker name=3D'pcc-xts-eaes-256'/>
     <blocker name=3D'pcc-xts-eaes-128'/>
     <blocker name=3D'pcc-xts-aes-256'/>
@@ -804,7 +804,7 @@
     <blocker name=3D'msa1'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z9EC.3' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z9EC.3' typename=3D'z9EC.3-s390x-cpu' usable=
=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -825,7 +825,7 @@
     <blocker name=3D'msa1'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z196.2-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z196.2-base' typename=3D'z196.2-base-s390x-cpu=
' usable=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -852,8 +852,8 @@
     <blocker name=3D'asnlxr'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'qemu' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'zEC12.2-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'qemu' typename=3D'qemu-s390x-cpu' usable=3D'ye=
s'/>
+  <cpu type=3D'tcg' name=3D'zEC12.2-base' typename=3D'zEC12.2-base-s390x-c=
pu' usable=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -881,8 +881,8 @@
     <blocker name=3D'asnlxr'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z800-base' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'z9EC.2' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z800-base' typename=3D'z800-base-s390x-cpu' us=
able=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'z9EC.2' typename=3D'z9EC.2-s390x-cpu' usable=
=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -903,9 +903,9 @@
     <blocker name=3D'msa1'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z900.2-base' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'z900.3' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'z890-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z900.2-base' typename=3D'z900.2-base-s390x-cpu=
' usable=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'z900.3' typename=3D'z900.3-s390x-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'z890-base' typename=3D'z890-base-s390x-cpu' us=
able=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -919,7 +919,7 @@
     <blocker name=3D'kmac-dea'/>
     <blocker name=3D'hfpm'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z890' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z890' typename=3D'z890-s390x-cpu' usable=3D'no=
'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -933,7 +933,7 @@
     <blocker name=3D'kmac-dea'/>
     <blocker name=3D'hfpm'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z990.4-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z990.4-base' typename=3D'z990.4-base-s390x-cpu=
' usable=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -947,7 +947,7 @@
     <blocker name=3D'kmac-dea'/>
     <blocker name=3D'hfpm'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z10BC.2-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z10BC.2-base' typename=3D'z10BC.2-base-s390x-c=
pu' usable=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -970,8 +970,8 @@
     <blocker name=3D'asnlxr'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z900.2' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'z9BC.2-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z900.2' typename=3D'z900.2-s390x-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'z9BC.2-base' typename=3D'z9BC.2-base-s390x-cpu=
' usable=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -989,8 +989,8 @@
     <blocker name=3D'asnlxr'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z800' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'z114' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z800' typename=3D'z800-s390x-cpu' usable=3D'ye=
s'/>
+  <cpu type=3D'tcg' name=3D'z114' typename=3D'z114-s390x-cpu' usable=3D'no=
'>
     <blocker name=3D'pcc-xts-eaes-256'/>
     <blocker name=3D'pcc-xts-eaes-128'/>
     <blocker name=3D'pcc-xts-aes-256'/>
@@ -1108,7 +1108,7 @@
     <blocker name=3D'msa1'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z13' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z13' typename=3D'z13-s390x-cpu' usable=3D'no'>
     <blocker name=3D'ppno-sha-512-drng'/>
     <blocker name=3D'pcc-xts-eaes-256'/>
     <blocker name=3D'pcc-xts-eaes-128'/>
@@ -1238,7 +1238,7 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z13s-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z13s-base' typename=3D'z13s-base-s390x-cpu' us=
able=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -1269,7 +1269,7 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z990' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z990' typename=3D'z990-s390x-cpu' usable=3D'no=
'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -1283,7 +1283,7 @@
     <blocker name=3D'kmac-dea'/>
     <blocker name=3D'hfpm'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z990.2' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z990.2' typename=3D'z990.2-s390x-cpu' usable=
=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -1297,7 +1297,7 @@
     <blocker name=3D'kmac-dea'/>
     <blocker name=3D'hfpm'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z14-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z14-base' typename=3D'z14-base-s390x-cpu' usab=
le=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -1333,7 +1333,7 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z890.2-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z890.2-base' typename=3D'z890.2-base-s390x-cpu=
' usable=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -1347,7 +1347,7 @@
     <blocker name=3D'kmac-dea'/>
     <blocker name=3D'hfpm'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z196' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z196' typename=3D'z196-s390x-cpu' usable=3D'no=
'>
     <blocker name=3D'pcc-xts-eaes-256'/>
     <blocker name=3D'pcc-xts-eaes-128'/>
     <blocker name=3D'pcc-xts-aes-256'/>
@@ -1465,7 +1465,7 @@
     <blocker name=3D'msa1'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z10EC' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z10EC' typename=3D'z10EC-s390x-cpu' usable=3D'=
no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -1493,7 +1493,7 @@
     <blocker name=3D'msa1'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z13s' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z13s' typename=3D'z13s-s390x-cpu' usable=3D'no=
'>
     <blocker name=3D'ppno-sha-512-drng'/>
     <blocker name=3D'pcc-xts-eaes-256'/>
     <blocker name=3D'pcc-xts-eaes-128'/>
@@ -1623,8 +1623,8 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z900' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'z10EC.3' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z900' typename=3D'z900-s390x-cpu' usable=3D'ye=
s'/>
+  <cpu type=3D'tcg' name=3D'z10EC.3' typename=3D'z10EC.3-s390x-cpu' usable=
=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -1652,7 +1652,7 @@
     <blocker name=3D'msa1'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z10EC.2-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z10EC.2-base' typename=3D'z10EC.2-base-s390x-c=
pu' usable=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -1675,7 +1675,7 @@
     <blocker name=3D'asnlxr'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z114-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z114-base' typename=3D'z114-base-s390x-cpu' us=
able=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -1702,7 +1702,7 @@
     <blocker name=3D'asnlxr'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z990.2-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z990.2-base' typename=3D'z990.2-base-s390x-cpu=
' usable=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -1716,7 +1716,7 @@
     <blocker name=3D'kmac-dea'/>
     <blocker name=3D'hfpm'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z9EC.2-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z9EC.2-base' typename=3D'z9EC.2-base-s390x-cpu=
' usable=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -1734,7 +1734,7 @@
     <blocker name=3D'asnlxr'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z890.3' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z890.3' typename=3D'z890.3-s390x-cpu' usable=
=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -1748,8 +1748,8 @@
     <blocker name=3D'kmac-dea'/>
     <blocker name=3D'hfpm'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z900.3-base' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'z9BC.2' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z900.3-base' typename=3D'z900.3-base-s390x-cpu=
' usable=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'z9BC.2' typename=3D'z9BC.2-s390x-cpu' usable=
=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -1770,7 +1770,7 @@
     <blocker name=3D'msa1'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z10BC' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z10BC' typename=3D'z10BC-s390x-cpu' usable=3D'=
no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -1798,7 +1798,7 @@
     <blocker name=3D'msa1'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z990.5' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z990.5' typename=3D'z990.5-s390x-cpu' usable=
=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -1812,7 +1812,7 @@
     <blocker name=3D'kmac-dea'/>
     <blocker name=3D'hfpm'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'zEC12.2' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'zEC12.2' typename=3D'zEC12.2-s390x-cpu' usable=
=3D'no'>
     <blocker name=3D'pcc-xts-eaes-256'/>
     <blocker name=3D'pcc-xts-eaes-128'/>
     <blocker name=3D'pcc-xts-aes-256'/>
@@ -1937,7 +1937,7 @@
     <blocker name=3D'msa1'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z10EC-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z10EC-base' typename=3D'z10EC-base-s390x-cpu' =
usable=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -1960,7 +1960,7 @@
     <blocker name=3D'asnlxr'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z9EC-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z9EC-base' typename=3D'z9EC-base-s390x-cpu' us=
able=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -1978,7 +1978,7 @@
     <blocker name=3D'asnlxr'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z9EC.3-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z9EC.3-base' typename=3D'z9EC.3-base-s390x-cpu=
' usable=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -1996,7 +1996,7 @@
     <blocker name=3D'asnlxr'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'zEC12' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'zEC12' typename=3D'zEC12-s390x-cpu' usable=3D'=
no'>
     <blocker name=3D'pcc-xts-eaes-256'/>
     <blocker name=3D'pcc-xts-eaes-128'/>
     <blocker name=3D'pcc-xts-aes-256'/>
@@ -2121,7 +2121,7 @@
     <blocker name=3D'msa1'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z990.5-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z990.5-base' typename=3D'z990.5-base-s390x-cpu=
' usable=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -2135,7 +2135,7 @@
     <blocker name=3D'kmac-dea'/>
     <blocker name=3D'hfpm'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z10BC-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z10BC-base' typename=3D'z10BC-base-s390x-cpu' =
usable=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -2158,8 +2158,8 @@
     <blocker name=3D'asnlxr'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z900-base' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'z13.2' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z900-base' typename=3D'z900-base-s390x-cpu' us=
able=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'z13.2' typename=3D'z13.2-s390x-cpu' usable=3D'=
no'>
     <blocker name=3D'ppno-sha-512-drng'/>
     <blocker name=3D'pcc-xts-eaes-256'/>
     <blocker name=3D'pcc-xts-eaes-128'/>
@@ -2289,7 +2289,7 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z890.3-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z890.3-base' typename=3D'z890.3-base-s390x-cpu=
' usable=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -2303,7 +2303,7 @@
     <blocker name=3D'kmac-dea'/>
     <blocker name=3D'hfpm'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'zBC12-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'zBC12-base' typename=3D'zBC12-base-s390x-cpu' =
usable=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -2331,7 +2331,7 @@
     <blocker name=3D'asnlxr'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z13.2-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z13.2-base' typename=3D'z13.2-base-s390x-cpu' =
usable=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -2362,7 +2362,7 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z990-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z990-base' typename=3D'z990-base-s390x-cpu' us=
able=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -2376,7 +2376,7 @@
     <blocker name=3D'kmac-dea'/>
     <blocker name=3D'hfpm'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z10EC.2' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z10EC.2' typename=3D'z10EC.2-s390x-cpu' usable=
=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -2404,7 +2404,7 @@
     <blocker name=3D'msa1'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z9BC' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z9BC' typename=3D'z9BC-s390x-cpu' usable=3D'no=
'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -2425,7 +2425,7 @@
     <blocker name=3D'msa1'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z10EC.3-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z10EC.3-base' typename=3D'z10EC.3-base-s390x-c=
pu' usable=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -2448,7 +2448,7 @@
     <blocker name=3D'asnlxr'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z990.3-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z990.3-base' typename=3D'z990.3-base-s390x-cpu=
' usable=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemu=
capabilitiesdata/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=3D'avx512pf' type=3D'boolean' value=3D'false'/>
     <property name=3D'xstore-en' type=3D'boolean' value=3D'false'/>
   </hostCPU>
-  <cpu type=3D'kvm' name=3D'max' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'host' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'qemu64' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'qemu32' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'phenom' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'max' typename=3D'max-x86_64-cpu' usable=3D'yes=
'/>
+  <cpu type=3D'kvm' name=3D'host' typename=3D'host-x86_64-cpu' usable=3D'y=
es'/>
+  <cpu type=3D'kvm' name=3D'base' typename=3D'base-x86_64-cpu' usable=3D'y=
es'/>
+  <cpu type=3D'kvm' name=3D'qemu64' typename=3D'qemu64-x86_64-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'qemu32' typename=3D'qemu32-x86_64-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'phenom' typename=3D'phenom-x86_64-cpu' usable=
=3D'no'>
     <blocker name=3D'mmxext'/>
     <blocker name=3D'fxsr-opt'/>
     <blocker name=3D'3dnowext'/>
@@ -705,24 +705,24 @@
     <blocker name=3D'sse4a'/>
     <blocker name=3D'npt'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'pentium3' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'pentium2' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'pentium' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'n270' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'kvm64' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'kvm32' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'coreduo' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'core2duo' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'athlon' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'pentium3' typename=3D'pentium3-x86_64-cpu' usa=
ble=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'pentium2' typename=3D'pentium2-x86_64-cpu' usa=
ble=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'pentium' typename=3D'pentium-x86_64-cpu' usabl=
e=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'n270' typename=3D'n270-x86_64-cpu' usable=3D'y=
es'/>
+  <cpu type=3D'kvm' name=3D'kvm64' typename=3D'kvm64-x86_64-cpu' usable=3D=
'yes'/>
+  <cpu type=3D'kvm' name=3D'kvm32' typename=3D'kvm32-x86_64-cpu' usable=3D=
'yes'/>
+  <cpu type=3D'kvm' name=3D'coreduo' typename=3D'coreduo-x86_64-cpu' usabl=
e=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'core2duo' typename=3D'core2duo-x86_64-cpu' usa=
ble=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'athlon' typename=3D'athlon-x86_64-cpu' usable=
=3D'no'>
     <blocker name=3D'mmxext'/>
     <blocker name=3D'3dnowext'/>
     <blocker name=3D'3dnow'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Westmere' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Westmere-IBRS' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Westmere' typename=3D'Westmere-x86_64-cpu' usa=
ble=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Westmere-IBRS' typename=3D'Westmere-IBRS-x86_6=
4-cpu' usable=3D'no'>
     <blocker name=3D'spec-ctrl'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Skylake-Server' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Skylake-Server' typename=3D'Skylake-Server-x86=
_64-cpu' usable=3D'no'>
     <blocker name=3D'hle'/>
     <blocker name=3D'rtm'/>
     <blocker name=3D'mpx'/>
@@ -745,7 +745,7 @@
     <blocker name=3D'avx512f'/>
     <blocker name=3D'avx512f'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Skylake-Server-IBRS' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Skylake-Server-IBRS' typename=3D'Skylake-Serve=
r-IBRS-x86_64-cpu' usable=3D'no'>
     <blocker name=3D'hle'/>
     <blocker name=3D'rtm'/>
     <blocker name=3D'mpx'/>
@@ -768,7 +768,7 @@
     <blocker name=3D'avx512f'/>
     <blocker name=3D'avx512f'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Skylake-Client' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Skylake-Client' typename=3D'Skylake-Client-x86=
_64-cpu' usable=3D'no'>
     <blocker name=3D'hle'/>
     <blocker name=3D'rtm'/>
     <blocker name=3D'mpx'/>
@@ -781,7 +781,7 @@
     <blocker name=3D'mpx'/>
     <blocker name=3D'mpx'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Skylake-Client-IBRS' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Skylake-Client-IBRS' typename=3D'Skylake-Clien=
t-IBRS-x86_64-cpu' usable=3D'no'>
     <blocker name=3D'hle'/>
     <blocker name=3D'rtm'/>
     <blocker name=3D'mpx'/>
@@ -795,12 +795,12 @@
     <blocker name=3D'mpx'/>
     <blocker name=3D'mpx'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'SandyBridge' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'SandyBridge-IBRS' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'SandyBridge' typename=3D'SandyBridge-x86_64-cp=
u' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'SandyBridge-IBRS' typename=3D'SandyBridge-IBRS=
-x86_64-cpu' usable=3D'no'>
     <blocker name=3D'spec-ctrl'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Penryn' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Opteron_G5' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Penryn' typename=3D'Penryn-x86_64-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Opteron_G5' typename=3D'Opteron_G5-x86_64-cpu'=
 usable=3D'no'>
     <blocker name=3D'sse4a'/>
     <blocker name=3D'misalignsse'/>
     <blocker name=3D'3dnowprefetch'/>
@@ -808,41 +808,41 @@
     <blocker name=3D'fma4'/>
     <blocker name=3D'tbm'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Opteron_G4' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Opteron_G4' typename=3D'Opteron_G4-x86_64-cpu'=
 usable=3D'no'>
     <blocker name=3D'sse4a'/>
     <blocker name=3D'misalignsse'/>
     <blocker name=3D'3dnowprefetch'/>
     <blocker name=3D'xop'/>
     <blocker name=3D'fma4'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Opteron_G3' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Opteron_G3' typename=3D'Opteron_G3-x86_64-cpu'=
 usable=3D'no'>
     <blocker name=3D'sse4a'/>
     <blocker name=3D'misalignsse'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Opteron_G2' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Opteron_G1' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Nehalem' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Nehalem-IBRS' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Opteron_G2' typename=3D'Opteron_G2-x86_64-cpu'=
 usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Opteron_G1' typename=3D'Opteron_G1-x86_64-cpu'=
 usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Nehalem' typename=3D'Nehalem-x86_64-cpu' usabl=
e=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Nehalem-IBRS' typename=3D'Nehalem-IBRS-x86_64-=
cpu' usable=3D'no'>
     <blocker name=3D'spec-ctrl'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'IvyBridge' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'IvyBridge-IBRS' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'IvyBridge' typename=3D'IvyBridge-x86_64-cpu' u=
sable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'IvyBridge-IBRS' typename=3D'IvyBridge-IBRS-x86=
_64-cpu' usable=3D'no'>
     <blocker name=3D'spec-ctrl'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Haswell' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Haswell' typename=3D'Haswell-x86_64-cpu' usabl=
e=3D'no'>
     <blocker name=3D'hle'/>
     <blocker name=3D'rtm'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Haswell-noTSX' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Haswell-noTSX-IBRS' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Haswell-noTSX' typename=3D'Haswell-noTSX-x86_6=
4-cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Haswell-noTSX-IBRS' typename=3D'Haswell-noTSX-=
IBRS-x86_64-cpu' usable=3D'no'>
     <blocker name=3D'spec-ctrl'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Haswell-IBRS' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Haswell-IBRS' typename=3D'Haswell-IBRS-x86_64-=
cpu' usable=3D'no'>
     <blocker name=3D'hle'/>
     <blocker name=3D'rtm'/>
     <blocker name=3D'spec-ctrl'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'EPYC' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'EPYC' typename=3D'EPYC-x86_64-cpu' usable=3D'n=
o'>
     <blocker name=3D'rdseed'/>
     <blocker name=3D'adx'/>
     <blocker name=3D'smap'/>
@@ -858,7 +858,7 @@
     <blocker name=3D'xsavec'/>
     <blocker name=3D'xgetbv1'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'EPYC-IBPB' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'EPYC-IBPB' typename=3D'EPYC-IBPB-x86_64-cpu' u=
sable=3D'no'>
     <blocker name=3D'rdseed'/>
     <blocker name=3D'adx'/>
     <blocker name=3D'smap'/>
@@ -875,8 +875,8 @@
     <blocker name=3D'xsavec'/>
     <blocker name=3D'xgetbv1'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Conroe' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Broadwell' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Conroe' typename=3D'Conroe-x86_64-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Broadwell' typename=3D'Broadwell-x86_64-cpu' u=
sable=3D'no'>
     <blocker name=3D'hle'/>
     <blocker name=3D'rtm'/>
     <blocker name=3D'rdseed'/>
@@ -884,20 +884,20 @@
     <blocker name=3D'smap'/>
     <blocker name=3D'3dnowprefetch'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Broadwell-noTSX' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Broadwell-noTSX' typename=3D'Broadwell-noTSX-x=
86_64-cpu' usable=3D'no'>
     <blocker name=3D'rdseed'/>
     <blocker name=3D'adx'/>
     <blocker name=3D'smap'/>
     <blocker name=3D'3dnowprefetch'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Broadwell-noTSX-IBRS' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Broadwell-noTSX-IBRS' typename=3D'Broadwell-no=
TSX-IBRS-x86_64-cpu' usable=3D'no'>
     <blocker name=3D'rdseed'/>
     <blocker name=3D'adx'/>
     <blocker name=3D'smap'/>
     <blocker name=3D'spec-ctrl'/>
     <blocker name=3D'3dnowprefetch'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Broadwell-IBRS' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Broadwell-IBRS' typename=3D'Broadwell-IBRS-x86=
_64-cpu' usable=3D'no'>
     <blocker name=3D'hle'/>
     <blocker name=3D'rtm'/>
     <blocker name=3D'rdseed'/>
@@ -906,32 +906,32 @@
     <blocker name=3D'spec-ctrl'/>
     <blocker name=3D'3dnowprefetch'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'486' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'max' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'host' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'486' typename=3D'486-x86_64-cpu' usable=3D'yes=
'/>
+  <cpu type=3D'tcg' name=3D'max' typename=3D'max-x86_64-cpu' usable=3D'yes=
'/>
+  <cpu type=3D'tcg' name=3D'host' typename=3D'host-x86_64-cpu' usable=3D'n=
o'>
     <blocker name=3D'kvm'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'base' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'qemu64' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'qemu32' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'phenom' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'base' typename=3D'base-x86_64-cpu' usable=3D'y=
es'/>
+  <cpu type=3D'tcg' name=3D'qemu64' typename=3D'qemu64-x86_64-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'qemu32' typename=3D'qemu32-x86_64-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'phenom' typename=3D'phenom-x86_64-cpu' usable=
=3D'no'>
     <blocker name=3D'fxsr-opt'/>
     <blocker name=3D'npt'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'pentium3' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'pentium2' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'pentium' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'n270' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'kvm64' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'kvm32' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'coreduo' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'core2duo' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'athlon' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'Westmere' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'Westmere-IBRS' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'pentium3' typename=3D'pentium3-x86_64-cpu' usa=
ble=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'pentium2' typename=3D'pentium2-x86_64-cpu' usa=
ble=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'pentium' typename=3D'pentium-x86_64-cpu' usabl=
e=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'n270' typename=3D'n270-x86_64-cpu' usable=3D'y=
es'/>
+  <cpu type=3D'tcg' name=3D'kvm64' typename=3D'kvm64-x86_64-cpu' usable=3D=
'yes'/>
+  <cpu type=3D'tcg' name=3D'kvm32' typename=3D'kvm32-x86_64-cpu' usable=3D=
'yes'/>
+  <cpu type=3D'tcg' name=3D'coreduo' typename=3D'coreduo-x86_64-cpu' usabl=
e=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'core2duo' typename=3D'core2duo-x86_64-cpu' usa=
ble=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'athlon' typename=3D'athlon-x86_64-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'Westmere' typename=3D'Westmere-x86_64-cpu' usa=
ble=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'Westmere-IBRS' typename=3D'Westmere-IBRS-x86_6=
4-cpu' usable=3D'no'>
     <blocker name=3D'spec-ctrl'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Skylake-Server' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Skylake-Server' typename=3D'Skylake-Server-x86=
_64-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -952,7 +952,7 @@
     <blocker name=3D'3dnowprefetch'/>
     <blocker name=3D'xsavec'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Skylake-Server-IBRS' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Skylake-Server-IBRS' typename=3D'Skylake-Serve=
r-IBRS-x86_64-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -974,7 +974,7 @@
     <blocker name=3D'3dnowprefetch'/>
     <blocker name=3D'xsavec'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Skylake-Client' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Skylake-Client' typename=3D'Skylake-Client-x86=
_64-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -990,7 +990,7 @@
     <blocker name=3D'3dnowprefetch'/>
     <blocker name=3D'xsavec'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Skylake-Client-IBRS' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Skylake-Client-IBRS' typename=3D'Skylake-Clien=
t-IBRS-x86_64-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1007,19 +1007,19 @@
     <blocker name=3D'3dnowprefetch'/>
     <blocker name=3D'xsavec'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'SandyBridge' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'SandyBridge' typename=3D'SandyBridge-x86_64-cp=
u' usable=3D'no'>
     <blocker name=3D'x2apic'/>
     <blocker name=3D'tsc-deadline'/>
     <blocker name=3D'avx'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'SandyBridge-IBRS' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'SandyBridge-IBRS' typename=3D'SandyBridge-IBRS=
-x86_64-cpu' usable=3D'no'>
     <blocker name=3D'x2apic'/>
     <blocker name=3D'tsc-deadline'/>
     <blocker name=3D'avx'/>
     <blocker name=3D'spec-ctrl'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Penryn' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'Opteron_G5' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Penryn' typename=3D'Penryn-x86_64-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'Opteron_G5' typename=3D'Opteron_G5-x86_64-cpu'=
 usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'avx'/>
     <blocker name=3D'f16c'/>
@@ -1029,30 +1029,30 @@
     <blocker name=3D'fma4'/>
     <blocker name=3D'tbm'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Opteron_G4' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Opteron_G4' typename=3D'Opteron_G4-x86_64-cpu'=
 usable=3D'no'>
     <blocker name=3D'avx'/>
     <blocker name=3D'misalignsse'/>
     <blocker name=3D'3dnowprefetch'/>
     <blocker name=3D'xop'/>
     <blocker name=3D'fma4'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Opteron_G3' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Opteron_G3' typename=3D'Opteron_G3-x86_64-cpu'=
 usable=3D'no'>
     <blocker name=3D'misalignsse'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Opteron_G2' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'Opteron_G1' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'Nehalem' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'Nehalem-IBRS' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Opteron_G2' typename=3D'Opteron_G2-x86_64-cpu'=
 usable=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'Opteron_G1' typename=3D'Opteron_G1-x86_64-cpu'=
 usable=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'Nehalem' typename=3D'Nehalem-x86_64-cpu' usabl=
e=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'Nehalem-IBRS' typename=3D'Nehalem-IBRS-x86_64-=
cpu' usable=3D'no'>
     <blocker name=3D'spec-ctrl'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'IvyBridge' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'IvyBridge' typename=3D'IvyBridge-x86_64-cpu' u=
sable=3D'no'>
     <blocker name=3D'x2apic'/>
     <blocker name=3D'tsc-deadline'/>
     <blocker name=3D'avx'/>
     <blocker name=3D'f16c'/>
     <blocker name=3D'rdrand'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'IvyBridge-IBRS' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'IvyBridge-IBRS' typename=3D'IvyBridge-IBRS-x86=
_64-cpu' usable=3D'no'>
     <blocker name=3D'x2apic'/>
     <blocker name=3D'tsc-deadline'/>
     <blocker name=3D'avx'/>
@@ -1060,7 +1060,7 @@
     <blocker name=3D'rdrand'/>
     <blocker name=3D'spec-ctrl'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Haswell' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Haswell' typename=3D'Haswell-x86_64-cpu' usabl=
e=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1073,7 +1073,7 @@
     <blocker name=3D'invpcid'/>
     <blocker name=3D'rtm'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Haswell-noTSX' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Haswell-noTSX' typename=3D'Haswell-noTSX-x86_6=
4-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1084,7 +1084,7 @@
     <blocker name=3D'avx2'/>
     <blocker name=3D'invpcid'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Haswell-noTSX-IBRS' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Haswell-noTSX-IBRS' typename=3D'Haswell-noTSX-=
IBRS-x86_64-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1096,7 +1096,7 @@
     <blocker name=3D'invpcid'/>
     <blocker name=3D'spec-ctrl'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Haswell-IBRS' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Haswell-IBRS' typename=3D'Haswell-IBRS-x86_64-=
cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1110,7 +1110,7 @@
     <blocker name=3D'rtm'/>
     <blocker name=3D'spec-ctrl'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'EPYC' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'EPYC' typename=3D'EPYC-x86_64-cpu' usable=3D'n=
o'>
     <blocker name=3D'fma'/>
     <blocker name=3D'avx'/>
     <blocker name=3D'f16c'/>
@@ -1124,7 +1124,7 @@
     <blocker name=3D'osvw'/>
     <blocker name=3D'xsavec'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'EPYC-IBPB' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'EPYC-IBPB' typename=3D'EPYC-IBPB-x86_64-cpu' u=
sable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'avx'/>
     <blocker name=3D'f16c'/>
@@ -1139,8 +1139,8 @@
     <blocker name=3D'ibpb'/>
     <blocker name=3D'xsavec'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Conroe' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'Broadwell' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Conroe' typename=3D'Conroe-x86_64-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'Broadwell' typename=3D'Broadwell-x86_64-cpu' u=
sable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1155,7 +1155,7 @@
     <blocker name=3D'rdseed'/>
     <blocker name=3D'3dnowprefetch'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Broadwell-noTSX' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Broadwell-noTSX' typename=3D'Broadwell-noTSX-x=
86_64-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1168,7 +1168,7 @@
     <blocker name=3D'rdseed'/>
     <blocker name=3D'3dnowprefetch'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Broadwell-noTSX-IBRS' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Broadwell-noTSX-IBRS' typename=3D'Broadwell-no=
TSX-IBRS-x86_64-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1182,7 +1182,7 @@
     <blocker name=3D'spec-ctrl'/>
     <blocker name=3D'3dnowprefetch'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Broadwell-IBRS' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Broadwell-IBRS' typename=3D'Broadwell-IBRS-x86=
_64-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1198,7 +1198,7 @@
     <blocker name=3D'spec-ctrl'/>
     <blocker name=3D'3dnowprefetch'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'486' usable=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'486' typename=3D'486-x86_64-cpu' usable=3D'yes=
'/>
   <machine name=3D'pc-i440fx-2.12' alias=3D'pc' hotplugCpus=3D'yes' maxCpu=
s=3D'255' default=3D'yes'/>
   <machine name=3D'isapc' hotplugCpus=3D'yes' maxCpus=3D'1'/>
   <machine name=3D'pc-1.1' hotplugCpus=3D'yes' maxCpus=3D'255'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemuca=
pabilitiesdata/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=3D'kvm' name=3D'default'/>
-  <cpu type=3D'kvm' name=3D'ppc'/>
-  <cpu type=3D'kvm' name=3D'ppc32'/>
-  <cpu type=3D'kvm' name=3D'ppc64'/>
-  <cpu type=3D'kvm' name=3D'970mp'/>
-  <cpu type=3D'kvm' name=3D'970fx'/>
-  <cpu type=3D'kvm' name=3D'970'/>
-  <cpu type=3D'kvm' name=3D'POWER9'/>
-  <cpu type=3D'kvm' name=3D'POWER8NVL'/>
-  <cpu type=3D'kvm' name=3D'POWER8'/>
-  <cpu type=3D'kvm' name=3D'POWER8E'/>
-  <cpu type=3D'kvm' name=3D'POWER7+'/>
-  <cpu type=3D'kvm' name=3D'POWER7'/>
-  <cpu type=3D'kvm' name=3D'POWER5gs'/>
-  <cpu type=3D'kvm' name=3D'POWER5+'/>
-  <cpu type=3D'kvm' name=3D'Apollo7PM'/>
-  <cpu type=3D'kvm' name=3D'7457A'/>
-  <cpu type=3D'kvm' name=3D'7447A'/>
-  <cpu type=3D'kvm' name=3D'Apollo7'/>
-  <cpu type=3D'kvm' name=3D'7457'/>
-  <cpu type=3D'kvm' name=3D'7447'/>
-  <cpu type=3D'kvm' name=3D'Apollo6'/>
-  <cpu type=3D'kvm' name=3D'7455'/>
-  <cpu type=3D'kvm' name=3D'7445'/>
-  <cpu type=3D'kvm' name=3D'7451'/>
-  <cpu type=3D'kvm' name=3D'7441'/>
-  <cpu type=3D'kvm' name=3D'Vger'/>
-  <cpu type=3D'kvm' name=3D'7450'/>
-  <cpu type=3D'kvm' name=3D'7448'/>
-  <cpu type=3D'kvm' name=3D'Nitro'/>
-  <cpu type=3D'kvm' name=3D'7410'/>
-  <cpu type=3D'kvm' name=3D'G4'/>
-  <cpu type=3D'kvm' name=3D'Max'/>
-  <cpu type=3D'kvm' name=3D'7400'/>
-  <cpu type=3D'kvm' name=3D'Goldfinger'/>
-  <cpu type=3D'kvm' name=3D'755'/>
-  <cpu type=3D'kvm' name=3D'745'/>
-  <cpu type=3D'kvm' name=3D'LoneStar'/>
-  <cpu type=3D'kvm' name=3D'750l'/>
-  <cpu type=3D'kvm' name=3D'750gx'/>
-  <cpu type=3D'kvm' name=3D'750fx'/>
-  <cpu type=3D'kvm' name=3D'750cxe'/>
-  <cpu type=3D'kvm' name=3D'750cx'/>
-  <cpu type=3D'kvm' name=3D'750cl'/>
-  <cpu type=3D'kvm' name=3D'Conan/Doyle'/>
-  <cpu type=3D'kvm' name=3D'G3'/>
-  <cpu type=3D'kvm' name=3D'Typhoon'/>
-  <cpu type=3D'kvm' name=3D'750'/>
-  <cpu type=3D'kvm' name=3D'Arthur'/>
-  <cpu type=3D'kvm' name=3D'740'/>
-  <cpu type=3D'kvm' name=3D'Mach5'/>
-  <cpu type=3D'kvm' name=3D'Sirocco'/>
-  <cpu type=3D'kvm' name=3D'604e'/>
-  <cpu type=3D'kvm' name=3D'Goldeneye'/>
-  <cpu type=3D'kvm' name=3D'603r'/>
-  <cpu type=3D'kvm' name=3D'Vaillant'/>
-  <cpu type=3D'kvm' name=3D'Stretch'/>
-  <cpu type=3D'kvm' name=3D'603e'/>
-  <cpu type=3D'kvm' name=3D'Vanilla'/>
-  <cpu type=3D'kvm' name=3D'601v'/>
-  <cpu type=3D'kvm' name=3D'601'/>
-  <cpu type=3D'kvm' name=3D'MPC8560'/>
-  <cpu type=3D'kvm' name=3D'MPC8555E'/>
-  <cpu type=3D'kvm' name=3D'MPC8555'/>
-  <cpu type=3D'kvm' name=3D'MPC8548E'/>
-  <cpu type=3D'kvm' name=3D'MPC8548'/>
-  <cpu type=3D'kvm' name=3D'MPC8547E'/>
-  <cpu type=3D'kvm' name=3D'MPC8545E'/>
-  <cpu type=3D'kvm' name=3D'MPC8545'/>
-  <cpu type=3D'kvm' name=3D'MPC8544E'/>
-  <cpu type=3D'kvm' name=3D'MPC8544'/>
-  <cpu type=3D'kvm' name=3D'MPC8543E'/>
-  <cpu type=3D'kvm' name=3D'MPC8543'/>
-  <cpu type=3D'kvm' name=3D'MPC8541E'/>
-  <cpu type=3D'kvm' name=3D'MPC8541'/>
-  <cpu type=3D'kvm' name=3D'MPC8540'/>
-  <cpu type=3D'kvm' name=3D'MPC8533E'/>
-  <cpu type=3D'kvm' name=3D'MPC8533'/>
-  <cpu type=3D'kvm' name=3D'e500v2'/>
-  <cpu type=3D'kvm' name=3D'e500v1'/>
-  <cpu type=3D'kvm' name=3D'e500'/>
-  <cpu type=3D'kvm' name=3D'MPC8347EA'/>
-  <cpu type=3D'kvm' name=3D'MPC8347E'/>
-  <cpu type=3D'kvm' name=3D'MPC8347A'/>
-  <cpu type=3D'kvm' name=3D'MPC8347'/>
-  <cpu type=3D'kvm' name=3D'e300'/>
-  <cpu type=3D'kvm' name=3D'e200'/>
-  <cpu type=3D'kvm' name=3D'MPC8280'/>
-  <cpu type=3D'kvm' name=3D'MPC8275'/>
-  <cpu type=3D'kvm' name=3D'MPC8272'/>
-  <cpu type=3D'kvm' name=3D'MPC8271'/>
-  <cpu type=3D'kvm' name=3D'MPC8270'/>
-  <cpu type=3D'kvm' name=3D'MPC8266_HiP4'/>
-  <cpu type=3D'kvm' name=3D'MPC8266_HiP3'/>
-  <cpu type=3D'kvm' name=3D'MPC8266'/>
-  <cpu type=3D'kvm' name=3D'MPC8265_HiP4'/>
-  <cpu type=3D'kvm' name=3D'MPC8265_HiP3'/>
-  <cpu type=3D'kvm' name=3D'MPC8265'/>
-  <cpu type=3D'kvm' name=3D'MPC8264_HiP4'/>
-  <cpu type=3D'kvm' name=3D'MPC8264_HiP3'/>
-  <cpu type=3D'kvm' name=3D'MPC8264'/>
-  <cpu type=3D'kvm' name=3D'MPC8260_HiP4'/>
-  <cpu type=3D'kvm' name=3D'MPC8260_HiP3'/>
-  <cpu type=3D'kvm' name=3D'MPC8260'/>
-  <cpu type=3D'kvm' name=3D'MPC8255_HiP4'/>
-  <cpu type=3D'kvm' name=3D'MPC8255_HiP3'/>
-  <cpu type=3D'kvm' name=3D'MPC8255'/>
-  <cpu type=3D'kvm' name=3D'MPC8250_HiP4'/>
-  <cpu type=3D'kvm' name=3D'MPC8250_HiP3'/>
-  <cpu type=3D'kvm' name=3D'MPC8250'/>
-  <cpu type=3D'kvm' name=3D'MPC8248'/>
-  <cpu type=3D'kvm' name=3D'MPC8247'/>
-  <cpu type=3D'kvm' name=3D'MPC8245'/>
-  <cpu type=3D'kvm' name=3D'MPC8241'/>
-  <cpu type=3D'kvm' name=3D'PowerQUICC-II'/>
-  <cpu type=3D'kvm' name=3D'MPC82xx'/>
-  <cpu type=3D'kvm' name=3D'MPC5200B'/>
-  <cpu type=3D'kvm' name=3D'MPC5200'/>
-  <cpu type=3D'kvm' name=3D'MPC52xx'/>
-  <cpu type=3D'kvm' name=3D'MPC8240'/>
-  <cpu type=3D'kvm' name=3D'440EP'/>
-  <cpu type=3D'kvm' name=3D'x2vp50'/>
-  <cpu type=3D'kvm' name=3D'x2vp7'/>
-  <cpu type=3D'kvm' name=3D'405GPe'/>
-  <cpu type=3D'kvm' name=3D'405GP'/>
-  <cpu type=3D'kvm' name=3D'405CR'/>
-  <cpu type=3D'kvm' name=3D'405'/>
-  <cpu type=3D'kvm' name=3D'403'/>
-  <cpu type=3D'kvm' name=3D'7457A_v1.2'/>
-  <cpu type=3D'kvm' name=3D'750cl_v1.0'/>
-  <cpu type=3D'kvm' name=3D'750cxe_v2.1'/>
-  <cpu type=3D'kvm' name=3D'755_v2.7'/>
-  <cpu type=3D'kvm' name=3D'MPC8347ET'/>
-  <cpu type=3D'kvm' name=3D'MPC8545E_v20'/>
-  <cpu type=3D'kvm' name=3D'750_v2.1'/>
-  <cpu type=3D'kvm' name=3D'755_v2.2'/>
-  <cpu type=3D'kvm' name=3D'745_v2.0'/>
-  <cpu type=3D'kvm' name=3D'7455_v1.0'/>
-  <cpu type=3D'kvm' name=3D'MPC8547E_v21'/>
-  <cpu type=3D'kvm' name=3D'STB25'/>
-  <cpu type=3D'kvm' name=3D'POWER8_v2.0'/>
-  <cpu type=3D'kvm' name=3D'401G2'/>
-  <cpu type=3D'kvm' name=3D'MPC8349A'/>
-  <cpu type=3D'kvm' name=3D'750e'/>
-  <cpu type=3D'kvm' name=3D'MPC8545_v21'/>
-  <cpu type=3D'kvm' name=3D'MPC8548_v11'/>
-  <cpu type=3D'kvm' name=3D'970fx_v2.0'/>
-  <cpu type=3D'kvm' name=3D'750fx_v2.0'/>
-  <cpu type=3D'kvm' name=3D'POWER8E_v2.1'/>
-  <cpu type=3D'kvm' name=3D'Cobra'/>
-  <cpu type=3D'kvm' name=3D'603p'/>
-  <cpu type=3D'kvm' name=3D'7400_v2.7'/>
-  <cpu type=3D'kvm' name=3D'MPC8378E'/>
-  <cpu type=3D'kvm' name=3D'e500v2_v10'/>
-  <cpu type=3D'kvm' name=3D'e500mc'/>
-  <cpu type=3D'kvm' name=3D'603e7v1'/>
-  <cpu type=3D'kvm' name=3D'970mp_v1.0'/>
-  <cpu type=3D'kvm' name=3D'MPC8555E_v11'/>
-  <cpu type=3D'kvm' name=3D'440-Xilinx-w-dfpu'/>
-  <cpu type=3D'kvm' name=3D'740e'/>
-  <cpu type=3D'kvm' name=3D'405CRc'/>
-  <cpu type=3D'kvm' name=3D'7447A_v1.1'/>
-  <cpu type=3D'kvm' name=3D'MPC8533E_v10'/>
-  <cpu type=3D'kvm' name=3D'MPC8543_v11'/>
-  <cpu type=3D'kvm' name=3D'7400_v2.2'/>
-  <cpu type=3D'kvm' name=3D'MPC8540_v21'/>
-  <cpu type=3D'kvm' name=3D'e500v2_v21'/>
-  <cpu type=3D'kvm' name=3D'e300c1'/>
-  <cpu type=3D'kvm' name=3D'970fx_v1.0'/>
-  <cpu type=3D'kvm' name=3D'750gx_v1.2'/>
-  <cpu type=3D'kvm' name=3D'750fx_v1.0'/>
-  <cpu type=3D'kvm' name=3D'MPC8641'/>
-  <cpu type=3D'kvm' name=3D'MPC8544E_v10'/>
-  <cpu type=3D'kvm' name=3D'405D4'/>
-  <cpu type=3D'kvm' name=3D'7457_v1.1'/>
-  <cpu type=3D'kvm' name=3D'970fx_v3.0'/>
-  <cpu type=3D'kvm' name=3D'604e_v2.2'/>
-  <cpu type=3D'kvm' name=3D'755_v2.6'/>
-  <cpu type=3D'kvm' name=3D'Npe4GS3'/>
-  <cpu type=3D'kvm' name=3D'7410_v1.4'/>
-  <cpu type=3D'kvm' name=3D'750_v2.0'/>
-  <cpu type=3D'kvm' name=3D'7445_v3.2'/>
-  <cpu type=3D'kvm' name=3D'745_v2.4'/>
-  <cpu type=3D'kvm' name=3D'750l_v3.2'/>
-  <cpu type=3D'kvm' name=3D'MPC8540_v10'/>
-  <cpu type=3D'kvm' name=3D'750_v1.0'/>
-  <cpu type=3D'kvm' name=3D'STB03'/>
-  <cpu type=3D'kvm' name=3D'MPC8343A'/>
-  <cpu type=3D'kvm' name=3D'MPC8378'/>
-  <cpu type=3D'kvm' name=3D'G2HiP3'/>
-  <cpu type=3D'kvm' name=3D'750cxe_v3.0'/>
-  <cpu type=3D'kvm' name=3D'e500_v10'/>
-  <cpu type=3D'kvm' name=3D'755_v1.1'/>
-  <cpu type=3D'kvm' name=3D'MPC8567'/>
-  <cpu type=3D'kvm' name=3D'MPC8545_v20'/>
-  <cpu type=3D'kvm' name=3D'MPC8548_v10'/>
-  <cpu type=3D'kvm' name=3D'Npe405H'/>
-  <cpu type=3D'kvm' name=3D'603e7v'/>
-  <cpu type=3D'kvm' name=3D'750_v3.0'/>
-  <cpu type=3D'kvm' name=3D'Npe405H2'/>
-  <cpu type=3D'kvm' name=3D'7400_v2.6'/>
-  <cpu type=3D'kvm' name=3D'405GPa'/>
-  <cpu type=3D'kvm' name=3D'MPC8548_v21'/>
-  <cpu type=3D'kvm' name=3D'MPC8541E_v10'/>
-  <cpu type=3D'kvm' name=3D'750l_v2.2'/>
-  <cpu type=3D'kvm' name=3D'MPC8555E_v10'/>
-  <cpu type=3D'kvm' name=3D'7457A_v1.1'/>
-  <cpu type=3D'kvm' name=3D'e200z6'/>
-  <cpu type=3D'kvm' name=3D'MPC8379E'/>
-  <cpu type=3D'kvm' name=3D'e500v2_v20'/>
-  <cpu type=3D'kvm' name=3D'MPC8347AP'/>
-  <cpu type=3D'kvm' name=3D'401B2'/>
-  <cpu type=3D'kvm' name=3D'MPC8349E'/>
-  <cpu type=3D'kvm' name=3D'755_v2.1'/>
-  <cpu type=3D'kvm' name=3D'MPC8543_v21'/>
-  <cpu type=3D'kvm' name=3D'745_v2.8'/>
-  <cpu type=3D'kvm' name=3D'MPC8547E_v20'/>
-  <cpu type=3D'kvm' name=3D'7455_v3.4'/>
-  <cpu type=3D'kvm' name=3D'7448_v1.1'/>
-  <cpu type=3D'kvm' name=3D'740_v2.2'/>
-  <cpu type=3D'kvm' name=3D'7400_v1.1'/>
-  <cpu type=3D'kvm' name=3D'MPC8567E'/>
-  <cpu type=3D'kvm' name=3D'7441_v2.10'/>
-  <cpu type=3D'kvm' name=3D'603e_v1.4'/>
-  <cpu type=3D'kvm' name=3D'G2leGP1'/>
-  <cpu type=3D'kvm' name=3D'7451_v2.10'/>
-  <cpu type=3D'kvm' name=3D'MPC8343E'/>
-  <cpu type=3D'kvm' name=3D'750cx_v2.2'/>
-  <cpu type=3D'kvm' name=3D'Npe405L'/>
-  <cpu type=3D'kvm' name=3D'603e7'/>
-  <cpu type=3D'kvm' name=3D'401A1'/>
-  <cpu type=3D'kvm' name=3D'MPC8377'/>
-  <cpu type=3D'kvm' name=3D'7448_v2.1'/>
-  <cpu type=3D'kvm' name=3D'7441_v2.3'/>
-  <cpu type=3D'kvm' name=3D'7400_v2.1'/>
-  <cpu type=3D'kvm' name=3D'405CRb'/>
-  <cpu type=3D'kvm' name=3D'604'/>
-  <cpu type=3D'kvm' name=3D'MPC8540_v20'/>
-  <cpu type=3D'kvm' name=3D'MPC8543_v10'/>
-  <cpu type=3D'kvm' name=3D'7445_v2.1'/>
-  <cpu type=3D'kvm' name=3D'e500_v20'/>
-  <cpu type=3D'kvm' name=3D'750gx_v1.1'/>
-  <cpu type=3D'kvm' name=3D'7447A_v1.0'/>
-  <cpu type=3D'kvm' name=3D'750cxe_v2.4'/>
-  <cpu type=3D'kvm' name=3D'MPC8548_v20'/>
-  <cpu type=3D'kvm' name=3D'MPC8543E_v11'/>
-  <cpu type=3D'kvm' name=3D'MPC8347AT'/>
-  <cpu type=3D'kvm' name=3D'POWER8NVL_v1.0'/>
-  <cpu type=3D'kvm' name=3D'7457A_v1.0'/>
-  <cpu type=3D'kvm' name=3D'7457_v1.0'/>
-  <cpu type=3D'kvm' name=3D'7450_v1.2'/>
-  <cpu type=3D'kvm' name=3D'MPC8572'/>
-  <cpu type=3D'kvm' name=3D'755_v2.5'/>
-  <cpu type=3D'kvm' name=3D'7410_v1.3'/>
-  <cpu type=3D'kvm' name=3D'745_v2.3'/>
-  <cpu type=3D'kvm' name=3D'750l_v2.1'/>
-  <cpu type=3D'kvm' name=3D'405GPR'/>
-  <cpu type=3D'kvm' name=3D'755_v2.0'/>
-  <cpu type=3D'kvm' name=3D'MPC8541_v11'/>
-  <cpu type=3D'kvm' name=3D'401C2'/>
-  <cpu type=3D'kvm' name=3D'e500v2_v30'/>
-  <cpu type=3D'kvm' name=3D'7455_v3.3'/>
-  <cpu type=3D'kvm' name=3D'405EZ'/>
-  <cpu type=3D'kvm' name=3D'MPC8568E'/>
-  <cpu type=3D'kvm' name=3D'755_v1.0'/>
-  <cpu type=3D'kvm' name=3D'603e_v1.3'/>
-  <cpu type=3D'kvm' name=3D'MPC8560_v10'/>
-  <cpu type=3D'kvm' name=3D'host'/>
-  <cpu type=3D'kvm' name=3D'MPC8560_v21'/>
-  <cpu type=3D'kvm' name=3D'G2H4'/>
-  <cpu type=3D'kvm' name=3D'MPC8533_v11'/>
-  <cpu type=3D'kvm' name=3D'740_v3.1'/>
-  <cpu type=3D'kvm' name=3D'e200z5'/>
-  <cpu type=3D'kvm' name=3D'MPC8349'/>
-  <cpu type=3D'kvm' name=3D'7400_v2.0'/>
-  <cpu type=3D'kvm' name=3D'405CRa'/>
-  <cpu type=3D'kvm' name=3D'MPC8543E_v10'/>
-  <cpu type=3D'kvm' name=3D'MPC8543E_v21'/>
-  <cpu type=3D'kvm' name=3D'750cxe_v2.3'/>
-  <cpu type=3D'kvm' name=3D'MPC8543_v20'/>
-  <cpu type=3D'kvm' name=3D'745_v2.7'/>
-  <cpu type=3D'kvm' name=3D'403GC'/>
-  <cpu type=3D'kvm' name=3D'e5500'/>
-  <cpu type=3D'kvm' name=3D'7448_v1.0'/>
-  <cpu type=3D'kvm' name=3D'MPC5200_v12'/>
-  <cpu type=3D'kvm' name=3D'740_v2.1'/>
-  <cpu type=3D'kvm' name=3D'745_v2.2'/>
-  <cpu type=3D'kvm' name=3D'7400_v1.0'/>
-  <cpu type=3D'kvm' name=3D'7410_v1.2'/>
-  <cpu type=3D'kvm' name=3D'x2vp4'/>
-  <cpu type=3D'kvm' name=3D'MPC8555_v11'/>
-  <cpu type=3D'kvm' name=3D'MPC8541_v10'/>
-  <cpu type=3D'kvm' name=3D'405LP'/>
-  <cpu type=3D'kvm' name=3D'750fx_v2.3'/>
-  <cpu type=3D'kvm' name=3D'405EP'/>
-  <cpu type=3D'kvm' name=3D'601_v2'/>
-  <cpu type=3D'kvm' name=3D'MPC8544_v11'/>
-  <cpu type=3D'kvm' name=3D'401D2'/>
-  <cpu type=3D'kvm' name=3D'MPC8572E'/>
-  <cpu type=3D'kvm' name=3D'604e_v1.0'/>
-  <cpu type=3D'kvm' name=3D'750cx_v2.1'/>
-  <cpu type=3D'kvm' name=3D'MPC5200B_v21'/>
-  <cpu type=3D'kvm' name=3D'750l_v3.0'/>
-  <cpu type=3D'kvm' name=3D'e300c4'/>
-  <cpu type=3D'kvm' name=3D'7448_v2.0'/>
-  <cpu type=3D'kvm' name=3D'7450_v2.1'/>
-  <cpu type=3D'kvm' name=3D'G2leGP'/>
-  <cpu type=3D'kvm' name=3D'750cxe_v3.1b'/>
-  <cpu type=3D'kvm' name=3D'7400_v2.9'/>
-  <cpu type=3D'kvm' name=3D'G2GP'/>
-  <cpu type=3D'kvm' name=3D'603'/>
-  <cpu type=3D'kvm' name=3D'405GPd'/>
-  <cpu type=3D'kvm' name=3D'MPC8548E_v11'/>
-  <cpu type=3D'kvm' name=3D'603e7t'/>
-  <cpu type=3D'kvm' name=3D'IOP480'/>
-  <cpu type=3D'kvm' name=3D'750gx_v1.0'/>
-  <cpu type=3D'kvm' name=3D'MPC8560_v20'/>
-  <cpu type=3D'kvm' name=3D'405D2'/>
-  <cpu type=3D'kvm' name=3D'750fl'/>
-  <cpu type=3D'kvm' name=3D'750l_v2.0'/>
-  <cpu type=3D'kvm' name=3D'x2vp20'/>
-  <cpu type=3D'kvm' name=3D'e600'/>
-  <cpu type=3D'kvm' name=3D'7450_v1.1'/>
-  <cpu type=3D'kvm' name=3D'755_v2.4'/>
-  <cpu type=3D'kvm' name=3D'7445_v1.0'/>
-  <cpu type=3D'kvm' name=3D'G2LS'/>
-  <cpu type=3D'kvm' name=3D'MPC8543E_v20'/>
-  <cpu type=3D'kvm' name=3D'603e_v2.2'/>
-  <cpu type=3D'kvm' name=3D'7447_v1.1'/>
-  <cpu type=3D'kvm' name=3D'603e_v4'/>
-  <cpu type=3D'kvm' name=3D'7455_v3.2'/>
-  <cpu type=3D'kvm' name=3D'740_v2.0'/>
-  <cpu type=3D'kvm' name=3D'MPC8347P'/>
-  <cpu type=3D'kvm' name=3D'440EPb'/>
-  <cpu type=3D'kvm' name=3D'MPC603'/>
-  <cpu type=3D'kvm' name=3D'603e_v1.2'/>
-  <cpu type=3D'kvm' name=3D'750fx_v2.2'/>
-  <cpu type=3D'kvm' name=3D'POWER9_v1.0'/>
-  <cpu type=3D'kvm' name=3D'740_v1.0'/>
-  <cpu type=3D'kvm' name=3D'MPC8544_v10'/>
-  <cpu type=3D'kvm' name=3D'601_v1'/>
-  <cpu type=3D'kvm' name=3D'745_v1.1'/>
-  <cpu type=3D'kvm' name=3D'POWER7+_v2.1'/>
-  <cpu type=3D'kvm' name=3D'750cx_v2.0'/>
-  <cpu type=3D'kvm' name=3D'MPC8347EAP'/>
-  <cpu type=3D'kvm' name=3D'401E2'/>
-  <cpu type=3D'kvm' name=3D'MPC8641D'/>
-  <cpu type=3D'kvm' name=3D'e300c3'/>
-  <cpu type=3D'kvm' name=3D'MPC8533_v10'/>
-  <cpu type=3D'kvm' name=3D'7441_v2.1'/>
-  <cpu type=3D'kvm' name=3D'740_v3.0'/>
-  <cpu type=3D'kvm' name=3D'POWER5+_v2.1'/>
-  <cpu type=3D'kvm' name=3D'602'/>
-  <cpu type=3D'kvm' name=3D'MPC8548E_v10'/>
-  <cpu type=3D'kvm' name=3D'G2leLS'/>
-  <cpu type=3D'kvm' name=3D'MPC8343'/>
-  <cpu type=3D'kvm' name=3D'750cx_v1.0'/>
-  <cpu type=3D'kvm' name=3D'750cxe_v2.2'/>
-  <cpu type=3D'kvm' name=3D'604e_v2.4'/>
-  <cpu type=3D'kvm' name=3D'755_v2.8'/>
-  <cpu type=3D'kvm' name=3D'745_v2.6'/>
-  <cpu type=3D'kvm' name=3D'MPC8548E_v21'/>
-  <cpu type=3D'kvm' name=3D'G2le'/>
-  <cpu type=3D'kvm' name=3D'403GB'/>
-  <cpu type=3D'kvm' name=3D'MPC8545E_v21'/>
-  <cpu type=3D'kvm' name=3D'POWER7_v2.3'/>
-  <cpu type=3D'kvm' name=3D'750_v2.2'/>
-  <cpu type=3D'kvm' name=3D'7450_v1.0'/>
-  <cpu type=3D'kvm' name=3D'MPC5200_v11'/>
-  <cpu type=3D'kvm' name=3D'755_v2.3'/>
-  <cpu type=3D'kvm' name=3D'MPC8347EP'/>
-  <cpu type=3D'kvm' name=3D'7410_v1.1'/>
-  <cpu type=3D'kvm' name=3D'750gl'/>
-  <cpu type=3D'kvm' name=3D'403GCX'/>
-  <cpu type=3D'kvm' name=3D'745_v2.1'/>
-  <cpu type=3D'kvm' name=3D'750p'/>
-  <cpu type=3D'kvm' name=3D'G2'/>
-  <cpu type=3D'kvm' name=3D'MPC8555_v10'/>
-  <cpu type=3D'kvm' name=3D'7445_v3.4'/>
-  <cpu type=3D'kvm' name=3D'MPC8347T'/>
-  <cpu type=3D'kvm' name=3D'603e_v3'/>
-  <cpu type=3D'kvm' name=3D'970_v2.2'/>
-  <cpu type=3D'kvm' name=3D'440-Xilinx'/>
-  <cpu type=3D'kvm' name=3D'740p'/>
-  <cpu type=3D'kvm' name=3D'MPC5200B_v20'/>
-  <cpu type=3D'kvm' name=3D'440EPX'/>
-  <cpu type=3D'kvm' name=3D'603e_v1.1'/>
-  <cpu type=3D'kvm' name=3D'7451_v2.3'/>
-  <cpu type=3D'kvm' name=3D'7450_v2.0'/>
-  <cpu type=3D'kvm' name=3D'7400_v2.8'/>
-  <cpu type=3D'kvm' name=3D'7455_v2.1'/>
-  <cpu type=3D'kvm' name=3D'405GPc'/>
-  <cpu type=3D'kvm' name=3D'MPC8347EAT'/>
-  <cpu type=3D'kvm' name=3D'970mp_v1.1'/>
-  <cpu type=3D'kvm' name=3D'603e7v2'/>
-  <cpu type=3D'kvm' name=3D'604r'/>
-  <cpu type=3D'kvm' name=3D'7447A_v1.2'/>
-  <cpu type=3D'kvm' name=3D'MPC8533E_v11'/>
-  <cpu type=3D'kvm' name=3D'e500v2_v22'/>
-  <cpu type=3D'kvm' name=3D'401F2'/>
-  <cpu type=3D'kvm' name=3D'MPC8343EA'/>
-  <cpu type=3D'kvm' name=3D'7457_v1.2'/>
-  <cpu type=3D'kvm' name=3D'970fx_v3.1'/>
-  <cpu type=3D'kvm' name=3D'7447_v1.0'/>
-  <cpu type=3D'kvm' name=3D'745_v2.5'/>
-  <cpu type=3D'kvm' name=3D'MPC8548E_v20'/>
-  <cpu type=3D'kvm' name=3D'MPC8610'/>
-  <cpu type=3D'kvm' name=3D'750cxe_v2.4b'/>
-  <cpu type=3D'kvm' name=3D'MPC5200_v10'/>
-  <cpu type=3D'kvm' name=3D'403GA'/>
-  <cpu type=3D'kvm' name=3D'7410_v1.0'/>
-  <cpu type=3D'kvm' name=3D'G2leGP3'/>
-  <cpu type=3D'kvm' name=3D'7445_v3.3'/>
-  <cpu type=3D'kvm' name=3D'603e_v4.1'/>
-  <cpu type=3D'kvm' name=3D'440EPa'/>
-  <cpu type=3D'kvm' name=3D'970fx_v2.1'/>
-  <cpu type=3D'kvm' name=3D'MPC8377E'/>
-  <cpu type=3D'kvm' name=3D'750fx_v2.1'/>
-  <cpu type=3D'kvm' name=3D'601_v0'/>
-  <cpu type=3D'kvm' name=3D'STB04'/>
-  <cpu type=3D'kvm' name=3D'745_v1.0'/>
-  <cpu type=3D'kvm' name=3D'G2HiP4'/>
-  <cpu type=3D'kvm' name=3D'750cl_v2.0'/>
-  <cpu type=3D'kvm' name=3D'750cxr'/>
-  <cpu type=3D'kvm' name=3D'MPC8349EA'/>
-  <cpu type=3D'kvm' name=3D'750cxe_v3.1'/>
-  <cpu type=3D'kvm' name=3D'MPC8379'/>
-  <cpu type=3D'kvm' name=3D'401'/>
-  <cpu type=3D'kvm' name=3D'MPC8568'/>
-  <cpu type=3D'kvm' name=3D'e300c2'/>
-  <cpu type=3D'kvm' name=3D'750_v3.1'/>
-  <cpu type=3D'kvm' name=3D'MPC8544E_v11'/>
-  <cpu type=3D'kvm' name=3D'405GPb'/>
-  <cpu type=3D'kvm' name=3D'MPC8541E_v11'/>
-  <cpu type=3D'tcg' name=3D'default'/>
-  <cpu type=3D'tcg' name=3D'ppc'/>
-  <cpu type=3D'tcg' name=3D'ppc32'/>
-  <cpu type=3D'tcg' name=3D'ppc64'/>
-  <cpu type=3D'tcg' name=3D'970mp'/>
-  <cpu type=3D'tcg' name=3D'970fx'/>
-  <cpu type=3D'tcg' name=3D'970'/>
-  <cpu type=3D'tcg' name=3D'POWER9'/>
-  <cpu type=3D'tcg' name=3D'POWER8NVL'/>
-  <cpu type=3D'tcg' name=3D'POWER8'/>
-  <cpu type=3D'tcg' name=3D'POWER8E'/>
-  <cpu type=3D'tcg' name=3D'POWER7+'/>
-  <cpu type=3D'tcg' name=3D'POWER7'/>
-  <cpu type=3D'tcg' name=3D'POWER5gs'/>
-  <cpu type=3D'tcg' name=3D'POWER5+'/>
-  <cpu type=3D'tcg' name=3D'Apollo7PM'/>
-  <cpu type=3D'tcg' name=3D'7457A'/>
-  <cpu type=3D'tcg' name=3D'7447A'/>
-  <cpu type=3D'tcg' name=3D'Apollo7'/>
-  <cpu type=3D'tcg' name=3D'7457'/>
-  <cpu type=3D'tcg' name=3D'7447'/>
-  <cpu type=3D'tcg' name=3D'Apollo6'/>
-  <cpu type=3D'tcg' name=3D'7455'/>
-  <cpu type=3D'tcg' name=3D'7445'/>
-  <cpu type=3D'tcg' name=3D'7451'/>
-  <cpu type=3D'tcg' name=3D'7441'/>
-  <cpu type=3D'tcg' name=3D'Vger'/>
-  <cpu type=3D'tcg' name=3D'7450'/>
-  <cpu type=3D'tcg' name=3D'7448'/>
-  <cpu type=3D'tcg' name=3D'Nitro'/>
-  <cpu type=3D'tcg' name=3D'7410'/>
-  <cpu type=3D'tcg' name=3D'G4'/>
-  <cpu type=3D'tcg' name=3D'Max'/>
-  <cpu type=3D'tcg' name=3D'7400'/>
-  <cpu type=3D'tcg' name=3D'Goldfinger'/>
-  <cpu type=3D'tcg' name=3D'755'/>
-  <cpu type=3D'tcg' name=3D'745'/>
-  <cpu type=3D'tcg' name=3D'LoneStar'/>
-  <cpu type=3D'tcg' name=3D'750l'/>
-  <cpu type=3D'tcg' name=3D'750gx'/>
-  <cpu type=3D'tcg' name=3D'750fx'/>
-  <cpu type=3D'tcg' name=3D'750cxe'/>
-  <cpu type=3D'tcg' name=3D'750cx'/>
-  <cpu type=3D'tcg' name=3D'750cl'/>
-  <cpu type=3D'tcg' name=3D'Conan/Doyle'/>
-  <cpu type=3D'tcg' name=3D'G3'/>
-  <cpu type=3D'tcg' name=3D'Typhoon'/>
-  <cpu type=3D'tcg' name=3D'750'/>
-  <cpu type=3D'tcg' name=3D'Arthur'/>
-  <cpu type=3D'tcg' name=3D'740'/>
-  <cpu type=3D'tcg' name=3D'Mach5'/>
-  <cpu type=3D'tcg' name=3D'Sirocco'/>
-  <cpu type=3D'tcg' name=3D'604e'/>
-  <cpu type=3D'tcg' name=3D'Goldeneye'/>
-  <cpu type=3D'tcg' name=3D'603r'/>
-  <cpu type=3D'tcg' name=3D'Vaillant'/>
-  <cpu type=3D'tcg' name=3D'Stretch'/>
-  <cpu type=3D'tcg' name=3D'603e'/>
-  <cpu type=3D'tcg' name=3D'Vanilla'/>
-  <cpu type=3D'tcg' name=3D'601v'/>
-  <cpu type=3D'tcg' name=3D'601'/>
-  <cpu type=3D'tcg' name=3D'MPC8560'/>
-  <cpu type=3D'tcg' name=3D'MPC8555E'/>
-  <cpu type=3D'tcg' name=3D'MPC8555'/>
-  <cpu type=3D'tcg' name=3D'MPC8548E'/>
-  <cpu type=3D'tcg' name=3D'MPC8548'/>
-  <cpu type=3D'tcg' name=3D'MPC8547E'/>
-  <cpu type=3D'tcg' name=3D'MPC8545E'/>
-  <cpu type=3D'tcg' name=3D'MPC8545'/>
-  <cpu type=3D'tcg' name=3D'MPC8544E'/>
-  <cpu type=3D'tcg' name=3D'MPC8544'/>
-  <cpu type=3D'tcg' name=3D'MPC8543E'/>
-  <cpu type=3D'tcg' name=3D'MPC8543'/>
-  <cpu type=3D'tcg' name=3D'MPC8541E'/>
-  <cpu type=3D'tcg' name=3D'MPC8541'/>
-  <cpu type=3D'tcg' name=3D'MPC8540'/>
-  <cpu type=3D'tcg' name=3D'MPC8533E'/>
-  <cpu type=3D'tcg' name=3D'MPC8533'/>
-  <cpu type=3D'tcg' name=3D'e500v2'/>
-  <cpu type=3D'tcg' name=3D'e500v1'/>
-  <cpu type=3D'tcg' name=3D'e500'/>
-  <cpu type=3D'tcg' name=3D'MPC8347EA'/>
-  <cpu type=3D'tcg' name=3D'MPC8347E'/>
-  <cpu type=3D'tcg' name=3D'MPC8347A'/>
-  <cpu type=3D'tcg' name=3D'MPC8347'/>
-  <cpu type=3D'tcg' name=3D'e300'/>
-  <cpu type=3D'tcg' name=3D'e200'/>
-  <cpu type=3D'tcg' name=3D'MPC8280'/>
-  <cpu type=3D'tcg' name=3D'MPC8275'/>
-  <cpu type=3D'tcg' name=3D'MPC8272'/>
-  <cpu type=3D'tcg' name=3D'MPC8271'/>
-  <cpu type=3D'tcg' name=3D'MPC8270'/>
-  <cpu type=3D'tcg' name=3D'MPC8266_HiP4'/>
-  <cpu type=3D'tcg' name=3D'MPC8266_HiP3'/>
-  <cpu type=3D'tcg' name=3D'MPC8266'/>
-  <cpu type=3D'tcg' name=3D'MPC8265_HiP4'/>
-  <cpu type=3D'tcg' name=3D'MPC8265_HiP3'/>
-  <cpu type=3D'tcg' name=3D'MPC8265'/>
-  <cpu type=3D'tcg' name=3D'MPC8264_HiP4'/>
-  <cpu type=3D'tcg' name=3D'MPC8264_HiP3'/>
-  <cpu type=3D'tcg' name=3D'MPC8264'/>
-  <cpu type=3D'tcg' name=3D'MPC8260_HiP4'/>
-  <cpu type=3D'tcg' name=3D'MPC8260_HiP3'/>
-  <cpu type=3D'tcg' name=3D'MPC8260'/>
-  <cpu type=3D'tcg' name=3D'MPC8255_HiP4'/>
-  <cpu type=3D'tcg' name=3D'MPC8255_HiP3'/>
-  <cpu type=3D'tcg' name=3D'MPC8255'/>
-  <cpu type=3D'tcg' name=3D'MPC8250_HiP4'/>
-  <cpu type=3D'tcg' name=3D'MPC8250_HiP3'/>
-  <cpu type=3D'tcg' name=3D'MPC8250'/>
-  <cpu type=3D'tcg' name=3D'MPC8248'/>
-  <cpu type=3D'tcg' name=3D'MPC8247'/>
-  <cpu type=3D'tcg' name=3D'MPC8245'/>
-  <cpu type=3D'tcg' name=3D'MPC8241'/>
-  <cpu type=3D'tcg' name=3D'PowerQUICC-II'/>
-  <cpu type=3D'tcg' name=3D'MPC82xx'/>
-  <cpu type=3D'tcg' name=3D'MPC5200B'/>
-  <cpu type=3D'tcg' name=3D'MPC5200'/>
-  <cpu type=3D'tcg' name=3D'MPC52xx'/>
-  <cpu type=3D'tcg' name=3D'MPC8240'/>
-  <cpu type=3D'tcg' name=3D'440EP'/>
-  <cpu type=3D'tcg' name=3D'x2vp50'/>
-  <cpu type=3D'tcg' name=3D'x2vp7'/>
-  <cpu type=3D'tcg' name=3D'405GPe'/>
-  <cpu type=3D'tcg' name=3D'405GP'/>
-  <cpu type=3D'tcg' name=3D'405CR'/>
-  <cpu type=3D'tcg' name=3D'405'/>
-  <cpu type=3D'tcg' name=3D'403'/>
-  <cpu type=3D'tcg' name=3D'7457A_v1.2'/>
-  <cpu type=3D'tcg' name=3D'750cl_v1.0'/>
-  <cpu type=3D'tcg' name=3D'750cxe_v2.1'/>
-  <cpu type=3D'tcg' name=3D'755_v2.7'/>
-  <cpu type=3D'tcg' name=3D'MPC8347ET'/>
-  <cpu type=3D'tcg' name=3D'MPC8545E_v20'/>
-  <cpu type=3D'tcg' name=3D'750_v2.1'/>
-  <cpu type=3D'tcg' name=3D'755_v2.2'/>
-  <cpu type=3D'tcg' name=3D'745_v2.0'/>
-  <cpu type=3D'tcg' name=3D'7455_v1.0'/>
-  <cpu type=3D'tcg' name=3D'MPC8547E_v21'/>
-  <cpu type=3D'tcg' name=3D'STB25'/>
-  <cpu type=3D'tcg' name=3D'POWER8_v2.0'/>
-  <cpu type=3D'tcg' name=3D'401G2'/>
-  <cpu type=3D'tcg' name=3D'MPC8349A'/>
-  <cpu type=3D'tcg' name=3D'750e'/>
-  <cpu type=3D'tcg' name=3D'MPC8545_v21'/>
-  <cpu type=3D'tcg' name=3D'MPC8548_v11'/>
-  <cpu type=3D'tcg' name=3D'970fx_v2.0'/>
-  <cpu type=3D'tcg' name=3D'750fx_v2.0'/>
-  <cpu type=3D'tcg' name=3D'POWER8E_v2.1'/>
-  <cpu type=3D'tcg' name=3D'Cobra'/>
-  <cpu type=3D'tcg' name=3D'603p'/>
-  <cpu type=3D'tcg' name=3D'7400_v2.7'/>
-  <cpu type=3D'tcg' name=3D'MPC8378E'/>
-  <cpu type=3D'tcg' name=3D'e500v2_v10'/>
-  <cpu type=3D'tcg' name=3D'e500mc'/>
-  <cpu type=3D'tcg' name=3D'603e7v1'/>
-  <cpu type=3D'tcg' name=3D'970mp_v1.0'/>
-  <cpu type=3D'tcg' name=3D'MPC8555E_v11'/>
-  <cpu type=3D'tcg' name=3D'440-Xilinx-w-dfpu'/>
-  <cpu type=3D'tcg' name=3D'740e'/>
-  <cpu type=3D'tcg' name=3D'405CRc'/>
-  <cpu type=3D'tcg' name=3D'7447A_v1.1'/>
-  <cpu type=3D'tcg' name=3D'MPC8533E_v10'/>
-  <cpu type=3D'tcg' name=3D'MPC8543_v11'/>
-  <cpu type=3D'tcg' name=3D'7400_v2.2'/>
-  <cpu type=3D'tcg' name=3D'MPC8540_v21'/>
-  <cpu type=3D'tcg' name=3D'e500v2_v21'/>
-  <cpu type=3D'tcg' name=3D'e300c1'/>
-  <cpu type=3D'tcg' name=3D'970fx_v1.0'/>
-  <cpu type=3D'tcg' name=3D'750gx_v1.2'/>
-  <cpu type=3D'tcg' name=3D'750fx_v1.0'/>
-  <cpu type=3D'tcg' name=3D'MPC8641'/>
-  <cpu type=3D'tcg' name=3D'MPC8544E_v10'/>
-  <cpu type=3D'tcg' name=3D'405D4'/>
-  <cpu type=3D'tcg' name=3D'7457_v1.1'/>
-  <cpu type=3D'tcg' name=3D'970fx_v3.0'/>
-  <cpu type=3D'tcg' name=3D'604e_v2.2'/>
-  <cpu type=3D'tcg' name=3D'755_v2.6'/>
-  <cpu type=3D'tcg' name=3D'Npe4GS3'/>
-  <cpu type=3D'tcg' name=3D'7410_v1.4'/>
-  <cpu type=3D'tcg' name=3D'750_v2.0'/>
-  <cpu type=3D'tcg' name=3D'7445_v3.2'/>
-  <cpu type=3D'tcg' name=3D'745_v2.4'/>
-  <cpu type=3D'tcg' name=3D'750l_v3.2'/>
-  <cpu type=3D'tcg' name=3D'MPC8540_v10'/>
-  <cpu type=3D'tcg' name=3D'750_v1.0'/>
-  <cpu type=3D'tcg' name=3D'STB03'/>
-  <cpu type=3D'tcg' name=3D'MPC8343A'/>
-  <cpu type=3D'tcg' name=3D'MPC8378'/>
-  <cpu type=3D'tcg' name=3D'G2HiP3'/>
-  <cpu type=3D'tcg' name=3D'750cxe_v3.0'/>
-  <cpu type=3D'tcg' name=3D'e500_v10'/>
-  <cpu type=3D'tcg' name=3D'755_v1.1'/>
-  <cpu type=3D'tcg' name=3D'MPC8567'/>
-  <cpu type=3D'tcg' name=3D'MPC8545_v20'/>
-  <cpu type=3D'tcg' name=3D'MPC8548_v10'/>
-  <cpu type=3D'tcg' name=3D'Npe405H'/>
-  <cpu type=3D'tcg' name=3D'603e7v'/>
-  <cpu type=3D'tcg' name=3D'750_v3.0'/>
-  <cpu type=3D'tcg' name=3D'Npe405H2'/>
-  <cpu type=3D'tcg' name=3D'7400_v2.6'/>
-  <cpu type=3D'tcg' name=3D'405GPa'/>
-  <cpu type=3D'tcg' name=3D'MPC8548_v21'/>
-  <cpu type=3D'tcg' name=3D'MPC8541E_v10'/>
-  <cpu type=3D'tcg' name=3D'750l_v2.2'/>
-  <cpu type=3D'tcg' name=3D'MPC8555E_v10'/>
-  <cpu type=3D'tcg' name=3D'7457A_v1.1'/>
-  <cpu type=3D'tcg' name=3D'e200z6'/>
-  <cpu type=3D'tcg' name=3D'MPC8379E'/>
-  <cpu type=3D'tcg' name=3D'e500v2_v20'/>
-  <cpu type=3D'tcg' name=3D'MPC8347AP'/>
-  <cpu type=3D'tcg' name=3D'401B2'/>
-  <cpu type=3D'tcg' name=3D'MPC8349E'/>
-  <cpu type=3D'tcg' name=3D'755_v2.1'/>
-  <cpu type=3D'tcg' name=3D'MPC8543_v21'/>
-  <cpu type=3D'tcg' name=3D'745_v2.8'/>
-  <cpu type=3D'tcg' name=3D'MPC8547E_v20'/>
-  <cpu type=3D'tcg' name=3D'7455_v3.4'/>
-  <cpu type=3D'tcg' name=3D'7448_v1.1'/>
-  <cpu type=3D'tcg' name=3D'740_v2.2'/>
-  <cpu type=3D'tcg' name=3D'7400_v1.1'/>
-  <cpu type=3D'tcg' name=3D'MPC8567E'/>
-  <cpu type=3D'tcg' name=3D'7441_v2.10'/>
-  <cpu type=3D'tcg' name=3D'603e_v1.4'/>
-  <cpu type=3D'tcg' name=3D'G2leGP1'/>
-  <cpu type=3D'tcg' name=3D'7451_v2.10'/>
-  <cpu type=3D'tcg' name=3D'MPC8343E'/>
-  <cpu type=3D'tcg' name=3D'750cx_v2.2'/>
-  <cpu type=3D'tcg' name=3D'Npe405L'/>
-  <cpu type=3D'tcg' name=3D'603e7'/>
-  <cpu type=3D'tcg' name=3D'401A1'/>
-  <cpu type=3D'tcg' name=3D'MPC8377'/>
-  <cpu type=3D'tcg' name=3D'7448_v2.1'/>
-  <cpu type=3D'tcg' name=3D'7441_v2.3'/>
-  <cpu type=3D'tcg' name=3D'7400_v2.1'/>
-  <cpu type=3D'tcg' name=3D'405CRb'/>
-  <cpu type=3D'tcg' name=3D'604'/>
-  <cpu type=3D'tcg' name=3D'MPC8540_v20'/>
-  <cpu type=3D'tcg' name=3D'MPC8543_v10'/>
-  <cpu type=3D'tcg' name=3D'7445_v2.1'/>
-  <cpu type=3D'tcg' name=3D'e500_v20'/>
-  <cpu type=3D'tcg' name=3D'750gx_v1.1'/>
-  <cpu type=3D'tcg' name=3D'7447A_v1.0'/>
-  <cpu type=3D'tcg' name=3D'750cxe_v2.4'/>
-  <cpu type=3D'tcg' name=3D'MPC8548_v20'/>
-  <cpu type=3D'tcg' name=3D'MPC8543E_v11'/>
-  <cpu type=3D'tcg' name=3D'MPC8347AT'/>
-  <cpu type=3D'tcg' name=3D'POWER8NVL_v1.0'/>
-  <cpu type=3D'tcg' name=3D'7457A_v1.0'/>
-  <cpu type=3D'tcg' name=3D'7457_v1.0'/>
-  <cpu type=3D'tcg' name=3D'7450_v1.2'/>
-  <cpu type=3D'tcg' name=3D'MPC8572'/>
-  <cpu type=3D'tcg' name=3D'755_v2.5'/>
-  <cpu type=3D'tcg' name=3D'7410_v1.3'/>
-  <cpu type=3D'tcg' name=3D'745_v2.3'/>
-  <cpu type=3D'tcg' name=3D'750l_v2.1'/>
-  <cpu type=3D'tcg' name=3D'405GPR'/>
-  <cpu type=3D'tcg' name=3D'755_v2.0'/>
-  <cpu type=3D'tcg' name=3D'MPC8541_v11'/>
-  <cpu type=3D'tcg' name=3D'401C2'/>
-  <cpu type=3D'tcg' name=3D'e500v2_v30'/>
-  <cpu type=3D'tcg' name=3D'7455_v3.3'/>
-  <cpu type=3D'tcg' name=3D'405EZ'/>
-  <cpu type=3D'tcg' name=3D'MPC8568E'/>
-  <cpu type=3D'tcg' name=3D'755_v1.0'/>
-  <cpu type=3D'tcg' name=3D'603e_v1.3'/>
-  <cpu type=3D'tcg' name=3D'MPC8560_v10'/>
-  <cpu type=3D'tcg' name=3D'MPC8560_v21'/>
-  <cpu type=3D'tcg' name=3D'G2H4'/>
-  <cpu type=3D'tcg' name=3D'MPC8533_v11'/>
-  <cpu type=3D'tcg' name=3D'740_v3.1'/>
-  <cpu type=3D'tcg' name=3D'e200z5'/>
-  <cpu type=3D'tcg' name=3D'MPC8349'/>
-  <cpu type=3D'tcg' name=3D'7400_v2.0'/>
-  <cpu type=3D'tcg' name=3D'405CRa'/>
-  <cpu type=3D'tcg' name=3D'MPC8543E_v10'/>
-  <cpu type=3D'tcg' name=3D'MPC8543E_v21'/>
-  <cpu type=3D'tcg' name=3D'750cxe_v2.3'/>
-  <cpu type=3D'tcg' name=3D'MPC8543_v20'/>
-  <cpu type=3D'tcg' name=3D'745_v2.7'/>
-  <cpu type=3D'tcg' name=3D'403GC'/>
-  <cpu type=3D'tcg' name=3D'e5500'/>
-  <cpu type=3D'tcg' name=3D'7448_v1.0'/>
-  <cpu type=3D'tcg' name=3D'MPC5200_v12'/>
-  <cpu type=3D'tcg' name=3D'740_v2.1'/>
-  <cpu type=3D'tcg' name=3D'745_v2.2'/>
-  <cpu type=3D'tcg' name=3D'7400_v1.0'/>
-  <cpu type=3D'tcg' name=3D'7410_v1.2'/>
-  <cpu type=3D'tcg' name=3D'x2vp4'/>
-  <cpu type=3D'tcg' name=3D'MPC8555_v11'/>
-  <cpu type=3D'tcg' name=3D'MPC8541_v10'/>
-  <cpu type=3D'tcg' name=3D'405LP'/>
-  <cpu type=3D'tcg' name=3D'750fx_v2.3'/>
-  <cpu type=3D'tcg' name=3D'405EP'/>
-  <cpu type=3D'tcg' name=3D'601_v2'/>
-  <cpu type=3D'tcg' name=3D'MPC8544_v11'/>
-  <cpu type=3D'tcg' name=3D'401D2'/>
-  <cpu type=3D'tcg' name=3D'MPC8572E'/>
-  <cpu type=3D'tcg' name=3D'604e_v1.0'/>
-  <cpu type=3D'tcg' name=3D'750cx_v2.1'/>
-  <cpu type=3D'tcg' name=3D'MPC5200B_v21'/>
-  <cpu type=3D'tcg' name=3D'750l_v3.0'/>
-  <cpu type=3D'tcg' name=3D'e300c4'/>
-  <cpu type=3D'tcg' name=3D'7448_v2.0'/>
-  <cpu type=3D'tcg' name=3D'7450_v2.1'/>
-  <cpu type=3D'tcg' name=3D'G2leGP'/>
-  <cpu type=3D'tcg' name=3D'750cxe_v3.1b'/>
-  <cpu type=3D'tcg' name=3D'7400_v2.9'/>
-  <cpu type=3D'tcg' name=3D'G2GP'/>
-  <cpu type=3D'tcg' name=3D'603'/>
-  <cpu type=3D'tcg' name=3D'405GPd'/>
-  <cpu type=3D'tcg' name=3D'MPC8548E_v11'/>
-  <cpu type=3D'tcg' name=3D'603e7t'/>
-  <cpu type=3D'tcg' name=3D'IOP480'/>
-  <cpu type=3D'tcg' name=3D'750gx_v1.0'/>
-  <cpu type=3D'tcg' name=3D'MPC8560_v20'/>
-  <cpu type=3D'tcg' name=3D'405D2'/>
-  <cpu type=3D'tcg' name=3D'750fl'/>
-  <cpu type=3D'tcg' name=3D'750l_v2.0'/>
-  <cpu type=3D'tcg' name=3D'x2vp20'/>
-  <cpu type=3D'tcg' name=3D'e600'/>
-  <cpu type=3D'tcg' name=3D'7450_v1.1'/>
-  <cpu type=3D'tcg' name=3D'755_v2.4'/>
-  <cpu type=3D'tcg' name=3D'7445_v1.0'/>
-  <cpu type=3D'tcg' name=3D'G2LS'/>
-  <cpu type=3D'tcg' name=3D'MPC8543E_v20'/>
-  <cpu type=3D'tcg' name=3D'603e_v2.2'/>
-  <cpu type=3D'tcg' name=3D'7447_v1.1'/>
-  <cpu type=3D'tcg' name=3D'603e_v4'/>
-  <cpu type=3D'tcg' name=3D'7455_v3.2'/>
-  <cpu type=3D'tcg' name=3D'740_v2.0'/>
-  <cpu type=3D'tcg' name=3D'MPC8347P'/>
-  <cpu type=3D'tcg' name=3D'440EPb'/>
-  <cpu type=3D'tcg' name=3D'MPC603'/>
-  <cpu type=3D'tcg' name=3D'603e_v1.2'/>
-  <cpu type=3D'tcg' name=3D'750fx_v2.2'/>
-  <cpu type=3D'tcg' name=3D'POWER9_v1.0'/>
-  <cpu type=3D'tcg' name=3D'740_v1.0'/>
-  <cpu type=3D'tcg' name=3D'MPC8544_v10'/>
-  <cpu type=3D'tcg' name=3D'601_v1'/>
-  <cpu type=3D'tcg' name=3D'745_v1.1'/>
-  <cpu type=3D'tcg' name=3D'POWER7+_v2.1'/>
-  <cpu type=3D'tcg' name=3D'750cx_v2.0'/>
-  <cpu type=3D'tcg' name=3D'MPC8347EAP'/>
-  <cpu type=3D'tcg' name=3D'401E2'/>
-  <cpu type=3D'tcg' name=3D'MPC8641D'/>
-  <cpu type=3D'tcg' name=3D'e300c3'/>
-  <cpu type=3D'tcg' name=3D'MPC8533_v10'/>
-  <cpu type=3D'tcg' name=3D'7441_v2.1'/>
-  <cpu type=3D'tcg' name=3D'740_v3.0'/>
-  <cpu type=3D'tcg' name=3D'POWER5+_v2.1'/>
-  <cpu type=3D'tcg' name=3D'602'/>
-  <cpu type=3D'tcg' name=3D'MPC8548E_v10'/>
-  <cpu type=3D'tcg' name=3D'G2leLS'/>
-  <cpu type=3D'tcg' name=3D'MPC8343'/>
-  <cpu type=3D'tcg' name=3D'750cx_v1.0'/>
-  <cpu type=3D'tcg' name=3D'750cxe_v2.2'/>
-  <cpu type=3D'tcg' name=3D'604e_v2.4'/>
-  <cpu type=3D'tcg' name=3D'755_v2.8'/>
-  <cpu type=3D'tcg' name=3D'745_v2.6'/>
-  <cpu type=3D'tcg' name=3D'MPC8548E_v21'/>
-  <cpu type=3D'tcg' name=3D'G2le'/>
-  <cpu type=3D'tcg' name=3D'403GB'/>
-  <cpu type=3D'tcg' name=3D'MPC8545E_v21'/>
-  <cpu type=3D'tcg' name=3D'POWER7_v2.3'/>
-  <cpu type=3D'tcg' name=3D'750_v2.2'/>
-  <cpu type=3D'tcg' name=3D'7450_v1.0'/>
-  <cpu type=3D'tcg' name=3D'MPC5200_v11'/>
-  <cpu type=3D'tcg' name=3D'755_v2.3'/>
-  <cpu type=3D'tcg' name=3D'MPC8347EP'/>
-  <cpu type=3D'tcg' name=3D'7410_v1.1'/>
-  <cpu type=3D'tcg' name=3D'750gl'/>
-  <cpu type=3D'tcg' name=3D'403GCX'/>
-  <cpu type=3D'tcg' name=3D'745_v2.1'/>
-  <cpu type=3D'tcg' name=3D'750p'/>
-  <cpu type=3D'tcg' name=3D'G2'/>
-  <cpu type=3D'tcg' name=3D'MPC8555_v10'/>
-  <cpu type=3D'tcg' name=3D'7445_v3.4'/>
-  <cpu type=3D'tcg' name=3D'MPC8347T'/>
-  <cpu type=3D'tcg' name=3D'603e_v3'/>
-  <cpu type=3D'tcg' name=3D'970_v2.2'/>
-  <cpu type=3D'tcg' name=3D'440-Xilinx'/>
-  <cpu type=3D'tcg' name=3D'740p'/>
-  <cpu type=3D'tcg' name=3D'MPC5200B_v20'/>
-  <cpu type=3D'tcg' name=3D'440EPX'/>
-  <cpu type=3D'tcg' name=3D'603e_v1.1'/>
-  <cpu type=3D'tcg' name=3D'7451_v2.3'/>
-  <cpu type=3D'tcg' name=3D'7450_v2.0'/>
-  <cpu type=3D'tcg' name=3D'7400_v2.8'/>
-  <cpu type=3D'tcg' name=3D'7455_v2.1'/>
-  <cpu type=3D'tcg' name=3D'405GPc'/>
-  <cpu type=3D'tcg' name=3D'MPC8347EAT'/>
-  <cpu type=3D'tcg' name=3D'970mp_v1.1'/>
-  <cpu type=3D'tcg' name=3D'603e7v2'/>
-  <cpu type=3D'tcg' name=3D'604r'/>
-  <cpu type=3D'tcg' name=3D'7447A_v1.2'/>
-  <cpu type=3D'tcg' name=3D'MPC8533E_v11'/>
-  <cpu type=3D'tcg' name=3D'e500v2_v22'/>
-  <cpu type=3D'tcg' name=3D'401F2'/>
-  <cpu type=3D'tcg' name=3D'MPC8343EA'/>
-  <cpu type=3D'tcg' name=3D'7457_v1.2'/>
-  <cpu type=3D'tcg' name=3D'970fx_v3.1'/>
-  <cpu type=3D'tcg' name=3D'7447_v1.0'/>
-  <cpu type=3D'tcg' name=3D'745_v2.5'/>
-  <cpu type=3D'tcg' name=3D'MPC8548E_v20'/>
-  <cpu type=3D'tcg' name=3D'MPC8610'/>
-  <cpu type=3D'tcg' name=3D'750cxe_v2.4b'/>
-  <cpu type=3D'tcg' name=3D'MPC5200_v10'/>
-  <cpu type=3D'tcg' name=3D'403GA'/>
-  <cpu type=3D'tcg' name=3D'7410_v1.0'/>
-  <cpu type=3D'tcg' name=3D'G2leGP3'/>
-  <cpu type=3D'tcg' name=3D'7445_v3.3'/>
-  <cpu type=3D'tcg' name=3D'603e_v4.1'/>
-  <cpu type=3D'tcg' name=3D'440EPa'/>
-  <cpu type=3D'tcg' name=3D'970fx_v2.1'/>
-  <cpu type=3D'tcg' name=3D'MPC8377E'/>
-  <cpu type=3D'tcg' name=3D'750fx_v2.1'/>
-  <cpu type=3D'tcg' name=3D'601_v0'/>
-  <cpu type=3D'tcg' name=3D'STB04'/>
-  <cpu type=3D'tcg' name=3D'745_v1.0'/>
-  <cpu type=3D'tcg' name=3D'G2HiP4'/>
-  <cpu type=3D'tcg' name=3D'750cl_v2.0'/>
-  <cpu type=3D'tcg' name=3D'750cxr'/>
-  <cpu type=3D'tcg' name=3D'MPC8349EA'/>
-  <cpu type=3D'tcg' name=3D'750cxe_v3.1'/>
-  <cpu type=3D'tcg' name=3D'MPC8379'/>
-  <cpu type=3D'tcg' name=3D'401'/>
-  <cpu type=3D'tcg' name=3D'MPC8568'/>
-  <cpu type=3D'tcg' name=3D'e300c2'/>
-  <cpu type=3D'tcg' name=3D'750_v3.1'/>
-  <cpu type=3D'tcg' name=3D'MPC8544E_v11'/>
-  <cpu type=3D'tcg' name=3D'405GPb'/>
-  <cpu type=3D'tcg' name=3D'MPC8541E_v11'/>
+  <cpu type=3D'kvm' name=3D'default' typename=3D'604-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'ppc' typename=3D'604-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'ppc32' typename=3D'604-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'ppc64' typename=3D'970fx_v3.1-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'970mp' typename=3D'970mp_v1.1-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'970fx' typename=3D'970fx_v3.1-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'970' typename=3D'970_v2.2-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'POWER9' typename=3D'POWER9_v1.0-powerpc64-cpu'=
/>
+  <cpu type=3D'kvm' name=3D'POWER8NVL' typename=3D'POWER8NVL_v1.0-powerpc6=
4-cpu'/>
+  <cpu type=3D'kvm' name=3D'POWER8' typename=3D'POWER8E_v2.1-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'POWER8E' typename=3D'POWER8E_v2.1-powerpc64-cp=
u'/>
+  <cpu type=3D'kvm' name=3D'POWER7+' typename=3D'POWER7+_v2.1-powerpc64-cp=
u'/>
+  <cpu type=3D'kvm' name=3D'POWER7' typename=3D'POWER7_v2.3-powerpc64-cpu'=
/>
+  <cpu type=3D'kvm' name=3D'POWER5gs' typename=3D'POWER5+_v2.1-powerpc64-c=
pu'/>
+  <cpu type=3D'kvm' name=3D'POWER5+' typename=3D'POWER5+_v2.1-powerpc64-cp=
u'/>
+  <cpu type=3D'kvm' name=3D'Apollo7PM' typename=3D'7457A_v1.0-powerpc64-cp=
u'/>
+  <cpu type=3D'kvm' name=3D'7457A' typename=3D'7457A_v1.2-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'7447A' typename=3D'7447A_v1.2-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'Apollo7' typename=3D'7457_v1.2-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'7457' typename=3D'7457_v1.2-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'7447' typename=3D'7447_v1.1-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'Apollo6' typename=3D'7455_v3.2-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'7455' typename=3D'7455_v3.2-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'7445' typename=3D'7445_v3.2-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'7451' typename=3D'7451_v2.3-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'7441' typename=3D'7441_v2.3-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'Vger' typename=3D'7450_v2.1-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'7450' typename=3D'7450_v2.1-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'7448' typename=3D'7448_v2.1-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'Nitro' typename=3D'7410_v1.4-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'7410' typename=3D'7410_v1.4-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'G4' typename=3D'7400_v2.9-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'Max' typename=3D'7400_v2.9-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'7400' typename=3D'7400_v2.9-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'Goldfinger' typename=3D'755_v2.8-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'755' typename=3D'755_v2.8-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'745' typename=3D'745_v2.8-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'LoneStar' typename=3D'750l_v3.2-powerpc64-cpu'=
/>
+  <cpu type=3D'kvm' name=3D'750l' typename=3D'750l_v3.2-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'750gx' typename=3D'750gx_v1.2-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'750fx' typename=3D'750fx_v2.3-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'750cxe' typename=3D'750cxe_v3.1b-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'750cx' typename=3D'750cx_v2.2-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'750cl' typename=3D'750cl_v2.0-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'Conan/Doyle' typename=3D'750p-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'G3' typename=3D'750_v3.1-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'Typhoon' typename=3D'750_v3.1-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'750' typename=3D'750_v3.1-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'Arthur' typename=3D'740_v3.1-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'740' typename=3D'740_v3.1-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'Mach5' typename=3D'604r-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'Sirocco' typename=3D'604e_v2.4-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'604e' typename=3D'604e_v2.4-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'Goldeneye' typename=3D'603e7t-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'603r' typename=3D'603e7t-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'Vaillant' typename=3D'603e7v-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'Stretch' typename=3D'603e_v4.1-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'603e' typename=3D'603e_v4.1-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'Vanilla' typename=3D'603-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'601v' typename=3D'601_v2-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'601' typename=3D'601_v2-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'MPC8560' typename=3D'MPC8560_v21-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'MPC8555E' typename=3D'MPC8555E_v11-powerpc64-c=
pu'/>
+  <cpu type=3D'kvm' name=3D'MPC8555' typename=3D'MPC8555_v11-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'MPC8548E' typename=3D'MPC8548E_v21-powerpc64-c=
pu'/>
+  <cpu type=3D'kvm' name=3D'MPC8548' typename=3D'MPC8548_v21-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'MPC8547E' typename=3D'MPC8547E_v21-powerpc64-c=
pu'/>
+  <cpu type=3D'kvm' name=3D'MPC8545E' typename=3D'MPC8545E_v21-powerpc64-c=
pu'/>
+  <cpu type=3D'kvm' name=3D'MPC8545' typename=3D'MPC8545_v21-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'MPC8544E' typename=3D'MPC8544E_v11-powerpc64-c=
pu'/>
+  <cpu type=3D'kvm' name=3D'MPC8544' typename=3D'MPC8544_v11-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'MPC8543E' typename=3D'MPC8543E_v21-powerpc64-c=
pu'/>
+  <cpu type=3D'kvm' name=3D'MPC8543' typename=3D'MPC8543_v21-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'MPC8541E' typename=3D'MPC8541E_v11-powerpc64-c=
pu'/>
+  <cpu type=3D'kvm' name=3D'MPC8541' typename=3D'MPC8541_v11-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'MPC8540' typename=3D'MPC8540_v21-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'MPC8533E' typename=3D'MPC8533E_v11-powerpc64-c=
pu'/>
+  <cpu type=3D'kvm' name=3D'MPC8533' typename=3D'MPC8533_v11-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'e500v2' typename=3D'e500v2_v22-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'e500v1' typename=3D'e500_v20-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'e500' typename=3D'e500v2_v22-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'MPC8347EA' typename=3D'MPC8347EAT-powerpc64-cp=
u'/>
+  <cpu type=3D'kvm' name=3D'MPC8347E' typename=3D'MPC8347ET-powerpc64-cpu'=
/>
+  <cpu type=3D'kvm' name=3D'MPC8347A' typename=3D'MPC8347AT-powerpc64-cpu'=
/>
+  <cpu type=3D'kvm' name=3D'MPC8347' typename=3D'MPC8347T-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'e300' typename=3D'e300c3-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'e200' typename=3D'e200z6-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'MPC8280' typename=3D'G2leGP3-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'MPC8275' typename=3D'G2leGP3-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'MPC8272' typename=3D'G2leGP3-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'MPC8271' typename=3D'G2leGP3-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'MPC8270' typename=3D'G2leGP3-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'MPC8266_HiP4' typename=3D'G2HiP4-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'MPC8266_HiP3' typename=3D'G2HiP3-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'MPC8266' typename=3D'G2HiP4-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'MPC8265_HiP4' typename=3D'G2HiP4-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'MPC8265_HiP3' typename=3D'G2HiP3-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'MPC8265' typename=3D'G2HiP4-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'MPC8264_HiP4' typename=3D'G2HiP4-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'MPC8264_HiP3' typename=3D'G2HiP3-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'MPC8264' typename=3D'G2HiP4-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'MPC8260_HiP4' typename=3D'G2HiP4-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'MPC8260_HiP3' typename=3D'G2HiP3-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'MPC8260' typename=3D'G2HiP4-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'MPC8255_HiP4' typename=3D'G2HiP4-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'MPC8255_HiP3' typename=3D'G2HiP3-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'MPC8255' typename=3D'G2HiP4-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'MPC8250_HiP4' typename=3D'G2HiP4-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'MPC8250_HiP3' typename=3D'G2HiP3-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'MPC8250' typename=3D'G2HiP4-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'MPC8248' typename=3D'G2leGP3-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'MPC8247' typename=3D'G2leGP3-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'MPC8245' typename=3D'G2HiP4-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'MPC8241' typename=3D'G2HiP4-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'PowerQUICC-II' typename=3D'G2leGP3-powerpc64-c=
pu'/>
+  <cpu type=3D'kvm' name=3D'MPC82xx' typename=3D'G2leGP3-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'MPC5200B' typename=3D'MPC5200B_v21-powerpc64-c=
pu'/>
+  <cpu type=3D'kvm' name=3D'MPC5200' typename=3D'MPC5200_v12-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'MPC52xx' typename=3D'MPC5200_v12-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'MPC8240' typename=3D'603-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'440EP' typename=3D'440EPb-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'x2vp50' typename=3D'x2vp20-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'x2vp7' typename=3D'x2vp4-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'405GPe' typename=3D'405CRc-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'405GP' typename=3D'405GPd-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'405CR' typename=3D'405CRc-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'405' typename=3D'405D4-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'403' typename=3D'403GC-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'7457A_v1.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cl_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cxe_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'755_v2.7' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8347ET' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8545E_v20' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'755_v2.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'745_v2.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7455_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8547E_v21' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'STB25' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'POWER8_v2.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'401G2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8349A' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750e' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8545_v21' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8548_v11' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'970fx_v2.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750fx_v2.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'POWER8E_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'Cobra' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603p' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7400_v2.7' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8378E' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e500v2_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e500mc' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603e7v1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'970mp_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8555E_v11' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'440-Xilinx-w-dfpu' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'740e' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'405CRc' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7447A_v1.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8533E_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8543_v11' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7400_v2.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8540_v21' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e500v2_v21' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e300c1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'970fx_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750gx_v1.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750fx_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8641' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8544E_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'405D4' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7457_v1.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'970fx_v3.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'604e_v2.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'755_v2.6' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'Npe4GS3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7410_v1.4' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750_v2.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7445_v3.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'745_v2.4' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750l_v3.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8540_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'STB03' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8343A' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8378' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'G2HiP3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cxe_v3.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e500_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'755_v1.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8567' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8545_v20' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8548_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'Npe405H' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603e7v' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750_v3.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'Npe405H2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7400_v2.6' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'405GPa' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8548_v21' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8541E_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750l_v2.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8555E_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7457A_v1.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e200z6' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8379E' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e500v2_v20' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8347AP' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'401B2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8349E' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'755_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8543_v21' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'745_v2.8' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8547E_v20' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7455_v3.4' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7448_v1.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'740_v2.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7400_v1.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8567E' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7441_v2.10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603e_v1.4' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'G2leGP1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7451_v2.10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8343E' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cx_v2.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'Npe405L' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603e7' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'401A1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8377' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7448_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7441_v2.3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7400_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'405CRb' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'604' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8540_v20' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8543_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7445_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e500_v20' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750gx_v1.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7447A_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cxe_v2.4' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8548_v20' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8543E_v11' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8347AT' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'POWER8NVL_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7457A_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7457_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7450_v1.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8572' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'755_v2.5' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7410_v1.3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'745_v2.3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750l_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'405GPR' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'755_v2.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8541_v11' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'401C2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e500v2_v30' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7455_v3.3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'405EZ' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8568E' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'755_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603e_v1.3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8560_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'host' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8560_v21' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'G2H4' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8533_v11' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'740_v3.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e200z5' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8349' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7400_v2.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'405CRa' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8543E_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8543E_v21' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cxe_v2.3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8543_v20' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'745_v2.7' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'403GC' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e5500' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7448_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC5200_v12' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'740_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'745_v2.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7400_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7410_v1.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'x2vp4' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8555_v11' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8541_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'405LP' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750fx_v2.3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'405EP' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'601_v2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8544_v11' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'401D2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8572E' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'604e_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cx_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC5200B_v21' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750l_v3.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e300c4' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7448_v2.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7450_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'G2leGP' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cxe_v3.1b' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7400_v2.9' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'G2GP' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'405GPd' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8548E_v11' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603e7t' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'IOP480' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750gx_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8560_v20' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'405D2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750fl' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750l_v2.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'x2vp20' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e600' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7450_v1.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'755_v2.4' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7445_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'G2LS' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8543E_v20' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603e_v2.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7447_v1.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603e_v4' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7455_v3.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'740_v2.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8347P' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'440EPb' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC603' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603e_v1.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750fx_v2.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'POWER9_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'740_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8544_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'601_v1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'745_v1.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'POWER7+_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cx_v2.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8347EAP' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'401E2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8641D' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e300c3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8533_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7441_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'740_v3.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'POWER5+_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'602' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8548E_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'G2leLS' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8343' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cx_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cxe_v2.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'604e_v2.4' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'755_v2.8' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'745_v2.6' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8548E_v21' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'G2le' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'403GB' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8545E_v21' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'POWER7_v2.3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750_v2.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7450_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC5200_v11' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'755_v2.3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8347EP' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7410_v1.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750gl' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'403GCX' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'745_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750p' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'G2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8555_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7445_v3.4' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8347T' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603e_v3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'970_v2.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'440-Xilinx' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'740p' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC5200B_v20' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'440EPX' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603e_v1.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7451_v2.3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7450_v2.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7400_v2.8' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7455_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'405GPc' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8347EAT' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'970mp_v1.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603e7v2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'604r' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7447A_v1.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8533E_v11' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e500v2_v22' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'401F2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8343EA' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7457_v1.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'970fx_v3.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7447_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'745_v2.5' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8548E_v20' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8610' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cxe_v2.4b' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC5200_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'403GA' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7410_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'G2leGP3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7445_v3.3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603e_v4.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'440EPa' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'970fx_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8377E' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750fx_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'601_v0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'STB04' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'745_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'G2HiP4' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cl_v2.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cxr' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8349EA' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cxe_v3.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8379' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'401' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8568' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e300c2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750_v3.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8544E_v11' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'405GPb' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'MPC8541E_v11' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'default' typename=3D'604-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'ppc' typename=3D'604-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'ppc32' typename=3D'604-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'ppc64' typename=3D'970fx_v3.1-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'970mp' typename=3D'970mp_v1.1-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'970fx' typename=3D'970fx_v3.1-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'970' typename=3D'970_v2.2-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'POWER9' typename=3D'POWER9_v1.0-powerpc64-cpu'=
/>
+  <cpu type=3D'tcg' name=3D'POWER8NVL' typename=3D'POWER8NVL_v1.0-powerpc6=
4-cpu'/>
+  <cpu type=3D'tcg' name=3D'POWER8' typename=3D'POWER8_v2.0-powerpc64-cpu'=
/>
+  <cpu type=3D'tcg' name=3D'POWER8E' typename=3D'POWER8E_v2.1-powerpc64-cp=
u'/>
+  <cpu type=3D'tcg' name=3D'POWER7+' typename=3D'POWER7+_v2.1-powerpc64-cp=
u'/>
+  <cpu type=3D'tcg' name=3D'POWER7' typename=3D'POWER7_v2.3-powerpc64-cpu'=
/>
+  <cpu type=3D'tcg' name=3D'POWER5gs' typename=3D'POWER5+_v2.1-powerpc64-c=
pu'/>
+  <cpu type=3D'tcg' name=3D'POWER5+' typename=3D'POWER5+_v2.1-powerpc64-cp=
u'/>
+  <cpu type=3D'tcg' name=3D'Apollo7PM' typename=3D'7457A_v1.0-powerpc64-cp=
u'/>
+  <cpu type=3D'tcg' name=3D'7457A' typename=3D'7457A_v1.2-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'7447A' typename=3D'7447A_v1.2-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'Apollo7' typename=3D'7457_v1.2-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'7457' typename=3D'7457_v1.2-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'7447' typename=3D'7447_v1.1-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'Apollo6' typename=3D'7455_v3.2-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'7455' typename=3D'7455_v3.2-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'7445' typename=3D'7445_v3.2-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'7451' typename=3D'7451_v2.3-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'7441' typename=3D'7441_v2.3-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'Vger' typename=3D'7450_v2.1-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'7450' typename=3D'7450_v2.1-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'7448' typename=3D'7448_v2.1-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'Nitro' typename=3D'7410_v1.4-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'7410' typename=3D'7410_v1.4-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'G4' typename=3D'7400_v2.9-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'Max' typename=3D'7400_v2.9-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'7400' typename=3D'7400_v2.9-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'Goldfinger' typename=3D'755_v2.8-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'755' typename=3D'755_v2.8-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'745' typename=3D'745_v2.8-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'LoneStar' typename=3D'750l_v3.2-powerpc64-cpu'=
/>
+  <cpu type=3D'tcg' name=3D'750l' typename=3D'750l_v3.2-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'750gx' typename=3D'750gx_v1.2-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'750fx' typename=3D'750fx_v2.3-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'750cxe' typename=3D'750cxe_v3.1b-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'750cx' typename=3D'750cx_v2.2-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'750cl' typename=3D'750cl_v2.0-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'Conan/Doyle' typename=3D'750p-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'G3' typename=3D'750_v3.1-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'Typhoon' typename=3D'750_v3.1-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'750' typename=3D'750_v3.1-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'Arthur' typename=3D'740_v3.1-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'740' typename=3D'740_v3.1-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'Mach5' typename=3D'604r-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'Sirocco' typename=3D'604e_v2.4-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'604e' typename=3D'604e_v2.4-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'Goldeneye' typename=3D'603e7t-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'603r' typename=3D'603e7t-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'Vaillant' typename=3D'603e7v-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'Stretch' typename=3D'603e_v4.1-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'603e' typename=3D'603e_v4.1-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'Vanilla' typename=3D'603-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'601v' typename=3D'601_v2-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'601' typename=3D'601_v2-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'MPC8560' typename=3D'MPC8560_v21-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'MPC8555E' typename=3D'MPC8555E_v11-powerpc64-c=
pu'/>
+  <cpu type=3D'tcg' name=3D'MPC8555' typename=3D'MPC8555_v11-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'MPC8548E' typename=3D'MPC8548E_v21-powerpc64-c=
pu'/>
+  <cpu type=3D'tcg' name=3D'MPC8548' typename=3D'MPC8548_v21-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'MPC8547E' typename=3D'MPC8547E_v21-powerpc64-c=
pu'/>
+  <cpu type=3D'tcg' name=3D'MPC8545E' typename=3D'MPC8545E_v21-powerpc64-c=
pu'/>
+  <cpu type=3D'tcg' name=3D'MPC8545' typename=3D'MPC8545_v21-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'MPC8544E' typename=3D'MPC8544E_v11-powerpc64-c=
pu'/>
+  <cpu type=3D'tcg' name=3D'MPC8544' typename=3D'MPC8544_v11-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'MPC8543E' typename=3D'MPC8543E_v21-powerpc64-c=
pu'/>
+  <cpu type=3D'tcg' name=3D'MPC8543' typename=3D'MPC8543_v21-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'MPC8541E' typename=3D'MPC8541E_v11-powerpc64-c=
pu'/>
+  <cpu type=3D'tcg' name=3D'MPC8541' typename=3D'MPC8541_v11-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'MPC8540' typename=3D'MPC8540_v21-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'MPC8533E' typename=3D'MPC8533E_v11-powerpc64-c=
pu'/>
+  <cpu type=3D'tcg' name=3D'MPC8533' typename=3D'MPC8533_v11-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'e500v2' typename=3D'e500v2_v22-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'e500v1' typename=3D'e500_v20-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'e500' typename=3D'e500v2_v22-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'MPC8347EA' typename=3D'MPC8347EAT-powerpc64-cp=
u'/>
+  <cpu type=3D'tcg' name=3D'MPC8347E' typename=3D'MPC8347ET-powerpc64-cpu'=
/>
+  <cpu type=3D'tcg' name=3D'MPC8347A' typename=3D'MPC8347AT-powerpc64-cpu'=
/>
+  <cpu type=3D'tcg' name=3D'MPC8347' typename=3D'MPC8347T-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'e300' typename=3D'e300c3-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'e200' typename=3D'e200z6-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'MPC8280' typename=3D'G2leGP3-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'MPC8275' typename=3D'G2leGP3-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'MPC8272' typename=3D'G2leGP3-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'MPC8271' typename=3D'G2leGP3-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'MPC8270' typename=3D'G2leGP3-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'MPC8266_HiP4' typename=3D'G2HiP4-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'MPC8266_HiP3' typename=3D'G2HiP3-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'MPC8266' typename=3D'G2HiP4-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'MPC8265_HiP4' typename=3D'G2HiP4-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'MPC8265_HiP3' typename=3D'G2HiP3-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'MPC8265' typename=3D'G2HiP4-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'MPC8264_HiP4' typename=3D'G2HiP4-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'MPC8264_HiP3' typename=3D'G2HiP3-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'MPC8264' typename=3D'G2HiP4-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'MPC8260_HiP4' typename=3D'G2HiP4-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'MPC8260_HiP3' typename=3D'G2HiP3-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'MPC8260' typename=3D'G2HiP4-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'MPC8255_HiP4' typename=3D'G2HiP4-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'MPC8255_HiP3' typename=3D'G2HiP3-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'MPC8255' typename=3D'G2HiP4-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'MPC8250_HiP4' typename=3D'G2HiP4-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'MPC8250_HiP3' typename=3D'G2HiP3-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'MPC8250' typename=3D'G2HiP4-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'MPC8248' typename=3D'G2leGP3-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'MPC8247' typename=3D'G2leGP3-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'MPC8245' typename=3D'G2HiP4-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'MPC8241' typename=3D'G2HiP4-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'PowerQUICC-II' typename=3D'G2leGP3-powerpc64-c=
pu'/>
+  <cpu type=3D'tcg' name=3D'MPC82xx' typename=3D'G2leGP3-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'MPC5200B' typename=3D'MPC5200B_v21-powerpc64-c=
pu'/>
+  <cpu type=3D'tcg' name=3D'MPC5200' typename=3D'MPC5200_v12-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'MPC52xx' typename=3D'MPC5200_v12-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'MPC8240' typename=3D'603-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'440EP' typename=3D'440EPb-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'x2vp50' typename=3D'x2vp20-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'x2vp7' typename=3D'x2vp4-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'405GPe' typename=3D'405CRc-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'405GP' typename=3D'405GPd-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'405CR' typename=3D'405CRc-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'405' typename=3D'405D4-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'403' typename=3D'403GC-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'7457A_v1.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cl_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cxe_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'755_v2.7' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8347ET' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8545E_v20' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'755_v2.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'745_v2.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7455_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8547E_v21' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'STB25' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'POWER8_v2.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'401G2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8349A' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750e' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8545_v21' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8548_v11' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'970fx_v2.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750fx_v2.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'POWER8E_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'Cobra' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603p' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7400_v2.7' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8378E' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e500v2_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e500mc' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603e7v1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'970mp_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8555E_v11' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'440-Xilinx-w-dfpu' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'740e' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'405CRc' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7447A_v1.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8533E_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8543_v11' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7400_v2.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8540_v21' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e500v2_v21' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e300c1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'970fx_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750gx_v1.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750fx_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8641' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8544E_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'405D4' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7457_v1.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'970fx_v3.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'604e_v2.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'755_v2.6' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'Npe4GS3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7410_v1.4' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750_v2.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7445_v3.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'745_v2.4' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750l_v3.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8540_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'STB03' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8343A' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8378' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'G2HiP3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cxe_v3.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e500_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'755_v1.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8567' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8545_v20' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8548_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'Npe405H' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603e7v' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750_v3.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'Npe405H2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7400_v2.6' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'405GPa' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8548_v21' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8541E_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750l_v2.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8555E_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7457A_v1.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e200z6' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8379E' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e500v2_v20' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8347AP' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'401B2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8349E' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'755_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8543_v21' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'745_v2.8' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8547E_v20' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7455_v3.4' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7448_v1.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'740_v2.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7400_v1.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8567E' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7441_v2.10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603e_v1.4' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'G2leGP1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7451_v2.10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8343E' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cx_v2.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'Npe405L' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603e7' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'401A1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8377' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7448_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7441_v2.3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7400_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'405CRb' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'604' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8540_v20' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8543_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7445_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e500_v20' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750gx_v1.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7447A_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cxe_v2.4' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8548_v20' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8543E_v11' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8347AT' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'POWER8NVL_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7457A_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7457_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7450_v1.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8572' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'755_v2.5' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7410_v1.3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'745_v2.3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750l_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'405GPR' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'755_v2.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8541_v11' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'401C2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e500v2_v30' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7455_v3.3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'405EZ' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8568E' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'755_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603e_v1.3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8560_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8560_v21' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'G2H4' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8533_v11' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'740_v3.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e200z5' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8349' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7400_v2.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'405CRa' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8543E_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8543E_v21' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cxe_v2.3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8543_v20' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'745_v2.7' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'403GC' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e5500' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7448_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC5200_v12' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'740_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'745_v2.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7400_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7410_v1.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'x2vp4' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8555_v11' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8541_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'405LP' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750fx_v2.3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'405EP' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'601_v2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8544_v11' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'401D2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8572E' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'604e_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cx_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC5200B_v21' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750l_v3.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e300c4' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7448_v2.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7450_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'G2leGP' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cxe_v3.1b' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7400_v2.9' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'G2GP' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'405GPd' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8548E_v11' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603e7t' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'IOP480' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750gx_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8560_v20' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'405D2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750fl' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750l_v2.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'x2vp20' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e600' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7450_v1.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'755_v2.4' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7445_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'G2LS' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8543E_v20' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603e_v2.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7447_v1.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603e_v4' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7455_v3.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'740_v2.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8347P' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'440EPb' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC603' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603e_v1.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750fx_v2.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'POWER9_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'740_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8544_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'601_v1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'745_v1.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'POWER7+_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cx_v2.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8347EAP' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'401E2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8641D' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e300c3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8533_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7441_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'740_v3.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'POWER5+_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'602' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8548E_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'G2leLS' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8343' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cx_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cxe_v2.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'604e_v2.4' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'755_v2.8' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'745_v2.6' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8548E_v21' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'G2le' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'403GB' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8545E_v21' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'POWER7_v2.3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750_v2.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7450_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC5200_v11' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'755_v2.3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8347EP' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7410_v1.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750gl' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'403GCX' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'745_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750p' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'G2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8555_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7445_v3.4' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8347T' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603e_v3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'970_v2.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'440-Xilinx' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'740p' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC5200B_v20' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'440EPX' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603e_v1.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7451_v2.3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7450_v2.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7400_v2.8' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7455_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'405GPc' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8347EAT' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'970mp_v1.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603e7v2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'604r' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7447A_v1.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8533E_v11' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e500v2_v22' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'401F2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8343EA' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7457_v1.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'970fx_v3.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7447_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'745_v2.5' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8548E_v20' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8610' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cxe_v2.4b' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC5200_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'403GA' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7410_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'G2leGP3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7445_v3.3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603e_v4.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'440EPa' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'970fx_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8377E' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750fx_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'601_v0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'STB04' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'745_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'G2HiP4' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cl_v2.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cxr' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8349EA' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cxe_v3.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8379' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'401' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8568' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e300c2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750_v3.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8544E_v11' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'405GPb' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'MPC8541E_v11' typename=3D''/>
   <machine name=3D'pseries-2.9' alias=3D'pseries' hotplugCpus=3D'yes' maxC=
pus=3D'1024' default=3D'yes'/>
   <machine name=3D'ref405ep' maxCpus=3D'1'/>
   <machine name=3D'virtex-ml507' maxCpus=3D'1'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemuca=
pabilitiesdata/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=3D'te' type=3D'boolean' value=3D'true'/>
     <property name=3D'cmm' type=3D'boolean' value=3D'true'/>
   </hostCPU>
-  <cpu type=3D'kvm' name=3D'z10EC-base'/>
-  <cpu type=3D'kvm' name=3D'z9EC-base'/>
-  <cpu type=3D'kvm' name=3D'z196.2-base'/>
-  <cpu type=3D'kvm' name=3D'z900-base'/>
-  <cpu type=3D'kvm' name=3D'z990'/>
-  <cpu type=3D'kvm' name=3D'z900.2-base'/>
-  <cpu type=3D'kvm' name=3D'host'/>
-  <cpu type=3D'kvm' name=3D'z900.3'/>
-  <cpu type=3D'kvm' name=3D'z114'/>
-  <cpu type=3D'kvm' name=3D'z890-base'/>
-  <cpu type=3D'kvm' name=3D'z13.2-base'/>
-  <cpu type=3D'kvm' name=3D'zEC12.2'/>
-  <cpu type=3D'kvm' name=3D'z900.2'/>
-  <cpu type=3D'kvm' name=3D'z10BC'/>
-  <cpu type=3D'kvm' name=3D'z10BC.2'/>
-  <cpu type=3D'kvm' name=3D'z196'/>
-  <cpu type=3D'kvm' name=3D'z9EC'/>
-  <cpu type=3D'kvm' name=3D'z990-base'/>
-  <cpu type=3D'kvm' name=3D'z10EC.3'/>
-  <cpu type=3D'kvm' name=3D'z900'/>
-  <cpu type=3D'kvm' name=3D'z9EC.3-base'/>
-  <cpu type=3D'kvm' name=3D'z990.5-base'/>
-  <cpu type=3D'kvm' name=3D'z10EC.2'/>
-  <cpu type=3D'kvm' name=3D'z9BC.2'/>
-  <cpu type=3D'kvm' name=3D'z10EC'/>
-  <cpu type=3D'kvm' name=3D'z990.3-base'/>
-  <cpu type=3D'kvm' name=3D'z13s'/>
-  <cpu type=3D'kvm' name=3D'z10EC.3-base'/>
-  <cpu type=3D'kvm' name=3D'zEC12.2-base'/>
-  <cpu type=3D'kvm' name=3D'z890.3-base'/>
-  <cpu type=3D'kvm' name=3D'z9EC.3'/>
-  <cpu type=3D'kvm' name=3D'z990.5'/>
-  <cpu type=3D'kvm' name=3D'z13'/>
-  <cpu type=3D'kvm' name=3D'z13s-base'/>
-  <cpu type=3D'kvm' name=3D'z9EC.2'/>
-  <cpu type=3D'kvm' name=3D'z990.4'/>
-  <cpu type=3D'kvm' name=3D'zEC12-base'/>
-  <cpu type=3D'kvm' name=3D'z9EC.2-base'/>
-  <cpu type=3D'kvm' name=3D'zBC12'/>
-  <cpu type=3D'kvm' name=3D'z196.2'/>
-  <cpu type=3D'kvm' name=3D'z990.3'/>
-  <cpu type=3D'kvm' name=3D'z990.2-base'/>
-  <cpu type=3D'kvm' name=3D'z900.3-base'/>
-  <cpu type=3D'kvm' name=3D'z890.3'/>
-  <cpu type=3D'kvm' name=3D'z10EC.2-base'/>
-  <cpu type=3D'kvm' name=3D'z990.2'/>
-  <cpu type=3D'kvm' name=3D'z890.2'/>
-  <cpu type=3D'kvm' name=3D'z800-base'/>
-  <cpu type=3D'kvm' name=3D'zBC12-base'/>
-  <cpu type=3D'kvm' name=3D'zEC12'/>
-  <cpu type=3D'kvm' name=3D'z9BC.2-base'/>
-  <cpu type=3D'kvm' name=3D'z9BC'/>
-  <cpu type=3D'kvm' name=3D'z10BC.2-base'/>
-  <cpu type=3D'kvm' name=3D'z990.4-base'/>
-  <cpu type=3D'kvm' name=3D'qemu'/>
-  <cpu type=3D'kvm' name=3D'z10BC-base'/>
-  <cpu type=3D'kvm' name=3D'z9BC-base'/>
-  <cpu type=3D'kvm' name=3D'z800'/>
-  <cpu type=3D'kvm' name=3D'z890.2-base'/>
-  <cpu type=3D'kvm' name=3D'z13.2'/>
-  <cpu type=3D'kvm' name=3D'z114-base'/>
-  <cpu type=3D'kvm' name=3D'z196-base'/>
-  <cpu type=3D'kvm' name=3D'z13-base'/>
-  <cpu type=3D'kvm' name=3D'z890'/>
-  <cpu type=3D'tcg' name=3D'z10EC-base'/>
-  <cpu type=3D'tcg' name=3D'z9EC-base'/>
-  <cpu type=3D'tcg' name=3D'z196.2-base'/>
-  <cpu type=3D'tcg' name=3D'z900-base'/>
-  <cpu type=3D'tcg' name=3D'z990'/>
-  <cpu type=3D'tcg' name=3D'z900.2-base'/>
-  <cpu type=3D'tcg' name=3D'host'/>
-  <cpu type=3D'tcg' name=3D'z900.3'/>
-  <cpu type=3D'tcg' name=3D'z114'/>
-  <cpu type=3D'tcg' name=3D'z890-base'/>
-  <cpu type=3D'tcg' name=3D'z13.2-base'/>
-  <cpu type=3D'tcg' name=3D'zEC12.2'/>
-  <cpu type=3D'tcg' name=3D'z900.2'/>
-  <cpu type=3D'tcg' name=3D'z10BC'/>
-  <cpu type=3D'tcg' name=3D'z10BC.2'/>
-  <cpu type=3D'tcg' name=3D'z196'/>
-  <cpu type=3D'tcg' name=3D'z9EC'/>
-  <cpu type=3D'tcg' name=3D'z990-base'/>
-  <cpu type=3D'tcg' name=3D'z10EC.3'/>
-  <cpu type=3D'tcg' name=3D'z900'/>
-  <cpu type=3D'tcg' name=3D'z9EC.3-base'/>
-  <cpu type=3D'tcg' name=3D'z990.5-base'/>
-  <cpu type=3D'tcg' name=3D'z10EC.2'/>
-  <cpu type=3D'tcg' name=3D'z9BC.2'/>
-  <cpu type=3D'tcg' name=3D'z10EC'/>
-  <cpu type=3D'tcg' name=3D'z990.3-base'/>
-  <cpu type=3D'tcg' name=3D'z13s'/>
-  <cpu type=3D'tcg' name=3D'z10EC.3-base'/>
-  <cpu type=3D'tcg' name=3D'zEC12.2-base'/>
-  <cpu type=3D'tcg' name=3D'z890.3-base'/>
-  <cpu type=3D'tcg' name=3D'z9EC.3'/>
-  <cpu type=3D'tcg' name=3D'z990.5'/>
-  <cpu type=3D'tcg' name=3D'z13'/>
-  <cpu type=3D'tcg' name=3D'z13s-base'/>
-  <cpu type=3D'tcg' name=3D'z9EC.2'/>
-  <cpu type=3D'tcg' name=3D'z990.4'/>
-  <cpu type=3D'tcg' name=3D'zEC12-base'/>
-  <cpu type=3D'tcg' name=3D'z9EC.2-base'/>
-  <cpu type=3D'tcg' name=3D'zBC12'/>
-  <cpu type=3D'tcg' name=3D'z196.2'/>
-  <cpu type=3D'tcg' name=3D'z990.3'/>
-  <cpu type=3D'tcg' name=3D'z990.2-base'/>
-  <cpu type=3D'tcg' name=3D'z900.3-base'/>
-  <cpu type=3D'tcg' name=3D'z890.3'/>
-  <cpu type=3D'tcg' name=3D'z10EC.2-base'/>
-  <cpu type=3D'tcg' name=3D'z990.2'/>
-  <cpu type=3D'tcg' name=3D'z890.2'/>
-  <cpu type=3D'tcg' name=3D'z800-base'/>
-  <cpu type=3D'tcg' name=3D'zBC12-base'/>
-  <cpu type=3D'tcg' name=3D'zEC12'/>
-  <cpu type=3D'tcg' name=3D'z9BC.2-base'/>
-  <cpu type=3D'tcg' name=3D'z9BC'/>
-  <cpu type=3D'tcg' name=3D'z10BC.2-base'/>
-  <cpu type=3D'tcg' name=3D'z990.4-base'/>
-  <cpu type=3D'tcg' name=3D'qemu'/>
-  <cpu type=3D'tcg' name=3D'z10BC-base'/>
-  <cpu type=3D'tcg' name=3D'z9BC-base'/>
-  <cpu type=3D'tcg' name=3D'z800'/>
-  <cpu type=3D'tcg' name=3D'z890.2-base'/>
-  <cpu type=3D'tcg' name=3D'z13.2'/>
-  <cpu type=3D'tcg' name=3D'z114-base'/>
-  <cpu type=3D'tcg' name=3D'z196-base'/>
-  <cpu type=3D'tcg' name=3D'z13-base'/>
-  <cpu type=3D'tcg' name=3D'z890'/>
+  <cpu type=3D'kvm' name=3D'z10EC-base' typename=3D'z10EC-base-s390-cpu'/>
+  <cpu type=3D'kvm' name=3D'z9EC-base' typename=3D'z9EC-base-s390-cpu'/>
+  <cpu type=3D'kvm' name=3D'z196.2-base' typename=3D'z196.2-base-s390-cpu'=
/>
+  <cpu type=3D'kvm' name=3D'z900-base' typename=3D'z900-base-s390-cpu'/>
+  <cpu type=3D'kvm' name=3D'z990' typename=3D'z990-s390-cpu'/>
+  <cpu type=3D'kvm' name=3D'z900.2-base' typename=3D'z900.2-base-s390-cpu'=
/>
+  <cpu type=3D'kvm' name=3D'host' typename=3D'host-s390-cpu'/>
+  <cpu type=3D'kvm' name=3D'z900.3' typename=3D'z900.3-s390-cpu'/>
+  <cpu type=3D'kvm' name=3D'z114' typename=3D'z114-s390-cpu'/>
+  <cpu type=3D'kvm' name=3D'z890-base' typename=3D'z890-base-s390-cpu'/>
+  <cpu type=3D'kvm' name=3D'z13.2-base' typename=3D'z13.2-base-s390-cpu'/>
+  <cpu type=3D'kvm' name=3D'zEC12.2' typename=3D'zEC12.2-s390-cpu'/>
+  <cpu type=3D'kvm' name=3D'z900.2' typename=3D'z900.2-s390-cpu'/>
+  <cpu type=3D'kvm' name=3D'z10BC' typename=3D'z10BC-s390-cpu'/>
+  <cpu type=3D'kvm' name=3D'z10BC.2' typename=3D'z10BC.2-s390-cpu'/>
+  <cpu type=3D'kvm' name=3D'z196' typename=3D'z196-s390-cpu'/>
+  <cpu type=3D'kvm' name=3D'z9EC' typename=3D'z9EC-s390-cpu'/>
+  <cpu type=3D'kvm' name=3D'z990-base' typename=3D'z990-base-s390-cpu'/>
+  <cpu type=3D'kvm' name=3D'z10EC.3' typename=3D'z10EC.3-s390-cpu'/>
+  <cpu type=3D'kvm' name=3D'z900' typename=3D'z900-s390-cpu'/>
+  <cpu type=3D'kvm' name=3D'z9EC.3-base' typename=3D'z9EC.3-base-s390-cpu'=
/>
+  <cpu type=3D'kvm' name=3D'z990.5-base' typename=3D'z990.5-base-s390-cpu'=
/>
+  <cpu type=3D'kvm' name=3D'z10EC.2' typename=3D'z10EC.2-s390-cpu'/>
+  <cpu type=3D'kvm' name=3D'z9BC.2' typename=3D'z9BC.2-s390-cpu'/>
+  <cpu type=3D'kvm' name=3D'z10EC' typename=3D'z10EC-s390-cpu'/>
+  <cpu type=3D'kvm' name=3D'z990.3-base' typename=3D'z990.3-base-s390-cpu'=
/>
+  <cpu type=3D'kvm' name=3D'z13s' typename=3D'z13s-s390-cpu'/>
+  <cpu type=3D'kvm' name=3D'z10EC.3-base' typename=3D'z10EC.3-base-s390-cp=
u'/>
+  <cpu type=3D'kvm' name=3D'zEC12.2-base' typename=3D'zEC12.2-base-s390-cp=
u'/>
+  <cpu type=3D'kvm' name=3D'z890.3-base' typename=3D'z890.3-base-s390-cpu'=
/>
+  <cpu type=3D'kvm' name=3D'z9EC.3' typename=3D'z9EC.3-s390-cpu'/>
+  <cpu type=3D'kvm' name=3D'z990.5' typename=3D'z990.5-s390-cpu'/>
+  <cpu type=3D'kvm' name=3D'z13' typename=3D'z13-s390-cpu'/>
+  <cpu type=3D'kvm' name=3D'z13s-base' typename=3D'z13s-base-s390-cpu'/>
+  <cpu type=3D'kvm' name=3D'z9EC.2' typename=3D'z9EC.2-s390-cpu'/>
+  <cpu type=3D'kvm' name=3D'z990.4' typename=3D'z990.4-s390-cpu'/>
+  <cpu type=3D'kvm' name=3D'zEC12-base' typename=3D'zEC12-base-s390-cpu'/>
+  <cpu type=3D'kvm' name=3D'z9EC.2-base' typename=3D'z9EC.2-base-s390-cpu'=
/>
+  <cpu type=3D'kvm' name=3D'zBC12' typename=3D'zBC12-s390-cpu'/>
+  <cpu type=3D'kvm' name=3D'z196.2' typename=3D'z196.2-s390-cpu'/>
+  <cpu type=3D'kvm' name=3D'z990.3' typename=3D'z990.3-s390-cpu'/>
+  <cpu type=3D'kvm' name=3D'z990.2-base' typename=3D'z990.2-base-s390-cpu'=
/>
+  <cpu type=3D'kvm' name=3D'z900.3-base' typename=3D'z900.3-base-s390-cpu'=
/>
+  <cpu type=3D'kvm' name=3D'z890.3' typename=3D'z890.3-s390-cpu'/>
+  <cpu type=3D'kvm' name=3D'z10EC.2-base' typename=3D'z10EC.2-base-s390-cp=
u'/>
+  <cpu type=3D'kvm' name=3D'z990.2' typename=3D'z990.2-s390-cpu'/>
+  <cpu type=3D'kvm' name=3D'z890.2' typename=3D'z890.2-s390-cpu'/>
+  <cpu type=3D'kvm' name=3D'z800-base' typename=3D'z800-base-s390-cpu'/>
+  <cpu type=3D'kvm' name=3D'zBC12-base' typename=3D'zBC12-base-s390-cpu'/>
+  <cpu type=3D'kvm' name=3D'zEC12' typename=3D'zEC12-s390-cpu'/>
+  <cpu type=3D'kvm' name=3D'z9BC.2-base' typename=3D'z9BC.2-base-s390-cpu'=
/>
+  <cpu type=3D'kvm' name=3D'z9BC' typename=3D'z9BC-s390-cpu'/>
+  <cpu type=3D'kvm' name=3D'z10BC.2-base' typename=3D'z10BC.2-base-s390-cp=
u'/>
+  <cpu type=3D'kvm' name=3D'z990.4-base' typename=3D'z990.4-base-s390-cpu'=
/>
+  <cpu type=3D'kvm' name=3D'qemu' typename=3D'qemu-s390-cpu'/>
+  <cpu type=3D'kvm' name=3D'z10BC-base' typename=3D'z10BC-base-s390-cpu'/>
+  <cpu type=3D'kvm' name=3D'z9BC-base' typename=3D'z9BC-base-s390-cpu'/>
+  <cpu type=3D'kvm' name=3D'z800' typename=3D'z800-s390-cpu'/>
+  <cpu type=3D'kvm' name=3D'z890.2-base' typename=3D'z890.2-base-s390-cpu'=
/>
+  <cpu type=3D'kvm' name=3D'z13.2' typename=3D'z13.2-s390-cpu'/>
+  <cpu type=3D'kvm' name=3D'z114-base' typename=3D'z114-base-s390-cpu'/>
+  <cpu type=3D'kvm' name=3D'z196-base' typename=3D'z196-base-s390-cpu'/>
+  <cpu type=3D'kvm' name=3D'z13-base' typename=3D'z13-base-s390-cpu'/>
+  <cpu type=3D'kvm' name=3D'z890' typename=3D'z890-s390-cpu'/>
+  <cpu type=3D'tcg' name=3D'z10EC-base' typename=3D'z10EC-base-s390-cpu'/>
+  <cpu type=3D'tcg' name=3D'z9EC-base' typename=3D'z9EC-base-s390-cpu'/>
+  <cpu type=3D'tcg' name=3D'z196.2-base' typename=3D'z196.2-base-s390-cpu'=
/>
+  <cpu type=3D'tcg' name=3D'z900-base' typename=3D'z900-base-s390-cpu'/>
+  <cpu type=3D'tcg' name=3D'z990' typename=3D'z990-s390-cpu'/>
+  <cpu type=3D'tcg' name=3D'z900.2-base' typename=3D'z900.2-base-s390-cpu'=
/>
+  <cpu type=3D'tcg' name=3D'host' typename=3D'host-s390-cpu'/>
+  <cpu type=3D'tcg' name=3D'z900.3' typename=3D'z900.3-s390-cpu'/>
+  <cpu type=3D'tcg' name=3D'z114' typename=3D'z114-s390-cpu'/>
+  <cpu type=3D'tcg' name=3D'z890-base' typename=3D'z890-base-s390-cpu'/>
+  <cpu type=3D'tcg' name=3D'z13.2-base' typename=3D'z13.2-base-s390-cpu'/>
+  <cpu type=3D'tcg' name=3D'zEC12.2' typename=3D'zEC12.2-s390-cpu'/>
+  <cpu type=3D'tcg' name=3D'z900.2' typename=3D'z900.2-s390-cpu'/>
+  <cpu type=3D'tcg' name=3D'z10BC' typename=3D'z10BC-s390-cpu'/>
+  <cpu type=3D'tcg' name=3D'z10BC.2' typename=3D'z10BC.2-s390-cpu'/>
+  <cpu type=3D'tcg' name=3D'z196' typename=3D'z196-s390-cpu'/>
+  <cpu type=3D'tcg' name=3D'z9EC' typename=3D'z9EC-s390-cpu'/>
+  <cpu type=3D'tcg' name=3D'z990-base' typename=3D'z990-base-s390-cpu'/>
+  <cpu type=3D'tcg' name=3D'z10EC.3' typename=3D'z10EC.3-s390-cpu'/>
+  <cpu type=3D'tcg' name=3D'z900' typename=3D'z900-s390-cpu'/>
+  <cpu type=3D'tcg' name=3D'z9EC.3-base' typename=3D'z9EC.3-base-s390-cpu'=
/>
+  <cpu type=3D'tcg' name=3D'z990.5-base' typename=3D'z990.5-base-s390-cpu'=
/>
+  <cpu type=3D'tcg' name=3D'z10EC.2' typename=3D'z10EC.2-s390-cpu'/>
+  <cpu type=3D'tcg' name=3D'z9BC.2' typename=3D'z9BC.2-s390-cpu'/>
+  <cpu type=3D'tcg' name=3D'z10EC' typename=3D'z10EC-s390-cpu'/>
+  <cpu type=3D'tcg' name=3D'z990.3-base' typename=3D'z990.3-base-s390-cpu'=
/>
+  <cpu type=3D'tcg' name=3D'z13s' typename=3D'z13s-s390-cpu'/>
+  <cpu type=3D'tcg' name=3D'z10EC.3-base' typename=3D'z10EC.3-base-s390-cp=
u'/>
+  <cpu type=3D'tcg' name=3D'zEC12.2-base' typename=3D'zEC12.2-base-s390-cp=
u'/>
+  <cpu type=3D'tcg' name=3D'z890.3-base' typename=3D'z890.3-base-s390-cpu'=
/>
+  <cpu type=3D'tcg' name=3D'z9EC.3' typename=3D'z9EC.3-s390-cpu'/>
+  <cpu type=3D'tcg' name=3D'z990.5' typename=3D'z990.5-s390-cpu'/>
+  <cpu type=3D'tcg' name=3D'z13' typename=3D'z13-s390-cpu'/>
+  <cpu type=3D'tcg' name=3D'z13s-base' typename=3D'z13s-base-s390-cpu'/>
+  <cpu type=3D'tcg' name=3D'z9EC.2' typename=3D'z9EC.2-s390-cpu'/>
+  <cpu type=3D'tcg' name=3D'z990.4' typename=3D'z990.4-s390-cpu'/>
+  <cpu type=3D'tcg' name=3D'zEC12-base' typename=3D'zEC12-base-s390-cpu'/>
+  <cpu type=3D'tcg' name=3D'z9EC.2-base' typename=3D'z9EC.2-base-s390-cpu'=
/>
+  <cpu type=3D'tcg' name=3D'zBC12' typename=3D'zBC12-s390-cpu'/>
+  <cpu type=3D'tcg' name=3D'z196.2' typename=3D'z196.2-s390-cpu'/>
+  <cpu type=3D'tcg' name=3D'z990.3' typename=3D'z990.3-s390-cpu'/>
+  <cpu type=3D'tcg' name=3D'z990.2-base' typename=3D'z990.2-base-s390-cpu'=
/>
+  <cpu type=3D'tcg' name=3D'z900.3-base' typename=3D'z900.3-base-s390-cpu'=
/>
+  <cpu type=3D'tcg' name=3D'z890.3' typename=3D'z890.3-s390-cpu'/>
+  <cpu type=3D'tcg' name=3D'z10EC.2-base' typename=3D'z10EC.2-base-s390-cp=
u'/>
+  <cpu type=3D'tcg' name=3D'z990.2' typename=3D'z990.2-s390-cpu'/>
+  <cpu type=3D'tcg' name=3D'z890.2' typename=3D'z890.2-s390-cpu'/>
+  <cpu type=3D'tcg' name=3D'z800-base' typename=3D'z800-base-s390-cpu'/>
+  <cpu type=3D'tcg' name=3D'zBC12-base' typename=3D'zBC12-base-s390-cpu'/>
+  <cpu type=3D'tcg' name=3D'zEC12' typename=3D'zEC12-s390-cpu'/>
+  <cpu type=3D'tcg' name=3D'z9BC.2-base' typename=3D'z9BC.2-base-s390-cpu'=
/>
+  <cpu type=3D'tcg' name=3D'z9BC' typename=3D'z9BC-s390-cpu'/>
+  <cpu type=3D'tcg' name=3D'z10BC.2-base' typename=3D'z10BC.2-base-s390-cp=
u'/>
+  <cpu type=3D'tcg' name=3D'z990.4-base' typename=3D'z990.4-base-s390-cpu'=
/>
+  <cpu type=3D'tcg' name=3D'qemu' typename=3D'qemu-s390-cpu'/>
+  <cpu type=3D'tcg' name=3D'z10BC-base' typename=3D'z10BC-base-s390-cpu'/>
+  <cpu type=3D'tcg' name=3D'z9BC-base' typename=3D'z9BC-base-s390-cpu'/>
+  <cpu type=3D'tcg' name=3D'z800' typename=3D'z800-s390-cpu'/>
+  <cpu type=3D'tcg' name=3D'z890.2-base' typename=3D'z890.2-base-s390-cpu'=
/>
+  <cpu type=3D'tcg' name=3D'z13.2' typename=3D'z13.2-s390-cpu'/>
+  <cpu type=3D'tcg' name=3D'z114-base' typename=3D'z114-base-s390-cpu'/>
+  <cpu type=3D'tcg' name=3D'z196-base' typename=3D'z196-base-s390-cpu'/>
+  <cpu type=3D'tcg' name=3D'z13-base' typename=3D'z13-base-s390-cpu'/>
+  <cpu type=3D'tcg' name=3D'z890' typename=3D'z890-s390-cpu'/>
   <machine name=3D's390-ccw-virtio-2.9' alias=3D's390-ccw-virtio' maxCpus=
=3D'248' default=3D'yes'/>
   <machine name=3D's390-ccw-virtio-2.7' maxCpus=3D'248'/>
   <machine name=3D's390-ccw-virtio-2.6' maxCpus=3D'248'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemuc=
apabilitiesdata/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=3D'avx512pf' type=3D'boolean' value=3D'false'/>
     <property name=3D'xstore-en' type=3D'boolean' value=3D'false'/>
   </hostCPU>
-  <cpu type=3D'kvm' name=3D'max' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'host' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'qemu64' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'qemu32' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'phenom' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'max' typename=3D'max-x86_64-cpu' usable=3D'yes=
'/>
+  <cpu type=3D'kvm' name=3D'host' typename=3D'host-x86_64-cpu' usable=3D'y=
es'/>
+  <cpu type=3D'kvm' name=3D'base' typename=3D'base-x86_64-cpu' usable=3D'y=
es'/>
+  <cpu type=3D'kvm' name=3D'qemu64' typename=3D'qemu64-x86_64-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'qemu32' typename=3D'qemu32-x86_64-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'phenom' typename=3D'phenom-x86_64-cpu' usable=
=3D'no'>
     <blocker name=3D'mmxext'/>
     <blocker name=3D'fxsr-opt'/>
     <blocker name=3D'3dnowext'/>
@@ -657,72 +657,72 @@
     <blocker name=3D'sse4a'/>
     <blocker name=3D'npt'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'pentium3' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'pentium2' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'pentium' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'n270' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'kvm64' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'kvm32' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'coreduo' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'core2duo' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'athlon' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'pentium3' typename=3D'pentium3-x86_64-cpu' usa=
ble=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'pentium2' typename=3D'pentium2-x86_64-cpu' usa=
ble=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'pentium' typename=3D'pentium-x86_64-cpu' usabl=
e=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'n270' typename=3D'n270-x86_64-cpu' usable=3D'y=
es'/>
+  <cpu type=3D'kvm' name=3D'kvm64' typename=3D'kvm64-x86_64-cpu' usable=3D=
'yes'/>
+  <cpu type=3D'kvm' name=3D'kvm32' typename=3D'kvm32-x86_64-cpu' usable=3D=
'yes'/>
+  <cpu type=3D'kvm' name=3D'coreduo' typename=3D'coreduo-x86_64-cpu' usabl=
e=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'core2duo' typename=3D'core2duo-x86_64-cpu' usa=
ble=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'athlon' typename=3D'athlon-x86_64-cpu' usable=
=3D'no'>
     <blocker name=3D'mmxext'/>
     <blocker name=3D'3dnowext'/>
     <blocker name=3D'3dnow'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Westmere' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Skylake-Client' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'SandyBridge' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Penryn' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Opteron_G5' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Westmere' typename=3D'Westmere-x86_64-cpu' usa=
ble=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Skylake-Client' typename=3D'Skylake-Client-x86=
_64-cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'SandyBridge' typename=3D'SandyBridge-x86_64-cp=
u' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Penryn' typename=3D'Penryn-x86_64-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Opteron_G5' typename=3D'Opteron_G5-x86_64-cpu'=
 usable=3D'no'>
     <blocker name=3D'sse4a'/>
     <blocker name=3D'misalignsse'/>
     <blocker name=3D'xop'/>
     <blocker name=3D'fma4'/>
     <blocker name=3D'tbm'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Opteron_G4' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Opteron_G4' typename=3D'Opteron_G4-x86_64-cpu'=
 usable=3D'no'>
     <blocker name=3D'sse4a'/>
     <blocker name=3D'misalignsse'/>
     <blocker name=3D'xop'/>
     <blocker name=3D'fma4'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Opteron_G3' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Opteron_G3' typename=3D'Opteron_G3-x86_64-cpu'=
 usable=3D'no'>
     <blocker name=3D'sse4a'/>
     <blocker name=3D'misalignsse'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Opteron_G2' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Opteron_G1' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Nehalem' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'IvyBridge' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Haswell' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Haswell-noTSX' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Conroe' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Broadwell' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Broadwell-noTSX' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'486' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'max' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'host' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Opteron_G2' typename=3D'Opteron_G2-x86_64-cpu'=
 usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Opteron_G1' typename=3D'Opteron_G1-x86_64-cpu'=
 usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Nehalem' typename=3D'Nehalem-x86_64-cpu' usabl=
e=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'IvyBridge' typename=3D'IvyBridge-x86_64-cpu' u=
sable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Haswell' typename=3D'Haswell-x86_64-cpu' usabl=
e=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Haswell-noTSX' typename=3D'Haswell-noTSX-x86_6=
4-cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Conroe' typename=3D'Conroe-x86_64-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Broadwell' typename=3D'Broadwell-x86_64-cpu' u=
sable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Broadwell-noTSX' typename=3D'Broadwell-noTSX-x=
86_64-cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'486' typename=3D'486-x86_64-cpu' usable=3D'yes=
'/>
+  <cpu type=3D'tcg' name=3D'max' typename=3D'max-x86_64-cpu' usable=3D'yes=
'/>
+  <cpu type=3D'tcg' name=3D'host' typename=3D'host-x86_64-cpu' usable=3D'n=
o'>
     <blocker name=3D'kvm'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'base' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'qemu64' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'qemu32' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'phenom' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'base' typename=3D'base-x86_64-cpu' usable=3D'y=
es'/>
+  <cpu type=3D'tcg' name=3D'qemu64' typename=3D'qemu64-x86_64-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'qemu32' typename=3D'qemu32-x86_64-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'phenom' typename=3D'phenom-x86_64-cpu' usable=
=3D'no'>
     <blocker name=3D'fxsr-opt'/>
     <blocker name=3D'npt'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'pentium3' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'pentium2' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'pentium' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'n270' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'kvm64' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'kvm32' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'coreduo' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'core2duo' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'athlon' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'Westmere' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'Skylake-Client' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'pentium3' typename=3D'pentium3-x86_64-cpu' usa=
ble=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'pentium2' typename=3D'pentium2-x86_64-cpu' usa=
ble=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'pentium' typename=3D'pentium-x86_64-cpu' usabl=
e=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'n270' typename=3D'n270-x86_64-cpu' usable=3D'y=
es'/>
+  <cpu type=3D'tcg' name=3D'kvm64' typename=3D'kvm64-x86_64-cpu' usable=3D=
'yes'/>
+  <cpu type=3D'tcg' name=3D'kvm32' typename=3D'kvm32-x86_64-cpu' usable=3D=
'yes'/>
+  <cpu type=3D'tcg' name=3D'coreduo' typename=3D'coreduo-x86_64-cpu' usabl=
e=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'core2duo' typename=3D'core2duo-x86_64-cpu' usa=
ble=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'athlon' typename=3D'athlon-x86_64-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'Westmere' typename=3D'Westmere-x86_64-cpu' usa=
ble=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'Skylake-Client' typename=3D'Skylake-Client-x86=
_64-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -738,13 +738,13 @@
     <blocker name=3D'3dnowprefetch'/>
     <blocker name=3D'xsavec'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'SandyBridge' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'SandyBridge' typename=3D'SandyBridge-x86_64-cp=
u' usable=3D'no'>
     <blocker name=3D'x2apic'/>
     <blocker name=3D'tsc-deadline'/>
     <blocker name=3D'avx'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Penryn' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'Opteron_G5' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Penryn' typename=3D'Penryn-x86_64-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'Opteron_G5' typename=3D'Opteron_G5-x86_64-cpu'=
 usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'avx'/>
     <blocker name=3D'f16c'/>
@@ -754,27 +754,27 @@
     <blocker name=3D'fma4'/>
     <blocker name=3D'tbm'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Opteron_G4' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Opteron_G4' typename=3D'Opteron_G4-x86_64-cpu'=
 usable=3D'no'>
     <blocker name=3D'avx'/>
     <blocker name=3D'misalignsse'/>
     <blocker name=3D'3dnowprefetch'/>
     <blocker name=3D'xop'/>
     <blocker name=3D'fma4'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Opteron_G3' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Opteron_G3' typename=3D'Opteron_G3-x86_64-cpu'=
 usable=3D'no'>
     <blocker name=3D'misalignsse'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Opteron_G2' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'Opteron_G1' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'Nehalem' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'IvyBridge' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Opteron_G2' typename=3D'Opteron_G2-x86_64-cpu'=
 usable=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'Opteron_G1' typename=3D'Opteron_G1-x86_64-cpu'=
 usable=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'Nehalem' typename=3D'Nehalem-x86_64-cpu' usabl=
e=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'IvyBridge' typename=3D'IvyBridge-x86_64-cpu' u=
sable=3D'no'>
     <blocker name=3D'x2apic'/>
     <blocker name=3D'tsc-deadline'/>
     <blocker name=3D'avx'/>
     <blocker name=3D'f16c'/>
     <blocker name=3D'rdrand'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Haswell' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Haswell' typename=3D'Haswell-x86_64-cpu' usabl=
e=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -787,7 +787,7 @@
     <blocker name=3D'invpcid'/>
     <blocker name=3D'rtm'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Haswell-noTSX' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Haswell-noTSX' typename=3D'Haswell-noTSX-x86_6=
4-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -798,8 +798,8 @@
     <blocker name=3D'avx2'/>
     <blocker name=3D'invpcid'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Conroe' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'Broadwell' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Conroe' typename=3D'Conroe-x86_64-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'Broadwell' typename=3D'Broadwell-x86_64-cpu' u=
sable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -814,7 +814,7 @@
     <blocker name=3D'rdseed'/>
     <blocker name=3D'3dnowprefetch'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Broadwell-noTSX' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Broadwell-noTSX' typename=3D'Broadwell-noTSX-x=
86_64-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -827,7 +827,7 @@
     <blocker name=3D'rdseed'/>
     <blocker name=3D'3dnowprefetch'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'486' usable=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'486' typename=3D'486-x86_64-cpu' usable=3D'yes=
'/>
   <machine name=3D'pc-i440fx-2.9' alias=3D'pc' hotplugCpus=3D'yes' maxCpus=
=3D'255' default=3D'yes'/>
   <machine name=3D'pc-0.12' hotplugCpus=3D'yes' maxCpus=3D'255'/>
   <machine name=3D'pc-i440fx-2.4' hotplugCpus=3D'yes' maxCpus=3D'255'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml b/tests/qemuca=
pabilitiesdata/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=3D'kvm' name=3D'default'/>
-  <cpu type=3D'kvm' name=3D'ppc'/>
-  <cpu type=3D'kvm' name=3D'ppc32'/>
-  <cpu type=3D'kvm' name=3D'ppc64'/>
-  <cpu type=3D'kvm' name=3D'970mp'/>
-  <cpu type=3D'kvm' name=3D'970fx'/>
-  <cpu type=3D'kvm' name=3D'970'/>
-  <cpu type=3D'kvm' name=3D'power9'/>
-  <cpu type=3D'kvm' name=3D'power8nvl'/>
-  <cpu type=3D'kvm' name=3D'power8'/>
-  <cpu type=3D'kvm' name=3D'power8e'/>
-  <cpu type=3D'kvm' name=3D'power7+'/>
-  <cpu type=3D'kvm' name=3D'power7'/>
-  <cpu type=3D'kvm' name=3D'power5gs'/>
-  <cpu type=3D'kvm' name=3D'power5+'/>
-  <cpu type=3D'kvm' name=3D'apollo7pm'/>
-  <cpu type=3D'kvm' name=3D'7457a'/>
-  <cpu type=3D'kvm' name=3D'7447a'/>
-  <cpu type=3D'kvm' name=3D'apollo7'/>
-  <cpu type=3D'kvm' name=3D'7457'/>
-  <cpu type=3D'kvm' name=3D'7447'/>
-  <cpu type=3D'kvm' name=3D'apollo6'/>
-  <cpu type=3D'kvm' name=3D'7455'/>
-  <cpu type=3D'kvm' name=3D'7445'/>
-  <cpu type=3D'kvm' name=3D'7451'/>
-  <cpu type=3D'kvm' name=3D'7441'/>
-  <cpu type=3D'kvm' name=3D'vger'/>
-  <cpu type=3D'kvm' name=3D'7450'/>
-  <cpu type=3D'kvm' name=3D'7448'/>
-  <cpu type=3D'kvm' name=3D'nitro'/>
-  <cpu type=3D'kvm' name=3D'7410'/>
-  <cpu type=3D'kvm' name=3D'g4'/>
-  <cpu type=3D'kvm' name=3D'max'/>
-  <cpu type=3D'kvm' name=3D'7400'/>
-  <cpu type=3D'kvm' name=3D'goldfinger'/>
-  <cpu type=3D'kvm' name=3D'755'/>
-  <cpu type=3D'kvm' name=3D'745'/>
-  <cpu type=3D'kvm' name=3D'lonestar'/>
-  <cpu type=3D'kvm' name=3D'750l'/>
-  <cpu type=3D'kvm' name=3D'750gx'/>
-  <cpu type=3D'kvm' name=3D'750fx'/>
-  <cpu type=3D'kvm' name=3D'750cxe'/>
-  <cpu type=3D'kvm' name=3D'750cx'/>
-  <cpu type=3D'kvm' name=3D'750cl'/>
-  <cpu type=3D'kvm' name=3D'conan/doyle'/>
-  <cpu type=3D'kvm' name=3D'g3'/>
-  <cpu type=3D'kvm' name=3D'typhoon'/>
-  <cpu type=3D'kvm' name=3D'750'/>
-  <cpu type=3D'kvm' name=3D'arthur'/>
-  <cpu type=3D'kvm' name=3D'740'/>
-  <cpu type=3D'kvm' name=3D'mach5'/>
-  <cpu type=3D'kvm' name=3D'sirocco'/>
-  <cpu type=3D'kvm' name=3D'604e'/>
-  <cpu type=3D'kvm' name=3D'goldeneye'/>
-  <cpu type=3D'kvm' name=3D'603r'/>
-  <cpu type=3D'kvm' name=3D'vaillant'/>
-  <cpu type=3D'kvm' name=3D'stretch'/>
-  <cpu type=3D'kvm' name=3D'603e'/>
-  <cpu type=3D'kvm' name=3D'vanilla'/>
-  <cpu type=3D'kvm' name=3D'601v'/>
-  <cpu type=3D'kvm' name=3D'601'/>
-  <cpu type=3D'kvm' name=3D'mpc8560'/>
-  <cpu type=3D'kvm' name=3D'mpc8555e'/>
-  <cpu type=3D'kvm' name=3D'mpc8555'/>
-  <cpu type=3D'kvm' name=3D'mpc8548e'/>
-  <cpu type=3D'kvm' name=3D'mpc8548'/>
-  <cpu type=3D'kvm' name=3D'mpc8547e'/>
-  <cpu type=3D'kvm' name=3D'mpc8545e'/>
-  <cpu type=3D'kvm' name=3D'mpc8545'/>
-  <cpu type=3D'kvm' name=3D'mpc8544e'/>
-  <cpu type=3D'kvm' name=3D'mpc8544'/>
-  <cpu type=3D'kvm' name=3D'mpc8543e'/>
-  <cpu type=3D'kvm' name=3D'mpc8543'/>
-  <cpu type=3D'kvm' name=3D'mpc8541e'/>
-  <cpu type=3D'kvm' name=3D'mpc8541'/>
-  <cpu type=3D'kvm' name=3D'mpc8540'/>
-  <cpu type=3D'kvm' name=3D'mpc8533e'/>
-  <cpu type=3D'kvm' name=3D'mpc8533'/>
-  <cpu type=3D'kvm' name=3D'e500v2'/>
-  <cpu type=3D'kvm' name=3D'e500v1'/>
-  <cpu type=3D'kvm' name=3D'e500'/>
-  <cpu type=3D'kvm' name=3D'mpc8347ea'/>
-  <cpu type=3D'kvm' name=3D'mpc8347e'/>
-  <cpu type=3D'kvm' name=3D'mpc8347a'/>
-  <cpu type=3D'kvm' name=3D'mpc8347'/>
-  <cpu type=3D'kvm' name=3D'e300'/>
-  <cpu type=3D'kvm' name=3D'e200'/>
-  <cpu type=3D'kvm' name=3D'mpc8280'/>
-  <cpu type=3D'kvm' name=3D'mpc8275'/>
-  <cpu type=3D'kvm' name=3D'mpc8272'/>
-  <cpu type=3D'kvm' name=3D'mpc8271'/>
-  <cpu type=3D'kvm' name=3D'mpc8270'/>
-  <cpu type=3D'kvm' name=3D'mpc8266_hip4'/>
-  <cpu type=3D'kvm' name=3D'mpc8266_hip3'/>
-  <cpu type=3D'kvm' name=3D'mpc8266'/>
-  <cpu type=3D'kvm' name=3D'mpc8265_hip4'/>
-  <cpu type=3D'kvm' name=3D'mpc8265_hip3'/>
-  <cpu type=3D'kvm' name=3D'mpc8265'/>
-  <cpu type=3D'kvm' name=3D'mpc8264_hip4'/>
-  <cpu type=3D'kvm' name=3D'mpc8264_hip3'/>
-  <cpu type=3D'kvm' name=3D'mpc8264'/>
-  <cpu type=3D'kvm' name=3D'mpc8260_hip4'/>
-  <cpu type=3D'kvm' name=3D'mpc8260_hip3'/>
-  <cpu type=3D'kvm' name=3D'mpc8260'/>
-  <cpu type=3D'kvm' name=3D'mpc8255_hip4'/>
-  <cpu type=3D'kvm' name=3D'mpc8255_hip3'/>
-  <cpu type=3D'kvm' name=3D'mpc8255'/>
-  <cpu type=3D'kvm' name=3D'mpc8250_hip4'/>
-  <cpu type=3D'kvm' name=3D'mpc8250_hip3'/>
-  <cpu type=3D'kvm' name=3D'mpc8250'/>
-  <cpu type=3D'kvm' name=3D'mpc8248'/>
-  <cpu type=3D'kvm' name=3D'mpc8247'/>
-  <cpu type=3D'kvm' name=3D'mpc8245'/>
-  <cpu type=3D'kvm' name=3D'mpc8241'/>
-  <cpu type=3D'kvm' name=3D'powerquicc-ii'/>
-  <cpu type=3D'kvm' name=3D'mpc82xx'/>
-  <cpu type=3D'kvm' name=3D'mpc5200b'/>
-  <cpu type=3D'kvm' name=3D'mpc5200'/>
-  <cpu type=3D'kvm' name=3D'mpc52xx'/>
-  <cpu type=3D'kvm' name=3D'mpc8240'/>
-  <cpu type=3D'kvm' name=3D'460ex'/>
-  <cpu type=3D'kvm' name=3D'440ep'/>
-  <cpu type=3D'kvm' name=3D'x2vp50'/>
-  <cpu type=3D'kvm' name=3D'x2vp7'/>
-  <cpu type=3D'kvm' name=3D'405gpe'/>
-  <cpu type=3D'kvm' name=3D'405gp'/>
-  <cpu type=3D'kvm' name=3D'405cr'/>
-  <cpu type=3D'kvm' name=3D'405'/>
-  <cpu type=3D'kvm' name=3D'403'/>
-  <cpu type=3D'kvm' name=3D'mpc8547e_v21'/>
-  <cpu type=3D'kvm' name=3D'750cl_v1.0'/>
-  <cpu type=3D'kvm' name=3D'7457a_v1.1'/>
-  <cpu type=3D'kvm' name=3D'g2gp'/>
-  <cpu type=3D'kvm' name=3D'750cxe_v2.1'/>
-  <cpu type=3D'kvm' name=3D'755_v2.7'/>
-  <cpu type=3D'kvm' name=3D'750_v2.1'/>
-  <cpu type=3D'kvm' name=3D'755_v2.2'/>
-  <cpu type=3D'kvm' name=3D'745_v2.0'/>
-  <cpu type=3D'kvm' name=3D'mpc8377'/>
-  <cpu type=3D'kvm' name=3D'7455_v1.0'/>
-  <cpu type=3D'kvm' name=3D'mpc8545_v21'/>
-  <cpu type=3D'kvm' name=3D'mpc8548_v11'/>
-  <cpu type=3D'kvm' name=3D'405d4'/>
-  <cpu type=3D'kvm' name=3D'g2le'/>
-  <cpu type=3D'kvm' name=3D'g2hip3'/>
-  <cpu type=3D'kvm' name=3D'750e'/>
-  <cpu type=3D'kvm' name=3D'mpc8572'/>
-  <cpu type=3D'kvm' name=3D'970fx_v2.0'/>
-  <cpu type=3D'kvm' name=3D'750fx_v2.0'/>
-  <cpu type=3D'kvm' name=3D'603p'/>
-  <cpu type=3D'kvm' name=3D'405gpb'/>
-  <cpu type=3D'kvm' name=3D'7400_v2.7'/>
-  <cpu type=3D'kvm' name=3D'mpc8544e_v10'/>
-  <cpu type=3D'kvm' name=3D'e500v2_v10'/>
-  <cpu type=3D'kvm' name=3D'e500mc'/>
-  <cpu type=3D'kvm' name=3D'603e7v1'/>
-  <cpu type=3D'kvm' name=3D'970mp_v1.0'/>
-  <cpu type=3D'kvm' name=3D'740e'/>
-  <cpu type=3D'kvm' name=3D'405crc'/>
-  <cpu type=3D'kvm' name=3D'403ga'/>
-  <cpu type=3D'kvm' name=3D'7447a_v1.0'/>
-  <cpu type=3D'kvm' name=3D'7400_v2.2'/>
-  <cpu type=3D'kvm' name=3D'e300c1'/>
-  <cpu type=3D'kvm' name=3D'mpc8572e'/>
-  <cpu type=3D'kvm' name=3D'e500v2_v21'/>
-  <cpu type=3D'kvm' name=3D'970fx_v1.0'/>
-  <cpu type=3D'kvm' name=3D'750gx_v1.2'/>
-  <cpu type=3D'kvm' name=3D'750fx_v1.0'/>
-  <cpu type=3D'kvm' name=3D'7457_v1.1'/>
-  <cpu type=3D'kvm' name=3D'970fx_v3.0'/>
-  <cpu type=3D'kvm' name=3D'604e_v2.2'/>
-  <cpu type=3D'kvm' name=3D'755_v2.6'/>
-  <cpu type=3D'kvm' name=3D'401a1'/>
-  <cpu type=3D'kvm' name=3D'power9_v1.0'/>
-  <cpu type=3D'kvm' name=3D'npe405h'/>
-  <cpu type=3D'kvm' name=3D'7410_v1.4'/>
-  <cpu type=3D'kvm' name=3D'g2ls'/>
-  <cpu type=3D'kvm' name=3D'750_v2.0'/>
-  <cpu type=3D'kvm' name=3D'401b2'/>
-  <cpu type=3D'kvm' name=3D'mpc8349'/>
-  <cpu type=3D'kvm' name=3D'mpc8347ep'/>
-  <cpu type=3D'kvm' name=3D'7445_v3.2'/>
-  <cpu type=3D'kvm' name=3D'mpc8540_v21'/>
-  <cpu type=3D'kvm' name=3D'mpc8543_v11'/>
-  <cpu type=3D'kvm' name=3D'403gcx'/>
-  <cpu type=3D'kvm' name=3D'745_v2.4'/>
-  <cpu type=3D'kvm' name=3D'mpc8548_v21'/>
-  <cpu type=3D'kvm' name=3D'750l_v3.2'/>
-  <cpu type=3D'kvm' name=3D'750_v1.0'/>
-  <cpu type=3D'kvm' name=3D'755_v1.1'/>
-  <cpu type=3D'kvm' name=3D'e500_v10'/>
-  <cpu type=3D'kvm' name=3D'750cxe_v3.0'/>
-  <cpu type=3D'kvm' name=3D'mpc8541e_v10'/>
-  <cpu type=3D'kvm' name=3D'mpc8347p'/>
-  <cpu type=3D'kvm' name=3D'mpc8555e_v10'/>
-  <cpu type=3D'kvm' name=3D'power9_v2.0'/>
-  <cpu type=3D'kvm' name=3D'power7_v2.3'/>
-  <cpu type=3D'kvm' name=3D'603e7v'/>
-  <cpu type=3D'kvm' name=3D'mpc8543e_v11'/>
-  <cpu type=3D'kvm' name=3D'750_v3.0'/>
-  <cpu type=3D'kvm' name=3D'7400_v2.6'/>
-  <cpu type=3D'kvm' name=3D'405gpa'/>
-  <cpu type=3D'kvm' name=3D'440epx'/>
-  <cpu type=3D'kvm' name=3D'750l_v2.2'/>
-  <cpu type=3D'kvm' name=3D'e200z6'/>
-  <cpu type=3D'kvm' name=3D'mpc8547e_v20'/>
-  <cpu type=3D'kvm' name=3D'7457a_v1.0'/>
-  <cpu type=3D'kvm' name=3D'mpc8349ea'/>
-  <cpu type=3D'kvm' name=3D'e500v2_v20'/>
-  <cpu type=3D'kvm' name=3D'power8nvl_v1.0'/>
-  <cpu type=3D'kvm' name=3D'mpc8540_v10'/>
-  <cpu type=3D'kvm' name=3D'755_v2.1'/>
-  <cpu type=3D'kvm' name=3D'745_v2.8'/>
-  <cpu type=3D'kvm' name=3D'npe405l'/>
-  <cpu type=3D'kvm' name=3D'mpc8343ea'/>
-  <cpu type=3D'kvm' name=3D'mpc8545_v20'/>
-  <cpu type=3D'kvm' name=3D'mpc8548_v10'/>
-  <cpu type=3D'kvm' name=3D'7448_v1.1'/>
-  <cpu type=3D'kvm' name=3D'7455_v3.4'/>
-  <cpu type=3D'kvm' name=3D'740_v2.2'/>
-  <cpu type=3D'kvm' name=3D'7400_v1.1'/>
-  <cpu type=3D'kvm' name=3D'mpc8347et'/>
-  <cpu type=3D'kvm' name=3D'7441_v2.10'/>
-  <cpu type=3D'kvm' name=3D'603e_v1.4'/>
-  <cpu type=3D'kvm' name=3D'mpc8543_v10'/>
-  <cpu type=3D'kvm' name=3D'401c2'/>
-  <cpu type=3D'kvm' name=3D'7451_v2.10'/>
-  <cpu type=3D'kvm' name=3D'750cx_v2.2'/>
-  <cpu type=3D'kvm' name=3D'mpc8543_v21'/>
-  <cpu type=3D'kvm' name=3D'603e7'/>
-  <cpu type=3D'kvm' name=3D'7448_v2.1'/>
-  <cpu type=3D'kvm' name=3D'7441_v2.3'/>
-  <cpu type=3D'kvm' name=3D'405crb'/>
-  <cpu type=3D'kvm' name=3D'604'/>
-  <cpu type=3D'kvm' name=3D'7400_v2.1'/>
-  <cpu type=3D'kvm' name=3D'440-xilinx-w-dfpu'/>
-  <cpu type=3D'kvm' name=3D'7445_v2.1'/>
-  <cpu type=3D'kvm' name=3D'cobra'/>
-  <cpu type=3D'kvm' name=3D'e500_v20'/>
-  <cpu type=3D'kvm' name=3D'mpc8541_v11'/>
-  <cpu type=3D'kvm' name=3D'750gx_v1.1'/>
-  <cpu type=3D'kvm' name=3D'750cxe_v2.4'/>
-  <cpu type=3D'kvm' name=3D'mpc8641d'/>
-  <cpu type=3D'kvm' name=3D'mpc8543e_v21'/>
-  <cpu type=3D'kvm' name=3D'750l_v2.1'/>
-  <cpu type=3D'kvm' name=3D'7457_v1.0'/>
-  <cpu type=3D'kvm' name=3D'7450_v1.2'/>
-  <cpu type=3D'kvm' name=3D'755_v2.5'/>
-  <cpu type=3D'kvm' name=3D'7410_v1.3'/>
-  <cpu type=3D'kvm' name=3D'745_v2.3'/>
-  <cpu type=3D'kvm' name=3D'755_v2.0'/>
-  <cpu type=3D'kvm' name=3D'e500v2_v30'/>
-  <cpu type=3D'kvm' name=3D'7455_v3.3'/>
-  <cpu type=3D'kvm' name=3D'mpc8540_v20'/>
-  <cpu type=3D'kvm' name=3D'405d2'/>
-  <cpu type=3D'kvm' name=3D'mpc8560_v21'/>
-  <cpu type=3D'kvm' name=3D'mpc8343'/>
-  <cpu type=3D'kvm' name=3D'mpc8548_v20'/>
-  <cpu type=3D'kvm' name=3D'mpc8347t'/>
-  <cpu type=3D'kvm' name=3D'755_v1.0'/>
-  <cpu type=3D'kvm' name=3D'603e_v1.3'/>
-  <cpu type=3D'kvm' name=3D'host'/>
-  <cpu type=3D'kvm' name=3D'mpc8543e_v10'/>
-  <cpu type=3D'kvm' name=3D'mpc8347eap'/>
-  <cpu type=3D'kvm' name=3D'mpc8548e_v11'/>
-  <cpu type=3D'kvm' name=3D'mpc8543_v20'/>
-  <cpu type=3D'kvm' name=3D'401d2'/>
-  <cpu type=3D'kvm' name=3D'power8_v2.0'/>
-  <cpu type=3D'kvm' name=3D'740_v3.1'/>
-  <cpu type=3D'kvm' name=3D'e200z5'/>
-  <cpu type=3D'kvm' name=3D'405cra'/>
-  <cpu type=3D'kvm' name=3D'7400_v2.0'/>
-  <cpu type=3D'kvm' name=3D'750cxe_v2.3'/>
-  <cpu type=3D'kvm' name=3D'745_v2.7'/>
-  <cpu type=3D'kvm' name=3D'mpc8560_v10'/>
-  <cpu type=3D'kvm' name=3D'e5500'/>
-  <cpu type=3D'kvm' name=3D'mpc8544_v11'/>
-  <cpu type=3D'kvm' name=3D'7448_v1.0'/>
-  <cpu type=3D'kvm' name=3D'401e2'/>
-  <cpu type=3D'kvm' name=3D'740_v2.1'/>
-  <cpu type=3D'kvm' name=3D'745_v2.2'/>
-  <cpu type=3D'kvm' name=3D'7400_v1.0'/>
-  <cpu type=3D'kvm' name=3D'7410_v1.2'/>
-  <cpu type=3D'kvm' name=3D'x2vp4'/>
-  <cpu type=3D'kvm' name=3D'mpc8347ap'/>
-  <cpu type=3D'kvm' name=3D'mpc8533_v11'/>
-  <cpu type=3D'kvm' name=3D'mpc5200b_v21'/>
-  <cpu type=3D'kvm' name=3D'750fx_v2.3'/>
-  <cpu type=3D'kvm' name=3D'601_v2'/>
-  <cpu type=3D'kvm' name=3D'g2legp3'/>
-  <cpu type=3D'kvm' name=3D'604e_v1.0'/>
-  <cpu type=3D'kvm' name=3D'750cx_v2.1'/>
-  <cpu type=3D'kvm' name=3D'mpc8610'/>
-  <cpu type=3D'kvm' name=3D'g2h4'/>
-  <cpu type=3D'kvm' name=3D'750l_v3.0'/>
-  <cpu type=3D'kvm' name=3D'mpc8377e'/>
-  <cpu type=3D'kvm' name=3D'e300c4'/>
-  <cpu type=3D'kvm' name=3D'mpc5200_v12'/>
-  <cpu type=3D'kvm' name=3D'7448_v2.0'/>
-  <cpu type=3D'kvm' name=3D'7450_v2.1'/>
-  <cpu type=3D'kvm' name=3D'750cxe_v3.1b'/>
-  <cpu type=3D'kvm' name=3D'g2'/>
-  <cpu type=3D'kvm' name=3D'7400_v2.9'/>
-  <cpu type=3D'kvm' name=3D'405gpd'/>
-  <cpu type=3D'kvm' name=3D'603'/>
-  <cpu type=3D'kvm' name=3D'603e7t'/>
-  <cpu type=3D'kvm' name=3D'mpc8555_v11'/>
-  <cpu type=3D'kvm' name=3D'750gx_v1.0'/>
-  <cpu type=3D'kvm' name=3D'mpc8541_v10'/>
-  <cpu type=3D'kvm' name=3D'mpc8543e_v20'/>
-  <cpu type=3D'kvm' name=3D'750fl'/>
-  <cpu type=3D'kvm' name=3D'750l_v2.0'/>
-  <cpu type=3D'kvm' name=3D'stb04'/>
-  <cpu type=3D'kvm' name=3D'mpc8548e_v21'/>
-  <cpu type=3D'kvm' name=3D'x2vp20'/>
-  <cpu type=3D'kvm' name=3D'405ez'/>
-  <cpu type=3D'kvm' name=3D'e600'/>
-  <cpu type=3D'kvm' name=3D'7450_v1.1'/>
-  <cpu type=3D'kvm' name=3D'755_v2.4'/>
-  <cpu type=3D'kvm' name=3D'mpc8379'/>
-  <cpu type=3D'kvm' name=3D'7445_v1.0'/>
-  <cpu type=3D'kvm' name=3D'7447_v1.1'/>
-  <cpu type=3D'kvm' name=3D'603e_v2.2'/>
-  <cpu type=3D'kvm' name=3D'603e_v4'/>
-  <cpu type=3D'kvm' name=3D'g2legp'/>
-  <cpu type=3D'kvm' name=3D'7455_v3.2'/>
-  <cpu type=3D'kvm' name=3D'740_v2.0'/>
-  <cpu type=3D'kvm' name=3D'mpc8560_v20'/>
-  <cpu type=3D'kvm' name=3D'440-xilinx'/>
-  <cpu type=3D'kvm' name=3D'401f2'/>
-  <cpu type=3D'kvm' name=3D'mpc8533_v10'/>
-  <cpu type=3D'kvm' name=3D'405gpr'/>
-  <cpu type=3D'kvm' name=3D'mpc8349a'/>
-  <cpu type=3D'kvm' name=3D'stb25'/>
-  <cpu type=3D'kvm' name=3D'603e_v1.2'/>
-  <cpu type=3D'kvm' name=3D'mpc5200b_v20'/>
-  <cpu type=3D'kvm' name=3D'750fx_v2.2'/>
-  <cpu type=3D'kvm' name=3D'mpc8347eat'/>
-  <cpu type=3D'kvm' name=3D'740_v1.0'/>
-  <cpu type=3D'kvm' name=3D'601_v1'/>
-  <cpu type=3D'kvm' name=3D'745_v1.1'/>
-  <cpu type=3D'kvm' name=3D'750cx_v2.0'/>
-  <cpu type=3D'kvm' name=3D'mpc8548e_v10'/>
-  <cpu type=3D'kvm' name=3D'7447a_v1.2'/>
-  <cpu type=3D'kvm' name=3D'403gc'/>
-  <cpu type=3D'kvm' name=3D'e300c3'/>
-  <cpu type=3D'kvm' name=3D'mpc5200_v11'/>
-  <cpu type=3D'kvm' name=3D'7441_v2.1'/>
-  <cpu type=3D'kvm' name=3D'740_v3.0'/>
-  <cpu type=3D'kvm' name=3D'mpc8545e_v21'/>
-  <cpu type=3D'kvm' name=3D'602'/>
-  <cpu type=3D'kvm' name=3D'mpc8378e'/>
-  <cpu type=3D'kvm' name=3D'mpc8343a'/>
-  <cpu type=3D'kvm' name=3D'460exb'/>
-  <cpu type=3D'kvm' name=3D'mpc8555_v10'/>
-  <cpu type=3D'kvm' name=3D'mpc8568'/>
-  <cpu type=3D'kvm' name=3D'7457a_v1.2'/>
-  <cpu type=3D'kvm' name=3D'750cx_v1.0'/>
-  <cpu type=3D'kvm' name=3D'750cxe_v2.2'/>
-  <cpu type=3D'kvm' name=3D'604e_v2.4'/>
-  <cpu type=3D'kvm' name=3D'755_v2.8'/>
-  <cpu type=3D'kvm' name=3D'405lp'/>
-  <cpu type=3D'kvm' name=3D'745_v2.6'/>
-  <cpu type=3D'kvm' name=3D'stb03'/>
-  <cpu type=3D'kvm' name=3D'405ep'/>
-  <cpu type=3D'kvm' name=3D'mpc8544_v10'/>
-  <cpu type=3D'kvm' name=3D'mpc8347at'/>
-  <cpu type=3D'kvm' name=3D'750_v2.2'/>
-  <cpu type=3D'kvm' name=3D'7450_v1.0'/>
-  <cpu type=3D'kvm' name=3D'755_v2.3'/>
-  <cpu type=3D'kvm' name=3D'7410_v1.1'/>
-  <cpu type=3D'kvm' name=3D'745_v2.1'/>
-  <cpu type=3D'kvm' name=3D'750gl'/>
-  <cpu type=3D'kvm' name=3D'e6500'/>
-  <cpu type=3D'kvm' name=3D'750p'/>
-  <cpu type=3D'kvm' name=3D'7445_v3.4'/>
-  <cpu type=3D'kvm' name=3D'440epb'/>
-  <cpu type=3D'kvm' name=3D'npe4gs3'/>
-  <cpu type=3D'kvm' name=3D'603e_v3'/>
-  <cpu type=3D'kvm' name=3D'mpc8349e'/>
-  <cpu type=3D'kvm' name=3D'970_v2.2'/>
-  <cpu type=3D'kvm' name=3D'g2lels'/>
-  <cpu type=3D'kvm' name=3D'g2hip4'/>
-  <cpu type=3D'kvm' name=3D'740p'/>
-  <cpu type=3D'kvm' name=3D'mpc8567e'/>
-  <cpu type=3D'kvm' name=3D'mpc8533e_v11'/>
-  <cpu type=3D'kvm' name=3D'7451_v2.3'/>
-  <cpu type=3D'kvm' name=3D'603e_v1.1'/>
-  <cpu type=3D'kvm' name=3D'401g2'/>
-  <cpu type=3D'kvm' name=3D'7400_v2.8'/>
-  <cpu type=3D'kvm' name=3D'7455_v2.1'/>
-  <cpu type=3D'kvm' name=3D'405gpc'/>
-  <cpu type=3D'kvm' name=3D'power7+_v2.1'/>
-  <cpu type=3D'kvm' name=3D'mpc8544e_v11'/>
-  <cpu type=3D'kvm' name=3D'7450_v2.0'/>
-  <cpu type=3D'kvm' name=3D'970mp_v1.1'/>
-  <cpu type=3D'kvm' name=3D'603e7v2'/>
-  <cpu type=3D'kvm' name=3D'604r'/>
-  <cpu type=3D'kvm' name=3D'e500v2_v22'/>
-  <cpu type=3D'kvm' name=3D'mpc8548e_v20'/>
-  <cpu type=3D'kvm' name=3D'mpc8545e_v20'/>
-  <cpu type=3D'kvm' name=3D'mpc8378'/>
-  <cpu type=3D'kvm' name=3D'mpc8567'/>
-  <cpu type=3D'kvm' name=3D'7457_v1.2'/>
-  <cpu type=3D'kvm' name=3D'7447_v1.0'/>
-  <cpu type=3D'kvm' name=3D'970fx_v3.1'/>
-  <cpu type=3D'kvm' name=3D'745_v2.5'/>
-  <cpu type=3D'kvm' name=3D'mpc8379e'/>
-  <cpu type=3D'kvm' name=3D'mpc8641'/>
-  <cpu type=3D'kvm' name=3D'750cxe_v2.4b'/>
-  <cpu type=3D'kvm' name=3D'7410_v1.0'/>
-  <cpu type=3D'kvm' name=3D'mpc603'/>
-  <cpu type=3D'kvm' name=3D'603e_v4.1'/>
-  <cpu type=3D'kvm' name=3D'7445_v3.3'/>
-  <cpu type=3D'kvm' name=3D'440epa'/>
-  <cpu type=3D'kvm' name=3D'970fx_v2.1'/>
-  <cpu type=3D'kvm' name=3D'iop480'/>
-  <cpu type=3D'kvm' name=3D'750fx_v2.1'/>
-  <cpu type=3D'kvm' name=3D'601_v0'/>
-  <cpu type=3D'kvm' name=3D'g2legp1'/>
-  <cpu type=3D'kvm' name=3D'745_v1.0'/>
-  <cpu type=3D'kvm' name=3D'750cl_v2.0'/>
-  <cpu type=3D'kvm' name=3D'750cxr'/>
-  <cpu type=3D'kvm' name=3D'401'/>
-  <cpu type=3D'kvm' name=3D'mpc8541e_v11'/>
-  <cpu type=3D'kvm' name=3D'750cxe_v3.1'/>
-  <cpu type=3D'kvm' name=3D'mpc8555e_v11'/>
-  <cpu type=3D'kvm' name=3D'power8e_v2.1'/>
-  <cpu type=3D'kvm' name=3D'7447a_v1.1'/>
-  <cpu type=3D'kvm' name=3D'403gb'/>
-  <cpu type=3D'kvm' name=3D'e300c2'/>
-  <cpu type=3D'kvm' name=3D'npe405h2'/>
-  <cpu type=3D'kvm' name=3D'mpc8343e'/>
-  <cpu type=3D'kvm' name=3D'mpc8533e_v10'/>
-  <cpu type=3D'kvm' name=3D'mpc5200_v10'/>
-  <cpu type=3D'kvm' name=3D'750_v3.1'/>
-  <cpu type=3D'kvm' name=3D'power5+_v2.1'/>
-  <cpu type=3D'kvm' name=3D'mpc8568e'/>
-  <cpu type=3D'tcg' name=3D'default'/>
-  <cpu type=3D'tcg' name=3D'ppc'/>
-  <cpu type=3D'tcg' name=3D'ppc32'/>
-  <cpu type=3D'tcg' name=3D'ppc64'/>
-  <cpu type=3D'tcg' name=3D'970mp'/>
-  <cpu type=3D'tcg' name=3D'970fx'/>
-  <cpu type=3D'tcg' name=3D'970'/>
-  <cpu type=3D'tcg' name=3D'power9'/>
-  <cpu type=3D'tcg' name=3D'power8nvl'/>
-  <cpu type=3D'tcg' name=3D'power8'/>
-  <cpu type=3D'tcg' name=3D'power8e'/>
-  <cpu type=3D'tcg' name=3D'power7+'/>
-  <cpu type=3D'tcg' name=3D'power7'/>
-  <cpu type=3D'tcg' name=3D'power5gs'/>
-  <cpu type=3D'tcg' name=3D'power5+'/>
-  <cpu type=3D'tcg' name=3D'apollo7pm'/>
-  <cpu type=3D'tcg' name=3D'7457a'/>
-  <cpu type=3D'tcg' name=3D'7447a'/>
-  <cpu type=3D'tcg' name=3D'apollo7'/>
-  <cpu type=3D'tcg' name=3D'7457'/>
-  <cpu type=3D'tcg' name=3D'7447'/>
-  <cpu type=3D'tcg' name=3D'apollo6'/>
-  <cpu type=3D'tcg' name=3D'7455'/>
-  <cpu type=3D'tcg' name=3D'7445'/>
-  <cpu type=3D'tcg' name=3D'7451'/>
-  <cpu type=3D'tcg' name=3D'7441'/>
-  <cpu type=3D'tcg' name=3D'vger'/>
-  <cpu type=3D'tcg' name=3D'7450'/>
-  <cpu type=3D'tcg' name=3D'7448'/>
-  <cpu type=3D'tcg' name=3D'nitro'/>
-  <cpu type=3D'tcg' name=3D'7410'/>
-  <cpu type=3D'tcg' name=3D'g4'/>
-  <cpu type=3D'tcg' name=3D'max'/>
-  <cpu type=3D'tcg' name=3D'7400'/>
-  <cpu type=3D'tcg' name=3D'goldfinger'/>
-  <cpu type=3D'tcg' name=3D'755'/>
-  <cpu type=3D'tcg' name=3D'745'/>
-  <cpu type=3D'tcg' name=3D'lonestar'/>
-  <cpu type=3D'tcg' name=3D'750l'/>
-  <cpu type=3D'tcg' name=3D'750gx'/>
-  <cpu type=3D'tcg' name=3D'750fx'/>
-  <cpu type=3D'tcg' name=3D'750cxe'/>
-  <cpu type=3D'tcg' name=3D'750cx'/>
-  <cpu type=3D'tcg' name=3D'750cl'/>
-  <cpu type=3D'tcg' name=3D'conan/doyle'/>
-  <cpu type=3D'tcg' name=3D'g3'/>
-  <cpu type=3D'tcg' name=3D'typhoon'/>
-  <cpu type=3D'tcg' name=3D'750'/>
-  <cpu type=3D'tcg' name=3D'arthur'/>
-  <cpu type=3D'tcg' name=3D'740'/>
-  <cpu type=3D'tcg' name=3D'mach5'/>
-  <cpu type=3D'tcg' name=3D'sirocco'/>
-  <cpu type=3D'tcg' name=3D'604e'/>
-  <cpu type=3D'tcg' name=3D'goldeneye'/>
-  <cpu type=3D'tcg' name=3D'603r'/>
-  <cpu type=3D'tcg' name=3D'vaillant'/>
-  <cpu type=3D'tcg' name=3D'stretch'/>
-  <cpu type=3D'tcg' name=3D'603e'/>
-  <cpu type=3D'tcg' name=3D'vanilla'/>
-  <cpu type=3D'tcg' name=3D'601v'/>
-  <cpu type=3D'tcg' name=3D'601'/>
-  <cpu type=3D'tcg' name=3D'mpc8560'/>
-  <cpu type=3D'tcg' name=3D'mpc8555e'/>
-  <cpu type=3D'tcg' name=3D'mpc8555'/>
-  <cpu type=3D'tcg' name=3D'mpc8548e'/>
-  <cpu type=3D'tcg' name=3D'mpc8548'/>
-  <cpu type=3D'tcg' name=3D'mpc8547e'/>
-  <cpu type=3D'tcg' name=3D'mpc8545e'/>
-  <cpu type=3D'tcg' name=3D'mpc8545'/>
-  <cpu type=3D'tcg' name=3D'mpc8544e'/>
-  <cpu type=3D'tcg' name=3D'mpc8544'/>
-  <cpu type=3D'tcg' name=3D'mpc8543e'/>
-  <cpu type=3D'tcg' name=3D'mpc8543'/>
-  <cpu type=3D'tcg' name=3D'mpc8541e'/>
-  <cpu type=3D'tcg' name=3D'mpc8541'/>
-  <cpu type=3D'tcg' name=3D'mpc8540'/>
-  <cpu type=3D'tcg' name=3D'mpc8533e'/>
-  <cpu type=3D'tcg' name=3D'mpc8533'/>
-  <cpu type=3D'tcg' name=3D'e500v2'/>
-  <cpu type=3D'tcg' name=3D'e500v1'/>
-  <cpu type=3D'tcg' name=3D'e500'/>
-  <cpu type=3D'tcg' name=3D'mpc8347ea'/>
-  <cpu type=3D'tcg' name=3D'mpc8347e'/>
-  <cpu type=3D'tcg' name=3D'mpc8347a'/>
-  <cpu type=3D'tcg' name=3D'mpc8347'/>
-  <cpu type=3D'tcg' name=3D'e300'/>
-  <cpu type=3D'tcg' name=3D'e200'/>
-  <cpu type=3D'tcg' name=3D'mpc8280'/>
-  <cpu type=3D'tcg' name=3D'mpc8275'/>
-  <cpu type=3D'tcg' name=3D'mpc8272'/>
-  <cpu type=3D'tcg' name=3D'mpc8271'/>
-  <cpu type=3D'tcg' name=3D'mpc8270'/>
-  <cpu type=3D'tcg' name=3D'mpc8266_hip4'/>
-  <cpu type=3D'tcg' name=3D'mpc8266_hip3'/>
-  <cpu type=3D'tcg' name=3D'mpc8266'/>
-  <cpu type=3D'tcg' name=3D'mpc8265_hip4'/>
-  <cpu type=3D'tcg' name=3D'mpc8265_hip3'/>
-  <cpu type=3D'tcg' name=3D'mpc8265'/>
-  <cpu type=3D'tcg' name=3D'mpc8264_hip4'/>
-  <cpu type=3D'tcg' name=3D'mpc8264_hip3'/>
-  <cpu type=3D'tcg' name=3D'mpc8264'/>
-  <cpu type=3D'tcg' name=3D'mpc8260_hip4'/>
-  <cpu type=3D'tcg' name=3D'mpc8260_hip3'/>
-  <cpu type=3D'tcg' name=3D'mpc8260'/>
-  <cpu type=3D'tcg' name=3D'mpc8255_hip4'/>
-  <cpu type=3D'tcg' name=3D'mpc8255_hip3'/>
-  <cpu type=3D'tcg' name=3D'mpc8255'/>
-  <cpu type=3D'tcg' name=3D'mpc8250_hip4'/>
-  <cpu type=3D'tcg' name=3D'mpc8250_hip3'/>
-  <cpu type=3D'tcg' name=3D'mpc8250'/>
-  <cpu type=3D'tcg' name=3D'mpc8248'/>
-  <cpu type=3D'tcg' name=3D'mpc8247'/>
-  <cpu type=3D'tcg' name=3D'mpc8245'/>
-  <cpu type=3D'tcg' name=3D'mpc8241'/>
-  <cpu type=3D'tcg' name=3D'powerquicc-ii'/>
-  <cpu type=3D'tcg' name=3D'mpc82xx'/>
-  <cpu type=3D'tcg' name=3D'mpc5200b'/>
-  <cpu type=3D'tcg' name=3D'mpc5200'/>
-  <cpu type=3D'tcg' name=3D'mpc52xx'/>
-  <cpu type=3D'tcg' name=3D'mpc8240'/>
-  <cpu type=3D'tcg' name=3D'460ex'/>
-  <cpu type=3D'tcg' name=3D'440ep'/>
-  <cpu type=3D'tcg' name=3D'x2vp50'/>
-  <cpu type=3D'tcg' name=3D'x2vp7'/>
-  <cpu type=3D'tcg' name=3D'405gpe'/>
-  <cpu type=3D'tcg' name=3D'405gp'/>
-  <cpu type=3D'tcg' name=3D'405cr'/>
-  <cpu type=3D'tcg' name=3D'405'/>
-  <cpu type=3D'tcg' name=3D'403'/>
-  <cpu type=3D'tcg' name=3D'mpc8547e_v21'/>
-  <cpu type=3D'tcg' name=3D'750cl_v1.0'/>
-  <cpu type=3D'tcg' name=3D'7457a_v1.1'/>
-  <cpu type=3D'tcg' name=3D'g2gp'/>
-  <cpu type=3D'tcg' name=3D'750cxe_v2.1'/>
-  <cpu type=3D'tcg' name=3D'755_v2.7'/>
-  <cpu type=3D'tcg' name=3D'750_v2.1'/>
-  <cpu type=3D'tcg' name=3D'755_v2.2'/>
-  <cpu type=3D'tcg' name=3D'745_v2.0'/>
-  <cpu type=3D'tcg' name=3D'mpc8377'/>
-  <cpu type=3D'tcg' name=3D'7455_v1.0'/>
-  <cpu type=3D'tcg' name=3D'mpc8545_v21'/>
-  <cpu type=3D'tcg' name=3D'mpc8548_v11'/>
-  <cpu type=3D'tcg' name=3D'405d4'/>
-  <cpu type=3D'tcg' name=3D'g2le'/>
-  <cpu type=3D'tcg' name=3D'g2hip3'/>
-  <cpu type=3D'tcg' name=3D'750e'/>
-  <cpu type=3D'tcg' name=3D'mpc8572'/>
-  <cpu type=3D'tcg' name=3D'970fx_v2.0'/>
-  <cpu type=3D'tcg' name=3D'750fx_v2.0'/>
-  <cpu type=3D'tcg' name=3D'603p'/>
-  <cpu type=3D'tcg' name=3D'405gpb'/>
-  <cpu type=3D'tcg' name=3D'7400_v2.7'/>
-  <cpu type=3D'tcg' name=3D'mpc8544e_v10'/>
-  <cpu type=3D'tcg' name=3D'e500v2_v10'/>
-  <cpu type=3D'tcg' name=3D'e500mc'/>
-  <cpu type=3D'tcg' name=3D'603e7v1'/>
-  <cpu type=3D'tcg' name=3D'970mp_v1.0'/>
-  <cpu type=3D'tcg' name=3D'740e'/>
-  <cpu type=3D'tcg' name=3D'405crc'/>
-  <cpu type=3D'tcg' name=3D'403ga'/>
-  <cpu type=3D'tcg' name=3D'7447a_v1.0'/>
-  <cpu type=3D'tcg' name=3D'7400_v2.2'/>
-  <cpu type=3D'tcg' name=3D'e300c1'/>
-  <cpu type=3D'tcg' name=3D'mpc8572e'/>
-  <cpu type=3D'tcg' name=3D'e500v2_v21'/>
-  <cpu type=3D'tcg' name=3D'970fx_v1.0'/>
-  <cpu type=3D'tcg' name=3D'750gx_v1.2'/>
-  <cpu type=3D'tcg' name=3D'750fx_v1.0'/>
-  <cpu type=3D'tcg' name=3D'7457_v1.1'/>
-  <cpu type=3D'tcg' name=3D'970fx_v3.0'/>
-  <cpu type=3D'tcg' name=3D'604e_v2.2'/>
-  <cpu type=3D'tcg' name=3D'755_v2.6'/>
-  <cpu type=3D'tcg' name=3D'401a1'/>
-  <cpu type=3D'tcg' name=3D'power9_v1.0'/>
-  <cpu type=3D'tcg' name=3D'npe405h'/>
-  <cpu type=3D'tcg' name=3D'7410_v1.4'/>
-  <cpu type=3D'tcg' name=3D'g2ls'/>
-  <cpu type=3D'tcg' name=3D'750_v2.0'/>
-  <cpu type=3D'tcg' name=3D'401b2'/>
-  <cpu type=3D'tcg' name=3D'mpc8349'/>
-  <cpu type=3D'tcg' name=3D'mpc8347ep'/>
-  <cpu type=3D'tcg' name=3D'7445_v3.2'/>
-  <cpu type=3D'tcg' name=3D'mpc8540_v21'/>
-  <cpu type=3D'tcg' name=3D'mpc8543_v11'/>
-  <cpu type=3D'tcg' name=3D'403gcx'/>
-  <cpu type=3D'tcg' name=3D'745_v2.4'/>
-  <cpu type=3D'tcg' name=3D'mpc8548_v21'/>
-  <cpu type=3D'tcg' name=3D'750l_v3.2'/>
-  <cpu type=3D'tcg' name=3D'750_v1.0'/>
-  <cpu type=3D'tcg' name=3D'755_v1.1'/>
-  <cpu type=3D'tcg' name=3D'e500_v10'/>
-  <cpu type=3D'tcg' name=3D'750cxe_v3.0'/>
-  <cpu type=3D'tcg' name=3D'mpc8541e_v10'/>
-  <cpu type=3D'tcg' name=3D'mpc8347p'/>
-  <cpu type=3D'tcg' name=3D'mpc8555e_v10'/>
-  <cpu type=3D'tcg' name=3D'power9_v2.0'/>
-  <cpu type=3D'tcg' name=3D'power7_v2.3'/>
-  <cpu type=3D'tcg' name=3D'603e7v'/>
-  <cpu type=3D'tcg' name=3D'mpc8543e_v11'/>
-  <cpu type=3D'tcg' name=3D'750_v3.0'/>
-  <cpu type=3D'tcg' name=3D'7400_v2.6'/>
-  <cpu type=3D'tcg' name=3D'405gpa'/>
-  <cpu type=3D'tcg' name=3D'440epx'/>
-  <cpu type=3D'tcg' name=3D'750l_v2.2'/>
-  <cpu type=3D'tcg' name=3D'e200z6'/>
-  <cpu type=3D'tcg' name=3D'mpc8547e_v20'/>
-  <cpu type=3D'tcg' name=3D'7457a_v1.0'/>
-  <cpu type=3D'tcg' name=3D'mpc8349ea'/>
-  <cpu type=3D'tcg' name=3D'e500v2_v20'/>
-  <cpu type=3D'tcg' name=3D'power8nvl_v1.0'/>
-  <cpu type=3D'tcg' name=3D'mpc8540_v10'/>
-  <cpu type=3D'tcg' name=3D'755_v2.1'/>
-  <cpu type=3D'tcg' name=3D'745_v2.8'/>
-  <cpu type=3D'tcg' name=3D'npe405l'/>
-  <cpu type=3D'tcg' name=3D'mpc8343ea'/>
-  <cpu type=3D'tcg' name=3D'mpc8545_v20'/>
-  <cpu type=3D'tcg' name=3D'mpc8548_v10'/>
-  <cpu type=3D'tcg' name=3D'7448_v1.1'/>
-  <cpu type=3D'tcg' name=3D'7455_v3.4'/>
-  <cpu type=3D'tcg' name=3D'740_v2.2'/>
-  <cpu type=3D'tcg' name=3D'7400_v1.1'/>
-  <cpu type=3D'tcg' name=3D'mpc8347et'/>
-  <cpu type=3D'tcg' name=3D'7441_v2.10'/>
-  <cpu type=3D'tcg' name=3D'603e_v1.4'/>
-  <cpu type=3D'tcg' name=3D'mpc8543_v10'/>
-  <cpu type=3D'tcg' name=3D'401c2'/>
-  <cpu type=3D'tcg' name=3D'7451_v2.10'/>
-  <cpu type=3D'tcg' name=3D'750cx_v2.2'/>
-  <cpu type=3D'tcg' name=3D'mpc8543_v21'/>
-  <cpu type=3D'tcg' name=3D'603e7'/>
-  <cpu type=3D'tcg' name=3D'7448_v2.1'/>
-  <cpu type=3D'tcg' name=3D'7441_v2.3'/>
-  <cpu type=3D'tcg' name=3D'405crb'/>
-  <cpu type=3D'tcg' name=3D'604'/>
-  <cpu type=3D'tcg' name=3D'7400_v2.1'/>
-  <cpu type=3D'tcg' name=3D'440-xilinx-w-dfpu'/>
-  <cpu type=3D'tcg' name=3D'7445_v2.1'/>
-  <cpu type=3D'tcg' name=3D'cobra'/>
-  <cpu type=3D'tcg' name=3D'e500_v20'/>
-  <cpu type=3D'tcg' name=3D'mpc8541_v11'/>
-  <cpu type=3D'tcg' name=3D'750gx_v1.1'/>
-  <cpu type=3D'tcg' name=3D'750cxe_v2.4'/>
-  <cpu type=3D'tcg' name=3D'mpc8641d'/>
-  <cpu type=3D'tcg' name=3D'mpc8543e_v21'/>
-  <cpu type=3D'tcg' name=3D'750l_v2.1'/>
-  <cpu type=3D'tcg' name=3D'7457_v1.0'/>
-  <cpu type=3D'tcg' name=3D'7450_v1.2'/>
-  <cpu type=3D'tcg' name=3D'755_v2.5'/>
-  <cpu type=3D'tcg' name=3D'7410_v1.3'/>
-  <cpu type=3D'tcg' name=3D'745_v2.3'/>
-  <cpu type=3D'tcg' name=3D'755_v2.0'/>
-  <cpu type=3D'tcg' name=3D'e500v2_v30'/>
-  <cpu type=3D'tcg' name=3D'7455_v3.3'/>
-  <cpu type=3D'tcg' name=3D'mpc8540_v20'/>
-  <cpu type=3D'tcg' name=3D'405d2'/>
-  <cpu type=3D'tcg' name=3D'mpc8560_v21'/>
-  <cpu type=3D'tcg' name=3D'mpc8343'/>
-  <cpu type=3D'tcg' name=3D'mpc8548_v20'/>
-  <cpu type=3D'tcg' name=3D'mpc8347t'/>
-  <cpu type=3D'tcg' name=3D'755_v1.0'/>
-  <cpu type=3D'tcg' name=3D'603e_v1.3'/>
-  <cpu type=3D'tcg' name=3D'mpc8543e_v10'/>
-  <cpu type=3D'tcg' name=3D'mpc8347eap'/>
-  <cpu type=3D'tcg' name=3D'mpc8548e_v11'/>
-  <cpu type=3D'tcg' name=3D'mpc8543_v20'/>
-  <cpu type=3D'tcg' name=3D'401d2'/>
-  <cpu type=3D'tcg' name=3D'power8_v2.0'/>
-  <cpu type=3D'tcg' name=3D'740_v3.1'/>
-  <cpu type=3D'tcg' name=3D'e200z5'/>
-  <cpu type=3D'tcg' name=3D'405cra'/>
-  <cpu type=3D'tcg' name=3D'7400_v2.0'/>
-  <cpu type=3D'tcg' name=3D'750cxe_v2.3'/>
-  <cpu type=3D'tcg' name=3D'745_v2.7'/>
-  <cpu type=3D'tcg' name=3D'mpc8560_v10'/>
-  <cpu type=3D'tcg' name=3D'e5500'/>
-  <cpu type=3D'tcg' name=3D'mpc8544_v11'/>
-  <cpu type=3D'tcg' name=3D'7448_v1.0'/>
-  <cpu type=3D'tcg' name=3D'401e2'/>
-  <cpu type=3D'tcg' name=3D'740_v2.1'/>
-  <cpu type=3D'tcg' name=3D'745_v2.2'/>
-  <cpu type=3D'tcg' name=3D'7400_v1.0'/>
-  <cpu type=3D'tcg' name=3D'7410_v1.2'/>
-  <cpu type=3D'tcg' name=3D'x2vp4'/>
-  <cpu type=3D'tcg' name=3D'mpc8347ap'/>
-  <cpu type=3D'tcg' name=3D'mpc8533_v11'/>
-  <cpu type=3D'tcg' name=3D'mpc5200b_v21'/>
-  <cpu type=3D'tcg' name=3D'750fx_v2.3'/>
-  <cpu type=3D'tcg' name=3D'601_v2'/>
-  <cpu type=3D'tcg' name=3D'g2legp3'/>
-  <cpu type=3D'tcg' name=3D'604e_v1.0'/>
-  <cpu type=3D'tcg' name=3D'750cx_v2.1'/>
-  <cpu type=3D'tcg' name=3D'mpc8610'/>
-  <cpu type=3D'tcg' name=3D'g2h4'/>
-  <cpu type=3D'tcg' name=3D'750l_v3.0'/>
-  <cpu type=3D'tcg' name=3D'mpc8377e'/>
-  <cpu type=3D'tcg' name=3D'e300c4'/>
-  <cpu type=3D'tcg' name=3D'mpc5200_v12'/>
-  <cpu type=3D'tcg' name=3D'7448_v2.0'/>
-  <cpu type=3D'tcg' name=3D'7450_v2.1'/>
-  <cpu type=3D'tcg' name=3D'750cxe_v3.1b'/>
-  <cpu type=3D'tcg' name=3D'g2'/>
-  <cpu type=3D'tcg' name=3D'7400_v2.9'/>
-  <cpu type=3D'tcg' name=3D'405gpd'/>
-  <cpu type=3D'tcg' name=3D'603'/>
-  <cpu type=3D'tcg' name=3D'603e7t'/>
-  <cpu type=3D'tcg' name=3D'mpc8555_v11'/>
-  <cpu type=3D'tcg' name=3D'750gx_v1.0'/>
-  <cpu type=3D'tcg' name=3D'mpc8541_v10'/>
-  <cpu type=3D'tcg' name=3D'mpc8543e_v20'/>
-  <cpu type=3D'tcg' name=3D'750fl'/>
-  <cpu type=3D'tcg' name=3D'750l_v2.0'/>
-  <cpu type=3D'tcg' name=3D'stb04'/>
-  <cpu type=3D'tcg' name=3D'mpc8548e_v21'/>
-  <cpu type=3D'tcg' name=3D'x2vp20'/>
-  <cpu type=3D'tcg' name=3D'405ez'/>
-  <cpu type=3D'tcg' name=3D'e600'/>
-  <cpu type=3D'tcg' name=3D'7450_v1.1'/>
-  <cpu type=3D'tcg' name=3D'755_v2.4'/>
-  <cpu type=3D'tcg' name=3D'mpc8379'/>
-  <cpu type=3D'tcg' name=3D'7445_v1.0'/>
-  <cpu type=3D'tcg' name=3D'7447_v1.1'/>
-  <cpu type=3D'tcg' name=3D'603e_v2.2'/>
-  <cpu type=3D'tcg' name=3D'603e_v4'/>
-  <cpu type=3D'tcg' name=3D'g2legp'/>
-  <cpu type=3D'tcg' name=3D'7455_v3.2'/>
-  <cpu type=3D'tcg' name=3D'740_v2.0'/>
-  <cpu type=3D'tcg' name=3D'mpc8560_v20'/>
-  <cpu type=3D'tcg' name=3D'440-xilinx'/>
-  <cpu type=3D'tcg' name=3D'401f2'/>
-  <cpu type=3D'tcg' name=3D'mpc8533_v10'/>
-  <cpu type=3D'tcg' name=3D'405gpr'/>
-  <cpu type=3D'tcg' name=3D'mpc8349a'/>
-  <cpu type=3D'tcg' name=3D'stb25'/>
-  <cpu type=3D'tcg' name=3D'603e_v1.2'/>
-  <cpu type=3D'tcg' name=3D'mpc5200b_v20'/>
-  <cpu type=3D'tcg' name=3D'750fx_v2.2'/>
-  <cpu type=3D'tcg' name=3D'mpc8347eat'/>
-  <cpu type=3D'tcg' name=3D'740_v1.0'/>
-  <cpu type=3D'tcg' name=3D'601_v1'/>
-  <cpu type=3D'tcg' name=3D'745_v1.1'/>
-  <cpu type=3D'tcg' name=3D'750cx_v2.0'/>
-  <cpu type=3D'tcg' name=3D'mpc8548e_v10'/>
-  <cpu type=3D'tcg' name=3D'7447a_v1.2'/>
-  <cpu type=3D'tcg' name=3D'403gc'/>
-  <cpu type=3D'tcg' name=3D'e300c3'/>
-  <cpu type=3D'tcg' name=3D'mpc5200_v11'/>
-  <cpu type=3D'tcg' name=3D'7441_v2.1'/>
-  <cpu type=3D'tcg' name=3D'740_v3.0'/>
-  <cpu type=3D'tcg' name=3D'mpc8545e_v21'/>
-  <cpu type=3D'tcg' name=3D'602'/>
-  <cpu type=3D'tcg' name=3D'mpc8378e'/>
-  <cpu type=3D'tcg' name=3D'mpc8343a'/>
-  <cpu type=3D'tcg' name=3D'460exb'/>
-  <cpu type=3D'tcg' name=3D'mpc8555_v10'/>
-  <cpu type=3D'tcg' name=3D'mpc8568'/>
-  <cpu type=3D'tcg' name=3D'7457a_v1.2'/>
-  <cpu type=3D'tcg' name=3D'750cx_v1.0'/>
-  <cpu type=3D'tcg' name=3D'750cxe_v2.2'/>
-  <cpu type=3D'tcg' name=3D'604e_v2.4'/>
-  <cpu type=3D'tcg' name=3D'755_v2.8'/>
-  <cpu type=3D'tcg' name=3D'405lp'/>
-  <cpu type=3D'tcg' name=3D'745_v2.6'/>
-  <cpu type=3D'tcg' name=3D'stb03'/>
-  <cpu type=3D'tcg' name=3D'405ep'/>
-  <cpu type=3D'tcg' name=3D'mpc8544_v10'/>
-  <cpu type=3D'tcg' name=3D'mpc8347at'/>
-  <cpu type=3D'tcg' name=3D'750_v2.2'/>
-  <cpu type=3D'tcg' name=3D'7450_v1.0'/>
-  <cpu type=3D'tcg' name=3D'755_v2.3'/>
-  <cpu type=3D'tcg' name=3D'7410_v1.1'/>
-  <cpu type=3D'tcg' name=3D'745_v2.1'/>
-  <cpu type=3D'tcg' name=3D'750gl'/>
-  <cpu type=3D'tcg' name=3D'e6500'/>
-  <cpu type=3D'tcg' name=3D'750p'/>
-  <cpu type=3D'tcg' name=3D'7445_v3.4'/>
-  <cpu type=3D'tcg' name=3D'440epb'/>
-  <cpu type=3D'tcg' name=3D'npe4gs3'/>
-  <cpu type=3D'tcg' name=3D'603e_v3'/>
-  <cpu type=3D'tcg' name=3D'mpc8349e'/>
-  <cpu type=3D'tcg' name=3D'970_v2.2'/>
-  <cpu type=3D'tcg' name=3D'g2lels'/>
-  <cpu type=3D'tcg' name=3D'g2hip4'/>
-  <cpu type=3D'tcg' name=3D'740p'/>
-  <cpu type=3D'tcg' name=3D'mpc8567e'/>
-  <cpu type=3D'tcg' name=3D'mpc8533e_v11'/>
-  <cpu type=3D'tcg' name=3D'7451_v2.3'/>
-  <cpu type=3D'tcg' name=3D'603e_v1.1'/>
-  <cpu type=3D'tcg' name=3D'401g2'/>
-  <cpu type=3D'tcg' name=3D'7400_v2.8'/>
-  <cpu type=3D'tcg' name=3D'7455_v2.1'/>
-  <cpu type=3D'tcg' name=3D'405gpc'/>
-  <cpu type=3D'tcg' name=3D'power7+_v2.1'/>
-  <cpu type=3D'tcg' name=3D'mpc8544e_v11'/>
-  <cpu type=3D'tcg' name=3D'7450_v2.0'/>
-  <cpu type=3D'tcg' name=3D'970mp_v1.1'/>
-  <cpu type=3D'tcg' name=3D'603e7v2'/>
-  <cpu type=3D'tcg' name=3D'604r'/>
-  <cpu type=3D'tcg' name=3D'e500v2_v22'/>
-  <cpu type=3D'tcg' name=3D'mpc8548e_v20'/>
-  <cpu type=3D'tcg' name=3D'mpc8545e_v20'/>
-  <cpu type=3D'tcg' name=3D'mpc8378'/>
-  <cpu type=3D'tcg' name=3D'mpc8567'/>
-  <cpu type=3D'tcg' name=3D'7457_v1.2'/>
-  <cpu type=3D'tcg' name=3D'7447_v1.0'/>
-  <cpu type=3D'tcg' name=3D'970fx_v3.1'/>
-  <cpu type=3D'tcg' name=3D'745_v2.5'/>
-  <cpu type=3D'tcg' name=3D'mpc8379e'/>
-  <cpu type=3D'tcg' name=3D'mpc8641'/>
-  <cpu type=3D'tcg' name=3D'750cxe_v2.4b'/>
-  <cpu type=3D'tcg' name=3D'7410_v1.0'/>
-  <cpu type=3D'tcg' name=3D'mpc603'/>
-  <cpu type=3D'tcg' name=3D'603e_v4.1'/>
-  <cpu type=3D'tcg' name=3D'7445_v3.3'/>
-  <cpu type=3D'tcg' name=3D'440epa'/>
-  <cpu type=3D'tcg' name=3D'970fx_v2.1'/>
-  <cpu type=3D'tcg' name=3D'iop480'/>
-  <cpu type=3D'tcg' name=3D'750fx_v2.1'/>
-  <cpu type=3D'tcg' name=3D'601_v0'/>
-  <cpu type=3D'tcg' name=3D'g2legp1'/>
-  <cpu type=3D'tcg' name=3D'745_v1.0'/>
-  <cpu type=3D'tcg' name=3D'750cl_v2.0'/>
-  <cpu type=3D'tcg' name=3D'750cxr'/>
-  <cpu type=3D'tcg' name=3D'401'/>
-  <cpu type=3D'tcg' name=3D'mpc8541e_v11'/>
-  <cpu type=3D'tcg' name=3D'750cxe_v3.1'/>
-  <cpu type=3D'tcg' name=3D'mpc8555e_v11'/>
-  <cpu type=3D'tcg' name=3D'power8e_v2.1'/>
-  <cpu type=3D'tcg' name=3D'7447a_v1.1'/>
-  <cpu type=3D'tcg' name=3D'403gb'/>
-  <cpu type=3D'tcg' name=3D'e300c2'/>
-  <cpu type=3D'tcg' name=3D'npe405h2'/>
-  <cpu type=3D'tcg' name=3D'mpc8343e'/>
-  <cpu type=3D'tcg' name=3D'mpc8533e_v10'/>
-  <cpu type=3D'tcg' name=3D'mpc5200_v10'/>
-  <cpu type=3D'tcg' name=3D'750_v3.1'/>
-  <cpu type=3D'tcg' name=3D'power5+_v2.1'/>
-  <cpu type=3D'tcg' name=3D'mpc8568e'/>
+  <cpu type=3D'kvm' name=3D'default' typename=3D'604-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'ppc' typename=3D'604-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'ppc32' typename=3D'604-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'ppc64' typename=3D'970fx_v3.1-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'970mp' typename=3D'970mp_v1.1-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'970fx' typename=3D'970fx_v3.1-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'970' typename=3D'970_v2.2-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'power9' typename=3D'power9_v2.0-powerpc64-cpu'=
/>
+  <cpu type=3D'kvm' name=3D'power8nvl' typename=3D'power8nvl_v1.0-powerpc6=
4-cpu'/>
+  <cpu type=3D'kvm' name=3D'power8' typename=3D'host-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'power8e' typename=3D'power8e_v2.1-powerpc64-cp=
u'/>
+  <cpu type=3D'kvm' name=3D'power7+' typename=3D'power7+_v2.1-powerpc64-cp=
u'/>
+  <cpu type=3D'kvm' name=3D'power7' typename=3D'power7_v2.3-powerpc64-cpu'=
/>
+  <cpu type=3D'kvm' name=3D'power5gs' typename=3D'power5+_v2.1-powerpc64-c=
pu'/>
+  <cpu type=3D'kvm' name=3D'power5+' typename=3D'power5+_v2.1-powerpc64-cp=
u'/>
+  <cpu type=3D'kvm' name=3D'apollo7pm' typename=3D'7457a_v1.0-powerpc64-cp=
u'/>
+  <cpu type=3D'kvm' name=3D'7457a' typename=3D'7457a_v1.2-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'7447a' typename=3D'7447a_v1.2-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'apollo7' typename=3D'7457_v1.2-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'7457' typename=3D'7457_v1.2-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'7447' typename=3D'7447_v1.1-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'apollo6' typename=3D'7455_v3.2-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'7455' typename=3D'7455_v3.2-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'7445' typename=3D'7445_v3.2-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'7451' typename=3D'7451_v2.3-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'7441' typename=3D'7441_v2.3-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'vger' typename=3D'7450_v2.1-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'7450' typename=3D'7450_v2.1-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'7448' typename=3D'7448_v2.1-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'nitro' typename=3D'7410_v1.4-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'7410' typename=3D'7410_v1.4-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'g4' typename=3D'7400_v2.9-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'max' typename=3D'7400_v2.9-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'7400' typename=3D'7400_v2.9-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'goldfinger' typename=3D'755_v2.8-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'755' typename=3D'755_v2.8-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'745' typename=3D'745_v2.8-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'lonestar' typename=3D'750l_v3.2-powerpc64-cpu'=
/>
+  <cpu type=3D'kvm' name=3D'750l' typename=3D'750l_v3.2-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'750gx' typename=3D'750gx_v1.2-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'750fx' typename=3D'750fx_v2.3-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'750cxe' typename=3D'750cxe_v3.1b-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'750cx' typename=3D'750cx_v2.2-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'750cl' typename=3D'750cl_v2.0-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'conan/doyle' typename=3D'750p-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'g3' typename=3D'750_v3.1-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'typhoon' typename=3D'750_v3.1-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'750' typename=3D'750_v3.1-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'arthur' typename=3D'740_v3.1-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'740' typename=3D'740_v3.1-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'mach5' typename=3D'604r-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'sirocco' typename=3D'604e_v2.4-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'604e' typename=3D'604e_v2.4-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'goldeneye' typename=3D'603e7t-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'603r' typename=3D'603e7t-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'vaillant' typename=3D'603e7v-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'stretch' typename=3D'603e_v4.1-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'603e' typename=3D'603e_v4.1-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'vanilla' typename=3D'603-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'601v' typename=3D'601_v2-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'601' typename=3D'601_v2-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'mpc8560' typename=3D'mpc8560_v21-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'mpc8555e' typename=3D'mpc8555e_v11-powerpc64-c=
pu'/>
+  <cpu type=3D'kvm' name=3D'mpc8555' typename=3D'mpc8555_v11-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'mpc8548e' typename=3D'mpc8548e_v21-powerpc64-c=
pu'/>
+  <cpu type=3D'kvm' name=3D'mpc8548' typename=3D'mpc8548_v21-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'mpc8547e' typename=3D'mpc8547e_v21-powerpc64-c=
pu'/>
+  <cpu type=3D'kvm' name=3D'mpc8545e' typename=3D'mpc8545e_v21-powerpc64-c=
pu'/>
+  <cpu type=3D'kvm' name=3D'mpc8545' typename=3D'mpc8545_v21-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'mpc8544e' typename=3D'mpc8544e_v11-powerpc64-c=
pu'/>
+  <cpu type=3D'kvm' name=3D'mpc8544' typename=3D'mpc8544_v11-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'mpc8543e' typename=3D'mpc8543e_v21-powerpc64-c=
pu'/>
+  <cpu type=3D'kvm' name=3D'mpc8543' typename=3D'mpc8543_v21-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'mpc8541e' typename=3D'mpc8541e_v11-powerpc64-c=
pu'/>
+  <cpu type=3D'kvm' name=3D'mpc8541' typename=3D'mpc8541_v11-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'mpc8540' typename=3D'mpc8540_v21-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'mpc8533e' typename=3D'mpc8533e_v11-powerpc64-c=
pu'/>
+  <cpu type=3D'kvm' name=3D'mpc8533' typename=3D'mpc8533_v11-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'e500v2' typename=3D'e500v2_v22-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'e500v1' typename=3D'e500_v20-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'e500' typename=3D'e500v2_v22-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'mpc8347ea' typename=3D'mpc8347eat-powerpc64-cp=
u'/>
+  <cpu type=3D'kvm' name=3D'mpc8347e' typename=3D'mpc8347et-powerpc64-cpu'=
/>
+  <cpu type=3D'kvm' name=3D'mpc8347a' typename=3D'mpc8347at-powerpc64-cpu'=
/>
+  <cpu type=3D'kvm' name=3D'mpc8347' typename=3D'mpc8347t-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'e300' typename=3D'e300c3-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'e200' typename=3D'e200z6-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'mpc8280' typename=3D'g2legp3-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'mpc8275' typename=3D'g2legp3-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'mpc8272' typename=3D'g2legp3-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'mpc8271' typename=3D'g2legp3-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'mpc8270' typename=3D'g2legp3-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'mpc8266_hip4' typename=3D'g2hip4-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'mpc8266_hip3' typename=3D'g2hip3-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'mpc8266' typename=3D'g2hip4-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'mpc8265_hip4' typename=3D'g2hip4-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'mpc8265_hip3' typename=3D'g2hip3-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'mpc8265' typename=3D'g2hip4-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'mpc8264_hip4' typename=3D'g2hip4-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'mpc8264_hip3' typename=3D'g2hip3-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'mpc8264' typename=3D'g2hip4-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'mpc8260_hip4' typename=3D'g2hip4-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'mpc8260_hip3' typename=3D'g2hip3-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'mpc8260' typename=3D'g2hip4-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'mpc8255_hip4' typename=3D'g2hip4-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'mpc8255_hip3' typename=3D'g2hip3-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'mpc8255' typename=3D'g2hip4-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'mpc8250_hip4' typename=3D'g2hip4-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'mpc8250_hip3' typename=3D'g2hip3-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'mpc8250' typename=3D'g2hip4-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'mpc8248' typename=3D'g2legp3-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'mpc8247' typename=3D'g2legp3-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'mpc8245' typename=3D'g2hip4-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'mpc8241' typename=3D'g2hip4-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'powerquicc-ii' typename=3D'g2legp3-powerpc64-c=
pu'/>
+  <cpu type=3D'kvm' name=3D'mpc82xx' typename=3D'g2legp3-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'mpc5200b' typename=3D'mpc5200b_v21-powerpc64-c=
pu'/>
+  <cpu type=3D'kvm' name=3D'mpc5200' typename=3D'mpc5200_v12-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'mpc52xx' typename=3D'mpc5200_v12-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'mpc8240' typename=3D'603-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'460ex' typename=3D'460exb-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'440ep' typename=3D'440epb-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'x2vp50' typename=3D'x2vp20-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'x2vp7' typename=3D'x2vp4-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'405gpe' typename=3D'405crc-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'405gp' typename=3D'405gpd-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'405cr' typename=3D'405crc-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'405' typename=3D'405d4-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'403' typename=3D'403gc-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'mpc8547e_v21' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cl_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7457a_v1.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'g2gp' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cxe_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'755_v2.7' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'755_v2.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'745_v2.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8377' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7455_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8545_v21' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8548_v11' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'405d4' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'g2le' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'g2hip3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750e' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8572' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'970fx_v2.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750fx_v2.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603p' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'405gpb' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7400_v2.7' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8544e_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e500v2_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e500mc' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603e7v1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'970mp_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'740e' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'405crc' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'403ga' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7447a_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7400_v2.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e300c1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8572e' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e500v2_v21' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'970fx_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750gx_v1.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750fx_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7457_v1.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'970fx_v3.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'604e_v2.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'755_v2.6' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'401a1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'power9_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'npe405h' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7410_v1.4' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'g2ls' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750_v2.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'401b2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8349' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8347ep' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7445_v3.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8540_v21' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8543_v11' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'403gcx' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'745_v2.4' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8548_v21' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750l_v3.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'755_v1.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e500_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cxe_v3.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8541e_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8347p' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8555e_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'power9_v2.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'power7_v2.3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603e7v' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8543e_v11' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750_v3.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7400_v2.6' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'405gpa' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'440epx' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750l_v2.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e200z6' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8547e_v20' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7457a_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8349ea' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e500v2_v20' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'power8nvl_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8540_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'755_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'745_v2.8' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'npe405l' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8343ea' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8545_v20' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8548_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7448_v1.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7455_v3.4' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'740_v2.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7400_v1.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8347et' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7441_v2.10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603e_v1.4' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8543_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'401c2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7451_v2.10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cx_v2.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8543_v21' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603e7' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7448_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7441_v2.3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'405crb' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'604' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7400_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'440-xilinx-w-dfpu' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7445_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'cobra' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e500_v20' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8541_v11' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750gx_v1.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cxe_v2.4' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8641d' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8543e_v21' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750l_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7457_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7450_v1.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'755_v2.5' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7410_v1.3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'745_v2.3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'755_v2.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e500v2_v30' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7455_v3.3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8540_v20' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'405d2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8560_v21' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8343' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8548_v20' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8347t' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'755_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603e_v1.3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'host' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8543e_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8347eap' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8548e_v11' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8543_v20' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'401d2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'power8_v2.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'740_v3.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e200z5' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'405cra' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7400_v2.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cxe_v2.3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'745_v2.7' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8560_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e5500' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8544_v11' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7448_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'401e2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'740_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'745_v2.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7400_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7410_v1.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'x2vp4' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8347ap' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8533_v11' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc5200b_v21' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750fx_v2.3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'601_v2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'g2legp3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'604e_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cx_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8610' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'g2h4' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750l_v3.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8377e' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e300c4' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc5200_v12' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7448_v2.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7450_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cxe_v3.1b' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'g2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7400_v2.9' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'405gpd' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603e7t' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8555_v11' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750gx_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8541_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8543e_v20' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750fl' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750l_v2.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'stb04' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8548e_v21' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'x2vp20' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'405ez' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e600' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7450_v1.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'755_v2.4' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8379' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7445_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7447_v1.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603e_v2.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603e_v4' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'g2legp' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7455_v3.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'740_v2.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8560_v20' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'440-xilinx' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'401f2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8533_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'405gpr' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8349a' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'stb25' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603e_v1.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc5200b_v20' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750fx_v2.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8347eat' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'740_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'601_v1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'745_v1.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cx_v2.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8548e_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7447a_v1.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'403gc' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e300c3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc5200_v11' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7441_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'740_v3.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8545e_v21' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'602' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8378e' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8343a' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'460exb' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8555_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8568' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7457a_v1.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cx_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cxe_v2.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'604e_v2.4' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'755_v2.8' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'405lp' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'745_v2.6' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'stb03' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'405ep' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8544_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8347at' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750_v2.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7450_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'755_v2.3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7410_v1.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'745_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750gl' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e6500' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750p' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7445_v3.4' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'440epb' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'npe4gs3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603e_v3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8349e' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'970_v2.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'g2lels' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'g2hip4' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'740p' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8567e' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8533e_v11' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7451_v2.3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603e_v1.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'401g2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7400_v2.8' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7455_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'405gpc' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'power7+_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8544e_v11' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7450_v2.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'970mp_v1.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603e7v2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'604r' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e500v2_v22' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8548e_v20' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8545e_v20' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8378' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8567' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7457_v1.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7447_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'970fx_v3.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'745_v2.5' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8379e' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8641' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cxe_v2.4b' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7410_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc603' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603e_v4.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7445_v3.3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'440epa' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'970fx_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'iop480' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750fx_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'601_v0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'g2legp1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'745_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cl_v2.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cxr' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'401' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8541e_v11' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cxe_v3.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8555e_v11' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'power8e_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7447a_v1.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'403gb' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e300c2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'npe405h2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8343e' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8533e_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc5200_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750_v3.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'power5+_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8568e' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'default' typename=3D'604-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'ppc' typename=3D'604-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'ppc32' typename=3D'604-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'ppc64' typename=3D'970fx_v3.1-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'970mp' typename=3D'970mp_v1.1-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'970fx' typename=3D'970fx_v3.1-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'970' typename=3D'970_v2.2-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'power9' typename=3D'power9_v2.0-powerpc64-cpu'=
/>
+  <cpu type=3D'tcg' name=3D'power8nvl' typename=3D'power8nvl_v1.0-powerpc6=
4-cpu'/>
+  <cpu type=3D'tcg' name=3D'power8' typename=3D'power8_v2.0-powerpc64-cpu'=
/>
+  <cpu type=3D'tcg' name=3D'power8e' typename=3D'power8e_v2.1-powerpc64-cp=
u'/>
+  <cpu type=3D'tcg' name=3D'power7+' typename=3D'power7+_v2.1-powerpc64-cp=
u'/>
+  <cpu type=3D'tcg' name=3D'power7' typename=3D'power7_v2.3-powerpc64-cpu'=
/>
+  <cpu type=3D'tcg' name=3D'power5gs' typename=3D'power5+_v2.1-powerpc64-c=
pu'/>
+  <cpu type=3D'tcg' name=3D'power5+' typename=3D'power5+_v2.1-powerpc64-cp=
u'/>
+  <cpu type=3D'tcg' name=3D'apollo7pm' typename=3D'7457a_v1.0-powerpc64-cp=
u'/>
+  <cpu type=3D'tcg' name=3D'7457a' typename=3D'7457a_v1.2-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'7447a' typename=3D'7447a_v1.2-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'apollo7' typename=3D'7457_v1.2-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'7457' typename=3D'7457_v1.2-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'7447' typename=3D'7447_v1.1-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'apollo6' typename=3D'7455_v3.2-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'7455' typename=3D'7455_v3.2-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'7445' typename=3D'7445_v3.2-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'7451' typename=3D'7451_v2.3-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'7441' typename=3D'7441_v2.3-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'vger' typename=3D'7450_v2.1-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'7450' typename=3D'7450_v2.1-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'7448' typename=3D'7448_v2.1-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'nitro' typename=3D'7410_v1.4-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'7410' typename=3D'7410_v1.4-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'g4' typename=3D'7400_v2.9-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'max' typename=3D'7400_v2.9-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'7400' typename=3D'7400_v2.9-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'goldfinger' typename=3D'755_v2.8-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'755' typename=3D'755_v2.8-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'745' typename=3D'745_v2.8-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'lonestar' typename=3D'750l_v3.2-powerpc64-cpu'=
/>
+  <cpu type=3D'tcg' name=3D'750l' typename=3D'750l_v3.2-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'750gx' typename=3D'750gx_v1.2-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'750fx' typename=3D'750fx_v2.3-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'750cxe' typename=3D'750cxe_v3.1b-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'750cx' typename=3D'750cx_v2.2-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'750cl' typename=3D'750cl_v2.0-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'conan/doyle' typename=3D'750p-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'g3' typename=3D'750_v3.1-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'typhoon' typename=3D'750_v3.1-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'750' typename=3D'750_v3.1-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'arthur' typename=3D'740_v3.1-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'740' typename=3D'740_v3.1-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'mach5' typename=3D'604r-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'sirocco' typename=3D'604e_v2.4-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'604e' typename=3D'604e_v2.4-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'goldeneye' typename=3D'603e7t-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'603r' typename=3D'603e7t-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'vaillant' typename=3D'603e7v-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'stretch' typename=3D'603e_v4.1-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'603e' typename=3D'603e_v4.1-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'vanilla' typename=3D'603-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'601v' typename=3D'601_v2-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'601' typename=3D'601_v2-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'mpc8560' typename=3D'mpc8560_v21-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'mpc8555e' typename=3D'mpc8555e_v11-powerpc64-c=
pu'/>
+  <cpu type=3D'tcg' name=3D'mpc8555' typename=3D'mpc8555_v11-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'mpc8548e' typename=3D'mpc8548e_v21-powerpc64-c=
pu'/>
+  <cpu type=3D'tcg' name=3D'mpc8548' typename=3D'mpc8548_v21-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'mpc8547e' typename=3D'mpc8547e_v21-powerpc64-c=
pu'/>
+  <cpu type=3D'tcg' name=3D'mpc8545e' typename=3D'mpc8545e_v21-powerpc64-c=
pu'/>
+  <cpu type=3D'tcg' name=3D'mpc8545' typename=3D'mpc8545_v21-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'mpc8544e' typename=3D'mpc8544e_v11-powerpc64-c=
pu'/>
+  <cpu type=3D'tcg' name=3D'mpc8544' typename=3D'mpc8544_v11-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'mpc8543e' typename=3D'mpc8543e_v21-powerpc64-c=
pu'/>
+  <cpu type=3D'tcg' name=3D'mpc8543' typename=3D'mpc8543_v21-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'mpc8541e' typename=3D'mpc8541e_v11-powerpc64-c=
pu'/>
+  <cpu type=3D'tcg' name=3D'mpc8541' typename=3D'mpc8541_v11-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'mpc8540' typename=3D'mpc8540_v21-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'mpc8533e' typename=3D'mpc8533e_v11-powerpc64-c=
pu'/>
+  <cpu type=3D'tcg' name=3D'mpc8533' typename=3D'mpc8533_v11-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'e500v2' typename=3D'e500v2_v22-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'e500v1' typename=3D'e500_v20-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'e500' typename=3D'e500v2_v22-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'mpc8347ea' typename=3D'mpc8347eat-powerpc64-cp=
u'/>
+  <cpu type=3D'tcg' name=3D'mpc8347e' typename=3D'mpc8347et-powerpc64-cpu'=
/>
+  <cpu type=3D'tcg' name=3D'mpc8347a' typename=3D'mpc8347at-powerpc64-cpu'=
/>
+  <cpu type=3D'tcg' name=3D'mpc8347' typename=3D'mpc8347t-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'e300' typename=3D'e300c3-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'e200' typename=3D'e200z6-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'mpc8280' typename=3D'g2legp3-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'mpc8275' typename=3D'g2legp3-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'mpc8272' typename=3D'g2legp3-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'mpc8271' typename=3D'g2legp3-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'mpc8270' typename=3D'g2legp3-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'mpc8266_hip4' typename=3D'g2hip4-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'mpc8266_hip3' typename=3D'g2hip3-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'mpc8266' typename=3D'g2hip4-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'mpc8265_hip4' typename=3D'g2hip4-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'mpc8265_hip3' typename=3D'g2hip3-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'mpc8265' typename=3D'g2hip4-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'mpc8264_hip4' typename=3D'g2hip4-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'mpc8264_hip3' typename=3D'g2hip3-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'mpc8264' typename=3D'g2hip4-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'mpc8260_hip4' typename=3D'g2hip4-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'mpc8260_hip3' typename=3D'g2hip3-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'mpc8260' typename=3D'g2hip4-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'mpc8255_hip4' typename=3D'g2hip4-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'mpc8255_hip3' typename=3D'g2hip3-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'mpc8255' typename=3D'g2hip4-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'mpc8250_hip4' typename=3D'g2hip4-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'mpc8250_hip3' typename=3D'g2hip3-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'mpc8250' typename=3D'g2hip4-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'mpc8248' typename=3D'g2legp3-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'mpc8247' typename=3D'g2legp3-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'mpc8245' typename=3D'g2hip4-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'mpc8241' typename=3D'g2hip4-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'powerquicc-ii' typename=3D'g2legp3-powerpc64-c=
pu'/>
+  <cpu type=3D'tcg' name=3D'mpc82xx' typename=3D'g2legp3-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'mpc5200b' typename=3D'mpc5200b_v21-powerpc64-c=
pu'/>
+  <cpu type=3D'tcg' name=3D'mpc5200' typename=3D'mpc5200_v12-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'mpc52xx' typename=3D'mpc5200_v12-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'mpc8240' typename=3D'603-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'460ex' typename=3D'460exb-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'440ep' typename=3D'440epb-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'x2vp50' typename=3D'x2vp20-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'x2vp7' typename=3D'x2vp4-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'405gpe' typename=3D'405crc-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'405gp' typename=3D'405gpd-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'405cr' typename=3D'405crc-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'405' typename=3D'405d4-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'403' typename=3D'403gc-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'mpc8547e_v21' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cl_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7457a_v1.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'g2gp' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cxe_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'755_v2.7' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'755_v2.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'745_v2.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8377' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7455_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8545_v21' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8548_v11' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'405d4' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'g2le' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'g2hip3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750e' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8572' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'970fx_v2.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750fx_v2.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603p' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'405gpb' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7400_v2.7' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8544e_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e500v2_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e500mc' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603e7v1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'970mp_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'740e' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'405crc' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'403ga' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7447a_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7400_v2.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e300c1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8572e' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e500v2_v21' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'970fx_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750gx_v1.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750fx_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7457_v1.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'970fx_v3.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'604e_v2.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'755_v2.6' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'401a1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'power9_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'npe405h' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7410_v1.4' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'g2ls' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750_v2.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'401b2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8349' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8347ep' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7445_v3.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8540_v21' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8543_v11' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'403gcx' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'745_v2.4' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8548_v21' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750l_v3.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'755_v1.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e500_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cxe_v3.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8541e_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8347p' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8555e_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'power9_v2.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'power7_v2.3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603e7v' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8543e_v11' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750_v3.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7400_v2.6' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'405gpa' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'440epx' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750l_v2.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e200z6' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8547e_v20' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7457a_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8349ea' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e500v2_v20' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'power8nvl_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8540_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'755_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'745_v2.8' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'npe405l' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8343ea' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8545_v20' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8548_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7448_v1.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7455_v3.4' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'740_v2.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7400_v1.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8347et' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7441_v2.10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603e_v1.4' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8543_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'401c2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7451_v2.10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cx_v2.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8543_v21' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603e7' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7448_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7441_v2.3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'405crb' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'604' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7400_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'440-xilinx-w-dfpu' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7445_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'cobra' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e500_v20' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8541_v11' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750gx_v1.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cxe_v2.4' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8641d' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8543e_v21' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750l_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7457_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7450_v1.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'755_v2.5' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7410_v1.3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'745_v2.3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'755_v2.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e500v2_v30' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7455_v3.3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8540_v20' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'405d2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8560_v21' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8343' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8548_v20' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8347t' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'755_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603e_v1.3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8543e_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8347eap' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8548e_v11' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8543_v20' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'401d2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'power8_v2.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'740_v3.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e200z5' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'405cra' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7400_v2.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cxe_v2.3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'745_v2.7' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8560_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e5500' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8544_v11' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7448_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'401e2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'740_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'745_v2.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7400_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7410_v1.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'x2vp4' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8347ap' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8533_v11' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc5200b_v21' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750fx_v2.3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'601_v2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'g2legp3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'604e_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cx_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8610' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'g2h4' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750l_v3.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8377e' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e300c4' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc5200_v12' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7448_v2.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7450_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cxe_v3.1b' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'g2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7400_v2.9' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'405gpd' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603e7t' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8555_v11' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750gx_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8541_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8543e_v20' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750fl' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750l_v2.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'stb04' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8548e_v21' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'x2vp20' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'405ez' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e600' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7450_v1.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'755_v2.4' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8379' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7445_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7447_v1.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603e_v2.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603e_v4' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'g2legp' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7455_v3.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'740_v2.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8560_v20' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'440-xilinx' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'401f2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8533_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'405gpr' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8349a' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'stb25' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603e_v1.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc5200b_v20' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750fx_v2.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8347eat' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'740_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'601_v1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'745_v1.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cx_v2.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8548e_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7447a_v1.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'403gc' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e300c3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc5200_v11' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7441_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'740_v3.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8545e_v21' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'602' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8378e' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8343a' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'460exb' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8555_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8568' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7457a_v1.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cx_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cxe_v2.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'604e_v2.4' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'755_v2.8' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'405lp' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'745_v2.6' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'stb03' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'405ep' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8544_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8347at' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750_v2.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7450_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'755_v2.3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7410_v1.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'745_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750gl' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e6500' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750p' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7445_v3.4' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'440epb' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'npe4gs3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603e_v3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8349e' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'970_v2.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'g2lels' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'g2hip4' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'740p' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8567e' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8533e_v11' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7451_v2.3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603e_v1.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'401g2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7400_v2.8' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7455_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'405gpc' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'power7+_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8544e_v11' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7450_v2.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'970mp_v1.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603e7v2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'604r' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e500v2_v22' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8548e_v20' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8545e_v20' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8378' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8567' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7457_v1.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7447_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'970fx_v3.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'745_v2.5' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8379e' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8641' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cxe_v2.4b' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7410_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc603' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603e_v4.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7445_v3.3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'440epa' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'970fx_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'iop480' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750fx_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'601_v0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'g2legp1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'745_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cl_v2.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cxr' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'401' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8541e_v11' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cxe_v3.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8555e_v11' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'power8e_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7447a_v1.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'403gb' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e300c2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'npe405h2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8343e' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8533e_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc5200_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750_v3.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'power5+_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8568e' typename=3D''/>
   <machine name=3D'pseries-3.0' alias=3D'pseries' hotplugCpus=3D'yes' maxC=
pus=3D'1024' default=3D'yes'/>
   <machine name=3D'ref405ep' maxCpus=3D'1'/>
   <machine name=3D'sam460ex' maxCpus=3D'1'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml b/tests/qemuca=
pabilitiesdata/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=3D'te' type=3D'boolean' value=3D'true'/>
     <property name=3D'cmm' type=3D'boolean' value=3D'true'/>
   </hostCPU>
-  <cpu type=3D'kvm' name=3D'z890.2' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z990.4' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z14ZR1' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z10BC.2' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z196.2' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z14' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z9BC-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'zEC12-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z196-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z13-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z990.3' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'host' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z9EC' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'zBC12' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z9EC.3' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z196.2-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'qemu' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'z890.2' typename=3D'z890.2-s390x-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z990.4' typename=3D'z990.4-s390x-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z14ZR1' typename=3D'z14ZR1-s390x-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z10BC.2' typename=3D'z10BC.2-s390x-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z196.2' typename=3D'z196.2-s390x-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z14' typename=3D'z14-s390x-cpu' usable=3D'yes'=
/>
+  <cpu type=3D'kvm' name=3D'z9BC-base' typename=3D'z9BC-base-s390x-cpu' us=
able=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'zEC12-base' typename=3D'zEC12-base-s390x-cpu' =
usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z196-base' typename=3D'z196-base-s390x-cpu' us=
able=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z13-base' typename=3D'z13-base-s390x-cpu' usab=
le=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z990.3' typename=3D'z990.3-s390x-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'host' typename=3D'host-s390x-cpu' usable=3D'ye=
s'/>
+  <cpu type=3D'kvm' name=3D'z9EC' typename=3D'z9EC-s390x-cpu' usable=3D'ye=
s'/>
+  <cpu type=3D'kvm' name=3D'zBC12' typename=3D'zBC12-s390x-cpu' usable=3D'=
yes'/>
+  <cpu type=3D'kvm' name=3D'z9EC.3' typename=3D'z9EC.3-s390x-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z196.2-base' typename=3D'z196.2-base-s390x-cpu=
' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'qemu' typename=3D'qemu-s390x-cpu' usable=3D'no=
'>
     <blocker name=3D'ais'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'zEC12.2-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z800-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z9EC.2' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z900.2-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z14ZR1-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z900.3' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z890-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z890' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z990.4-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z10BC.2-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z900.2' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z9BC.2-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z800' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z114' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z13' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z13s-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z990' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z990.2' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z14-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z890.2-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z196' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z10EC' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z13s' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z900' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z10EC.3' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z10EC.2-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z114-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z990.2-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z9EC.2-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z890.3' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z900.3-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z9BC.2' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z10BC' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z990.5' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'zEC12.2' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z10EC-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z9EC-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z9EC.3-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'zEC12' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z990.5-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z10BC-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z900-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z13.2' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'zBC12-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z13.2-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z890.3-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z990-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z10EC.2' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z9BC' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z10EC.3-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z990.3-base' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'z890.2' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'zEC12.2-base' typename=3D'zEC12.2-base-s390x-c=
pu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z800-base' typename=3D'z800-base-s390x-cpu' us=
able=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z9EC.2' typename=3D'z9EC.2-s390x-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z900.2-base' typename=3D'z900.2-base-s390x-cpu=
' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z14ZR1-base' typename=3D'z14ZR1-base-s390x-cpu=
' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z900.3' typename=3D'z900.3-s390x-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z890-base' typename=3D'z890-base-s390x-cpu' us=
able=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z890' typename=3D'z890-s390x-cpu' usable=3D'ye=
s'/>
+  <cpu type=3D'kvm' name=3D'z990.4-base' typename=3D'z990.4-base-s390x-cpu=
' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z10BC.2-base' typename=3D'z10BC.2-base-s390x-c=
pu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z900.2' typename=3D'z900.2-s390x-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z9BC.2-base' typename=3D'z9BC.2-base-s390x-cpu=
' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z800' typename=3D'z800-s390x-cpu' usable=3D'ye=
s'/>
+  <cpu type=3D'kvm' name=3D'z114' typename=3D'z114-s390x-cpu' usable=3D'ye=
s'/>
+  <cpu type=3D'kvm' name=3D'z13' typename=3D'z13-s390x-cpu' usable=3D'yes'=
/>
+  <cpu type=3D'kvm' name=3D'z13s-base' typename=3D'z13s-base-s390x-cpu' us=
able=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z990' typename=3D'z990-s390x-cpu' usable=3D'ye=
s'/>
+  <cpu type=3D'kvm' name=3D'z990.2' typename=3D'z990.2-s390x-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z14-base' typename=3D'z14-base-s390x-cpu' usab=
le=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z890.2-base' typename=3D'z890.2-base-s390x-cpu=
' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z196' typename=3D'z196-s390x-cpu' usable=3D'ye=
s'/>
+  <cpu type=3D'kvm' name=3D'z10EC' typename=3D'z10EC-s390x-cpu' usable=3D'=
yes'/>
+  <cpu type=3D'kvm' name=3D'z13s' typename=3D'z13s-s390x-cpu' usable=3D'ye=
s'/>
+  <cpu type=3D'kvm' name=3D'z900' typename=3D'z900-s390x-cpu' usable=3D'ye=
s'/>
+  <cpu type=3D'kvm' name=3D'z10EC.3' typename=3D'z10EC.3-s390x-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z10EC.2-base' typename=3D'z10EC.2-base-s390x-c=
pu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z114-base' typename=3D'z114-base-s390x-cpu' us=
able=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z990.2-base' typename=3D'z990.2-base-s390x-cpu=
' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z9EC.2-base' typename=3D'z9EC.2-base-s390x-cpu=
' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z890.3' typename=3D'z890.3-s390x-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z900.3-base' typename=3D'z900.3-base-s390x-cpu=
' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z9BC.2' typename=3D'z9BC.2-s390x-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z10BC' typename=3D'z10BC-s390x-cpu' usable=3D'=
yes'/>
+  <cpu type=3D'kvm' name=3D'z990.5' typename=3D'z990.5-s390x-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'zEC12.2' typename=3D'zEC12.2-s390x-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z10EC-base' typename=3D'z10EC-base-s390x-cpu' =
usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z9EC-base' typename=3D'z9EC-base-s390x-cpu' us=
able=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z9EC.3-base' typename=3D'z9EC.3-base-s390x-cpu=
' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'zEC12' typename=3D'zEC12-s390x-cpu' usable=3D'=
yes'/>
+  <cpu type=3D'kvm' name=3D'z990.5-base' typename=3D'z990.5-base-s390x-cpu=
' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z10BC-base' typename=3D'z10BC-base-s390x-cpu' =
usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z900-base' typename=3D'z900-base-s390x-cpu' us=
able=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z13.2' typename=3D'z13.2-s390x-cpu' usable=3D'=
yes'/>
+  <cpu type=3D'kvm' name=3D'zBC12-base' typename=3D'zBC12-base-s390x-cpu' =
usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z13.2-base' typename=3D'z13.2-base-s390x-cpu' =
usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z890.3-base' typename=3D'z890.3-base-s390x-cpu=
' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z990-base' typename=3D'z990-base-s390x-cpu' us=
able=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z10EC.2' typename=3D'z10EC.2-s390x-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z9BC' typename=3D'z9BC-s390x-cpu' usable=3D'ye=
s'/>
+  <cpu type=3D'kvm' name=3D'z10EC.3-base' typename=3D'z10EC.3-base-s390x-c=
pu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z990.3-base' typename=3D'z990.3-base-s390x-cpu=
' usable=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'z890.2' typename=3D'z890.2-s390x-cpu' usable=
=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -245,7 +245,7 @@
     <blocker name=3D'kmac-dea'/>
     <blocker name=3D'hfpm'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z990.4' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z990.4' typename=3D'z990.4-s390x-cpu' usable=
=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -259,7 +259,7 @@
     <blocker name=3D'kmac-dea'/>
     <blocker name=3D'hfpm'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z14ZR1' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z14ZR1' typename=3D'z14ZR1-s390x-cpu' usable=
=3D'no'>
     <blocker name=3D'ppno-sha-512-drng'/>
     <blocker name=3D'pcc-xts-eaes-256'/>
     <blocker name=3D'pcc-xts-eaes-128'/>
@@ -403,7 +403,7 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z10BC.2' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z10BC.2' typename=3D'z10BC.2-s390x-cpu' usable=
=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -431,7 +431,7 @@
     <blocker name=3D'msa1'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z196.2' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z196.2' typename=3D'z196.2-s390x-cpu' usable=
=3D'no'>
     <blocker name=3D'pcc-xts-eaes-256'/>
     <blocker name=3D'pcc-xts-eaes-128'/>
     <blocker name=3D'pcc-xts-aes-256'/>
@@ -551,7 +551,7 @@
     <blocker name=3D'msa1'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z14' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z14' typename=3D'z14-s390x-cpu' usable=3D'no'>
     <blocker name=3D'ppno-sha-512-drng'/>
     <blocker name=3D'pcc-xts-eaes-256'/>
     <blocker name=3D'pcc-xts-eaes-128'/>
@@ -695,7 +695,7 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z9BC-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z9BC-base' typename=3D'z9BC-base-s390x-cpu' us=
able=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -713,7 +713,7 @@
     <blocker name=3D'asnlxr'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'zEC12-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'zEC12-base' typename=3D'zEC12-base-s390x-cpu' =
usable=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -741,7 +741,7 @@
     <blocker name=3D'asnlxr'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z196-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z196-base' typename=3D'z196-base-s390x-cpu' us=
able=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -768,7 +768,7 @@
     <blocker name=3D'asnlxr'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z13-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z13-base' typename=3D'z13-base-s390x-cpu' usab=
le=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -799,7 +799,7 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z990.3' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z990.3' typename=3D'z990.3-s390x-cpu' usable=
=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -813,8 +813,8 @@
     <blocker name=3D'kmac-dea'/>
     <blocker name=3D'hfpm'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'host'/>
-  <cpu type=3D'tcg' name=3D'z9EC' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'host' typename=3D'host-s390x-cpu'/>
+  <cpu type=3D'tcg' name=3D'z9EC' typename=3D'z9EC-s390x-cpu' usable=3D'no=
'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -835,7 +835,7 @@
     <blocker name=3D'msa1'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'zBC12' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'zBC12' typename=3D'zBC12-s390x-cpu' usable=3D'=
no'>
     <blocker name=3D'pcc-xts-eaes-256'/>
     <blocker name=3D'pcc-xts-eaes-128'/>
     <blocker name=3D'pcc-xts-aes-256'/>
@@ -962,7 +962,7 @@
     <blocker name=3D'msa1'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z9EC.3' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z9EC.3' typename=3D'z9EC.3-s390x-cpu' usable=
=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -983,7 +983,7 @@
     <blocker name=3D'msa1'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z196.2-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z196.2-base' typename=3D'z196.2-base-s390x-cpu=
' usable=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -1010,8 +1010,8 @@
     <blocker name=3D'asnlxr'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'qemu' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'zEC12.2-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'qemu' typename=3D'qemu-s390x-cpu' usable=3D'ye=
s'/>
+  <cpu type=3D'tcg' name=3D'zEC12.2-base' typename=3D'zEC12.2-base-s390x-c=
pu' usable=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -1039,8 +1039,8 @@
     <blocker name=3D'asnlxr'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z800-base' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'z9EC.2' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z800-base' typename=3D'z800-base-s390x-cpu' us=
able=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'z9EC.2' typename=3D'z9EC.2-s390x-cpu' usable=
=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -1061,8 +1061,8 @@
     <blocker name=3D'msa1'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z900.2-base' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'z14ZR1-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z900.2-base' typename=3D'z900.2-base-s390x-cpu=
' usable=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'z14ZR1-base' typename=3D'z14ZR1-base-s390x-cpu=
' usable=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -1098,8 +1098,8 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z900.3' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'z890-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z900.3' typename=3D'z900.3-s390x-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'z890-base' typename=3D'z890-base-s390x-cpu' us=
able=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -1113,7 +1113,7 @@
     <blocker name=3D'kmac-dea'/>
     <blocker name=3D'hfpm'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z890' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z890' typename=3D'z890-s390x-cpu' usable=3D'no=
'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -1127,7 +1127,7 @@
     <blocker name=3D'kmac-dea'/>
     <blocker name=3D'hfpm'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z990.4-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z990.4-base' typename=3D'z990.4-base-s390x-cpu=
' usable=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -1141,7 +1141,7 @@
     <blocker name=3D'kmac-dea'/>
     <blocker name=3D'hfpm'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z10BC.2-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z10BC.2-base' typename=3D'z10BC.2-base-s390x-c=
pu' usable=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -1164,8 +1164,8 @@
     <blocker name=3D'asnlxr'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z900.2' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'z9BC.2-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z900.2' typename=3D'z900.2-s390x-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'z9BC.2-base' typename=3D'z9BC.2-base-s390x-cpu=
' usable=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -1183,8 +1183,8 @@
     <blocker name=3D'asnlxr'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z800' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'z114' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z800' typename=3D'z800-s390x-cpu' usable=3D'ye=
s'/>
+  <cpu type=3D'tcg' name=3D'z114' typename=3D'z114-s390x-cpu' usable=3D'no=
'>
     <blocker name=3D'pcc-xts-eaes-256'/>
     <blocker name=3D'pcc-xts-eaes-128'/>
     <blocker name=3D'pcc-xts-aes-256'/>
@@ -1304,7 +1304,7 @@
     <blocker name=3D'msa1'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z13' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z13' typename=3D'z13-s390x-cpu' usable=3D'no'>
     <blocker name=3D'ppno-sha-512-drng'/>
     <blocker name=3D'pcc-xts-eaes-256'/>
     <blocker name=3D'pcc-xts-eaes-128'/>
@@ -1436,7 +1436,7 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z13s-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z13s-base' typename=3D'z13s-base-s390x-cpu' us=
able=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -1467,7 +1467,7 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z990' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z990' typename=3D'z990-s390x-cpu' usable=3D'no=
'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -1481,7 +1481,7 @@
     <blocker name=3D'kmac-dea'/>
     <blocker name=3D'hfpm'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z990.2' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z990.2' typename=3D'z990.2-s390x-cpu' usable=
=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -1495,7 +1495,7 @@
     <blocker name=3D'kmac-dea'/>
     <blocker name=3D'hfpm'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z14-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z14-base' typename=3D'z14-base-s390x-cpu' usab=
le=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -1531,7 +1531,7 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z890.2-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z890.2-base' typename=3D'z890.2-base-s390x-cpu=
' usable=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -1545,7 +1545,7 @@
     <blocker name=3D'kmac-dea'/>
     <blocker name=3D'hfpm'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z196' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z196' typename=3D'z196-s390x-cpu' usable=3D'no=
'>
     <blocker name=3D'pcc-xts-eaes-256'/>
     <blocker name=3D'pcc-xts-eaes-128'/>
     <blocker name=3D'pcc-xts-aes-256'/>
@@ -1665,7 +1665,7 @@
     <blocker name=3D'msa1'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z10EC' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z10EC' typename=3D'z10EC-s390x-cpu' usable=3D'=
no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -1693,7 +1693,7 @@
     <blocker name=3D'msa1'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z13s' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z13s' typename=3D'z13s-s390x-cpu' usable=3D'no=
'>
     <blocker name=3D'ppno-sha-512-drng'/>
     <blocker name=3D'pcc-xts-eaes-256'/>
     <blocker name=3D'pcc-xts-eaes-128'/>
@@ -1825,8 +1825,8 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z900' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'z10EC.3' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z900' typename=3D'z900-s390x-cpu' usable=3D'ye=
s'/>
+  <cpu type=3D'tcg' name=3D'z10EC.3' typename=3D'z10EC.3-s390x-cpu' usable=
=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -1854,7 +1854,7 @@
     <blocker name=3D'msa1'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z10EC.2-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z10EC.2-base' typename=3D'z10EC.2-base-s390x-c=
pu' usable=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -1877,7 +1877,7 @@
     <blocker name=3D'asnlxr'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z114-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z114-base' typename=3D'z114-base-s390x-cpu' us=
able=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -1904,7 +1904,7 @@
     <blocker name=3D'asnlxr'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z990.2-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z990.2-base' typename=3D'z990.2-base-s390x-cpu=
' usable=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -1918,7 +1918,7 @@
     <blocker name=3D'kmac-dea'/>
     <blocker name=3D'hfpm'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z9EC.2-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z9EC.2-base' typename=3D'z9EC.2-base-s390x-cpu=
' usable=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -1936,7 +1936,7 @@
     <blocker name=3D'asnlxr'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z890.3' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z890.3' typename=3D'z890.3-s390x-cpu' usable=
=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -1950,8 +1950,8 @@
     <blocker name=3D'kmac-dea'/>
     <blocker name=3D'hfpm'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z900.3-base' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'z9BC.2' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z900.3-base' typename=3D'z900.3-base-s390x-cpu=
' usable=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'z9BC.2' typename=3D'z9BC.2-s390x-cpu' usable=
=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -1972,7 +1972,7 @@
     <blocker name=3D'msa1'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z10BC' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z10BC' typename=3D'z10BC-s390x-cpu' usable=3D'=
no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -2000,7 +2000,7 @@
     <blocker name=3D'msa1'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z990.5' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z990.5' typename=3D'z990.5-s390x-cpu' usable=
=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -2014,7 +2014,7 @@
     <blocker name=3D'kmac-dea'/>
     <blocker name=3D'hfpm'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'zEC12.2' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'zEC12.2' typename=3D'zEC12.2-s390x-cpu' usable=
=3D'no'>
     <blocker name=3D'pcc-xts-eaes-256'/>
     <blocker name=3D'pcc-xts-eaes-128'/>
     <blocker name=3D'pcc-xts-aes-256'/>
@@ -2141,7 +2141,7 @@
     <blocker name=3D'msa1'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z10EC-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z10EC-base' typename=3D'z10EC-base-s390x-cpu' =
usable=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -2164,7 +2164,7 @@
     <blocker name=3D'asnlxr'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z9EC-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z9EC-base' typename=3D'z9EC-base-s390x-cpu' us=
able=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -2182,7 +2182,7 @@
     <blocker name=3D'asnlxr'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z9EC.3-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z9EC.3-base' typename=3D'z9EC.3-base-s390x-cpu=
' usable=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -2200,7 +2200,7 @@
     <blocker name=3D'asnlxr'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'zEC12' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'zEC12' typename=3D'zEC12-s390x-cpu' usable=3D'=
no'>
     <blocker name=3D'pcc-xts-eaes-256'/>
     <blocker name=3D'pcc-xts-eaes-128'/>
     <blocker name=3D'pcc-xts-aes-256'/>
@@ -2327,7 +2327,7 @@
     <blocker name=3D'msa1'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z990.5-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z990.5-base' typename=3D'z990.5-base-s390x-cpu=
' usable=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -2341,7 +2341,7 @@
     <blocker name=3D'kmac-dea'/>
     <blocker name=3D'hfpm'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z10BC-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z10BC-base' typename=3D'z10BC-base-s390x-cpu' =
usable=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -2364,8 +2364,8 @@
     <blocker name=3D'asnlxr'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z900-base' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'z13.2' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z900-base' typename=3D'z900-base-s390x-cpu' us=
able=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'z13.2' typename=3D'z13.2-s390x-cpu' usable=3D'=
no'>
     <blocker name=3D'ppno-sha-512-drng'/>
     <blocker name=3D'pcc-xts-eaes-256'/>
     <blocker name=3D'pcc-xts-eaes-128'/>
@@ -2497,7 +2497,7 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'zBC12-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'zBC12-base' typename=3D'zBC12-base-s390x-cpu' =
usable=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -2525,7 +2525,7 @@
     <blocker name=3D'asnlxr'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z13.2-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z13.2-base' typename=3D'z13.2-base-s390x-cpu' =
usable=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -2556,7 +2556,7 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z890.3-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z890.3-base' typename=3D'z890.3-base-s390x-cpu=
' usable=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -2570,7 +2570,7 @@
     <blocker name=3D'kmac-dea'/>
     <blocker name=3D'hfpm'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z990-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z990-base' typename=3D'z990-base-s390x-cpu' us=
able=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -2584,7 +2584,7 @@
     <blocker name=3D'kmac-dea'/>
     <blocker name=3D'hfpm'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z10EC.2' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z10EC.2' typename=3D'z10EC.2-s390x-cpu' usable=
=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -2612,7 +2612,7 @@
     <blocker name=3D'msa1'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z9BC' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z9BC' typename=3D'z9BC-s390x-cpu' usable=3D'no=
'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -2633,7 +2633,7 @@
     <blocker name=3D'msa1'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z10EC.3-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z10EC.3-base' typename=3D'z10EC.3-base-s390x-c=
pu' usable=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -2656,7 +2656,7 @@
     <blocker name=3D'asnlxr'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z990.3-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z990.3-base' typename=3D'z990.3-base-s390x-cpu=
' usable=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml b/tests/qemuc=
apabilitiesdata/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=3D'avx512pf' type=3D'boolean' value=3D'false'/>
     <property name=3D'xstore-en' type=3D'boolean' value=3D'false'/>
   </hostCPU>
-  <cpu type=3D'kvm' name=3D'max' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'host' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'qemu64' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'qemu32' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'phenom' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'max' typename=3D'max-x86_64-cpu' usable=3D'yes=
'/>
+  <cpu type=3D'kvm' name=3D'host' typename=3D'host-x86_64-cpu' usable=3D'y=
es'/>
+  <cpu type=3D'kvm' name=3D'base' typename=3D'base-x86_64-cpu' usable=3D'y=
es'/>
+  <cpu type=3D'kvm' name=3D'qemu64' typename=3D'qemu64-x86_64-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'qemu32' typename=3D'qemu32-x86_64-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'phenom' typename=3D'phenom-x86_64-cpu' usable=
=3D'no'>
     <blocker name=3D'mmxext'/>
     <blocker name=3D'fxsr-opt'/>
     <blocker name=3D'3dnowext'/>
@@ -725,22 +725,22 @@
     <blocker name=3D'sse4a'/>
     <blocker name=3D'npt'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'pentium3' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'pentium2' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'pentium' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'n270' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'kvm64' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'kvm32' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'coreduo' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'core2duo' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'athlon' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'pentium3' typename=3D'pentium3-x86_64-cpu' usa=
ble=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'pentium2' typename=3D'pentium2-x86_64-cpu' usa=
ble=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'pentium' typename=3D'pentium-x86_64-cpu' usabl=
e=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'n270' typename=3D'n270-x86_64-cpu' usable=3D'y=
es'/>
+  <cpu type=3D'kvm' name=3D'kvm64' typename=3D'kvm64-x86_64-cpu' usable=3D=
'yes'/>
+  <cpu type=3D'kvm' name=3D'kvm32' typename=3D'kvm32-x86_64-cpu' usable=3D=
'yes'/>
+  <cpu type=3D'kvm' name=3D'coreduo' typename=3D'coreduo-x86_64-cpu' usabl=
e=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'core2duo' typename=3D'core2duo-x86_64-cpu' usa=
ble=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'athlon' typename=3D'athlon-x86_64-cpu' usable=
=3D'no'>
     <blocker name=3D'mmxext'/>
     <blocker name=3D'3dnowext'/>
     <blocker name=3D'3dnow'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Westmere-IBRS' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Westmere' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Skylake-Server-IBRS' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Westmere-IBRS' typename=3D'Westmere-IBRS-x86_6=
4-cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Westmere' typename=3D'Westmere-x86_64-cpu' usa=
ble=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Skylake-Server-IBRS' typename=3D'Skylake-Serve=
r-IBRS-x86_64-cpu' usable=3D'no'>
     <blocker name=3D'avx512f'/>
     <blocker name=3D'avx512dq'/>
     <blocker name=3D'clwb'/>
@@ -751,7 +751,7 @@
     <blocker name=3D'avx512f'/>
     <blocker name=3D'avx512f'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Skylake-Server' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Skylake-Server' typename=3D'Skylake-Server-x86=
_64-cpu' usable=3D'no'>
     <blocker name=3D'avx512f'/>
     <blocker name=3D'avx512dq'/>
     <blocker name=3D'clwb'/>
@@ -762,33 +762,33 @@
     <blocker name=3D'avx512f'/>
     <blocker name=3D'avx512f'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Skylake-Client-IBRS' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Skylake-Client' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'SandyBridge-IBRS' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'SandyBridge' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Penryn' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Opteron_G5' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Skylake-Client-IBRS' typename=3D'Skylake-Clien=
t-IBRS-x86_64-cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Skylake-Client' typename=3D'Skylake-Client-x86=
_64-cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'SandyBridge-IBRS' typename=3D'SandyBridge-IBRS=
-x86_64-cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'SandyBridge' typename=3D'SandyBridge-x86_64-cp=
u' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Penryn' typename=3D'Penryn-x86_64-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Opteron_G5' typename=3D'Opteron_G5-x86_64-cpu'=
 usable=3D'no'>
     <blocker name=3D'sse4a'/>
     <blocker name=3D'misalignsse'/>
     <blocker name=3D'xop'/>
     <blocker name=3D'fma4'/>
     <blocker name=3D'tbm'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Opteron_G4' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Opteron_G4' typename=3D'Opteron_G4-x86_64-cpu'=
 usable=3D'no'>
     <blocker name=3D'sse4a'/>
     <blocker name=3D'misalignsse'/>
     <blocker name=3D'xop'/>
     <blocker name=3D'fma4'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Opteron_G3' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Opteron_G3' typename=3D'Opteron_G3-x86_64-cpu'=
 usable=3D'no'>
     <blocker name=3D'sse4a'/>
     <blocker name=3D'misalignsse'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Opteron_G2' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Opteron_G1' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Nehalem-IBRS' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Nehalem' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'KnightsMill' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Opteron_G2' typename=3D'Opteron_G2-x86_64-cpu'=
 usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Opteron_G1' typename=3D'Opteron_G1-x86_64-cpu'=
 usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Nehalem-IBRS' typename=3D'Nehalem-IBRS-x86_64-=
cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Nehalem' typename=3D'Nehalem-x86_64-cpu' usabl=
e=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'KnightsMill' typename=3D'KnightsMill-x86_64-cp=
u' usable=3D'no'>
     <blocker name=3D'avx512f'/>
     <blocker name=3D'avx512pf'/>
     <blocker name=3D'avx512er'/>
@@ -800,13 +800,13 @@
     <blocker name=3D'avx512f'/>
     <blocker name=3D'avx512f'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'IvyBridge-IBRS' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'IvyBridge' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Haswell-noTSX-IBRS' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Haswell-noTSX' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Haswell-IBRS' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Haswell' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'EPYC-IBPB' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'IvyBridge-IBRS' typename=3D'IvyBridge-IBRS-x86=
_64-cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'IvyBridge' typename=3D'IvyBridge-x86_64-cpu' u=
sable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Haswell-noTSX-IBRS' typename=3D'Haswell-noTSX-=
IBRS-x86_64-cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Haswell-noTSX' typename=3D'Haswell-noTSX-x86_6=
4-cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Haswell-IBRS' typename=3D'Haswell-IBRS-x86_64-=
cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Haswell' typename=3D'Haswell-x86_64-cpu' usabl=
e=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'EPYC-IBPB' typename=3D'EPYC-IBPB-x86_64-cpu' u=
sable=3D'no'>
     <blocker name=3D'sha-ni'/>
     <blocker name=3D'mmxext'/>
     <blocker name=3D'fxsr-opt'/>
@@ -816,7 +816,7 @@
     <blocker name=3D'osvw'/>
     <blocker name=3D'ibpb'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'EPYC' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'EPYC' typename=3D'EPYC-x86_64-cpu' usable=3D'n=
o'>
     <blocker name=3D'sha-ni'/>
     <blocker name=3D'mmxext'/>
     <blocker name=3D'fxsr-opt'/>
@@ -825,36 +825,36 @@
     <blocker name=3D'misalignsse'/>
     <blocker name=3D'osvw'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Conroe' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Broadwell-noTSX-IBRS' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Broadwell-noTSX' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Broadwell-IBRS' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Broadwell' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'486' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'max' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'host' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Conroe' typename=3D'Conroe-x86_64-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Broadwell-noTSX-IBRS' typename=3D'Broadwell-no=
TSX-IBRS-x86_64-cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Broadwell-noTSX' typename=3D'Broadwell-noTSX-x=
86_64-cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Broadwell-IBRS' typename=3D'Broadwell-IBRS-x86=
_64-cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Broadwell' typename=3D'Broadwell-x86_64-cpu' u=
sable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'486' typename=3D'486-x86_64-cpu' usable=3D'yes=
'/>
+  <cpu type=3D'tcg' name=3D'max' typename=3D'max-x86_64-cpu' usable=3D'yes=
'/>
+  <cpu type=3D'tcg' name=3D'host' typename=3D'host-x86_64-cpu' usable=3D'n=
o'>
     <blocker name=3D'kvm'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'base' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'qemu64' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'qemu32' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'phenom' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'base' typename=3D'base-x86_64-cpu' usable=3D'y=
es'/>
+  <cpu type=3D'tcg' name=3D'qemu64' typename=3D'qemu64-x86_64-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'qemu32' typename=3D'qemu32-x86_64-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'phenom' typename=3D'phenom-x86_64-cpu' usable=
=3D'no'>
     <blocker name=3D'fxsr-opt'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'pentium3' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'pentium2' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'pentium' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'n270' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'kvm64' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'kvm32' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'coreduo' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'core2duo' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'athlon' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'Westmere-IBRS' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'pentium3' typename=3D'pentium3-x86_64-cpu' usa=
ble=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'pentium2' typename=3D'pentium2-x86_64-cpu' usa=
ble=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'pentium' typename=3D'pentium-x86_64-cpu' usabl=
e=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'n270' typename=3D'n270-x86_64-cpu' usable=3D'y=
es'/>
+  <cpu type=3D'tcg' name=3D'kvm64' typename=3D'kvm64-x86_64-cpu' usable=3D=
'yes'/>
+  <cpu type=3D'tcg' name=3D'kvm32' typename=3D'kvm32-x86_64-cpu' usable=3D=
'yes'/>
+  <cpu type=3D'tcg' name=3D'coreduo' typename=3D'coreduo-x86_64-cpu' usabl=
e=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'core2duo' typename=3D'core2duo-x86_64-cpu' usa=
ble=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'athlon' typename=3D'athlon-x86_64-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'Westmere-IBRS' typename=3D'Westmere-IBRS-x86_6=
4-cpu' usable=3D'no'>
     <blocker name=3D'spec-ctrl'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Westmere' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'Skylake-Server-IBRS' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Westmere' typename=3D'Westmere-x86_64-cpu' usa=
ble=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'Skylake-Server-IBRS' typename=3D'Skylake-Serve=
r-IBRS-x86_64-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -876,7 +876,7 @@
     <blocker name=3D'3dnowprefetch'/>
     <blocker name=3D'xsavec'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Skylake-Server' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Skylake-Server' typename=3D'Skylake-Server-x86=
_64-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -897,7 +897,7 @@
     <blocker name=3D'3dnowprefetch'/>
     <blocker name=3D'xsavec'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Skylake-Client-IBRS' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Skylake-Client-IBRS' typename=3D'Skylake-Clien=
t-IBRS-x86_64-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -914,7 +914,7 @@
     <blocker name=3D'3dnowprefetch'/>
     <blocker name=3D'xsavec'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Skylake-Client' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Skylake-Client' typename=3D'Skylake-Client-x86=
_64-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -930,19 +930,19 @@
     <blocker name=3D'3dnowprefetch'/>
     <blocker name=3D'xsavec'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'SandyBridge-IBRS' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'SandyBridge-IBRS' typename=3D'SandyBridge-IBRS=
-x86_64-cpu' usable=3D'no'>
     <blocker name=3D'x2apic'/>
     <blocker name=3D'tsc-deadline'/>
     <blocker name=3D'avx'/>
     <blocker name=3D'spec-ctrl'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'SandyBridge' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'SandyBridge' typename=3D'SandyBridge-x86_64-cp=
u' usable=3D'no'>
     <blocker name=3D'x2apic'/>
     <blocker name=3D'tsc-deadline'/>
     <blocker name=3D'avx'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Penryn' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'Opteron_G5' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Penryn' typename=3D'Penryn-x86_64-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'Opteron_G5' typename=3D'Opteron_G5-x86_64-cpu'=
 usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'avx'/>
     <blocker name=3D'f16c'/>
@@ -952,23 +952,23 @@
     <blocker name=3D'fma4'/>
     <blocker name=3D'tbm'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Opteron_G4' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Opteron_G4' typename=3D'Opteron_G4-x86_64-cpu'=
 usable=3D'no'>
     <blocker name=3D'avx'/>
     <blocker name=3D'misalignsse'/>
     <blocker name=3D'3dnowprefetch'/>
     <blocker name=3D'xop'/>
     <blocker name=3D'fma4'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Opteron_G3' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Opteron_G3' typename=3D'Opteron_G3-x86_64-cpu'=
 usable=3D'no'>
     <blocker name=3D'misalignsse'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Opteron_G2' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'Opteron_G1' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'Nehalem-IBRS' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Opteron_G2' typename=3D'Opteron_G2-x86_64-cpu'=
 usable=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'Opteron_G1' typename=3D'Opteron_G1-x86_64-cpu'=
 usable=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'Nehalem-IBRS' typename=3D'Nehalem-IBRS-x86_64-=
cpu' usable=3D'no'>
     <blocker name=3D'spec-ctrl'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Nehalem' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'KnightsMill' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Nehalem' typename=3D'Nehalem-x86_64-cpu' usabl=
e=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'KnightsMill' typename=3D'KnightsMill-x86_64-cp=
u' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'x2apic'/>
     <blocker name=3D'tsc-deadline'/>
@@ -986,7 +986,7 @@
     <blocker name=3D'avx512-4fmaps'/>
     <blocker name=3D'3dnowprefetch'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'IvyBridge-IBRS' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'IvyBridge-IBRS' typename=3D'IvyBridge-IBRS-x86=
_64-cpu' usable=3D'no'>
     <blocker name=3D'x2apic'/>
     <blocker name=3D'tsc-deadline'/>
     <blocker name=3D'avx'/>
@@ -994,14 +994,14 @@
     <blocker name=3D'rdrand'/>
     <blocker name=3D'spec-ctrl'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'IvyBridge' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'IvyBridge' typename=3D'IvyBridge-x86_64-cpu' u=
sable=3D'no'>
     <blocker name=3D'x2apic'/>
     <blocker name=3D'tsc-deadline'/>
     <blocker name=3D'avx'/>
     <blocker name=3D'f16c'/>
     <blocker name=3D'rdrand'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Haswell-noTSX-IBRS' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Haswell-noTSX-IBRS' typename=3D'Haswell-noTSX-=
IBRS-x86_64-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1013,7 +1013,7 @@
     <blocker name=3D'invpcid'/>
     <blocker name=3D'spec-ctrl'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Haswell-noTSX' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Haswell-noTSX' typename=3D'Haswell-noTSX-x86_6=
4-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1024,7 +1024,7 @@
     <blocker name=3D'avx2'/>
     <blocker name=3D'invpcid'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Haswell-IBRS' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Haswell-IBRS' typename=3D'Haswell-IBRS-x86_64-=
cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1038,7 +1038,7 @@
     <blocker name=3D'rtm'/>
     <blocker name=3D'spec-ctrl'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Haswell' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Haswell' typename=3D'Haswell-x86_64-cpu' usabl=
e=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1051,7 +1051,7 @@
     <blocker name=3D'invpcid'/>
     <blocker name=3D'rtm'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'EPYC-IBPB' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'EPYC-IBPB' typename=3D'EPYC-IBPB-x86_64-cpu' u=
sable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'avx'/>
     <blocker name=3D'f16c'/>
@@ -1067,7 +1067,7 @@
     <blocker name=3D'ibpb'/>
     <blocker name=3D'xsavec'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'EPYC' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'EPYC' typename=3D'EPYC-x86_64-cpu' usable=3D'n=
o'>
     <blocker name=3D'fma'/>
     <blocker name=3D'avx'/>
     <blocker name=3D'f16c'/>
@@ -1082,8 +1082,8 @@
     <blocker name=3D'topoext'/>
     <blocker name=3D'xsavec'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Conroe' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'Broadwell-noTSX-IBRS' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Conroe' typename=3D'Conroe-x86_64-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'Broadwell-noTSX-IBRS' typename=3D'Broadwell-no=
TSX-IBRS-x86_64-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1097,7 +1097,7 @@
     <blocker name=3D'spec-ctrl'/>
     <blocker name=3D'3dnowprefetch'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Broadwell-noTSX' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Broadwell-noTSX' typename=3D'Broadwell-noTSX-x=
86_64-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1110,7 +1110,7 @@
     <blocker name=3D'rdseed'/>
     <blocker name=3D'3dnowprefetch'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Broadwell-IBRS' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Broadwell-IBRS' typename=3D'Broadwell-IBRS-x86=
_64-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1126,7 +1126,7 @@
     <blocker name=3D'spec-ctrl'/>
     <blocker name=3D'3dnowprefetch'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Broadwell' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Broadwell' typename=3D'Broadwell-x86_64-cpu' u=
sable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1141,7 +1141,7 @@
     <blocker name=3D'rdseed'/>
     <blocker name=3D'3dnowprefetch'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'486' usable=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'486' typename=3D'486-x86_64-cpu' usable=3D'yes=
'/>
   <machine name=3D'pc-i440fx-3.0' alias=3D'pc' hotplugCpus=3D'yes' maxCpus=
=3D'255' default=3D'yes'/>
   <machine name=3D'isapc' hotplugCpus=3D'yes' maxCpus=3D'1'/>
   <machine name=3D'pc-1.1' hotplugCpus=3D'yes' maxCpus=3D'255'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml b/tests/qemuca=
pabilitiesdata/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=3D'kvm' name=3D'default'/>
-  <cpu type=3D'kvm' name=3D'ppc'/>
-  <cpu type=3D'kvm' name=3D'ppc32'/>
-  <cpu type=3D'kvm' name=3D'ppc64'/>
-  <cpu type=3D'kvm' name=3D'power9'/>
-  <cpu type=3D'kvm' name=3D'power8nvl'/>
-  <cpu type=3D'kvm' name=3D'power8'/>
-  <cpu type=3D'kvm' name=3D'power8e'/>
-  <cpu type=3D'kvm' name=3D'power7+'/>
-  <cpu type=3D'kvm' name=3D'power7'/>
-  <cpu type=3D'kvm' name=3D'power5gs'/>
-  <cpu type=3D'kvm' name=3D'power5+'/>
-  <cpu type=3D'kvm' name=3D'970mp'/>
-  <cpu type=3D'kvm' name=3D'970fx'/>
-  <cpu type=3D'kvm' name=3D'970'/>
-  <cpu type=3D'kvm' name=3D'apollo7pm'/>
-  <cpu type=3D'kvm' name=3D'7457a'/>
-  <cpu type=3D'kvm' name=3D'7447a'/>
-  <cpu type=3D'kvm' name=3D'apollo7'/>
-  <cpu type=3D'kvm' name=3D'7457'/>
-  <cpu type=3D'kvm' name=3D'7447'/>
-  <cpu type=3D'kvm' name=3D'apollo6'/>
-  <cpu type=3D'kvm' name=3D'7455'/>
-  <cpu type=3D'kvm' name=3D'7445'/>
-  <cpu type=3D'kvm' name=3D'7451'/>
-  <cpu type=3D'kvm' name=3D'7441'/>
-  <cpu type=3D'kvm' name=3D'vger'/>
-  <cpu type=3D'kvm' name=3D'7450'/>
-  <cpu type=3D'kvm' name=3D'7448'/>
-  <cpu type=3D'kvm' name=3D'nitro'/>
-  <cpu type=3D'kvm' name=3D'7410'/>
-  <cpu type=3D'kvm' name=3D'g4'/>
-  <cpu type=3D'kvm' name=3D'max'/>
-  <cpu type=3D'kvm' name=3D'7400'/>
-  <cpu type=3D'kvm' name=3D'goldfinger'/>
-  <cpu type=3D'kvm' name=3D'755'/>
-  <cpu type=3D'kvm' name=3D'745'/>
-  <cpu type=3D'kvm' name=3D'lonestar'/>
-  <cpu type=3D'kvm' name=3D'750l'/>
-  <cpu type=3D'kvm' name=3D'750gx'/>
-  <cpu type=3D'kvm' name=3D'750fx'/>
-  <cpu type=3D'kvm' name=3D'750cxe'/>
-  <cpu type=3D'kvm' name=3D'750cx'/>
-  <cpu type=3D'kvm' name=3D'750cl'/>
-  <cpu type=3D'kvm' name=3D'conan/doyle'/>
-  <cpu type=3D'kvm' name=3D'g3'/>
-  <cpu type=3D'kvm' name=3D'typhoon'/>
-  <cpu type=3D'kvm' name=3D'750'/>
-  <cpu type=3D'kvm' name=3D'arthur'/>
-  <cpu type=3D'kvm' name=3D'740'/>
-  <cpu type=3D'kvm' name=3D'mach5'/>
-  <cpu type=3D'kvm' name=3D'sirocco'/>
-  <cpu type=3D'kvm' name=3D'604e'/>
-  <cpu type=3D'kvm' name=3D'goldeneye'/>
-  <cpu type=3D'kvm' name=3D'603r'/>
-  <cpu type=3D'kvm' name=3D'vaillant'/>
-  <cpu type=3D'kvm' name=3D'stretch'/>
-  <cpu type=3D'kvm' name=3D'603e'/>
-  <cpu type=3D'kvm' name=3D'vanilla'/>
-  <cpu type=3D'kvm' name=3D'601v'/>
-  <cpu type=3D'kvm' name=3D'601'/>
-  <cpu type=3D'kvm' name=3D'mpc8560'/>
-  <cpu type=3D'kvm' name=3D'mpc8555e'/>
-  <cpu type=3D'kvm' name=3D'mpc8555'/>
-  <cpu type=3D'kvm' name=3D'mpc8548e'/>
-  <cpu type=3D'kvm' name=3D'mpc8548'/>
-  <cpu type=3D'kvm' name=3D'mpc8547e'/>
-  <cpu type=3D'kvm' name=3D'mpc8545e'/>
-  <cpu type=3D'kvm' name=3D'mpc8545'/>
-  <cpu type=3D'kvm' name=3D'mpc8544e'/>
-  <cpu type=3D'kvm' name=3D'mpc8544'/>
-  <cpu type=3D'kvm' name=3D'mpc8543e'/>
-  <cpu type=3D'kvm' name=3D'mpc8543'/>
-  <cpu type=3D'kvm' name=3D'mpc8541e'/>
-  <cpu type=3D'kvm' name=3D'mpc8541'/>
-  <cpu type=3D'kvm' name=3D'mpc8540'/>
-  <cpu type=3D'kvm' name=3D'mpc8533e'/>
-  <cpu type=3D'kvm' name=3D'mpc8533'/>
-  <cpu type=3D'kvm' name=3D'e500v2'/>
-  <cpu type=3D'kvm' name=3D'e500v1'/>
-  <cpu type=3D'kvm' name=3D'e500'/>
-  <cpu type=3D'kvm' name=3D'mpc8347ea'/>
-  <cpu type=3D'kvm' name=3D'mpc8347e'/>
-  <cpu type=3D'kvm' name=3D'mpc8347a'/>
-  <cpu type=3D'kvm' name=3D'mpc8347'/>
-  <cpu type=3D'kvm' name=3D'e300'/>
-  <cpu type=3D'kvm' name=3D'e200'/>
-  <cpu type=3D'kvm' name=3D'mpc8280'/>
-  <cpu type=3D'kvm' name=3D'mpc8275'/>
-  <cpu type=3D'kvm' name=3D'mpc8272'/>
-  <cpu type=3D'kvm' name=3D'mpc8271'/>
-  <cpu type=3D'kvm' name=3D'mpc8270'/>
-  <cpu type=3D'kvm' name=3D'mpc8266_hip4'/>
-  <cpu type=3D'kvm' name=3D'mpc8266_hip3'/>
-  <cpu type=3D'kvm' name=3D'mpc8266'/>
-  <cpu type=3D'kvm' name=3D'mpc8265_hip4'/>
-  <cpu type=3D'kvm' name=3D'mpc8265_hip3'/>
-  <cpu type=3D'kvm' name=3D'mpc8265'/>
-  <cpu type=3D'kvm' name=3D'mpc8264_hip4'/>
-  <cpu type=3D'kvm' name=3D'mpc8264_hip3'/>
-  <cpu type=3D'kvm' name=3D'mpc8264'/>
-  <cpu type=3D'kvm' name=3D'mpc8260_hip4'/>
-  <cpu type=3D'kvm' name=3D'mpc8260_hip3'/>
-  <cpu type=3D'kvm' name=3D'mpc8260'/>
-  <cpu type=3D'kvm' name=3D'mpc8255_hip4'/>
-  <cpu type=3D'kvm' name=3D'mpc8255_hip3'/>
-  <cpu type=3D'kvm' name=3D'mpc8255'/>
-  <cpu type=3D'kvm' name=3D'mpc8250_hip4'/>
-  <cpu type=3D'kvm' name=3D'mpc8250_hip3'/>
-  <cpu type=3D'kvm' name=3D'mpc8250'/>
-  <cpu type=3D'kvm' name=3D'mpc8248'/>
-  <cpu type=3D'kvm' name=3D'mpc8247'/>
-  <cpu type=3D'kvm' name=3D'mpc8245'/>
-  <cpu type=3D'kvm' name=3D'mpc8241'/>
-  <cpu type=3D'kvm' name=3D'powerquicc-ii'/>
-  <cpu type=3D'kvm' name=3D'mpc82xx'/>
-  <cpu type=3D'kvm' name=3D'mpc5200b'/>
-  <cpu type=3D'kvm' name=3D'mpc5200'/>
-  <cpu type=3D'kvm' name=3D'mpc52xx'/>
-  <cpu type=3D'kvm' name=3D'mpc8240'/>
-  <cpu type=3D'kvm' name=3D'460ex'/>
-  <cpu type=3D'kvm' name=3D'440ep'/>
-  <cpu type=3D'kvm' name=3D'x2vp50'/>
-  <cpu type=3D'kvm' name=3D'x2vp7'/>
-  <cpu type=3D'kvm' name=3D'405gpe'/>
-  <cpu type=3D'kvm' name=3D'405gp'/>
-  <cpu type=3D'kvm' name=3D'405cr'/>
-  <cpu type=3D'kvm' name=3D'405'/>
-  <cpu type=3D'kvm' name=3D'403'/>
-  <cpu type=3D'kvm' name=3D'mpc8547e_v21'/>
-  <cpu type=3D'kvm' name=3D'750cl_v1.0'/>
-  <cpu type=3D'kvm' name=3D'7457a_v1.1'/>
-  <cpu type=3D'kvm' name=3D'g2gp'/>
-  <cpu type=3D'kvm' name=3D'750cxe_v2.1'/>
-  <cpu type=3D'kvm' name=3D'755_v2.7'/>
-  <cpu type=3D'kvm' name=3D'750_v2.1'/>
-  <cpu type=3D'kvm' name=3D'755_v2.2'/>
-  <cpu type=3D'kvm' name=3D'745_v2.0'/>
-  <cpu type=3D'kvm' name=3D'mpc8377'/>
-  <cpu type=3D'kvm' name=3D'7455_v1.0'/>
-  <cpu type=3D'kvm' name=3D'mpc8545_v21'/>
-  <cpu type=3D'kvm' name=3D'mpc8548_v11'/>
-  <cpu type=3D'kvm' name=3D'405d4'/>
-  <cpu type=3D'kvm' name=3D'g2le'/>
-  <cpu type=3D'kvm' name=3D'g2hip3'/>
-  <cpu type=3D'kvm' name=3D'750e'/>
-  <cpu type=3D'kvm' name=3D'mpc8572'/>
-  <cpu type=3D'kvm' name=3D'970fx_v2.0'/>
-  <cpu type=3D'kvm' name=3D'750fx_v2.0'/>
-  <cpu type=3D'kvm' name=3D'603p'/>
-  <cpu type=3D'kvm' name=3D'405gpb'/>
-  <cpu type=3D'kvm' name=3D'7400_v2.7'/>
-  <cpu type=3D'kvm' name=3D'mpc8544e_v10'/>
-  <cpu type=3D'kvm' name=3D'e500v2_v10'/>
-  <cpu type=3D'kvm' name=3D'e500mc'/>
-  <cpu type=3D'kvm' name=3D'603e7v1'/>
-  <cpu type=3D'kvm' name=3D'970mp_v1.0'/>
-  <cpu type=3D'kvm' name=3D'740e'/>
-  <cpu type=3D'kvm' name=3D'405crc'/>
-  <cpu type=3D'kvm' name=3D'403ga'/>
-  <cpu type=3D'kvm' name=3D'7447a_v1.0'/>
-  <cpu type=3D'kvm' name=3D'7400_v2.2'/>
-  <cpu type=3D'kvm' name=3D'e300c1'/>
-  <cpu type=3D'kvm' name=3D'mpc8572e'/>
-  <cpu type=3D'kvm' name=3D'e500v2_v21'/>
-  <cpu type=3D'kvm' name=3D'970fx_v1.0'/>
-  <cpu type=3D'kvm' name=3D'750gx_v1.2'/>
-  <cpu type=3D'kvm' name=3D'750fx_v1.0'/>
-  <cpu type=3D'kvm' name=3D'7457_v1.1'/>
-  <cpu type=3D'kvm' name=3D'970fx_v3.0'/>
-  <cpu type=3D'kvm' name=3D'604e_v2.2'/>
-  <cpu type=3D'kvm' name=3D'755_v2.6'/>
-  <cpu type=3D'kvm' name=3D'401a1'/>
-  <cpu type=3D'kvm' name=3D'power9_v1.0'/>
-  <cpu type=3D'kvm' name=3D'npe405h'/>
-  <cpu type=3D'kvm' name=3D'g2ls'/>
-  <cpu type=3D'kvm' name=3D'7410_v1.4'/>
-  <cpu type=3D'kvm' name=3D'750_v2.0'/>
-  <cpu type=3D'kvm' name=3D'401b2'/>
-  <cpu type=3D'kvm' name=3D'mpc8349'/>
-  <cpu type=3D'kvm' name=3D'mpc8347ep'/>
-  <cpu type=3D'kvm' name=3D'7445_v3.2'/>
-  <cpu type=3D'kvm' name=3D'mpc8540_v21'/>
-  <cpu type=3D'kvm' name=3D'mpc8543_v11'/>
-  <cpu type=3D'kvm' name=3D'403gcx'/>
-  <cpu type=3D'kvm' name=3D'745_v2.4'/>
-  <cpu type=3D'kvm' name=3D'mpc8548_v21'/>
-  <cpu type=3D'kvm' name=3D'750l_v3.2'/>
-  <cpu type=3D'kvm' name=3D'750_v1.0'/>
-  <cpu type=3D'kvm' name=3D'755_v1.1'/>
-  <cpu type=3D'kvm' name=3D'e500_v10'/>
-  <cpu type=3D'kvm' name=3D'750cxe_v3.0'/>
-  <cpu type=3D'kvm' name=3D'mpc8541e_v10'/>
-  <cpu type=3D'kvm' name=3D'mpc8347p'/>
-  <cpu type=3D'kvm' name=3D'mpc8555e_v10'/>
-  <cpu type=3D'kvm' name=3D'power9_v2.0'/>
-  <cpu type=3D'kvm' name=3D'power7_v2.3'/>
-  <cpu type=3D'kvm' name=3D'603e7v'/>
-  <cpu type=3D'kvm' name=3D'mpc8543e_v11'/>
-  <cpu type=3D'kvm' name=3D'750_v3.0'/>
-  <cpu type=3D'kvm' name=3D'7400_v2.6'/>
-  <cpu type=3D'kvm' name=3D'405gpa'/>
-  <cpu type=3D'kvm' name=3D'440epx'/>
-  <cpu type=3D'kvm' name=3D'750l_v2.2'/>
-  <cpu type=3D'kvm' name=3D'e200z6'/>
-  <cpu type=3D'kvm' name=3D'mpc8547e_v20'/>
-  <cpu type=3D'kvm' name=3D'7457a_v1.0'/>
-  <cpu type=3D'kvm' name=3D'mpc8349ea'/>
-  <cpu type=3D'kvm' name=3D'e500v2_v20'/>
-  <cpu type=3D'kvm' name=3D'power8nvl_v1.0'/>
-  <cpu type=3D'kvm' name=3D'mpc8540_v10'/>
-  <cpu type=3D'kvm' name=3D'755_v2.1'/>
-  <cpu type=3D'kvm' name=3D'745_v2.8'/>
-  <cpu type=3D'kvm' name=3D'npe405l'/>
-  <cpu type=3D'kvm' name=3D'mpc8343ea'/>
-  <cpu type=3D'kvm' name=3D'mpc8545_v20'/>
-  <cpu type=3D'kvm' name=3D'mpc8548_v10'/>
-  <cpu type=3D'kvm' name=3D'7455_v3.4'/>
-  <cpu type=3D'kvm' name=3D'740_v2.2'/>
-  <cpu type=3D'kvm' name=3D'7448_v1.1'/>
-  <cpu type=3D'kvm' name=3D'7400_v1.1'/>
-  <cpu type=3D'kvm' name=3D'mpc8347et'/>
-  <cpu type=3D'kvm' name=3D'7441_v2.10'/>
-  <cpu type=3D'kvm' name=3D'603e_v1.4'/>
-  <cpu type=3D'kvm' name=3D'mpc8543_v10'/>
-  <cpu type=3D'kvm' name=3D'401c2'/>
-  <cpu type=3D'kvm' name=3D'7451_v2.10'/>
-  <cpu type=3D'kvm' name=3D'750cx_v2.2'/>
-  <cpu type=3D'kvm' name=3D'mpc8543_v21'/>
-  <cpu type=3D'kvm' name=3D'603e7'/>
-  <cpu type=3D'kvm' name=3D'7448_v2.1'/>
-  <cpu type=3D'kvm' name=3D'7441_v2.3'/>
-  <cpu type=3D'kvm' name=3D'405crb'/>
-  <cpu type=3D'kvm' name=3D'604'/>
-  <cpu type=3D'kvm' name=3D'7400_v2.1'/>
-  <cpu type=3D'kvm' name=3D'440-xilinx-w-dfpu'/>
-  <cpu type=3D'kvm' name=3D'7445_v2.1'/>
-  <cpu type=3D'kvm' name=3D'cobra'/>
-  <cpu type=3D'kvm' name=3D'e500_v20'/>
-  <cpu type=3D'kvm' name=3D'mpc8541_v11'/>
-  <cpu type=3D'kvm' name=3D'750gx_v1.1'/>
-  <cpu type=3D'kvm' name=3D'750cxe_v2.4'/>
-  <cpu type=3D'kvm' name=3D'mpc8641d'/>
-  <cpu type=3D'kvm' name=3D'mpc8543e_v21'/>
-  <cpu type=3D'kvm' name=3D'750l_v2.1'/>
-  <cpu type=3D'kvm' name=3D'7457_v1.0'/>
-  <cpu type=3D'kvm' name=3D'7450_v1.2'/>
-  <cpu type=3D'kvm' name=3D'755_v2.5'/>
-  <cpu type=3D'kvm' name=3D'7410_v1.3'/>
-  <cpu type=3D'kvm' name=3D'745_v2.3'/>
-  <cpu type=3D'kvm' name=3D'755_v2.0'/>
-  <cpu type=3D'kvm' name=3D'e500v2_v30'/>
-  <cpu type=3D'kvm' name=3D'7455_v3.3'/>
-  <cpu type=3D'kvm' name=3D'mpc8540_v20'/>
-  <cpu type=3D'kvm' name=3D'405d2'/>
-  <cpu type=3D'kvm' name=3D'mpc8560_v21'/>
-  <cpu type=3D'kvm' name=3D'mpc8343'/>
-  <cpu type=3D'kvm' name=3D'mpc8548_v20'/>
-  <cpu type=3D'kvm' name=3D'mpc8347t'/>
-  <cpu type=3D'kvm' name=3D'755_v1.0'/>
-  <cpu type=3D'kvm' name=3D'603e_v1.3'/>
-  <cpu type=3D'kvm' name=3D'host'/>
-  <cpu type=3D'kvm' name=3D'mpc8543e_v10'/>
-  <cpu type=3D'kvm' name=3D'mpc8347eap'/>
-  <cpu type=3D'kvm' name=3D'mpc8548e_v11'/>
-  <cpu type=3D'kvm' name=3D'mpc8543_v20'/>
-  <cpu type=3D'kvm' name=3D'401d2'/>
-  <cpu type=3D'kvm' name=3D'power8_v2.0'/>
-  <cpu type=3D'kvm' name=3D'740_v3.1'/>
-  <cpu type=3D'kvm' name=3D'e200z5'/>
-  <cpu type=3D'kvm' name=3D'405cra'/>
-  <cpu type=3D'kvm' name=3D'7400_v2.0'/>
-  <cpu type=3D'kvm' name=3D'750cxe_v2.3'/>
-  <cpu type=3D'kvm' name=3D'745_v2.7'/>
-  <cpu type=3D'kvm' name=3D'mpc8560_v10'/>
-  <cpu type=3D'kvm' name=3D'e5500'/>
-  <cpu type=3D'kvm' name=3D'mpc8544_v11'/>
-  <cpu type=3D'kvm' name=3D'7448_v1.0'/>
-  <cpu type=3D'kvm' name=3D'401e2'/>
-  <cpu type=3D'kvm' name=3D'740_v2.1'/>
-  <cpu type=3D'kvm' name=3D'745_v2.2'/>
-  <cpu type=3D'kvm' name=3D'7400_v1.0'/>
-  <cpu type=3D'kvm' name=3D'7410_v1.2'/>
-  <cpu type=3D'kvm' name=3D'x2vp4'/>
-  <cpu type=3D'kvm' name=3D'mpc8347ap'/>
-  <cpu type=3D'kvm' name=3D'mpc8533_v11'/>
-  <cpu type=3D'kvm' name=3D'mpc5200b_v21'/>
-  <cpu type=3D'kvm' name=3D'750fx_v2.3'/>
-  <cpu type=3D'kvm' name=3D'601_v2'/>
-  <cpu type=3D'kvm' name=3D'g2legp3'/>
-  <cpu type=3D'kvm' name=3D'604e_v1.0'/>
-  <cpu type=3D'kvm' name=3D'750cx_v2.1'/>
-  <cpu type=3D'kvm' name=3D'mpc8610'/>
-  <cpu type=3D'kvm' name=3D'g2h4'/>
-  <cpu type=3D'kvm' name=3D'750l_v3.0'/>
-  <cpu type=3D'kvm' name=3D'mpc8377e'/>
-  <cpu type=3D'kvm' name=3D'e300c4'/>
-  <cpu type=3D'kvm' name=3D'mpc5200_v12'/>
-  <cpu type=3D'kvm' name=3D'7448_v2.0'/>
-  <cpu type=3D'kvm' name=3D'7450_v2.1'/>
-  <cpu type=3D'kvm' name=3D'750cxe_v3.1b'/>
-  <cpu type=3D'kvm' name=3D'g2'/>
-  <cpu type=3D'kvm' name=3D'7400_v2.9'/>
-  <cpu type=3D'kvm' name=3D'405gpd'/>
-  <cpu type=3D'kvm' name=3D'603'/>
-  <cpu type=3D'kvm' name=3D'603e7t'/>
-  <cpu type=3D'kvm' name=3D'mpc8555_v11'/>
-  <cpu type=3D'kvm' name=3D'750gx_v1.0'/>
-  <cpu type=3D'kvm' name=3D'mpc8541_v10'/>
-  <cpu type=3D'kvm' name=3D'mpc8543e_v20'/>
-  <cpu type=3D'kvm' name=3D'750fl'/>
-  <cpu type=3D'kvm' name=3D'750l_v2.0'/>
-  <cpu type=3D'kvm' name=3D'stb04'/>
-  <cpu type=3D'kvm' name=3D'mpc8548e_v21'/>
-  <cpu type=3D'kvm' name=3D'x2vp20'/>
-  <cpu type=3D'kvm' name=3D'405ez'/>
-  <cpu type=3D'kvm' name=3D'e600'/>
-  <cpu type=3D'kvm' name=3D'7450_v1.1'/>
-  <cpu type=3D'kvm' name=3D'755_v2.4'/>
-  <cpu type=3D'kvm' name=3D'mpc8379'/>
-  <cpu type=3D'kvm' name=3D'7445_v1.0'/>
-  <cpu type=3D'kvm' name=3D'7447_v1.1'/>
-  <cpu type=3D'kvm' name=3D'603e_v2.2'/>
-  <cpu type=3D'kvm' name=3D'603e_v4'/>
-  <cpu type=3D'kvm' name=3D'g2legp'/>
-  <cpu type=3D'kvm' name=3D'7455_v3.2'/>
-  <cpu type=3D'kvm' name=3D'740_v2.0'/>
-  <cpu type=3D'kvm' name=3D'mpc8560_v20'/>
-  <cpu type=3D'kvm' name=3D'440-xilinx'/>
-  <cpu type=3D'kvm' name=3D'401f2'/>
-  <cpu type=3D'kvm' name=3D'mpc8533_v10'/>
-  <cpu type=3D'kvm' name=3D'mpc8349a'/>
-  <cpu type=3D'kvm' name=3D'405gpr'/>
-  <cpu type=3D'kvm' name=3D'stb25'/>
-  <cpu type=3D'kvm' name=3D'603e_v1.2'/>
-  <cpu type=3D'kvm' name=3D'mpc5200b_v20'/>
-  <cpu type=3D'kvm' name=3D'750fx_v2.2'/>
-  <cpu type=3D'kvm' name=3D'mpc8347eat'/>
-  <cpu type=3D'kvm' name=3D'740_v1.0'/>
-  <cpu type=3D'kvm' name=3D'601_v1'/>
-  <cpu type=3D'kvm' name=3D'745_v1.1'/>
-  <cpu type=3D'kvm' name=3D'750cx_v2.0'/>
-  <cpu type=3D'kvm' name=3D'mpc8548e_v10'/>
-  <cpu type=3D'kvm' name=3D'7447a_v1.2'/>
-  <cpu type=3D'kvm' name=3D'403gc'/>
-  <cpu type=3D'kvm' name=3D'e300c3'/>
-  <cpu type=3D'kvm' name=3D'mpc5200_v11'/>
-  <cpu type=3D'kvm' name=3D'7441_v2.1'/>
-  <cpu type=3D'kvm' name=3D'740_v3.0'/>
-  <cpu type=3D'kvm' name=3D'mpc8545e_v21'/>
-  <cpu type=3D'kvm' name=3D'602'/>
-  <cpu type=3D'kvm' name=3D'mpc8378e'/>
-  <cpu type=3D'kvm' name=3D'mpc8343a'/>
-  <cpu type=3D'kvm' name=3D'460exb'/>
-  <cpu type=3D'kvm' name=3D'mpc8555_v10'/>
-  <cpu type=3D'kvm' name=3D'mpc8568'/>
-  <cpu type=3D'kvm' name=3D'7457a_v1.2'/>
-  <cpu type=3D'kvm' name=3D'750cx_v1.0'/>
-  <cpu type=3D'kvm' name=3D'750cxe_v2.2'/>
-  <cpu type=3D'kvm' name=3D'604e_v2.4'/>
-  <cpu type=3D'kvm' name=3D'755_v2.8'/>
-  <cpu type=3D'kvm' name=3D'405lp'/>
-  <cpu type=3D'kvm' name=3D'745_v2.6'/>
-  <cpu type=3D'kvm' name=3D'stb03'/>
-  <cpu type=3D'kvm' name=3D'405ep'/>
-  <cpu type=3D'kvm' name=3D'mpc8544_v10'/>
-  <cpu type=3D'kvm' name=3D'mpc8347at'/>
-  <cpu type=3D'kvm' name=3D'750_v2.2'/>
-  <cpu type=3D'kvm' name=3D'7450_v1.0'/>
-  <cpu type=3D'kvm' name=3D'755_v2.3'/>
-  <cpu type=3D'kvm' name=3D'7410_v1.1'/>
-  <cpu type=3D'kvm' name=3D'745_v2.1'/>
-  <cpu type=3D'kvm' name=3D'750gl'/>
-  <cpu type=3D'kvm' name=3D'e6500'/>
-  <cpu type=3D'kvm' name=3D'750p'/>
-  <cpu type=3D'kvm' name=3D'7445_v3.4'/>
-  <cpu type=3D'kvm' name=3D'440epb'/>
-  <cpu type=3D'kvm' name=3D'npe4gs3'/>
-  <cpu type=3D'kvm' name=3D'603e_v3'/>
-  <cpu type=3D'kvm' name=3D'mpc8349e'/>
-  <cpu type=3D'kvm' name=3D'970_v2.2'/>
-  <cpu type=3D'kvm' name=3D'g2lels'/>
-  <cpu type=3D'kvm' name=3D'g2hip4'/>
-  <cpu type=3D'kvm' name=3D'740p'/>
-  <cpu type=3D'kvm' name=3D'mpc8567e'/>
-  <cpu type=3D'kvm' name=3D'mpc8533e_v11'/>
-  <cpu type=3D'kvm' name=3D'7451_v2.3'/>
-  <cpu type=3D'kvm' name=3D'603e_v1.1'/>
-  <cpu type=3D'kvm' name=3D'401g2'/>
-  <cpu type=3D'kvm' name=3D'7400_v2.8'/>
-  <cpu type=3D'kvm' name=3D'7455_v2.1'/>
-  <cpu type=3D'kvm' name=3D'405gpc'/>
-  <cpu type=3D'kvm' name=3D'power7+_v2.1'/>
-  <cpu type=3D'kvm' name=3D'mpc8544e_v11'/>
-  <cpu type=3D'kvm' name=3D'7450_v2.0'/>
-  <cpu type=3D'kvm' name=3D'970mp_v1.1'/>
-  <cpu type=3D'kvm' name=3D'603e7v2'/>
-  <cpu type=3D'kvm' name=3D'604r'/>
-  <cpu type=3D'kvm' name=3D'e500v2_v22'/>
-  <cpu type=3D'kvm' name=3D'mpc8548e_v20'/>
-  <cpu type=3D'kvm' name=3D'mpc8545e_v20'/>
-  <cpu type=3D'kvm' name=3D'mpc8378'/>
-  <cpu type=3D'kvm' name=3D'mpc8567'/>
-  <cpu type=3D'kvm' name=3D'7457_v1.2'/>
-  <cpu type=3D'kvm' name=3D'7447_v1.0'/>
-  <cpu type=3D'kvm' name=3D'970fx_v3.1'/>
-  <cpu type=3D'kvm' name=3D'745_v2.5'/>
-  <cpu type=3D'kvm' name=3D'mpc8379e'/>
-  <cpu type=3D'kvm' name=3D'mpc8641'/>
-  <cpu type=3D'kvm' name=3D'750cxe_v2.4b'/>
-  <cpu type=3D'kvm' name=3D'7410_v1.0'/>
-  <cpu type=3D'kvm' name=3D'mpc603'/>
-  <cpu type=3D'kvm' name=3D'603e_v4.1'/>
-  <cpu type=3D'kvm' name=3D'7445_v3.3'/>
-  <cpu type=3D'kvm' name=3D'440epa'/>
-  <cpu type=3D'kvm' name=3D'970fx_v2.1'/>
-  <cpu type=3D'kvm' name=3D'iop480'/>
-  <cpu type=3D'kvm' name=3D'750fx_v2.1'/>
-  <cpu type=3D'kvm' name=3D'601_v0'/>
-  <cpu type=3D'kvm' name=3D'g2legp1'/>
-  <cpu type=3D'kvm' name=3D'745_v1.0'/>
-  <cpu type=3D'kvm' name=3D'750cl_v2.0'/>
-  <cpu type=3D'kvm' name=3D'750cxr'/>
-  <cpu type=3D'kvm' name=3D'401'/>
-  <cpu type=3D'kvm' name=3D'mpc8541e_v11'/>
-  <cpu type=3D'kvm' name=3D'750cxe_v3.1'/>
-  <cpu type=3D'kvm' name=3D'mpc8555e_v11'/>
-  <cpu type=3D'kvm' name=3D'power8e_v2.1'/>
-  <cpu type=3D'kvm' name=3D'7447a_v1.1'/>
-  <cpu type=3D'kvm' name=3D'403gb'/>
-  <cpu type=3D'kvm' name=3D'e300c2'/>
-  <cpu type=3D'kvm' name=3D'npe405h2'/>
-  <cpu type=3D'kvm' name=3D'mpc8343e'/>
-  <cpu type=3D'kvm' name=3D'mpc8533e_v10'/>
-  <cpu type=3D'kvm' name=3D'mpc5200_v10'/>
-  <cpu type=3D'kvm' name=3D'750_v3.1'/>
-  <cpu type=3D'kvm' name=3D'power5+_v2.1'/>
-  <cpu type=3D'kvm' name=3D'mpc8568e'/>
-  <cpu type=3D'tcg' name=3D'default'/>
-  <cpu type=3D'tcg' name=3D'ppc'/>
-  <cpu type=3D'tcg' name=3D'ppc32'/>
-  <cpu type=3D'tcg' name=3D'ppc64'/>
-  <cpu type=3D'tcg' name=3D'power9'/>
-  <cpu type=3D'tcg' name=3D'power8nvl'/>
-  <cpu type=3D'tcg' name=3D'power8'/>
-  <cpu type=3D'tcg' name=3D'power8e'/>
-  <cpu type=3D'tcg' name=3D'power7+'/>
-  <cpu type=3D'tcg' name=3D'power7'/>
-  <cpu type=3D'tcg' name=3D'power5gs'/>
-  <cpu type=3D'tcg' name=3D'power5+'/>
-  <cpu type=3D'tcg' name=3D'970mp'/>
-  <cpu type=3D'tcg' name=3D'970fx'/>
-  <cpu type=3D'tcg' name=3D'970'/>
-  <cpu type=3D'tcg' name=3D'apollo7pm'/>
-  <cpu type=3D'tcg' name=3D'7457a'/>
-  <cpu type=3D'tcg' name=3D'7447a'/>
-  <cpu type=3D'tcg' name=3D'apollo7'/>
-  <cpu type=3D'tcg' name=3D'7457'/>
-  <cpu type=3D'tcg' name=3D'7447'/>
-  <cpu type=3D'tcg' name=3D'apollo6'/>
-  <cpu type=3D'tcg' name=3D'7455'/>
-  <cpu type=3D'tcg' name=3D'7445'/>
-  <cpu type=3D'tcg' name=3D'7451'/>
-  <cpu type=3D'tcg' name=3D'7441'/>
-  <cpu type=3D'tcg' name=3D'vger'/>
-  <cpu type=3D'tcg' name=3D'7450'/>
-  <cpu type=3D'tcg' name=3D'7448'/>
-  <cpu type=3D'tcg' name=3D'nitro'/>
-  <cpu type=3D'tcg' name=3D'7410'/>
-  <cpu type=3D'tcg' name=3D'g4'/>
-  <cpu type=3D'tcg' name=3D'max'/>
-  <cpu type=3D'tcg' name=3D'7400'/>
-  <cpu type=3D'tcg' name=3D'goldfinger'/>
-  <cpu type=3D'tcg' name=3D'755'/>
-  <cpu type=3D'tcg' name=3D'745'/>
-  <cpu type=3D'tcg' name=3D'lonestar'/>
-  <cpu type=3D'tcg' name=3D'750l'/>
-  <cpu type=3D'tcg' name=3D'750gx'/>
-  <cpu type=3D'tcg' name=3D'750fx'/>
-  <cpu type=3D'tcg' name=3D'750cxe'/>
-  <cpu type=3D'tcg' name=3D'750cx'/>
-  <cpu type=3D'tcg' name=3D'750cl'/>
-  <cpu type=3D'tcg' name=3D'conan/doyle'/>
-  <cpu type=3D'tcg' name=3D'g3'/>
-  <cpu type=3D'tcg' name=3D'typhoon'/>
-  <cpu type=3D'tcg' name=3D'750'/>
-  <cpu type=3D'tcg' name=3D'arthur'/>
-  <cpu type=3D'tcg' name=3D'740'/>
-  <cpu type=3D'tcg' name=3D'mach5'/>
-  <cpu type=3D'tcg' name=3D'sirocco'/>
-  <cpu type=3D'tcg' name=3D'604e'/>
-  <cpu type=3D'tcg' name=3D'goldeneye'/>
-  <cpu type=3D'tcg' name=3D'603r'/>
-  <cpu type=3D'tcg' name=3D'vaillant'/>
-  <cpu type=3D'tcg' name=3D'stretch'/>
-  <cpu type=3D'tcg' name=3D'603e'/>
-  <cpu type=3D'tcg' name=3D'vanilla'/>
-  <cpu type=3D'tcg' name=3D'601v'/>
-  <cpu type=3D'tcg' name=3D'601'/>
-  <cpu type=3D'tcg' name=3D'mpc8560'/>
-  <cpu type=3D'tcg' name=3D'mpc8555e'/>
-  <cpu type=3D'tcg' name=3D'mpc8555'/>
-  <cpu type=3D'tcg' name=3D'mpc8548e'/>
-  <cpu type=3D'tcg' name=3D'mpc8548'/>
-  <cpu type=3D'tcg' name=3D'mpc8547e'/>
-  <cpu type=3D'tcg' name=3D'mpc8545e'/>
-  <cpu type=3D'tcg' name=3D'mpc8545'/>
-  <cpu type=3D'tcg' name=3D'mpc8544e'/>
-  <cpu type=3D'tcg' name=3D'mpc8544'/>
-  <cpu type=3D'tcg' name=3D'mpc8543e'/>
-  <cpu type=3D'tcg' name=3D'mpc8543'/>
-  <cpu type=3D'tcg' name=3D'mpc8541e'/>
-  <cpu type=3D'tcg' name=3D'mpc8541'/>
-  <cpu type=3D'tcg' name=3D'mpc8540'/>
-  <cpu type=3D'tcg' name=3D'mpc8533e'/>
-  <cpu type=3D'tcg' name=3D'mpc8533'/>
-  <cpu type=3D'tcg' name=3D'e500v2'/>
-  <cpu type=3D'tcg' name=3D'e500v1'/>
-  <cpu type=3D'tcg' name=3D'e500'/>
-  <cpu type=3D'tcg' name=3D'mpc8347ea'/>
-  <cpu type=3D'tcg' name=3D'mpc8347e'/>
-  <cpu type=3D'tcg' name=3D'mpc8347a'/>
-  <cpu type=3D'tcg' name=3D'mpc8347'/>
-  <cpu type=3D'tcg' name=3D'e300'/>
-  <cpu type=3D'tcg' name=3D'e200'/>
-  <cpu type=3D'tcg' name=3D'mpc8280'/>
-  <cpu type=3D'tcg' name=3D'mpc8275'/>
-  <cpu type=3D'tcg' name=3D'mpc8272'/>
-  <cpu type=3D'tcg' name=3D'mpc8271'/>
-  <cpu type=3D'tcg' name=3D'mpc8270'/>
-  <cpu type=3D'tcg' name=3D'mpc8266_hip4'/>
-  <cpu type=3D'tcg' name=3D'mpc8266_hip3'/>
-  <cpu type=3D'tcg' name=3D'mpc8266'/>
-  <cpu type=3D'tcg' name=3D'mpc8265_hip4'/>
-  <cpu type=3D'tcg' name=3D'mpc8265_hip3'/>
-  <cpu type=3D'tcg' name=3D'mpc8265'/>
-  <cpu type=3D'tcg' name=3D'mpc8264_hip4'/>
-  <cpu type=3D'tcg' name=3D'mpc8264_hip3'/>
-  <cpu type=3D'tcg' name=3D'mpc8264'/>
-  <cpu type=3D'tcg' name=3D'mpc8260_hip4'/>
-  <cpu type=3D'tcg' name=3D'mpc8260_hip3'/>
-  <cpu type=3D'tcg' name=3D'mpc8260'/>
-  <cpu type=3D'tcg' name=3D'mpc8255_hip4'/>
-  <cpu type=3D'tcg' name=3D'mpc8255_hip3'/>
-  <cpu type=3D'tcg' name=3D'mpc8255'/>
-  <cpu type=3D'tcg' name=3D'mpc8250_hip4'/>
-  <cpu type=3D'tcg' name=3D'mpc8250_hip3'/>
-  <cpu type=3D'tcg' name=3D'mpc8250'/>
-  <cpu type=3D'tcg' name=3D'mpc8248'/>
-  <cpu type=3D'tcg' name=3D'mpc8247'/>
-  <cpu type=3D'tcg' name=3D'mpc8245'/>
-  <cpu type=3D'tcg' name=3D'mpc8241'/>
-  <cpu type=3D'tcg' name=3D'powerquicc-ii'/>
-  <cpu type=3D'tcg' name=3D'mpc82xx'/>
-  <cpu type=3D'tcg' name=3D'mpc5200b'/>
-  <cpu type=3D'tcg' name=3D'mpc5200'/>
-  <cpu type=3D'tcg' name=3D'mpc52xx'/>
-  <cpu type=3D'tcg' name=3D'mpc8240'/>
-  <cpu type=3D'tcg' name=3D'460ex'/>
-  <cpu type=3D'tcg' name=3D'440ep'/>
-  <cpu type=3D'tcg' name=3D'x2vp50'/>
-  <cpu type=3D'tcg' name=3D'x2vp7'/>
-  <cpu type=3D'tcg' name=3D'405gpe'/>
-  <cpu type=3D'tcg' name=3D'405gp'/>
-  <cpu type=3D'tcg' name=3D'405cr'/>
-  <cpu type=3D'tcg' name=3D'405'/>
-  <cpu type=3D'tcg' name=3D'403'/>
-  <cpu type=3D'tcg' name=3D'mpc8547e_v21'/>
-  <cpu type=3D'tcg' name=3D'750cl_v1.0'/>
-  <cpu type=3D'tcg' name=3D'7457a_v1.1'/>
-  <cpu type=3D'tcg' name=3D'g2gp'/>
-  <cpu type=3D'tcg' name=3D'750cxe_v2.1'/>
-  <cpu type=3D'tcg' name=3D'755_v2.7'/>
-  <cpu type=3D'tcg' name=3D'750_v2.1'/>
-  <cpu type=3D'tcg' name=3D'755_v2.2'/>
-  <cpu type=3D'tcg' name=3D'745_v2.0'/>
-  <cpu type=3D'tcg' name=3D'mpc8377'/>
-  <cpu type=3D'tcg' name=3D'7455_v1.0'/>
-  <cpu type=3D'tcg' name=3D'mpc8545_v21'/>
-  <cpu type=3D'tcg' name=3D'mpc8548_v11'/>
-  <cpu type=3D'tcg' name=3D'405d4'/>
-  <cpu type=3D'tcg' name=3D'g2le'/>
-  <cpu type=3D'tcg' name=3D'g2hip3'/>
-  <cpu type=3D'tcg' name=3D'750e'/>
-  <cpu type=3D'tcg' name=3D'mpc8572'/>
-  <cpu type=3D'tcg' name=3D'970fx_v2.0'/>
-  <cpu type=3D'tcg' name=3D'750fx_v2.0'/>
-  <cpu type=3D'tcg' name=3D'603p'/>
-  <cpu type=3D'tcg' name=3D'405gpb'/>
-  <cpu type=3D'tcg' name=3D'7400_v2.7'/>
-  <cpu type=3D'tcg' name=3D'mpc8544e_v10'/>
-  <cpu type=3D'tcg' name=3D'e500v2_v10'/>
-  <cpu type=3D'tcg' name=3D'e500mc'/>
-  <cpu type=3D'tcg' name=3D'603e7v1'/>
-  <cpu type=3D'tcg' name=3D'970mp_v1.0'/>
-  <cpu type=3D'tcg' name=3D'740e'/>
-  <cpu type=3D'tcg' name=3D'405crc'/>
-  <cpu type=3D'tcg' name=3D'403ga'/>
-  <cpu type=3D'tcg' name=3D'7447a_v1.0'/>
-  <cpu type=3D'tcg' name=3D'7400_v2.2'/>
-  <cpu type=3D'tcg' name=3D'e300c1'/>
-  <cpu type=3D'tcg' name=3D'mpc8572e'/>
-  <cpu type=3D'tcg' name=3D'e500v2_v21'/>
-  <cpu type=3D'tcg' name=3D'970fx_v1.0'/>
-  <cpu type=3D'tcg' name=3D'750gx_v1.2'/>
-  <cpu type=3D'tcg' name=3D'750fx_v1.0'/>
-  <cpu type=3D'tcg' name=3D'7457_v1.1'/>
-  <cpu type=3D'tcg' name=3D'970fx_v3.0'/>
-  <cpu type=3D'tcg' name=3D'604e_v2.2'/>
-  <cpu type=3D'tcg' name=3D'755_v2.6'/>
-  <cpu type=3D'tcg' name=3D'401a1'/>
-  <cpu type=3D'tcg' name=3D'power9_v1.0'/>
-  <cpu type=3D'tcg' name=3D'npe405h'/>
-  <cpu type=3D'tcg' name=3D'g2ls'/>
-  <cpu type=3D'tcg' name=3D'7410_v1.4'/>
-  <cpu type=3D'tcg' name=3D'750_v2.0'/>
-  <cpu type=3D'tcg' name=3D'401b2'/>
-  <cpu type=3D'tcg' name=3D'mpc8349'/>
-  <cpu type=3D'tcg' name=3D'mpc8347ep'/>
-  <cpu type=3D'tcg' name=3D'7445_v3.2'/>
-  <cpu type=3D'tcg' name=3D'mpc8540_v21'/>
-  <cpu type=3D'tcg' name=3D'mpc8543_v11'/>
-  <cpu type=3D'tcg' name=3D'403gcx'/>
-  <cpu type=3D'tcg' name=3D'745_v2.4'/>
-  <cpu type=3D'tcg' name=3D'mpc8548_v21'/>
-  <cpu type=3D'tcg' name=3D'750l_v3.2'/>
-  <cpu type=3D'tcg' name=3D'750_v1.0'/>
-  <cpu type=3D'tcg' name=3D'755_v1.1'/>
-  <cpu type=3D'tcg' name=3D'e500_v10'/>
-  <cpu type=3D'tcg' name=3D'750cxe_v3.0'/>
-  <cpu type=3D'tcg' name=3D'mpc8541e_v10'/>
-  <cpu type=3D'tcg' name=3D'mpc8347p'/>
-  <cpu type=3D'tcg' name=3D'mpc8555e_v10'/>
-  <cpu type=3D'tcg' name=3D'power9_v2.0'/>
-  <cpu type=3D'tcg' name=3D'power7_v2.3'/>
-  <cpu type=3D'tcg' name=3D'603e7v'/>
-  <cpu type=3D'tcg' name=3D'mpc8543e_v11'/>
-  <cpu type=3D'tcg' name=3D'750_v3.0'/>
-  <cpu type=3D'tcg' name=3D'7400_v2.6'/>
-  <cpu type=3D'tcg' name=3D'405gpa'/>
-  <cpu type=3D'tcg' name=3D'440epx'/>
-  <cpu type=3D'tcg' name=3D'750l_v2.2'/>
-  <cpu type=3D'tcg' name=3D'e200z6'/>
-  <cpu type=3D'tcg' name=3D'mpc8547e_v20'/>
-  <cpu type=3D'tcg' name=3D'7457a_v1.0'/>
-  <cpu type=3D'tcg' name=3D'mpc8349ea'/>
-  <cpu type=3D'tcg' name=3D'e500v2_v20'/>
-  <cpu type=3D'tcg' name=3D'power8nvl_v1.0'/>
-  <cpu type=3D'tcg' name=3D'mpc8540_v10'/>
-  <cpu type=3D'tcg' name=3D'755_v2.1'/>
-  <cpu type=3D'tcg' name=3D'745_v2.8'/>
-  <cpu type=3D'tcg' name=3D'npe405l'/>
-  <cpu type=3D'tcg' name=3D'mpc8343ea'/>
-  <cpu type=3D'tcg' name=3D'mpc8545_v20'/>
-  <cpu type=3D'tcg' name=3D'mpc8548_v10'/>
-  <cpu type=3D'tcg' name=3D'7455_v3.4'/>
-  <cpu type=3D'tcg' name=3D'740_v2.2'/>
-  <cpu type=3D'tcg' name=3D'7448_v1.1'/>
-  <cpu type=3D'tcg' name=3D'7400_v1.1'/>
-  <cpu type=3D'tcg' name=3D'mpc8347et'/>
-  <cpu type=3D'tcg' name=3D'7441_v2.10'/>
-  <cpu type=3D'tcg' name=3D'603e_v1.4'/>
-  <cpu type=3D'tcg' name=3D'mpc8543_v10'/>
-  <cpu type=3D'tcg' name=3D'401c2'/>
-  <cpu type=3D'tcg' name=3D'7451_v2.10'/>
-  <cpu type=3D'tcg' name=3D'750cx_v2.2'/>
-  <cpu type=3D'tcg' name=3D'mpc8543_v21'/>
-  <cpu type=3D'tcg' name=3D'603e7'/>
-  <cpu type=3D'tcg' name=3D'7448_v2.1'/>
-  <cpu type=3D'tcg' name=3D'7441_v2.3'/>
-  <cpu type=3D'tcg' name=3D'405crb'/>
-  <cpu type=3D'tcg' name=3D'604'/>
-  <cpu type=3D'tcg' name=3D'7400_v2.1'/>
-  <cpu type=3D'tcg' name=3D'440-xilinx-w-dfpu'/>
-  <cpu type=3D'tcg' name=3D'7445_v2.1'/>
-  <cpu type=3D'tcg' name=3D'cobra'/>
-  <cpu type=3D'tcg' name=3D'e500_v20'/>
-  <cpu type=3D'tcg' name=3D'mpc8541_v11'/>
-  <cpu type=3D'tcg' name=3D'750gx_v1.1'/>
-  <cpu type=3D'tcg' name=3D'750cxe_v2.4'/>
-  <cpu type=3D'tcg' name=3D'mpc8641d'/>
-  <cpu type=3D'tcg' name=3D'mpc8543e_v21'/>
-  <cpu type=3D'tcg' name=3D'750l_v2.1'/>
-  <cpu type=3D'tcg' name=3D'7457_v1.0'/>
-  <cpu type=3D'tcg' name=3D'7450_v1.2'/>
-  <cpu type=3D'tcg' name=3D'755_v2.5'/>
-  <cpu type=3D'tcg' name=3D'7410_v1.3'/>
-  <cpu type=3D'tcg' name=3D'745_v2.3'/>
-  <cpu type=3D'tcg' name=3D'755_v2.0'/>
-  <cpu type=3D'tcg' name=3D'e500v2_v30'/>
-  <cpu type=3D'tcg' name=3D'7455_v3.3'/>
-  <cpu type=3D'tcg' name=3D'mpc8540_v20'/>
-  <cpu type=3D'tcg' name=3D'405d2'/>
-  <cpu type=3D'tcg' name=3D'mpc8560_v21'/>
-  <cpu type=3D'tcg' name=3D'mpc8343'/>
-  <cpu type=3D'tcg' name=3D'mpc8548_v20'/>
-  <cpu type=3D'tcg' name=3D'mpc8347t'/>
-  <cpu type=3D'tcg' name=3D'755_v1.0'/>
-  <cpu type=3D'tcg' name=3D'603e_v1.3'/>
-  <cpu type=3D'tcg' name=3D'mpc8543e_v10'/>
-  <cpu type=3D'tcg' name=3D'mpc8347eap'/>
-  <cpu type=3D'tcg' name=3D'mpc8548e_v11'/>
-  <cpu type=3D'tcg' name=3D'mpc8543_v20'/>
-  <cpu type=3D'tcg' name=3D'401d2'/>
-  <cpu type=3D'tcg' name=3D'power8_v2.0'/>
-  <cpu type=3D'tcg' name=3D'740_v3.1'/>
-  <cpu type=3D'tcg' name=3D'e200z5'/>
-  <cpu type=3D'tcg' name=3D'405cra'/>
-  <cpu type=3D'tcg' name=3D'7400_v2.0'/>
-  <cpu type=3D'tcg' name=3D'750cxe_v2.3'/>
-  <cpu type=3D'tcg' name=3D'745_v2.7'/>
-  <cpu type=3D'tcg' name=3D'mpc8560_v10'/>
-  <cpu type=3D'tcg' name=3D'e5500'/>
-  <cpu type=3D'tcg' name=3D'mpc8544_v11'/>
-  <cpu type=3D'tcg' name=3D'7448_v1.0'/>
-  <cpu type=3D'tcg' name=3D'401e2'/>
-  <cpu type=3D'tcg' name=3D'740_v2.1'/>
-  <cpu type=3D'tcg' name=3D'745_v2.2'/>
-  <cpu type=3D'tcg' name=3D'7400_v1.0'/>
-  <cpu type=3D'tcg' name=3D'7410_v1.2'/>
-  <cpu type=3D'tcg' name=3D'x2vp4'/>
-  <cpu type=3D'tcg' name=3D'mpc8347ap'/>
-  <cpu type=3D'tcg' name=3D'mpc8533_v11'/>
-  <cpu type=3D'tcg' name=3D'mpc5200b_v21'/>
-  <cpu type=3D'tcg' name=3D'750fx_v2.3'/>
-  <cpu type=3D'tcg' name=3D'601_v2'/>
-  <cpu type=3D'tcg' name=3D'g2legp3'/>
-  <cpu type=3D'tcg' name=3D'604e_v1.0'/>
-  <cpu type=3D'tcg' name=3D'750cx_v2.1'/>
-  <cpu type=3D'tcg' name=3D'mpc8610'/>
-  <cpu type=3D'tcg' name=3D'g2h4'/>
-  <cpu type=3D'tcg' name=3D'750l_v3.0'/>
-  <cpu type=3D'tcg' name=3D'mpc8377e'/>
-  <cpu type=3D'tcg' name=3D'e300c4'/>
-  <cpu type=3D'tcg' name=3D'mpc5200_v12'/>
-  <cpu type=3D'tcg' name=3D'7448_v2.0'/>
-  <cpu type=3D'tcg' name=3D'7450_v2.1'/>
-  <cpu type=3D'tcg' name=3D'750cxe_v3.1b'/>
-  <cpu type=3D'tcg' name=3D'g2'/>
-  <cpu type=3D'tcg' name=3D'7400_v2.9'/>
-  <cpu type=3D'tcg' name=3D'405gpd'/>
-  <cpu type=3D'tcg' name=3D'603'/>
-  <cpu type=3D'tcg' name=3D'603e7t'/>
-  <cpu type=3D'tcg' name=3D'mpc8555_v11'/>
-  <cpu type=3D'tcg' name=3D'750gx_v1.0'/>
-  <cpu type=3D'tcg' name=3D'mpc8541_v10'/>
-  <cpu type=3D'tcg' name=3D'mpc8543e_v20'/>
-  <cpu type=3D'tcg' name=3D'750fl'/>
-  <cpu type=3D'tcg' name=3D'750l_v2.0'/>
-  <cpu type=3D'tcg' name=3D'stb04'/>
-  <cpu type=3D'tcg' name=3D'mpc8548e_v21'/>
-  <cpu type=3D'tcg' name=3D'x2vp20'/>
-  <cpu type=3D'tcg' name=3D'405ez'/>
-  <cpu type=3D'tcg' name=3D'e600'/>
-  <cpu type=3D'tcg' name=3D'7450_v1.1'/>
-  <cpu type=3D'tcg' name=3D'755_v2.4'/>
-  <cpu type=3D'tcg' name=3D'mpc8379'/>
-  <cpu type=3D'tcg' name=3D'7445_v1.0'/>
-  <cpu type=3D'tcg' name=3D'7447_v1.1'/>
-  <cpu type=3D'tcg' name=3D'603e_v2.2'/>
-  <cpu type=3D'tcg' name=3D'603e_v4'/>
-  <cpu type=3D'tcg' name=3D'g2legp'/>
-  <cpu type=3D'tcg' name=3D'7455_v3.2'/>
-  <cpu type=3D'tcg' name=3D'740_v2.0'/>
-  <cpu type=3D'tcg' name=3D'mpc8560_v20'/>
-  <cpu type=3D'tcg' name=3D'440-xilinx'/>
-  <cpu type=3D'tcg' name=3D'401f2'/>
-  <cpu type=3D'tcg' name=3D'mpc8533_v10'/>
-  <cpu type=3D'tcg' name=3D'mpc8349a'/>
-  <cpu type=3D'tcg' name=3D'405gpr'/>
-  <cpu type=3D'tcg' name=3D'stb25'/>
-  <cpu type=3D'tcg' name=3D'603e_v1.2'/>
-  <cpu type=3D'tcg' name=3D'mpc5200b_v20'/>
-  <cpu type=3D'tcg' name=3D'750fx_v2.2'/>
-  <cpu type=3D'tcg' name=3D'mpc8347eat'/>
-  <cpu type=3D'tcg' name=3D'740_v1.0'/>
-  <cpu type=3D'tcg' name=3D'601_v1'/>
-  <cpu type=3D'tcg' name=3D'745_v1.1'/>
-  <cpu type=3D'tcg' name=3D'750cx_v2.0'/>
-  <cpu type=3D'tcg' name=3D'mpc8548e_v10'/>
-  <cpu type=3D'tcg' name=3D'7447a_v1.2'/>
-  <cpu type=3D'tcg' name=3D'403gc'/>
-  <cpu type=3D'tcg' name=3D'e300c3'/>
-  <cpu type=3D'tcg' name=3D'mpc5200_v11'/>
-  <cpu type=3D'tcg' name=3D'7441_v2.1'/>
-  <cpu type=3D'tcg' name=3D'740_v3.0'/>
-  <cpu type=3D'tcg' name=3D'mpc8545e_v21'/>
-  <cpu type=3D'tcg' name=3D'602'/>
-  <cpu type=3D'tcg' name=3D'mpc8378e'/>
-  <cpu type=3D'tcg' name=3D'mpc8343a'/>
-  <cpu type=3D'tcg' name=3D'460exb'/>
-  <cpu type=3D'tcg' name=3D'mpc8555_v10'/>
-  <cpu type=3D'tcg' name=3D'mpc8568'/>
-  <cpu type=3D'tcg' name=3D'7457a_v1.2'/>
-  <cpu type=3D'tcg' name=3D'750cx_v1.0'/>
-  <cpu type=3D'tcg' name=3D'750cxe_v2.2'/>
-  <cpu type=3D'tcg' name=3D'604e_v2.4'/>
-  <cpu type=3D'tcg' name=3D'755_v2.8'/>
-  <cpu type=3D'tcg' name=3D'405lp'/>
-  <cpu type=3D'tcg' name=3D'745_v2.6'/>
-  <cpu type=3D'tcg' name=3D'stb03'/>
-  <cpu type=3D'tcg' name=3D'405ep'/>
-  <cpu type=3D'tcg' name=3D'mpc8544_v10'/>
-  <cpu type=3D'tcg' name=3D'mpc8347at'/>
-  <cpu type=3D'tcg' name=3D'750_v2.2'/>
-  <cpu type=3D'tcg' name=3D'7450_v1.0'/>
-  <cpu type=3D'tcg' name=3D'755_v2.3'/>
-  <cpu type=3D'tcg' name=3D'7410_v1.1'/>
-  <cpu type=3D'tcg' name=3D'745_v2.1'/>
-  <cpu type=3D'tcg' name=3D'750gl'/>
-  <cpu type=3D'tcg' name=3D'e6500'/>
-  <cpu type=3D'tcg' name=3D'750p'/>
-  <cpu type=3D'tcg' name=3D'7445_v3.4'/>
-  <cpu type=3D'tcg' name=3D'440epb'/>
-  <cpu type=3D'tcg' name=3D'npe4gs3'/>
-  <cpu type=3D'tcg' name=3D'603e_v3'/>
-  <cpu type=3D'tcg' name=3D'mpc8349e'/>
-  <cpu type=3D'tcg' name=3D'970_v2.2'/>
-  <cpu type=3D'tcg' name=3D'g2lels'/>
-  <cpu type=3D'tcg' name=3D'g2hip4'/>
-  <cpu type=3D'tcg' name=3D'740p'/>
-  <cpu type=3D'tcg' name=3D'mpc8567e'/>
-  <cpu type=3D'tcg' name=3D'mpc8533e_v11'/>
-  <cpu type=3D'tcg' name=3D'7451_v2.3'/>
-  <cpu type=3D'tcg' name=3D'603e_v1.1'/>
-  <cpu type=3D'tcg' name=3D'401g2'/>
-  <cpu type=3D'tcg' name=3D'7400_v2.8'/>
-  <cpu type=3D'tcg' name=3D'7455_v2.1'/>
-  <cpu type=3D'tcg' name=3D'405gpc'/>
-  <cpu type=3D'tcg' name=3D'power7+_v2.1'/>
-  <cpu type=3D'tcg' name=3D'mpc8544e_v11'/>
-  <cpu type=3D'tcg' name=3D'7450_v2.0'/>
-  <cpu type=3D'tcg' name=3D'970mp_v1.1'/>
-  <cpu type=3D'tcg' name=3D'603e7v2'/>
-  <cpu type=3D'tcg' name=3D'604r'/>
-  <cpu type=3D'tcg' name=3D'e500v2_v22'/>
-  <cpu type=3D'tcg' name=3D'mpc8548e_v20'/>
-  <cpu type=3D'tcg' name=3D'mpc8545e_v20'/>
-  <cpu type=3D'tcg' name=3D'mpc8378'/>
-  <cpu type=3D'tcg' name=3D'mpc8567'/>
-  <cpu type=3D'tcg' name=3D'7457_v1.2'/>
-  <cpu type=3D'tcg' name=3D'7447_v1.0'/>
-  <cpu type=3D'tcg' name=3D'970fx_v3.1'/>
-  <cpu type=3D'tcg' name=3D'745_v2.5'/>
-  <cpu type=3D'tcg' name=3D'mpc8379e'/>
-  <cpu type=3D'tcg' name=3D'mpc8641'/>
-  <cpu type=3D'tcg' name=3D'750cxe_v2.4b'/>
-  <cpu type=3D'tcg' name=3D'7410_v1.0'/>
-  <cpu type=3D'tcg' name=3D'mpc603'/>
-  <cpu type=3D'tcg' name=3D'603e_v4.1'/>
-  <cpu type=3D'tcg' name=3D'7445_v3.3'/>
-  <cpu type=3D'tcg' name=3D'440epa'/>
-  <cpu type=3D'tcg' name=3D'970fx_v2.1'/>
-  <cpu type=3D'tcg' name=3D'iop480'/>
-  <cpu type=3D'tcg' name=3D'750fx_v2.1'/>
-  <cpu type=3D'tcg' name=3D'601_v0'/>
-  <cpu type=3D'tcg' name=3D'g2legp1'/>
-  <cpu type=3D'tcg' name=3D'745_v1.0'/>
-  <cpu type=3D'tcg' name=3D'750cl_v2.0'/>
-  <cpu type=3D'tcg' name=3D'750cxr'/>
-  <cpu type=3D'tcg' name=3D'401'/>
-  <cpu type=3D'tcg' name=3D'mpc8541e_v11'/>
-  <cpu type=3D'tcg' name=3D'750cxe_v3.1'/>
-  <cpu type=3D'tcg' name=3D'mpc8555e_v11'/>
-  <cpu type=3D'tcg' name=3D'power8e_v2.1'/>
-  <cpu type=3D'tcg' name=3D'7447a_v1.1'/>
-  <cpu type=3D'tcg' name=3D'403gb'/>
-  <cpu type=3D'tcg' name=3D'e300c2'/>
-  <cpu type=3D'tcg' name=3D'npe405h2'/>
-  <cpu type=3D'tcg' name=3D'mpc8343e'/>
-  <cpu type=3D'tcg' name=3D'mpc8533e_v10'/>
-  <cpu type=3D'tcg' name=3D'mpc5200_v10'/>
-  <cpu type=3D'tcg' name=3D'750_v3.1'/>
-  <cpu type=3D'tcg' name=3D'power5+_v2.1'/>
-  <cpu type=3D'tcg' name=3D'mpc8568e'/>
+  <cpu type=3D'kvm' name=3D'default' typename=3D'604-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'ppc' typename=3D'604-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'ppc32' typename=3D'604-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'ppc64' typename=3D'970fx_v3.1-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'power9' typename=3D'host-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'power8nvl' typename=3D'power8nvl_v1.0-powerpc6=
4-cpu'/>
+  <cpu type=3D'kvm' name=3D'power8' typename=3D'power8_v2.0-powerpc64-cpu'=
/>
+  <cpu type=3D'kvm' name=3D'power8e' typename=3D'power8e_v2.1-powerpc64-cp=
u'/>
+  <cpu type=3D'kvm' name=3D'power7+' typename=3D'power7+_v2.1-powerpc64-cp=
u'/>
+  <cpu type=3D'kvm' name=3D'power7' typename=3D'power7_v2.3-powerpc64-cpu'=
/>
+  <cpu type=3D'kvm' name=3D'power5gs' typename=3D'power5+_v2.1-powerpc64-c=
pu'/>
+  <cpu type=3D'kvm' name=3D'power5+' typename=3D'power5+_v2.1-powerpc64-cp=
u'/>
+  <cpu type=3D'kvm' name=3D'970mp' typename=3D'970mp_v1.1-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'970fx' typename=3D'970fx_v3.1-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'970' typename=3D'970_v2.2-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'apollo7pm' typename=3D'7457a_v1.0-powerpc64-cp=
u'/>
+  <cpu type=3D'kvm' name=3D'7457a' typename=3D'7457a_v1.2-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'7447a' typename=3D'7447a_v1.2-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'apollo7' typename=3D'7457_v1.2-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'7457' typename=3D'7457_v1.2-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'7447' typename=3D'7447_v1.1-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'apollo6' typename=3D'7455_v3.2-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'7455' typename=3D'7455_v3.2-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'7445' typename=3D'7445_v3.2-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'7451' typename=3D'7451_v2.3-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'7441' typename=3D'7441_v2.3-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'vger' typename=3D'7450_v2.1-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'7450' typename=3D'7450_v2.1-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'7448' typename=3D'7448_v2.1-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'nitro' typename=3D'7410_v1.4-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'7410' typename=3D'7410_v1.4-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'g4' typename=3D'7400_v2.9-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'max' typename=3D'7400_v2.9-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'7400' typename=3D'7400_v2.9-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'goldfinger' typename=3D'755_v2.8-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'755' typename=3D'755_v2.8-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'745' typename=3D'745_v2.8-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'lonestar' typename=3D'750l_v3.2-powerpc64-cpu'=
/>
+  <cpu type=3D'kvm' name=3D'750l' typename=3D'750l_v3.2-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'750gx' typename=3D'750gx_v1.2-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'750fx' typename=3D'750fx_v2.3-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'750cxe' typename=3D'750cxe_v3.1b-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'750cx' typename=3D'750cx_v2.2-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'750cl' typename=3D'750cl_v2.0-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'conan/doyle' typename=3D'750p-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'g3' typename=3D'750_v3.1-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'typhoon' typename=3D'750_v3.1-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'750' typename=3D'750_v3.1-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'arthur' typename=3D'740_v3.1-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'740' typename=3D'740_v3.1-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'mach5' typename=3D'604r-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'sirocco' typename=3D'604e_v2.4-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'604e' typename=3D'604e_v2.4-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'goldeneye' typename=3D'603e7t-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'603r' typename=3D'603e7t-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'vaillant' typename=3D'603e7v-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'stretch' typename=3D'603e_v4.1-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'603e' typename=3D'603e_v4.1-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'vanilla' typename=3D'603-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'601v' typename=3D'601_v2-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'601' typename=3D'601_v2-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'mpc8560' typename=3D'mpc8560_v21-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'mpc8555e' typename=3D'mpc8555e_v11-powerpc64-c=
pu'/>
+  <cpu type=3D'kvm' name=3D'mpc8555' typename=3D'mpc8555_v11-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'mpc8548e' typename=3D'mpc8548e_v21-powerpc64-c=
pu'/>
+  <cpu type=3D'kvm' name=3D'mpc8548' typename=3D'mpc8548_v21-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'mpc8547e' typename=3D'mpc8547e_v21-powerpc64-c=
pu'/>
+  <cpu type=3D'kvm' name=3D'mpc8545e' typename=3D'mpc8545e_v21-powerpc64-c=
pu'/>
+  <cpu type=3D'kvm' name=3D'mpc8545' typename=3D'mpc8545_v21-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'mpc8544e' typename=3D'mpc8544e_v11-powerpc64-c=
pu'/>
+  <cpu type=3D'kvm' name=3D'mpc8544' typename=3D'mpc8544_v11-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'mpc8543e' typename=3D'mpc8543e_v21-powerpc64-c=
pu'/>
+  <cpu type=3D'kvm' name=3D'mpc8543' typename=3D'mpc8543_v21-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'mpc8541e' typename=3D'mpc8541e_v11-powerpc64-c=
pu'/>
+  <cpu type=3D'kvm' name=3D'mpc8541' typename=3D'mpc8541_v11-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'mpc8540' typename=3D'mpc8540_v21-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'mpc8533e' typename=3D'mpc8533e_v11-powerpc64-c=
pu'/>
+  <cpu type=3D'kvm' name=3D'mpc8533' typename=3D'mpc8533_v11-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'e500v2' typename=3D'e500v2_v22-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'e500v1' typename=3D'e500_v20-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'e500' typename=3D'e500v2_v22-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'mpc8347ea' typename=3D'mpc8347eat-powerpc64-cp=
u'/>
+  <cpu type=3D'kvm' name=3D'mpc8347e' typename=3D'mpc8347et-powerpc64-cpu'=
/>
+  <cpu type=3D'kvm' name=3D'mpc8347a' typename=3D'mpc8347at-powerpc64-cpu'=
/>
+  <cpu type=3D'kvm' name=3D'mpc8347' typename=3D'mpc8347t-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'e300' typename=3D'e300c3-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'e200' typename=3D'e200z6-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'mpc8280' typename=3D'g2legp3-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'mpc8275' typename=3D'g2legp3-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'mpc8272' typename=3D'g2legp3-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'mpc8271' typename=3D'g2legp3-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'mpc8270' typename=3D'g2legp3-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'mpc8266_hip4' typename=3D'g2hip4-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'mpc8266_hip3' typename=3D'g2hip3-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'mpc8266' typename=3D'g2hip4-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'mpc8265_hip4' typename=3D'g2hip4-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'mpc8265_hip3' typename=3D'g2hip3-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'mpc8265' typename=3D'g2hip4-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'mpc8264_hip4' typename=3D'g2hip4-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'mpc8264_hip3' typename=3D'g2hip3-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'mpc8264' typename=3D'g2hip4-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'mpc8260_hip4' typename=3D'g2hip4-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'mpc8260_hip3' typename=3D'g2hip3-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'mpc8260' typename=3D'g2hip4-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'mpc8255_hip4' typename=3D'g2hip4-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'mpc8255_hip3' typename=3D'g2hip3-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'mpc8255' typename=3D'g2hip4-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'mpc8250_hip4' typename=3D'g2hip4-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'mpc8250_hip3' typename=3D'g2hip3-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'mpc8250' typename=3D'g2hip4-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'mpc8248' typename=3D'g2legp3-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'mpc8247' typename=3D'g2legp3-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'mpc8245' typename=3D'g2hip4-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'mpc8241' typename=3D'g2hip4-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'powerquicc-ii' typename=3D'g2legp3-powerpc64-c=
pu'/>
+  <cpu type=3D'kvm' name=3D'mpc82xx' typename=3D'g2legp3-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'mpc5200b' typename=3D'mpc5200b_v21-powerpc64-c=
pu'/>
+  <cpu type=3D'kvm' name=3D'mpc5200' typename=3D'mpc5200_v12-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'mpc52xx' typename=3D'mpc5200_v12-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'mpc8240' typename=3D'603-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'460ex' typename=3D'460exb-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'440ep' typename=3D'440epb-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'x2vp50' typename=3D'x2vp20-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'x2vp7' typename=3D'x2vp4-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'405gpe' typename=3D'405crc-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'405gp' typename=3D'405gpd-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'405cr' typename=3D'405crc-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'405' typename=3D'405d4-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'403' typename=3D'403gc-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'mpc8547e_v21' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cl_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7457a_v1.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'g2gp' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cxe_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'755_v2.7' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'755_v2.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'745_v2.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8377' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7455_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8545_v21' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8548_v11' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'405d4' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'g2le' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'g2hip3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750e' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8572' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'970fx_v2.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750fx_v2.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603p' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'405gpb' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7400_v2.7' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8544e_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e500v2_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e500mc' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603e7v1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'970mp_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'740e' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'405crc' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'403ga' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7447a_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7400_v2.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e300c1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8572e' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e500v2_v21' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'970fx_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750gx_v1.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750fx_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7457_v1.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'970fx_v3.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'604e_v2.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'755_v2.6' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'401a1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'power9_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'npe405h' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'g2ls' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7410_v1.4' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750_v2.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'401b2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8349' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8347ep' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7445_v3.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8540_v21' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8543_v11' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'403gcx' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'745_v2.4' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8548_v21' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750l_v3.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'755_v1.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e500_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cxe_v3.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8541e_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8347p' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8555e_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'power9_v2.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'power7_v2.3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603e7v' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8543e_v11' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750_v3.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7400_v2.6' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'405gpa' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'440epx' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750l_v2.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e200z6' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8547e_v20' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7457a_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8349ea' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e500v2_v20' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'power8nvl_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8540_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'755_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'745_v2.8' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'npe405l' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8343ea' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8545_v20' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8548_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7455_v3.4' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'740_v2.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7448_v1.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7400_v1.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8347et' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7441_v2.10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603e_v1.4' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8543_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'401c2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7451_v2.10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cx_v2.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8543_v21' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603e7' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7448_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7441_v2.3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'405crb' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'604' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7400_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'440-xilinx-w-dfpu' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7445_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'cobra' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e500_v20' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8541_v11' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750gx_v1.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cxe_v2.4' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8641d' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8543e_v21' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750l_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7457_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7450_v1.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'755_v2.5' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7410_v1.3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'745_v2.3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'755_v2.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e500v2_v30' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7455_v3.3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8540_v20' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'405d2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8560_v21' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8343' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8548_v20' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8347t' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'755_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603e_v1.3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'host' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8543e_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8347eap' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8548e_v11' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8543_v20' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'401d2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'power8_v2.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'740_v3.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e200z5' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'405cra' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7400_v2.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cxe_v2.3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'745_v2.7' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8560_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e5500' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8544_v11' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7448_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'401e2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'740_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'745_v2.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7400_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7410_v1.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'x2vp4' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8347ap' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8533_v11' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc5200b_v21' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750fx_v2.3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'601_v2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'g2legp3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'604e_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cx_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8610' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'g2h4' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750l_v3.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8377e' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e300c4' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc5200_v12' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7448_v2.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7450_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cxe_v3.1b' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'g2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7400_v2.9' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'405gpd' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603e7t' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8555_v11' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750gx_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8541_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8543e_v20' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750fl' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750l_v2.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'stb04' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8548e_v21' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'x2vp20' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'405ez' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e600' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7450_v1.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'755_v2.4' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8379' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7445_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7447_v1.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603e_v2.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603e_v4' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'g2legp' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7455_v3.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'740_v2.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8560_v20' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'440-xilinx' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'401f2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8533_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8349a' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'405gpr' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'stb25' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603e_v1.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc5200b_v20' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750fx_v2.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8347eat' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'740_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'601_v1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'745_v1.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cx_v2.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8548e_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7447a_v1.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'403gc' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e300c3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc5200_v11' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7441_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'740_v3.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8545e_v21' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'602' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8378e' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8343a' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'460exb' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8555_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8568' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7457a_v1.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cx_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cxe_v2.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'604e_v2.4' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'755_v2.8' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'405lp' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'745_v2.6' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'stb03' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'405ep' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8544_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8347at' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750_v2.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7450_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'755_v2.3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7410_v1.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'745_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750gl' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e6500' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750p' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7445_v3.4' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'440epb' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'npe4gs3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603e_v3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8349e' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'970_v2.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'g2lels' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'g2hip4' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'740p' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8567e' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8533e_v11' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7451_v2.3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603e_v1.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'401g2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7400_v2.8' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7455_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'405gpc' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'power7+_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8544e_v11' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7450_v2.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'970mp_v1.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603e7v2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'604r' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e500v2_v22' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8548e_v20' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8545e_v20' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8378' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8567' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7457_v1.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7447_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'970fx_v3.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'745_v2.5' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8379e' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8641' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cxe_v2.4b' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7410_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc603' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603e_v4.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7445_v3.3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'440epa' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'970fx_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'iop480' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750fx_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'601_v0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'g2legp1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'745_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cl_v2.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cxr' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'401' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8541e_v11' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cxe_v3.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8555e_v11' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'power8e_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7447a_v1.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'403gb' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e300c2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'npe405h2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8343e' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8533e_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc5200_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750_v3.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'power5+_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8568e' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'default' typename=3D'604-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'ppc' typename=3D'604-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'ppc32' typename=3D'604-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'ppc64' typename=3D'970fx_v3.1-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'power9' typename=3D'power9_v2.0-powerpc64-cpu'=
/>
+  <cpu type=3D'tcg' name=3D'power8nvl' typename=3D'power8nvl_v1.0-powerpc6=
4-cpu'/>
+  <cpu type=3D'tcg' name=3D'power8' typename=3D'power8_v2.0-powerpc64-cpu'=
/>
+  <cpu type=3D'tcg' name=3D'power8e' typename=3D'power8e_v2.1-powerpc64-cp=
u'/>
+  <cpu type=3D'tcg' name=3D'power7+' typename=3D'power7+_v2.1-powerpc64-cp=
u'/>
+  <cpu type=3D'tcg' name=3D'power7' typename=3D'power7_v2.3-powerpc64-cpu'=
/>
+  <cpu type=3D'tcg' name=3D'power5gs' typename=3D'power5+_v2.1-powerpc64-c=
pu'/>
+  <cpu type=3D'tcg' name=3D'power5+' typename=3D'power5+_v2.1-powerpc64-cp=
u'/>
+  <cpu type=3D'tcg' name=3D'970mp' typename=3D'970mp_v1.1-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'970fx' typename=3D'970fx_v3.1-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'970' typename=3D'970_v2.2-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'apollo7pm' typename=3D'7457a_v1.0-powerpc64-cp=
u'/>
+  <cpu type=3D'tcg' name=3D'7457a' typename=3D'7457a_v1.2-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'7447a' typename=3D'7447a_v1.2-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'apollo7' typename=3D'7457_v1.2-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'7457' typename=3D'7457_v1.2-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'7447' typename=3D'7447_v1.1-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'apollo6' typename=3D'7455_v3.2-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'7455' typename=3D'7455_v3.2-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'7445' typename=3D'7445_v3.2-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'7451' typename=3D'7451_v2.3-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'7441' typename=3D'7441_v2.3-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'vger' typename=3D'7450_v2.1-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'7450' typename=3D'7450_v2.1-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'7448' typename=3D'7448_v2.1-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'nitro' typename=3D'7410_v1.4-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'7410' typename=3D'7410_v1.4-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'g4' typename=3D'7400_v2.9-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'max' typename=3D'7400_v2.9-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'7400' typename=3D'7400_v2.9-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'goldfinger' typename=3D'755_v2.8-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'755' typename=3D'755_v2.8-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'745' typename=3D'745_v2.8-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'lonestar' typename=3D'750l_v3.2-powerpc64-cpu'=
/>
+  <cpu type=3D'tcg' name=3D'750l' typename=3D'750l_v3.2-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'750gx' typename=3D'750gx_v1.2-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'750fx' typename=3D'750fx_v2.3-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'750cxe' typename=3D'750cxe_v3.1b-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'750cx' typename=3D'750cx_v2.2-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'750cl' typename=3D'750cl_v2.0-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'conan/doyle' typename=3D'750p-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'g3' typename=3D'750_v3.1-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'typhoon' typename=3D'750_v3.1-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'750' typename=3D'750_v3.1-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'arthur' typename=3D'740_v3.1-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'740' typename=3D'740_v3.1-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'mach5' typename=3D'604r-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'sirocco' typename=3D'604e_v2.4-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'604e' typename=3D'604e_v2.4-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'goldeneye' typename=3D'603e7t-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'603r' typename=3D'603e7t-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'vaillant' typename=3D'603e7v-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'stretch' typename=3D'603e_v4.1-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'603e' typename=3D'603e_v4.1-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'vanilla' typename=3D'603-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'601v' typename=3D'601_v2-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'601' typename=3D'601_v2-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'mpc8560' typename=3D'mpc8560_v21-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'mpc8555e' typename=3D'mpc8555e_v11-powerpc64-c=
pu'/>
+  <cpu type=3D'tcg' name=3D'mpc8555' typename=3D'mpc8555_v11-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'mpc8548e' typename=3D'mpc8548e_v21-powerpc64-c=
pu'/>
+  <cpu type=3D'tcg' name=3D'mpc8548' typename=3D'mpc8548_v21-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'mpc8547e' typename=3D'mpc8547e_v21-powerpc64-c=
pu'/>
+  <cpu type=3D'tcg' name=3D'mpc8545e' typename=3D'mpc8545e_v21-powerpc64-c=
pu'/>
+  <cpu type=3D'tcg' name=3D'mpc8545' typename=3D'mpc8545_v21-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'mpc8544e' typename=3D'mpc8544e_v11-powerpc64-c=
pu'/>
+  <cpu type=3D'tcg' name=3D'mpc8544' typename=3D'mpc8544_v11-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'mpc8543e' typename=3D'mpc8543e_v21-powerpc64-c=
pu'/>
+  <cpu type=3D'tcg' name=3D'mpc8543' typename=3D'mpc8543_v21-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'mpc8541e' typename=3D'mpc8541e_v11-powerpc64-c=
pu'/>
+  <cpu type=3D'tcg' name=3D'mpc8541' typename=3D'mpc8541_v11-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'mpc8540' typename=3D'mpc8540_v21-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'mpc8533e' typename=3D'mpc8533e_v11-powerpc64-c=
pu'/>
+  <cpu type=3D'tcg' name=3D'mpc8533' typename=3D'mpc8533_v11-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'e500v2' typename=3D'e500v2_v22-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'e500v1' typename=3D'e500_v20-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'e500' typename=3D'e500v2_v22-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'mpc8347ea' typename=3D'mpc8347eat-powerpc64-cp=
u'/>
+  <cpu type=3D'tcg' name=3D'mpc8347e' typename=3D'mpc8347et-powerpc64-cpu'=
/>
+  <cpu type=3D'tcg' name=3D'mpc8347a' typename=3D'mpc8347at-powerpc64-cpu'=
/>
+  <cpu type=3D'tcg' name=3D'mpc8347' typename=3D'mpc8347t-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'e300' typename=3D'e300c3-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'e200' typename=3D'e200z6-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'mpc8280' typename=3D'g2legp3-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'mpc8275' typename=3D'g2legp3-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'mpc8272' typename=3D'g2legp3-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'mpc8271' typename=3D'g2legp3-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'mpc8270' typename=3D'g2legp3-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'mpc8266_hip4' typename=3D'g2hip4-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'mpc8266_hip3' typename=3D'g2hip3-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'mpc8266' typename=3D'g2hip4-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'mpc8265_hip4' typename=3D'g2hip4-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'mpc8265_hip3' typename=3D'g2hip3-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'mpc8265' typename=3D'g2hip4-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'mpc8264_hip4' typename=3D'g2hip4-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'mpc8264_hip3' typename=3D'g2hip3-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'mpc8264' typename=3D'g2hip4-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'mpc8260_hip4' typename=3D'g2hip4-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'mpc8260_hip3' typename=3D'g2hip3-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'mpc8260' typename=3D'g2hip4-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'mpc8255_hip4' typename=3D'g2hip4-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'mpc8255_hip3' typename=3D'g2hip3-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'mpc8255' typename=3D'g2hip4-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'mpc8250_hip4' typename=3D'g2hip4-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'mpc8250_hip3' typename=3D'g2hip3-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'mpc8250' typename=3D'g2hip4-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'mpc8248' typename=3D'g2legp3-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'mpc8247' typename=3D'g2legp3-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'mpc8245' typename=3D'g2hip4-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'mpc8241' typename=3D'g2hip4-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'powerquicc-ii' typename=3D'g2legp3-powerpc64-c=
pu'/>
+  <cpu type=3D'tcg' name=3D'mpc82xx' typename=3D'g2legp3-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'mpc5200b' typename=3D'mpc5200b_v21-powerpc64-c=
pu'/>
+  <cpu type=3D'tcg' name=3D'mpc5200' typename=3D'mpc5200_v12-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'mpc52xx' typename=3D'mpc5200_v12-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'mpc8240' typename=3D'603-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'460ex' typename=3D'460exb-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'440ep' typename=3D'440epb-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'x2vp50' typename=3D'x2vp20-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'x2vp7' typename=3D'x2vp4-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'405gpe' typename=3D'405crc-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'405gp' typename=3D'405gpd-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'405cr' typename=3D'405crc-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'405' typename=3D'405d4-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'403' typename=3D'403gc-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'mpc8547e_v21' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cl_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7457a_v1.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'g2gp' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cxe_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'755_v2.7' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'755_v2.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'745_v2.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8377' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7455_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8545_v21' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8548_v11' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'405d4' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'g2le' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'g2hip3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750e' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8572' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'970fx_v2.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750fx_v2.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603p' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'405gpb' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7400_v2.7' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8544e_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e500v2_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e500mc' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603e7v1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'970mp_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'740e' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'405crc' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'403ga' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7447a_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7400_v2.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e300c1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8572e' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e500v2_v21' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'970fx_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750gx_v1.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750fx_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7457_v1.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'970fx_v3.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'604e_v2.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'755_v2.6' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'401a1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'power9_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'npe405h' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'g2ls' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7410_v1.4' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750_v2.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'401b2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8349' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8347ep' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7445_v3.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8540_v21' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8543_v11' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'403gcx' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'745_v2.4' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8548_v21' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750l_v3.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'755_v1.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e500_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cxe_v3.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8541e_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8347p' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8555e_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'power9_v2.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'power7_v2.3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603e7v' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8543e_v11' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750_v3.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7400_v2.6' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'405gpa' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'440epx' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750l_v2.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e200z6' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8547e_v20' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7457a_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8349ea' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e500v2_v20' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'power8nvl_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8540_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'755_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'745_v2.8' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'npe405l' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8343ea' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8545_v20' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8548_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7455_v3.4' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'740_v2.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7448_v1.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7400_v1.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8347et' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7441_v2.10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603e_v1.4' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8543_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'401c2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7451_v2.10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cx_v2.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8543_v21' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603e7' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7448_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7441_v2.3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'405crb' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'604' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7400_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'440-xilinx-w-dfpu' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7445_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'cobra' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e500_v20' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8541_v11' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750gx_v1.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cxe_v2.4' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8641d' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8543e_v21' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750l_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7457_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7450_v1.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'755_v2.5' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7410_v1.3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'745_v2.3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'755_v2.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e500v2_v30' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7455_v3.3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8540_v20' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'405d2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8560_v21' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8343' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8548_v20' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8347t' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'755_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603e_v1.3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8543e_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8347eap' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8548e_v11' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8543_v20' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'401d2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'power8_v2.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'740_v3.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e200z5' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'405cra' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7400_v2.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cxe_v2.3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'745_v2.7' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8560_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e5500' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8544_v11' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7448_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'401e2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'740_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'745_v2.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7400_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7410_v1.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'x2vp4' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8347ap' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8533_v11' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc5200b_v21' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750fx_v2.3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'601_v2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'g2legp3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'604e_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cx_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8610' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'g2h4' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750l_v3.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8377e' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e300c4' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc5200_v12' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7448_v2.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7450_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cxe_v3.1b' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'g2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7400_v2.9' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'405gpd' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603e7t' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8555_v11' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750gx_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8541_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8543e_v20' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750fl' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750l_v2.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'stb04' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8548e_v21' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'x2vp20' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'405ez' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e600' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7450_v1.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'755_v2.4' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8379' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7445_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7447_v1.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603e_v2.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603e_v4' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'g2legp' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7455_v3.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'740_v2.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8560_v20' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'440-xilinx' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'401f2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8533_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8349a' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'405gpr' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'stb25' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603e_v1.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc5200b_v20' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750fx_v2.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8347eat' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'740_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'601_v1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'745_v1.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cx_v2.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8548e_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7447a_v1.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'403gc' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e300c3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc5200_v11' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7441_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'740_v3.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8545e_v21' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'602' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8378e' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8343a' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'460exb' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8555_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8568' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7457a_v1.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cx_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cxe_v2.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'604e_v2.4' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'755_v2.8' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'405lp' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'745_v2.6' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'stb03' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'405ep' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8544_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8347at' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750_v2.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7450_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'755_v2.3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7410_v1.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'745_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750gl' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e6500' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750p' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7445_v3.4' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'440epb' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'npe4gs3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603e_v3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8349e' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'970_v2.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'g2lels' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'g2hip4' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'740p' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8567e' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8533e_v11' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7451_v2.3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603e_v1.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'401g2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7400_v2.8' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7455_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'405gpc' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'power7+_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8544e_v11' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7450_v2.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'970mp_v1.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603e7v2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'604r' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e500v2_v22' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8548e_v20' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8545e_v20' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8378' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8567' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7457_v1.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7447_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'970fx_v3.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'745_v2.5' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8379e' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8641' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cxe_v2.4b' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7410_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc603' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603e_v4.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7445_v3.3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'440epa' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'970fx_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'iop480' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750fx_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'601_v0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'g2legp1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'745_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cl_v2.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cxr' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'401' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8541e_v11' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cxe_v3.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8555e_v11' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'power8e_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7447a_v1.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'403gb' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e300c2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'npe405h2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8343e' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8533e_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc5200_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750_v3.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'power5+_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8568e' typename=3D''/>
   <machine name=3D'pseries-3.1' alias=3D'pseries' hotplugCpus=3D'yes' maxC=
pus=3D'1024' default=3D'yes'/>
   <machine name=3D'ref405ep' maxCpus=3D'1'/>
   <machine name=3D'sam460ex' maxCpus=3D'1'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml b/tests/qemuc=
apabilitiesdata/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=3D'avx512pf' type=3D'boolean' value=3D'false'/>
     <property name=3D'xstore-en' type=3D'boolean' value=3D'false'/>
   </hostCPU>
-  <cpu type=3D'kvm' name=3D'max' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'host' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'qemu64' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'qemu32' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'phenom' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'max' typename=3D'max-x86_64-cpu' usable=3D'yes=
'/>
+  <cpu type=3D'kvm' name=3D'host' typename=3D'host-x86_64-cpu' usable=3D'y=
es'/>
+  <cpu type=3D'kvm' name=3D'base' typename=3D'base-x86_64-cpu' usable=3D'y=
es'/>
+  <cpu type=3D'kvm' name=3D'qemu64' typename=3D'qemu64-x86_64-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'qemu32' typename=3D'qemu32-x86_64-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'phenom' typename=3D'phenom-x86_64-cpu' usable=
=3D'no'>
     <blocker name=3D'mmxext'/>
     <blocker name=3D'fxsr-opt'/>
     <blocker name=3D'3dnowext'/>
@@ -752,22 +752,22 @@
     <blocker name=3D'sse4a'/>
     <blocker name=3D'npt'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'pentium3' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'pentium2' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'pentium' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'n270' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'kvm64' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'kvm32' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'coreduo' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'core2duo' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'athlon' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'pentium3' typename=3D'pentium3-x86_64-cpu' usa=
ble=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'pentium2' typename=3D'pentium2-x86_64-cpu' usa=
ble=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'pentium' typename=3D'pentium-x86_64-cpu' usabl=
e=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'n270' typename=3D'n270-x86_64-cpu' usable=3D'y=
es'/>
+  <cpu type=3D'kvm' name=3D'kvm64' typename=3D'kvm64-x86_64-cpu' usable=3D=
'yes'/>
+  <cpu type=3D'kvm' name=3D'kvm32' typename=3D'kvm32-x86_64-cpu' usable=3D=
'yes'/>
+  <cpu type=3D'kvm' name=3D'coreduo' typename=3D'coreduo-x86_64-cpu' usabl=
e=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'core2duo' typename=3D'core2duo-x86_64-cpu' usa=
ble=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'athlon' typename=3D'athlon-x86_64-cpu' usable=
=3D'no'>
     <blocker name=3D'mmxext'/>
     <blocker name=3D'3dnowext'/>
     <blocker name=3D'3dnow'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Westmere-IBRS' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Westmere' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Skylake-Server-IBRS' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Westmere-IBRS' typename=3D'Westmere-IBRS-x86_6=
4-cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Westmere' typename=3D'Westmere-x86_64-cpu' usa=
ble=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Skylake-Server-IBRS' typename=3D'Skylake-Serve=
r-IBRS-x86_64-cpu' usable=3D'no'>
     <blocker name=3D'avx512f'/>
     <blocker name=3D'avx512dq'/>
     <blocker name=3D'clwb'/>
@@ -780,7 +780,7 @@
     <blocker name=3D'avx512f'/>
     <blocker name=3D'pku'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Skylake-Server' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Skylake-Server' typename=3D'Skylake-Server-x86=
_64-cpu' usable=3D'no'>
     <blocker name=3D'avx512f'/>
     <blocker name=3D'avx512dq'/>
     <blocker name=3D'clwb'/>
@@ -793,33 +793,33 @@
     <blocker name=3D'avx512f'/>
     <blocker name=3D'pku'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Skylake-Client-IBRS' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Skylake-Client' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'SandyBridge-IBRS' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'SandyBridge' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Penryn' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Opteron_G5' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Skylake-Client-IBRS' typename=3D'Skylake-Clien=
t-IBRS-x86_64-cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Skylake-Client' typename=3D'Skylake-Client-x86=
_64-cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'SandyBridge-IBRS' typename=3D'SandyBridge-IBRS=
-x86_64-cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'SandyBridge' typename=3D'SandyBridge-x86_64-cp=
u' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Penryn' typename=3D'Penryn-x86_64-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Opteron_G5' typename=3D'Opteron_G5-x86_64-cpu'=
 usable=3D'no'>
     <blocker name=3D'sse4a'/>
     <blocker name=3D'misalignsse'/>
     <blocker name=3D'xop'/>
     <blocker name=3D'fma4'/>
     <blocker name=3D'tbm'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Opteron_G4' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Opteron_G4' typename=3D'Opteron_G4-x86_64-cpu'=
 usable=3D'no'>
     <blocker name=3D'sse4a'/>
     <blocker name=3D'misalignsse'/>
     <blocker name=3D'xop'/>
     <blocker name=3D'fma4'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Opteron_G3' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Opteron_G3' typename=3D'Opteron_G3-x86_64-cpu'=
 usable=3D'no'>
     <blocker name=3D'sse4a'/>
     <blocker name=3D'misalignsse'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Opteron_G2' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Opteron_G1' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Nehalem-IBRS' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Nehalem' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'KnightsMill' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Opteron_G2' typename=3D'Opteron_G2-x86_64-cpu'=
 usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Opteron_G1' typename=3D'Opteron_G1-x86_64-cpu'=
 usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Nehalem-IBRS' typename=3D'Nehalem-IBRS-x86_64-=
cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Nehalem' typename=3D'Nehalem-x86_64-cpu' usabl=
e=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'KnightsMill' typename=3D'KnightsMill-x86_64-cp=
u' usable=3D'no'>
     <blocker name=3D'avx512f'/>
     <blocker name=3D'avx512pf'/>
     <blocker name=3D'avx512er'/>
@@ -831,9 +831,9 @@
     <blocker name=3D'avx512f'/>
     <blocker name=3D'avx512f'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'IvyBridge-IBRS' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'IvyBridge' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Icelake-Server' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'IvyBridge-IBRS' typename=3D'IvyBridge-IBRS-x86=
_64-cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'IvyBridge' typename=3D'IvyBridge-x86_64-cpu' u=
sable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Icelake-Server' typename=3D'Icelake-Server-x86=
_64-cpu' usable=3D'no'>
     <blocker name=3D'avx512f'/>
     <blocker name=3D'avx512dq'/>
     <blocker name=3D'clwb'/>
@@ -860,7 +860,7 @@
     <blocker name=3D'avx512f'/>
     <blocker name=3D'pku'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Icelake-Client' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Icelake-Client' typename=3D'Icelake-Client-x86=
_64-cpu' usable=3D'no'>
     <blocker name=3D'intel-pt'/>
     <blocker name=3D'avx512vbmi'/>
     <blocker name=3D'pku'/>
@@ -876,11 +876,11 @@
     <blocker name=3D'wbnoinvd'/>
     <blocker name=3D'pku'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Haswell-noTSX-IBRS' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Haswell-noTSX' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Haswell-IBRS' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Haswell' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'EPYC-IBPB' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Haswell-noTSX-IBRS' typename=3D'Haswell-noTSX-=
IBRS-x86_64-cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Haswell-noTSX' typename=3D'Haswell-noTSX-x86_6=
4-cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Haswell-IBRS' typename=3D'Haswell-IBRS-x86_64-=
cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Haswell' typename=3D'Haswell-x86_64-cpu' usabl=
e=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'EPYC-IBPB' typename=3D'EPYC-IBPB-x86_64-cpu' u=
sable=3D'no'>
     <blocker name=3D'sha-ni'/>
     <blocker name=3D'mmxext'/>
     <blocker name=3D'fxsr-opt'/>
@@ -890,7 +890,7 @@
     <blocker name=3D'osvw'/>
     <blocker name=3D'ibpb'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'EPYC' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'EPYC' typename=3D'EPYC-x86_64-cpu' usable=3D'n=
o'>
     <blocker name=3D'sha-ni'/>
     <blocker name=3D'mmxext'/>
     <blocker name=3D'fxsr-opt'/>
@@ -899,8 +899,8 @@
     <blocker name=3D'misalignsse'/>
     <blocker name=3D'osvw'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Conroe' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Cascadelake-Server' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Conroe' typename=3D'Conroe-x86_64-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Cascadelake-Server' typename=3D'Cascadelake-Se=
rver-x86_64-cpu' usable=3D'no'>
     <blocker name=3D'avx512f'/>
     <blocker name=3D'avx512dq'/>
     <blocker name=3D'clwb'/>
@@ -917,35 +917,35 @@
     <blocker name=3D'avx512f'/>
     <blocker name=3D'pku'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Broadwell-noTSX-IBRS' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Broadwell-noTSX' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Broadwell-IBRS' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Broadwell' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'486' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'max' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'host' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Broadwell-noTSX-IBRS' typename=3D'Broadwell-no=
TSX-IBRS-x86_64-cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Broadwell-noTSX' typename=3D'Broadwell-noTSX-x=
86_64-cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Broadwell-IBRS' typename=3D'Broadwell-IBRS-x86=
_64-cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Broadwell' typename=3D'Broadwell-x86_64-cpu' u=
sable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'486' typename=3D'486-x86_64-cpu' usable=3D'yes=
'/>
+  <cpu type=3D'tcg' name=3D'max' typename=3D'max-x86_64-cpu' usable=3D'yes=
'/>
+  <cpu type=3D'tcg' name=3D'host' typename=3D'host-x86_64-cpu' usable=3D'n=
o'>
     <blocker name=3D'kvm'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'base' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'qemu64' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'qemu32' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'phenom' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'base' typename=3D'base-x86_64-cpu' usable=3D'y=
es'/>
+  <cpu type=3D'tcg' name=3D'qemu64' typename=3D'qemu64-x86_64-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'qemu32' typename=3D'qemu32-x86_64-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'phenom' typename=3D'phenom-x86_64-cpu' usable=
=3D'no'>
     <blocker name=3D'fxsr-opt'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'pentium3' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'pentium2' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'pentium' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'n270' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'kvm64' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'kvm32' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'coreduo' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'core2duo' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'athlon' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'Westmere-IBRS' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'pentium3' typename=3D'pentium3-x86_64-cpu' usa=
ble=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'pentium2' typename=3D'pentium2-x86_64-cpu' usa=
ble=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'pentium' typename=3D'pentium-x86_64-cpu' usabl=
e=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'n270' typename=3D'n270-x86_64-cpu' usable=3D'y=
es'/>
+  <cpu type=3D'tcg' name=3D'kvm64' typename=3D'kvm64-x86_64-cpu' usable=3D=
'yes'/>
+  <cpu type=3D'tcg' name=3D'kvm32' typename=3D'kvm32-x86_64-cpu' usable=3D=
'yes'/>
+  <cpu type=3D'tcg' name=3D'coreduo' typename=3D'coreduo-x86_64-cpu' usabl=
e=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'core2duo' typename=3D'core2duo-x86_64-cpu' usa=
ble=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'athlon' typename=3D'athlon-x86_64-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'Westmere-IBRS' typename=3D'Westmere-IBRS-x86_6=
4-cpu' usable=3D'no'>
     <blocker name=3D'spec-ctrl'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Westmere' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'Skylake-Server-IBRS' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Westmere' typename=3D'Westmere-x86_64-cpu' usa=
ble=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'Skylake-Server-IBRS' typename=3D'Skylake-Serve=
r-IBRS-x86_64-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -967,7 +967,7 @@
     <blocker name=3D'3dnowprefetch'/>
     <blocker name=3D'xsavec'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Skylake-Server' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Skylake-Server' typename=3D'Skylake-Server-x86=
_64-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -988,7 +988,7 @@
     <blocker name=3D'3dnowprefetch'/>
     <blocker name=3D'xsavec'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Skylake-Client-IBRS' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Skylake-Client-IBRS' typename=3D'Skylake-Clien=
t-IBRS-x86_64-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1005,7 +1005,7 @@
     <blocker name=3D'3dnowprefetch'/>
     <blocker name=3D'xsavec'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Skylake-Client' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Skylake-Client' typename=3D'Skylake-Client-x86=
_64-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1021,19 +1021,19 @@
     <blocker name=3D'3dnowprefetch'/>
     <blocker name=3D'xsavec'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'SandyBridge-IBRS' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'SandyBridge-IBRS' typename=3D'SandyBridge-IBRS=
-x86_64-cpu' usable=3D'no'>
     <blocker name=3D'x2apic'/>
     <blocker name=3D'tsc-deadline'/>
     <blocker name=3D'avx'/>
     <blocker name=3D'spec-ctrl'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'SandyBridge' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'SandyBridge' typename=3D'SandyBridge-x86_64-cp=
u' usable=3D'no'>
     <blocker name=3D'x2apic'/>
     <blocker name=3D'tsc-deadline'/>
     <blocker name=3D'avx'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Penryn' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'Opteron_G5' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Penryn' typename=3D'Penryn-x86_64-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'Opteron_G5' typename=3D'Opteron_G5-x86_64-cpu'=
 usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'avx'/>
     <blocker name=3D'f16c'/>
@@ -1043,23 +1043,23 @@
     <blocker name=3D'fma4'/>
     <blocker name=3D'tbm'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Opteron_G4' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Opteron_G4' typename=3D'Opteron_G4-x86_64-cpu'=
 usable=3D'no'>
     <blocker name=3D'avx'/>
     <blocker name=3D'misalignsse'/>
     <blocker name=3D'3dnowprefetch'/>
     <blocker name=3D'xop'/>
     <blocker name=3D'fma4'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Opteron_G3' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Opteron_G3' typename=3D'Opteron_G3-x86_64-cpu'=
 usable=3D'no'>
     <blocker name=3D'misalignsse'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Opteron_G2' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'Opteron_G1' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'Nehalem-IBRS' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Opteron_G2' typename=3D'Opteron_G2-x86_64-cpu'=
 usable=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'Opteron_G1' typename=3D'Opteron_G1-x86_64-cpu'=
 usable=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'Nehalem-IBRS' typename=3D'Nehalem-IBRS-x86_64-=
cpu' usable=3D'no'>
     <blocker name=3D'spec-ctrl'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Nehalem' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'KnightsMill' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Nehalem' typename=3D'Nehalem-x86_64-cpu' usabl=
e=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'KnightsMill' typename=3D'KnightsMill-x86_64-cp=
u' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'x2apic'/>
     <blocker name=3D'tsc-deadline'/>
@@ -1077,7 +1077,7 @@
     <blocker name=3D'avx512-4fmaps'/>
     <blocker name=3D'3dnowprefetch'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'IvyBridge-IBRS' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'IvyBridge-IBRS' typename=3D'IvyBridge-IBRS-x86=
_64-cpu' usable=3D'no'>
     <blocker name=3D'x2apic'/>
     <blocker name=3D'tsc-deadline'/>
     <blocker name=3D'avx'/>
@@ -1085,14 +1085,14 @@
     <blocker name=3D'rdrand'/>
     <blocker name=3D'spec-ctrl'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'IvyBridge' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'IvyBridge' typename=3D'IvyBridge-x86_64-cpu' u=
sable=3D'no'>
     <blocker name=3D'x2apic'/>
     <blocker name=3D'tsc-deadline'/>
     <blocker name=3D'avx'/>
     <blocker name=3D'f16c'/>
     <blocker name=3D'rdrand'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Icelake-Server' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Icelake-Server' typename=3D'Icelake-Server-x86=
_64-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1128,7 +1128,7 @@
     <blocker name=3D'wbnoinvd'/>
     <blocker name=3D'xsavec'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Icelake-Client' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Icelake-Client' typename=3D'Icelake-Client-x86=
_64-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1158,7 +1158,7 @@
     <blocker name=3D'wbnoinvd'/>
     <blocker name=3D'xsavec'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Haswell-noTSX-IBRS' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Haswell-noTSX-IBRS' typename=3D'Haswell-noTSX-=
IBRS-x86_64-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1170,7 +1170,7 @@
     <blocker name=3D'invpcid'/>
     <blocker name=3D'spec-ctrl'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Haswell-noTSX' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Haswell-noTSX' typename=3D'Haswell-noTSX-x86_6=
4-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1181,7 +1181,7 @@
     <blocker name=3D'avx2'/>
     <blocker name=3D'invpcid'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Haswell-IBRS' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Haswell-IBRS' typename=3D'Haswell-IBRS-x86_64-=
cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1195,7 +1195,7 @@
     <blocker name=3D'rtm'/>
     <blocker name=3D'spec-ctrl'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Haswell' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Haswell' typename=3D'Haswell-x86_64-cpu' usabl=
e=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1208,7 +1208,7 @@
     <blocker name=3D'invpcid'/>
     <blocker name=3D'rtm'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'EPYC-IBPB' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'EPYC-IBPB' typename=3D'EPYC-IBPB-x86_64-cpu' u=
sable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'avx'/>
     <blocker name=3D'f16c'/>
@@ -1224,7 +1224,7 @@
     <blocker name=3D'ibpb'/>
     <blocker name=3D'xsavec'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'EPYC' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'EPYC' typename=3D'EPYC-x86_64-cpu' usable=3D'n=
o'>
     <blocker name=3D'fma'/>
     <blocker name=3D'avx'/>
     <blocker name=3D'f16c'/>
@@ -1239,8 +1239,8 @@
     <blocker name=3D'topoext'/>
     <blocker name=3D'xsavec'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Conroe' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'Cascadelake-Server' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Conroe' typename=3D'Conroe-x86_64-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'Cascadelake-Server' typename=3D'Cascadelake-Se=
rver-x86_64-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1266,7 +1266,7 @@
     <blocker name=3D'3dnowprefetch'/>
     <blocker name=3D'xsavec'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Broadwell-noTSX-IBRS' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Broadwell-noTSX-IBRS' typename=3D'Broadwell-no=
TSX-IBRS-x86_64-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1280,7 +1280,7 @@
     <blocker name=3D'spec-ctrl'/>
     <blocker name=3D'3dnowprefetch'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Broadwell-noTSX' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Broadwell-noTSX' typename=3D'Broadwell-noTSX-x=
86_64-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1293,7 +1293,7 @@
     <blocker name=3D'rdseed'/>
     <blocker name=3D'3dnowprefetch'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Broadwell-IBRS' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Broadwell-IBRS' typename=3D'Broadwell-IBRS-x86=
_64-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1309,7 +1309,7 @@
     <blocker name=3D'spec-ctrl'/>
     <blocker name=3D'3dnowprefetch'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Broadwell' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Broadwell' typename=3D'Broadwell-x86_64-cpu' u=
sable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1324,7 +1324,7 @@
     <blocker name=3D'rdseed'/>
     <blocker name=3D'3dnowprefetch'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'486' usable=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'486' typename=3D'486-x86_64-cpu' usable=3D'yes=
'/>
   <machine name=3D'pc-i440fx-3.1' alias=3D'pc' hotplugCpus=3D'yes' maxCpus=
=3D'255' default=3D'yes'/>
   <machine name=3D'isapc' hotplugCpus=3D'yes' maxCpus=3D'1'/>
   <machine name=3D'pc-1.1' hotplugCpus=3D'yes' maxCpus=3D'255'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml b/tests/qemu=
capabilitiesdata/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=3D'kvm' name=3D'pxa262'/>
-  <cpu type=3D'kvm' name=3D'pxa270-a0'/>
-  <cpu type=3D'kvm' name=3D'arm1136'/>
-  <cpu type=3D'kvm' name=3D'cortex-a15'/>
-  <cpu type=3D'kvm' name=3D'pxa260'/>
-  <cpu type=3D'kvm' name=3D'arm1136-r2'/>
-  <cpu type=3D'kvm' name=3D'pxa261'/>
-  <cpu type=3D'kvm' name=3D'pxa255'/>
-  <cpu type=3D'kvm' name=3D'cortex-a72'/>
-  <cpu type=3D'kvm' name=3D'cortex-m33'/>
-  <cpu type=3D'kvm' name=3D'arm926'/>
-  <cpu type=3D'kvm' name=3D'cortex-r5f'/>
-  <cpu type=3D'kvm' name=3D'arm11mpcore'/>
-  <cpu type=3D'kvm' name=3D'pxa250'/>
-  <cpu type=3D'kvm' name=3D'ti925t'/>
-  <cpu type=3D'kvm' name=3D'cortex-a57'/>
-  <cpu type=3D'kvm' name=3D'sa1110'/>
-  <cpu type=3D'kvm' name=3D'host'/>
-  <cpu type=3D'kvm' name=3D'arm1176'/>
-  <cpu type=3D'kvm' name=3D'cortex-a53'/>
-  <cpu type=3D'kvm' name=3D'sa1100'/>
-  <cpu type=3D'kvm' name=3D'pxa270-c5'/>
-  <cpu type=3D'kvm' name=3D'cortex-a9'/>
-  <cpu type=3D'kvm' name=3D'cortex-a8'/>
-  <cpu type=3D'kvm' name=3D'cortex-a7'/>
-  <cpu type=3D'kvm' name=3D'pxa270-c0'/>
-  <cpu type=3D'kvm' name=3D'arm1026'/>
-  <cpu type=3D'kvm' name=3D'pxa270-b1'/>
-  <cpu type=3D'kvm' name=3D'cortex-m3'/>
-  <cpu type=3D'kvm' name=3D'max'/>
-  <cpu type=3D'kvm' name=3D'cortex-m4'/>
-  <cpu type=3D'kvm' name=3D'pxa270-b0'/>
-  <cpu type=3D'kvm' name=3D'arm946'/>
-  <cpu type=3D'kvm' name=3D'cortex-m0'/>
-  <cpu type=3D'kvm' name=3D'cortex-r5'/>
-  <cpu type=3D'kvm' name=3D'pxa270-a1'/>
-  <cpu type=3D'kvm' name=3D'pxa270'/>
-  <cpu type=3D'tcg' name=3D'pxa262'/>
-  <cpu type=3D'tcg' name=3D'pxa270-a0'/>
-  <cpu type=3D'tcg' name=3D'arm1136'/>
-  <cpu type=3D'tcg' name=3D'cortex-a15'/>
-  <cpu type=3D'tcg' name=3D'pxa260'/>
-  <cpu type=3D'tcg' name=3D'arm1136-r2'/>
-  <cpu type=3D'tcg' name=3D'pxa261'/>
-  <cpu type=3D'tcg' name=3D'pxa255'/>
-  <cpu type=3D'tcg' name=3D'cortex-a72'/>
-  <cpu type=3D'tcg' name=3D'cortex-m33'/>
-  <cpu type=3D'tcg' name=3D'arm926'/>
-  <cpu type=3D'tcg' name=3D'cortex-r5f'/>
-  <cpu type=3D'tcg' name=3D'arm11mpcore'/>
-  <cpu type=3D'tcg' name=3D'pxa250'/>
-  <cpu type=3D'tcg' name=3D'ti925t'/>
-  <cpu type=3D'tcg' name=3D'cortex-a57'/>
-  <cpu type=3D'tcg' name=3D'sa1110'/>
-  <cpu type=3D'tcg' name=3D'host'/>
-  <cpu type=3D'tcg' name=3D'arm1176'/>
-  <cpu type=3D'tcg' name=3D'cortex-a53'/>
-  <cpu type=3D'tcg' name=3D'sa1100'/>
-  <cpu type=3D'tcg' name=3D'pxa270-c5'/>
-  <cpu type=3D'tcg' name=3D'cortex-a9'/>
-  <cpu type=3D'tcg' name=3D'cortex-a8'/>
-  <cpu type=3D'tcg' name=3D'cortex-a7'/>
-  <cpu type=3D'tcg' name=3D'pxa270-c0'/>
-  <cpu type=3D'tcg' name=3D'arm1026'/>
-  <cpu type=3D'tcg' name=3D'pxa270-b1'/>
-  <cpu type=3D'tcg' name=3D'cortex-m3'/>
-  <cpu type=3D'tcg' name=3D'max'/>
-  <cpu type=3D'tcg' name=3D'cortex-m4'/>
-  <cpu type=3D'tcg' name=3D'pxa270-b0'/>
-  <cpu type=3D'tcg' name=3D'arm946'/>
-  <cpu type=3D'tcg' name=3D'cortex-m0'/>
-  <cpu type=3D'tcg' name=3D'cortex-r5'/>
-  <cpu type=3D'tcg' name=3D'pxa270-a1'/>
-  <cpu type=3D'tcg' name=3D'pxa270'/>
+  <cpu type=3D'kvm' name=3D'pxa262' typename=3D'pxa262-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'pxa270-a0' typename=3D'pxa270-a0-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'arm1136' typename=3D'arm1136-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'cortex-a15' typename=3D'cortex-a15-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'pxa260' typename=3D'pxa260-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'arm1136-r2' typename=3D'arm1136-r2-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'pxa261' typename=3D'pxa261-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'pxa255' typename=3D'pxa255-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'cortex-a72' typename=3D'cortex-a72-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'cortex-m33' typename=3D'cortex-m33-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'arm926' typename=3D'arm926-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'cortex-r5f' typename=3D'cortex-r5f-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'arm11mpcore' typename=3D'arm11mpcore-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'pxa250' typename=3D'pxa250-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'ti925t' typename=3D'ti925t-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'cortex-a57' typename=3D'cortex-a57-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'sa1110' typename=3D'sa1110-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'host' typename=3D'host-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'arm1176' typename=3D'arm1176-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'cortex-a53' typename=3D'cortex-a53-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'sa1100' typename=3D'sa1100-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'pxa270-c5' typename=3D'pxa270-c5-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'cortex-a9' typename=3D'cortex-a9-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'cortex-a8' typename=3D'cortex-a8-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'cortex-a7' typename=3D'cortex-a7-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'pxa270-c0' typename=3D'pxa270-c0-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'arm1026' typename=3D'arm1026-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'pxa270-b1' typename=3D'pxa270-b1-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'cortex-m3' typename=3D'cortex-m3-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'max' typename=3D'max-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'cortex-m4' typename=3D'cortex-m4-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'pxa270-b0' typename=3D'pxa270-b0-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'arm946' typename=3D'arm946-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'cortex-m0' typename=3D'cortex-m0-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'cortex-r5' typename=3D'cortex-r5-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'pxa270-a1' typename=3D'pxa270-a1-arm-cpu'/>
+  <cpu type=3D'kvm' name=3D'pxa270' typename=3D'pxa270-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'pxa262' typename=3D'pxa262-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'pxa270-a0' typename=3D'pxa270-a0-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'arm1136' typename=3D'arm1136-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'cortex-a15' typename=3D'cortex-a15-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'pxa260' typename=3D'pxa260-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'arm1136-r2' typename=3D'arm1136-r2-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'pxa261' typename=3D'pxa261-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'pxa255' typename=3D'pxa255-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'cortex-a72' typename=3D'cortex-a72-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'cortex-m33' typename=3D'cortex-m33-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'arm926' typename=3D'arm926-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'cortex-r5f' typename=3D'cortex-r5f-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'arm11mpcore' typename=3D'arm11mpcore-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'pxa250' typename=3D'pxa250-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'ti925t' typename=3D'ti925t-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'cortex-a57' typename=3D'cortex-a57-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'sa1110' typename=3D'sa1110-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'host' typename=3D'host-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'arm1176' typename=3D'arm1176-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'cortex-a53' typename=3D'cortex-a53-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'sa1100' typename=3D'sa1100-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'pxa270-c5' typename=3D'pxa270-c5-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'cortex-a9' typename=3D'cortex-a9-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'cortex-a8' typename=3D'cortex-a8-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'cortex-a7' typename=3D'cortex-a7-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'pxa270-c0' typename=3D'pxa270-c0-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'arm1026' typename=3D'arm1026-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'pxa270-b1' typename=3D'pxa270-b1-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'cortex-m3' typename=3D'cortex-m3-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'max' typename=3D'max-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'cortex-m4' typename=3D'cortex-m4-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'pxa270-b0' typename=3D'pxa270-b0-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'arm946' typename=3D'arm946-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'cortex-m0' typename=3D'cortex-m0-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'cortex-r5' typename=3D'cortex-r5-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'pxa270-a1' typename=3D'pxa270-a1-arm-cpu'/>
+  <cpu type=3D'tcg' name=3D'pxa270' typename=3D'pxa270-arm-cpu'/>
   <machine name=3D'integratorcp' maxCpus=3D'1'/>
   <machine name=3D'nuri' maxCpus=3D'2'/>
   <machine name=3D'mps2-an511' maxCpus=3D'1'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml b/tests/qemuca=
pabilitiesdata/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=3D'kvm' name=3D'default'/>
-  <cpu type=3D'kvm' name=3D'ppc'/>
-  <cpu type=3D'kvm' name=3D'ppc32'/>
-  <cpu type=3D'kvm' name=3D'ppc64'/>
-  <cpu type=3D'kvm' name=3D'power9'/>
-  <cpu type=3D'kvm' name=3D'power8nvl'/>
-  <cpu type=3D'kvm' name=3D'power8'/>
-  <cpu type=3D'kvm' name=3D'power8e'/>
-  <cpu type=3D'kvm' name=3D'power7+'/>
-  <cpu type=3D'kvm' name=3D'power7'/>
-  <cpu type=3D'kvm' name=3D'power5gs'/>
-  <cpu type=3D'kvm' name=3D'power5+'/>
-  <cpu type=3D'kvm' name=3D'970mp'/>
-  <cpu type=3D'kvm' name=3D'970fx'/>
-  <cpu type=3D'kvm' name=3D'970'/>
-  <cpu type=3D'kvm' name=3D'apollo7pm'/>
-  <cpu type=3D'kvm' name=3D'7457a'/>
-  <cpu type=3D'kvm' name=3D'7447a'/>
-  <cpu type=3D'kvm' name=3D'apollo7'/>
-  <cpu type=3D'kvm' name=3D'7457'/>
-  <cpu type=3D'kvm' name=3D'7447'/>
-  <cpu type=3D'kvm' name=3D'apollo6'/>
-  <cpu type=3D'kvm' name=3D'7455'/>
-  <cpu type=3D'kvm' name=3D'7445'/>
-  <cpu type=3D'kvm' name=3D'7451'/>
-  <cpu type=3D'kvm' name=3D'7441'/>
-  <cpu type=3D'kvm' name=3D'vger'/>
-  <cpu type=3D'kvm' name=3D'7450'/>
-  <cpu type=3D'kvm' name=3D'7448'/>
-  <cpu type=3D'kvm' name=3D'nitro'/>
-  <cpu type=3D'kvm' name=3D'7410'/>
-  <cpu type=3D'kvm' name=3D'g4'/>
-  <cpu type=3D'kvm' name=3D'max'/>
-  <cpu type=3D'kvm' name=3D'7400'/>
-  <cpu type=3D'kvm' name=3D'goldfinger'/>
-  <cpu type=3D'kvm' name=3D'755'/>
-  <cpu type=3D'kvm' name=3D'745'/>
-  <cpu type=3D'kvm' name=3D'lonestar'/>
-  <cpu type=3D'kvm' name=3D'750l'/>
-  <cpu type=3D'kvm' name=3D'750gx'/>
-  <cpu type=3D'kvm' name=3D'750fx'/>
-  <cpu type=3D'kvm' name=3D'750cxe'/>
-  <cpu type=3D'kvm' name=3D'750cx'/>
-  <cpu type=3D'kvm' name=3D'750cl'/>
-  <cpu type=3D'kvm' name=3D'conan/doyle'/>
-  <cpu type=3D'kvm' name=3D'g3'/>
-  <cpu type=3D'kvm' name=3D'typhoon'/>
-  <cpu type=3D'kvm' name=3D'750'/>
-  <cpu type=3D'kvm' name=3D'arthur'/>
-  <cpu type=3D'kvm' name=3D'740'/>
-  <cpu type=3D'kvm' name=3D'mach5'/>
-  <cpu type=3D'kvm' name=3D'sirocco'/>
-  <cpu type=3D'kvm' name=3D'604e'/>
-  <cpu type=3D'kvm' name=3D'goldeneye'/>
-  <cpu type=3D'kvm' name=3D'603r'/>
-  <cpu type=3D'kvm' name=3D'vaillant'/>
-  <cpu type=3D'kvm' name=3D'stretch'/>
-  <cpu type=3D'kvm' name=3D'603e'/>
-  <cpu type=3D'kvm' name=3D'vanilla'/>
-  <cpu type=3D'kvm' name=3D'601v'/>
-  <cpu type=3D'kvm' name=3D'601'/>
-  <cpu type=3D'kvm' name=3D'mpc8560'/>
-  <cpu type=3D'kvm' name=3D'mpc8555e'/>
-  <cpu type=3D'kvm' name=3D'mpc8555'/>
-  <cpu type=3D'kvm' name=3D'mpc8548e'/>
-  <cpu type=3D'kvm' name=3D'mpc8548'/>
-  <cpu type=3D'kvm' name=3D'mpc8547e'/>
-  <cpu type=3D'kvm' name=3D'mpc8545e'/>
-  <cpu type=3D'kvm' name=3D'mpc8545'/>
-  <cpu type=3D'kvm' name=3D'mpc8544e'/>
-  <cpu type=3D'kvm' name=3D'mpc8544'/>
-  <cpu type=3D'kvm' name=3D'mpc8543e'/>
-  <cpu type=3D'kvm' name=3D'mpc8543'/>
-  <cpu type=3D'kvm' name=3D'mpc8541e'/>
-  <cpu type=3D'kvm' name=3D'mpc8541'/>
-  <cpu type=3D'kvm' name=3D'mpc8540'/>
-  <cpu type=3D'kvm' name=3D'mpc8533e'/>
-  <cpu type=3D'kvm' name=3D'mpc8533'/>
-  <cpu type=3D'kvm' name=3D'e500v2'/>
-  <cpu type=3D'kvm' name=3D'e500v1'/>
-  <cpu type=3D'kvm' name=3D'e500'/>
-  <cpu type=3D'kvm' name=3D'mpc8347ea'/>
-  <cpu type=3D'kvm' name=3D'mpc8347e'/>
-  <cpu type=3D'kvm' name=3D'mpc8347a'/>
-  <cpu type=3D'kvm' name=3D'mpc8347'/>
-  <cpu type=3D'kvm' name=3D'e300'/>
-  <cpu type=3D'kvm' name=3D'e200'/>
-  <cpu type=3D'kvm' name=3D'mpc8280'/>
-  <cpu type=3D'kvm' name=3D'mpc8275'/>
-  <cpu type=3D'kvm' name=3D'mpc8272'/>
-  <cpu type=3D'kvm' name=3D'mpc8271'/>
-  <cpu type=3D'kvm' name=3D'mpc8270'/>
-  <cpu type=3D'kvm' name=3D'mpc8266_hip4'/>
-  <cpu type=3D'kvm' name=3D'mpc8266_hip3'/>
-  <cpu type=3D'kvm' name=3D'mpc8266'/>
-  <cpu type=3D'kvm' name=3D'mpc8265_hip4'/>
-  <cpu type=3D'kvm' name=3D'mpc8265_hip3'/>
-  <cpu type=3D'kvm' name=3D'mpc8265'/>
-  <cpu type=3D'kvm' name=3D'mpc8264_hip4'/>
-  <cpu type=3D'kvm' name=3D'mpc8264_hip3'/>
-  <cpu type=3D'kvm' name=3D'mpc8264'/>
-  <cpu type=3D'kvm' name=3D'mpc8260_hip4'/>
-  <cpu type=3D'kvm' name=3D'mpc8260_hip3'/>
-  <cpu type=3D'kvm' name=3D'mpc8260'/>
-  <cpu type=3D'kvm' name=3D'mpc8255_hip4'/>
-  <cpu type=3D'kvm' name=3D'mpc8255_hip3'/>
-  <cpu type=3D'kvm' name=3D'mpc8255'/>
-  <cpu type=3D'kvm' name=3D'mpc8250_hip4'/>
-  <cpu type=3D'kvm' name=3D'mpc8250_hip3'/>
-  <cpu type=3D'kvm' name=3D'mpc8250'/>
-  <cpu type=3D'kvm' name=3D'mpc8248'/>
-  <cpu type=3D'kvm' name=3D'mpc8247'/>
-  <cpu type=3D'kvm' name=3D'mpc8245'/>
-  <cpu type=3D'kvm' name=3D'mpc8241'/>
-  <cpu type=3D'kvm' name=3D'powerquicc-ii'/>
-  <cpu type=3D'kvm' name=3D'mpc82xx'/>
-  <cpu type=3D'kvm' name=3D'mpc5200b'/>
-  <cpu type=3D'kvm' name=3D'mpc5200'/>
-  <cpu type=3D'kvm' name=3D'mpc52xx'/>
-  <cpu type=3D'kvm' name=3D'mpc8240'/>
-  <cpu type=3D'kvm' name=3D'460ex'/>
-  <cpu type=3D'kvm' name=3D'440ep'/>
-  <cpu type=3D'kvm' name=3D'x2vp50'/>
-  <cpu type=3D'kvm' name=3D'x2vp7'/>
-  <cpu type=3D'kvm' name=3D'405gpe'/>
-  <cpu type=3D'kvm' name=3D'405gp'/>
-  <cpu type=3D'kvm' name=3D'405cr'/>
-  <cpu type=3D'kvm' name=3D'405'/>
-  <cpu type=3D'kvm' name=3D'403'/>
-  <cpu type=3D'kvm' name=3D'mpc8547e_v21'/>
-  <cpu type=3D'kvm' name=3D'g2gp'/>
-  <cpu type=3D'kvm' name=3D'7457a_v1.1'/>
-  <cpu type=3D'kvm' name=3D'750cl_v1.0'/>
-  <cpu type=3D'kvm' name=3D'750cxe_v2.1'/>
-  <cpu type=3D'kvm' name=3D'755_v2.7'/>
-  <cpu type=3D'kvm' name=3D'750_v2.1'/>
-  <cpu type=3D'kvm' name=3D'755_v2.2'/>
-  <cpu type=3D'kvm' name=3D'745_v2.0'/>
-  <cpu type=3D'kvm' name=3D'mpc8377'/>
-  <cpu type=3D'kvm' name=3D'7455_v1.0'/>
-  <cpu type=3D'kvm' name=3D'mpc8545_v21'/>
-  <cpu type=3D'kvm' name=3D'mpc8548_v11'/>
-  <cpu type=3D'kvm' name=3D'405d4'/>
-  <cpu type=3D'kvm' name=3D'g2le'/>
-  <cpu type=3D'kvm' name=3D'g2hip3'/>
-  <cpu type=3D'kvm' name=3D'750e'/>
-  <cpu type=3D'kvm' name=3D'mpc8572'/>
-  <cpu type=3D'kvm' name=3D'970fx_v2.0'/>
-  <cpu type=3D'kvm' name=3D'750fx_v2.0'/>
-  <cpu type=3D'kvm' name=3D'603p'/>
-  <cpu type=3D'kvm' name=3D'405gpb'/>
-  <cpu type=3D'kvm' name=3D'7400_v2.7'/>
-  <cpu type=3D'kvm' name=3D'mpc8544e_v10'/>
-  <cpu type=3D'kvm' name=3D'e500v2_v10'/>
-  <cpu type=3D'kvm' name=3D'e500mc'/>
-  <cpu type=3D'kvm' name=3D'603e7v1'/>
-  <cpu type=3D'kvm' name=3D'970mp_v1.0'/>
-  <cpu type=3D'kvm' name=3D'740e'/>
-  <cpu type=3D'kvm' name=3D'405crc'/>
-  <cpu type=3D'kvm' name=3D'403ga'/>
-  <cpu type=3D'kvm' name=3D'7447a_v1.0'/>
-  <cpu type=3D'kvm' name=3D'e300c1'/>
-  <cpu type=3D'kvm' name=3D'mpc8572e'/>
-  <cpu type=3D'kvm' name=3D'e500v2_v21'/>
-  <cpu type=3D'kvm' name=3D'7400_v2.2'/>
-  <cpu type=3D'kvm' name=3D'970fx_v1.0'/>
-  <cpu type=3D'kvm' name=3D'750gx_v1.2'/>
-  <cpu type=3D'kvm' name=3D'750fx_v1.0'/>
-  <cpu type=3D'kvm' name=3D'7457_v1.1'/>
-  <cpu type=3D'kvm' name=3D'970fx_v3.0'/>
-  <cpu type=3D'kvm' name=3D'604e_v2.2'/>
-  <cpu type=3D'kvm' name=3D'745_v2.4'/>
-  <cpu type=3D'kvm' name=3D'401a1'/>
-  <cpu type=3D'kvm' name=3D'755_v2.6'/>
-  <cpu type=3D'kvm' name=3D'npe405h'/>
-  <cpu type=3D'kvm' name=3D'power9_v1.0'/>
-  <cpu type=3D'kvm' name=3D'g2ls'/>
-  <cpu type=3D'kvm' name=3D'7410_v1.4'/>
-  <cpu type=3D'kvm' name=3D'750_v2.0'/>
-  <cpu type=3D'kvm' name=3D'401b2'/>
-  <cpu type=3D'kvm' name=3D'mpc8349'/>
-  <cpu type=3D'kvm' name=3D'mpc8347ep'/>
-  <cpu type=3D'kvm' name=3D'7445_v3.2'/>
-  <cpu type=3D'kvm' name=3D'mpc8540_v21'/>
-  <cpu type=3D'kvm' name=3D'mpc8543_v11'/>
-  <cpu type=3D'kvm' name=3D'403gcx'/>
-  <cpu type=3D'kvm' name=3D'mpc8548_v21'/>
-  <cpu type=3D'kvm' name=3D'750l_v3.2'/>
-  <cpu type=3D'kvm' name=3D'750_v1.0'/>
-  <cpu type=3D'kvm' name=3D'755_v1.1'/>
-  <cpu type=3D'kvm' name=3D'750cxe_v3.0'/>
-  <cpu type=3D'kvm' name=3D'e500_v10'/>
-  <cpu type=3D'kvm' name=3D'mpc8541e_v10'/>
-  <cpu type=3D'kvm' name=3D'power9_v2.0'/>
-  <cpu type=3D'kvm' name=3D'mpc8347p'/>
-  <cpu type=3D'kvm' name=3D'mpc8555e_v10'/>
-  <cpu type=3D'kvm' name=3D'power7_v2.3'/>
-  <cpu type=3D'kvm' name=3D'603e7v'/>
-  <cpu type=3D'kvm' name=3D'mpc8543e_v11'/>
-  <cpu type=3D'kvm' name=3D'750_v3.0'/>
-  <cpu type=3D'kvm' name=3D'7400_v2.6'/>
-  <cpu type=3D'kvm' name=3D'405gpa'/>
-  <cpu type=3D'kvm' name=3D'440epx'/>
-  <cpu type=3D'kvm' name=3D'750l_v2.2'/>
-  <cpu type=3D'kvm' name=3D'e200z6'/>
-  <cpu type=3D'kvm' name=3D'mpc8547e_v20'/>
-  <cpu type=3D'kvm' name=3D'7457a_v1.0'/>
-  <cpu type=3D'kvm' name=3D'mpc8349ea'/>
-  <cpu type=3D'kvm' name=3D'e500v2_v20'/>
-  <cpu type=3D'kvm' name=3D'power8nvl_v1.0'/>
-  <cpu type=3D'kvm' name=3D'mpc8540_v10'/>
-  <cpu type=3D'kvm' name=3D'755_v2.1'/>
-  <cpu type=3D'kvm' name=3D'745_v2.8'/>
-  <cpu type=3D'kvm' name=3D'npe405l'/>
-  <cpu type=3D'kvm' name=3D'mpc8343ea'/>
-  <cpu type=3D'kvm' name=3D'mpc8545_v20'/>
-  <cpu type=3D'kvm' name=3D'mpc8548_v10'/>
-  <cpu type=3D'kvm' name=3D'7448_v1.1'/>
-  <cpu type=3D'kvm' name=3D'740_v2.2'/>
-  <cpu type=3D'kvm' name=3D'7455_v3.4'/>
-  <cpu type=3D'kvm' name=3D'7400_v1.1'/>
-  <cpu type=3D'kvm' name=3D'mpc8347et'/>
-  <cpu type=3D'kvm' name=3D'7441_v2.10'/>
-  <cpu type=3D'kvm' name=3D'603e_v1.4'/>
-  <cpu type=3D'kvm' name=3D'mpc8543_v10'/>
-  <cpu type=3D'kvm' name=3D'401c2'/>
-  <cpu type=3D'kvm' name=3D'7451_v2.10'/>
-  <cpu type=3D'kvm' name=3D'750cx_v2.2'/>
-  <cpu type=3D'kvm' name=3D'mpc8543_v21'/>
-  <cpu type=3D'kvm' name=3D'603e7'/>
-  <cpu type=3D'kvm' name=3D'7448_v2.1'/>
-  <cpu type=3D'kvm' name=3D'7441_v2.3'/>
-  <cpu type=3D'kvm' name=3D'405crb'/>
-  <cpu type=3D'kvm' name=3D'7445_v2.1'/>
-  <cpu type=3D'kvm' name=3D'7400_v2.1'/>
-  <cpu type=3D'kvm' name=3D'440-xilinx-w-dfpu'/>
-  <cpu type=3D'kvm' name=3D'604'/>
-  <cpu type=3D'kvm' name=3D'cobra'/>
-  <cpu type=3D'kvm' name=3D'e500_v20'/>
-  <cpu type=3D'kvm' name=3D'mpc8541_v11'/>
-  <cpu type=3D'kvm' name=3D'750gx_v1.1'/>
-  <cpu type=3D'kvm' name=3D'750cxe_v2.4'/>
-  <cpu type=3D'kvm' name=3D'mpc8641d'/>
-  <cpu type=3D'kvm' name=3D'mpc8543e_v21'/>
-  <cpu type=3D'kvm' name=3D'750l_v2.1'/>
-  <cpu type=3D'kvm' name=3D'7457_v1.0'/>
-  <cpu type=3D'kvm' name=3D'7450_v1.2'/>
-  <cpu type=3D'kvm' name=3D'755_v2.5'/>
-  <cpu type=3D'kvm' name=3D'7410_v1.3'/>
-  <cpu type=3D'kvm' name=3D'745_v2.3'/>
-  <cpu type=3D'kvm' name=3D'755_v2.0'/>
-  <cpu type=3D'kvm' name=3D'e500v2_v30'/>
-  <cpu type=3D'kvm' name=3D'7455_v3.3'/>
-  <cpu type=3D'kvm' name=3D'mpc8540_v20'/>
-  <cpu type=3D'kvm' name=3D'405d2'/>
-  <cpu type=3D'kvm' name=3D'mpc8560_v21'/>
-  <cpu type=3D'kvm' name=3D'mpc8343'/>
-  <cpu type=3D'kvm' name=3D'mpc8548_v20'/>
-  <cpu type=3D'kvm' name=3D'mpc8347t'/>
-  <cpu type=3D'kvm' name=3D'755_v1.0'/>
-  <cpu type=3D'kvm' name=3D'603e_v1.3'/>
-  <cpu type=3D'kvm' name=3D'host'/>
-  <cpu type=3D'kvm' name=3D'mpc8543e_v10'/>
-  <cpu type=3D'kvm' name=3D'mpc8347eap'/>
-  <cpu type=3D'kvm' name=3D'mpc8548e_v11'/>
-  <cpu type=3D'kvm' name=3D'mpc8543_v20'/>
-  <cpu type=3D'kvm' name=3D'401d2'/>
-  <cpu type=3D'kvm' name=3D'power8_v2.0'/>
-  <cpu type=3D'kvm' name=3D'740_v3.1'/>
-  <cpu type=3D'kvm' name=3D'e200z5'/>
-  <cpu type=3D'kvm' name=3D'405cra'/>
-  <cpu type=3D'kvm' name=3D'7400_v2.0'/>
-  <cpu type=3D'kvm' name=3D'750cxe_v2.3'/>
-  <cpu type=3D'kvm' name=3D'745_v2.7'/>
-  <cpu type=3D'kvm' name=3D'mpc8560_v10'/>
-  <cpu type=3D'kvm' name=3D'e5500'/>
-  <cpu type=3D'kvm' name=3D'mpc8544_v11'/>
-  <cpu type=3D'kvm' name=3D'7448_v1.0'/>
-  <cpu type=3D'kvm' name=3D'401e2'/>
-  <cpu type=3D'kvm' name=3D'740_v2.1'/>
-  <cpu type=3D'kvm' name=3D'7410_v1.2'/>
-  <cpu type=3D'kvm' name=3D'745_v2.2'/>
-  <cpu type=3D'kvm' name=3D'7400_v1.0'/>
-  <cpu type=3D'kvm' name=3D'x2vp4'/>
-  <cpu type=3D'kvm' name=3D'mpc8347ap'/>
-  <cpu type=3D'kvm' name=3D'mpc8533_v11'/>
-  <cpu type=3D'kvm' name=3D'mpc5200b_v21'/>
-  <cpu type=3D'kvm' name=3D'750fx_v2.3'/>
-  <cpu type=3D'kvm' name=3D'601_v2'/>
-  <cpu type=3D'kvm' name=3D'g2legp3'/>
-  <cpu type=3D'kvm' name=3D'604e_v1.0'/>
-  <cpu type=3D'kvm' name=3D'750cx_v2.1'/>
-  <cpu type=3D'kvm' name=3D'mpc8610'/>
-  <cpu type=3D'kvm' name=3D'g2h4'/>
-  <cpu type=3D'kvm' name=3D'750l_v3.0'/>
-  <cpu type=3D'kvm' name=3D'mpc8377e'/>
-  <cpu type=3D'kvm' name=3D'e300c4'/>
-  <cpu type=3D'kvm' name=3D'mpc5200_v12'/>
-  <cpu type=3D'kvm' name=3D'7448_v2.0'/>
-  <cpu type=3D'kvm' name=3D'7450_v2.1'/>
-  <cpu type=3D'kvm' name=3D'750cxe_v3.1b'/>
-  <cpu type=3D'kvm' name=3D'g2'/>
-  <cpu type=3D'kvm' name=3D'7400_v2.9'/>
-  <cpu type=3D'kvm' name=3D'405gpd'/>
-  <cpu type=3D'kvm' name=3D'603'/>
-  <cpu type=3D'kvm' name=3D'603e7t'/>
-  <cpu type=3D'kvm' name=3D'mpc8555_v11'/>
-  <cpu type=3D'kvm' name=3D'750gx_v1.0'/>
-  <cpu type=3D'kvm' name=3D'mpc8541_v10'/>
-  <cpu type=3D'kvm' name=3D'mpc8543e_v20'/>
-  <cpu type=3D'kvm' name=3D'750fl'/>
-  <cpu type=3D'kvm' name=3D'750l_v2.0'/>
-  <cpu type=3D'kvm' name=3D'stb04'/>
-  <cpu type=3D'kvm' name=3D'mpc8548e_v21'/>
-  <cpu type=3D'kvm' name=3D'x2vp20'/>
-  <cpu type=3D'kvm' name=3D'e600'/>
-  <cpu type=3D'kvm' name=3D'7450_v1.1'/>
-  <cpu type=3D'kvm' name=3D'755_v2.4'/>
-  <cpu type=3D'kvm' name=3D'mpc8379'/>
-  <cpu type=3D'kvm' name=3D'7445_v1.0'/>
-  <cpu type=3D'kvm' name=3D'405ez'/>
-  <cpu type=3D'kvm' name=3D'7447_v1.1'/>
-  <cpu type=3D'kvm' name=3D'603e_v2.2'/>
-  <cpu type=3D'kvm' name=3D'603e_v4'/>
-  <cpu type=3D'kvm' name=3D'g2legp'/>
-  <cpu type=3D'kvm' name=3D'7455_v3.2'/>
-  <cpu type=3D'kvm' name=3D'740_v2.0'/>
-  <cpu type=3D'kvm' name=3D'mpc8560_v20'/>
-  <cpu type=3D'kvm' name=3D'440-xilinx'/>
-  <cpu type=3D'kvm' name=3D'401f2'/>
-  <cpu type=3D'kvm' name=3D'mpc8533_v10'/>
-  <cpu type=3D'kvm' name=3D'mpc8349a'/>
-  <cpu type=3D'kvm' name=3D'405gpr'/>
-  <cpu type=3D'kvm' name=3D'stb25'/>
-  <cpu type=3D'kvm' name=3D'603e_v1.2'/>
-  <cpu type=3D'kvm' name=3D'mpc5200b_v20'/>
-  <cpu type=3D'kvm' name=3D'750fx_v2.2'/>
-  <cpu type=3D'kvm' name=3D'mpc8347eat'/>
-  <cpu type=3D'kvm' name=3D'740_v1.0'/>
-  <cpu type=3D'kvm' name=3D'601_v1'/>
-  <cpu type=3D'kvm' name=3D'745_v1.1'/>
-  <cpu type=3D'kvm' name=3D'750cx_v2.0'/>
-  <cpu type=3D'kvm' name=3D'mpc8548e_v10'/>
-  <cpu type=3D'kvm' name=3D'403gc'/>
-  <cpu type=3D'kvm' name=3D'7447a_v1.2'/>
-  <cpu type=3D'kvm' name=3D'e300c3'/>
-  <cpu type=3D'kvm' name=3D'mpc5200_v11'/>
-  <cpu type=3D'kvm' name=3D'7441_v2.1'/>
-  <cpu type=3D'kvm' name=3D'740_v3.0'/>
-  <cpu type=3D'kvm' name=3D'mpc8545e_v21'/>
-  <cpu type=3D'kvm' name=3D'602'/>
-  <cpu type=3D'kvm' name=3D'mpc8378e'/>
-  <cpu type=3D'kvm' name=3D'mpc8343a'/>
-  <cpu type=3D'kvm' name=3D'460exb'/>
-  <cpu type=3D'kvm' name=3D'mpc8555_v10'/>
-  <cpu type=3D'kvm' name=3D'mpc8568'/>
-  <cpu type=3D'kvm' name=3D'7457a_v1.2'/>
-  <cpu type=3D'kvm' name=3D'750cx_v1.0'/>
-  <cpu type=3D'kvm' name=3D'750cxe_v2.2'/>
-  <cpu type=3D'kvm' name=3D'604e_v2.4'/>
-  <cpu type=3D'kvm' name=3D'755_v2.8'/>
-  <cpu type=3D'kvm' name=3D'405lp'/>
-  <cpu type=3D'kvm' name=3D'745_v2.6'/>
-  <cpu type=3D'kvm' name=3D'stb03'/>
-  <cpu type=3D'kvm' name=3D'405ep'/>
-  <cpu type=3D'kvm' name=3D'mpc8544_v10'/>
-  <cpu type=3D'kvm' name=3D'mpc8347at'/>
-  <cpu type=3D'kvm' name=3D'750_v2.2'/>
-  <cpu type=3D'kvm' name=3D'7450_v1.0'/>
-  <cpu type=3D'kvm' name=3D'755_v2.3'/>
-  <cpu type=3D'kvm' name=3D'7410_v1.1'/>
-  <cpu type=3D'kvm' name=3D'745_v2.1'/>
-  <cpu type=3D'kvm' name=3D'750gl'/>
-  <cpu type=3D'kvm' name=3D'e6500'/>
-  <cpu type=3D'kvm' name=3D'750p'/>
-  <cpu type=3D'kvm' name=3D'7445_v3.4'/>
-  <cpu type=3D'kvm' name=3D'440epb'/>
-  <cpu type=3D'kvm' name=3D'npe4gs3'/>
-  <cpu type=3D'kvm' name=3D'603e_v3'/>
-  <cpu type=3D'kvm' name=3D'mpc8349e'/>
-  <cpu type=3D'kvm' name=3D'970_v2.2'/>
-  <cpu type=3D'kvm' name=3D'g2lels'/>
-  <cpu type=3D'kvm' name=3D'g2hip4'/>
-  <cpu type=3D'kvm' name=3D'740p'/>
-  <cpu type=3D'kvm' name=3D'mpc8567e'/>
-  <cpu type=3D'kvm' name=3D'mpc8533e_v11'/>
-  <cpu type=3D'kvm' name=3D'7451_v2.3'/>
-  <cpu type=3D'kvm' name=3D'7450_v2.0'/>
-  <cpu type=3D'kvm' name=3D'401g2'/>
-  <cpu type=3D'kvm' name=3D'7400_v2.8'/>
-  <cpu type=3D'kvm' name=3D'405gpc'/>
-  <cpu type=3D'kvm' name=3D'7455_v2.1'/>
-  <cpu type=3D'kvm' name=3D'power7+_v2.1'/>
-  <cpu type=3D'kvm' name=3D'mpc8544e_v11'/>
-  <cpu type=3D'kvm' name=3D'970mp_v1.1'/>
-  <cpu type=3D'kvm' name=3D'603e7v2'/>
-  <cpu type=3D'kvm' name=3D'603e_v1.1'/>
-  <cpu type=3D'kvm' name=3D'604r'/>
-  <cpu type=3D'kvm' name=3D'e500v2_v22'/>
-  <cpu type=3D'kvm' name=3D'mpc8548e_v20'/>
-  <cpu type=3D'kvm' name=3D'mpc8545e_v20'/>
-  <cpu type=3D'kvm' name=3D'mpc8378'/>
-  <cpu type=3D'kvm' name=3D'mpc8567'/>
-  <cpu type=3D'kvm' name=3D'7457_v1.2'/>
-  <cpu type=3D'kvm' name=3D'7447_v1.0'/>
-  <cpu type=3D'kvm' name=3D'970fx_v3.1'/>
-  <cpu type=3D'kvm' name=3D'745_v2.5'/>
-  <cpu type=3D'kvm' name=3D'mpc8379e'/>
-  <cpu type=3D'kvm' name=3D'mpc8641'/>
-  <cpu type=3D'kvm' name=3D'750cxe_v2.4b'/>
-  <cpu type=3D'kvm' name=3D'7410_v1.0'/>
-  <cpu type=3D'kvm' name=3D'mpc603'/>
-  <cpu type=3D'kvm' name=3D'603e_v4.1'/>
-  <cpu type=3D'kvm' name=3D'7445_v3.3'/>
-  <cpu type=3D'kvm' name=3D'440epa'/>
-  <cpu type=3D'kvm' name=3D'970fx_v2.1'/>
-  <cpu type=3D'kvm' name=3D'iop480'/>
-  <cpu type=3D'kvm' name=3D'750fx_v2.1'/>
-  <cpu type=3D'kvm' name=3D'601_v0'/>
-  <cpu type=3D'kvm' name=3D'g2legp1'/>
-  <cpu type=3D'kvm' name=3D'745_v1.0'/>
-  <cpu type=3D'kvm' name=3D'750cl_v2.0'/>
-  <cpu type=3D'kvm' name=3D'401'/>
-  <cpu type=3D'kvm' name=3D'mpc8541e_v11'/>
-  <cpu type=3D'kvm' name=3D'750cxe_v3.1'/>
-  <cpu type=3D'kvm' name=3D'750cxr'/>
-  <cpu type=3D'kvm' name=3D'mpc8555e_v11'/>
-  <cpu type=3D'kvm' name=3D'power5+_v2.1'/>
-  <cpu type=3D'kvm' name=3D'403gb'/>
-  <cpu type=3D'kvm' name=3D'7447a_v1.1'/>
-  <cpu type=3D'kvm' name=3D'e300c2'/>
-  <cpu type=3D'kvm' name=3D'npe405h2'/>
-  <cpu type=3D'kvm' name=3D'mpc8343e'/>
-  <cpu type=3D'kvm' name=3D'mpc8533e_v10'/>
-  <cpu type=3D'kvm' name=3D'mpc5200_v10'/>
-  <cpu type=3D'kvm' name=3D'750_v3.1'/>
-  <cpu type=3D'kvm' name=3D'power8e_v2.1'/>
-  <cpu type=3D'kvm' name=3D'mpc8568e'/>
-  <cpu type=3D'tcg' name=3D'default'/>
-  <cpu type=3D'tcg' name=3D'ppc'/>
-  <cpu type=3D'tcg' name=3D'ppc32'/>
-  <cpu type=3D'tcg' name=3D'ppc64'/>
-  <cpu type=3D'tcg' name=3D'power9'/>
-  <cpu type=3D'tcg' name=3D'power8nvl'/>
-  <cpu type=3D'tcg' name=3D'power8'/>
-  <cpu type=3D'tcg' name=3D'power8e'/>
-  <cpu type=3D'tcg' name=3D'power7+'/>
-  <cpu type=3D'tcg' name=3D'power7'/>
-  <cpu type=3D'tcg' name=3D'power5gs'/>
-  <cpu type=3D'tcg' name=3D'power5+'/>
-  <cpu type=3D'tcg' name=3D'970mp'/>
-  <cpu type=3D'tcg' name=3D'970fx'/>
-  <cpu type=3D'tcg' name=3D'970'/>
-  <cpu type=3D'tcg' name=3D'apollo7pm'/>
-  <cpu type=3D'tcg' name=3D'7457a'/>
-  <cpu type=3D'tcg' name=3D'7447a'/>
-  <cpu type=3D'tcg' name=3D'apollo7'/>
-  <cpu type=3D'tcg' name=3D'7457'/>
-  <cpu type=3D'tcg' name=3D'7447'/>
-  <cpu type=3D'tcg' name=3D'apollo6'/>
-  <cpu type=3D'tcg' name=3D'7455'/>
-  <cpu type=3D'tcg' name=3D'7445'/>
-  <cpu type=3D'tcg' name=3D'7451'/>
-  <cpu type=3D'tcg' name=3D'7441'/>
-  <cpu type=3D'tcg' name=3D'vger'/>
-  <cpu type=3D'tcg' name=3D'7450'/>
-  <cpu type=3D'tcg' name=3D'7448'/>
-  <cpu type=3D'tcg' name=3D'nitro'/>
-  <cpu type=3D'tcg' name=3D'7410'/>
-  <cpu type=3D'tcg' name=3D'g4'/>
-  <cpu type=3D'tcg' name=3D'max'/>
-  <cpu type=3D'tcg' name=3D'7400'/>
-  <cpu type=3D'tcg' name=3D'goldfinger'/>
-  <cpu type=3D'tcg' name=3D'755'/>
-  <cpu type=3D'tcg' name=3D'745'/>
-  <cpu type=3D'tcg' name=3D'lonestar'/>
-  <cpu type=3D'tcg' name=3D'750l'/>
-  <cpu type=3D'tcg' name=3D'750gx'/>
-  <cpu type=3D'tcg' name=3D'750fx'/>
-  <cpu type=3D'tcg' name=3D'750cxe'/>
-  <cpu type=3D'tcg' name=3D'750cx'/>
-  <cpu type=3D'tcg' name=3D'750cl'/>
-  <cpu type=3D'tcg' name=3D'conan/doyle'/>
-  <cpu type=3D'tcg' name=3D'g3'/>
-  <cpu type=3D'tcg' name=3D'typhoon'/>
-  <cpu type=3D'tcg' name=3D'750'/>
-  <cpu type=3D'tcg' name=3D'arthur'/>
-  <cpu type=3D'tcg' name=3D'740'/>
-  <cpu type=3D'tcg' name=3D'mach5'/>
-  <cpu type=3D'tcg' name=3D'sirocco'/>
-  <cpu type=3D'tcg' name=3D'604e'/>
-  <cpu type=3D'tcg' name=3D'goldeneye'/>
-  <cpu type=3D'tcg' name=3D'603r'/>
-  <cpu type=3D'tcg' name=3D'vaillant'/>
-  <cpu type=3D'tcg' name=3D'stretch'/>
-  <cpu type=3D'tcg' name=3D'603e'/>
-  <cpu type=3D'tcg' name=3D'vanilla'/>
-  <cpu type=3D'tcg' name=3D'601v'/>
-  <cpu type=3D'tcg' name=3D'601'/>
-  <cpu type=3D'tcg' name=3D'mpc8560'/>
-  <cpu type=3D'tcg' name=3D'mpc8555e'/>
-  <cpu type=3D'tcg' name=3D'mpc8555'/>
-  <cpu type=3D'tcg' name=3D'mpc8548e'/>
-  <cpu type=3D'tcg' name=3D'mpc8548'/>
-  <cpu type=3D'tcg' name=3D'mpc8547e'/>
-  <cpu type=3D'tcg' name=3D'mpc8545e'/>
-  <cpu type=3D'tcg' name=3D'mpc8545'/>
-  <cpu type=3D'tcg' name=3D'mpc8544e'/>
-  <cpu type=3D'tcg' name=3D'mpc8544'/>
-  <cpu type=3D'tcg' name=3D'mpc8543e'/>
-  <cpu type=3D'tcg' name=3D'mpc8543'/>
-  <cpu type=3D'tcg' name=3D'mpc8541e'/>
-  <cpu type=3D'tcg' name=3D'mpc8541'/>
-  <cpu type=3D'tcg' name=3D'mpc8540'/>
-  <cpu type=3D'tcg' name=3D'mpc8533e'/>
-  <cpu type=3D'tcg' name=3D'mpc8533'/>
-  <cpu type=3D'tcg' name=3D'e500v2'/>
-  <cpu type=3D'tcg' name=3D'e500v1'/>
-  <cpu type=3D'tcg' name=3D'e500'/>
-  <cpu type=3D'tcg' name=3D'mpc8347ea'/>
-  <cpu type=3D'tcg' name=3D'mpc8347e'/>
-  <cpu type=3D'tcg' name=3D'mpc8347a'/>
-  <cpu type=3D'tcg' name=3D'mpc8347'/>
-  <cpu type=3D'tcg' name=3D'e300'/>
-  <cpu type=3D'tcg' name=3D'e200'/>
-  <cpu type=3D'tcg' name=3D'mpc8280'/>
-  <cpu type=3D'tcg' name=3D'mpc8275'/>
-  <cpu type=3D'tcg' name=3D'mpc8272'/>
-  <cpu type=3D'tcg' name=3D'mpc8271'/>
-  <cpu type=3D'tcg' name=3D'mpc8270'/>
-  <cpu type=3D'tcg' name=3D'mpc8266_hip4'/>
-  <cpu type=3D'tcg' name=3D'mpc8266_hip3'/>
-  <cpu type=3D'tcg' name=3D'mpc8266'/>
-  <cpu type=3D'tcg' name=3D'mpc8265_hip4'/>
-  <cpu type=3D'tcg' name=3D'mpc8265_hip3'/>
-  <cpu type=3D'tcg' name=3D'mpc8265'/>
-  <cpu type=3D'tcg' name=3D'mpc8264_hip4'/>
-  <cpu type=3D'tcg' name=3D'mpc8264_hip3'/>
-  <cpu type=3D'tcg' name=3D'mpc8264'/>
-  <cpu type=3D'tcg' name=3D'mpc8260_hip4'/>
-  <cpu type=3D'tcg' name=3D'mpc8260_hip3'/>
-  <cpu type=3D'tcg' name=3D'mpc8260'/>
-  <cpu type=3D'tcg' name=3D'mpc8255_hip4'/>
-  <cpu type=3D'tcg' name=3D'mpc8255_hip3'/>
-  <cpu type=3D'tcg' name=3D'mpc8255'/>
-  <cpu type=3D'tcg' name=3D'mpc8250_hip4'/>
-  <cpu type=3D'tcg' name=3D'mpc8250_hip3'/>
-  <cpu type=3D'tcg' name=3D'mpc8250'/>
-  <cpu type=3D'tcg' name=3D'mpc8248'/>
-  <cpu type=3D'tcg' name=3D'mpc8247'/>
-  <cpu type=3D'tcg' name=3D'mpc8245'/>
-  <cpu type=3D'tcg' name=3D'mpc8241'/>
-  <cpu type=3D'tcg' name=3D'powerquicc-ii'/>
-  <cpu type=3D'tcg' name=3D'mpc82xx'/>
-  <cpu type=3D'tcg' name=3D'mpc5200b'/>
-  <cpu type=3D'tcg' name=3D'mpc5200'/>
-  <cpu type=3D'tcg' name=3D'mpc52xx'/>
-  <cpu type=3D'tcg' name=3D'mpc8240'/>
-  <cpu type=3D'tcg' name=3D'460ex'/>
-  <cpu type=3D'tcg' name=3D'440ep'/>
-  <cpu type=3D'tcg' name=3D'x2vp50'/>
-  <cpu type=3D'tcg' name=3D'x2vp7'/>
-  <cpu type=3D'tcg' name=3D'405gpe'/>
-  <cpu type=3D'tcg' name=3D'405gp'/>
-  <cpu type=3D'tcg' name=3D'405cr'/>
-  <cpu type=3D'tcg' name=3D'405'/>
-  <cpu type=3D'tcg' name=3D'403'/>
-  <cpu type=3D'tcg' name=3D'mpc8547e_v21'/>
-  <cpu type=3D'tcg' name=3D'g2gp'/>
-  <cpu type=3D'tcg' name=3D'7457a_v1.1'/>
-  <cpu type=3D'tcg' name=3D'750cl_v1.0'/>
-  <cpu type=3D'tcg' name=3D'750cxe_v2.1'/>
-  <cpu type=3D'tcg' name=3D'755_v2.7'/>
-  <cpu type=3D'tcg' name=3D'750_v2.1'/>
-  <cpu type=3D'tcg' name=3D'755_v2.2'/>
-  <cpu type=3D'tcg' name=3D'745_v2.0'/>
-  <cpu type=3D'tcg' name=3D'mpc8377'/>
-  <cpu type=3D'tcg' name=3D'7455_v1.0'/>
-  <cpu type=3D'tcg' name=3D'mpc8545_v21'/>
-  <cpu type=3D'tcg' name=3D'mpc8548_v11'/>
-  <cpu type=3D'tcg' name=3D'405d4'/>
-  <cpu type=3D'tcg' name=3D'g2le'/>
-  <cpu type=3D'tcg' name=3D'g2hip3'/>
-  <cpu type=3D'tcg' name=3D'750e'/>
-  <cpu type=3D'tcg' name=3D'mpc8572'/>
-  <cpu type=3D'tcg' name=3D'970fx_v2.0'/>
-  <cpu type=3D'tcg' name=3D'750fx_v2.0'/>
-  <cpu type=3D'tcg' name=3D'603p'/>
-  <cpu type=3D'tcg' name=3D'405gpb'/>
-  <cpu type=3D'tcg' name=3D'7400_v2.7'/>
-  <cpu type=3D'tcg' name=3D'mpc8544e_v10'/>
-  <cpu type=3D'tcg' name=3D'e500v2_v10'/>
-  <cpu type=3D'tcg' name=3D'e500mc'/>
-  <cpu type=3D'tcg' name=3D'603e7v1'/>
-  <cpu type=3D'tcg' name=3D'970mp_v1.0'/>
-  <cpu type=3D'tcg' name=3D'740e'/>
-  <cpu type=3D'tcg' name=3D'405crc'/>
-  <cpu type=3D'tcg' name=3D'403ga'/>
-  <cpu type=3D'tcg' name=3D'7447a_v1.0'/>
-  <cpu type=3D'tcg' name=3D'e300c1'/>
-  <cpu type=3D'tcg' name=3D'mpc8572e'/>
-  <cpu type=3D'tcg' name=3D'e500v2_v21'/>
-  <cpu type=3D'tcg' name=3D'7400_v2.2'/>
-  <cpu type=3D'tcg' name=3D'970fx_v1.0'/>
-  <cpu type=3D'tcg' name=3D'750gx_v1.2'/>
-  <cpu type=3D'tcg' name=3D'750fx_v1.0'/>
-  <cpu type=3D'tcg' name=3D'7457_v1.1'/>
-  <cpu type=3D'tcg' name=3D'970fx_v3.0'/>
-  <cpu type=3D'tcg' name=3D'604e_v2.2'/>
-  <cpu type=3D'tcg' name=3D'745_v2.4'/>
-  <cpu type=3D'tcg' name=3D'401a1'/>
-  <cpu type=3D'tcg' name=3D'755_v2.6'/>
-  <cpu type=3D'tcg' name=3D'npe405h'/>
-  <cpu type=3D'tcg' name=3D'power9_v1.0'/>
-  <cpu type=3D'tcg' name=3D'g2ls'/>
-  <cpu type=3D'tcg' name=3D'7410_v1.4'/>
-  <cpu type=3D'tcg' name=3D'750_v2.0'/>
-  <cpu type=3D'tcg' name=3D'401b2'/>
-  <cpu type=3D'tcg' name=3D'mpc8349'/>
-  <cpu type=3D'tcg' name=3D'mpc8347ep'/>
-  <cpu type=3D'tcg' name=3D'7445_v3.2'/>
-  <cpu type=3D'tcg' name=3D'mpc8540_v21'/>
-  <cpu type=3D'tcg' name=3D'mpc8543_v11'/>
-  <cpu type=3D'tcg' name=3D'403gcx'/>
-  <cpu type=3D'tcg' name=3D'mpc8548_v21'/>
-  <cpu type=3D'tcg' name=3D'750l_v3.2'/>
-  <cpu type=3D'tcg' name=3D'750_v1.0'/>
-  <cpu type=3D'tcg' name=3D'755_v1.1'/>
-  <cpu type=3D'tcg' name=3D'750cxe_v3.0'/>
-  <cpu type=3D'tcg' name=3D'e500_v10'/>
-  <cpu type=3D'tcg' name=3D'mpc8541e_v10'/>
-  <cpu type=3D'tcg' name=3D'power9_v2.0'/>
-  <cpu type=3D'tcg' name=3D'mpc8347p'/>
-  <cpu type=3D'tcg' name=3D'mpc8555e_v10'/>
-  <cpu type=3D'tcg' name=3D'power7_v2.3'/>
-  <cpu type=3D'tcg' name=3D'603e7v'/>
-  <cpu type=3D'tcg' name=3D'mpc8543e_v11'/>
-  <cpu type=3D'tcg' name=3D'750_v3.0'/>
-  <cpu type=3D'tcg' name=3D'7400_v2.6'/>
-  <cpu type=3D'tcg' name=3D'405gpa'/>
-  <cpu type=3D'tcg' name=3D'440epx'/>
-  <cpu type=3D'tcg' name=3D'750l_v2.2'/>
-  <cpu type=3D'tcg' name=3D'e200z6'/>
-  <cpu type=3D'tcg' name=3D'mpc8547e_v20'/>
-  <cpu type=3D'tcg' name=3D'7457a_v1.0'/>
-  <cpu type=3D'tcg' name=3D'mpc8349ea'/>
-  <cpu type=3D'tcg' name=3D'e500v2_v20'/>
-  <cpu type=3D'tcg' name=3D'power8nvl_v1.0'/>
-  <cpu type=3D'tcg' name=3D'mpc8540_v10'/>
-  <cpu type=3D'tcg' name=3D'755_v2.1'/>
-  <cpu type=3D'tcg' name=3D'745_v2.8'/>
-  <cpu type=3D'tcg' name=3D'npe405l'/>
-  <cpu type=3D'tcg' name=3D'mpc8343ea'/>
-  <cpu type=3D'tcg' name=3D'mpc8545_v20'/>
-  <cpu type=3D'tcg' name=3D'mpc8548_v10'/>
-  <cpu type=3D'tcg' name=3D'7448_v1.1'/>
-  <cpu type=3D'tcg' name=3D'740_v2.2'/>
-  <cpu type=3D'tcg' name=3D'7455_v3.4'/>
-  <cpu type=3D'tcg' name=3D'7400_v1.1'/>
-  <cpu type=3D'tcg' name=3D'mpc8347et'/>
-  <cpu type=3D'tcg' name=3D'7441_v2.10'/>
-  <cpu type=3D'tcg' name=3D'603e_v1.4'/>
-  <cpu type=3D'tcg' name=3D'mpc8543_v10'/>
-  <cpu type=3D'tcg' name=3D'401c2'/>
-  <cpu type=3D'tcg' name=3D'7451_v2.10'/>
-  <cpu type=3D'tcg' name=3D'750cx_v2.2'/>
-  <cpu type=3D'tcg' name=3D'mpc8543_v21'/>
-  <cpu type=3D'tcg' name=3D'603e7'/>
-  <cpu type=3D'tcg' name=3D'7448_v2.1'/>
-  <cpu type=3D'tcg' name=3D'7441_v2.3'/>
-  <cpu type=3D'tcg' name=3D'405crb'/>
-  <cpu type=3D'tcg' name=3D'7445_v2.1'/>
-  <cpu type=3D'tcg' name=3D'7400_v2.1'/>
-  <cpu type=3D'tcg' name=3D'440-xilinx-w-dfpu'/>
-  <cpu type=3D'tcg' name=3D'604'/>
-  <cpu type=3D'tcg' name=3D'cobra'/>
-  <cpu type=3D'tcg' name=3D'e500_v20'/>
-  <cpu type=3D'tcg' name=3D'mpc8541_v11'/>
-  <cpu type=3D'tcg' name=3D'750gx_v1.1'/>
-  <cpu type=3D'tcg' name=3D'750cxe_v2.4'/>
-  <cpu type=3D'tcg' name=3D'mpc8641d'/>
-  <cpu type=3D'tcg' name=3D'mpc8543e_v21'/>
-  <cpu type=3D'tcg' name=3D'750l_v2.1'/>
-  <cpu type=3D'tcg' name=3D'7457_v1.0'/>
-  <cpu type=3D'tcg' name=3D'7450_v1.2'/>
-  <cpu type=3D'tcg' name=3D'755_v2.5'/>
-  <cpu type=3D'tcg' name=3D'7410_v1.3'/>
-  <cpu type=3D'tcg' name=3D'745_v2.3'/>
-  <cpu type=3D'tcg' name=3D'755_v2.0'/>
-  <cpu type=3D'tcg' name=3D'e500v2_v30'/>
-  <cpu type=3D'tcg' name=3D'7455_v3.3'/>
-  <cpu type=3D'tcg' name=3D'mpc8540_v20'/>
-  <cpu type=3D'tcg' name=3D'405d2'/>
-  <cpu type=3D'tcg' name=3D'mpc8560_v21'/>
-  <cpu type=3D'tcg' name=3D'mpc8343'/>
-  <cpu type=3D'tcg' name=3D'mpc8548_v20'/>
-  <cpu type=3D'tcg' name=3D'mpc8347t'/>
-  <cpu type=3D'tcg' name=3D'755_v1.0'/>
-  <cpu type=3D'tcg' name=3D'603e_v1.3'/>
-  <cpu type=3D'tcg' name=3D'mpc8543e_v10'/>
-  <cpu type=3D'tcg' name=3D'mpc8347eap'/>
-  <cpu type=3D'tcg' name=3D'mpc8548e_v11'/>
-  <cpu type=3D'tcg' name=3D'mpc8543_v20'/>
-  <cpu type=3D'tcg' name=3D'401d2'/>
-  <cpu type=3D'tcg' name=3D'power8_v2.0'/>
-  <cpu type=3D'tcg' name=3D'740_v3.1'/>
-  <cpu type=3D'tcg' name=3D'e200z5'/>
-  <cpu type=3D'tcg' name=3D'405cra'/>
-  <cpu type=3D'tcg' name=3D'7400_v2.0'/>
-  <cpu type=3D'tcg' name=3D'750cxe_v2.3'/>
-  <cpu type=3D'tcg' name=3D'745_v2.7'/>
-  <cpu type=3D'tcg' name=3D'mpc8560_v10'/>
-  <cpu type=3D'tcg' name=3D'e5500'/>
-  <cpu type=3D'tcg' name=3D'mpc8544_v11'/>
-  <cpu type=3D'tcg' name=3D'7448_v1.0'/>
-  <cpu type=3D'tcg' name=3D'401e2'/>
-  <cpu type=3D'tcg' name=3D'740_v2.1'/>
-  <cpu type=3D'tcg' name=3D'7410_v1.2'/>
-  <cpu type=3D'tcg' name=3D'745_v2.2'/>
-  <cpu type=3D'tcg' name=3D'7400_v1.0'/>
-  <cpu type=3D'tcg' name=3D'x2vp4'/>
-  <cpu type=3D'tcg' name=3D'mpc8347ap'/>
-  <cpu type=3D'tcg' name=3D'mpc8533_v11'/>
-  <cpu type=3D'tcg' name=3D'mpc5200b_v21'/>
-  <cpu type=3D'tcg' name=3D'750fx_v2.3'/>
-  <cpu type=3D'tcg' name=3D'601_v2'/>
-  <cpu type=3D'tcg' name=3D'g2legp3'/>
-  <cpu type=3D'tcg' name=3D'604e_v1.0'/>
-  <cpu type=3D'tcg' name=3D'750cx_v2.1'/>
-  <cpu type=3D'tcg' name=3D'mpc8610'/>
-  <cpu type=3D'tcg' name=3D'g2h4'/>
-  <cpu type=3D'tcg' name=3D'750l_v3.0'/>
-  <cpu type=3D'tcg' name=3D'mpc8377e'/>
-  <cpu type=3D'tcg' name=3D'e300c4'/>
-  <cpu type=3D'tcg' name=3D'mpc5200_v12'/>
-  <cpu type=3D'tcg' name=3D'7448_v2.0'/>
-  <cpu type=3D'tcg' name=3D'7450_v2.1'/>
-  <cpu type=3D'tcg' name=3D'750cxe_v3.1b'/>
-  <cpu type=3D'tcg' name=3D'g2'/>
-  <cpu type=3D'tcg' name=3D'7400_v2.9'/>
-  <cpu type=3D'tcg' name=3D'405gpd'/>
-  <cpu type=3D'tcg' name=3D'603'/>
-  <cpu type=3D'tcg' name=3D'603e7t'/>
-  <cpu type=3D'tcg' name=3D'mpc8555_v11'/>
-  <cpu type=3D'tcg' name=3D'750gx_v1.0'/>
-  <cpu type=3D'tcg' name=3D'mpc8541_v10'/>
-  <cpu type=3D'tcg' name=3D'mpc8543e_v20'/>
-  <cpu type=3D'tcg' name=3D'750fl'/>
-  <cpu type=3D'tcg' name=3D'750l_v2.0'/>
-  <cpu type=3D'tcg' name=3D'stb04'/>
-  <cpu type=3D'tcg' name=3D'mpc8548e_v21'/>
-  <cpu type=3D'tcg' name=3D'x2vp20'/>
-  <cpu type=3D'tcg' name=3D'e600'/>
-  <cpu type=3D'tcg' name=3D'7450_v1.1'/>
-  <cpu type=3D'tcg' name=3D'755_v2.4'/>
-  <cpu type=3D'tcg' name=3D'mpc8379'/>
-  <cpu type=3D'tcg' name=3D'7445_v1.0'/>
-  <cpu type=3D'tcg' name=3D'405ez'/>
-  <cpu type=3D'tcg' name=3D'7447_v1.1'/>
-  <cpu type=3D'tcg' name=3D'603e_v2.2'/>
-  <cpu type=3D'tcg' name=3D'603e_v4'/>
-  <cpu type=3D'tcg' name=3D'g2legp'/>
-  <cpu type=3D'tcg' name=3D'7455_v3.2'/>
-  <cpu type=3D'tcg' name=3D'740_v2.0'/>
-  <cpu type=3D'tcg' name=3D'mpc8560_v20'/>
-  <cpu type=3D'tcg' name=3D'440-xilinx'/>
-  <cpu type=3D'tcg' name=3D'401f2'/>
-  <cpu type=3D'tcg' name=3D'mpc8533_v10'/>
-  <cpu type=3D'tcg' name=3D'mpc8349a'/>
-  <cpu type=3D'tcg' name=3D'405gpr'/>
-  <cpu type=3D'tcg' name=3D'stb25'/>
-  <cpu type=3D'tcg' name=3D'603e_v1.2'/>
-  <cpu type=3D'tcg' name=3D'mpc5200b_v20'/>
-  <cpu type=3D'tcg' name=3D'750fx_v2.2'/>
-  <cpu type=3D'tcg' name=3D'mpc8347eat'/>
-  <cpu type=3D'tcg' name=3D'740_v1.0'/>
-  <cpu type=3D'tcg' name=3D'601_v1'/>
-  <cpu type=3D'tcg' name=3D'745_v1.1'/>
-  <cpu type=3D'tcg' name=3D'750cx_v2.0'/>
-  <cpu type=3D'tcg' name=3D'mpc8548e_v10'/>
-  <cpu type=3D'tcg' name=3D'403gc'/>
-  <cpu type=3D'tcg' name=3D'7447a_v1.2'/>
-  <cpu type=3D'tcg' name=3D'e300c3'/>
-  <cpu type=3D'tcg' name=3D'mpc5200_v11'/>
-  <cpu type=3D'tcg' name=3D'7441_v2.1'/>
-  <cpu type=3D'tcg' name=3D'740_v3.0'/>
-  <cpu type=3D'tcg' name=3D'mpc8545e_v21'/>
-  <cpu type=3D'tcg' name=3D'602'/>
-  <cpu type=3D'tcg' name=3D'mpc8378e'/>
-  <cpu type=3D'tcg' name=3D'mpc8343a'/>
-  <cpu type=3D'tcg' name=3D'460exb'/>
-  <cpu type=3D'tcg' name=3D'mpc8555_v10'/>
-  <cpu type=3D'tcg' name=3D'mpc8568'/>
-  <cpu type=3D'tcg' name=3D'7457a_v1.2'/>
-  <cpu type=3D'tcg' name=3D'750cx_v1.0'/>
-  <cpu type=3D'tcg' name=3D'750cxe_v2.2'/>
-  <cpu type=3D'tcg' name=3D'604e_v2.4'/>
-  <cpu type=3D'tcg' name=3D'755_v2.8'/>
-  <cpu type=3D'tcg' name=3D'405lp'/>
-  <cpu type=3D'tcg' name=3D'745_v2.6'/>
-  <cpu type=3D'tcg' name=3D'stb03'/>
-  <cpu type=3D'tcg' name=3D'405ep'/>
-  <cpu type=3D'tcg' name=3D'mpc8544_v10'/>
-  <cpu type=3D'tcg' name=3D'mpc8347at'/>
-  <cpu type=3D'tcg' name=3D'750_v2.2'/>
-  <cpu type=3D'tcg' name=3D'7450_v1.0'/>
-  <cpu type=3D'tcg' name=3D'755_v2.3'/>
-  <cpu type=3D'tcg' name=3D'7410_v1.1'/>
-  <cpu type=3D'tcg' name=3D'745_v2.1'/>
-  <cpu type=3D'tcg' name=3D'750gl'/>
-  <cpu type=3D'tcg' name=3D'e6500'/>
-  <cpu type=3D'tcg' name=3D'750p'/>
-  <cpu type=3D'tcg' name=3D'7445_v3.4'/>
-  <cpu type=3D'tcg' name=3D'440epb'/>
-  <cpu type=3D'tcg' name=3D'npe4gs3'/>
-  <cpu type=3D'tcg' name=3D'603e_v3'/>
-  <cpu type=3D'tcg' name=3D'mpc8349e'/>
-  <cpu type=3D'tcg' name=3D'970_v2.2'/>
-  <cpu type=3D'tcg' name=3D'g2lels'/>
-  <cpu type=3D'tcg' name=3D'g2hip4'/>
-  <cpu type=3D'tcg' name=3D'740p'/>
-  <cpu type=3D'tcg' name=3D'mpc8567e'/>
-  <cpu type=3D'tcg' name=3D'mpc8533e_v11'/>
-  <cpu type=3D'tcg' name=3D'7451_v2.3'/>
-  <cpu type=3D'tcg' name=3D'7450_v2.0'/>
-  <cpu type=3D'tcg' name=3D'401g2'/>
-  <cpu type=3D'tcg' name=3D'7400_v2.8'/>
-  <cpu type=3D'tcg' name=3D'405gpc'/>
-  <cpu type=3D'tcg' name=3D'7455_v2.1'/>
-  <cpu type=3D'tcg' name=3D'power7+_v2.1'/>
-  <cpu type=3D'tcg' name=3D'mpc8544e_v11'/>
-  <cpu type=3D'tcg' name=3D'970mp_v1.1'/>
-  <cpu type=3D'tcg' name=3D'603e7v2'/>
-  <cpu type=3D'tcg' name=3D'603e_v1.1'/>
-  <cpu type=3D'tcg' name=3D'604r'/>
-  <cpu type=3D'tcg' name=3D'e500v2_v22'/>
-  <cpu type=3D'tcg' name=3D'mpc8548e_v20'/>
-  <cpu type=3D'tcg' name=3D'mpc8545e_v20'/>
-  <cpu type=3D'tcg' name=3D'mpc8378'/>
-  <cpu type=3D'tcg' name=3D'mpc8567'/>
-  <cpu type=3D'tcg' name=3D'7457_v1.2'/>
-  <cpu type=3D'tcg' name=3D'7447_v1.0'/>
-  <cpu type=3D'tcg' name=3D'970fx_v3.1'/>
-  <cpu type=3D'tcg' name=3D'745_v2.5'/>
-  <cpu type=3D'tcg' name=3D'mpc8379e'/>
-  <cpu type=3D'tcg' name=3D'mpc8641'/>
-  <cpu type=3D'tcg' name=3D'750cxe_v2.4b'/>
-  <cpu type=3D'tcg' name=3D'7410_v1.0'/>
-  <cpu type=3D'tcg' name=3D'mpc603'/>
-  <cpu type=3D'tcg' name=3D'603e_v4.1'/>
-  <cpu type=3D'tcg' name=3D'7445_v3.3'/>
-  <cpu type=3D'tcg' name=3D'440epa'/>
-  <cpu type=3D'tcg' name=3D'970fx_v2.1'/>
-  <cpu type=3D'tcg' name=3D'iop480'/>
-  <cpu type=3D'tcg' name=3D'750fx_v2.1'/>
-  <cpu type=3D'tcg' name=3D'601_v0'/>
-  <cpu type=3D'tcg' name=3D'g2legp1'/>
-  <cpu type=3D'tcg' name=3D'745_v1.0'/>
-  <cpu type=3D'tcg' name=3D'750cl_v2.0'/>
-  <cpu type=3D'tcg' name=3D'401'/>
-  <cpu type=3D'tcg' name=3D'mpc8541e_v11'/>
-  <cpu type=3D'tcg' name=3D'750cxe_v3.1'/>
-  <cpu type=3D'tcg' name=3D'750cxr'/>
-  <cpu type=3D'tcg' name=3D'mpc8555e_v11'/>
-  <cpu type=3D'tcg' name=3D'power5+_v2.1'/>
-  <cpu type=3D'tcg' name=3D'403gb'/>
-  <cpu type=3D'tcg' name=3D'7447a_v1.1'/>
-  <cpu type=3D'tcg' name=3D'e300c2'/>
-  <cpu type=3D'tcg' name=3D'npe405h2'/>
-  <cpu type=3D'tcg' name=3D'mpc8343e'/>
-  <cpu type=3D'tcg' name=3D'mpc8533e_v10'/>
-  <cpu type=3D'tcg' name=3D'mpc5200_v10'/>
-  <cpu type=3D'tcg' name=3D'750_v3.1'/>
-  <cpu type=3D'tcg' name=3D'power8e_v2.1'/>
-  <cpu type=3D'tcg' name=3D'mpc8568e'/>
+  <cpu type=3D'kvm' name=3D'default' typename=3D'604-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'ppc' typename=3D'604-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'ppc32' typename=3D'604-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'ppc64' typename=3D'970fx_v3.1-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'power9' typename=3D'power9_v2.0-powerpc64-cpu'=
/>
+  <cpu type=3D'kvm' name=3D'power8nvl' typename=3D'power8nvl_v1.0-powerpc6=
4-cpu'/>
+  <cpu type=3D'kvm' name=3D'power8' typename=3D'host-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'power8e' typename=3D'power8e_v2.1-powerpc64-cp=
u'/>
+  <cpu type=3D'kvm' name=3D'power7+' typename=3D'power7+_v2.1-powerpc64-cp=
u'/>
+  <cpu type=3D'kvm' name=3D'power7' typename=3D'power7_v2.3-powerpc64-cpu'=
/>
+  <cpu type=3D'kvm' name=3D'power5gs' typename=3D'power5+_v2.1-powerpc64-c=
pu'/>
+  <cpu type=3D'kvm' name=3D'power5+' typename=3D'power5+_v2.1-powerpc64-cp=
u'/>
+  <cpu type=3D'kvm' name=3D'970mp' typename=3D'970mp_v1.1-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'970fx' typename=3D'970fx_v3.1-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'970' typename=3D'970_v2.2-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'apollo7pm' typename=3D'7457a_v1.0-powerpc64-cp=
u'/>
+  <cpu type=3D'kvm' name=3D'7457a' typename=3D'7457a_v1.2-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'7447a' typename=3D'7447a_v1.2-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'apollo7' typename=3D'7457_v1.2-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'7457' typename=3D'7457_v1.2-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'7447' typename=3D'7447_v1.1-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'apollo6' typename=3D'7455_v3.2-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'7455' typename=3D'7455_v3.2-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'7445' typename=3D'7445_v3.2-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'7451' typename=3D'7451_v2.3-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'7441' typename=3D'7441_v2.3-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'vger' typename=3D'7450_v2.1-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'7450' typename=3D'7450_v2.1-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'7448' typename=3D'7448_v2.1-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'nitro' typename=3D'7410_v1.4-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'7410' typename=3D'7410_v1.4-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'g4' typename=3D'7400_v2.9-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'max' typename=3D'7400_v2.9-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'7400' typename=3D'7400_v2.9-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'goldfinger' typename=3D'755_v2.8-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'755' typename=3D'755_v2.8-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'745' typename=3D'745_v2.8-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'lonestar' typename=3D'750l_v3.2-powerpc64-cpu'=
/>
+  <cpu type=3D'kvm' name=3D'750l' typename=3D'750l_v3.2-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'750gx' typename=3D'750gx_v1.2-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'750fx' typename=3D'750fx_v2.3-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'750cxe' typename=3D'750cxe_v3.1b-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'750cx' typename=3D'750cx_v2.2-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'750cl' typename=3D'750cl_v2.0-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'conan/doyle' typename=3D'750p-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'g3' typename=3D'750_v3.1-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'typhoon' typename=3D'750_v3.1-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'750' typename=3D'750_v3.1-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'arthur' typename=3D'740_v3.1-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'740' typename=3D'740_v3.1-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'mach5' typename=3D'604r-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'sirocco' typename=3D'604e_v2.4-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'604e' typename=3D'604e_v2.4-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'goldeneye' typename=3D'603e7t-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'603r' typename=3D'603e7t-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'vaillant' typename=3D'603e7v-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'stretch' typename=3D'603e_v4.1-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'603e' typename=3D'603e_v4.1-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'vanilla' typename=3D'603-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'601v' typename=3D'601_v2-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'601' typename=3D'601_v2-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'mpc8560' typename=3D'mpc8560_v21-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'mpc8555e' typename=3D'mpc8555e_v11-powerpc64-c=
pu'/>
+  <cpu type=3D'kvm' name=3D'mpc8555' typename=3D'mpc8555_v11-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'mpc8548e' typename=3D'mpc8548e_v21-powerpc64-c=
pu'/>
+  <cpu type=3D'kvm' name=3D'mpc8548' typename=3D'mpc8548_v21-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'mpc8547e' typename=3D'mpc8547e_v21-powerpc64-c=
pu'/>
+  <cpu type=3D'kvm' name=3D'mpc8545e' typename=3D'mpc8545e_v21-powerpc64-c=
pu'/>
+  <cpu type=3D'kvm' name=3D'mpc8545' typename=3D'mpc8545_v21-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'mpc8544e' typename=3D'mpc8544e_v11-powerpc64-c=
pu'/>
+  <cpu type=3D'kvm' name=3D'mpc8544' typename=3D'mpc8544_v11-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'mpc8543e' typename=3D'mpc8543e_v21-powerpc64-c=
pu'/>
+  <cpu type=3D'kvm' name=3D'mpc8543' typename=3D'mpc8543_v21-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'mpc8541e' typename=3D'mpc8541e_v11-powerpc64-c=
pu'/>
+  <cpu type=3D'kvm' name=3D'mpc8541' typename=3D'mpc8541_v11-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'mpc8540' typename=3D'mpc8540_v21-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'mpc8533e' typename=3D'mpc8533e_v11-powerpc64-c=
pu'/>
+  <cpu type=3D'kvm' name=3D'mpc8533' typename=3D'mpc8533_v11-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'e500v2' typename=3D'e500v2_v22-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'e500v1' typename=3D'e500_v20-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'e500' typename=3D'e500v2_v22-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'mpc8347ea' typename=3D'mpc8347eat-powerpc64-cp=
u'/>
+  <cpu type=3D'kvm' name=3D'mpc8347e' typename=3D'mpc8347et-powerpc64-cpu'=
/>
+  <cpu type=3D'kvm' name=3D'mpc8347a' typename=3D'mpc8347at-powerpc64-cpu'=
/>
+  <cpu type=3D'kvm' name=3D'mpc8347' typename=3D'mpc8347t-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'e300' typename=3D'e300c3-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'e200' typename=3D'e200z6-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'mpc8280' typename=3D'g2legp3-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'mpc8275' typename=3D'g2legp3-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'mpc8272' typename=3D'g2legp3-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'mpc8271' typename=3D'g2legp3-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'mpc8270' typename=3D'g2legp3-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'mpc8266_hip4' typename=3D'g2hip4-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'mpc8266_hip3' typename=3D'g2hip3-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'mpc8266' typename=3D'g2hip4-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'mpc8265_hip4' typename=3D'g2hip4-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'mpc8265_hip3' typename=3D'g2hip3-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'mpc8265' typename=3D'g2hip4-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'mpc8264_hip4' typename=3D'g2hip4-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'mpc8264_hip3' typename=3D'g2hip3-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'mpc8264' typename=3D'g2hip4-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'mpc8260_hip4' typename=3D'g2hip4-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'mpc8260_hip3' typename=3D'g2hip3-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'mpc8260' typename=3D'g2hip4-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'mpc8255_hip4' typename=3D'g2hip4-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'mpc8255_hip3' typename=3D'g2hip3-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'mpc8255' typename=3D'g2hip4-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'mpc8250_hip4' typename=3D'g2hip4-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'mpc8250_hip3' typename=3D'g2hip3-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'mpc8250' typename=3D'g2hip4-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'mpc8248' typename=3D'g2legp3-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'mpc8247' typename=3D'g2legp3-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'mpc8245' typename=3D'g2hip4-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'mpc8241' typename=3D'g2hip4-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'powerquicc-ii' typename=3D'g2legp3-powerpc64-c=
pu'/>
+  <cpu type=3D'kvm' name=3D'mpc82xx' typename=3D'g2legp3-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'mpc5200b' typename=3D'mpc5200b_v21-powerpc64-c=
pu'/>
+  <cpu type=3D'kvm' name=3D'mpc5200' typename=3D'mpc5200_v12-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'mpc52xx' typename=3D'mpc5200_v12-powerpc64-cpu=
'/>
+  <cpu type=3D'kvm' name=3D'mpc8240' typename=3D'603-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'460ex' typename=3D'460exb-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'440ep' typename=3D'440epb-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'x2vp50' typename=3D'x2vp20-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'x2vp7' typename=3D'x2vp4-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'405gpe' typename=3D'405crc-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'405gp' typename=3D'405gpd-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'405cr' typename=3D'405crc-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'405' typename=3D'405d4-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'403' typename=3D'403gc-powerpc64-cpu'/>
+  <cpu type=3D'kvm' name=3D'mpc8547e_v21' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'g2gp' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7457a_v1.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cl_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cxe_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'755_v2.7' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'755_v2.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'745_v2.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8377' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7455_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8545_v21' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8548_v11' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'405d4' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'g2le' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'g2hip3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750e' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8572' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'970fx_v2.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750fx_v2.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603p' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'405gpb' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7400_v2.7' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8544e_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e500v2_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e500mc' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603e7v1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'970mp_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'740e' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'405crc' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'403ga' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7447a_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e300c1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8572e' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e500v2_v21' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7400_v2.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'970fx_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750gx_v1.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750fx_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7457_v1.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'970fx_v3.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'604e_v2.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'745_v2.4' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'401a1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'755_v2.6' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'npe405h' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'power9_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'g2ls' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7410_v1.4' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750_v2.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'401b2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8349' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8347ep' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7445_v3.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8540_v21' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8543_v11' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'403gcx' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8548_v21' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750l_v3.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'755_v1.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cxe_v3.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e500_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8541e_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'power9_v2.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8347p' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8555e_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'power7_v2.3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603e7v' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8543e_v11' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750_v3.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7400_v2.6' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'405gpa' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'440epx' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750l_v2.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e200z6' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8547e_v20' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7457a_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8349ea' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e500v2_v20' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'power8nvl_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8540_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'755_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'745_v2.8' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'npe405l' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8343ea' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8545_v20' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8548_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7448_v1.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'740_v2.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7455_v3.4' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7400_v1.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8347et' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7441_v2.10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603e_v1.4' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8543_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'401c2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7451_v2.10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cx_v2.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8543_v21' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603e7' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7448_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7441_v2.3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'405crb' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7445_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7400_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'440-xilinx-w-dfpu' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'604' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'cobra' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e500_v20' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8541_v11' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750gx_v1.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cxe_v2.4' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8641d' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8543e_v21' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750l_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7457_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7450_v1.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'755_v2.5' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7410_v1.3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'745_v2.3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'755_v2.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e500v2_v30' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7455_v3.3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8540_v20' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'405d2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8560_v21' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8343' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8548_v20' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8347t' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'755_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603e_v1.3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'host' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8543e_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8347eap' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8548e_v11' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8543_v20' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'401d2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'power8_v2.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'740_v3.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e200z5' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'405cra' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7400_v2.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cxe_v2.3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'745_v2.7' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8560_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e5500' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8544_v11' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7448_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'401e2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'740_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7410_v1.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'745_v2.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7400_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'x2vp4' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8347ap' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8533_v11' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc5200b_v21' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750fx_v2.3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'601_v2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'g2legp3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'604e_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cx_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8610' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'g2h4' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750l_v3.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8377e' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e300c4' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc5200_v12' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7448_v2.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7450_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cxe_v3.1b' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'g2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7400_v2.9' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'405gpd' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603e7t' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8555_v11' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750gx_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8541_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8543e_v20' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750fl' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750l_v2.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'stb04' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8548e_v21' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'x2vp20' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e600' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7450_v1.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'755_v2.4' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8379' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7445_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'405ez' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7447_v1.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603e_v2.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603e_v4' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'g2legp' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7455_v3.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'740_v2.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8560_v20' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'440-xilinx' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'401f2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8533_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8349a' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'405gpr' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'stb25' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603e_v1.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc5200b_v20' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750fx_v2.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8347eat' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'740_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'601_v1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'745_v1.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cx_v2.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8548e_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'403gc' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7447a_v1.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e300c3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc5200_v11' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7441_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'740_v3.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8545e_v21' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'602' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8378e' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8343a' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'460exb' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8555_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8568' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7457a_v1.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cx_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cxe_v2.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'604e_v2.4' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'755_v2.8' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'405lp' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'745_v2.6' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'stb03' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'405ep' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8544_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8347at' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750_v2.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7450_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'755_v2.3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7410_v1.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'745_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750gl' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e6500' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750p' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7445_v3.4' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'440epb' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'npe4gs3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603e_v3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8349e' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'970_v2.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'g2lels' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'g2hip4' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'740p' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8567e' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8533e_v11' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7451_v2.3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7450_v2.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'401g2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7400_v2.8' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'405gpc' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7455_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'power7+_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8544e_v11' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'970mp_v1.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603e7v2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603e_v1.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'604r' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e500v2_v22' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8548e_v20' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8545e_v20' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8378' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8567' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7457_v1.2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7447_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'970fx_v3.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'745_v2.5' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8379e' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8641' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cxe_v2.4b' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7410_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc603' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'603e_v4.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7445_v3.3' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'440epa' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'970fx_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'iop480' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750fx_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'601_v0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'g2legp1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'745_v1.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cl_v2.0' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'401' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8541e_v11' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cxe_v3.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750cxr' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8555e_v11' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'power5+_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'403gb' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'7447a_v1.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'e300c2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'npe405h2' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8343e' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8533e_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc5200_v10' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'750_v3.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'power8e_v2.1' typename=3D''/>
+  <cpu type=3D'kvm' name=3D'mpc8568e' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'default' typename=3D'604-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'ppc' typename=3D'604-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'ppc32' typename=3D'604-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'ppc64' typename=3D'970fx_v3.1-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'power9' typename=3D'power9_v2.0-powerpc64-cpu'=
/>
+  <cpu type=3D'tcg' name=3D'power8nvl' typename=3D'power8nvl_v1.0-powerpc6=
4-cpu'/>
+  <cpu type=3D'tcg' name=3D'power8' typename=3D'power8_v2.0-powerpc64-cpu'=
/>
+  <cpu type=3D'tcg' name=3D'power8e' typename=3D'power8e_v2.1-powerpc64-cp=
u'/>
+  <cpu type=3D'tcg' name=3D'power7+' typename=3D'power7+_v2.1-powerpc64-cp=
u'/>
+  <cpu type=3D'tcg' name=3D'power7' typename=3D'power7_v2.3-powerpc64-cpu'=
/>
+  <cpu type=3D'tcg' name=3D'power5gs' typename=3D'power5+_v2.1-powerpc64-c=
pu'/>
+  <cpu type=3D'tcg' name=3D'power5+' typename=3D'power5+_v2.1-powerpc64-cp=
u'/>
+  <cpu type=3D'tcg' name=3D'970mp' typename=3D'970mp_v1.1-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'970fx' typename=3D'970fx_v3.1-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'970' typename=3D'970_v2.2-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'apollo7pm' typename=3D'7457a_v1.0-powerpc64-cp=
u'/>
+  <cpu type=3D'tcg' name=3D'7457a' typename=3D'7457a_v1.2-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'7447a' typename=3D'7447a_v1.2-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'apollo7' typename=3D'7457_v1.2-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'7457' typename=3D'7457_v1.2-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'7447' typename=3D'7447_v1.1-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'apollo6' typename=3D'7455_v3.2-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'7455' typename=3D'7455_v3.2-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'7445' typename=3D'7445_v3.2-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'7451' typename=3D'7451_v2.3-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'7441' typename=3D'7441_v2.3-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'vger' typename=3D'7450_v2.1-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'7450' typename=3D'7450_v2.1-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'7448' typename=3D'7448_v2.1-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'nitro' typename=3D'7410_v1.4-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'7410' typename=3D'7410_v1.4-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'g4' typename=3D'7400_v2.9-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'max' typename=3D'7400_v2.9-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'7400' typename=3D'7400_v2.9-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'goldfinger' typename=3D'755_v2.8-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'755' typename=3D'755_v2.8-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'745' typename=3D'745_v2.8-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'lonestar' typename=3D'750l_v3.2-powerpc64-cpu'=
/>
+  <cpu type=3D'tcg' name=3D'750l' typename=3D'750l_v3.2-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'750gx' typename=3D'750gx_v1.2-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'750fx' typename=3D'750fx_v2.3-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'750cxe' typename=3D'750cxe_v3.1b-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'750cx' typename=3D'750cx_v2.2-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'750cl' typename=3D'750cl_v2.0-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'conan/doyle' typename=3D'750p-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'g3' typename=3D'750_v3.1-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'typhoon' typename=3D'750_v3.1-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'750' typename=3D'750_v3.1-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'arthur' typename=3D'740_v3.1-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'740' typename=3D'740_v3.1-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'mach5' typename=3D'604r-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'sirocco' typename=3D'604e_v2.4-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'604e' typename=3D'604e_v2.4-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'goldeneye' typename=3D'603e7t-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'603r' typename=3D'603e7t-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'vaillant' typename=3D'603e7v-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'stretch' typename=3D'603e_v4.1-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'603e' typename=3D'603e_v4.1-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'vanilla' typename=3D'603-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'601v' typename=3D'601_v2-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'601' typename=3D'601_v2-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'mpc8560' typename=3D'mpc8560_v21-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'mpc8555e' typename=3D'mpc8555e_v11-powerpc64-c=
pu'/>
+  <cpu type=3D'tcg' name=3D'mpc8555' typename=3D'mpc8555_v11-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'mpc8548e' typename=3D'mpc8548e_v21-powerpc64-c=
pu'/>
+  <cpu type=3D'tcg' name=3D'mpc8548' typename=3D'mpc8548_v21-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'mpc8547e' typename=3D'mpc8547e_v21-powerpc64-c=
pu'/>
+  <cpu type=3D'tcg' name=3D'mpc8545e' typename=3D'mpc8545e_v21-powerpc64-c=
pu'/>
+  <cpu type=3D'tcg' name=3D'mpc8545' typename=3D'mpc8545_v21-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'mpc8544e' typename=3D'mpc8544e_v11-powerpc64-c=
pu'/>
+  <cpu type=3D'tcg' name=3D'mpc8544' typename=3D'mpc8544_v11-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'mpc8543e' typename=3D'mpc8543e_v21-powerpc64-c=
pu'/>
+  <cpu type=3D'tcg' name=3D'mpc8543' typename=3D'mpc8543_v21-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'mpc8541e' typename=3D'mpc8541e_v11-powerpc64-c=
pu'/>
+  <cpu type=3D'tcg' name=3D'mpc8541' typename=3D'mpc8541_v11-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'mpc8540' typename=3D'mpc8540_v21-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'mpc8533e' typename=3D'mpc8533e_v11-powerpc64-c=
pu'/>
+  <cpu type=3D'tcg' name=3D'mpc8533' typename=3D'mpc8533_v11-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'e500v2' typename=3D'e500v2_v22-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'e500v1' typename=3D'e500_v20-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'e500' typename=3D'e500v2_v22-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'mpc8347ea' typename=3D'mpc8347eat-powerpc64-cp=
u'/>
+  <cpu type=3D'tcg' name=3D'mpc8347e' typename=3D'mpc8347et-powerpc64-cpu'=
/>
+  <cpu type=3D'tcg' name=3D'mpc8347a' typename=3D'mpc8347at-powerpc64-cpu'=
/>
+  <cpu type=3D'tcg' name=3D'mpc8347' typename=3D'mpc8347t-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'e300' typename=3D'e300c3-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'e200' typename=3D'e200z6-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'mpc8280' typename=3D'g2legp3-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'mpc8275' typename=3D'g2legp3-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'mpc8272' typename=3D'g2legp3-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'mpc8271' typename=3D'g2legp3-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'mpc8270' typename=3D'g2legp3-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'mpc8266_hip4' typename=3D'g2hip4-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'mpc8266_hip3' typename=3D'g2hip3-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'mpc8266' typename=3D'g2hip4-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'mpc8265_hip4' typename=3D'g2hip4-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'mpc8265_hip3' typename=3D'g2hip3-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'mpc8265' typename=3D'g2hip4-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'mpc8264_hip4' typename=3D'g2hip4-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'mpc8264_hip3' typename=3D'g2hip3-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'mpc8264' typename=3D'g2hip4-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'mpc8260_hip4' typename=3D'g2hip4-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'mpc8260_hip3' typename=3D'g2hip3-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'mpc8260' typename=3D'g2hip4-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'mpc8255_hip4' typename=3D'g2hip4-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'mpc8255_hip3' typename=3D'g2hip3-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'mpc8255' typename=3D'g2hip4-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'mpc8250_hip4' typename=3D'g2hip4-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'mpc8250_hip3' typename=3D'g2hip3-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'mpc8250' typename=3D'g2hip4-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'mpc8248' typename=3D'g2legp3-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'mpc8247' typename=3D'g2legp3-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'mpc8245' typename=3D'g2hip4-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'mpc8241' typename=3D'g2hip4-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'powerquicc-ii' typename=3D'g2legp3-powerpc64-c=
pu'/>
+  <cpu type=3D'tcg' name=3D'mpc82xx' typename=3D'g2legp3-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'mpc5200b' typename=3D'mpc5200b_v21-powerpc64-c=
pu'/>
+  <cpu type=3D'tcg' name=3D'mpc5200' typename=3D'mpc5200_v12-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'mpc52xx' typename=3D'mpc5200_v12-powerpc64-cpu=
'/>
+  <cpu type=3D'tcg' name=3D'mpc8240' typename=3D'603-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'460ex' typename=3D'460exb-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'440ep' typename=3D'440epb-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'x2vp50' typename=3D'x2vp20-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'x2vp7' typename=3D'x2vp4-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'405gpe' typename=3D'405crc-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'405gp' typename=3D'405gpd-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'405cr' typename=3D'405crc-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'405' typename=3D'405d4-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'403' typename=3D'403gc-powerpc64-cpu'/>
+  <cpu type=3D'tcg' name=3D'mpc8547e_v21' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'g2gp' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7457a_v1.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cl_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cxe_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'755_v2.7' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'755_v2.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'745_v2.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8377' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7455_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8545_v21' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8548_v11' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'405d4' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'g2le' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'g2hip3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750e' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8572' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'970fx_v2.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750fx_v2.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603p' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'405gpb' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7400_v2.7' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8544e_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e500v2_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e500mc' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603e7v1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'970mp_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'740e' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'405crc' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'403ga' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7447a_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e300c1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8572e' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e500v2_v21' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7400_v2.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'970fx_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750gx_v1.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750fx_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7457_v1.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'970fx_v3.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'604e_v2.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'745_v2.4' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'401a1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'755_v2.6' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'npe405h' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'power9_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'g2ls' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7410_v1.4' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750_v2.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'401b2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8349' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8347ep' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7445_v3.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8540_v21' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8543_v11' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'403gcx' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8548_v21' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750l_v3.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'755_v1.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cxe_v3.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e500_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8541e_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'power9_v2.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8347p' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8555e_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'power7_v2.3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603e7v' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8543e_v11' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750_v3.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7400_v2.6' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'405gpa' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'440epx' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750l_v2.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e200z6' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8547e_v20' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7457a_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8349ea' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e500v2_v20' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'power8nvl_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8540_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'755_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'745_v2.8' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'npe405l' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8343ea' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8545_v20' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8548_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7448_v1.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'740_v2.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7455_v3.4' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7400_v1.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8347et' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7441_v2.10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603e_v1.4' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8543_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'401c2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7451_v2.10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cx_v2.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8543_v21' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603e7' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7448_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7441_v2.3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'405crb' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7445_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7400_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'440-xilinx-w-dfpu' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'604' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'cobra' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e500_v20' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8541_v11' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750gx_v1.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cxe_v2.4' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8641d' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8543e_v21' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750l_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7457_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7450_v1.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'755_v2.5' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7410_v1.3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'745_v2.3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'755_v2.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e500v2_v30' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7455_v3.3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8540_v20' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'405d2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8560_v21' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8343' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8548_v20' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8347t' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'755_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603e_v1.3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8543e_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8347eap' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8548e_v11' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8543_v20' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'401d2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'power8_v2.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'740_v3.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e200z5' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'405cra' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7400_v2.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cxe_v2.3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'745_v2.7' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8560_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e5500' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8544_v11' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7448_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'401e2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'740_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7410_v1.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'745_v2.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7400_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'x2vp4' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8347ap' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8533_v11' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc5200b_v21' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750fx_v2.3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'601_v2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'g2legp3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'604e_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cx_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8610' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'g2h4' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750l_v3.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8377e' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e300c4' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc5200_v12' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7448_v2.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7450_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cxe_v3.1b' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'g2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7400_v2.9' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'405gpd' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603e7t' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8555_v11' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750gx_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8541_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8543e_v20' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750fl' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750l_v2.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'stb04' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8548e_v21' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'x2vp20' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e600' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7450_v1.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'755_v2.4' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8379' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7445_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'405ez' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7447_v1.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603e_v2.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603e_v4' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'g2legp' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7455_v3.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'740_v2.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8560_v20' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'440-xilinx' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'401f2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8533_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8349a' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'405gpr' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'stb25' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603e_v1.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc5200b_v20' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750fx_v2.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8347eat' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'740_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'601_v1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'745_v1.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cx_v2.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8548e_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'403gc' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7447a_v1.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e300c3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc5200_v11' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7441_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'740_v3.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8545e_v21' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'602' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8378e' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8343a' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'460exb' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8555_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8568' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7457a_v1.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cx_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cxe_v2.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'604e_v2.4' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'755_v2.8' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'405lp' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'745_v2.6' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'stb03' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'405ep' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8544_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8347at' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750_v2.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7450_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'755_v2.3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7410_v1.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'745_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750gl' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e6500' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750p' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7445_v3.4' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'440epb' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'npe4gs3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603e_v3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8349e' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'970_v2.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'g2lels' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'g2hip4' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'740p' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8567e' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8533e_v11' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7451_v2.3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7450_v2.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'401g2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7400_v2.8' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'405gpc' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7455_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'power7+_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8544e_v11' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'970mp_v1.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603e7v2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603e_v1.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'604r' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e500v2_v22' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8548e_v20' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8545e_v20' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8378' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8567' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7457_v1.2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7447_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'970fx_v3.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'745_v2.5' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8379e' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8641' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cxe_v2.4b' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7410_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc603' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'603e_v4.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7445_v3.3' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'440epa' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'970fx_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'iop480' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750fx_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'601_v0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'g2legp1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'745_v1.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cl_v2.0' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'401' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8541e_v11' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cxe_v3.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750cxr' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8555e_v11' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'power5+_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'403gb' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'7447a_v1.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'e300c2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'npe405h2' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8343e' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8533e_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc5200_v10' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'750_v3.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'power8e_v2.1' typename=3D''/>
+  <cpu type=3D'tcg' name=3D'mpc8568e' typename=3D''/>
   <machine name=3D'pseries-4.0' alias=3D'pseries' hotplugCpus=3D'yes' maxC=
pus=3D'1024' default=3D'yes'/>
   <machine name=3D'ref405ep' maxCpus=3D'1'/>
   <machine name=3D'sam460ex' maxCpus=3D'1'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml b/tests/qemuca=
pabilitiesdata/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=3D'msa5-base' type=3D'boolean' value=3D'true'/>
     <property name=3D'tods' type=3D'boolean' value=3D'false'/>
   </hostCPU>
-  <cpu type=3D'kvm' name=3D'z14.2' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z890.2' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z990.4' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z14ZR1' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z10BC.2' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z196.2' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z14' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z9BC-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'zEC12-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z196-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z13-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z990.3' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'host' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z9EC' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'zBC12' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z9EC.3' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z196.2-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'qemu' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'z14.2' typename=3D'z14.2-s390x-cpu' usable=3D'=
yes'/>
+  <cpu type=3D'kvm' name=3D'z890.2' typename=3D'z890.2-s390x-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z990.4' typename=3D'z990.4-s390x-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z14ZR1' typename=3D'z14ZR1-s390x-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z10BC.2' typename=3D'z10BC.2-s390x-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z196.2' typename=3D'z196.2-s390x-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z14' typename=3D'z14-s390x-cpu' usable=3D'yes'=
/>
+  <cpu type=3D'kvm' name=3D'z9BC-base' typename=3D'z9BC-base-s390x-cpu' us=
able=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'zEC12-base' typename=3D'zEC12-base-s390x-cpu' =
usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z196-base' typename=3D'z196-base-s390x-cpu' us=
able=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z13-base' typename=3D'z13-base-s390x-cpu' usab=
le=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z990.3' typename=3D'z990.3-s390x-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'host' typename=3D'host-s390x-cpu' usable=3D'ye=
s'/>
+  <cpu type=3D'kvm' name=3D'z9EC' typename=3D'z9EC-s390x-cpu' usable=3D'ye=
s'/>
+  <cpu type=3D'kvm' name=3D'zBC12' typename=3D'zBC12-s390x-cpu' usable=3D'=
yes'/>
+  <cpu type=3D'kvm' name=3D'z9EC.3' typename=3D'z9EC.3-s390x-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z196.2-base' typename=3D'z196.2-base-s390x-cpu=
' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'qemu' typename=3D'qemu-s390x-cpu' usable=3D'no=
'>
     <blocker name=3D'ais'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'zEC12.2-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z800-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z9EC.2' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z900.2-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z14ZR1-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z900.3' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z890' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z890-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z990.4-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z10BC.2-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z900.2' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z9BC.2-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z800' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z114' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z13' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z990' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z13s-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z990.2' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z14.2-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z14-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z890.2-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z196' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z10EC' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z13s' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z900' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z10EC.3' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z10EC.2-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z114-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z990.2-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z9EC.2-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z890.3' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z900.3-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z9BC.2' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z10BC' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z990.5' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'zEC12.2' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z10EC-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z9EC-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z9EC.3-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'zEC12' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z990.5-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z10BC-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'max' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z900-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z13.2' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'zBC12-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z13.2-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z890.3-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z990-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z10EC.2' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z9BC' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z10EC.3-base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'z990.3-base' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'z14.2' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'zEC12.2-base' typename=3D'zEC12.2-base-s390x-c=
pu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z800-base' typename=3D'z800-base-s390x-cpu' us=
able=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z9EC.2' typename=3D'z9EC.2-s390x-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z900.2-base' typename=3D'z900.2-base-s390x-cpu=
' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z14ZR1-base' typename=3D'z14ZR1-base-s390x-cpu=
' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z900.3' typename=3D'z900.3-s390x-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z890' typename=3D'z890-s390x-cpu' usable=3D'ye=
s'/>
+  <cpu type=3D'kvm' name=3D'z890-base' typename=3D'z890-base-s390x-cpu' us=
able=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z990.4-base' typename=3D'z990.4-base-s390x-cpu=
' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z10BC.2-base' typename=3D'z10BC.2-base-s390x-c=
pu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z900.2' typename=3D'z900.2-s390x-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z9BC.2-base' typename=3D'z9BC.2-base-s390x-cpu=
' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z800' typename=3D'z800-s390x-cpu' usable=3D'ye=
s'/>
+  <cpu type=3D'kvm' name=3D'z114' typename=3D'z114-s390x-cpu' usable=3D'ye=
s'/>
+  <cpu type=3D'kvm' name=3D'z13' typename=3D'z13-s390x-cpu' usable=3D'yes'=
/>
+  <cpu type=3D'kvm' name=3D'z990' typename=3D'z990-s390x-cpu' usable=3D'ye=
s'/>
+  <cpu type=3D'kvm' name=3D'z13s-base' typename=3D'z13s-base-s390x-cpu' us=
able=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z990.2' typename=3D'z990.2-s390x-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z14.2-base' typename=3D'z14.2-base-s390x-cpu' =
usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z14-base' typename=3D'z14-base-s390x-cpu' usab=
le=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z890.2-base' typename=3D'z890.2-base-s390x-cpu=
' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z196' typename=3D'z196-s390x-cpu' usable=3D'ye=
s'/>
+  <cpu type=3D'kvm' name=3D'z10EC' typename=3D'z10EC-s390x-cpu' usable=3D'=
yes'/>
+  <cpu type=3D'kvm' name=3D'z13s' typename=3D'z13s-s390x-cpu' usable=3D'ye=
s'/>
+  <cpu type=3D'kvm' name=3D'z900' typename=3D'z900-s390x-cpu' usable=3D'ye=
s'/>
+  <cpu type=3D'kvm' name=3D'z10EC.3' typename=3D'z10EC.3-s390x-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z10EC.2-base' typename=3D'z10EC.2-base-s390x-c=
pu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z114-base' typename=3D'z114-base-s390x-cpu' us=
able=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z990.2-base' typename=3D'z990.2-base-s390x-cpu=
' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z9EC.2-base' typename=3D'z9EC.2-base-s390x-cpu=
' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z890.3' typename=3D'z890.3-s390x-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z900.3-base' typename=3D'z900.3-base-s390x-cpu=
' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z9BC.2' typename=3D'z9BC.2-s390x-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z10BC' typename=3D'z10BC-s390x-cpu' usable=3D'=
yes'/>
+  <cpu type=3D'kvm' name=3D'z990.5' typename=3D'z990.5-s390x-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'zEC12.2' typename=3D'zEC12.2-s390x-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z10EC-base' typename=3D'z10EC-base-s390x-cpu' =
usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z9EC-base' typename=3D'z9EC-base-s390x-cpu' us=
able=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z9EC.3-base' typename=3D'z9EC.3-base-s390x-cpu=
' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'zEC12' typename=3D'zEC12-s390x-cpu' usable=3D'=
yes'/>
+  <cpu type=3D'kvm' name=3D'z990.5-base' typename=3D'z990.5-base-s390x-cpu=
' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z10BC-base' typename=3D'z10BC-base-s390x-cpu' =
usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'max' typename=3D'max-s390x-cpu' usable=3D'yes'=
/>
+  <cpu type=3D'kvm' name=3D'z900-base' typename=3D'z900-base-s390x-cpu' us=
able=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z13.2' typename=3D'z13.2-s390x-cpu' usable=3D'=
yes'/>
+  <cpu type=3D'kvm' name=3D'zBC12-base' typename=3D'zBC12-base-s390x-cpu' =
usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z13.2-base' typename=3D'z13.2-base-s390x-cpu' =
usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z890.3-base' typename=3D'z890.3-base-s390x-cpu=
' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z990-base' typename=3D'z990-base-s390x-cpu' us=
able=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z10EC.2' typename=3D'z10EC.2-s390x-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z9BC' typename=3D'z9BC-s390x-cpu' usable=3D'ye=
s'/>
+  <cpu type=3D'kvm' name=3D'z10EC.3-base' typename=3D'z10EC.3-base-s390x-c=
pu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'z990.3-base' typename=3D'z990.3-base-s390x-cpu=
' usable=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'z14.2' typename=3D'z14.2-s390x-cpu' usable=3D'=
no'>
     <blocker name=3D'ppno-sha-512-drng'/>
     <blocker name=3D'pcc-xts-eaes-256'/>
     <blocker name=3D'pcc-xts-eaes-128'/>
@@ -425,7 +425,7 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z890.2' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z890.2' typename=3D'z890.2-s390x-cpu' usable=
=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -439,7 +439,7 @@
     <blocker name=3D'kmac-dea'/>
     <blocker name=3D'hfpm'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z990.4' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z990.4' typename=3D'z990.4-s390x-cpu' usable=
=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -453,7 +453,7 @@
     <blocker name=3D'kmac-dea'/>
     <blocker name=3D'hfpm'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z14ZR1' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z14ZR1' typename=3D'z14ZR1-s390x-cpu' usable=
=3D'no'>
     <blocker name=3D'ppno-sha-512-drng'/>
     <blocker name=3D'pcc-xts-eaes-256'/>
     <blocker name=3D'pcc-xts-eaes-128'/>
@@ -598,7 +598,7 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z10BC.2' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z10BC.2' typename=3D'z10BC.2-s390x-cpu' usable=
=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -626,7 +626,7 @@
     <blocker name=3D'msa1'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z196.2' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z196.2' typename=3D'z196.2-s390x-cpu' usable=
=3D'no'>
     <blocker name=3D'pcc-xts-eaes-256'/>
     <blocker name=3D'pcc-xts-eaes-128'/>
     <blocker name=3D'pcc-xts-aes-256'/>
@@ -745,7 +745,7 @@
     <blocker name=3D'msa1'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z14' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z14' typename=3D'z14-s390x-cpu' usable=3D'no'>
     <blocker name=3D'ppno-sha-512-drng'/>
     <blocker name=3D'pcc-xts-eaes-256'/>
     <blocker name=3D'pcc-xts-eaes-128'/>
@@ -890,7 +890,7 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z9BC-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z9BC-base' typename=3D'z9BC-base-s390x-cpu' us=
able=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -908,7 +908,7 @@
     <blocker name=3D'asnlxr'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'zEC12-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'zEC12-base' typename=3D'zEC12-base-s390x-cpu' =
usable=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -935,7 +935,7 @@
     <blocker name=3D'asnlxr'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z196-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z196-base' typename=3D'z196-base-s390x-cpu' us=
able=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -961,7 +961,7 @@
     <blocker name=3D'asnlxr'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z13-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z13-base' typename=3D'z13-base-s390x-cpu' usab=
le=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -991,7 +991,7 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z990.3' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z990.3' typename=3D'z990.3-s390x-cpu' usable=
=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -1005,8 +1005,8 @@
     <blocker name=3D'kmac-dea'/>
     <blocker name=3D'hfpm'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'host' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'z9EC' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'host' typename=3D'host-s390x-cpu' usable=3D'ye=
s'/>
+  <cpu type=3D'tcg' name=3D'z9EC' typename=3D'z9EC-s390x-cpu' usable=3D'no=
'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -1027,7 +1027,7 @@
     <blocker name=3D'msa1'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'zBC12' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'zBC12' typename=3D'zBC12-s390x-cpu' usable=3D'=
no'>
     <blocker name=3D'pcc-xts-eaes-256'/>
     <blocker name=3D'pcc-xts-eaes-128'/>
     <blocker name=3D'pcc-xts-aes-256'/>
@@ -1153,7 +1153,7 @@
     <blocker name=3D'msa1'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z9EC.3' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z9EC.3' typename=3D'z9EC.3-s390x-cpu' usable=
=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -1174,7 +1174,7 @@
     <blocker name=3D'msa1'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z196.2-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z196.2-base' typename=3D'z196.2-base-s390x-cpu=
' usable=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -1200,8 +1200,8 @@
     <blocker name=3D'asnlxr'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'qemu' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'zEC12.2-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'qemu' typename=3D'qemu-s390x-cpu' usable=3D'ye=
s'/>
+  <cpu type=3D'tcg' name=3D'zEC12.2-base' typename=3D'zEC12.2-base-s390x-c=
pu' usable=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -1228,8 +1228,8 @@
     <blocker name=3D'asnlxr'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z800-base' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'z9EC.2' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z800-base' typename=3D'z800-base-s390x-cpu' us=
able=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'z9EC.2' typename=3D'z9EC.2-s390x-cpu' usable=
=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -1250,8 +1250,8 @@
     <blocker name=3D'msa1'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z900.2-base' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'z14ZR1-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z900.2-base' typename=3D'z900.2-base-s390x-cpu=
' usable=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'z14ZR1-base' typename=3D'z14ZR1-base-s390x-cpu=
' usable=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -1286,8 +1286,8 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z900.3' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'z890' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z900.3' typename=3D'z900.3-s390x-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'z890' typename=3D'z890-s390x-cpu' usable=3D'no=
'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -1301,7 +1301,7 @@
     <blocker name=3D'kmac-dea'/>
     <blocker name=3D'hfpm'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z890-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z890-base' typename=3D'z890-base-s390x-cpu' us=
able=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -1315,7 +1315,7 @@
     <blocker name=3D'kmac-dea'/>
     <blocker name=3D'hfpm'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z990.4-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z990.4-base' typename=3D'z990.4-base-s390x-cpu=
' usable=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -1329,7 +1329,7 @@
     <blocker name=3D'kmac-dea'/>
     <blocker name=3D'hfpm'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z10BC.2-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z10BC.2-base' typename=3D'z10BC.2-base-s390x-c=
pu' usable=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -1352,8 +1352,8 @@
     <blocker name=3D'asnlxr'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z900.2' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'z9BC.2-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z900.2' typename=3D'z900.2-s390x-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'z9BC.2-base' typename=3D'z9BC.2-base-s390x-cpu=
' usable=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -1371,8 +1371,8 @@
     <blocker name=3D'asnlxr'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z800' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'z114' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z800' typename=3D'z800-s390x-cpu' usable=3D'ye=
s'/>
+  <cpu type=3D'tcg' name=3D'z114' typename=3D'z114-s390x-cpu' usable=3D'no=
'>
     <blocker name=3D'pcc-xts-eaes-256'/>
     <blocker name=3D'pcc-xts-eaes-128'/>
     <blocker name=3D'pcc-xts-aes-256'/>
@@ -1491,7 +1491,7 @@
     <blocker name=3D'msa1'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z13' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z13' typename=3D'z13-s390x-cpu' usable=3D'no'>
     <blocker name=3D'ppno-sha-512-drng'/>
     <blocker name=3D'pcc-xts-eaes-256'/>
     <blocker name=3D'pcc-xts-eaes-128'/>
@@ -1622,7 +1622,7 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z990' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z990' typename=3D'z990-s390x-cpu' usable=3D'no=
'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -1636,7 +1636,7 @@
     <blocker name=3D'kmac-dea'/>
     <blocker name=3D'hfpm'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z13s-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z13s-base' typename=3D'z13s-base-s390x-cpu' us=
able=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -1666,7 +1666,7 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z990.2' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z990.2' typename=3D'z990.2-s390x-cpu' usable=
=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -1680,7 +1680,7 @@
     <blocker name=3D'kmac-dea'/>
     <blocker name=3D'hfpm'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z14.2-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z14.2-base' typename=3D'z14.2-base-s390x-cpu' =
usable=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -1715,7 +1715,7 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z14-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z14-base' typename=3D'z14-base-s390x-cpu' usab=
le=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -1750,7 +1750,7 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z890.2-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z890.2-base' typename=3D'z890.2-base-s390x-cpu=
' usable=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -1764,7 +1764,7 @@
     <blocker name=3D'kmac-dea'/>
     <blocker name=3D'hfpm'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z196' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z196' typename=3D'z196-s390x-cpu' usable=3D'no=
'>
     <blocker name=3D'pcc-xts-eaes-256'/>
     <blocker name=3D'pcc-xts-eaes-128'/>
     <blocker name=3D'pcc-xts-aes-256'/>
@@ -1883,7 +1883,7 @@
     <blocker name=3D'msa1'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z10EC' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z10EC' typename=3D'z10EC-s390x-cpu' usable=3D'=
no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -1911,7 +1911,7 @@
     <blocker name=3D'msa1'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z13s' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z13s' typename=3D'z13s-s390x-cpu' usable=3D'no=
'>
     <blocker name=3D'ppno-sha-512-drng'/>
     <blocker name=3D'pcc-xts-eaes-256'/>
     <blocker name=3D'pcc-xts-eaes-128'/>
@@ -2042,8 +2042,8 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z900' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'z10EC.3' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z900' typename=3D'z900-s390x-cpu' usable=3D'ye=
s'/>
+  <cpu type=3D'tcg' name=3D'z10EC.3' typename=3D'z10EC.3-s390x-cpu' usable=
=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -2071,7 +2071,7 @@
     <blocker name=3D'msa1'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z10EC.2-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z10EC.2-base' typename=3D'z10EC.2-base-s390x-c=
pu' usable=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -2094,7 +2094,7 @@
     <blocker name=3D'asnlxr'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z114-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z114-base' typename=3D'z114-base-s390x-cpu' us=
able=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -2120,7 +2120,7 @@
     <blocker name=3D'asnlxr'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z990.2-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z990.2-base' typename=3D'z990.2-base-s390x-cpu=
' usable=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -2134,7 +2134,7 @@
     <blocker name=3D'kmac-dea'/>
     <blocker name=3D'hfpm'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z9EC.2-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z9EC.2-base' typename=3D'z9EC.2-base-s390x-cpu=
' usable=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -2152,7 +2152,7 @@
     <blocker name=3D'asnlxr'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z890.3' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z890.3' typename=3D'z890.3-s390x-cpu' usable=
=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -2166,8 +2166,8 @@
     <blocker name=3D'kmac-dea'/>
     <blocker name=3D'hfpm'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z900.3-base' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'z9BC.2' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z900.3-base' typename=3D'z900.3-base-s390x-cpu=
' usable=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'z9BC.2' typename=3D'z9BC.2-s390x-cpu' usable=
=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -2188,7 +2188,7 @@
     <blocker name=3D'msa1'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z10BC' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z10BC' typename=3D'z10BC-s390x-cpu' usable=3D'=
no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -2216,7 +2216,7 @@
     <blocker name=3D'msa1'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z990.5' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z990.5' typename=3D'z990.5-s390x-cpu' usable=
=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -2230,7 +2230,7 @@
     <blocker name=3D'kmac-dea'/>
     <blocker name=3D'hfpm'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'zEC12.2' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'zEC12.2' typename=3D'zEC12.2-s390x-cpu' usable=
=3D'no'>
     <blocker name=3D'pcc-xts-eaes-256'/>
     <blocker name=3D'pcc-xts-eaes-128'/>
     <blocker name=3D'pcc-xts-aes-256'/>
@@ -2356,7 +2356,7 @@
     <blocker name=3D'msa1'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z10EC-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z10EC-base' typename=3D'z10EC-base-s390x-cpu' =
usable=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -2379,7 +2379,7 @@
     <blocker name=3D'asnlxr'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z9EC-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z9EC-base' typename=3D'z9EC-base-s390x-cpu' us=
able=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -2397,7 +2397,7 @@
     <blocker name=3D'asnlxr'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z9EC.3-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z9EC.3-base' typename=3D'z9EC.3-base-s390x-cpu=
' usable=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -2415,7 +2415,7 @@
     <blocker name=3D'asnlxr'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'zEC12' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'zEC12' typename=3D'zEC12-s390x-cpu' usable=3D'=
no'>
     <blocker name=3D'pcc-xts-eaes-256'/>
     <blocker name=3D'pcc-xts-eaes-128'/>
     <blocker name=3D'pcc-xts-aes-256'/>
@@ -2541,7 +2541,7 @@
     <blocker name=3D'msa1'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z990.5-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z990.5-base' typename=3D'z990.5-base-s390x-cpu=
' usable=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -2555,7 +2555,7 @@
     <blocker name=3D'kmac-dea'/>
     <blocker name=3D'hfpm'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z10BC-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z10BC-base' typename=3D'z10BC-base-s390x-cpu' =
usable=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -2578,9 +2578,9 @@
     <blocker name=3D'asnlxr'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'max' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'z900-base' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'z13.2' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'max' typename=3D'max-s390x-cpu' usable=3D'yes'=
/>
+  <cpu type=3D'tcg' name=3D'z900-base' typename=3D'z900-base-s390x-cpu' us=
able=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'z13.2' typename=3D'z13.2-s390x-cpu' usable=3D'=
no'>
     <blocker name=3D'ppno-sha-512-drng'/>
     <blocker name=3D'pcc-xts-eaes-256'/>
     <blocker name=3D'pcc-xts-eaes-128'/>
@@ -2711,7 +2711,7 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'zBC12-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'zBC12-base' typename=3D'zBC12-base-s390x-cpu' =
usable=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -2738,7 +2738,7 @@
     <blocker name=3D'asnlxr'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z13.2-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z13.2-base' typename=3D'z13.2-base-s390x-cpu' =
usable=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -2768,7 +2768,7 @@
     <blocker name=3D'tods'/>
     <blocker name=3D'type'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z890.3-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z890.3-base' typename=3D'z890.3-base-s390x-cpu=
' usable=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -2782,7 +2782,7 @@
     <blocker name=3D'kmac-dea'/>
     <blocker name=3D'hfpm'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z990-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z990-base' typename=3D'z990-base-s390x-cpu' us=
able=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -2796,7 +2796,7 @@
     <blocker name=3D'kmac-dea'/>
     <blocker name=3D'hfpm'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z10EC.2' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z10EC.2' typename=3D'z10EC.2-s390x-cpu' usable=
=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -2824,7 +2824,7 @@
     <blocker name=3D'msa1'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z9BC' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z9BC' typename=3D'z9BC-s390x-cpu' usable=3D'no=
'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -2845,7 +2845,7 @@
     <blocker name=3D'msa1'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z10EC.3-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z10EC.3-base' typename=3D'z10EC.3-base-s390x-c=
pu' usable=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
@@ -2868,7 +2868,7 @@
     <blocker name=3D'asnlxr'/>
     <blocker name=3D'tods'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'z990.3-base' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'z990.3-base' typename=3D'z990.3-base-s390x-cpu=
' usable=3D'no'>
     <blocker name=3D'klmd-sha-1'/>
     <blocker name=3D'kimd-sha-1'/>
     <blocker name=3D'km-tdea-192'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml b/tests/qemuc=
apabilitiesdata/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=3D'avx512pf' type=3D'boolean' value=3D'false'/>
     <property name=3D'xstore-en' type=3D'boolean' value=3D'false'/>
   </hostCPU>
-  <cpu type=3D'kvm' name=3D'max' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'host' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'qemu64' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'qemu32' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'phenom' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'max' typename=3D'max-x86_64-cpu' usable=3D'yes=
'/>
+  <cpu type=3D'kvm' name=3D'host' typename=3D'host-x86_64-cpu' usable=3D'y=
es'/>
+  <cpu type=3D'kvm' name=3D'base' typename=3D'base-x86_64-cpu' usable=3D'y=
es'/>
+  <cpu type=3D'kvm' name=3D'qemu64' typename=3D'qemu64-x86_64-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'qemu32' typename=3D'qemu32-x86_64-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'phenom' typename=3D'phenom-x86_64-cpu' usable=
=3D'no'>
     <blocker name=3D'mmxext'/>
     <blocker name=3D'fxsr-opt'/>
     <blocker name=3D'3dnowext'/>
@@ -765,22 +765,22 @@
     <blocker name=3D'sse4a'/>
     <blocker name=3D'npt'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'pentium3' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'pentium2' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'pentium' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'n270' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'kvm64' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'kvm32' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'coreduo' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'core2duo' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'athlon' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'pentium3' typename=3D'pentium3-x86_64-cpu' usa=
ble=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'pentium2' typename=3D'pentium2-x86_64-cpu' usa=
ble=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'pentium' typename=3D'pentium-x86_64-cpu' usabl=
e=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'n270' typename=3D'n270-x86_64-cpu' usable=3D'y=
es'/>
+  <cpu type=3D'kvm' name=3D'kvm64' typename=3D'kvm64-x86_64-cpu' usable=3D=
'yes'/>
+  <cpu type=3D'kvm' name=3D'kvm32' typename=3D'kvm32-x86_64-cpu' usable=3D=
'yes'/>
+  <cpu type=3D'kvm' name=3D'coreduo' typename=3D'coreduo-x86_64-cpu' usabl=
e=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'core2duo' typename=3D'core2duo-x86_64-cpu' usa=
ble=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'athlon' typename=3D'athlon-x86_64-cpu' usable=
=3D'no'>
     <blocker name=3D'mmxext'/>
     <blocker name=3D'3dnowext'/>
     <blocker name=3D'3dnow'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Westmere-IBRS' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Westmere' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Skylake-Server-IBRS' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Westmere-IBRS' typename=3D'Westmere-IBRS-x86_6=
4-cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Westmere' typename=3D'Westmere-x86_64-cpu' usa=
ble=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Skylake-Server-IBRS' typename=3D'Skylake-Serve=
r-IBRS-x86_64-cpu' usable=3D'no'>
     <blocker name=3D'avx512f'/>
     <blocker name=3D'avx512dq'/>
     <blocker name=3D'clwb'/>
@@ -793,7 +793,7 @@
     <blocker name=3D'avx512f'/>
     <blocker name=3D'pku'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Skylake-Server' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Skylake-Server' typename=3D'Skylake-Server-x86=
_64-cpu' usable=3D'no'>
     <blocker name=3D'avx512f'/>
     <blocker name=3D'avx512dq'/>
     <blocker name=3D'clwb'/>
@@ -806,12 +806,12 @@
     <blocker name=3D'avx512f'/>
     <blocker name=3D'pku'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Skylake-Client-IBRS' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Skylake-Client' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'SandyBridge-IBRS' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'SandyBridge' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Penryn' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Opteron_G5' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Skylake-Client-IBRS' typename=3D'Skylake-Clien=
t-IBRS-x86_64-cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Skylake-Client' typename=3D'Skylake-Client-x86=
_64-cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'SandyBridge-IBRS' typename=3D'SandyBridge-IBRS=
-x86_64-cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'SandyBridge' typename=3D'SandyBridge-x86_64-cp=
u' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Penryn' typename=3D'Penryn-x86_64-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Opteron_G5' typename=3D'Opteron_G5-x86_64-cpu'=
 usable=3D'no'>
     <blocker name=3D'sse4a'/>
     <blocker name=3D'misalignsse'/>
     <blocker name=3D'xop'/>
@@ -820,7 +820,7 @@
     <blocker name=3D'npt'/>
     <blocker name=3D'nrip-save'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Opteron_G4' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Opteron_G4' typename=3D'Opteron_G4-x86_64-cpu'=
 usable=3D'no'>
     <blocker name=3D'sse4a'/>
     <blocker name=3D'misalignsse'/>
     <blocker name=3D'xop'/>
@@ -828,15 +828,15 @@
     <blocker name=3D'npt'/>
     <blocker name=3D'nrip-save'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Opteron_G3' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Opteron_G3' typename=3D'Opteron_G3-x86_64-cpu'=
 usable=3D'no'>
     <blocker name=3D'sse4a'/>
     <blocker name=3D'misalignsse'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Opteron_G2' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Opteron_G1' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Nehalem-IBRS' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Nehalem' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'KnightsMill' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Opteron_G2' typename=3D'Opteron_G2-x86_64-cpu'=
 usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Opteron_G1' typename=3D'Opteron_G1-x86_64-cpu'=
 usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Nehalem-IBRS' typename=3D'Nehalem-IBRS-x86_64-=
cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Nehalem' typename=3D'Nehalem-x86_64-cpu' usabl=
e=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'KnightsMill' typename=3D'KnightsMill-x86_64-cp=
u' usable=3D'no'>
     <blocker name=3D'avx512f'/>
     <blocker name=3D'avx512pf'/>
     <blocker name=3D'avx512er'/>
@@ -848,9 +848,9 @@
     <blocker name=3D'avx512f'/>
     <blocker name=3D'avx512f'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'IvyBridge-IBRS' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'IvyBridge' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Icelake-Server' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'IvyBridge-IBRS' typename=3D'IvyBridge-IBRS-x86=
_64-cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'IvyBridge' typename=3D'IvyBridge-x86_64-cpu' u=
sable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Icelake-Server' typename=3D'Icelake-Server-x86=
_64-cpu' usable=3D'no'>
     <blocker name=3D'avx512f'/>
     <blocker name=3D'avx512dq'/>
     <blocker name=3D'clwb'/>
@@ -873,7 +873,7 @@
     <blocker name=3D'avx512f'/>
     <blocker name=3D'pku'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Icelake-Client' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Icelake-Client' typename=3D'Icelake-Client-x86=
_64-cpu' usable=3D'no'>
     <blocker name=3D'avx512vbmi'/>
     <blocker name=3D'pku'/>
     <blocker name=3D'avx512vbmi2'/>
@@ -886,11 +886,11 @@
     <blocker name=3D'wbnoinvd'/>
     <blocker name=3D'pku'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Haswell-noTSX-IBRS' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Haswell-noTSX' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Haswell-IBRS' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Haswell' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'EPYC-IBPB' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Haswell-noTSX-IBRS' typename=3D'Haswell-noTSX-=
IBRS-x86_64-cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Haswell-noTSX' typename=3D'Haswell-noTSX-x86_6=
4-cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Haswell-IBRS' typename=3D'Haswell-IBRS-x86_64-=
cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Haswell' typename=3D'Haswell-x86_64-cpu' usabl=
e=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'EPYC-IBPB' typename=3D'EPYC-IBPB-x86_64-cpu' u=
sable=3D'no'>
     <blocker name=3D'sha-ni'/>
     <blocker name=3D'mmxext'/>
     <blocker name=3D'fxsr-opt'/>
@@ -902,7 +902,7 @@
     <blocker name=3D'npt'/>
     <blocker name=3D'nrip-save'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'EPYC' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'EPYC' typename=3D'EPYC-x86_64-cpu' usable=3D'n=
o'>
     <blocker name=3D'sha-ni'/>
     <blocker name=3D'mmxext'/>
     <blocker name=3D'fxsr-opt'/>
@@ -913,8 +913,8 @@
     <blocker name=3D'npt'/>
     <blocker name=3D'nrip-save'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Conroe' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Cascadelake-Server' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Conroe' typename=3D'Conroe-x86_64-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Cascadelake-Server' typename=3D'Cascadelake-Se=
rver-x86_64-cpu' usable=3D'no'>
     <blocker name=3D'avx512f'/>
     <blocker name=3D'avx512dq'/>
     <blocker name=3D'clwb'/>
@@ -928,35 +928,35 @@
     <blocker name=3D'avx512f'/>
     <blocker name=3D'pku'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Broadwell-noTSX-IBRS' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Broadwell-noTSX' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Broadwell-IBRS' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Broadwell' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'486' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'max' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'host' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Broadwell-noTSX-IBRS' typename=3D'Broadwell-no=
TSX-IBRS-x86_64-cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Broadwell-noTSX' typename=3D'Broadwell-noTSX-x=
86_64-cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Broadwell-IBRS' typename=3D'Broadwell-IBRS-x86=
_64-cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Broadwell' typename=3D'Broadwell-x86_64-cpu' u=
sable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'486' typename=3D'486-x86_64-cpu' usable=3D'yes=
'/>
+  <cpu type=3D'tcg' name=3D'max' typename=3D'max-x86_64-cpu' usable=3D'yes=
'/>
+  <cpu type=3D'tcg' name=3D'host' typename=3D'host-x86_64-cpu' usable=3D'n=
o'>
     <blocker name=3D'kvm'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'base' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'qemu64' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'qemu32' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'phenom' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'base' typename=3D'base-x86_64-cpu' usable=3D'y=
es'/>
+  <cpu type=3D'tcg' name=3D'qemu64' typename=3D'qemu64-x86_64-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'qemu32' typename=3D'qemu32-x86_64-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'phenom' typename=3D'phenom-x86_64-cpu' usable=
=3D'no'>
     <blocker name=3D'fxsr-opt'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'pentium3' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'pentium2' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'pentium' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'n270' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'kvm64' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'kvm32' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'coreduo' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'core2duo' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'athlon' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'Westmere-IBRS' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'pentium3' typename=3D'pentium3-x86_64-cpu' usa=
ble=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'pentium2' typename=3D'pentium2-x86_64-cpu' usa=
ble=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'pentium' typename=3D'pentium-x86_64-cpu' usabl=
e=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'n270' typename=3D'n270-x86_64-cpu' usable=3D'y=
es'/>
+  <cpu type=3D'tcg' name=3D'kvm64' typename=3D'kvm64-x86_64-cpu' usable=3D=
'yes'/>
+  <cpu type=3D'tcg' name=3D'kvm32' typename=3D'kvm32-x86_64-cpu' usable=3D=
'yes'/>
+  <cpu type=3D'tcg' name=3D'coreduo' typename=3D'coreduo-x86_64-cpu' usabl=
e=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'core2duo' typename=3D'core2duo-x86_64-cpu' usa=
ble=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'athlon' typename=3D'athlon-x86_64-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'Westmere-IBRS' typename=3D'Westmere-IBRS-x86_6=
4-cpu' usable=3D'no'>
     <blocker name=3D'spec-ctrl'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Westmere' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'Skylake-Server-IBRS' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Westmere' typename=3D'Westmere-x86_64-cpu' usa=
ble=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'Skylake-Server-IBRS' typename=3D'Skylake-Serve=
r-IBRS-x86_64-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -978,7 +978,7 @@
     <blocker name=3D'3dnowprefetch'/>
     <blocker name=3D'xsavec'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Skylake-Server' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Skylake-Server' typename=3D'Skylake-Server-x86=
_64-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -999,7 +999,7 @@
     <blocker name=3D'3dnowprefetch'/>
     <blocker name=3D'xsavec'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Skylake-Client-IBRS' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Skylake-Client-IBRS' typename=3D'Skylake-Clien=
t-IBRS-x86_64-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1016,7 +1016,7 @@
     <blocker name=3D'3dnowprefetch'/>
     <blocker name=3D'xsavec'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Skylake-Client' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Skylake-Client' typename=3D'Skylake-Client-x86=
_64-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1032,19 +1032,19 @@
     <blocker name=3D'3dnowprefetch'/>
     <blocker name=3D'xsavec'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'SandyBridge-IBRS' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'SandyBridge-IBRS' typename=3D'SandyBridge-IBRS=
-x86_64-cpu' usable=3D'no'>
     <blocker name=3D'x2apic'/>
     <blocker name=3D'tsc-deadline'/>
     <blocker name=3D'avx'/>
     <blocker name=3D'spec-ctrl'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'SandyBridge' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'SandyBridge' typename=3D'SandyBridge-x86_64-cp=
u' usable=3D'no'>
     <blocker name=3D'x2apic'/>
     <blocker name=3D'tsc-deadline'/>
     <blocker name=3D'avx'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Penryn' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'Opteron_G5' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Penryn' typename=3D'Penryn-x86_64-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'Opteron_G5' typename=3D'Opteron_G5-x86_64-cpu'=
 usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'avx'/>
     <blocker name=3D'f16c'/>
@@ -1055,7 +1055,7 @@
     <blocker name=3D'tbm'/>
     <blocker name=3D'nrip-save'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Opteron_G4' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Opteron_G4' typename=3D'Opteron_G4-x86_64-cpu'=
 usable=3D'no'>
     <blocker name=3D'avx'/>
     <blocker name=3D'misalignsse'/>
     <blocker name=3D'3dnowprefetch'/>
@@ -1063,16 +1063,16 @@
     <blocker name=3D'fma4'/>
     <blocker name=3D'nrip-save'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Opteron_G3' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Opteron_G3' typename=3D'Opteron_G3-x86_64-cpu'=
 usable=3D'no'>
     <blocker name=3D'misalignsse'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Opteron_G2' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'Opteron_G1' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'Nehalem-IBRS' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Opteron_G2' typename=3D'Opteron_G2-x86_64-cpu'=
 usable=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'Opteron_G1' typename=3D'Opteron_G1-x86_64-cpu'=
 usable=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'Nehalem-IBRS' typename=3D'Nehalem-IBRS-x86_64-=
cpu' usable=3D'no'>
     <blocker name=3D'spec-ctrl'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Nehalem' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'KnightsMill' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Nehalem' typename=3D'Nehalem-x86_64-cpu' usabl=
e=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'KnightsMill' typename=3D'KnightsMill-x86_64-cp=
u' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'x2apic'/>
     <blocker name=3D'tsc-deadline'/>
@@ -1090,7 +1090,7 @@
     <blocker name=3D'avx512-4fmaps'/>
     <blocker name=3D'3dnowprefetch'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'IvyBridge-IBRS' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'IvyBridge-IBRS' typename=3D'IvyBridge-IBRS-x86=
_64-cpu' usable=3D'no'>
     <blocker name=3D'x2apic'/>
     <blocker name=3D'tsc-deadline'/>
     <blocker name=3D'avx'/>
@@ -1098,14 +1098,14 @@
     <blocker name=3D'rdrand'/>
     <blocker name=3D'spec-ctrl'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'IvyBridge' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'IvyBridge' typename=3D'IvyBridge-x86_64-cpu' u=
sable=3D'no'>
     <blocker name=3D'x2apic'/>
     <blocker name=3D'tsc-deadline'/>
     <blocker name=3D'avx'/>
     <blocker name=3D'f16c'/>
     <blocker name=3D'rdrand'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Icelake-Server' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Icelake-Server' typename=3D'Icelake-Server-x86=
_64-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1138,7 +1138,7 @@
     <blocker name=3D'wbnoinvd'/>
     <blocker name=3D'xsavec'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Icelake-Client' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Icelake-Client' typename=3D'Icelake-Client-x86=
_64-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1166,7 +1166,7 @@
     <blocker name=3D'wbnoinvd'/>
     <blocker name=3D'xsavec'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Haswell-noTSX-IBRS' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Haswell-noTSX-IBRS' typename=3D'Haswell-noTSX-=
IBRS-x86_64-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1178,7 +1178,7 @@
     <blocker name=3D'invpcid'/>
     <blocker name=3D'spec-ctrl'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Haswell-noTSX' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Haswell-noTSX' typename=3D'Haswell-noTSX-x86_6=
4-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1189,7 +1189,7 @@
     <blocker name=3D'avx2'/>
     <blocker name=3D'invpcid'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Haswell-IBRS' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Haswell-IBRS' typename=3D'Haswell-IBRS-x86_64-=
cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1203,7 +1203,7 @@
     <blocker name=3D'rtm'/>
     <blocker name=3D'spec-ctrl'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Haswell' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Haswell' typename=3D'Haswell-x86_64-cpu' usabl=
e=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1216,7 +1216,7 @@
     <blocker name=3D'invpcid'/>
     <blocker name=3D'rtm'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'EPYC-IBPB' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'EPYC-IBPB' typename=3D'EPYC-IBPB-x86_64-cpu' u=
sable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'avx'/>
     <blocker name=3D'f16c'/>
@@ -1233,7 +1233,7 @@
     <blocker name=3D'nrip-save'/>
     <blocker name=3D'xsavec'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'EPYC' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'EPYC' typename=3D'EPYC-x86_64-cpu' usable=3D'n=
o'>
     <blocker name=3D'fma'/>
     <blocker name=3D'avx'/>
     <blocker name=3D'f16c'/>
@@ -1249,8 +1249,8 @@
     <blocker name=3D'nrip-save'/>
     <blocker name=3D'xsavec'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Conroe' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'Cascadelake-Server' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Conroe' typename=3D'Conroe-x86_64-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'Cascadelake-Server' typename=3D'Cascadelake-Se=
rver-x86_64-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1274,7 +1274,7 @@
     <blocker name=3D'3dnowprefetch'/>
     <blocker name=3D'xsavec'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Broadwell-noTSX-IBRS' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Broadwell-noTSX-IBRS' typename=3D'Broadwell-no=
TSX-IBRS-x86_64-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1288,7 +1288,7 @@
     <blocker name=3D'spec-ctrl'/>
     <blocker name=3D'3dnowprefetch'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Broadwell-noTSX' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Broadwell-noTSX' typename=3D'Broadwell-noTSX-x=
86_64-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1301,7 +1301,7 @@
     <blocker name=3D'rdseed'/>
     <blocker name=3D'3dnowprefetch'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Broadwell-IBRS' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Broadwell-IBRS' typename=3D'Broadwell-IBRS-x86=
_64-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1317,7 +1317,7 @@
     <blocker name=3D'spec-ctrl'/>
     <blocker name=3D'3dnowprefetch'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Broadwell' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Broadwell' typename=3D'Broadwell-x86_64-cpu' u=
sable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1332,7 +1332,7 @@
     <blocker name=3D'rdseed'/>
     <blocker name=3D'3dnowprefetch'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'486' usable=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'486' typename=3D'486-x86_64-cpu' usable=3D'yes=
'/>
   <machine name=3D'pc-i440fx-4.0' alias=3D'pc' hotplugCpus=3D'yes' maxCpus=
=3D'255' default=3D'yes'/>
   <machine name=3D'isapc' hotplugCpus=3D'yes' maxCpus=3D'1'/>
   <machine name=3D'pc-1.1' hotplugCpus=3D'yes' maxCpus=3D'255'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml b/tests/qemuc=
apabilitiesdata/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=3D'avx512pf' type=3D'boolean' value=3D'false'/>
     <property name=3D'xstore-en' type=3D'boolean' value=3D'false'/>
   </hostCPU>
-  <cpu type=3D'kvm' name=3D'max' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'host' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'qemu64-v1' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'qemu64' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'qemu32-v1' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'qemu32' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'phenom-v1' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'max' typename=3D'max-x86_64-cpu' usable=3D'yes=
'/>
+  <cpu type=3D'kvm' name=3D'host' typename=3D'host-x86_64-cpu' usable=3D'y=
es'/>
+  <cpu type=3D'kvm' name=3D'base' typename=3D'base-x86_64-cpu' usable=3D'y=
es'/>
+  <cpu type=3D'kvm' name=3D'qemu64-v1' typename=3D'qemu64-v1-x86_64-cpu' u=
sable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'qemu64' typename=3D'qemu64-x86_64-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'qemu32-v1' typename=3D'qemu32-v1-x86_64-cpu' u=
sable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'qemu32' typename=3D'qemu32-x86_64-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'phenom-v1' typename=3D'phenom-v1-x86_64-cpu' u=
sable=3D'no'>
     <blocker name=3D'mmxext'/>
     <blocker name=3D'fxsr-opt'/>
     <blocker name=3D'3dnowext'/>
@@ -629,7 +629,7 @@
     <blocker name=3D'sse4a'/>
     <blocker name=3D'npt'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'phenom' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'phenom' typename=3D'phenom-x86_64-cpu' usable=
=3D'no'>
     <blocker name=3D'mmxext'/>
     <blocker name=3D'fxsr-opt'/>
     <blocker name=3D'3dnowext'/>
@@ -637,37 +637,37 @@
     <blocker name=3D'sse4a'/>
     <blocker name=3D'npt'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'pentium3-v1' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'pentium3' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'pentium2-v1' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'pentium2' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'pentium-v1' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'pentium' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'n270-v1' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'n270' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'kvm64-v1' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'kvm64' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'kvm32-v1' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'kvm32' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'coreduo-v1' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'coreduo' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'core2duo-v1' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'core2duo' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'athlon-v1' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'pentium3-v1' typename=3D'pentium3-v1-x86_64-cp=
u' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'pentium3' typename=3D'pentium3-x86_64-cpu' usa=
ble=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'pentium2-v1' typename=3D'pentium2-v1-x86_64-cp=
u' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'pentium2' typename=3D'pentium2-x86_64-cpu' usa=
ble=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'pentium-v1' typename=3D'pentium-v1-x86_64-cpu'=
 usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'pentium' typename=3D'pentium-x86_64-cpu' usabl=
e=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'n270-v1' typename=3D'n270-v1-x86_64-cpu' usabl=
e=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'n270' typename=3D'n270-x86_64-cpu' usable=3D'y=
es'/>
+  <cpu type=3D'kvm' name=3D'kvm64-v1' typename=3D'kvm64-v1-x86_64-cpu' usa=
ble=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'kvm64' typename=3D'kvm64-x86_64-cpu' usable=3D=
'yes'/>
+  <cpu type=3D'kvm' name=3D'kvm32-v1' typename=3D'kvm32-v1-x86_64-cpu' usa=
ble=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'kvm32' typename=3D'kvm32-x86_64-cpu' usable=3D=
'yes'/>
+  <cpu type=3D'kvm' name=3D'coreduo-v1' typename=3D'coreduo-v1-x86_64-cpu'=
 usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'coreduo' typename=3D'coreduo-x86_64-cpu' usabl=
e=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'core2duo-v1' typename=3D'core2duo-v1-x86_64-cp=
u' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'core2duo' typename=3D'core2duo-x86_64-cpu' usa=
ble=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'athlon-v1' typename=3D'athlon-v1-x86_64-cpu' u=
sable=3D'no'>
     <blocker name=3D'mmxext'/>
     <blocker name=3D'3dnowext'/>
     <blocker name=3D'3dnow'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'athlon' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'athlon' typename=3D'athlon-x86_64-cpu' usable=
=3D'no'>
     <blocker name=3D'mmxext'/>
     <blocker name=3D'3dnowext'/>
     <blocker name=3D'3dnow'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Westmere-v2' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Westmere-v1' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Westmere-IBRS' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Westmere' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Snowridge-v1' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Westmere-v2' typename=3D'Westmere-v2-x86_64-cp=
u' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Westmere-v1' typename=3D'Westmere-v1-x86_64-cp=
u' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Westmere-IBRS' typename=3D'Westmere-IBRS-x86_6=
4-cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Westmere' typename=3D'Westmere-x86_64-cpu' usa=
ble=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Snowridge-v1' typename=3D'Snowridge-v1-x86_64-=
cpu' usable=3D'no'>
     <blocker name=3D'clwb'/>
     <blocker name=3D'sha-ni'/>
     <blocker name=3D'gfni'/>
@@ -677,7 +677,7 @@
     <blocker name=3D'core-capability'/>
     <blocker name=3D'split-lock-detect'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Snowridge' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Snowridge' typename=3D'Snowridge-x86_64-cpu' u=
sable=3D'no'>
     <blocker name=3D'clwb'/>
     <blocker name=3D'sha-ni'/>
     <blocker name=3D'gfni'/>
@@ -687,7 +687,7 @@
     <blocker name=3D'core-capability'/>
     <blocker name=3D'split-lock-detect'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Skylake-Server-v2' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Skylake-Server-v2' typename=3D'Skylake-Server-=
v2-x86_64-cpu' usable=3D'no'>
     <blocker name=3D'avx512f'/>
     <blocker name=3D'avx512dq'/>
     <blocker name=3D'clwb'/>
@@ -700,7 +700,7 @@
     <blocker name=3D'avx512f'/>
     <blocker name=3D'pku'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Skylake-Server-v1' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Skylake-Server-v1' typename=3D'Skylake-Server-=
v1-x86_64-cpu' usable=3D'no'>
     <blocker name=3D'avx512f'/>
     <blocker name=3D'avx512dq'/>
     <blocker name=3D'clwb'/>
@@ -713,7 +713,7 @@
     <blocker name=3D'avx512f'/>
     <blocker name=3D'pku'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Skylake-Server-IBRS' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Skylake-Server-IBRS' typename=3D'Skylake-Serve=
r-IBRS-x86_64-cpu' usable=3D'no'>
     <blocker name=3D'avx512f'/>
     <blocker name=3D'avx512dq'/>
     <blocker name=3D'clwb'/>
@@ -726,7 +726,7 @@
     <blocker name=3D'avx512f'/>
     <blocker name=3D'pku'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Skylake-Server' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Skylake-Server' typename=3D'Skylake-Server-x86=
_64-cpu' usable=3D'no'>
     <blocker name=3D'avx512f'/>
     <blocker name=3D'avx512dq'/>
     <blocker name=3D'clwb'/>
@@ -739,17 +739,17 @@
     <blocker name=3D'avx512f'/>
     <blocker name=3D'pku'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Skylake-Client-v2' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Skylake-Client-v1' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Skylake-Client-IBRS' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Skylake-Client' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'SandyBridge-v2' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'SandyBridge-v1' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'SandyBridge-IBRS' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'SandyBridge' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Penryn-v1' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Penryn' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Opteron_G5-v1' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Skylake-Client-v2' typename=3D'Skylake-Client-=
v2-x86_64-cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Skylake-Client-v1' typename=3D'Skylake-Client-=
v1-x86_64-cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Skylake-Client-IBRS' typename=3D'Skylake-Clien=
t-IBRS-x86_64-cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Skylake-Client' typename=3D'Skylake-Client-x86=
_64-cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'SandyBridge-v2' typename=3D'SandyBridge-v2-x86=
_64-cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'SandyBridge-v1' typename=3D'SandyBridge-v1-x86=
_64-cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'SandyBridge-IBRS' typename=3D'SandyBridge-IBRS=
-x86_64-cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'SandyBridge' typename=3D'SandyBridge-x86_64-cp=
u' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Penryn-v1' typename=3D'Penryn-v1-x86_64-cpu' u=
sable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Penryn' typename=3D'Penryn-x86_64-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Opteron_G5-v1' typename=3D'Opteron_G5-v1-x86_6=
4-cpu' usable=3D'no'>
     <blocker name=3D'sse4a'/>
     <blocker name=3D'misalignsse'/>
     <blocker name=3D'xop'/>
@@ -758,7 +758,7 @@
     <blocker name=3D'npt'/>
     <blocker name=3D'nrip-save'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Opteron_G5' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Opteron_G5' typename=3D'Opteron_G5-x86_64-cpu'=
 usable=3D'no'>
     <blocker name=3D'sse4a'/>
     <blocker name=3D'misalignsse'/>
     <blocker name=3D'xop'/>
@@ -767,7 +767,7 @@
     <blocker name=3D'npt'/>
     <blocker name=3D'nrip-save'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Opteron_G4-v1' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Opteron_G4-v1' typename=3D'Opteron_G4-v1-x86_6=
4-cpu' usable=3D'no'>
     <blocker name=3D'sse4a'/>
     <blocker name=3D'misalignsse'/>
     <blocker name=3D'xop'/>
@@ -775,7 +775,7 @@
     <blocker name=3D'npt'/>
     <blocker name=3D'nrip-save'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Opteron_G4' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Opteron_G4' typename=3D'Opteron_G4-x86_64-cpu'=
 usable=3D'no'>
     <blocker name=3D'sse4a'/>
     <blocker name=3D'misalignsse'/>
     <blocker name=3D'xop'/>
@@ -783,23 +783,23 @@
     <blocker name=3D'npt'/>
     <blocker name=3D'nrip-save'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Opteron_G3-v1' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Opteron_G3-v1' typename=3D'Opteron_G3-v1-x86_6=
4-cpu' usable=3D'no'>
     <blocker name=3D'sse4a'/>
     <blocker name=3D'misalignsse'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Opteron_G3' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Opteron_G3' typename=3D'Opteron_G3-x86_64-cpu'=
 usable=3D'no'>
     <blocker name=3D'sse4a'/>
     <blocker name=3D'misalignsse'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Opteron_G2-v1' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Opteron_G2' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Opteron_G1-v1' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Opteron_G1' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Nehalem-v2' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Nehalem-v1' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Nehalem-IBRS' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Nehalem' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'KnightsMill-v1' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Opteron_G2-v1' typename=3D'Opteron_G2-v1-x86_6=
4-cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Opteron_G2' typename=3D'Opteron_G2-x86_64-cpu'=
 usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Opteron_G1-v1' typename=3D'Opteron_G1-v1-x86_6=
4-cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Opteron_G1' typename=3D'Opteron_G1-x86_64-cpu'=
 usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Nehalem-v2' typename=3D'Nehalem-v2-x86_64-cpu'=
 usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Nehalem-v1' typename=3D'Nehalem-v1-x86_64-cpu'=
 usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Nehalem-IBRS' typename=3D'Nehalem-IBRS-x86_64-=
cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Nehalem' typename=3D'Nehalem-x86_64-cpu' usabl=
e=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'KnightsMill-v1' typename=3D'KnightsMill-v1-x86=
_64-cpu' usable=3D'no'>
     <blocker name=3D'avx512f'/>
     <blocker name=3D'avx512pf'/>
     <blocker name=3D'avx512er'/>
@@ -811,7 +811,7 @@
     <blocker name=3D'avx512f'/>
     <blocker name=3D'avx512f'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'KnightsMill' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'KnightsMill' typename=3D'KnightsMill-x86_64-cp=
u' usable=3D'no'>
     <blocker name=3D'avx512f'/>
     <blocker name=3D'avx512pf'/>
     <blocker name=3D'avx512er'/>
@@ -823,11 +823,11 @@
     <blocker name=3D'avx512f'/>
     <blocker name=3D'avx512f'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'IvyBridge-v2' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'IvyBridge-v1' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'IvyBridge-IBRS' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'IvyBridge' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Icelake-Server-v1' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'IvyBridge-v2' typename=3D'IvyBridge-v2-x86_64-=
cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'IvyBridge-v1' typename=3D'IvyBridge-v1-x86_64-=
cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'IvyBridge-IBRS' typename=3D'IvyBridge-IBRS-x86=
_64-cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'IvyBridge' typename=3D'IvyBridge-x86_64-cpu' u=
sable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Icelake-Server-v1' typename=3D'Icelake-Server-=
v1-x86_64-cpu' usable=3D'no'>
     <blocker name=3D'avx512f'/>
     <blocker name=3D'avx512dq'/>
     <blocker name=3D'clwb'/>
@@ -850,7 +850,7 @@
     <blocker name=3D'avx512f'/>
     <blocker name=3D'pku'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Icelake-Server' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Icelake-Server' typename=3D'Icelake-Server-x86=
_64-cpu' usable=3D'no'>
     <blocker name=3D'avx512f'/>
     <blocker name=3D'avx512dq'/>
     <blocker name=3D'clwb'/>
@@ -873,7 +873,7 @@
     <blocker name=3D'avx512f'/>
     <blocker name=3D'pku'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Icelake-Client-v1' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Icelake-Client-v1' typename=3D'Icelake-Client-=
v1-x86_64-cpu' usable=3D'no'>
     <blocker name=3D'avx512vbmi'/>
     <blocker name=3D'pku'/>
     <blocker name=3D'avx512vbmi2'/>
@@ -886,7 +886,7 @@
     <blocker name=3D'wbnoinvd'/>
     <blocker name=3D'pku'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Icelake-Client' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Icelake-Client' typename=3D'Icelake-Client-x86=
_64-cpu' usable=3D'no'>
     <blocker name=3D'avx512vbmi'/>
     <blocker name=3D'pku'/>
     <blocker name=3D'avx512vbmi2'/>
@@ -899,15 +899,15 @@
     <blocker name=3D'wbnoinvd'/>
     <blocker name=3D'pku'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Haswell-v4' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Haswell-v3' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Haswell-v2' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Haswell-v1' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Haswell-noTSX-IBRS' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Haswell-noTSX' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Haswell-IBRS' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Haswell' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'EPYC-v2' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Haswell-v4' typename=3D'Haswell-v4-x86_64-cpu'=
 usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Haswell-v3' typename=3D'Haswell-v3-x86_64-cpu'=
 usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Haswell-v2' typename=3D'Haswell-v2-x86_64-cpu'=
 usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Haswell-v1' typename=3D'Haswell-v1-x86_64-cpu'=
 usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Haswell-noTSX-IBRS' typename=3D'Haswell-noTSX-=
IBRS-x86_64-cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Haswell-noTSX' typename=3D'Haswell-noTSX-x86_6=
4-cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Haswell-IBRS' typename=3D'Haswell-IBRS-x86_64-=
cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Haswell' typename=3D'Haswell-x86_64-cpu' usabl=
e=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'EPYC-v2' typename=3D'EPYC-v2-x86_64-cpu' usabl=
e=3D'no'>
     <blocker name=3D'sha-ni'/>
     <blocker name=3D'mmxext'/>
     <blocker name=3D'fxsr-opt'/>
@@ -919,7 +919,7 @@
     <blocker name=3D'npt'/>
     <blocker name=3D'nrip-save'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'EPYC-v1' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'EPYC-v1' typename=3D'EPYC-v1-x86_64-cpu' usabl=
e=3D'no'>
     <blocker name=3D'sha-ni'/>
     <blocker name=3D'mmxext'/>
     <blocker name=3D'fxsr-opt'/>
@@ -930,7 +930,7 @@
     <blocker name=3D'npt'/>
     <blocker name=3D'nrip-save'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'EPYC-IBPB' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'EPYC-IBPB' typename=3D'EPYC-IBPB-x86_64-cpu' u=
sable=3D'no'>
     <blocker name=3D'sha-ni'/>
     <blocker name=3D'mmxext'/>
     <blocker name=3D'fxsr-opt'/>
@@ -942,7 +942,7 @@
     <blocker name=3D'npt'/>
     <blocker name=3D'nrip-save'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'EPYC' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'EPYC' typename=3D'EPYC-x86_64-cpu' usable=3D'n=
o'>
     <blocker name=3D'sha-ni'/>
     <blocker name=3D'mmxext'/>
     <blocker name=3D'fxsr-opt'/>
@@ -954,7 +954,7 @@
     <blocker name=3D'npt'/>
     <blocker name=3D'nrip-save'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Dhyana-v1' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Dhyana-v1' typename=3D'Dhyana-v1-x86_64-cpu' u=
sable=3D'no'>
     <blocker name=3D'mmxext'/>
     <blocker name=3D'fxsr-opt'/>
     <blocker name=3D'cr8legacy'/>
@@ -965,7 +965,7 @@
     <blocker name=3D'npt'/>
     <blocker name=3D'nrip-save'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Dhyana' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Dhyana' typename=3D'Dhyana-x86_64-cpu' usable=
=3D'no'>
     <blocker name=3D'mmxext'/>
     <blocker name=3D'fxsr-opt'/>
     <blocker name=3D'cr8legacy'/>
@@ -976,9 +976,9 @@
     <blocker name=3D'npt'/>
     <blocker name=3D'nrip-save'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Conroe-v1' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Conroe' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Cascadelake-Server-v2' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Conroe-v1' typename=3D'Conroe-v1-x86_64-cpu' u=
sable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Conroe' typename=3D'Conroe-x86_64-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Cascadelake-Server-v2' typename=3D'Cascadelake=
-Server-v2-x86_64-cpu' usable=3D'no'>
     <blocker name=3D'avx512f'/>
     <blocker name=3D'avx512dq'/>
     <blocker name=3D'clwb'/>
@@ -995,7 +995,7 @@
     <blocker name=3D'ibrs-all'/>
     <blocker name=3D'mds-no'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Cascadelake-Server-v1' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Cascadelake-Server-v1' typename=3D'Cascadelake=
-Server-v1-x86_64-cpu' usable=3D'no'>
     <blocker name=3D'avx512f'/>
     <blocker name=3D'avx512dq'/>
     <blocker name=3D'clwb'/>
@@ -1009,7 +1009,7 @@
     <blocker name=3D'avx512f'/>
     <blocker name=3D'pku'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Cascadelake-Server' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Cascadelake-Server' typename=3D'Cascadelake-Se=
rver-x86_64-cpu' usable=3D'no'>
     <blocker name=3D'avx512f'/>
     <blocker name=3D'avx512dq'/>
     <blocker name=3D'clwb'/>
@@ -1026,60 +1026,60 @@
     <blocker name=3D'ibrs-all'/>
     <blocker name=3D'mds-no'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Broadwell-v4' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Broadwell-v3' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Broadwell-v2' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Broadwell-v1' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Broadwell-noTSX-IBRS' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Broadwell-noTSX' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Broadwell-IBRS' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Broadwell' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'486-v1' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'486' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'max' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'host' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Broadwell-v4' typename=3D'Broadwell-v4-x86_64-=
cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Broadwell-v3' typename=3D'Broadwell-v3-x86_64-=
cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Broadwell-v2' typename=3D'Broadwell-v2-x86_64-=
cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Broadwell-v1' typename=3D'Broadwell-v1-x86_64-=
cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Broadwell-noTSX-IBRS' typename=3D'Broadwell-no=
TSX-IBRS-x86_64-cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Broadwell-noTSX' typename=3D'Broadwell-noTSX-x=
86_64-cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Broadwell-IBRS' typename=3D'Broadwell-IBRS-x86=
_64-cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Broadwell' typename=3D'Broadwell-x86_64-cpu' u=
sable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'486-v1' typename=3D'486-v1-x86_64-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'486' typename=3D'486-x86_64-cpu' usable=3D'yes=
'/>
+  <cpu type=3D'tcg' name=3D'max' typename=3D'max-x86_64-cpu' usable=3D'yes=
'/>
+  <cpu type=3D'tcg' name=3D'host' typename=3D'host-x86_64-cpu' usable=3D'n=
o'>
     <blocker name=3D'kvm'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'base' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'qemu64-v1' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'qemu64' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'qemu32-v1' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'qemu32' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'phenom-v1' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'base' typename=3D'base-x86_64-cpu' usable=3D'y=
es'/>
+  <cpu type=3D'tcg' name=3D'qemu64-v1' typename=3D'qemu64-v1-x86_64-cpu' u=
sable=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'qemu64' typename=3D'qemu64-x86_64-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'qemu32-v1' typename=3D'qemu32-v1-x86_64-cpu' u=
sable=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'qemu32' typename=3D'qemu32-x86_64-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'phenom-v1' typename=3D'phenom-v1-x86_64-cpu' u=
sable=3D'no'>
     <blocker name=3D'fxsr-opt'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'phenom' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'phenom' typename=3D'phenom-x86_64-cpu' usable=
=3D'no'>
     <blocker name=3D'fxsr-opt'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'pentium3-v1' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'pentium3' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'pentium2-v1' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'pentium2' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'pentium-v1' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'pentium' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'n270-v1' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'n270' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'kvm64-v1' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'kvm64' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'kvm32-v1' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'kvm32' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'coreduo-v1' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'coreduo' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'core2duo-v1' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'core2duo' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'athlon-v1' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'athlon' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'Westmere-v2' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'pentium3-v1' typename=3D'pentium3-v1-x86_64-cp=
u' usable=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'pentium3' typename=3D'pentium3-x86_64-cpu' usa=
ble=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'pentium2-v1' typename=3D'pentium2-v1-x86_64-cp=
u' usable=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'pentium2' typename=3D'pentium2-x86_64-cpu' usa=
ble=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'pentium-v1' typename=3D'pentium-v1-x86_64-cpu'=
 usable=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'pentium' typename=3D'pentium-x86_64-cpu' usabl=
e=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'n270-v1' typename=3D'n270-v1-x86_64-cpu' usabl=
e=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'n270' typename=3D'n270-x86_64-cpu' usable=3D'y=
es'/>
+  <cpu type=3D'tcg' name=3D'kvm64-v1' typename=3D'kvm64-v1-x86_64-cpu' usa=
ble=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'kvm64' typename=3D'kvm64-x86_64-cpu' usable=3D=
'yes'/>
+  <cpu type=3D'tcg' name=3D'kvm32-v1' typename=3D'kvm32-v1-x86_64-cpu' usa=
ble=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'kvm32' typename=3D'kvm32-x86_64-cpu' usable=3D=
'yes'/>
+  <cpu type=3D'tcg' name=3D'coreduo-v1' typename=3D'coreduo-v1-x86_64-cpu'=
 usable=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'coreduo' typename=3D'coreduo-x86_64-cpu' usabl=
e=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'core2duo-v1' typename=3D'core2duo-v1-x86_64-cp=
u' usable=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'core2duo' typename=3D'core2duo-x86_64-cpu' usa=
ble=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'athlon-v1' typename=3D'athlon-v1-x86_64-cpu' u=
sable=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'athlon' typename=3D'athlon-x86_64-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'Westmere-v2' typename=3D'Westmere-v2-x86_64-cp=
u' usable=3D'no'>
     <blocker name=3D'spec-ctrl'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Westmere-v1' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'Westmere-IBRS' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Westmere-v1' typename=3D'Westmere-v1-x86_64-cp=
u' usable=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'Westmere-IBRS' typename=3D'Westmere-IBRS-x86_6=
4-cpu' usable=3D'no'>
     <blocker name=3D'spec-ctrl'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Westmere' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Westmere' typename=3D'Westmere-x86_64-cpu' usa=
ble=3D'no'>
     <blocker name=3D'spec-ctrl'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Snowridge-v1' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Snowridge-v1' typename=3D'Snowridge-v1-x86_64-=
cpu' usable=3D'no'>
     <blocker name=3D'x2apic'/>
     <blocker name=3D'tsc-deadline'/>
     <blocker name=3D'rdseed'/>
@@ -1097,7 +1097,7 @@
     <blocker name=3D'xsavec'/>
     <blocker name=3D'split-lock-detect'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Snowridge' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Snowridge' typename=3D'Snowridge-x86_64-cpu' u=
sable=3D'no'>
     <blocker name=3D'x2apic'/>
     <blocker name=3D'tsc-deadline'/>
     <blocker name=3D'rdseed'/>
@@ -1115,7 +1115,7 @@
     <blocker name=3D'xsavec'/>
     <blocker name=3D'split-lock-detect'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Skylake-Server-v2' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Skylake-Server-v2' typename=3D'Skylake-Server-=
v2-x86_64-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1136,7 +1136,7 @@
     <blocker name=3D'3dnowprefetch'/>
     <blocker name=3D'xsavec'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Skylake-Server-v1' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Skylake-Server-v1' typename=3D'Skylake-Server-=
v1-x86_64-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1156,7 +1156,7 @@
     <blocker name=3D'3dnowprefetch'/>
     <blocker name=3D'xsavec'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Skylake-Server-IBRS' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Skylake-Server-IBRS' typename=3D'Skylake-Serve=
r-IBRS-x86_64-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1177,7 +1177,7 @@
     <blocker name=3D'3dnowprefetch'/>
     <blocker name=3D'xsavec'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Skylake-Server' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Skylake-Server' typename=3D'Skylake-Server-x86=
_64-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1198,7 +1198,7 @@
     <blocker name=3D'3dnowprefetch'/>
     <blocker name=3D'xsavec'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Skylake-Client-v2' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Skylake-Client-v2' typename=3D'Skylake-Client-=
v2-x86_64-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1214,7 +1214,7 @@
     <blocker name=3D'3dnowprefetch'/>
     <blocker name=3D'xsavec'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Skylake-Client-v1' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Skylake-Client-v1' typename=3D'Skylake-Client-=
v1-x86_64-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1229,7 +1229,7 @@
     <blocker name=3D'3dnowprefetch'/>
     <blocker name=3D'xsavec'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Skylake-Client-IBRS' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Skylake-Client-IBRS' typename=3D'Skylake-Clien=
t-IBRS-x86_64-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1245,7 +1245,7 @@
     <blocker name=3D'3dnowprefetch'/>
     <blocker name=3D'xsavec'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Skylake-Client' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Skylake-Client' typename=3D'Skylake-Client-x86=
_64-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1261,32 +1261,32 @@
     <blocker name=3D'3dnowprefetch'/>
     <blocker name=3D'xsavec'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'SandyBridge-v2' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'SandyBridge-v2' typename=3D'SandyBridge-v2-x86=
_64-cpu' usable=3D'no'>
     <blocker name=3D'x2apic'/>
     <blocker name=3D'tsc-deadline'/>
     <blocker name=3D'avx'/>
     <blocker name=3D'spec-ctrl'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'SandyBridge-v1' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'SandyBridge-v1' typename=3D'SandyBridge-v1-x86=
_64-cpu' usable=3D'no'>
     <blocker name=3D'x2apic'/>
     <blocker name=3D'tsc-deadline'/>
     <blocker name=3D'avx'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'SandyBridge-IBRS' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'SandyBridge-IBRS' typename=3D'SandyBridge-IBRS=
-x86_64-cpu' usable=3D'no'>
     <blocker name=3D'x2apic'/>
     <blocker name=3D'tsc-deadline'/>
     <blocker name=3D'avx'/>
     <blocker name=3D'spec-ctrl'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'SandyBridge' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'SandyBridge' typename=3D'SandyBridge-x86_64-cp=
u' usable=3D'no'>
     <blocker name=3D'x2apic'/>
     <blocker name=3D'tsc-deadline'/>
     <blocker name=3D'avx'/>
     <blocker name=3D'spec-ctrl'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Penryn-v1' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'Penryn' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'Opteron_G5-v1' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Penryn-v1' typename=3D'Penryn-v1-x86_64-cpu' u=
sable=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'Penryn' typename=3D'Penryn-x86_64-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'Opteron_G5-v1' typename=3D'Opteron_G5-v1-x86_6=
4-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'avx'/>
     <blocker name=3D'f16c'/>
@@ -1297,7 +1297,7 @@
     <blocker name=3D'tbm'/>
     <blocker name=3D'nrip-save'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Opteron_G5' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Opteron_G5' typename=3D'Opteron_G5-x86_64-cpu'=
 usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'avx'/>
     <blocker name=3D'f16c'/>
@@ -1308,7 +1308,7 @@
     <blocker name=3D'tbm'/>
     <blocker name=3D'nrip-save'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Opteron_G4-v1' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Opteron_G4-v1' typename=3D'Opteron_G4-v1-x86_6=
4-cpu' usable=3D'no'>
     <blocker name=3D'avx'/>
     <blocker name=3D'misalignsse'/>
     <blocker name=3D'3dnowprefetch'/>
@@ -1316,7 +1316,7 @@
     <blocker name=3D'fma4'/>
     <blocker name=3D'nrip-save'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Opteron_G4' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Opteron_G4' typename=3D'Opteron_G4-x86_64-cpu'=
 usable=3D'no'>
     <blocker name=3D'avx'/>
     <blocker name=3D'misalignsse'/>
     <blocker name=3D'3dnowprefetch'/>
@@ -1324,27 +1324,27 @@
     <blocker name=3D'fma4'/>
     <blocker name=3D'nrip-save'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Opteron_G3-v1' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Opteron_G3-v1' typename=3D'Opteron_G3-v1-x86_6=
4-cpu' usable=3D'no'>
     <blocker name=3D'misalignsse'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Opteron_G3' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Opteron_G3' typename=3D'Opteron_G3-x86_64-cpu'=
 usable=3D'no'>
     <blocker name=3D'misalignsse'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Opteron_G2-v1' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'Opteron_G2' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'Opteron_G1-v1' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'Opteron_G1' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'Nehalem-v2' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Opteron_G2-v1' typename=3D'Opteron_G2-v1-x86_6=
4-cpu' usable=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'Opteron_G2' typename=3D'Opteron_G2-x86_64-cpu'=
 usable=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'Opteron_G1-v1' typename=3D'Opteron_G1-v1-x86_6=
4-cpu' usable=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'Opteron_G1' typename=3D'Opteron_G1-x86_64-cpu'=
 usable=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'Nehalem-v2' typename=3D'Nehalem-v2-x86_64-cpu'=
 usable=3D'no'>
     <blocker name=3D'spec-ctrl'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Nehalem-v1' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'Nehalem-IBRS' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Nehalem-v1' typename=3D'Nehalem-v1-x86_64-cpu'=
 usable=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'Nehalem-IBRS' typename=3D'Nehalem-IBRS-x86_64-=
cpu' usable=3D'no'>
     <blocker name=3D'spec-ctrl'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Nehalem' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Nehalem' typename=3D'Nehalem-x86_64-cpu' usabl=
e=3D'no'>
     <blocker name=3D'spec-ctrl'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'KnightsMill-v1' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'KnightsMill-v1' typename=3D'KnightsMill-v1-x86=
_64-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'x2apic'/>
     <blocker name=3D'tsc-deadline'/>
@@ -1361,7 +1361,7 @@
     <blocker name=3D'avx512-4fmaps'/>
     <blocker name=3D'3dnowprefetch'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'KnightsMill' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'KnightsMill' typename=3D'KnightsMill-x86_64-cp=
u' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'x2apic'/>
     <blocker name=3D'tsc-deadline'/>
@@ -1378,34 +1378,34 @@
     <blocker name=3D'avx512-4fmaps'/>
     <blocker name=3D'3dnowprefetch'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'IvyBridge-v2' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'IvyBridge-v2' typename=3D'IvyBridge-v2-x86_64-=
cpu' usable=3D'no'>
     <blocker name=3D'x2apic'/>
     <blocker name=3D'tsc-deadline'/>
     <blocker name=3D'avx'/>
     <blocker name=3D'f16c'/>
     <blocker name=3D'spec-ctrl'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'IvyBridge-v1' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'IvyBridge-v1' typename=3D'IvyBridge-v1-x86_64-=
cpu' usable=3D'no'>
     <blocker name=3D'x2apic'/>
     <blocker name=3D'tsc-deadline'/>
     <blocker name=3D'avx'/>
     <blocker name=3D'f16c'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'IvyBridge-IBRS' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'IvyBridge-IBRS' typename=3D'IvyBridge-IBRS-x86=
_64-cpu' usable=3D'no'>
     <blocker name=3D'x2apic'/>
     <blocker name=3D'tsc-deadline'/>
     <blocker name=3D'avx'/>
     <blocker name=3D'f16c'/>
     <blocker name=3D'spec-ctrl'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'IvyBridge' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'IvyBridge' typename=3D'IvyBridge-x86_64-cpu' u=
sable=3D'no'>
     <blocker name=3D'x2apic'/>
     <blocker name=3D'tsc-deadline'/>
     <blocker name=3D'avx'/>
     <blocker name=3D'f16c'/>
     <blocker name=3D'spec-ctrl'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Icelake-Server-v1' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Icelake-Server-v1' typename=3D'Icelake-Server-=
v1-x86_64-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1437,7 +1437,7 @@
     <blocker name=3D'wbnoinvd'/>
     <blocker name=3D'xsavec'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Icelake-Server' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Icelake-Server' typename=3D'Icelake-Server-x86=
_64-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1469,7 +1469,7 @@
     <blocker name=3D'wbnoinvd'/>
     <blocker name=3D'xsavec'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Icelake-Client-v1' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Icelake-Client-v1' typename=3D'Icelake-Client-=
v1-x86_64-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1496,7 +1496,7 @@
     <blocker name=3D'wbnoinvd'/>
     <blocker name=3D'xsavec'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Icelake-Client' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Icelake-Client' typename=3D'Icelake-Client-x86=
_64-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1523,7 +1523,7 @@
     <blocker name=3D'wbnoinvd'/>
     <blocker name=3D'xsavec'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Haswell-v4' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Haswell-v4' typename=3D'Haswell-v4-x86_64-cpu'=
 usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1534,7 +1534,7 @@
     <blocker name=3D'invpcid'/>
     <blocker name=3D'spec-ctrl'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Haswell-v3' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Haswell-v3' typename=3D'Haswell-v3-x86_64-cpu'=
 usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1547,7 +1547,7 @@
     <blocker name=3D'rtm'/>
     <blocker name=3D'spec-ctrl'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Haswell-v2' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Haswell-v2' typename=3D'Haswell-v2-x86_64-cpu'=
 usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1557,7 +1557,7 @@
     <blocker name=3D'avx2'/>
     <blocker name=3D'invpcid'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Haswell-v1' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Haswell-v1' typename=3D'Haswell-v1-x86_64-cpu'=
 usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1569,7 +1569,7 @@
     <blocker name=3D'invpcid'/>
     <blocker name=3D'rtm'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Haswell-noTSX-IBRS' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Haswell-noTSX-IBRS' typename=3D'Haswell-noTSX-=
IBRS-x86_64-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1580,7 +1580,7 @@
     <blocker name=3D'invpcid'/>
     <blocker name=3D'spec-ctrl'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Haswell-noTSX' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Haswell-noTSX' typename=3D'Haswell-noTSX-x86_6=
4-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1590,7 +1590,7 @@
     <blocker name=3D'avx2'/>
     <blocker name=3D'invpcid'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Haswell-IBRS' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Haswell-IBRS' typename=3D'Haswell-IBRS-x86_64-=
cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1603,7 +1603,7 @@
     <blocker name=3D'rtm'/>
     <blocker name=3D'spec-ctrl'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Haswell' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Haswell' typename=3D'Haswell-x86_64-cpu' usabl=
e=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1614,7 +1614,7 @@
     <blocker name=3D'invpcid'/>
     <blocker name=3D'spec-ctrl'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'EPYC-v2' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'EPYC-v2' typename=3D'EPYC-v2-x86_64-cpu' usabl=
e=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'avx'/>
     <blocker name=3D'f16c'/>
@@ -1630,7 +1630,7 @@
     <blocker name=3D'nrip-save'/>
     <blocker name=3D'xsavec'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'EPYC-v1' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'EPYC-v1' typename=3D'EPYC-v1-x86_64-cpu' usabl=
e=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'avx'/>
     <blocker name=3D'f16c'/>
@@ -1645,7 +1645,7 @@
     <blocker name=3D'nrip-save'/>
     <blocker name=3D'xsavec'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'EPYC-IBPB' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'EPYC-IBPB' typename=3D'EPYC-IBPB-x86_64-cpu' u=
sable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'avx'/>
     <blocker name=3D'f16c'/>
@@ -1661,7 +1661,7 @@
     <blocker name=3D'nrip-save'/>
     <blocker name=3D'xsavec'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'EPYC' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'EPYC' typename=3D'EPYC-x86_64-cpu' usable=3D'n=
o'>
     <blocker name=3D'fma'/>
     <blocker name=3D'avx'/>
     <blocker name=3D'f16c'/>
@@ -1677,7 +1677,7 @@
     <blocker name=3D'nrip-save'/>
     <blocker name=3D'xsavec'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Dhyana-v1' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Dhyana-v1' typename=3D'Dhyana-v1-x86_64-cpu' u=
sable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'avx'/>
     <blocker name=3D'f16c'/>
@@ -1692,7 +1692,7 @@
     <blocker name=3D'nrip-save'/>
     <blocker name=3D'xsavec'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Dhyana' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Dhyana' typename=3D'Dhyana-x86_64-cpu' usable=
=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'avx'/>
     <blocker name=3D'f16c'/>
@@ -1707,9 +1707,9 @@
     <blocker name=3D'nrip-save'/>
     <blocker name=3D'xsavec'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Conroe-v1' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'Conroe' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'Cascadelake-Server-v2' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Conroe-v1' typename=3D'Conroe-v1-x86_64-cpu' u=
sable=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'Conroe' typename=3D'Conroe-x86_64-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'Cascadelake-Server-v2' typename=3D'Cascadelake=
-Server-v2-x86_64-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1737,7 +1737,7 @@
     <blocker name=3D'skip-l1dfl-vmentry'/>
     <blocker name=3D'mds-no'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Cascadelake-Server-v1' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Cascadelake-Server-v1' typename=3D'Cascadelake=
-Server-v1-x86_64-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1760,7 +1760,7 @@
     <blocker name=3D'3dnowprefetch'/>
     <blocker name=3D'xsavec'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Cascadelake-Server' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Cascadelake-Server' typename=3D'Cascadelake-Se=
rver-x86_64-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1788,7 +1788,7 @@
     <blocker name=3D'skip-l1dfl-vmentry'/>
     <blocker name=3D'mds-no'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Broadwell-v4' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Broadwell-v4' typename=3D'Broadwell-v4-x86_64-=
cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1801,7 +1801,7 @@
     <blocker name=3D'spec-ctrl'/>
     <blocker name=3D'3dnowprefetch'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Broadwell-v3' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Broadwell-v3' typename=3D'Broadwell-v3-x86_64-=
cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1816,7 +1816,7 @@
     <blocker name=3D'spec-ctrl'/>
     <blocker name=3D'3dnowprefetch'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Broadwell-v2' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Broadwell-v2' typename=3D'Broadwell-v2-x86_64-=
cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1828,7 +1828,7 @@
     <blocker name=3D'rdseed'/>
     <blocker name=3D'3dnowprefetch'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Broadwell-v1' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Broadwell-v1' typename=3D'Broadwell-v1-x86_64-=
cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1842,7 +1842,7 @@
     <blocker name=3D'rdseed'/>
     <blocker name=3D'3dnowprefetch'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Broadwell-noTSX-IBRS' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Broadwell-noTSX-IBRS' typename=3D'Broadwell-no=
TSX-IBRS-x86_64-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1855,7 +1855,7 @@
     <blocker name=3D'spec-ctrl'/>
     <blocker name=3D'3dnowprefetch'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Broadwell-noTSX' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Broadwell-noTSX' typename=3D'Broadwell-noTSX-x=
86_64-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1867,7 +1867,7 @@
     <blocker name=3D'rdseed'/>
     <blocker name=3D'3dnowprefetch'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Broadwell-IBRS' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Broadwell-IBRS' typename=3D'Broadwell-IBRS-x86=
_64-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1882,7 +1882,7 @@
     <blocker name=3D'spec-ctrl'/>
     <blocker name=3D'3dnowprefetch'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Broadwell' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Broadwell' typename=3D'Broadwell-x86_64-cpu' u=
sable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1895,8 +1895,8 @@
     <blocker name=3D'spec-ctrl'/>
     <blocker name=3D'3dnowprefetch'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'486-v1' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'486' usable=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'486-v1' typename=3D'486-v1-x86_64-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'486' typename=3D'486-x86_64-cpu' usable=3D'yes=
'/>
   <machine name=3D'pc-i440fx-4.1' alias=3D'pc' hotplugCpus=3D'yes' maxCpus=
=3D'255' default=3D'yes'/>
   <machine name=3D'pc-0.15' hotplugCpus=3D'yes' maxCpus=3D'255'/>
   <machine name=3D'pc-i440fx-2.12' hotplugCpus=3D'yes' maxCpus=3D'255'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemuc=
apabilitiesdata/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=3D'avx512pf' type=3D'boolean' value=3D'false'/>
     <property name=3D'xstore-en' type=3D'boolean' value=3D'false'/>
   </hostCPU>
-  <cpu type=3D'kvm' name=3D'max' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'host' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'base' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'qemu64-v1' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'qemu64' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'qemu32-v1' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'qemu32' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'phenom-v1' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'max' typename=3D'max-x86_64-cpu' usable=3D'yes=
'/>
+  <cpu type=3D'kvm' name=3D'host' typename=3D'host-x86_64-cpu' usable=3D'y=
es'/>
+  <cpu type=3D'kvm' name=3D'base' typename=3D'base-x86_64-cpu' usable=3D'y=
es'/>
+  <cpu type=3D'kvm' name=3D'qemu64-v1' typename=3D'qemu64-v1-x86_64-cpu' u=
sable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'qemu64' typename=3D'qemu64-x86_64-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'qemu32-v1' typename=3D'qemu32-v1-x86_64-cpu' u=
sable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'qemu32' typename=3D'qemu32-x86_64-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'phenom-v1' typename=3D'phenom-v1-x86_64-cpu' u=
sable=3D'no'>
     <blocker name=3D'mmxext'/>
     <blocker name=3D'fxsr-opt'/>
     <blocker name=3D'3dnowext'/>
@@ -635,7 +635,7 @@
     <blocker name=3D'sse4a'/>
     <blocker name=3D'npt'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'phenom' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'phenom' typename=3D'phenom-x86_64-cpu' usable=
=3D'no'>
     <blocker name=3D'mmxext'/>
     <blocker name=3D'fxsr-opt'/>
     <blocker name=3D'3dnowext'/>
@@ -643,37 +643,37 @@
     <blocker name=3D'sse4a'/>
     <blocker name=3D'npt'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'pentium3-v1' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'pentium3' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'pentium2-v1' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'pentium2' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'pentium-v1' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'pentium' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'n270-v1' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'n270' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'kvm64-v1' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'kvm64' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'kvm32-v1' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'kvm32' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'coreduo-v1' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'coreduo' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'core2duo-v1' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'core2duo' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'athlon-v1' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'pentium3-v1' typename=3D'pentium3-v1-x86_64-cp=
u' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'pentium3' typename=3D'pentium3-x86_64-cpu' usa=
ble=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'pentium2-v1' typename=3D'pentium2-v1-x86_64-cp=
u' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'pentium2' typename=3D'pentium2-x86_64-cpu' usa=
ble=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'pentium-v1' typename=3D'pentium-v1-x86_64-cpu'=
 usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'pentium' typename=3D'pentium-x86_64-cpu' usabl=
e=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'n270-v1' typename=3D'n270-v1-x86_64-cpu' usabl=
e=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'n270' typename=3D'n270-x86_64-cpu' usable=3D'y=
es'/>
+  <cpu type=3D'kvm' name=3D'kvm64-v1' typename=3D'kvm64-v1-x86_64-cpu' usa=
ble=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'kvm64' typename=3D'kvm64-x86_64-cpu' usable=3D=
'yes'/>
+  <cpu type=3D'kvm' name=3D'kvm32-v1' typename=3D'kvm32-v1-x86_64-cpu' usa=
ble=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'kvm32' typename=3D'kvm32-x86_64-cpu' usable=3D=
'yes'/>
+  <cpu type=3D'kvm' name=3D'coreduo-v1' typename=3D'coreduo-v1-x86_64-cpu'=
 usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'coreduo' typename=3D'coreduo-x86_64-cpu' usabl=
e=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'core2duo-v1' typename=3D'core2duo-v1-x86_64-cp=
u' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'core2duo' typename=3D'core2duo-x86_64-cpu' usa=
ble=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'athlon-v1' typename=3D'athlon-v1-x86_64-cpu' u=
sable=3D'no'>
     <blocker name=3D'mmxext'/>
     <blocker name=3D'3dnowext'/>
     <blocker name=3D'3dnow'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'athlon' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'athlon' typename=3D'athlon-x86_64-cpu' usable=
=3D'no'>
     <blocker name=3D'mmxext'/>
     <blocker name=3D'3dnowext'/>
     <blocker name=3D'3dnow'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Westmere-v2' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Westmere-v1' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Westmere-IBRS' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Westmere' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Snowridge-v1' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Westmere-v2' typename=3D'Westmere-v2-x86_64-cp=
u' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Westmere-v1' typename=3D'Westmere-v1-x86_64-cp=
u' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Westmere-IBRS' typename=3D'Westmere-IBRS-x86_6=
4-cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Westmere' typename=3D'Westmere-x86_64-cpu' usa=
ble=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Snowridge-v1' typename=3D'Snowridge-v1-x86_64-=
cpu' usable=3D'no'>
     <blocker name=3D'clwb'/>
     <blocker name=3D'sha-ni'/>
     <blocker name=3D'gfni'/>
@@ -683,7 +683,7 @@
     <blocker name=3D'core-capability'/>
     <blocker name=3D'split-lock-detect'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Snowridge' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Snowridge' typename=3D'Snowridge-x86_64-cpu' u=
sable=3D'no'>
     <blocker name=3D'clwb'/>
     <blocker name=3D'sha-ni'/>
     <blocker name=3D'gfni'/>
@@ -693,7 +693,7 @@
     <blocker name=3D'core-capability'/>
     <blocker name=3D'split-lock-detect'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Skylake-Server-v2' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Skylake-Server-v2' typename=3D'Skylake-Server-=
v2-x86_64-cpu' usable=3D'no'>
     <blocker name=3D'avx512f'/>
     <blocker name=3D'avx512dq'/>
     <blocker name=3D'clwb'/>
@@ -706,7 +706,7 @@
     <blocker name=3D'avx512f'/>
     <blocker name=3D'pku'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Skylake-Server-v1' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Skylake-Server-v1' typename=3D'Skylake-Server-=
v1-x86_64-cpu' usable=3D'no'>
     <blocker name=3D'avx512f'/>
     <blocker name=3D'avx512dq'/>
     <blocker name=3D'clwb'/>
@@ -719,7 +719,7 @@
     <blocker name=3D'avx512f'/>
     <blocker name=3D'pku'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Skylake-Server-IBRS' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Skylake-Server-IBRS' typename=3D'Skylake-Serve=
r-IBRS-x86_64-cpu' usable=3D'no'>
     <blocker name=3D'avx512f'/>
     <blocker name=3D'avx512dq'/>
     <blocker name=3D'clwb'/>
@@ -732,7 +732,7 @@
     <blocker name=3D'avx512f'/>
     <blocker name=3D'pku'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Skylake-Server' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Skylake-Server' typename=3D'Skylake-Server-x86=
_64-cpu' usable=3D'no'>
     <blocker name=3D'avx512f'/>
     <blocker name=3D'avx512dq'/>
     <blocker name=3D'clwb'/>
@@ -745,17 +745,17 @@
     <blocker name=3D'avx512f'/>
     <blocker name=3D'pku'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Skylake-Client-v2' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Skylake-Client-v1' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Skylake-Client-IBRS' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Skylake-Client' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'SandyBridge-v2' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'SandyBridge-v1' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'SandyBridge-IBRS' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'SandyBridge' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Penryn-v1' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Penryn' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Opteron_G5-v1' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Skylake-Client-v2' typename=3D'Skylake-Client-=
v2-x86_64-cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Skylake-Client-v1' typename=3D'Skylake-Client-=
v1-x86_64-cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Skylake-Client-IBRS' typename=3D'Skylake-Clien=
t-IBRS-x86_64-cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Skylake-Client' typename=3D'Skylake-Client-x86=
_64-cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'SandyBridge-v2' typename=3D'SandyBridge-v2-x86=
_64-cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'SandyBridge-v1' typename=3D'SandyBridge-v1-x86=
_64-cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'SandyBridge-IBRS' typename=3D'SandyBridge-IBRS=
-x86_64-cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'SandyBridge' typename=3D'SandyBridge-x86_64-cp=
u' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Penryn-v1' typename=3D'Penryn-v1-x86_64-cpu' u=
sable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Penryn' typename=3D'Penryn-x86_64-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Opteron_G5-v1' typename=3D'Opteron_G5-v1-x86_6=
4-cpu' usable=3D'no'>
     <blocker name=3D'sse4a'/>
     <blocker name=3D'misalignsse'/>
     <blocker name=3D'xop'/>
@@ -764,7 +764,7 @@
     <blocker name=3D'npt'/>
     <blocker name=3D'nrip-save'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Opteron_G5' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Opteron_G5' typename=3D'Opteron_G5-x86_64-cpu'=
 usable=3D'no'>
     <blocker name=3D'sse4a'/>
     <blocker name=3D'misalignsse'/>
     <blocker name=3D'xop'/>
@@ -773,7 +773,7 @@
     <blocker name=3D'npt'/>
     <blocker name=3D'nrip-save'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Opteron_G4-v1' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Opteron_G4-v1' typename=3D'Opteron_G4-v1-x86_6=
4-cpu' usable=3D'no'>
     <blocker name=3D'sse4a'/>
     <blocker name=3D'misalignsse'/>
     <blocker name=3D'xop'/>
@@ -781,7 +781,7 @@
     <blocker name=3D'npt'/>
     <blocker name=3D'nrip-save'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Opteron_G4' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Opteron_G4' typename=3D'Opteron_G4-x86_64-cpu'=
 usable=3D'no'>
     <blocker name=3D'sse4a'/>
     <blocker name=3D'misalignsse'/>
     <blocker name=3D'xop'/>
@@ -789,23 +789,23 @@
     <blocker name=3D'npt'/>
     <blocker name=3D'nrip-save'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Opteron_G3-v1' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Opteron_G3-v1' typename=3D'Opteron_G3-v1-x86_6=
4-cpu' usable=3D'no'>
     <blocker name=3D'sse4a'/>
     <blocker name=3D'misalignsse'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Opteron_G3' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Opteron_G3' typename=3D'Opteron_G3-x86_64-cpu'=
 usable=3D'no'>
     <blocker name=3D'sse4a'/>
     <blocker name=3D'misalignsse'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Opteron_G2-v1' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Opteron_G2' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Opteron_G1-v1' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Opteron_G1' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Nehalem-v2' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Nehalem-v1' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Nehalem-IBRS' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Nehalem' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'KnightsMill-v1' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Opteron_G2-v1' typename=3D'Opteron_G2-v1-x86_6=
4-cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Opteron_G2' typename=3D'Opteron_G2-x86_64-cpu'=
 usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Opteron_G1-v1' typename=3D'Opteron_G1-v1-x86_6=
4-cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Opteron_G1' typename=3D'Opteron_G1-x86_64-cpu'=
 usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Nehalem-v2' typename=3D'Nehalem-v2-x86_64-cpu'=
 usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Nehalem-v1' typename=3D'Nehalem-v1-x86_64-cpu'=
 usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Nehalem-IBRS' typename=3D'Nehalem-IBRS-x86_64-=
cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Nehalem' typename=3D'Nehalem-x86_64-cpu' usabl=
e=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'KnightsMill-v1' typename=3D'KnightsMill-v1-x86=
_64-cpu' usable=3D'no'>
     <blocker name=3D'avx512f'/>
     <blocker name=3D'avx512pf'/>
     <blocker name=3D'avx512er'/>
@@ -817,7 +817,7 @@
     <blocker name=3D'avx512f'/>
     <blocker name=3D'avx512f'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'KnightsMill' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'KnightsMill' typename=3D'KnightsMill-x86_64-cp=
u' usable=3D'no'>
     <blocker name=3D'avx512f'/>
     <blocker name=3D'avx512pf'/>
     <blocker name=3D'avx512er'/>
@@ -829,11 +829,11 @@
     <blocker name=3D'avx512f'/>
     <blocker name=3D'avx512f'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'IvyBridge-v2' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'IvyBridge-v1' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'IvyBridge-IBRS' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'IvyBridge' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Icelake-Server-v1' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'IvyBridge-v2' typename=3D'IvyBridge-v2-x86_64-=
cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'IvyBridge-v1' typename=3D'IvyBridge-v1-x86_64-=
cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'IvyBridge-IBRS' typename=3D'IvyBridge-IBRS-x86=
_64-cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'IvyBridge' typename=3D'IvyBridge-x86_64-cpu' u=
sable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Icelake-Server-v1' typename=3D'Icelake-Server-=
v1-x86_64-cpu' usable=3D'no'>
     <blocker name=3D'avx512f'/>
     <blocker name=3D'avx512dq'/>
     <blocker name=3D'clwb'/>
@@ -856,7 +856,7 @@
     <blocker name=3D'avx512f'/>
     <blocker name=3D'pku'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Icelake-Server' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Icelake-Server' typename=3D'Icelake-Server-x86=
_64-cpu' usable=3D'no'>
     <blocker name=3D'avx512f'/>
     <blocker name=3D'avx512dq'/>
     <blocker name=3D'clwb'/>
@@ -879,7 +879,7 @@
     <blocker name=3D'avx512f'/>
     <blocker name=3D'pku'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Icelake-Client-v1' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Icelake-Client-v1' typename=3D'Icelake-Client-=
v1-x86_64-cpu' usable=3D'no'>
     <blocker name=3D'avx512vbmi'/>
     <blocker name=3D'pku'/>
     <blocker name=3D'avx512vbmi2'/>
@@ -892,7 +892,7 @@
     <blocker name=3D'wbnoinvd'/>
     <blocker name=3D'pku'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Icelake-Client' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Icelake-Client' typename=3D'Icelake-Client-x86=
_64-cpu' usable=3D'no'>
     <blocker name=3D'avx512vbmi'/>
     <blocker name=3D'pku'/>
     <blocker name=3D'avx512vbmi2'/>
@@ -905,15 +905,15 @@
     <blocker name=3D'wbnoinvd'/>
     <blocker name=3D'pku'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Haswell-v4' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Haswell-v3' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Haswell-v2' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Haswell-v1' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Haswell-noTSX-IBRS' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Haswell-noTSX' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Haswell-IBRS' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Haswell' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'EPYC-v2' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Haswell-v4' typename=3D'Haswell-v4-x86_64-cpu'=
 usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Haswell-v3' typename=3D'Haswell-v3-x86_64-cpu'=
 usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Haswell-v2' typename=3D'Haswell-v2-x86_64-cpu'=
 usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Haswell-v1' typename=3D'Haswell-v1-x86_64-cpu'=
 usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Haswell-noTSX-IBRS' typename=3D'Haswell-noTSX-=
IBRS-x86_64-cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Haswell-noTSX' typename=3D'Haswell-noTSX-x86_6=
4-cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Haswell-IBRS' typename=3D'Haswell-IBRS-x86_64-=
cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Haswell' typename=3D'Haswell-x86_64-cpu' usabl=
e=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'EPYC-v2' typename=3D'EPYC-v2-x86_64-cpu' usabl=
e=3D'no'>
     <blocker name=3D'sha-ni'/>
     <blocker name=3D'mmxext'/>
     <blocker name=3D'fxsr-opt'/>
@@ -925,7 +925,7 @@
     <blocker name=3D'npt'/>
     <blocker name=3D'nrip-save'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'EPYC-v1' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'EPYC-v1' typename=3D'EPYC-v1-x86_64-cpu' usabl=
e=3D'no'>
     <blocker name=3D'sha-ni'/>
     <blocker name=3D'mmxext'/>
     <blocker name=3D'fxsr-opt'/>
@@ -936,7 +936,7 @@
     <blocker name=3D'npt'/>
     <blocker name=3D'nrip-save'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'EPYC-IBPB' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'EPYC-IBPB' typename=3D'EPYC-IBPB-x86_64-cpu' u=
sable=3D'no'>
     <blocker name=3D'sha-ni'/>
     <blocker name=3D'mmxext'/>
     <blocker name=3D'fxsr-opt'/>
@@ -948,7 +948,7 @@
     <blocker name=3D'npt'/>
     <blocker name=3D'nrip-save'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'EPYC' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'EPYC' typename=3D'EPYC-x86_64-cpu' usable=3D'n=
o'>
     <blocker name=3D'sha-ni'/>
     <blocker name=3D'mmxext'/>
     <blocker name=3D'fxsr-opt'/>
@@ -960,7 +960,7 @@
     <blocker name=3D'npt'/>
     <blocker name=3D'nrip-save'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Dhyana-v1' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Dhyana-v1' typename=3D'Dhyana-v1-x86_64-cpu' u=
sable=3D'no'>
     <blocker name=3D'mmxext'/>
     <blocker name=3D'fxsr-opt'/>
     <blocker name=3D'cr8legacy'/>
@@ -971,7 +971,7 @@
     <blocker name=3D'npt'/>
     <blocker name=3D'nrip-save'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Dhyana' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Dhyana' typename=3D'Dhyana-x86_64-cpu' usable=
=3D'no'>
     <blocker name=3D'mmxext'/>
     <blocker name=3D'fxsr-opt'/>
     <blocker name=3D'cr8legacy'/>
@@ -982,9 +982,9 @@
     <blocker name=3D'npt'/>
     <blocker name=3D'nrip-save'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Conroe-v1' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Conroe' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Cascadelake-Server-v2' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Conroe-v1' typename=3D'Conroe-v1-x86_64-cpu' u=
sable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Conroe' typename=3D'Conroe-x86_64-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Cascadelake-Server-v2' typename=3D'Cascadelake=
-Server-v2-x86_64-cpu' usable=3D'no'>
     <blocker name=3D'avx512f'/>
     <blocker name=3D'avx512dq'/>
     <blocker name=3D'clwb'/>
@@ -1001,7 +1001,7 @@
     <blocker name=3D'ibrs-all'/>
     <blocker name=3D'mds-no'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Cascadelake-Server-v1' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Cascadelake-Server-v1' typename=3D'Cascadelake=
-Server-v1-x86_64-cpu' usable=3D'no'>
     <blocker name=3D'avx512f'/>
     <blocker name=3D'avx512dq'/>
     <blocker name=3D'clwb'/>
@@ -1015,7 +1015,7 @@
     <blocker name=3D'avx512f'/>
     <blocker name=3D'pku'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Cascadelake-Server' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Cascadelake-Server' typename=3D'Cascadelake-Se=
rver-x86_64-cpu' usable=3D'no'>
     <blocker name=3D'avx512f'/>
     <blocker name=3D'avx512dq'/>
     <blocker name=3D'clwb'/>
@@ -1032,60 +1032,60 @@
     <blocker name=3D'ibrs-all'/>
     <blocker name=3D'mds-no'/>
   </cpu>
-  <cpu type=3D'kvm' name=3D'Broadwell-v4' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Broadwell-v3' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Broadwell-v2' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Broadwell-v1' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Broadwell-noTSX-IBRS' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Broadwell-noTSX' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Broadwell-IBRS' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'Broadwell' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'486-v1' usable=3D'yes'/>
-  <cpu type=3D'kvm' name=3D'486' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'max' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'host' usable=3D'no'>
+  <cpu type=3D'kvm' name=3D'Broadwell-v4' typename=3D'Broadwell-v4-x86_64-=
cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Broadwell-v3' typename=3D'Broadwell-v3-x86_64-=
cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Broadwell-v2' typename=3D'Broadwell-v2-x86_64-=
cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Broadwell-v1' typename=3D'Broadwell-v1-x86_64-=
cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Broadwell-noTSX-IBRS' typename=3D'Broadwell-no=
TSX-IBRS-x86_64-cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Broadwell-noTSX' typename=3D'Broadwell-noTSX-x=
86_64-cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Broadwell-IBRS' typename=3D'Broadwell-IBRS-x86=
_64-cpu' usable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'Broadwell' typename=3D'Broadwell-x86_64-cpu' u=
sable=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'486-v1' typename=3D'486-v1-x86_64-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'kvm' name=3D'486' typename=3D'486-x86_64-cpu' usable=3D'yes=
'/>
+  <cpu type=3D'tcg' name=3D'max' typename=3D'max-x86_64-cpu' usable=3D'yes=
'/>
+  <cpu type=3D'tcg' name=3D'host' typename=3D'host-x86_64-cpu' usable=3D'n=
o'>
     <blocker name=3D'kvm'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'base' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'qemu64-v1' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'qemu64' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'qemu32-v1' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'qemu32' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'phenom-v1' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'base' typename=3D'base-x86_64-cpu' usable=3D'y=
es'/>
+  <cpu type=3D'tcg' name=3D'qemu64-v1' typename=3D'qemu64-v1-x86_64-cpu' u=
sable=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'qemu64' typename=3D'qemu64-x86_64-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'qemu32-v1' typename=3D'qemu32-v1-x86_64-cpu' u=
sable=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'qemu32' typename=3D'qemu32-x86_64-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'phenom-v1' typename=3D'phenom-v1-x86_64-cpu' u=
sable=3D'no'>
     <blocker name=3D'fxsr-opt'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'phenom' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'phenom' typename=3D'phenom-x86_64-cpu' usable=
=3D'no'>
     <blocker name=3D'fxsr-opt'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'pentium3-v1' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'pentium3' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'pentium2-v1' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'pentium2' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'pentium-v1' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'pentium' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'n270-v1' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'n270' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'kvm64-v1' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'kvm64' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'kvm32-v1' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'kvm32' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'coreduo-v1' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'coreduo' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'core2duo-v1' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'core2duo' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'athlon-v1' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'athlon' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'Westmere-v2' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'pentium3-v1' typename=3D'pentium3-v1-x86_64-cp=
u' usable=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'pentium3' typename=3D'pentium3-x86_64-cpu' usa=
ble=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'pentium2-v1' typename=3D'pentium2-v1-x86_64-cp=
u' usable=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'pentium2' typename=3D'pentium2-x86_64-cpu' usa=
ble=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'pentium-v1' typename=3D'pentium-v1-x86_64-cpu'=
 usable=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'pentium' typename=3D'pentium-x86_64-cpu' usabl=
e=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'n270-v1' typename=3D'n270-v1-x86_64-cpu' usabl=
e=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'n270' typename=3D'n270-x86_64-cpu' usable=3D'y=
es'/>
+  <cpu type=3D'tcg' name=3D'kvm64-v1' typename=3D'kvm64-v1-x86_64-cpu' usa=
ble=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'kvm64' typename=3D'kvm64-x86_64-cpu' usable=3D=
'yes'/>
+  <cpu type=3D'tcg' name=3D'kvm32-v1' typename=3D'kvm32-v1-x86_64-cpu' usa=
ble=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'kvm32' typename=3D'kvm32-x86_64-cpu' usable=3D=
'yes'/>
+  <cpu type=3D'tcg' name=3D'coreduo-v1' typename=3D'coreduo-v1-x86_64-cpu'=
 usable=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'coreduo' typename=3D'coreduo-x86_64-cpu' usabl=
e=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'core2duo-v1' typename=3D'core2duo-v1-x86_64-cp=
u' usable=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'core2duo' typename=3D'core2duo-x86_64-cpu' usa=
ble=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'athlon-v1' typename=3D'athlon-v1-x86_64-cpu' u=
sable=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'athlon' typename=3D'athlon-x86_64-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'Westmere-v2' typename=3D'Westmere-v2-x86_64-cp=
u' usable=3D'no'>
     <blocker name=3D'spec-ctrl'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Westmere-v1' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'Westmere-IBRS' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Westmere-v1' typename=3D'Westmere-v1-x86_64-cp=
u' usable=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'Westmere-IBRS' typename=3D'Westmere-IBRS-x86_6=
4-cpu' usable=3D'no'>
     <blocker name=3D'spec-ctrl'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Westmere' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Westmere' typename=3D'Westmere-x86_64-cpu' usa=
ble=3D'no'>
     <blocker name=3D'spec-ctrl'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Snowridge-v1' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Snowridge-v1' typename=3D'Snowridge-v1-x86_64-=
cpu' usable=3D'no'>
     <blocker name=3D'x2apic'/>
     <blocker name=3D'tsc-deadline'/>
     <blocker name=3D'rdseed'/>
@@ -1103,7 +1103,7 @@
     <blocker name=3D'xsavec'/>
     <blocker name=3D'split-lock-detect'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Snowridge' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Snowridge' typename=3D'Snowridge-x86_64-cpu' u=
sable=3D'no'>
     <blocker name=3D'x2apic'/>
     <blocker name=3D'tsc-deadline'/>
     <blocker name=3D'rdseed'/>
@@ -1121,7 +1121,7 @@
     <blocker name=3D'xsavec'/>
     <blocker name=3D'split-lock-detect'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Skylake-Server-v2' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Skylake-Server-v2' typename=3D'Skylake-Server-=
v2-x86_64-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1142,7 +1142,7 @@
     <blocker name=3D'3dnowprefetch'/>
     <blocker name=3D'xsavec'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Skylake-Server-v1' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Skylake-Server-v1' typename=3D'Skylake-Server-=
v1-x86_64-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1162,7 +1162,7 @@
     <blocker name=3D'3dnowprefetch'/>
     <blocker name=3D'xsavec'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Skylake-Server-IBRS' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Skylake-Server-IBRS' typename=3D'Skylake-Serve=
r-IBRS-x86_64-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1183,7 +1183,7 @@
     <blocker name=3D'3dnowprefetch'/>
     <blocker name=3D'xsavec'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Skylake-Server' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Skylake-Server' typename=3D'Skylake-Server-x86=
_64-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1204,7 +1204,7 @@
     <blocker name=3D'3dnowprefetch'/>
     <blocker name=3D'xsavec'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Skylake-Client-v2' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Skylake-Client-v2' typename=3D'Skylake-Client-=
v2-x86_64-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1220,7 +1220,7 @@
     <blocker name=3D'3dnowprefetch'/>
     <blocker name=3D'xsavec'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Skylake-Client-v1' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Skylake-Client-v1' typename=3D'Skylake-Client-=
v1-x86_64-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1235,7 +1235,7 @@
     <blocker name=3D'3dnowprefetch'/>
     <blocker name=3D'xsavec'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Skylake-Client-IBRS' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Skylake-Client-IBRS' typename=3D'Skylake-Clien=
t-IBRS-x86_64-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1251,7 +1251,7 @@
     <blocker name=3D'3dnowprefetch'/>
     <blocker name=3D'xsavec'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Skylake-Client' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Skylake-Client' typename=3D'Skylake-Client-x86=
_64-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1267,32 +1267,32 @@
     <blocker name=3D'3dnowprefetch'/>
     <blocker name=3D'xsavec'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'SandyBridge-v2' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'SandyBridge-v2' typename=3D'SandyBridge-v2-x86=
_64-cpu' usable=3D'no'>
     <blocker name=3D'x2apic'/>
     <blocker name=3D'tsc-deadline'/>
     <blocker name=3D'avx'/>
     <blocker name=3D'spec-ctrl'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'SandyBridge-v1' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'SandyBridge-v1' typename=3D'SandyBridge-v1-x86=
_64-cpu' usable=3D'no'>
     <blocker name=3D'x2apic'/>
     <blocker name=3D'tsc-deadline'/>
     <blocker name=3D'avx'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'SandyBridge-IBRS' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'SandyBridge-IBRS' typename=3D'SandyBridge-IBRS=
-x86_64-cpu' usable=3D'no'>
     <blocker name=3D'x2apic'/>
     <blocker name=3D'tsc-deadline'/>
     <blocker name=3D'avx'/>
     <blocker name=3D'spec-ctrl'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'SandyBridge' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'SandyBridge' typename=3D'SandyBridge-x86_64-cp=
u' usable=3D'no'>
     <blocker name=3D'x2apic'/>
     <blocker name=3D'tsc-deadline'/>
     <blocker name=3D'avx'/>
     <blocker name=3D'spec-ctrl'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Penryn-v1' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'Penryn' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'Opteron_G5-v1' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Penryn-v1' typename=3D'Penryn-v1-x86_64-cpu' u=
sable=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'Penryn' typename=3D'Penryn-x86_64-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'Opteron_G5-v1' typename=3D'Opteron_G5-v1-x86_6=
4-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'avx'/>
     <blocker name=3D'f16c'/>
@@ -1303,7 +1303,7 @@
     <blocker name=3D'tbm'/>
     <blocker name=3D'nrip-save'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Opteron_G5' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Opteron_G5' typename=3D'Opteron_G5-x86_64-cpu'=
 usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'avx'/>
     <blocker name=3D'f16c'/>
@@ -1314,7 +1314,7 @@
     <blocker name=3D'tbm'/>
     <blocker name=3D'nrip-save'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Opteron_G4-v1' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Opteron_G4-v1' typename=3D'Opteron_G4-v1-x86_6=
4-cpu' usable=3D'no'>
     <blocker name=3D'avx'/>
     <blocker name=3D'misalignsse'/>
     <blocker name=3D'3dnowprefetch'/>
@@ -1322,7 +1322,7 @@
     <blocker name=3D'fma4'/>
     <blocker name=3D'nrip-save'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Opteron_G4' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Opteron_G4' typename=3D'Opteron_G4-x86_64-cpu'=
 usable=3D'no'>
     <blocker name=3D'avx'/>
     <blocker name=3D'misalignsse'/>
     <blocker name=3D'3dnowprefetch'/>
@@ -1330,27 +1330,27 @@
     <blocker name=3D'fma4'/>
     <blocker name=3D'nrip-save'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Opteron_G3-v1' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Opteron_G3-v1' typename=3D'Opteron_G3-v1-x86_6=
4-cpu' usable=3D'no'>
     <blocker name=3D'misalignsse'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Opteron_G3' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Opteron_G3' typename=3D'Opteron_G3-x86_64-cpu'=
 usable=3D'no'>
     <blocker name=3D'misalignsse'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Opteron_G2-v1' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'Opteron_G2' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'Opteron_G1-v1' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'Opteron_G1' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'Nehalem-v2' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Opteron_G2-v1' typename=3D'Opteron_G2-v1-x86_6=
4-cpu' usable=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'Opteron_G2' typename=3D'Opteron_G2-x86_64-cpu'=
 usable=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'Opteron_G1-v1' typename=3D'Opteron_G1-v1-x86_6=
4-cpu' usable=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'Opteron_G1' typename=3D'Opteron_G1-x86_64-cpu'=
 usable=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'Nehalem-v2' typename=3D'Nehalem-v2-x86_64-cpu'=
 usable=3D'no'>
     <blocker name=3D'spec-ctrl'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Nehalem-v1' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'Nehalem-IBRS' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Nehalem-v1' typename=3D'Nehalem-v1-x86_64-cpu'=
 usable=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'Nehalem-IBRS' typename=3D'Nehalem-IBRS-x86_64-=
cpu' usable=3D'no'>
     <blocker name=3D'spec-ctrl'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Nehalem' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Nehalem' typename=3D'Nehalem-x86_64-cpu' usabl=
e=3D'no'>
     <blocker name=3D'spec-ctrl'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'KnightsMill-v1' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'KnightsMill-v1' typename=3D'KnightsMill-v1-x86=
_64-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'x2apic'/>
     <blocker name=3D'tsc-deadline'/>
@@ -1367,7 +1367,7 @@
     <blocker name=3D'avx512-4fmaps'/>
     <blocker name=3D'3dnowprefetch'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'KnightsMill' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'KnightsMill' typename=3D'KnightsMill-x86_64-cp=
u' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'x2apic'/>
     <blocker name=3D'tsc-deadline'/>
@@ -1384,34 +1384,34 @@
     <blocker name=3D'avx512-4fmaps'/>
     <blocker name=3D'3dnowprefetch'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'IvyBridge-v2' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'IvyBridge-v2' typename=3D'IvyBridge-v2-x86_64-=
cpu' usable=3D'no'>
     <blocker name=3D'x2apic'/>
     <blocker name=3D'tsc-deadline'/>
     <blocker name=3D'avx'/>
     <blocker name=3D'f16c'/>
     <blocker name=3D'spec-ctrl'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'IvyBridge-v1' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'IvyBridge-v1' typename=3D'IvyBridge-v1-x86_64-=
cpu' usable=3D'no'>
     <blocker name=3D'x2apic'/>
     <blocker name=3D'tsc-deadline'/>
     <blocker name=3D'avx'/>
     <blocker name=3D'f16c'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'IvyBridge-IBRS' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'IvyBridge-IBRS' typename=3D'IvyBridge-IBRS-x86=
_64-cpu' usable=3D'no'>
     <blocker name=3D'x2apic'/>
     <blocker name=3D'tsc-deadline'/>
     <blocker name=3D'avx'/>
     <blocker name=3D'f16c'/>
     <blocker name=3D'spec-ctrl'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'IvyBridge' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'IvyBridge' typename=3D'IvyBridge-x86_64-cpu' u=
sable=3D'no'>
     <blocker name=3D'x2apic'/>
     <blocker name=3D'tsc-deadline'/>
     <blocker name=3D'avx'/>
     <blocker name=3D'f16c'/>
     <blocker name=3D'spec-ctrl'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Icelake-Server-v1' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Icelake-Server-v1' typename=3D'Icelake-Server-=
v1-x86_64-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1443,7 +1443,7 @@
     <blocker name=3D'wbnoinvd'/>
     <blocker name=3D'xsavec'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Icelake-Server' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Icelake-Server' typename=3D'Icelake-Server-x86=
_64-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1475,7 +1475,7 @@
     <blocker name=3D'wbnoinvd'/>
     <blocker name=3D'xsavec'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Icelake-Client-v1' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Icelake-Client-v1' typename=3D'Icelake-Client-=
v1-x86_64-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1502,7 +1502,7 @@
     <blocker name=3D'wbnoinvd'/>
     <blocker name=3D'xsavec'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Icelake-Client' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Icelake-Client' typename=3D'Icelake-Client-x86=
_64-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1529,7 +1529,7 @@
     <blocker name=3D'wbnoinvd'/>
     <blocker name=3D'xsavec'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Haswell-v4' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Haswell-v4' typename=3D'Haswell-v4-x86_64-cpu'=
 usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1540,7 +1540,7 @@
     <blocker name=3D'invpcid'/>
     <blocker name=3D'spec-ctrl'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Haswell-v3' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Haswell-v3' typename=3D'Haswell-v3-x86_64-cpu'=
 usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1553,7 +1553,7 @@
     <blocker name=3D'rtm'/>
     <blocker name=3D'spec-ctrl'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Haswell-v2' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Haswell-v2' typename=3D'Haswell-v2-x86_64-cpu'=
 usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1563,7 +1563,7 @@
     <blocker name=3D'avx2'/>
     <blocker name=3D'invpcid'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Haswell-v1' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Haswell-v1' typename=3D'Haswell-v1-x86_64-cpu'=
 usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1575,7 +1575,7 @@
     <blocker name=3D'invpcid'/>
     <blocker name=3D'rtm'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Haswell-noTSX-IBRS' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Haswell-noTSX-IBRS' typename=3D'Haswell-noTSX-=
IBRS-x86_64-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1586,7 +1586,7 @@
     <blocker name=3D'invpcid'/>
     <blocker name=3D'spec-ctrl'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Haswell-noTSX' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Haswell-noTSX' typename=3D'Haswell-noTSX-x86_6=
4-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1596,7 +1596,7 @@
     <blocker name=3D'avx2'/>
     <blocker name=3D'invpcid'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Haswell-IBRS' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Haswell-IBRS' typename=3D'Haswell-IBRS-x86_64-=
cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1609,7 +1609,7 @@
     <blocker name=3D'rtm'/>
     <blocker name=3D'spec-ctrl'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Haswell' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Haswell' typename=3D'Haswell-x86_64-cpu' usabl=
e=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1620,7 +1620,7 @@
     <blocker name=3D'invpcid'/>
     <blocker name=3D'spec-ctrl'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'EPYC-v2' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'EPYC-v2' typename=3D'EPYC-v2-x86_64-cpu' usabl=
e=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'avx'/>
     <blocker name=3D'f16c'/>
@@ -1636,7 +1636,7 @@
     <blocker name=3D'nrip-save'/>
     <blocker name=3D'xsavec'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'EPYC-v1' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'EPYC-v1' typename=3D'EPYC-v1-x86_64-cpu' usabl=
e=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'avx'/>
     <blocker name=3D'f16c'/>
@@ -1651,7 +1651,7 @@
     <blocker name=3D'nrip-save'/>
     <blocker name=3D'xsavec'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'EPYC-IBPB' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'EPYC-IBPB' typename=3D'EPYC-IBPB-x86_64-cpu' u=
sable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'avx'/>
     <blocker name=3D'f16c'/>
@@ -1667,7 +1667,7 @@
     <blocker name=3D'nrip-save'/>
     <blocker name=3D'xsavec'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'EPYC' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'EPYC' typename=3D'EPYC-x86_64-cpu' usable=3D'n=
o'>
     <blocker name=3D'fma'/>
     <blocker name=3D'avx'/>
     <blocker name=3D'f16c'/>
@@ -1683,7 +1683,7 @@
     <blocker name=3D'nrip-save'/>
     <blocker name=3D'xsavec'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Dhyana-v1' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Dhyana-v1' typename=3D'Dhyana-v1-x86_64-cpu' u=
sable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'avx'/>
     <blocker name=3D'f16c'/>
@@ -1698,7 +1698,7 @@
     <blocker name=3D'nrip-save'/>
     <blocker name=3D'xsavec'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Dhyana' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Dhyana' typename=3D'Dhyana-x86_64-cpu' usable=
=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'avx'/>
     <blocker name=3D'f16c'/>
@@ -1713,9 +1713,9 @@
     <blocker name=3D'nrip-save'/>
     <blocker name=3D'xsavec'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Conroe-v1' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'Conroe' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'Cascadelake-Server-v2' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Conroe-v1' typename=3D'Conroe-v1-x86_64-cpu' u=
sable=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'Conroe' typename=3D'Conroe-x86_64-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'Cascadelake-Server-v2' typename=3D'Cascadelake=
-Server-v2-x86_64-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1743,7 +1743,7 @@
     <blocker name=3D'skip-l1dfl-vmentry'/>
     <blocker name=3D'mds-no'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Cascadelake-Server-v1' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Cascadelake-Server-v1' typename=3D'Cascadelake=
-Server-v1-x86_64-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1766,7 +1766,7 @@
     <blocker name=3D'3dnowprefetch'/>
     <blocker name=3D'xsavec'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Cascadelake-Server' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Cascadelake-Server' typename=3D'Cascadelake-Se=
rver-x86_64-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1794,7 +1794,7 @@
     <blocker name=3D'skip-l1dfl-vmentry'/>
     <blocker name=3D'mds-no'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Broadwell-v4' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Broadwell-v4' typename=3D'Broadwell-v4-x86_64-=
cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1807,7 +1807,7 @@
     <blocker name=3D'spec-ctrl'/>
     <blocker name=3D'3dnowprefetch'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Broadwell-v3' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Broadwell-v3' typename=3D'Broadwell-v3-x86_64-=
cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1822,7 +1822,7 @@
     <blocker name=3D'spec-ctrl'/>
     <blocker name=3D'3dnowprefetch'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Broadwell-v2' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Broadwell-v2' typename=3D'Broadwell-v2-x86_64-=
cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1834,7 +1834,7 @@
     <blocker name=3D'rdseed'/>
     <blocker name=3D'3dnowprefetch'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Broadwell-v1' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Broadwell-v1' typename=3D'Broadwell-v1-x86_64-=
cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1848,7 +1848,7 @@
     <blocker name=3D'rdseed'/>
     <blocker name=3D'3dnowprefetch'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Broadwell-noTSX-IBRS' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Broadwell-noTSX-IBRS' typename=3D'Broadwell-no=
TSX-IBRS-x86_64-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1861,7 +1861,7 @@
     <blocker name=3D'spec-ctrl'/>
     <blocker name=3D'3dnowprefetch'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Broadwell-noTSX' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Broadwell-noTSX' typename=3D'Broadwell-noTSX-x=
86_64-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1873,7 +1873,7 @@
     <blocker name=3D'rdseed'/>
     <blocker name=3D'3dnowprefetch'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Broadwell-IBRS' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Broadwell-IBRS' typename=3D'Broadwell-IBRS-x86=
_64-cpu' usable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1888,7 +1888,7 @@
     <blocker name=3D'spec-ctrl'/>
     <blocker name=3D'3dnowprefetch'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'Broadwell' usable=3D'no'>
+  <cpu type=3D'tcg' name=3D'Broadwell' typename=3D'Broadwell-x86_64-cpu' u=
sable=3D'no'>
     <blocker name=3D'fma'/>
     <blocker name=3D'pcid'/>
     <blocker name=3D'x2apic'/>
@@ -1901,8 +1901,8 @@
     <blocker name=3D'spec-ctrl'/>
     <blocker name=3D'3dnowprefetch'/>
   </cpu>
-  <cpu type=3D'tcg' name=3D'486-v1' usable=3D'yes'/>
-  <cpu type=3D'tcg' name=3D'486' usable=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'486-v1' typename=3D'486-v1-x86_64-cpu' usable=
=3D'yes'/>
+  <cpu type=3D'tcg' name=3D'486' typename=3D'486-x86_64-cpu' usable=3D'yes=
'/>
   <machine name=3D'pc-i440fx-4.2' alias=3D'pc' hotplugCpus=3D'yes' maxCpus=
=3D'255' default=3D'yes'/>
   <machine name=3D'pc-0.15' hotplugCpus=3D'yes' maxCpus=3D'255'/>
   <machine name=3D'pc-i440fx-2.12' hotplugCpus=3D'yes' maxCpus=3D'255'/>
--=20
2.23.0

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