From 22d8f55b2159841eca99e25a0bc5bcc84c991332 Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Tue, 14 Aug 2018 17:53:05 +0200 Subject: [PATCH] qemu: capabilities: Detect active block commit via QMP schema probing if possible For versions where we can probe that the arguments are optional we can perform the probing by a schema query rather than sending a separate command to do so. Signed-off-by: Peter Krempa Reviewed-by: John Ferlan --- src/qemu/qemu_capabilities.c | 8 +- .../caps_2.10.0.aarch64.replies | 164 +++++++------- .../caps_2.10.0.aarch64.xml | 2 +- .../caps_2.10.0.ppc64.replies | 164 +++++++------- .../caps_2.10.0.ppc64.xml | 2 +- .../caps_2.10.0.s390x.replies | 164 +++++++------- .../caps_2.10.0.s390x.xml | 2 +- .../caps_2.10.0.x86_64.replies | 196 ++++++++--------- .../caps_2.10.0.x86_64.xml | 2 +- .../caps_2.11.0.s390x.replies | 168 +++++++------- .../caps_2.11.0.s390x.xml | 2 +- .../caps_2.11.0.x86_64.replies | 196 ++++++++--------- .../caps_2.11.0.x86_64.xml | 2 +- .../caps_2.12.0.aarch64.replies | 172 +++++++-------- .../caps_2.12.0.aarch64.xml | 2 +- .../caps_2.12.0.ppc64.replies | 172 +++++++-------- .../caps_2.12.0.ppc64.xml | 2 +- .../caps_2.12.0.s390x.replies | 176 +++++++-------- .../caps_2.12.0.s390x.xml | 2 +- .../caps_2.12.0.x86_64.replies | 208 ++++++++---------- .../caps_2.12.0.x86_64.xml | 2 +- .../caps_2.5.0.x86_64.replies | 180 +++++++-------- .../caps_2.5.0.x86_64.xml | 2 +- .../caps_2.6.0.aarch64.replies | 164 +++++++------- .../caps_2.6.0.aarch64.xml | 2 +- .../caps_2.6.0.ppc64.replies | 164 +++++++------- .../qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 2 +- .../caps_2.6.0.x86_64.replies | 180 +++++++-------- .../caps_2.6.0.x86_64.xml | 2 +- .../caps_2.7.0.s390x.replies | 156 ++++++------- .../qemucapabilitiesdata/caps_2.7.0.s390x.xml | 2 +- .../caps_2.7.0.x86_64.replies | 180 +++++++-------- .../caps_2.7.0.x86_64.xml | 2 +- .../caps_2.8.0.s390x.replies | 164 +++++++------- .../qemucapabilitiesdata/caps_2.8.0.s390x.xml | 2 +- .../caps_2.8.0.x86_64.replies | 180 +++++++-------- .../caps_2.8.0.x86_64.xml | 2 +- .../caps_2.9.0.ppc64.replies | 164 +++++++------- .../qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 2 +- .../caps_2.9.0.s390x.replies | 164 +++++++------- .../qemucapabilitiesdata/caps_2.9.0.s390x.xml | 2 +- .../caps_2.9.0.x86_64.replies | 196 ++++++++--------- .../caps_2.9.0.x86_64.xml | 2 +- .../caps_3.0.0.ppc64.replies | 172 +++++++-------- .../qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 2 +- .../caps_3.0.0.riscv32.replies | 148 ++++++------- .../caps_3.0.0.riscv64.replies | 148 ++++++------- .../caps_3.0.0.x86_64.replies | 208 ++++++++---------- .../caps_3.0.0.x86_64.xml | 2 +- 49 files changed, 2002 insertions(+), 2400 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 9fae713c63..de1668921f 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1307,6 +1307,7 @@ static struct virQEMUCapsStringFlags virQEMUCapsQMPSchemaQueries[] = { { "blockdev-add/arg-type/+qcow2/encrypt/+luks/key-secret", QEMU_CAPS_QCOW2_LUKS }, { "nbd-server-start/arg-type/tls-creds", QEMU_CAPS_NBD_TLS }, { "screendump/arg-type/device", QEMU_CAPS_SCREENDUMP_DEVICE }, + { "block-commit/arg-type/*top", QEMU_CAPS_ACTIVE_COMMIT }, }; typedef struct _virQEMUCapsObjectTypeProps virQEMUCapsObjectTypeProps; @@ -2163,9 +2164,10 @@ virQEMUCapsProbeQMPCommands(virQEMUCapsPtr qemuCaps, VIR_FORCE_CLOSE(fd); } - /* Probe for active commit of qemu 2.1 (for now, we are choosing - * to ignore the fact that qemu 2.0 can also do active commit) */ - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCK_COMMIT) && + /* Probe for active commit of qemu 2.1. We don't need to query directly + * if we have QMP schema support */ + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_QMP_SCHEMA) && + virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCK_COMMIT) && qemuMonitorSupportsActiveCommit(mon)) virQEMUCapsSet(qemuCaps, QEMU_CAPS_ACTIVE_COMMIT); diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies index 4bc6433601..3751702864 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies @@ -507,25 +507,9 @@ "id": "libvirt-5" } -{ - "execute": "block-commit", - "arguments": { - "device": "bogus" - }, - "id": "libvirt-6" -} - -{ - "id": "libvirt-6", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'bogus' not found" - } -} - { "execute": "query-kvm", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -533,12 +517,12 @@ "enabled": true, "present": true }, - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "query-events", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -655,12 +639,12 @@ "name": "ACPI_DEVICE_OST" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { "execute": "qom-list-types", - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -3230,7 +3214,7 @@ "parent": "rng-backend" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -3238,7 +3222,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -3466,7 +3450,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -3474,7 +3458,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -3761,7 +3745,7 @@ "type": "uint16" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -3769,7 +3753,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -3930,7 +3914,7 @@ "type": "str" } ], - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -3938,11 +3922,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -3954,11 +3938,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-14" + "id": "libvirt-13" } { - "id": "libvirt-14", + "id": "libvirt-13", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -3970,11 +3954,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -3986,11 +3970,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -4002,11 +3986,11 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" @@ -4018,7 +4002,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -4125,7 +4109,7 @@ "type": "bool" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -4133,7 +4117,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -4247,7 +4231,7 @@ "type": "uint64" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -4255,7 +4239,7 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -4331,7 +4315,7 @@ "type": "uint16" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -4339,11 +4323,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-21" + "id": "libvirt-20" } { - "id": "libvirt-21", + "id": "libvirt-20", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -4355,7 +4339,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -4424,7 +4408,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -4432,7 +4416,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -4459,7 +4443,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -4467,11 +4451,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-24" + "id": "libvirt-23" } { - "id": "libvirt-24", + "id": "libvirt-23", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -4483,11 +4467,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-25" + "id": "libvirt-24" } { - "id": "libvirt-25", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -4499,7 +4483,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -4572,7 +4556,7 @@ "type": "uint16" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -4580,11 +4564,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-27" + "id": "libvirt-26" } { - "id": "libvirt-27", + "id": "libvirt-26", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -4596,7 +4580,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -4653,7 +4637,7 @@ "type": "int32" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -4661,7 +4645,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -4812,7 +4796,7 @@ "type": "str" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -4820,7 +4804,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -4867,7 +4851,7 @@ "type": "size" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -4875,11 +4859,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-31" + "id": "libvirt-30" } { - "id": "libvirt-31", + "id": "libvirt-30", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -4891,7 +4875,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -5034,7 +5018,7 @@ "type": "str" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -5042,11 +5026,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-33" + "id": "libvirt-32" } { - "id": "libvirt-33", + "id": "libvirt-32", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -5058,7 +5042,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -5102,7 +5086,7 @@ "type": "bool" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -5110,7 +5094,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -5190,12 +5174,12 @@ "type": "uint32" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-machines", - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -5462,12 +5446,12 @@ "cpu-max": 1 } ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-cpu-definitions", - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -5633,34 +5617,34 @@ "static": false } ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-tpm-models", - "id": "libvirt-38" + "id": "libvirt-37" } { "return": [ ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-tpm-types", - "id": "libvirt-39" + "id": "libvirt-38" } { "return": [ ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-command-line-options", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -6805,12 +6789,12 @@ "option": "drive" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-migrate-capabilities", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -6860,12 +6844,12 @@ "capability": "return-path" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-qmp-schema", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -16588,12 +16572,12 @@ "meta-type": "object" } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-gic-capabilities", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -16609,7 +16593,7 @@ "kernel": true } ], - "id": "libvirt-43" + "id": "libvirt-42" } { diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml index 078507f57d..97318fa72f 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml @@ -161,7 +161,7 @@ 2010000 0 - 307647 + 307434 (v2.10.0) aarch64 diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies index a3a4deb87d..232896ed8a 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies @@ -504,25 +504,9 @@ "id": "libvirt-5" } -{ - "execute": "block-commit", - "arguments": { - "device": "bogus" - }, - "id": "libvirt-6" -} - -{ - "id": "libvirt-6", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'bogus' not found" - } -} - { "execute": "query-kvm", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -530,12 +514,12 @@ "enabled": true, "present": true }, - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "query-events", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -652,12 +636,12 @@ "name": "ACPI_DEVICE_OST" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { "execute": "qom-list-types", - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -3331,7 +3315,7 @@ "parent": "7455-family-powerpc64-cpu" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -3339,7 +3323,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -3567,7 +3551,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -3575,7 +3559,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -3862,7 +3846,7 @@ "type": "uint16" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -3870,7 +3854,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -4031,7 +4015,7 @@ "type": "str" } ], - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -4039,11 +4023,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -4055,11 +4039,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-14" + "id": "libvirt-13" } { - "id": "libvirt-14", + "id": "libvirt-13", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -4071,11 +4055,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -4087,11 +4071,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -4103,11 +4087,11 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" @@ -4119,7 +4103,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -4226,7 +4210,7 @@ "type": "bool" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -4234,7 +4218,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -4348,7 +4332,7 @@ "type": "uint64" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -4356,7 +4340,7 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -4432,7 +4416,7 @@ "type": "uint16" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -4440,11 +4424,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-21" + "id": "libvirt-20" } { - "id": "libvirt-21", + "id": "libvirt-20", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -4456,7 +4440,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -4525,7 +4509,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -4533,7 +4517,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -4560,7 +4544,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -4568,11 +4552,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-24" + "id": "libvirt-23" } { - "id": "libvirt-24", + "id": "libvirt-23", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -4584,11 +4568,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-25" + "id": "libvirt-24" } { - "id": "libvirt-25", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -4600,7 +4584,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -4673,7 +4657,7 @@ "type": "uint16" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -4681,11 +4665,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-27" + "id": "libvirt-26" } { - "id": "libvirt-27", + "id": "libvirt-26", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -4697,7 +4681,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -4754,7 +4738,7 @@ "type": "int32" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -4762,7 +4746,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -4913,7 +4897,7 @@ "type": "str" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -4921,7 +4905,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -4968,7 +4952,7 @@ "type": "size" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -4976,11 +4960,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-31" + "id": "libvirt-30" } { - "id": "libvirt-31", + "id": "libvirt-30", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -4992,7 +4976,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -5135,7 +5119,7 @@ "type": "str" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -5143,11 +5127,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-33" + "id": "libvirt-32" } { - "id": "libvirt-33", + "id": "libvirt-32", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -5159,7 +5143,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -5203,7 +5187,7 @@ "type": "bool" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -5211,7 +5195,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -5291,7 +5275,7 @@ "type": "uint32" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -5299,7 +5283,7 @@ "arguments": { "typename": "spapr-pci-host-bridge" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -5385,12 +5369,12 @@ "type": "uint32" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-machines", - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -5508,12 +5492,12 @@ "cpu-max": 1 } ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-cpu-definitions", - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -7689,34 +7673,34 @@ "static": false } ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-tpm-models", - "id": "libvirt-39" + "id": "libvirt-38" } { "return": [ ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-tpm-types", - "id": "libvirt-40" + "id": "libvirt-39" } { "return": [ ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-command-line-options", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -8856,12 +8840,12 @@ "option": "drive" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-migrate-capabilities", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -8911,12 +8895,12 @@ "capability": "return-path" } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-qmp-schema", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -18639,7 +18623,7 @@ "meta-type": "object" } ], - "id": "libvirt-43" + "id": "libvirt-42" } { diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml index 75c2230b25..35b79569dc 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml @@ -160,7 +160,7 @@ 2010000 0 - 386992 + 386779 (v2.10.0) ppc64 diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies index 4feada0473..3d1d2a3133 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies @@ -516,25 +516,9 @@ "id": "libvirt-5" } -{ - "execute": "block-commit", - "arguments": { - "device": "bogus" - }, - "id": "libvirt-6" -} - -{ - "id": "libvirt-6", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'bogus' not found" - } -} - { "execute": "query-kvm", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -542,12 +526,12 @@ "enabled": true, "present": true }, - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "query-events", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -664,12 +648,12 @@ "name": "ACPI_DEVICE_OST" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { "execute": "qom-list-types", - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1571,7 +1555,7 @@ "parent": "virtio-device" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1579,7 +1563,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -1807,7 +1791,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -1815,7 +1799,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2102,7 +2086,7 @@ "type": "uint16" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2110,7 +2094,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -2271,7 +2255,7 @@ "type": "str" } ], - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -2279,7 +2263,7 @@ "arguments": { "typename": "virtio-blk-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { @@ -2417,7 +2401,7 @@ "type": "uint32" } ], - "id": "libvirt-13" + "id": "libvirt-12" } { @@ -2425,7 +2409,7 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -2626,7 +2610,7 @@ "type": "uint16" } ], - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -2634,7 +2618,7 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -2709,7 +2693,7 @@ "type": "uint32" } ], - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -2717,11 +2701,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -2733,11 +2717,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -2749,11 +2733,11 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-18" + "id": "libvirt-17" } { - "id": "libvirt-18", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" @@ -2765,7 +2749,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2872,7 +2856,7 @@ "type": "bool" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2880,7 +2864,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -2994,7 +2978,7 @@ "type": "uint64" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -3002,11 +2986,11 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-21" + "id": "libvirt-20" } { - "id": "libvirt-21", + "id": "libvirt-20", "error": { "class": "DeviceNotFound", "desc": "Device 'ide-drive' not found" @@ -3018,11 +3002,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-22" + "id": "libvirt-21" } { - "id": "libvirt-22", + "id": "libvirt-21", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -3034,11 +3018,11 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-23" + "id": "libvirt-22" } { - "id": "libvirt-23", + "id": "libvirt-22", "error": { "class": "DeviceNotFound", "desc": "Device 'usb-host' not found" @@ -3050,7 +3034,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -3077,7 +3061,7 @@ "type": "uint32" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -3085,11 +3069,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-25" + "id": "libvirt-24" } { - "id": "libvirt-25", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -3101,11 +3085,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-26" + "id": "libvirt-25" } { - "id": "libvirt-26", + "id": "libvirt-25", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -3117,11 +3101,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-27" + "id": "libvirt-26" } { - "id": "libvirt-27", + "id": "libvirt-26", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -3133,7 +3117,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3284,7 +3268,7 @@ "type": "str" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3292,7 +3276,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3339,7 +3323,7 @@ "type": "size" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3347,11 +3331,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-30" + "id": "libvirt-29" } { - "id": "libvirt-30", + "id": "libvirt-29", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -3363,7 +3347,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3506,7 +3490,7 @@ "type": "str" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3514,7 +3498,7 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3576,7 +3560,7 @@ "type": "uint32" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3584,7 +3568,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3628,7 +3612,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3636,7 +3620,7 @@ "arguments": { "typename": "virtual-css-bridge" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -3646,12 +3630,12 @@ "type": "bool" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { "execute": "query-machines", - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -3699,12 +3683,12 @@ "cpu-max": 248 } ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-cpu-definitions", - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -4238,34 +4222,34 @@ "migration-safe": true } ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-tpm-models", - "id": "libvirt-37" + "id": "libvirt-36" } { "return": [ ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-tpm-types", - "id": "libvirt-38" + "id": "libvirt-37" } { "return": [ ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-command-line-options", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -5370,12 +5354,12 @@ "option": "drive" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-migrate-capabilities", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -5425,12 +5409,12 @@ "capability": "return-path" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-qmp-schema", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -15153,7 +15137,7 @@ "meta-type": "object" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -15164,7 +15148,7 @@ "name": "host" } }, - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -15204,7 +15188,7 @@ } } }, - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -15218,11 +15202,11 @@ } } }, - "id": "libvirt-43" + "id": "libvirt-42" } { - "id": "libvirt-43", + "id": "libvirt-42", "error": { "class": "GenericError", "desc": "Property '.migratable' not found" diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml index 5d134f4708..a763a9e9be 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml @@ -121,7 +121,7 @@ 2010000 0 - 307899 + 307686 s390x diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies index aee8d1a2c2..79958080e3 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies @@ -513,25 +513,9 @@ "id": "libvirt-5" } -{ - "execute": "block-commit", - "arguments": { - "device": "bogus" - }, - "id": "libvirt-6" -} - -{ - "id": "libvirt-6", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'bogus' not found" - } -} - { "execute": "query-kvm", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -539,12 +523,12 @@ "enabled": true, "present": true }, - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "query-events", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -661,12 +645,12 @@ "name": "ACPI_DEVICE_OST" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { "execute": "qom-list-types", - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2208,7 +2192,7 @@ "parent": "virtio-input-hid-pci" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2216,7 +2200,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2444,7 +2428,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2452,7 +2436,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2739,7 +2723,7 @@ "type": "uint16" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2747,7 +2731,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -2908,7 +2892,7 @@ "type": "str" } ], - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -2916,11 +2900,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -2932,11 +2916,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-14" + "id": "libvirt-13" } { - "id": "libvirt-14", + "id": "libvirt-13", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -2948,11 +2932,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -2964,11 +2948,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -2980,7 +2964,7 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -3042,7 +3026,7 @@ "type": "bool" } ], - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -3050,7 +3034,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -3157,7 +3141,7 @@ "type": "bool" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -3165,7 +3149,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -3279,7 +3263,7 @@ "type": "uint64" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -3287,7 +3271,7 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -3363,7 +3347,7 @@ "type": "uint16" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -3371,7 +3355,7 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -3434,7 +3418,7 @@ "type": "int32" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -3442,7 +3426,7 @@ "arguments": { "typename": "usb-redir" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -3491,7 +3475,7 @@ "type": "bool" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -3499,7 +3483,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3568,7 +3552,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3576,7 +3560,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -3603,7 +3587,7 @@ "type": "uint32" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -3611,7 +3595,7 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -3649,7 +3633,7 @@ "type": "child" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -3657,7 +3641,7 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -3735,7 +3719,7 @@ "type": "uint64" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -3743,7 +3727,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3816,7 +3800,7 @@ "type": "uint16" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3824,7 +3808,7 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3838,7 +3822,7 @@ "type": "LostTickPolicy" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3846,7 +3830,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3903,7 +3887,7 @@ "type": "int32" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3911,7 +3895,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -3954,7 +3938,7 @@ "type": "int32" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -3962,7 +3946,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -4057,7 +4041,7 @@ "type": "uint32" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -4065,7 +4049,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -4226,7 +4210,7 @@ "type": "str" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -4234,7 +4218,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -4291,7 +4275,7 @@ "type": "size" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -4299,7 +4283,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -4395,7 +4379,7 @@ "type": "uint32" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -4403,7 +4387,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -4546,7 +4530,7 @@ "type": "str" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -4554,11 +4538,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-36" + "id": "libvirt-35" } { - "id": "libvirt-36", + "id": "libvirt-35", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -4570,7 +4554,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -4614,7 +4598,7 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -4622,7 +4606,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -4702,7 +4686,7 @@ "type": "uint32" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -4710,7 +4694,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -4745,7 +4729,7 @@ "type": "bool" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -4753,7 +4737,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -4779,12 +4763,12 @@ "type": "pci-devfn" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-machines", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -4973,12 +4957,12 @@ "alias": "q35" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-cpu-definitions", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -5313,36 +5297,36 @@ "migration-safe": true } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-tpm-models", - "id": "libvirt-43" + "id": "libvirt-42" } { "return": [ "tpm-tis" ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-tpm-types", - "id": "libvirt-44" + "id": "libvirt-43" } { "return": [ "passthrough" ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-command-line-options", - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -6621,12 +6605,12 @@ "option": "drive" } ], - "id": "libvirt-45" + "id": "libvirt-44" } { "execute": "query-migrate-capabilities", - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -6676,12 +6660,12 @@ "capability": "return-path" } ], - "id": "libvirt-46" + "id": "libvirt-45" } { "execute": "query-qmp-schema", - "id": "libvirt-47" + "id": "libvirt-46" } { @@ -16404,7 +16388,7 @@ "meta-type": "object" } ], - "id": "libvirt-47" + "id": "libvirt-46" } { @@ -16415,7 +16399,7 @@ "name": "host" } }, - "id": "libvirt-48" + "id": "libvirt-47" } { @@ -16594,7 +16578,7 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-47" } { @@ -16775,7 +16759,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -17018,7 +17002,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -17032,7 +17016,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -17211,7 +17195,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -17392,7 +17376,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { @@ -17635,7 +17619,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml index e5905d727c..8ca64d6178 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml @@ -205,7 +205,7 @@ 2010000 0 - 367995 + 367782 (v2.10.0) x86_64 diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies index 2b03c251fc..a9f08ea573 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies @@ -525,25 +525,9 @@ "id": "libvirt-5" } -{ - "execute": "block-commit", - "arguments": { - "device": "bogus" - }, - "id": "libvirt-6" -} - -{ - "id": "libvirt-6", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'bogus' not found" - } -} - { "execute": "query-kvm", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -551,12 +535,12 @@ "enabled": true, "present": true }, - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "query-events", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -673,12 +657,12 @@ "name": "ACPI_DEVICE_OST" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { "execute": "qom-list-types", - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1612,7 +1596,7 @@ "parent": "virtio-device" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1620,7 +1604,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -1848,7 +1832,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -1856,7 +1840,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2143,7 +2127,7 @@ "type": "uint16" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2151,7 +2135,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -2316,7 +2300,7 @@ "type": "str" } ], - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -2324,7 +2308,7 @@ "arguments": { "typename": "virtio-blk-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { @@ -2462,7 +2446,7 @@ "type": "uint32" } ], - "id": "libvirt-13" + "id": "libvirt-12" } { @@ -2470,7 +2454,7 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -2671,7 +2655,7 @@ "type": "uint16" } ], - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -2679,7 +2663,7 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -2758,7 +2742,7 @@ "type": "uint32" } ], - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -2766,11 +2750,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -2782,11 +2766,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -2798,11 +2782,11 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-18" + "id": "libvirt-17" } { - "id": "libvirt-18", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" @@ -2814,7 +2798,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2926,7 +2910,7 @@ "type": "bool" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2934,7 +2918,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -3048,7 +3032,7 @@ "type": "uint64" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -3056,11 +3040,11 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-21" + "id": "libvirt-20" } { - "id": "libvirt-21", + "id": "libvirt-20", "error": { "class": "DeviceNotFound", "desc": "Device 'ide-drive' not found" @@ -3072,11 +3056,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-22" + "id": "libvirt-21" } { - "id": "libvirt-22", + "id": "libvirt-21", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -3088,11 +3072,11 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-23" + "id": "libvirt-22" } { - "id": "libvirt-23", + "id": "libvirt-22", "error": { "class": "DeviceNotFound", "desc": "Device 'usb-host' not found" @@ -3104,7 +3088,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -3131,7 +3115,7 @@ "type": "uint32" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -3139,11 +3123,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-25" + "id": "libvirt-24" } { - "id": "libvirt-25", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -3155,11 +3139,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-26" + "id": "libvirt-25" } { - "id": "libvirt-26", + "id": "libvirt-25", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -3171,11 +3155,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-27" + "id": "libvirt-26" } { - "id": "libvirt-27", + "id": "libvirt-26", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -3187,7 +3171,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3338,7 +3322,7 @@ "type": "str" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3346,7 +3330,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3393,7 +3377,7 @@ "type": "size" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3401,11 +3385,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-30" + "id": "libvirt-29" } { - "id": "libvirt-30", + "id": "libvirt-29", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -3417,7 +3401,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3560,7 +3544,7 @@ "type": "str" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3568,7 +3552,7 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3630,7 +3614,7 @@ "type": "uint32" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3638,7 +3622,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3682,7 +3666,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3690,7 +3674,7 @@ "arguments": { "typename": "virtio-gpu-ccw" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -3755,7 +3739,7 @@ "type": "uint32" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -3763,7 +3747,7 @@ "arguments": { "typename": "virtual-css-bridge" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -3773,12 +3757,12 @@ "type": "bool" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-machines", - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -3831,12 +3815,12 @@ "cpu-max": 248 } ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-cpu-definitions", - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -4370,35 +4354,35 @@ "migration-safe": true } ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-tpm-models", - "id": "libvirt-38" + "id": "libvirt-37" } { "return": [ ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-tpm-types", - "id": "libvirt-39" + "id": "libvirt-38" } { "return": [ "emulator" ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-command-line-options", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -5519,12 +5503,12 @@ "option": "drive" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-migrate-capabilities", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -5582,12 +5566,12 @@ "capability": "x-multifd" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-qmp-schema", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -15455,7 +15439,7 @@ "meta-type": "object" } ], - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -15466,7 +15450,7 @@ "name": "host" } }, - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -15505,7 +15489,7 @@ } } }, - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -15519,11 +15503,11 @@ } } }, - "id": "libvirt-44" + "id": "libvirt-43" } { - "id": "libvirt-44", + "id": "libvirt-43", "error": { "class": "GenericError", "desc": "Property '.migratable' not found" diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml index df70c7d3e9..79656e6b95 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml @@ -128,7 +128,7 @@ 2011000 0 - 346751 + 346538 s390x diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies index bfa7adc988..c21d681d24 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies @@ -522,25 +522,9 @@ "id": "libvirt-5" } -{ - "execute": "block-commit", - "arguments": { - "device": "bogus" - }, - "id": "libvirt-6" -} - -{ - "id": "libvirt-6", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'bogus' not found" - } -} - { "execute": "query-kvm", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -548,12 +532,12 @@ "enabled": true, "present": true }, - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "query-events", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -670,12 +654,12 @@ "name": "ACPI_DEVICE_OST" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { "execute": "qom-list-types", - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2201,7 +2185,7 @@ "parent": "virtio-input-hid-pci" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2209,7 +2193,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2437,7 +2421,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2445,7 +2429,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2732,7 +2716,7 @@ "type": "uint16" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2740,7 +2724,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -2905,7 +2889,7 @@ "type": "str" } ], - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -2913,11 +2897,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -2929,11 +2913,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-14" + "id": "libvirt-13" } { - "id": "libvirt-14", + "id": "libvirt-13", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -2945,11 +2929,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -2961,11 +2945,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -2977,11 +2961,11 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" @@ -2993,7 +2977,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -3105,7 +3089,7 @@ "type": "bool" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -3113,7 +3097,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -3227,7 +3211,7 @@ "type": "uint64" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -3235,7 +3219,7 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -3311,7 +3295,7 @@ "type": "uint16" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -3319,7 +3303,7 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -3382,7 +3366,7 @@ "type": "int32" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -3390,7 +3374,7 @@ "arguments": { "typename": "usb-redir" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -3439,7 +3423,7 @@ "type": "bool" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -3447,7 +3431,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3516,7 +3500,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3524,7 +3508,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -3551,7 +3535,7 @@ "type": "uint32" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -3559,7 +3543,7 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -3601,7 +3585,7 @@ "type": "bool" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -3609,7 +3593,7 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -3691,7 +3675,7 @@ "type": "uint64" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -3699,7 +3683,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3772,7 +3756,7 @@ "type": "uint16" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3780,7 +3764,7 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3794,7 +3778,7 @@ "type": "LostTickPolicy" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3802,7 +3786,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3859,7 +3843,7 @@ "type": "int32" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3867,7 +3851,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -3910,7 +3894,7 @@ "type": "int32" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -3918,7 +3902,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -4013,7 +3997,7 @@ "type": "uint32" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -4021,7 +4005,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -4182,7 +4166,7 @@ "type": "str" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -4190,7 +4174,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -4247,7 +4231,7 @@ "type": "size" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -4255,7 +4239,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -4351,7 +4335,7 @@ "type": "uint32" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -4359,7 +4343,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -4502,7 +4486,7 @@ "type": "str" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -4510,11 +4494,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-36" + "id": "libvirt-35" } { - "id": "libvirt-36", + "id": "libvirt-35", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -4526,7 +4510,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -4570,7 +4554,7 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -4578,7 +4562,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -4658,7 +4642,7 @@ "type": "uint32" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -4666,7 +4650,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -4701,7 +4685,7 @@ "type": "bool" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -4709,7 +4693,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -4752,12 +4736,12 @@ "type": "int32" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-machines", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -4946,12 +4930,12 @@ "cpu-max": 288 } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-cpu-definitions", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -5265,24 +5249,24 @@ "migration-safe": true } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-tpm-models", - "id": "libvirt-43" + "id": "libvirt-42" } { "return": [ "tpm-tis" ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-tpm-types", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -5290,12 +5274,12 @@ "passthrough", "emulator" ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-command-line-options", - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -6590,12 +6574,12 @@ "option": "drive" } ], - "id": "libvirt-45" + "id": "libvirt-44" } { "execute": "query-migrate-capabilities", - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -6653,12 +6637,12 @@ "capability": "x-multifd" } ], - "id": "libvirt-46" + "id": "libvirt-45" } { "execute": "query-qmp-schema", - "id": "libvirt-47" + "id": "libvirt-46" } { @@ -16526,7 +16510,7 @@ "meta-type": "object" } ], - "id": "libvirt-47" + "id": "libvirt-46" } { @@ -16537,7 +16521,7 @@ "name": "host" } }, - "id": "libvirt-48" + "id": "libvirt-47" } { @@ -16717,7 +16701,7 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-47" } { @@ -16899,7 +16883,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -17144,7 +17128,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -17158,7 +17142,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -17338,7 +17322,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -17520,7 +17504,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { @@ -17765,7 +17749,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml index c22d8507a6..69f3f2c82f 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml @@ -209,7 +209,7 @@ 2011000 0 - 371455 + 371242 (v2.11.0) x86_64 diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies index 9a8e54c63d..85e52dc1d3 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies @@ -540,25 +540,9 @@ "id": "libvirt-5" } -{ - "execute": "block-commit", - "arguments": { - "device": "bogus" - }, - "id": "libvirt-6" -} - -{ - "id": "libvirt-6", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'bogus' not found" - } -} - { "execute": "query-kvm", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -566,12 +550,12 @@ "enabled": true, "present": true }, - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "query-events", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -694,12 +678,12 @@ "name": "SHUTDOWN" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { "execute": "qom-list-types", - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -3517,7 +3501,7 @@ "parent": "rng-backend" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -3525,7 +3509,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -3757,7 +3741,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -3765,7 +3749,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -4060,7 +4044,7 @@ "type": "uint16" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -4068,7 +4052,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -4233,7 +4217,7 @@ "type": "str" } ], - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -4241,11 +4225,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -4257,11 +4241,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-14" + "id": "libvirt-13" } { - "id": "libvirt-14", + "id": "libvirt-13", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -4273,11 +4257,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -4289,11 +4273,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -4305,11 +4289,11 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" @@ -4321,7 +4305,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -4447,7 +4431,7 @@ "type": "str" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -4455,7 +4439,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -4569,7 +4553,7 @@ "type": "uint64" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -4577,7 +4561,7 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -4653,7 +4637,7 @@ "type": "uint16" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -4661,11 +4645,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-21" + "id": "libvirt-20" } { - "id": "libvirt-21", + "id": "libvirt-20", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -4677,7 +4661,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -4746,7 +4730,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -4754,7 +4738,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -4785,7 +4769,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -4793,11 +4777,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-24" + "id": "libvirt-23" } { - "id": "libvirt-24", + "id": "libvirt-23", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -4809,11 +4793,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-25" + "id": "libvirt-24" } { - "id": "libvirt-25", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -4825,7 +4809,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -4898,7 +4882,7 @@ "type": "uint16" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -4906,11 +4890,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-27" + "id": "libvirt-26" } { - "id": "libvirt-27", + "id": "libvirt-26", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -4922,7 +4906,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -4979,7 +4963,7 @@ "type": "int32" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -4987,7 +4971,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -5138,7 +5122,7 @@ "type": "str" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -5146,7 +5130,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -5193,7 +5177,7 @@ "type": "size" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -5201,11 +5185,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-31" + "id": "libvirt-30" } { - "id": "libvirt-31", + "id": "libvirt-30", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -5217,7 +5201,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -5360,7 +5344,7 @@ "type": "str" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -5368,11 +5352,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-33" + "id": "libvirt-32" } { - "id": "libvirt-33", + "id": "libvirt-32", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -5384,7 +5368,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -5428,7 +5412,7 @@ "type": "bool" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -5436,7 +5420,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -5516,7 +5500,7 @@ "type": "uint32" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -5524,7 +5508,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -5578,7 +5562,7 @@ "type": "string" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -5586,11 +5570,11 @@ "arguments": { "typename": "spapr-machine" }, - "id": "libvirt-37" + "id": "libvirt-36" } { - "id": "libvirt-37", + "id": "libvirt-36", "error": { "class": "DeviceNotFound", "desc": "Class 'spapr-machine' not found" @@ -5599,7 +5583,7 @@ { "execute": "query-machines", - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -5896,12 +5880,12 @@ "cpu-max": 1 } ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-cpu-definitions", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -6077,35 +6061,35 @@ "static": false } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-tpm-models", - "id": "libvirt-40" + "id": "libvirt-39" } { "return": [ ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-tpm-types", - "id": "libvirt-41" + "id": "libvirt-40" } { "return": [ "emulator" ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-command-line-options", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -7266,12 +7250,12 @@ "option": "drive" } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-migrate-capabilities", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -7333,12 +7317,12 @@ "capability": "dirty-bitmaps" } ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-qmp-schema", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -18706,12 +18690,12 @@ "meta-type": "object" } ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-gic-capabilities", - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -18727,7 +18711,7 @@ "kernel": false } ], - "id": "libvirt-45" + "id": "libvirt-44" } { diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml index 72407c9990..926db70f80 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml @@ -172,7 +172,7 @@ 2011090 0 - 347550 + 347337 v2.12.0-rc0 aarch64 diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies index 4f819150fe..e544ae3089 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies @@ -537,25 +537,9 @@ "id": "libvirt-5" } -{ - "execute": "block-commit", - "arguments": { - "device": "bogus" - }, - "id": "libvirt-6" -} - -{ - "id": "libvirt-6", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'bogus' not found" - } -} - { "execute": "query-kvm", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -563,12 +547,12 @@ "enabled": true, "present": true }, - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "query-events", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -691,12 +675,12 @@ "name": "SHUTDOWN" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { "execute": "qom-list-types", - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -3506,7 +3490,7 @@ "parent": "e500v2-family-powerpc64-cpu" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -3514,7 +3498,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -3746,7 +3730,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -3754,7 +3738,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -4049,7 +4033,7 @@ "type": "uint16" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -4057,7 +4041,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -4222,7 +4206,7 @@ "type": "str" } ], - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -4230,11 +4214,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -4246,11 +4230,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-14" + "id": "libvirt-13" } { - "id": "libvirt-14", + "id": "libvirt-13", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -4262,11 +4246,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -4278,11 +4262,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -4294,11 +4278,11 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" @@ -4310,7 +4294,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -4436,7 +4420,7 @@ "type": "str" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -4444,7 +4428,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -4558,7 +4542,7 @@ "type": "uint64" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -4566,7 +4550,7 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -4642,7 +4626,7 @@ "type": "uint16" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -4650,11 +4634,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-21" + "id": "libvirt-20" } { - "id": "libvirt-21", + "id": "libvirt-20", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -4666,7 +4650,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -4735,7 +4719,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -4743,7 +4727,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -4774,7 +4758,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -4782,11 +4766,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-24" + "id": "libvirt-23" } { - "id": "libvirt-24", + "id": "libvirt-23", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -4798,11 +4782,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-25" + "id": "libvirt-24" } { - "id": "libvirt-25", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -4814,7 +4798,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -4887,7 +4871,7 @@ "type": "uint16" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -4895,11 +4879,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-27" + "id": "libvirt-26" } { - "id": "libvirt-27", + "id": "libvirt-26", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -4911,7 +4895,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -4968,7 +4952,7 @@ "type": "int32" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -4976,7 +4960,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -5127,7 +5111,7 @@ "type": "str" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -5135,7 +5119,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -5182,7 +5166,7 @@ "type": "size" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -5190,11 +5174,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-31" + "id": "libvirt-30" } { - "id": "libvirt-31", + "id": "libvirt-30", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -5206,7 +5190,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -5349,7 +5333,7 @@ "type": "str" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -5357,11 +5341,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-33" + "id": "libvirt-32" } { - "id": "libvirt-33", + "id": "libvirt-32", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -5373,7 +5357,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -5417,7 +5401,7 @@ "type": "bool" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -5425,7 +5409,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -5505,7 +5489,7 @@ "type": "uint32" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -5513,7 +5497,7 @@ "arguments": { "typename": "spapr-pci-host-bridge" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -5571,7 +5555,7 @@ "type": "uint32" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -5579,7 +5563,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -5633,7 +5617,7 @@ "type": "string" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -5641,7 +5625,7 @@ "arguments": { "typename": "spapr-machine" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -5802,12 +5786,12 @@ "type": "bool" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-machines", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -5945,12 +5929,12 @@ "cpu-max": 1 } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-cpu-definitions", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -8146,35 +8130,35 @@ "static": false } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-tpm-models", - "id": "libvirt-41" + "id": "libvirt-40" } { "return": [ ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-tpm-types", - "id": "libvirt-42" + "id": "libvirt-41" } { "return": [ "emulator" ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-command-line-options", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -9330,12 +9314,12 @@ "option": "drive" } ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-migrate-capabilities", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -9397,12 +9381,12 @@ "capability": "dirty-bitmaps" } ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-qmp-schema", - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -20770,7 +20754,7 @@ "meta-type": "object" } ], - "id": "libvirt-45" + "id": "libvirt-44" } { diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml index d94082600f..66a77638a5 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml @@ -170,7 +170,7 @@ 2011090 0 - 428334 + 428121 v2.12.0-rc0 ppc64 diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies index 0a028a2fe6..70456d725c 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies @@ -549,25 +549,9 @@ "id": "libvirt-5" } -{ - "execute": "block-commit", - "arguments": { - "device": "bogus" - }, - "id": "libvirt-6" -} - -{ - "id": "libvirt-6", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'bogus' not found" - } -} - { "execute": "query-kvm", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -575,12 +559,12 @@ "enabled": true, "present": true }, - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "query-events", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -703,12 +687,12 @@ "name": "SHUTDOWN" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { "execute": "qom-list-types", - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1658,7 +1642,7 @@ "parent": "virtio-device" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1666,7 +1650,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -1898,7 +1882,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -1906,7 +1890,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2201,7 +2185,7 @@ "type": "uint16" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2209,7 +2193,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -2374,7 +2358,7 @@ "type": "str" } ], - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -2382,7 +2366,7 @@ "arguments": { "typename": "virtio-blk-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { @@ -2524,7 +2508,7 @@ "type": "uint32" } ], - "id": "libvirt-13" + "id": "libvirt-12" } { @@ -2532,7 +2516,7 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -2741,7 +2725,7 @@ "type": "uint16" } ], - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -2749,7 +2733,7 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -2828,7 +2812,7 @@ "type": "uint32" } ], - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -2836,11 +2820,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -2852,11 +2836,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -2868,11 +2852,11 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-18" + "id": "libvirt-17" } { - "id": "libvirt-18", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" @@ -2884,7 +2868,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -3010,7 +2994,7 @@ "type": "str" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -3018,7 +3002,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -3136,7 +3120,7 @@ "type": "uint32" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -3144,11 +3128,11 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-21" + "id": "libvirt-20" } { - "id": "libvirt-21", + "id": "libvirt-20", "error": { "class": "DeviceNotFound", "desc": "Device 'ide-drive' not found" @@ -3160,11 +3144,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-22" + "id": "libvirt-21" } { - "id": "libvirt-22", + "id": "libvirt-21", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -3176,11 +3160,11 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-23" + "id": "libvirt-22" } { - "id": "libvirt-23", + "id": "libvirt-22", "error": { "class": "DeviceNotFound", "desc": "Device 'usb-host' not found" @@ -3192,7 +3176,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -3223,7 +3207,7 @@ "type": "uint32" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -3231,11 +3215,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-25" + "id": "libvirt-24" } { - "id": "libvirt-25", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -3247,11 +3231,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-26" + "id": "libvirt-25" } { - "id": "libvirt-26", + "id": "libvirt-25", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -3263,11 +3247,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-27" + "id": "libvirt-26" } { - "id": "libvirt-27", + "id": "libvirt-26", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -3279,7 +3263,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3430,7 +3414,7 @@ "type": "str" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3438,7 +3422,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3485,7 +3469,7 @@ "type": "size" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3493,11 +3477,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-30" + "id": "libvirt-29" } { - "id": "libvirt-30", + "id": "libvirt-29", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -3509,7 +3493,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3652,7 +3636,7 @@ "type": "str" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3660,7 +3644,7 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3722,7 +3706,7 @@ "type": "uint32" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3730,7 +3714,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3774,7 +3758,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3782,7 +3766,7 @@ "arguments": { "typename": "virtio-gpu-ccw" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -3847,7 +3831,7 @@ "type": "uint32" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -3855,7 +3839,7 @@ "arguments": { "typename": "virtual-css-bridge" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -3870,7 +3854,7 @@ "type": "bool" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -3878,7 +3862,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -3932,7 +3916,7 @@ "type": "string" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -3940,11 +3924,11 @@ "arguments": { "typename": "spapr-machine" }, - "id": "libvirt-37" + "id": "libvirt-36" } { - "id": "libvirt-37", + "id": "libvirt-36", "error": { "class": "DeviceNotFound", "desc": "Class 'spapr-machine' not found" @@ -3953,7 +3937,7 @@ { "execute": "query-machines", - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -4011,12 +3995,12 @@ "alias": "s390-ccw-virtio" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-cpu-definitions", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -4551,35 +4535,35 @@ "migration-safe": true } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-tpm-models", - "id": "libvirt-40" + "id": "libvirt-39" } { "return": [ ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-tpm-types", - "id": "libvirt-41" + "id": "libvirt-40" } { "return": [ "emulator" ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-command-line-options", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -5704,12 +5688,12 @@ "option": "drive" } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-migrate-capabilities", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -5771,12 +5755,12 @@ "capability": "dirty-bitmaps" } ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-qmp-schema", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -17144,7 +17128,7 @@ "meta-type": "object" } ], - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -17155,7 +17139,7 @@ "name": "host" } }, - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -17193,7 +17177,7 @@ } } }, - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -17207,11 +17191,11 @@ } } }, - "id": "libvirt-46" + "id": "libvirt-45" } { - "id": "libvirt-46", + "id": "libvirt-45", "error": { "class": "GenericError", "desc": "Property '.migratable' not found" diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml index e5b7ffc433..f7c54df0d7 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml @@ -136,7 +136,7 @@ 2012000 0 - 375999 + 375786 s390x diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies index 6f37e4301e..d0a691dab9 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies @@ -555,25 +555,9 @@ "id": "libvirt-5" } -{ - "execute": "block-commit", - "arguments": { - "device": "bogus" - }, - "id": "libvirt-6" -} - -{ - "id": "libvirt-6", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'bogus' not found" - } -} - { "execute": "query-kvm", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -581,12 +565,12 @@ "enabled": true, "present": true }, - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "query-events", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -709,12 +693,12 @@ "name": "SHUTDOWN" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { "execute": "qom-list-types", - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2364,7 +2348,7 @@ "parent": "rng-backend" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2372,7 +2356,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2604,7 +2588,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2612,7 +2596,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2907,7 +2891,7 @@ "type": "uint16" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2915,7 +2899,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -3080,7 +3064,7 @@ "type": "str" } ], - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -3088,11 +3072,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -3104,11 +3088,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-14" + "id": "libvirt-13" } { - "id": "libvirt-14", + "id": "libvirt-13", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -3120,11 +3104,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -3136,11 +3120,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -3152,11 +3136,11 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" @@ -3168,7 +3152,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -3294,7 +3278,7 @@ "type": "str" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -3302,7 +3286,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -3416,7 +3400,7 @@ "type": "uint64" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -3424,7 +3408,7 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -3500,7 +3484,7 @@ "type": "uint16" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -3508,7 +3492,7 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -3571,7 +3555,7 @@ "type": "int32" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -3579,7 +3563,7 @@ "arguments": { "typename": "usb-redir" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -3628,7 +3612,7 @@ "type": "bool" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -3636,7 +3620,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3705,7 +3689,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3713,7 +3697,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -3744,7 +3728,7 @@ "type": "uint32" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -3752,7 +3736,7 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -3794,7 +3778,7 @@ "type": "bool" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -3802,7 +3786,7 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -3884,7 +3868,7 @@ "type": "uint64" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -3892,7 +3876,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3965,7 +3949,7 @@ "type": "uint16" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3973,7 +3957,7 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3987,7 +3971,7 @@ "type": "LostTickPolicy" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3995,7 +3979,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -4052,7 +4036,7 @@ "type": "int32" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -4060,7 +4044,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -4103,7 +4087,7 @@ "type": "int32" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -4111,7 +4095,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -4206,7 +4190,7 @@ "type": "uint32" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -4214,7 +4198,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -4365,7 +4349,7 @@ "type": "str" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -4373,7 +4357,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -4420,7 +4404,7 @@ "type": "size" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -4428,7 +4412,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -4524,7 +4508,7 @@ "type": "uint32" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -4532,7 +4516,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -4675,7 +4659,7 @@ "type": "str" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -4683,11 +4667,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-36" + "id": "libvirt-35" } { - "id": "libvirt-36", + "id": "libvirt-35", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -4699,7 +4683,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -4743,7 +4727,7 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -4751,7 +4735,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -4831,7 +4815,7 @@ "type": "uint32" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -4839,7 +4823,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -4878,7 +4862,7 @@ "type": "bool" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -4886,7 +4870,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -4929,7 +4913,7 @@ "type": "int32" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -4937,7 +4921,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -4991,7 +4975,7 @@ "type": "string" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -4999,11 +4983,11 @@ "arguments": { "typename": "spapr-machine" }, - "id": "libvirt-42" + "id": "libvirt-41" } { - "id": "libvirt-42", + "id": "libvirt-41", "error": { "class": "DeviceNotFound", "desc": "Class 'spapr-machine' not found" @@ -5012,7 +4996,7 @@ { "execute": "query-machines", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -5211,12 +5195,12 @@ "cpu-max": 255 } ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-cpu-definitions", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -5730,12 +5714,12 @@ "migration-safe": true } ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-tpm-models", - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -5743,12 +5727,12 @@ "tpm-crb", "tpm-tis" ], - "id": "libvirt-45" + "id": "libvirt-44" } { "execute": "query-tpm-types", - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -5756,12 +5740,12 @@ "passthrough", "emulator" ], - "id": "libvirt-46" + "id": "libvirt-45" } { "execute": "query-command-line-options", - "id": "libvirt-47" + "id": "libvirt-46" } { @@ -7048,12 +7032,12 @@ "option": "drive" } ], - "id": "libvirt-47" + "id": "libvirt-46" } { "execute": "query-migrate-capabilities", - "id": "libvirt-48" + "id": "libvirt-47" } { @@ -7115,12 +7099,12 @@ "capability": "dirty-bitmaps" } ], - "id": "libvirt-48" + "id": "libvirt-47" } { "execute": "query-qmp-schema", - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -18488,7 +18472,7 @@ "meta-type": "object" } ], - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -18499,7 +18483,7 @@ "name": "host" } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -18689,7 +18673,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -18881,7 +18865,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { @@ -19136,7 +19120,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { @@ -19150,7 +19134,7 @@ } } }, - "id": "libvirt-52" + "id": "libvirt-51" } { @@ -19340,7 +19324,7 @@ } } }, - "id": "libvirt-52" + "id": "libvirt-51" } { @@ -19532,7 +19516,7 @@ } } }, - "id": "libvirt-53" + "id": "libvirt-52" } { @@ -19787,12 +19771,12 @@ } } }, - "id": "libvirt-53" + "id": "libvirt-52" } { "execute": "query-sev-capabilities", - "id": "libvirt-54" + "id": "libvirt-53" } { @@ -19802,7 +19786,7 @@ "cert-chain": "AQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAA", "pdh": "AQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAA" }, - "id": "libvirt-54" + "id": "libvirt-53" } { diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml index d134e5632d..9c8a2d4a3d 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml @@ -214,7 +214,7 @@ 2011090 0 - 416196 + 415983 v2.12.0-rc0 x86_64 diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies index 20d0000c84..8fcec6431a 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies @@ -471,25 +471,9 @@ "id": "libvirt-5" } -{ - "execute": "block-commit", - "arguments": { - "device": "bogus" - }, - "id": "libvirt-6" -} - -{ - "id": "libvirt-6", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'bogus' not found" - } -} - { "execute": "query-kvm", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -497,12 +481,12 @@ "enabled": true, "present": true }, - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "query-events", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -613,12 +597,12 @@ "name": "ACPI_DEVICE_OST" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { "execute": "qom-list-types", - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1524,7 +1508,7 @@ "name": "virtio-blk-device" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1532,7 +1516,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -1694,7 +1678,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -1702,7 +1686,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -1930,7 +1914,7 @@ "type": "str" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -1938,7 +1922,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -2056,7 +2040,7 @@ "type": "uint32" } ], - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -2064,11 +2048,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -2080,11 +2064,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-14" + "id": "libvirt-13" } { - "id": "libvirt-14", + "id": "libvirt-13", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -2096,11 +2080,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -2112,11 +2096,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -2128,7 +2112,7 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -2180,7 +2164,7 @@ "type": "bool" } ], - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -2188,7 +2172,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -2272,7 +2256,7 @@ "type": "bool" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -2280,7 +2264,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2375,7 +2359,7 @@ "type": "uint64" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2383,7 +2367,7 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -2440,7 +2424,7 @@ "type": "uint16" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -2448,7 +2432,7 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -2501,7 +2485,7 @@ "type": "int32" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -2509,7 +2493,7 @@ "arguments": { "typename": "usb-redir" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -2550,7 +2534,7 @@ "type": "bool" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -2558,7 +2542,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -2623,7 +2607,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -2631,7 +2615,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -2658,7 +2642,7 @@ "type": "uint32" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -2666,7 +2650,7 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -2704,7 +2688,7 @@ "type": "child" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -2712,7 +2696,7 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -2766,7 +2750,7 @@ "type": "child" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -2774,7 +2758,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -2834,7 +2818,7 @@ "type": "uint16" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -2842,7 +2826,7 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -2856,7 +2840,7 @@ "type": "LostTickPolicy" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -2864,7 +2848,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -2911,7 +2895,7 @@ "type": "int32" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -2919,7 +2903,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -2952,7 +2936,7 @@ "type": "int32" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -2960,7 +2944,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3037,7 +3021,7 @@ "type": "uint32" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3045,7 +3029,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3151,7 +3135,7 @@ "type": "uint32" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3159,7 +3143,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3199,7 +3183,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3207,7 +3191,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -3284,7 +3268,7 @@ "type": "uint32" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -3292,7 +3276,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -3392,7 +3376,7 @@ "type": "bool" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -3400,11 +3384,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-36" + "id": "libvirt-35" } { - "id": "libvirt-36", + "id": "libvirt-35", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -3416,7 +3400,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -3455,7 +3439,7 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -3463,7 +3447,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -3533,7 +3517,7 @@ "type": "uint32" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -3541,7 +3525,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -3551,7 +3535,7 @@ "type": "uint32" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -3559,7 +3543,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -3585,12 +3569,12 @@ "type": "pci-devfn" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-machines", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -3727,12 +3711,12 @@ "cpu-max": 255 } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-cpu-definitions", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -3822,36 +3806,36 @@ "name": "qemu64" } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-tpm-models", - "id": "libvirt-43" + "id": "libvirt-42" } { "return": [ "tpm-tis" ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-tpm-types", - "id": "libvirt-44" + "id": "libvirt-43" } { "return": [ "passthrough" ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-command-line-options", - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -4896,12 +4880,12 @@ "option": "drive" } ], - "id": "libvirt-45" + "id": "libvirt-44" } { "execute": "query-migrate-capabilities", - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -4935,12 +4919,12 @@ "capability": "x-postcopy-ram" } ], - "id": "libvirt-46" + "id": "libvirt-45" } { "execute": "query-qmp-schema", - "id": "libvirt-47" + "id": "libvirt-46" } { @@ -12485,7 +12469,7 @@ "meta-type": "array" } ], - "id": "libvirt-47" + "id": "libvirt-46" } { diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml index 1055b367fb..ffa2b87f8b 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml @@ -164,7 +164,7 @@ 2005000 0 - 221513 + 221300 x86_64 diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies index fd08db576a..35cbc575f3 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies @@ -474,25 +474,9 @@ "id": "libvirt-5" } -{ - "execute": "block-commit", - "arguments": { - "device": "bogus" - }, - "id": "libvirt-6" -} - -{ - "id": "libvirt-6", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'bogus' not found" - } -} - { "execute": "query-kvm", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -500,12 +484,12 @@ "enabled": true, "present": true }, - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "query-events", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -622,12 +606,12 @@ "name": "ACPI_DEVICE_OST" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { "execute": "qom-list-types", - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2283,7 +2267,7 @@ "name": "fw-path-provider" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2291,7 +2275,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2453,7 +2437,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2461,7 +2445,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2689,7 +2673,7 @@ "type": "str" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2697,7 +2681,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -2815,7 +2799,7 @@ "type": "uint32" } ], - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -2823,11 +2807,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -2839,11 +2823,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-14" + "id": "libvirt-13" } { - "id": "libvirt-14", + "id": "libvirt-13", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -2855,11 +2839,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -2871,11 +2855,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -2887,11 +2871,11 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" @@ -2903,7 +2887,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -2991,7 +2975,7 @@ "type": "bool" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -2999,7 +2983,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -3094,7 +3078,7 @@ "type": "uint64" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -3102,7 +3086,7 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -3159,7 +3143,7 @@ "type": "uint16" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -3167,11 +3151,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-21" + "id": "libvirt-20" } { - "id": "libvirt-21", + "id": "libvirt-20", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -3183,7 +3167,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -3248,7 +3232,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -3256,7 +3240,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3283,7 +3267,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3291,11 +3275,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-24" + "id": "libvirt-23" } { - "id": "libvirt-24", + "id": "libvirt-23", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -3307,11 +3291,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-25" + "id": "libvirt-24" } { - "id": "libvirt-25", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -3323,7 +3307,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -3383,7 +3367,7 @@ "type": "uint16" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -3391,11 +3375,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-27" + "id": "libvirt-26" } { - "id": "libvirt-27", + "id": "libvirt-26", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -3407,7 +3391,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3454,7 +3438,7 @@ "type": "int32" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3462,7 +3446,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3558,7 +3542,7 @@ "type": "uint32" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3566,7 +3550,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -3596,7 +3580,7 @@ "type": "uint32" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -3604,11 +3588,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-31" + "id": "libvirt-30" } { - "id": "libvirt-31", + "id": "libvirt-30", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -3620,7 +3604,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3720,7 +3704,7 @@ "type": "bool" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3728,11 +3712,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-33" + "id": "libvirt-32" } { - "id": "libvirt-33", + "id": "libvirt-32", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -3744,7 +3728,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -3783,7 +3767,7 @@ "type": "bool" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -3791,7 +3775,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -3861,12 +3845,12 @@ "type": "uint32" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-machines", - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -4041,12 +4025,12 @@ "cpu-max": 1 } ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-cpu-definitions", - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -4145,34 +4129,34 @@ "name": "pxa270" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-tpm-models", - "id": "libvirt-38" + "id": "libvirt-37" } { "return": [ ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-tpm-types", - "id": "libvirt-39" + "id": "libvirt-38" } { "return": [ ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-command-line-options", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -5144,12 +5128,12 @@ "option": "drive" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-migrate-capabilities", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -5183,12 +5167,12 @@ "capability": "postcopy-ram" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-qmp-schema", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -13193,12 +13177,12 @@ "meta-type": "array" } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-gic-capabilities", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -13214,7 +13198,7 @@ "kernel": true } ], - "id": "libvirt-43" + "id": "libvirt-42" } { diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml index 31f78d3a7a..70b5c4896f 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml @@ -145,7 +145,7 @@ 2006000 0 - 232358 + 232145 aarch64 diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies index 4406214e62..d0f8998634 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies @@ -471,25 +471,9 @@ "id": "libvirt-5" } -{ - "execute": "block-commit", - "arguments": { - "device": "bogus" - }, - "id": "libvirt-6" -} - -{ - "id": "libvirt-6", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'bogus' not found" - } -} - { "execute": "query-kvm", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -497,12 +481,12 @@ "enabled": true, "present": true }, - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "query-events", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -619,12 +603,12 @@ "name": "ACPI_DEVICE_OST" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { "execute": "qom-list-types", - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2433,7 +2417,7 @@ "name": "fw-path-provider" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2441,7 +2425,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2603,7 +2587,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2611,7 +2595,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2839,7 +2823,7 @@ "type": "str" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2847,7 +2831,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -2965,7 +2949,7 @@ "type": "uint32" } ], - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -2973,11 +2957,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -2989,11 +2973,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-14" + "id": "libvirt-13" } { - "id": "libvirt-14", + "id": "libvirt-13", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -3005,11 +2989,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -3021,11 +3005,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -3037,11 +3021,11 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" @@ -3053,7 +3037,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -3141,7 +3125,7 @@ "type": "bool" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -3149,7 +3133,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -3244,7 +3228,7 @@ "type": "uint64" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -3252,7 +3236,7 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -3309,7 +3293,7 @@ "type": "uint16" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -3317,11 +3301,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-21" + "id": "libvirt-20" } { - "id": "libvirt-21", + "id": "libvirt-20", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -3333,7 +3317,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -3398,7 +3382,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -3406,7 +3390,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3433,7 +3417,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3441,11 +3425,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-24" + "id": "libvirt-23" } { - "id": "libvirt-24", + "id": "libvirt-23", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -3457,11 +3441,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-25" + "id": "libvirt-24" } { - "id": "libvirt-25", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -3473,7 +3457,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -3533,7 +3517,7 @@ "type": "uint16" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -3541,11 +3525,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-27" + "id": "libvirt-26" } { - "id": "libvirt-27", + "id": "libvirt-26", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -3557,7 +3541,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3604,7 +3588,7 @@ "type": "int32" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3612,7 +3596,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3708,7 +3692,7 @@ "type": "uint32" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3716,7 +3700,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -3746,7 +3730,7 @@ "type": "uint32" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -3754,11 +3738,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-31" + "id": "libvirt-30" } { - "id": "libvirt-31", + "id": "libvirt-30", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -3770,7 +3754,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3870,7 +3854,7 @@ "type": "bool" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3878,11 +3862,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-33" + "id": "libvirt-32" } { - "id": "libvirt-33", + "id": "libvirt-32", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -3894,7 +3878,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -3933,7 +3917,7 @@ "type": "bool" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -3941,7 +3925,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -4011,7 +3995,7 @@ "type": "uint32" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -4019,7 +4003,7 @@ "arguments": { "typename": "spapr-pci-host-bridge" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -4065,12 +4049,12 @@ "type": "uint32" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-machines", - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -4142,12 +4126,12 @@ "cpu-max": 255 } ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-cpu-definitions", - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -5449,34 +5433,34 @@ "name": "MPC8541E_v11" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-tpm-models", - "id": "libvirt-39" + "id": "libvirt-38" } { "return": [ ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-tpm-types", - "id": "libvirt-40" + "id": "libvirt-39" } { "return": [ ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-command-line-options", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -6443,12 +6427,12 @@ "option": "drive" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-migrate-capabilities", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -6482,12 +6466,12 @@ "capability": "postcopy-ram" } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-qmp-schema", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -14492,7 +14476,7 @@ "meta-type": "array" } ], - "id": "libvirt-43" + "id": "libvirt-42" } { diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml index be091167d3..0155c85971 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml @@ -140,7 +140,7 @@ 2006000 0 - 267184 + 266971 ppc64 diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies index c8b8f44e95..db84cdf840 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies @@ -477,25 +477,9 @@ "id": "libvirt-5" } -{ - "execute": "block-commit", - "arguments": { - "device": "bogus" - }, - "id": "libvirt-6" -} - -{ - "id": "libvirt-6", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'bogus' not found" - } -} - { "execute": "query-kvm", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -503,12 +487,12 @@ "enabled": true, "present": true }, - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "query-events", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -625,12 +609,12 @@ "name": "ACPI_DEVICE_OST" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { "execute": "qom-list-types", - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1602,7 +1586,7 @@ "name": "virtio-blk-device" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1610,7 +1594,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -1772,7 +1756,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -1780,7 +1764,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2008,7 +1992,7 @@ "type": "str" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2016,7 +2000,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -2134,7 +2118,7 @@ "type": "uint32" } ], - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -2142,11 +2126,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -2158,11 +2142,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-14" + "id": "libvirt-13" } { - "id": "libvirt-14", + "id": "libvirt-13", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -2174,11 +2158,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -2190,11 +2174,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -2206,7 +2190,7 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -2258,7 +2242,7 @@ "type": "bool" } ], - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -2266,7 +2250,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -2354,7 +2338,7 @@ "type": "bool" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -2362,7 +2346,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2457,7 +2441,7 @@ "type": "uint64" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2465,7 +2449,7 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -2522,7 +2506,7 @@ "type": "uint16" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -2530,7 +2514,7 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -2583,7 +2567,7 @@ "type": "int32" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -2591,7 +2575,7 @@ "arguments": { "typename": "usb-redir" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -2632,7 +2616,7 @@ "type": "bool" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -2640,7 +2624,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -2705,7 +2689,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -2713,7 +2697,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -2740,7 +2724,7 @@ "type": "uint32" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -2748,7 +2732,7 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -2786,7 +2770,7 @@ "type": "child" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -2794,7 +2778,7 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -2848,7 +2832,7 @@ "type": "child" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -2856,7 +2840,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -2916,7 +2900,7 @@ "type": "uint16" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -2924,7 +2908,7 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -2938,7 +2922,7 @@ "type": "LostTickPolicy" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -2946,7 +2930,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -2993,7 +2977,7 @@ "type": "int32" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3001,7 +2985,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -3034,7 +3018,7 @@ "type": "int32" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -3042,7 +3026,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3119,7 +3103,7 @@ "type": "uint32" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3127,7 +3111,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3233,7 +3217,7 @@ "type": "uint32" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3241,7 +3225,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3281,7 +3265,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3289,7 +3273,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -3366,7 +3350,7 @@ "type": "uint32" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -3374,7 +3358,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -3474,7 +3458,7 @@ "type": "bool" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -3482,11 +3466,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-36" + "id": "libvirt-35" } { - "id": "libvirt-36", + "id": "libvirt-35", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -3498,7 +3482,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -3537,7 +3521,7 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -3545,7 +3529,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -3615,7 +3599,7 @@ "type": "uint32" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -3623,7 +3607,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -3633,7 +3617,7 @@ "type": "uint32" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -3641,7 +3625,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -3667,12 +3651,12 @@ "type": "pci-devfn" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-machines", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -3785,12 +3769,12 @@ "cpu-max": 255 } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-cpu-definitions", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -3880,36 +3864,36 @@ "name": "qemu64" } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-tpm-models", - "id": "libvirt-43" + "id": "libvirt-42" } { "return": [ "tpm-tis" ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-tpm-types", - "id": "libvirt-44" + "id": "libvirt-43" } { "return": [ "passthrough" ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-command-line-options", - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -5003,12 +4987,12 @@ "option": "drive" } ], - "id": "libvirt-45" + "id": "libvirt-44" } { "execute": "query-migrate-capabilities", - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -5042,12 +5026,12 @@ "capability": "postcopy-ram" } ], - "id": "libvirt-46" + "id": "libvirt-45" } { "execute": "query-qmp-schema", - "id": "libvirt-47" + "id": "libvirt-46" } { @@ -13052,7 +13036,7 @@ "meta-type": "array" } ], - "id": "libvirt-47" + "id": "libvirt-46" } { diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml index ea2623c9ef..e7bf91cc64 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml @@ -176,7 +176,7 @@ 2006000 0 - 232317 + 232104 x86_64 diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies index f92b8f9803..81362ae7ad 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies @@ -483,25 +483,9 @@ "id": "libvirt-5" } -{ - "execute": "block-commit", - "arguments": { - "device": "bogus" - }, - "id": "libvirt-6" -} - -{ - "id": "libvirt-6", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'bogus' not found" - } -} - { "execute": "query-kvm", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -509,12 +493,12 @@ "enabled": true, "present": true }, - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "query-events", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -631,12 +615,12 @@ "name": "ACPI_DEVICE_OST" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { "execute": "qom-list-types", - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1014,7 +998,7 @@ "name": "s390-skeys-kvm" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1022,7 +1006,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -1207,7 +1191,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -1215,7 +1199,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -1447,7 +1431,7 @@ "type": "str" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -1455,7 +1439,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -1577,7 +1561,7 @@ "type": "str" } ], - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -1585,7 +1569,7 @@ "arguments": { "typename": "virtio-blk-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { @@ -1714,7 +1698,7 @@ "type": "uint32" } ], - "id": "libvirt-13" + "id": "libvirt-12" } { @@ -1722,7 +1706,7 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -1902,7 +1886,7 @@ "type": "bool" } ], - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -1910,7 +1894,7 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -1980,7 +1964,7 @@ "type": "uint32" } ], - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -1988,11 +1972,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -2004,11 +1988,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -2020,11 +2004,11 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-18" + "id": "libvirt-17" } { - "id": "libvirt-18", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" @@ -2036,7 +2020,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2138,7 +2122,7 @@ "type": "bool" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2146,7 +2130,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -2256,7 +2240,7 @@ "type": "uint64" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -2264,11 +2248,11 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-21" + "id": "libvirt-20" } { - "id": "libvirt-21", + "id": "libvirt-20", "error": { "class": "DeviceNotFound", "desc": "Device 'ide-drive' not found" @@ -2280,11 +2264,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-22" + "id": "libvirt-21" } { - "id": "libvirt-22", + "id": "libvirt-21", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -2296,11 +2280,11 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-23" + "id": "libvirt-22" } { - "id": "libvirt-23", + "id": "libvirt-22", "error": { "class": "DeviceNotFound", "desc": "Device 'usb-host' not found" @@ -2312,7 +2296,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -2339,7 +2323,7 @@ "type": "uint32" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -2347,11 +2331,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-25" + "id": "libvirt-24" } { - "id": "libvirt-25", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -2363,11 +2347,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-26" + "id": "libvirt-25" } { - "id": "libvirt-26", + "id": "libvirt-25", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -2379,11 +2363,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-27" + "id": "libvirt-26" } { - "id": "libvirt-27", + "id": "libvirt-26", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -2395,7 +2379,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -2495,7 +2479,7 @@ "type": "uint32" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -2503,7 +2487,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -2533,7 +2517,7 @@ "type": "uint32" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -2541,11 +2525,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-30" + "id": "libvirt-29" } { - "id": "libvirt-30", + "id": "libvirt-29", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -2557,7 +2541,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -2661,7 +2645,7 @@ "type": "bool" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -2669,7 +2653,7 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -2726,7 +2710,7 @@ "type": "uint32" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -2734,7 +2718,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -2773,7 +2757,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -2781,7 +2765,7 @@ "arguments": { "typename": "virtual-css-bridge" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -2791,12 +2775,12 @@ "type": "bool" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { "execute": "query-machines", - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -2829,12 +2813,12 @@ "cpu-max": 248 } ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-cpu-definitions", - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -2843,34 +2827,34 @@ "name": "host" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-tpm-models", - "id": "libvirt-37" + "id": "libvirt-36" } { "return": [ ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-tpm-types", - "id": "libvirt-38" + "id": "libvirt-37" } { "return": [ ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-command-line-options", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -3806,12 +3790,12 @@ "option": "drive" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-migrate-capabilities", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -3845,12 +3829,12 @@ "capability": "postcopy-ram" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-qmp-schema", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -12206,7 +12190,7 @@ "meta-type": "object" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml index adc3877bd8..459f2da46c 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml @@ -108,7 +108,7 @@ 2007000 0 - 220792 + 220579 s390x diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies index 89ad92f3ea..5de9e0b1ef 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies @@ -486,25 +486,9 @@ "id": "libvirt-5" } -{ - "execute": "block-commit", - "arguments": { - "device": "bogus" - }, - "id": "libvirt-6" -} - -{ - "id": "libvirt-6", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'bogus' not found" - } -} - { "execute": "query-kvm", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -512,12 +496,12 @@ "enabled": true, "present": true }, - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "query-events", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -634,12 +618,12 @@ "name": "ACPI_DEVICE_OST" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { "execute": "qom-list-types", - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1626,7 +1610,7 @@ "name": "virtio-blk-device" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1634,7 +1618,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -1819,7 +1803,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -1827,7 +1811,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2059,7 +2043,7 @@ "type": "str" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2067,7 +2051,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -2189,7 +2173,7 @@ "type": "str" } ], - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -2197,11 +2181,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -2213,11 +2197,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-14" + "id": "libvirt-13" } { - "id": "libvirt-14", + "id": "libvirt-13", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -2229,11 +2213,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -2245,11 +2229,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -2261,7 +2245,7 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -2318,7 +2302,7 @@ "type": "bool" } ], - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -2326,7 +2310,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -2428,7 +2412,7 @@ "type": "bool" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -2436,7 +2420,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2546,7 +2530,7 @@ "type": "uint64" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2554,7 +2538,7 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -2626,7 +2610,7 @@ "type": "uint16" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -2634,7 +2618,7 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -2692,7 +2676,7 @@ "type": "int32" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -2700,7 +2684,7 @@ "arguments": { "typename": "usb-redir" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -2749,7 +2733,7 @@ "type": "bool" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -2757,7 +2741,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -2826,7 +2810,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -2834,7 +2818,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -2861,7 +2845,7 @@ "type": "uint32" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -2869,7 +2853,7 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -2907,7 +2891,7 @@ "type": "child" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -2915,7 +2899,7 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -2993,7 +2977,7 @@ "type": "int" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -3001,7 +2985,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3070,7 +3054,7 @@ "type": "uint16" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3078,7 +3062,7 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3092,7 +3076,7 @@ "type": "LostTickPolicy" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3100,7 +3084,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3152,7 +3136,7 @@ "type": "int32" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3160,7 +3144,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -3198,7 +3182,7 @@ "type": "int32" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -3206,7 +3190,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3288,7 +3272,7 @@ "type": "uint32" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3296,7 +3280,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3406,7 +3390,7 @@ "type": "uint32" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3414,7 +3398,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3454,7 +3438,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3462,7 +3446,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -3548,7 +3532,7 @@ "type": "uint32" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -3556,7 +3540,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -3660,7 +3644,7 @@ "type": "bool" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -3668,11 +3652,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-36" + "id": "libvirt-35" } { - "id": "libvirt-36", + "id": "libvirt-35", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -3684,7 +3668,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -3723,7 +3707,7 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -3731,7 +3715,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -3806,7 +3790,7 @@ "type": "uint32" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -3814,7 +3798,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -3828,7 +3812,7 @@ "type": "bool" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -3836,7 +3820,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -3862,12 +3846,12 @@ "type": "pci-devfn" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-machines", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -4016,12 +4000,12 @@ "cpu-max": 255 } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-cpu-definitions", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -4114,36 +4098,36 @@ "name": "qemu64" } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-tpm-models", - "id": "libvirt-43" + "id": "libvirt-42" } { "return": [ "tpm-tis" ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-tpm-types", - "id": "libvirt-44" + "id": "libvirt-43" } { "return": [ "passthrough" ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-command-line-options", - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -5241,12 +5225,12 @@ "option": "drive" } ], - "id": "libvirt-45" + "id": "libvirt-44" } { "execute": "query-migrate-capabilities", - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -5280,12 +5264,12 @@ "capability": "postcopy-ram" } ], - "id": "libvirt-46" + "id": "libvirt-45" } { "execute": "query-qmp-schema", - "id": "libvirt-47" + "id": "libvirt-46" } { @@ -13641,7 +13625,7 @@ "meta-type": "object" } ], - "id": "libvirt-47" + "id": "libvirt-46" } { diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml index 00557a9783..defd5554e6 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml @@ -181,7 +181,7 @@ 2007000 0 - 244005 + 243792 (v2.7.0) x86_64 diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies index 135f22ab89..ca6be2b1a6 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies @@ -495,25 +495,9 @@ "id": "libvirt-5" } -{ - "execute": "block-commit", - "arguments": { - "device": "bogus" - }, - "id": "libvirt-6" -} - -{ - "id": "libvirt-6", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'bogus' not found" - } -} - { "execute": "query-kvm", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -521,12 +505,12 @@ "enabled": true, "present": true }, - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "query-events", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -643,12 +627,12 @@ "name": "ACPI_DEVICE_OST" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { "execute": "qom-list-types", - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1254,7 +1238,7 @@ "name": "virtio-blk-device" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1262,7 +1246,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -1452,7 +1436,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -1460,7 +1444,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -1701,7 +1685,7 @@ "type": "str" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -1709,7 +1693,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -1836,7 +1820,7 @@ "type": "str" } ], - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -1844,7 +1828,7 @@ "arguments": { "typename": "virtio-blk-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { @@ -1973,7 +1957,7 @@ "type": "uint32" } ], - "id": "libvirt-13" + "id": "libvirt-12" } { @@ -1981,7 +1965,7 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -2165,7 +2149,7 @@ "type": "bool" } ], - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -2173,7 +2157,7 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -2243,7 +2227,7 @@ "type": "uint32" } ], - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -2251,11 +2235,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -2267,11 +2251,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -2283,11 +2267,11 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-18" + "id": "libvirt-17" } { - "id": "libvirt-18", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" @@ -2299,7 +2283,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2401,7 +2385,7 @@ "type": "bool" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2409,7 +2393,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -2519,7 +2503,7 @@ "type": "uint64" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -2527,11 +2511,11 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-21" + "id": "libvirt-20" } { - "id": "libvirt-21", + "id": "libvirt-20", "error": { "class": "DeviceNotFound", "desc": "Device 'ide-drive' not found" @@ -2543,11 +2527,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-22" + "id": "libvirt-21" } { - "id": "libvirt-22", + "id": "libvirt-21", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -2559,11 +2543,11 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-23" + "id": "libvirt-22" } { - "id": "libvirt-23", + "id": "libvirt-22", "error": { "class": "DeviceNotFound", "desc": "Device 'usb-host' not found" @@ -2575,7 +2559,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -2602,7 +2586,7 @@ "type": "uint32" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -2610,11 +2594,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-25" + "id": "libvirt-24" } { - "id": "libvirt-25", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -2626,11 +2610,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-26" + "id": "libvirt-25" } { - "id": "libvirt-26", + "id": "libvirt-25", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -2642,11 +2626,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-27" + "id": "libvirt-26" } { - "id": "libvirt-27", + "id": "libvirt-26", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -2658,7 +2642,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -2763,7 +2747,7 @@ "type": "uint32" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -2771,7 +2755,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -2801,7 +2785,7 @@ "type": "uint32" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -2809,11 +2793,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-30" + "id": "libvirt-29" } { - "id": "libvirt-30", + "id": "libvirt-29", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -2825,7 +2809,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -2934,7 +2918,7 @@ "type": "bool" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -2942,7 +2926,7 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -2999,7 +2983,7 @@ "type": "uint32" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3007,7 +2991,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3046,7 +3030,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3054,7 +3038,7 @@ "arguments": { "typename": "virtual-css-bridge" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -3064,12 +3048,12 @@ "type": "bool" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { "execute": "query-machines", - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -3107,12 +3091,12 @@ "alias": "s390-ccw-virtio" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-cpu-definitions", - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -3438,34 +3422,34 @@ "migration-safe": true } ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-tpm-models", - "id": "libvirt-37" + "id": "libvirt-36" } { "return": [ ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-tpm-types", - "id": "libvirt-38" + "id": "libvirt-37" } { "return": [ ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-command-line-options", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -4426,12 +4410,12 @@ "option": "drive" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-migrate-capabilities", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -4469,12 +4453,12 @@ "capability": "x-colo" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-qmp-schema", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -13244,7 +13228,7 @@ "meta-type": "object" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -13255,7 +13239,7 @@ "name": "host" } }, - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -13281,7 +13265,7 @@ } } }, - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -13295,11 +13279,11 @@ } } }, - "id": "libvirt-43" + "id": "libvirt-42" } { - "id": "libvirt-43", + "id": "libvirt-42", "error": { "class": "GenericError", "desc": "Property '.migratable' not found" diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml index fdaea3fabb..564c6c481a 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml @@ -111,7 +111,7 @@ 2007093 0 - 246206 + 245993 s390x diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies index 8f80e733db..cb87874dfc 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies @@ -489,25 +489,9 @@ "id": "libvirt-5" } -{ - "execute": "block-commit", - "arguments": { - "device": "bogus" - }, - "id": "libvirt-6" -} - -{ - "id": "libvirt-6", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'bogus' not found" - } -} - { "execute": "query-kvm", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -515,12 +499,12 @@ "enabled": true, "present": true }, - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "query-events", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -637,12 +621,12 @@ "name": "ACPI_DEVICE_OST" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { "execute": "qom-list-types", - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1710,7 +1694,7 @@ "name": "virtio-blk-device" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1718,7 +1702,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -1912,7 +1896,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -1920,7 +1904,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2165,7 +2149,7 @@ "type": "str" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2173,7 +2157,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -2304,7 +2288,7 @@ "type": "str" } ], - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -2312,11 +2296,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -2328,11 +2312,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-14" + "id": "libvirt-13" } { - "id": "libvirt-14", + "id": "libvirt-13", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -2344,11 +2328,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -2360,11 +2344,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -2376,7 +2360,7 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -2433,7 +2417,7 @@ "type": "bool" } ], - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -2441,7 +2425,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -2543,7 +2527,7 @@ "type": "bool" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -2551,7 +2535,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2661,7 +2645,7 @@ "type": "uint64" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2669,7 +2653,7 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -2741,7 +2725,7 @@ "type": "uint16" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -2749,7 +2733,7 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -2807,7 +2791,7 @@ "type": "int32" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -2815,7 +2799,7 @@ "arguments": { "typename": "usb-redir" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -2864,7 +2848,7 @@ "type": "bool" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -2872,7 +2856,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -2941,7 +2925,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -2949,7 +2933,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -2976,7 +2960,7 @@ "type": "uint32" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -2984,7 +2968,7 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -3022,7 +3006,7 @@ "type": "child" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -3030,7 +3014,7 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -3108,7 +3092,7 @@ "type": "int" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -3116,7 +3100,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3185,7 +3169,7 @@ "type": "uint16" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3193,7 +3177,7 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3207,7 +3191,7 @@ "type": "LostTickPolicy" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3215,7 +3199,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3267,7 +3251,7 @@ "type": "int32" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3275,7 +3259,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -3313,7 +3297,7 @@ "type": "int32" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -3321,7 +3305,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3403,7 +3387,7 @@ "type": "uint32" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3411,7 +3395,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3530,7 +3514,7 @@ "type": "uint32" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3538,7 +3522,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3578,7 +3562,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3586,7 +3570,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -3672,7 +3656,7 @@ "type": "uint32" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -3680,7 +3664,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -3793,7 +3777,7 @@ "type": "guest statistics" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -3801,11 +3785,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-36" + "id": "libvirt-35" } { - "id": "libvirt-36", + "id": "libvirt-35", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -3817,7 +3801,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -3856,7 +3840,7 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -3864,7 +3848,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -3939,7 +3923,7 @@ "type": "uint32" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -3947,7 +3931,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -3970,7 +3954,7 @@ "type": "uint32" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -3978,7 +3962,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -4004,12 +3988,12 @@ "type": "pci-devfn" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-machines", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -4178,12 +4162,12 @@ "cpu-max": 255 } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-cpu-definitions", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -4389,36 +4373,36 @@ "static": false } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-tpm-models", - "id": "libvirt-43" + "id": "libvirt-42" } { "return": [ "tpm-tis" ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-tpm-types", - "id": "libvirt-44" + "id": "libvirt-43" } { "return": [ "passthrough" ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-command-line-options", - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -5541,12 +5525,12 @@ "option": "drive" } ], - "id": "libvirt-45" + "id": "libvirt-44" } { "execute": "query-migrate-capabilities", - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -5584,12 +5568,12 @@ "capability": "x-colo" } ], - "id": "libvirt-46" + "id": "libvirt-45" } { "execute": "query-qmp-schema", - "id": "libvirt-47" + "id": "libvirt-46" } { @@ -14359,7 +14343,7 @@ "meta-type": "object" } ], - "id": "libvirt-47" + "id": "libvirt-46" } { diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml index 71548b6326..318059bba1 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml @@ -184,7 +184,7 @@ 2008000 0 - 260660 + 260447 (v2.8.0) x86_64 diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies index 0c97fc3ad8..b2e224725c 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies @@ -495,25 +495,9 @@ "id": "libvirt-5" } -{ - "execute": "block-commit", - "arguments": { - "device": "bogus" - }, - "id": "libvirt-6" -} - -{ - "id": "libvirt-6", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'bogus' not found" - } -} - { "execute": "query-kvm", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -521,12 +505,12 @@ "enabled": true, "present": true }, - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "query-events", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -643,12 +627,12 @@ "name": "ACPI_DEVICE_OST" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { "execute": "qom-list-types", - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2598,7 +2582,7 @@ "name": "7457A_v1.2-powerpc64-cpu" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2606,7 +2590,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2834,7 +2818,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2842,7 +2826,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -3121,7 +3105,7 @@ "type": "uint16" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -3129,7 +3113,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -3290,7 +3274,7 @@ "type": "str" } ], - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -3298,11 +3282,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -3314,11 +3298,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-14" + "id": "libvirt-13" } { - "id": "libvirt-14", + "id": "libvirt-13", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -3330,11 +3314,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -3346,11 +3330,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -3362,11 +3346,11 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" @@ -3378,7 +3362,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -3485,7 +3469,7 @@ "type": "bool" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -3493,7 +3477,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -3607,7 +3591,7 @@ "type": "uint64" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -3615,7 +3599,7 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -3691,7 +3675,7 @@ "type": "uint16" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -3699,11 +3683,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-21" + "id": "libvirt-20" } { - "id": "libvirt-21", + "id": "libvirt-20", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -3715,11 +3699,11 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-22" + "id": "libvirt-21" } { - "id": "libvirt-22", + "id": "libvirt-21", "error": { "class": "DeviceNotFound", "desc": "Device 'usb-host' not found" @@ -3731,7 +3715,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3758,7 +3742,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3766,11 +3750,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-24" + "id": "libvirt-23" } { - "id": "libvirt-24", + "id": "libvirt-23", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -3782,11 +3766,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-25" + "id": "libvirt-24" } { - "id": "libvirt-25", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -3798,7 +3782,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -3871,7 +3855,7 @@ "type": "uint16" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -3879,11 +3863,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-27" + "id": "libvirt-26" } { - "id": "libvirt-27", + "id": "libvirt-26", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -3895,7 +3879,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3952,7 +3936,7 @@ "type": "int32" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3960,7 +3944,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -4103,7 +4087,7 @@ "type": "str" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -4111,7 +4095,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -4150,7 +4134,7 @@ "type": "size" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -4158,11 +4142,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-31" + "id": "libvirt-30" } { - "id": "libvirt-31", + "id": "libvirt-30", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -4174,7 +4158,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -4317,7 +4301,7 @@ "type": "str" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -4325,11 +4309,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-33" + "id": "libvirt-32" } { - "id": "libvirt-33", + "id": "libvirt-32", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -4341,7 +4325,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -4385,7 +4369,7 @@ "type": "bool" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -4393,7 +4377,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -4473,7 +4457,7 @@ "type": "uint32" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -4481,7 +4465,7 @@ "arguments": { "typename": "spapr-pci-host-bridge" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -4567,12 +4551,12 @@ "type": "uint32" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-machines", - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -4685,12 +4669,12 @@ "cpu-max": 1 } ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-cpu-definitions", - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -6866,34 +6850,34 @@ "static": false } ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-tpm-models", - "id": "libvirt-39" + "id": "libvirt-38" } { "return": [ ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-tpm-types", - "id": "libvirt-40" + "id": "libvirt-39" } { "return": [ ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-command-line-options", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -8003,12 +7987,12 @@ "option": "drive" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-migrate-capabilities", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -8050,12 +8034,12 @@ "capability": "release-ram" } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-qmp-schema", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -17341,7 +17325,7 @@ "meta-type": "object" } ], - "id": "libvirt-43" + "id": "libvirt-42" } { diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml index c4ebb73d21..ea81b431f9 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml @@ -151,7 +151,7 @@ 2009000 0 - 350708 + 350495 (v2.9.0) ppc64 diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies index 94ab7feb62..5e2b4518fa 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies @@ -507,25 +507,9 @@ "id": "libvirt-5" } -{ - "execute": "block-commit", - "arguments": { - "device": "bogus" - }, - "id": "libvirt-6" -} - -{ - "id": "libvirt-6", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'bogus' not found" - } -} - { "execute": "query-kvm", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -533,12 +517,12 @@ "enabled": true, "present": true }, - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "query-events", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -655,12 +639,12 @@ "name": "ACPI_DEVICE_OST" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { "execute": "qom-list-types", - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1302,7 +1286,7 @@ "name": "virtio-blk-device" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1310,7 +1294,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -1538,7 +1522,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -1546,7 +1530,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -1825,7 +1809,7 @@ "type": "uint16" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -1833,7 +1817,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -1994,7 +1978,7 @@ "type": "str" } ], - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -2002,7 +1986,7 @@ "arguments": { "typename": "virtio-blk-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { @@ -2140,7 +2124,7 @@ "type": "uint32" } ], - "id": "libvirt-13" + "id": "libvirt-12" } { @@ -2148,7 +2132,7 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -2341,7 +2325,7 @@ "type": "uint16" } ], - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -2349,7 +2333,7 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -2424,7 +2408,7 @@ "type": "uint32" } ], - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -2432,11 +2416,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -2448,11 +2432,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -2464,11 +2448,11 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-18" + "id": "libvirt-17" } { - "id": "libvirt-18", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" @@ -2480,7 +2464,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2587,7 +2571,7 @@ "type": "bool" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2595,7 +2579,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -2709,7 +2693,7 @@ "type": "uint64" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -2717,11 +2701,11 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-21" + "id": "libvirt-20" } { - "id": "libvirt-21", + "id": "libvirt-20", "error": { "class": "DeviceNotFound", "desc": "Device 'ide-drive' not found" @@ -2733,11 +2717,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-22" + "id": "libvirt-21" } { - "id": "libvirt-22", + "id": "libvirt-21", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -2749,11 +2733,11 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-23" + "id": "libvirt-22" } { - "id": "libvirt-23", + "id": "libvirt-22", "error": { "class": "DeviceNotFound", "desc": "Device 'usb-host' not found" @@ -2765,7 +2749,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -2792,7 +2776,7 @@ "type": "uint32" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -2800,11 +2784,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-25" + "id": "libvirt-24" } { - "id": "libvirt-25", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -2816,11 +2800,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-26" + "id": "libvirt-25" } { - "id": "libvirt-26", + "id": "libvirt-25", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -2832,11 +2816,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-27" + "id": "libvirt-26" } { - "id": "libvirt-27", + "id": "libvirt-26", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -2848,7 +2832,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -2991,7 +2975,7 @@ "type": "str" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -2999,7 +2983,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3038,7 +3022,7 @@ "type": "size" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3046,11 +3030,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-30" + "id": "libvirt-29" } { - "id": "libvirt-30", + "id": "libvirt-29", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -3062,7 +3046,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3205,7 +3189,7 @@ "type": "str" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3213,7 +3197,7 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3275,7 +3259,7 @@ "type": "uint32" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3283,7 +3267,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3327,7 +3311,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3335,7 +3319,7 @@ "arguments": { "typename": "virtual-css-bridge" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -3345,12 +3329,12 @@ "type": "bool" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { "execute": "query-machines", - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -3393,12 +3377,12 @@ "cpu-max": 248 } ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-cpu-definitions", - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -3788,34 +3772,34 @@ "migration-safe": true } ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-tpm-models", - "id": "libvirt-37" + "id": "libvirt-36" } { "return": [ ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-tpm-types", - "id": "libvirt-38" + "id": "libvirt-37" } { "return": [ ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-command-line-options", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -4890,12 +4874,12 @@ "option": "drive" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-migrate-capabilities", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -4937,12 +4921,12 @@ "capability": "release-ram" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-qmp-schema", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -14228,7 +14212,7 @@ "meta-type": "object" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -14239,7 +14223,7 @@ "name": "host" } }, - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -14266,7 +14250,7 @@ } } }, - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -14280,11 +14264,11 @@ } } }, - "id": "libvirt-43" + "id": "libvirt-42" } { - "id": "libvirt-43", + "id": "libvirt-42", "error": { "class": "GenericError", "desc": "Property '.migratable' not found" diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml index 302cc5ffa1..a1e0152f95 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml @@ -115,7 +115,7 @@ 2009000 0 - 269625 + 269412 s390x diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies index 7d10d68abd..0e5d78e15f 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies @@ -504,25 +504,9 @@ "id": "libvirt-5" } -{ - "execute": "block-commit", - "arguments": { - "device": "bogus" - }, - "id": "libvirt-6" -} - -{ - "id": "libvirt-6", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'bogus' not found" - } -} - { "execute": "query-kvm", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -530,12 +514,12 @@ "enabled": true, "present": true }, - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "query-events", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -652,12 +636,12 @@ "name": "ACPI_DEVICE_OST" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { "execute": "qom-list-types", - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1788,7 +1772,7 @@ "name": "virtio-blk-device" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1796,7 +1780,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2024,7 +2008,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2032,7 +2016,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2311,7 +2295,7 @@ "type": "uint16" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2319,7 +2303,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -2480,7 +2464,7 @@ "type": "str" } ], - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -2488,11 +2472,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -2504,11 +2488,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-14" + "id": "libvirt-13" } { - "id": "libvirt-14", + "id": "libvirt-13", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -2520,11 +2504,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -2536,11 +2520,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -2552,7 +2536,7 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -2614,7 +2598,7 @@ "type": "bool" } ], - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -2622,7 +2606,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -2729,7 +2713,7 @@ "type": "bool" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -2737,7 +2721,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2851,7 +2835,7 @@ "type": "uint64" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2859,7 +2843,7 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -2935,7 +2919,7 @@ "type": "uint16" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -2943,7 +2927,7 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -3006,7 +2990,7 @@ "type": "int32" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -3014,7 +2998,7 @@ "arguments": { "typename": "usb-redir" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -3063,7 +3047,7 @@ "type": "bool" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -3071,7 +3055,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3140,7 +3124,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3148,7 +3132,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -3175,7 +3159,7 @@ "type": "uint32" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -3183,7 +3167,7 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -3221,7 +3205,7 @@ "type": "child" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -3229,7 +3213,7 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -3307,7 +3291,7 @@ "type": "int" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -3315,7 +3299,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3388,7 +3372,7 @@ "type": "uint16" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3396,7 +3380,7 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3410,7 +3394,7 @@ "type": "LostTickPolicy" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3418,7 +3402,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3475,7 +3459,7 @@ "type": "int32" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3483,7 +3467,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -3526,7 +3510,7 @@ "type": "int32" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -3534,7 +3518,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3621,7 +3605,7 @@ "type": "uint32" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3629,7 +3613,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3782,7 +3766,7 @@ "type": "str" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3790,7 +3774,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3839,7 +3823,7 @@ "type": "size" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3847,7 +3831,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -3943,7 +3927,7 @@ "type": "uint32" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -3951,7 +3935,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -4094,7 +4078,7 @@ "type": "str" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -4102,11 +4086,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-36" + "id": "libvirt-35" } { - "id": "libvirt-36", + "id": "libvirt-35", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -4118,7 +4102,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -4162,7 +4146,7 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -4170,7 +4154,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -4250,7 +4234,7 @@ "type": "uint32" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -4258,7 +4242,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -4289,7 +4273,7 @@ "type": "bool" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -4297,7 +4281,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -4323,12 +4307,12 @@ "type": "pci-devfn" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-machines", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -4507,12 +4491,12 @@ "cpu-max": 255 } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-cpu-definitions", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -4794,36 +4778,36 @@ "migration-safe": true } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-tpm-models", - "id": "libvirt-43" + "id": "libvirt-42" } { "return": [ "tpm-tis" ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-tpm-types", - "id": "libvirt-44" + "id": "libvirt-43" } { "return": [ "passthrough" ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-command-line-options", - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -6072,12 +6056,12 @@ "option": "drive" } ], - "id": "libvirt-45" + "id": "libvirt-44" } { "execute": "query-migrate-capabilities", - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -6119,12 +6103,12 @@ "capability": "release-ram" } ], - "id": "libvirt-46" + "id": "libvirt-45" } { "execute": "query-qmp-schema", - "id": "libvirt-47" + "id": "libvirt-46" } { @@ -15410,7 +15394,7 @@ "meta-type": "object" } ], - "id": "libvirt-47" + "id": "libvirt-46" } { @@ -15421,7 +15405,7 @@ "name": "host" } }, - "id": "libvirt-48" + "id": "libvirt-47" } { @@ -15600,7 +15584,7 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-47" } { @@ -15781,7 +15765,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -16022,7 +16006,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -16036,7 +16020,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -16215,7 +16199,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -16396,7 +16380,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { @@ -16637,7 +16621,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml index c0bfb3f07a..54c4e4ce57 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml @@ -199,7 +199,7 @@ 2009000 0 - 343984 + 343771 (v2.9.0) x86_64 diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies index f759823f6c..ef5189687a 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies @@ -582,25 +582,9 @@ "id": "libvirt-5" } -{ - "execute": "block-commit", - "arguments": { - "device": "bogus" - }, - "id": "libvirt-6" -} - -{ - "id": "libvirt-6", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'bogus' not found" - } -} - { "execute": "query-kvm", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -608,12 +592,12 @@ "enabled": true, "present": true }, - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "query-events", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -739,12 +723,12 @@ "name": "SHUTDOWN" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { "execute": "qom-list-types", - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -3586,7 +3570,7 @@ "parent": "virtio-input-hid-pci" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -3594,7 +3578,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -3826,7 +3810,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -3834,7 +3818,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -4124,7 +4108,7 @@ "type": "uint16" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -4132,7 +4116,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -4297,7 +4281,7 @@ "type": "str" } ], - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -4305,11 +4289,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -4321,11 +4305,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-14" + "id": "libvirt-13" } { - "id": "libvirt-14", + "id": "libvirt-13", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -4337,11 +4321,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -4353,11 +4337,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -4369,11 +4353,11 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" @@ -4385,7 +4369,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -4519,7 +4503,7 @@ "type": "str" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -4527,7 +4511,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -4645,7 +4629,7 @@ "type": "uint32" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -4653,7 +4637,7 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -4729,7 +4713,7 @@ "type": "uint16" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -4737,11 +4721,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-21" + "id": "libvirt-20" } { - "id": "libvirt-21", + "id": "libvirt-20", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -4753,7 +4737,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -4822,7 +4806,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -4830,7 +4814,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -4861,7 +4845,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -4869,11 +4853,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-24" + "id": "libvirt-23" } { - "id": "libvirt-24", + "id": "libvirt-23", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -4885,11 +4869,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-25" + "id": "libvirt-24" } { - "id": "libvirt-25", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -4901,7 +4885,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -4974,7 +4958,7 @@ "type": "uint16" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -4982,11 +4966,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-27" + "id": "libvirt-26" } { - "id": "libvirt-27", + "id": "libvirt-26", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -4998,7 +4982,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -5055,7 +5039,7 @@ "type": "int32" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -5063,7 +5047,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -5214,7 +5198,7 @@ "type": "str" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -5222,7 +5206,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -5269,7 +5253,7 @@ "type": "size" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -5277,11 +5261,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-31" + "id": "libvirt-30" } { - "id": "libvirt-31", + "id": "libvirt-30", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -5293,7 +5277,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -5436,7 +5420,7 @@ "type": "str" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -5444,11 +5428,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-33" + "id": "libvirt-32" } { - "id": "libvirt-33", + "id": "libvirt-32", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -5460,7 +5444,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -5504,7 +5488,7 @@ "type": "bool" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -5512,7 +5496,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -5592,7 +5576,7 @@ "type": "uint32" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -5600,7 +5584,7 @@ "arguments": { "typename": "spapr-pci-host-bridge" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -5658,7 +5642,7 @@ "type": "uint32" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -5666,7 +5650,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -5716,7 +5700,7 @@ "type": "string" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -5724,7 +5708,7 @@ "arguments": { "typename": "spapr-machine" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -5895,12 +5879,12 @@ "type": "bool" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-machines", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -6043,12 +6027,12 @@ "cpu-max": 1 } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-cpu-definitions", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -8244,35 +8228,35 @@ "static": false } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-tpm-models", - "id": "libvirt-41" + "id": "libvirt-40" } { "return": [ ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-tpm-types", - "id": "libvirt-42" + "id": "libvirt-41" } { "return": [ "emulator" ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-command-line-options", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -9402,12 +9386,12 @@ "option": "drive" } ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-migrate-capabilities", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -9477,12 +9461,12 @@ "capability": "late-block-activate" } ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-qmp-schema", - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -21641,7 +21625,7 @@ "meta-type": "object" } ], - "id": "libvirt-45" + "id": "libvirt-44" } { diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml index 64033dee51..85848ecdae 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml @@ -170,7 +170,7 @@ 2012050 0 - 446771 + 446558 v2.12.0-1689-g518d23a ppc64 diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies index a8d424cf22..b35582157c 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies +++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies @@ -579,25 +579,9 @@ "id": "libvirt-5" } -{ - "execute": "block-commit", - "arguments": { - "device": "bogus" - }, - "id": "libvirt-6" -} - -{ - "id": "libvirt-6", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'bogus' not found" - } -} - { "execute": "query-kvm", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -605,12 +589,12 @@ "enabled": false, "present": false }, - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "query-events", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -739,12 +723,12 @@ "name": "SHUTDOWN" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { "execute": "qom-list-types", - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1230,7 +1214,7 @@ "parent": "scsi-disk-base" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1238,11 +1222,11 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { - "id": "libvirt-10", + "id": "libvirt-9", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-blk-pci' not found" @@ -1254,11 +1238,11 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { - "id": "libvirt-11", + "id": "libvirt-10", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-pci' not found" @@ -1270,11 +1254,11 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-12" + "id": "libvirt-11" } { - "id": "libvirt-12", + "id": "libvirt-11", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-pci' not found" @@ -1286,11 +1270,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -1302,11 +1286,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-14" + "id": "libvirt-13" } { - "id": "libvirt-14", + "id": "libvirt-13", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -1318,11 +1302,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -1334,11 +1318,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -1350,11 +1334,11 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" @@ -1366,7 +1350,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -1484,7 +1468,7 @@ "type": "uint32" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -1492,11 +1476,11 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-19" + "id": "libvirt-18" } { - "id": "libvirt-19", + "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'ide-drive' not found" @@ -1508,11 +1492,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-20" + "id": "libvirt-19" } { - "id": "libvirt-20", + "id": "libvirt-19", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -1524,11 +1508,11 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-21" + "id": "libvirt-20" } { - "id": "libvirt-21", + "id": "libvirt-20", "error": { "class": "DeviceNotFound", "desc": "Device 'usb-host' not found" @@ -1540,7 +1524,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -1571,7 +1555,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -1579,11 +1563,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-23" + "id": "libvirt-22" } { - "id": "libvirt-23", + "id": "libvirt-22", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -1595,11 +1579,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-24" + "id": "libvirt-23" } { - "id": "libvirt-24", + "id": "libvirt-23", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -1611,11 +1595,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-25" + "id": "libvirt-24" } { - "id": "libvirt-25", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -1627,11 +1611,11 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-26" + "id": "libvirt-25" } { - "id": "libvirt-26", + "id": "libvirt-25", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-gpu-pci' not found" @@ -1643,7 +1627,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -1690,7 +1674,7 @@ "type": "size" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -1698,11 +1682,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-28" + "id": "libvirt-27" } { - "id": "libvirt-28", + "id": "libvirt-27", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -1714,11 +1698,11 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-29" + "id": "libvirt-28" } { - "id": "libvirt-29", + "id": "libvirt-28", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-pci' not found" @@ -1730,11 +1714,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-30" + "id": "libvirt-29" } { - "id": "libvirt-30", + "id": "libvirt-29", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -1746,7 +1730,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -1790,7 +1774,7 @@ "type": "bool" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -1798,7 +1782,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -1848,7 +1832,7 @@ "type": "string" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -1856,11 +1840,11 @@ "arguments": { "typename": "spapr-machine" }, - "id": "libvirt-33" + "id": "libvirt-32" } { - "id": "libvirt-33", + "id": "libvirt-32", "error": { "class": "DeviceNotFound", "desc": "Class 'spapr-machine' not found" @@ -1869,7 +1853,7 @@ { "execute": "query-machines", - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -1906,23 +1890,23 @@ "cpu-max": 1 } ], - "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" } { @@ -1930,12 +1914,12 @@ "passthrough", "emulator" ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-command-line-options", - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -3060,12 +3044,12 @@ "option": "drive" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-migrate-capabilities", - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -3135,12 +3119,12 @@ "capability": "late-block-activate" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-qmp-schema", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -14815,5 +14799,5 @@ "meta-type": "object" } ], - "id": "libvirt-39" + "id": "libvirt-38" } diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies index 7ecdbee8fd..1f12c26583 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies +++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies @@ -579,25 +579,9 @@ "id": "libvirt-5" } -{ - "execute": "block-commit", - "arguments": { - "device": "bogus" - }, - "id": "libvirt-6" -} - -{ - "id": "libvirt-6", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'bogus' not found" - } -} - { "execute": "query-kvm", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -605,12 +589,12 @@ "enabled": false, "present": false }, - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "query-events", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -739,12 +723,12 @@ "name": "SHUTDOWN" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { "execute": "qom-list-types", - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1230,7 +1214,7 @@ "parent": "scsi-disk-base" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1238,11 +1222,11 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { - "id": "libvirt-10", + "id": "libvirt-9", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-blk-pci' not found" @@ -1254,11 +1238,11 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { - "id": "libvirt-11", + "id": "libvirt-10", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-pci' not found" @@ -1270,11 +1254,11 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-12" + "id": "libvirt-11" } { - "id": "libvirt-12", + "id": "libvirt-11", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-pci' not found" @@ -1286,11 +1270,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -1302,11 +1286,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-14" + "id": "libvirt-13" } { - "id": "libvirt-14", + "id": "libvirt-13", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -1318,11 +1302,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -1334,11 +1318,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -1350,11 +1334,11 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" @@ -1366,7 +1350,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -1484,7 +1468,7 @@ "type": "uint32" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -1492,11 +1476,11 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-19" + "id": "libvirt-18" } { - "id": "libvirt-19", + "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'ide-drive' not found" @@ -1508,11 +1492,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-20" + "id": "libvirt-19" } { - "id": "libvirt-20", + "id": "libvirt-19", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -1524,11 +1508,11 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-21" + "id": "libvirt-20" } { - "id": "libvirt-21", + "id": "libvirt-20", "error": { "class": "DeviceNotFound", "desc": "Device 'usb-host' not found" @@ -1540,7 +1524,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -1571,7 +1555,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -1579,11 +1563,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-23" + "id": "libvirt-22" } { - "id": "libvirt-23", + "id": "libvirt-22", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -1595,11 +1579,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-24" + "id": "libvirt-23" } { - "id": "libvirt-24", + "id": "libvirt-23", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -1611,11 +1595,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-25" + "id": "libvirt-24" } { - "id": "libvirt-25", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -1627,11 +1611,11 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-26" + "id": "libvirt-25" } { - "id": "libvirt-26", + "id": "libvirt-25", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-gpu-pci' not found" @@ -1643,7 +1627,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -1690,7 +1674,7 @@ "type": "size" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -1698,11 +1682,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-28" + "id": "libvirt-27" } { - "id": "libvirt-28", + "id": "libvirt-27", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -1714,11 +1698,11 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-29" + "id": "libvirt-28" } { - "id": "libvirt-29", + "id": "libvirt-28", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-pci' not found" @@ -1730,11 +1714,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-30" + "id": "libvirt-29" } { - "id": "libvirt-30", + "id": "libvirt-29", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -1746,7 +1730,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -1790,7 +1774,7 @@ "type": "bool" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -1798,7 +1782,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -1848,7 +1832,7 @@ "type": "string" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -1856,11 +1840,11 @@ "arguments": { "typename": "spapr-machine" }, - "id": "libvirt-33" + "id": "libvirt-32" } { - "id": "libvirt-33", + "id": "libvirt-32", "error": { "class": "DeviceNotFound", "desc": "Class 'spapr-machine' not found" @@ -1869,7 +1853,7 @@ { "execute": "query-machines", - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -1906,23 +1890,23 @@ "cpu-max": 1 } ], - "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" } { @@ -1930,12 +1914,12 @@ "passthrough", "emulator" ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-command-line-options", - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -3060,12 +3044,12 @@ "option": "drive" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-migrate-capabilities", - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -3135,12 +3119,12 @@ "capability": "late-block-activate" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-qmp-schema", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -14815,5 +14799,5 @@ "meta-type": "object" } ], - "id": "libvirt-39" + "id": "libvirt-38" } diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies index dc34d74ca3..f1b469f0f4 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies @@ -600,25 +600,9 @@ "id": "libvirt-5" } -{ - "execute": "block-commit", - "arguments": { - "device": "bogus" - }, - "id": "libvirt-6" -} - -{ - "id": "libvirt-6", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'bogus' not found" - } -} - { "execute": "query-kvm", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -626,12 +610,12 @@ "enabled": true, "present": true }, - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "query-events", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -760,12 +744,12 @@ "name": "SHUTDOWN" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { "execute": "qom-list-types", - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2431,7 +2415,7 @@ "parent": "rng-backend" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2439,7 +2423,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2671,7 +2655,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2679,7 +2663,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2969,7 +2953,7 @@ "type": "uint16" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2977,7 +2961,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -3142,7 +3126,7 @@ "type": "str" } ], - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -3150,11 +3134,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -3166,11 +3150,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-14" + "id": "libvirt-13" } { - "id": "libvirt-14", + "id": "libvirt-13", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -3182,11 +3166,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -3198,11 +3182,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -3214,11 +3198,11 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" @@ -3230,7 +3214,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -3364,7 +3348,7 @@ "type": "str" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -3372,7 +3356,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -3490,7 +3474,7 @@ "type": "uint32" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -3498,7 +3482,7 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -3574,7 +3558,7 @@ "type": "uint16" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -3582,7 +3566,7 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -3645,7 +3629,7 @@ "type": "int32" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -3653,7 +3637,7 @@ "arguments": { "typename": "usb-redir" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -3702,7 +3686,7 @@ "type": "bool" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -3710,7 +3694,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3779,7 +3763,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3787,7 +3771,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -3818,7 +3802,7 @@ "type": "uint32" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -3826,7 +3810,7 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -3868,7 +3852,7 @@ "type": "bool" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -3876,7 +3860,7 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -3958,7 +3942,7 @@ "type": "uint64" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -3966,7 +3950,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -4049,7 +4033,7 @@ "type": "uint16" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -4057,7 +4041,7 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -4071,7 +4055,7 @@ "type": "LostTickPolicy" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -4079,7 +4063,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -4140,7 +4124,7 @@ "type": "bool" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -4148,7 +4132,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -4195,7 +4179,7 @@ "type": "bool" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -4203,7 +4187,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -4302,7 +4286,7 @@ "type": "uint32" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -4310,7 +4294,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -4471,7 +4455,7 @@ "type": "str" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -4479,7 +4463,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -4536,7 +4520,7 @@ "type": "size" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -4544,7 +4528,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -4640,7 +4624,7 @@ "type": "uint32" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -4648,7 +4632,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -4791,7 +4775,7 @@ "type": "str" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -4799,11 +4783,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-36" + "id": "libvirt-35" } { - "id": "libvirt-36", + "id": "libvirt-35", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -4815,7 +4799,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -4859,7 +4843,7 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -4867,7 +4851,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -4947,7 +4931,7 @@ "type": "uint32" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -4955,7 +4939,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -4994,7 +4978,7 @@ "type": "bool" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -5002,7 +4986,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -5045,7 +5029,7 @@ "type": "int32" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -5053,7 +5037,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -5103,7 +5087,7 @@ "type": "string" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -5111,11 +5095,11 @@ "arguments": { "typename": "spapr-machine" }, - "id": "libvirt-42" + "id": "libvirt-41" } { - "id": "libvirt-42", + "id": "libvirt-41", "error": { "class": "DeviceNotFound", "desc": "Class 'spapr-machine' not found" @@ -5124,7 +5108,7 @@ { "execute": "query-machines", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -5333,12 +5317,12 @@ "cpu-max": 255 } ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-cpu-definitions", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -5775,12 +5759,12 @@ "migration-safe": true } ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-tpm-models", - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -5788,12 +5772,12 @@ "tpm-crb", "tpm-tis" ], - "id": "libvirt-45" + "id": "libvirt-44" } { "execute": "query-tpm-types", - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -5801,12 +5785,12 @@ "passthrough", "emulator" ], - "id": "libvirt-46" + "id": "libvirt-45" } { "execute": "query-command-line-options", - "id": "libvirt-47" + "id": "libvirt-46" } { @@ -7105,12 +7089,12 @@ "option": "drive" } ], - "id": "libvirt-47" + "id": "libvirt-46" } { "execute": "query-migrate-capabilities", - "id": "libvirt-48" + "id": "libvirt-47" } { @@ -7180,12 +7164,12 @@ "capability": "late-block-activate" } ], - "id": "libvirt-48" + "id": "libvirt-47" } { "execute": "query-qmp-schema", - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -19065,7 +19049,7 @@ "meta-type": "object" } ], - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -19076,7 +19060,7 @@ "name": "host" } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -19269,7 +19253,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -19464,7 +19448,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { @@ -19727,7 +19711,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { @@ -19741,7 +19725,7 @@ } } }, - "id": "libvirt-52" + "id": "libvirt-51" } { @@ -19934,7 +19918,7 @@ } } }, - "id": "libvirt-52" + "id": "libvirt-51" } { @@ -20129,7 +20113,7 @@ } } }, - "id": "libvirt-53" + "id": "libvirt-52" } { @@ -20392,16 +20376,16 @@ } } }, - "id": "libvirt-53" + "id": "libvirt-52" } { "execute": "query-sev-capabilities", - "id": "libvirt-54" + "id": "libvirt-53" } { - "id": "libvirt-54", + "id": "libvirt-53", "error": { "class": "GenericError", "desc": "SEV feature is not available" diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml index a9e8fe2dab..7f813228c9 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml @@ -216,7 +216,7 @@ 3000000 0 - 427797 + 427584 v3.0.0 x86_64