diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 31191dd8b8..93a99c3aa8 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2123,15 +2123,13 @@ virQEMUCapsProbeQMPEvents(virQEMUCapsPtr qemuCaps, char **events = NULL; int nevents; + /* we can probe events also from the QMP schema so we can skip this here */ + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_QMP_SCHEMA)) + return 0; + if ((nevents = qemuMonitorGetEvents(mon, &events)) < 0) return -1; - /* we can probe events also from the QMP schema so we can skip this here */ - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_QMP_SCHEMA)) { - virStringListFreeCount(events, nevents); - return 0; - } - virQEMUCapsProcessStringFlags(qemuCaps, ARRAY_CARDINALITY(virQEMUCapsEvents), virQEMUCapsEvents, diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies index 61131cee46..7da45594ca 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies @@ -503,131 +503,9 @@ "id": "libvirt-5" } -{ - "execute": "query-events", - "id": "libvirt-6" -} - -{ - "return": [ - { - "name": "WATCHDOG" - }, - { - "name": "WAKEUP" - }, - { - "name": "VSERPORT_CHANGE" - }, - { - "name": "VNC_INITIALIZED" - }, - { - "name": "VNC_DISCONNECTED" - }, - { - "name": "VNC_CONNECTED" - }, - { - "name": "SUSPEND_DISK" - }, - { - "name": "SUSPEND" - }, - { - "name": "STOP" - }, - { - "name": "SPICE_MIGRATE_COMPLETED" - }, - { - "name": "SPICE_INITIALIZED" - }, - { - "name": "SPICE_DISCONNECTED" - }, - { - "name": "SPICE_CONNECTED" - }, - { - "name": "SHUTDOWN" - }, - { - "name": "RTC_CHANGE" - }, - { - "name": "RESUME" - }, - { - "name": "RESET" - }, - { - "name": "QUORUM_REPORT_BAD" - }, - { - "name": "QUORUM_FAILURE" - }, - { - "name": "POWERDOWN" - }, - { - "name": "NIC_RX_FILTER_CHANGED" - }, - { - "name": "MIGRATION_PASS" - }, - { - "name": "MIGRATION" - }, - { - "name": "MEM_UNPLUG_ERROR" - }, - { - "name": "GUEST_PANICKED" - }, - { - "name": "DUMP_COMPLETED" - }, - { - "name": "DEVICE_TRAY_MOVED" - }, - { - "name": "DEVICE_DELETED" - }, - { - "name": "BLOCK_WRITE_THRESHOLD" - }, - { - "name": "BLOCK_JOB_READY" - }, - { - "name": "BLOCK_JOB_ERROR" - }, - { - "name": "BLOCK_JOB_COMPLETED" - }, - { - "name": "BLOCK_JOB_CANCELLED" - }, - { - "name": "BLOCK_IO_ERROR" - }, - { - "name": "BLOCK_IMAGE_CORRUPTED" - }, - { - "name": "BALLOON_CHANGE" - }, - { - "name": "ACPI_DEVICE_OST" - } - ], - "id": "libvirt-6" -} - { "execute": "qom-list-types", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -3197,7 +3075,7 @@ "parent": "rng-backend" } ], - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -3205,7 +3083,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -3433,7 +3311,7 @@ "type": "str" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -3441,7 +3319,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -3728,7 +3606,7 @@ "type": "uint16" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -3736,7 +3614,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -3897,7 +3775,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -3905,11 +3783,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-11" + "id": "libvirt-10" } { - "id": "libvirt-11", + "id": "libvirt-10", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -3921,11 +3799,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-12" + "id": "libvirt-11" } { - "id": "libvirt-12", + "id": "libvirt-11", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -3937,11 +3815,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -3953,7 +3831,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -4060,7 +3938,7 @@ "type": "bool" } ], - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -4068,7 +3946,7 @@ "arguments": { "typename": "scsi-hd" }, - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -4182,7 +4060,7 @@ "type": "uint64" } ], - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -4190,7 +4068,7 @@ "arguments": { "typename": "ide-hd" }, - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -4266,7 +4144,7 @@ "type": "uint16" } ], - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -4274,11 +4152,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -4290,11 +4168,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-18" + "id": "libvirt-17" } { - "id": "libvirt-18", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -4306,11 +4184,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-19" + "id": "libvirt-18" } { - "id": "libvirt-19", + "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -4322,7 +4200,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -4395,7 +4273,7 @@ "type": "uint16" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -4403,11 +4281,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-21" + "id": "libvirt-20" } { - "id": "libvirt-21", + "id": "libvirt-20", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -4419,7 +4297,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -4476,7 +4354,7 @@ "type": "int32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -4484,7 +4362,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -4635,7 +4513,7 @@ "type": "str" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -4643,7 +4521,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -4690,7 +4568,7 @@ "type": "size" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -4698,11 +4576,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-25" + "id": "libvirt-24" } { - "id": "libvirt-25", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -4714,7 +4592,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -4857,7 +4735,7 @@ "type": "str" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -4865,11 +4743,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-27" + "id": "libvirt-26" } { - "id": "libvirt-27", + "id": "libvirt-26", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -4881,7 +4759,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -4925,7 +4803,7 @@ "type": "bool" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -4933,7 +4811,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -5013,12 +4891,12 @@ "type": "uint32" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { "execute": "query-machines", - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -5285,12 +5163,12 @@ "cpu-max": 1 } ], - "id": "libvirt-30" + "id": "libvirt-29" } { "execute": "query-cpu-definitions", - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -5456,34 +5334,34 @@ "static": false } ], - "id": "libvirt-31" + "id": "libvirt-30" } { "execute": "query-tpm-models", - "id": "libvirt-32" + "id": "libvirt-31" } { "return": [ ], - "id": "libvirt-32" + "id": "libvirt-31" } { "execute": "query-tpm-types", - "id": "libvirt-33" + "id": "libvirt-32" } { "return": [ ], - "id": "libvirt-33" + "id": "libvirt-32" } { "execute": "query-command-line-options", - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -6628,12 +6506,12 @@ "option": "drive" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { "execute": "query-migrate-capabilities", - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -6683,12 +6561,12 @@ "capability": "return-path" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-qmp-schema", - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -16411,12 +16289,12 @@ "meta-type": "object" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-gic-capabilities", - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -16432,7 +16310,7 @@ "kernel": true } ], - "id": "libvirt-37" + "id": "libvirt-36" } { diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies index 7e9229983c..b77e730cfd 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies @@ -500,131 +500,9 @@ "id": "libvirt-5" } -{ - "execute": "query-events", - "id": "libvirt-6" -} - -{ - "return": [ - { - "name": "WATCHDOG" - }, - { - "name": "WAKEUP" - }, - { - "name": "VSERPORT_CHANGE" - }, - { - "name": "VNC_INITIALIZED" - }, - { - "name": "VNC_DISCONNECTED" - }, - { - "name": "VNC_CONNECTED" - }, - { - "name": "SUSPEND_DISK" - }, - { - "name": "SUSPEND" - }, - { - "name": "STOP" - }, - { - "name": "SPICE_MIGRATE_COMPLETED" - }, - { - "name": "SPICE_INITIALIZED" - }, - { - "name": "SPICE_DISCONNECTED" - }, - { - "name": "SPICE_CONNECTED" - }, - { - "name": "SHUTDOWN" - }, - { - "name": "RTC_CHANGE" - }, - { - "name": "RESUME" - }, - { - "name": "RESET" - }, - { - "name": "QUORUM_REPORT_BAD" - }, - { - "name": "QUORUM_FAILURE" - }, - { - "name": "POWERDOWN" - }, - { - "name": "NIC_RX_FILTER_CHANGED" - }, - { - "name": "MIGRATION_PASS" - }, - { - "name": "MIGRATION" - }, - { - "name": "MEM_UNPLUG_ERROR" - }, - { - "name": "GUEST_PANICKED" - }, - { - "name": "DUMP_COMPLETED" - }, - { - "name": "DEVICE_TRAY_MOVED" - }, - { - "name": "DEVICE_DELETED" - }, - { - "name": "BLOCK_WRITE_THRESHOLD" - }, - { - "name": "BLOCK_JOB_READY" - }, - { - "name": "BLOCK_JOB_ERROR" - }, - { - "name": "BLOCK_JOB_COMPLETED" - }, - { - "name": "BLOCK_JOB_CANCELLED" - }, - { - "name": "BLOCK_IO_ERROR" - }, - { - "name": "BLOCK_IMAGE_CORRUPTED" - }, - { - "name": "BALLOON_CHANGE" - }, - { - "name": "ACPI_DEVICE_OST" - } - ], - "id": "libvirt-6" -} - { "execute": "qom-list-types", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -3298,7 +3176,7 @@ "parent": "7455-family-powerpc64-cpu" } ], - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -3306,7 +3184,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -3534,7 +3412,7 @@ "type": "str" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -3542,7 +3420,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -3829,7 +3707,7 @@ "type": "uint16" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -3837,7 +3715,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -3998,7 +3876,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -4006,11 +3884,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-11" + "id": "libvirt-10" } { - "id": "libvirt-11", + "id": "libvirt-10", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -4022,11 +3900,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-12" + "id": "libvirt-11" } { - "id": "libvirt-12", + "id": "libvirt-11", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -4038,11 +3916,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -4054,7 +3932,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -4161,7 +4039,7 @@ "type": "bool" } ], - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -4169,7 +4047,7 @@ "arguments": { "typename": "scsi-hd" }, - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -4283,7 +4161,7 @@ "type": "uint64" } ], - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -4291,7 +4169,7 @@ "arguments": { "typename": "ide-hd" }, - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -4367,7 +4245,7 @@ "type": "uint16" } ], - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -4375,11 +4253,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -4391,11 +4269,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-18" + "id": "libvirt-17" } { - "id": "libvirt-18", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -4407,11 +4285,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-19" + "id": "libvirt-18" } { - "id": "libvirt-19", + "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -4423,7 +4301,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -4496,7 +4374,7 @@ "type": "uint16" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -4504,11 +4382,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-21" + "id": "libvirt-20" } { - "id": "libvirt-21", + "id": "libvirt-20", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -4520,7 +4398,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -4577,7 +4455,7 @@ "type": "int32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -4585,7 +4463,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -4736,7 +4614,7 @@ "type": "str" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -4744,7 +4622,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -4791,7 +4669,7 @@ "type": "size" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -4799,11 +4677,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-25" + "id": "libvirt-24" } { - "id": "libvirt-25", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -4815,7 +4693,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -4958,7 +4836,7 @@ "type": "str" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -4966,11 +4844,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-27" + "id": "libvirt-26" } { - "id": "libvirt-27", + "id": "libvirt-26", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -4982,7 +4860,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -5026,7 +4904,7 @@ "type": "bool" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -5034,7 +4912,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -5114,7 +4992,7 @@ "type": "uint32" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -5122,7 +5000,7 @@ "arguments": { "typename": "spapr-pci-host-bridge" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -5208,12 +5086,12 @@ "type": "uint32" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { "execute": "query-machines", - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -5331,12 +5209,12 @@ "cpu-max": 1 } ], - "id": "libvirt-31" + "id": "libvirt-30" } { "execute": "query-cpu-definitions", - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -7512,34 +7390,34 @@ "static": false } ], - "id": "libvirt-32" + "id": "libvirt-31" } { "execute": "query-tpm-models", - "id": "libvirt-33" + "id": "libvirt-32" } { "return": [ ], - "id": "libvirt-33" + "id": "libvirt-32" } { "execute": "query-tpm-types", - "id": "libvirt-34" + "id": "libvirt-33" } { "return": [ ], - "id": "libvirt-34" + "id": "libvirt-33" } { "execute": "query-command-line-options", - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -8679,12 +8557,12 @@ "option": "drive" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-migrate-capabilities", - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -8734,12 +8612,12 @@ "capability": "return-path" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-qmp-schema", - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -18462,7 +18340,7 @@ "meta-type": "object" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies index d688e2aeef..21f2db0c37 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies @@ -512,131 +512,9 @@ "id": "libvirt-5" } -{ - "execute": "query-events", - "id": "libvirt-6" -} - -{ - "return": [ - { - "name": "WATCHDOG" - }, - { - "name": "WAKEUP" - }, - { - "name": "VSERPORT_CHANGE" - }, - { - "name": "VNC_INITIALIZED" - }, - { - "name": "VNC_DISCONNECTED" - }, - { - "name": "VNC_CONNECTED" - }, - { - "name": "SUSPEND_DISK" - }, - { - "name": "SUSPEND" - }, - { - "name": "STOP" - }, - { - "name": "SPICE_MIGRATE_COMPLETED" - }, - { - "name": "SPICE_INITIALIZED" - }, - { - "name": "SPICE_DISCONNECTED" - }, - { - "name": "SPICE_CONNECTED" - }, - { - "name": "SHUTDOWN" - }, - { - "name": "RTC_CHANGE" - }, - { - "name": "RESUME" - }, - { - "name": "RESET" - }, - { - "name": "QUORUM_REPORT_BAD" - }, - { - "name": "QUORUM_FAILURE" - }, - { - "name": "POWERDOWN" - }, - { - "name": "NIC_RX_FILTER_CHANGED" - }, - { - "name": "MIGRATION_PASS" - }, - { - "name": "MIGRATION" - }, - { - "name": "MEM_UNPLUG_ERROR" - }, - { - "name": "GUEST_PANICKED" - }, - { - "name": "DUMP_COMPLETED" - }, - { - "name": "DEVICE_TRAY_MOVED" - }, - { - "name": "DEVICE_DELETED" - }, - { - "name": "BLOCK_WRITE_THRESHOLD" - }, - { - "name": "BLOCK_JOB_READY" - }, - { - "name": "BLOCK_JOB_ERROR" - }, - { - "name": "BLOCK_JOB_COMPLETED" - }, - { - "name": "BLOCK_JOB_CANCELLED" - }, - { - "name": "BLOCK_IO_ERROR" - }, - { - "name": "BLOCK_IMAGE_CORRUPTED" - }, - { - "name": "BALLOON_CHANGE" - }, - { - "name": "ACPI_DEVICE_OST" - } - ], - "id": "libvirt-6" -} - { "execute": "qom-list-types", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -1538,7 +1416,7 @@ "parent": "virtio-device" } ], - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -1546,7 +1424,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -1774,7 +1652,7 @@ "type": "str" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -1782,7 +1660,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2069,7 +1947,7 @@ "type": "uint16" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2077,7 +1955,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2238,7 +2116,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2246,7 +2124,7 @@ "arguments": { "typename": "virtio-blk-ccw" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2384,7 +2262,7 @@ "type": "uint32" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2392,7 +2270,7 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -2593,7 +2471,7 @@ "type": "uint16" } ], - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -2601,7 +2479,7 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { @@ -2676,7 +2554,7 @@ "type": "uint32" } ], - "id": "libvirt-13" + "id": "libvirt-12" } { @@ -2684,11 +2562,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-14" + "id": "libvirt-13" } { - "id": "libvirt-14", + "id": "libvirt-13", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -2700,7 +2578,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -2807,7 +2685,7 @@ "type": "bool" } ], - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -2815,7 +2693,7 @@ "arguments": { "typename": "scsi-hd" }, - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -2929,7 +2807,7 @@ "type": "uint64" } ], - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -2937,11 +2815,11 @@ "arguments": { "typename": "ide-hd" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'ide-drive' not found" @@ -2953,11 +2831,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-18" + "id": "libvirt-17" } { - "id": "libvirt-18", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -2969,11 +2847,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-19" + "id": "libvirt-18" } { - "id": "libvirt-19", + "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -2985,11 +2863,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-20" + "id": "libvirt-19" } { - "id": "libvirt-20", + "id": "libvirt-19", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -3001,11 +2879,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-21" + "id": "libvirt-20" } { - "id": "libvirt-21", + "id": "libvirt-20", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -3017,7 +2895,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -3168,7 +3046,7 @@ "type": "str" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -3176,7 +3054,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3223,7 +3101,7 @@ "type": "size" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3231,11 +3109,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-24" + "id": "libvirt-23" } { - "id": "libvirt-24", + "id": "libvirt-23", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -3247,7 +3125,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -3390,7 +3268,7 @@ "type": "str" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -3398,7 +3276,7 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -3460,7 +3338,7 @@ "type": "uint32" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -3468,7 +3346,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3512,7 +3390,7 @@ "type": "bool" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3520,7 +3398,7 @@ "arguments": { "typename": "virtual-css-bridge" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3530,12 +3408,12 @@ "type": "bool" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { "execute": "query-machines", - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3583,12 +3461,12 @@ "cpu-max": 248 } ], - "id": "libvirt-29" + "id": "libvirt-28" } { "execute": "query-cpu-definitions", - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -4122,34 +4000,34 @@ "migration-safe": true } ], - "id": "libvirt-30" + "id": "libvirt-29" } { "execute": "query-tpm-models", - "id": "libvirt-31" + "id": "libvirt-30" } { "return": [ ], - "id": "libvirt-31" + "id": "libvirt-30" } { "execute": "query-tpm-types", - "id": "libvirt-32" + "id": "libvirt-31" } { "return": [ ], - "id": "libvirt-32" + "id": "libvirt-31" } { "execute": "query-command-line-options", - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -5254,12 +5132,12 @@ "option": "drive" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { "execute": "query-migrate-capabilities", - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -5309,12 +5187,12 @@ "capability": "return-path" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { "execute": "query-qmp-schema", - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -15037,7 +14915,7 @@ "meta-type": "object" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -15048,7 +14926,7 @@ "name": "host" } }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -15088,7 +14966,7 @@ } } }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -15102,11 +14980,11 @@ } } }, - "id": "libvirt-37" + "id": "libvirt-36" } { - "id": "libvirt-37", + "id": "libvirt-36", "error": { "class": "GenericError", "desc": "Property '.migratable' not found" diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies index c182f5fe5e..257616400b 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies @@ -509,131 +509,9 @@ "id": "libvirt-5" } -{ - "execute": "query-events", - "id": "libvirt-6" -} - -{ - "return": [ - { - "name": "WATCHDOG" - }, - { - "name": "WAKEUP" - }, - { - "name": "VSERPORT_CHANGE" - }, - { - "name": "VNC_INITIALIZED" - }, - { - "name": "VNC_DISCONNECTED" - }, - { - "name": "VNC_CONNECTED" - }, - { - "name": "SUSPEND_DISK" - }, - { - "name": "SUSPEND" - }, - { - "name": "STOP" - }, - { - "name": "SPICE_MIGRATE_COMPLETED" - }, - { - "name": "SPICE_INITIALIZED" - }, - { - "name": "SPICE_DISCONNECTED" - }, - { - "name": "SPICE_CONNECTED" - }, - { - "name": "SHUTDOWN" - }, - { - "name": "RTC_CHANGE" - }, - { - "name": "RESUME" - }, - { - "name": "RESET" - }, - { - "name": "QUORUM_REPORT_BAD" - }, - { - "name": "QUORUM_FAILURE" - }, - { - "name": "POWERDOWN" - }, - { - "name": "NIC_RX_FILTER_CHANGED" - }, - { - "name": "MIGRATION_PASS" - }, - { - "name": "MIGRATION" - }, - { - "name": "MEM_UNPLUG_ERROR" - }, - { - "name": "GUEST_PANICKED" - }, - { - "name": "DUMP_COMPLETED" - }, - { - "name": "DEVICE_TRAY_MOVED" - }, - { - "name": "DEVICE_DELETED" - }, - { - "name": "BLOCK_WRITE_THRESHOLD" - }, - { - "name": "BLOCK_JOB_READY" - }, - { - "name": "BLOCK_JOB_ERROR" - }, - { - "name": "BLOCK_JOB_COMPLETED" - }, - { - "name": "BLOCK_JOB_CANCELLED" - }, - { - "name": "BLOCK_IO_ERROR" - }, - { - "name": "BLOCK_IMAGE_CORRUPTED" - }, - { - "name": "BALLOON_CHANGE" - }, - { - "name": "ACPI_DEVICE_OST" - } - ], - "id": "libvirt-6" -} - { "execute": "qom-list-types", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -2175,7 +2053,7 @@ "parent": "virtio-input-hid-pci" } ], - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -2183,7 +2061,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -2411,7 +2289,7 @@ "type": "str" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -2419,7 +2297,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2706,7 +2584,7 @@ "type": "uint16" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2714,7 +2592,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2875,7 +2753,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2883,11 +2761,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-11" + "id": "libvirt-10" } { - "id": "libvirt-11", + "id": "libvirt-10", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -2899,11 +2777,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-12" + "id": "libvirt-11" } { - "id": "libvirt-12", + "id": "libvirt-11", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -2915,11 +2793,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -2931,7 +2809,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -3038,7 +2916,7 @@ "type": "bool" } ], - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -3046,7 +2924,7 @@ "arguments": { "typename": "scsi-hd" }, - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -3160,7 +3038,7 @@ "type": "uint64" } ], - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -3168,7 +3046,7 @@ "arguments": { "typename": "ide-hd" }, - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -3244,7 +3122,7 @@ "type": "uint16" } ], - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -3252,7 +3130,7 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -3315,7 +3193,7 @@ "type": "int32" } ], - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -3323,7 +3201,7 @@ "arguments": { "typename": "usb-redir" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -3372,7 +3250,7 @@ "type": "bool" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -3380,7 +3258,7 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -3418,7 +3296,7 @@ "type": "child" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -3426,7 +3304,7 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -3504,7 +3382,7 @@ "type": "uint64" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -3512,7 +3390,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -3585,7 +3463,7 @@ "type": "uint16" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -3593,7 +3471,7 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -3607,7 +3485,7 @@ "type": "LostTickPolicy" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -3615,7 +3493,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3672,7 +3550,7 @@ "type": "int32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3680,7 +3558,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -3723,7 +3601,7 @@ "type": "int32" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -3731,7 +3609,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -3826,7 +3704,7 @@ "type": "uint32" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -3834,7 +3712,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -3995,7 +3873,7 @@ "type": "str" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -4003,7 +3881,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -4060,7 +3938,7 @@ "type": "size" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -4068,7 +3946,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -4164,7 +4042,7 @@ "type": "uint32" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -4172,7 +4050,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -4315,7 +4193,7 @@ "type": "str" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -4323,11 +4201,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" @@ -4339,7 +4217,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -4383,7 +4261,7 @@ "type": "bool" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -4391,7 +4269,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -4471,7 +4349,7 @@ "type": "uint32" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -4479,7 +4357,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -4514,7 +4392,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -4522,7 +4400,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -4548,7 +4426,7 @@ "type": "pci-devfn" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -4556,7 +4434,7 @@ "arguments": { "typename": "nvdimm" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -4566,12 +4444,12 @@ "type": "link" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-machines", - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -4760,12 +4638,12 @@ "alias": "q35" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-cpu-definitions", - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -5100,36 +4978,36 @@ "migration-safe": true } ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-tpm-models", - "id": "libvirt-38" + "id": "libvirt-37" } { "return": [ "tpm-tis" ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-tpm-types", - "id": "libvirt-39" + "id": "libvirt-38" } { "return": [ "passthrough" ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-command-line-options", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -6408,12 +6286,12 @@ "option": "drive" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-migrate-capabilities", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -6463,12 +6341,12 @@ "capability": "return-path" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-qmp-schema", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -16191,7 +16069,7 @@ "meta-type": "object" } ], - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -16202,7 +16080,7 @@ "name": "host" } }, - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -16381,7 +16259,7 @@ } } }, - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -16562,7 +16440,7 @@ } } }, - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -16805,7 +16683,7 @@ } } }, - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -16819,7 +16697,7 @@ } } }, - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -16998,7 +16876,7 @@ } } }, - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -17179,7 +17057,7 @@ } } }, - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -17422,7 +17300,7 @@ } } }, - "id": "libvirt-46" + "id": "libvirt-45" } { diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies index 560c0af0c8..b94c0b878c 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies @@ -521,131 +521,9 @@ "id": "libvirt-5" } -{ - "execute": "query-events", - "id": "libvirt-6" -} - -{ - "return": [ - { - "name": "WATCHDOG" - }, - { - "name": "WAKEUP" - }, - { - "name": "VSERPORT_CHANGE" - }, - { - "name": "VNC_INITIALIZED" - }, - { - "name": "VNC_DISCONNECTED" - }, - { - "name": "VNC_CONNECTED" - }, - { - "name": "SUSPEND_DISK" - }, - { - "name": "SUSPEND" - }, - { - "name": "STOP" - }, - { - "name": "SPICE_MIGRATE_COMPLETED" - }, - { - "name": "SPICE_INITIALIZED" - }, - { - "name": "SPICE_DISCONNECTED" - }, - { - "name": "SPICE_CONNECTED" - }, - { - "name": "SHUTDOWN" - }, - { - "name": "RTC_CHANGE" - }, - { - "name": "RESUME" - }, - { - "name": "RESET" - }, - { - "name": "QUORUM_REPORT_BAD" - }, - { - "name": "QUORUM_FAILURE" - }, - { - "name": "POWERDOWN" - }, - { - "name": "NIC_RX_FILTER_CHANGED" - }, - { - "name": "MIGRATION_PASS" - }, - { - "name": "MIGRATION" - }, - { - "name": "MEM_UNPLUG_ERROR" - }, - { - "name": "GUEST_PANICKED" - }, - { - "name": "DUMP_COMPLETED" - }, - { - "name": "DEVICE_TRAY_MOVED" - }, - { - "name": "DEVICE_DELETED" - }, - { - "name": "BLOCK_WRITE_THRESHOLD" - }, - { - "name": "BLOCK_JOB_READY" - }, - { - "name": "BLOCK_JOB_ERROR" - }, - { - "name": "BLOCK_JOB_COMPLETED" - }, - { - "name": "BLOCK_JOB_CANCELLED" - }, - { - "name": "BLOCK_IO_ERROR" - }, - { - "name": "BLOCK_IMAGE_CORRUPTED" - }, - { - "name": "BALLOON_CHANGE" - }, - { - "name": "ACPI_DEVICE_OST" - } - ], - "id": "libvirt-6" -} - { "execute": "qom-list-types", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -1579,7 +1457,7 @@ "parent": "virtio-device" } ], - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -1587,7 +1465,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -1815,7 +1693,7 @@ "type": "str" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -1823,7 +1701,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2110,7 +1988,7 @@ "type": "uint16" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2118,7 +1996,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2283,7 +2161,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2291,7 +2169,7 @@ "arguments": { "typename": "virtio-blk-ccw" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2429,7 +2307,7 @@ "type": "uint32" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2437,7 +2315,7 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -2638,7 +2516,7 @@ "type": "uint16" } ], - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -2646,7 +2524,7 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { @@ -2725,7 +2603,7 @@ "type": "uint32" } ], - "id": "libvirt-13" + "id": "libvirt-12" } { @@ -2733,11 +2611,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-14" + "id": "libvirt-13" } { - "id": "libvirt-14", + "id": "libvirt-13", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -2749,7 +2627,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -2861,7 +2739,7 @@ "type": "bool" } ], - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -2869,7 +2747,7 @@ "arguments": { "typename": "scsi-hd" }, - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -2983,7 +2861,7 @@ "type": "uint64" } ], - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -2991,11 +2869,11 @@ "arguments": { "typename": "ide-hd" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'ide-drive' not found" @@ -3007,11 +2885,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-18" + "id": "libvirt-17" } { - "id": "libvirt-18", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -3023,11 +2901,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-19" + "id": "libvirt-18" } { - "id": "libvirt-19", + "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -3039,11 +2917,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-20" + "id": "libvirt-19" } { - "id": "libvirt-20", + "id": "libvirt-19", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -3055,11 +2933,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-21" + "id": "libvirt-20" } { - "id": "libvirt-21", + "id": "libvirt-20", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -3071,7 +2949,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -3222,7 +3100,7 @@ "type": "str" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -3230,7 +3108,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3277,7 +3155,7 @@ "type": "size" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3285,11 +3163,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-24" + "id": "libvirt-23" } { - "id": "libvirt-24", + "id": "libvirt-23", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -3301,7 +3179,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -3444,7 +3322,7 @@ "type": "str" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -3452,7 +3330,7 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -3514,7 +3392,7 @@ "type": "uint32" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -3522,7 +3400,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3566,7 +3444,7 @@ "type": "bool" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3574,7 +3452,7 @@ "arguments": { "typename": "virtio-gpu-ccw" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3639,7 +3517,7 @@ "type": "uint32" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3647,7 +3525,7 @@ "arguments": { "typename": "virtual-css-bridge" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3657,12 +3535,12 @@ "type": "bool" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { "execute": "query-machines", - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -3715,12 +3593,12 @@ "cpu-max": 248 } ], - "id": "libvirt-30" + "id": "libvirt-29" } { "execute": "query-cpu-definitions", - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -4254,35 +4132,35 @@ "migration-safe": true } ], - "id": "libvirt-31" + "id": "libvirt-30" } { "execute": "query-tpm-models", - "id": "libvirt-32" + "id": "libvirt-31" } { "return": [ ], - "id": "libvirt-32" + "id": "libvirt-31" } { "execute": "query-tpm-types", - "id": "libvirt-33" + "id": "libvirt-32" } { "return": [ "emulator" ], - "id": "libvirt-33" + "id": "libvirt-32" } { "execute": "query-command-line-options", - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -5403,12 +5281,12 @@ "option": "drive" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { "execute": "query-migrate-capabilities", - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -5466,12 +5344,12 @@ "capability": "x-multifd" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-qmp-schema", - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -15339,7 +15217,7 @@ "meta-type": "object" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -15350,7 +15228,7 @@ "name": "host" } }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -15389,7 +15267,7 @@ } } }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -15403,11 +15281,11 @@ } } }, - "id": "libvirt-38" + "id": "libvirt-37" } { - "id": "libvirt-38", + "id": "libvirt-37", "error": { "class": "GenericError", "desc": "Property '.migratable' not found" diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies index 1ed4707a23..98a01464a2 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies @@ -518,131 +518,9 @@ "id": "libvirt-5" } -{ - "execute": "query-events", - "id": "libvirt-6" -} - -{ - "return": [ - { - "name": "WATCHDOG" - }, - { - "name": "WAKEUP" - }, - { - "name": "VSERPORT_CHANGE" - }, - { - "name": "VNC_INITIALIZED" - }, - { - "name": "VNC_DISCONNECTED" - }, - { - "name": "VNC_CONNECTED" - }, - { - "name": "SUSPEND_DISK" - }, - { - "name": "SUSPEND" - }, - { - "name": "STOP" - }, - { - "name": "SPICE_MIGRATE_COMPLETED" - }, - { - "name": "SPICE_INITIALIZED" - }, - { - "name": "SPICE_DISCONNECTED" - }, - { - "name": "SPICE_CONNECTED" - }, - { - "name": "SHUTDOWN" - }, - { - "name": "RTC_CHANGE" - }, - { - "name": "RESUME" - }, - { - "name": "RESET" - }, - { - "name": "QUORUM_REPORT_BAD" - }, - { - "name": "QUORUM_FAILURE" - }, - { - "name": "POWERDOWN" - }, - { - "name": "NIC_RX_FILTER_CHANGED" - }, - { - "name": "MIGRATION_PASS" - }, - { - "name": "MIGRATION" - }, - { - "name": "MEM_UNPLUG_ERROR" - }, - { - "name": "GUEST_PANICKED" - }, - { - "name": "DUMP_COMPLETED" - }, - { - "name": "DEVICE_TRAY_MOVED" - }, - { - "name": "DEVICE_DELETED" - }, - { - "name": "BLOCK_WRITE_THRESHOLD" - }, - { - "name": "BLOCK_JOB_READY" - }, - { - "name": "BLOCK_JOB_ERROR" - }, - { - "name": "BLOCK_JOB_COMPLETED" - }, - { - "name": "BLOCK_JOB_CANCELLED" - }, - { - "name": "BLOCK_IO_ERROR" - }, - { - "name": "BLOCK_IMAGE_CORRUPTED" - }, - { - "name": "BALLOON_CHANGE" - }, - { - "name": "ACPI_DEVICE_OST" - } - ], - "id": "libvirt-6" -} - { "execute": "qom-list-types", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -2168,7 +2046,7 @@ "parent": "virtio-input-hid-pci" } ], - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -2176,7 +2054,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -2404,7 +2282,7 @@ "type": "str" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -2412,7 +2290,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2699,7 +2577,7 @@ "type": "uint16" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2707,7 +2585,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2872,7 +2750,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2880,11 +2758,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-11" + "id": "libvirt-10" } { - "id": "libvirt-11", + "id": "libvirt-10", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -2896,11 +2774,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-12" + "id": "libvirt-11" } { - "id": "libvirt-12", + "id": "libvirt-11", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -2912,11 +2790,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -2928,7 +2806,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -3040,7 +2918,7 @@ "type": "bool" } ], - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -3048,7 +2926,7 @@ "arguments": { "typename": "scsi-hd" }, - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -3162,7 +3040,7 @@ "type": "uint64" } ], - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -3170,7 +3048,7 @@ "arguments": { "typename": "ide-hd" }, - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -3246,7 +3124,7 @@ "type": "uint16" } ], - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -3254,7 +3132,7 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -3317,7 +3195,7 @@ "type": "int32" } ], - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -3325,7 +3203,7 @@ "arguments": { "typename": "usb-redir" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -3374,7 +3252,7 @@ "type": "bool" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -3382,7 +3260,7 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -3424,7 +3302,7 @@ "type": "bool" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -3432,7 +3310,7 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -3514,7 +3392,7 @@ "type": "uint64" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -3522,7 +3400,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -3595,7 +3473,7 @@ "type": "uint16" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -3603,7 +3481,7 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -3617,7 +3495,7 @@ "type": "LostTickPolicy" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -3625,7 +3503,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3682,7 +3560,7 @@ "type": "int32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3690,7 +3568,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -3733,7 +3611,7 @@ "type": "int32" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -3741,7 +3619,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -3836,7 +3714,7 @@ "type": "uint32" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -3844,7 +3722,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -4005,7 +3883,7 @@ "type": "str" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -4013,7 +3891,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -4070,7 +3948,7 @@ "type": "size" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -4078,7 +3956,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -4174,7 +4052,7 @@ "type": "uint32" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -4182,7 +4060,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -4325,7 +4203,7 @@ "type": "str" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -4333,11 +4211,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" @@ -4349,7 +4227,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -4393,7 +4271,7 @@ "type": "bool" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -4401,7 +4279,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -4481,7 +4359,7 @@ "type": "uint32" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -4489,7 +4367,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -4524,7 +4402,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -4532,7 +4410,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -4575,7 +4453,7 @@ "type": "int32" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -4583,7 +4461,7 @@ "arguments": { "typename": "nvdimm" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -4593,12 +4471,12 @@ "type": "link" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-machines", - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -4787,12 +4665,12 @@ "cpu-max": 288 } ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-cpu-definitions", - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -5106,24 +4984,24 @@ "migration-safe": true } ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-tpm-models", - "id": "libvirt-38" + "id": "libvirt-37" } { "return": [ "tpm-tis" ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-tpm-types", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -5131,12 +5009,12 @@ "passthrough", "emulator" ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-command-line-options", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -6431,12 +6309,12 @@ "option": "drive" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-migrate-capabilities", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -6494,12 +6372,12 @@ "capability": "x-multifd" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-qmp-schema", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -16367,7 +16245,7 @@ "meta-type": "object" } ], - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -16378,7 +16256,7 @@ "name": "host" } }, - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -16558,7 +16436,7 @@ } } }, - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -16740,7 +16618,7 @@ } } }, - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -16985,7 +16863,7 @@ } } }, - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -16999,7 +16877,7 @@ } } }, - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -17179,7 +17057,7 @@ } } }, - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -17361,7 +17239,7 @@ } } }, - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -17606,7 +17484,7 @@ } } }, - "id": "libvirt-46" + "id": "libvirt-45" } { diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies index 565e10047e..830b73df03 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies @@ -536,137 +536,9 @@ "id": "libvirt-5" } -{ - "execute": "query-events", - "id": "libvirt-6" -} - -{ - "return": [ - { - "name": "COMMAND_DROPPED" - }, - { - "name": "RTC_CHANGE" - }, - { - "name": "ACPI_DEVICE_OST" - }, - { - "name": "MEM_UNPLUG_ERROR" - }, - { - "name": "DUMP_COMPLETED" - }, - { - "name": "DEVICE_DELETED" - }, - { - "name": "BALLOON_CHANGE" - }, - { - "name": "MIGRATION_PASS" - }, - { - "name": "MIGRATION" - }, - { - "name": "VNC_DISCONNECTED" - }, - { - "name": "VNC_INITIALIZED" - }, - { - "name": "VNC_CONNECTED" - }, - { - "name": "SPICE_MIGRATE_COMPLETED" - }, - { - "name": "SPICE_DISCONNECTED" - }, - { - "name": "SPICE_INITIALIZED" - }, - { - "name": "SPICE_CONNECTED" - }, - { - "name": "NIC_RX_FILTER_CHANGED" - }, - { - "name": "VSERPORT_CHANGE" - }, - { - "name": "QUORUM_REPORT_BAD" - }, - { - "name": "QUORUM_FAILURE" - }, - { - "name": "DEVICE_TRAY_MOVED" - }, - { - "name": "BLOCK_WRITE_THRESHOLD" - }, - { - "name": "BLOCK_JOB_PENDING" - }, - { - "name": "BLOCK_JOB_READY" - }, - { - "name": "BLOCK_JOB_ERROR" - }, - { - "name": "BLOCK_JOB_CANCELLED" - }, - { - "name": "BLOCK_JOB_COMPLETED" - }, - { - "name": "BLOCK_IO_ERROR" - }, - { - "name": "BLOCK_IMAGE_CORRUPTED" - }, - { - "name": "GUEST_PANICKED" - }, - { - "name": "WATCHDOG" - }, - { - "name": "WAKEUP" - }, - { - "name": "SUSPEND_DISK" - }, - { - "name": "SUSPEND" - }, - { - "name": "RESUME" - }, - { - "name": "STOP" - }, - { - "name": "RESET" - }, - { - "name": "POWERDOWN" - }, - { - "name": "SHUTDOWN" - } - ], - "id": "libvirt-6" -} - { "execute": "qom-list-types", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -3484,7 +3356,7 @@ "parent": "rng-backend" } ], - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -3492,7 +3364,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -3724,7 +3596,7 @@ "type": "str" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -3732,7 +3604,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -4027,7 +3899,7 @@ "type": "uint16" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -4035,7 +3907,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -4200,7 +4072,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -4208,11 +4080,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-11" + "id": "libvirt-10" } { - "id": "libvirt-11", + "id": "libvirt-10", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -4224,11 +4096,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-12" + "id": "libvirt-11" } { - "id": "libvirt-12", + "id": "libvirt-11", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -4240,11 +4112,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -4256,7 +4128,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -4382,7 +4254,7 @@ "type": "str" } ], - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -4390,7 +4262,7 @@ "arguments": { "typename": "scsi-hd" }, - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -4504,7 +4376,7 @@ "type": "uint64" } ], - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -4512,7 +4384,7 @@ "arguments": { "typename": "ide-hd" }, - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -4588,7 +4460,7 @@ "type": "uint16" } ], - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -4596,11 +4468,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -4612,11 +4484,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-18" + "id": "libvirt-17" } { - "id": "libvirt-18", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -4628,11 +4500,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-19" + "id": "libvirt-18" } { - "id": "libvirt-19", + "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -4644,7 +4516,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -4717,7 +4589,7 @@ "type": "uint16" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -4725,11 +4597,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-21" + "id": "libvirt-20" } { - "id": "libvirt-21", + "id": "libvirt-20", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -4741,7 +4613,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -4798,7 +4670,7 @@ "type": "int32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -4806,7 +4678,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -4957,7 +4829,7 @@ "type": "str" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -4965,7 +4837,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -5012,7 +4884,7 @@ "type": "size" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -5020,11 +4892,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-25" + "id": "libvirt-24" } { - "id": "libvirt-25", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -5036,7 +4908,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -5179,7 +5051,7 @@ "type": "str" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -5187,11 +5059,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-27" + "id": "libvirt-26" } { - "id": "libvirt-27", + "id": "libvirt-26", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -5203,7 +5075,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -5247,7 +5119,7 @@ "type": "bool" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -5255,7 +5127,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -5335,7 +5207,7 @@ "type": "uint32" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -5343,7 +5215,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -5397,7 +5269,7 @@ "type": "string" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -5405,7 +5277,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -5455,7 +5327,7 @@ "type": "string" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -5463,11 +5335,11 @@ "arguments": { "typename": "spapr-machine" }, - "id": "libvirt-32" + "id": "libvirt-31" } { - "id": "libvirt-32", + "id": "libvirt-31", "error": { "class": "DeviceNotFound", "desc": "Class 'spapr-machine' not found" @@ -5476,7 +5348,7 @@ { "execute": "query-machines", - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -5773,12 +5645,12 @@ "cpu-max": 1 } ], - "id": "libvirt-33" + "id": "libvirt-32" } { "execute": "query-cpu-definitions", - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -5954,35 +5826,35 @@ "static": false } ], - "id": "libvirt-34" + "id": "libvirt-33" } { "execute": "query-tpm-models", - "id": "libvirt-35" + "id": "libvirt-34" } { "return": [ ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-tpm-types", - "id": "libvirt-36" + "id": "libvirt-35" } { "return": [ "emulator" ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-command-line-options", - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -7143,12 +7015,12 @@ "option": "drive" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-migrate-capabilities", - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -7210,12 +7082,12 @@ "capability": "dirty-bitmaps" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-qmp-schema", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -18583,12 +18455,12 @@ "meta-type": "object" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-gic-capabilities", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -18604,7 +18476,7 @@ "kernel": false } ], - "id": "libvirt-40" + "id": "libvirt-39" } { diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies index fb9fa444c8..a1a0f25a58 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies @@ -533,137 +533,9 @@ "id": "libvirt-5" } -{ - "execute": "query-events", - "id": "libvirt-6" -} - -{ - "return": [ - { - "name": "COMMAND_DROPPED" - }, - { - "name": "RTC_CHANGE" - }, - { - "name": "ACPI_DEVICE_OST" - }, - { - "name": "MEM_UNPLUG_ERROR" - }, - { - "name": "DUMP_COMPLETED" - }, - { - "name": "DEVICE_DELETED" - }, - { - "name": "BALLOON_CHANGE" - }, - { - "name": "MIGRATION_PASS" - }, - { - "name": "MIGRATION" - }, - { - "name": "VNC_DISCONNECTED" - }, - { - "name": "VNC_INITIALIZED" - }, - { - "name": "VNC_CONNECTED" - }, - { - "name": "SPICE_MIGRATE_COMPLETED" - }, - { - "name": "SPICE_DISCONNECTED" - }, - { - "name": "SPICE_INITIALIZED" - }, - { - "name": "SPICE_CONNECTED" - }, - { - "name": "NIC_RX_FILTER_CHANGED" - }, - { - "name": "VSERPORT_CHANGE" - }, - { - "name": "QUORUM_REPORT_BAD" - }, - { - "name": "QUORUM_FAILURE" - }, - { - "name": "DEVICE_TRAY_MOVED" - }, - { - "name": "BLOCK_WRITE_THRESHOLD" - }, - { - "name": "BLOCK_JOB_PENDING" - }, - { - "name": "BLOCK_JOB_READY" - }, - { - "name": "BLOCK_JOB_ERROR" - }, - { - "name": "BLOCK_JOB_CANCELLED" - }, - { - "name": "BLOCK_JOB_COMPLETED" - }, - { - "name": "BLOCK_IO_ERROR" - }, - { - "name": "BLOCK_IMAGE_CORRUPTED" - }, - { - "name": "GUEST_PANICKED" - }, - { - "name": "WATCHDOG" - }, - { - "name": "WAKEUP" - }, - { - "name": "SUSPEND_DISK" - }, - { - "name": "SUSPEND" - }, - { - "name": "RESUME" - }, - { - "name": "STOP" - }, - { - "name": "RESET" - }, - { - "name": "POWERDOWN" - }, - { - "name": "SHUTDOWN" - } - ], - "id": "libvirt-6" -} - { "execute": "qom-list-types", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -3473,7 +3345,7 @@ "parent": "e500v2-family-powerpc64-cpu" } ], - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -3481,7 +3353,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -3713,7 +3585,7 @@ "type": "str" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -3721,7 +3593,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -4016,7 +3888,7 @@ "type": "uint16" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -4024,7 +3896,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -4189,7 +4061,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -4197,11 +4069,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-11" + "id": "libvirt-10" } { - "id": "libvirt-11", + "id": "libvirt-10", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -4213,11 +4085,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-12" + "id": "libvirt-11" } { - "id": "libvirt-12", + "id": "libvirt-11", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -4229,11 +4101,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -4245,7 +4117,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -4371,7 +4243,7 @@ "type": "str" } ], - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -4379,7 +4251,7 @@ "arguments": { "typename": "scsi-hd" }, - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -4493,7 +4365,7 @@ "type": "uint64" } ], - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -4501,7 +4373,7 @@ "arguments": { "typename": "ide-hd" }, - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -4577,7 +4449,7 @@ "type": "uint16" } ], - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -4585,11 +4457,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -4601,11 +4473,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-18" + "id": "libvirt-17" } { - "id": "libvirt-18", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -4617,11 +4489,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-19" + "id": "libvirt-18" } { - "id": "libvirt-19", + "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -4633,7 +4505,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -4706,7 +4578,7 @@ "type": "uint16" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -4714,11 +4586,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-21" + "id": "libvirt-20" } { - "id": "libvirt-21", + "id": "libvirt-20", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -4730,7 +4602,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -4787,7 +4659,7 @@ "type": "int32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -4795,7 +4667,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -4946,7 +4818,7 @@ "type": "str" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -4954,7 +4826,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -5001,7 +4873,7 @@ "type": "size" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -5009,11 +4881,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-25" + "id": "libvirt-24" } { - "id": "libvirt-25", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -5025,7 +4897,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -5168,7 +5040,7 @@ "type": "str" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -5176,11 +5048,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-27" + "id": "libvirt-26" } { - "id": "libvirt-27", + "id": "libvirt-26", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -5192,7 +5064,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -5236,7 +5108,7 @@ "type": "bool" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -5244,7 +5116,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -5324,7 +5196,7 @@ "type": "uint32" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -5332,7 +5204,7 @@ "arguments": { "typename": "spapr-pci-host-bridge" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -5390,7 +5262,7 @@ "type": "uint32" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -5398,7 +5270,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -5452,7 +5324,7 @@ "type": "string" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -5460,7 +5332,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -5510,7 +5382,7 @@ "type": "string" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -5518,7 +5390,7 @@ "arguments": { "typename": "spapr-machine" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -5679,12 +5551,12 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { "execute": "query-machines", - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -5822,12 +5694,12 @@ "cpu-max": 1 } ], - "id": "libvirt-34" + "id": "libvirt-33" } { "execute": "query-cpu-definitions", - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -8023,35 +7895,35 @@ "static": false } ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-tpm-models", - "id": "libvirt-36" + "id": "libvirt-35" } { "return": [ ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-tpm-types", - "id": "libvirt-37" + "id": "libvirt-36" } { "return": [ "emulator" ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-command-line-options", - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -9207,12 +9079,12 @@ "option": "drive" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-migrate-capabilities", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -9274,12 +9146,12 @@ "capability": "dirty-bitmaps" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-qmp-schema", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -20647,7 +20519,7 @@ "meta-type": "object" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies index ddc62a8b82..23b898120d 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies @@ -545,137 +545,9 @@ "id": "libvirt-5" } -{ - "execute": "query-events", - "id": "libvirt-6" -} - -{ - "return": [ - { - "name": "COMMAND_DROPPED" - }, - { - "name": "RTC_CHANGE" - }, - { - "name": "ACPI_DEVICE_OST" - }, - { - "name": "MEM_UNPLUG_ERROR" - }, - { - "name": "DUMP_COMPLETED" - }, - { - "name": "DEVICE_DELETED" - }, - { - "name": "BALLOON_CHANGE" - }, - { - "name": "MIGRATION_PASS" - }, - { - "name": "MIGRATION" - }, - { - "name": "VNC_DISCONNECTED" - }, - { - "name": "VNC_INITIALIZED" - }, - { - "name": "VNC_CONNECTED" - }, - { - "name": "SPICE_MIGRATE_COMPLETED" - }, - { - "name": "SPICE_DISCONNECTED" - }, - { - "name": "SPICE_INITIALIZED" - }, - { - "name": "SPICE_CONNECTED" - }, - { - "name": "NIC_RX_FILTER_CHANGED" - }, - { - "name": "VSERPORT_CHANGE" - }, - { - "name": "QUORUM_REPORT_BAD" - }, - { - "name": "QUORUM_FAILURE" - }, - { - "name": "DEVICE_TRAY_MOVED" - }, - { - "name": "BLOCK_WRITE_THRESHOLD" - }, - { - "name": "BLOCK_JOB_PENDING" - }, - { - "name": "BLOCK_JOB_READY" - }, - { - "name": "BLOCK_JOB_ERROR" - }, - { - "name": "BLOCK_JOB_CANCELLED" - }, - { - "name": "BLOCK_JOB_COMPLETED" - }, - { - "name": "BLOCK_IO_ERROR" - }, - { - "name": "BLOCK_IMAGE_CORRUPTED" - }, - { - "name": "GUEST_PANICKED" - }, - { - "name": "WATCHDOG" - }, - { - "name": "WAKEUP" - }, - { - "name": "SUSPEND_DISK" - }, - { - "name": "SUSPEND" - }, - { - "name": "RESUME" - }, - { - "name": "STOP" - }, - { - "name": "RESET" - }, - { - "name": "POWERDOWN" - }, - { - "name": "SHUTDOWN" - } - ], - "id": "libvirt-6" -} - { "execute": "qom-list-types", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -1625,7 +1497,7 @@ "parent": "virtio-device" } ], - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -1633,7 +1505,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -1865,7 +1737,7 @@ "type": "str" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -1873,7 +1745,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2168,7 +2040,7 @@ "type": "uint16" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2176,7 +2048,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2341,7 +2213,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2349,7 +2221,7 @@ "arguments": { "typename": "virtio-blk-ccw" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2491,7 +2363,7 @@ "type": "uint32" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2499,7 +2371,7 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -2708,7 +2580,7 @@ "type": "uint16" } ], - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -2716,7 +2588,7 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { @@ -2795,7 +2667,7 @@ "type": "uint32" } ], - "id": "libvirt-13" + "id": "libvirt-12" } { @@ -2803,11 +2675,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-14" + "id": "libvirt-13" } { - "id": "libvirt-14", + "id": "libvirt-13", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -2819,7 +2691,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -2945,7 +2817,7 @@ "type": "str" } ], - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -2953,7 +2825,7 @@ "arguments": { "typename": "scsi-hd" }, - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -3071,7 +2943,7 @@ "type": "uint32" } ], - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -3079,11 +2951,11 @@ "arguments": { "typename": "ide-hd" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'ide-drive' not found" @@ -3095,11 +2967,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-18" + "id": "libvirt-17" } { - "id": "libvirt-18", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -3111,11 +2983,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-19" + "id": "libvirt-18" } { - "id": "libvirt-19", + "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -3127,11 +2999,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-20" + "id": "libvirt-19" } { - "id": "libvirt-20", + "id": "libvirt-19", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -3143,11 +3015,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-21" + "id": "libvirt-20" } { - "id": "libvirt-21", + "id": "libvirt-20", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -3159,7 +3031,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -3310,7 +3182,7 @@ "type": "str" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -3318,7 +3190,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3365,7 +3237,7 @@ "type": "size" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3373,11 +3245,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-24" + "id": "libvirt-23" } { - "id": "libvirt-24", + "id": "libvirt-23", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -3389,7 +3261,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -3532,7 +3404,7 @@ "type": "str" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -3540,7 +3412,7 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -3602,7 +3474,7 @@ "type": "uint32" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -3610,7 +3482,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3654,7 +3526,7 @@ "type": "bool" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3662,7 +3534,7 @@ "arguments": { "typename": "virtio-gpu-ccw" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3727,7 +3599,7 @@ "type": "uint32" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3735,7 +3607,7 @@ "arguments": { "typename": "virtual-css-bridge" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3750,7 +3622,7 @@ "type": "bool" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3758,7 +3630,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -3812,7 +3684,7 @@ "type": "string" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -3820,7 +3692,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3870,7 +3742,7 @@ "type": "string" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3878,11 +3750,11 @@ "arguments": { "typename": "spapr-machine" }, - "id": "libvirt-32" + "id": "libvirt-31" } { - "id": "libvirt-32", + "id": "libvirt-31", "error": { "class": "DeviceNotFound", "desc": "Class 'spapr-machine' not found" @@ -3891,7 +3763,7 @@ { "execute": "query-machines", - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3949,12 +3821,12 @@ "alias": "s390-ccw-virtio" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { "execute": "query-cpu-definitions", - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -4489,35 +4361,35 @@ "migration-safe": true } ], - "id": "libvirt-34" + "id": "libvirt-33" } { "execute": "query-tpm-models", - "id": "libvirt-35" + "id": "libvirt-34" } { "return": [ ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-tpm-types", - "id": "libvirt-36" + "id": "libvirt-35" } { "return": [ "emulator" ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-command-line-options", - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -5642,12 +5514,12 @@ "option": "drive" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-migrate-capabilities", - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -5709,12 +5581,12 @@ "capability": "dirty-bitmaps" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-qmp-schema", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -17082,7 +16954,7 @@ "meta-type": "object" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -17093,7 +16965,7 @@ "name": "host" } }, - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -17131,7 +17003,7 @@ } } }, - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -17145,11 +17017,11 @@ } } }, - "id": "libvirt-41" + "id": "libvirt-40" } { - "id": "libvirt-41", + "id": "libvirt-40", "error": { "class": "GenericError", "desc": "Property '.migratable' not found" diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies index 132c9c9893..b1783f4073 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies @@ -551,137 +551,9 @@ "id": "libvirt-5" } -{ - "execute": "query-events", - "id": "libvirt-6" -} - -{ - "return": [ - { - "name": "COMMAND_DROPPED" - }, - { - "name": "RTC_CHANGE" - }, - { - "name": "ACPI_DEVICE_OST" - }, - { - "name": "MEM_UNPLUG_ERROR" - }, - { - "name": "DUMP_COMPLETED" - }, - { - "name": "DEVICE_DELETED" - }, - { - "name": "BALLOON_CHANGE" - }, - { - "name": "MIGRATION_PASS" - }, - { - "name": "MIGRATION" - }, - { - "name": "VNC_DISCONNECTED" - }, - { - "name": "VNC_INITIALIZED" - }, - { - "name": "VNC_CONNECTED" - }, - { - "name": "SPICE_MIGRATE_COMPLETED" - }, - { - "name": "SPICE_DISCONNECTED" - }, - { - "name": "SPICE_INITIALIZED" - }, - { - "name": "SPICE_CONNECTED" - }, - { - "name": "NIC_RX_FILTER_CHANGED" - }, - { - "name": "VSERPORT_CHANGE" - }, - { - "name": "QUORUM_REPORT_BAD" - }, - { - "name": "QUORUM_FAILURE" - }, - { - "name": "DEVICE_TRAY_MOVED" - }, - { - "name": "BLOCK_WRITE_THRESHOLD" - }, - { - "name": "BLOCK_JOB_PENDING" - }, - { - "name": "BLOCK_JOB_READY" - }, - { - "name": "BLOCK_JOB_ERROR" - }, - { - "name": "BLOCK_JOB_CANCELLED" - }, - { - "name": "BLOCK_JOB_COMPLETED" - }, - { - "name": "BLOCK_IO_ERROR" - }, - { - "name": "BLOCK_IMAGE_CORRUPTED" - }, - { - "name": "GUEST_PANICKED" - }, - { - "name": "WATCHDOG" - }, - { - "name": "WAKEUP" - }, - { - "name": "SUSPEND_DISK" - }, - { - "name": "SUSPEND" - }, - { - "name": "RESUME" - }, - { - "name": "STOP" - }, - { - "name": "RESET" - }, - { - "name": "POWERDOWN" - }, - { - "name": "SHUTDOWN" - } - ], - "id": "libvirt-6" -} - { "execute": "qom-list-types", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -2331,7 +2203,7 @@ "parent": "rng-backend" } ], - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -2339,7 +2211,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -2571,7 +2443,7 @@ "type": "str" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -2579,7 +2451,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2874,7 +2746,7 @@ "type": "uint16" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2882,7 +2754,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -3047,7 +2919,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -3055,11 +2927,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-11" + "id": "libvirt-10" } { - "id": "libvirt-11", + "id": "libvirt-10", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -3071,11 +2943,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-12" + "id": "libvirt-11" } { - "id": "libvirt-12", + "id": "libvirt-11", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -3087,11 +2959,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -3103,7 +2975,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -3229,7 +3101,7 @@ "type": "str" } ], - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -3237,7 +3109,7 @@ "arguments": { "typename": "scsi-hd" }, - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -3351,7 +3223,7 @@ "type": "uint64" } ], - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -3359,7 +3231,7 @@ "arguments": { "typename": "ide-hd" }, - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -3435,7 +3307,7 @@ "type": "uint16" } ], - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -3443,7 +3315,7 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -3506,7 +3378,7 @@ "type": "int32" } ], - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -3514,7 +3386,7 @@ "arguments": { "typename": "usb-redir" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -3563,7 +3435,7 @@ "type": "bool" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -3571,7 +3443,7 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -3613,7 +3485,7 @@ "type": "bool" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -3621,7 +3493,7 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -3703,7 +3575,7 @@ "type": "uint64" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -3711,7 +3583,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -3784,7 +3656,7 @@ "type": "uint16" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -3792,7 +3664,7 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -3806,7 +3678,7 @@ "type": "LostTickPolicy" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -3814,7 +3686,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3871,7 +3743,7 @@ "type": "int32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3879,7 +3751,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -3922,7 +3794,7 @@ "type": "int32" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -3930,7 +3802,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -4025,7 +3897,7 @@ "type": "uint32" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -4033,7 +3905,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -4184,7 +4056,7 @@ "type": "str" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -4192,7 +4064,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -4239,7 +4111,7 @@ "type": "size" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -4247,7 +4119,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -4343,7 +4215,7 @@ "type": "uint32" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -4351,7 +4223,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -4494,7 +4366,7 @@ "type": "str" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -4502,11 +4374,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" @@ -4518,7 +4390,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -4562,7 +4434,7 @@ "type": "bool" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -4570,7 +4442,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -4650,7 +4522,7 @@ "type": "uint32" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -4658,7 +4530,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -4697,7 +4569,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -4705,7 +4577,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -4748,7 +4620,7 @@ "type": "int32" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -4756,7 +4628,7 @@ "arguments": { "typename": "nvdimm" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -4766,7 +4638,7 @@ "type": "link" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -4774,7 +4646,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -4828,7 +4700,7 @@ "type": "string" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -4836,7 +4708,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -4886,7 +4758,7 @@ "type": "string" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -4894,11 +4766,11 @@ "arguments": { "typename": "spapr-machine" }, - "id": "libvirt-38" + "id": "libvirt-37" } { - "id": "libvirt-38", + "id": "libvirt-37", "error": { "class": "DeviceNotFound", "desc": "Class 'spapr-machine' not found" @@ -4907,7 +4779,7 @@ { "execute": "query-machines", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -5106,12 +4978,12 @@ "cpu-max": 255 } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-cpu-definitions", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -5625,12 +5497,12 @@ "migration-safe": true } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-tpm-models", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -5638,12 +5510,12 @@ "tpm-crb", "tpm-tis" ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-tpm-types", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -5651,12 +5523,12 @@ "passthrough", "emulator" ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-command-line-options", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -6943,12 +6815,12 @@ "option": "drive" } ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-migrate-capabilities", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -7010,12 +6882,12 @@ "capability": "dirty-bitmaps" } ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-qmp-schema", - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -18383,7 +18255,7 @@ "meta-type": "object" } ], - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -18394,7 +18266,7 @@ "name": "host" } }, - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -18584,7 +18456,7 @@ } } }, - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -18776,7 +18648,7 @@ } } }, - "id": "libvirt-47" + "id": "libvirt-46" } { @@ -19031,7 +18903,7 @@ } } }, - "id": "libvirt-47" + "id": "libvirt-46" } { @@ -19045,7 +18917,7 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-47" } { @@ -19235,7 +19107,7 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-47" } { @@ -19427,7 +19299,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -19682,12 +19554,12 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-48" } { "execute": "query-sev-capabilities", - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -19697,7 +19569,7 @@ "cert-chain": "AQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAA", "pdh": "AQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAA" }, - "id": "libvirt-50" + "id": "libvirt-49" } { diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies index dcec7217db..76ebfba904 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies @@ -467,125 +467,9 @@ "id": "libvirt-5" } -{ - "execute": "query-events", - "id": "libvirt-6" -} - -{ - "return": [ - { - "name": "WATCHDOG" - }, - { - "name": "WAKEUP" - }, - { - "name": "VSERPORT_CHANGE" - }, - { - "name": "VNC_INITIALIZED" - }, - { - "name": "VNC_DISCONNECTED" - }, - { - "name": "VNC_CONNECTED" - }, - { - "name": "SUSPEND_DISK" - }, - { - "name": "SUSPEND" - }, - { - "name": "STOP" - }, - { - "name": "SPICE_MIGRATE_COMPLETED" - }, - { - "name": "SPICE_INITIALIZED" - }, - { - "name": "SPICE_DISCONNECTED" - }, - { - "name": "SPICE_CONNECTED" - }, - { - "name": "SHUTDOWN" - }, - { - "name": "RTC_CHANGE" - }, - { - "name": "RESUME" - }, - { - "name": "RESET" - }, - { - "name": "QUORUM_REPORT_BAD" - }, - { - "name": "QUORUM_FAILURE" - }, - { - "name": "POWERDOWN" - }, - { - "name": "NIC_RX_FILTER_CHANGED" - }, - { - "name": "MIGRATION" - }, - { - "name": "MEM_UNPLUG_ERROR" - }, - { - "name": "GUEST_PANICKED" - }, - { - "name": "DEVICE_TRAY_MOVED" - }, - { - "name": "DEVICE_DELETED" - }, - { - "name": "BLOCK_WRITE_THRESHOLD" - }, - { - "name": "BLOCK_JOB_READY" - }, - { - "name": "BLOCK_JOB_ERROR" - }, - { - "name": "BLOCK_JOB_COMPLETED" - }, - { - "name": "BLOCK_JOB_CANCELLED" - }, - { - "name": "BLOCK_IO_ERROR" - }, - { - "name": "BLOCK_IMAGE_CORRUPTED" - }, - { - "name": "BALLOON_CHANGE" - }, - { - "name": "ACPI_DEVICE_OST" - } - ], - "id": "libvirt-6" -} - { "execute": "qom-list-types", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -1491,7 +1375,7 @@ "name": "virtio-blk-device" } ], - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -1499,7 +1383,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -1661,7 +1545,7 @@ "type": "str" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -1669,7 +1553,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1897,7 +1781,7 @@ "type": "str" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1905,7 +1789,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2023,7 +1907,7 @@ "type": "uint32" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2031,11 +1915,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-11" + "id": "libvirt-10" } { - "id": "libvirt-11", + "id": "libvirt-10", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -2047,11 +1931,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-12" + "id": "libvirt-11" } { - "id": "libvirt-12", + "id": "libvirt-11", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -2063,11 +1947,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -2079,7 +1963,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -2163,7 +2047,7 @@ "type": "bool" } ], - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -2171,7 +2055,7 @@ "arguments": { "typename": "scsi-hd" }, - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -2266,7 +2150,7 @@ "type": "uint64" } ], - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -2274,7 +2158,7 @@ "arguments": { "typename": "ide-hd" }, - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -2331,7 +2215,7 @@ "type": "uint16" } ], - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -2339,7 +2223,7 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -2392,7 +2276,7 @@ "type": "int32" } ], - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -2400,7 +2284,7 @@ "arguments": { "typename": "usb-redir" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -2441,7 +2325,7 @@ "type": "bool" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -2449,7 +2333,7 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2487,7 +2371,7 @@ "type": "child" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2495,7 +2379,7 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -2549,7 +2433,7 @@ "type": "child" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -2557,7 +2441,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -2617,7 +2501,7 @@ "type": "uint16" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -2625,7 +2509,7 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -2639,7 +2523,7 @@ "type": "LostTickPolicy" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -2647,7 +2531,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -2694,7 +2578,7 @@ "type": "int32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -2702,7 +2586,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -2735,7 +2619,7 @@ "type": "int32" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -2743,7 +2627,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -2820,7 +2704,7 @@ "type": "uint32" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -2828,7 +2712,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -2934,7 +2818,7 @@ "type": "uint32" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -2942,7 +2826,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -2982,7 +2866,7 @@ "type": "bool" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -2990,7 +2874,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3067,7 +2951,7 @@ "type": "uint32" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3075,7 +2959,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3175,7 +3059,7 @@ "type": "bool" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3183,11 +3067,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" @@ -3199,7 +3083,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3238,7 +3122,7 @@ "type": "bool" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3246,7 +3130,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3316,7 +3200,7 @@ "type": "uint32" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3324,7 +3208,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3334,7 +3218,7 @@ "type": "uint32" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3342,7 +3226,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -3368,12 +3252,12 @@ "type": "pci-devfn" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { "execute": "query-machines", - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -3510,12 +3394,12 @@ "cpu-max": 255 } ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-cpu-definitions", - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -3605,36 +3489,36 @@ "name": "qemu64" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-tpm-models", - "id": "libvirt-37" + "id": "libvirt-36" } { "return": [ "tpm-tis" ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-tpm-types", - "id": "libvirt-38" + "id": "libvirt-37" } { "return": [ "passthrough" ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-command-line-options", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -4679,12 +4563,12 @@ "option": "drive" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-migrate-capabilities", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -4718,12 +4602,12 @@ "capability": "x-postcopy-ram" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-qmp-schema", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -12268,7 +12152,7 @@ "meta-type": "array" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies index 9df4439b05..4d35a2c464 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies @@ -470,131 +470,9 @@ "id": "libvirt-5" } -{ - "execute": "query-events", - "id": "libvirt-6" -} - -{ - "return": [ - { - "name": "WATCHDOG" - }, - { - "name": "WAKEUP" - }, - { - "name": "VSERPORT_CHANGE" - }, - { - "name": "VNC_INITIALIZED" - }, - { - "name": "VNC_DISCONNECTED" - }, - { - "name": "VNC_CONNECTED" - }, - { - "name": "SUSPEND_DISK" - }, - { - "name": "SUSPEND" - }, - { - "name": "STOP" - }, - { - "name": "SPICE_MIGRATE_COMPLETED" - }, - { - "name": "SPICE_INITIALIZED" - }, - { - "name": "SPICE_DISCONNECTED" - }, - { - "name": "SPICE_CONNECTED" - }, - { - "name": "SHUTDOWN" - }, - { - "name": "RTC_CHANGE" - }, - { - "name": "RESUME" - }, - { - "name": "RESET" - }, - { - "name": "QUORUM_REPORT_BAD" - }, - { - "name": "QUORUM_FAILURE" - }, - { - "name": "POWERDOWN" - }, - { - "name": "NIC_RX_FILTER_CHANGED" - }, - { - "name": "MIGRATION_PASS" - }, - { - "name": "MIGRATION" - }, - { - "name": "MEM_UNPLUG_ERROR" - }, - { - "name": "GUEST_PANICKED" - }, - { - "name": "DUMP_COMPLETED" - }, - { - "name": "DEVICE_TRAY_MOVED" - }, - { - "name": "DEVICE_DELETED" - }, - { - "name": "BLOCK_WRITE_THRESHOLD" - }, - { - "name": "BLOCK_JOB_READY" - }, - { - "name": "BLOCK_JOB_ERROR" - }, - { - "name": "BLOCK_JOB_COMPLETED" - }, - { - "name": "BLOCK_JOB_CANCELLED" - }, - { - "name": "BLOCK_IO_ERROR" - }, - { - "name": "BLOCK_IMAGE_CORRUPTED" - }, - { - "name": "BALLOON_CHANGE" - }, - { - "name": "ACPI_DEVICE_OST" - } - ], - "id": "libvirt-6" -} - { "execute": "qom-list-types", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -2250,7 +2128,7 @@ "name": "fw-path-provider" } ], - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -2258,7 +2136,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -2420,7 +2298,7 @@ "type": "str" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -2428,7 +2306,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2656,7 +2534,7 @@ "type": "str" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2664,7 +2542,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2782,7 +2660,7 @@ "type": "uint32" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2790,11 +2668,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-11" + "id": "libvirt-10" } { - "id": "libvirt-11", + "id": "libvirt-10", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -2806,11 +2684,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-12" + "id": "libvirt-11" } { - "id": "libvirt-12", + "id": "libvirt-11", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -2822,11 +2700,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -2838,7 +2716,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -2926,7 +2804,7 @@ "type": "bool" } ], - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -2934,7 +2812,7 @@ "arguments": { "typename": "scsi-hd" }, - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -3029,7 +2907,7 @@ "type": "uint64" } ], - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -3037,7 +2915,7 @@ "arguments": { "typename": "ide-hd" }, - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -3094,7 +2972,7 @@ "type": "uint16" } ], - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -3102,11 +2980,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -3118,11 +2996,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-18" + "id": "libvirt-17" } { - "id": "libvirt-18", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -3134,11 +3012,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-19" + "id": "libvirt-18" } { - "id": "libvirt-19", + "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -3150,7 +3028,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -3210,7 +3088,7 @@ "type": "uint16" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -3218,11 +3096,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-21" + "id": "libvirt-20" } { - "id": "libvirt-21", + "id": "libvirt-20", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -3234,7 +3112,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -3281,7 +3159,7 @@ "type": "int32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -3289,7 +3167,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3385,7 +3263,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3393,7 +3271,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -3423,7 +3301,7 @@ "type": "uint32" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -3431,11 +3309,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-25" + "id": "libvirt-24" } { - "id": "libvirt-25", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -3447,7 +3325,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -3547,7 +3425,7 @@ "type": "bool" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -3555,11 +3433,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-27" + "id": "libvirt-26" } { - "id": "libvirt-27", + "id": "libvirt-26", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -3571,7 +3449,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3610,7 +3488,7 @@ "type": "bool" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3618,7 +3496,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3688,12 +3566,12 @@ "type": "uint32" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { "execute": "query-machines", - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -3868,12 +3746,12 @@ "cpu-max": 1 } ], - "id": "libvirt-30" + "id": "libvirt-29" } { "execute": "query-cpu-definitions", - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3972,34 +3850,34 @@ "name": "pxa270" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { "execute": "query-tpm-models", - "id": "libvirt-32" + "id": "libvirt-31" } { "return": [ ], - "id": "libvirt-32" + "id": "libvirt-31" } { "execute": "query-tpm-types", - "id": "libvirt-33" + "id": "libvirt-32" } { "return": [ ], - "id": "libvirt-33" + "id": "libvirt-32" } { "execute": "query-command-line-options", - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -4971,12 +4849,12 @@ "option": "drive" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { "execute": "query-migrate-capabilities", - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -5010,12 +4888,12 @@ "capability": "postcopy-ram" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-qmp-schema", - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -13020,12 +12898,12 @@ "meta-type": "array" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-gic-capabilities", - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -13041,7 +12919,7 @@ "kernel": true } ], - "id": "libvirt-37" + "id": "libvirt-36" } { diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies index 09f2f5daa5..89dc5bca0a 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies @@ -467,131 +467,9 @@ "id": "libvirt-5" } -{ - "execute": "query-events", - "id": "libvirt-6" -} - -{ - "return": [ - { - "name": "WATCHDOG" - }, - { - "name": "WAKEUP" - }, - { - "name": "VSERPORT_CHANGE" - }, - { - "name": "VNC_INITIALIZED" - }, - { - "name": "VNC_DISCONNECTED" - }, - { - "name": "VNC_CONNECTED" - }, - { - "name": "SUSPEND_DISK" - }, - { - "name": "SUSPEND" - }, - { - "name": "STOP" - }, - { - "name": "SPICE_MIGRATE_COMPLETED" - }, - { - "name": "SPICE_INITIALIZED" - }, - { - "name": "SPICE_DISCONNECTED" - }, - { - "name": "SPICE_CONNECTED" - }, - { - "name": "SHUTDOWN" - }, - { - "name": "RTC_CHANGE" - }, - { - "name": "RESUME" - }, - { - "name": "RESET" - }, - { - "name": "QUORUM_REPORT_BAD" - }, - { - "name": "QUORUM_FAILURE" - }, - { - "name": "POWERDOWN" - }, - { - "name": "NIC_RX_FILTER_CHANGED" - }, - { - "name": "MIGRATION_PASS" - }, - { - "name": "MIGRATION" - }, - { - "name": "MEM_UNPLUG_ERROR" - }, - { - "name": "GUEST_PANICKED" - }, - { - "name": "DUMP_COMPLETED" - }, - { - "name": "DEVICE_TRAY_MOVED" - }, - { - "name": "DEVICE_DELETED" - }, - { - "name": "BLOCK_WRITE_THRESHOLD" - }, - { - "name": "BLOCK_JOB_READY" - }, - { - "name": "BLOCK_JOB_ERROR" - }, - { - "name": "BLOCK_JOB_COMPLETED" - }, - { - "name": "BLOCK_JOB_CANCELLED" - }, - { - "name": "BLOCK_IO_ERROR" - }, - { - "name": "BLOCK_IMAGE_CORRUPTED" - }, - { - "name": "BALLOON_CHANGE" - }, - { - "name": "ACPI_DEVICE_OST" - } - ], - "id": "libvirt-6" -} - { "execute": "qom-list-types", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -2400,7 +2278,7 @@ "name": "fw-path-provider" } ], - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -2408,7 +2286,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -2570,7 +2448,7 @@ "type": "str" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -2578,7 +2456,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2806,7 +2684,7 @@ "type": "str" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2814,7 +2692,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2932,7 +2810,7 @@ "type": "uint32" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2940,11 +2818,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-11" + "id": "libvirt-10" } { - "id": "libvirt-11", + "id": "libvirt-10", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -2956,11 +2834,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-12" + "id": "libvirt-11" } { - "id": "libvirt-12", + "id": "libvirt-11", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -2972,11 +2850,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -2988,7 +2866,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -3076,7 +2954,7 @@ "type": "bool" } ], - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -3084,7 +2962,7 @@ "arguments": { "typename": "scsi-hd" }, - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -3179,7 +3057,7 @@ "type": "uint64" } ], - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -3187,7 +3065,7 @@ "arguments": { "typename": "ide-hd" }, - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -3244,7 +3122,7 @@ "type": "uint16" } ], - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -3252,11 +3130,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -3268,11 +3146,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-18" + "id": "libvirt-17" } { - "id": "libvirt-18", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -3284,11 +3162,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-19" + "id": "libvirt-18" } { - "id": "libvirt-19", + "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -3300,7 +3178,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -3360,7 +3238,7 @@ "type": "uint16" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -3368,11 +3246,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-21" + "id": "libvirt-20" } { - "id": "libvirt-21", + "id": "libvirt-20", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -3384,7 +3262,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -3431,7 +3309,7 @@ "type": "int32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -3439,7 +3317,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3535,7 +3413,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3543,7 +3421,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -3573,7 +3451,7 @@ "type": "uint32" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -3581,11 +3459,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-25" + "id": "libvirt-24" } { - "id": "libvirt-25", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -3597,7 +3475,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -3697,7 +3575,7 @@ "type": "bool" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -3705,11 +3583,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-27" + "id": "libvirt-26" } { - "id": "libvirt-27", + "id": "libvirt-26", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -3721,7 +3599,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3760,7 +3638,7 @@ "type": "bool" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3768,7 +3646,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3838,7 +3716,7 @@ "type": "uint32" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3846,7 +3724,7 @@ "arguments": { "typename": "spapr-pci-host-bridge" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -3892,12 +3770,12 @@ "type": "uint32" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { "execute": "query-machines", - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3969,12 +3847,12 @@ "cpu-max": 255 } ], - "id": "libvirt-31" + "id": "libvirt-30" } { "execute": "query-cpu-definitions", - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -5276,34 +5154,34 @@ "name": "MPC8541E_v11" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { "execute": "query-tpm-models", - "id": "libvirt-33" + "id": "libvirt-32" } { "return": [ ], - "id": "libvirt-33" + "id": "libvirt-32" } { "execute": "query-tpm-types", - "id": "libvirt-34" + "id": "libvirt-33" } { "return": [ ], - "id": "libvirt-34" + "id": "libvirt-33" } { "execute": "query-command-line-options", - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -6270,12 +6148,12 @@ "option": "drive" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-migrate-capabilities", - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -6309,12 +6187,12 @@ "capability": "postcopy-ram" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-qmp-schema", - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -14319,7 +14197,7 @@ "meta-type": "array" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies index b3848a67fa..3ceb880a91 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies @@ -473,131 +473,9 @@ "id": "libvirt-5" } -{ - "execute": "query-events", - "id": "libvirt-6" -} - -{ - "return": [ - { - "name": "WATCHDOG" - }, - { - "name": "WAKEUP" - }, - { - "name": "VSERPORT_CHANGE" - }, - { - "name": "VNC_INITIALIZED" - }, - { - "name": "VNC_DISCONNECTED" - }, - { - "name": "VNC_CONNECTED" - }, - { - "name": "SUSPEND_DISK" - }, - { - "name": "SUSPEND" - }, - { - "name": "STOP" - }, - { - "name": "SPICE_MIGRATE_COMPLETED" - }, - { - "name": "SPICE_INITIALIZED" - }, - { - "name": "SPICE_DISCONNECTED" - }, - { - "name": "SPICE_CONNECTED" - }, - { - "name": "SHUTDOWN" - }, - { - "name": "RTC_CHANGE" - }, - { - "name": "RESUME" - }, - { - "name": "RESET" - }, - { - "name": "QUORUM_REPORT_BAD" - }, - { - "name": "QUORUM_FAILURE" - }, - { - "name": "POWERDOWN" - }, - { - "name": "NIC_RX_FILTER_CHANGED" - }, - { - "name": "MIGRATION_PASS" - }, - { - "name": "MIGRATION" - }, - { - "name": "MEM_UNPLUG_ERROR" - }, - { - "name": "GUEST_PANICKED" - }, - { - "name": "DUMP_COMPLETED" - }, - { - "name": "DEVICE_TRAY_MOVED" - }, - { - "name": "DEVICE_DELETED" - }, - { - "name": "BLOCK_WRITE_THRESHOLD" - }, - { - "name": "BLOCK_JOB_READY" - }, - { - "name": "BLOCK_JOB_ERROR" - }, - { - "name": "BLOCK_JOB_COMPLETED" - }, - { - "name": "BLOCK_JOB_CANCELLED" - }, - { - "name": "BLOCK_IO_ERROR" - }, - { - "name": "BLOCK_IMAGE_CORRUPTED" - }, - { - "name": "BALLOON_CHANGE" - }, - { - "name": "ACPI_DEVICE_OST" - } - ], - "id": "libvirt-6" -} - { "execute": "qom-list-types", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -1569,7 +1447,7 @@ "name": "virtio-blk-device" } ], - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -1577,7 +1455,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -1739,7 +1617,7 @@ "type": "str" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -1747,7 +1625,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1975,7 +1853,7 @@ "type": "str" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1983,7 +1861,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2101,7 +1979,7 @@ "type": "uint32" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2109,11 +1987,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-11" + "id": "libvirt-10" } { - "id": "libvirt-11", + "id": "libvirt-10", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -2125,11 +2003,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-12" + "id": "libvirt-11" } { - "id": "libvirt-12", + "id": "libvirt-11", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -2141,11 +2019,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -2157,7 +2035,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -2245,7 +2123,7 @@ "type": "bool" } ], - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -2253,7 +2131,7 @@ "arguments": { "typename": "scsi-hd" }, - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -2348,7 +2226,7 @@ "type": "uint64" } ], - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -2356,7 +2234,7 @@ "arguments": { "typename": "ide-hd" }, - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -2413,7 +2291,7 @@ "type": "uint16" } ], - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -2421,7 +2299,7 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -2474,7 +2352,7 @@ "type": "int32" } ], - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -2482,7 +2360,7 @@ "arguments": { "typename": "usb-redir" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -2523,7 +2401,7 @@ "type": "bool" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -2531,7 +2409,7 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2569,7 +2447,7 @@ "type": "child" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2577,7 +2455,7 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -2631,7 +2509,7 @@ "type": "child" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -2639,7 +2517,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -2699,7 +2577,7 @@ "type": "uint16" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -2707,7 +2585,7 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -2721,7 +2599,7 @@ "type": "LostTickPolicy" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -2729,7 +2607,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -2776,7 +2654,7 @@ "type": "int32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -2784,7 +2662,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -2817,7 +2695,7 @@ "type": "int32" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -2825,7 +2703,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -2902,7 +2780,7 @@ "type": "uint32" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -2910,7 +2788,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -3016,7 +2894,7 @@ "type": "uint32" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -3024,7 +2902,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3064,7 +2942,7 @@ "type": "bool" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3072,7 +2950,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3149,7 +3027,7 @@ "type": "uint32" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3157,7 +3035,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3257,7 +3135,7 @@ "type": "bool" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3265,11 +3143,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" @@ -3281,7 +3159,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3320,7 +3198,7 @@ "type": "bool" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3328,7 +3206,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3398,7 +3276,7 @@ "type": "uint32" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3406,7 +3284,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3416,7 +3294,7 @@ "type": "uint32" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3424,7 +3302,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -3450,7 +3328,7 @@ "type": "pci-devfn" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -3458,7 +3336,7 @@ "arguments": { "typename": "nvdimm" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -3468,12 +3346,12 @@ "type": "link" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-machines", - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -3586,12 +3464,12 @@ "cpu-max": 255 } ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-cpu-definitions", - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -3681,36 +3559,36 @@ "name": "qemu64" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-tpm-models", - "id": "libvirt-38" + "id": "libvirt-37" } { "return": [ "tpm-tis" ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-tpm-types", - "id": "libvirt-39" + "id": "libvirt-38" } { "return": [ "passthrough" ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-command-line-options", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -4804,12 +4682,12 @@ "option": "drive" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-migrate-capabilities", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -4843,12 +4721,12 @@ "capability": "postcopy-ram" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-qmp-schema", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -12853,7 +12731,7 @@ "meta-type": "array" } ], - "id": "libvirt-42" + "id": "libvirt-41" } { diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies index bea4007f04..fcc51289b2 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies @@ -479,131 +479,9 @@ "id": "libvirt-5" } -{ - "execute": "query-events", - "id": "libvirt-6" -} - -{ - "return": [ - { - "name": "WATCHDOG" - }, - { - "name": "WAKEUP" - }, - { - "name": "VSERPORT_CHANGE" - }, - { - "name": "VNC_INITIALIZED" - }, - { - "name": "VNC_DISCONNECTED" - }, - { - "name": "VNC_CONNECTED" - }, - { - "name": "SUSPEND_DISK" - }, - { - "name": "SUSPEND" - }, - { - "name": "STOP" - }, - { - "name": "SPICE_MIGRATE_COMPLETED" - }, - { - "name": "SPICE_INITIALIZED" - }, - { - "name": "SPICE_DISCONNECTED" - }, - { - "name": "SPICE_CONNECTED" - }, - { - "name": "SHUTDOWN" - }, - { - "name": "RTC_CHANGE" - }, - { - "name": "RESUME" - }, - { - "name": "RESET" - }, - { - "name": "QUORUM_REPORT_BAD" - }, - { - "name": "QUORUM_FAILURE" - }, - { - "name": "POWERDOWN" - }, - { - "name": "NIC_RX_FILTER_CHANGED" - }, - { - "name": "MIGRATION_PASS" - }, - { - "name": "MIGRATION" - }, - { - "name": "MEM_UNPLUG_ERROR" - }, - { - "name": "GUEST_PANICKED" - }, - { - "name": "DUMP_COMPLETED" - }, - { - "name": "DEVICE_TRAY_MOVED" - }, - { - "name": "DEVICE_DELETED" - }, - { - "name": "BLOCK_WRITE_THRESHOLD" - }, - { - "name": "BLOCK_JOB_READY" - }, - { - "name": "BLOCK_JOB_ERROR" - }, - { - "name": "BLOCK_JOB_COMPLETED" - }, - { - "name": "BLOCK_JOB_CANCELLED" - }, - { - "name": "BLOCK_IO_ERROR" - }, - { - "name": "BLOCK_IMAGE_CORRUPTED" - }, - { - "name": "BALLOON_CHANGE" - }, - { - "name": "ACPI_DEVICE_OST" - } - ], - "id": "libvirt-6" -} - { "execute": "qom-list-types", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -981,7 +859,7 @@ "name": "s390-skeys-kvm" } ], - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -989,7 +867,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -1174,7 +1052,7 @@ "type": "str" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -1182,7 +1060,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1414,7 +1292,7 @@ "type": "str" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1422,7 +1300,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -1544,7 +1422,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -1552,7 +1430,7 @@ "arguments": { "typename": "virtio-blk-ccw" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -1681,7 +1559,7 @@ "type": "uint32" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -1689,7 +1567,7 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -1869,7 +1747,7 @@ "type": "bool" } ], - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -1877,7 +1755,7 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { @@ -1947,7 +1825,7 @@ "type": "uint32" } ], - "id": "libvirt-13" + "id": "libvirt-12" } { @@ -1955,11 +1833,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-14" + "id": "libvirt-13" } { - "id": "libvirt-14", + "id": "libvirt-13", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -1971,7 +1849,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -2073,7 +1951,7 @@ "type": "bool" } ], - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -2081,7 +1959,7 @@ "arguments": { "typename": "scsi-hd" }, - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -2191,7 +2069,7 @@ "type": "uint64" } ], - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -2199,11 +2077,11 @@ "arguments": { "typename": "ide-hd" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'ide-drive' not found" @@ -2215,11 +2093,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-18" + "id": "libvirt-17" } { - "id": "libvirt-18", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -2231,11 +2109,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-19" + "id": "libvirt-18" } { - "id": "libvirt-19", + "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -2247,11 +2125,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-20" + "id": "libvirt-19" } { - "id": "libvirt-20", + "id": "libvirt-19", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -2263,11 +2141,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-21" + "id": "libvirt-20" } { - "id": "libvirt-21", + "id": "libvirt-20", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -2279,7 +2157,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -2379,7 +2257,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -2387,7 +2265,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -2417,7 +2295,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -2425,11 +2303,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-24" + "id": "libvirt-23" } { - "id": "libvirt-24", + "id": "libvirt-23", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -2441,7 +2319,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -2545,7 +2423,7 @@ "type": "bool" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -2553,7 +2431,7 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -2610,7 +2488,7 @@ "type": "uint32" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -2618,7 +2496,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -2657,7 +2535,7 @@ "type": "bool" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -2665,7 +2543,7 @@ "arguments": { "typename": "virtual-css-bridge" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -2675,12 +2553,12 @@ "type": "bool" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { "execute": "query-machines", - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -2713,12 +2591,12 @@ "cpu-max": 248 } ], - "id": "libvirt-29" + "id": "libvirt-28" } { "execute": "query-cpu-definitions", - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -2727,34 +2605,34 @@ "name": "host" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { "execute": "query-tpm-models", - "id": "libvirt-31" + "id": "libvirt-30" } { "return": [ ], - "id": "libvirt-31" + "id": "libvirt-30" } { "execute": "query-tpm-types", - "id": "libvirt-32" + "id": "libvirt-31" } { "return": [ ], - "id": "libvirt-32" + "id": "libvirt-31" } { "execute": "query-command-line-options", - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3690,12 +3568,12 @@ "option": "drive" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { "execute": "query-migrate-capabilities", - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -3729,12 +3607,12 @@ "capability": "postcopy-ram" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { "execute": "query-qmp-schema", - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -12090,7 +11968,7 @@ "meta-type": "object" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies index e2b5751cf7..53791fcd22 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies @@ -482,131 +482,9 @@ "id": "libvirt-5" } -{ - "execute": "query-events", - "id": "libvirt-6" -} - -{ - "return": [ - { - "name": "WATCHDOG" - }, - { - "name": "WAKEUP" - }, - { - "name": "VSERPORT_CHANGE" - }, - { - "name": "VNC_INITIALIZED" - }, - { - "name": "VNC_DISCONNECTED" - }, - { - "name": "VNC_CONNECTED" - }, - { - "name": "SUSPEND_DISK" - }, - { - "name": "SUSPEND" - }, - { - "name": "STOP" - }, - { - "name": "SPICE_MIGRATE_COMPLETED" - }, - { - "name": "SPICE_INITIALIZED" - }, - { - "name": "SPICE_DISCONNECTED" - }, - { - "name": "SPICE_CONNECTED" - }, - { - "name": "SHUTDOWN" - }, - { - "name": "RTC_CHANGE" - }, - { - "name": "RESUME" - }, - { - "name": "RESET" - }, - { - "name": "QUORUM_REPORT_BAD" - }, - { - "name": "QUORUM_FAILURE" - }, - { - "name": "POWERDOWN" - }, - { - "name": "NIC_RX_FILTER_CHANGED" - }, - { - "name": "MIGRATION_PASS" - }, - { - "name": "MIGRATION" - }, - { - "name": "MEM_UNPLUG_ERROR" - }, - { - "name": "GUEST_PANICKED" - }, - { - "name": "DUMP_COMPLETED" - }, - { - "name": "DEVICE_TRAY_MOVED" - }, - { - "name": "DEVICE_DELETED" - }, - { - "name": "BLOCK_WRITE_THRESHOLD" - }, - { - "name": "BLOCK_JOB_READY" - }, - { - "name": "BLOCK_JOB_ERROR" - }, - { - "name": "BLOCK_JOB_COMPLETED" - }, - { - "name": "BLOCK_JOB_CANCELLED" - }, - { - "name": "BLOCK_IO_ERROR" - }, - { - "name": "BLOCK_IMAGE_CORRUPTED" - }, - { - "name": "BALLOON_CHANGE" - }, - { - "name": "ACPI_DEVICE_OST" - } - ], - "id": "libvirt-6" -} - { "execute": "qom-list-types", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -1593,7 +1471,7 @@ "name": "virtio-blk-device" } ], - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -1601,7 +1479,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -1786,7 +1664,7 @@ "type": "str" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -1794,7 +1672,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2026,7 +1904,7 @@ "type": "str" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2034,7 +1912,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2156,7 +2034,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2164,11 +2042,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-11" + "id": "libvirt-10" } { - "id": "libvirt-11", + "id": "libvirt-10", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -2180,11 +2058,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-12" + "id": "libvirt-11" } { - "id": "libvirt-12", + "id": "libvirt-11", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -2196,11 +2074,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -2212,7 +2090,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -2314,7 +2192,7 @@ "type": "bool" } ], - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -2322,7 +2200,7 @@ "arguments": { "typename": "scsi-hd" }, - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -2432,7 +2310,7 @@ "type": "uint64" } ], - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -2440,7 +2318,7 @@ "arguments": { "typename": "ide-hd" }, - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -2512,7 +2390,7 @@ "type": "uint16" } ], - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -2520,7 +2398,7 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -2578,7 +2456,7 @@ "type": "int32" } ], - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -2586,7 +2464,7 @@ "arguments": { "typename": "usb-redir" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -2635,7 +2513,7 @@ "type": "bool" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -2643,7 +2521,7 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2681,7 +2559,7 @@ "type": "child" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2689,7 +2567,7 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -2767,7 +2645,7 @@ "type": "int" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -2775,7 +2653,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -2844,7 +2722,7 @@ "type": "uint16" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -2852,7 +2730,7 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -2866,7 +2744,7 @@ "type": "LostTickPolicy" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -2874,7 +2752,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -2926,7 +2804,7 @@ "type": "int32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -2934,7 +2812,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -2972,7 +2850,7 @@ "type": "int32" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -2980,7 +2858,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -3062,7 +2940,7 @@ "type": "uint32" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -3070,7 +2948,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -3180,7 +3058,7 @@ "type": "uint32" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -3188,7 +3066,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3228,7 +3106,7 @@ "type": "bool" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3236,7 +3114,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3322,7 +3200,7 @@ "type": "uint32" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3330,7 +3208,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3434,7 +3312,7 @@ "type": "bool" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3442,11 +3320,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" @@ -3458,7 +3336,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3497,7 +3375,7 @@ "type": "bool" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3505,7 +3383,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3580,7 +3458,7 @@ "type": "uint32" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3588,7 +3466,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3602,7 +3480,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3610,7 +3488,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -3636,7 +3514,7 @@ "type": "pci-devfn" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -3644,7 +3522,7 @@ "arguments": { "typename": "nvdimm" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -3654,12 +3532,12 @@ "type": "link" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-machines", - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -3808,12 +3686,12 @@ "cpu-max": 255 } ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-cpu-definitions", - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -3906,36 +3784,36 @@ "name": "qemu64" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-tpm-models", - "id": "libvirt-38" + "id": "libvirt-37" } { "return": [ "tpm-tis" ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-tpm-types", - "id": "libvirt-39" + "id": "libvirt-38" } { "return": [ "passthrough" ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-command-line-options", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -5033,12 +4911,12 @@ "option": "drive" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-migrate-capabilities", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -5072,12 +4950,12 @@ "capability": "postcopy-ram" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-qmp-schema", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -13433,7 +13311,7 @@ "meta-type": "object" } ], - "id": "libvirt-42" + "id": "libvirt-41" } { diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies index 7a874985dd..1e3c1ba897 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies @@ -491,131 +491,9 @@ "id": "libvirt-5" } -{ - "execute": "query-events", - "id": "libvirt-6" -} - -{ - "return": [ - { - "name": "WATCHDOG" - }, - { - "name": "WAKEUP" - }, - { - "name": "VSERPORT_CHANGE" - }, - { - "name": "VNC_INITIALIZED" - }, - { - "name": "VNC_DISCONNECTED" - }, - { - "name": "VNC_CONNECTED" - }, - { - "name": "SUSPEND_DISK" - }, - { - "name": "SUSPEND" - }, - { - "name": "STOP" - }, - { - "name": "SPICE_MIGRATE_COMPLETED" - }, - { - "name": "SPICE_INITIALIZED" - }, - { - "name": "SPICE_DISCONNECTED" - }, - { - "name": "SPICE_CONNECTED" - }, - { - "name": "SHUTDOWN" - }, - { - "name": "RTC_CHANGE" - }, - { - "name": "RESUME" - }, - { - "name": "RESET" - }, - { - "name": "QUORUM_REPORT_BAD" - }, - { - "name": "QUORUM_FAILURE" - }, - { - "name": "POWERDOWN" - }, - { - "name": "NIC_RX_FILTER_CHANGED" - }, - { - "name": "MIGRATION_PASS" - }, - { - "name": "MIGRATION" - }, - { - "name": "MEM_UNPLUG_ERROR" - }, - { - "name": "GUEST_PANICKED" - }, - { - "name": "DUMP_COMPLETED" - }, - { - "name": "DEVICE_TRAY_MOVED" - }, - { - "name": "DEVICE_DELETED" - }, - { - "name": "BLOCK_WRITE_THRESHOLD" - }, - { - "name": "BLOCK_JOB_READY" - }, - { - "name": "BLOCK_JOB_ERROR" - }, - { - "name": "BLOCK_JOB_COMPLETED" - }, - { - "name": "BLOCK_JOB_CANCELLED" - }, - { - "name": "BLOCK_IO_ERROR" - }, - { - "name": "BLOCK_IMAGE_CORRUPTED" - }, - { - "name": "BALLOON_CHANGE" - }, - { - "name": "ACPI_DEVICE_OST" - } - ], - "id": "libvirt-6" -} - { "execute": "qom-list-types", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -1221,7 +1099,7 @@ "name": "virtio-blk-device" } ], - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -1229,7 +1107,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -1419,7 +1297,7 @@ "type": "str" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -1427,7 +1305,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1668,7 +1546,7 @@ "type": "str" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1676,7 +1554,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -1803,7 +1681,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -1811,7 +1689,7 @@ "arguments": { "typename": "virtio-blk-ccw" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -1940,7 +1818,7 @@ "type": "uint32" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -1948,7 +1826,7 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -2132,7 +2010,7 @@ "type": "bool" } ], - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -2140,7 +2018,7 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { @@ -2210,7 +2088,7 @@ "type": "uint32" } ], - "id": "libvirt-13" + "id": "libvirt-12" } { @@ -2218,11 +2096,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-14" + "id": "libvirt-13" } { - "id": "libvirt-14", + "id": "libvirt-13", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -2234,7 +2112,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -2336,7 +2214,7 @@ "type": "bool" } ], - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -2344,7 +2222,7 @@ "arguments": { "typename": "scsi-hd" }, - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -2454,7 +2332,7 @@ "type": "uint64" } ], - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -2462,11 +2340,11 @@ "arguments": { "typename": "ide-hd" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'ide-drive' not found" @@ -2478,11 +2356,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-18" + "id": "libvirt-17" } { - "id": "libvirt-18", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -2494,11 +2372,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-19" + "id": "libvirt-18" } { - "id": "libvirt-19", + "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -2510,11 +2388,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-20" + "id": "libvirt-19" } { - "id": "libvirt-20", + "id": "libvirt-19", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -2526,11 +2404,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-21" + "id": "libvirt-20" } { - "id": "libvirt-21", + "id": "libvirt-20", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -2542,7 +2420,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -2647,7 +2525,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -2655,7 +2533,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -2685,7 +2563,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -2693,11 +2571,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-24" + "id": "libvirt-23" } { - "id": "libvirt-24", + "id": "libvirt-23", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -2709,7 +2587,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -2818,7 +2696,7 @@ "type": "bool" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -2826,7 +2704,7 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -2883,7 +2761,7 @@ "type": "uint32" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -2891,7 +2769,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -2930,7 +2808,7 @@ "type": "bool" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -2938,7 +2816,7 @@ "arguments": { "typename": "virtual-css-bridge" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -2948,12 +2826,12 @@ "type": "bool" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { "execute": "query-machines", - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -2991,12 +2869,12 @@ "alias": "s390-ccw-virtio" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { "execute": "query-cpu-definitions", - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -3322,34 +3200,34 @@ "migration-safe": true } ], - "id": "libvirt-30" + "id": "libvirt-29" } { "execute": "query-tpm-models", - "id": "libvirt-31" + "id": "libvirt-30" } { "return": [ ], - "id": "libvirt-31" + "id": "libvirt-30" } { "execute": "query-tpm-types", - "id": "libvirt-32" + "id": "libvirt-31" } { "return": [ ], - "id": "libvirt-32" + "id": "libvirt-31" } { "execute": "query-command-line-options", - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -4310,12 +4188,12 @@ "option": "drive" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { "execute": "query-migrate-capabilities", - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -4353,12 +4231,12 @@ "capability": "x-colo" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { "execute": "query-qmp-schema", - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -13128,7 +13006,7 @@ "meta-type": "object" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -13139,7 +13017,7 @@ "name": "host" } }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -13165,7 +13043,7 @@ } } }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -13179,11 +13057,11 @@ } } }, - "id": "libvirt-37" + "id": "libvirt-36" } { - "id": "libvirt-37", + "id": "libvirt-36", "error": { "class": "GenericError", "desc": "Property '.migratable' not found" diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies index a4747f746a..4eec6773fa 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies @@ -485,131 +485,9 @@ "id": "libvirt-5" } -{ - "execute": "query-events", - "id": "libvirt-6" -} - -{ - "return": [ - { - "name": "WATCHDOG" - }, - { - "name": "WAKEUP" - }, - { - "name": "VSERPORT_CHANGE" - }, - { - "name": "VNC_INITIALIZED" - }, - { - "name": "VNC_DISCONNECTED" - }, - { - "name": "VNC_CONNECTED" - }, - { - "name": "SUSPEND_DISK" - }, - { - "name": "SUSPEND" - }, - { - "name": "STOP" - }, - { - "name": "SPICE_MIGRATE_COMPLETED" - }, - { - "name": "SPICE_INITIALIZED" - }, - { - "name": "SPICE_DISCONNECTED" - }, - { - "name": "SPICE_CONNECTED" - }, - { - "name": "SHUTDOWN" - }, - { - "name": "RTC_CHANGE" - }, - { - "name": "RESUME" - }, - { - "name": "RESET" - }, - { - "name": "QUORUM_REPORT_BAD" - }, - { - "name": "QUORUM_FAILURE" - }, - { - "name": "POWERDOWN" - }, - { - "name": "NIC_RX_FILTER_CHANGED" - }, - { - "name": "MIGRATION_PASS" - }, - { - "name": "MIGRATION" - }, - { - "name": "MEM_UNPLUG_ERROR" - }, - { - "name": "GUEST_PANICKED" - }, - { - "name": "DUMP_COMPLETED" - }, - { - "name": "DEVICE_TRAY_MOVED" - }, - { - "name": "DEVICE_DELETED" - }, - { - "name": "BLOCK_WRITE_THRESHOLD" - }, - { - "name": "BLOCK_JOB_READY" - }, - { - "name": "BLOCK_JOB_ERROR" - }, - { - "name": "BLOCK_JOB_COMPLETED" - }, - { - "name": "BLOCK_JOB_CANCELLED" - }, - { - "name": "BLOCK_IO_ERROR" - }, - { - "name": "BLOCK_IMAGE_CORRUPTED" - }, - { - "name": "BALLOON_CHANGE" - }, - { - "name": "ACPI_DEVICE_OST" - } - ], - "id": "libvirt-6" -} - { "execute": "qom-list-types", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -1677,7 +1555,7 @@ "name": "virtio-blk-device" } ], - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -1685,7 +1563,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -1879,7 +1757,7 @@ "type": "str" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -1887,7 +1765,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2132,7 +2010,7 @@ "type": "str" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2140,7 +2018,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2271,7 +2149,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2279,11 +2157,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-11" + "id": "libvirt-10" } { - "id": "libvirt-11", + "id": "libvirt-10", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -2295,11 +2173,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-12" + "id": "libvirt-11" } { - "id": "libvirt-12", + "id": "libvirt-11", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -2311,11 +2189,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -2327,7 +2205,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -2429,7 +2307,7 @@ "type": "bool" } ], - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -2437,7 +2315,7 @@ "arguments": { "typename": "scsi-hd" }, - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -2547,7 +2425,7 @@ "type": "uint64" } ], - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -2555,7 +2433,7 @@ "arguments": { "typename": "ide-hd" }, - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -2627,7 +2505,7 @@ "type": "uint16" } ], - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -2635,7 +2513,7 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -2693,7 +2571,7 @@ "type": "int32" } ], - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -2701,7 +2579,7 @@ "arguments": { "typename": "usb-redir" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -2750,7 +2628,7 @@ "type": "bool" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -2758,7 +2636,7 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2796,7 +2674,7 @@ "type": "child" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2804,7 +2682,7 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -2882,7 +2760,7 @@ "type": "int" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -2890,7 +2768,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -2959,7 +2837,7 @@ "type": "uint16" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -2967,7 +2845,7 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -2981,7 +2859,7 @@ "type": "LostTickPolicy" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -2989,7 +2867,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3041,7 +2919,7 @@ "type": "int32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3049,7 +2927,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -3087,7 +2965,7 @@ "type": "int32" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -3095,7 +2973,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -3177,7 +3055,7 @@ "type": "uint32" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -3185,7 +3063,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -3304,7 +3182,7 @@ "type": "uint32" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -3312,7 +3190,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3352,7 +3230,7 @@ "type": "bool" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3360,7 +3238,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3446,7 +3324,7 @@ "type": "uint32" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3454,7 +3332,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3567,7 +3445,7 @@ "type": "guest statistics" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3575,11 +3453,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" @@ -3591,7 +3469,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3630,7 +3508,7 @@ "type": "bool" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3638,7 +3516,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3713,7 +3591,7 @@ "type": "uint32" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3721,7 +3599,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3744,7 +3622,7 @@ "type": "uint32" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3752,7 +3630,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -3778,7 +3656,7 @@ "type": "pci-devfn" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -3786,7 +3664,7 @@ "arguments": { "typename": "nvdimm" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -3796,12 +3674,12 @@ "type": "link" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-machines", - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -3970,12 +3848,12 @@ "cpu-max": 255 } ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-cpu-definitions", - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -4181,36 +4059,36 @@ "static": false } ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-tpm-models", - "id": "libvirt-38" + "id": "libvirt-37" } { "return": [ "tpm-tis" ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-tpm-types", - "id": "libvirt-39" + "id": "libvirt-38" } { "return": [ "passthrough" ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-command-line-options", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -5333,12 +5211,12 @@ "option": "drive" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-migrate-capabilities", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -5376,12 +5254,12 @@ "capability": "x-colo" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-qmp-schema", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -14151,7 +14029,7 @@ "meta-type": "object" } ], - "id": "libvirt-42" + "id": "libvirt-41" } { diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies index d9319e9a59..f663c5da92 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies @@ -491,131 +491,9 @@ "id": "libvirt-5" } -{ - "execute": "query-events", - "id": "libvirt-6" -} - -{ - "return": [ - { - "name": "WATCHDOG" - }, - { - "name": "WAKEUP" - }, - { - "name": "VSERPORT_CHANGE" - }, - { - "name": "VNC_INITIALIZED" - }, - { - "name": "VNC_DISCONNECTED" - }, - { - "name": "VNC_CONNECTED" - }, - { - "name": "SUSPEND_DISK" - }, - { - "name": "SUSPEND" - }, - { - "name": "STOP" - }, - { - "name": "SPICE_MIGRATE_COMPLETED" - }, - { - "name": "SPICE_INITIALIZED" - }, - { - "name": "SPICE_DISCONNECTED" - }, - { - "name": "SPICE_CONNECTED" - }, - { - "name": "SHUTDOWN" - }, - { - "name": "RTC_CHANGE" - }, - { - "name": "RESUME" - }, - { - "name": "RESET" - }, - { - "name": "QUORUM_REPORT_BAD" - }, - { - "name": "QUORUM_FAILURE" - }, - { - "name": "POWERDOWN" - }, - { - "name": "NIC_RX_FILTER_CHANGED" - }, - { - "name": "MIGRATION_PASS" - }, - { - "name": "MIGRATION" - }, - { - "name": "MEM_UNPLUG_ERROR" - }, - { - "name": "GUEST_PANICKED" - }, - { - "name": "DUMP_COMPLETED" - }, - { - "name": "DEVICE_TRAY_MOVED" - }, - { - "name": "DEVICE_DELETED" - }, - { - "name": "BLOCK_WRITE_THRESHOLD" - }, - { - "name": "BLOCK_JOB_READY" - }, - { - "name": "BLOCK_JOB_ERROR" - }, - { - "name": "BLOCK_JOB_COMPLETED" - }, - { - "name": "BLOCK_JOB_CANCELLED" - }, - { - "name": "BLOCK_IO_ERROR" - }, - { - "name": "BLOCK_IMAGE_CORRUPTED" - }, - { - "name": "BALLOON_CHANGE" - }, - { - "name": "ACPI_DEVICE_OST" - } - ], - "id": "libvirt-6" -} - { "execute": "qom-list-types", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -2565,7 +2443,7 @@ "name": "7457A_v1.2-powerpc64-cpu" } ], - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -2573,7 +2451,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -2801,7 +2679,7 @@ "type": "str" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -2809,7 +2687,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -3088,7 +2966,7 @@ "type": "uint16" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -3096,7 +2974,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -3257,7 +3135,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -3265,11 +3143,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-11" + "id": "libvirt-10" } { - "id": "libvirt-11", + "id": "libvirt-10", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -3281,11 +3159,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-12" + "id": "libvirt-11" } { - "id": "libvirt-12", + "id": "libvirt-11", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -3297,11 +3175,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -3313,7 +3191,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -3420,7 +3298,7 @@ "type": "bool" } ], - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -3428,7 +3306,7 @@ "arguments": { "typename": "scsi-hd" }, - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -3542,7 +3420,7 @@ "type": "uint64" } ], - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -3550,7 +3428,7 @@ "arguments": { "typename": "ide-hd" }, - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -3626,7 +3504,7 @@ "type": "uint16" } ], - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -3634,11 +3512,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -3650,11 +3528,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-18" + "id": "libvirt-17" } { - "id": "libvirt-18", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -3666,11 +3544,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-19" + "id": "libvirt-18" } { - "id": "libvirt-19", + "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -3682,7 +3560,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -3755,7 +3633,7 @@ "type": "uint16" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -3763,11 +3641,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-21" + "id": "libvirt-20" } { - "id": "libvirt-21", + "id": "libvirt-20", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -3779,7 +3657,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -3836,7 +3714,7 @@ "type": "int32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -3844,7 +3722,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3987,7 +3865,7 @@ "type": "str" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3995,7 +3873,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -4034,7 +3912,7 @@ "type": "size" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -4042,11 +3920,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-25" + "id": "libvirt-24" } { - "id": "libvirt-25", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -4058,7 +3936,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -4201,7 +4079,7 @@ "type": "str" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -4209,11 +4087,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-27" + "id": "libvirt-26" } { - "id": "libvirt-27", + "id": "libvirt-26", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -4225,7 +4103,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -4269,7 +4147,7 @@ "type": "bool" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -4277,7 +4155,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -4357,7 +4235,7 @@ "type": "uint32" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -4365,7 +4243,7 @@ "arguments": { "typename": "spapr-pci-host-bridge" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -4451,12 +4329,12 @@ "type": "uint32" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { "execute": "query-machines", - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -4569,12 +4447,12 @@ "cpu-max": 1 } ], - "id": "libvirt-31" + "id": "libvirt-30" } { "execute": "query-cpu-definitions", - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -6750,34 +6628,34 @@ "static": false } ], - "id": "libvirt-32" + "id": "libvirt-31" } { "execute": "query-tpm-models", - "id": "libvirt-33" + "id": "libvirt-32" } { "return": [ ], - "id": "libvirt-33" + "id": "libvirt-32" } { "execute": "query-tpm-types", - "id": "libvirt-34" + "id": "libvirt-33" } { "return": [ ], - "id": "libvirt-34" + "id": "libvirt-33" } { "execute": "query-command-line-options", - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -7887,12 +7765,12 @@ "option": "drive" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-migrate-capabilities", - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -7934,12 +7812,12 @@ "capability": "release-ram" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-qmp-schema", - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -17225,7 +17103,7 @@ "meta-type": "object" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies index fab8534b8e..9933bdeca5 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies @@ -503,131 +503,9 @@ "id": "libvirt-5" } -{ - "execute": "query-events", - "id": "libvirt-6" -} - -{ - "return": [ - { - "name": "WATCHDOG" - }, - { - "name": "WAKEUP" - }, - { - "name": "VSERPORT_CHANGE" - }, - { - "name": "VNC_INITIALIZED" - }, - { - "name": "VNC_DISCONNECTED" - }, - { - "name": "VNC_CONNECTED" - }, - { - "name": "SUSPEND_DISK" - }, - { - "name": "SUSPEND" - }, - { - "name": "STOP" - }, - { - "name": "SPICE_MIGRATE_COMPLETED" - }, - { - "name": "SPICE_INITIALIZED" - }, - { - "name": "SPICE_DISCONNECTED" - }, - { - "name": "SPICE_CONNECTED" - }, - { - "name": "SHUTDOWN" - }, - { - "name": "RTC_CHANGE" - }, - { - "name": "RESUME" - }, - { - "name": "RESET" - }, - { - "name": "QUORUM_REPORT_BAD" - }, - { - "name": "QUORUM_FAILURE" - }, - { - "name": "POWERDOWN" - }, - { - "name": "NIC_RX_FILTER_CHANGED" - }, - { - "name": "MIGRATION_PASS" - }, - { - "name": "MIGRATION" - }, - { - "name": "MEM_UNPLUG_ERROR" - }, - { - "name": "GUEST_PANICKED" - }, - { - "name": "DUMP_COMPLETED" - }, - { - "name": "DEVICE_TRAY_MOVED" - }, - { - "name": "DEVICE_DELETED" - }, - { - "name": "BLOCK_WRITE_THRESHOLD" - }, - { - "name": "BLOCK_JOB_READY" - }, - { - "name": "BLOCK_JOB_ERROR" - }, - { - "name": "BLOCK_JOB_COMPLETED" - }, - { - "name": "BLOCK_JOB_CANCELLED" - }, - { - "name": "BLOCK_IO_ERROR" - }, - { - "name": "BLOCK_IMAGE_CORRUPTED" - }, - { - "name": "BALLOON_CHANGE" - }, - { - "name": "ACPI_DEVICE_OST" - } - ], - "id": "libvirt-6" -} - { "execute": "qom-list-types", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -1269,7 +1147,7 @@ "name": "virtio-blk-device" } ], - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -1277,7 +1155,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -1505,7 +1383,7 @@ "type": "str" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -1513,7 +1391,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1792,7 +1670,7 @@ "type": "uint16" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1800,7 +1678,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -1961,7 +1839,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -1969,7 +1847,7 @@ "arguments": { "typename": "virtio-blk-ccw" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2107,7 +1985,7 @@ "type": "uint32" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2115,7 +1993,7 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -2308,7 +2186,7 @@ "type": "uint16" } ], - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -2316,7 +2194,7 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { @@ -2391,7 +2269,7 @@ "type": "uint32" } ], - "id": "libvirt-13" + "id": "libvirt-12" } { @@ -2399,11 +2277,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-14" + "id": "libvirt-13" } { - "id": "libvirt-14", + "id": "libvirt-13", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -2415,7 +2293,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -2522,7 +2400,7 @@ "type": "bool" } ], - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -2530,7 +2408,7 @@ "arguments": { "typename": "scsi-hd" }, - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -2644,7 +2522,7 @@ "type": "uint64" } ], - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -2652,11 +2530,11 @@ "arguments": { "typename": "ide-hd" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'ide-drive' not found" @@ -2668,11 +2546,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-18" + "id": "libvirt-17" } { - "id": "libvirt-18", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -2684,11 +2562,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-19" + "id": "libvirt-18" } { - "id": "libvirt-19", + "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -2700,11 +2578,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-20" + "id": "libvirt-19" } { - "id": "libvirt-20", + "id": "libvirt-19", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -2716,11 +2594,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-21" + "id": "libvirt-20" } { - "id": "libvirt-21", + "id": "libvirt-20", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -2732,7 +2610,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -2875,7 +2753,7 @@ "type": "str" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -2883,7 +2761,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -2922,7 +2800,7 @@ "type": "size" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -2930,11 +2808,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-24" + "id": "libvirt-23" } { - "id": "libvirt-24", + "id": "libvirt-23", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -2946,7 +2824,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -3089,7 +2967,7 @@ "type": "str" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -3097,7 +2975,7 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -3159,7 +3037,7 @@ "type": "uint32" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -3167,7 +3045,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3211,7 +3089,7 @@ "type": "bool" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3219,7 +3097,7 @@ "arguments": { "typename": "virtual-css-bridge" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3229,12 +3107,12 @@ "type": "bool" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { "execute": "query-machines", - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3277,12 +3155,12 @@ "cpu-max": 248 } ], - "id": "libvirt-29" + "id": "libvirt-28" } { "execute": "query-cpu-definitions", - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -3672,34 +3550,34 @@ "migration-safe": true } ], - "id": "libvirt-30" + "id": "libvirt-29" } { "execute": "query-tpm-models", - "id": "libvirt-31" + "id": "libvirt-30" } { "return": [ ], - "id": "libvirt-31" + "id": "libvirt-30" } { "execute": "query-tpm-types", - "id": "libvirt-32" + "id": "libvirt-31" } { "return": [ ], - "id": "libvirt-32" + "id": "libvirt-31" } { "execute": "query-command-line-options", - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -4774,12 +4652,12 @@ "option": "drive" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { "execute": "query-migrate-capabilities", - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -4821,12 +4699,12 @@ "capability": "release-ram" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { "execute": "query-qmp-schema", - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -14112,7 +13990,7 @@ "meta-type": "object" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -14123,7 +14001,7 @@ "name": "host" } }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -14150,7 +14028,7 @@ } } }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -14164,11 +14042,11 @@ } } }, - "id": "libvirt-37" + "id": "libvirt-36" } { - "id": "libvirt-37", + "id": "libvirt-36", "error": { "class": "GenericError", "desc": "Property '.migratable' not found" diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies index ec7747b5d7..7c507e9645 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies @@ -500,131 +500,9 @@ "id": "libvirt-5" } -{ - "execute": "query-events", - "id": "libvirt-6" -} - -{ - "return": [ - { - "name": "WATCHDOG" - }, - { - "name": "WAKEUP" - }, - { - "name": "VSERPORT_CHANGE" - }, - { - "name": "VNC_INITIALIZED" - }, - { - "name": "VNC_DISCONNECTED" - }, - { - "name": "VNC_CONNECTED" - }, - { - "name": "SUSPEND_DISK" - }, - { - "name": "SUSPEND" - }, - { - "name": "STOP" - }, - { - "name": "SPICE_MIGRATE_COMPLETED" - }, - { - "name": "SPICE_INITIALIZED" - }, - { - "name": "SPICE_DISCONNECTED" - }, - { - "name": "SPICE_CONNECTED" - }, - { - "name": "SHUTDOWN" - }, - { - "name": "RTC_CHANGE" - }, - { - "name": "RESUME" - }, - { - "name": "RESET" - }, - { - "name": "QUORUM_REPORT_BAD" - }, - { - "name": "QUORUM_FAILURE" - }, - { - "name": "POWERDOWN" - }, - { - "name": "NIC_RX_FILTER_CHANGED" - }, - { - "name": "MIGRATION_PASS" - }, - { - "name": "MIGRATION" - }, - { - "name": "MEM_UNPLUG_ERROR" - }, - { - "name": "GUEST_PANICKED" - }, - { - "name": "DUMP_COMPLETED" - }, - { - "name": "DEVICE_TRAY_MOVED" - }, - { - "name": "DEVICE_DELETED" - }, - { - "name": "BLOCK_WRITE_THRESHOLD" - }, - { - "name": "BLOCK_JOB_READY" - }, - { - "name": "BLOCK_JOB_ERROR" - }, - { - "name": "BLOCK_JOB_COMPLETED" - }, - { - "name": "BLOCK_JOB_CANCELLED" - }, - { - "name": "BLOCK_IO_ERROR" - }, - { - "name": "BLOCK_IMAGE_CORRUPTED" - }, - { - "name": "BALLOON_CHANGE" - }, - { - "name": "ACPI_DEVICE_OST" - } - ], - "id": "libvirt-6" -} - { "execute": "qom-list-types", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -1755,7 +1633,7 @@ "name": "virtio-blk-device" } ], - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -1763,7 +1641,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -1991,7 +1869,7 @@ "type": "str" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -1999,7 +1877,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2278,7 +2156,7 @@ "type": "uint16" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2286,7 +2164,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2447,7 +2325,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2455,11 +2333,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-11" + "id": "libvirt-10" } { - "id": "libvirt-11", + "id": "libvirt-10", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -2471,11 +2349,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-12" + "id": "libvirt-11" } { - "id": "libvirt-12", + "id": "libvirt-11", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -2487,11 +2365,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -2503,7 +2381,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -2610,7 +2488,7 @@ "type": "bool" } ], - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -2618,7 +2496,7 @@ "arguments": { "typename": "scsi-hd" }, - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -2732,7 +2610,7 @@ "type": "uint64" } ], - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -2740,7 +2618,7 @@ "arguments": { "typename": "ide-hd" }, - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -2816,7 +2694,7 @@ "type": "uint16" } ], - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -2824,7 +2702,7 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -2887,7 +2765,7 @@ "type": "int32" } ], - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -2895,7 +2773,7 @@ "arguments": { "typename": "usb-redir" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -2944,7 +2822,7 @@ "type": "bool" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -2952,7 +2830,7 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2990,7 +2868,7 @@ "type": "child" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2998,7 +2876,7 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -3076,7 +2954,7 @@ "type": "int" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -3084,7 +2962,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -3157,7 +3035,7 @@ "type": "uint16" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -3165,7 +3043,7 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -3179,7 +3057,7 @@ "type": "LostTickPolicy" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -3187,7 +3065,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3244,7 +3122,7 @@ "type": "int32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3252,7 +3130,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -3295,7 +3173,7 @@ "type": "int32" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -3303,7 +3181,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -3390,7 +3268,7 @@ "type": "uint32" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -3398,7 +3276,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -3551,7 +3429,7 @@ "type": "str" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -3559,7 +3437,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3608,7 +3486,7 @@ "type": "size" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3616,7 +3494,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3712,7 +3590,7 @@ "type": "uint32" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3720,7 +3598,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3863,7 +3741,7 @@ "type": "str" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3871,11 +3749,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" @@ -3887,7 +3765,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3931,7 +3809,7 @@ "type": "bool" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3939,7 +3817,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -4019,7 +3897,7 @@ "type": "uint32" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -4027,7 +3905,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -4058,7 +3936,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -4066,7 +3944,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -4092,7 +3970,7 @@ "type": "pci-devfn" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -4100,7 +3978,7 @@ "arguments": { "typename": "nvdimm" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -4110,12 +3988,12 @@ "type": "link" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-machines", - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -4294,12 +4172,12 @@ "cpu-max": 255 } ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-cpu-definitions", - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -4581,36 +4459,36 @@ "migration-safe": true } ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-tpm-models", - "id": "libvirt-38" + "id": "libvirt-37" } { "return": [ "tpm-tis" ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-tpm-types", - "id": "libvirt-39" + "id": "libvirt-38" } { "return": [ "passthrough" ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-command-line-options", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -5859,12 +5737,12 @@ "option": "drive" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-migrate-capabilities", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -5906,12 +5784,12 @@ "capability": "release-ram" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-qmp-schema", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -15197,7 +15075,7 @@ "meta-type": "object" } ], - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -15208,7 +15086,7 @@ "name": "host" } }, - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -15387,7 +15265,7 @@ } } }, - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -15568,7 +15446,7 @@ } } }, - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -15809,7 +15687,7 @@ } } }, - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -15823,7 +15701,7 @@ } } }, - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -16002,7 +15880,7 @@ } } }, - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -16183,7 +16061,7 @@ } } }, - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -16424,7 +16302,7 @@ } } }, - "id": "libvirt-46" + "id": "libvirt-45" } { diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies index c6e5678144..1d57a5d7ba 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies @@ -578,140 +578,9 @@ "id": "libvirt-5" } -{ - "execute": "query-events", - "id": "libvirt-6" -} - -{ - "return": [ - { - "name": "COMMAND_DROPPED" - }, - { - "name": "RTC_CHANGE" - }, - { - "name": "ACPI_DEVICE_OST" - }, - { - "name": "MEM_UNPLUG_ERROR" - }, - { - "name": "DUMP_COMPLETED" - }, - { - "name": "DEVICE_DELETED" - }, - { - "name": "BALLOON_CHANGE" - }, - { - "name": "MIGRATION_PASS" - }, - { - "name": "MIGRATION" - }, - { - "name": "VNC_DISCONNECTED" - }, - { - "name": "VNC_INITIALIZED" - }, - { - "name": "VNC_CONNECTED" - }, - { - "name": "SPICE_MIGRATE_COMPLETED" - }, - { - "name": "SPICE_DISCONNECTED" - }, - { - "name": "SPICE_INITIALIZED" - }, - { - "name": "SPICE_CONNECTED" - }, - { - "name": "NIC_RX_FILTER_CHANGED" - }, - { - "name": "VSERPORT_CHANGE" - }, - { - "name": "QUORUM_REPORT_BAD" - }, - { - "name": "QUORUM_FAILURE" - }, - { - "name": "DEVICE_TRAY_MOVED" - }, - { - "name": "BLOCK_WRITE_THRESHOLD" - }, - { - "name": "BLOCK_JOB_PENDING" - }, - { - "name": "BLOCK_JOB_READY" - }, - { - "name": "BLOCK_JOB_ERROR" - }, - { - "name": "BLOCK_JOB_CANCELLED" - }, - { - "name": "BLOCK_JOB_COMPLETED" - }, - { - "name": "BLOCK_IO_ERROR" - }, - { - "name": "BLOCK_IMAGE_CORRUPTED" - }, - { - "name": "JOB_STATUS_CHANGE" - }, - { - "name": "GUEST_PANICKED" - }, - { - "name": "WATCHDOG" - }, - { - "name": "WAKEUP" - }, - { - "name": "SUSPEND_DISK" - }, - { - "name": "SUSPEND" - }, - { - "name": "RESUME" - }, - { - "name": "STOP" - }, - { - "name": "RESET" - }, - { - "name": "POWERDOWN" - }, - { - "name": "SHUTDOWN" - } - ], - "id": "libvirt-6" -} - { "execute": "qom-list-types", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -3553,7 +3422,7 @@ "parent": "virtio-input-hid-pci" } ], - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -3561,7 +3430,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -3793,7 +3662,7 @@ "type": "str" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -3801,7 +3670,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -4091,7 +3960,7 @@ "type": "uint16" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -4099,7 +3968,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -4264,7 +4133,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -4272,11 +4141,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-11" + "id": "libvirt-10" } { - "id": "libvirt-11", + "id": "libvirt-10", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -4288,11 +4157,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-12" + "id": "libvirt-11" } { - "id": "libvirt-12", + "id": "libvirt-11", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -4304,11 +4173,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -4320,7 +4189,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -4454,7 +4323,7 @@ "type": "str" } ], - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -4462,7 +4331,7 @@ "arguments": { "typename": "scsi-hd" }, - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -4580,7 +4449,7 @@ "type": "uint32" } ], - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -4588,7 +4457,7 @@ "arguments": { "typename": "ide-hd" }, - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -4664,7 +4533,7 @@ "type": "uint16" } ], - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -4672,11 +4541,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -4688,11 +4557,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-18" + "id": "libvirt-17" } { - "id": "libvirt-18", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -4704,11 +4573,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-19" + "id": "libvirt-18" } { - "id": "libvirt-19", + "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -4720,7 +4589,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -4793,7 +4662,7 @@ "type": "uint16" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -4801,11 +4670,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-21" + "id": "libvirt-20" } { - "id": "libvirt-21", + "id": "libvirt-20", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -4817,7 +4686,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -4874,7 +4743,7 @@ "type": "int32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -4882,7 +4751,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -5033,7 +4902,7 @@ "type": "str" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -5041,7 +4910,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -5088,7 +4957,7 @@ "type": "size" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -5096,11 +4965,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-25" + "id": "libvirt-24" } { - "id": "libvirt-25", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -5112,7 +4981,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -5255,7 +5124,7 @@ "type": "str" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -5263,11 +5132,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-27" + "id": "libvirt-26" } { - "id": "libvirt-27", + "id": "libvirt-26", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -5279,7 +5148,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -5323,7 +5192,7 @@ "type": "bool" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -5331,7 +5200,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -5411,7 +5280,7 @@ "type": "uint32" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -5419,7 +5288,7 @@ "arguments": { "typename": "spapr-pci-host-bridge" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -5477,7 +5346,7 @@ "type": "uint32" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -5485,7 +5354,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -5535,7 +5404,7 @@ "type": "string" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -5543,7 +5412,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -5593,7 +5462,7 @@ "type": "string" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -5601,7 +5470,7 @@ "arguments": { "typename": "spapr-machine" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -5772,12 +5641,12 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { "execute": "query-machines", - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -5920,12 +5789,12 @@ "cpu-max": 1 } ], - "id": "libvirt-34" + "id": "libvirt-33" } { "execute": "query-cpu-definitions", - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -8121,35 +7990,35 @@ "static": false } ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-tpm-models", - "id": "libvirt-36" + "id": "libvirt-35" } { "return": [ ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-tpm-types", - "id": "libvirt-37" + "id": "libvirt-36" } { "return": [ "emulator" ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-command-line-options", - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -9279,12 +9148,12 @@ "option": "drive" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-migrate-capabilities", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -9354,12 +9223,12 @@ "capability": "late-block-activate" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-qmp-schema", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -21518,7 +21387,7 @@ "meta-type": "object" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies index cf8953390a..eaab110763 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies +++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies @@ -575,143 +575,9 @@ "id": "libvirt-5" } -{ - "execute": "query-events", - "id": "libvirt-6" -} - -{ - "return": [ - { - "name": "COMMAND_DROPPED" - }, - { - "name": "RTC_CHANGE" - }, - { - "name": "ACPI_DEVICE_OST" - }, - { - "name": "MEM_UNPLUG_ERROR" - }, - { - "name": "DUMP_COMPLETED" - }, - { - "name": "DEVICE_DELETED" - }, - { - "name": "BALLOON_CHANGE" - }, - { - "name": "MIGRATION_PASS" - }, - { - "name": "MIGRATION" - }, - { - "name": "VNC_DISCONNECTED" - }, - { - "name": "VNC_INITIALIZED" - }, - { - "name": "VNC_CONNECTED" - }, - { - "name": "SPICE_MIGRATE_COMPLETED" - }, - { - "name": "SPICE_DISCONNECTED" - }, - { - "name": "SPICE_INITIALIZED" - }, - { - "name": "SPICE_CONNECTED" - }, - { - "name": "NIC_RX_FILTER_CHANGED" - }, - { - "name": "VSERPORT_CHANGE" - }, - { - "name": "QUORUM_REPORT_BAD" - }, - { - "name": "QUORUM_FAILURE" - }, - { - "name": "PR_MANAGER_STATUS_CHANGED" - }, - { - "name": "DEVICE_TRAY_MOVED" - }, - { - "name": "BLOCK_WRITE_THRESHOLD" - }, - { - "name": "BLOCK_JOB_PENDING" - }, - { - "name": "BLOCK_JOB_READY" - }, - { - "name": "BLOCK_JOB_ERROR" - }, - { - "name": "BLOCK_JOB_CANCELLED" - }, - { - "name": "BLOCK_JOB_COMPLETED" - }, - { - "name": "BLOCK_IO_ERROR" - }, - { - "name": "BLOCK_IMAGE_CORRUPTED" - }, - { - "name": "JOB_STATUS_CHANGE" - }, - { - "name": "GUEST_PANICKED" - }, - { - "name": "WATCHDOG" - }, - { - "name": "WAKEUP" - }, - { - "name": "SUSPEND_DISK" - }, - { - "name": "SUSPEND" - }, - { - "name": "RESUME" - }, - { - "name": "STOP" - }, - { - "name": "RESET" - }, - { - "name": "POWERDOWN" - }, - { - "name": "SHUTDOWN" - } - ], - "id": "libvirt-6" -} - { "execute": "qom-list-types", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -1197,7 +1063,7 @@ "parent": "scsi-disk-base" } ], - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -1205,11 +1071,11 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-8" + "id": "libvirt-7" } { - "id": "libvirt-8", + "id": "libvirt-7", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-blk-pci' not found" @@ -1221,11 +1087,11 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-9" + "id": "libvirt-8" } { - "id": "libvirt-9", + "id": "libvirt-8", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-pci' not found" @@ -1237,11 +1103,11 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { - "id": "libvirt-10", + "id": "libvirt-9", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-pci' not found" @@ -1253,11 +1119,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-11" + "id": "libvirt-10" } { - "id": "libvirt-11", + "id": "libvirt-10", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -1269,11 +1135,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-12" + "id": "libvirt-11" } { - "id": "libvirt-12", + "id": "libvirt-11", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -1285,11 +1151,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -1301,7 +1167,7 @@ "arguments": { "typename": "scsi-hd" }, - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -1419,7 +1285,7 @@ "type": "uint32" } ], - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -1427,11 +1293,11 @@ "arguments": { "typename": "ide-hd" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'ide-drive' not found" @@ -1443,11 +1309,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -1459,11 +1325,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -1475,11 +1341,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-18" + "id": "libvirt-17" } { - "id": "libvirt-18", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -1491,11 +1357,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-19" + "id": "libvirt-18" } { - "id": "libvirt-19", + "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -1507,11 +1373,11 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-20" + "id": "libvirt-19" } { - "id": "libvirt-20", + "id": "libvirt-19", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-gpu-pci' not found" @@ -1523,7 +1389,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -1570,7 +1436,7 @@ "type": "size" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -1578,11 +1444,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-22" + "id": "libvirt-21" } { - "id": "libvirt-22", + "id": "libvirt-21", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -1594,11 +1460,11 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-23" + "id": "libvirt-22" } { - "id": "libvirt-23", + "id": "libvirt-22", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-pci' not found" @@ -1610,11 +1476,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-24" + "id": "libvirt-23" } { - "id": "libvirt-24", + "id": "libvirt-23", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -1626,7 +1492,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -1670,7 +1536,7 @@ "type": "bool" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -1678,7 +1544,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -1728,7 +1594,7 @@ "type": "string" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -1736,7 +1602,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -1786,7 +1652,7 @@ "type": "string" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -1794,11 +1660,11 @@ "arguments": { "typename": "spapr-machine" }, - "id": "libvirt-28" + "id": "libvirt-27" } { - "id": "libvirt-28", + "id": "libvirt-27", "error": { "class": "DeviceNotFound", "desc": "Class 'spapr-machine' not found" @@ -1807,7 +1673,7 @@ { "execute": "query-machines", - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -1844,23 +1710,23 @@ "cpu-max": 1 } ], - "id": "libvirt-29" + "id": "libvirt-28" } { "execute": "query-tpm-models", - "id": "libvirt-30" + "id": "libvirt-29" } { "return": [ ], - "id": "libvirt-30" + "id": "libvirt-29" } { "execute": "query-tpm-types", - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -1868,12 +1734,12 @@ "passthrough", "emulator" ], - "id": "libvirt-31" + "id": "libvirt-30" } { "execute": "query-command-line-options", - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -2998,12 +2864,12 @@ "option": "drive" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { "execute": "query-migrate-capabilities", - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3073,12 +2939,12 @@ "capability": "late-block-activate" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { "execute": "query-qmp-schema", - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -14753,5 +14619,5 @@ "meta-type": "object" } ], - "id": "libvirt-34" + "id": "libvirt-33" } diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies index b1b5784439..d727902b84 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies +++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies @@ -575,143 +575,9 @@ "id": "libvirt-5" } -{ - "execute": "query-events", - "id": "libvirt-6" -} - -{ - "return": [ - { - "name": "COMMAND_DROPPED" - }, - { - "name": "RTC_CHANGE" - }, - { - "name": "ACPI_DEVICE_OST" - }, - { - "name": "MEM_UNPLUG_ERROR" - }, - { - "name": "DUMP_COMPLETED" - }, - { - "name": "DEVICE_DELETED" - }, - { - "name": "BALLOON_CHANGE" - }, - { - "name": "MIGRATION_PASS" - }, - { - "name": "MIGRATION" - }, - { - "name": "VNC_DISCONNECTED" - }, - { - "name": "VNC_INITIALIZED" - }, - { - "name": "VNC_CONNECTED" - }, - { - "name": "SPICE_MIGRATE_COMPLETED" - }, - { - "name": "SPICE_DISCONNECTED" - }, - { - "name": "SPICE_INITIALIZED" - }, - { - "name": "SPICE_CONNECTED" - }, - { - "name": "NIC_RX_FILTER_CHANGED" - }, - { - "name": "VSERPORT_CHANGE" - }, - { - "name": "QUORUM_REPORT_BAD" - }, - { - "name": "QUORUM_FAILURE" - }, - { - "name": "PR_MANAGER_STATUS_CHANGED" - }, - { - "name": "DEVICE_TRAY_MOVED" - }, - { - "name": "BLOCK_WRITE_THRESHOLD" - }, - { - "name": "BLOCK_JOB_PENDING" - }, - { - "name": "BLOCK_JOB_READY" - }, - { - "name": "BLOCK_JOB_ERROR" - }, - { - "name": "BLOCK_JOB_CANCELLED" - }, - { - "name": "BLOCK_JOB_COMPLETED" - }, - { - "name": "BLOCK_IO_ERROR" - }, - { - "name": "BLOCK_IMAGE_CORRUPTED" - }, - { - "name": "JOB_STATUS_CHANGE" - }, - { - "name": "GUEST_PANICKED" - }, - { - "name": "WATCHDOG" - }, - { - "name": "WAKEUP" - }, - { - "name": "SUSPEND_DISK" - }, - { - "name": "SUSPEND" - }, - { - "name": "RESUME" - }, - { - "name": "STOP" - }, - { - "name": "RESET" - }, - { - "name": "POWERDOWN" - }, - { - "name": "SHUTDOWN" - } - ], - "id": "libvirt-6" -} - { "execute": "qom-list-types", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -1197,7 +1063,7 @@ "parent": "scsi-disk-base" } ], - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -1205,11 +1071,11 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-8" + "id": "libvirt-7" } { - "id": "libvirt-8", + "id": "libvirt-7", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-blk-pci' not found" @@ -1221,11 +1087,11 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-9" + "id": "libvirt-8" } { - "id": "libvirt-9", + "id": "libvirt-8", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-pci' not found" @@ -1237,11 +1103,11 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { - "id": "libvirt-10", + "id": "libvirt-9", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-pci' not found" @@ -1253,11 +1119,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-11" + "id": "libvirt-10" } { - "id": "libvirt-11", + "id": "libvirt-10", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -1269,11 +1135,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-12" + "id": "libvirt-11" } { - "id": "libvirt-12", + "id": "libvirt-11", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -1285,11 +1151,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -1301,7 +1167,7 @@ "arguments": { "typename": "scsi-hd" }, - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -1419,7 +1285,7 @@ "type": "uint32" } ], - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -1427,11 +1293,11 @@ "arguments": { "typename": "ide-hd" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'ide-drive' not found" @@ -1443,11 +1309,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -1459,11 +1325,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -1475,11 +1341,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-18" + "id": "libvirt-17" } { - "id": "libvirt-18", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -1491,11 +1357,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-19" + "id": "libvirt-18" } { - "id": "libvirt-19", + "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -1507,11 +1373,11 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-20" + "id": "libvirt-19" } { - "id": "libvirt-20", + "id": "libvirt-19", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-gpu-pci' not found" @@ -1523,7 +1389,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -1570,7 +1436,7 @@ "type": "size" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -1578,11 +1444,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-22" + "id": "libvirt-21" } { - "id": "libvirt-22", + "id": "libvirt-21", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -1594,11 +1460,11 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-23" + "id": "libvirt-22" } { - "id": "libvirt-23", + "id": "libvirt-22", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-pci' not found" @@ -1610,11 +1476,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-24" + "id": "libvirt-23" } { - "id": "libvirt-24", + "id": "libvirt-23", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -1626,7 +1492,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -1670,7 +1536,7 @@ "type": "bool" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -1678,7 +1544,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -1728,7 +1594,7 @@ "type": "string" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -1736,7 +1602,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -1786,7 +1652,7 @@ "type": "string" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -1794,11 +1660,11 @@ "arguments": { "typename": "spapr-machine" }, - "id": "libvirt-28" + "id": "libvirt-27" } { - "id": "libvirt-28", + "id": "libvirt-27", "error": { "class": "DeviceNotFound", "desc": "Class 'spapr-machine' not found" @@ -1807,7 +1673,7 @@ { "execute": "query-machines", - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -1844,23 +1710,23 @@ "cpu-max": 1 } ], - "id": "libvirt-29" + "id": "libvirt-28" } { "execute": "query-tpm-models", - "id": "libvirt-30" + "id": "libvirt-29" } { "return": [ ], - "id": "libvirt-30" + "id": "libvirt-29" } { "execute": "query-tpm-types", - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -1868,12 +1734,12 @@ "passthrough", "emulator" ], - "id": "libvirt-31" + "id": "libvirt-30" } { "execute": "query-command-line-options", - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -2998,12 +2864,12 @@ "option": "drive" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { "execute": "query-migrate-capabilities", - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3073,12 +2939,12 @@ "capability": "late-block-activate" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { "execute": "query-qmp-schema", - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -14753,5 +14619,5 @@ "meta-type": "object" } ], - "id": "libvirt-34" + "id": "libvirt-33" } diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.replies b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.replies index 1b398ed4e4..e5f554f955 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.replies @@ -590,143 +590,9 @@ "id": "libvirt-5" } -{ - "execute": "query-events", - "id": "libvirt-6" -} - -{ - "return": [ - { - "name": "COMMAND_DROPPED" - }, - { - "name": "RTC_CHANGE" - }, - { - "name": "ACPI_DEVICE_OST" - }, - { - "name": "MEM_UNPLUG_ERROR" - }, - { - "name": "DUMP_COMPLETED" - }, - { - "name": "DEVICE_DELETED" - }, - { - "name": "BALLOON_CHANGE" - }, - { - "name": "MIGRATION_PASS" - }, - { - "name": "MIGRATION" - }, - { - "name": "VNC_DISCONNECTED" - }, - { - "name": "VNC_INITIALIZED" - }, - { - "name": "VNC_CONNECTED" - }, - { - "name": "SPICE_MIGRATE_COMPLETED" - }, - { - "name": "SPICE_DISCONNECTED" - }, - { - "name": "SPICE_INITIALIZED" - }, - { - "name": "SPICE_CONNECTED" - }, - { - "name": "NIC_RX_FILTER_CHANGED" - }, - { - "name": "VSERPORT_CHANGE" - }, - { - "name": "QUORUM_REPORT_BAD" - }, - { - "name": "QUORUM_FAILURE" - }, - { - "name": "PR_MANAGER_STATUS_CHANGED" - }, - { - "name": "DEVICE_TRAY_MOVED" - }, - { - "name": "BLOCK_WRITE_THRESHOLD" - }, - { - "name": "BLOCK_JOB_PENDING" - }, - { - "name": "BLOCK_JOB_READY" - }, - { - "name": "BLOCK_JOB_ERROR" - }, - { - "name": "BLOCK_JOB_CANCELLED" - }, - { - "name": "BLOCK_JOB_COMPLETED" - }, - { - "name": "BLOCK_IO_ERROR" - }, - { - "name": "BLOCK_IMAGE_CORRUPTED" - }, - { - "name": "JOB_STATUS_CHANGE" - }, - { - "name": "GUEST_PANICKED" - }, - { - "name": "WATCHDOG" - }, - { - "name": "WAKEUP" - }, - { - "name": "SUSPEND_DISK" - }, - { - "name": "SUSPEND" - }, - { - "name": "RESUME" - }, - { - "name": "STOP" - }, - { - "name": "RESET" - }, - { - "name": "POWERDOWN" - }, - { - "name": "SHUTDOWN" - } - ], - "id": "libvirt-6" -} - { "execute": "qom-list-types", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -1704,7 +1570,7 @@ "parent": "virtio-device" } ], - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -1712,7 +1578,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -1944,7 +1810,7 @@ "type": "str" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -1952,7 +1818,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2242,7 +2108,7 @@ "type": "uint16" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2250,7 +2116,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2415,7 +2281,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2423,7 +2289,7 @@ "arguments": { "typename": "virtio-blk-ccw" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2565,7 +2431,7 @@ "type": "uint32" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2573,7 +2439,7 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -2777,7 +2643,7 @@ "type": "uint16" } ], - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -2785,7 +2651,7 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { @@ -2864,7 +2730,7 @@ "type": "uint32" } ], - "id": "libvirt-13" + "id": "libvirt-12" } { @@ -2872,11 +2738,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-14" + "id": "libvirt-13" } { - "id": "libvirt-14", + "id": "libvirt-13", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -2888,7 +2754,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -3022,7 +2888,7 @@ "type": "str" } ], - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -3030,7 +2896,7 @@ "arguments": { "typename": "scsi-hd" }, - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -3148,7 +3014,7 @@ "type": "uint32" } ], - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -3156,11 +3022,11 @@ "arguments": { "typename": "ide-hd" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'ide-drive' not found" @@ -3172,11 +3038,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-18" + "id": "libvirt-17" } { - "id": "libvirt-18", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -3188,7 +3054,7 @@ "arguments": { "typename": "usb-redir" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -3237,7 +3103,7 @@ "type": "bool" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -3245,11 +3111,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-20" + "id": "libvirt-19" } { - "id": "libvirt-20", + "id": "libvirt-19", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -3261,11 +3127,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-21" + "id": "libvirt-20" } { - "id": "libvirt-21", + "id": "libvirt-20", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -3277,11 +3143,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-22" + "id": "libvirt-21" } { - "id": "libvirt-22", + "id": "libvirt-21", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -3293,7 +3159,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3454,7 +3320,7 @@ "type": "str" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3462,7 +3328,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -3519,7 +3385,7 @@ "type": "size" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -3527,11 +3393,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-25" + "id": "libvirt-24" } { - "id": "libvirt-25", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -3543,7 +3409,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -3686,7 +3552,7 @@ "type": "str" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -3694,7 +3560,7 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3756,7 +3622,7 @@ "type": "uint32" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3764,7 +3630,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3808,7 +3674,7 @@ "type": "bool" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3816,7 +3682,7 @@ "arguments": { "typename": "virtio-gpu-ccw" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3891,7 +3757,7 @@ "type": "uint32" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3899,7 +3765,7 @@ "arguments": { "typename": "virtual-css-bridge" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -3914,7 +3780,7 @@ "type": "bool" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -3922,7 +3788,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3972,7 +3838,7 @@ "type": "string" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3980,7 +3846,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -4030,7 +3896,7 @@ "type": "string" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -4038,11 +3904,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" @@ -4051,7 +3917,7 @@ { "execute": "query-machines", - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -4114,12 +3980,12 @@ "cpu-max": 248 } ], - "id": "libvirt-34" + "id": "libvirt-33" } { "execute": "query-cpu-definitions", - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -4670,35 +4536,35 @@ "migration-safe": true } ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-tpm-models", - "id": "libvirt-36" + "id": "libvirt-35" } { "return": [ ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-tpm-types", - "id": "libvirt-37" + "id": "libvirt-36" } { "return": [ "emulator" ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-command-line-options", - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -5858,12 +5724,12 @@ "option": "drive" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-migrate-capabilities", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -5933,12 +5799,12 @@ "capability": "late-block-activate" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-qmp-schema", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -17613,7 +17479,7 @@ "meta-type": "object" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -17624,7 +17490,7 @@ "name": "host" } }, - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -17666,7 +17532,7 @@ } } }, - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -17680,11 +17546,11 @@ } } }, - "id": "libvirt-42" + "id": "libvirt-41" } { - "id": "libvirt-42", + "id": "libvirt-41", "error": { "class": "GenericError", "desc": "Property '.migratable' not found" diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies index 558a753e13..8511053834 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies @@ -596,143 +596,9 @@ "id": "libvirt-5" } -{ - "execute": "query-events", - "id": "libvirt-6" -} - -{ - "return": [ - { - "name": "COMMAND_DROPPED" - }, - { - "name": "RTC_CHANGE" - }, - { - "name": "ACPI_DEVICE_OST" - }, - { - "name": "MEM_UNPLUG_ERROR" - }, - { - "name": "DUMP_COMPLETED" - }, - { - "name": "DEVICE_DELETED" - }, - { - "name": "BALLOON_CHANGE" - }, - { - "name": "MIGRATION_PASS" - }, - { - "name": "MIGRATION" - }, - { - "name": "VNC_DISCONNECTED" - }, - { - "name": "VNC_INITIALIZED" - }, - { - "name": "VNC_CONNECTED" - }, - { - "name": "SPICE_MIGRATE_COMPLETED" - }, - { - "name": "SPICE_DISCONNECTED" - }, - { - "name": "SPICE_INITIALIZED" - }, - { - "name": "SPICE_CONNECTED" - }, - { - "name": "NIC_RX_FILTER_CHANGED" - }, - { - "name": "VSERPORT_CHANGE" - }, - { - "name": "QUORUM_REPORT_BAD" - }, - { - "name": "QUORUM_FAILURE" - }, - { - "name": "PR_MANAGER_STATUS_CHANGED" - }, - { - "name": "DEVICE_TRAY_MOVED" - }, - { - "name": "BLOCK_WRITE_THRESHOLD" - }, - { - "name": "BLOCK_JOB_PENDING" - }, - { - "name": "BLOCK_JOB_READY" - }, - { - "name": "BLOCK_JOB_ERROR" - }, - { - "name": "BLOCK_JOB_CANCELLED" - }, - { - "name": "BLOCK_JOB_COMPLETED" - }, - { - "name": "BLOCK_IO_ERROR" - }, - { - "name": "BLOCK_IMAGE_CORRUPTED" - }, - { - "name": "JOB_STATUS_CHANGE" - }, - { - "name": "GUEST_PANICKED" - }, - { - "name": "WATCHDOG" - }, - { - "name": "WAKEUP" - }, - { - "name": "SUSPEND_DISK" - }, - { - "name": "SUSPEND" - }, - { - "name": "RESUME" - }, - { - "name": "STOP" - }, - { - "name": "RESET" - }, - { - "name": "POWERDOWN" - }, - { - "name": "SHUTDOWN" - } - ], - "id": "libvirt-6" -} - { "execute": "qom-list-types", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -2398,7 +2264,7 @@ "parent": "rng-backend" } ], - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -2406,7 +2272,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -2638,7 +2504,7 @@ "type": "str" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -2646,7 +2512,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2936,7 +2802,7 @@ "type": "uint16" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2944,7 +2810,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -3109,7 +2975,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -3117,11 +2983,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-11" + "id": "libvirt-10" } { - "id": "libvirt-11", + "id": "libvirt-10", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -3133,11 +2999,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-12" + "id": "libvirt-11" } { - "id": "libvirt-12", + "id": "libvirt-11", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -3149,11 +3015,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -3165,7 +3031,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -3299,7 +3165,7 @@ "type": "str" } ], - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -3307,7 +3173,7 @@ "arguments": { "typename": "scsi-hd" }, - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -3425,7 +3291,7 @@ "type": "uint32" } ], - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -3433,7 +3299,7 @@ "arguments": { "typename": "ide-hd" }, - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -3509,7 +3375,7 @@ "type": "uint16" } ], - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -3517,7 +3383,7 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -3580,7 +3446,7 @@ "type": "int32" } ], - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -3588,7 +3454,7 @@ "arguments": { "typename": "usb-redir" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -3637,7 +3503,7 @@ "type": "bool" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -3645,7 +3511,7 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -3687,7 +3553,7 @@ "type": "bool" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -3695,7 +3561,7 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -3777,7 +3643,7 @@ "type": "uint64" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -3785,7 +3651,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -3868,7 +3734,7 @@ "type": "uint16" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -3876,7 +3742,7 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -3890,7 +3756,7 @@ "type": "LostTickPolicy" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -3898,7 +3764,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3959,7 +3825,7 @@ "type": "bool" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3967,7 +3833,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -4014,7 +3880,7 @@ "type": "bool" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -4022,7 +3888,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -4121,7 +3987,7 @@ "type": "uint32" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -4129,7 +3995,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -4290,7 +4156,7 @@ "type": "str" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -4298,7 +4164,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -4355,7 +4221,7 @@ "type": "size" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -4363,7 +4229,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -4459,7 +4325,7 @@ "type": "uint32" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -4467,7 +4333,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -4610,7 +4476,7 @@ "type": "str" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -4618,11 +4484,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" @@ -4634,7 +4500,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -4678,7 +4544,7 @@ "type": "bool" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -4686,7 +4552,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -4766,7 +4632,7 @@ "type": "uint32" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -4774,7 +4640,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -4813,7 +4679,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -4821,7 +4687,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -4864,7 +4730,7 @@ "type": "int32" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -4872,7 +4738,7 @@ "arguments": { "typename": "nvdimm" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -4906,7 +4772,7 @@ "type": "uint64" } ], - "id": "libvirt-35" + "id": "libvirt-34" } @@ -4915,7 +4781,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -4965,7 +4831,7 @@ "type": "string" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -4973,7 +4839,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -5023,7 +4889,7 @@ "type": "string" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -5031,11 +4897,11 @@ "arguments": { "typename": "spapr-machine" }, - "id": "libvirt-38" + "id": "libvirt-37" } { - "id": "libvirt-38", + "id": "libvirt-37", "error": { "class": "DeviceNotFound", "desc": "Class 'spapr-machine' not found" @@ -5044,7 +4910,7 @@ { "execute": "query-machines", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -5253,12 +5119,12 @@ "cpu-max": 255 } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-cpu-definitions", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -5695,12 +5561,12 @@ "migration-safe": true } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-tpm-models", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -5708,12 +5574,12 @@ "tpm-crb", "tpm-tis" ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-tpm-types", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -5721,12 +5587,12 @@ "passthrough", "emulator" ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-command-line-options", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -7025,12 +6891,12 @@ "option": "drive" } ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-migrate-capabilities", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -7100,12 +6966,12 @@ "capability": "late-block-activate" } ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-qmp-schema", - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -18985,7 +18851,7 @@ "meta-type": "object" } ], - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -18996,7 +18862,7 @@ "name": "host" } }, - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -19189,7 +19055,7 @@ } } }, - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -19384,7 +19250,7 @@ } } }, - "id": "libvirt-47" + "id": "libvirt-46" } { @@ -19647,7 +19513,7 @@ } } }, - "id": "libvirt-47" + "id": "libvirt-46" } { @@ -19661,7 +19527,7 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-47" } { @@ -19854,7 +19720,7 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-47" } { @@ -20049,7 +19915,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -20312,16 +20178,16 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-48" } { "execute": "query-sev-capabilities", - "id": "libvirt-50" + "id": "libvirt-49" } { - "id": "libvirt-50", + "id": "libvirt-49", "error": { "class": "GenericError", "desc": "SEV feature is not available" diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies index ca8c176dd3..3921f8eff0 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies @@ -581,146 +581,9 @@ "id": "libvirt-5" } -{ - "execute": "query-events", - "id": "libvirt-6" -} - -{ - "return": [ - { - "name": "COMMAND_DROPPED" - }, - { - "name": "RTC_CHANGE" - }, - { - "name": "ACPI_DEVICE_OST" - }, - { - "name": "MEM_UNPLUG_ERROR" - }, - { - "name": "DUMP_COMPLETED" - }, - { - "name": "DEVICE_DELETED" - }, - { - "name": "BALLOON_CHANGE" - }, - { - "name": "COLO_EXIT" - }, - { - "name": "MIGRATION_PASS" - }, - { - "name": "MIGRATION" - }, - { - "name": "VNC_DISCONNECTED" - }, - { - "name": "VNC_INITIALIZED" - }, - { - "name": "VNC_CONNECTED" - }, - { - "name": "SPICE_MIGRATE_COMPLETED" - }, - { - "name": "SPICE_DISCONNECTED" - }, - { - "name": "SPICE_INITIALIZED" - }, - { - "name": "SPICE_CONNECTED" - }, - { - "name": "NIC_RX_FILTER_CHANGED" - }, - { - "name": "VSERPORT_CHANGE" - }, - { - "name": "QUORUM_REPORT_BAD" - }, - { - "name": "QUORUM_FAILURE" - }, - { - "name": "PR_MANAGER_STATUS_CHANGED" - }, - { - "name": "DEVICE_TRAY_MOVED" - }, - { - "name": "BLOCK_WRITE_THRESHOLD" - }, - { - "name": "BLOCK_JOB_PENDING" - }, - { - "name": "BLOCK_JOB_READY" - }, - { - "name": "BLOCK_JOB_ERROR" - }, - { - "name": "BLOCK_JOB_CANCELLED" - }, - { - "name": "BLOCK_JOB_COMPLETED" - }, - { - "name": "BLOCK_IO_ERROR" - }, - { - "name": "BLOCK_IMAGE_CORRUPTED" - }, - { - "name": "JOB_STATUS_CHANGE" - }, - { - "name": "GUEST_PANICKED" - }, - { - "name": "WATCHDOG" - }, - { - "name": "WAKEUP" - }, - { - "name": "SUSPEND_DISK" - }, - { - "name": "SUSPEND" - }, - { - "name": "RESUME" - }, - { - "name": "STOP" - }, - { - "name": "RESET" - }, - { - "name": "POWERDOWN" - }, - { - "name": "SHUTDOWN" - } - ], - "id": "libvirt-6" -} - { "execute": "qom-list-types", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -3582,7 +3445,7 @@ "parent": "virtio-input-hid-pci" } ], - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -3590,7 +3453,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -3822,7 +3685,7 @@ "type": "str" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -3830,7 +3693,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -4120,7 +3983,7 @@ "type": "uint16" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -4128,7 +3991,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -4293,7 +4156,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -4301,11 +4164,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-11" + "id": "libvirt-10" } { - "id": "libvirt-11", + "id": "libvirt-10", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -4317,11 +4180,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-12" + "id": "libvirt-11" } { - "id": "libvirt-12", + "id": "libvirt-11", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -4333,11 +4196,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -4349,7 +4212,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -4487,7 +4350,7 @@ "type": "str" } ], - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -4495,7 +4358,7 @@ "arguments": { "typename": "scsi-hd" }, - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -4613,7 +4476,7 @@ "type": "uint64" } ], - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -4621,7 +4484,7 @@ "arguments": { "typename": "ide-hd" }, - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -4697,7 +4560,7 @@ "type": "uint16" } ], - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -4705,11 +4568,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -4721,11 +4584,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-18" + "id": "libvirt-17" } { - "id": "libvirt-18", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -4737,11 +4600,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-19" + "id": "libvirt-18" } { - "id": "libvirt-19", + "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -4753,7 +4616,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -4836,7 +4699,7 @@ "type": "uint16" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -4844,11 +4707,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-21" + "id": "libvirt-20" } { - "id": "libvirt-21", + "id": "libvirt-20", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -4860,7 +4723,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -4934,7 +4797,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -4942,7 +4805,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -5093,7 +4956,7 @@ "type": "str" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -5101,7 +4964,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -5148,7 +5011,7 @@ "type": "size" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -5156,11 +5019,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-25" + "id": "libvirt-24" } { - "id": "libvirt-25", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -5172,7 +5035,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -5315,7 +5178,7 @@ "type": "str" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -5323,11 +5186,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-27" + "id": "libvirt-26" } { - "id": "libvirt-27", + "id": "libvirt-26", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -5339,7 +5202,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -5383,7 +5246,7 @@ "type": "bool" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -5391,7 +5254,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -5471,7 +5334,7 @@ "type": "uint32" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -5479,7 +5342,7 @@ "arguments": { "typename": "spapr-pci-host-bridge" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -5537,7 +5400,7 @@ "type": "uint32" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -5545,7 +5408,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -5606,7 +5469,7 @@ "type": "bool" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -5614,7 +5477,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -5674,7 +5537,7 @@ "type": "bool" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -5682,7 +5545,7 @@ "arguments": { "typename": "spapr-machine" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -5827,12 +5690,12 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { "execute": "query-machines", - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -5980,12 +5843,12 @@ "cpu-max": 1 } ], - "id": "libvirt-34" + "id": "libvirt-33" } { "execute": "query-cpu-definitions", - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -8181,35 +8044,35 @@ "static": false } ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-tpm-models", - "id": "libvirt-36" + "id": "libvirt-35" } { "return": [ ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-tpm-types", - "id": "libvirt-37" + "id": "libvirt-36" } { "return": [ "emulator" ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-command-line-options", - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -9344,12 +9207,12 @@ "option": "drive" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-migrate-capabilities", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -9419,12 +9282,12 @@ "capability": "late-block-activate" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-qmp-schema", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -21292,7 +21155,7 @@ "meta-type": "object" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies index 358e2a0bdf..0f0778f3e5 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies @@ -602,146 +602,9 @@ "id": "libvirt-5" } -{ - "execute": "query-events", - "id": "libvirt-6" -} - -{ - "return": [ - { - "name": "COMMAND_DROPPED" - }, - { - "name": "RTC_CHANGE" - }, - { - "name": "ACPI_DEVICE_OST" - }, - { - "name": "MEM_UNPLUG_ERROR" - }, - { - "name": "DUMP_COMPLETED" - }, - { - "name": "DEVICE_DELETED" - }, - { - "name": "BALLOON_CHANGE" - }, - { - "name": "COLO_EXIT" - }, - { - "name": "MIGRATION_PASS" - }, - { - "name": "MIGRATION" - }, - { - "name": "VNC_DISCONNECTED" - }, - { - "name": "VNC_INITIALIZED" - }, - { - "name": "VNC_CONNECTED" - }, - { - "name": "SPICE_MIGRATE_COMPLETED" - }, - { - "name": "SPICE_DISCONNECTED" - }, - { - "name": "SPICE_INITIALIZED" - }, - { - "name": "SPICE_CONNECTED" - }, - { - "name": "NIC_RX_FILTER_CHANGED" - }, - { - "name": "VSERPORT_CHANGE" - }, - { - "name": "QUORUM_REPORT_BAD" - }, - { - "name": "QUORUM_FAILURE" - }, - { - "name": "PR_MANAGER_STATUS_CHANGED" - }, - { - "name": "DEVICE_TRAY_MOVED" - }, - { - "name": "BLOCK_WRITE_THRESHOLD" - }, - { - "name": "BLOCK_JOB_PENDING" - }, - { - "name": "BLOCK_JOB_READY" - }, - { - "name": "BLOCK_JOB_ERROR" - }, - { - "name": "BLOCK_JOB_CANCELLED" - }, - { - "name": "BLOCK_JOB_COMPLETED" - }, - { - "name": "BLOCK_IO_ERROR" - }, - { - "name": "BLOCK_IMAGE_CORRUPTED" - }, - { - "name": "JOB_STATUS_CHANGE" - }, - { - "name": "GUEST_PANICKED" - }, - { - "name": "WATCHDOG" - }, - { - "name": "WAKEUP" - }, - { - "name": "SUSPEND_DISK" - }, - { - "name": "SUSPEND" - }, - { - "name": "RESUME" - }, - { - "name": "STOP" - }, - { - "name": "RESET" - }, - { - "name": "POWERDOWN" - }, - { - "name": "SHUTDOWN" - } - ], - "id": "libvirt-6" -} - { "execute": "qom-list-types", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -2427,7 +2290,7 @@ "parent": "rng-backend" } ], - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -2435,7 +2298,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -2667,7 +2530,7 @@ "type": "str" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -2675,7 +2538,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2965,7 +2828,7 @@ "type": "uint16" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2973,7 +2836,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -3138,7 +3001,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -3146,11 +3009,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-11" + "id": "libvirt-10" } { - "id": "libvirt-11", + "id": "libvirt-10", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -3162,11 +3025,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-12" + "id": "libvirt-11" } { - "id": "libvirt-12", + "id": "libvirt-11", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -3178,11 +3041,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -3194,7 +3057,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -3332,7 +3195,7 @@ "type": "str" } ], - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -3340,7 +3203,7 @@ "arguments": { "typename": "scsi-hd" }, - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -3458,7 +3321,7 @@ "type": "uint64" } ], - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -3466,7 +3329,7 @@ "arguments": { "typename": "ide-hd" }, - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -3542,7 +3405,7 @@ "type": "uint16" } ], - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -3550,7 +3413,7 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -3613,7 +3476,7 @@ "type": "int32" } ], - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -3621,7 +3484,7 @@ "arguments": { "typename": "usb-redir" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -3670,7 +3533,7 @@ "type": "bool" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -3678,7 +3541,7 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -3720,7 +3583,7 @@ "type": "bool" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -3728,7 +3591,7 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -3810,7 +3673,7 @@ "type": "uint64" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -3818,7 +3681,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -3901,7 +3764,7 @@ "type": "uint16" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -3909,7 +3772,7 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -3923,7 +3786,7 @@ "type": "LostTickPolicy" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -3931,7 +3794,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -4005,7 +3868,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -4013,7 +3876,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -4060,7 +3923,7 @@ "type": "bool" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -4068,7 +3931,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -4167,7 +4030,7 @@ "type": "uint32" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -4175,7 +4038,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -4336,7 +4199,7 @@ "type": "bool" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -4344,7 +4207,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -4401,7 +4264,7 @@ "type": "size" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -4409,7 +4272,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -4505,7 +4368,7 @@ "type": "uint32" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -4513,7 +4376,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -4656,7 +4519,7 @@ "type": "str" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -4664,11 +4527,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" @@ -4680,7 +4543,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -4724,7 +4587,7 @@ "type": "bool" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -4732,7 +4595,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -4812,7 +4675,7 @@ "type": "uint32" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -4820,7 +4683,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -4859,7 +4722,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -4867,7 +4730,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -4910,7 +4773,7 @@ "type": "int32" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -4918,7 +4781,7 @@ "arguments": { "typename": "nvdimm" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -4952,7 +4815,7 @@ "type": "uint64" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -4960,7 +4823,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -5021,7 +4884,7 @@ "type": "bool" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -5029,7 +4892,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -5089,7 +4952,7 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -5097,11 +4960,11 @@ "arguments": { "typename": "spapr-machine" }, - "id": "libvirt-38" + "id": "libvirt-37" } { - "id": "libvirt-38", + "id": "libvirt-37", "error": { "class": "DeviceNotFound", "desc": "Class 'spapr-machine' not found" @@ -5110,7 +4973,7 @@ { "execute": "query-machines", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -5329,12 +5192,12 @@ "cpu-max": 255 } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-cpu-definitions", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -5853,12 +5716,12 @@ "migration-safe": true } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-tpm-models", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -5866,12 +5729,12 @@ "tpm-crb", "tpm-tis" ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-tpm-types", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -5879,12 +5742,12 @@ "passthrough", "emulator" ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-command-line-options", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -7158,12 +7021,12 @@ "option": "drive" } ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-migrate-capabilities", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -7233,12 +7096,12 @@ "capability": "late-block-activate" } ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-qmp-schema", - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -19423,7 +19286,7 @@ "meta-type": "object" } ], - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -19434,7 +19297,7 @@ "name": "host" } }, - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -19636,7 +19499,7 @@ } } }, - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -19840,7 +19703,7 @@ } } }, - "id": "libvirt-47" + "id": "libvirt-46" } { @@ -20115,7 +19978,7 @@ } } }, - "id": "libvirt-47" + "id": "libvirt-46" } { @@ -20129,7 +19992,7 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-47" } { @@ -20331,7 +20194,7 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-47" } { @@ -20535,7 +20398,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -20810,16 +20673,16 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-48" } { "execute": "query-sev-capabilities", - "id": "libvirt-50" + "id": "libvirt-49" } { - "id": "libvirt-50", + "id": "libvirt-49", "error": { "class": "GenericError", "desc": "SEV feature is not available" diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies index 667159d6ab..cb51093656 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies @@ -584,146 +584,9 @@ "id": "libvirt-5" } -{ - "execute": "query-events", - "id": "libvirt-6" -} - -{ - "return": [ - { - "name": "RTC_CHANGE" - }, - { - "name": "ACPI_DEVICE_OST" - }, - { - "name": "MEM_UNPLUG_ERROR" - }, - { - "name": "DUMP_COMPLETED" - }, - { - "name": "DEVICE_DELETED" - }, - { - "name": "BALLOON_CHANGE" - }, - { - "name": "COLO_EXIT" - }, - { - "name": "MIGRATION_PASS" - }, - { - "name": "MIGRATION" - }, - { - "name": "VNC_DISCONNECTED" - }, - { - "name": "VNC_INITIALIZED" - }, - { - "name": "VNC_CONNECTED" - }, - { - "name": "SPICE_MIGRATE_COMPLETED" - }, - { - "name": "SPICE_DISCONNECTED" - }, - { - "name": "SPICE_INITIALIZED" - }, - { - "name": "SPICE_CONNECTED" - }, - { - "name": "RDMA_GID_STATUS_CHANGED" - }, - { - "name": "NIC_RX_FILTER_CHANGED" - }, - { - "name": "VSERPORT_CHANGE" - }, - { - "name": "QUORUM_REPORT_BAD" - }, - { - "name": "QUORUM_FAILURE" - }, - { - "name": "PR_MANAGER_STATUS_CHANGED" - }, - { - "name": "DEVICE_TRAY_MOVED" - }, - { - "name": "BLOCK_WRITE_THRESHOLD" - }, - { - "name": "BLOCK_JOB_PENDING" - }, - { - "name": "BLOCK_JOB_READY" - }, - { - "name": "BLOCK_JOB_ERROR" - }, - { - "name": "BLOCK_JOB_CANCELLED" - }, - { - "name": "BLOCK_JOB_COMPLETED" - }, - { - "name": "BLOCK_IO_ERROR" - }, - { - "name": "BLOCK_IMAGE_CORRUPTED" - }, - { - "name": "JOB_STATUS_CHANGE" - }, - { - "name": "GUEST_PANICKED" - }, - { - "name": "WATCHDOG" - }, - { - "name": "WAKEUP" - }, - { - "name": "SUSPEND_DISK" - }, - { - "name": "SUSPEND" - }, - { - "name": "RESUME" - }, - { - "name": "STOP" - }, - { - "name": "RESET" - }, - { - "name": "POWERDOWN" - }, - { - "name": "SHUTDOWN" - } - ], - "id": "libvirt-6" -} - { "execute": "qom-list-types", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -1873,7 +1736,7 @@ "parent": "virtio-device" } ], - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -1881,7 +1744,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -2113,7 +1976,7 @@ "type": "bool" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -2121,7 +1984,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2420,7 +2283,7 @@ "type": "uint16" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2428,7 +2291,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2593,7 +2456,7 @@ "type": "bool" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2601,11 +2464,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-11" + "id": "libvirt-10" } { - "id": "libvirt-11", + "id": "libvirt-10", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -2617,11 +2480,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-12" + "id": "libvirt-11" } { - "id": "libvirt-12", + "id": "libvirt-11", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -2633,11 +2496,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -2649,7 +2512,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -2787,7 +2650,7 @@ "type": "str" } ], - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -2795,7 +2658,7 @@ "arguments": { "typename": "scsi-hd" }, - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -2913,7 +2776,7 @@ "type": "uint64" } ], - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -2921,7 +2784,7 @@ "arguments": { "typename": "ide-hd" }, - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -2997,7 +2860,7 @@ "type": "uint16" } ], - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -3005,11 +2868,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -3021,7 +2884,7 @@ "arguments": { "typename": "usb-redir" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -3070,7 +2933,7 @@ "type": "bool" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -3078,11 +2941,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-19" + "id": "libvirt-18" } { - "id": "libvirt-19", + "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -3094,11 +2957,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-20" + "id": "libvirt-19" } { - "id": "libvirt-20", + "id": "libvirt-19", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -3110,7 +2973,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -3193,7 +3056,7 @@ "type": "uint16" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -3201,11 +3064,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-22" + "id": "libvirt-21" } { - "id": "libvirt-22", + "id": "libvirt-21", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -3217,7 +3080,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3291,7 +3154,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3299,7 +3162,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -3451,7 +3314,7 @@ "type": "bool" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -3459,7 +3322,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -3516,7 +3379,7 @@ "type": "size" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -3524,11 +3387,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-26" + "id": "libvirt-25" } { - "id": "libvirt-26", + "id": "libvirt-25", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -3540,7 +3403,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3683,7 +3546,7 @@ "type": "str" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3691,11 +3554,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-28" + "id": "libvirt-27" } { - "id": "libvirt-28", + "id": "libvirt-27", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -3707,7 +3570,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3751,7 +3614,7 @@ "type": "bool" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3759,7 +3622,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -3839,7 +3702,7 @@ "type": "uint32" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -3847,7 +3710,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3912,7 +3775,7 @@ "type": "bool" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3920,7 +3783,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3984,7 +3847,7 @@ "type": "bool" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3992,11 +3855,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" @@ -4005,7 +3868,7 @@ { "execute": "query-machines", - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -4042,23 +3905,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" } { @@ -4066,12 +3929,12 @@ "passthrough", "emulator" ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-command-line-options", - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -5331,12 +5194,12 @@ "option": "drive" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-migrate-capabilities", - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -5406,12 +5269,12 @@ "capability": "late-block-activate" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-qmp-schema", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -17621,5 +17484,5 @@ "meta-type": "object" } ], - "id": "libvirt-39" + "id": "libvirt-38" } diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies index 414707e42a..beadeb2c02 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies @@ -584,146 +584,9 @@ "id": "libvirt-5" } -{ - "execute": "query-events", - "id": "libvirt-6" -} - -{ - "return": [ - { - "name": "RTC_CHANGE" - }, - { - "name": "ACPI_DEVICE_OST" - }, - { - "name": "MEM_UNPLUG_ERROR" - }, - { - "name": "DUMP_COMPLETED" - }, - { - "name": "DEVICE_DELETED" - }, - { - "name": "BALLOON_CHANGE" - }, - { - "name": "COLO_EXIT" - }, - { - "name": "MIGRATION_PASS" - }, - { - "name": "MIGRATION" - }, - { - "name": "VNC_DISCONNECTED" - }, - { - "name": "VNC_INITIALIZED" - }, - { - "name": "VNC_CONNECTED" - }, - { - "name": "SPICE_MIGRATE_COMPLETED" - }, - { - "name": "SPICE_DISCONNECTED" - }, - { - "name": "SPICE_INITIALIZED" - }, - { - "name": "SPICE_CONNECTED" - }, - { - "name": "RDMA_GID_STATUS_CHANGED" - }, - { - "name": "NIC_RX_FILTER_CHANGED" - }, - { - "name": "VSERPORT_CHANGE" - }, - { - "name": "QUORUM_REPORT_BAD" - }, - { - "name": "QUORUM_FAILURE" - }, - { - "name": "PR_MANAGER_STATUS_CHANGED" - }, - { - "name": "DEVICE_TRAY_MOVED" - }, - { - "name": "BLOCK_WRITE_THRESHOLD" - }, - { - "name": "BLOCK_JOB_PENDING" - }, - { - "name": "BLOCK_JOB_READY" - }, - { - "name": "BLOCK_JOB_ERROR" - }, - { - "name": "BLOCK_JOB_CANCELLED" - }, - { - "name": "BLOCK_JOB_COMPLETED" - }, - { - "name": "BLOCK_IO_ERROR" - }, - { - "name": "BLOCK_IMAGE_CORRUPTED" - }, - { - "name": "JOB_STATUS_CHANGE" - }, - { - "name": "GUEST_PANICKED" - }, - { - "name": "WATCHDOG" - }, - { - "name": "WAKEUP" - }, - { - "name": "SUSPEND_DISK" - }, - { - "name": "SUSPEND" - }, - { - "name": "RESUME" - }, - { - "name": "STOP" - }, - { - "name": "RESET" - }, - { - "name": "POWERDOWN" - }, - { - "name": "SHUTDOWN" - } - ], - "id": "libvirt-6" -} - { "execute": "qom-list-types", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -1873,7 +1736,7 @@ "parent": "virtio-device" } ], - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -1881,7 +1744,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -2113,7 +1976,7 @@ "type": "bool" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -2121,7 +1984,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2420,7 +2283,7 @@ "type": "uint16" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2428,7 +2291,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2593,7 +2456,7 @@ "type": "bool" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2601,11 +2464,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-11" + "id": "libvirt-10" } { - "id": "libvirt-11", + "id": "libvirt-10", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -2617,11 +2480,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-12" + "id": "libvirt-11" } { - "id": "libvirt-12", + "id": "libvirt-11", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -2633,11 +2496,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -2649,7 +2512,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -2787,7 +2650,7 @@ "type": "str" } ], - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -2795,7 +2658,7 @@ "arguments": { "typename": "scsi-hd" }, - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -2913,7 +2776,7 @@ "type": "uint64" } ], - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -2921,7 +2784,7 @@ "arguments": { "typename": "ide-hd" }, - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -2997,7 +2860,7 @@ "type": "uint16" } ], - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -3005,11 +2868,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -3021,7 +2884,7 @@ "arguments": { "typename": "usb-redir" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -3070,7 +2933,7 @@ "type": "bool" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -3078,11 +2941,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-19" + "id": "libvirt-18" } { - "id": "libvirt-19", + "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -3094,11 +2957,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-20" + "id": "libvirt-19" } { - "id": "libvirt-20", + "id": "libvirt-19", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -3110,7 +2973,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -3193,7 +3056,7 @@ "type": "uint16" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -3201,11 +3064,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-22" + "id": "libvirt-21" } { - "id": "libvirt-22", + "id": "libvirt-21", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -3217,7 +3080,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3291,7 +3154,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3299,7 +3162,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -3451,7 +3314,7 @@ "type": "bool" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -3459,7 +3322,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -3516,7 +3379,7 @@ "type": "size" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -3524,11 +3387,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-26" + "id": "libvirt-25" } { - "id": "libvirt-26", + "id": "libvirt-25", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -3540,7 +3403,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3683,7 +3546,7 @@ "type": "str" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3691,11 +3554,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-28" + "id": "libvirt-27" } { - "id": "libvirt-28", + "id": "libvirt-27", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -3707,7 +3570,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3751,7 +3614,7 @@ "type": "bool" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3759,7 +3622,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -3839,7 +3702,7 @@ "type": "uint32" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -3847,7 +3710,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3912,7 +3775,7 @@ "type": "bool" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3920,7 +3783,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3984,7 +3847,7 @@ "type": "bool" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3992,11 +3855,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" @@ -4005,7 +3868,7 @@ { "execute": "query-machines", - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -4042,23 +3905,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" } { @@ -4066,12 +3929,12 @@ "passthrough", "emulator" ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-command-line-options", - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -5331,12 +5194,12 @@ "option": "drive" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-migrate-capabilities", - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -5406,12 +5269,12 @@ "capability": "late-block-activate" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-qmp-schema", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -17621,5 +17484,5 @@ "meta-type": "object" } ], - "id": "libvirt-39" + "id": "libvirt-38" } diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies index aaa4da4d8e..aa9ee38c80 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies @@ -605,146 +605,9 @@ "id": "libvirt-5" } -{ - "execute": "query-events", - "id": "libvirt-6" -} - -{ - "return": [ - { - "name": "RTC_CHANGE" - }, - { - "name": "ACPI_DEVICE_OST" - }, - { - "name": "MEM_UNPLUG_ERROR" - }, - { - "name": "DUMP_COMPLETED" - }, - { - "name": "DEVICE_DELETED" - }, - { - "name": "BALLOON_CHANGE" - }, - { - "name": "COLO_EXIT" - }, - { - "name": "MIGRATION_PASS" - }, - { - "name": "MIGRATION" - }, - { - "name": "VNC_DISCONNECTED" - }, - { - "name": "VNC_INITIALIZED" - }, - { - "name": "VNC_CONNECTED" - }, - { - "name": "SPICE_MIGRATE_COMPLETED" - }, - { - "name": "SPICE_DISCONNECTED" - }, - { - "name": "SPICE_INITIALIZED" - }, - { - "name": "SPICE_CONNECTED" - }, - { - "name": "RDMA_GID_STATUS_CHANGED" - }, - { - "name": "NIC_RX_FILTER_CHANGED" - }, - { - "name": "VSERPORT_CHANGE" - }, - { - "name": "QUORUM_REPORT_BAD" - }, - { - "name": "QUORUM_FAILURE" - }, - { - "name": "PR_MANAGER_STATUS_CHANGED" - }, - { - "name": "DEVICE_TRAY_MOVED" - }, - { - "name": "BLOCK_WRITE_THRESHOLD" - }, - { - "name": "BLOCK_JOB_PENDING" - }, - { - "name": "BLOCK_JOB_READY" - }, - { - "name": "BLOCK_JOB_ERROR" - }, - { - "name": "BLOCK_JOB_CANCELLED" - }, - { - "name": "BLOCK_JOB_COMPLETED" - }, - { - "name": "BLOCK_IO_ERROR" - }, - { - "name": "BLOCK_IMAGE_CORRUPTED" - }, - { - "name": "JOB_STATUS_CHANGE" - }, - { - "name": "GUEST_PANICKED" - }, - { - "name": "WATCHDOG" - }, - { - "name": "WAKEUP" - }, - { - "name": "SUSPEND_DISK" - }, - { - "name": "SUSPEND" - }, - { - "name": "RESUME" - }, - { - "name": "STOP" - }, - { - "name": "RESET" - }, - { - "name": "POWERDOWN" - }, - { - "name": "SHUTDOWN" - } - ], - "id": "libvirt-6" -} - { "execute": "qom-list-types", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -2526,7 +2389,7 @@ "parent": "rng-backend" } ], - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -2534,7 +2397,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -2766,7 +2629,7 @@ "type": "bool" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -2774,7 +2637,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -3073,7 +2936,7 @@ "type": "uint16" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -3081,7 +2944,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -3246,7 +3109,7 @@ "type": "bool" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -3254,11 +3117,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-11" + "id": "libvirt-10" } { - "id": "libvirt-11", + "id": "libvirt-10", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -3270,11 +3133,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-12" + "id": "libvirt-11" } { - "id": "libvirt-12", + "id": "libvirt-11", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -3286,11 +3149,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -3302,7 +3165,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -3440,7 +3303,7 @@ "type": "str" } ], - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -3448,7 +3311,7 @@ "arguments": { "typename": "scsi-hd" }, - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -3586,7 +3449,7 @@ "type": "uint32" } ], - "id": "libvirt-15" + "id": "libvirt-14" } { @@ -3594,7 +3457,7 @@ "arguments": { "typename": "ide-hd" }, - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -3691,7 +3554,7 @@ "type": "uint32" } ], - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -3699,7 +3562,7 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -3762,7 +3625,7 @@ "type": "int32" } ], - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -3770,7 +3633,7 @@ "arguments": { "typename": "usb-redir" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -3819,7 +3682,7 @@ "type": "bool" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -3827,7 +3690,7 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -3869,7 +3732,7 @@ "type": "bool" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -3877,7 +3740,7 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -3959,7 +3822,7 @@ "type": "uint64" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -3967,7 +3830,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -4050,7 +3913,7 @@ "type": "uint16" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -4058,7 +3921,7 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -4072,7 +3935,7 @@ "type": "LostTickPolicy" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -4080,7 +3943,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -4154,7 +4017,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -4162,7 +4025,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -4209,7 +4072,7 @@ "type": "bool" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -4217,7 +4080,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -4316,7 +4179,7 @@ "type": "uint32" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -4324,7 +4187,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -4476,7 +4339,7 @@ "type": "bool" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -4484,7 +4347,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -4541,7 +4404,7 @@ "type": "size" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -4549,7 +4412,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -4645,7 +4508,7 @@ "type": "uint32" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -4653,7 +4516,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -4796,7 +4659,7 @@ "type": "str" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -4804,11 +4667,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" @@ -4820,7 +4683,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -4864,7 +4727,7 @@ "type": "bool" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -4872,7 +4735,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -4952,7 +4815,7 @@ "type": "uint32" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -4960,7 +4823,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -5004,7 +4867,7 @@ "type": "uint8" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -5012,7 +4875,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -5055,7 +4918,7 @@ "type": "int32" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -5063,7 +4926,7 @@ "arguments": { "typename": "nvdimm" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -5097,7 +4960,7 @@ "type": "uint64" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -5105,7 +4968,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -5170,7 +5033,7 @@ "type": "bool" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -5178,7 +5041,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -5242,7 +5105,7 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -5250,11 +5113,11 @@ "arguments": { "typename": "spapr-machine" }, - "id": "libvirt-38" + "id": "libvirt-37" } { - "id": "libvirt-38", + "id": "libvirt-37", "error": { "class": "DeviceNotFound", "desc": "Class 'spapr-machine' not found" @@ -5263,7 +5126,7 @@ { "execute": "query-machines", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -5482,12 +5345,12 @@ "alias": "q35" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-cpu-definitions", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -6011,12 +5874,12 @@ "migration-safe": true } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-tpm-models", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -6024,12 +5887,12 @@ "tpm-crb", "tpm-tis" ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-tpm-types", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -6037,12 +5900,12 @@ "passthrough", "emulator" ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-command-line-options", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -7312,12 +7175,12 @@ "option": "drive" } ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-migrate-capabilities", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -7387,12 +7250,12 @@ "capability": "late-block-activate" } ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-qmp-schema", - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -19766,7 +19629,7 @@ "meta-type": "object" } ], - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -19777,7 +19640,7 @@ "name": "host" } }, - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -19982,7 +19845,7 @@ } } }, - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -20189,7 +20052,7 @@ } } }, - "id": "libvirt-47" + "id": "libvirt-46" } { @@ -20468,7 +20331,7 @@ } } }, - "id": "libvirt-47" + "id": "libvirt-46" } { @@ -20482,7 +20345,7 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-47" } { @@ -20687,7 +20550,7 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-47" } { @@ -20894,7 +20757,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -21173,16 +21036,16 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-48" } { "execute": "query-sev-capabilities", - "id": "libvirt-50" + "id": "libvirt-49" } { - "id": "libvirt-50", + "id": "libvirt-49", "error": { "class": "GenericError", "desc": "SEV feature is not available"