qemu: Move call to virQEMUCapsProbeQMPMachineProps()

We're going to need information about available machine types
when probing machine type properties soon, and that means we
have to change the order we call QMP commands.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index e4c0390252f119dee6ca74b378a1e38a1f4a2b52..5aa337c40c60e3774752c936df9c14b647e81189 100644 (file)
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -4388,10 +4388,10 @@ virQEMUCapsInitQMPMonitor(virQEMUCapsPtr qemuCaps,
         return -1;
     if (virQEMUCapsProbeQMPDevices(qemuCaps, mon) < 0)
         return -1;
-    if (virQEMUCapsProbeQMPMachineProps(qemuCaps, mon) < 0)
-        return -1;
     if (virQEMUCapsProbeQMPMachineTypes(qemuCaps, mon) < 0)
         return -1;
+    if (virQEMUCapsProbeQMPMachineProps(qemuCaps, mon) < 0)
+        return -1;
     if (virQEMUCapsProbeQMPCPUDefinitions(qemuCaps, mon, false) < 0)
         return -1;
     if (virQEMUCapsProbeQMPTPM(qemuCaps, mon) < 0)

diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies
index 830b73df03357984d3517c418a6d2a7aff5a4e79..1eaa60f656bf76da4891657f946231df1ed82bce 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies
@@ -5330,25 +5330,9 @@
   "id": "libvirt-30"
 }
 
-{
-  "execute": "qom-list-properties",
-  "arguments": {
-    "typename": "spapr-machine"
-  },
-  "id": "libvirt-31"
-}
-
-{
-  "id": "libvirt-31",
-  "error": {
-    "class": "DeviceNotFound",
-    "desc": "Class 'spapr-machine' not found"
-  }
-}
-
 {
   "execute": "query-machines",
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }
 
 {
@@ -5645,9 +5629,25 @@
       "cpu-max": 1
     }
   ],
+  "id": "libvirt-31"
+}
+
+{
+  "execute": "qom-list-properties",
+  "arguments": {
+    "typename": "spapr-machine"
+  },
   "id": "libvirt-32"
 }
 
+{
+  "id": "libvirt-32",
+  "error": {
+    "class": "DeviceNotFound",
+    "desc": "Class 'spapr-machine' not found"
+  }
+}
+
 {
   "execute": "query-cpu-definitions",
   "id": "libvirt-33"

diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies
index a1a0f25a58bf7939aef5a99be0bbc8c92d61a119..38d77aa19ccfba230b4eccbb61b6ace37e3c1a10 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies
@@ -5385,12 +5385,155 @@
   "id": "libvirt-31"
 }
 
+{
+  "execute": "query-machines",
+  "id": "libvirt-32"
+}
+
+{
+  "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-32"
+}
+
 {
   "execute": "qom-list-properties",
   "arguments": {
     "typename": "spapr-machine"
   },
-  "id": "libvirt-32"
+  "id": "libvirt-33"
 }
 
 {
@@ -5551,149 +5694,6 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-32"
-}
-
-{
-  "execute": "query-machines",
-  "id": "libvirt-33"
-}
-
-{
-  "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-33"
 }
 

diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies
index 23b898120d70d54e5a3a1f552fdfe20b1b5e42c9..59e699b8be67263358d15987d54a4be049f8ec5c 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies
@@ -3745,25 +3745,9 @@
   "id": "libvirt-30"
 }
 
-{
-  "execute": "qom-list-properties",
-  "arguments": {
-    "typename": "spapr-machine"
-  },
-  "id": "libvirt-31"
-}
-
-{
-  "id": "libvirt-31",
-  "error": {
-    "class": "DeviceNotFound",
-    "desc": "Class 'spapr-machine' not found"
-  }
-}
-
 {
   "execute": "query-machines",
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }
 
 {
@@ -3821,9 +3805,25 @@
       "alias": "s390-ccw-virtio"
     }
   ],
+  "id": "libvirt-31"
+}
+
+{
+  "execute": "qom-list-properties",
+  "arguments": {
+    "typename": "spapr-machine"
+  },
   "id": "libvirt-32"
 }
 
+{
+  "id": "libvirt-32",
+  "error": {
+    "class": "DeviceNotFound",
+    "desc": "Class 'spapr-machine' not found"
+  }
+}
+
 {
   "execute": "query-cpu-definitions",
   "id": "libvirt-33"

diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies
index b1783f4073cf37c8d4bcd86d36fa2d9d67ba0c04..5e4686c9885d9e4e8fff6f050154ba04a19327c1 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies
@@ -4761,25 +4761,9 @@
   "id": "libvirt-36"
 }
 
-{
-  "execute": "qom-list-properties",
-  "arguments": {
-    "typename": "spapr-machine"
-  },
-  "id": "libvirt-37"
-}
-
-{
-  "id": "libvirt-37",
-  "error": {
-    "class": "DeviceNotFound",
-    "desc": "Class 'spapr-machine' not found"
-  }
-}
-
 {
   "execute": "query-machines",
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }
 
 {
@@ -4978,9 +4962,25 @@
       "cpu-max": 255
     }
   ],
+  "id": "libvirt-37"
+}
+
+{
+  "execute": "qom-list-properties",
+  "arguments": {
+    "typename": "spapr-machine"
+  },
   "id": "libvirt-38"
 }
 
+{
+  "id": "libvirt-38",
+  "error": {
+    "class": "DeviceNotFound",
+    "desc": "Class 'spapr-machine' not found"
+  }
+}
+
 {
   "execute": "query-cpu-definitions",
   "id": "libvirt-39"

diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies
index 1d57a5d7bad4d4e9ebe9647cf532ef4e4fa9b5d9..80c68de11af6e30127516e2de87c323f6bb816f1 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies
@@ -5465,12 +5465,160 @@
   "id": "libvirt-31"
 }
 
+{
+  "execute": "query-machines",
+  "id": "libvirt-32"
+}
+
+{
+  "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-32"
+}
+
 {
   "execute": "qom-list-properties",
   "arguments": {
     "typename": "spapr-machine"
   },
-  "id": "libvirt-32"
+  "id": "libvirt-33"
 }
 
 {
@@ -5641,154 +5789,6 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-32"
-}
-
-{
-  "execute": "query-machines",
-  "id": "libvirt-33"
-}
-
-{
-  "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-33"
 }
 

diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies
index eaab110763d7ccf7c84d0ccb65ef38b879623fe2..995171fa564ba1eb67cee307e49a719cf451f84c 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies
@@ -1655,25 +1655,9 @@
   "id": "libvirt-26"
 }
 
-{
-  "execute": "qom-list-properties",
-  "arguments": {
-    "typename": "spapr-machine"
-  },
-  "id": "libvirt-27"
-}
-
-{
-  "id": "libvirt-27",
-  "error": {
-    "class": "DeviceNotFound",
-    "desc": "Class 'spapr-machine' not found"
-  }
-}
-
 {
   "execute": "query-machines",
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }
 
 {
@@ -1710,9 +1694,25 @@
       "cpu-max": 1
     }
   ],
+  "id": "libvirt-27"
+}
+
+{
+  "execute": "qom-list-properties",
+  "arguments": {
+    "typename": "spapr-machine"
+  },
   "id": "libvirt-28"
 }
 
+{
+  "id": "libvirt-28",
+  "error": {
+    "class": "DeviceNotFound",
+    "desc": "Class 'spapr-machine' not found"
+  }
+}
+
 {
   "execute": "query-tpm-models",
   "id": "libvirt-29"

diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies
index d727902b84c939c61c2b94c5a1e60db8716e434b..4775ff260f20269dc6e8c7482a3dd5e16453bb13 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies
@@ -1655,25 +1655,9 @@
   "id": "libvirt-26"
 }
 
-{
-  "execute": "qom-list-properties",
-  "arguments": {
-    "typename": "spapr-machine"
-  },
-  "id": "libvirt-27"
-}
-
-{
-  "id": "libvirt-27",
-  "error": {
-    "class": "DeviceNotFound",
-    "desc": "Class 'spapr-machine' not found"
-  }
-}
-
 {
   "execute": "query-machines",
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }
 
 {
@@ -1710,9 +1694,25 @@
       "cpu-max": 1
     }
   ],
+  "id": "libvirt-27"
+}
+
+{
+  "execute": "qom-list-properties",
+  "arguments": {
+    "typename": "spapr-machine"
+  },
   "id": "libvirt-28"
 }
 
+{
+  "id": "libvirt-28",
+  "error": {
+    "class": "DeviceNotFound",
+    "desc": "Class 'spapr-machine' not found"
+  }
+}
+
 {
   "execute": "query-tpm-models",
   "id": "libvirt-29"

diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.replies b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.replies
index e5f554f955d337b7ce611afee72157f6e222115c..126892431657ba1f0bb83ffa41c1baf371c126fb 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.replies
@@ -3899,25 +3899,9 @@
   "id": "libvirt-31"
 }
 
-{
-  "execute": "qom-list-properties",
-  "arguments": {
-    "typename": "spapr-machine"
-  },
-  "id": "libvirt-32"
-}
-
-{
-  "id": "libvirt-32",
-  "error": {
-    "class": "DeviceNotFound",
-    "desc": "Class 'spapr-machine' not found"
-  }
-}
-
 {
   "execute": "query-machines",
-  "id": "libvirt-33"
+  "id": "libvirt-32"
 }
 
 {
@@ -3980,9 +3964,25 @@
       "cpu-max": 248
     }
   ],
+  "id": "libvirt-32"
+}
+
+{
+  "execute": "qom-list-properties",
+  "arguments": {
+    "typename": "spapr-machine"
+  },
   "id": "libvirt-33"
 }
 
+{
+  "id": "libvirt-33",
+  "error": {
+    "class": "DeviceNotFound",
+    "desc": "Class 'spapr-machine' not found"
+  }
+}
+
 {
   "execute": "query-cpu-definitions",
   "id": "libvirt-34"

diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies
index 851105383405c448c6e80ff7373f796811b1afca..c546944e8f8753afce6660898c8e5bba08b9f0d5 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies
@@ -4892,25 +4892,9 @@
   "id": "libvirt-36"
 }
 
-{
-  "execute": "qom-list-properties",
-  "arguments": {
-    "typename": "spapr-machine"
-  },
-  "id": "libvirt-37"
-}
-
-{
-  "id": "libvirt-37",
-  "error": {
-    "class": "DeviceNotFound",
-    "desc": "Class 'spapr-machine' not found"
-  }
-}
-
 {
   "execute": "query-machines",
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }
 
 {
@@ -5119,9 +5103,25 @@
       "cpu-max": 255
     }
   ],
+  "id": "libvirt-37"
+}
+
+{
+  "execute": "qom-list-properties",
+  "arguments": {
+    "typename": "spapr-machine"
+  },
   "id": "libvirt-38"
 }
 
+{
+  "id": "libvirt-38",
+  "error": {
+    "class": "DeviceNotFound",
+    "desc": "Class 'spapr-machine' not found"
+  }
+}
+
 {
   "execute": "query-cpu-definitions",
   "id": "libvirt-39"

diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies
index 3921f8eff08a5dbcc961d526d89acf83be2116fe..e62c3cd3bbfec95f349805b0349f7b5a1e056615 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies
@@ -5540,162 +5540,9 @@
   "id": "libvirt-31"
 }
 
-{
-  "execute": "qom-list-properties",
-  "arguments": {
-    "typename": "spapr-machine"
-  },
-  "id": "libvirt-32"
-}
-
-{
-  "return": [
-    {
-      "name": "type",
-      "type": "string"
-    },
-    {
-      "name": "graphics",
-      "description": "Set on/off to enable/disable graphics emulation",
-      "type": "bool"
-    },
-    {
-      "name": "phandle-start",
-      "description": "The first phandle ID we may generate dynamically",
-      "type": "int"
-    },
-    {
-      "name": "dump-guest-core",
-      "description": "Include guest memory in  a core dump",
-      "type": "bool"
-    },
-    {
-      "name": "kernel-irqchip",
-      "description": "Configure KVM in-kernel irqchip",
-      "type": "on|off|split"
-    },
-    {
-      "name": "accel",
-      "description": "Accelerator list",
-      "type": "string"
-    },
-    {
-      "name": "append",
-      "description": "Linux kernel command line",
-      "type": "string"
-    },
-    {
-      "name": "dumpdtb",
-      "description": "Dump current dtb to a file and quit",
-      "type": "string"
-    },
-    {
-      "name": "memory-encryption",
-      "description": "Set memory encryption object to use",
-      "type": "string"
-    },
-    {
-      "name": "igd-passthru",
-      "description": "Set on/off to enable/disable igd passthrou",
-      "type": "bool"
-    },
-    {
-      "name": "dt-compatible",
-      "description": "Overrides the \"compatible\" property of the dt root node",
-      "type": "string"
-    },
-    {
-      "name": "kernel",
-      "description": "Linux kernel image file",
-      "type": "string"
-    },
-    {
-      "name": "usb",
-      "description": "Set on/off to enable/disable usb",
-      "type": "bool"
-    },
-    {
-      "name": "suppress-vmdesc",
-      "description": "Set on to disable self-describing migration",
-      "type": "bool"
-    },
-    {
-      "name": "dtb",
-      "description": "Linux kernel device tree file",
-      "type": "string"
-    },
-    {
-      "name": "firmware",
-      "description": "Firmware image",
-      "type": "string"
-    },
-    {
-      "name": "mem-merge",
-      "description": "Enable/disable memory merge support",
-      "type": "bool"
-    },
-    {
-      "name": "initrd",
-      "description": "Linux initial ramdisk file",
-      "type": "string"
-    },
-    {
-      "name": "enforce-config-section",
-      "description": "Set on to enforce configuration section migration",
-      "type": "bool"
-    },
-    {
-      "name": "kvm-shadow-mem",
-      "description": "KVM shadow MMU size",
-      "type": "int"
-    },
-    {
-      "name": "cap-hpt-max-page-size",
-      "description": "Maximum page size for Hash Page Table guests",
-      "type": "int"
-    },
-    {
-      "name": "cap-dfp",
-      "description": "Allow Decimal Floating Point (DFP)",
-      "type": "bool"
-    },
-    {
-      "name": "cap-cfpc",
-      "description": "Cache Flush on Privilege Change (broken, workaround, fixed)",
-      "type": "string"
-    },
-    {
-      "name": "cap-ibs",
-      "description": "Indirect Branch Speculation (broken, fixed-ibs, fixed-ccd)",
-      "type": "string"
-    },
-    {
-      "name": "cap-sbbc",
-      "description": "Speculation Barrier Bounds Checking (broken, workaround, fixed)",
-      "type": "string"
-    },
-    {
-      "name": "cap-vsx",
-      "description": "Allow Vector Scalar Extensions (VSX)",
-      "type": "bool"
-    },
-    {
-      "name": "cap-htm",
-      "description": "Allow Hardware Transactional Memory (HTM)",
-      "type": "bool"
-    },
-    {
-      "name": "cap-nested-hv",
-      "description": "Allow Nested KVM-HV",
-      "type": "bool"
-    }
-  ],
-  "id": "libvirt-32"
-}
-
 {
   "execute": "query-machines",
-  "id": "libvirt-33"
+  "id": "libvirt-32"
 }
 
 {
@@ -5843,6 +5690,159 @@
       "cpu-max": 1
     }
   ],
+  "id": "libvirt-32"
+}
+
+{
+  "execute": "qom-list-properties",
+  "arguments": {
+    "typename": "spapr-machine"
+  },
+  "id": "libvirt-33"
+}
+
+{
+  "return": [
+    {
+      "name": "type",
+      "type": "string"
+    },
+    {
+      "name": "graphics",
+      "description": "Set on/off to enable/disable graphics emulation",
+      "type": "bool"
+    },
+    {
+      "name": "phandle-start",
+      "description": "The first phandle ID we may generate dynamically",
+      "type": "int"
+    },
+    {
+      "name": "dump-guest-core",
+      "description": "Include guest memory in  a core dump",
+      "type": "bool"
+    },
+    {
+      "name": "kernel-irqchip",
+      "description": "Configure KVM in-kernel irqchip",
+      "type": "on|off|split"
+    },
+    {
+      "name": "accel",
+      "description": "Accelerator list",
+      "type": "string"
+    },
+    {
+      "name": "append",
+      "description": "Linux kernel command line",
+      "type": "string"
+    },
+    {
+      "name": "dumpdtb",
+      "description": "Dump current dtb to a file and quit",
+      "type": "string"
+    },
+    {
+      "name": "memory-encryption",
+      "description": "Set memory encryption object to use",
+      "type": "string"
+    },
+    {
+      "name": "igd-passthru",
+      "description": "Set on/off to enable/disable igd passthrou",
+      "type": "bool"
+    },
+    {
+      "name": "dt-compatible",
+      "description": "Overrides the \"compatible\" property of the dt root node",
+      "type": "string"
+    },
+    {
+      "name": "kernel",
+      "description": "Linux kernel image file",
+      "type": "string"
+    },
+    {
+      "name": "usb",
+      "description": "Set on/off to enable/disable usb",
+      "type": "bool"
+    },
+    {
+      "name": "suppress-vmdesc",
+      "description": "Set on to disable self-describing migration",
+      "type": "bool"
+    },
+    {
+      "name": "dtb",
+      "description": "Linux kernel device tree file",
+      "type": "string"
+    },
+    {
+      "name": "firmware",
+      "description": "Firmware image",
+      "type": "string"
+    },
+    {
+      "name": "mem-merge",
+      "description": "Enable/disable memory merge support",
+      "type": "bool"
+    },
+    {
+      "name": "initrd",
+      "description": "Linux initial ramdisk file",
+      "type": "string"
+    },
+    {
+      "name": "enforce-config-section",
+      "description": "Set on to enforce configuration section migration",
+      "type": "bool"
+    },
+    {
+      "name": "kvm-shadow-mem",
+      "description": "KVM shadow MMU size",
+      "type": "int"
+    },
+    {
+      "name": "cap-hpt-max-page-size",
+      "description": "Maximum page size for Hash Page Table guests",
+      "type": "int"
+    },
+    {
+      "name": "cap-dfp",
+      "description": "Allow Decimal Floating Point (DFP)",
+      "type": "bool"
+    },
+    {
+      "name": "cap-cfpc",
+      "description": "Cache Flush on Privilege Change (broken, workaround, fixed)",
+      "type": "string"
+    },
+    {
+      "name": "cap-ibs",
+      "description": "Indirect Branch Speculation (broken, fixed-ibs, fixed-ccd)",
+      "type": "string"
+    },
+    {
+      "name": "cap-sbbc",
+      "description": "Speculation Barrier Bounds Checking (broken, workaround, fixed)",
+      "type": "string"
+    },
+    {
+      "name": "cap-vsx",
+      "description": "Allow Vector Scalar Extensions (VSX)",
+      "type": "bool"
+    },
+    {
+      "name": "cap-htm",
+      "description": "Allow Hardware Transactional Memory (HTM)",
+      "type": "bool"
+    },
+    {
+      "name": "cap-nested-hv",
+      "description": "Allow Nested KVM-HV",
+      "type": "bool"
+    }
+  ],
   "id": "libvirt-33"
 }
 

diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies
index 0f0778f3e559426f70915c08428d54e3734c1ca4..856f588fd0b171750e63b304c8e8629cd360d391 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies
@@ -4955,25 +4955,9 @@
   "id": "libvirt-36"
 }
 
-{
-  "execute": "qom-list-properties",
-  "arguments": {
-    "typename": "spapr-machine"
-  },
-  "id": "libvirt-37"
-}
-
-{
-  "id": "libvirt-37",
-  "error": {
-    "class": "DeviceNotFound",
-    "desc": "Class 'spapr-machine' not found"
-  }
-}
-
 {
   "execute": "query-machines",
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }
 
 {
@@ -5192,9 +5176,25 @@
       "cpu-max": 255
     }
   ],
+  "id": "libvirt-37"
+}
+
+{
+  "execute": "qom-list-properties",
+  "arguments": {
+    "typename": "spapr-machine"
+  },
   "id": "libvirt-38"
 }
 
+{
+  "id": "libvirt-38",
+  "error": {
+    "class": "DeviceNotFound",
+    "desc": "Class 'spapr-machine' not found"
+  }
+}
+
 {
   "execute": "query-cpu-definitions",
   "id": "libvirt-39"

diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.replies
index fa092a409ec58909f8aae69a482c33d953cf93e2..489141349045b7077c9c87f625ca8cf3085876b3 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.replies
@@ -5863,25 +5863,9 @@
   "id": "libvirt-31"
 }
 
-{
-  "execute": "qom-list-properties",
-  "arguments": {
-    "typename": "spapr-machine"
-  },
-  "id": "libvirt-32"
-}
-
-{
-  "id": "libvirt-32",
-  "error": {
-    "class": "DeviceNotFound",
-    "desc": "Class 'spapr-machine' not found"
-  }
-}
-
 {
   "execute": "query-machines",
-  "id": "libvirt-33"
+  "id": "libvirt-32"
 }
 
 {
@@ -6223,9 +6207,25 @@
       "cpu-max": 1
     }
   ],
+  "id": "libvirt-32"
+}
+
+{
+  "execute": "qom-list-properties",
+  "arguments": {
+    "typename": "spapr-machine"
+  },
   "id": "libvirt-33"
 }
 
+{
+  "id": "libvirt-33",
+  "error": {
+    "class": "DeviceNotFound",
+    "desc": "Class 'spapr-machine' not found"
+  }
+}
+
 {
   "execute": "query-cpu-definitions",
   "id": "libvirt-34"

diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.replies
index e1bc78bfae674af9686c285f097fff1f98c249fc..c51b06f9a26470bae37394154e444ddf3e564b75 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.replies
@@ -5918,12 +5918,170 @@
   "id": "libvirt-32"
 }
 
+{
+  "execute": "query-machines",
+  "id": "libvirt-33"
+}
+
+{
+  "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-33"
+}
+
 {
   "execute": "qom-list-properties",
   "arguments": {
     "typename": "spapr-machine"
   },
-  "id": "libvirt-33"
+  "id": "libvirt-34"
 }
 
 {
@@ -6078,164 +6236,6 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-33"
-}
-
-{
-  "execute": "query-machines",
-  "id": "libvirt-34"
-}
-
-{
-  "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-34"
 }
 

diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies
index 9671d6f9143fca7be7cc34cba3e8bb9940b6fc78..feb5c8fc4d26d72c347167e83eaccf84b8d3a65b 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies
@@ -4037,25 +4037,9 @@
   "id": "libvirt-32"
 }
 
-{
-  "execute": "qom-list-properties",
-  "arguments": {
-    "typename": "spapr-machine"
-  },
-  "id": "libvirt-33"
-}
-
-{
-  "id": "libvirt-33",
-  "error": {
-    "class": "DeviceNotFound",
-    "desc": "Class 'spapr-machine' not found"
-  }
-}
-
 {
   "execute": "query-machines",
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }
 
 {
@@ -4092,9 +4076,25 @@
       "cpu-max": 1
     }
   ],
+  "id": "libvirt-33"
+}
+
+{
+  "execute": "qom-list-properties",
+  "arguments": {
+    "typename": "spapr-machine"
+  },
   "id": "libvirt-34"
 }
 
+{
+  "id": "libvirt-34",
+  "error": {
+    "class": "DeviceNotFound",
+    "desc": "Class 'spapr-machine' not found"
+  }
+}
+
 {
   "execute": "query-tpm-models",
   "id": "libvirt-35"

diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies
index 0ca448478102f7a2833d94aeaa965a85dd71bdfd..e2588168a062f508c6017c42bac6faef7e6585d6 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies
@@ -4037,25 +4037,9 @@
   "id": "libvirt-32"
 }
 
-{
-  "execute": "qom-list-properties",
-  "arguments": {
-    "typename": "spapr-machine"
-  },
-  "id": "libvirt-33"
-}
-
-{
-  "id": "libvirt-33",
-  "error": {
-    "class": "DeviceNotFound",
-    "desc": "Class 'spapr-machine' not found"
-  }
-}
-
 {
   "execute": "query-machines",
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }
 
 {
@@ -4092,9 +4076,25 @@
       "cpu-max": 1
     }
   ],
+  "id": "libvirt-33"
+}
+
+{
+  "execute": "qom-list-properties",
+  "arguments": {
+    "typename": "spapr-machine"
+  },
   "id": "libvirt-34"
 }
 
+{
+  "id": "libvirt-34",
+  "error": {
+    "class": "DeviceNotFound",
+    "desc": "Class 'spapr-machine' not found"
+  }
+}
+
 {
   "execute": "query-tpm-models",
   "id": "libvirt-35"

diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.replies b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.replies
index 8b7d60f1d9d2bca39382b8525a1b05cb72bc8522..e806185863892bfd28a50a8a80d6cf749194bcd0 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.replies
@@ -4202,25 +4202,9 @@
   "id": "libvirt-31"
 }
 
-{
-  "execute": "qom-list-properties",
-  "arguments": {
-    "typename": "spapr-machine"
-  },
-  "id": "libvirt-32"
-}
-
-{
-  "id": "libvirt-32",
-  "error": {
-    "class": "DeviceNotFound",
-    "desc": "Class 'spapr-machine' not found"
-  }
-}
-
 {
   "execute": "query-machines",
-  "id": "libvirt-33"
+  "id": "libvirt-32"
 }
 
 {
@@ -4293,9 +4277,25 @@
       "cpu-max": 248
     }
   ],
+  "id": "libvirt-32"
+}
+
+{
+  "execute": "qom-list-properties",
+  "arguments": {
+    "typename": "spapr-machine"
+  },
   "id": "libvirt-33"
 }
 
+{
+  "id": "libvirt-33",
+  "error": {
+    "class": "DeviceNotFound",
+    "desc": "Class 'spapr-machine' not found"
+  }
+}
+
 {
   "execute": "query-cpu-definitions",
   "id": "libvirt-34"

diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies
index 1482f858467782a52e68ae0ba8a54797a99a0ce7..f89603d64d8684f3a738d0f6c1dde51de5ba066a 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies
@@ -5188,25 +5188,9 @@
   "id": "libvirt-36"
 }
 
-{
-  "execute": "qom-list-properties",
-  "arguments": {
-    "typename": "spapr-machine"
-  },
-  "id": "libvirt-37"
-}
-
-{
-  "id": "libvirt-37",
-  "error": {
-    "class": "DeviceNotFound",
-    "desc": "Class 'spapr-machine' not found"
-  }
-}
-
 {
   "execute": "query-machines",
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }
 
 {
@@ -5425,9 +5409,25 @@
       "alias": "q35"
     }
   ],
+  "id": "libvirt-37"
+}
+
+{
+  "execute": "qom-list-properties",
+  "arguments": {
+    "typename": "spapr-machine"
+  },
   "id": "libvirt-38"
 }
 
+{
+  "id": "libvirt-38",
+  "error": {
+    "class": "DeviceNotFound",
+    "desc": "Class 'spapr-machine' not found"
+  }
+}
+
 {
   "execute": "query-cpu-definitions",
   "id": "libvirt-39"