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@xxxxxxxxxx>
---
src/qemu/qemu_capabilities.c | 4 +-
.../caps_2.12.0.aarch64.replies | 34 +-
.../caps_2.12.0.ppc64.replies | 288 ++++++++--------
.../caps_2.12.0.s390x.replies | 34 +-
.../caps_2.12.0.x86_64.replies | 34 +-
.../caps_3.0.0.ppc64.replies | 298 ++++++++--------
.../caps_3.0.0.riscv32.replies | 34 +-
.../caps_3.0.0.riscv64.replies | 34 +-
.../caps_3.0.0.s390x.replies | 34 +-
.../caps_3.0.0.x86_64.replies | 34 +-
.../caps_3.1.0.ppc64.replies | 308 ++++++++---------
.../caps_3.1.0.x86_64.replies | 34 +-
.../caps_4.0.0.aarch64.replies | 34 +-
.../caps_4.0.0.ppc64.replies | 318 +++++++++---------
.../caps_4.0.0.riscv32.replies | 34 +-
.../caps_4.0.0.riscv64.replies | 34 +-
.../caps_4.0.0.s390x.replies | 34 +-
.../caps_4.0.0.x86_64.replies | 34 +-
18 files changed, 829 insertions(+), 829 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 34d162b9d1..294d42b0e5 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -4394,10 +4394,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 830b73df03..1eaa60f656 100644
--- 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 a1a0f25a58..38d77aa19c 100644
--- 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 23b898120d..59e699b8be 100644
--- 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 b1783f4073..5e4686c988 100644
--- 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 1d57a5d7ba..80c68de11a 100644
--- 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 eaab110763..995171fa56 100644
--- 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 d727902b84..4775ff260f 100644
--- 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 e5f554f955..1268924316 100644
--- 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 8511053834..c546944e8f 100644
--- 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 3921f8eff0..e62c3cd3bb 100644
--- 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 0f0778f3e5..856f588fd0 100644
--- 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 fa092a409e..4891413490 100644
--- 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 e1bc78bfae..c51b06f9a2 100644
--- 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 9671d6f914..feb5c8fc4d 100644
--- 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 0ca4484781..e2588168a0 100644
--- 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 8b7d60f1d9..e806185863 100644
--- 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 1482f85846..f89603d64d 100644
--- 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"
--
2.21.0
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list
