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>

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 49f843a12c5f0833b6e9bc73245ca8310580e4ca..df93515959e7a2f8919ebe68f9d6c20fe0e40fdc 100644 (file)
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -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;

diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
index 8b573070d53450874a04cb5652238ed783ff0158..a62a5534b8ecc8515f2aa2517a50ae5c3fa3e9f5 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
@@ -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>

diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
index 743b0a3dd7874668b76cf40b502ac68b170aefab..3b34b97da0cdda936e1efb19ec6b42a9206218a2 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
@@ -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>

diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
index a23d1c62061d9facf1677a33eb0cb77670704cce..e99c2375d1dab41b1bf814231ebde13e194d2aef 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
@@ -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>

diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
index 75d5371d3fd5991e7fc71aafd623ad2e25e5cdd1..1cb08f4039162c83f9a1849646700365300aae26 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
@@ -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>

diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
index ad4f5447ed92a7db2b3d5f7ca538c9f7b271f392..9375536242d83949e7e0588faebb2ab35acfa2e6 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
@@ -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>

diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
index dc2b8075db078d1d3fd7f9d4836ec201ef9271df..a01fa35a8141bb141acf0d38c6d8e66d92f4ebd0 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
@@ -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>

diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
index 0d317f60c4ee90508c1acdb1992c9b5fc26a752f..2bbb0f78d1364cb8c759f9d63d3ab44ee2761f81 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
@@ -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>

diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
index 951e1c85a4e167c9c8e4cde09f76af6f3e63f2b5..902056fe9d9ad4fa3d425b467a1c7f6e64c6a768 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
@@ -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>

diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
index 8ca2be3b83cf0a83f8d2df16322226150ddf6e28..3b498ff03e9bcbd57a5a2fb43a7d472b7281890c 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
@@ -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>

diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
index 96dd9f77c8aa71cc3999a71e73f6547d361e75a1..f9ae66a4e55830127ac8d2a8aea20450dc349e94 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
@@ -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>

diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
index 037ecf959443f14618aedbca54433e5ffdf2f40b..661eac299a3ad3053ce7e89df7b6e43babf9bf22 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
@@ -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>

diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
index ef52887411e7308dffeb9b857c94281c043f6c70..7ba6407f8d6cceb67932d3d65c045f1e2d796154 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
@@ -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>

diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
index b3245762d47dd08f04938a7eafaafdd438ea152b..e5f9955e35e617f3192953faab7915e4eba224fc 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
@@ -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>

diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
index 7f184b06f0a952a834bfac8511f33739c8eeef00..576ffd55f0ee94bd1d20bf4fe7a23d370816f09b 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
@@ -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>

diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
index 31d7f172eee78f5beee5d68aa0d9d387785e6525..8f997d72fab72f2b5da6df8c44b6079cd33d6a8c 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
@@ -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>

diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
index 0cc922c0a20a93afe06983bfd8b03f81609e7548..f4df7202bfc4285704e53cde6eda650cb3421ae2 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
@@ -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>

diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
index a77258215203ed9f4f38e3b4a479700d1ba63478..6fa907104bebcb776fe02978ddcb789d6cb936d7 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
@@ -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>

diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
index 2961c2552fbfef887297107d37f81c226699169d..3ce45265918142189364a97d6d421ef05a7a5d06 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
@@ -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>

diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
index 633444de95c349a9a94918fcfc7fe6b9ed9062a0..6662538d755f8b725a8a6684fcf31960af16bf7d 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
@@ -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>

diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
index e9fc059065ba3efa2ef6761c83ac1d20bc734c6d..7e78676191c463a2a73b7ccae60a901a0064a27c 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
@@ -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>

diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
index ffb5c59491c66d497ded594146c6580f2f276ba1..a45fde31dd13a540e09ec2068896a301b13c87f8 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
@@ -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>

diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
index 75b4fbdc49358c37cc91bebe1352ea4c99fc8189..da549442eaaea4cce5e818060211e3dfd62cfd3d 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
@@ -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>

diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
index 7ee52a95e7c3c1604e01b333ddece75fb385ebe0..3a4f4869a84e630684e28c4ac5cfa581cd36c2e7 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
@@ -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>

diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
index 2bae44af66bf538e26e757702fa19290b74235f1..36f6a642e55f13ae5c97cc8f019fa4dc9a99c389 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
@@ -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>

diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
index 8240932e79367e03b73c4b69bb89734eebfbea0c..4d376e07fa2b1d85cb9a496d826aefaddb36883d 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
@@ -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>

diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
index 05f7fe9e672440d566952088629df213e6189a3d..d1409a6cbaa33cff2e6f192402a8f15139adf78a 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
@@ -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>

diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
index be58cb34fb382b3184a0df4f864c0dafee2ece40..6160cd3e00d8293cd218e2f58ba7699e5709d29d 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
@@ -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>

diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
index 1a2b7aa2695f40a6d7fc70860f9c5d2f48a40d00..a7a18c03f2524011ced8780aa497dab24c790f7d 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
@@ -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>

diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
index 210f0f89b09dd4b79ed3772310c9f68aa2e8b798..0a1147e7969f0986e31f94bdc10a46f53501ef91 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
@@ -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>

diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
index d5a8b8073a0a2cae19c4ec2e291ee4bc15d22bfb..7a8ee6ce465395aa0256a90133024f65ab546129 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
@@ -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>

diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
index 4687eb7daa1e01e18547838ba7b8ede313dae6a0..0fbad25a37b8487b868fb77c377b2ae6e274495c 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
@@ -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>

diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
index 1d50ef1aa21c7218153deb7ab0ec10b636a5ccbf..77cbb4dfa8a529b1b7a6fd623a93f5a960d69d87 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
@@ -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>

diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
index cf677da0e02583e575882fe29bfac9d01bb0aa25..3447d21e2e442d7c28571e4808ad911e304f9dd3 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
@@ -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>

diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
index 96e12204b53ecc380010d24a841fe17087321f12..72b23f55be25bc9025c82a5a74a39016faee7548 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
@@ -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>

diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
index 5214be2e34a18707c0c16b68fc23579fc25e41f2..36a9d07ae0a5abb2796f0c7212cd74b644c4d078 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
@@ -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>

diff --git a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
index c99cca667058a88331c1427df5b774715114fc90..a88c71f5ab0239c1a1cf94b92de53fb02267f960 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
@@ -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>

diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
index 53735a4734e4102926d3c36894ed6f6bf5cd6833..6883985f2ba81ec2f0aef6e8f4a94851a968c56c 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
@@ -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>

diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
index 1f2f9e7591ba962b25525f2da7266c54245a10a2..f99130bdf40dca135022bfca96c24728cd154d4c 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
@@ -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>

diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
index a92f7520b792f792ad3d81aa765138e2bea6cbcf..3baa16804807fccc6c0670e85818bd85dc020541 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
@@ -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>

diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
index b3e9307db29694afe80e2af52c4b7cfe5771f5ac..dc2bc8c42c273ee4013c969be76f9db708c7358f 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@@ -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>