[libvirt] [PATCH 0/6] qemu: Rework the way we probe machine type properties
This is a prerequisite for vSMMUv3 support, which I'm currently working on, but I'm posting it separately because it still makes perfect sense as a standalone series and I think it's a nice cleanup in its own right. Unfortunately there's quite a bit of test suite churn associated with these changes, but hopefully that should be for the most part compensated by the *lack* of test suite churn when I introduce vSMMUv3 support. Andrea Bolognani (6): qemu: Introduce virQEMUCapsProbeQMPMachineProps() qemu: Add -machine suffix automatically qemu: Move call to virQEMUCapsProbeQMPMachineProps() qemu: Probe canonicalized machine type tests: Refresh capabilities for QEMU on ppc64 qemu: Only probe available machine types src/qemu/qemu_capabilities.c | 63 +++- .../caps_2.12.0.aarch64.replies | 48 +-- .../caps_2.12.0.ppc64.replies | 290 ++++++++-------- .../caps_2.12.0.s390x.replies | 52 +-- .../caps_2.12.0.x86_64.replies | 64 ++-- .../caps_3.0.0.ppc64.replies | 300 ++++++++-------- .../caps_3.0.0.riscv32.replies | 40 +-- .../caps_3.0.0.riscv64.replies | 40 +-- .../caps_3.0.0.s390x.replies | 52 +-- .../caps_3.0.0.x86_64.replies | 64 ++-- .../caps_3.1.0.ppc64.replies | 315 +++++++++-------- .../caps_3.1.0.x86_64.replies | 64 ++-- .../caps_4.0.0.aarch64.replies | 48 +-- .../caps_4.0.0.ppc64.replies | 328 ++++++++++-------- .../caps_4.0.0.riscv32.replies | 40 +-- .../caps_4.0.0.riscv64.replies | 40 +-- .../caps_4.0.0.s390x.replies | 52 +-- .../caps_4.0.0.x86_64.replies | 64 ++-- 18 files changed, 938 insertions(+), 1026 deletions(-) -- 2.21.0
Up until now we've probed machine type properties, along with properties for other types, in virQEMUCapsProbeQMPDevices(), but soon we're going to need some logic that is specific to machine types and as such wouldn't quite fit into that function. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- src/qemu/qemu_capabilities.c | 52 ++++++++++++++++++++++++++++++------ 1 file changed, 44 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index a0b2ca73fb..66745ab4e2 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1391,12 +1391,6 @@ static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsMemoryBackendMemfd[] { "hugetlb", QEMU_CAPS_OBJECT_MEMORY_MEMFD_HUGETLB }, }; -static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsSPAPRMachine[] = { - { "cap-hpt-max-page-size", QEMU_CAPS_MACHINE_PSERIES_CAP_HPT_MAX_PAGE_SIZE }, - { "cap-htm", QEMU_CAPS_MACHINE_PSERIES_CAP_HTM }, - { "cap-nested-hv", QEMU_CAPS_MACHINE_PSERIES_CAP_NESTED_HV }, -}; - static virQEMUCapsObjectTypeProps virQEMUCapsObjectProps[] = { { "memory-backend-file", virQEMUCapsObjectPropsMemoryBackendFile, ARRAY_CARDINALITY(virQEMUCapsObjectPropsMemoryBackendFile), @@ -1404,8 +1398,17 @@ static virQEMUCapsObjectTypeProps virQEMUCapsObjectProps[] = { { "memory-backend-memfd", virQEMUCapsObjectPropsMemoryBackendMemfd, ARRAY_CARDINALITY(virQEMUCapsObjectPropsMemoryBackendMemfd), QEMU_CAPS_OBJECT_MEMORY_MEMFD }, - { "spapr-machine", virQEMUCapsObjectPropsSPAPRMachine, - ARRAY_CARDINALITY(virQEMUCapsObjectPropsSPAPRMachine), +}; + +static struct virQEMUCapsStringFlags virQEMUCapsMachinePropsSPAPR[] = { + { "cap-hpt-max-page-size", QEMU_CAPS_MACHINE_PSERIES_CAP_HPT_MAX_PAGE_SIZE }, + { "cap-htm", QEMU_CAPS_MACHINE_PSERIES_CAP_HTM }, + { "cap-nested-hv", QEMU_CAPS_MACHINE_PSERIES_CAP_NESTED_HV }, +}; + +static virQEMUCapsObjectTypeProps virQEMUCapsMachineProps[] = { + { "spapr-machine", virQEMUCapsMachinePropsSPAPR, + ARRAY_CARDINALITY(virQEMUCapsMachinePropsSPAPR), -1 }, }; @@ -2341,6 +2344,37 @@ virQEMUCapsProbeQMPMachineTypes(virQEMUCapsPtr qemuCaps, } +static int +virQEMUCapsProbeQMPMachineProps(virQEMUCapsPtr qemuCaps, + qemuMonitorPtr mon) +{ + char **values; + int nvalues; + size_t i; + + /* We need qom-list-properties for this to work */ + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_QOM_LIST_PROPERTIES)) + return 0; + + for (i = 0; i < ARRAY_CARDINALITY(virQEMUCapsMachineProps); i++) { + virQEMUCapsObjectTypeProps props = virQEMUCapsMachineProps[i]; + const char *type = props.type; + + if ((nvalues = qemuMonitorGetObjectProps(mon, type, &values)) < 0) + return -1; + + virQEMUCapsProcessStringFlags(qemuCaps, + props.nprops, + props.props, + nvalues, values); + + virStringListFreeCount(values, nvalues); + } + + return 0; +} + + virDomainCapsCPUModelsPtr virQEMUCapsFetchCPUDefinitions(qemuMonitorPtr mon) { @@ -4355,6 +4389,8 @@ 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 (virQEMUCapsProbeQMPCPUDefinitions(qemuCaps, mon, false) < 0) -- 2.21.0
On Thu, May 16, 2019 at 05:35:31PM +0200, Andrea Bolognani wrote:
Up until now we've probed machine type properties, along with properties for other types, in virQEMUCapsProbeQMPDevices(), but soon we're going to need some logic that is specific to machine types and as such wouldn't quite fit into that function.
Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- src/qemu/qemu_capabilities.c | 52 ++++++++++++++++++++++++++++++------ 1 file changed, 44 insertions(+), 8 deletions(-)
[...]
+static int +virQEMUCapsProbeQMPMachineProps(virQEMUCapsPtr qemuCaps, + qemuMonitorPtr mon) +{ + char **values; + int nvalues; + size_t i; + + /* We need qom-list-properties for this to work */
Useless comment, the code says the same thing.
+ if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_QOM_LIST_PROPERTIES)) + return 0;
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
The QOM type for machine types is the machine type name followed by the -machine suffix. Since this is always the case, we can make virQEMUCapsMachineProps more readable and avoid repetition by not including the suffix there and adding it automatically while processing the data. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- src/qemu/qemu_capabilities.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 66745ab4e2..34d162b9d1 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1407,7 +1407,7 @@ static struct virQEMUCapsStringFlags virQEMUCapsMachinePropsSPAPR[] = { }; static virQEMUCapsObjectTypeProps virQEMUCapsMachineProps[] = { - { "spapr-machine", virQEMUCapsMachinePropsSPAPR, + { "spapr", virQEMUCapsMachinePropsSPAPR, ARRAY_CARDINALITY(virQEMUCapsMachinePropsSPAPR), -1 }, }; @@ -2358,7 +2358,12 @@ virQEMUCapsProbeQMPMachineProps(virQEMUCapsPtr qemuCaps, for (i = 0; i < ARRAY_CARDINALITY(virQEMUCapsMachineProps); i++) { virQEMUCapsObjectTypeProps props = virQEMUCapsMachineProps[i]; - const char *type = props.type; + VIR_AUTOFREE(char *) type = NULL; + + /* The QOM type for machine types is the machine type name + * followed by the -machine suffix */ + if (virAsprintf(&type, "%s-machine", props.type) < 0) + return -1; if ((nvalues = qemuMonitorGetObjectProps(mon, type, &values)) < 0) return -1; -- 2.21.0
On Thu, May 16, 2019 at 05:35:32PM +0200, Andrea Bolognani wrote:
The QOM type for machine types is the machine type name followed by the -machine suffix. Since this is always the case, we can make virQEMUCapsMachineProps more readable and avoid repetition by not including the suffix there and adding it automatically while processing the data.
Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- src/qemu/qemu_capabilities.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 66745ab4e2..34d162b9d1 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1407,7 +1407,7 @@ static struct virQEMUCapsStringFlags virQEMUCapsMachinePropsSPAPR[] = { };
static virQEMUCapsObjectTypeProps virQEMUCapsMachineProps[] = { - { "spapr-machine", virQEMUCapsMachinePropsSPAPR, + { "spapr", virQEMUCapsMachinePropsSPAPR, ARRAY_CARDINALITY(virQEMUCapsMachinePropsSPAPR), -1 }, }; @@ -2358,7 +2358,12 @@ virQEMUCapsProbeQMPMachineProps(virQEMUCapsPtr qemuCaps,
for (i = 0; i < ARRAY_CARDINALITY(virQEMUCapsMachineProps); i++) { virQEMUCapsObjectTypeProps props = virQEMUCapsMachineProps[i]; - const char *type = props.type; + VIR_AUTOFREE(char *) type = NULL; + + /* The QOM type for machine types is the machine type name + * followed by the -machine suffix */ + if (virAsprintf(&type, "%s-machine", props.type) < 0) + return -1;
if ((nvalues = qemuMonitorGetObjectProps(mon, type, &values)) < 0) return -1;
This patch on its own doesn't make that much sense and only adds some extra memory allocation, but looking forward to the following patches it is required to canonicalize the machine type. Please move the patch next to the one which introduces the canonicalize code and modify the commit message to reflect the actual need for this change. Pavel
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> --- 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
On Thu, May 16, 2019 at 05:35:33PM +0200, Andrea Bolognani wrote:
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> --- 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(-)
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
Now that we have the list of machine types available when probing machine type properties, we can list properties for the canonicalized version of the "pseries" machine type instead of having to go through "spapr-machine", which we know to be the parent type for all "pseries-*-machine" types. By doing this, we'll be able to find even properties that are only available from a certain versioned machine type forward, and can't thus be obtained when looking at the parent type only. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- src/qemu/qemu_capabilities.c | 9 +++++---- tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies | 4 ++-- tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies | 2 +- tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies | 4 ++-- tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies | 4 ++-- tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies | 2 +- tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies | 4 ++-- tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies | 4 ++-- tests/qemucapabilitiesdata/caps_3.0.0.s390x.replies | 4 ++-- tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies | 4 ++-- tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies | 2 +- tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies | 4 ++-- tests/qemucapabilitiesdata/caps_4.0.0.aarch64.replies | 4 ++-- tests/qemucapabilitiesdata/caps_4.0.0.ppc64.replies | 2 +- tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies | 4 ++-- tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies | 4 ++-- tests/qemucapabilitiesdata/caps_4.0.0.s390x.replies | 4 ++-- tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies | 4 ++-- 18 files changed, 35 insertions(+), 34 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 294d42b0e5..e12f076da8 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1400,15 +1400,15 @@ static virQEMUCapsObjectTypeProps virQEMUCapsObjectProps[] = { QEMU_CAPS_OBJECT_MEMORY_MEMFD }, }; -static struct virQEMUCapsStringFlags virQEMUCapsMachinePropsSPAPR[] = { +static struct virQEMUCapsStringFlags virQEMUCapsMachinePropsPSeries[] = { { "cap-hpt-max-page-size", QEMU_CAPS_MACHINE_PSERIES_CAP_HPT_MAX_PAGE_SIZE }, { "cap-htm", QEMU_CAPS_MACHINE_PSERIES_CAP_HTM }, { "cap-nested-hv", QEMU_CAPS_MACHINE_PSERIES_CAP_NESTED_HV }, }; static virQEMUCapsObjectTypeProps virQEMUCapsMachineProps[] = { - { "spapr", virQEMUCapsMachinePropsSPAPR, - ARRAY_CARDINALITY(virQEMUCapsMachinePropsSPAPR), + { "pseries", virQEMUCapsMachinePropsPSeries, + ARRAY_CARDINALITY(virQEMUCapsMachinePropsPSeries), -1 }, }; @@ -2358,11 +2358,12 @@ virQEMUCapsProbeQMPMachineProps(virQEMUCapsPtr qemuCaps, for (i = 0; i < ARRAY_CARDINALITY(virQEMUCapsMachineProps); i++) { virQEMUCapsObjectTypeProps props = virQEMUCapsMachineProps[i]; + const char *canon = virQEMUCapsGetCanonicalMachine(qemuCaps, props.type); VIR_AUTOFREE(char *) type = NULL; /* The QOM type for machine types is the machine type name * followed by the -machine suffix */ - if (virAsprintf(&type, "%s-machine", props.type) < 0) + if (virAsprintf(&type, "%s-machine", canon) < 0) return -1; if ((nvalues = qemuMonitorGetObjectProps(mon, type, &values)) < 0) diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies index 1eaa60f656..7b42e70d5d 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies @@ -5635,7 +5635,7 @@ { "execute": "qom-list-properties", "arguments": { - "typename": "spapr-machine" + "typename": "pseries-machine" }, "id": "libvirt-32" } @@ -5644,7 +5644,7 @@ "id": "libvirt-32", "error": { "class": "DeviceNotFound", - "desc": "Class 'spapr-machine' not found" + "desc": "Class 'pseries-machine' not found" } } diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies index 38d77aa19c..5c9ddbc178 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies @@ -5531,7 +5531,7 @@ { "execute": "qom-list-properties", "arguments": { - "typename": "spapr-machine" + "typename": "pseries-2.12-machine" }, "id": "libvirt-33" } diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies index 59e699b8be..3cd62cd10a 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies @@ -3811,7 +3811,7 @@ { "execute": "qom-list-properties", "arguments": { - "typename": "spapr-machine" + "typename": "pseries-machine" }, "id": "libvirt-32" } @@ -3820,7 +3820,7 @@ "id": "libvirt-32", "error": { "class": "DeviceNotFound", - "desc": "Class 'spapr-machine' not found" + "desc": "Class 'pseries-machine' not found" } } diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies index 5e4686c988..124be0cd71 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies @@ -4968,7 +4968,7 @@ { "execute": "qom-list-properties", "arguments": { - "typename": "spapr-machine" + "typename": "pseries-machine" }, "id": "libvirt-38" } @@ -4977,7 +4977,7 @@ "id": "libvirt-38", "error": { "class": "DeviceNotFound", - "desc": "Class 'spapr-machine' not found" + "desc": "Class 'pseries-machine' not found" } } diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies index 80c68de11a..fa370a39bd 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies @@ -5616,7 +5616,7 @@ { "execute": "qom-list-properties", "arguments": { - "typename": "spapr-machine" + "typename": "pseries-3.0-machine" }, "id": "libvirt-33" } diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies index 995171fa56..ce6f554cfe 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies +++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies @@ -1700,7 +1700,7 @@ { "execute": "qom-list-properties", "arguments": { - "typename": "spapr-machine" + "typename": "pseries-machine" }, "id": "libvirt-28" } @@ -1709,7 +1709,7 @@ "id": "libvirt-28", "error": { "class": "DeviceNotFound", - "desc": "Class 'spapr-machine' not found" + "desc": "Class 'pseries-machine' not found" } } diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies index 4775ff260f..8884ca1c6e 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies +++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies @@ -1700,7 +1700,7 @@ { "execute": "qom-list-properties", "arguments": { - "typename": "spapr-machine" + "typename": "pseries-machine" }, "id": "libvirt-28" } @@ -1709,7 +1709,7 @@ "id": "libvirt-28", "error": { "class": "DeviceNotFound", - "desc": "Class 'spapr-machine' not found" + "desc": "Class 'pseries-machine' not found" } } diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.replies b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.replies index 1268924316..b385e27fa1 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.replies @@ -3970,7 +3970,7 @@ { "execute": "qom-list-properties", "arguments": { - "typename": "spapr-machine" + "typename": "pseries-machine" }, "id": "libvirt-33" } @@ -3979,7 +3979,7 @@ "id": "libvirt-33", "error": { "class": "DeviceNotFound", - "desc": "Class 'spapr-machine' not found" + "desc": "Class 'pseries-machine' not found" } } diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies index c546944e8f..964759a50d 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies @@ -5109,7 +5109,7 @@ { "execute": "qom-list-properties", "arguments": { - "typename": "spapr-machine" + "typename": "pseries-machine" }, "id": "libvirt-38" } @@ -5118,7 +5118,7 @@ "id": "libvirt-38", "error": { "class": "DeviceNotFound", - "desc": "Class 'spapr-machine' not found" + "desc": "Class 'pseries-machine' not found" } } diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies index e62c3cd3bb..c23f67e869 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies @@ -5696,7 +5696,7 @@ { "execute": "qom-list-properties", "arguments": { - "typename": "spapr-machine" + "typename": "pseries-3.1-machine" }, "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 856f588fd0..b562839794 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies @@ -5182,7 +5182,7 @@ { "execute": "qom-list-properties", "arguments": { - "typename": "spapr-machine" + "typename": "pseries-machine" }, "id": "libvirt-38" } @@ -5191,7 +5191,7 @@ "id": "libvirt-38", "error": { "class": "DeviceNotFound", - "desc": "Class 'spapr-machine' not found" + "desc": "Class 'pseries-machine' not found" } } diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.replies index 4891413490..043189d1ac 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.replies @@ -6213,7 +6213,7 @@ { "execute": "qom-list-properties", "arguments": { - "typename": "spapr-machine" + "typename": "pseries-machine" }, "id": "libvirt-33" } @@ -6222,7 +6222,7 @@ "id": "libvirt-33", "error": { "class": "DeviceNotFound", - "desc": "Class 'spapr-machine' not found" + "desc": "Class 'pseries-machine' not found" } } diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.replies index c51b06f9a2..38e4c254a4 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.replies @@ -6079,7 +6079,7 @@ { "execute": "qom-list-properties", "arguments": { - "typename": "spapr-machine" + "typename": "pseries-4.0-machine" }, "id": "libvirt-34" } diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies index feb5c8fc4d..5205bda05c 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies @@ -4082,7 +4082,7 @@ { "execute": "qom-list-properties", "arguments": { - "typename": "spapr-machine" + "typename": "pseries-machine" }, "id": "libvirt-34" } @@ -4091,7 +4091,7 @@ "id": "libvirt-34", "error": { "class": "DeviceNotFound", - "desc": "Class 'spapr-machine' not found" + "desc": "Class 'pseries-machine' not found" } } diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies index e2588168a0..dfe5671a58 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies @@ -4082,7 +4082,7 @@ { "execute": "qom-list-properties", "arguments": { - "typename": "spapr-machine" + "typename": "pseries-machine" }, "id": "libvirt-34" } @@ -4091,7 +4091,7 @@ "id": "libvirt-34", "error": { "class": "DeviceNotFound", - "desc": "Class 'spapr-machine' not found" + "desc": "Class 'pseries-machine' not found" } } diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.replies b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.replies index e806185863..6f74f107f7 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.replies @@ -4283,7 +4283,7 @@ { "execute": "qom-list-properties", "arguments": { - "typename": "spapr-machine" + "typename": "pseries-machine" }, "id": "libvirt-33" } @@ -4292,7 +4292,7 @@ "id": "libvirt-33", "error": { "class": "DeviceNotFound", - "desc": "Class 'spapr-machine' not found" + "desc": "Class 'pseries-machine' not found" } } diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies index f89603d64d..6cfff8b7e0 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies @@ -5415,7 +5415,7 @@ { "execute": "qom-list-properties", "arguments": { - "typename": "spapr-machine" + "typename": "pseries-machine" }, "id": "libvirt-38" } @@ -5424,7 +5424,7 @@ "id": "libvirt-38", "error": { "class": "DeviceNotFound", - "desc": "Class 'spapr-machine' not found" + "desc": "Class 'pseries-machine' not found" } } -- 2.21.0
On Thu, May 16, 2019 at 05:35:34PM +0200, Andrea Bolognani wrote:
Now that we have the list of machine types available when probing machine type properties, we can list properties for the canonicalized version of the "pseries" machine type instead of having to go through "spapr-machine", which we know to be the parent type for all "pseries-*-machine" types. By doing this, we'll be able to find even properties that are only available from a certain versioned machine type forward, and can't thus be obtained when looking at the parent type only.
Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- src/qemu/qemu_capabilities.c | 9 +++++---- tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies | 4 ++-- tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies | 2 +- tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies | 4 ++-- tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies | 4 ++-- tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies | 2 +- tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies | 4 ++-- tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies | 4 ++-- tests/qemucapabilitiesdata/caps_3.0.0.s390x.replies | 4 ++-- tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies | 4 ++-- tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies | 2 +- tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies | 4 ++-- tests/qemucapabilitiesdata/caps_4.0.0.aarch64.replies | 4 ++-- tests/qemucapabilitiesdata/caps_4.0.0.ppc64.replies | 2 +- tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies | 4 ++-- tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies | 4 ++-- tests/qemucapabilitiesdata/caps_4.0.0.s390x.replies | 4 ++-- tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies | 4 ++-- 18 files changed, 35 insertions(+), 34 deletions(-)
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
Now that we're probing machine type properties using the latest machine type rather than the "spapr-machine" parent, we can finally discover properties that are not available on all machine types. This commit refreshes replies for QEMU 4.0.0 as well as 3.1.0 to show not only that we're actually discovering new machine type properties this way, but also that the number of available machine type properties increases with each subsequent QEMU release. If qom-list-properties had been available in QEMU 2.10.0, we could now drop the explicit version number checks for the QEMU_CAPS_MACHINE_PSERIES_MAX_CPU_COMPAT and QEMU_CAPS_MACHINE_PSERIES_RESIZE_HPT capabilities, but unfortunately it wasn't, so we have to keep them around still. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- .../caps_3.1.0.ppc64.replies | 29 ++++++++++++ .../caps_4.0.0.ppc64.replies | 44 +++++++++++++++++++ 2 files changed, 73 insertions(+) diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies index c23f67e869..33666a43db 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies @@ -5841,6 +5841,35 @@ "name": "cap-nested-hv", "description": "Allow Nested KVM-HV", "type": "bool" + }, + { + "name": "resize-hpt", + "description": "Resizing of the Hash Page Table (enabled, disabled, required)", + "type": "string" + }, + { + "name": "max-cpu-compat", + "description": "Maximum permitted CPU compatibility mode. Valid values are power6, power7, power7+, power8, power9.", + "type": "string" + }, + { + "name": "modern-hotplug-events", + "description": "Use dedicated hotplug event mechanism in place of standard EPOW events when possible (required for memory hot-unplug support)", + "type": "bool" + }, + { + "name": "vsmt", + "description": "Virtual SMT: KVM behaves as if this were the host's SMT mode", + "type": "uint32" + }, + { + "name": "kvm-type", + "description": "Specifies the KVM virtualization mode (HV, PR)", + "type": "string" + }, + { + "name": "vfio-no-msix-emulation", + "type": "bool" } ], "id": "libvirt-33" diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.replies index 38e4c254a4..baa8f8963d 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.replies @@ -6234,6 +6234,50 @@ "name": "cap-nested-hv", "description": "Allow Nested KVM-HV", "type": "bool" + }, + { + "name": "vfio-no-msix-emulation", + "type": "bool" + }, + { + "name": "ic-mode", + "description": "Specifies the interrupt controller mode (xics, xive, dual)", + "type": "string" + }, + { + "name": "kvm-type", + "description": "Specifies the KVM virtualization mode (HV, PR)", + "type": "string" + }, + { + "name": "host-model", + "description": "Host model to advertise in guest device tree", + "type": "string" + }, + { + "name": "max-cpu-compat", + "description": "Maximum permitted CPU compatibility mode. Valid values are power6, power7, power7+, power8, power9.", + "type": "string" + }, + { + "name": "modern-hotplug-events", + "description": "Use dedicated hotplug event mechanism in place of standard EPOW events when possible (required for memory hot-unplug support)", + "type": "bool" + }, + { + "name": "vsmt", + "description": "Virtual SMT: KVM behaves as if this were the host's SMT mode", + "type": "uint32" + }, + { + "name": "host-serial", + "description": "Host serial number to advertise in guest device tree", + "type": "string" + }, + { + "name": "resize-hpt", + "description": "Resizing of the Hash Page Table (enabled, disabled, required)", + "type": "string" } ], "id": "libvirt-34" -- 2.21.0
On Thu, May 16, 2019 at 05:35:35PM +0200, Andrea Bolognani wrote:
Now that we're probing machine type properties using the latest machine type rather than the "spapr-machine" parent, we can finally discover properties that are not available on all machine types.
This commit refreshes replies for QEMU 4.0.0 as well as 3.1.0 to show not only that we're actually discovering new machine type properties this way, but also that the number of available machine type properties increases with each subsequent QEMU release.
If qom-list-properties had been available in QEMU 2.10.0, we could now drop the explicit version number checks for the QEMU_CAPS_MACHINE_PSERIES_MAX_CPU_COMPAT and QEMU_CAPS_MACHINE_PSERIES_RESIZE_HPT capabilities, but unfortunately it wasn't, so we have to keep them around still.
Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- .../caps_3.1.0.ppc64.replies | 29 ++++++++++++ .../caps_4.0.0.ppc64.replies | 44 +++++++++++++++++++ 2 files changed, 73 insertions(+)
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
Since we know the full list of machine types supported by the QEMU binary when probing machine type properties, we can save some work (and eventually test suite churn, as more architecture-specific machine types need to be probed) by only probing machines that we know exist. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- src/qemu/qemu_capabilities.c | 5 ++ .../caps_2.12.0.aarch64.replies | 44 +++++--------- .../caps_2.12.0.s390x.replies | 48 +++++---------- .../caps_2.12.0.x86_64.replies | 60 +++++++------------ .../caps_3.0.0.riscv32.replies | 36 ++++------- .../caps_3.0.0.riscv64.replies | 36 ++++------- .../caps_3.0.0.s390x.replies | 48 +++++---------- .../caps_3.0.0.x86_64.replies | 60 +++++++------------ .../caps_3.1.0.x86_64.replies | 60 +++++++------------ .../caps_4.0.0.aarch64.replies | 44 +++++--------- .../caps_4.0.0.riscv32.replies | 36 ++++------- .../caps_4.0.0.riscv64.replies | 36 ++++------- .../caps_4.0.0.s390x.replies | 48 +++++---------- .../caps_4.0.0.x86_64.replies | 60 +++++++------------ 14 files changed, 209 insertions(+), 412 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index e12f076da8..d13c2c1192 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2361,6 +2361,11 @@ virQEMUCapsProbeQMPMachineProps(virQEMUCapsPtr qemuCaps, const char *canon = virQEMUCapsGetCanonicalMachine(qemuCaps, props.type); VIR_AUTOFREE(char *) type = NULL; + /* If the machine type is not supported by the QEMU binary, we + * don't need to bother probing its properties */ + if (!virQEMUCapsIsMachineSupported(qemuCaps, canon)) + continue; + /* The QOM type for machine types is the machine type name * followed by the -machine suffix */ if (virAsprintf(&type, "%s-machine", canon) < 0) diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies index 7b42e70d5d..67553451fc 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies @@ -5632,25 +5632,9 @@ "id": "libvirt-31" } -{ - "execute": "qom-list-properties", - "arguments": { - "typename": "pseries-machine" - }, - "id": "libvirt-32" -} - -{ - "id": "libvirt-32", - "error": { - "class": "DeviceNotFound", - "desc": "Class 'pseries-machine' not found" - } -} - { "execute": "query-cpu-definitions", - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -5826,35 +5810,35 @@ "static": false } ], - "id": "libvirt-33" + "id": "libvirt-32" } { "execute": "query-tpm-models", - "id": "libvirt-34" + "id": "libvirt-33" } { "return": [ ], - "id": "libvirt-34" + "id": "libvirt-33" } { "execute": "query-tpm-types", - "id": "libvirt-35" + "id": "libvirt-34" } { "return": [ "emulator" ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-command-line-options", - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -7015,12 +6999,12 @@ "option": "drive" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-migrate-capabilities", - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -7082,12 +7066,12 @@ "capability": "dirty-bitmaps" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-qmp-schema", - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -18455,12 +18439,12 @@ "meta-type": "object" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-gic-capabilities", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -18476,7 +18460,7 @@ "kernel": false } ], - "id": "libvirt-39" + "id": "libvirt-38" } { diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies index 3cd62cd10a..77afcbaa5b 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies @@ -3808,25 +3808,9 @@ "id": "libvirt-31" } -{ - "execute": "qom-list-properties", - "arguments": { - "typename": "pseries-machine" - }, - "id": "libvirt-32" -} - -{ - "id": "libvirt-32", - "error": { - "class": "DeviceNotFound", - "desc": "Class 'pseries-machine' not found" - } -} - { "execute": "query-cpu-definitions", - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -4361,35 +4345,35 @@ "migration-safe": true } ], - "id": "libvirt-33" + "id": "libvirt-32" } { "execute": "query-tpm-models", - "id": "libvirt-34" + "id": "libvirt-33" } { "return": [ ], - "id": "libvirt-34" + "id": "libvirt-33" } { "execute": "query-tpm-types", - "id": "libvirt-35" + "id": "libvirt-34" } { "return": [ "emulator" ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-command-line-options", - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -5514,12 +5498,12 @@ "option": "drive" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-migrate-capabilities", - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -5581,12 +5565,12 @@ "capability": "dirty-bitmaps" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-qmp-schema", - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -16954,7 +16938,7 @@ "meta-type": "object" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -16965,7 +16949,7 @@ "name": "host" } }, - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -17003,7 +16987,7 @@ } } }, - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -17017,11 +17001,11 @@ } } }, - "id": "libvirt-40" + "id": "libvirt-39" } { - "id": "libvirt-40", + "id": "libvirt-39", "error": { "class": "GenericError", "desc": "Property '.migratable' not found" diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies index 124be0cd71..2e4e5ae4ab 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies @@ -4965,25 +4965,9 @@ "id": "libvirt-37" } -{ - "execute": "qom-list-properties", - "arguments": { - "typename": "pseries-machine" - }, - "id": "libvirt-38" -} - -{ - "id": "libvirt-38", - "error": { - "class": "DeviceNotFound", - "desc": "Class 'pseries-machine' not found" - } -} - { "execute": "query-cpu-definitions", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -5497,12 +5481,12 @@ "migration-safe": true } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-tpm-models", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -5510,12 +5494,12 @@ "tpm-crb", "tpm-tis" ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-tpm-types", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -5523,12 +5507,12 @@ "passthrough", "emulator" ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-command-line-options", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -6815,12 +6799,12 @@ "option": "drive" } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-migrate-capabilities", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -6882,12 +6866,12 @@ "capability": "dirty-bitmaps" } ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-qmp-schema", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -18255,7 +18239,7 @@ "meta-type": "object" } ], - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -18266,7 +18250,7 @@ "name": "host" } }, - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -18456,7 +18440,7 @@ } } }, - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -18648,7 +18632,7 @@ } } }, - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -18903,7 +18887,7 @@ } } }, - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -18917,7 +18901,7 @@ } } }, - "id": "libvirt-47" + "id": "libvirt-46" } { @@ -19107,7 +19091,7 @@ } } }, - "id": "libvirt-47" + "id": "libvirt-46" } { @@ -19299,7 +19283,7 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-47" } { @@ -19554,12 +19538,12 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-47" } { "execute": "query-sev-capabilities", - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -19569,7 +19553,7 @@ "cert-chain": "AQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAA", "pdh": "AQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAA" }, - "id": "libvirt-49" + "id": "libvirt-48" } { diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies index ce6f554cfe..389fc95e0e 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies +++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies @@ -1697,36 +1697,20 @@ "id": "libvirt-27" } -{ - "execute": "qom-list-properties", - "arguments": { - "typename": "pseries-machine" - }, - "id": "libvirt-28" -} - -{ - "id": "libvirt-28", - "error": { - "class": "DeviceNotFound", - "desc": "Class 'pseries-machine' not found" - } -} - { "execute": "query-tpm-models", - "id": "libvirt-29" + "id": "libvirt-28" } { "return": [ ], - "id": "libvirt-29" + "id": "libvirt-28" } { "execute": "query-tpm-types", - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -1734,12 +1718,12 @@ "passthrough", "emulator" ], - "id": "libvirt-30" + "id": "libvirt-29" } { "execute": "query-command-line-options", - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -2864,12 +2848,12 @@ "option": "drive" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { "execute": "query-migrate-capabilities", - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -2939,12 +2923,12 @@ "capability": "late-block-activate" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { "execute": "query-qmp-schema", - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -14619,5 +14603,5 @@ "meta-type": "object" } ], - "id": "libvirt-33" + "id": "libvirt-32" } diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies index 8884ca1c6e..65da947c60 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies +++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies @@ -1697,36 +1697,20 @@ "id": "libvirt-27" } -{ - "execute": "qom-list-properties", - "arguments": { - "typename": "pseries-machine" - }, - "id": "libvirt-28" -} - -{ - "id": "libvirt-28", - "error": { - "class": "DeviceNotFound", - "desc": "Class 'pseries-machine' not found" - } -} - { "execute": "query-tpm-models", - "id": "libvirt-29" + "id": "libvirt-28" } { "return": [ ], - "id": "libvirt-29" + "id": "libvirt-28" } { "execute": "query-tpm-types", - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -1734,12 +1718,12 @@ "passthrough", "emulator" ], - "id": "libvirt-30" + "id": "libvirt-29" } { "execute": "query-command-line-options", - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -2864,12 +2848,12 @@ "option": "drive" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { "execute": "query-migrate-capabilities", - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -2939,12 +2923,12 @@ "capability": "late-block-activate" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { "execute": "query-qmp-schema", - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -14619,5 +14603,5 @@ "meta-type": "object" } ], - "id": "libvirt-33" + "id": "libvirt-32" } diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.replies b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.replies index b385e27fa1..5640750d19 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.replies @@ -3967,25 +3967,9 @@ "id": "libvirt-32" } -{ - "execute": "qom-list-properties", - "arguments": { - "typename": "pseries-machine" - }, - "id": "libvirt-33" -} - -{ - "id": "libvirt-33", - "error": { - "class": "DeviceNotFound", - "desc": "Class 'pseries-machine' not found" - } -} - { "execute": "query-cpu-definitions", - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -4536,35 +4520,35 @@ "migration-safe": true } ], - "id": "libvirt-34" + "id": "libvirt-33" } { "execute": "query-tpm-models", - "id": "libvirt-35" + "id": "libvirt-34" } { "return": [ ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-tpm-types", - "id": "libvirt-36" + "id": "libvirt-35" } { "return": [ "emulator" ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-command-line-options", - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -5724,12 +5708,12 @@ "option": "drive" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-migrate-capabilities", - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -5799,12 +5783,12 @@ "capability": "late-block-activate" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-qmp-schema", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -17479,7 +17463,7 @@ "meta-type": "object" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -17490,7 +17474,7 @@ "name": "host" } }, - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -17532,7 +17516,7 @@ } } }, - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -17546,11 +17530,11 @@ } } }, - "id": "libvirt-41" + "id": "libvirt-40" } { - "id": "libvirt-41", + "id": "libvirt-40", "error": { "class": "GenericError", "desc": "Property '.migratable' not found" diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies index 964759a50d..d5f40bd1d4 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies @@ -5106,25 +5106,9 @@ "id": "libvirt-37" } -{ - "execute": "qom-list-properties", - "arguments": { - "typename": "pseries-machine" - }, - "id": "libvirt-38" -} - -{ - "id": "libvirt-38", - "error": { - "class": "DeviceNotFound", - "desc": "Class 'pseries-machine' not found" - } -} - { "execute": "query-cpu-definitions", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -5561,12 +5545,12 @@ "migration-safe": true } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-tpm-models", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -5574,12 +5558,12 @@ "tpm-crb", "tpm-tis" ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-tpm-types", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -5587,12 +5571,12 @@ "passthrough", "emulator" ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-command-line-options", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -6891,12 +6875,12 @@ "option": "drive" } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-migrate-capabilities", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -6966,12 +6950,12 @@ "capability": "late-block-activate" } ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-qmp-schema", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -18851,7 +18835,7 @@ "meta-type": "object" } ], - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -18862,7 +18846,7 @@ "name": "host" } }, - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -19055,7 +19039,7 @@ } } }, - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -19250,7 +19234,7 @@ } } }, - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -19513,7 +19497,7 @@ } } }, - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -19527,7 +19511,7 @@ } } }, - "id": "libvirt-47" + "id": "libvirt-46" } { @@ -19720,7 +19704,7 @@ } } }, - "id": "libvirt-47" + "id": "libvirt-46" } { @@ -19915,7 +19899,7 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-47" } { @@ -20178,16 +20162,16 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-47" } { "execute": "query-sev-capabilities", - "id": "libvirt-49" + "id": "libvirt-48" } { - "id": "libvirt-49", + "id": "libvirt-48", "error": { "class": "GenericError", "desc": "SEV feature is not available" diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies index b562839794..7567ee6f42 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies @@ -5179,25 +5179,9 @@ "id": "libvirt-37" } -{ - "execute": "qom-list-properties", - "arguments": { - "typename": "pseries-machine" - }, - "id": "libvirt-38" -} - -{ - "id": "libvirt-38", - "error": { - "class": "DeviceNotFound", - "desc": "Class 'pseries-machine' not found" - } -} - { "execute": "query-cpu-definitions", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -5716,12 +5700,12 @@ "migration-safe": true } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-tpm-models", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -5729,12 +5713,12 @@ "tpm-crb", "tpm-tis" ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-tpm-types", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -5742,12 +5726,12 @@ "passthrough", "emulator" ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-command-line-options", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -7021,12 +7005,12 @@ "option": "drive" } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-migrate-capabilities", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -7096,12 +7080,12 @@ "capability": "late-block-activate" } ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-qmp-schema", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -19286,7 +19270,7 @@ "meta-type": "object" } ], - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -19297,7 +19281,7 @@ "name": "host" } }, - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -19499,7 +19483,7 @@ } } }, - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -19703,7 +19687,7 @@ } } }, - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -19978,7 +19962,7 @@ } } }, - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -19992,7 +19976,7 @@ } } }, - "id": "libvirt-47" + "id": "libvirt-46" } { @@ -20194,7 +20178,7 @@ } } }, - "id": "libvirt-47" + "id": "libvirt-46" } { @@ -20398,7 +20382,7 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-47" } { @@ -20673,16 +20657,16 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-47" } { "execute": "query-sev-capabilities", - "id": "libvirt-49" + "id": "libvirt-48" } { - "id": "libvirt-49", + "id": "libvirt-48", "error": { "class": "GenericError", "desc": "SEV feature is not available" diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.replies index 043189d1ac..128ee04e86 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.replies @@ -6210,25 +6210,9 @@ "id": "libvirt-32" } -{ - "execute": "qom-list-properties", - "arguments": { - "typename": "pseries-machine" - }, - "id": "libvirt-33" -} - -{ - "id": "libvirt-33", - "error": { - "class": "DeviceNotFound", - "desc": "Class 'pseries-machine' not found" - } -} - { "execute": "query-cpu-definitions", - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -6419,34 +6403,34 @@ "static": false } ], - "id": "libvirt-34" + "id": "libvirt-33" } { "execute": "query-tpm-models", - "id": "libvirt-35" + "id": "libvirt-34" } { "return": [ ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-tpm-types", - "id": "libvirt-36" + "id": "libvirt-35" } { "return": [ ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-command-line-options", - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -7594,12 +7578,12 @@ "option": "drive" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-migrate-capabilities", - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -7673,12 +7657,12 @@ "capability": "x-ignore-shared" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-qmp-schema", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -19765,12 +19749,12 @@ ] } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-gic-capabilities", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -19786,7 +19770,7 @@ "kernel": false } ], - "id": "libvirt-40" + "id": "libvirt-39" } { diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies index 5205bda05c..053b714825 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies @@ -4079,47 +4079,31 @@ "id": "libvirt-33" } -{ - "execute": "qom-list-properties", - "arguments": { - "typename": "pseries-machine" - }, - "id": "libvirt-34" -} - -{ - "id": "libvirt-34", - "error": { - "class": "DeviceNotFound", - "desc": "Class 'pseries-machine' not found" - } -} - { "execute": "query-tpm-models", - "id": "libvirt-35" + "id": "libvirt-34" } { "return": [ ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-tpm-types", - "id": "libvirt-36" + "id": "libvirt-35" } { "return": [ ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-command-line-options", - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -5391,12 +5375,12 @@ "option": "drive" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-migrate-capabilities", - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -5470,12 +5454,12 @@ "capability": "x-ignore-shared" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-qmp-schema", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -17754,5 +17738,5 @@ ] } ], - "id": "libvirt-39" + "id": "libvirt-38" } diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies index dfe5671a58..2db59687aa 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies @@ -4079,47 +4079,31 @@ "id": "libvirt-33" } -{ - "execute": "qom-list-properties", - "arguments": { - "typename": "pseries-machine" - }, - "id": "libvirt-34" -} - -{ - "id": "libvirt-34", - "error": { - "class": "DeviceNotFound", - "desc": "Class 'pseries-machine' not found" - } -} - { "execute": "query-tpm-models", - "id": "libvirt-35" + "id": "libvirt-34" } { "return": [ ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-tpm-types", - "id": "libvirt-36" + "id": "libvirt-35" } { "return": [ ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-command-line-options", - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -5391,12 +5375,12 @@ "option": "drive" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-migrate-capabilities", - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -5470,12 +5454,12 @@ "capability": "x-ignore-shared" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-qmp-schema", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -17754,5 +17738,5 @@ ] } ], - "id": "libvirt-39" + "id": "libvirt-38" } diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.replies b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.replies index 6f74f107f7..8c2c299828 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.replies @@ -4280,25 +4280,9 @@ "id": "libvirt-32" } -{ - "execute": "qom-list-properties", - "arguments": { - "typename": "pseries-machine" - }, - "id": "libvirt-33" -} - -{ - "id": "libvirt-33", - "error": { - "class": "DeviceNotFound", - "desc": "Class 'pseries-machine' not found" - } -} - { "execute": "query-cpu-definitions", - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -4873,34 +4857,34 @@ "migration-safe": true } ], - "id": "libvirt-34" + "id": "libvirt-33" } { "execute": "query-tpm-models", - "id": "libvirt-35" + "id": "libvirt-34" } { "return": [ ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-tpm-types", - "id": "libvirt-36" + "id": "libvirt-35" } { "return": [ ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-command-line-options", - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -6043,12 +6027,12 @@ "option": "drive" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-migrate-capabilities", - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -6122,12 +6106,12 @@ "capability": "x-ignore-shared" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-qmp-schema", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -18295,7 +18279,7 @@ ] } ], - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -18306,7 +18290,7 @@ "name": "host" } }, - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -18351,7 +18335,7 @@ } } }, - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -18365,11 +18349,11 @@ } } }, - "id": "libvirt-41" + "id": "libvirt-40" } { - "id": "libvirt-41", + "id": "libvirt-40", "error": { "class": "GenericError", "desc": "Property '.migratable' not found" diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies index 6cfff8b7e0..52a2825505 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies @@ -5412,25 +5412,9 @@ "id": "libvirt-37" } -{ - "execute": "qom-list-properties", - "arguments": { - "typename": "pseries-machine" - }, - "id": "libvirt-38" -} - -{ - "id": "libvirt-38", - "error": { - "class": "DeviceNotFound", - "desc": "Class 'pseries-machine' not found" - } -} - { "execute": "query-cpu-definitions", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -5947,12 +5931,12 @@ "migration-safe": true } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-tpm-models", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -5960,12 +5944,12 @@ "tpm-crb", "tpm-tis" ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-tpm-types", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -5973,12 +5957,12 @@ "passthrough", "emulator" ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-command-line-options", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -7260,12 +7244,12 @@ "option": "drive" } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-migrate-capabilities", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -7339,12 +7323,12 @@ "capability": "x-ignore-shared" } ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-qmp-schema", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -19809,7 +19793,7 @@ ] } ], - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -19820,7 +19804,7 @@ "name": "host" } }, - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -20024,7 +20008,7 @@ } } }, - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -20230,7 +20214,7 @@ } } }, - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -20509,7 +20493,7 @@ } } }, - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -20523,7 +20507,7 @@ } } }, - "id": "libvirt-47" + "id": "libvirt-46" } { @@ -20727,7 +20711,7 @@ } } }, - "id": "libvirt-47" + "id": "libvirt-46" } { @@ -20933,7 +20917,7 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-47" } { @@ -21212,16 +21196,16 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-47" } { "execute": "query-sev-capabilities", - "id": "libvirt-49" + "id": "libvirt-48" } { - "id": "libvirt-49", + "id": "libvirt-48", "error": { "class": "GenericError", "desc": "SEV feature is not available" -- 2.21.0
On Thu, May 16, 2019 at 05:35:36PM +0200, Andrea Bolognani wrote:
Since we know the full list of machine types supported by the QEMU binary when probing machine type properties, we can save some work (and eventually test suite churn, as more architecture-specific machine types need to be probed) by only probing machines that we know exist.
Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- src/qemu/qemu_capabilities.c | 5 ++ .../caps_2.12.0.aarch64.replies | 44 +++++--------- .../caps_2.12.0.s390x.replies | 48 +++++---------- .../caps_2.12.0.x86_64.replies | 60 +++++++------------ .../caps_3.0.0.riscv32.replies | 36 ++++------- .../caps_3.0.0.riscv64.replies | 36 ++++------- .../caps_3.0.0.s390x.replies | 48 +++++---------- .../caps_3.0.0.x86_64.replies | 60 +++++++------------ .../caps_3.1.0.x86_64.replies | 60 +++++++------------ .../caps_4.0.0.aarch64.replies | 44 +++++--------- .../caps_4.0.0.riscv32.replies | 36 ++++------- .../caps_4.0.0.riscv64.replies | 36 ++++------- .../caps_4.0.0.s390x.replies | 48 +++++---------- .../caps_4.0.0.x86_64.replies | 60 +++++++------------ 14 files changed, 209 insertions(+), 412 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index e12f076da8..d13c2c1192 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2361,6 +2361,11 @@ virQEMUCapsProbeQMPMachineProps(virQEMUCapsPtr qemuCaps, const char *canon = virQEMUCapsGetCanonicalMachine(qemuCaps, props.type); VIR_AUTOFREE(char *) type = NULL;
+ /* If the machine type is not supported by the QEMU binary, we + * don't need to bother probing its properties */
Redundant comment, the code says the same thing.
+ if (!virQEMUCapsIsMachineSupported(qemuCaps, canon)) + continue; + /* The QOM type for machine types is the machine type name * followed by the -machine suffix */ if (virAsprintf(&type, "%s-machine", canon) < 0)
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
participants (2)
-
Andrea Bolognani -
Pavel Hrdina