qemu: Probe machine types for both KVM and TCG

Almost all TCG query-machines replies match KVM. The only exceptions are
4.2.0 replies on s390x which differ in the reported default CPU type.

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 a1206e18a34a2b77e439e3d736381f59a6f98487..601f17249c3429b7876f165f0ae4b16896029a77 100644 (file)
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -4726,7 +4726,8 @@ virQEMUCapsInitQMPMonitorTCG(virQEMUCapsPtr qemuCaps,
     if (virQEMUCapsProbeQMPHostCPU(qemuCaps, accel, mon, VIR_DOMAIN_VIRT_QEMU) < 0)
         return -1;
 
-    virQEMUCapsAccelCopyMachineTypes(&qemuCaps->tcg, &qemuCaps->kvm);
+    if (virQEMUCapsProbeQMPMachineTypes(qemuCaps, accel, mon) < 0)
+        return -1;
 
     return 0;
 }

diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies
index a62b4e98f4736eb2d2984946f8d80e5c1fc954e1..e74273e0d3780b6ab6e3cea1d6f7fc199a588362 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies
@@ -3145,3 +3145,81 @@
   ],
   "id": "libvirt-2"
 }
+
+{
+  "execute": "query-machines",
+  "id": "libvirt-3"
+}
+
+{
+  "return": [
+    {
+      "name": "pc-q35-1.4",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-q35-1.5",
+      "cpu-max": 255,
+      "alias": "q35"
+    },
+    {
+      "name": "isapc",
+      "cpu-max": 1
+    },
+    {
+      "name": "pc-0.10",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-0.11",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-0.12",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-0.13",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-0.14",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-0.15",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-1.0",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-1.1",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-1.2",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-1.3",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-i440fx-1.4",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-i440fx-1.5",
+      "is-default": true,
+      "cpu-max": 255,
+      "alias": "pc"
+    },
+    {
+      "name": "none",
+      "cpu-max": 1
+    }
+  ],
+  "id": "libvirt-3"
+}

diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies
index 3253ba635a7be79f68189fe343ddc434eec67b48..60af5aa0b3b5c9e503274d26543cd1641ecffbaf 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies
@@ -3108,3 +3108,89 @@
   ],
   "id": "libvirt-2"
 }
+
+{
+  "execute": "query-machines",
+  "id": "libvirt-3"
+}
+
+{
+  "return": [
+    {
+      "name": "pc-q35-1.4",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-q35-1.5",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-q35-1.6",
+      "cpu-max": 255,
+      "alias": "q35"
+    },
+    {
+      "name": "isapc",
+      "cpu-max": 1
+    },
+    {
+      "name": "pc-0.10",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-0.11",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-0.12",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-0.13",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-0.14",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-0.15",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-1.0",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-1.1",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-1.2",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-1.3",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-i440fx-1.4",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-i440fx-1.5",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-i440fx-1.6",
+      "is-default": true,
+      "cpu-max": 255,
+      "alias": "pc"
+    },
+    {
+      "name": "none",
+      "cpu-max": 1
+    }
+  ],
+  "id": "libvirt-3"
+}

diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies
index 4789a11f55cdb69f1341719e1cb634c65746ee08..6dfa888dff16beecc275b1e3858ea70b91f70ab3 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies
@@ -3323,3 +3323,97 @@
   ],
   "id": "libvirt-2"
 }
+
+{
+  "execute": "query-machines",
+  "id": "libvirt-3"
+}
+
+{
+  "return": [
+    {
+      "name": "pc-q35-1.4",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-q35-1.5",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-q35-1.6",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-q35-1.7",
+      "cpu-max": 255,
+      "alias": "q35"
+    },
+    {
+      "name": "isapc",
+      "cpu-max": 1
+    },
+    {
+      "name": "pc-0.10",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-0.11",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-0.12",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-0.13",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-0.14",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-0.15",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-1.0",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-1.1",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-1.2",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-1.3",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-i440fx-1.4",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-i440fx-1.5",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-i440fx-1.6",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-i440fx-1.7",
+      "is-default": true,
+      "cpu-max": 255,
+      "alias": "pc"
+    },
+    {
+      "name": "none",
+      "cpu-max": 1
+    }
+  ],
+  "id": "libvirt-3"
+}

diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies
index 42b7278fe1239ec2da17d60d772d4a256e8e87e4..cd35b2984b90f541786a417ee3628efe34bbb6de 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies
@@ -3827,3 +3827,113 @@
   ],
   "id": "libvirt-2"
 }
+
+{
+  "execute": "query-machines",
+  "id": "libvirt-3"
+}
+
+{
+  "return": [
+    {
+      "name": "pc-1.3",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-0.12",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-q35-1.6",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-q35-1.5",
+      "cpu-max": 255
+    },
+    {
+      "name": "none",
+      "cpu-max": 1
+    },
+    {
+      "name": "pc-i440fx-1.6",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-i440fx-1.7",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-q35-2.1",
+      "cpu-max": 255,
+      "alias": "q35"
+    },
+    {
+      "name": "pc-0.11",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-0.10",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-1.2",
+      "cpu-max": 255
+    },
+    {
+      "name": "isapc",
+      "cpu-max": 1
+    },
+    {
+      "name": "pc-q35-1.4",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-0.15",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-i440fx-1.5",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-i440fx-1.4",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-q35-2.0",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-0.14",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-1.1",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-q35-1.7",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-i440fx-2.1",
+      "is-default": true,
+      "cpu-max": 255,
+      "alias": "pc"
+    },
+    {
+      "name": "pc-1.0",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-i440fx-2.0",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-0.13",
+      "cpu-max": 255
+    }
+  ],
+  "id": "libvirt-3"
+}

diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies
index 7da45594ca654c89c786e171a9ae7fc7bc326e60..73a99a36ead77db68cda62422db04aab212210eb 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies
@@ -16489,3 +16489,275 @@
   ],
   "id": "libvirt-2"
 }
+
+{
+  "execute": "query-machines",
+  "id": "libvirt-3"
+}
+
+{
+  "return": [
+    {
+      "hotpluggable-cpus": false,
+      "name": "integratorcp",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "nuri",
+      "cpu-max": 2
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "mps2-an511",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "verdex",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "ast2500-evb",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "smdkc210",
+      "cpu-max": 2
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "collie",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "imx25-pdk",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "none",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "spitz",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "realview-pbx-a9",
+      "cpu-max": 4
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "realview-eb",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "versatilepb",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "realview-pb-a8",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "virt-2.9",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "musicpal",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "z2",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "akita",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "virt-2.7",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "kzm",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "virt-2.8",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "realview-eb-mpcore",
+      "cpu-max": 4
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "sx1",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "sx1-v1",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "virt-2.6",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "cubieboard",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "highbank",
+      "cpu-max": 4
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "raspi2",
+      "cpu-max": 4
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "netduino2",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "terrier",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "n810",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "mainstone",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "palmetto-bmc",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "sabrelite",
+      "cpu-max": 4
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "midway",
+      "cpu-max": 4
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "romulus-bmc",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "cheetah",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "tosa",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "borzoi",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "versatileab",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "lm3s6965evb",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "n800",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "virt-2.10",
+      "cpu-max": 255,
+      "alias": "virt"
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "connex",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "xilinx-zynq-a9",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "xlnx-ep108",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "mps2-an385",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "vexpress-a9",
+      "cpu-max": 4
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "vexpress-a15",
+      "cpu-max": 4
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "xlnx-zcu102",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "canon-a1100",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "lm3s811evb",
+      "cpu-max": 1
+    }
+  ],
+  "id": "libvirt-3"
+}

diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies
index b77e730cfde01316a1b4385c7360d5f75750bf3b..9b19d4ebd8263705df12258f3b41e5a293426029 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies
@@ -20529,3 +20529,126 @@
   ],
   "id": "libvirt-2"
 }
+
+{
+  "execute": "query-machines",
+  "id": "libvirt-3"
+}
+
+{
+  "return": [
+    {
+      "hotpluggable-cpus": false,
+      "name": "ref405ep",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "none",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "virtex-ml507",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "powernv",
+      "cpu-max": 2048
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "ppce500",
+      "cpu-max": 32
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "mpc8544ds",
+      "cpu-max": 15
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "bamboo",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "g3beige",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pseries-2.10",
+      "is-default": true,
+      "cpu-max": 1024,
+      "alias": "pseries"
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "prep",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pseries-2.9",
+      "cpu-max": 1024
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "mac99",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "pseries-2.6",
+      "cpu-max": 1024
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pseries-2.7",
+      "cpu-max": 1024
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pseries-2.8",
+      "cpu-max": 1024
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "pseries-2.4",
+      "cpu-max": 1024
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "pseries-2.5",
+      "cpu-max": 1024
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "pseries-2.2",
+      "cpu-max": 1024
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "taihu",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "pseries-2.3",
+      "cpu-max": 1024
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "pseries-2.1",
+      "cpu-max": 1024
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "40p",
+      "cpu-max": 1
+    }
+  ],
+  "id": "libvirt-3"
+}

diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies
index 21f2db0c37020d6f6451f4653a6480ff3f52441f..9cae647bdff5c631b76349ef44a612ae959527ec 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies
@@ -16473,3 +16473,56 @@
     "desc": "The CPU definition 'max' is unknown."
   }
 }
+
+{
+  "execute": "query-machines",
+  "id": "libvirt-4"
+}
+
+{
+  "return": [
+    {
+      "hotpluggable-cpus": false,
+      "name": "s390-ccw-virtio-2.7",
+      "cpu-max": 248
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "s390-ccw-virtio-2.6",
+      "cpu-max": 248
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "none",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "s390-ccw-virtio-2.10",
+      "is-default": true,
+      "cpu-max": 248,
+      "alias": "s390-ccw-virtio"
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "s390-ccw-virtio-2.5",
+      "cpu-max": 248
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "s390-ccw-virtio-2.4",
+      "cpu-max": 248
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "s390-ccw-virtio-2.9",
+      "cpu-max": 248
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "s390-ccw-virtio-2.8",
+      "cpu-max": 248
+    }
+  ],
+  "id": "libvirt-4"
+}

diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies
index 257616400bc688bc536991ba8ff49b4ab0ec3b1f..8f96b4c567110928e02ed448fe867ca63b520088 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies
@@ -18921,3 +18921,197 @@
   },
   "id": "libvirt-6"
 }
+
+{
+  "execute": "query-machines",
+  "id": "libvirt-7"
+}
+
+{
+  "return": [
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-0.12",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.4",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-1.3",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-2.7",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-2.6",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "none",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "xenpv",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-1.7",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.8",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-1.6",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.7",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.10",
+      "is-default": true,
+      "cpu-max": 255,
+      "alias": "pc"
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-0.11",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.3",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-0.10",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-1.2",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.2",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "isapc",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-2.5",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "xenfv",
+      "cpu-max": 128
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-0.15",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-0.14",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-1.5",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.6",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-1.4",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.5",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-2.9",
+      "cpu-max": 288
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-1.1",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.1",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-2.8",
+      "cpu-max": 288
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-1.0",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.0",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-2.4",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.9",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-0.13",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-2.10",
+      "cpu-max": 288,
+      "alias": "q35"
+    }
+  ],
+  "id": "libvirt-7"
+}

diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies
index b94c0b878cf059abec087c4da732cdb624c73c5c..6b06303f7b2b65bc90732c5499d4f0e4653d2ffc 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies
@@ -18113,3 +18113,61 @@
     "desc": "The CPU definition 'max' is unknown."
   }
 }
+
+{
+  "execute": "query-machines",
+  "id": "libvirt-4"
+}
+
+{
+  "return": [
+    {
+      "hotpluggable-cpus": true,
+      "name": "s390-ccw-virtio-2.7",
+      "cpu-max": 248
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "s390-ccw-virtio-2.6",
+      "cpu-max": 248
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "none",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "s390-ccw-virtio-2.11",
+      "is-default": true,
+      "cpu-max": 248,
+      "alias": "s390-ccw-virtio"
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "s390-ccw-virtio-2.10",
+      "cpu-max": 248
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "s390-ccw-virtio-2.5",
+      "cpu-max": 248
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "s390-ccw-virtio-2.4",
+      "cpu-max": 248
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "s390-ccw-virtio-2.9",
+      "cpu-max": 248
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "s390-ccw-virtio-2.8",
+      "cpu-max": 248
+    }
+  ],
+  "id": "libvirt-4"
+}

diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies
index 98a01464a22e995818db47e64358d6588576dbee..d91f01b55d112b47c318d1cfa74b51c1a45ab5ae 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies
@@ -19133,3 +19133,197 @@
   },
   "id": "libvirt-6"
 }
+
+{
+  "execute": "query-machines",
+  "id": "libvirt-7"
+}
+
+{
+  "return": [
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-0.12",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.4",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-1.3",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-2.7",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-2.6",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "none",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-1.7",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.8",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-1.6",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.11",
+      "is-default": true,
+      "cpu-max": 255,
+      "alias": "pc"
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.7",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.10",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-0.11",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.3",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-0.10",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-1.2",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.2",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "isapc",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-2.5",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-0.15",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-0.14",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-1.5",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.6",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-1.4",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.5",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-2.9",
+      "cpu-max": 288
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-1.1",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.1",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-2.8",
+      "cpu-max": 288
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-1.0",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.0",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-2.4",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.9",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-2.11",
+      "cpu-max": 288,
+      "alias": "q35"
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-0.13",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-2.10",
+      "cpu-max": 288
+    }
+  ],
+  "id": "libvirt-7"
+}

diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies
index 2e1d8d345d61b412683b42f5c9272ee17e23b862..87414a9bcafe647f02d3b949b93daa13bed5dbe1 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies
@@ -18964,3 +18964,305 @@
   ],
   "id": "libvirt-2"
 }
+
+{
+  "execute": "query-machines",
+  "id": "libvirt-3"
+}
+
+{
+  "return": [
+    {
+      "hotpluggable-cpus": false,
+      "name": "integratorcp",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "nuri",
+      "cpu-max": 2
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "mps2-an511",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "verdex",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "mps2-an505",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "ast2500-evb",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "smdkc210",
+      "cpu-max": 2
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "collie",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "imx25-pdk",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "none",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "spitz",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "realview-pbx-a9",
+      "cpu-max": 4
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "realview-eb",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "realview-pb-a8",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "versatilepb",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "emcraft-sf2",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "virt-2.9",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "musicpal",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "z2",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "akita",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "virt-2.7",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "kzm",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "virt-2.8",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "realview-eb-mpcore",
+      "cpu-max": 4
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "mcimx7d-sabre",
+      "cpu-max": 2
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "sx1",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "sx1-v1",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "virt-2.6",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "cubieboard",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "highbank",
+      "cpu-max": 4
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "raspi2",
+      "cpu-max": 4
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "raspi3",
+      "cpu-max": 4
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "netduino2",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "terrier",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "n810",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "mainstone",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "palmetto-bmc",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "sabrelite",
+      "cpu-max": 4
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "midway",
+      "cpu-max": 4
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "romulus-bmc",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "cheetah",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "tosa",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "borzoi",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "versatileab",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "lm3s6965evb",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "n800",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "virt-2.10",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "virt-2.11",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "connex",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "virt-2.12",
+      "cpu-max": 255,
+      "alias": "virt"
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "xilinx-zynq-a9",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "xlnx-ep108",
+      "cpu-max": 6
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "mps2-an385",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "vexpress-a9",
+      "cpu-max": 4
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "vexpress-a15",
+      "cpu-max": 4
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "xlnx-zcu102",
+      "cpu-max": 6
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "canon-a1100",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "lm3s811evb",
+      "cpu-max": 1
+    }
+  ],
+  "id": "libvirt-3"
+}

diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies
index 5c9ddbc178113ded25859f9cb3d8f35916761d3d..98ce528b1a0ca4230cee3cc5d79f3c4e88a6e9c8 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies
@@ -22728,3 +22728,146 @@
   ],
   "id": "libvirt-2"
 }
+
+{
+  "execute": "query-machines",
+  "id": "libvirt-3"
+}
+
+{
+  "return": [
+    {
+      "hotpluggable-cpus": false,
+      "name": "ref405ep",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "sam460ex",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "none",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "virtex-ml507",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "powernv",
+      "cpu-max": 2048
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "ppce500",
+      "cpu-max": 32
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "mpc8544ds",
+      "cpu-max": 15
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pseries-2.12-sxxm",
+      "cpu-max": 1024
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "bamboo",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "g3beige",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pseries-2.10",
+      "cpu-max": 1024
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "prep",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pseries-2.11",
+      "cpu-max": 1024
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pseries-2.12",
+      "is-default": true,
+      "cpu-max": 1024,
+      "alias": "pseries"
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pseries-2.9",
+      "cpu-max": 1024
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "mac99",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "pseries-2.6",
+      "cpu-max": 1024
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pseries-2.7",
+      "cpu-max": 1024
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pseries-2.8",
+      "cpu-max": 1024
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "pseries-2.4",
+      "cpu-max": 1024
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "pseries-2.5",
+      "cpu-max": 1024
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "pseries-2.2",
+      "cpu-max": 1024
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "taihu",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "pseries-2.3",
+      "cpu-max": 1024
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "pseries-2.1",
+      "cpu-max": 1024
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "40p",
+      "cpu-max": 1
+    }
+  ],
+  "id": "libvirt-3"
+}

diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies
index 77afcbaa5b9f661056fd23c417fb723fb443840f..93ad14a6b896c81640cd0e137f8f10c900dc999a 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies
@@ -19695,3 +19695,66 @@
     "desc": "The CPU definition 'max' is unknown."
   }
 }
+
+{
+  "execute": "query-machines",
+  "id": "libvirt-4"
+}
+
+{
+  "return": [
+    {
+      "hotpluggable-cpus": true,
+      "name": "s390-ccw-virtio-2.7",
+      "cpu-max": 248
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "s390-ccw-virtio-2.6",
+      "cpu-max": 248
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "none",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "s390-ccw-virtio-2.11",
+      "cpu-max": 248
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "s390-ccw-virtio-2.10",
+      "cpu-max": 248
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "s390-ccw-virtio-2.5",
+      "cpu-max": 248
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "s390-ccw-virtio-2.4",
+      "cpu-max": 248
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "s390-ccw-virtio-2.9",
+      "cpu-max": 248
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "s390-ccw-virtio-2.8",
+      "cpu-max": 248
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "s390-ccw-virtio-2.12",
+      "is-default": true,
+      "cpu-max": 248,
+      "alias": "s390-ccw-virtio"
+    }
+  ],
+  "id": "libvirt-4"
+}

diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies
index 3a2f854531de93b4ec2df4068045f66821a6283c..b4c243096b9a7b05bbe5aab2a2ed51ed90561158 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies
@@ -22488,3 +22488,207 @@
   },
   "id": "libvirt-6"
 }
+
+{
+  "execute": "query-machines",
+  "id": "libvirt-7"
+}
+
+{
+  "return": [
+    {
+      "hotpluggable-cpus": true,
+      "name": "isapc",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-1.1",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-1.2",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-1.3",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.8",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-1.0",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "none",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.9",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.6",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.7",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.3",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.4",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.5",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.1",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.2",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.0",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-2.11",
+      "cpu-max": 288
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-2.12",
+      "cpu-max": 288,
+      "alias": "q35"
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-2.10",
+      "cpu-max": 288
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-1.7",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-2.9",
+      "cpu-max": 288
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-0.15",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-1.5",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-2.7",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-1.6",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.11",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-2.8",
+      "cpu-max": 288
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-0.13",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.12",
+      "is-default": true,
+      "cpu-max": 255,
+      "alias": "pc"
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-0.14",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-2.4",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-2.5",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-2.6",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-1.4",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.10",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-0.11",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-0.12",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-0.10",
+      "cpu-max": 255
+    }
+  ],
+  "id": "libvirt-7"
+}

diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies
index 9ad0d61af674611a4c55ba62a5fc2f5343265a5e..e6bf39de8ae17a36b9c020cce04bb41b1fe78efa 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies
@@ -4630,3 +4630,137 @@
   ],
   "id": "libvirt-2"
 }
+
+{
+  "execute": "query-machines",
+  "id": "libvirt-3"
+}
+
+{
+  "return": [
+    {
+      "name": "pc-i440fx-2.4",
+      "is-default": true,
+      "cpu-max": 255,
+      "alias": "pc"
+    },
+    {
+      "name": "pc-1.3",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-0.12",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-q35-1.6",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-q35-1.5",
+      "cpu-max": 255
+    },
+    {
+      "name": "none",
+      "cpu-max": 1
+    },
+    {
+      "name": "pc-i440fx-1.6",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-q35-2.2",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-i440fx-1.7",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-q35-2.1",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-0.11",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-0.10",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-i440fx-2.2",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-1.2",
+      "cpu-max": 255
+    },
+    {
+      "name": "isapc",
+      "cpu-max": 1
+    },
+    {
+      "name": "pc-i440fx-2.3",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-q35-1.4",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-0.15",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-i440fx-1.5",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-q35-2.0",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-i440fx-1.4",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-0.14",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-1.1",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-i440fx-2.1",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-q35-1.7",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-1.0",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-i440fx-2.0",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-q35-2.4",
+      "cpu-max": 255,
+      "alias": "q35"
+    },
+    {
+      "name": "pc-q35-2.3",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-0.13",
+      "cpu-max": 255
+    }
+  ],
+  "id": "libvirt-3"
+}

diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies
index 76ebfba904f8beb78332442275f4e13c35d511d6..0f83583fabdff290387317c26727535a40cee090 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies
@@ -12260,3 +12260,145 @@
   ],
   "id": "libvirt-2"
 }
+
+{
+  "execute": "query-machines",
+  "id": "libvirt-3"
+}
+
+{
+  "return": [
+    {
+      "name": "pc-i440fx-2.4",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-1.3",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-0.12",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-q35-1.6",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-q35-1.5",
+      "cpu-max": 255
+    },
+    {
+      "name": "none",
+      "cpu-max": 1
+    },
+    {
+      "name": "pc-i440fx-1.6",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-q35-2.2",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-i440fx-1.7",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-q35-2.1",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-0.11",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-0.10",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-1.2",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-i440fx-2.2",
+      "cpu-max": 255
+    },
+    {
+      "name": "isapc",
+      "cpu-max": 1
+    },
+    {
+      "name": "pc-i440fx-2.3",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-q35-1.4",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-q35-2.5",
+      "cpu-max": 255,
+      "alias": "q35"
+    },
+    {
+      "name": "pc-0.15",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-i440fx-1.5",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-q35-2.0",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-i440fx-1.4",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-i440fx-2.5",
+      "is-default": true,
+      "cpu-max": 255,
+      "alias": "pc"
+    },
+    {
+      "name": "pc-0.14",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-1.1",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-i440fx-2.1",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-q35-1.7",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-1.0",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-i440fx-2.0",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-q35-2.4",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-q35-2.3",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-0.13",
+      "cpu-max": 255
+    }
+  ],
+  "id": "libvirt-3"
+}

diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies
index 4d35a2c4640da27a2662e77457be85eea4c3f5cb..44f5227452dce0074f980b9fd683ad015b146b5b 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies
@@ -13033,3 +13033,183 @@
   ],
   "id": "libvirt-2"
 }
+
+{
+  "execute": "query-machines",
+  "id": "libvirt-3"
+}
+
+{
+  "return": [
+    {
+      "name": "integratorcp",
+      "cpu-max": 1
+    },
+    {
+      "name": "nuri",
+      "cpu-max": 2
+    },
+    {
+      "name": "verdex",
+      "cpu-max": 1
+    },
+    {
+      "name": "smdkc210",
+      "cpu-max": 2
+    },
+    {
+      "name": "collie",
+      "cpu-max": 1
+    },
+    {
+      "name": "imx25-pdk",
+      "cpu-max": 1
+    },
+    {
+      "name": "none",
+      "cpu-max": 1
+    },
+    {
+      "name": "spitz",
+      "cpu-max": 1
+    },
+    {
+      "name": "realview-pbx-a9",
+      "cpu-max": 4
+    },
+    {
+      "name": "realview-eb",
+      "cpu-max": 1
+    },
+    {
+      "name": "versatilepb",
+      "cpu-max": 1
+    },
+    {
+      "name": "realview-pb-a8",
+      "cpu-max": 1
+    },
+    {
+      "name": "musicpal",
+      "cpu-max": 1
+    },
+    {
+      "name": "z2",
+      "cpu-max": 1
+    },
+    {
+      "name": "akita",
+      "cpu-max": 1
+    },
+    {
+      "name": "kzm",
+      "cpu-max": 1
+    },
+    {
+      "name": "realview-eb-mpcore",
+      "cpu-max": 4
+    },
+    {
+      "name": "sx1",
+      "cpu-max": 1
+    },
+    {
+      "name": "sx1-v1",
+      "cpu-max": 1
+    },
+    {
+      "name": "virt-2.6",
+      "cpu-max": 255,
+      "alias": "virt"
+    },
+    {
+      "name": "cubieboard",
+      "cpu-max": 1
+    },
+    {
+      "name": "highbank",
+      "cpu-max": 4
+    },
+    {
+      "name": "raspi2",
+      "cpu-max": 4
+    },
+    {
+      "name": "netduino2",
+      "cpu-max": 1
+    },
+    {
+      "name": "terrier",
+      "cpu-max": 1
+    },
+    {
+      "name": "n810",
+      "cpu-max": 1
+    },
+    {
+      "name": "mainstone",
+      "cpu-max": 1
+    },
+    {
+      "name": "palmetto-bmc",
+      "cpu-max": 1
+    },
+    {
+      "name": "midway",
+      "cpu-max": 4
+    },
+    {
+      "name": "cheetah",
+      "cpu-max": 1
+    },
+    {
+      "name": "tosa",
+      "cpu-max": 1
+    },
+    {
+      "name": "borzoi",
+      "cpu-max": 1
+    },
+    {
+      "name": "versatileab",
+      "cpu-max": 1
+    },
+    {
+      "name": "lm3s6965evb",
+      "cpu-max": 1
+    },
+    {
+      "name": "n800",
+      "cpu-max": 1
+    },
+    {
+      "name": "connex",
+      "cpu-max": 1
+    },
+    {
+      "name": "xilinx-zynq-a9",
+      "cpu-max": 1
+    },
+    {
+      "name": "xlnx-ep108",
+      "cpu-max": 1
+    },
+    {
+      "name": "vexpress-a9",
+      "cpu-max": 4
+    },
+    {
+      "name": "vexpress-a15",
+      "cpu-max": 4
+    },
+    {
+      "name": "canon-a1100",
+      "cpu-max": 1
+    },
+    {
+      "name": "lm3s811evb",
+      "cpu-max": 1
+    }
+  ],
+  "id": "libvirt-3"
+}

diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies
index 89dc5bca0a27019e28cc0cc6b5d6e88df0198103..8f4aba565bc4dc483cdd8c1bafc3749026e6f0de 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies
@@ -15511,3 +15511,80 @@
   ],
   "id": "libvirt-2"
 }
+
+{
+  "execute": "query-machines",
+  "id": "libvirt-3"
+}
+
+{
+  "return": [
+    {
+      "name": "ref405ep",
+      "cpu-max": 1
+    },
+    {
+      "name": "none",
+      "cpu-max": 1
+    },
+    {
+      "name": "virtex-ml507",
+      "cpu-max": 1
+    },
+    {
+      "name": "ppce500",
+      "cpu-max": 32
+    },
+    {
+      "name": "mpc8544ds",
+      "cpu-max": 15
+    },
+    {
+      "name": "bamboo",
+      "cpu-max": 1
+    },
+    {
+      "name": "g3beige",
+      "cpu-max": 1
+    },
+    {
+      "name": "prep",
+      "cpu-max": 1
+    },
+    {
+      "name": "mac99",
+      "cpu-max": 1
+    },
+    {
+      "name": "pseries-2.6",
+      "is-default": true,
+      "cpu-max": 255,
+      "alias": "pseries"
+    },
+    {
+      "name": "pseries-2.4",
+      "cpu-max": 255
+    },
+    {
+      "name": "pseries-2.5",
+      "cpu-max": 255
+    },
+    {
+      "name": "pseries-2.2",
+      "cpu-max": 255
+    },
+    {
+      "name": "taihu",
+      "cpu-max": 1
+    },
+    {
+      "name": "pseries-2.3",
+      "cpu-max": 255
+    },
+    {
+      "name": "pseries-2.1",
+      "cpu-max": 255
+    }
+  ],
+  "id": "libvirt-3"
+}

diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies
index 3ceb880a9192ab2785a582840e6272a7c0388f4f..6c46e139877093cc2d192358ffbd47bf21f1fa3c 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies
@@ -12839,3 +12839,121 @@
   ],
   "id": "libvirt-2"
 }
+
+{
+  "execute": "query-machines",
+  "id": "libvirt-3"
+}
+
+{
+  "return": [
+    {
+      "name": "pc-0.12",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-i440fx-2.4",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-1.3",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-q35-2.6",
+      "cpu-max": 255,
+      "alias": "q35"
+    },
+    {
+      "name": "none",
+      "cpu-max": 1
+    },
+    {
+      "name": "pc-i440fx-1.7",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-i440fx-1.6",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-0.11",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-i440fx-2.3",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-0.10",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-1.2",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-i440fx-2.2",
+      "cpu-max": 255
+    },
+    {
+      "name": "isapc",
+      "cpu-max": 1
+    },
+    {
+      "name": "pc-q35-2.5",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-0.15",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-i440fx-1.5",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-0.14",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-i440fx-2.6",
+      "is-default": true,
+      "cpu-max": 255,
+      "alias": "pc"
+    },
+    {
+      "name": "pc-i440fx-1.4",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-i440fx-2.5",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-1.1",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-i440fx-2.1",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-1.0",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-i440fx-2.0",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-q35-2.4",
+      "cpu-max": 255
+    },
+    {
+      "name": "pc-0.13",
+      "cpu-max": 255
+    }
+  ],
+  "id": "libvirt-3"
+}

diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies
index fcc51289b210e45d081185147b3f8b8a868ea40b..a23af1e004b55e9617f0cb5312f7e1073f531004 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies
@@ -11995,3 +11995,41 @@
   ],
   "id": "libvirt-2"
 }
+
+{
+  "execute": "query-machines",
+  "id": "libvirt-3"
+}
+
+{
+  "return": [
+    {
+      "hotpluggable-cpus": false,
+      "name": "s390-ccw-virtio-2.5",
+      "cpu-max": 248
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "s390-ccw-virtio-2.4",
+      "cpu-max": 248
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "none",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "s390-ccw-virtio-2.7",
+      "is-default": true,
+      "cpu-max": 248,
+      "alias": "s390-ccw-virtio"
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "s390-ccw-virtio-2.6",
+      "cpu-max": 248
+    }
+  ],
+  "id": "libvirt-3"
+}

diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies
index 53791fcd224db05b62f32b4940041257fccae742..97d885fc969185c5ab2e7ade8eb532e61dc3cc34 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies
@@ -13422,3 +13422,157 @@
   ],
   "id": "libvirt-2"
 }
+
+{
+  "execute": "query-machines",
+  "id": "libvirt-3"
+}
+
+{
+  "return": [
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-0.12",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.4",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-1.3",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-2.7",
+      "cpu-max": 255,
+      "alias": "q35"
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-2.6",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "none",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-1.7",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-1.6",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.7",
+      "is-default": true,
+      "cpu-max": 255,
+      "alias": "pc"
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-0.11",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.3",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-0.10",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-1.2",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.2",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "isapc",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-2.5",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-0.15",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-1.5",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-0.14",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.6",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-1.4",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.5",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-1.1",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.1",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-1.0",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.0",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-2.4",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-0.13",
+      "cpu-max": 255
+    }
+  ],
+  "id": "libvirt-3"
+}

diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies
index 1e3c1ba8976c6834c1fdf525852b5883e02e7720..5db900ce8036ca8b38cf2962919c83dd1ee87d16 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies
@@ -13428,3 +13428,46 @@
     "desc": "The CPU definition 'max' is unknown."
   }
 }
+
+{
+  "execute": "query-machines",
+  "id": "libvirt-4"
+}
+
+{
+  "return": [
+    {
+      "hotpluggable-cpus": false,
+      "name": "s390-ccw-virtio-2.7",
+      "cpu-max": 248
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "s390-ccw-virtio-2.6",
+      "cpu-max": 248
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "none",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "s390-ccw-virtio-2.5",
+      "cpu-max": 248
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "s390-ccw-virtio-2.4",
+      "cpu-max": 248
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "s390-ccw-virtio-2.8",
+      "is-default": true,
+      "cpu-max": 248,
+      "alias": "s390-ccw-virtio"
+    }
+  ],
+  "id": "libvirt-4"
+}

diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies
index 4eec6773fa7cff5602c12787b8d25de661b4616a..119fefbf9a9de4b82e78f918f4e07c2e68528067 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies
@@ -14316,3 +14316,177 @@
   ],
   "id": "libvirt-2"
 }
+
+{
+  "execute": "query-machines",
+  "id": "libvirt-3"
+}
+
+{
+  "return": [
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-0.12",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.4",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-1.3",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-2.7",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-2.6",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "none",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "xenpv",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-1.7",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.8",
+      "is-default": true,
+      "cpu-max": 255,
+      "alias": "pc"
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-1.6",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.7",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-0.11",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.3",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-0.10",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-1.2",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.2",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "isapc",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-2.5",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "xenfv",
+      "cpu-max": 128
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-0.15",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-0.14",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-1.5",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.6",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-1.4",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.5",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-1.1",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.1",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-2.8",
+      "cpu-max": 288,
+      "alias": "q35"
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-1.0",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.0",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-2.4",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-0.13",
+      "cpu-max": 255
+    }
+  ],
+  "id": "libvirt-3"
+}

diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies
index f663c5da92169aee155faa7d5c0f332e42c9e1a2..71916f6372f4de66da4ec0db66a2bd8da109fdf5 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies
@@ -19292,3 +19292,121 @@
   ],
   "id": "libvirt-2"
 }
+
+{
+  "execute": "query-machines",
+  "id": "libvirt-3"
+}
+
+{
+  "return": [
+    {
+      "hotpluggable-cpus": false,
+      "name": "ref405ep",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "none",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "virtex-ml507",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "powernv",
+      "cpu-max": 2048
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "ppce500",
+      "cpu-max": 32
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "mpc8544ds",
+      "cpu-max": 15
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "bamboo",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "g3beige",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "prep",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pseries-2.9",
+      "is-default": true,
+      "cpu-max": 1024,
+      "alias": "pseries"
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "mac99",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "pseries-2.6",
+      "cpu-max": 1024
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pseries-2.7",
+      "cpu-max": 1024
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pseries-2.8",
+      "cpu-max": 1024
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "pseries-2.4",
+      "cpu-max": 1024
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "pseries-2.5",
+      "cpu-max": 1024
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "pseries-2.2",
+      "cpu-max": 1024
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "taihu",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "pseries-2.3",
+      "cpu-max": 1024
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "pseries-2.1",
+      "cpu-max": 1024
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "40p",
+      "cpu-max": 1
+    }
+  ],
+  "id": "libvirt-3"
+}

diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies
index 9933bdeca57a86c0a7aef5a02a6fcb5ed549468d..503f896892e70637c2f60d2a8f3cbeba14b86af4 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies
@@ -14477,3 +14477,51 @@
     "desc": "The CPU definition 'max' is unknown."
   }
 }
+
+{
+  "execute": "query-machines",
+  "id": "libvirt-4"
+}
+
+{
+  "return": [
+    {
+      "hotpluggable-cpus": false,
+      "name": "s390-ccw-virtio-2.7",
+      "cpu-max": 248
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "s390-ccw-virtio-2.6",
+      "cpu-max": 248
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "none",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "s390-ccw-virtio-2.5",
+      "cpu-max": 248
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "s390-ccw-virtio-2.4",
+      "cpu-max": 248
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "s390-ccw-virtio-2.9",
+      "is-default": true,
+      "cpu-max": 248,
+      "alias": "s390-ccw-virtio"
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "s390-ccw-virtio-2.8",
+      "cpu-max": 248
+    }
+  ],
+  "id": "libvirt-4"
+}

diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies
index 7c507e9645176a3eeac54dac57117ce56ed742d3..8f32313b464ad5d37502a6cd3935ee96c63e67b5 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies
@@ -17892,3 +17892,187 @@
   },
   "id": "libvirt-6"
 }
+
+{
+  "execute": "query-machines",
+  "id": "libvirt-7"
+}
+
+{
+  "return": [
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-0.12",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.4",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-1.3",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-2.7",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-2.6",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "none",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "xenpv",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-1.7",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.8",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-1.6",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.7",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-0.11",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.3",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-0.10",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-1.2",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.2",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "isapc",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-2.5",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "xenfv",
+      "cpu-max": 128
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-0.15",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-0.14",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-1.5",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.6",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-1.4",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.5",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-2.9",
+      "cpu-max": 288,
+      "alias": "q35"
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-1.1",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.1",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-2.8",
+      "cpu-max": 288
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-1.0",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.0",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-2.4",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.9",
+      "is-default": true,
+      "cpu-max": 255,
+      "alias": "pc"
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-0.13",
+      "cpu-max": 255
+    }
+  ],
+  "id": "libvirt-7"
+}

diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies
index fa370a39bdb9e77b3458ba28252ad1528567ccf7..79891dac7f347d0557ebff91b892378a54b15618 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies
@@ -23596,3 +23596,151 @@
   ],
   "id": "libvirt-2"
 }
+
+{
+  "execute": "query-machines",
+  "id": "libvirt-3"
+}
+
+{
+  "return": [
+    {
+      "hotpluggable-cpus": false,
+      "name": "ref405ep",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "sam460ex",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "none",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "virtex-ml507",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "powernv",
+      "cpu-max": 2048
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "ppce500",
+      "cpu-max": 32
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "mpc8544ds",
+      "cpu-max": 15
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pseries-2.12-sxxm",
+      "cpu-max": 1024
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "bamboo",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "g3beige",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pseries-3.0",
+      "is-default": true,
+      "cpu-max": 1024,
+      "alias": "pseries"
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pseries-2.10",
+      "cpu-max": 1024
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "prep",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pseries-2.11",
+      "cpu-max": 1024
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pseries-2.12",
+      "cpu-max": 1024
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pseries-2.9",
+      "cpu-max": 1024
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "mac99",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "pseries-2.6",
+      "cpu-max": 1024
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pseries-2.7",
+      "cpu-max": 1024
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pseries-2.8",
+      "cpu-max": 1024
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "pseries-2.4",
+      "cpu-max": 1024
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "pseries-2.5",
+      "cpu-max": 1024
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "pseries-2.2",
+      "cpu-max": 1024
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "taihu",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "pseries-2.3",
+      "cpu-max": 1024
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "pseries-2.1",
+      "cpu-max": 1024
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "40p",
+      "cpu-max": 1
+    }
+  ],
+  "id": "libvirt-3"
+}

diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies
index 8159b26d19225c8c749ed5dd986843cffd0f42a9..efb18678a2e7c9a24f3553018d8a6230fe8345ff 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies
@@ -14718,3 +14718,45 @@
   ],
   "id": "libvirt-33"
 }
+
+{
+  "execute": "query-machines",
+  "id": "libvirt-34"
+}
+
+{
+  "return": [
+    {
+      "hotpluggable-cpus": false,
+      "name": "spike_v1.9.1",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "sifive_e",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "none",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "spike_v1.10",
+      "is-default": true,
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "virt",
+      "cpu-max": 8
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "sifive_u",
+      "cpu-max": 1
+    }
+  ],
+  "id": "libvirt-34"
+}

diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies
index 995ca8678486ddbe4f7b28905a38947cf85d6e19..018e52f8da475d1cba8148c16868e7fef6c21e97 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies
@@ -14718,3 +14718,45 @@
   ],
   "id": "libvirt-33"
 }
+
+{
+  "execute": "query-machines",
+  "id": "libvirt-34"
+}
+
+{
+  "return": [
+    {
+      "hotpluggable-cpus": false,
+      "name": "spike_v1.9.1",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "sifive_e",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "none",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "spike_v1.10",
+      "is-default": true,
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "virt",
+      "cpu-max": 8
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "sifive_u",
+      "cpu-max": 1
+    }
+  ],
+  "id": "libvirt-34"
+}

diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.replies b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.replies
index 5640750d195b3c762213937a5b1cae1107eddc68..0b35f7e99b72a92fdb432f12dcc9dc3ee9c58dcc 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.replies
@@ -20436,3 +20436,71 @@
     "desc": "The CPU definition 'max' is unknown."
   }
 }
+
+{
+  "execute": "query-machines",
+  "id": "libvirt-4"
+}
+
+{
+  "return": [
+    {
+      "hotpluggable-cpus": true,
+      "name": "s390-ccw-virtio-2.7",
+      "cpu-max": 248
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "s390-ccw-virtio-2.6",
+      "cpu-max": 248
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "none",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "s390-ccw-virtio-2.11",
+      "cpu-max": 248
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "s390-ccw-virtio-2.10",
+      "cpu-max": 248
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "s390-ccw-virtio-2.5",
+      "cpu-max": 248
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "s390-ccw-virtio-2.4",
+      "cpu-max": 248
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "s390-ccw-virtio-3.0",
+      "is-default": true,
+      "cpu-max": 248,
+      "alias": "s390-ccw-virtio"
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "s390-ccw-virtio-2.9",
+      "cpu-max": 248
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "s390-ccw-virtio-2.8",
+      "cpu-max": 248
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "s390-ccw-virtio-2.12",
+      "cpu-max": 248
+    }
+  ],
+  "id": "libvirt-4"
+}

diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies
index b2ec8d75d390bf97a6fd427a23fcbe720667ee17..f25e5deb94fc5647b496aa160f08ec48b6c4d414 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies
@@ -23195,3 +23195,217 @@
   },
   "id": "libvirt-6"
 }
+
+{
+  "execute": "query-machines",
+  "id": "libvirt-7"
+}
+
+{
+  "return": [
+    {
+      "hotpluggable-cpus": true,
+      "name": "isapc",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-1.1",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-1.2",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-1.3",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.8",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-1.0",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "none",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.9",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.6",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.7",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.3",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.4",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.5",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.1",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.2",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.0",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-2.11",
+      "cpu-max": 288
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-2.12",
+      "cpu-max": 288
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-3.0",
+      "cpu-max": 288,
+      "alias": "q35"
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-2.10",
+      "cpu-max": 288
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-1.7",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-2.9",
+      "cpu-max": 288
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-0.15",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-1.5",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-2.7",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-1.6",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.11",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-2.8",
+      "cpu-max": 288
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-0.13",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.12",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-0.14",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-3.0",
+      "is-default": true,
+      "cpu-max": 255,
+      "alias": "pc"
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-2.4",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-2.5",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-2.6",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-1.4",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.10",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-0.11",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-0.12",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-0.10",
+      "cpu-max": 255
+    }
+  ],
+  "id": "libvirt-7"
+}

diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies
index 33666a43db33a4568954c014a1422f0be6db49ea..e6429c253c239b787397a3f70f44d833b685b846 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies
@@ -23393,3 +23393,156 @@
   ],
   "id": "libvirt-2"
 }
+
+{
+  "execute": "query-machines",
+  "id": "libvirt-3"
+}
+
+{
+  "return": [
+    {
+      "hotpluggable-cpus": false,
+      "name": "ref405ep",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "sam460ex",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "none",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "virtex-ml507",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "powernv",
+      "cpu-max": 2048
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "ppce500",
+      "cpu-max": 32
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "mpc8544ds",
+      "cpu-max": 15
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pseries-3.1",
+      "is-default": true,
+      "cpu-max": 1024,
+      "alias": "pseries"
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pseries-2.12-sxxm",
+      "cpu-max": 1024
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "bamboo",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "g3beige",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pseries-3.0",
+      "cpu-max": 1024
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pseries-2.10",
+      "cpu-max": 1024
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "prep",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pseries-2.11",
+      "cpu-max": 1024
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pseries-2.12",
+      "cpu-max": 1024
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pseries-2.9",
+      "cpu-max": 1024
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "mac99",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "pseries-2.6",
+      "cpu-max": 1024
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pseries-2.7",
+      "cpu-max": 1024
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pseries-2.8",
+      "cpu-max": 1024
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "pseries-2.4",
+      "cpu-max": 1024
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "pseries-2.5",
+      "cpu-max": 1024
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "pseries-2.2",
+      "cpu-max": 1024
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "taihu",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "pseries-2.3",
+      "cpu-max": 1024
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "pseries-2.1",
+      "cpu-max": 1024
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "40p",
+      "cpu-max": 1
+    }
+  ],
+  "id": "libvirt-3"
+}

diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies
index b8b117ffaf87fb4deb09a7cd56ca0399c1d9b31e..256fa92af9f565c39e785e391853598eff0be068 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies
@@ -23908,3 +23908,227 @@
   },
   "id": "libvirt-6"
 }
+
+{
+  "execute": "query-machines",
+  "id": "libvirt-7"
+}
+
+{
+  "return": [
+    {
+      "hotpluggable-cpus": true,
+      "name": "isapc",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-1.1",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-1.2",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-1.3",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.8",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-1.0",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "none",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.9",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.6",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.7",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.3",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.4",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.5",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.1",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.2",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-3.1",
+      "cpu-max": 288,
+      "alias": "q35"
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.0",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-2.11",
+      "cpu-max": 288
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-2.12",
+      "cpu-max": 288
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-3.0",
+      "cpu-max": 288
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-2.10",
+      "cpu-max": 288
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-1.7",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-2.9",
+      "cpu-max": 288
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-0.15",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-1.5",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-2.7",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-1.6",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.11",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-2.8",
+      "cpu-max": 288
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-0.13",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.12",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-0.14",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-3.0",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-3.1",
+      "is-default": true,
+      "cpu-max": 255,
+      "alias": "pc"
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-2.4",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-2.5",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-2.6",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-1.4",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.10",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-0.11",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-0.12",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-0.10",
+      "cpu-max": 255
+    }
+  ],
+  "id": "libvirt-7"
+}

diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.replies
index 3a9b1b8dc7efafedb59566a00bc2f4d1686cb9b3..0eca77accadf6ba01978fca7e08ea43cc8aaa3d2 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.replies
@@ -20245,3 +20245,350 @@
   ],
   "id": "libvirt-2"
 }
+
+{
+  "execute": "query-machines",
+  "id": "libvirt-3"
+}
+
+{
+  "return": [
+    {
+      "hotpluggable-cpus": false,
+      "name": "integratorcp",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "nuri",
+      "cpu-max": 2
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "mps2-an511",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "verdex",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "mps2-an505",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "virt-3.0",
+      "cpu-max": 512
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "ast2500-evb",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "smdkc210",
+      "cpu-max": 2
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "collie",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "xlnx-versal-virt",
+      "cpu-max": 2
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "imx25-pdk",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "none",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "spitz",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "musca-b1",
+      "cpu-max": 2
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "realview-pbx-a9",
+      "cpu-max": 4
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "realview-eb",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "realview-pb-a8",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "versatilepb",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "emcraft-sf2",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "virt-2.9",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "musicpal",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "z2",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "akita",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "virt-2.7",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "kzm",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "virt-2.8",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "realview-eb-mpcore",
+      "cpu-max": 4
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "musca-a",
+      "cpu-max": 2
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "mcimx7d-sabre",
+      "cpu-max": 2
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "sx1",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "sx1-v1",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "virt-2.6",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "cubieboard",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "virt-4.0",
+      "cpu-max": 512,
+      "alias": "virt"
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "highbank",
+      "cpu-max": 4
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "raspi2",
+      "cpu-max": 4
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "raspi3",
+      "cpu-max": 4
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "netduino2",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "terrier",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "n810",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "mainstone",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "palmetto-bmc",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "sabrelite",
+      "cpu-max": 4
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "midway",
+      "cpu-max": 4
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "romulus-bmc",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "cheetah",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "tosa",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "borzoi",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "versatileab",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "lm3s6965evb",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "n800",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "virt-2.10",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "virt-2.11",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "connex",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "virt-2.12",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "microbit",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "witherspoon-bmc",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "xilinx-zynq-a9",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "mps2-an385",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "vexpress-a9",
+      "cpu-max": 4
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "mps2-an521",
+      "cpu-max": 2
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "mcimx6ul-evk",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "vexpress-a15",
+      "cpu-max": 4
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "xlnx-zcu102",
+      "cpu-max": 6
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "virt-3.1",
+      "cpu-max": 512
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "canon-a1100",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "lm3s811evb",
+      "cpu-max": 1
+    }
+  ],
+  "id": "libvirt-3"
+}

diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.replies
index baa8f8963d6222840f858ebc8aa2d733a9db9ced..84b5f06c5d1bb00be511f0eff42fa7cb4502cb76 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.replies
@@ -24002,3 +24002,161 @@
   ],
   "id": "libvirt-2"
 }
+
+{
+  "execute": "query-machines",
+  "id": "libvirt-3"
+}
+
+{
+  "return": [
+    {
+      "hotpluggable-cpus": false,
+      "name": "ref405ep",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "sam460ex",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "none",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "virtex-ml507",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "powernv",
+      "cpu-max": 2048
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "ppce500",
+      "cpu-max": 32
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "mpc8544ds",
+      "cpu-max": 15
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pseries-3.1",
+      "cpu-max": 1024
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pseries-2.12-sxxm",
+      "cpu-max": 1024
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "bamboo",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "g3beige",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pseries-3.0",
+      "cpu-max": 1024
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pseries-2.10",
+      "cpu-max": 1024
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "prep",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pseries-2.11",
+      "cpu-max": 1024
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pseries-2.12",
+      "cpu-max": 1024
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pseries-2.9",
+      "cpu-max": 1024
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "mac99",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "pseries-2.6",
+      "cpu-max": 1024
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pseries-2.7",
+      "cpu-max": 1024
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pseries-2.8",
+      "cpu-max": 1024
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "pseries-2.4",
+      "cpu-max": 1024
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "pseries-2.5",
+      "cpu-max": 1024
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pseries-4.0",
+      "is-default": true,
+      "cpu-max": 1024,
+      "alias": "pseries"
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "pseries-2.2",
+      "cpu-max": 1024
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "taihu",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "pseries-2.3",
+      "cpu-max": 1024
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "pseries-2.1",
+      "cpu-max": 1024
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "40p",
+      "cpu-max": 1
+    }
+  ],
+  "id": "libvirt-3"
+}

diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies
index c2ca623a0bc212cce3e03ae3b3dcec52da520c61..2b1d832c6bf8ccc0f45e63cfe6e3b403a8a1f7d3 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies
@@ -17853,3 +17853,45 @@
   ],
   "id": "libvirt-39"
 }
+
+{
+  "execute": "query-machines",
+  "id": "libvirt-40"
+}
+
+{
+  "return": [
+    {
+      "hotpluggable-cpus": false,
+      "name": "virt",
+      "cpu-max": 8
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "none",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "spike_v1.10",
+      "is-default": true,
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "sifive_u",
+      "cpu-max": 4
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "sifive_e",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "spike_v1.9.1",
+      "cpu-max": 1
+    }
+  ],
+  "id": "libvirt-40"
+}

diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies
index 0cccbdb4e0579f6bd236dc87c9655da5d1d1849c..8fd9646f536de52af7cdff8cbaa43999057c4918 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies
@@ -17853,3 +17853,45 @@
   ],
   "id": "libvirt-39"
 }
+
+{
+  "execute": "query-machines",
+  "id": "libvirt-40"
+}
+
+{
+  "return": [
+    {
+      "hotpluggable-cpus": false,
+      "name": "virt",
+      "cpu-max": 8
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "none",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "spike_v1.10",
+      "is-default": true,
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "sifive_u",
+      "cpu-max": 4
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "sifive_e",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "spike_v1.9.1",
+      "cpu-max": 1
+    }
+  ],
+  "id": "libvirt-40"
+}

diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.replies b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.replies
index 8c2c299828d7d842480c6ce15b0afe9f7ac42770..70fb54b0e70f034217187343067819b313fecb22 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.replies
@@ -21496,3 +21496,81 @@
     "desc": "Property '.migratable' not found"
   }
 }
+
+{
+  "execute": "query-machines",
+  "id": "libvirt-5"
+}
+
+{
+  "return": [
+    {
+      "hotpluggable-cpus": true,
+      "name": "s390-ccw-virtio-4.0",
+      "is-default": true,
+      "cpu-max": 248,
+      "alias": "s390-ccw-virtio"
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "s390-ccw-virtio-2.7",
+      "cpu-max": 248
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "s390-ccw-virtio-2.6",
+      "cpu-max": 248
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "none",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "s390-ccw-virtio-2.11",
+      "cpu-max": 248
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "s390-ccw-virtio-2.10",
+      "cpu-max": 248
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "s390-ccw-virtio-3.1",
+      "cpu-max": 248
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "s390-ccw-virtio-2.5",
+      "cpu-max": 248
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "s390-ccw-virtio-2.4",
+      "cpu-max": 248
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "s390-ccw-virtio-3.0",
+      "cpu-max": 248
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "s390-ccw-virtio-2.9",
+      "cpu-max": 248
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "s390-ccw-virtio-2.8",
+      "cpu-max": 248
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "s390-ccw-virtio-2.12",
+      "cpu-max": 248
+    }
+  ],
+  "id": "libvirt-5"
+}

diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies
index b155e2a24257d52392793e100e9b541e622d75e4..09112a207fe1dcb7e6c390c903b78736317423a8 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies
@@ -24476,3 +24476,227 @@
   },
   "id": "libvirt-6"
 }
+
+{
+  "execute": "query-machines",
+  "id": "libvirt-7"
+}
+
+{
+  "return": [
+    {
+      "hotpluggable-cpus": true,
+      "name": "isapc",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-1.1",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-1.2",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-1.3",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.8",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-1.0",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "none",
+      "cpu-max": 1
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.9",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.6",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.7",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.3",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.4",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.5",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-4.0",
+      "is-default": true,
+      "cpu-max": 255,
+      "alias": "pc"
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.1",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.2",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-3.1",
+      "cpu-max": 288
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.0",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-2.11",
+      "cpu-max": 288
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-2.12",
+      "cpu-max": 288
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-3.0",
+      "cpu-max": 288
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-2.10",
+      "cpu-max": 288
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-1.7",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-2.9",
+      "cpu-max": 288
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-0.15",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-1.5",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-2.7",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-1.6",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.11",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-2.8",
+      "cpu-max": 288
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-0.13",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.12",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-0.14",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-3.0",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-3.1",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-2.4",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-2.5",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-2.6",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.10",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-1.4",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-0.12",
+      "cpu-max": 255
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-4.0",
+      "cpu-max": 288,
+      "alias": "q35"
+    }
+  ],
+  "id": "libvirt-7"
+}

diff --git a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.replies
index 68cae3d5993638bf2f145763da24bb6ad3b807ee..c143866dcccf681aec0371b8335e29fb6508714d 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.replies
@@ -24568,3 +24568,332 @@
   },
   "id": "libvirt-4"
 }
+
+{
+  "execute": "query-machines",
+  "id": "libvirt-5"
+}
+
+{
+  "return": [
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-0.15",
+      "numa-mem-supported": true,
+      "cpu-max": 255,
+      "deprecated": true
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.12",
+      "numa-mem-supported": true,
+      "cpu-max": 255,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.0",
+      "numa-mem-supported": true,
+      "cpu-max": 255,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.5",
+      "numa-mem-supported": true,
+      "cpu-max": 255,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-1.5",
+      "numa-mem-supported": true,
+      "cpu-max": 255,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-2.7",
+      "numa-mem-supported": true,
+      "cpu-max": 255,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-0.12",
+      "numa-mem-supported": true,
+      "cpu-max": 255,
+      "deprecated": true
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.2",
+      "numa-mem-supported": true,
+      "cpu-max": 255,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-1.1",
+      "numa-mem-supported": true,
+      "cpu-max": 255,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "none",
+      "numa-mem-supported": false,
+      "cpu-max": 1,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.7",
+      "numa-mem-supported": true,
+      "cpu-max": 255,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-2.4",
+      "numa-mem-supported": true,
+      "cpu-max": 255,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-2.10",
+      "numa-mem-supported": true,
+      "cpu-max": 288,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-1.7",
+      "numa-mem-supported": true,
+      "cpu-max": 255,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-0.14",
+      "numa-mem-supported": true,
+      "cpu-max": 255,
+      "deprecated": true
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-2.9",
+      "numa-mem-supported": true,
+      "cpu-max": 288,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.11",
+      "numa-mem-supported": true,
+      "cpu-max": 255,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-3.1",
+      "numa-mem-supported": true,
+      "cpu-max": 288,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-4.1",
+      "numa-mem-supported": true,
+      "cpu-max": 288,
+      "deprecated": false,
+      "alias": "q35"
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.4",
+      "numa-mem-supported": true,
+      "cpu-max": 255,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-1.3",
+      "numa-mem-supported": true,
+      "cpu-max": 255,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-4.1",
+      "numa-mem-supported": true,
+      "is-default": true,
+      "cpu-max": 255,
+      "deprecated": false,
+      "alias": "pc"
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.9",
+      "numa-mem-supported": true,
+      "cpu-max": 255,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "isapc",
+      "numa-mem-supported": true,
+      "cpu-max": 1,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-1.4",
+      "numa-mem-supported": true,
+      "cpu-max": 255,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-2.6",
+      "numa-mem-supported": true,
+      "cpu-max": 255,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-3.1",
+      "numa-mem-supported": true,
+      "cpu-max": 255,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-2.12",
+      "numa-mem-supported": true,
+      "cpu-max": 288,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.1",
+      "numa-mem-supported": true,
+      "cpu-max": 255,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-1.0",
+      "numa-mem-supported": true,
+      "cpu-max": 255,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.6",
+      "numa-mem-supported": true,
+      "cpu-max": 255,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-4.0.1",
+      "numa-mem-supported": true,
+      "cpu-max": 288,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-1.6",
+      "numa-mem-supported": true,
+      "cpu-max": 255,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-0.13",
+      "numa-mem-supported": true,
+      "cpu-max": 255,
+      "deprecated": true
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-2.8",
+      "numa-mem-supported": true,
+      "cpu-max": 288,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.10",
+      "numa-mem-supported": true,
+      "cpu-max": 255,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-3.0",
+      "numa-mem-supported": true,
+      "cpu-max": 288,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-4.0",
+      "numa-mem-supported": true,
+      "cpu-max": 288,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.3",
+      "numa-mem-supported": true,
+      "cpu-max": 255,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-1.2",
+      "numa-mem-supported": true,
+      "cpu-max": 255,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-4.0",
+      "numa-mem-supported": true,
+      "cpu-max": 255,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.8",
+      "numa-mem-supported": true,
+      "cpu-max": 255,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-2.5",
+      "numa-mem-supported": true,
+      "cpu-max": 255,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-3.0",
+      "numa-mem-supported": true,
+      "cpu-max": 255,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-2.11",
+      "numa-mem-supported": true,
+      "cpu-max": 288,
+      "deprecated": false
+    }
+  ],
+  "id": "libvirt-5"
+}

diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.replies
index 127f121680f91405df5394c559a0d404a0b551ce..e5d5b53667573c5014e5d71dec497e516f4fb75d 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.replies
@@ -21557,3 +21557,559 @@
     "desc": "Parameter 'migratable' is unexpected"
   }
 }
+
+{
+  "execute": "query-machines",
+  "id": "libvirt-5"
+}
+
+{
+  "return": [
+    {
+      "hotpluggable-cpus": false,
+      "name": "integratorcp",
+      "numa-mem-supported": false,
+      "default-cpu-type": "arm926-arm-cpu",
+      "cpu-max": 1,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "nuri",
+      "numa-mem-supported": false,
+      "cpu-max": 2,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "mps2-an511",
+      "numa-mem-supported": false,
+      "default-cpu-type": "cortex-m3-arm-cpu",
+      "cpu-max": 1,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "mps2-an505",
+      "numa-mem-supported": false,
+      "default-cpu-type": "cortex-m33-arm-cpu",
+      "cpu-max": 1,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "verdex",
+      "numa-mem-supported": false,
+      "default-cpu-type": "pxa270-c0-arm-cpu",
+      "cpu-max": 1,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "virt-3.0",
+      "numa-mem-supported": true,
+      "default-cpu-type": "cortex-a15-arm-cpu",
+      "cpu-max": 512,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "ast2500-evb",
+      "numa-mem-supported": false,
+      "cpu-max": 2,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "smdkc210",
+      "numa-mem-supported": false,
+      "cpu-max": 2,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "collie",
+      "numa-mem-supported": false,
+      "default-cpu-type": "sa1110-arm-cpu",
+      "cpu-max": 1,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "xlnx-versal-virt",
+      "numa-mem-supported": false,
+      "cpu-max": 2,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "imx25-pdk",
+      "numa-mem-supported": false,
+      "cpu-max": 1,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "none",
+      "numa-mem-supported": false,
+      "cpu-max": 1,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "spitz",
+      "numa-mem-supported": false,
+      "default-cpu-type": "pxa270-c0-arm-cpu",
+      "cpu-max": 1,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "musca-b1",
+      "numa-mem-supported": false,
+      "default-cpu-type": "cortex-m33-arm-cpu",
+      "cpu-max": 2,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "realview-pbx-a9",
+      "numa-mem-supported": false,
+      "default-cpu-type": "cortex-a9-arm-cpu",
+      "cpu-max": 4,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "realview-eb",
+      "numa-mem-supported": false,
+      "default-cpu-type": "arm926-arm-cpu",
+      "cpu-max": 1,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "versatilepb",
+      "numa-mem-supported": false,
+      "default-cpu-type": "arm926-arm-cpu",
+      "cpu-max": 1,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "realview-pb-a8",
+      "numa-mem-supported": false,
+      "default-cpu-type": "cortex-a8-arm-cpu",
+      "cpu-max": 1,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "emcraft-sf2",
+      "numa-mem-supported": false,
+      "default-cpu-type": "cortex-m3-arm-cpu",
+      "cpu-max": 1,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "virt-2.9",
+      "numa-mem-supported": true,
+      "default-cpu-type": "cortex-a15-arm-cpu",
+      "cpu-max": 255,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "musicpal",
+      "numa-mem-supported": false,
+      "default-cpu-type": "arm926-arm-cpu",
+      "cpu-max": 1,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "sbsa-ref",
+      "numa-mem-supported": true,
+      "default-cpu-type": "cortex-a57-arm-cpu",
+      "cpu-max": 512,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "z2",
+      "numa-mem-supported": false,
+      "default-cpu-type": "pxa270-c5-arm-cpu",
+      "cpu-max": 1,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "akita",
+      "numa-mem-supported": false,
+      "default-cpu-type": "pxa270-c0-arm-cpu",
+      "cpu-max": 1,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "virt-2.7",
+      "numa-mem-supported": true,
+      "default-cpu-type": "cortex-a15-arm-cpu",
+      "cpu-max": 255,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "kzm",
+      "numa-mem-supported": false,
+      "cpu-max": 1,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "swift-bmc",
+      "numa-mem-supported": false,
+      "cpu-max": 2,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "virt-2.8",
+      "numa-mem-supported": true,
+      "default-cpu-type": "cortex-a15-arm-cpu",
+      "cpu-max": 255,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "realview-eb-mpcore",
+      "numa-mem-supported": false,
+      "default-cpu-type": "arm11mpcore-arm-cpu",
+      "cpu-max": 4,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "musca-a",
+      "numa-mem-supported": false,
+      "default-cpu-type": "cortex-m33-arm-cpu",
+      "cpu-max": 2,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "mcimx7d-sabre",
+      "numa-mem-supported": false,
+      "cpu-max": 2,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "sx1",
+      "numa-mem-supported": false,
+      "default-cpu-type": "ti925t-arm-cpu",
+      "cpu-max": 1,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "virt-4.2",
+      "numa-mem-supported": true,
+      "default-cpu-type": "cortex-a15-arm-cpu",
+      "cpu-max": 512,
+      "deprecated": false,
+      "alias": "virt"
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "sx1-v1",
+      "numa-mem-supported": false,
+      "default-cpu-type": "ti925t-arm-cpu",
+      "cpu-max": 1,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "virt-2.6",
+      "numa-mem-supported": true,
+      "default-cpu-type": "cortex-a15-arm-cpu",
+      "cpu-max": 255,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "cubieboard",
+      "numa-mem-supported": false,
+      "default-cpu-type": "cortex-a9-arm-cpu",
+      "cpu-max": 1,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "virt-4.0",
+      "numa-mem-supported": true,
+      "default-cpu-type": "cortex-a15-arm-cpu",
+      "cpu-max": 512,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "highbank",
+      "numa-mem-supported": false,
+      "cpu-max": 4,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "virt-4.1",
+      "numa-mem-supported": true,
+      "default-cpu-type": "cortex-a15-arm-cpu",
+      "cpu-max": 512,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "raspi2",
+      "numa-mem-supported": false,
+      "cpu-max": 4,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "raspi3",
+      "numa-mem-supported": false,
+      "cpu-max": 4,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "netduino2",
+      "numa-mem-supported": false,
+      "cpu-max": 1,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "terrier",
+      "numa-mem-supported": false,
+      "default-cpu-type": "pxa270-c5-arm-cpu",
+      "cpu-max": 1,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "n810",
+      "numa-mem-supported": false,
+      "default-cpu-type": "arm1136-r2-arm-cpu",
+      "cpu-max": 1,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "mainstone",
+      "numa-mem-supported": false,
+      "default-cpu-type": "pxa270-c5-arm-cpu",
+      "cpu-max": 1,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "palmetto-bmc",
+      "numa-mem-supported": false,
+      "cpu-max": 2,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "sabrelite",
+      "numa-mem-supported": false,
+      "cpu-max": 4,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "midway",
+      "numa-mem-supported": false,
+      "cpu-max": 4,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "romulus-bmc",
+      "numa-mem-supported": false,
+      "cpu-max": 2,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "cheetah",
+      "numa-mem-supported": false,
+      "default-cpu-type": "ti925t-arm-cpu",
+      "cpu-max": 1,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "tosa",
+      "numa-mem-supported": false,
+      "cpu-max": 1,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "borzoi",
+      "numa-mem-supported": false,
+      "default-cpu-type": "pxa270-c0-arm-cpu",
+      "cpu-max": 1,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "versatileab",
+      "numa-mem-supported": false,
+      "default-cpu-type": "arm926-arm-cpu",
+      "cpu-max": 1,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "lm3s6965evb",
+      "numa-mem-supported": false,
+      "default-cpu-type": "cortex-m3-arm-cpu",
+      "cpu-max": 1,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "n800",
+      "numa-mem-supported": false,
+      "default-cpu-type": "arm1136-r2-arm-cpu",
+      "cpu-max": 1,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "virt-2.10",
+      "numa-mem-supported": true,
+      "default-cpu-type": "cortex-a15-arm-cpu",
+      "cpu-max": 255,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "virt-2.11",
+      "numa-mem-supported": true,
+      "default-cpu-type": "cortex-a15-arm-cpu",
+      "cpu-max": 255,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "connex",
+      "numa-mem-supported": false,
+      "cpu-max": 1,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "virt-2.12",
+      "numa-mem-supported": true,
+      "default-cpu-type": "cortex-a15-arm-cpu",
+      "cpu-max": 255,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "microbit",
+      "numa-mem-supported": false,
+      "cpu-max": 1,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "witherspoon-bmc",
+      "numa-mem-supported": false,
+      "cpu-max": 2,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "xilinx-zynq-a9",
+      "numa-mem-supported": false,
+      "default-cpu-type": "cortex-a9-arm-cpu",
+      "cpu-max": 1,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "mps2-an385",
+      "numa-mem-supported": false,
+      "default-cpu-type": "cortex-m3-arm-cpu",
+      "cpu-max": 1,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "vexpress-a9",
+      "numa-mem-supported": false,
+      "default-cpu-type": "cortex-a9-arm-cpu",
+      "cpu-max": 4,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "mps2-an521",
+      "numa-mem-supported": false,
+      "default-cpu-type": "cortex-m33-arm-cpu",
+      "cpu-max": 2,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "mcimx6ul-evk",
+      "numa-mem-supported": false,
+      "cpu-max": 1,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "vexpress-a15",
+      "numa-mem-supported": false,
+      "default-cpu-type": "cortex-a15-arm-cpu",
+      "cpu-max": 4,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "xlnx-zcu102",
+      "numa-mem-supported": false,
+      "cpu-max": 6,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "virt-3.1",
+      "numa-mem-supported": true,
+      "default-cpu-type": "cortex-a15-arm-cpu",
+      "cpu-max": 512,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "canon-a1100",
+      "numa-mem-supported": false,
+      "cpu-max": 1,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "lm3s811evb",
+      "numa-mem-supported": false,
+      "default-cpu-type": "cortex-m3-arm-cpu",
+      "cpu-max": 1,
+      "deprecated": false
+    }
+  ],
+  "id": "libvirt-5"
+}

diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
index d9da9b993dc98d38d1a5d9dc267e48556866b554..3fd7c0ab0d4e817e43ca717dbe3886e850c41aa8 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
@@ -424,7 +424,6 @@
   <machine type='tcg' name='witherspoon-bmc' maxCpus='2'/>
   <machine type='tcg' name='xilinx-zynq-a9' maxCpus='1'/>
   <machine type='tcg' name='mps2-an385' maxCpus='1'/>
-  <machine type='tcg' name='ast2600-evb' maxCpus='2'/>
   <machine type='tcg' name='vexpress-a9' maxCpus='4'/>
   <machine type='tcg' name='mps2-an521' maxCpus='2'/>
   <machine type='tcg' name='mcimx6ul-evk' maxCpus='1'/>

diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.replies
index 0423043f96cf02a90b905b7b659842db8cb0dfa2..2414105e250ae7f49320d6c50828d7903e73710d 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.replies
@@ -24404,3 +24404,270 @@
   ],
   "id": "libvirt-2"
 }
+
+{
+  "execute": "query-machines",
+  "id": "libvirt-3"
+}
+
+{
+  "return": [
+    {
+      "hotpluggable-cpus": false,
+      "name": "ref405ep",
+      "numa-mem-supported": false,
+      "cpu-max": 1,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "sam460ex",
+      "numa-mem-supported": false,
+      "default-cpu-type": "460exb-powerpc64-cpu",
+      "cpu-max": 1,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "none",
+      "numa-mem-supported": false,
+      "cpu-max": 1,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "virtex-ml507",
+      "numa-mem-supported": false,
+      "default-cpu-type": "440-xilinx-powerpc64-cpu",
+      "cpu-max": 1,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "ppce500",
+      "numa-mem-supported": false,
+      "default-cpu-type": "e500v2_v30-powerpc64-cpu",
+      "cpu-max": 32,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "mpc8544ds",
+      "numa-mem-supported": false,
+      "default-cpu-type": "e500v2_v30-powerpc64-cpu",
+      "cpu-max": 15,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pseries-3.1",
+      "numa-mem-supported": true,
+      "default-cpu-type": "power8_v2.0-powerpc64-cpu",
+      "cpu-max": 1024,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pseries-2.12-sxxm",
+      "numa-mem-supported": true,
+      "default-cpu-type": "power8_v2.0-powerpc64-cpu",
+      "cpu-max": 1024,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "bamboo",
+      "numa-mem-supported": false,
+      "default-cpu-type": "440epb-powerpc64-cpu",
+      "cpu-max": 1,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "g3beige",
+      "numa-mem-supported": false,
+      "default-cpu-type": "750_v3.1-powerpc64-cpu",
+      "cpu-max": 1,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pseries-3.0",
+      "numa-mem-supported": true,
+      "default-cpu-type": "power8_v2.0-powerpc64-cpu",
+      "cpu-max": 1024,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pseries-2.10",
+      "numa-mem-supported": true,
+      "default-cpu-type": "power8_v2.0-powerpc64-cpu",
+      "cpu-max": 1024,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "prep",
+      "numa-mem-supported": false,
+      "default-cpu-type": "602-powerpc64-cpu",
+      "cpu-max": 1,
+      "deprecated": true
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pseries-2.11",
+      "numa-mem-supported": true,
+      "default-cpu-type": "power8_v2.0-powerpc64-cpu",
+      "cpu-max": 1024,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pseries-2.12",
+      "numa-mem-supported": true,
+      "default-cpu-type": "power8_v2.0-powerpc64-cpu",
+      "cpu-max": 1024,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pseries-2.9",
+      "numa-mem-supported": true,
+      "default-cpu-type": "power8_v2.0-powerpc64-cpu",
+      "cpu-max": 1024,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "mac99",
+      "numa-mem-supported": false,
+      "default-cpu-type": "970fx_v3.1-powerpc64-cpu",
+      "cpu-max": 1,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "pseries-2.6",
+      "numa-mem-supported": true,
+      "default-cpu-type": "power7_v2.3-powerpc64-cpu",
+      "cpu-max": 1024,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pseries-2.7",
+      "numa-mem-supported": true,
+      "default-cpu-type": "power7_v2.3-powerpc64-cpu",
+      "cpu-max": 1024,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pseries-2.8",
+      "numa-mem-supported": true,
+      "default-cpu-type": "power8_v2.0-powerpc64-cpu",
+      "cpu-max": 1024,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pseries-4.2",
+      "numa-mem-supported": true,
+      "default-cpu-type": "power9_v2.0-powerpc64-cpu",
+      "is-default": true,
+      "cpu-max": 1024,
+      "deprecated": false,
+      "alias": "pseries"
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "pseries-2.4",
+      "numa-mem-supported": true,
+      "default-cpu-type": "power7_v2.3-powerpc64-cpu",
+      "cpu-max": 1024,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "pseries-2.5",
+      "numa-mem-supported": true,
+      "default-cpu-type": "power7_v2.3-powerpc64-cpu",
+      "cpu-max": 1024,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pseries-4.0",
+      "numa-mem-supported": true,
+      "default-cpu-type": "power9_v2.0-powerpc64-cpu",
+      "cpu-max": 1024,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pseries-4.1",
+      "numa-mem-supported": true,
+      "default-cpu-type": "power9_v2.0-powerpc64-cpu",
+      "cpu-max": 1024,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "pseries-2.2",
+      "numa-mem-supported": true,
+      "default-cpu-type": "power7_v2.3-powerpc64-cpu",
+      "cpu-max": 1024,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "taihu",
+      "numa-mem-supported": false,
+      "cpu-max": 1,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "pseries-2.3",
+      "numa-mem-supported": true,
+      "default-cpu-type": "power7_v2.3-powerpc64-cpu",
+      "cpu-max": 1024,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "pseries-2.1",
+      "numa-mem-supported": true,
+      "default-cpu-type": "power7_v2.3-powerpc64-cpu",
+      "cpu-max": 1024,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "powernv8",
+      "numa-mem-supported": false,
+      "default-cpu-type": "power8_v2.0-powerpc64-cpu",
+      "cpu-max": 2048,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "powernv9",
+      "numa-mem-supported": false,
+      "default-cpu-type": "power9_v2.0-powerpc64-cpu",
+      "cpu-max": 2048,
+      "deprecated": false,
+      "alias": "powernv"
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "40p",
+      "numa-mem-supported": false,
+      "default-cpu-type": "604-powerpc64-cpu",
+      "cpu-max": 1,
+      "deprecated": false
+    }
+  ],
+  "id": "libvirt-3"
+}

diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.replies b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.replies
index ae0d733df31d992a903c5a91c249027a21356f41..be709b3c369ccff0c287d791b766bb0fc775e0a4 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.replies
@@ -22414,3 +22414,135 @@
     "desc": "Property '.migratable' not found"
   }
 }
+
+{
+  "execute": "query-machines",
+  "id": "libvirt-5"
+}
+
+{
+  "return": [
+    {
+      "hotpluggable-cpus": true,
+      "name": "s390-ccw-virtio-4.0",
+      "numa-mem-supported": false,
+      "default-cpu-type": "qemu-s390x-cpu",
+      "cpu-max": 248,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "s390-ccw-virtio-3.1",
+      "numa-mem-supported": false,
+      "default-cpu-type": "qemu-s390x-cpu",
+      "cpu-max": 248,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "s390-ccw-virtio-2.6",
+      "numa-mem-supported": false,
+      "default-cpu-type": "qemu-s390x-cpu",
+      "cpu-max": 248,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "s390-ccw-virtio-2.12",
+      "numa-mem-supported": false,
+      "default-cpu-type": "qemu-s390x-cpu",
+      "cpu-max": 248,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "s390-ccw-virtio-2.9",
+      "numa-mem-supported": false,
+      "default-cpu-type": "qemu-s390x-cpu",
+      "cpu-max": 248,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "s390-ccw-virtio-3.0",
+      "numa-mem-supported": false,
+      "default-cpu-type": "qemu-s390x-cpu",
+      "cpu-max": 248,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "s390-ccw-virtio-4.2",
+      "numa-mem-supported": false,
+      "default-cpu-type": "qemu-s390x-cpu",
+      "is-default": true,
+      "cpu-max": 248,
+      "deprecated": false,
+      "alias": "s390-ccw-virtio"
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "s390-ccw-virtio-2.5",
+      "numa-mem-supported": false,
+      "default-cpu-type": "qemu-s390x-cpu",
+      "cpu-max": 248,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "s390-ccw-virtio-2.11",
+      "numa-mem-supported": false,
+      "default-cpu-type": "qemu-s390x-cpu",
+      "cpu-max": 248,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "s390-ccw-virtio-2.8",
+      "numa-mem-supported": false,
+      "default-cpu-type": "qemu-s390x-cpu",
+      "cpu-max": 248,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "s390-ccw-virtio-4.1",
+      "numa-mem-supported": false,
+      "default-cpu-type": "qemu-s390x-cpu",
+      "cpu-max": 248,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "none",
+      "numa-mem-supported": false,
+      "cpu-max": 1,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "s390-ccw-virtio-2.4",
+      "numa-mem-supported": false,
+      "default-cpu-type": "qemu-s390x-cpu",
+      "cpu-max": 248,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "s390-ccw-virtio-2.10",
+      "numa-mem-supported": false,
+      "default-cpu-type": "qemu-s390x-cpu",
+      "cpu-max": 248,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "s390-ccw-virtio-2.7",
+      "numa-mem-supported": false,
+      "default-cpu-type": "qemu-s390x-cpu",
+      "cpu-max": 248,
+      "deprecated": false
+    }
+  ],
+  "id": "libvirt-5"
+}

diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.replies
index 638f364159eb10fbe412af821cf0dd3bbef5efae..19c356b6013803ab5f6bfc47e0ad97d6448f8ad9 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.replies
@@ -24756,3 +24756,392 @@
   },
   "id": "libvirt-4"
 }
+
+{
+  "execute": "query-machines",
+  "id": "libvirt-5"
+}
+
+{
+  "return": [
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-0.15",
+      "numa-mem-supported": true,
+      "default-cpu-type": "qemu64-x86_64-cpu",
+      "cpu-max": 255,
+      "deprecated": true
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.12",
+      "numa-mem-supported": true,
+      "default-cpu-type": "qemu64-x86_64-cpu",
+      "cpu-max": 255,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.0",
+      "numa-mem-supported": true,
+      "default-cpu-type": "qemu64-x86_64-cpu",
+      "cpu-max": 255,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-4.2",
+      "numa-mem-supported": true,
+      "default-cpu-type": "qemu64-x86_64-cpu",
+      "cpu-max": 288,
+      "deprecated": false,
+      "alias": "q35"
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.5",
+      "numa-mem-supported": true,
+      "default-cpu-type": "qemu64-x86_64-cpu",
+      "cpu-max": 255,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-4.2",
+      "numa-mem-supported": true,
+      "default-cpu-type": "qemu64-x86_64-cpu",
+      "is-default": true,
+      "cpu-max": 255,
+      "deprecated": false,
+      "alias": "pc"
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-1.5",
+      "numa-mem-supported": true,
+      "default-cpu-type": "qemu64-x86_64-cpu",
+      "cpu-max": 255,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-0.12",
+      "numa-mem-supported": true,
+      "default-cpu-type": "qemu64-x86_64-cpu",
+      "cpu-max": 255,
+      "deprecated": true
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-2.7",
+      "numa-mem-supported": true,
+      "default-cpu-type": "qemu64-x86_64-cpu",
+      "cpu-max": 255,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.2",
+      "numa-mem-supported": true,
+      "default-cpu-type": "qemu64-x86_64-cpu",
+      "cpu-max": 255,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-1.1",
+      "numa-mem-supported": true,
+      "default-cpu-type": "qemu64-x86_64-cpu",
+      "cpu-max": 255,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": false,
+      "name": "none",
+      "numa-mem-supported": false,
+      "cpu-max": 1,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.7",
+      "numa-mem-supported": true,
+      "default-cpu-type": "qemu64-x86_64-cpu",
+      "cpu-max": 255,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-2.4",
+      "numa-mem-supported": true,
+      "default-cpu-type": "qemu64-x86_64-cpu",
+      "cpu-max": 255,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-2.10",
+      "numa-mem-supported": true,
+      "default-cpu-type": "qemu64-x86_64-cpu",
+      "cpu-max": 288,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-1.7",
+      "numa-mem-supported": true,
+      "default-cpu-type": "qemu64-x86_64-cpu",
+      "cpu-max": 255,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-0.14",
+      "numa-mem-supported": true,
+      "default-cpu-type": "qemu64-x86_64-cpu",
+      "cpu-max": 255,
+      "deprecated": true
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-2.9",
+      "numa-mem-supported": true,
+      "default-cpu-type": "qemu64-x86_64-cpu",
+      "cpu-max": 288,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.11",
+      "numa-mem-supported": true,
+      "default-cpu-type": "qemu64-x86_64-cpu",
+      "cpu-max": 255,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-3.1",
+      "numa-mem-supported": true,
+      "default-cpu-type": "qemu64-x86_64-cpu",
+      "cpu-max": 288,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-4.1",
+      "numa-mem-supported": true,
+      "default-cpu-type": "qemu64-x86_64-cpu",
+      "cpu-max": 288,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.4",
+      "numa-mem-supported": true,
+      "default-cpu-type": "qemu64-x86_64-cpu",
+      "cpu-max": 255,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-1.3",
+      "numa-mem-supported": true,
+      "default-cpu-type": "qemu64-x86_64-cpu",
+      "cpu-max": 255,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-4.1",
+      "numa-mem-supported": true,
+      "default-cpu-type": "qemu64-x86_64-cpu",
+      "cpu-max": 255,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.9",
+      "numa-mem-supported": true,
+      "default-cpu-type": "qemu64-x86_64-cpu",
+      "cpu-max": 255,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "isapc",
+      "numa-mem-supported": true,
+      "default-cpu-type": "486-x86_64-cpu",
+      "cpu-max": 1,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-1.4",
+      "numa-mem-supported": true,
+      "default-cpu-type": "qemu64-x86_64-cpu",
+      "cpu-max": 255,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-2.6",
+      "numa-mem-supported": true,
+      "default-cpu-type": "qemu64-x86_64-cpu",
+      "cpu-max": 255,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-3.1",
+      "numa-mem-supported": true,
+      "default-cpu-type": "qemu64-x86_64-cpu",
+      "cpu-max": 255,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-2.12",
+      "numa-mem-supported": true,
+      "default-cpu-type": "qemu64-x86_64-cpu",
+      "cpu-max": 288,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.1",
+      "numa-mem-supported": true,
+      "default-cpu-type": "qemu64-x86_64-cpu",
+      "cpu-max": 255,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-1.0",
+      "numa-mem-supported": true,
+      "default-cpu-type": "qemu64-x86_64-cpu",
+      "cpu-max": 255,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.6",
+      "numa-mem-supported": true,
+      "default-cpu-type": "qemu64-x86_64-cpu",
+      "cpu-max": 255,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-4.0.1",
+      "numa-mem-supported": true,
+      "default-cpu-type": "qemu64-x86_64-cpu",
+      "cpu-max": 288,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-1.6",
+      "numa-mem-supported": true,
+      "default-cpu-type": "qemu64-x86_64-cpu",
+      "cpu-max": 255,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-0.13",
+      "numa-mem-supported": true,
+      "default-cpu-type": "qemu64-x86_64-cpu",
+      "cpu-max": 255,
+      "deprecated": true
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-2.8",
+      "numa-mem-supported": true,
+      "default-cpu-type": "qemu64-x86_64-cpu",
+      "cpu-max": 288,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.10",
+      "numa-mem-supported": true,
+      "default-cpu-type": "qemu64-x86_64-cpu",
+      "cpu-max": 255,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-3.0",
+      "numa-mem-supported": true,
+      "default-cpu-type": "qemu64-x86_64-cpu",
+      "cpu-max": 288,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-4.0",
+      "numa-mem-supported": true,
+      "default-cpu-type": "qemu64-x86_64-cpu",
+      "cpu-max": 288,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.3",
+      "numa-mem-supported": true,
+      "default-cpu-type": "qemu64-x86_64-cpu",
+      "cpu-max": 255,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-1.2",
+      "numa-mem-supported": true,
+      "default-cpu-type": "qemu64-x86_64-cpu",
+      "cpu-max": 255,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-4.0",
+      "numa-mem-supported": true,
+      "default-cpu-type": "qemu64-x86_64-cpu",
+      "cpu-max": 255,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-2.8",
+      "numa-mem-supported": true,
+      "default-cpu-type": "qemu64-x86_64-cpu",
+      "cpu-max": 255,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-2.5",
+      "numa-mem-supported": true,
+      "default-cpu-type": "qemu64-x86_64-cpu",
+      "cpu-max": 255,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-3.0",
+      "numa-mem-supported": true,
+      "default-cpu-type": "qemu64-x86_64-cpu",
+      "cpu-max": 255,
+      "deprecated": false
+    },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-q35-2.11",
+      "numa-mem-supported": true,
+      "default-cpu-type": "qemu64-x86_64-cpu",
+      "cpu-max": 288,
+      "deprecated": false
+    }
+  ],
+  "id": "libvirt-5"
+}