qemu: Move machine type data in capabilities cache

In preparation for making machine types dependent on the accelerator,
the <machine> elements are formatted between <cpu type='kvm'> and
<cpu type='tcg'>.

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 09:04:58 +02:00
parent de18836ea7
commit a068413e7c
41 changed files with 1021 additions and 1021 deletions

View File

@ -4131,10 +4131,10 @@ virQEMUCapsFormatCache(virQEMUCapsPtr qemuCaps)
virArchToString(qemuCaps->arch));
virQEMUCapsFormatAccel(qemuCaps, &buf, VIR_DOMAIN_VIRT_KVM);
virQEMUCapsFormatAccel(qemuCaps, &buf, VIR_DOMAIN_VIRT_QEMU);
virQEMUCapsFormatMachines(qemuCaps, &buf);
virQEMUCapsFormatAccel(qemuCaps, &buf, VIR_DOMAIN_VIRT_QEMU);
for (i = 0; i < qemuCaps->ngicCapabilities; i++) {
virGICCapabilityPtr cap;
bool kernel;

View File

@ -112,6 +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'/>
<cpu type='tcg' name='Opteron_G5'/>
<cpu type='tcg' name='Opteron_G4'/>
<cpu type='tcg' name='Opteron_G3'/>
@ -136,19 +151,4 @@
<cpu type='tcg' name='core2duo'/>
<cpu type='tcg' name='phenom'/>
<cpu type='tcg' 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'/>
</qemuCaps>

View File

@ -117,6 +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'/>
<cpu type='tcg' name='Opteron_G5'/>
<cpu type='tcg' name='Opteron_G4'/>
<cpu type='tcg' name='Opteron_G3'/>
@ -141,21 +158,4 @@
<cpu type='tcg' name='core2duo'/>
<cpu type='tcg' name='phenom'/>
<cpu type='tcg' 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'/>
</qemuCaps>

View File

@ -119,6 +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'/>
<cpu type='tcg' name='Opteron_G5'/>
<cpu type='tcg' name='Opteron_G4'/>
<cpu type='tcg' name='Opteron_G3'/>
@ -143,23 +162,4 @@
<cpu type='tcg' name='core2duo'/>
<cpu type='tcg' name='phenom'/>
<cpu type='tcg' 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'/>
</qemuCaps>

View File

@ -136,6 +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'/>
<cpu type='tcg' name='Opteron_G5'/>
<cpu type='tcg' name='Opteron_G4'/>
<cpu type='tcg' name='Opteron_G3'/>
@ -161,27 +184,4 @@
<cpu type='tcg' name='core2duo'/>
<cpu type='tcg' name='phenom'/>
<cpu type='tcg' 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'/>
</qemuCaps>

View File

@ -176,37 +176,6 @@
<cpu type='kvm' name='cortex-r5' typename='cortex-r5-arm-cpu'/>
<cpu type='kvm' name='pxa270-a1' typename='pxa270-a1-arm-cpu'/>
<cpu type='kvm' name='pxa270' typename='pxa270-arm-cpu'/>
<cpu type='tcg' name='pxa262' typename='pxa262-arm-cpu'/>
<cpu type='tcg' name='pxa270-a0' typename='pxa270-a0-arm-cpu'/>
<cpu type='tcg' name='arm1136' typename='arm1136-arm-cpu'/>
<cpu type='tcg' name='cortex-a15' typename='cortex-a15-arm-cpu'/>
<cpu type='tcg' name='pxa260' typename='pxa260-arm-cpu'/>
<cpu type='tcg' name='arm1136-r2' typename='arm1136-r2-arm-cpu'/>
<cpu type='tcg' name='pxa261' typename='pxa261-arm-cpu'/>
<cpu type='tcg' name='pxa255' typename='pxa255-arm-cpu'/>
<cpu type='tcg' name='arm926' typename='arm926-arm-cpu'/>
<cpu type='tcg' name='arm11mpcore' typename='arm11mpcore-arm-cpu'/>
<cpu type='tcg' name='pxa250' typename='pxa250-arm-cpu'/>
<cpu type='tcg' name='ti925t' typename='ti925t-arm-cpu'/>
<cpu type='tcg' name='cortex-a57' typename='cortex-a57-arm-cpu'/>
<cpu type='tcg' name='sa1110' typename='sa1110-arm-cpu'/>
<cpu type='tcg' name='arm1176' typename='arm1176-arm-cpu'/>
<cpu type='tcg' name='cortex-a53' typename='cortex-a53-arm-cpu'/>
<cpu type='tcg' name='sa1100' typename='sa1100-arm-cpu'/>
<cpu type='tcg' name='pxa270-c5' typename='pxa270-c5-arm-cpu'/>
<cpu type='tcg' name='cortex-a9' typename='cortex-a9-arm-cpu'/>
<cpu type='tcg' name='cortex-a8' typename='cortex-a8-arm-cpu'/>
<cpu type='tcg' name='pxa270-c0' typename='pxa270-c0-arm-cpu'/>
<cpu type='tcg' name='cortex-a7' typename='cortex-a7-arm-cpu'/>
<cpu type='tcg' name='arm1026' typename='arm1026-arm-cpu'/>
<cpu type='tcg' name='pxa270-b1' typename='pxa270-b1-arm-cpu'/>
<cpu type='tcg' name='cortex-m3' typename='cortex-m3-arm-cpu'/>
<cpu type='tcg' name='cortex-m4' typename='cortex-m4-arm-cpu'/>
<cpu type='tcg' name='pxa270-b0' typename='pxa270-b0-arm-cpu'/>
<cpu type='tcg' name='arm946' typename='arm946-arm-cpu'/>
<cpu type='tcg' name='cortex-r5' typename='cortex-r5-arm-cpu'/>
<cpu type='tcg' name='pxa270-a1' typename='pxa270-a1-arm-cpu'/>
<cpu type='tcg' name='pxa270' typename='pxa270-arm-cpu'/>
<machine name='integratorcp' maxCpus='1'/>
<machine name='nuri' maxCpus='2'/>
<machine name='mps2-an511' maxCpus='1'/>
@ -258,6 +227,37 @@
<machine name='xlnx-zcu102' maxCpus='1'/>
<machine name='canon-a1100' maxCpus='1'/>
<machine 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'/>
<cpu type='tcg' name='cortex-a15' typename='cortex-a15-arm-cpu'/>
<cpu type='tcg' name='pxa260' typename='pxa260-arm-cpu'/>
<cpu type='tcg' name='arm1136-r2' typename='arm1136-r2-arm-cpu'/>
<cpu type='tcg' name='pxa261' typename='pxa261-arm-cpu'/>
<cpu type='tcg' name='pxa255' typename='pxa255-arm-cpu'/>
<cpu type='tcg' name='arm926' typename='arm926-arm-cpu'/>
<cpu type='tcg' name='arm11mpcore' typename='arm11mpcore-arm-cpu'/>
<cpu type='tcg' name='pxa250' typename='pxa250-arm-cpu'/>
<cpu type='tcg' name='ti925t' typename='ti925t-arm-cpu'/>
<cpu type='tcg' name='cortex-a57' typename='cortex-a57-arm-cpu'/>
<cpu type='tcg' name='sa1110' typename='sa1110-arm-cpu'/>
<cpu type='tcg' name='arm1176' typename='arm1176-arm-cpu'/>
<cpu type='tcg' name='cortex-a53' typename='cortex-a53-arm-cpu'/>
<cpu type='tcg' name='sa1100' typename='sa1100-arm-cpu'/>
<cpu type='tcg' name='pxa270-c5' typename='pxa270-c5-arm-cpu'/>
<cpu type='tcg' name='cortex-a9' typename='cortex-a9-arm-cpu'/>
<cpu type='tcg' name='cortex-a8' typename='cortex-a8-arm-cpu'/>
<cpu type='tcg' name='pxa270-c0' typename='pxa270-c0-arm-cpu'/>
<cpu type='tcg' name='cortex-a7' typename='cortex-a7-arm-cpu'/>
<cpu type='tcg' name='arm1026' typename='arm1026-arm-cpu'/>
<cpu type='tcg' name='pxa270-b1' typename='pxa270-b1-arm-cpu'/>
<cpu type='tcg' name='cortex-m3' typename='cortex-m3-arm-cpu'/>
<cpu type='tcg' name='cortex-m4' typename='cortex-m4-arm-cpu'/>
<cpu type='tcg' name='pxa270-b0' typename='pxa270-b0-arm-cpu'/>
<cpu type='tcg' name='arm946' typename='arm946-arm-cpu'/>
<cpu type='tcg' name='cortex-r5' typename='cortex-r5-arm-cpu'/>
<cpu type='tcg' name='pxa270-a1' typename='pxa270-a1-arm-cpu'/>
<cpu type='tcg' name='pxa270' typename='pxa270-arm-cpu'/>
<gic version='3' kernel='no' emulated='yes'/>
<gic version='2' kernel='yes' emulated='yes'/>
</qemuCaps>

View File

@ -577,6 +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'/>
<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'/>
@ -1010,25 +1031,4 @@
<cpu type='tcg' name='MPC8544E_v11'/>
<cpu type='tcg' name='405GPb'/>
<cpu type='tcg' 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'/>
</qemuCaps>

View File

@ -207,6 +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'/>
<cpu type='tcg' name='z10EC-base' typename='z10EC-base-s390-cpu' usable='no'>
<blocker name='dateh2'/>
<blocker name='pfpo'/>
@ -1251,11 +1258,4 @@
<blocker name='msa'/>
<blocker name='type'/>
</cpu>
<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'/>
</qemuCaps>

View File

@ -528,6 +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'/>
<hostCPU type='tcg' model='base' migratability='yes'>
<property name='phys-bits' type='number' value='0'/>
<property name='core-id' type='number' value='-1'/>
@ -910,39 +945,4 @@
<blocker name='3dnowprefetch'/>
</cpu>
<cpu type='tcg' name='486' typename='486-x86_64-cpu' usable='yes'/>
<machine name='pc-i440fx-2.10' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/>
<machine name='pc-0.12' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/>
<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'/>
</qemuCaps>

View File

@ -213,6 +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'/>
<cpu type='tcg' name='z890.2' typename='z890.2-s390x-cpu' usable='no'>
<blocker name='klmd-sha-1'/>
<blocker name='kimd-sha-1'/>
@ -2596,12 +2604,4 @@
<blocker name='hfpm'/>
<blocker name='type'/>
</cpu>
<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'/>
</qemuCaps>

View File

@ -505,6 +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'/>
<hostCPU type='tcg' model='base' migratability='yes'>
<property name='phys-bits' type='number' value='0'/>
<property name='core-id' type='number' value='-1'/>
@ -903,39 +938,4 @@
<blocker name='3dnowprefetch'/>
</cpu>
<cpu type='tcg' name='486' typename='486-x86_64-cpu' usable='yes'/>
<machine name='pc-i440fx-2.11' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/>
<machine name='pc-0.12' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/>
<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'/>
</qemuCaps>

View File

@ -193,40 +193,6 @@
<cpu type='kvm' name='cortex-r5' typename='cortex-r5-arm-cpu'/>
<cpu type='kvm' name='pxa270-a1' typename='pxa270-a1-arm-cpu'/>
<cpu type='kvm' name='pxa270' typename='pxa270-arm-cpu'/>
<cpu type='tcg' name='pxa262' typename='pxa262-arm-cpu'/>
<cpu type='tcg' name='pxa270-a0' typename='pxa270-a0-arm-cpu'/>
<cpu type='tcg' name='arm1136' typename='arm1136-arm-cpu'/>
<cpu type='tcg' name='cortex-a15' typename='cortex-a15-arm-cpu'/>
<cpu type='tcg' name='pxa260' typename='pxa260-arm-cpu'/>
<cpu type='tcg' name='arm1136-r2' typename='arm1136-r2-arm-cpu'/>
<cpu type='tcg' name='pxa261' typename='pxa261-arm-cpu'/>
<cpu type='tcg' name='pxa255' typename='pxa255-arm-cpu'/>
<cpu type='tcg' name='cortex-m33' typename='cortex-m33-arm-cpu'/>
<cpu type='tcg' name='arm926' typename='arm926-arm-cpu'/>
<cpu type='tcg' name='arm11mpcore' typename='arm11mpcore-arm-cpu'/>
<cpu type='tcg' name='pxa250' typename='pxa250-arm-cpu'/>
<cpu type='tcg' name='ti925t' typename='ti925t-arm-cpu'/>
<cpu type='tcg' name='cortex-a57' typename='cortex-a57-arm-cpu'/>
<cpu type='tcg' name='sa1110' typename='sa1110-arm-cpu'/>
<cpu type='tcg' name='host' typename='host-arm-cpu'/>
<cpu type='tcg' name='arm1176' typename='arm1176-arm-cpu'/>
<cpu type='tcg' name='cortex-a53' typename='cortex-a53-arm-cpu'/>
<cpu type='tcg' name='sa1100' typename='sa1100-arm-cpu'/>
<cpu type='tcg' name='pxa270-c5' typename='pxa270-c5-arm-cpu'/>
<cpu type='tcg' name='cortex-a9' typename='cortex-a9-arm-cpu'/>
<cpu type='tcg' name='cortex-a8' typename='cortex-a8-arm-cpu'/>
<cpu type='tcg' name='cortex-a7' typename='cortex-a7-arm-cpu'/>
<cpu type='tcg' name='pxa270-c0' typename='pxa270-c0-arm-cpu'/>
<cpu type='tcg' name='arm1026' typename='arm1026-arm-cpu'/>
<cpu type='tcg' name='pxa270-b1' typename='pxa270-b1-arm-cpu'/>
<cpu type='tcg' name='cortex-m3' typename='cortex-m3-arm-cpu'/>
<cpu type='tcg' name='max' typename='max-arm-cpu'/>
<cpu type='tcg' name='cortex-m4' typename='cortex-m4-arm-cpu'/>
<cpu type='tcg' name='pxa270-b0' typename='pxa270-b0-arm-cpu'/>
<cpu type='tcg' name='arm946' typename='arm946-arm-cpu'/>
<cpu type='tcg' name='cortex-r5' typename='cortex-r5-arm-cpu'/>
<cpu type='tcg' name='pxa270-a1' typename='pxa270-a1-arm-cpu'/>
<cpu type='tcg' name='pxa270' typename='pxa270-arm-cpu'/>
<machine name='integratorcp' maxCpus='1'/>
<machine name='nuri' maxCpus='2'/>
<machine name='mps2-an511' maxCpus='1'/>
@ -284,6 +250,40 @@
<machine name='xlnx-zcu102' maxCpus='6'/>
<machine name='canon-a1100' maxCpus='1'/>
<machine 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'/>
<cpu type='tcg' name='cortex-a15' typename='cortex-a15-arm-cpu'/>
<cpu type='tcg' name='pxa260' typename='pxa260-arm-cpu'/>
<cpu type='tcg' name='arm1136-r2' typename='arm1136-r2-arm-cpu'/>
<cpu type='tcg' name='pxa261' typename='pxa261-arm-cpu'/>
<cpu type='tcg' name='pxa255' typename='pxa255-arm-cpu'/>
<cpu type='tcg' name='cortex-m33' typename='cortex-m33-arm-cpu'/>
<cpu type='tcg' name='arm926' typename='arm926-arm-cpu'/>
<cpu type='tcg' name='arm11mpcore' typename='arm11mpcore-arm-cpu'/>
<cpu type='tcg' name='pxa250' typename='pxa250-arm-cpu'/>
<cpu type='tcg' name='ti925t' typename='ti925t-arm-cpu'/>
<cpu type='tcg' name='cortex-a57' typename='cortex-a57-arm-cpu'/>
<cpu type='tcg' name='sa1110' typename='sa1110-arm-cpu'/>
<cpu type='tcg' name='host' typename='host-arm-cpu'/>
<cpu type='tcg' name='arm1176' typename='arm1176-arm-cpu'/>
<cpu type='tcg' name='cortex-a53' typename='cortex-a53-arm-cpu'/>
<cpu type='tcg' name='sa1100' typename='sa1100-arm-cpu'/>
<cpu type='tcg' name='pxa270-c5' typename='pxa270-c5-arm-cpu'/>
<cpu type='tcg' name='cortex-a9' typename='cortex-a9-arm-cpu'/>
<cpu type='tcg' name='cortex-a8' typename='cortex-a8-arm-cpu'/>
<cpu type='tcg' name='cortex-a7' typename='cortex-a7-arm-cpu'/>
<cpu type='tcg' name='pxa270-c0' typename='pxa270-c0-arm-cpu'/>
<cpu type='tcg' name='arm1026' typename='arm1026-arm-cpu'/>
<cpu type='tcg' name='pxa270-b1' typename='pxa270-b1-arm-cpu'/>
<cpu type='tcg' name='cortex-m3' typename='cortex-m3-arm-cpu'/>
<cpu type='tcg' name='max' typename='max-arm-cpu'/>
<cpu type='tcg' name='cortex-m4' typename='cortex-m4-arm-cpu'/>
<cpu type='tcg' name='pxa270-b0' typename='pxa270-b0-arm-cpu'/>
<cpu type='tcg' name='arm946' typename='arm946-arm-cpu'/>
<cpu type='tcg' name='cortex-r5' typename='cortex-r5-arm-cpu'/>
<cpu type='tcg' name='pxa270-a1' typename='pxa270-a1-arm-cpu'/>
<cpu type='tcg' name='pxa270' typename='pxa270-arm-cpu'/>
<gic version='3' kernel='yes' emulated='yes'/>
<gic version='2' kernel='no' emulated='yes'/>
</qemuCaps>

View File

@ -594,6 +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'/>
<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,29 +1056,4 @@
<cpu type='tcg' name='750_v3.1'/>
<cpu type='tcg' name='power8e_v2.1'/>
<cpu type='tcg' 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'/>
</qemuCaps>

View File

@ -225,6 +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'/>
<cpu type='tcg' name='z890.2' typename='z890.2-s390x-cpu' usable='no'>
<blocker name='klmd-sha-1'/>
<blocker name='kimd-sha-1'/>
@ -2464,13 +2473,4 @@
<blocker name='kmac-dea'/>
<blocker name='hfpm'/>
</cpu>
<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'/>
</qemuCaps>

View File

@ -661,6 +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'/>
<hostCPU type='tcg' model='base' migratability='yes'>
<property name='phys-bits' type='number' value='0'/>
<property name='core-id' type='number' value='-1'/>
@ -1199,43 +1236,6 @@
<blocker name='3dnowprefetch'/>
</cpu>
<cpu type='tcg' name='486' typename='486-x86_64-cpu' usable='yes'/>
<machine name='pc-i440fx-2.12' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/>
<machine name='isapc' hotplugCpus='yes' maxCpus='1'/>
<machine name='pc-1.1' hotplugCpus='yes' maxCpus='255'/>
<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'/>
<sev>
<cbitpos>47</cbitpos>
<reducedPhysBits>1</reducedPhysBits>

View File

@ -165,34 +165,6 @@
<cpu type='kvm' name='core2duo'/>
<cpu type='kvm' name='phenom'/>
<cpu type='kvm' name='qemu64'/>
<cpu type='tcg' name='Opteron_G5'/>
<cpu type='tcg' name='Opteron_G4'/>
<cpu type='tcg' name='Opteron_G3'/>
<cpu type='tcg' name='Opteron_G2'/>
<cpu type='tcg' name='Opteron_G1'/>
<cpu type='tcg' name='Broadwell'/>
<cpu type='tcg' name='Broadwell-noTSX'/>
<cpu type='tcg' name='Haswell'/>
<cpu type='tcg' name='Haswell-noTSX'/>
<cpu type='tcg' name='IvyBridge'/>
<cpu type='tcg' name='SandyBridge'/>
<cpu type='tcg' name='Westmere'/>
<cpu type='tcg' name='Nehalem'/>
<cpu type='tcg' name='Penryn'/>
<cpu type='tcg' name='Conroe'/>
<cpu type='tcg' name='n270'/>
<cpu type='tcg' name='athlon'/>
<cpu type='tcg' name='pentium3'/>
<cpu type='tcg' name='pentium2'/>
<cpu type='tcg' name='pentium'/>
<cpu type='tcg' name='486'/>
<cpu type='tcg' name='coreduo'/>
<cpu type='tcg' name='kvm32'/>
<cpu type='tcg' name='qemu32'/>
<cpu type='tcg' name='kvm64'/>
<cpu type='tcg' name='core2duo'/>
<cpu type='tcg' name='phenom'/>
<cpu type='tcg' 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'/>
@ -222,4 +194,32 @@
<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'/>
<cpu type='tcg' name='Opteron_G5'/>
<cpu type='tcg' name='Opteron_G4'/>
<cpu type='tcg' name='Opteron_G3'/>
<cpu type='tcg' name='Opteron_G2'/>
<cpu type='tcg' name='Opteron_G1'/>
<cpu type='tcg' name='Broadwell'/>
<cpu type='tcg' name='Broadwell-noTSX'/>
<cpu type='tcg' name='Haswell'/>
<cpu type='tcg' name='Haswell-noTSX'/>
<cpu type='tcg' name='IvyBridge'/>
<cpu type='tcg' name='SandyBridge'/>
<cpu type='tcg' name='Westmere'/>
<cpu type='tcg' name='Nehalem'/>
<cpu type='tcg' name='Penryn'/>
<cpu type='tcg' name='Conroe'/>
<cpu type='tcg' name='n270'/>
<cpu type='tcg' name='athlon'/>
<cpu type='tcg' name='pentium3'/>
<cpu type='tcg' name='pentium2'/>
<cpu type='tcg' name='pentium'/>
<cpu type='tcg' name='486'/>
<cpu type='tcg' name='coreduo'/>
<cpu type='tcg' name='kvm32'/>
<cpu type='tcg' name='qemu32'/>
<cpu type='tcg' name='kvm64'/>
<cpu type='tcg' name='core2duo'/>
<cpu type='tcg' name='phenom'/>
<cpu type='tcg' name='qemu64'/>
</qemuCaps>

View File

@ -171,34 +171,6 @@
<cpu type='kvm' name='core2duo'/>
<cpu type='kvm' name='phenom'/>
<cpu type='kvm' name='qemu64'/>
<cpu type='tcg' name='Opteron_G5'/>
<cpu type='tcg' name='Opteron_G4'/>
<cpu type='tcg' name='Opteron_G3'/>
<cpu type='tcg' name='Opteron_G2'/>
<cpu type='tcg' name='Opteron_G1'/>
<cpu type='tcg' name='Broadwell'/>
<cpu type='tcg' name='Broadwell-noTSX'/>
<cpu type='tcg' name='Haswell'/>
<cpu type='tcg' name='Haswell-noTSX'/>
<cpu type='tcg' name='IvyBridge'/>
<cpu type='tcg' name='SandyBridge'/>
<cpu type='tcg' name='Westmere'/>
<cpu type='tcg' name='Nehalem'/>
<cpu type='tcg' name='Penryn'/>
<cpu type='tcg' name='Conroe'/>
<cpu type='tcg' name='n270'/>
<cpu type='tcg' name='athlon'/>
<cpu type='tcg' name='pentium3'/>
<cpu type='tcg' name='pentium2'/>
<cpu type='tcg' name='pentium'/>
<cpu type='tcg' name='486'/>
<cpu type='tcg' name='coreduo'/>
<cpu type='tcg' name='kvm32'/>
<cpu type='tcg' name='qemu32'/>
<cpu type='tcg' name='kvm64'/>
<cpu type='tcg' name='core2duo'/>
<cpu type='tcg' name='phenom'/>
<cpu type='tcg' 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'/>
@ -230,4 +202,32 @@
<machine name='pc-q35-2.4' maxCpus='255'/>
<machine name='pc-q35-2.3' maxCpus='255'/>
<machine name='pc-0.13' maxCpus='255'/>
<cpu type='tcg' name='Opteron_G5'/>
<cpu type='tcg' name='Opteron_G4'/>
<cpu type='tcg' name='Opteron_G3'/>
<cpu type='tcg' name='Opteron_G2'/>
<cpu type='tcg' name='Opteron_G1'/>
<cpu type='tcg' name='Broadwell'/>
<cpu type='tcg' name='Broadwell-noTSX'/>
<cpu type='tcg' name='Haswell'/>
<cpu type='tcg' name='Haswell-noTSX'/>
<cpu type='tcg' name='IvyBridge'/>
<cpu type='tcg' name='SandyBridge'/>
<cpu type='tcg' name='Westmere'/>
<cpu type='tcg' name='Nehalem'/>
<cpu type='tcg' name='Penryn'/>
<cpu type='tcg' name='Conroe'/>
<cpu type='tcg' name='n270'/>
<cpu type='tcg' name='athlon'/>
<cpu type='tcg' name='pentium3'/>
<cpu type='tcg' name='pentium2'/>
<cpu type='tcg' name='pentium'/>
<cpu type='tcg' name='486'/>
<cpu type='tcg' name='coreduo'/>
<cpu type='tcg' name='kvm32'/>
<cpu type='tcg' name='qemu32'/>
<cpu type='tcg' name='kvm64'/>
<cpu type='tcg' name='core2duo'/>
<cpu type='tcg' name='phenom'/>
<cpu type='tcg' name='qemu64'/>
</qemuCaps>

View File

@ -158,36 +158,6 @@
<cpu type='kvm' name='cortex-r5'/>
<cpu type='kvm' name='pxa270-a1'/>
<cpu type='kvm' name='pxa270'/>
<cpu type='tcg' name='pxa262'/>
<cpu type='tcg' name='pxa270-a0'/>
<cpu type='tcg' name='arm1136'/>
<cpu type='tcg' name='cortex-a15'/>
<cpu type='tcg' name='pxa260'/>
<cpu type='tcg' name='arm1136-r2'/>
<cpu type='tcg' name='pxa261'/>
<cpu type='tcg' name='pxa255'/>
<cpu type='tcg' name='arm926'/>
<cpu type='tcg' name='arm11mpcore'/>
<cpu type='tcg' name='pxa250'/>
<cpu type='tcg' name='ti925t'/>
<cpu type='tcg' name='cortex-a57'/>
<cpu type='tcg' name='sa1110'/>
<cpu type='tcg' name='arm1176'/>
<cpu type='tcg' name='cortex-a53'/>
<cpu type='tcg' name='sa1100'/>
<cpu type='tcg' name='pxa270-c5'/>
<cpu type='tcg' name='cortex-a9'/>
<cpu type='tcg' name='cortex-a8'/>
<cpu type='tcg' name='pxa270-c0'/>
<cpu type='tcg' name='arm1026'/>
<cpu type='tcg' name='pxa270-b1'/>
<cpu type='tcg' name='cortex-m3'/>
<cpu type='tcg' name='cortex-m4'/>
<cpu type='tcg' name='pxa270-b0'/>
<cpu type='tcg' name='arm946'/>
<cpu type='tcg' name='cortex-r5'/>
<cpu type='tcg' name='pxa270-a1'/>
<cpu type='tcg' name='pxa270'/>
<machine name='integratorcp' maxCpus='1'/>
<machine name='nuri' maxCpus='2'/>
<machine name='verdex' maxCpus='1'/>
@ -229,6 +199,36 @@
<machine name='vexpress-a15' maxCpus='4'/>
<machine name='canon-a1100' maxCpus='1'/>
<machine name='lm3s811evb' maxCpus='1'/>
<cpu type='tcg' name='pxa262'/>
<cpu type='tcg' name='pxa270-a0'/>
<cpu type='tcg' name='arm1136'/>
<cpu type='tcg' name='cortex-a15'/>
<cpu type='tcg' name='pxa260'/>
<cpu type='tcg' name='arm1136-r2'/>
<cpu type='tcg' name='pxa261'/>
<cpu type='tcg' name='pxa255'/>
<cpu type='tcg' name='arm926'/>
<cpu type='tcg' name='arm11mpcore'/>
<cpu type='tcg' name='pxa250'/>
<cpu type='tcg' name='ti925t'/>
<cpu type='tcg' name='cortex-a57'/>
<cpu type='tcg' name='sa1110'/>
<cpu type='tcg' name='arm1176'/>
<cpu type='tcg' name='cortex-a53'/>
<cpu type='tcg' name='sa1100'/>
<cpu type='tcg' name='pxa270-c5'/>
<cpu type='tcg' name='cortex-a9'/>
<cpu type='tcg' name='cortex-a8'/>
<cpu type='tcg' name='pxa270-c0'/>
<cpu type='tcg' name='arm1026'/>
<cpu type='tcg' name='pxa270-b1'/>
<cpu type='tcg' name='cortex-m3'/>
<cpu type='tcg' name='cortex-m4'/>
<cpu type='tcg' name='pxa270-b0'/>
<cpu type='tcg' name='arm946'/>
<cpu type='tcg' name='cortex-r5'/>
<cpu type='tcg' name='pxa270-a1'/>
<cpu type='tcg' name='pxa270'/>
<gic version='3' kernel='no' emulated='no'/>
<gic version='2' kernel='yes' emulated='yes'/>
</qemuCaps>

View File

@ -554,6 +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'/>
<cpu type='tcg' name='default'/>
<cpu type='tcg' name='ppc'/>
<cpu type='tcg' name='ppc32'/>
@ -984,19 +999,4 @@
<cpu type='tcg' name='MPC8544E_v11'/>
<cpu type='tcg' name='405GPb'/>
<cpu type='tcg' 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'/>
</qemuCaps>

View File

@ -183,6 +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'/>
<cpu type='tcg' name='Opteron_G5'/>
<cpu type='tcg' name='Opteron_G4'/>
<cpu type='tcg' name='Opteron_G3'/>
@ -211,29 +236,4 @@
<cpu type='tcg' name='core2duo'/>
<cpu type='tcg' name='phenom'/>
<cpu type='tcg' 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'/>
</qemuCaps>

View File

@ -95,9 +95,9 @@
<package></package>
<arch>s390x</arch>
<cpu type='kvm' name='host'/>
<cpu type='tcg' 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'/>
<cpu type='tcg' name='host'/>
</qemuCaps>

View File

@ -189,6 +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'/>
<cpu type='tcg' name='Opteron_G5'/>
<cpu type='tcg' name='Opteron_G4'/>
<cpu type='tcg' name='Opteron_G3'/>
@ -218,31 +245,4 @@
<cpu type='tcg' name='core2duo'/>
<cpu type='tcg' name='phenom'/>
<cpu type='tcg' 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'/>
</qemuCaps>

View File

@ -180,6 +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'/>
<cpu type='tcg' name='z10EC-base'/>
<cpu type='tcg' name='z9EC-base'/>
<cpu type='tcg' name='z196.2-base'/>
@ -244,9 +249,4 @@
<cpu type='tcg' name='z196-base'/>
<cpu type='tcg' name='z13-base'/>
<cpu type='tcg' 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'/>
</qemuCaps>

View File

@ -218,6 +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'/>
<cpu type='tcg' name='host' usable='no'>
<blocker name='kvm'/>
</cpu>
@ -343,35 +374,4 @@
<blocker name='3dnowprefetch'/>
</cpu>
<cpu type='tcg' 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'/>
</qemuCaps>

View File

@ -569,6 +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'/>
<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'/>
@ -1002,24 +1022,4 @@
<cpu type='tcg' name='MPC8544E_v11'/>
<cpu type='tcg' name='405GPb'/>
<cpu type='tcg' 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'/>
</qemuCaps>

View File

@ -186,6 +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'/>
<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'/>
@ -250,10 +256,4 @@
<cpu type='tcg' name='z196-base' typename='z196-base-s390-cpu'/>
<cpu type='tcg' name='z13-base' typename='z13-base-s390-cpu'/>
<cpu type='tcg' name='z890' typename='z890-s390-cpu'/>
<machine name='s390-ccw-virtio-2.9' alias='s390-ccw-virtio' maxCpus='248' default='yes'/>
<machine name='s390-ccw-virtio-2.7' maxCpus='248'/>
<machine name='s390-ccw-virtio-2.6' maxCpus='248'/>
<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'/>
</qemuCaps>

View File

@ -469,6 +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'/>
<hostCPU type='tcg' model='base' migratability='yes'>
<property name='phys-bits' type='number' value='0'/>
<property name='core-id' type='number' value='-1'/>
@ -828,37 +861,4 @@
<blocker name='3dnowprefetch'/>
</cpu>
<cpu type='tcg' name='486' typename='486-x86_64-cpu' usable='yes'/>
<machine name='pc-i440fx-2.9' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/>
<machine name='pc-0.12' hotplugCpus='yes' maxCpus='255'/>
<machine name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/>
<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'/>
</qemuCaps>

View File

@ -596,6 +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'/>
<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'/>
@ -1033,30 +1059,4 @@
<cpu type='tcg' name='750_v3.1'/>
<cpu type='tcg' name='power5+_v2.1'/>
<cpu type='tcg' 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'/>
</qemuCaps>

View File

@ -234,6 +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'/>
<cpu type='tcg' name='z890.2' typename='z890.2-s390x-cpu' usable='no'>
<blocker name='klmd-sha-1'/>
<blocker name='kimd-sha-1'/>
@ -2673,14 +2683,4 @@
<blocker name='kmac-dea'/>
<blocker name='hfpm'/>
</cpu>
<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'/>
</qemuCaps>

View File

@ -578,6 +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'/>
<hostCPU type='tcg' model='base' migratability='yes'>
<property name='phys-bits' type='number' value='0'/>
<property name='core-id' type='number' value='-1'/>
@ -1143,43 +1182,4 @@
<blocker name='3dnowprefetch'/>
</cpu>
<cpu type='tcg' name='486' typename='486-x86_64-cpu' usable='yes'/>
<machine name='pc-i440fx-3.0' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/>
<machine name='isapc' hotplugCpus='yes' maxCpus='1'/>
<machine name='pc-1.1' hotplugCpus='yes' maxCpus='255'/>
<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'/>
</qemuCaps>

View File

@ -600,6 +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'/>
<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'/>
@ -1037,31 +1064,4 @@
<cpu type='tcg' name='750_v3.1'/>
<cpu type='tcg' name='power5+_v2.1'/>
<cpu type='tcg' 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'/>
</qemuCaps>

View File

@ -657,6 +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'/>
<hostCPU type='tcg' model='base' migratability='yes'>
<property name='phys-bits' type='number' value='0'/>
<property name='core-id' type='number' value='-1'/>
@ -1326,45 +1367,4 @@
<blocker name='3dnowprefetch'/>
</cpu>
<cpu type='tcg' name='486' typename='486-x86_64-cpu' usable='yes'/>
<machine name='pc-i440fx-3.1' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/>
<machine name='isapc' hotplugCpus='yes' maxCpus='1'/>
<machine name='pc-1.1' hotplugCpus='yes' maxCpus='255'/>
<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'/>
</qemuCaps>

View File

@ -209,43 +209,6 @@
<cpu type='kvm' name='cortex-r5' typename='cortex-r5-arm-cpu'/>
<cpu type='kvm' name='pxa270-a1' typename='pxa270-a1-arm-cpu'/>
<cpu type='kvm' name='pxa270' typename='pxa270-arm-cpu'/>
<cpu type='tcg' name='pxa262' typename='pxa262-arm-cpu'/>
<cpu type='tcg' name='pxa270-a0' typename='pxa270-a0-arm-cpu'/>
<cpu type='tcg' name='arm1136' typename='arm1136-arm-cpu'/>
<cpu type='tcg' name='cortex-a15' typename='cortex-a15-arm-cpu'/>
<cpu type='tcg' name='pxa260' typename='pxa260-arm-cpu'/>
<cpu type='tcg' name='arm1136-r2' typename='arm1136-r2-arm-cpu'/>
<cpu type='tcg' name='pxa261' typename='pxa261-arm-cpu'/>
<cpu type='tcg' name='pxa255' typename='pxa255-arm-cpu'/>
<cpu type='tcg' name='cortex-a72' typename='cortex-a72-arm-cpu'/>
<cpu type='tcg' name='cortex-m33' typename='cortex-m33-arm-cpu'/>
<cpu type='tcg' name='arm926' typename='arm926-arm-cpu'/>
<cpu type='tcg' name='cortex-r5f' typename='cortex-r5f-arm-cpu'/>
<cpu type='tcg' name='arm11mpcore' typename='arm11mpcore-arm-cpu'/>
<cpu type='tcg' name='pxa250' typename='pxa250-arm-cpu'/>
<cpu type='tcg' name='ti925t' typename='ti925t-arm-cpu'/>
<cpu type='tcg' name='cortex-a57' typename='cortex-a57-arm-cpu'/>
<cpu type='tcg' name='sa1110' typename='sa1110-arm-cpu'/>
<cpu type='tcg' name='host' typename='host-arm-cpu'/>
<cpu type='tcg' name='arm1176' typename='arm1176-arm-cpu'/>
<cpu type='tcg' name='cortex-a53' typename='cortex-a53-arm-cpu'/>
<cpu type='tcg' name='sa1100' typename='sa1100-arm-cpu'/>
<cpu type='tcg' name='pxa270-c5' typename='pxa270-c5-arm-cpu'/>
<cpu type='tcg' name='cortex-a9' typename='cortex-a9-arm-cpu'/>
<cpu type='tcg' name='cortex-a8' typename='cortex-a8-arm-cpu'/>
<cpu type='tcg' name='cortex-a7' typename='cortex-a7-arm-cpu'/>
<cpu type='tcg' name='pxa270-c0' typename='pxa270-c0-arm-cpu'/>
<cpu type='tcg' name='arm1026' typename='arm1026-arm-cpu'/>
<cpu type='tcg' name='pxa270-b1' typename='pxa270-b1-arm-cpu'/>
<cpu type='tcg' name='cortex-m3' typename='cortex-m3-arm-cpu'/>
<cpu type='tcg' name='max' typename='max-arm-cpu'/>
<cpu type='tcg' name='cortex-m4' typename='cortex-m4-arm-cpu'/>
<cpu type='tcg' name='pxa270-b0' typename='pxa270-b0-arm-cpu'/>
<cpu type='tcg' name='arm946' typename='arm946-arm-cpu'/>
<cpu type='tcg' name='cortex-m0' typename='cortex-m0-arm-cpu'/>
<cpu type='tcg' name='cortex-r5' typename='cortex-r5-arm-cpu'/>
<cpu type='tcg' name='pxa270-a1' typename='pxa270-a1-arm-cpu'/>
<cpu type='tcg' name='pxa270' typename='pxa270-arm-cpu'/>
<machine name='integratorcp' maxCpus='1'/>
<machine name='nuri' maxCpus='2'/>
<machine name='mps2-an511' maxCpus='1'/>
@ -312,6 +275,43 @@
<machine name='virt-3.1' maxCpus='512'/>
<machine name='canon-a1100' maxCpus='1'/>
<machine 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'/>
<cpu type='tcg' name='cortex-a15' typename='cortex-a15-arm-cpu'/>
<cpu type='tcg' name='pxa260' typename='pxa260-arm-cpu'/>
<cpu type='tcg' name='arm1136-r2' typename='arm1136-r2-arm-cpu'/>
<cpu type='tcg' name='pxa261' typename='pxa261-arm-cpu'/>
<cpu type='tcg' name='pxa255' typename='pxa255-arm-cpu'/>
<cpu type='tcg' name='cortex-a72' typename='cortex-a72-arm-cpu'/>
<cpu type='tcg' name='cortex-m33' typename='cortex-m33-arm-cpu'/>
<cpu type='tcg' name='arm926' typename='arm926-arm-cpu'/>
<cpu type='tcg' name='cortex-r5f' typename='cortex-r5f-arm-cpu'/>
<cpu type='tcg' name='arm11mpcore' typename='arm11mpcore-arm-cpu'/>
<cpu type='tcg' name='pxa250' typename='pxa250-arm-cpu'/>
<cpu type='tcg' name='ti925t' typename='ti925t-arm-cpu'/>
<cpu type='tcg' name='cortex-a57' typename='cortex-a57-arm-cpu'/>
<cpu type='tcg' name='sa1110' typename='sa1110-arm-cpu'/>
<cpu type='tcg' name='host' typename='host-arm-cpu'/>
<cpu type='tcg' name='arm1176' typename='arm1176-arm-cpu'/>
<cpu type='tcg' name='cortex-a53' typename='cortex-a53-arm-cpu'/>
<cpu type='tcg' name='sa1100' typename='sa1100-arm-cpu'/>
<cpu type='tcg' name='pxa270-c5' typename='pxa270-c5-arm-cpu'/>
<cpu type='tcg' name='cortex-a9' typename='cortex-a9-arm-cpu'/>
<cpu type='tcg' name='cortex-a8' typename='cortex-a8-arm-cpu'/>
<cpu type='tcg' name='cortex-a7' typename='cortex-a7-arm-cpu'/>
<cpu type='tcg' name='pxa270-c0' typename='pxa270-c0-arm-cpu'/>
<cpu type='tcg' name='arm1026' typename='arm1026-arm-cpu'/>
<cpu type='tcg' name='pxa270-b1' typename='pxa270-b1-arm-cpu'/>
<cpu type='tcg' name='cortex-m3' typename='cortex-m3-arm-cpu'/>
<cpu type='tcg' name='max' typename='max-arm-cpu'/>
<cpu type='tcg' name='cortex-m4' typename='cortex-m4-arm-cpu'/>
<cpu type='tcg' name='pxa270-b0' typename='pxa270-b0-arm-cpu'/>
<cpu type='tcg' name='arm946' typename='arm946-arm-cpu'/>
<cpu type='tcg' name='cortex-m0' typename='cortex-m0-arm-cpu'/>
<cpu type='tcg' name='cortex-r5' typename='cortex-r5-arm-cpu'/>
<cpu type='tcg' name='pxa270-a1' typename='pxa270-a1-arm-cpu'/>
<cpu type='tcg' name='pxa270' typename='pxa270-arm-cpu'/>
<gic version='3' kernel='yes' emulated='yes'/>
<gic version='2' kernel='no' emulated='yes'/>
</qemuCaps>

View File

@ -614,6 +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'/>
<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'/>
@ -1051,32 +1079,4 @@
<cpu type='tcg' name='750_v3.1'/>
<cpu type='tcg' name='power8e_v2.1'/>
<cpu type='tcg' 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'/>
</qemuCaps>

View File

@ -248,6 +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'/>
<hostCPU type='tcg' model='zEC12.2-base' migratability='no'>
<property name='dateh2' type='boolean' value='false'/>
<property name='aen' type='boolean' value='true'/>
@ -2884,16 +2896,4 @@
<blocker name='kmac-dea'/>
<blocker name='hfpm'/>
</cpu>
<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'/>
</qemuCaps>

View File

@ -664,6 +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'/>
<hostCPU type='tcg' model='base' migratability='yes'>
<property name='phys-bits' type='number' value='0'/>
<property name='core-id' type='number' value='-1'/>
@ -1334,45 +1375,4 @@
<blocker name='3dnowprefetch'/>
</cpu>
<cpu type='tcg' name='486' typename='486-x86_64-cpu' usable='yes'/>
<machine name='pc-i440fx-4.0' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/>
<machine name='isapc' hotplugCpus='yes' maxCpus='1'/>
<machine name='pc-1.1' hotplugCpus='yes' maxCpus='255'/>
<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'/>
</qemuCaps>

View File

@ -838,6 +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'/>
<hostCPU type='tcg' model='base' migratability='yes'>
<property name='cmov' type='boolean' value='true' migratable='yes'/>
<property name='ia64' type='boolean' value='false'/>
@ -1898,48 +1942,4 @@
</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 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'/>
</qemuCaps>

View File

@ -233,64 +233,6 @@
<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'/>
<hostCPU type='tcg' model='max' migratability='no'>
<property name='sve768' type='boolean' value='true'/>
<property name='sve128' type='boolean' value='true'/>
<property name='sve1024' type='boolean' value='true'/>
<property name='sve1280' type='boolean' value='true'/>
<property name='sve896' type='boolean' value='true'/>
<property name='sve256' type='boolean' value='true'/>
<property name='sve1536' type='boolean' value='true'/>
<property name='sve1792' type='boolean' value='true'/>
<property name='sve384' type='boolean' value='true'/>
<property name='sve' type='boolean' value='true'/>
<property name='sve2048' type='boolean' value='true'/>
<property name='sve512' type='boolean' value='true'/>
<property name='aarch64' type='boolean' value='true'/>
<property name='pmu' type='boolean' value='true'/>
<property name='sve1920' type='boolean' value='true'/>
<property name='sve1152' type='boolean' value='true'/>
<property name='sve640' type='boolean' value='true'/>
<property name='sve1408' type='boolean' value='true'/>
<property name='sve1664' type='boolean' value='true'/>
</hostCPU>
<cpu type='tcg' name='pxa262' typename='pxa262-arm-cpu'/>
<cpu type='tcg' name='pxa270-a0' typename='pxa270-a0-arm-cpu'/>
<cpu type='tcg' name='arm1136' typename='arm1136-arm-cpu'/>
<cpu type='tcg' name='cortex-a15' typename='cortex-a15-arm-cpu'/>
<cpu type='tcg' name='pxa260' typename='pxa260-arm-cpu'/>
<cpu type='tcg' name='arm1136-r2' typename='arm1136-r2-arm-cpu'/>
<cpu type='tcg' name='pxa261' typename='pxa261-arm-cpu'/>
<cpu type='tcg' name='pxa255' typename='pxa255-arm-cpu'/>
<cpu type='tcg' name='cortex-a72' typename='cortex-a72-arm-cpu'/>
<cpu type='tcg' name='cortex-m33' typename='cortex-m33-arm-cpu'/>
<cpu type='tcg' name='arm926' typename='arm926-arm-cpu'/>
<cpu type='tcg' name='cortex-r5f' typename='cortex-r5f-arm-cpu'/>
<cpu type='tcg' name='arm11mpcore' typename='arm11mpcore-arm-cpu'/>
<cpu type='tcg' name='pxa250' typename='pxa250-arm-cpu'/>
<cpu type='tcg' name='ti925t' typename='ti925t-arm-cpu'/>
<cpu type='tcg' name='cortex-a57' typename='cortex-a57-arm-cpu'/>
<cpu type='tcg' name='sa1110' typename='sa1110-arm-cpu'/>
<cpu type='tcg' name='host' typename='host-arm-cpu'/>
<cpu type='tcg' name='arm1176' typename='arm1176-arm-cpu'/>
<cpu type='tcg' name='cortex-a53' typename='cortex-a53-arm-cpu'/>
<cpu type='tcg' name='sa1100' typename='sa1100-arm-cpu'/>
<cpu type='tcg' name='pxa270-c5' typename='pxa270-c5-arm-cpu'/>
<cpu type='tcg' name='cortex-a9' typename='cortex-a9-arm-cpu'/>
<cpu type='tcg' name='cortex-a8' typename='cortex-a8-arm-cpu'/>
<cpu type='tcg' name='cortex-a7' typename='cortex-a7-arm-cpu'/>
<cpu type='tcg' name='pxa270-c0' typename='pxa270-c0-arm-cpu'/>
<cpu type='tcg' name='arm1026' typename='arm1026-arm-cpu'/>
<cpu type='tcg' name='pxa270-b1' typename='pxa270-b1-arm-cpu'/>
<cpu type='tcg' name='cortex-m3' typename='cortex-m3-arm-cpu'/>
<cpu type='tcg' name='max' typename='max-arm-cpu'/>
<cpu type='tcg' name='cortex-m4' typename='cortex-m4-arm-cpu'/>
<cpu type='tcg' name='pxa270-b0' typename='pxa270-b0-arm-cpu'/>
<cpu type='tcg' name='arm946' typename='arm946-arm-cpu'/>
<cpu type='tcg' name='cortex-m0' typename='cortex-m0-arm-cpu'/>
<cpu type='tcg' name='cortex-r5' typename='cortex-r5-arm-cpu'/>
<cpu type='tcg' name='pxa270-a1' typename='pxa270-a1-arm-cpu'/>
<cpu type='tcg' name='pxa270' typename='pxa270-arm-cpu'/>
<machine name='integratorcp' maxCpus='1'/>
<machine name='nuri' maxCpus='2'/>
<machine name='mps2-an511' maxCpus='1'/>
@ -362,6 +304,64 @@
<machine name='virt-3.1' maxCpus='512'/>
<machine name='canon-a1100' maxCpus='1'/>
<machine 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'/>
<property name='sve1024' type='boolean' value='true'/>
<property name='sve1280' type='boolean' value='true'/>
<property name='sve896' type='boolean' value='true'/>
<property name='sve256' type='boolean' value='true'/>
<property name='sve1536' type='boolean' value='true'/>
<property name='sve1792' type='boolean' value='true'/>
<property name='sve384' type='boolean' value='true'/>
<property name='sve' type='boolean' value='true'/>
<property name='sve2048' type='boolean' value='true'/>
<property name='sve512' type='boolean' value='true'/>
<property name='aarch64' type='boolean' value='true'/>
<property name='pmu' type='boolean' value='true'/>
<property name='sve1920' type='boolean' value='true'/>
<property name='sve1152' type='boolean' value='true'/>
<property name='sve640' type='boolean' value='true'/>
<property name='sve1408' type='boolean' value='true'/>
<property name='sve1664' type='boolean' value='true'/>
</hostCPU>
<cpu type='tcg' name='pxa262' typename='pxa262-arm-cpu'/>
<cpu type='tcg' name='pxa270-a0' typename='pxa270-a0-arm-cpu'/>
<cpu type='tcg' name='arm1136' typename='arm1136-arm-cpu'/>
<cpu type='tcg' name='cortex-a15' typename='cortex-a15-arm-cpu'/>
<cpu type='tcg' name='pxa260' typename='pxa260-arm-cpu'/>
<cpu type='tcg' name='arm1136-r2' typename='arm1136-r2-arm-cpu'/>
<cpu type='tcg' name='pxa261' typename='pxa261-arm-cpu'/>
<cpu type='tcg' name='pxa255' typename='pxa255-arm-cpu'/>
<cpu type='tcg' name='cortex-a72' typename='cortex-a72-arm-cpu'/>
<cpu type='tcg' name='cortex-m33' typename='cortex-m33-arm-cpu'/>
<cpu type='tcg' name='arm926' typename='arm926-arm-cpu'/>
<cpu type='tcg' name='cortex-r5f' typename='cortex-r5f-arm-cpu'/>
<cpu type='tcg' name='arm11mpcore' typename='arm11mpcore-arm-cpu'/>
<cpu type='tcg' name='pxa250' typename='pxa250-arm-cpu'/>
<cpu type='tcg' name='ti925t' typename='ti925t-arm-cpu'/>
<cpu type='tcg' name='cortex-a57' typename='cortex-a57-arm-cpu'/>
<cpu type='tcg' name='sa1110' typename='sa1110-arm-cpu'/>
<cpu type='tcg' name='host' typename='host-arm-cpu'/>
<cpu type='tcg' name='arm1176' typename='arm1176-arm-cpu'/>
<cpu type='tcg' name='cortex-a53' typename='cortex-a53-arm-cpu'/>
<cpu type='tcg' name='sa1100' typename='sa1100-arm-cpu'/>
<cpu type='tcg' name='pxa270-c5' typename='pxa270-c5-arm-cpu'/>
<cpu type='tcg' name='cortex-a9' typename='cortex-a9-arm-cpu'/>
<cpu type='tcg' name='cortex-a8' typename='cortex-a8-arm-cpu'/>
<cpu type='tcg' name='cortex-a7' typename='cortex-a7-arm-cpu'/>
<cpu type='tcg' name='pxa270-c0' typename='pxa270-c0-arm-cpu'/>
<cpu type='tcg' name='arm1026' typename='arm1026-arm-cpu'/>
<cpu type='tcg' name='pxa270-b1' typename='pxa270-b1-arm-cpu'/>
<cpu type='tcg' name='cortex-m3' typename='cortex-m3-arm-cpu'/>
<cpu type='tcg' name='max' typename='max-arm-cpu'/>
<cpu type='tcg' name='cortex-m4' typename='cortex-m4-arm-cpu'/>
<cpu type='tcg' name='pxa270-b0' typename='pxa270-b0-arm-cpu'/>
<cpu type='tcg' name='arm946' typename='arm946-arm-cpu'/>
<cpu type='tcg' name='cortex-m0' typename='cortex-m0-arm-cpu'/>
<cpu type='tcg' name='cortex-r5' typename='cortex-r5-arm-cpu'/>
<cpu type='tcg' name='pxa270-a1' typename='pxa270-a1-arm-cpu'/>
<cpu type='tcg' name='pxa270' typename='pxa270-arm-cpu'/>
<gic version='3' kernel='yes' emulated='yes'/>
<gic version='2' kernel='no' emulated='yes'/>
</qemuCaps>

View File

@ -616,6 +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'/>
<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'/>
@ -1053,35 +1084,4 @@
<cpu type='tcg' name='750_v3.1'/>
<cpu type='tcg' name='power8e_v2.1'/>
<cpu type='tcg' 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'/>
</qemuCaps>

View File

@ -371,6 +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'/>
<hostCPU type='tcg' model='z13.2-base' migratability='no'>
<property name='dateh2' type='boolean' value='false'/>
<property name='aen' type='boolean' value='true'/>
@ -3328,18 +3342,4 @@
<blocker name='type'/>
</cpu>
<cpu type='tcg' name='qemu' typename='qemu-s390x-cpu' usable='yes'/>
<machine name='s390-ccw-virtio-4.2' alias='s390-ccw-virtio' hotplugCpus='yes' maxCpus='248' default='yes'/>
<machine name='s390-ccw-virtio-4.0' hotplugCpus='yes' maxCpus='248'/>
<machine name='s390-ccw-virtio-3.1' hotplugCpus='yes' maxCpus='248'/>
<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'/>
</qemuCaps>

View File

@ -841,6 +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'/>
<hostCPU type='tcg' model='base' migratability='yes'>
<property name='cmov' type='boolean' value='true' migratable='yes'/>
<property name='ia64' type='boolean' value='false'/>
@ -1904,50 +1950,4 @@
</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 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'/>
</qemuCaps>