qemu: Make probed machine types depend on accelerator

Some specifics of machine types may depend on the accelerator and thus
the data should be moved to virQEMUCapsAccel. The TCG machine types are
just copied from the ones probed for KVM to simplify the changes to
qemucapabilitiestest data files.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Jiri Denemark 2019-10-24 14:19:38 +02:00
parent 518948997c
commit d5d2d8e34a
45 changed files with 2374 additions and 1222 deletions

View File

@ -584,6 +584,8 @@ struct _virQEMUCapsHostCPUData {
typedef struct _virQEMUCapsAccel virQEMUCapsAccel;
typedef virQEMUCapsAccel *virQEMUCapsAccelPtr;
struct _virQEMUCapsAccel {
size_t nmachineTypes;
virQEMUCapsMachineTypePtr machineTypes;
virQEMUCapsHostCPUData hostCPU;
qemuMonitorCPUDefsPtr cpuModels;
};
@ -620,9 +622,6 @@ struct _virQEMUCaps {
virHashTablePtr domCapsCache;
size_t nmachineTypes;
virQEMUCapsMachineTypePtr machineTypes;
size_t ngicCapabilities;
virGICCapability *gicCapabilities;
@ -736,16 +735,16 @@ virQEMUCapsGetAccel(virQEMUCapsPtr qemuCaps,
static void
virQEMUCapsSetDefaultMachine(virQEMUCapsPtr qemuCaps,
virQEMUCapsSetDefaultMachine(virQEMUCapsAccelPtr caps,
size_t defIdx)
{
virQEMUCapsMachineType tmp = qemuCaps->machineTypes[defIdx];
virQEMUCapsMachineType tmp = caps->machineTypes[defIdx];
memmove(qemuCaps->machineTypes + 1,
qemuCaps->machineTypes,
sizeof(qemuCaps->machineTypes[0]) * defIdx);
memmove(caps->machineTypes + 1,
caps->machineTypes,
sizeof(caps->machineTypes[0]) * defIdx);
qemuCaps->machineTypes[0] = tmp;
caps->machineTypes[0] = tmp;
}
@ -842,26 +841,34 @@ virQEMUCapsGetMachineTypesCaps(virQEMUCapsPtr qemuCaps,
virCapsGuestMachinePtr **machines)
{
size_t i;
virQEMUCapsAccelPtr accel;
/* Guest capabilities do not report TCG vs. KVM caps separately. We just
* take the set of machine types we probed first. */
if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_KVM))
accel = &qemuCaps->kvm;
else
accel = &qemuCaps->tcg;
*machines = NULL;
*nmachines = qemuCaps->nmachineTypes;
*nmachines = accel->nmachineTypes;
if (*nmachines &&
VIR_ALLOC_N(*machines, qemuCaps->nmachineTypes) < 0)
VIR_ALLOC_N(*machines, accel->nmachineTypes) < 0)
goto error;
for (i = 0; i < qemuCaps->nmachineTypes; i++) {
for (i = 0; i < accel->nmachineTypes; i++) {
virCapsGuestMachinePtr mach;
if (VIR_ALLOC(mach) < 0)
goto error;
(*machines)[i] = mach;
if (qemuCaps->machineTypes[i].alias) {
mach->name = g_strdup(qemuCaps->machineTypes[i].alias);
mach->canonical = g_strdup(qemuCaps->machineTypes[i].name);
if (accel->machineTypes[i].alias) {
mach->name = g_strdup(accel->machineTypes[i].alias);
mach->canonical = g_strdup(accel->machineTypes[i].name);
} else {
mach->name = g_strdup(qemuCaps->machineTypes[i].name);
mach->name = g_strdup(accel->machineTypes[i].name);
}
mach->maxCpus = qemuCaps->machineTypes[i].maxCpus;
mach->maxCpus = accel->machineTypes[i].maxCpus;
}
/* Make sure all canonical machine types also have their own entry so that
@ -1690,8 +1697,8 @@ virQEMUCapsSEVInfoCopy(virSEVCapabilityPtr *dst,
static void
virQEMUCapsCopyMachineTypes(virQEMUCapsPtr dst,
virQEMUCapsPtr src)
virQEMUCapsAccelCopyMachineTypes(virQEMUCapsAccelPtr dst,
virQEMUCapsAccelPtr src)
{
size_t i;
@ -1712,6 +1719,8 @@ static int
virQEMUCapsAccelCopy(virQEMUCapsAccelPtr dst,
virQEMUCapsAccelPtr src)
{
virQEMUCapsAccelCopyMachineTypes(dst, src);
if (virQEMUCapsHostCPUDataCopy(&dst->hostCPU, &src->hostCPU) < 0)
return -1;
@ -1751,8 +1760,6 @@ virQEMUCapsPtr virQEMUCapsNewCopy(virQEMUCapsPtr qemuCaps)
virQEMUCapsAccelCopy(&ret->tcg, &qemuCaps->tcg) < 0)
goto error;
virQEMUCapsCopyMachineTypes(ret, qemuCaps);
if (VIR_ALLOC_N(ret->gicCapabilities, qemuCaps->ngicCapabilities) < 0)
goto error;
ret->ngicCapabilities = qemuCaps->ngicCapabilities;
@ -1775,6 +1782,14 @@ virQEMUCapsPtr virQEMUCapsNewCopy(virQEMUCapsPtr qemuCaps)
static void
virQEMUCapsAccelClear(virQEMUCapsAccelPtr caps)
{
size_t i;
for (i = 0; i < caps->nmachineTypes; i++) {
VIR_FREE(caps->machineTypes[i].name);
VIR_FREE(caps->machineTypes[i].alias);
}
VIR_FREE(caps->machineTypes);
virQEMUCapsHostCPUDataClear(&caps->hostCPU);
virObjectUnref(caps->cpuModels);
}
@ -1783,13 +1798,6 @@ virQEMUCapsAccelClear(virQEMUCapsAccelPtr caps)
void virQEMUCapsDispose(void *obj)
{
virQEMUCapsPtr qemuCaps = obj;
size_t i;
for (i = 0; i < qemuCaps->nmachineTypes; i++) {
VIR_FREE(qemuCaps->machineTypes[i].name);
VIR_FREE(qemuCaps->machineTypes[i].alias);
}
VIR_FREE(qemuCaps->machineTypes);
virHashFree(qemuCaps->domCapsCache);
virBitmapFree(qemuCaps->flags);
@ -2118,19 +2126,22 @@ virQEMUCapsIsCPUModeSupported(virQEMUCapsPtr qemuCaps,
*/
const char *
virQEMUCapsGetCanonicalMachine(virQEMUCapsPtr qemuCaps,
virDomainVirtType virtType G_GNUC_UNUSED,
virDomainVirtType virtType,
const char *name)
{
virQEMUCapsAccelPtr accel;
size_t i;
if (!name || !qemuCaps)
return name;
for (i = 0; i < qemuCaps->nmachineTypes; i++) {
if (!qemuCaps->machineTypes[i].alias)
accel = virQEMUCapsGetAccel(qemuCaps, virtType);
for (i = 0; i < accel->nmachineTypes; i++) {
if (!accel->machineTypes[i].alias)
continue;
if (STREQ(qemuCaps->machineTypes[i].alias, name))
return qemuCaps->machineTypes[i].name;
if (STREQ(accel->machineTypes[i].alias, name))
return accel->machineTypes[i].name;
}
return name;
@ -2139,19 +2150,22 @@ virQEMUCapsGetCanonicalMachine(virQEMUCapsPtr qemuCaps,
int
virQEMUCapsGetMachineMaxCpus(virQEMUCapsPtr qemuCaps,
virDomainVirtType virtType G_GNUC_UNUSED,
virDomainVirtType virtType,
const char *name)
{
virQEMUCapsAccelPtr accel;
size_t i;
if (!name)
return 0;
for (i = 0; i < qemuCaps->nmachineTypes; i++) {
if (!qemuCaps->machineTypes[i].maxCpus)
accel = virQEMUCapsGetAccel(qemuCaps, virtType);
for (i = 0; i < accel->nmachineTypes; i++) {
if (!accel->machineTypes[i].maxCpus)
continue;
if (STREQ(qemuCaps->machineTypes[i].name, name))
return qemuCaps->machineTypes[i].maxCpus;
if (STREQ(accel->machineTypes[i].name, name))
return accel->machineTypes[i].maxCpus;
}
return 0;
@ -2160,14 +2174,17 @@ virQEMUCapsGetMachineMaxCpus(virQEMUCapsPtr qemuCaps,
bool
virQEMUCapsGetMachineHotplugCpus(virQEMUCapsPtr qemuCaps,
virDomainVirtType virtType G_GNUC_UNUSED,
virDomainVirtType virtType,
const char *name)
{
virQEMUCapsAccelPtr accel;
size_t i;
for (i = 0; i < qemuCaps->nmachineTypes; i++) {
if (STREQ_NULLABLE(qemuCaps->machineTypes[i].name, name))
return qemuCaps->machineTypes[i].hotplugCpus;
accel = virQEMUCapsGetAccel(qemuCaps, virtType);
for (i = 0; i < accel->nmachineTypes; i++) {
if (STREQ_NULLABLE(accel->machineTypes[i].name, name))
return accel->machineTypes[i].hotplugCpus;
}
return false;
@ -2380,6 +2397,7 @@ verify(G_N_ELEMENTS(preferredMachines) == VIR_ARCH_LAST);
static int
virQEMUCapsProbeQMPMachineTypes(virQEMUCapsPtr qemuCaps,
virQEMUCapsAccelPtr accel,
qemuMonitorPtr mon)
{
qemuMonitorMachineInfoPtr *machines = NULL;
@ -2393,7 +2411,7 @@ virQEMUCapsProbeQMPMachineTypes(virQEMUCapsPtr qemuCaps,
if ((nmachines = qemuMonitorGetMachines(mon, &machines)) < 0)
return -1;
if (VIR_ALLOC_N(qemuCaps->machineTypes, nmachines) < 0)
if (VIR_ALLOC_N(accel->machineTypes, nmachines) < 0)
goto cleanup;
for (i = 0; i < nmachines; i++) {
@ -2401,7 +2419,7 @@ virQEMUCapsProbeQMPMachineTypes(virQEMUCapsPtr qemuCaps,
if (STREQ(machines[i]->name, "none"))
continue;
mach = &(qemuCaps->machineTypes[qemuCaps->nmachineTypes++]);
mach = &(accel->machineTypes[accel->nmachineTypes++]);
mach->alias = g_strdup(machines[i]->alias);
mach->name = g_strdup(machines[i]->name);
@ -2412,12 +2430,12 @@ virQEMUCapsProbeQMPMachineTypes(virQEMUCapsPtr qemuCaps,
if (preferredMachine &&
(STREQ_NULLABLE(mach->alias, preferredMachine) ||
STREQ(mach->name, preferredMachine))) {
preferredIdx = qemuCaps->nmachineTypes - 1;
preferredIdx = accel->nmachineTypes - 1;
}
if (machines[i]->isDefault) {
mach->qemuDefault = true;
defIdx = qemuCaps->nmachineTypes - 1;
defIdx = accel->nmachineTypes - 1;
}
}
@ -2433,7 +2451,7 @@ virQEMUCapsProbeQMPMachineTypes(virQEMUCapsPtr qemuCaps,
if (preferredIdx == -1)
preferredIdx = defIdx;
if (preferredIdx != -1)
virQEMUCapsSetDefaultMachine(qemuCaps, preferredIdx);
virQEMUCapsSetDefaultMachine(accel, preferredIdx);
ret = 0;
@ -2447,13 +2465,14 @@ virQEMUCapsProbeQMPMachineTypes(virQEMUCapsPtr qemuCaps,
static bool
virQEMUCapsIsMachineSupported(virQEMUCapsPtr qemuCaps,
virDomainVirtType virtType G_GNUC_UNUSED,
virDomainVirtType virtType,
const char *canonical_machine)
{
virQEMUCapsAccelPtr accel = virQEMUCapsGetAccel(qemuCaps, virtType);
size_t i;
for (i = 0; i < qemuCaps->nmachineTypes; i++) {
if (STREQ(canonical_machine, qemuCaps->machineTypes[i].name))
for (i = 0; i < accel->nmachineTypes; i++) {
if (STREQ(canonical_machine, accel->machineTypes[i].name))
return true;
}
return false;
@ -3576,15 +3595,17 @@ virQEMUCapsLoadCPUModels(virQEMUCapsAccelPtr caps,
static int
virQEMUCapsLoadMachines(virQEMUCapsPtr qemuCaps,
xmlXPathContextPtr ctxt)
virQEMUCapsLoadMachines(virQEMUCapsAccelPtr caps,
xmlXPathContextPtr ctxt,
const char *typeStr)
{
g_autofree char *xpath = g_strdup_printf("./machine[@type='%s']", typeStr);
g_autofree xmlNodePtr *nodes = NULL;
char *str = NULL;
size_t i;
int n;
if ((n = virXPathNodeSet("./machine", ctxt, &nodes)) < 0) {
if ((n = virXPathNodeSet(xpath, ctxt, &nodes)) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("failed to parse qemu capabilities machines"));
return -1;
@ -3593,21 +3614,21 @@ virQEMUCapsLoadMachines(virQEMUCapsPtr qemuCaps,
if (n == 0)
return 0;
qemuCaps->nmachineTypes = n;
if (VIR_ALLOC_N(qemuCaps->machineTypes, qemuCaps->nmachineTypes) < 0)
caps->nmachineTypes = n;
if (VIR_ALLOC_N(caps->machineTypes, caps->nmachineTypes) < 0)
return -1;
for (i = 0; i < n; i++) {
if (!(qemuCaps->machineTypes[i].name = virXMLPropString(nodes[i], "name"))) {
if (!(caps->machineTypes[i].name = virXMLPropString(nodes[i], "name"))) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("missing machine name in QEMU capabilities cache"));
return -1;
}
qemuCaps->machineTypes[i].alias = virXMLPropString(nodes[i], "alias");
caps->machineTypes[i].alias = virXMLPropString(nodes[i], "alias");
str = virXMLPropString(nodes[i], "maxCpus");
if (str &&
virStrToLong_ui(str, NULL, 10, &(qemuCaps->machineTypes[i].maxCpus)) < 0) {
virStrToLong_ui(str, NULL, 10, &(caps->machineTypes[i].maxCpus)) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("malformed machine cpu count in QEMU capabilities cache"));
return -1;
@ -3616,12 +3637,12 @@ virQEMUCapsLoadMachines(virQEMUCapsPtr qemuCaps,
str = virXMLPropString(nodes[i], "hotplugCpus");
if (STREQ_NULLABLE(str, "yes"))
qemuCaps->machineTypes[i].hotplugCpus = true;
caps->machineTypes[i].hotplugCpus = true;
VIR_FREE(str);
str = virXMLPropString(nodes[i], "default");
if (STREQ_NULLABLE(str, "yes"))
qemuCaps->machineTypes[i].qemuDefault = true;
caps->machineTypes[i].qemuDefault = true;
VIR_FREE(str);
}
@ -3643,6 +3664,9 @@ virQEMUCapsLoadAccel(virQEMUCapsPtr qemuCaps,
if (virQEMUCapsLoadCPUModels(caps, ctxt, typeStr) < 0)
return -1;
if (virQEMUCapsLoadMachines(caps, ctxt, typeStr) < 0)
return -1;
return 0;
}
@ -3862,9 +3886,6 @@ virQEMUCapsLoadCache(virArch hostArch,
virQEMUCapsLoadAccel(qemuCaps, ctxt, VIR_DOMAIN_VIRT_QEMU) < 0)
goto cleanup;
if (virQEMUCapsLoadMachines(qemuCaps, ctxt) < 0)
goto cleanup;
if ((n = virXPathNodeSet("./gic", ctxt, &nodes)) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("failed to parse qemu capabilities gic"));
@ -4045,21 +4066,23 @@ virQEMUCapsFormatCPUModels(virQEMUCapsAccelPtr caps,
static void
virQEMUCapsFormatMachines(virQEMUCapsPtr qemuCaps,
virBufferPtr buf)
virQEMUCapsFormatMachines(virQEMUCapsAccelPtr caps,
virBufferPtr buf,
const char *typeStr)
{
size_t i;
for (i = 0; i < qemuCaps->nmachineTypes; i++) {
virBufferEscapeString(buf, "<machine name='%s'",
qemuCaps->machineTypes[i].name);
for (i = 0; i < caps->nmachineTypes; i++) {
virBufferAsprintf(buf, "<machine type='%s'", typeStr);
virBufferEscapeString(buf, " name='%s'",
caps->machineTypes[i].name);
virBufferEscapeString(buf, " alias='%s'",
qemuCaps->machineTypes[i].alias);
if (qemuCaps->machineTypes[i].hotplugCpus)
caps->machineTypes[i].alias);
if (caps->machineTypes[i].hotplugCpus)
virBufferAddLit(buf, " hotplugCpus='yes'");
virBufferAsprintf(buf, " maxCpus='%u'",
qemuCaps->machineTypes[i].maxCpus);
if (qemuCaps->machineTypes[i].qemuDefault)
caps->machineTypes[i].maxCpus);
if (caps->machineTypes[i].qemuDefault)
virBufferAddLit(buf, " default='yes'");
virBufferAddLit(buf, "/>\n");
}
@ -4076,6 +4099,8 @@ virQEMUCapsFormatAccel(virQEMUCapsPtr qemuCaps,
virQEMUCapsFormatHostCPUModelInfo(caps, buf, typeStr);
virQEMUCapsFormatCPUModels(caps, buf, typeStr);
virQEMUCapsFormatMachines(caps, buf, typeStr);
}
@ -4142,8 +4167,6 @@ virQEMUCapsFormatCache(virQEMUCapsPtr qemuCaps)
virArchToString(qemuCaps->arch));
virQEMUCapsFormatAccel(qemuCaps, &buf, VIR_DOMAIN_VIRT_KVM);
virQEMUCapsFormatMachines(qemuCaps, &buf);
virQEMUCapsFormatAccel(qemuCaps, &buf, VIR_DOMAIN_VIRT_QEMU);
for (i = 0; i < qemuCaps->ngicCapabilities; i++) {
@ -4660,7 +4683,7 @@ virQEMUCapsInitQMPMonitor(virQEMUCapsPtr qemuCaps,
return -1;
if (virQEMUCapsProbeQMPDevices(qemuCaps, mon) < 0)
return -1;
if (virQEMUCapsProbeQMPMachineTypes(qemuCaps, mon) < 0)
if (virQEMUCapsProbeQMPMachineTypes(qemuCaps, accel, mon) < 0)
return -1;
if (virQEMUCapsProbeQMPMachineProps(qemuCaps, type, mon) < 0)
return -1;
@ -4703,6 +4726,8 @@ virQEMUCapsInitQMPMonitorTCG(virQEMUCapsPtr qemuCaps,
if (virQEMUCapsProbeQMPHostCPU(qemuCaps, accel, mon, VIR_DOMAIN_VIRT_QEMU) < 0)
return -1;
virQEMUCapsAccelCopyMachineTypes(&qemuCaps->tcg, &qemuCaps->kvm);
return 0;
}
@ -5213,11 +5238,13 @@ virQEMUCapsSupportsVmport(virQEMUCapsPtr qemuCaps,
*/
const char *
virQEMUCapsGetPreferredMachine(virQEMUCapsPtr qemuCaps,
virDomainVirtType virtType G_GNUC_UNUSED)
virDomainVirtType virtType)
{
if (!qemuCaps->nmachineTypes)
virQEMUCapsAccelPtr accel = virQEMUCapsGetAccel(qemuCaps, virtType);
if (!accel->nmachineTypes)
return NULL;
return qemuCaps->machineTypes[0].name;
return accel->machineTypes[0].name;
}
@ -5722,6 +5749,9 @@ virQEMUCapsStripMachineAliases(virQEMUCapsPtr qemuCaps)
{
size_t i;
for (i = 0; i < qemuCaps->nmachineTypes; i++)
VIR_FREE(qemuCaps->machineTypes[i].alias);
for (i = 0; i < qemuCaps->kvm.nmachineTypes; i++)
VIR_FREE(qemuCaps->kvm.machineTypes[i].alias);
for (i = 0; i < qemuCaps->tcg.nmachineTypes; i++)
VIR_FREE(qemuCaps->tcg.machineTypes[i].alias);
}

View File

@ -112,21 +112,21 @@
<cpu type='kvm' name='core2duo'/>
<cpu type='kvm' name='phenom'/>
<cpu type='kvm' name='qemu64'/>
<machine name='pc-i440fx-1.5' alias='pc' maxCpus='255' default='yes'/>
<machine name='pc-q35-1.4' maxCpus='255'/>
<machine name='pc-q35-1.5' alias='q35' maxCpus='255'/>
<machine name='isapc' maxCpus='1'/>
<machine name='pc-0.10' maxCpus='255'/>
<machine name='pc-0.11' maxCpus='255'/>
<machine name='pc-0.12' maxCpus='255'/>
<machine name='pc-0.13' maxCpus='255'/>
<machine name='pc-0.14' maxCpus='255'/>
<machine name='pc-0.15' maxCpus='255'/>
<machine name='pc-1.0' maxCpus='255'/>
<machine name='pc-1.1' maxCpus='255'/>
<machine name='pc-1.2' maxCpus='255'/>
<machine name='pc-1.3' maxCpus='255'/>
<machine name='pc-i440fx-1.4' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-1.5' alias='pc' maxCpus='255' default='yes'/>
<machine type='kvm' name='pc-q35-1.4' maxCpus='255'/>
<machine type='kvm' name='pc-q35-1.5' alias='q35' maxCpus='255'/>
<machine type='kvm' name='isapc' maxCpus='1'/>
<machine type='kvm' name='pc-0.10' maxCpus='255'/>
<machine type='kvm' name='pc-0.11' maxCpus='255'/>
<machine type='kvm' name='pc-0.12' maxCpus='255'/>
<machine type='kvm' name='pc-0.13' maxCpus='255'/>
<machine type='kvm' name='pc-0.14' maxCpus='255'/>
<machine type='kvm' name='pc-0.15' maxCpus='255'/>
<machine type='kvm' name='pc-1.0' maxCpus='255'/>
<machine type='kvm' name='pc-1.1' maxCpus='255'/>
<machine type='kvm' name='pc-1.2' maxCpus='255'/>
<machine type='kvm' name='pc-1.3' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-1.4' maxCpus='255'/>
<cpu type='tcg' name='Opteron_G5'/>
<cpu type='tcg' name='Opteron_G4'/>
<cpu type='tcg' name='Opteron_G3'/>
@ -151,4 +151,19 @@
<cpu type='tcg' name='core2duo'/>
<cpu type='tcg' name='phenom'/>
<cpu type='tcg' name='qemu64'/>
<machine type='tcg' name='pc-i440fx-1.5' alias='pc' maxCpus='255' default='yes'/>
<machine type='tcg' name='pc-q35-1.4' maxCpus='255'/>
<machine type='tcg' name='pc-q35-1.5' alias='q35' maxCpus='255'/>
<machine type='tcg' name='isapc' maxCpus='1'/>
<machine type='tcg' name='pc-0.10' maxCpus='255'/>
<machine type='tcg' name='pc-0.11' maxCpus='255'/>
<machine type='tcg' name='pc-0.12' maxCpus='255'/>
<machine type='tcg' name='pc-0.13' maxCpus='255'/>
<machine type='tcg' name='pc-0.14' maxCpus='255'/>
<machine type='tcg' name='pc-0.15' maxCpus='255'/>
<machine type='tcg' name='pc-1.0' maxCpus='255'/>
<machine type='tcg' name='pc-1.1' maxCpus='255'/>
<machine type='tcg' name='pc-1.2' maxCpus='255'/>
<machine type='tcg' name='pc-1.3' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-1.4' maxCpus='255'/>
</qemuCaps>

View File

@ -117,23 +117,23 @@
<cpu type='kvm' name='core2duo'/>
<cpu type='kvm' name='phenom'/>
<cpu type='kvm' name='qemu64'/>
<machine name='pc-i440fx-1.6' alias='pc' maxCpus='255' default='yes'/>
<machine name='pc-q35-1.4' maxCpus='255'/>
<machine name='pc-q35-1.5' maxCpus='255'/>
<machine name='pc-q35-1.6' alias='q35' maxCpus='255'/>
<machine name='isapc' maxCpus='1'/>
<machine name='pc-0.10' maxCpus='255'/>
<machine name='pc-0.11' maxCpus='255'/>
<machine name='pc-0.12' maxCpus='255'/>
<machine name='pc-0.13' maxCpus='255'/>
<machine name='pc-0.14' maxCpus='255'/>
<machine name='pc-0.15' maxCpus='255'/>
<machine name='pc-1.0' maxCpus='255'/>
<machine name='pc-1.1' maxCpus='255'/>
<machine name='pc-1.2' maxCpus='255'/>
<machine name='pc-1.3' maxCpus='255'/>
<machine name='pc-i440fx-1.4' maxCpus='255'/>
<machine name='pc-i440fx-1.5' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-1.6' alias='pc' maxCpus='255' default='yes'/>
<machine type='kvm' name='pc-q35-1.4' maxCpus='255'/>
<machine type='kvm' name='pc-q35-1.5' maxCpus='255'/>
<machine type='kvm' name='pc-q35-1.6' alias='q35' maxCpus='255'/>
<machine type='kvm' name='isapc' maxCpus='1'/>
<machine type='kvm' name='pc-0.10' maxCpus='255'/>
<machine type='kvm' name='pc-0.11' maxCpus='255'/>
<machine type='kvm' name='pc-0.12' maxCpus='255'/>
<machine type='kvm' name='pc-0.13' maxCpus='255'/>
<machine type='kvm' name='pc-0.14' maxCpus='255'/>
<machine type='kvm' name='pc-0.15' maxCpus='255'/>
<machine type='kvm' name='pc-1.0' maxCpus='255'/>
<machine type='kvm' name='pc-1.1' maxCpus='255'/>
<machine type='kvm' name='pc-1.2' maxCpus='255'/>
<machine type='kvm' name='pc-1.3' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-1.4' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-1.5' maxCpus='255'/>
<cpu type='tcg' name='Opteron_G5'/>
<cpu type='tcg' name='Opteron_G4'/>
<cpu type='tcg' name='Opteron_G3'/>
@ -158,4 +158,21 @@
<cpu type='tcg' name='core2duo'/>
<cpu type='tcg' name='phenom'/>
<cpu type='tcg' name='qemu64'/>
<machine type='tcg' name='pc-i440fx-1.6' alias='pc' maxCpus='255' default='yes'/>
<machine type='tcg' name='pc-q35-1.4' maxCpus='255'/>
<machine type='tcg' name='pc-q35-1.5' maxCpus='255'/>
<machine type='tcg' name='pc-q35-1.6' alias='q35' maxCpus='255'/>
<machine type='tcg' name='isapc' maxCpus='1'/>
<machine type='tcg' name='pc-0.10' maxCpus='255'/>
<machine type='tcg' name='pc-0.11' maxCpus='255'/>
<machine type='tcg' name='pc-0.12' maxCpus='255'/>
<machine type='tcg' name='pc-0.13' maxCpus='255'/>
<machine type='tcg' name='pc-0.14' maxCpus='255'/>
<machine type='tcg' name='pc-0.15' maxCpus='255'/>
<machine type='tcg' name='pc-1.0' maxCpus='255'/>
<machine type='tcg' name='pc-1.1' maxCpus='255'/>
<machine type='tcg' name='pc-1.2' maxCpus='255'/>
<machine type='tcg' name='pc-1.3' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-1.4' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-1.5' maxCpus='255'/>
</qemuCaps>

View File

@ -119,25 +119,25 @@
<cpu type='kvm' name='core2duo'/>
<cpu type='kvm' name='phenom'/>
<cpu type='kvm' name='qemu64'/>
<machine name='pc-i440fx-1.7' alias='pc' maxCpus='255' default='yes'/>
<machine name='pc-q35-1.4' maxCpus='255'/>
<machine name='pc-q35-1.5' maxCpus='255'/>
<machine name='pc-q35-1.6' maxCpus='255'/>
<machine name='pc-q35-1.7' alias='q35' maxCpus='255'/>
<machine name='isapc' maxCpus='1'/>
<machine name='pc-0.10' maxCpus='255'/>
<machine name='pc-0.11' maxCpus='255'/>
<machine name='pc-0.12' maxCpus='255'/>
<machine name='pc-0.13' maxCpus='255'/>
<machine name='pc-0.14' maxCpus='255'/>
<machine name='pc-0.15' maxCpus='255'/>
<machine name='pc-1.0' maxCpus='255'/>
<machine name='pc-1.1' maxCpus='255'/>
<machine name='pc-1.2' maxCpus='255'/>
<machine name='pc-1.3' maxCpus='255'/>
<machine name='pc-i440fx-1.4' maxCpus='255'/>
<machine name='pc-i440fx-1.5' maxCpus='255'/>
<machine name='pc-i440fx-1.6' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-1.7' alias='pc' maxCpus='255' default='yes'/>
<machine type='kvm' name='pc-q35-1.4' maxCpus='255'/>
<machine type='kvm' name='pc-q35-1.5' maxCpus='255'/>
<machine type='kvm' name='pc-q35-1.6' maxCpus='255'/>
<machine type='kvm' name='pc-q35-1.7' alias='q35' maxCpus='255'/>
<machine type='kvm' name='isapc' maxCpus='1'/>
<machine type='kvm' name='pc-0.10' maxCpus='255'/>
<machine type='kvm' name='pc-0.11' maxCpus='255'/>
<machine type='kvm' name='pc-0.12' maxCpus='255'/>
<machine type='kvm' name='pc-0.13' maxCpus='255'/>
<machine type='kvm' name='pc-0.14' maxCpus='255'/>
<machine type='kvm' name='pc-0.15' maxCpus='255'/>
<machine type='kvm' name='pc-1.0' maxCpus='255'/>
<machine type='kvm' name='pc-1.1' maxCpus='255'/>
<machine type='kvm' name='pc-1.2' maxCpus='255'/>
<machine type='kvm' name='pc-1.3' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-1.4' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-1.5' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-1.6' maxCpus='255'/>
<cpu type='tcg' name='Opteron_G5'/>
<cpu type='tcg' name='Opteron_G4'/>
<cpu type='tcg' name='Opteron_G3'/>
@ -162,4 +162,23 @@
<cpu type='tcg' name='core2duo'/>
<cpu type='tcg' name='phenom'/>
<cpu type='tcg' name='qemu64'/>
<machine type='tcg' name='pc-i440fx-1.7' alias='pc' maxCpus='255' default='yes'/>
<machine type='tcg' name='pc-q35-1.4' maxCpus='255'/>
<machine type='tcg' name='pc-q35-1.5' maxCpus='255'/>
<machine type='tcg' name='pc-q35-1.6' maxCpus='255'/>
<machine type='tcg' name='pc-q35-1.7' alias='q35' maxCpus='255'/>
<machine type='tcg' name='isapc' maxCpus='1'/>
<machine type='tcg' name='pc-0.10' maxCpus='255'/>
<machine type='tcg' name='pc-0.11' maxCpus='255'/>
<machine type='tcg' name='pc-0.12' maxCpus='255'/>
<machine type='tcg' name='pc-0.13' maxCpus='255'/>
<machine type='tcg' name='pc-0.14' maxCpus='255'/>
<machine type='tcg' name='pc-0.15' maxCpus='255'/>
<machine type='tcg' name='pc-1.0' maxCpus='255'/>
<machine type='tcg' name='pc-1.1' maxCpus='255'/>
<machine type='tcg' name='pc-1.2' maxCpus='255'/>
<machine type='tcg' name='pc-1.3' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-1.4' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-1.5' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-1.6' maxCpus='255'/>
</qemuCaps>

View File

@ -136,29 +136,29 @@
<cpu type='kvm' name='core2duo'/>
<cpu type='kvm' name='phenom'/>
<cpu type='kvm' name='qemu64'/>
<machine name='pc-i440fx-2.1' alias='pc' maxCpus='255' default='yes'/>
<machine name='pc-1.3' maxCpus='255'/>
<machine name='pc-0.12' maxCpus='255'/>
<machine name='pc-q35-1.6' maxCpus='255'/>
<machine name='pc-q35-1.5' maxCpus='255'/>
<machine name='pc-i440fx-1.6' maxCpus='255'/>
<machine name='pc-i440fx-1.7' maxCpus='255'/>
<machine name='pc-q35-2.1' alias='q35' maxCpus='255'/>
<machine name='pc-0.11' maxCpus='255'/>
<machine name='pc-0.10' maxCpus='255'/>
<machine name='pc-1.2' maxCpus='255'/>
<machine name='isapc' maxCpus='1'/>
<machine name='pc-q35-1.4' maxCpus='255'/>
<machine name='pc-0.15' maxCpus='255'/>
<machine name='pc-i440fx-1.5' maxCpus='255'/>
<machine name='pc-i440fx-1.4' maxCpus='255'/>
<machine name='pc-q35-2.0' maxCpus='255'/>
<machine name='pc-0.14' maxCpus='255'/>
<machine name='pc-1.1' maxCpus='255'/>
<machine name='pc-q35-1.7' maxCpus='255'/>
<machine name='pc-1.0' maxCpus='255'/>
<machine name='pc-i440fx-2.0' maxCpus='255'/>
<machine name='pc-0.13' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.1' alias='pc' maxCpus='255' default='yes'/>
<machine type='kvm' name='pc-1.3' maxCpus='255'/>
<machine type='kvm' name='pc-0.12' maxCpus='255'/>
<machine type='kvm' name='pc-q35-1.6' maxCpus='255'/>
<machine type='kvm' name='pc-q35-1.5' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-1.6' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-1.7' maxCpus='255'/>
<machine type='kvm' name='pc-q35-2.1' alias='q35' maxCpus='255'/>
<machine type='kvm' name='pc-0.11' maxCpus='255'/>
<machine type='kvm' name='pc-0.10' maxCpus='255'/>
<machine type='kvm' name='pc-1.2' maxCpus='255'/>
<machine type='kvm' name='isapc' maxCpus='1'/>
<machine type='kvm' name='pc-q35-1.4' maxCpus='255'/>
<machine type='kvm' name='pc-0.15' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-1.5' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-1.4' maxCpus='255'/>
<machine type='kvm' name='pc-q35-2.0' maxCpus='255'/>
<machine type='kvm' name='pc-0.14' maxCpus='255'/>
<machine type='kvm' name='pc-1.1' maxCpus='255'/>
<machine type='kvm' name='pc-q35-1.7' maxCpus='255'/>
<machine type='kvm' name='pc-1.0' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.0' maxCpus='255'/>
<machine type='kvm' name='pc-0.13' maxCpus='255'/>
<cpu type='tcg' name='Opteron_G5'/>
<cpu type='tcg' name='Opteron_G4'/>
<cpu type='tcg' name='Opteron_G3'/>
@ -184,4 +184,27 @@
<cpu type='tcg' name='core2duo'/>
<cpu type='tcg' name='phenom'/>
<cpu type='tcg' name='qemu64'/>
<machine type='tcg' name='pc-i440fx-2.1' alias='pc' maxCpus='255' default='yes'/>
<machine type='tcg' name='pc-1.3' maxCpus='255'/>
<machine type='tcg' name='pc-0.12' maxCpus='255'/>
<machine type='tcg' name='pc-q35-1.6' maxCpus='255'/>
<machine type='tcg' name='pc-q35-1.5' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-1.6' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-1.7' maxCpus='255'/>
<machine type='tcg' name='pc-q35-2.1' alias='q35' maxCpus='255'/>
<machine type='tcg' name='pc-0.11' maxCpus='255'/>
<machine type='tcg' name='pc-0.10' maxCpus='255'/>
<machine type='tcg' name='pc-1.2' maxCpus='255'/>
<machine type='tcg' name='isapc' maxCpus='1'/>
<machine type='tcg' name='pc-q35-1.4' maxCpus='255'/>
<machine type='tcg' name='pc-0.15' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-1.5' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-1.4' maxCpus='255'/>
<machine type='tcg' name='pc-q35-2.0' maxCpus='255'/>
<machine type='tcg' name='pc-0.14' maxCpus='255'/>
<machine type='tcg' name='pc-1.1' maxCpus='255'/>
<machine type='tcg' name='pc-q35-1.7' maxCpus='255'/>
<machine type='tcg' name='pc-1.0' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.0' maxCpus='255'/>
<machine type='tcg' name='pc-0.13' maxCpus='255'/>
</qemuCaps>

View File

@ -176,57 +176,57 @@
<cpu type='kvm' name='cortex-r5' typename='cortex-r5-arm-cpu'/>
<cpu type='kvm' name='pxa270-a1' typename='pxa270-a1-arm-cpu'/>
<cpu type='kvm' name='pxa270' typename='pxa270-arm-cpu'/>
<machine name='integratorcp' maxCpus='1'/>
<machine name='nuri' maxCpus='2'/>
<machine name='mps2-an511' maxCpus='1'/>
<machine name='verdex' maxCpus='1'/>
<machine name='ast2500-evb' maxCpus='1'/>
<machine name='smdkc210' maxCpus='2'/>
<machine name='collie' maxCpus='1'/>
<machine name='imx25-pdk' maxCpus='1'/>
<machine name='spitz' maxCpus='1'/>
<machine name='realview-pbx-a9' maxCpus='4'/>
<machine name='realview-eb' maxCpus='1'/>
<machine name='versatilepb' maxCpus='1'/>
<machine name='realview-pb-a8' maxCpus='1'/>
<machine name='virt-2.9' maxCpus='255'/>
<machine name='musicpal' maxCpus='1'/>
<machine name='z2' maxCpus='1'/>
<machine name='akita' maxCpus='1'/>
<machine name='virt-2.7' maxCpus='255'/>
<machine name='kzm' maxCpus='1'/>
<machine name='virt-2.8' maxCpus='255'/>
<machine name='realview-eb-mpcore' maxCpus='4'/>
<machine name='sx1' maxCpus='1'/>
<machine name='sx1-v1' maxCpus='1'/>
<machine name='virt-2.6' maxCpus='255'/>
<machine name='cubieboard' maxCpus='1'/>
<machine name='highbank' maxCpus='4'/>
<machine name='raspi2' maxCpus='4'/>
<machine name='netduino2' maxCpus='1'/>
<machine name='terrier' maxCpus='1'/>
<machine name='n810' maxCpus='1'/>
<machine name='mainstone' maxCpus='1'/>
<machine name='palmetto-bmc' maxCpus='1'/>
<machine name='sabrelite' maxCpus='4'/>
<machine name='midway' maxCpus='4'/>
<machine name='romulus-bmc' maxCpus='1'/>
<machine name='cheetah' maxCpus='1'/>
<machine name='tosa' maxCpus='1'/>
<machine name='borzoi' maxCpus='1'/>
<machine name='versatileab' maxCpus='1'/>
<machine name='lm3s6965evb' maxCpus='1'/>
<machine name='n800' maxCpus='1'/>
<machine name='virt-2.10' alias='virt' maxCpus='255'/>
<machine name='connex' maxCpus='1'/>
<machine name='xilinx-zynq-a9' maxCpus='1'/>
<machine name='xlnx-ep108' maxCpus='1'/>
<machine name='mps2-an385' maxCpus='1'/>
<machine name='vexpress-a9' maxCpus='4'/>
<machine name='vexpress-a15' maxCpus='4'/>
<machine name='xlnx-zcu102' maxCpus='1'/>
<machine name='canon-a1100' maxCpus='1'/>
<machine name='lm3s811evb' maxCpus='1'/>
<machine type='kvm' name='integratorcp' maxCpus='1'/>
<machine type='kvm' name='nuri' maxCpus='2'/>
<machine type='kvm' name='mps2-an511' maxCpus='1'/>
<machine type='kvm' name='verdex' maxCpus='1'/>
<machine type='kvm' name='ast2500-evb' maxCpus='1'/>
<machine type='kvm' name='smdkc210' maxCpus='2'/>
<machine type='kvm' name='collie' maxCpus='1'/>
<machine type='kvm' name='imx25-pdk' maxCpus='1'/>
<machine type='kvm' name='spitz' maxCpus='1'/>
<machine type='kvm' name='realview-pbx-a9' maxCpus='4'/>
<machine type='kvm' name='realview-eb' maxCpus='1'/>
<machine type='kvm' name='versatilepb' maxCpus='1'/>
<machine type='kvm' name='realview-pb-a8' maxCpus='1'/>
<machine type='kvm' name='virt-2.9' maxCpus='255'/>
<machine type='kvm' name='musicpal' maxCpus='1'/>
<machine type='kvm' name='z2' maxCpus='1'/>
<machine type='kvm' name='akita' maxCpus='1'/>
<machine type='kvm' name='virt-2.7' maxCpus='255'/>
<machine type='kvm' name='kzm' maxCpus='1'/>
<machine type='kvm' name='virt-2.8' maxCpus='255'/>
<machine type='kvm' name='realview-eb-mpcore' maxCpus='4'/>
<machine type='kvm' name='sx1' maxCpus='1'/>
<machine type='kvm' name='sx1-v1' maxCpus='1'/>
<machine type='kvm' name='virt-2.6' maxCpus='255'/>
<machine type='kvm' name='cubieboard' maxCpus='1'/>
<machine type='kvm' name='highbank' maxCpus='4'/>
<machine type='kvm' name='raspi2' maxCpus='4'/>
<machine type='kvm' name='netduino2' maxCpus='1'/>
<machine type='kvm' name='terrier' maxCpus='1'/>
<machine type='kvm' name='n810' maxCpus='1'/>
<machine type='kvm' name='mainstone' maxCpus='1'/>
<machine type='kvm' name='palmetto-bmc' maxCpus='1'/>
<machine type='kvm' name='sabrelite' maxCpus='4'/>
<machine type='kvm' name='midway' maxCpus='4'/>
<machine type='kvm' name='romulus-bmc' maxCpus='1'/>
<machine type='kvm' name='cheetah' maxCpus='1'/>
<machine type='kvm' name='tosa' maxCpus='1'/>
<machine type='kvm' name='borzoi' maxCpus='1'/>
<machine type='kvm' name='versatileab' maxCpus='1'/>
<machine type='kvm' name='lm3s6965evb' maxCpus='1'/>
<machine type='kvm' name='n800' maxCpus='1'/>
<machine type='kvm' name='virt-2.10' alias='virt' maxCpus='255'/>
<machine type='kvm' name='connex' maxCpus='1'/>
<machine type='kvm' name='xilinx-zynq-a9' maxCpus='1'/>
<machine type='kvm' name='xlnx-ep108' maxCpus='1'/>
<machine type='kvm' name='mps2-an385' maxCpus='1'/>
<machine type='kvm' name='vexpress-a9' maxCpus='4'/>
<machine type='kvm' name='vexpress-a15' maxCpus='4'/>
<machine type='kvm' name='xlnx-zcu102' maxCpus='1'/>
<machine type='kvm' name='canon-a1100' maxCpus='1'/>
<machine type='kvm' name='lm3s811evb' maxCpus='1'/>
<cpu type='tcg' name='pxa262' typename='pxa262-arm-cpu'/>
<cpu type='tcg' name='pxa270-a0' typename='pxa270-a0-arm-cpu'/>
<cpu type='tcg' name='arm1136' typename='arm1136-arm-cpu'/>
@ -258,6 +258,57 @@
<cpu type='tcg' name='cortex-r5' typename='cortex-r5-arm-cpu'/>
<cpu type='tcg' name='pxa270-a1' typename='pxa270-a1-arm-cpu'/>
<cpu type='tcg' name='pxa270' typename='pxa270-arm-cpu'/>
<machine type='tcg' name='integratorcp' maxCpus='1'/>
<machine type='tcg' name='nuri' maxCpus='2'/>
<machine type='tcg' name='mps2-an511' maxCpus='1'/>
<machine type='tcg' name='verdex' maxCpus='1'/>
<machine type='tcg' name='ast2500-evb' maxCpus='1'/>
<machine type='tcg' name='smdkc210' maxCpus='2'/>
<machine type='tcg' name='collie' maxCpus='1'/>
<machine type='tcg' name='imx25-pdk' maxCpus='1'/>
<machine type='tcg' name='spitz' maxCpus='1'/>
<machine type='tcg' name='realview-pbx-a9' maxCpus='4'/>
<machine type='tcg' name='realview-eb' maxCpus='1'/>
<machine type='tcg' name='versatilepb' maxCpus='1'/>
<machine type='tcg' name='realview-pb-a8' maxCpus='1'/>
<machine type='tcg' name='virt-2.9' maxCpus='255'/>
<machine type='tcg' name='musicpal' maxCpus='1'/>
<machine type='tcg' name='z2' maxCpus='1'/>
<machine type='tcg' name='akita' maxCpus='1'/>
<machine type='tcg' name='virt-2.7' maxCpus='255'/>
<machine type='tcg' name='kzm' maxCpus='1'/>
<machine type='tcg' name='virt-2.8' maxCpus='255'/>
<machine type='tcg' name='realview-eb-mpcore' maxCpus='4'/>
<machine type='tcg' name='sx1' maxCpus='1'/>
<machine type='tcg' name='sx1-v1' maxCpus='1'/>
<machine type='tcg' name='virt-2.6' maxCpus='255'/>
<machine type='tcg' name='cubieboard' maxCpus='1'/>
<machine type='tcg' name='highbank' maxCpus='4'/>
<machine type='tcg' name='raspi2' maxCpus='4'/>
<machine type='tcg' name='netduino2' maxCpus='1'/>
<machine type='tcg' name='terrier' maxCpus='1'/>
<machine type='tcg' name='n810' maxCpus='1'/>
<machine type='tcg' name='mainstone' maxCpus='1'/>
<machine type='tcg' name='palmetto-bmc' maxCpus='1'/>
<machine type='tcg' name='sabrelite' maxCpus='4'/>
<machine type='tcg' name='midway' maxCpus='4'/>
<machine type='tcg' name='romulus-bmc' maxCpus='1'/>
<machine type='tcg' name='cheetah' maxCpus='1'/>
<machine type='tcg' name='tosa' maxCpus='1'/>
<machine type='tcg' name='borzoi' maxCpus='1'/>
<machine type='tcg' name='versatileab' maxCpus='1'/>
<machine type='tcg' name='lm3s6965evb' maxCpus='1'/>
<machine type='tcg' name='n800' maxCpus='1'/>
<machine type='tcg' name='virt-2.10' alias='virt' maxCpus='255'/>
<machine type='tcg' name='connex' maxCpus='1'/>
<machine type='tcg' name='xilinx-zynq-a9' maxCpus='1'/>
<machine type='tcg' name='xlnx-ep108' maxCpus='1'/>
<machine type='tcg' name='mps2-an385' maxCpus='1'/>
<machine type='tcg' name='vexpress-a9' maxCpus='4'/>
<machine type='tcg' name='vexpress-a15' maxCpus='4'/>
<machine type='tcg' name='xlnx-zcu102' maxCpus='1'/>
<machine type='tcg' name='canon-a1100' maxCpus='1'/>
<machine type='tcg' name='lm3s811evb' maxCpus='1'/>
<gic version='3' kernel='no' emulated='yes'/>
<gic version='2' kernel='yes' emulated='yes'/>
</qemuCaps>

View File

@ -577,27 +577,27 @@
<cpu type='kvm' name='MPC8544E_v11'/>
<cpu type='kvm' name='405GPb'/>
<cpu type='kvm' name='MPC8541E_v11'/>
<machine name='pseries-2.10' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes'/>
<machine name='ref405ep' maxCpus='1'/>
<machine name='virtex-ml507' maxCpus='1'/>
<machine name='powernv' maxCpus='2048'/>
<machine name='ppce500' maxCpus='32'/>
<machine name='mpc8544ds' maxCpus='15'/>
<machine name='bamboo' maxCpus='1'/>
<machine name='g3beige' maxCpus='1'/>
<machine name='prep' maxCpus='1'/>
<machine name='pseries-2.9' hotplugCpus='yes' maxCpus='1024'/>
<machine name='mac99' maxCpus='1'/>
<machine name='pseries-2.6' maxCpus='1024'/>
<machine name='pseries-2.7' hotplugCpus='yes' maxCpus='1024'/>
<machine name='pseries-2.8' hotplugCpus='yes' maxCpus='1024'/>
<machine name='pseries-2.4' maxCpus='1024'/>
<machine name='pseries-2.5' maxCpus='1024'/>
<machine name='pseries-2.2' maxCpus='1024'/>
<machine name='taihu' maxCpus='1'/>
<machine name='pseries-2.3' maxCpus='1024'/>
<machine name='pseries-2.1' maxCpus='1024'/>
<machine name='40p' maxCpus='1'/>
<machine type='kvm' name='pseries-2.10' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes'/>
<machine type='kvm' name='ref405ep' maxCpus='1'/>
<machine type='kvm' name='virtex-ml507' maxCpus='1'/>
<machine type='kvm' name='powernv' maxCpus='2048'/>
<machine type='kvm' name='ppce500' maxCpus='32'/>
<machine type='kvm' name='mpc8544ds' maxCpus='15'/>
<machine type='kvm' name='bamboo' maxCpus='1'/>
<machine type='kvm' name='g3beige' maxCpus='1'/>
<machine type='kvm' name='prep' maxCpus='1'/>
<machine type='kvm' name='pseries-2.9' hotplugCpus='yes' maxCpus='1024'/>
<machine type='kvm' name='mac99' maxCpus='1'/>
<machine type='kvm' name='pseries-2.6' maxCpus='1024'/>
<machine type='kvm' name='pseries-2.7' hotplugCpus='yes' maxCpus='1024'/>
<machine type='kvm' name='pseries-2.8' hotplugCpus='yes' maxCpus='1024'/>
<machine type='kvm' name='pseries-2.4' maxCpus='1024'/>
<machine type='kvm' name='pseries-2.5' maxCpus='1024'/>
<machine type='kvm' name='pseries-2.2' maxCpus='1024'/>
<machine type='kvm' name='taihu' maxCpus='1'/>
<machine type='kvm' name='pseries-2.3' maxCpus='1024'/>
<machine type='kvm' name='pseries-2.1' maxCpus='1024'/>
<machine type='kvm' name='40p' maxCpus='1'/>
<cpu type='tcg' name='default' typename='604-powerpc64-cpu'/>
<cpu type='tcg' name='ppc' typename='604-powerpc64-cpu'/>
<cpu type='tcg' name='ppc32' typename='604-powerpc64-cpu'/>
@ -1031,4 +1031,25 @@
<cpu type='tcg' name='MPC8544E_v11'/>
<cpu type='tcg' name='405GPb'/>
<cpu type='tcg' name='MPC8541E_v11'/>
<machine type='tcg' name='pseries-2.10' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes'/>
<machine type='tcg' name='ref405ep' maxCpus='1'/>
<machine type='tcg' name='virtex-ml507' maxCpus='1'/>
<machine type='tcg' name='powernv' maxCpus='2048'/>
<machine type='tcg' name='ppce500' maxCpus='32'/>
<machine type='tcg' name='mpc8544ds' maxCpus='15'/>
<machine type='tcg' name='bamboo' maxCpus='1'/>
<machine type='tcg' name='g3beige' maxCpus='1'/>
<machine type='tcg' name='prep' maxCpus='1'/>
<machine type='tcg' name='pseries-2.9' hotplugCpus='yes' maxCpus='1024'/>
<machine type='tcg' name='mac99' maxCpus='1'/>
<machine type='tcg' name='pseries-2.6' maxCpus='1024'/>
<machine type='tcg' name='pseries-2.7' hotplugCpus='yes' maxCpus='1024'/>
<machine type='tcg' name='pseries-2.8' hotplugCpus='yes' maxCpus='1024'/>
<machine type='tcg' name='pseries-2.4' maxCpus='1024'/>
<machine type='tcg' name='pseries-2.5' maxCpus='1024'/>
<machine type='tcg' name='pseries-2.2' maxCpus='1024'/>
<machine type='tcg' name='taihu' maxCpus='1'/>
<machine type='tcg' name='pseries-2.3' maxCpus='1024'/>
<machine type='tcg' name='pseries-2.1' maxCpus='1024'/>
<machine type='tcg' name='40p' maxCpus='1'/>
</qemuCaps>

View File

@ -207,13 +207,13 @@
<cpu type='kvm' name='z196-base' typename='z196-base-s390-cpu' usable='yes'/>
<cpu type='kvm' name='z13-base' typename='z13-base-s390-cpu' usable='yes'/>
<cpu type='kvm' name='z890' typename='z890-s390-cpu' usable='yes'/>
<machine name='s390-ccw-virtio-2.10' alias='s390-ccw-virtio' maxCpus='248' default='yes'/>
<machine name='s390-ccw-virtio-2.7' maxCpus='248'/>
<machine name='s390-ccw-virtio-2.6' maxCpus='248'/>
<machine name='s390-ccw-virtio-2.5' maxCpus='248'/>
<machine name='s390-ccw-virtio-2.4' maxCpus='248'/>
<machine name='s390-ccw-virtio-2.9' maxCpus='248'/>
<machine name='s390-ccw-virtio-2.8' maxCpus='248'/>
<machine type='kvm' name='s390-ccw-virtio-2.10' alias='s390-ccw-virtio' maxCpus='248' default='yes'/>
<machine type='kvm' name='s390-ccw-virtio-2.7' maxCpus='248'/>
<machine type='kvm' name='s390-ccw-virtio-2.6' maxCpus='248'/>
<machine type='kvm' name='s390-ccw-virtio-2.5' maxCpus='248'/>
<machine type='kvm' name='s390-ccw-virtio-2.4' maxCpus='248'/>
<machine type='kvm' name='s390-ccw-virtio-2.9' maxCpus='248'/>
<machine type='kvm' name='s390-ccw-virtio-2.8' maxCpus='248'/>
<cpu type='tcg' name='z10EC-base' typename='z10EC-base-s390-cpu' usable='no'>
<blocker name='dateh2'/>
<blocker name='pfpo'/>
@ -1258,4 +1258,11 @@
<blocker name='msa'/>
<blocker name='type'/>
</cpu>
<machine type='tcg' name='s390-ccw-virtio-2.10' alias='s390-ccw-virtio' maxCpus='248' default='yes'/>
<machine type='tcg' name='s390-ccw-virtio-2.7' maxCpus='248'/>
<machine type='tcg' name='s390-ccw-virtio-2.6' maxCpus='248'/>
<machine type='tcg' name='s390-ccw-virtio-2.5' maxCpus='248'/>
<machine type='tcg' name='s390-ccw-virtio-2.4' maxCpus='248'/>
<machine type='tcg' name='s390-ccw-virtio-2.9' maxCpus='248'/>
<machine type='tcg' name='s390-ccw-virtio-2.8' maxCpus='248'/>
</qemuCaps>

View File

@ -528,41 +528,41 @@
<blocker name='3dnowprefetch'/>
</cpu>
<cpu type='kvm' name='486' typename='486-x86_64-cpu' usable='yes'/>
<machine name='pc-i440fx-2.10' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/>
<machine name='pc-0.12' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-1.3' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255'/>
<machine name='xenpv' maxCpus='1'/>
<machine name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-0.11' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-0.10' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-1.2' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255'/>
<machine name='isapc' hotplugCpus='yes' maxCpus='1'/>
<machine name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255'/>
<machine name='xenfv' hotplugCpus='yes' maxCpus='128'/>
<machine name='pc-0.15' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-0.14' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288'/>
<machine name='pc-1.1' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288'/>
<machine name='pc-1.0' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-0.13' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-2.10' alias='q35' hotplugCpus='yes' maxCpus='288'/>
<machine type='kvm' name='pc-i440fx-2.10' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/>
<machine type='kvm' name='pc-0.12' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-1.3' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='xenpv' maxCpus='1'/>
<machine type='kvm' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-0.11' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-0.10' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-1.2' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='isapc' hotplugCpus='yes' maxCpus='1'/>
<machine type='kvm' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='xenfv' hotplugCpus='yes' maxCpus='128'/>
<machine type='kvm' name='pc-0.15' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-0.14' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288'/>
<machine type='kvm' name='pc-1.1' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288'/>
<machine type='kvm' name='pc-1.0' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-0.13' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-q35-2.10' alias='q35' hotplugCpus='yes' maxCpus='288'/>
<hostCPU type='tcg' model='base' migratability='yes'>
<property name='phys-bits' type='number' value='0'/>
<property name='core-id' type='number' value='-1'/>
@ -945,4 +945,39 @@
<blocker name='3dnowprefetch'/>
</cpu>
<cpu type='tcg' name='486' typename='486-x86_64-cpu' usable='yes'/>
<machine type='tcg' name='pc-i440fx-2.10' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/>
<machine type='tcg' name='pc-0.12' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-1.3' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='xenpv' maxCpus='1'/>
<machine type='tcg' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-0.11' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-0.10' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-1.2' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='isapc' hotplugCpus='yes' maxCpus='1'/>
<machine type='tcg' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='xenfv' hotplugCpus='yes' maxCpus='128'/>
<machine type='tcg' name='pc-0.15' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-0.14' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288'/>
<machine type='tcg' name='pc-1.1' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288'/>
<machine type='tcg' name='pc-1.0' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-0.13' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-q35-2.10' alias='q35' hotplugCpus='yes' maxCpus='288'/>
</qemuCaps>

View File

@ -213,14 +213,14 @@
<cpu type='kvm' name='z9BC' typename='z9BC-s390x-cpu' usable='yes'/>
<cpu type='kvm' name='z10EC.3-base' typename='z10EC.3-base-s390x-cpu' usable='yes'/>
<cpu type='kvm' name='z990.3-base' typename='z990.3-base-s390x-cpu' usable='yes'/>
<machine name='s390-ccw-virtio-2.11' alias='s390-ccw-virtio' hotplugCpus='yes' maxCpus='248' default='yes'/>
<machine name='s390-ccw-virtio-2.7' hotplugCpus='yes' maxCpus='248'/>
<machine name='s390-ccw-virtio-2.6' hotplugCpus='yes' maxCpus='248'/>
<machine name='s390-ccw-virtio-2.10' hotplugCpus='yes' maxCpus='248'/>
<machine name='s390-ccw-virtio-2.5' hotplugCpus='yes' maxCpus='248'/>
<machine name='s390-ccw-virtio-2.4' hotplugCpus='yes' maxCpus='248'/>
<machine name='s390-ccw-virtio-2.9' hotplugCpus='yes' maxCpus='248'/>
<machine name='s390-ccw-virtio-2.8' hotplugCpus='yes' maxCpus='248'/>
<machine type='kvm' name='s390-ccw-virtio-2.11' alias='s390-ccw-virtio' hotplugCpus='yes' maxCpus='248' default='yes'/>
<machine type='kvm' name='s390-ccw-virtio-2.7' hotplugCpus='yes' maxCpus='248'/>
<machine type='kvm' name='s390-ccw-virtio-2.6' hotplugCpus='yes' maxCpus='248'/>
<machine type='kvm' name='s390-ccw-virtio-2.10' hotplugCpus='yes' maxCpus='248'/>
<machine type='kvm' name='s390-ccw-virtio-2.5' hotplugCpus='yes' maxCpus='248'/>
<machine type='kvm' name='s390-ccw-virtio-2.4' hotplugCpus='yes' maxCpus='248'/>
<machine type='kvm' name='s390-ccw-virtio-2.9' hotplugCpus='yes' maxCpus='248'/>
<machine type='kvm' name='s390-ccw-virtio-2.8' hotplugCpus='yes' maxCpus='248'/>
<cpu type='tcg' name='z890.2' typename='z890.2-s390x-cpu' usable='no'>
<blocker name='klmd-sha-1'/>
<blocker name='kimd-sha-1'/>
@ -2604,4 +2604,12 @@
<blocker name='hfpm'/>
<blocker name='type'/>
</cpu>
<machine type='tcg' name='s390-ccw-virtio-2.11' alias='s390-ccw-virtio' hotplugCpus='yes' maxCpus='248' default='yes'/>
<machine type='tcg' name='s390-ccw-virtio-2.7' hotplugCpus='yes' maxCpus='248'/>
<machine type='tcg' name='s390-ccw-virtio-2.6' hotplugCpus='yes' maxCpus='248'/>
<machine type='tcg' name='s390-ccw-virtio-2.10' hotplugCpus='yes' maxCpus='248'/>
<machine type='tcg' name='s390-ccw-virtio-2.5' hotplugCpus='yes' maxCpus='248'/>
<machine type='tcg' name='s390-ccw-virtio-2.4' hotplugCpus='yes' maxCpus='248'/>
<machine type='tcg' name='s390-ccw-virtio-2.9' hotplugCpus='yes' maxCpus='248'/>
<machine type='tcg' name='s390-ccw-virtio-2.8' hotplugCpus='yes' maxCpus='248'/>
</qemuCaps>

View File

@ -505,41 +505,41 @@
<cpu type='kvm' name='Broadwell' typename='Broadwell-x86_64-cpu' usable='yes'/>
<cpu type='kvm' name='Broadwell-noTSX' typename='Broadwell-noTSX-x86_64-cpu' usable='yes'/>
<cpu type='kvm' name='486' typename='486-x86_64-cpu' usable='yes'/>
<machine name='pc-i440fx-2.11' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/>
<machine name='pc-0.12' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-1.3' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-0.11' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-0.10' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-1.2' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255'/>
<machine name='isapc' hotplugCpus='yes' maxCpus='1'/>
<machine name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-0.15' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-0.14' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288'/>
<machine name='pc-1.1' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288'/>
<machine name='pc-1.0' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-2.11' alias='q35' hotplugCpus='yes' maxCpus='288'/>
<machine name='pc-0.13' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288'/>
<machine type='kvm' name='pc-i440fx-2.11' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/>
<machine type='kvm' name='pc-0.12' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-1.3' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-0.11' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-0.10' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-1.2' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='isapc' hotplugCpus='yes' maxCpus='1'/>
<machine type='kvm' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-0.15' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-0.14' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288'/>
<machine type='kvm' name='pc-1.1' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288'/>
<machine type='kvm' name='pc-1.0' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-q35-2.11' alias='q35' hotplugCpus='yes' maxCpus='288'/>
<machine type='kvm' name='pc-0.13' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288'/>
<hostCPU type='tcg' model='base' migratability='yes'>
<property name='phys-bits' type='number' value='0'/>
<property name='core-id' type='number' value='-1'/>
@ -938,4 +938,39 @@
<blocker name='3dnowprefetch'/>
</cpu>
<cpu type='tcg' name='486' typename='486-x86_64-cpu' usable='yes'/>
<machine type='tcg' name='pc-i440fx-2.11' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/>
<machine type='tcg' name='pc-0.12' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-1.3' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-0.11' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-0.10' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-1.2' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='isapc' hotplugCpus='yes' maxCpus='1'/>
<machine type='tcg' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-0.15' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-0.14' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288'/>
<machine type='tcg' name='pc-1.1' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288'/>
<machine type='tcg' name='pc-1.0' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-q35-2.11' alias='q35' hotplugCpus='yes' maxCpus='288'/>
<machine type='tcg' name='pc-0.13' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288'/>
</qemuCaps>

View File

@ -193,63 +193,63 @@
<cpu type='kvm' name='cortex-r5' typename='cortex-r5-arm-cpu'/>
<cpu type='kvm' name='pxa270-a1' typename='pxa270-a1-arm-cpu'/>
<cpu type='kvm' name='pxa270' typename='pxa270-arm-cpu'/>
<machine name='integratorcp' maxCpus='1'/>
<machine name='nuri' maxCpus='2'/>
<machine name='mps2-an511' maxCpus='1'/>
<machine name='verdex' maxCpus='1'/>
<machine name='mps2-an505' maxCpus='1'/>
<machine name='ast2500-evb' maxCpus='1'/>
<machine name='smdkc210' maxCpus='2'/>
<machine name='collie' maxCpus='1'/>
<machine name='imx25-pdk' maxCpus='1'/>
<machine name='spitz' maxCpus='1'/>
<machine name='realview-pbx-a9' maxCpus='4'/>
<machine name='realview-eb' maxCpus='1'/>
<machine name='realview-pb-a8' maxCpus='1'/>
<machine name='versatilepb' maxCpus='1'/>
<machine name='emcraft-sf2' maxCpus='1'/>
<machine name='virt-2.9' maxCpus='255'/>
<machine name='musicpal' maxCpus='1'/>
<machine name='z2' maxCpus='1'/>
<machine name='akita' maxCpus='1'/>
<machine name='virt-2.7' maxCpus='255'/>
<machine name='kzm' maxCpus='1'/>
<machine name='virt-2.8' maxCpus='255'/>
<machine name='realview-eb-mpcore' maxCpus='4'/>
<machine name='mcimx7d-sabre' maxCpus='2'/>
<machine name='sx1' maxCpus='1'/>
<machine name='sx1-v1' maxCpus='1'/>
<machine name='virt-2.6' maxCpus='255'/>
<machine name='cubieboard' maxCpus='1'/>
<machine name='highbank' maxCpus='4'/>
<machine name='raspi2' maxCpus='4'/>
<machine name='raspi3' maxCpus='4'/>
<machine name='netduino2' maxCpus='1'/>
<machine name='terrier' maxCpus='1'/>
<machine name='n810' maxCpus='1'/>
<machine name='mainstone' maxCpus='1'/>
<machine name='palmetto-bmc' maxCpus='1'/>
<machine name='sabrelite' maxCpus='4'/>
<machine name='midway' maxCpus='4'/>
<machine name='romulus-bmc' maxCpus='1'/>
<machine name='cheetah' maxCpus='1'/>
<machine name='tosa' maxCpus='1'/>
<machine name='borzoi' maxCpus='1'/>
<machine name='versatileab' maxCpus='1'/>
<machine name='lm3s6965evb' maxCpus='1'/>
<machine name='n800' maxCpus='1'/>
<machine name='virt-2.10' maxCpus='255'/>
<machine name='virt-2.11' maxCpus='255'/>
<machine name='connex' maxCpus='1'/>
<machine name='virt-2.12' alias='virt' maxCpus='255'/>
<machine name='xilinx-zynq-a9' maxCpus='1'/>
<machine name='xlnx-ep108' maxCpus='6'/>
<machine name='mps2-an385' maxCpus='1'/>
<machine name='vexpress-a9' maxCpus='4'/>
<machine name='vexpress-a15' maxCpus='4'/>
<machine name='xlnx-zcu102' maxCpus='6'/>
<machine name='canon-a1100' maxCpus='1'/>
<machine name='lm3s811evb' maxCpus='1'/>
<machine type='kvm' name='integratorcp' maxCpus='1'/>
<machine type='kvm' name='nuri' maxCpus='2'/>
<machine type='kvm' name='mps2-an511' maxCpus='1'/>
<machine type='kvm' name='verdex' maxCpus='1'/>
<machine type='kvm' name='mps2-an505' maxCpus='1'/>
<machine type='kvm' name='ast2500-evb' maxCpus='1'/>
<machine type='kvm' name='smdkc210' maxCpus='2'/>
<machine type='kvm' name='collie' maxCpus='1'/>
<machine type='kvm' name='imx25-pdk' maxCpus='1'/>
<machine type='kvm' name='spitz' maxCpus='1'/>
<machine type='kvm' name='realview-pbx-a9' maxCpus='4'/>
<machine type='kvm' name='realview-eb' maxCpus='1'/>
<machine type='kvm' name='realview-pb-a8' maxCpus='1'/>
<machine type='kvm' name='versatilepb' maxCpus='1'/>
<machine type='kvm' name='emcraft-sf2' maxCpus='1'/>
<machine type='kvm' name='virt-2.9' maxCpus='255'/>
<machine type='kvm' name='musicpal' maxCpus='1'/>
<machine type='kvm' name='z2' maxCpus='1'/>
<machine type='kvm' name='akita' maxCpus='1'/>
<machine type='kvm' name='virt-2.7' maxCpus='255'/>
<machine type='kvm' name='kzm' maxCpus='1'/>
<machine type='kvm' name='virt-2.8' maxCpus='255'/>
<machine type='kvm' name='realview-eb-mpcore' maxCpus='4'/>
<machine type='kvm' name='mcimx7d-sabre' maxCpus='2'/>
<machine type='kvm' name='sx1' maxCpus='1'/>
<machine type='kvm' name='sx1-v1' maxCpus='1'/>
<machine type='kvm' name='virt-2.6' maxCpus='255'/>
<machine type='kvm' name='cubieboard' maxCpus='1'/>
<machine type='kvm' name='highbank' maxCpus='4'/>
<machine type='kvm' name='raspi2' maxCpus='4'/>
<machine type='kvm' name='raspi3' maxCpus='4'/>
<machine type='kvm' name='netduino2' maxCpus='1'/>
<machine type='kvm' name='terrier' maxCpus='1'/>
<machine type='kvm' name='n810' maxCpus='1'/>
<machine type='kvm' name='mainstone' maxCpus='1'/>
<machine type='kvm' name='palmetto-bmc' maxCpus='1'/>
<machine type='kvm' name='sabrelite' maxCpus='4'/>
<machine type='kvm' name='midway' maxCpus='4'/>
<machine type='kvm' name='romulus-bmc' maxCpus='1'/>
<machine type='kvm' name='cheetah' maxCpus='1'/>
<machine type='kvm' name='tosa' maxCpus='1'/>
<machine type='kvm' name='borzoi' maxCpus='1'/>
<machine type='kvm' name='versatileab' maxCpus='1'/>
<machine type='kvm' name='lm3s6965evb' maxCpus='1'/>
<machine type='kvm' name='n800' maxCpus='1'/>
<machine type='kvm' name='virt-2.10' maxCpus='255'/>
<machine type='kvm' name='virt-2.11' maxCpus='255'/>
<machine type='kvm' name='connex' maxCpus='1'/>
<machine type='kvm' name='virt-2.12' alias='virt' maxCpus='255'/>
<machine type='kvm' name='xilinx-zynq-a9' maxCpus='1'/>
<machine type='kvm' name='xlnx-ep108' maxCpus='6'/>
<machine type='kvm' name='mps2-an385' maxCpus='1'/>
<machine type='kvm' name='vexpress-a9' maxCpus='4'/>
<machine type='kvm' name='vexpress-a15' maxCpus='4'/>
<machine type='kvm' name='xlnx-zcu102' maxCpus='6'/>
<machine type='kvm' name='canon-a1100' maxCpus='1'/>
<machine type='kvm' name='lm3s811evb' maxCpus='1'/>
<cpu type='tcg' name='pxa262' typename='pxa262-arm-cpu'/>
<cpu type='tcg' name='pxa270-a0' typename='pxa270-a0-arm-cpu'/>
<cpu type='tcg' name='arm1136' typename='arm1136-arm-cpu'/>
@ -284,6 +284,63 @@
<cpu type='tcg' name='cortex-r5' typename='cortex-r5-arm-cpu'/>
<cpu type='tcg' name='pxa270-a1' typename='pxa270-a1-arm-cpu'/>
<cpu type='tcg' name='pxa270' typename='pxa270-arm-cpu'/>
<machine type='tcg' name='integratorcp' maxCpus='1'/>
<machine type='tcg' name='nuri' maxCpus='2'/>
<machine type='tcg' name='mps2-an511' maxCpus='1'/>
<machine type='tcg' name='verdex' maxCpus='1'/>
<machine type='tcg' name='mps2-an505' maxCpus='1'/>
<machine type='tcg' name='ast2500-evb' maxCpus='1'/>
<machine type='tcg' name='smdkc210' maxCpus='2'/>
<machine type='tcg' name='collie' maxCpus='1'/>
<machine type='tcg' name='imx25-pdk' maxCpus='1'/>
<machine type='tcg' name='spitz' maxCpus='1'/>
<machine type='tcg' name='realview-pbx-a9' maxCpus='4'/>
<machine type='tcg' name='realview-eb' maxCpus='1'/>
<machine type='tcg' name='realview-pb-a8' maxCpus='1'/>
<machine type='tcg' name='versatilepb' maxCpus='1'/>
<machine type='tcg' name='emcraft-sf2' maxCpus='1'/>
<machine type='tcg' name='virt-2.9' maxCpus='255'/>
<machine type='tcg' name='musicpal' maxCpus='1'/>
<machine type='tcg' name='z2' maxCpus='1'/>
<machine type='tcg' name='akita' maxCpus='1'/>
<machine type='tcg' name='virt-2.7' maxCpus='255'/>
<machine type='tcg' name='kzm' maxCpus='1'/>
<machine type='tcg' name='virt-2.8' maxCpus='255'/>
<machine type='tcg' name='realview-eb-mpcore' maxCpus='4'/>
<machine type='tcg' name='mcimx7d-sabre' maxCpus='2'/>
<machine type='tcg' name='sx1' maxCpus='1'/>
<machine type='tcg' name='sx1-v1' maxCpus='1'/>
<machine type='tcg' name='virt-2.6' maxCpus='255'/>
<machine type='tcg' name='cubieboard' maxCpus='1'/>
<machine type='tcg' name='highbank' maxCpus='4'/>
<machine type='tcg' name='raspi2' maxCpus='4'/>
<machine type='tcg' name='raspi3' maxCpus='4'/>
<machine type='tcg' name='netduino2' maxCpus='1'/>
<machine type='tcg' name='terrier' maxCpus='1'/>
<machine type='tcg' name='n810' maxCpus='1'/>
<machine type='tcg' name='mainstone' maxCpus='1'/>
<machine type='tcg' name='palmetto-bmc' maxCpus='1'/>
<machine type='tcg' name='sabrelite' maxCpus='4'/>
<machine type='tcg' name='midway' maxCpus='4'/>
<machine type='tcg' name='romulus-bmc' maxCpus='1'/>
<machine type='tcg' name='cheetah' maxCpus='1'/>
<machine type='tcg' name='tosa' maxCpus='1'/>
<machine type='tcg' name='borzoi' maxCpus='1'/>
<machine type='tcg' name='versatileab' maxCpus='1'/>
<machine type='tcg' name='lm3s6965evb' maxCpus='1'/>
<machine type='tcg' name='n800' maxCpus='1'/>
<machine type='tcg' name='virt-2.10' maxCpus='255'/>
<machine type='tcg' name='virt-2.11' maxCpus='255'/>
<machine type='tcg' name='connex' maxCpus='1'/>
<machine type='tcg' name='virt-2.12' alias='virt' maxCpus='255'/>
<machine type='tcg' name='xilinx-zynq-a9' maxCpus='1'/>
<machine type='tcg' name='xlnx-ep108' maxCpus='6'/>
<machine type='tcg' name='mps2-an385' maxCpus='1'/>
<machine type='tcg' name='vexpress-a9' maxCpus='4'/>
<machine type='tcg' name='vexpress-a15' maxCpus='4'/>
<machine type='tcg' name='xlnx-zcu102' maxCpus='6'/>
<machine type='tcg' name='canon-a1100' maxCpus='1'/>
<machine type='tcg' name='lm3s811evb' maxCpus='1'/>
<gic version='3' kernel='yes' emulated='yes'/>
<gic version='2' kernel='no' emulated='yes'/>
</qemuCaps>

View File

@ -594,31 +594,31 @@
<cpu type='kvm' name='750_v3.1'/>
<cpu type='kvm' name='power8e_v2.1'/>
<cpu type='kvm' name='mpc8568e'/>
<machine name='pseries-2.12' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes'/>
<machine name='ref405ep' maxCpus='1'/>
<machine name='sam460ex' maxCpus='1'/>
<machine name='virtex-ml507' maxCpus='1'/>
<machine name='powernv' maxCpus='2048'/>
<machine name='ppce500' maxCpus='32'/>
<machine name='mpc8544ds' maxCpus='15'/>
<machine name='pseries-2.12-sxxm' hotplugCpus='yes' maxCpus='1024'/>
<machine name='bamboo' maxCpus='1'/>
<machine name='g3beige' maxCpus='1'/>
<machine name='pseries-2.10' hotplugCpus='yes' maxCpus='1024'/>
<machine name='prep' maxCpus='1'/>
<machine name='pseries-2.11' hotplugCpus='yes' maxCpus='1024'/>
<machine name='pseries-2.9' hotplugCpus='yes' maxCpus='1024'/>
<machine name='mac99' maxCpus='1'/>
<machine name='pseries-2.6' maxCpus='1024'/>
<machine name='pseries-2.7' hotplugCpus='yes' maxCpus='1024'/>
<machine name='pseries-2.8' hotplugCpus='yes' maxCpus='1024'/>
<machine name='pseries-2.4' maxCpus='1024'/>
<machine name='pseries-2.5' maxCpus='1024'/>
<machine name='pseries-2.2' maxCpus='1024'/>
<machine name='taihu' maxCpus='1'/>
<machine name='pseries-2.3' maxCpus='1024'/>
<machine name='pseries-2.1' maxCpus='1024'/>
<machine name='40p' maxCpus='1'/>
<machine type='kvm' name='pseries-2.12' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes'/>
<machine type='kvm' name='ref405ep' maxCpus='1'/>
<machine type='kvm' name='sam460ex' maxCpus='1'/>
<machine type='kvm' name='virtex-ml507' maxCpus='1'/>
<machine type='kvm' name='powernv' maxCpus='2048'/>
<machine type='kvm' name='ppce500' maxCpus='32'/>
<machine type='kvm' name='mpc8544ds' maxCpus='15'/>
<machine type='kvm' name='pseries-2.12-sxxm' hotplugCpus='yes' maxCpus='1024'/>
<machine type='kvm' name='bamboo' maxCpus='1'/>
<machine type='kvm' name='g3beige' maxCpus='1'/>
<machine type='kvm' name='pseries-2.10' hotplugCpus='yes' maxCpus='1024'/>
<machine type='kvm' name='prep' maxCpus='1'/>
<machine type='kvm' name='pseries-2.11' hotplugCpus='yes' maxCpus='1024'/>
<machine type='kvm' name='pseries-2.9' hotplugCpus='yes' maxCpus='1024'/>
<machine type='kvm' name='mac99' maxCpus='1'/>
<machine type='kvm' name='pseries-2.6' maxCpus='1024'/>
<machine type='kvm' name='pseries-2.7' hotplugCpus='yes' maxCpus='1024'/>
<machine type='kvm' name='pseries-2.8' hotplugCpus='yes' maxCpus='1024'/>
<machine type='kvm' name='pseries-2.4' maxCpus='1024'/>
<machine type='kvm' name='pseries-2.5' maxCpus='1024'/>
<machine type='kvm' name='pseries-2.2' maxCpus='1024'/>
<machine type='kvm' name='taihu' maxCpus='1'/>
<machine type='kvm' name='pseries-2.3' maxCpus='1024'/>
<machine type='kvm' name='pseries-2.1' maxCpus='1024'/>
<machine type='kvm' name='40p' maxCpus='1'/>
<cpu type='tcg' name='default' typename='604-powerpc64-cpu'/>
<cpu type='tcg' name='ppc' typename='604-powerpc64-cpu'/>
<cpu type='tcg' name='ppc32' typename='604-powerpc64-cpu'/>
@ -1056,4 +1056,29 @@
<cpu type='tcg' name='750_v3.1'/>
<cpu type='tcg' name='power8e_v2.1'/>
<cpu type='tcg' name='mpc8568e'/>
<machine type='tcg' name='pseries-2.12' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes'/>
<machine type='tcg' name='ref405ep' maxCpus='1'/>
<machine type='tcg' name='sam460ex' maxCpus='1'/>
<machine type='tcg' name='virtex-ml507' maxCpus='1'/>
<machine type='tcg' name='powernv' maxCpus='2048'/>
<machine type='tcg' name='ppce500' maxCpus='32'/>
<machine type='tcg' name='mpc8544ds' maxCpus='15'/>
<machine type='tcg' name='pseries-2.12-sxxm' hotplugCpus='yes' maxCpus='1024'/>
<machine type='tcg' name='bamboo' maxCpus='1'/>
<machine type='tcg' name='g3beige' maxCpus='1'/>
<machine type='tcg' name='pseries-2.10' hotplugCpus='yes' maxCpus='1024'/>
<machine type='tcg' name='prep' maxCpus='1'/>
<machine type='tcg' name='pseries-2.11' hotplugCpus='yes' maxCpus='1024'/>
<machine type='tcg' name='pseries-2.9' hotplugCpus='yes' maxCpus='1024'/>
<machine type='tcg' name='mac99' maxCpus='1'/>
<machine type='tcg' name='pseries-2.6' maxCpus='1024'/>
<machine type='tcg' name='pseries-2.7' hotplugCpus='yes' maxCpus='1024'/>
<machine type='tcg' name='pseries-2.8' hotplugCpus='yes' maxCpus='1024'/>
<machine type='tcg' name='pseries-2.4' maxCpus='1024'/>
<machine type='tcg' name='pseries-2.5' maxCpus='1024'/>
<machine type='tcg' name='pseries-2.2' maxCpus='1024'/>
<machine type='tcg' name='taihu' maxCpus='1'/>
<machine type='tcg' name='pseries-2.3' maxCpus='1024'/>
<machine type='tcg' name='pseries-2.1' maxCpus='1024'/>
<machine type='tcg' name='40p' maxCpus='1'/>
</qemuCaps>

View File

@ -225,15 +225,15 @@
<cpu type='kvm' name='z9BC' typename='z9BC-s390x-cpu' usable='yes'/>
<cpu type='kvm' name='z10EC.3-base' typename='z10EC.3-base-s390x-cpu' usable='yes'/>
<cpu type='kvm' name='z990.3-base' typename='z990.3-base-s390x-cpu' usable='yes'/>
<machine name='s390-ccw-virtio-2.12' alias='s390-ccw-virtio' hotplugCpus='yes' maxCpus='248' default='yes'/>
<machine name='s390-ccw-virtio-2.7' hotplugCpus='yes' maxCpus='248'/>
<machine name='s390-ccw-virtio-2.6' hotplugCpus='yes' maxCpus='248'/>
<machine name='s390-ccw-virtio-2.11' hotplugCpus='yes' maxCpus='248'/>
<machine name='s390-ccw-virtio-2.10' hotplugCpus='yes' maxCpus='248'/>
<machine name='s390-ccw-virtio-2.5' hotplugCpus='yes' maxCpus='248'/>
<machine name='s390-ccw-virtio-2.4' hotplugCpus='yes' maxCpus='248'/>
<machine name='s390-ccw-virtio-2.9' hotplugCpus='yes' maxCpus='248'/>
<machine name='s390-ccw-virtio-2.8' hotplugCpus='yes' maxCpus='248'/>
<machine type='kvm' name='s390-ccw-virtio-2.12' alias='s390-ccw-virtio' hotplugCpus='yes' maxCpus='248' default='yes'/>
<machine type='kvm' name='s390-ccw-virtio-2.7' hotplugCpus='yes' maxCpus='248'/>
<machine type='kvm' name='s390-ccw-virtio-2.6' hotplugCpus='yes' maxCpus='248'/>
<machine type='kvm' name='s390-ccw-virtio-2.11' hotplugCpus='yes' maxCpus='248'/>
<machine type='kvm' name='s390-ccw-virtio-2.10' hotplugCpus='yes' maxCpus='248'/>
<machine type='kvm' name='s390-ccw-virtio-2.5' hotplugCpus='yes' maxCpus='248'/>
<machine type='kvm' name='s390-ccw-virtio-2.4' hotplugCpus='yes' maxCpus='248'/>
<machine type='kvm' name='s390-ccw-virtio-2.9' hotplugCpus='yes' maxCpus='248'/>
<machine type='kvm' name='s390-ccw-virtio-2.8' hotplugCpus='yes' maxCpus='248'/>
<cpu type='tcg' name='z890.2' typename='z890.2-s390x-cpu' usable='no'>
<blocker name='klmd-sha-1'/>
<blocker name='kimd-sha-1'/>
@ -2473,4 +2473,13 @@
<blocker name='kmac-dea'/>
<blocker name='hfpm'/>
</cpu>
<machine type='tcg' name='s390-ccw-virtio-2.12' alias='s390-ccw-virtio' hotplugCpus='yes' maxCpus='248' default='yes'/>
<machine type='tcg' name='s390-ccw-virtio-2.7' hotplugCpus='yes' maxCpus='248'/>
<machine type='tcg' name='s390-ccw-virtio-2.6' hotplugCpus='yes' maxCpus='248'/>
<machine type='tcg' name='s390-ccw-virtio-2.11' hotplugCpus='yes' maxCpus='248'/>
<machine type='tcg' name='s390-ccw-virtio-2.10' hotplugCpus='yes' maxCpus='248'/>
<machine type='tcg' name='s390-ccw-virtio-2.5' hotplugCpus='yes' maxCpus='248'/>
<machine type='tcg' name='s390-ccw-virtio-2.4' hotplugCpus='yes' maxCpus='248'/>
<machine type='tcg' name='s390-ccw-virtio-2.9' hotplugCpus='yes' maxCpus='248'/>
<machine type='tcg' name='s390-ccw-virtio-2.8' hotplugCpus='yes' maxCpus='248'/>
</qemuCaps>

View File

@ -661,43 +661,43 @@
<blocker name='3dnowprefetch'/>
</cpu>
<cpu type='kvm' name='486' typename='486-x86_64-cpu' usable='yes'/>
<machine name='pc-i440fx-2.12' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/>
<machine name='isapc' hotplugCpus='yes' maxCpus='1'/>
<machine name='pc-1.1' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-1.2' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-1.3' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-1.0' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288'/>
<machine name='pc-q35-2.12' alias='q35' hotplugCpus='yes' maxCpus='288'/>
<machine name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288'/>
<machine name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288'/>
<machine name='pc-0.15' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288'/>
<machine name='pc-0.13' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-0.14' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-0.11' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-0.12' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-0.10' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.12' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/>
<machine type='kvm' name='isapc' hotplugCpus='yes' maxCpus='1'/>
<machine type='kvm' name='pc-1.1' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-1.2' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-1.3' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-1.0' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288'/>
<machine type='kvm' name='pc-q35-2.12' alias='q35' hotplugCpus='yes' maxCpus='288'/>
<machine type='kvm' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288'/>
<machine type='kvm' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288'/>
<machine type='kvm' name='pc-0.15' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288'/>
<machine type='kvm' name='pc-0.13' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-0.14' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-0.11' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-0.12' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-0.10' hotplugCpus='yes' maxCpus='255'/>
<hostCPU type='tcg' model='base' migratability='yes'>
<property name='phys-bits' type='number' value='0'/>
<property name='core-id' type='number' value='-1'/>
@ -1236,6 +1236,43 @@
<blocker name='3dnowprefetch'/>
</cpu>
<cpu type='tcg' name='486' typename='486-x86_64-cpu' usable='yes'/>
<machine type='tcg' name='pc-i440fx-2.12' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/>
<machine type='tcg' name='isapc' hotplugCpus='yes' maxCpus='1'/>
<machine type='tcg' name='pc-1.1' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-1.2' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-1.3' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-1.0' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288'/>
<machine type='tcg' name='pc-q35-2.12' alias='q35' hotplugCpus='yes' maxCpus='288'/>
<machine type='tcg' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288'/>
<machine type='tcg' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288'/>
<machine type='tcg' name='pc-0.15' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288'/>
<machine type='tcg' name='pc-0.13' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-0.14' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-0.11' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-0.12' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-0.10' hotplugCpus='yes' maxCpus='255'/>
<sev>
<cbitpos>47</cbitpos>
<reducedPhysBits>1</reducedPhysBits>

View File

@ -165,35 +165,35 @@
<cpu type='kvm' name='core2duo'/>
<cpu type='kvm' name='phenom'/>
<cpu type='kvm' name='qemu64'/>
<machine name='pc-i440fx-2.4' alias='pc' maxCpus='255' default='yes'/>
<machine name='pc-1.3' maxCpus='255'/>
<machine name='pc-0.12' maxCpus='255'/>
<machine name='pc-q35-1.6' maxCpus='255'/>
<machine name='pc-q35-1.5' maxCpus='255'/>
<machine name='pc-i440fx-1.6' maxCpus='255'/>
<machine name='pc-q35-2.2' maxCpus='255'/>
<machine name='pc-i440fx-1.7' maxCpus='255'/>
<machine name='pc-q35-2.1' maxCpus='255'/>
<machine name='pc-0.11' maxCpus='255'/>
<machine name='pc-0.10' maxCpus='255'/>
<machine name='pc-i440fx-2.2' maxCpus='255'/>
<machine name='pc-1.2' maxCpus='255'/>
<machine name='isapc' maxCpus='1'/>
<machine name='pc-i440fx-2.3' maxCpus='255'/>
<machine name='pc-q35-1.4' maxCpus='255'/>
<machine name='pc-0.15' maxCpus='255'/>
<machine name='pc-i440fx-1.5' maxCpus='255'/>
<machine name='pc-q35-2.0' maxCpus='255'/>
<machine name='pc-i440fx-1.4' maxCpus='255'/>
<machine name='pc-0.14' maxCpus='255'/>
<machine name='pc-1.1' maxCpus='255'/>
<machine name='pc-i440fx-2.1' maxCpus='255'/>
<machine name='pc-q35-1.7' maxCpus='255'/>
<machine name='pc-1.0' maxCpus='255'/>
<machine name='pc-i440fx-2.0' maxCpus='255'/>
<machine name='pc-q35-2.4' alias='q35' maxCpus='255'/>
<machine name='pc-q35-2.3' maxCpus='255'/>
<machine name='pc-0.13' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.4' alias='pc' maxCpus='255' default='yes'/>
<machine type='kvm' name='pc-1.3' maxCpus='255'/>
<machine type='kvm' name='pc-0.12' maxCpus='255'/>
<machine type='kvm' name='pc-q35-1.6' maxCpus='255'/>
<machine type='kvm' name='pc-q35-1.5' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-1.6' maxCpus='255'/>
<machine type='kvm' name='pc-q35-2.2' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-1.7' maxCpus='255'/>
<machine type='kvm' name='pc-q35-2.1' maxCpus='255'/>
<machine type='kvm' name='pc-0.11' maxCpus='255'/>
<machine type='kvm' name='pc-0.10' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.2' maxCpus='255'/>
<machine type='kvm' name='pc-1.2' maxCpus='255'/>
<machine type='kvm' name='isapc' maxCpus='1'/>
<machine type='kvm' name='pc-i440fx-2.3' maxCpus='255'/>
<machine type='kvm' name='pc-q35-1.4' maxCpus='255'/>
<machine type='kvm' name='pc-0.15' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-1.5' maxCpus='255'/>
<machine type='kvm' name='pc-q35-2.0' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-1.4' maxCpus='255'/>
<machine type='kvm' name='pc-0.14' maxCpus='255'/>
<machine type='kvm' name='pc-1.1' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.1' maxCpus='255'/>
<machine type='kvm' name='pc-q35-1.7' maxCpus='255'/>
<machine type='kvm' name='pc-1.0' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.0' maxCpus='255'/>
<machine type='kvm' name='pc-q35-2.4' alias='q35' maxCpus='255'/>
<machine type='kvm' name='pc-q35-2.3' maxCpus='255'/>
<machine type='kvm' name='pc-0.13' maxCpus='255'/>
<cpu type='tcg' name='Opteron_G5'/>
<cpu type='tcg' name='Opteron_G4'/>
<cpu type='tcg' name='Opteron_G3'/>
@ -222,4 +222,33 @@
<cpu type='tcg' name='core2duo'/>
<cpu type='tcg' name='phenom'/>
<cpu type='tcg' name='qemu64'/>
<machine type='tcg' name='pc-i440fx-2.4' alias='pc' maxCpus='255' default='yes'/>
<machine type='tcg' name='pc-1.3' maxCpus='255'/>
<machine type='tcg' name='pc-0.12' maxCpus='255'/>
<machine type='tcg' name='pc-q35-1.6' maxCpus='255'/>
<machine type='tcg' name='pc-q35-1.5' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-1.6' maxCpus='255'/>
<machine type='tcg' name='pc-q35-2.2' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-1.7' maxCpus='255'/>
<machine type='tcg' name='pc-q35-2.1' maxCpus='255'/>
<machine type='tcg' name='pc-0.11' maxCpus='255'/>
<machine type='tcg' name='pc-0.10' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.2' maxCpus='255'/>
<machine type='tcg' name='pc-1.2' maxCpus='255'/>
<machine type='tcg' name='isapc' maxCpus='1'/>
<machine type='tcg' name='pc-i440fx-2.3' maxCpus='255'/>
<machine type='tcg' name='pc-q35-1.4' maxCpus='255'/>
<machine type='tcg' name='pc-0.15' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-1.5' maxCpus='255'/>
<machine type='tcg' name='pc-q35-2.0' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-1.4' maxCpus='255'/>
<machine type='tcg' name='pc-0.14' maxCpus='255'/>
<machine type='tcg' name='pc-1.1' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.1' maxCpus='255'/>
<machine type='tcg' name='pc-q35-1.7' maxCpus='255'/>
<machine type='tcg' name='pc-1.0' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.0' maxCpus='255'/>
<machine type='tcg' name='pc-q35-2.4' alias='q35' maxCpus='255'/>
<machine type='tcg' name='pc-q35-2.3' maxCpus='255'/>
<machine type='tcg' name='pc-0.13' maxCpus='255'/>
</qemuCaps>

View File

@ -171,37 +171,37 @@
<cpu type='kvm' name='core2duo'/>
<cpu type='kvm' name='phenom'/>
<cpu type='kvm' name='qemu64'/>
<machine name='pc-i440fx-2.5' alias='pc' maxCpus='255' default='yes'/>
<machine name='pc-i440fx-2.4' maxCpus='255'/>
<machine name='pc-1.3' maxCpus='255'/>
<machine name='pc-0.12' maxCpus='255'/>
<machine name='pc-q35-1.6' maxCpus='255'/>
<machine name='pc-q35-1.5' maxCpus='255'/>
<machine name='pc-i440fx-1.6' maxCpus='255'/>
<machine name='pc-q35-2.2' maxCpus='255'/>
<machine name='pc-i440fx-1.7' maxCpus='255'/>
<machine name='pc-q35-2.1' maxCpus='255'/>
<machine name='pc-0.11' maxCpus='255'/>
<machine name='pc-0.10' maxCpus='255'/>
<machine name='pc-1.2' maxCpus='255'/>
<machine name='pc-i440fx-2.2' maxCpus='255'/>
<machine name='isapc' maxCpus='1'/>
<machine name='pc-i440fx-2.3' maxCpus='255'/>
<machine name='pc-q35-1.4' maxCpus='255'/>
<machine name='pc-q35-2.5' alias='q35' maxCpus='255'/>
<machine name='pc-0.15' maxCpus='255'/>
<machine name='pc-i440fx-1.5' maxCpus='255'/>
<machine name='pc-q35-2.0' maxCpus='255'/>
<machine name='pc-i440fx-1.4' maxCpus='255'/>
<machine name='pc-0.14' maxCpus='255'/>
<machine name='pc-1.1' maxCpus='255'/>
<machine name='pc-i440fx-2.1' maxCpus='255'/>
<machine name='pc-q35-1.7' maxCpus='255'/>
<machine name='pc-1.0' maxCpus='255'/>
<machine name='pc-i440fx-2.0' maxCpus='255'/>
<machine name='pc-q35-2.4' maxCpus='255'/>
<machine name='pc-q35-2.3' maxCpus='255'/>
<machine name='pc-0.13' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.5' alias='pc' maxCpus='255' default='yes'/>
<machine type='kvm' name='pc-i440fx-2.4' maxCpus='255'/>
<machine type='kvm' name='pc-1.3' maxCpus='255'/>
<machine type='kvm' name='pc-0.12' maxCpus='255'/>
<machine type='kvm' name='pc-q35-1.6' maxCpus='255'/>
<machine type='kvm' name='pc-q35-1.5' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-1.6' maxCpus='255'/>
<machine type='kvm' name='pc-q35-2.2' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-1.7' maxCpus='255'/>
<machine type='kvm' name='pc-q35-2.1' maxCpus='255'/>
<machine type='kvm' name='pc-0.11' maxCpus='255'/>
<machine type='kvm' name='pc-0.10' maxCpus='255'/>
<machine type='kvm' name='pc-1.2' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.2' maxCpus='255'/>
<machine type='kvm' name='isapc' maxCpus='1'/>
<machine type='kvm' name='pc-i440fx-2.3' maxCpus='255'/>
<machine type='kvm' name='pc-q35-1.4' maxCpus='255'/>
<machine type='kvm' name='pc-q35-2.5' alias='q35' maxCpus='255'/>
<machine type='kvm' name='pc-0.15' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-1.5' maxCpus='255'/>
<machine type='kvm' name='pc-q35-2.0' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-1.4' maxCpus='255'/>
<machine type='kvm' name='pc-0.14' maxCpus='255'/>
<machine type='kvm' name='pc-1.1' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.1' maxCpus='255'/>
<machine type='kvm' name='pc-q35-1.7' maxCpus='255'/>
<machine type='kvm' name='pc-1.0' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.0' maxCpus='255'/>
<machine type='kvm' name='pc-q35-2.4' maxCpus='255'/>
<machine type='kvm' name='pc-q35-2.3' maxCpus='255'/>
<machine type='kvm' name='pc-0.13' maxCpus='255'/>
<cpu type='tcg' name='Opteron_G5'/>
<cpu type='tcg' name='Opteron_G4'/>
<cpu type='tcg' name='Opteron_G3'/>
@ -230,4 +230,35 @@
<cpu type='tcg' name='core2duo'/>
<cpu type='tcg' name='phenom'/>
<cpu type='tcg' name='qemu64'/>
<machine type='tcg' name='pc-i440fx-2.5' alias='pc' maxCpus='255' default='yes'/>
<machine type='tcg' name='pc-i440fx-2.4' maxCpus='255'/>
<machine type='tcg' name='pc-1.3' maxCpus='255'/>
<machine type='tcg' name='pc-0.12' maxCpus='255'/>
<machine type='tcg' name='pc-q35-1.6' maxCpus='255'/>
<machine type='tcg' name='pc-q35-1.5' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-1.6' maxCpus='255'/>
<machine type='tcg' name='pc-q35-2.2' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-1.7' maxCpus='255'/>
<machine type='tcg' name='pc-q35-2.1' maxCpus='255'/>
<machine type='tcg' name='pc-0.11' maxCpus='255'/>
<machine type='tcg' name='pc-0.10' maxCpus='255'/>
<machine type='tcg' name='pc-1.2' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.2' maxCpus='255'/>
<machine type='tcg' name='isapc' maxCpus='1'/>
<machine type='tcg' name='pc-i440fx-2.3' maxCpus='255'/>
<machine type='tcg' name='pc-q35-1.4' maxCpus='255'/>
<machine type='tcg' name='pc-q35-2.5' alias='q35' maxCpus='255'/>
<machine type='tcg' name='pc-0.15' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-1.5' maxCpus='255'/>
<machine type='tcg' name='pc-q35-2.0' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-1.4' maxCpus='255'/>
<machine type='tcg' name='pc-0.14' maxCpus='255'/>
<machine type='tcg' name='pc-1.1' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.1' maxCpus='255'/>
<machine type='tcg' name='pc-q35-1.7' maxCpus='255'/>
<machine type='tcg' name='pc-1.0' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.0' maxCpus='255'/>
<machine type='tcg' name='pc-q35-2.4' maxCpus='255'/>
<machine type='tcg' name='pc-q35-2.3' maxCpus='255'/>
<machine type='tcg' name='pc-0.13' maxCpus='255'/>
</qemuCaps>

View File

@ -158,47 +158,47 @@
<cpu type='kvm' name='cortex-r5'/>
<cpu type='kvm' name='pxa270-a1'/>
<cpu type='kvm' name='pxa270'/>
<machine name='integratorcp' maxCpus='1'/>
<machine name='nuri' maxCpus='2'/>
<machine name='verdex' maxCpus='1'/>
<machine name='smdkc210' maxCpus='2'/>
<machine name='collie' maxCpus='1'/>
<machine name='imx25-pdk' maxCpus='1'/>
<machine name='spitz' maxCpus='1'/>
<machine name='realview-pbx-a9' maxCpus='4'/>
<machine name='realview-eb' maxCpus='1'/>
<machine name='versatilepb' maxCpus='1'/>
<machine name='realview-pb-a8' maxCpus='1'/>
<machine name='musicpal' maxCpus='1'/>
<machine name='z2' maxCpus='1'/>
<machine name='akita' maxCpus='1'/>
<machine name='kzm' maxCpus='1'/>
<machine name='realview-eb-mpcore' maxCpus='4'/>
<machine name='sx1' maxCpus='1'/>
<machine name='sx1-v1' maxCpus='1'/>
<machine name='virt-2.6' alias='virt' maxCpus='255'/>
<machine name='cubieboard' maxCpus='1'/>
<machine name='highbank' maxCpus='4'/>
<machine name='raspi2' maxCpus='4'/>
<machine name='netduino2' maxCpus='1'/>
<machine name='terrier' maxCpus='1'/>
<machine name='n810' maxCpus='1'/>
<machine name='mainstone' maxCpus='1'/>
<machine name='palmetto-bmc' maxCpus='1'/>
<machine name='midway' maxCpus='4'/>
<machine name='cheetah' maxCpus='1'/>
<machine name='tosa' maxCpus='1'/>
<machine name='borzoi' maxCpus='1'/>
<machine name='versatileab' maxCpus='1'/>
<machine name='lm3s6965evb' maxCpus='1'/>
<machine name='n800' maxCpus='1'/>
<machine name='connex' maxCpus='1'/>
<machine name='xilinx-zynq-a9' maxCpus='1'/>
<machine name='xlnx-ep108' maxCpus='1'/>
<machine name='vexpress-a9' maxCpus='4'/>
<machine name='vexpress-a15' maxCpus='4'/>
<machine name='canon-a1100' maxCpus='1'/>
<machine name='lm3s811evb' maxCpus='1'/>
<machine type='kvm' name='integratorcp' maxCpus='1'/>
<machine type='kvm' name='nuri' maxCpus='2'/>
<machine type='kvm' name='verdex' maxCpus='1'/>
<machine type='kvm' name='smdkc210' maxCpus='2'/>
<machine type='kvm' name='collie' maxCpus='1'/>
<machine type='kvm' name='imx25-pdk' maxCpus='1'/>
<machine type='kvm' name='spitz' maxCpus='1'/>
<machine type='kvm' name='realview-pbx-a9' maxCpus='4'/>
<machine type='kvm' name='realview-eb' maxCpus='1'/>
<machine type='kvm' name='versatilepb' maxCpus='1'/>
<machine type='kvm' name='realview-pb-a8' maxCpus='1'/>
<machine type='kvm' name='musicpal' maxCpus='1'/>
<machine type='kvm' name='z2' maxCpus='1'/>
<machine type='kvm' name='akita' maxCpus='1'/>
<machine type='kvm' name='kzm' maxCpus='1'/>
<machine type='kvm' name='realview-eb-mpcore' maxCpus='4'/>
<machine type='kvm' name='sx1' maxCpus='1'/>
<machine type='kvm' name='sx1-v1' maxCpus='1'/>
<machine type='kvm' name='virt-2.6' alias='virt' maxCpus='255'/>
<machine type='kvm' name='cubieboard' maxCpus='1'/>
<machine type='kvm' name='highbank' maxCpus='4'/>
<machine type='kvm' name='raspi2' maxCpus='4'/>
<machine type='kvm' name='netduino2' maxCpus='1'/>
<machine type='kvm' name='terrier' maxCpus='1'/>
<machine type='kvm' name='n810' maxCpus='1'/>
<machine type='kvm' name='mainstone' maxCpus='1'/>
<machine type='kvm' name='palmetto-bmc' maxCpus='1'/>
<machine type='kvm' name='midway' maxCpus='4'/>
<machine type='kvm' name='cheetah' maxCpus='1'/>
<machine type='kvm' name='tosa' maxCpus='1'/>
<machine type='kvm' name='borzoi' maxCpus='1'/>
<machine type='kvm' name='versatileab' maxCpus='1'/>
<machine type='kvm' name='lm3s6965evb' maxCpus='1'/>
<machine type='kvm' name='n800' maxCpus='1'/>
<machine type='kvm' name='connex' maxCpus='1'/>
<machine type='kvm' name='xilinx-zynq-a9' maxCpus='1'/>
<machine type='kvm' name='xlnx-ep108' maxCpus='1'/>
<machine type='kvm' name='vexpress-a9' maxCpus='4'/>
<machine type='kvm' name='vexpress-a15' maxCpus='4'/>
<machine type='kvm' name='canon-a1100' maxCpus='1'/>
<machine type='kvm' name='lm3s811evb' maxCpus='1'/>
<cpu type='tcg' name='pxa262'/>
<cpu type='tcg' name='pxa270-a0'/>
<cpu type='tcg' name='arm1136'/>
@ -229,6 +229,47 @@
<cpu type='tcg' name='cortex-r5'/>
<cpu type='tcg' name='pxa270-a1'/>
<cpu type='tcg' name='pxa270'/>
<machine type='tcg' name='integratorcp' maxCpus='1'/>
<machine type='tcg' name='nuri' maxCpus='2'/>
<machine type='tcg' name='verdex' maxCpus='1'/>
<machine type='tcg' name='smdkc210' maxCpus='2'/>
<machine type='tcg' name='collie' maxCpus='1'/>
<machine type='tcg' name='imx25-pdk' maxCpus='1'/>
<machine type='tcg' name='spitz' maxCpus='1'/>
<machine type='tcg' name='realview-pbx-a9' maxCpus='4'/>
<machine type='tcg' name='realview-eb' maxCpus='1'/>
<machine type='tcg' name='versatilepb' maxCpus='1'/>
<machine type='tcg' name='realview-pb-a8' maxCpus='1'/>
<machine type='tcg' name='musicpal' maxCpus='1'/>
<machine type='tcg' name='z2' maxCpus='1'/>
<machine type='tcg' name='akita' maxCpus='1'/>
<machine type='tcg' name='kzm' maxCpus='1'/>
<machine type='tcg' name='realview-eb-mpcore' maxCpus='4'/>
<machine type='tcg' name='sx1' maxCpus='1'/>
<machine type='tcg' name='sx1-v1' maxCpus='1'/>
<machine type='tcg' name='virt-2.6' alias='virt' maxCpus='255'/>
<machine type='tcg' name='cubieboard' maxCpus='1'/>
<machine type='tcg' name='highbank' maxCpus='4'/>
<machine type='tcg' name='raspi2' maxCpus='4'/>
<machine type='tcg' name='netduino2' maxCpus='1'/>
<machine type='tcg' name='terrier' maxCpus='1'/>
<machine type='tcg' name='n810' maxCpus='1'/>
<machine type='tcg' name='mainstone' maxCpus='1'/>
<machine type='tcg' name='palmetto-bmc' maxCpus='1'/>
<machine type='tcg' name='midway' maxCpus='4'/>
<machine type='tcg' name='cheetah' maxCpus='1'/>
<machine type='tcg' name='tosa' maxCpus='1'/>
<machine type='tcg' name='borzoi' maxCpus='1'/>
<machine type='tcg' name='versatileab' maxCpus='1'/>
<machine type='tcg' name='lm3s6965evb' maxCpus='1'/>
<machine type='tcg' name='n800' maxCpus='1'/>
<machine type='tcg' name='connex' maxCpus='1'/>
<machine type='tcg' name='xilinx-zynq-a9' maxCpus='1'/>
<machine type='tcg' name='xlnx-ep108' maxCpus='1'/>
<machine type='tcg' name='vexpress-a9' maxCpus='4'/>
<machine type='tcg' name='vexpress-a15' maxCpus='4'/>
<machine type='tcg' name='canon-a1100' maxCpus='1'/>
<machine type='tcg' name='lm3s811evb' maxCpus='1'/>
<gic version='3' kernel='no' emulated='no'/>
<gic version='2' kernel='yes' emulated='yes'/>
</qemuCaps>

View File

@ -554,21 +554,21 @@
<cpu type='kvm' name='MPC8544E_v11'/>
<cpu type='kvm' name='405GPb'/>
<cpu type='kvm' name='MPC8541E_v11'/>
<machine name='pseries-2.6' alias='pseries' maxCpus='255' default='yes'/>
<machine name='ref405ep' maxCpus='1'/>
<machine name='virtex-ml507' maxCpus='1'/>
<machine name='ppce500' maxCpus='32'/>
<machine name='mpc8544ds' maxCpus='15'/>
<machine name='bamboo' maxCpus='1'/>
<machine name='g3beige' maxCpus='1'/>
<machine name='prep' maxCpus='1'/>
<machine name='mac99' maxCpus='1'/>
<machine name='pseries-2.4' maxCpus='255'/>
<machine name='pseries-2.5' maxCpus='255'/>
<machine name='pseries-2.2' maxCpus='255'/>
<machine name='taihu' maxCpus='1'/>
<machine name='pseries-2.3' maxCpus='255'/>
<machine name='pseries-2.1' maxCpus='255'/>
<machine type='kvm' name='pseries-2.6' alias='pseries' maxCpus='255' default='yes'/>
<machine type='kvm' name='ref405ep' maxCpus='1'/>
<machine type='kvm' name='virtex-ml507' maxCpus='1'/>
<machine type='kvm' name='ppce500' maxCpus='32'/>
<machine type='kvm' name='mpc8544ds' maxCpus='15'/>
<machine type='kvm' name='bamboo' maxCpus='1'/>
<machine type='kvm' name='g3beige' maxCpus='1'/>
<machine type='kvm' name='prep' maxCpus='1'/>
<machine type='kvm' name='mac99' maxCpus='1'/>
<machine type='kvm' name='pseries-2.4' maxCpus='255'/>
<machine type='kvm' name='pseries-2.5' maxCpus='255'/>
<machine type='kvm' name='pseries-2.2' maxCpus='255'/>
<machine type='kvm' name='taihu' maxCpus='1'/>
<machine type='kvm' name='pseries-2.3' maxCpus='255'/>
<machine type='kvm' name='pseries-2.1' maxCpus='255'/>
<cpu type='tcg' name='default'/>
<cpu type='tcg' name='ppc'/>
<cpu type='tcg' name='ppc32'/>
@ -999,4 +999,19 @@
<cpu type='tcg' name='MPC8544E_v11'/>
<cpu type='tcg' name='405GPb'/>
<cpu type='tcg' name='MPC8541E_v11'/>
<machine type='tcg' name='pseries-2.6' alias='pseries' maxCpus='255' default='yes'/>
<machine type='tcg' name='ref405ep' maxCpus='1'/>
<machine type='tcg' name='virtex-ml507' maxCpus='1'/>
<machine type='tcg' name='ppce500' maxCpus='32'/>
<machine type='tcg' name='mpc8544ds' maxCpus='15'/>
<machine type='tcg' name='bamboo' maxCpus='1'/>
<machine type='tcg' name='g3beige' maxCpus='1'/>
<machine type='tcg' name='prep' maxCpus='1'/>
<machine type='tcg' name='mac99' maxCpus='1'/>
<machine type='tcg' name='pseries-2.4' maxCpus='255'/>
<machine type='tcg' name='pseries-2.5' maxCpus='255'/>
<machine type='tcg' name='pseries-2.2' maxCpus='255'/>
<machine type='tcg' name='taihu' maxCpus='1'/>
<machine type='tcg' name='pseries-2.3' maxCpus='255'/>
<machine type='tcg' name='pseries-2.1' maxCpus='255'/>
</qemuCaps>

View File

@ -183,31 +183,31 @@
<cpu type='kvm' name='core2duo'/>
<cpu type='kvm' name='phenom'/>
<cpu type='kvm' name='qemu64'/>
<machine name='pc-i440fx-2.6' alias='pc' maxCpus='255' default='yes'/>
<machine name='pc-0.12' maxCpus='255'/>
<machine name='pc-i440fx-2.4' maxCpus='255'/>
<machine name='pc-1.3' maxCpus='255'/>
<machine name='pc-q35-2.6' alias='q35' maxCpus='255'/>
<machine name='pc-i440fx-1.7' maxCpus='255'/>
<machine name='pc-i440fx-1.6' maxCpus='255'/>
<machine name='pc-0.11' maxCpus='255'/>
<machine name='pc-i440fx-2.3' maxCpus='255'/>
<machine name='pc-0.10' maxCpus='255'/>
<machine name='pc-1.2' maxCpus='255'/>
<machine name='pc-i440fx-2.2' maxCpus='255'/>
<machine name='isapc' maxCpus='1'/>
<machine name='pc-q35-2.5' maxCpus='255'/>
<machine name='pc-0.15' maxCpus='255'/>
<machine name='pc-i440fx-1.5' maxCpus='255'/>
<machine name='pc-0.14' maxCpus='255'/>
<machine name='pc-i440fx-1.4' maxCpus='255'/>
<machine name='pc-i440fx-2.5' maxCpus='255'/>
<machine name='pc-1.1' maxCpus='255'/>
<machine name='pc-i440fx-2.1' maxCpus='255'/>
<machine name='pc-1.0' maxCpus='255'/>
<machine name='pc-i440fx-2.0' maxCpus='255'/>
<machine name='pc-q35-2.4' maxCpus='255'/>
<machine name='pc-0.13' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.6' alias='pc' maxCpus='255' default='yes'/>
<machine type='kvm' name='pc-0.12' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.4' maxCpus='255'/>
<machine type='kvm' name='pc-1.3' maxCpus='255'/>
<machine type='kvm' name='pc-q35-2.6' alias='q35' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-1.7' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-1.6' maxCpus='255'/>
<machine type='kvm' name='pc-0.11' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.3' maxCpus='255'/>
<machine type='kvm' name='pc-0.10' maxCpus='255'/>
<machine type='kvm' name='pc-1.2' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.2' maxCpus='255'/>
<machine type='kvm' name='isapc' maxCpus='1'/>
<machine type='kvm' name='pc-q35-2.5' maxCpus='255'/>
<machine type='kvm' name='pc-0.15' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-1.5' maxCpus='255'/>
<machine type='kvm' name='pc-0.14' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-1.4' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.5' maxCpus='255'/>
<machine type='kvm' name='pc-1.1' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.1' maxCpus='255'/>
<machine type='kvm' name='pc-1.0' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.0' maxCpus='255'/>
<machine type='kvm' name='pc-q35-2.4' maxCpus='255'/>
<machine type='kvm' name='pc-0.13' maxCpus='255'/>
<cpu type='tcg' name='Opteron_G5'/>
<cpu type='tcg' name='Opteron_G4'/>
<cpu type='tcg' name='Opteron_G3'/>
@ -236,4 +236,29 @@
<cpu type='tcg' name='core2duo'/>
<cpu type='tcg' name='phenom'/>
<cpu type='tcg' name='qemu64'/>
<machine type='tcg' name='pc-i440fx-2.6' alias='pc' maxCpus='255' default='yes'/>
<machine type='tcg' name='pc-0.12' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.4' maxCpus='255'/>
<machine type='tcg' name='pc-1.3' maxCpus='255'/>
<machine type='tcg' name='pc-q35-2.6' alias='q35' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-1.7' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-1.6' maxCpus='255'/>
<machine type='tcg' name='pc-0.11' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.3' maxCpus='255'/>
<machine type='tcg' name='pc-0.10' maxCpus='255'/>
<machine type='tcg' name='pc-1.2' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.2' maxCpus='255'/>
<machine type='tcg' name='isapc' maxCpus='1'/>
<machine type='tcg' name='pc-q35-2.5' maxCpus='255'/>
<machine type='tcg' name='pc-0.15' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-1.5' maxCpus='255'/>
<machine type='tcg' name='pc-0.14' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-1.4' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.5' maxCpus='255'/>
<machine type='tcg' name='pc-1.1' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.1' maxCpus='255'/>
<machine type='tcg' name='pc-1.0' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.0' maxCpus='255'/>
<machine type='tcg' name='pc-q35-2.4' maxCpus='255'/>
<machine type='tcg' name='pc-0.13' maxCpus='255'/>
</qemuCaps>

View File

@ -95,9 +95,13 @@
<package></package>
<arch>s390x</arch>
<cpu type='kvm' name='host'/>
<machine name='s390-ccw-virtio-2.7' alias='s390-ccw-virtio' maxCpus='248' default='yes'/>
<machine name='s390-ccw-virtio-2.5' maxCpus='248'/>
<machine name='s390-ccw-virtio-2.4' maxCpus='248'/>
<machine name='s390-ccw-virtio-2.6' maxCpus='248'/>
<machine type='kvm' name='s390-ccw-virtio-2.7' alias='s390-ccw-virtio' maxCpus='248' default='yes'/>
<machine type='kvm' name='s390-ccw-virtio-2.5' maxCpus='248'/>
<machine type='kvm' name='s390-ccw-virtio-2.4' maxCpus='248'/>
<machine type='kvm' name='s390-ccw-virtio-2.6' maxCpus='248'/>
<cpu type='tcg' name='host'/>
<machine type='tcg' name='s390-ccw-virtio-2.7' alias='s390-ccw-virtio' maxCpus='248' default='yes'/>
<machine type='tcg' name='s390-ccw-virtio-2.5' maxCpus='248'/>
<machine type='tcg' name='s390-ccw-virtio-2.4' maxCpus='248'/>
<machine type='tcg' name='s390-ccw-virtio-2.6' maxCpus='248'/>
</qemuCaps>

View File

@ -189,33 +189,33 @@
<cpu type='kvm' name='core2duo'/>
<cpu type='kvm' name='phenom'/>
<cpu type='kvm' name='qemu64'/>
<machine name='pc-i440fx-2.7' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/>
<machine name='pc-0.12' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-1.3' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-2.7' alias='q35' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-0.11' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-0.10' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-1.2' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255'/>
<machine name='isapc' hotplugCpus='yes' maxCpus='1'/>
<machine name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-0.15' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-0.14' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-1.1' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-1.0' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-0.13' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.7' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/>
<machine type='kvm' name='pc-0.12' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-1.3' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-q35-2.7' alias='q35' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-0.11' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-0.10' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-1.2' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='isapc' hotplugCpus='yes' maxCpus='1'/>
<machine type='kvm' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-0.15' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-0.14' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-1.1' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-1.0' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-0.13' hotplugCpus='yes' maxCpus='255'/>
<cpu type='tcg' name='Opteron_G5'/>
<cpu type='tcg' name='Opteron_G4'/>
<cpu type='tcg' name='Opteron_G3'/>
@ -245,4 +245,31 @@
<cpu type='tcg' name='core2duo'/>
<cpu type='tcg' name='phenom'/>
<cpu type='tcg' name='qemu64'/>
<machine type='tcg' name='pc-i440fx-2.7' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/>
<machine type='tcg' name='pc-0.12' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-1.3' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-q35-2.7' alias='q35' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-0.11' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-0.10' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-1.2' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='isapc' hotplugCpus='yes' maxCpus='1'/>
<machine type='tcg' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-0.15' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-0.14' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-1.1' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-1.0' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-0.13' hotplugCpus='yes' maxCpus='255'/>
</qemuCaps>

View File

@ -180,11 +180,11 @@
<cpu type='kvm' name='z196-base'/>
<cpu type='kvm' name='z13-base'/>
<cpu type='kvm' name='z890'/>
<machine name='s390-ccw-virtio-2.8' alias='s390-ccw-virtio' maxCpus='248' default='yes'/>
<machine name='s390-ccw-virtio-2.7' maxCpus='248'/>
<machine name='s390-ccw-virtio-2.6' maxCpus='248'/>
<machine name='s390-ccw-virtio-2.5' maxCpus='248'/>
<machine name='s390-ccw-virtio-2.4' maxCpus='248'/>
<machine type='kvm' name='s390-ccw-virtio-2.8' alias='s390-ccw-virtio' maxCpus='248' default='yes'/>
<machine type='kvm' name='s390-ccw-virtio-2.7' maxCpus='248'/>
<machine type='kvm' name='s390-ccw-virtio-2.6' maxCpus='248'/>
<machine type='kvm' name='s390-ccw-virtio-2.5' maxCpus='248'/>
<machine type='kvm' name='s390-ccw-virtio-2.4' maxCpus='248'/>
<cpu type='tcg' name='z10EC-base'/>
<cpu type='tcg' name='z9EC-base'/>
<cpu type='tcg' name='z196.2-base'/>
@ -249,4 +249,9 @@
<cpu type='tcg' name='z196-base'/>
<cpu type='tcg' name='z13-base'/>
<cpu type='tcg' name='z890'/>
<machine type='tcg' name='s390-ccw-virtio-2.8' alias='s390-ccw-virtio' maxCpus='248' default='yes'/>
<machine type='tcg' name='s390-ccw-virtio-2.7' maxCpus='248'/>
<machine type='tcg' name='s390-ccw-virtio-2.6' maxCpus='248'/>
<machine type='tcg' name='s390-ccw-virtio-2.5' maxCpus='248'/>
<machine type='tcg' name='s390-ccw-virtio-2.4' maxCpus='248'/>
</qemuCaps>

View File

@ -218,37 +218,37 @@
<cpu type='kvm' name='Broadwell' usable='yes'/>
<cpu type='kvm' name='Broadwell-noTSX' usable='yes'/>
<cpu type='kvm' name='486' usable='yes'/>
<machine name='pc-i440fx-2.8' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/>
<machine name='pc-0.12' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-1.3' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255'/>
<machine name='xenpv' maxCpus='1'/>
<machine name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-0.11' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-0.10' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-1.2' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255'/>
<machine name='isapc' hotplugCpus='yes' maxCpus='1'/>
<machine name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255'/>
<machine name='xenfv' hotplugCpus='yes' maxCpus='128'/>
<machine name='pc-0.15' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-0.14' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-1.1' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-2.8' alias='q35' hotplugCpus='yes' maxCpus='288'/>
<machine name='pc-1.0' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-0.13' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.8' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/>
<machine type='kvm' name='pc-0.12' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-1.3' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='xenpv' maxCpus='1'/>
<machine type='kvm' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-0.11' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-0.10' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-1.2' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='isapc' hotplugCpus='yes' maxCpus='1'/>
<machine type='kvm' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='xenfv' hotplugCpus='yes' maxCpus='128'/>
<machine type='kvm' name='pc-0.15' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-0.14' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-1.1' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-q35-2.8' alias='q35' hotplugCpus='yes' maxCpus='288'/>
<machine type='kvm' name='pc-1.0' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-0.13' hotplugCpus='yes' maxCpus='255'/>
<cpu type='tcg' name='host' usable='no'>
<blocker name='kvm'/>
</cpu>
@ -374,4 +374,35 @@
<blocker name='3dnowprefetch'/>
</cpu>
<cpu type='tcg' name='486' usable='yes'/>
<machine type='tcg' name='pc-i440fx-2.8' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/>
<machine type='tcg' name='pc-0.12' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-1.3' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='xenpv' maxCpus='1'/>
<machine type='tcg' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-0.11' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-0.10' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-1.2' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='isapc' hotplugCpus='yes' maxCpus='1'/>
<machine type='tcg' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='xenfv' hotplugCpus='yes' maxCpus='128'/>
<machine type='tcg' name='pc-0.15' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-0.14' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-1.1' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-q35-2.8' alias='q35' hotplugCpus='yes' maxCpus='288'/>
<machine type='tcg' name='pc-1.0' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-0.13' hotplugCpus='yes' maxCpus='255'/>
</qemuCaps>

View File

@ -569,26 +569,26 @@
<cpu type='kvm' name='MPC8544E_v11'/>
<cpu type='kvm' name='405GPb'/>
<cpu type='kvm' name='MPC8541E_v11'/>
<machine name='pseries-2.9' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes'/>
<machine name='ref405ep' maxCpus='1'/>
<machine name='virtex-ml507' maxCpus='1'/>
<machine name='powernv' maxCpus='2048'/>
<machine name='ppce500' maxCpus='32'/>
<machine name='mpc8544ds' maxCpus='15'/>
<machine name='bamboo' maxCpus='1'/>
<machine name='g3beige' maxCpus='1'/>
<machine name='prep' maxCpus='1'/>
<machine name='mac99' maxCpus='1'/>
<machine name='pseries-2.6' maxCpus='1024'/>
<machine name='pseries-2.7' hotplugCpus='yes' maxCpus='1024'/>
<machine name='pseries-2.8' hotplugCpus='yes' maxCpus='1024'/>
<machine name='pseries-2.4' maxCpus='1024'/>
<machine name='pseries-2.5' maxCpus='1024'/>
<machine name='pseries-2.2' maxCpus='1024'/>
<machine name='taihu' maxCpus='1'/>
<machine name='pseries-2.3' maxCpus='1024'/>
<machine name='pseries-2.1' maxCpus='1024'/>
<machine name='40p' maxCpus='1'/>
<machine type='kvm' name='pseries-2.9' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes'/>
<machine type='kvm' name='ref405ep' maxCpus='1'/>
<machine type='kvm' name='virtex-ml507' maxCpus='1'/>
<machine type='kvm' name='powernv' maxCpus='2048'/>
<machine type='kvm' name='ppce500' maxCpus='32'/>
<machine type='kvm' name='mpc8544ds' maxCpus='15'/>
<machine type='kvm' name='bamboo' maxCpus='1'/>
<machine type='kvm' name='g3beige' maxCpus='1'/>
<machine type='kvm' name='prep' maxCpus='1'/>
<machine type='kvm' name='mac99' maxCpus='1'/>
<machine type='kvm' name='pseries-2.6' maxCpus='1024'/>
<machine type='kvm' name='pseries-2.7' hotplugCpus='yes' maxCpus='1024'/>
<machine type='kvm' name='pseries-2.8' hotplugCpus='yes' maxCpus='1024'/>
<machine type='kvm' name='pseries-2.4' maxCpus='1024'/>
<machine type='kvm' name='pseries-2.5' maxCpus='1024'/>
<machine type='kvm' name='pseries-2.2' maxCpus='1024'/>
<machine type='kvm' name='taihu' maxCpus='1'/>
<machine type='kvm' name='pseries-2.3' maxCpus='1024'/>
<machine type='kvm' name='pseries-2.1' maxCpus='1024'/>
<machine type='kvm' name='40p' maxCpus='1'/>
<cpu type='tcg' name='default' typename='604-powerpc64-cpu'/>
<cpu type='tcg' name='ppc' typename='604-powerpc64-cpu'/>
<cpu type='tcg' name='ppc32' typename='604-powerpc64-cpu'/>
@ -1022,4 +1022,24 @@
<cpu type='tcg' name='MPC8544E_v11'/>
<cpu type='tcg' name='405GPb'/>
<cpu type='tcg' name='MPC8541E_v11'/>
<machine type='tcg' name='pseries-2.9' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes'/>
<machine type='tcg' name='ref405ep' maxCpus='1'/>
<machine type='tcg' name='virtex-ml507' maxCpus='1'/>
<machine type='tcg' name='powernv' maxCpus='2048'/>
<machine type='tcg' name='ppce500' maxCpus='32'/>
<machine type='tcg' name='mpc8544ds' maxCpus='15'/>
<machine type='tcg' name='bamboo' maxCpus='1'/>
<machine type='tcg' name='g3beige' maxCpus='1'/>
<machine type='tcg' name='prep' maxCpus='1'/>
<machine type='tcg' name='mac99' maxCpus='1'/>
<machine type='tcg' name='pseries-2.6' maxCpus='1024'/>
<machine type='tcg' name='pseries-2.7' hotplugCpus='yes' maxCpus='1024'/>
<machine type='tcg' name='pseries-2.8' hotplugCpus='yes' maxCpus='1024'/>
<machine type='tcg' name='pseries-2.4' maxCpus='1024'/>
<machine type='tcg' name='pseries-2.5' maxCpus='1024'/>
<machine type='tcg' name='pseries-2.2' maxCpus='1024'/>
<machine type='tcg' name='taihu' maxCpus='1'/>
<machine type='tcg' name='pseries-2.3' maxCpus='1024'/>
<machine type='tcg' name='pseries-2.1' maxCpus='1024'/>
<machine type='tcg' name='40p' maxCpus='1'/>
</qemuCaps>

View File

@ -186,12 +186,12 @@
<cpu type='kvm' name='z196-base' typename='z196-base-s390-cpu'/>
<cpu type='kvm' name='z13-base' typename='z13-base-s390-cpu'/>
<cpu type='kvm' name='z890' typename='z890-s390-cpu'/>
<machine name='s390-ccw-virtio-2.9' alias='s390-ccw-virtio' maxCpus='248' default='yes'/>
<machine name='s390-ccw-virtio-2.7' maxCpus='248'/>
<machine name='s390-ccw-virtio-2.6' maxCpus='248'/>
<machine name='s390-ccw-virtio-2.5' maxCpus='248'/>
<machine name='s390-ccw-virtio-2.4' maxCpus='248'/>
<machine name='s390-ccw-virtio-2.8' maxCpus='248'/>
<machine type='kvm' name='s390-ccw-virtio-2.9' alias='s390-ccw-virtio' maxCpus='248' default='yes'/>
<machine type='kvm' name='s390-ccw-virtio-2.7' maxCpus='248'/>
<machine type='kvm' name='s390-ccw-virtio-2.6' maxCpus='248'/>
<machine type='kvm' name='s390-ccw-virtio-2.5' maxCpus='248'/>
<machine type='kvm' name='s390-ccw-virtio-2.4' maxCpus='248'/>
<machine type='kvm' name='s390-ccw-virtio-2.8' maxCpus='248'/>
<cpu type='tcg' name='z10EC-base' typename='z10EC-base-s390-cpu'/>
<cpu type='tcg' name='z9EC-base' typename='z9EC-base-s390-cpu'/>
<cpu type='tcg' name='z196.2-base' typename='z196.2-base-s390-cpu'/>
@ -256,4 +256,10 @@
<cpu type='tcg' name='z196-base' typename='z196-base-s390-cpu'/>
<cpu type='tcg' name='z13-base' typename='z13-base-s390-cpu'/>
<cpu type='tcg' name='z890' typename='z890-s390-cpu'/>
<machine type='tcg' name='s390-ccw-virtio-2.9' alias='s390-ccw-virtio' maxCpus='248' default='yes'/>
<machine type='tcg' name='s390-ccw-virtio-2.7' maxCpus='248'/>
<machine type='tcg' name='s390-ccw-virtio-2.6' maxCpus='248'/>
<machine type='tcg' name='s390-ccw-virtio-2.5' maxCpus='248'/>
<machine type='tcg' name='s390-ccw-virtio-2.4' maxCpus='248'/>
<machine type='tcg' name='s390-ccw-virtio-2.8' maxCpus='248'/>
</qemuCaps>

View File

@ -469,39 +469,39 @@
<cpu type='kvm' name='Broadwell' typename='Broadwell-x86_64-cpu' usable='yes'/>
<cpu type='kvm' name='Broadwell-noTSX' typename='Broadwell-noTSX-x86_64-cpu' usable='yes'/>
<cpu type='kvm' name='486' typename='486-x86_64-cpu' usable='yes'/>
<machine name='pc-i440fx-2.9' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/>
<machine name='pc-0.12' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-1.3' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255'/>
<machine name='xenpv' maxCpus='1'/>
<machine name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-0.11' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-0.10' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-1.2' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255'/>
<machine name='isapc' hotplugCpus='yes' maxCpus='1'/>
<machine name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255'/>
<machine name='xenfv' hotplugCpus='yes' maxCpus='128'/>
<machine name='pc-0.15' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-0.14' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-2.9' alias='q35' hotplugCpus='yes' maxCpus='288'/>
<machine name='pc-1.1' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288'/>
<machine name='pc-1.0' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-0.13' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.9' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/>
<machine type='kvm' name='pc-0.12' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-1.3' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='xenpv' maxCpus='1'/>
<machine type='kvm' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-0.11' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-0.10' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-1.2' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='isapc' hotplugCpus='yes' maxCpus='1'/>
<machine type='kvm' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='xenfv' hotplugCpus='yes' maxCpus='128'/>
<machine type='kvm' name='pc-0.15' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-0.14' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-q35-2.9' alias='q35' hotplugCpus='yes' maxCpus='288'/>
<machine type='kvm' name='pc-1.1' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288'/>
<machine type='kvm' name='pc-1.0' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-0.13' hotplugCpus='yes' maxCpus='255'/>
<hostCPU type='tcg' model='base' migratability='yes'>
<property name='phys-bits' type='number' value='0'/>
<property name='core-id' type='number' value='-1'/>
@ -861,4 +861,37 @@
<blocker name='3dnowprefetch'/>
</cpu>
<cpu type='tcg' name='486' typename='486-x86_64-cpu' usable='yes'/>
<machine type='tcg' name='pc-i440fx-2.9' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/>
<machine type='tcg' name='pc-0.12' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-1.3' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='xenpv' maxCpus='1'/>
<machine type='tcg' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-0.11' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-0.10' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-1.2' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='isapc' hotplugCpus='yes' maxCpus='1'/>
<machine type='tcg' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='xenfv' hotplugCpus='yes' maxCpus='128'/>
<machine type='tcg' name='pc-0.15' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-0.14' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-q35-2.9' alias='q35' hotplugCpus='yes' maxCpus='288'/>
<machine type='tcg' name='pc-1.1' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288'/>
<machine type='tcg' name='pc-1.0' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-0.13' hotplugCpus='yes' maxCpus='255'/>
</qemuCaps>

View File

@ -596,32 +596,32 @@
<cpu type='kvm' name='750_v3.1'/>
<cpu type='kvm' name='power5+_v2.1'/>
<cpu type='kvm' name='mpc8568e'/>
<machine name='pseries-3.0' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes'/>
<machine name='ref405ep' maxCpus='1'/>
<machine name='sam460ex' maxCpus='1'/>
<machine name='virtex-ml507' maxCpus='1'/>
<machine name='powernv' maxCpus='2048'/>
<machine name='ppce500' maxCpus='32'/>
<machine name='mpc8544ds' maxCpus='15'/>
<machine name='pseries-2.12-sxxm' hotplugCpus='yes' maxCpus='1024'/>
<machine name='bamboo' maxCpus='1'/>
<machine name='g3beige' maxCpus='1'/>
<machine name='pseries-2.10' hotplugCpus='yes' maxCpus='1024'/>
<machine name='prep' maxCpus='1'/>
<machine name='pseries-2.11' hotplugCpus='yes' maxCpus='1024'/>
<machine name='pseries-2.12' hotplugCpus='yes' maxCpus='1024'/>
<machine name='pseries-2.9' hotplugCpus='yes' maxCpus='1024'/>
<machine name='mac99' maxCpus='1'/>
<machine name='pseries-2.6' maxCpus='1024'/>
<machine name='pseries-2.7' hotplugCpus='yes' maxCpus='1024'/>
<machine name='pseries-2.8' hotplugCpus='yes' maxCpus='1024'/>
<machine name='pseries-2.4' maxCpus='1024'/>
<machine name='pseries-2.5' maxCpus='1024'/>
<machine name='pseries-2.2' maxCpus='1024'/>
<machine name='taihu' maxCpus='1'/>
<machine name='pseries-2.3' maxCpus='1024'/>
<machine name='pseries-2.1' maxCpus='1024'/>
<machine name='40p' maxCpus='1'/>
<machine type='kvm' name='pseries-3.0' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes'/>
<machine type='kvm' name='ref405ep' maxCpus='1'/>
<machine type='kvm' name='sam460ex' maxCpus='1'/>
<machine type='kvm' name='virtex-ml507' maxCpus='1'/>
<machine type='kvm' name='powernv' maxCpus='2048'/>
<machine type='kvm' name='ppce500' maxCpus='32'/>
<machine type='kvm' name='mpc8544ds' maxCpus='15'/>
<machine type='kvm' name='pseries-2.12-sxxm' hotplugCpus='yes' maxCpus='1024'/>
<machine type='kvm' name='bamboo' maxCpus='1'/>
<machine type='kvm' name='g3beige' maxCpus='1'/>
<machine type='kvm' name='pseries-2.10' hotplugCpus='yes' maxCpus='1024'/>
<machine type='kvm' name='prep' maxCpus='1'/>
<machine type='kvm' name='pseries-2.11' hotplugCpus='yes' maxCpus='1024'/>
<machine type='kvm' name='pseries-2.12' hotplugCpus='yes' maxCpus='1024'/>
<machine type='kvm' name='pseries-2.9' hotplugCpus='yes' maxCpus='1024'/>
<machine type='kvm' name='mac99' maxCpus='1'/>
<machine type='kvm' name='pseries-2.6' maxCpus='1024'/>
<machine type='kvm' name='pseries-2.7' hotplugCpus='yes' maxCpus='1024'/>
<machine type='kvm' name='pseries-2.8' hotplugCpus='yes' maxCpus='1024'/>
<machine type='kvm' name='pseries-2.4' maxCpus='1024'/>
<machine type='kvm' name='pseries-2.5' maxCpus='1024'/>
<machine type='kvm' name='pseries-2.2' maxCpus='1024'/>
<machine type='kvm' name='taihu' maxCpus='1'/>
<machine type='kvm' name='pseries-2.3' maxCpus='1024'/>
<machine type='kvm' name='pseries-2.1' maxCpus='1024'/>
<machine type='kvm' name='40p' maxCpus='1'/>
<cpu type='tcg' name='default' typename='604-powerpc64-cpu'/>
<cpu type='tcg' name='ppc' typename='604-powerpc64-cpu'/>
<cpu type='tcg' name='ppc32' typename='604-powerpc64-cpu'/>
@ -1059,4 +1059,30 @@
<cpu type='tcg' name='750_v3.1'/>
<cpu type='tcg' name='power5+_v2.1'/>
<cpu type='tcg' name='mpc8568e'/>
<machine type='tcg' name='pseries-3.0' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes'/>
<machine type='tcg' name='ref405ep' maxCpus='1'/>
<machine type='tcg' name='sam460ex' maxCpus='1'/>
<machine type='tcg' name='virtex-ml507' maxCpus='1'/>
<machine type='tcg' name='powernv' maxCpus='2048'/>
<machine type='tcg' name='ppce500' maxCpus='32'/>
<machine type='tcg' name='mpc8544ds' maxCpus='15'/>
<machine type='tcg' name='pseries-2.12-sxxm' hotplugCpus='yes' maxCpus='1024'/>
<machine type='tcg' name='bamboo' maxCpus='1'/>
<machine type='tcg' name='g3beige' maxCpus='1'/>
<machine type='tcg' name='pseries-2.10' hotplugCpus='yes' maxCpus='1024'/>
<machine type='tcg' name='prep' maxCpus='1'/>
<machine type='tcg' name='pseries-2.11' hotplugCpus='yes' maxCpus='1024'/>
<machine type='tcg' name='pseries-2.12' hotplugCpus='yes' maxCpus='1024'/>
<machine type='tcg' name='pseries-2.9' hotplugCpus='yes' maxCpus='1024'/>
<machine type='tcg' name='mac99' maxCpus='1'/>
<machine type='tcg' name='pseries-2.6' maxCpus='1024'/>
<machine type='tcg' name='pseries-2.7' hotplugCpus='yes' maxCpus='1024'/>
<machine type='tcg' name='pseries-2.8' hotplugCpus='yes' maxCpus='1024'/>
<machine type='tcg' name='pseries-2.4' maxCpus='1024'/>
<machine type='tcg' name='pseries-2.5' maxCpus='1024'/>
<machine type='tcg' name='pseries-2.2' maxCpus='1024'/>
<machine type='tcg' name='taihu' maxCpus='1'/>
<machine type='tcg' name='pseries-2.3' maxCpus='1024'/>
<machine type='tcg' name='pseries-2.1' maxCpus='1024'/>
<machine type='tcg' name='40p' maxCpus='1'/>
</qemuCaps>

View File

@ -98,9 +98,9 @@
<microcodeVersion>0</microcodeVersion>
<package></package>
<arch>riscv32</arch>
<machine name='spike_v1.10' maxCpus='1' default='yes'/>
<machine name='spike_v1.9.1' maxCpus='1'/>
<machine name='sifive_e' maxCpus='1'/>
<machine name='virt' maxCpus='8'/>
<machine name='sifive_u' maxCpus='1'/>
<machine type='tcg' name='spike_v1.10' maxCpus='1' default='yes'/>
<machine type='tcg' name='spike_v1.9.1' maxCpus='1'/>
<machine type='tcg' name='sifive_e' maxCpus='1'/>
<machine type='tcg' name='virt' maxCpus='8'/>
<machine type='tcg' name='sifive_u' maxCpus='1'/>
</qemuCaps>

View File

@ -98,9 +98,9 @@
<microcodeVersion>0</microcodeVersion>
<package></package>
<arch>riscv64</arch>
<machine name='spike_v1.10' maxCpus='1' default='yes'/>
<machine name='spike_v1.9.1' maxCpus='1'/>
<machine name='sifive_e' maxCpus='1'/>
<machine name='virt' maxCpus='8'/>
<machine name='sifive_u' maxCpus='1'/>
<machine type='tcg' name='spike_v1.10' maxCpus='1' default='yes'/>
<machine type='tcg' name='spike_v1.9.1' maxCpus='1'/>
<machine type='tcg' name='sifive_e' maxCpus='1'/>
<machine type='tcg' name='virt' maxCpus='8'/>
<machine type='tcg' name='sifive_u' maxCpus='1'/>
</qemuCaps>

View File

@ -234,16 +234,16 @@
<cpu type='kvm' name='z9BC' typename='z9BC-s390x-cpu' usable='yes'/>
<cpu type='kvm' name='z10EC.3-base' typename='z10EC.3-base-s390x-cpu' usable='yes'/>
<cpu type='kvm' name='z990.3-base' typename='z990.3-base-s390x-cpu' usable='yes'/>
<machine name='s390-ccw-virtio-3.0' alias='s390-ccw-virtio' hotplugCpus='yes' maxCpus='248' default='yes'/>
<machine name='s390-ccw-virtio-2.7' hotplugCpus='yes' maxCpus='248'/>
<machine name='s390-ccw-virtio-2.6' hotplugCpus='yes' maxCpus='248'/>
<machine name='s390-ccw-virtio-2.11' hotplugCpus='yes' maxCpus='248'/>
<machine name='s390-ccw-virtio-2.10' hotplugCpus='yes' maxCpus='248'/>
<machine name='s390-ccw-virtio-2.5' hotplugCpus='yes' maxCpus='248'/>
<machine name='s390-ccw-virtio-2.4' hotplugCpus='yes' maxCpus='248'/>
<machine name='s390-ccw-virtio-2.9' hotplugCpus='yes' maxCpus='248'/>
<machine name='s390-ccw-virtio-2.8' hotplugCpus='yes' maxCpus='248'/>
<machine name='s390-ccw-virtio-2.12' hotplugCpus='yes' maxCpus='248'/>
<machine type='kvm' name='s390-ccw-virtio-3.0' alias='s390-ccw-virtio' hotplugCpus='yes' maxCpus='248' default='yes'/>
<machine type='kvm' name='s390-ccw-virtio-2.7' hotplugCpus='yes' maxCpus='248'/>
<machine type='kvm' name='s390-ccw-virtio-2.6' hotplugCpus='yes' maxCpus='248'/>
<machine type='kvm' name='s390-ccw-virtio-2.11' hotplugCpus='yes' maxCpus='248'/>
<machine type='kvm' name='s390-ccw-virtio-2.10' hotplugCpus='yes' maxCpus='248'/>
<machine type='kvm' name='s390-ccw-virtio-2.5' hotplugCpus='yes' maxCpus='248'/>
<machine type='kvm' name='s390-ccw-virtio-2.4' hotplugCpus='yes' maxCpus='248'/>
<machine type='kvm' name='s390-ccw-virtio-2.9' hotplugCpus='yes' maxCpus='248'/>
<machine type='kvm' name='s390-ccw-virtio-2.8' hotplugCpus='yes' maxCpus='248'/>
<machine type='kvm' name='s390-ccw-virtio-2.12' hotplugCpus='yes' maxCpus='248'/>
<cpu type='tcg' name='z890.2' typename='z890.2-s390x-cpu' usable='no'>
<blocker name='klmd-sha-1'/>
<blocker name='kimd-sha-1'/>
@ -2683,4 +2683,14 @@
<blocker name='kmac-dea'/>
<blocker name='hfpm'/>
</cpu>
<machine type='tcg' name='s390-ccw-virtio-3.0' alias='s390-ccw-virtio' hotplugCpus='yes' maxCpus='248' default='yes'/>
<machine type='tcg' name='s390-ccw-virtio-2.7' hotplugCpus='yes' maxCpus='248'/>
<machine type='tcg' name='s390-ccw-virtio-2.6' hotplugCpus='yes' maxCpus='248'/>
<machine type='tcg' name='s390-ccw-virtio-2.11' hotplugCpus='yes' maxCpus='248'/>
<machine type='tcg' name='s390-ccw-virtio-2.10' hotplugCpus='yes' maxCpus='248'/>
<machine type='tcg' name='s390-ccw-virtio-2.5' hotplugCpus='yes' maxCpus='248'/>
<machine type='tcg' name='s390-ccw-virtio-2.4' hotplugCpus='yes' maxCpus='248'/>
<machine type='tcg' name='s390-ccw-virtio-2.9' hotplugCpus='yes' maxCpus='248'/>
<machine type='tcg' name='s390-ccw-virtio-2.8' hotplugCpus='yes' maxCpus='248'/>
<machine type='tcg' name='s390-ccw-virtio-2.12' hotplugCpus='yes' maxCpus='248'/>
</qemuCaps>

View File

@ -578,45 +578,45 @@
<cpu type='kvm' name='Broadwell-IBRS' typename='Broadwell-IBRS-x86_64-cpu' usable='yes'/>
<cpu type='kvm' name='Broadwell' typename='Broadwell-x86_64-cpu' usable='yes'/>
<cpu type='kvm' name='486' typename='486-x86_64-cpu' usable='yes'/>
<machine name='pc-i440fx-3.0' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/>
<machine name='isapc' hotplugCpus='yes' maxCpus='1'/>
<machine name='pc-1.1' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-1.2' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-1.3' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-1.0' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288'/>
<machine name='pc-q35-2.12' hotplugCpus='yes' maxCpus='288'/>
<machine name='pc-q35-3.0' alias='q35' hotplugCpus='yes' maxCpus='288'/>
<machine name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288'/>
<machine name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288'/>
<machine name='pc-0.15' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288'/>
<machine name='pc-0.13' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-0.14' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-0.11' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-0.12' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-0.10' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-3.0' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/>
<machine type='kvm' name='isapc' hotplugCpus='yes' maxCpus='1'/>
<machine type='kvm' name='pc-1.1' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-1.2' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-1.3' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-1.0' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288'/>
<machine type='kvm' name='pc-q35-2.12' hotplugCpus='yes' maxCpus='288'/>
<machine type='kvm' name='pc-q35-3.0' alias='q35' hotplugCpus='yes' maxCpus='288'/>
<machine type='kvm' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288'/>
<machine type='kvm' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288'/>
<machine type='kvm' name='pc-0.15' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288'/>
<machine type='kvm' name='pc-0.13' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-0.14' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-0.11' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-0.12' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-0.10' hotplugCpus='yes' maxCpus='255'/>
<hostCPU type='tcg' model='base' migratability='yes'>
<property name='phys-bits' type='number' value='0'/>
<property name='core-id' type='number' value='-1'/>
@ -1182,4 +1182,43 @@
<blocker name='3dnowprefetch'/>
</cpu>
<cpu type='tcg' name='486' typename='486-x86_64-cpu' usable='yes'/>
<machine type='tcg' name='pc-i440fx-3.0' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/>
<machine type='tcg' name='isapc' hotplugCpus='yes' maxCpus='1'/>
<machine type='tcg' name='pc-1.1' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-1.2' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-1.3' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-1.0' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288'/>
<machine type='tcg' name='pc-q35-2.12' hotplugCpus='yes' maxCpus='288'/>
<machine type='tcg' name='pc-q35-3.0' alias='q35' hotplugCpus='yes' maxCpus='288'/>
<machine type='tcg' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288'/>
<machine type='tcg' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288'/>
<machine type='tcg' name='pc-0.15' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288'/>
<machine type='tcg' name='pc-0.13' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-0.14' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-0.11' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-0.12' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-0.10' hotplugCpus='yes' maxCpus='255'/>
</qemuCaps>

View File

@ -600,33 +600,33 @@
<cpu type='kvm' name='750_v3.1'/>
<cpu type='kvm' name='power5+_v2.1'/>
<cpu type='kvm' name='mpc8568e'/>
<machine name='pseries-3.1' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes'/>
<machine name='ref405ep' maxCpus='1'/>
<machine name='sam460ex' maxCpus='1'/>
<machine name='virtex-ml507' maxCpus='1'/>
<machine name='powernv' maxCpus='2048'/>
<machine name='ppce500' maxCpus='32'/>
<machine name='mpc8544ds' maxCpus='15'/>
<machine name='pseries-2.12-sxxm' hotplugCpus='yes' maxCpus='1024'/>
<machine name='bamboo' maxCpus='1'/>
<machine name='g3beige' maxCpus='1'/>
<machine name='pseries-3.0' hotplugCpus='yes' maxCpus='1024'/>
<machine name='pseries-2.10' hotplugCpus='yes' maxCpus='1024'/>
<machine name='prep' maxCpus='1'/>
<machine name='pseries-2.11' hotplugCpus='yes' maxCpus='1024'/>
<machine name='pseries-2.12' hotplugCpus='yes' maxCpus='1024'/>
<machine name='pseries-2.9' hotplugCpus='yes' maxCpus='1024'/>
<machine name='mac99' maxCpus='1'/>
<machine name='pseries-2.6' maxCpus='1024'/>
<machine name='pseries-2.7' hotplugCpus='yes' maxCpus='1024'/>
<machine name='pseries-2.8' hotplugCpus='yes' maxCpus='1024'/>
<machine name='pseries-2.4' maxCpus='1024'/>
<machine name='pseries-2.5' maxCpus='1024'/>
<machine name='pseries-2.2' maxCpus='1024'/>
<machine name='taihu' maxCpus='1'/>
<machine name='pseries-2.3' maxCpus='1024'/>
<machine name='pseries-2.1' maxCpus='1024'/>
<machine name='40p' maxCpus='1'/>
<machine type='kvm' name='pseries-3.1' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes'/>
<machine type='kvm' name='ref405ep' maxCpus='1'/>
<machine type='kvm' name='sam460ex' maxCpus='1'/>
<machine type='kvm' name='virtex-ml507' maxCpus='1'/>
<machine type='kvm' name='powernv' maxCpus='2048'/>
<machine type='kvm' name='ppce500' maxCpus='32'/>
<machine type='kvm' name='mpc8544ds' maxCpus='15'/>
<machine type='kvm' name='pseries-2.12-sxxm' hotplugCpus='yes' maxCpus='1024'/>
<machine type='kvm' name='bamboo' maxCpus='1'/>
<machine type='kvm' name='g3beige' maxCpus='1'/>
<machine type='kvm' name='pseries-3.0' hotplugCpus='yes' maxCpus='1024'/>
<machine type='kvm' name='pseries-2.10' hotplugCpus='yes' maxCpus='1024'/>
<machine type='kvm' name='prep' maxCpus='1'/>
<machine type='kvm' name='pseries-2.11' hotplugCpus='yes' maxCpus='1024'/>
<machine type='kvm' name='pseries-2.12' hotplugCpus='yes' maxCpus='1024'/>
<machine type='kvm' name='pseries-2.9' hotplugCpus='yes' maxCpus='1024'/>
<machine type='kvm' name='mac99' maxCpus='1'/>
<machine type='kvm' name='pseries-2.6' maxCpus='1024'/>
<machine type='kvm' name='pseries-2.7' hotplugCpus='yes' maxCpus='1024'/>
<machine type='kvm' name='pseries-2.8' hotplugCpus='yes' maxCpus='1024'/>
<machine type='kvm' name='pseries-2.4' maxCpus='1024'/>
<machine type='kvm' name='pseries-2.5' maxCpus='1024'/>
<machine type='kvm' name='pseries-2.2' maxCpus='1024'/>
<machine type='kvm' name='taihu' maxCpus='1'/>
<machine type='kvm' name='pseries-2.3' maxCpus='1024'/>
<machine type='kvm' name='pseries-2.1' maxCpus='1024'/>
<machine type='kvm' name='40p' maxCpus='1'/>
<cpu type='tcg' name='default' typename='604-powerpc64-cpu'/>
<cpu type='tcg' name='ppc' typename='604-powerpc64-cpu'/>
<cpu type='tcg' name='ppc32' typename='604-powerpc64-cpu'/>
@ -1064,4 +1064,31 @@
<cpu type='tcg' name='750_v3.1'/>
<cpu type='tcg' name='power5+_v2.1'/>
<cpu type='tcg' name='mpc8568e'/>
<machine type='tcg' name='pseries-3.1' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes'/>
<machine type='tcg' name='ref405ep' maxCpus='1'/>
<machine type='tcg' name='sam460ex' maxCpus='1'/>
<machine type='tcg' name='virtex-ml507' maxCpus='1'/>
<machine type='tcg' name='powernv' maxCpus='2048'/>
<machine type='tcg' name='ppce500' maxCpus='32'/>
<machine type='tcg' name='mpc8544ds' maxCpus='15'/>
<machine type='tcg' name='pseries-2.12-sxxm' hotplugCpus='yes' maxCpus='1024'/>
<machine type='tcg' name='bamboo' maxCpus='1'/>
<machine type='tcg' name='g3beige' maxCpus='1'/>
<machine type='tcg' name='pseries-3.0' hotplugCpus='yes' maxCpus='1024'/>
<machine type='tcg' name='pseries-2.10' hotplugCpus='yes' maxCpus='1024'/>
<machine type='tcg' name='prep' maxCpus='1'/>
<machine type='tcg' name='pseries-2.11' hotplugCpus='yes' maxCpus='1024'/>
<machine type='tcg' name='pseries-2.12' hotplugCpus='yes' maxCpus='1024'/>
<machine type='tcg' name='pseries-2.9' hotplugCpus='yes' maxCpus='1024'/>
<machine type='tcg' name='mac99' maxCpus='1'/>
<machine type='tcg' name='pseries-2.6' maxCpus='1024'/>
<machine type='tcg' name='pseries-2.7' hotplugCpus='yes' maxCpus='1024'/>
<machine type='tcg' name='pseries-2.8' hotplugCpus='yes' maxCpus='1024'/>
<machine type='tcg' name='pseries-2.4' maxCpus='1024'/>
<machine type='tcg' name='pseries-2.5' maxCpus='1024'/>
<machine type='tcg' name='pseries-2.2' maxCpus='1024'/>
<machine type='tcg' name='taihu' maxCpus='1'/>
<machine type='tcg' name='pseries-2.3' maxCpus='1024'/>
<machine type='tcg' name='pseries-2.1' maxCpus='1024'/>
<machine type='tcg' name='40p' maxCpus='1'/>
</qemuCaps>

View File

@ -657,47 +657,47 @@
<cpu type='kvm' name='Broadwell-IBRS' typename='Broadwell-IBRS-x86_64-cpu' usable='yes'/>
<cpu type='kvm' name='Broadwell' typename='Broadwell-x86_64-cpu' usable='yes'/>
<cpu type='kvm' name='486' typename='486-x86_64-cpu' usable='yes'/>
<machine name='pc-i440fx-3.1' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/>
<machine name='isapc' hotplugCpus='yes' maxCpus='1'/>
<machine name='pc-1.1' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-1.2' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-1.3' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-1.0' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-3.1' alias='q35' hotplugCpus='yes' maxCpus='288'/>
<machine name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288'/>
<machine name='pc-q35-2.12' hotplugCpus='yes' maxCpus='288'/>
<machine name='pc-q35-3.0' hotplugCpus='yes' maxCpus='288'/>
<machine name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288'/>
<machine name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288'/>
<machine name='pc-0.15' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288'/>
<machine name='pc-0.13' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-0.14' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-3.0' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-0.11' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-0.12' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-0.10' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-3.1' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/>
<machine type='kvm' name='isapc' hotplugCpus='yes' maxCpus='1'/>
<machine type='kvm' name='pc-1.1' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-1.2' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-1.3' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-1.0' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-q35-3.1' alias='q35' hotplugCpus='yes' maxCpus='288'/>
<machine type='kvm' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288'/>
<machine type='kvm' name='pc-q35-2.12' hotplugCpus='yes' maxCpus='288'/>
<machine type='kvm' name='pc-q35-3.0' hotplugCpus='yes' maxCpus='288'/>
<machine type='kvm' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288'/>
<machine type='kvm' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288'/>
<machine type='kvm' name='pc-0.15' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288'/>
<machine type='kvm' name='pc-0.13' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-0.14' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-3.0' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-0.11' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-0.12' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-0.10' hotplugCpus='yes' maxCpus='255'/>
<hostCPU type='tcg' model='base' migratability='yes'>
<property name='phys-bits' type='number' value='0'/>
<property name='core-id' type='number' value='-1'/>
@ -1367,4 +1367,45 @@
<blocker name='3dnowprefetch'/>
</cpu>
<cpu type='tcg' name='486' typename='486-x86_64-cpu' usable='yes'/>
<machine type='tcg' name='pc-i440fx-3.1' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/>
<machine type='tcg' name='isapc' hotplugCpus='yes' maxCpus='1'/>
<machine type='tcg' name='pc-1.1' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-1.2' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-1.3' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-1.0' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-q35-3.1' alias='q35' hotplugCpus='yes' maxCpus='288'/>
<machine type='tcg' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288'/>
<machine type='tcg' name='pc-q35-2.12' hotplugCpus='yes' maxCpus='288'/>
<machine type='tcg' name='pc-q35-3.0' hotplugCpus='yes' maxCpus='288'/>
<machine type='tcg' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288'/>
<machine type='tcg' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288'/>
<machine type='tcg' name='pc-0.15' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288'/>
<machine type='tcg' name='pc-0.13' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-0.14' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-3.0' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-0.11' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-0.12' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-0.10' hotplugCpus='yes' maxCpus='255'/>
</qemuCaps>

View File

@ -209,72 +209,72 @@
<cpu type='kvm' name='cortex-r5' typename='cortex-r5-arm-cpu'/>
<cpu type='kvm' name='pxa270-a1' typename='pxa270-a1-arm-cpu'/>
<cpu type='kvm' name='pxa270' typename='pxa270-arm-cpu'/>
<machine name='integratorcp' maxCpus='1'/>
<machine name='nuri' maxCpus='2'/>
<machine name='mps2-an511' maxCpus='1'/>
<machine name='verdex' maxCpus='1'/>
<machine name='mps2-an505' maxCpus='1'/>
<machine name='virt-3.0' maxCpus='512'/>
<machine name='ast2500-evb' maxCpus='1'/>
<machine name='smdkc210' maxCpus='2'/>
<machine name='collie' maxCpus='1'/>
<machine name='xlnx-versal-virt' maxCpus='2'/>
<machine name='imx25-pdk' maxCpus='1'/>
<machine name='spitz' maxCpus='1'/>
<machine name='musca-b1' maxCpus='2'/>
<machine name='realview-pbx-a9' maxCpus='4'/>
<machine name='realview-eb' maxCpus='1'/>
<machine name='realview-pb-a8' maxCpus='1'/>
<machine name='versatilepb' maxCpus='1'/>
<machine name='emcraft-sf2' maxCpus='1'/>
<machine name='virt-2.9' maxCpus='255'/>
<machine name='musicpal' maxCpus='1'/>
<machine name='z2' maxCpus='1'/>
<machine name='akita' maxCpus='1'/>
<machine name='virt-2.7' maxCpus='255'/>
<machine name='kzm' maxCpus='1'/>
<machine name='virt-2.8' maxCpus='255'/>
<machine name='realview-eb-mpcore' maxCpus='4'/>
<machine name='musca-a' maxCpus='2'/>
<machine name='mcimx7d-sabre' maxCpus='2'/>
<machine name='sx1' maxCpus='1'/>
<machine name='sx1-v1' maxCpus='1'/>
<machine name='virt-2.6' maxCpus='255'/>
<machine name='cubieboard' maxCpus='1'/>
<machine name='virt-4.0' alias='virt' maxCpus='512'/>
<machine name='highbank' maxCpus='4'/>
<machine name='raspi2' maxCpus='4'/>
<machine name='raspi3' maxCpus='4'/>
<machine name='netduino2' maxCpus='1'/>
<machine name='terrier' maxCpus='1'/>
<machine name='n810' maxCpus='1'/>
<machine name='mainstone' maxCpus='1'/>
<machine name='palmetto-bmc' maxCpus='1'/>
<machine name='sabrelite' maxCpus='4'/>
<machine name='midway' maxCpus='4'/>
<machine name='romulus-bmc' maxCpus='1'/>
<machine name='cheetah' maxCpus='1'/>
<machine name='tosa' maxCpus='1'/>
<machine name='borzoi' maxCpus='1'/>
<machine name='versatileab' maxCpus='1'/>
<machine name='lm3s6965evb' maxCpus='1'/>
<machine name='n800' maxCpus='1'/>
<machine name='virt-2.10' maxCpus='255'/>
<machine name='virt-2.11' maxCpus='255'/>
<machine name='connex' maxCpus='1'/>
<machine name='virt-2.12' maxCpus='255'/>
<machine name='microbit' maxCpus='1'/>
<machine name='witherspoon-bmc' maxCpus='1'/>
<machine name='xilinx-zynq-a9' maxCpus='1'/>
<machine name='mps2-an385' maxCpus='1'/>
<machine name='vexpress-a9' maxCpus='4'/>
<machine name='mps2-an521' maxCpus='2'/>
<machine name='mcimx6ul-evk' maxCpus='1'/>
<machine name='vexpress-a15' maxCpus='4'/>
<machine name='xlnx-zcu102' maxCpus='6'/>
<machine name='virt-3.1' maxCpus='512'/>
<machine name='canon-a1100' maxCpus='1'/>
<machine name='lm3s811evb' maxCpus='1'/>
<machine type='kvm' name='integratorcp' maxCpus='1'/>
<machine type='kvm' name='nuri' maxCpus='2'/>
<machine type='kvm' name='mps2-an511' maxCpus='1'/>
<machine type='kvm' name='verdex' maxCpus='1'/>
<machine type='kvm' name='mps2-an505' maxCpus='1'/>
<machine type='kvm' name='virt-3.0' maxCpus='512'/>
<machine type='kvm' name='ast2500-evb' maxCpus='1'/>
<machine type='kvm' name='smdkc210' maxCpus='2'/>
<machine type='kvm' name='collie' maxCpus='1'/>
<machine type='kvm' name='xlnx-versal-virt' maxCpus='2'/>
<machine type='kvm' name='imx25-pdk' maxCpus='1'/>
<machine type='kvm' name='spitz' maxCpus='1'/>
<machine type='kvm' name='musca-b1' maxCpus='2'/>
<machine type='kvm' name='realview-pbx-a9' maxCpus='4'/>
<machine type='kvm' name='realview-eb' maxCpus='1'/>
<machine type='kvm' name='realview-pb-a8' maxCpus='1'/>
<machine type='kvm' name='versatilepb' maxCpus='1'/>
<machine type='kvm' name='emcraft-sf2' maxCpus='1'/>
<machine type='kvm' name='virt-2.9' maxCpus='255'/>
<machine type='kvm' name='musicpal' maxCpus='1'/>
<machine type='kvm' name='z2' maxCpus='1'/>
<machine type='kvm' name='akita' maxCpus='1'/>
<machine type='kvm' name='virt-2.7' maxCpus='255'/>
<machine type='kvm' name='kzm' maxCpus='1'/>
<machine type='kvm' name='virt-2.8' maxCpus='255'/>
<machine type='kvm' name='realview-eb-mpcore' maxCpus='4'/>
<machine type='kvm' name='musca-a' maxCpus='2'/>
<machine type='kvm' name='mcimx7d-sabre' maxCpus='2'/>
<machine type='kvm' name='sx1' maxCpus='1'/>
<machine type='kvm' name='sx1-v1' maxCpus='1'/>
<machine type='kvm' name='virt-2.6' maxCpus='255'/>
<machine type='kvm' name='cubieboard' maxCpus='1'/>
<machine type='kvm' name='virt-4.0' alias='virt' maxCpus='512'/>
<machine type='kvm' name='highbank' maxCpus='4'/>
<machine type='kvm' name='raspi2' maxCpus='4'/>
<machine type='kvm' name='raspi3' maxCpus='4'/>
<machine type='kvm' name='netduino2' maxCpus='1'/>
<machine type='kvm' name='terrier' maxCpus='1'/>
<machine type='kvm' name='n810' maxCpus='1'/>
<machine type='kvm' name='mainstone' maxCpus='1'/>
<machine type='kvm' name='palmetto-bmc' maxCpus='1'/>
<machine type='kvm' name='sabrelite' maxCpus='4'/>
<machine type='kvm' name='midway' maxCpus='4'/>
<machine type='kvm' name='romulus-bmc' maxCpus='1'/>
<machine type='kvm' name='cheetah' maxCpus='1'/>
<machine type='kvm' name='tosa' maxCpus='1'/>
<machine type='kvm' name='borzoi' maxCpus='1'/>
<machine type='kvm' name='versatileab' maxCpus='1'/>
<machine type='kvm' name='lm3s6965evb' maxCpus='1'/>
<machine type='kvm' name='n800' maxCpus='1'/>
<machine type='kvm' name='virt-2.10' maxCpus='255'/>
<machine type='kvm' name='virt-2.11' maxCpus='255'/>
<machine type='kvm' name='connex' maxCpus='1'/>
<machine type='kvm' name='virt-2.12' maxCpus='255'/>
<machine type='kvm' name='microbit' maxCpus='1'/>
<machine type='kvm' name='witherspoon-bmc' maxCpus='1'/>
<machine type='kvm' name='xilinx-zynq-a9' maxCpus='1'/>
<machine type='kvm' name='mps2-an385' maxCpus='1'/>
<machine type='kvm' name='vexpress-a9' maxCpus='4'/>
<machine type='kvm' name='mps2-an521' maxCpus='2'/>
<machine type='kvm' name='mcimx6ul-evk' maxCpus='1'/>
<machine type='kvm' name='vexpress-a15' maxCpus='4'/>
<machine type='kvm' name='xlnx-zcu102' maxCpus='6'/>
<machine type='kvm' name='virt-3.1' maxCpus='512'/>
<machine type='kvm' name='canon-a1100' maxCpus='1'/>
<machine type='kvm' name='lm3s811evb' maxCpus='1'/>
<cpu type='tcg' name='pxa262' typename='pxa262-arm-cpu'/>
<cpu type='tcg' name='pxa270-a0' typename='pxa270-a0-arm-cpu'/>
<cpu type='tcg' name='arm1136' typename='arm1136-arm-cpu'/>
@ -312,6 +312,72 @@
<cpu type='tcg' name='cortex-r5' typename='cortex-r5-arm-cpu'/>
<cpu type='tcg' name='pxa270-a1' typename='pxa270-a1-arm-cpu'/>
<cpu type='tcg' name='pxa270' typename='pxa270-arm-cpu'/>
<machine type='tcg' name='integratorcp' maxCpus='1'/>
<machine type='tcg' name='nuri' maxCpus='2'/>
<machine type='tcg' name='mps2-an511' maxCpus='1'/>
<machine type='tcg' name='verdex' maxCpus='1'/>
<machine type='tcg' name='mps2-an505' maxCpus='1'/>
<machine type='tcg' name='virt-3.0' maxCpus='512'/>
<machine type='tcg' name='ast2500-evb' maxCpus='1'/>
<machine type='tcg' name='smdkc210' maxCpus='2'/>
<machine type='tcg' name='collie' maxCpus='1'/>
<machine type='tcg' name='xlnx-versal-virt' maxCpus='2'/>
<machine type='tcg' name='imx25-pdk' maxCpus='1'/>
<machine type='tcg' name='spitz' maxCpus='1'/>
<machine type='tcg' name='musca-b1' maxCpus='2'/>
<machine type='tcg' name='realview-pbx-a9' maxCpus='4'/>
<machine type='tcg' name='realview-eb' maxCpus='1'/>
<machine type='tcg' name='realview-pb-a8' maxCpus='1'/>
<machine type='tcg' name='versatilepb' maxCpus='1'/>
<machine type='tcg' name='emcraft-sf2' maxCpus='1'/>
<machine type='tcg' name='virt-2.9' maxCpus='255'/>
<machine type='tcg' name='musicpal' maxCpus='1'/>
<machine type='tcg' name='z2' maxCpus='1'/>
<machine type='tcg' name='akita' maxCpus='1'/>
<machine type='tcg' name='virt-2.7' maxCpus='255'/>
<machine type='tcg' name='kzm' maxCpus='1'/>
<machine type='tcg' name='virt-2.8' maxCpus='255'/>
<machine type='tcg' name='realview-eb-mpcore' maxCpus='4'/>
<machine type='tcg' name='musca-a' maxCpus='2'/>
<machine type='tcg' name='mcimx7d-sabre' maxCpus='2'/>
<machine type='tcg' name='sx1' maxCpus='1'/>
<machine type='tcg' name='sx1-v1' maxCpus='1'/>
<machine type='tcg' name='virt-2.6' maxCpus='255'/>
<machine type='tcg' name='cubieboard' maxCpus='1'/>
<machine type='tcg' name='virt-4.0' alias='virt' maxCpus='512'/>
<machine type='tcg' name='highbank' maxCpus='4'/>
<machine type='tcg' name='raspi2' maxCpus='4'/>
<machine type='tcg' name='raspi3' maxCpus='4'/>
<machine type='tcg' name='netduino2' maxCpus='1'/>
<machine type='tcg' name='terrier' maxCpus='1'/>
<machine type='tcg' name='n810' maxCpus='1'/>
<machine type='tcg' name='mainstone' maxCpus='1'/>
<machine type='tcg' name='palmetto-bmc' maxCpus='1'/>
<machine type='tcg' name='sabrelite' maxCpus='4'/>
<machine type='tcg' name='midway' maxCpus='4'/>
<machine type='tcg' name='romulus-bmc' maxCpus='1'/>
<machine type='tcg' name='cheetah' maxCpus='1'/>
<machine type='tcg' name='tosa' maxCpus='1'/>
<machine type='tcg' name='borzoi' maxCpus='1'/>
<machine type='tcg' name='versatileab' maxCpus='1'/>
<machine type='tcg' name='lm3s6965evb' maxCpus='1'/>
<machine type='tcg' name='n800' maxCpus='1'/>
<machine type='tcg' name='virt-2.10' maxCpus='255'/>
<machine type='tcg' name='virt-2.11' maxCpus='255'/>
<machine type='tcg' name='connex' maxCpus='1'/>
<machine type='tcg' name='virt-2.12' maxCpus='255'/>
<machine type='tcg' name='microbit' maxCpus='1'/>
<machine type='tcg' name='witherspoon-bmc' maxCpus='1'/>
<machine type='tcg' name='xilinx-zynq-a9' maxCpus='1'/>
<machine type='tcg' name='mps2-an385' maxCpus='1'/>
<machine type='tcg' name='vexpress-a9' maxCpus='4'/>
<machine type='tcg' name='mps2-an521' maxCpus='2'/>
<machine type='tcg' name='mcimx6ul-evk' maxCpus='1'/>
<machine type='tcg' name='vexpress-a15' maxCpus='4'/>
<machine type='tcg' name='xlnx-zcu102' maxCpus='6'/>
<machine type='tcg' name='virt-3.1' maxCpus='512'/>
<machine type='tcg' name='canon-a1100' maxCpus='1'/>
<machine type='tcg' name='lm3s811evb' maxCpus='1'/>
<gic version='3' kernel='yes' emulated='yes'/>
<gic version='2' kernel='no' emulated='yes'/>
</qemuCaps>

View File

@ -614,34 +614,34 @@
<cpu type='kvm' name='750_v3.1'/>
<cpu type='kvm' name='power8e_v2.1'/>
<cpu type='kvm' name='mpc8568e'/>
<machine name='pseries-4.0' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes'/>
<machine name='ref405ep' maxCpus='1'/>
<machine name='sam460ex' maxCpus='1'/>
<machine name='virtex-ml507' maxCpus='1'/>
<machine name='powernv' maxCpus='2048'/>
<machine name='ppce500' maxCpus='32'/>
<machine name='mpc8544ds' maxCpus='15'/>
<machine name='pseries-3.1' hotplugCpus='yes' maxCpus='1024'/>
<machine name='pseries-2.12-sxxm' hotplugCpus='yes' maxCpus='1024'/>
<machine name='bamboo' maxCpus='1'/>
<machine name='g3beige' maxCpus='1'/>
<machine name='pseries-3.0' hotplugCpus='yes' maxCpus='1024'/>
<machine name='pseries-2.10' hotplugCpus='yes' maxCpus='1024'/>
<machine name='prep' maxCpus='1'/>
<machine name='pseries-2.11' hotplugCpus='yes' maxCpus='1024'/>
<machine name='pseries-2.12' hotplugCpus='yes' maxCpus='1024'/>
<machine name='pseries-2.9' hotplugCpus='yes' maxCpus='1024'/>
<machine name='mac99' maxCpus='1'/>
<machine name='pseries-2.6' maxCpus='1024'/>
<machine name='pseries-2.7' hotplugCpus='yes' maxCpus='1024'/>
<machine name='pseries-2.8' hotplugCpus='yes' maxCpus='1024'/>
<machine name='pseries-2.4' maxCpus='1024'/>
<machine name='pseries-2.5' maxCpus='1024'/>
<machine name='pseries-2.2' maxCpus='1024'/>
<machine name='taihu' maxCpus='1'/>
<machine name='pseries-2.3' maxCpus='1024'/>
<machine name='pseries-2.1' maxCpus='1024'/>
<machine name='40p' maxCpus='1'/>
<machine type='kvm' name='pseries-4.0' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes'/>
<machine type='kvm' name='ref405ep' maxCpus='1'/>
<machine type='kvm' name='sam460ex' maxCpus='1'/>
<machine type='kvm' name='virtex-ml507' maxCpus='1'/>
<machine type='kvm' name='powernv' maxCpus='2048'/>
<machine type='kvm' name='ppce500' maxCpus='32'/>
<machine type='kvm' name='mpc8544ds' maxCpus='15'/>
<machine type='kvm' name='pseries-3.1' hotplugCpus='yes' maxCpus='1024'/>
<machine type='kvm' name='pseries-2.12-sxxm' hotplugCpus='yes' maxCpus='1024'/>
<machine type='kvm' name='bamboo' maxCpus='1'/>
<machine type='kvm' name='g3beige' maxCpus='1'/>
<machine type='kvm' name='pseries-3.0' hotplugCpus='yes' maxCpus='1024'/>
<machine type='kvm' name='pseries-2.10' hotplugCpus='yes' maxCpus='1024'/>
<machine type='kvm' name='prep' maxCpus='1'/>
<machine type='kvm' name='pseries-2.11' hotplugCpus='yes' maxCpus='1024'/>
<machine type='kvm' name='pseries-2.12' hotplugCpus='yes' maxCpus='1024'/>
<machine type='kvm' name='pseries-2.9' hotplugCpus='yes' maxCpus='1024'/>
<machine type='kvm' name='mac99' maxCpus='1'/>
<machine type='kvm' name='pseries-2.6' maxCpus='1024'/>
<machine type='kvm' name='pseries-2.7' hotplugCpus='yes' maxCpus='1024'/>
<machine type='kvm' name='pseries-2.8' hotplugCpus='yes' maxCpus='1024'/>
<machine type='kvm' name='pseries-2.4' maxCpus='1024'/>
<machine type='kvm' name='pseries-2.5' maxCpus='1024'/>
<machine type='kvm' name='pseries-2.2' maxCpus='1024'/>
<machine type='kvm' name='taihu' maxCpus='1'/>
<machine type='kvm' name='pseries-2.3' maxCpus='1024'/>
<machine type='kvm' name='pseries-2.1' maxCpus='1024'/>
<machine type='kvm' name='40p' maxCpus='1'/>
<cpu type='tcg' name='default' typename='604-powerpc64-cpu'/>
<cpu type='tcg' name='ppc' typename='604-powerpc64-cpu'/>
<cpu type='tcg' name='ppc32' typename='604-powerpc64-cpu'/>
@ -1079,4 +1079,32 @@
<cpu type='tcg' name='750_v3.1'/>
<cpu type='tcg' name='power8e_v2.1'/>
<cpu type='tcg' name='mpc8568e'/>
<machine type='tcg' name='pseries-4.0' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes'/>
<machine type='tcg' name='ref405ep' maxCpus='1'/>
<machine type='tcg' name='sam460ex' maxCpus='1'/>
<machine type='tcg' name='virtex-ml507' maxCpus='1'/>
<machine type='tcg' name='powernv' maxCpus='2048'/>
<machine type='tcg' name='ppce500' maxCpus='32'/>
<machine type='tcg' name='mpc8544ds' maxCpus='15'/>
<machine type='tcg' name='pseries-3.1' hotplugCpus='yes' maxCpus='1024'/>
<machine type='tcg' name='pseries-2.12-sxxm' hotplugCpus='yes' maxCpus='1024'/>
<machine type='tcg' name='bamboo' maxCpus='1'/>
<machine type='tcg' name='g3beige' maxCpus='1'/>
<machine type='tcg' name='pseries-3.0' hotplugCpus='yes' maxCpus='1024'/>
<machine type='tcg' name='pseries-2.10' hotplugCpus='yes' maxCpus='1024'/>
<machine type='tcg' name='prep' maxCpus='1'/>
<machine type='tcg' name='pseries-2.11' hotplugCpus='yes' maxCpus='1024'/>
<machine type='tcg' name='pseries-2.12' hotplugCpus='yes' maxCpus='1024'/>
<machine type='tcg' name='pseries-2.9' hotplugCpus='yes' maxCpus='1024'/>
<machine type='tcg' name='mac99' maxCpus='1'/>
<machine type='tcg' name='pseries-2.6' maxCpus='1024'/>
<machine type='tcg' name='pseries-2.7' hotplugCpus='yes' maxCpus='1024'/>
<machine type='tcg' name='pseries-2.8' hotplugCpus='yes' maxCpus='1024'/>
<machine type='tcg' name='pseries-2.4' maxCpus='1024'/>
<machine type='tcg' name='pseries-2.5' maxCpus='1024'/>
<machine type='tcg' name='pseries-2.2' maxCpus='1024'/>
<machine type='tcg' name='taihu' maxCpus='1'/>
<machine type='tcg' name='pseries-2.3' maxCpus='1024'/>
<machine type='tcg' name='pseries-2.1' maxCpus='1024'/>
<machine type='tcg' name='40p' maxCpus='1'/>
</qemuCaps>

View File

@ -173,9 +173,9 @@
<microcodeVersion>0</microcodeVersion>
<package>v4.0.0</package>
<arch>riscv32</arch>
<machine name='spike_v1.10' maxCpus='1' default='yes'/>
<machine name='virt' maxCpus='8'/>
<machine name='sifive_u' maxCpus='4'/>
<machine name='sifive_e' maxCpus='1'/>
<machine name='spike_v1.9.1' maxCpus='1'/>
<machine type='tcg' name='spike_v1.10' maxCpus='1' default='yes'/>
<machine type='tcg' name='virt' maxCpus='8'/>
<machine type='tcg' name='sifive_u' maxCpus='4'/>
<machine type='tcg' name='sifive_e' maxCpus='1'/>
<machine type='tcg' name='spike_v1.9.1' maxCpus='1'/>
</qemuCaps>

View File

@ -173,9 +173,9 @@
<microcodeVersion>0</microcodeVersion>
<package>v4.0.0</package>
<arch>riscv64</arch>
<machine name='spike_v1.10' maxCpus='1' default='yes'/>
<machine name='virt' maxCpus='8'/>
<machine name='sifive_u' maxCpus='4'/>
<machine name='sifive_e' maxCpus='1'/>
<machine name='spike_v1.9.1' maxCpus='1'/>
<machine type='tcg' name='spike_v1.10' maxCpus='1' default='yes'/>
<machine type='tcg' name='virt' maxCpus='8'/>
<machine type='tcg' name='sifive_u' maxCpus='4'/>
<machine type='tcg' name='sifive_e' maxCpus='1'/>
<machine type='tcg' name='spike_v1.9.1' maxCpus='1'/>
</qemuCaps>

View File

@ -248,18 +248,18 @@
<cpu type='kvm' name='z9BC' typename='z9BC-s390x-cpu' usable='yes'/>
<cpu type='kvm' name='z10EC.3-base' typename='z10EC.3-base-s390x-cpu' usable='yes'/>
<cpu type='kvm' name='z990.3-base' typename='z990.3-base-s390x-cpu' usable='yes'/>
<machine name='s390-ccw-virtio-4.0' alias='s390-ccw-virtio' hotplugCpus='yes' maxCpus='248' default='yes'/>
<machine name='s390-ccw-virtio-2.7' hotplugCpus='yes' maxCpus='248'/>
<machine name='s390-ccw-virtio-2.6' hotplugCpus='yes' maxCpus='248'/>
<machine name='s390-ccw-virtio-2.11' hotplugCpus='yes' maxCpus='248'/>
<machine name='s390-ccw-virtio-2.10' hotplugCpus='yes' maxCpus='248'/>
<machine name='s390-ccw-virtio-3.1' hotplugCpus='yes' maxCpus='248'/>
<machine name='s390-ccw-virtio-2.5' hotplugCpus='yes' maxCpus='248'/>
<machine name='s390-ccw-virtio-2.4' hotplugCpus='yes' maxCpus='248'/>
<machine name='s390-ccw-virtio-3.0' hotplugCpus='yes' maxCpus='248'/>
<machine name='s390-ccw-virtio-2.9' hotplugCpus='yes' maxCpus='248'/>
<machine name='s390-ccw-virtio-2.8' hotplugCpus='yes' maxCpus='248'/>
<machine name='s390-ccw-virtio-2.12' hotplugCpus='yes' maxCpus='248'/>
<machine type='kvm' name='s390-ccw-virtio-4.0' alias='s390-ccw-virtio' hotplugCpus='yes' maxCpus='248' default='yes'/>
<machine type='kvm' name='s390-ccw-virtio-2.7' hotplugCpus='yes' maxCpus='248'/>
<machine type='kvm' name='s390-ccw-virtio-2.6' hotplugCpus='yes' maxCpus='248'/>
<machine type='kvm' name='s390-ccw-virtio-2.11' hotplugCpus='yes' maxCpus='248'/>
<machine type='kvm' name='s390-ccw-virtio-2.10' hotplugCpus='yes' maxCpus='248'/>
<machine type='kvm' name='s390-ccw-virtio-3.1' hotplugCpus='yes' maxCpus='248'/>
<machine type='kvm' name='s390-ccw-virtio-2.5' hotplugCpus='yes' maxCpus='248'/>
<machine type='kvm' name='s390-ccw-virtio-2.4' hotplugCpus='yes' maxCpus='248'/>
<machine type='kvm' name='s390-ccw-virtio-3.0' hotplugCpus='yes' maxCpus='248'/>
<machine type='kvm' name='s390-ccw-virtio-2.9' hotplugCpus='yes' maxCpus='248'/>
<machine type='kvm' name='s390-ccw-virtio-2.8' hotplugCpus='yes' maxCpus='248'/>
<machine type='kvm' name='s390-ccw-virtio-2.12' hotplugCpus='yes' maxCpus='248'/>
<hostCPU type='tcg' model='zEC12.2-base' migratability='no'>
<property name='dateh2' type='boolean' value='false'/>
<property name='aen' type='boolean' value='true'/>
@ -2896,4 +2896,16 @@
<blocker name='kmac-dea'/>
<blocker name='hfpm'/>
</cpu>
<machine type='tcg' name='s390-ccw-virtio-4.0' alias='s390-ccw-virtio' hotplugCpus='yes' maxCpus='248' default='yes'/>
<machine type='tcg' name='s390-ccw-virtio-2.7' hotplugCpus='yes' maxCpus='248'/>
<machine type='tcg' name='s390-ccw-virtio-2.6' hotplugCpus='yes' maxCpus='248'/>
<machine type='tcg' name='s390-ccw-virtio-2.11' hotplugCpus='yes' maxCpus='248'/>
<machine type='tcg' name='s390-ccw-virtio-2.10' hotplugCpus='yes' maxCpus='248'/>
<machine type='tcg' name='s390-ccw-virtio-3.1' hotplugCpus='yes' maxCpus='248'/>
<machine type='tcg' name='s390-ccw-virtio-2.5' hotplugCpus='yes' maxCpus='248'/>
<machine type='tcg' name='s390-ccw-virtio-2.4' hotplugCpus='yes' maxCpus='248'/>
<machine type='tcg' name='s390-ccw-virtio-3.0' hotplugCpus='yes' maxCpus='248'/>
<machine type='tcg' name='s390-ccw-virtio-2.9' hotplugCpus='yes' maxCpus='248'/>
<machine type='tcg' name='s390-ccw-virtio-2.8' hotplugCpus='yes' maxCpus='248'/>
<machine type='tcg' name='s390-ccw-virtio-2.12' hotplugCpus='yes' maxCpus='248'/>
</qemuCaps>

View File

@ -664,47 +664,47 @@
<cpu type='kvm' name='Broadwell-IBRS' typename='Broadwell-IBRS-x86_64-cpu' usable='yes'/>
<cpu type='kvm' name='Broadwell' typename='Broadwell-x86_64-cpu' usable='yes'/>
<cpu type='kvm' name='486' typename='486-x86_64-cpu' usable='yes'/>
<machine name='pc-i440fx-4.0' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/>
<machine name='isapc' hotplugCpus='yes' maxCpus='1'/>
<machine name='pc-1.1' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-1.2' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-1.3' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-1.0' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-3.1' hotplugCpus='yes' maxCpus='288'/>
<machine name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288'/>
<machine name='pc-q35-2.12' hotplugCpus='yes' maxCpus='288'/>
<machine name='pc-q35-3.0' hotplugCpus='yes' maxCpus='288'/>
<machine name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288'/>
<machine name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288'/>
<machine name='pc-0.15' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288'/>
<machine name='pc-0.13' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-0.14' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-3.0' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-3.1' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-0.12' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-4.0' alias='q35' hotplugCpus='yes' maxCpus='288'/>
<machine type='kvm' name='pc-i440fx-4.0' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/>
<machine type='kvm' name='isapc' hotplugCpus='yes' maxCpus='1'/>
<machine type='kvm' name='pc-1.1' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-1.2' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-1.3' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-1.0' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-q35-3.1' hotplugCpus='yes' maxCpus='288'/>
<machine type='kvm' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288'/>
<machine type='kvm' name='pc-q35-2.12' hotplugCpus='yes' maxCpus='288'/>
<machine type='kvm' name='pc-q35-3.0' hotplugCpus='yes' maxCpus='288'/>
<machine type='kvm' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288'/>
<machine type='kvm' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288'/>
<machine type='kvm' name='pc-0.15' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288'/>
<machine type='kvm' name='pc-0.13' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-0.14' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-3.0' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-3.1' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-0.12' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-q35-4.0' alias='q35' hotplugCpus='yes' maxCpus='288'/>
<hostCPU type='tcg' model='base' migratability='yes'>
<property name='phys-bits' type='number' value='0'/>
<property name='core-id' type='number' value='-1'/>
@ -1375,4 +1375,45 @@
<blocker name='3dnowprefetch'/>
</cpu>
<cpu type='tcg' name='486' typename='486-x86_64-cpu' usable='yes'/>
<machine type='tcg' name='pc-i440fx-4.0' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/>
<machine type='tcg' name='isapc' hotplugCpus='yes' maxCpus='1'/>
<machine type='tcg' name='pc-1.1' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-1.2' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-1.3' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-1.0' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-q35-3.1' hotplugCpus='yes' maxCpus='288'/>
<machine type='tcg' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288'/>
<machine type='tcg' name='pc-q35-2.12' hotplugCpus='yes' maxCpus='288'/>
<machine type='tcg' name='pc-q35-3.0' hotplugCpus='yes' maxCpus='288'/>
<machine type='tcg' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288'/>
<machine type='tcg' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288'/>
<machine type='tcg' name='pc-0.15' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288'/>
<machine type='tcg' name='pc-0.13' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-0.14' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-3.0' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-3.1' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-0.12' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-q35-4.0' alias='q35' hotplugCpus='yes' maxCpus='288'/>
</qemuCaps>

View File

@ -838,50 +838,50 @@
<cpu type='kvm' name='Broadwell' typename='Broadwell-x86_64-cpu' usable='yes'/>
<cpu type='kvm' name='486-v1' typename='486-v1-x86_64-cpu' usable='yes'/>
<cpu type='kvm' name='486' typename='486-x86_64-cpu' usable='yes'/>
<machine name='pc-i440fx-4.1' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/>
<machine name='pc-0.15' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-0.12' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-1.1' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288'/>
<machine name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-0.14' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288'/>
<machine name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-3.1' hotplugCpus='yes' maxCpus='288'/>
<machine name='pc-q35-4.1' alias='q35' hotplugCpus='yes' maxCpus='288'/>
<machine name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-1.3' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255'/>
<machine name='isapc' hotplugCpus='yes' maxCpus='1'/>
<machine name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-3.1' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-2.12' hotplugCpus='yes' maxCpus='288'/>
<machine name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-1.0' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-4.0.1' hotplugCpus='yes' maxCpus='288'/>
<machine name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-0.13' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288'/>
<machine name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-3.0' hotplugCpus='yes' maxCpus='288'/>
<machine name='pc-q35-4.0' hotplugCpus='yes' maxCpus='288'/>
<machine name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-1.2' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-4.0' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-3.0' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288'/>
<machine type='kvm' name='pc-i440fx-4.1' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/>
<machine type='kvm' name='pc-0.15' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-0.12' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-1.1' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288'/>
<machine type='kvm' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-0.14' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288'/>
<machine type='kvm' name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-q35-3.1' hotplugCpus='yes' maxCpus='288'/>
<machine type='kvm' name='pc-q35-4.1' alias='q35' hotplugCpus='yes' maxCpus='288'/>
<machine type='kvm' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-1.3' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='isapc' hotplugCpus='yes' maxCpus='1'/>
<machine type='kvm' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-3.1' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-q35-2.12' hotplugCpus='yes' maxCpus='288'/>
<machine type='kvm' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-1.0' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-q35-4.0.1' hotplugCpus='yes' maxCpus='288'/>
<machine type='kvm' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-0.13' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288'/>
<machine type='kvm' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-q35-3.0' hotplugCpus='yes' maxCpus='288'/>
<machine type='kvm' name='pc-q35-4.0' hotplugCpus='yes' maxCpus='288'/>
<machine type='kvm' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-1.2' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-4.0' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-3.0' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288'/>
<hostCPU type='tcg' model='base' migratability='yes'>
<property name='cmov' type='boolean' value='true' migratable='yes'/>
<property name='ia64' type='boolean' value='false'/>
@ -1942,4 +1942,48 @@
</cpu>
<cpu type='tcg' name='486-v1' typename='486-v1-x86_64-cpu' usable='yes'/>
<cpu type='tcg' name='486' typename='486-x86_64-cpu' usable='yes'/>
<machine type='tcg' name='pc-i440fx-4.1' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/>
<machine type='tcg' name='pc-0.15' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-0.12' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-1.1' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288'/>
<machine type='tcg' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-0.14' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288'/>
<machine type='tcg' name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-q35-3.1' hotplugCpus='yes' maxCpus='288'/>
<machine type='tcg' name='pc-q35-4.1' alias='q35' hotplugCpus='yes' maxCpus='288'/>
<machine type='tcg' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-1.3' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='isapc' hotplugCpus='yes' maxCpus='1'/>
<machine type='tcg' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-3.1' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-q35-2.12' hotplugCpus='yes' maxCpus='288'/>
<machine type='tcg' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-1.0' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-q35-4.0.1' hotplugCpus='yes' maxCpus='288'/>
<machine type='tcg' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-0.13' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288'/>
<machine type='tcg' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-q35-3.0' hotplugCpus='yes' maxCpus='288'/>
<machine type='tcg' name='pc-q35-4.0' hotplugCpus='yes' maxCpus='288'/>
<machine type='tcg' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-1.2' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-4.0' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-3.0' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288'/>
</qemuCaps>

View File

@ -233,77 +233,77 @@
<cpu type='kvm' name='cortex-r5' typename='cortex-r5-arm-cpu'/>
<cpu type='kvm' name='pxa270-a1' typename='pxa270-a1-arm-cpu'/>
<cpu type='kvm' name='pxa270' typename='pxa270-arm-cpu'/>
<machine name='integratorcp' maxCpus='1'/>
<machine name='nuri' maxCpus='2'/>
<machine name='mps2-an511' maxCpus='1'/>
<machine name='mps2-an505' maxCpus='1'/>
<machine name='verdex' maxCpus='1'/>
<machine name='virt-3.0' maxCpus='512'/>
<machine name='ast2500-evb' maxCpus='2'/>
<machine name='smdkc210' maxCpus='2'/>
<machine name='collie' maxCpus='1'/>
<machine name='xlnx-versal-virt' maxCpus='2'/>
<machine name='imx25-pdk' maxCpus='1'/>
<machine name='spitz' maxCpus='1'/>
<machine name='musca-b1' maxCpus='2'/>
<machine name='realview-pbx-a9' maxCpus='4'/>
<machine name='realview-eb' maxCpus='1'/>
<machine name='versatilepb' maxCpus='1'/>
<machine name='realview-pb-a8' maxCpus='1'/>
<machine name='emcraft-sf2' maxCpus='1'/>
<machine name='virt-2.9' maxCpus='255'/>
<machine name='musicpal' maxCpus='1'/>
<machine name='sbsa-ref' maxCpus='512'/>
<machine name='z2' maxCpus='1'/>
<machine name='akita' maxCpus='1'/>
<machine name='virt-2.7' maxCpus='255'/>
<machine name='kzm' maxCpus='1'/>
<machine name='swift-bmc' maxCpus='2'/>
<machine name='virt-2.8' maxCpus='255'/>
<machine name='realview-eb-mpcore' maxCpus='4'/>
<machine name='musca-a' maxCpus='2'/>
<machine name='mcimx7d-sabre' maxCpus='2'/>
<machine name='sx1' maxCpus='1'/>
<machine name='virt-4.2' alias='virt' maxCpus='512'/>
<machine name='sx1-v1' maxCpus='1'/>
<machine name='virt-2.6' maxCpus='255'/>
<machine name='cubieboard' maxCpus='1'/>
<machine name='virt-4.0' maxCpus='512'/>
<machine name='highbank' maxCpus='4'/>
<machine name='virt-4.1' maxCpus='512'/>
<machine name='raspi2' maxCpus='4'/>
<machine name='raspi3' maxCpus='4'/>
<machine name='netduino2' maxCpus='1'/>
<machine name='terrier' maxCpus='1'/>
<machine name='n810' maxCpus='1'/>
<machine name='mainstone' maxCpus='1'/>
<machine name='palmetto-bmc' maxCpus='2'/>
<machine name='sabrelite' maxCpus='4'/>
<machine name='midway' maxCpus='4'/>
<machine name='romulus-bmc' maxCpus='2'/>
<machine name='cheetah' maxCpus='1'/>
<machine name='tosa' maxCpus='1'/>
<machine name='borzoi' maxCpus='1'/>
<machine name='versatileab' maxCpus='1'/>
<machine name='lm3s6965evb' maxCpus='1'/>
<machine name='n800' maxCpus='1'/>
<machine name='virt-2.10' maxCpus='255'/>
<machine name='virt-2.11' maxCpus='255'/>
<machine name='connex' maxCpus='1'/>
<machine name='virt-2.12' maxCpus='255'/>
<machine name='microbit' maxCpus='1'/>
<machine name='witherspoon-bmc' maxCpus='2'/>
<machine name='xilinx-zynq-a9' maxCpus='1'/>
<machine name='mps2-an385' maxCpus='1'/>
<machine name='ast2600-evb' maxCpus='2'/>
<machine name='vexpress-a9' maxCpus='4'/>
<machine name='mps2-an521' maxCpus='2'/>
<machine name='mcimx6ul-evk' maxCpus='1'/>
<machine name='vexpress-a15' maxCpus='4'/>
<machine name='xlnx-zcu102' maxCpus='6'/>
<machine name='virt-3.1' maxCpus='512'/>
<machine name='canon-a1100' maxCpus='1'/>
<machine name='lm3s811evb' maxCpus='1'/>
<machine type='kvm' name='integratorcp' maxCpus='1'/>
<machine type='kvm' name='nuri' maxCpus='2'/>
<machine type='kvm' name='mps2-an511' maxCpus='1'/>
<machine type='kvm' name='mps2-an505' maxCpus='1'/>
<machine type='kvm' name='verdex' maxCpus='1'/>
<machine type='kvm' name='virt-3.0' maxCpus='512'/>
<machine type='kvm' name='ast2500-evb' maxCpus='2'/>
<machine type='kvm' name='smdkc210' maxCpus='2'/>
<machine type='kvm' name='collie' maxCpus='1'/>
<machine type='kvm' name='xlnx-versal-virt' maxCpus='2'/>
<machine type='kvm' name='imx25-pdk' maxCpus='1'/>
<machine type='kvm' name='spitz' maxCpus='1'/>
<machine type='kvm' name='musca-b1' maxCpus='2'/>
<machine type='kvm' name='realview-pbx-a9' maxCpus='4'/>
<machine type='kvm' name='realview-eb' maxCpus='1'/>
<machine type='kvm' name='versatilepb' maxCpus='1'/>
<machine type='kvm' name='realview-pb-a8' maxCpus='1'/>
<machine type='kvm' name='emcraft-sf2' maxCpus='1'/>
<machine type='kvm' name='virt-2.9' maxCpus='255'/>
<machine type='kvm' name='musicpal' maxCpus='1'/>
<machine type='kvm' name='sbsa-ref' maxCpus='512'/>
<machine type='kvm' name='z2' maxCpus='1'/>
<machine type='kvm' name='akita' maxCpus='1'/>
<machine type='kvm' name='virt-2.7' maxCpus='255'/>
<machine type='kvm' name='kzm' maxCpus='1'/>
<machine type='kvm' name='swift-bmc' maxCpus='2'/>
<machine type='kvm' name='virt-2.8' maxCpus='255'/>
<machine type='kvm' name='realview-eb-mpcore' maxCpus='4'/>
<machine type='kvm' name='musca-a' maxCpus='2'/>
<machine type='kvm' name='mcimx7d-sabre' maxCpus='2'/>
<machine type='kvm' name='sx1' maxCpus='1'/>
<machine type='kvm' name='virt-4.2' alias='virt' maxCpus='512'/>
<machine type='kvm' name='sx1-v1' maxCpus='1'/>
<machine type='kvm' name='virt-2.6' maxCpus='255'/>
<machine type='kvm' name='cubieboard' maxCpus='1'/>
<machine type='kvm' name='virt-4.0' maxCpus='512'/>
<machine type='kvm' name='highbank' maxCpus='4'/>
<machine type='kvm' name='virt-4.1' maxCpus='512'/>
<machine type='kvm' name='raspi2' maxCpus='4'/>
<machine type='kvm' name='raspi3' maxCpus='4'/>
<machine type='kvm' name='netduino2' maxCpus='1'/>
<machine type='kvm' name='terrier' maxCpus='1'/>
<machine type='kvm' name='n810' maxCpus='1'/>
<machine type='kvm' name='mainstone' maxCpus='1'/>
<machine type='kvm' name='palmetto-bmc' maxCpus='2'/>
<machine type='kvm' name='sabrelite' maxCpus='4'/>
<machine type='kvm' name='midway' maxCpus='4'/>
<machine type='kvm' name='romulus-bmc' maxCpus='2'/>
<machine type='kvm' name='cheetah' maxCpus='1'/>
<machine type='kvm' name='tosa' maxCpus='1'/>
<machine type='kvm' name='borzoi' maxCpus='1'/>
<machine type='kvm' name='versatileab' maxCpus='1'/>
<machine type='kvm' name='lm3s6965evb' maxCpus='1'/>
<machine type='kvm' name='n800' maxCpus='1'/>
<machine type='kvm' name='virt-2.10' maxCpus='255'/>
<machine type='kvm' name='virt-2.11' maxCpus='255'/>
<machine type='kvm' name='connex' maxCpus='1'/>
<machine type='kvm' name='virt-2.12' maxCpus='255'/>
<machine type='kvm' name='microbit' maxCpus='1'/>
<machine type='kvm' name='witherspoon-bmc' maxCpus='2'/>
<machine type='kvm' name='xilinx-zynq-a9' maxCpus='1'/>
<machine type='kvm' name='mps2-an385' maxCpus='1'/>
<machine type='kvm' name='ast2600-evb' maxCpus='2'/>
<machine type='kvm' name='vexpress-a9' maxCpus='4'/>
<machine type='kvm' name='mps2-an521' maxCpus='2'/>
<machine type='kvm' name='mcimx6ul-evk' maxCpus='1'/>
<machine type='kvm' name='vexpress-a15' maxCpus='4'/>
<machine type='kvm' name='xlnx-zcu102' maxCpus='6'/>
<machine type='kvm' name='virt-3.1' maxCpus='512'/>
<machine type='kvm' name='canon-a1100' maxCpus='1'/>
<machine type='kvm' name='lm3s811evb' maxCpus='1'/>
<hostCPU type='tcg' model='max' migratability='no'>
<property name='sve768' type='boolean' value='true'/>
<property name='sve128' type='boolean' value='true'/>
@ -362,6 +362,77 @@
<cpu type='tcg' name='cortex-r5' typename='cortex-r5-arm-cpu'/>
<cpu type='tcg' name='pxa270-a1' typename='pxa270-a1-arm-cpu'/>
<cpu type='tcg' name='pxa270' typename='pxa270-arm-cpu'/>
<machine type='tcg' name='integratorcp' maxCpus='1'/>
<machine type='tcg' name='nuri' maxCpus='2'/>
<machine type='tcg' name='mps2-an511' maxCpus='1'/>
<machine type='tcg' name='mps2-an505' maxCpus='1'/>
<machine type='tcg' name='verdex' maxCpus='1'/>
<machine type='tcg' name='virt-3.0' maxCpus='512'/>
<machine type='tcg' name='ast2500-evb' maxCpus='2'/>
<machine type='tcg' name='smdkc210' maxCpus='2'/>
<machine type='tcg' name='collie' maxCpus='1'/>
<machine type='tcg' name='xlnx-versal-virt' maxCpus='2'/>
<machine type='tcg' name='imx25-pdk' maxCpus='1'/>
<machine type='tcg' name='spitz' maxCpus='1'/>
<machine type='tcg' name='musca-b1' maxCpus='2'/>
<machine type='tcg' name='realview-pbx-a9' maxCpus='4'/>
<machine type='tcg' name='realview-eb' maxCpus='1'/>
<machine type='tcg' name='versatilepb' maxCpus='1'/>
<machine type='tcg' name='realview-pb-a8' maxCpus='1'/>
<machine type='tcg' name='emcraft-sf2' maxCpus='1'/>
<machine type='tcg' name='virt-2.9' maxCpus='255'/>
<machine type='tcg' name='musicpal' maxCpus='1'/>
<machine type='tcg' name='sbsa-ref' maxCpus='512'/>
<machine type='tcg' name='z2' maxCpus='1'/>
<machine type='tcg' name='akita' maxCpus='1'/>
<machine type='tcg' name='virt-2.7' maxCpus='255'/>
<machine type='tcg' name='kzm' maxCpus='1'/>
<machine type='tcg' name='swift-bmc' maxCpus='2'/>
<machine type='tcg' name='virt-2.8' maxCpus='255'/>
<machine type='tcg' name='realview-eb-mpcore' maxCpus='4'/>
<machine type='tcg' name='musca-a' maxCpus='2'/>
<machine type='tcg' name='mcimx7d-sabre' maxCpus='2'/>
<machine type='tcg' name='sx1' maxCpus='1'/>
<machine type='tcg' name='virt-4.2' alias='virt' maxCpus='512'/>
<machine type='tcg' name='sx1-v1' maxCpus='1'/>
<machine type='tcg' name='virt-2.6' maxCpus='255'/>
<machine type='tcg' name='cubieboard' maxCpus='1'/>
<machine type='tcg' name='virt-4.0' maxCpus='512'/>
<machine type='tcg' name='highbank' maxCpus='4'/>
<machine type='tcg' name='virt-4.1' maxCpus='512'/>
<machine type='tcg' name='raspi2' maxCpus='4'/>
<machine type='tcg' name='raspi3' maxCpus='4'/>
<machine type='tcg' name='netduino2' maxCpus='1'/>
<machine type='tcg' name='terrier' maxCpus='1'/>
<machine type='tcg' name='n810' maxCpus='1'/>
<machine type='tcg' name='mainstone' maxCpus='1'/>
<machine type='tcg' name='palmetto-bmc' maxCpus='2'/>
<machine type='tcg' name='sabrelite' maxCpus='4'/>
<machine type='tcg' name='midway' maxCpus='4'/>
<machine type='tcg' name='romulus-bmc' maxCpus='2'/>
<machine type='tcg' name='cheetah' maxCpus='1'/>
<machine type='tcg' name='tosa' maxCpus='1'/>
<machine type='tcg' name='borzoi' maxCpus='1'/>
<machine type='tcg' name='versatileab' maxCpus='1'/>
<machine type='tcg' name='lm3s6965evb' maxCpus='1'/>
<machine type='tcg' name='n800' maxCpus='1'/>
<machine type='tcg' name='virt-2.10' maxCpus='255'/>
<machine type='tcg' name='virt-2.11' maxCpus='255'/>
<machine type='tcg' name='connex' maxCpus='1'/>
<machine type='tcg' name='virt-2.12' maxCpus='255'/>
<machine type='tcg' name='microbit' maxCpus='1'/>
<machine type='tcg' name='witherspoon-bmc' maxCpus='2'/>
<machine type='tcg' name='xilinx-zynq-a9' maxCpus='1'/>
<machine type='tcg' name='mps2-an385' maxCpus='1'/>
<machine type='tcg' name='ast2600-evb' maxCpus='2'/>
<machine type='tcg' name='vexpress-a9' maxCpus='4'/>
<machine type='tcg' name='mps2-an521' maxCpus='2'/>
<machine type='tcg' name='mcimx6ul-evk' maxCpus='1'/>
<machine type='tcg' name='vexpress-a15' maxCpus='4'/>
<machine type='tcg' name='xlnx-zcu102' maxCpus='6'/>
<machine type='tcg' name='virt-3.1' maxCpus='512'/>
<machine type='tcg' name='canon-a1100' maxCpus='1'/>
<machine type='tcg' name='lm3s811evb' maxCpus='1'/>
<gic version='3' kernel='yes' emulated='yes'/>
<gic version='2' kernel='no' emulated='yes'/>
</qemuCaps>

View File

@ -616,37 +616,37 @@
<cpu type='kvm' name='750_v3.1'/>
<cpu type='kvm' name='power8e_v2.1'/>
<cpu type='kvm' name='mpc8568e'/>
<machine name='pseries-4.2' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes'/>
<machine name='ref405ep' maxCpus='1'/>
<machine name='sam460ex' maxCpus='1'/>
<machine name='virtex-ml507' maxCpus='1'/>
<machine name='ppce500' maxCpus='32'/>
<machine name='mpc8544ds' maxCpus='15'/>
<machine name='pseries-3.1' hotplugCpus='yes' maxCpus='1024'/>
<machine name='pseries-2.12-sxxm' hotplugCpus='yes' maxCpus='1024'/>
<machine name='bamboo' maxCpus='1'/>
<machine name='g3beige' maxCpus='1'/>
<machine name='pseries-3.0' hotplugCpus='yes' maxCpus='1024'/>
<machine name='pseries-2.10' hotplugCpus='yes' maxCpus='1024'/>
<machine name='prep' maxCpus='1'/>
<machine name='pseries-2.11' hotplugCpus='yes' maxCpus='1024'/>
<machine name='pseries-2.12' hotplugCpus='yes' maxCpus='1024'/>
<machine name='pseries-2.9' hotplugCpus='yes' maxCpus='1024'/>
<machine name='mac99' maxCpus='1'/>
<machine name='pseries-2.6' maxCpus='1024'/>
<machine name='pseries-2.7' hotplugCpus='yes' maxCpus='1024'/>
<machine name='pseries-2.8' hotplugCpus='yes' maxCpus='1024'/>
<machine name='pseries-2.4' maxCpus='1024'/>
<machine name='pseries-2.5' maxCpus='1024'/>
<machine name='pseries-4.0' hotplugCpus='yes' maxCpus='1024'/>
<machine name='pseries-4.1' hotplugCpus='yes' maxCpus='1024'/>
<machine name='pseries-2.2' maxCpus='1024'/>
<machine name='taihu' maxCpus='1'/>
<machine name='pseries-2.3' maxCpus='1024'/>
<machine name='pseries-2.1' maxCpus='1024'/>
<machine name='powernv8' maxCpus='2048'/>
<machine name='powernv9' alias='powernv' maxCpus='2048'/>
<machine name='40p' maxCpus='1'/>
<machine type='kvm' name='pseries-4.2' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes'/>
<machine type='kvm' name='ref405ep' maxCpus='1'/>
<machine type='kvm' name='sam460ex' maxCpus='1'/>
<machine type='kvm' name='virtex-ml507' maxCpus='1'/>
<machine type='kvm' name='ppce500' maxCpus='32'/>
<machine type='kvm' name='mpc8544ds' maxCpus='15'/>
<machine type='kvm' name='pseries-3.1' hotplugCpus='yes' maxCpus='1024'/>
<machine type='kvm' name='pseries-2.12-sxxm' hotplugCpus='yes' maxCpus='1024'/>
<machine type='kvm' name='bamboo' maxCpus='1'/>
<machine type='kvm' name='g3beige' maxCpus='1'/>
<machine type='kvm' name='pseries-3.0' hotplugCpus='yes' maxCpus='1024'/>
<machine type='kvm' name='pseries-2.10' hotplugCpus='yes' maxCpus='1024'/>
<machine type='kvm' name='prep' maxCpus='1'/>
<machine type='kvm' name='pseries-2.11' hotplugCpus='yes' maxCpus='1024'/>
<machine type='kvm' name='pseries-2.12' hotplugCpus='yes' maxCpus='1024'/>
<machine type='kvm' name='pseries-2.9' hotplugCpus='yes' maxCpus='1024'/>
<machine type='kvm' name='mac99' maxCpus='1'/>
<machine type='kvm' name='pseries-2.6' maxCpus='1024'/>
<machine type='kvm' name='pseries-2.7' hotplugCpus='yes' maxCpus='1024'/>
<machine type='kvm' name='pseries-2.8' hotplugCpus='yes' maxCpus='1024'/>
<machine type='kvm' name='pseries-2.4' maxCpus='1024'/>
<machine type='kvm' name='pseries-2.5' maxCpus='1024'/>
<machine type='kvm' name='pseries-4.0' hotplugCpus='yes' maxCpus='1024'/>
<machine type='kvm' name='pseries-4.1' hotplugCpus='yes' maxCpus='1024'/>
<machine type='kvm' name='pseries-2.2' maxCpus='1024'/>
<machine type='kvm' name='taihu' maxCpus='1'/>
<machine type='kvm' name='pseries-2.3' maxCpus='1024'/>
<machine type='kvm' name='pseries-2.1' maxCpus='1024'/>
<machine type='kvm' name='powernv8' maxCpus='2048'/>
<machine type='kvm' name='powernv9' alias='powernv' maxCpus='2048'/>
<machine type='kvm' name='40p' maxCpus='1'/>
<cpu type='tcg' name='default' typename='604-powerpc64-cpu'/>
<cpu type='tcg' name='ppc' typename='604-powerpc64-cpu'/>
<cpu type='tcg' name='ppc32' typename='604-powerpc64-cpu'/>
@ -1084,4 +1084,35 @@
<cpu type='tcg' name='750_v3.1'/>
<cpu type='tcg' name='power8e_v2.1'/>
<cpu type='tcg' name='mpc8568e'/>
<machine type='tcg' name='pseries-4.2' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes'/>
<machine type='tcg' name='ref405ep' maxCpus='1'/>
<machine type='tcg' name='sam460ex' maxCpus='1'/>
<machine type='tcg' name='virtex-ml507' maxCpus='1'/>
<machine type='tcg' name='ppce500' maxCpus='32'/>
<machine type='tcg' name='mpc8544ds' maxCpus='15'/>
<machine type='tcg' name='pseries-3.1' hotplugCpus='yes' maxCpus='1024'/>
<machine type='tcg' name='pseries-2.12-sxxm' hotplugCpus='yes' maxCpus='1024'/>
<machine type='tcg' name='bamboo' maxCpus='1'/>
<machine type='tcg' name='g3beige' maxCpus='1'/>
<machine type='tcg' name='pseries-3.0' hotplugCpus='yes' maxCpus='1024'/>
<machine type='tcg' name='pseries-2.10' hotplugCpus='yes' maxCpus='1024'/>
<machine type='tcg' name='prep' maxCpus='1'/>
<machine type='tcg' name='pseries-2.11' hotplugCpus='yes' maxCpus='1024'/>
<machine type='tcg' name='pseries-2.12' hotplugCpus='yes' maxCpus='1024'/>
<machine type='tcg' name='pseries-2.9' hotplugCpus='yes' maxCpus='1024'/>
<machine type='tcg' name='mac99' maxCpus='1'/>
<machine type='tcg' name='pseries-2.6' maxCpus='1024'/>
<machine type='tcg' name='pseries-2.7' hotplugCpus='yes' maxCpus='1024'/>
<machine type='tcg' name='pseries-2.8' hotplugCpus='yes' maxCpus='1024'/>
<machine type='tcg' name='pseries-2.4' maxCpus='1024'/>
<machine type='tcg' name='pseries-2.5' maxCpus='1024'/>
<machine type='tcg' name='pseries-4.0' hotplugCpus='yes' maxCpus='1024'/>
<machine type='tcg' name='pseries-4.1' hotplugCpus='yes' maxCpus='1024'/>
<machine type='tcg' name='pseries-2.2' maxCpus='1024'/>
<machine type='tcg' name='taihu' maxCpus='1'/>
<machine type='tcg' name='pseries-2.3' maxCpus='1024'/>
<machine type='tcg' name='pseries-2.1' maxCpus='1024'/>
<machine type='tcg' name='powernv8' maxCpus='2048'/>
<machine type='tcg' name='powernv9' alias='powernv' maxCpus='2048'/>
<machine type='tcg' name='40p' maxCpus='1'/>
</qemuCaps>

View File

@ -371,20 +371,20 @@
<cpu type='kvm' name='qemu' typename='qemu-s390x-cpu' usable='no'>
<blocker name='ais'/>
</cpu>
<machine name='s390-ccw-virtio-4.2' alias='s390-ccw-virtio' hotplugCpus='yes' maxCpus='248' default='yes'/>
<machine name='s390-ccw-virtio-4.0' hotplugCpus='yes' maxCpus='248'/>
<machine name='s390-ccw-virtio-3.1' hotplugCpus='yes' maxCpus='248'/>
<machine name='s390-ccw-virtio-2.6' hotplugCpus='yes' maxCpus='248'/>
<machine name='s390-ccw-virtio-2.12' hotplugCpus='yes' maxCpus='248'/>
<machine name='s390-ccw-virtio-2.9' hotplugCpus='yes' maxCpus='248'/>
<machine name='s390-ccw-virtio-3.0' hotplugCpus='yes' maxCpus='248'/>
<machine name='s390-ccw-virtio-2.5' hotplugCpus='yes' maxCpus='248'/>
<machine name='s390-ccw-virtio-2.11' hotplugCpus='yes' maxCpus='248'/>
<machine name='s390-ccw-virtio-2.8' hotplugCpus='yes' maxCpus='248'/>
<machine name='s390-ccw-virtio-4.1' hotplugCpus='yes' maxCpus='248'/>
<machine name='s390-ccw-virtio-2.4' hotplugCpus='yes' maxCpus='248'/>
<machine name='s390-ccw-virtio-2.10' hotplugCpus='yes' maxCpus='248'/>
<machine name='s390-ccw-virtio-2.7' hotplugCpus='yes' maxCpus='248'/>
<machine type='kvm' name='s390-ccw-virtio-4.2' alias='s390-ccw-virtio' hotplugCpus='yes' maxCpus='248' default='yes'/>
<machine type='kvm' name='s390-ccw-virtio-4.0' hotplugCpus='yes' maxCpus='248'/>
<machine type='kvm' name='s390-ccw-virtio-3.1' hotplugCpus='yes' maxCpus='248'/>
<machine type='kvm' name='s390-ccw-virtio-2.6' hotplugCpus='yes' maxCpus='248'/>
<machine type='kvm' name='s390-ccw-virtio-2.12' hotplugCpus='yes' maxCpus='248'/>
<machine type='kvm' name='s390-ccw-virtio-2.9' hotplugCpus='yes' maxCpus='248'/>
<machine type='kvm' name='s390-ccw-virtio-3.0' hotplugCpus='yes' maxCpus='248'/>
<machine type='kvm' name='s390-ccw-virtio-2.5' hotplugCpus='yes' maxCpus='248'/>
<machine type='kvm' name='s390-ccw-virtio-2.11' hotplugCpus='yes' maxCpus='248'/>
<machine type='kvm' name='s390-ccw-virtio-2.8' hotplugCpus='yes' maxCpus='248'/>
<machine type='kvm' name='s390-ccw-virtio-4.1' hotplugCpus='yes' maxCpus='248'/>
<machine type='kvm' name='s390-ccw-virtio-2.4' hotplugCpus='yes' maxCpus='248'/>
<machine type='kvm' name='s390-ccw-virtio-2.10' hotplugCpus='yes' maxCpus='248'/>
<machine type='kvm' name='s390-ccw-virtio-2.7' hotplugCpus='yes' maxCpus='248'/>
<hostCPU type='tcg' model='z13.2-base' migratability='no'>
<property name='dateh2' type='boolean' value='false'/>
<property name='aen' type='boolean' value='true'/>
@ -3342,4 +3342,18 @@
<blocker name='type'/>
</cpu>
<cpu type='tcg' name='qemu' typename='qemu-s390x-cpu' usable='yes'/>
<machine type='tcg' name='s390-ccw-virtio-4.2' alias='s390-ccw-virtio' hotplugCpus='yes' maxCpus='248' default='yes'/>
<machine type='tcg' name='s390-ccw-virtio-4.0' hotplugCpus='yes' maxCpus='248'/>
<machine type='tcg' name='s390-ccw-virtio-3.1' hotplugCpus='yes' maxCpus='248'/>
<machine type='tcg' name='s390-ccw-virtio-2.6' hotplugCpus='yes' maxCpus='248'/>
<machine type='tcg' name='s390-ccw-virtio-2.12' hotplugCpus='yes' maxCpus='248'/>
<machine type='tcg' name='s390-ccw-virtio-2.9' hotplugCpus='yes' maxCpus='248'/>
<machine type='tcg' name='s390-ccw-virtio-3.0' hotplugCpus='yes' maxCpus='248'/>
<machine type='tcg' name='s390-ccw-virtio-2.5' hotplugCpus='yes' maxCpus='248'/>
<machine type='tcg' name='s390-ccw-virtio-2.11' hotplugCpus='yes' maxCpus='248'/>
<machine type='tcg' name='s390-ccw-virtio-2.8' hotplugCpus='yes' maxCpus='248'/>
<machine type='tcg' name='s390-ccw-virtio-4.1' hotplugCpus='yes' maxCpus='248'/>
<machine type='tcg' name='s390-ccw-virtio-2.4' hotplugCpus='yes' maxCpus='248'/>
<machine type='tcg' name='s390-ccw-virtio-2.10' hotplugCpus='yes' maxCpus='248'/>
<machine type='tcg' name='s390-ccw-virtio-2.7' hotplugCpus='yes' maxCpus='248'/>
</qemuCaps>

View File

@ -841,52 +841,52 @@
<cpu type='kvm' name='Broadwell' typename='Broadwell-x86_64-cpu' usable='yes'/>
<cpu type='kvm' name='486-v1' typename='486-v1-x86_64-cpu' usable='yes'/>
<cpu type='kvm' name='486' typename='486-x86_64-cpu' usable='yes'/>
<machine name='pc-i440fx-4.2' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/>
<machine name='pc-0.15' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-4.2' alias='q35' hotplugCpus='yes' maxCpus='288'/>
<machine name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-0.12' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-1.1' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288'/>
<machine name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-0.14' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288'/>
<machine name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-3.1' hotplugCpus='yes' maxCpus='288'/>
<machine name='pc-q35-4.1' hotplugCpus='yes' maxCpus='288'/>
<machine name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-1.3' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-4.1' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255'/>
<machine name='isapc' hotplugCpus='yes' maxCpus='1'/>
<machine name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-3.1' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-2.12' hotplugCpus='yes' maxCpus='288'/>
<machine name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-1.0' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-4.0.1' hotplugCpus='yes' maxCpus='288'/>
<machine name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-0.13' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288'/>
<machine name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-3.0' hotplugCpus='yes' maxCpus='288'/>
<machine name='pc-q35-4.0' hotplugCpus='yes' maxCpus='288'/>
<machine name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-1.2' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-4.0' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-3.0' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288'/>
<machine type='kvm' name='pc-i440fx-4.2' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/>
<machine type='kvm' name='pc-0.15' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-q35-4.2' alias='q35' hotplugCpus='yes' maxCpus='288'/>
<machine type='kvm' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-0.12' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-1.1' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288'/>
<machine type='kvm' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-0.14' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288'/>
<machine type='kvm' name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-q35-3.1' hotplugCpus='yes' maxCpus='288'/>
<machine type='kvm' name='pc-q35-4.1' hotplugCpus='yes' maxCpus='288'/>
<machine type='kvm' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-1.3' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-4.1' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='isapc' hotplugCpus='yes' maxCpus='1'/>
<machine type='kvm' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-3.1' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-q35-2.12' hotplugCpus='yes' maxCpus='288'/>
<machine type='kvm' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-1.0' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-q35-4.0.1' hotplugCpus='yes' maxCpus='288'/>
<machine type='kvm' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-0.13' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288'/>
<machine type='kvm' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-q35-3.0' hotplugCpus='yes' maxCpus='288'/>
<machine type='kvm' name='pc-q35-4.0' hotplugCpus='yes' maxCpus='288'/>
<machine type='kvm' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-1.2' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-4.0' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-i440fx-3.0' hotplugCpus='yes' maxCpus='255'/>
<machine type='kvm' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288'/>
<hostCPU type='tcg' model='base' migratability='yes'>
<property name='cmov' type='boolean' value='true' migratable='yes'/>
<property name='ia64' type='boolean' value='false'/>
@ -1950,4 +1950,50 @@
</cpu>
<cpu type='tcg' name='486-v1' typename='486-v1-x86_64-cpu' usable='yes'/>
<cpu type='tcg' name='486' typename='486-x86_64-cpu' usable='yes'/>
<machine type='tcg' name='pc-i440fx-4.2' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/>
<machine type='tcg' name='pc-0.15' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-q35-4.2' alias='q35' hotplugCpus='yes' maxCpus='288'/>
<machine type='tcg' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-0.12' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-1.1' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288'/>
<machine type='tcg' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-0.14' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288'/>
<machine type='tcg' name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-q35-3.1' hotplugCpus='yes' maxCpus='288'/>
<machine type='tcg' name='pc-q35-4.1' hotplugCpus='yes' maxCpus='288'/>
<machine type='tcg' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-1.3' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-4.1' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='isapc' hotplugCpus='yes' maxCpus='1'/>
<machine type='tcg' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-3.1' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-q35-2.12' hotplugCpus='yes' maxCpus='288'/>
<machine type='tcg' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-1.0' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-q35-4.0.1' hotplugCpus='yes' maxCpus='288'/>
<machine type='tcg' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-0.13' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288'/>
<machine type='tcg' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-q35-3.0' hotplugCpus='yes' maxCpus='288'/>
<machine type='tcg' name='pc-q35-4.0' hotplugCpus='yes' maxCpus='288'/>
<machine type='tcg' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-1.2' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-4.0' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-i440fx-3.0' hotplugCpus='yes' maxCpus='255'/>
<machine type='tcg' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288'/>
</qemuCaps>