diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index de1668921f..c258053834 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1009,7 +1009,6 @@ struct virQEMUCapsStringFlags virQEMUCapsCommands[] = { { "query-vnc", QEMU_CAPS_VNC }, { "drive-mirror", QEMU_CAPS_DRIVE_MIRROR }, { "blockdev-snapshot-sync", QEMU_CAPS_DISK_SNAPSHOT }, - { "add-fd", QEMU_CAPS_ADD_FD }, { "nbd-server-start", QEMU_CAPS_NBD_SERVER }, { "change-backing-file", QEMU_CAPS_CHANGE_BACKING_FILE }, { "rtc-reset-reinjection", QEMU_CAPS_RTC_RESET_REINJECTION }, @@ -2148,22 +2147,6 @@ virQEMUCapsProbeQMPCommands(virQEMUCapsPtr qemuCaps, ncommands, commands); virStringListFreeCount(commands, ncommands); - /* QMP add-fd was introduced in 1.2, but did not support - * management control of set numbering, and did not have a - * counterpart -add-fd command line option. We require the - * add-fd features from 1.3 or later. */ - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_ADD_FD)) { - int fd = open("/dev/null", O_RDONLY); - if (fd < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("unable to probe for add-fd")); - return -1; - } - if (qemuMonitorAddFd(mon, 0, fd, "/dev/null") < 0) - virQEMUCapsClear(qemuCaps, QEMU_CAPS_ADD_FD); - VIR_FORCE_CLOSE(fd); - } - /* Probe for active commit of qemu 2.1. We don't need to query directly * if we have QMP schema support */ if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_QMP_SCHEMA) && diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index ece5771cc2..fdfbde48fe 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -225,7 +225,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ /* 125 */ QEMU_CAPS_DEVICE_USB_SERIAL, /* -device usb-serial */ QEMU_CAPS_DEVICE_USB_NET, /* -device usb-net */ - QEMU_CAPS_ADD_FD, /* -add-fd */ + X_QEMU_CAPS_ADD_FD, /* -add-fd */ QEMU_CAPS_NBD_SERVER, /* nbd-server-start QMP command */ QEMU_CAPS_DEVICE_VIRTIO_RNG, /* virtio-rng device */ diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 5bbc43be43..fd9e58fd5d 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -9724,7 +9724,9 @@ qemuBuildTPMBackendStr(const virDomainDef *def, const virDomainTPMDef *tpm = def->tpm; virBuffer buf = VIR_BUFFER_INITIALIZER; const char *type = NULL; - char *cancel_path = NULL, *devset = NULL; + char *cancel_path = NULL; + char *devset = NULL; + char *cancelset = NULL; const char *tpmdev; *tpmfd = -1; @@ -9750,28 +9752,24 @@ qemuBuildTPMBackendStr(const virDomainDef *def, if (!(cancel_path = virTPMCreateCancelPath(tpmdev))) goto error; - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_ADD_FD)) { - if (qemuBuildTPMOpenBackendFDs(tpmdev, cancel_path, tpmfd, cancelfd) < 0) - goto error; + if (qemuBuildTPMOpenBackendFDs(tpmdev, cancel_path, tpmfd, cancelfd) < 0) + goto error; - virCommandPassFD(cmd, *tpmfd, VIR_COMMAND_PASS_FD_CLOSE_PARENT); - virCommandPassFD(cmd, *cancelfd, VIR_COMMAND_PASS_FD_CLOSE_PARENT); - devset = qemuVirCommandGetDevSet(cmd, *tpmfd); - if (devset == NULL) - goto error; + virCommandPassFD(cmd, *tpmfd, VIR_COMMAND_PASS_FD_CLOSE_PARENT); + virCommandPassFD(cmd, *cancelfd, VIR_COMMAND_PASS_FD_CLOSE_PARENT); + + if (!(devset = qemuVirCommandGetDevSet(cmd, *tpmfd)) || + !(cancelset = qemuVirCommandGetDevSet(cmd, *cancelfd))) + goto error; - VIR_FREE(cancel_path); - cancel_path = qemuVirCommandGetDevSet(cmd, *cancelfd); - if (cancel_path == NULL) - goto error; - } virBufferAddLit(&buf, ",path="); - virQEMUBuildBufferEscapeComma(&buf, devset ? devset : tpmdev); + virQEMUBuildBufferEscapeComma(&buf, devset); virBufferAddLit(&buf, ",cancel-path="); - virQEMUBuildBufferEscapeComma(&buf, cancel_path); + virQEMUBuildBufferEscapeComma(&buf, cancelset); VIR_FREE(devset); + VIR_FREE(cancelset); VIR_FREE(cancel_path); break; diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies index de7d441deb..600ca5a6f7 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies @@ -331,33 +331,16 @@ "id": "libvirt-4" } -{ - "execute": "add-fd", - "arguments": { - "fdset-id": 0, - "opaque": "/dev/null" - }, - "id": "libvirt-5" -} - -{ - "return": { - "fd": 13, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - { "execute": "block-commit", "arguments": { "device": "bogus" }, - "id": "libvirt-6" + "id": "libvirt-5" } { - "id": "libvirt-6", + "id": "libvirt-5", "error": { "class": "GenericError", "desc": "Parameter 'top' is missing" @@ -366,7 +349,7 @@ { "execute": "query-kvm", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -374,12 +357,12 @@ "enabled": true, "present": true }, - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "query-events", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -463,12 +446,12 @@ "name": "SHUTDOWN" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { "execute": "qom-list-types", - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1044,7 +1027,7 @@ "name": "VGA" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1052,7 +1035,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -1154,7 +1137,7 @@ "type": "hex32" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -1162,7 +1145,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -1308,7 +1291,7 @@ "type": "on/off" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -1316,7 +1299,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -1378,7 +1361,7 @@ "type": "on/off" } ], - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -1386,11 +1369,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -1402,11 +1385,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-14" + "id": "libvirt-13" } { - "id": "libvirt-14", + "id": "libvirt-13", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -1418,11 +1401,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -1434,11 +1417,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -1450,7 +1433,7 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -1496,7 +1479,7 @@ "type": "pci-host-devaddr" } ], - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -1504,7 +1487,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -1546,7 +1529,7 @@ "type": "pci-host-devaddr" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -1554,7 +1537,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -1628,7 +1611,7 @@ "type": "drive" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -1636,7 +1619,7 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -1690,7 +1673,7 @@ "type": "drive" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -1698,7 +1681,7 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -1740,7 +1723,7 @@ "type": "uint32" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -1748,7 +1731,7 @@ "arguments": { "typename": "usb-redir" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -1778,7 +1761,7 @@ "type": "chr" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -1786,7 +1769,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -1840,7 +1823,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -1848,7 +1831,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -1874,7 +1857,7 @@ "type": "drive" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -1882,13 +1865,13 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-25" + "id": "libvirt-24" } { "return": [ ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -1896,7 +1879,7 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -1906,7 +1889,7 @@ "type": "uint64" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -1914,7 +1897,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -1964,7 +1947,7 @@ "type": "drive" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -1972,7 +1955,7 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -1986,7 +1969,7 @@ "type": "hex32" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -1994,7 +1977,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -2028,7 +2011,7 @@ "type": "uint32" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -2036,7 +2019,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -2066,7 +2049,7 @@ "type": "uint32" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -2074,7 +2057,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -2144,7 +2127,7 @@ "type": "uint32" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -2152,11 +2135,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-32" + "id": "libvirt-31" } { - "id": "libvirt-32", + "id": "libvirt-31", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -2168,7 +2151,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -2206,7 +2189,7 @@ "type": "on/off" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -2214,11 +2197,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-34" + "id": "libvirt-33" } { - "id": "libvirt-34", + "id": "libvirt-33", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -2230,13 +2213,13 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-35" + "id": "libvirt-34" } { "return": [ ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -2244,7 +2227,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -2294,7 +2277,7 @@ "type": "on/off" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -2302,7 +2285,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -2328,12 +2311,12 @@ "type": "pci-devfn" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-machines", - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -2406,12 +2389,12 @@ "cpu-max": 1 } ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-cpu-definitions", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -2489,34 +2472,34 @@ "name": "qemu64" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-tpm-models", - "id": "libvirt-40" + "id": "libvirt-39" } { "return": [ ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-tpm-types", - "id": "libvirt-41" + "id": "libvirt-40" } { "return": [ ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-command-line-options", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -3217,12 +3200,12 @@ "option": "drive" } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-migrate-capabilities", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -3232,7 +3215,7 @@ "capability": "xbzrle" } ], - "id": "libvirt-43" + "id": "libvirt-42" } { diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml index a8dd69f4fa..2a98e8a3c6 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml @@ -60,7 +60,6 @@ - @@ -109,7 +108,7 @@ 1005003 0 - 51089 + 50896 x86_64 diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies index 53cd0819dd..e74ae6b958 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies @@ -337,33 +337,16 @@ "id": "libvirt-4" } -{ - "execute": "add-fd", - "arguments": { - "fdset-id": 0, - "opaque": "/dev/null" - }, - "id": "libvirt-5" -} - -{ - "return": { - "fd": 13, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - { "execute": "block-commit", "arguments": { "device": "bogus" }, - "id": "libvirt-6" + "id": "libvirt-5" } { - "id": "libvirt-6", + "id": "libvirt-5", "error": { "class": "GenericError", "desc": "Parameter 'top' is missing" @@ -372,7 +355,7 @@ { "execute": "query-kvm", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -380,12 +363,12 @@ "enabled": true, "present": true }, - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "query-events", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -472,12 +455,12 @@ "name": "SHUTDOWN" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { "execute": "qom-list-types", - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1065,7 +1048,7 @@ "name": "VGA" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1073,7 +1056,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -1175,7 +1158,7 @@ "type": "hex32" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -1183,7 +1166,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -1337,7 +1320,7 @@ "type": "on/off" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -1345,7 +1328,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -1407,7 +1390,7 @@ "type": "on/off" } ], - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -1415,11 +1398,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -1431,11 +1414,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-14" + "id": "libvirt-13" } { - "id": "libvirt-14", + "id": "libvirt-13", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -1447,11 +1430,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -1463,11 +1446,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -1479,7 +1462,7 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -1525,7 +1508,7 @@ "type": "pci-host-devaddr" } ], - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -1533,7 +1516,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -1575,7 +1558,7 @@ "type": "pci-host-devaddr" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -1583,7 +1566,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -1657,7 +1640,7 @@ "type": "drive" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -1665,7 +1648,7 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -1719,7 +1702,7 @@ "type": "drive" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -1727,7 +1710,7 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -1769,7 +1752,7 @@ "type": "uint32" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -1777,7 +1760,7 @@ "arguments": { "typename": "usb-redir" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -1811,7 +1794,7 @@ "type": "chr" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -1819,7 +1802,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -1877,7 +1860,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -1885,7 +1868,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -1911,7 +1894,7 @@ "type": "drive" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -1919,7 +1902,7 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -1929,7 +1912,7 @@ "type": "size" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -1937,7 +1920,7 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -1951,7 +1934,7 @@ "type": "uint64" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -1959,7 +1942,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -2009,7 +1992,7 @@ "type": "drive" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -2017,7 +2000,7 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -2031,7 +2014,7 @@ "type": "hex32" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -2039,7 +2022,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -2073,7 +2056,7 @@ "type": "uint32" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -2081,7 +2064,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -2111,7 +2094,7 @@ "type": "uint32" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -2119,7 +2102,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -2189,7 +2172,7 @@ "type": "uint32" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -2197,11 +2180,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-32" + "id": "libvirt-31" } { - "id": "libvirt-32", + "id": "libvirt-31", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -2213,7 +2196,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -2251,7 +2234,7 @@ "type": "on/off" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -2259,11 +2242,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-34" + "id": "libvirt-33" } { - "id": "libvirt-34", + "id": "libvirt-33", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -2275,13 +2258,13 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-35" + "id": "libvirt-34" } { "return": [ ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -2289,7 +2272,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -2339,7 +2322,7 @@ "type": "on/off" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -2347,7 +2330,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -2373,12 +2356,12 @@ "type": "pci-devfn" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-machines", - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -2459,12 +2442,12 @@ "cpu-max": 1 } ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-cpu-definitions", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -2542,34 +2525,34 @@ "name": "qemu64" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-tpm-models", - "id": "libvirt-40" + "id": "libvirt-39" } { "return": [ ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-tpm-types", - "id": "libvirt-41" + "id": "libvirt-40" } { "return": [ ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-command-line-options", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -3172,12 +3155,12 @@ "option": "drive" } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-migrate-capabilities", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -3199,7 +3182,7 @@ "capability": "zero-blocks" } ], - "id": "libvirt-43" + "id": "libvirt-42" } { diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml index 536e0e19eb..67bb5c5971 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml @@ -61,7 +61,6 @@ - @@ -114,7 +113,7 @@ 1006000 0 - 49318 + 49125 x86_64 diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies index 7985f280b6..a6c8e1e459 100644 --- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies @@ -346,33 +346,16 @@ "id": "libvirt-4" } -{ - "execute": "add-fd", - "arguments": { - "fdset-id": 0, - "opaque": "/dev/null" - }, - "id": "libvirt-5" -} - -{ - "return": { - "fd": 13, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - { "execute": "block-commit", "arguments": { "device": "bogus" }, - "id": "libvirt-6" + "id": "libvirt-5" } { - "id": "libvirt-6", + "id": "libvirt-5", "error": { "class": "GenericError", "desc": "Parameter 'top' is missing" @@ -381,7 +364,7 @@ { "execute": "query-kvm", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -389,12 +372,12 @@ "enabled": true, "present": true }, - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "query-events", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -484,12 +467,12 @@ "name": "SHUTDOWN" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { "execute": "qom-list-types", - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1074,7 +1057,7 @@ "name": "VGA" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1082,7 +1065,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -1184,7 +1167,7 @@ "type": "hex32" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -1192,7 +1175,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -1346,7 +1329,7 @@ "type": "on/off" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -1354,7 +1337,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -1416,7 +1399,7 @@ "type": "on/off" } ], - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -1424,11 +1407,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -1440,11 +1423,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-14" + "id": "libvirt-13" } { - "id": "libvirt-14", + "id": "libvirt-13", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -1456,11 +1439,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -1472,11 +1455,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -1488,7 +1471,7 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -1534,7 +1517,7 @@ "type": "pci-host-devaddr" } ], - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -1542,7 +1525,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -1584,7 +1567,7 @@ "type": "pci-host-devaddr" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -1592,7 +1575,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -1666,7 +1649,7 @@ "type": "drive" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -1674,7 +1657,7 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -1728,7 +1711,7 @@ "type": "drive" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -1736,7 +1719,7 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -1778,7 +1761,7 @@ "type": "uint32" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -1786,7 +1769,7 @@ "arguments": { "typename": "usb-redir" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -1820,7 +1803,7 @@ "type": "chr" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -1828,7 +1811,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -1886,7 +1869,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -1894,7 +1877,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -1920,7 +1903,7 @@ "type": "drive" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -1928,7 +1911,7 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -1942,7 +1925,7 @@ "type": "size" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -1950,7 +1933,7 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -1968,7 +1951,7 @@ "type": "uint64" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -1976,7 +1959,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -2026,7 +2009,7 @@ "type": "drive" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -2034,7 +2017,7 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -2048,7 +2031,7 @@ "type": "hex32" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -2056,7 +2039,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -2090,7 +2073,7 @@ "type": "uint32" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -2098,7 +2081,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -2128,7 +2111,7 @@ "type": "uint32" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -2136,7 +2119,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -2206,7 +2189,7 @@ "type": "uint32" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -2214,11 +2197,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-32" + "id": "libvirt-31" } { - "id": "libvirt-32", + "id": "libvirt-31", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -2230,7 +2213,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -2268,7 +2251,7 @@ "type": "on/off" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -2276,11 +2259,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-34" + "id": "libvirt-33" } { - "id": "libvirt-34", + "id": "libvirt-33", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -2292,13 +2275,13 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-35" + "id": "libvirt-34" } { "return": [ ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -2306,7 +2289,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -2356,7 +2339,7 @@ "type": "on/off" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -2364,7 +2347,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -2390,12 +2373,12 @@ "type": "pci-devfn" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-machines", - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -2484,12 +2467,12 @@ "cpu-max": 1 } ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-cpu-definitions", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -2567,34 +2550,34 @@ "name": "qemu64" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-tpm-models", - "id": "libvirt-40" + "id": "libvirt-39" } { "return": [ ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-tpm-types", - "id": "libvirt-41" + "id": "libvirt-40" } { "return": [ ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-command-line-options", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -3387,12 +3370,12 @@ "option": "drive" } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-migrate-capabilities", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -3414,7 +3397,7 @@ "capability": "zero-blocks" } ], - "id": "libvirt-43" + "id": "libvirt-42" } { diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml index 41f57963fa..2df50c71c7 100644 --- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml @@ -61,7 +61,6 @@ - @@ -116,7 +115,7 @@ 1007000 0 - 54762 + 54569 x86_64 diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies index 646dce8250..88152e56bd 100644 --- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies @@ -379,33 +379,16 @@ "id": "libvirt-4" } -{ - "execute": "add-fd", - "arguments": { - "fdset-id": 0, - "opaque": "/dev/null" - }, - "id": "libvirt-5" -} - -{ - "return": { - "fd": 13, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - { "execute": "block-commit", "arguments": { "device": "bogus" }, - "id": "libvirt-6" + "id": "libvirt-5" } { - "id": "libvirt-6", + "id": "libvirt-5", "error": { "class": "DeviceNotFound", "desc": "Device 'bogus' not found" @@ -414,7 +397,7 @@ { "execute": "query-kvm", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -422,12 +405,12 @@ "enabled": true, "present": true }, - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "query-events", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -529,12 +512,12 @@ "name": "BLOCK_IMAGE_CORRUPTED" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { "execute": "qom-list-types", - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1317,7 +1300,7 @@ "name": "fusbh200-ehci-usb" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1325,7 +1308,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -1435,7 +1418,7 @@ "type": "uint32" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -1443,7 +1426,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -1605,7 +1588,7 @@ "type": "on/off" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -1613,7 +1596,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -1683,7 +1666,7 @@ "type": "on/off" } ], - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -1691,11 +1674,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -1707,11 +1690,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-14" + "id": "libvirt-13" } { - "id": "libvirt-14", + "id": "libvirt-13", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -1723,11 +1706,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -1739,11 +1722,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -1755,7 +1738,7 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -1801,7 +1784,7 @@ "type": "pci-host-devaddr" } ], - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -1809,7 +1792,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -1851,7 +1834,7 @@ "type": "pci-host-devaddr" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -1859,7 +1842,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -1945,7 +1928,7 @@ "type": "drive" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -1953,7 +1936,7 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -2007,7 +1990,7 @@ "type": "drive" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -2015,7 +1998,7 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -2065,7 +2048,7 @@ "type": "uint32" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -2073,7 +2056,7 @@ "arguments": { "typename": "usb-redir" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -2111,7 +2094,7 @@ "type": "chr" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -2119,7 +2102,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -2181,7 +2164,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -2189,7 +2172,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -2215,7 +2198,7 @@ "type": "drive" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -2223,7 +2206,7 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -2261,7 +2244,7 @@ "type": "size" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -2269,7 +2252,7 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -2319,7 +2302,7 @@ "type": "uint64" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -2327,7 +2310,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -2381,7 +2364,7 @@ "type": "drive" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -2389,7 +2372,7 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -2403,7 +2386,7 @@ "type": "uint32" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -2411,7 +2394,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -2445,7 +2428,7 @@ "type": "uint32" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -2453,7 +2436,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -2483,7 +2466,7 @@ "type": "uint32" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -2491,7 +2474,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -2561,7 +2544,7 @@ "type": "uint32" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -2569,7 +2552,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -2623,7 +2606,7 @@ "type": "pci-devfn" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -2631,7 +2614,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -2681,7 +2664,7 @@ "type": "uint32" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -2689,11 +2672,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-34" + "id": "libvirt-33" } { - "id": "libvirt-34", + "id": "libvirt-33", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -2705,13 +2688,13 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-35" + "id": "libvirt-34" } { "return": [ ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -2719,7 +2702,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -2773,7 +2756,7 @@ "type": "on/off" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -2781,7 +2764,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -2807,12 +2790,12 @@ "type": "pci-devfn" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-machines", - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -2917,12 +2900,12 @@ "cpu-max": 255 } ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-cpu-definitions", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -3003,36 +2986,36 @@ "name": "qemu64" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-tpm-models", - "id": "libvirt-40" + "id": "libvirt-39" } { "return": [ "tpm-tis" ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-tpm-types", - "id": "libvirt-41" + "id": "libvirt-40" } { "return": [ "passthrough" ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-command-line-options", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -3892,12 +3875,12 @@ "option": "drive" } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-migrate-capabilities", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -3919,7 +3902,7 @@ "capability": "zero-blocks" } ], - "id": "libvirt-43" + "id": "libvirt-42" } { diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml index 28f2db1fbc..bc1c5d553f 100644 --- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml @@ -61,7 +61,6 @@ - @@ -132,7 +131,7 @@ 2001001 0 - 63558 + 63365 x86_64 diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies index 3751702864..fee785692f 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies @@ -490,26 +490,9 @@ "id": "libvirt-4" } -{ - "execute": "add-fd", - "arguments": { - "fdset-id": 0, - "opaque": "/dev/null" - }, - "id": "libvirt-5" -} - -{ - "return": { - "fd": 17, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - { "execute": "query-kvm", - "id": "libvirt-6" + "id": "libvirt-5" } { @@ -517,12 +500,12 @@ "enabled": true, "present": true }, - "id": "libvirt-6" + "id": "libvirt-5" } { "execute": "query-events", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -639,12 +622,12 @@ "name": "ACPI_DEVICE_OST" } ], - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "qom-list-types", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -3214,7 +3197,7 @@ "parent": "rng-backend" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -3222,7 +3205,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -3450,7 +3433,7 @@ "type": "str" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -3458,7 +3441,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -3745,7 +3728,7 @@ "type": "uint16" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -3753,7 +3736,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -3914,7 +3897,7 @@ "type": "str" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -3922,11 +3905,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-12" + "id": "libvirt-11" } { - "id": "libvirt-12", + "id": "libvirt-11", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -3938,11 +3921,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -3954,11 +3937,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" @@ -3970,11 +3953,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -3986,11 +3969,11 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" @@ -4002,7 +3985,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -4109,7 +4092,7 @@ "type": "bool" } ], - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -4117,7 +4100,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -4231,7 +4214,7 @@ "type": "uint64" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -4239,7 +4222,7 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -4315,7 +4298,7 @@ "type": "uint16" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -4323,11 +4306,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-20" + "id": "libvirt-19" } { - "id": "libvirt-20", + "id": "libvirt-19", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -4339,7 +4322,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -4408,7 +4391,7 @@ "type": "uint32" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -4416,7 +4399,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -4443,7 +4426,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -4451,11 +4434,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-23" + "id": "libvirt-22" } { - "id": "libvirt-23", + "id": "libvirt-22", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -4467,11 +4450,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-24" + "id": "libvirt-23" } { - "id": "libvirt-24", + "id": "libvirt-23", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -4483,7 +4466,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -4556,7 +4539,7 @@ "type": "uint16" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -4564,11 +4547,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-26" + "id": "libvirt-25" } { - "id": "libvirt-26", + "id": "libvirt-25", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -4580,7 +4563,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -4637,7 +4620,7 @@ "type": "int32" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -4645,7 +4628,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -4796,7 +4779,7 @@ "type": "str" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -4804,7 +4787,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -4851,7 +4834,7 @@ "type": "size" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -4859,11 +4842,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-30" + "id": "libvirt-29" } { - "id": "libvirt-30", + "id": "libvirt-29", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -4875,7 +4858,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -5018,7 +5001,7 @@ "type": "str" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -5026,11 +5009,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-32" + "id": "libvirt-31" } { - "id": "libvirt-32", + "id": "libvirt-31", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -5042,7 +5025,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -5086,7 +5069,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -5094,7 +5077,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -5174,12 +5157,12 @@ "type": "uint32" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { "execute": "query-machines", - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -5446,12 +5429,12 @@ "cpu-max": 1 } ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-cpu-definitions", - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -5617,34 +5600,34 @@ "static": false } ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-tpm-models", - "id": "libvirt-37" + "id": "libvirt-36" } { "return": [ ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-tpm-types", - "id": "libvirt-38" + "id": "libvirt-37" } { "return": [ ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-command-line-options", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -6789,12 +6772,12 @@ "option": "drive" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-migrate-capabilities", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -6844,12 +6827,12 @@ "capability": "return-path" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-qmp-schema", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -16572,12 +16555,12 @@ "meta-type": "object" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-gic-capabilities", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -16593,7 +16576,7 @@ "kernel": true } ], - "id": "libvirt-42" + "id": "libvirt-41" } { diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml index 97318fa72f..cb2740ad14 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml @@ -46,7 +46,6 @@ - @@ -161,7 +160,7 @@ 2010000 0 - 307434 + 307241 (v2.10.0) aarch64 diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies index 232896ed8a..e3047f133e 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies @@ -487,26 +487,9 @@ "id": "libvirt-4" } -{ - "execute": "add-fd", - "arguments": { - "fdset-id": 0, - "opaque": "/dev/null" - }, - "id": "libvirt-5" -} - -{ - "return": { - "fd": 16, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - { "execute": "query-kvm", - "id": "libvirt-6" + "id": "libvirt-5" } { @@ -514,12 +497,12 @@ "enabled": true, "present": true }, - "id": "libvirt-6" + "id": "libvirt-5" } { "execute": "query-events", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -636,12 +619,12 @@ "name": "ACPI_DEVICE_OST" } ], - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "qom-list-types", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -3315,7 +3298,7 @@ "parent": "7455-family-powerpc64-cpu" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -3323,7 +3306,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -3551,7 +3534,7 @@ "type": "str" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -3559,7 +3542,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -3846,7 +3829,7 @@ "type": "uint16" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -3854,7 +3837,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -4015,7 +3998,7 @@ "type": "str" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -4023,11 +4006,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-12" + "id": "libvirt-11" } { - "id": "libvirt-12", + "id": "libvirt-11", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -4039,11 +4022,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -4055,11 +4038,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" @@ -4071,11 +4054,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -4087,11 +4070,11 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" @@ -4103,7 +4086,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -4210,7 +4193,7 @@ "type": "bool" } ], - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -4218,7 +4201,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -4332,7 +4315,7 @@ "type": "uint64" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -4340,7 +4323,7 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -4416,7 +4399,7 @@ "type": "uint16" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -4424,11 +4407,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-20" + "id": "libvirt-19" } { - "id": "libvirt-20", + "id": "libvirt-19", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -4440,7 +4423,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -4509,7 +4492,7 @@ "type": "uint32" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -4517,7 +4500,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -4544,7 +4527,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -4552,11 +4535,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-23" + "id": "libvirt-22" } { - "id": "libvirt-23", + "id": "libvirt-22", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -4568,11 +4551,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-24" + "id": "libvirt-23" } { - "id": "libvirt-24", + "id": "libvirt-23", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -4584,7 +4567,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -4657,7 +4640,7 @@ "type": "uint16" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -4665,11 +4648,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-26" + "id": "libvirt-25" } { - "id": "libvirt-26", + "id": "libvirt-25", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -4681,7 +4664,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -4738,7 +4721,7 @@ "type": "int32" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -4746,7 +4729,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -4897,7 +4880,7 @@ "type": "str" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -4905,7 +4888,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -4952,7 +4935,7 @@ "type": "size" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -4960,11 +4943,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-30" + "id": "libvirt-29" } { - "id": "libvirt-30", + "id": "libvirt-29", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -4976,7 +4959,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -5119,7 +5102,7 @@ "type": "str" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -5127,11 +5110,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-32" + "id": "libvirt-31" } { - "id": "libvirt-32", + "id": "libvirt-31", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -5143,7 +5126,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -5187,7 +5170,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -5195,7 +5178,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -5275,7 +5258,7 @@ "type": "uint32" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -5283,7 +5266,7 @@ "arguments": { "typename": "spapr-pci-host-bridge" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -5369,12 +5352,12 @@ "type": "uint32" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-machines", - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -5492,12 +5475,12 @@ "cpu-max": 1 } ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-cpu-definitions", - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -7673,34 +7656,34 @@ "static": false } ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-tpm-models", - "id": "libvirt-38" + "id": "libvirt-37" } { "return": [ ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-tpm-types", - "id": "libvirt-39" + "id": "libvirt-38" } { "return": [ ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-command-line-options", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -8840,12 +8823,12 @@ "option": "drive" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-migrate-capabilities", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -8895,12 +8878,12 @@ "capability": "return-path" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-qmp-schema", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -18623,7 +18606,7 @@ "meta-type": "object" } ], - "id": "libvirt-42" + "id": "libvirt-41" } { diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml index 35b79569dc..91583a5659 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml @@ -45,7 +45,6 @@ - @@ -160,7 +159,7 @@ 2010000 0 - 386779 + 386586 (v2.10.0) ppc64 diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies index 3d1d2a3133..f30a3eaa2b 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies @@ -499,26 +499,9 @@ "id": "libvirt-4" } -{ - "execute": "add-fd", - "arguments": { - "fdset-id": 0, - "opaque": "/dev/null" - }, - "id": "libvirt-5" -} - -{ - "return": { - "fd": 15, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - { "execute": "query-kvm", - "id": "libvirt-6" + "id": "libvirt-5" } { @@ -526,12 +509,12 @@ "enabled": true, "present": true }, - "id": "libvirt-6" + "id": "libvirt-5" } { "execute": "query-events", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -648,12 +631,12 @@ "name": "ACPI_DEVICE_OST" } ], - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "qom-list-types", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -1555,7 +1538,7 @@ "parent": "virtio-device" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -1563,7 +1546,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1791,7 +1774,7 @@ "type": "str" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1799,7 +1782,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2086,7 +2069,7 @@ "type": "uint16" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2094,7 +2077,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2255,7 +2238,7 @@ "type": "str" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2263,7 +2246,7 @@ "arguments": { "typename": "virtio-blk-ccw" }, - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -2401,7 +2384,7 @@ "type": "uint32" } ], - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -2409,7 +2392,7 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { @@ -2610,7 +2593,7 @@ "type": "uint16" } ], - "id": "libvirt-13" + "id": "libvirt-12" } { @@ -2618,7 +2601,7 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -2693,7 +2676,7 @@ "type": "uint32" } ], - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -2701,11 +2684,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -2717,11 +2700,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -2733,11 +2716,11 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" @@ -2749,7 +2732,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -2856,7 +2839,7 @@ "type": "bool" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -2864,7 +2847,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2978,7 +2961,7 @@ "type": "uint64" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2986,11 +2969,11 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-20" + "id": "libvirt-19" } { - "id": "libvirt-20", + "id": "libvirt-19", "error": { "class": "DeviceNotFound", "desc": "Device 'ide-drive' not found" @@ -3002,11 +2985,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-21" + "id": "libvirt-20" } { - "id": "libvirt-21", + "id": "libvirt-20", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -3018,11 +3001,11 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-22" + "id": "libvirt-21" } { - "id": "libvirt-22", + "id": "libvirt-21", "error": { "class": "DeviceNotFound", "desc": "Device 'usb-host' not found" @@ -3034,7 +3017,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3061,7 +3044,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3069,11 +3052,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-24" + "id": "libvirt-23" } { - "id": "libvirt-24", + "id": "libvirt-23", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -3085,11 +3068,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-25" + "id": "libvirt-24" } { - "id": "libvirt-25", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -3101,11 +3084,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-26" + "id": "libvirt-25" } { - "id": "libvirt-26", + "id": "libvirt-25", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -3117,7 +3100,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3268,7 +3251,7 @@ "type": "str" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3276,7 +3259,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3323,7 +3306,7 @@ "type": "size" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3331,11 +3314,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-29" + "id": "libvirt-28" } { - "id": "libvirt-29", + "id": "libvirt-28", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -3347,7 +3330,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -3490,7 +3473,7 @@ "type": "str" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -3498,7 +3481,7 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3560,7 +3543,7 @@ "type": "uint32" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3568,7 +3551,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3612,7 +3595,7 @@ "type": "bool" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3620,7 +3603,7 @@ "arguments": { "typename": "virtual-css-bridge" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3630,12 +3613,12 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { "execute": "query-machines", - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -3683,12 +3666,12 @@ "cpu-max": 248 } ], - "id": "libvirt-34" + "id": "libvirt-33" } { "execute": "query-cpu-definitions", - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -4222,34 +4205,34 @@ "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": [ ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-command-line-options", - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -5354,12 +5337,12 @@ "option": "drive" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-migrate-capabilities", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -5409,12 +5392,12 @@ "capability": "return-path" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-qmp-schema", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -15137,7 +15120,7 @@ "meta-type": "object" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -15148,7 +15131,7 @@ "name": "host" } }, - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -15188,7 +15171,7 @@ } } }, - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -15202,11 +15185,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_2.10.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml index a763a9e9be..aa61a331b8 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml @@ -28,7 +28,6 @@ - @@ -121,7 +120,7 @@ 2010000 0 - 307686 + 307493 s390x diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies index 79958080e3..b3937c1d9c 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies @@ -496,26 +496,9 @@ "id": "libvirt-4" } -{ - "execute": "add-fd", - "arguments": { - "fdset-id": 0, - "opaque": "/dev/null" - }, - "id": "libvirt-5" -} - -{ - "return": { - "fd": 15, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - { "execute": "query-kvm", - "id": "libvirt-6" + "id": "libvirt-5" } { @@ -523,12 +506,12 @@ "enabled": true, "present": true }, - "id": "libvirt-6" + "id": "libvirt-5" } { "execute": "query-events", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -645,12 +628,12 @@ "name": "ACPI_DEVICE_OST" } ], - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "qom-list-types", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -2192,7 +2175,7 @@ "parent": "virtio-input-hid-pci" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -2200,7 +2183,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2428,7 +2411,7 @@ "type": "str" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2436,7 +2419,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2723,7 +2706,7 @@ "type": "uint16" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2731,7 +2714,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2892,7 +2875,7 @@ "type": "str" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2900,11 +2883,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-12" + "id": "libvirt-11" } { - "id": "libvirt-12", + "id": "libvirt-11", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -2916,11 +2899,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -2932,11 +2915,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" @@ -2948,11 +2931,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -2964,7 +2947,7 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -3026,7 +3009,7 @@ "type": "bool" } ], - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -3034,7 +3017,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -3141,7 +3124,7 @@ "type": "bool" } ], - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -3149,7 +3132,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -3263,7 +3246,7 @@ "type": "uint64" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -3271,7 +3254,7 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -3347,7 +3330,7 @@ "type": "uint16" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -3355,7 +3338,7 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -3418,7 +3401,7 @@ "type": "int32" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -3426,7 +3409,7 @@ "arguments": { "typename": "usb-redir" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -3475,7 +3458,7 @@ "type": "bool" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -3483,7 +3466,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -3552,7 +3535,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -3560,7 +3543,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3587,7 +3570,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3595,7 +3578,7 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -3633,7 +3616,7 @@ "type": "child" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -3641,7 +3624,7 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -3719,7 +3702,7 @@ "type": "uint64" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -3727,7 +3710,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -3800,7 +3783,7 @@ "type": "uint16" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -3808,7 +3791,7 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3822,7 +3805,7 @@ "type": "LostTickPolicy" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3830,7 +3813,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3887,7 +3870,7 @@ "type": "int32" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3895,7 +3878,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3938,7 +3921,7 @@ "type": "int32" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3946,7 +3929,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -4041,7 +4024,7 @@ "type": "uint32" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -4049,7 +4032,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -4210,7 +4193,7 @@ "type": "str" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -4218,7 +4201,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -4275,7 +4258,7 @@ "type": "size" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -4283,7 +4266,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -4379,7 +4362,7 @@ "type": "uint32" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -4387,7 +4370,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -4530,7 +4513,7 @@ "type": "str" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -4538,11 +4521,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-35" + "id": "libvirt-34" } { - "id": "libvirt-35", + "id": "libvirt-34", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -4554,7 +4537,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -4598,7 +4581,7 @@ "type": "bool" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -4606,7 +4589,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -4686,7 +4669,7 @@ "type": "uint32" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -4694,7 +4677,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -4729,7 +4712,7 @@ "type": "bool" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -4737,7 +4720,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -4763,12 +4746,12 @@ "type": "pci-devfn" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-machines", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -4957,12 +4940,12 @@ "alias": "q35" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-cpu-definitions", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -5297,36 +5280,36 @@ "migration-safe": true } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-tpm-models", - "id": "libvirt-42" + "id": "libvirt-41" } { "return": [ "tpm-tis" ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-tpm-types", - "id": "libvirt-43" + "id": "libvirt-42" } { "return": [ "passthrough" ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-command-line-options", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -6605,12 +6588,12 @@ "option": "drive" } ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-migrate-capabilities", - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -6660,12 +6643,12 @@ "capability": "return-path" } ], - "id": "libvirt-45" + "id": "libvirt-44" } { "execute": "query-qmp-schema", - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -16388,7 +16371,7 @@ "meta-type": "object" } ], - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -16399,7 +16382,7 @@ "name": "host" } }, - "id": "libvirt-47" + "id": "libvirt-46" } { @@ -16578,7 +16561,7 @@ } } }, - "id": "libvirt-47" + "id": "libvirt-46" } { @@ -16759,7 +16742,7 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-47" } { @@ -17002,7 +16985,7 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-47" } { @@ -17016,7 +16999,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -17195,7 +17178,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -17376,7 +17359,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -17619,7 +17602,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml index 8ca64d6178..647c0ce4ba 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml @@ -61,7 +61,6 @@ - @@ -205,7 +204,7 @@ 2010000 0 - 367782 + 367589 (v2.10.0) x86_64 diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies index a9f08ea573..d47a19130c 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies @@ -508,26 +508,9 @@ "id": "libvirt-4" } -{ - "execute": "add-fd", - "arguments": { - "fdset-id": 0, - "opaque": "/dev/null" - }, - "id": "libvirt-5" -} - -{ - "return": { - "fd": 15, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - { "execute": "query-kvm", - "id": "libvirt-6" + "id": "libvirt-5" } { @@ -535,12 +518,12 @@ "enabled": true, "present": true }, - "id": "libvirt-6" + "id": "libvirt-5" } { "execute": "query-events", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -657,12 +640,12 @@ "name": "ACPI_DEVICE_OST" } ], - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "qom-list-types", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -1596,7 +1579,7 @@ "parent": "virtio-device" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -1604,7 +1587,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1832,7 +1815,7 @@ "type": "str" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1840,7 +1823,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2127,7 +2110,7 @@ "type": "uint16" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2135,7 +2118,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2300,7 +2283,7 @@ "type": "str" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2308,7 +2291,7 @@ "arguments": { "typename": "virtio-blk-ccw" }, - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -2446,7 +2429,7 @@ "type": "uint32" } ], - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -2454,7 +2437,7 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { @@ -2655,7 +2638,7 @@ "type": "uint16" } ], - "id": "libvirt-13" + "id": "libvirt-12" } { @@ -2663,7 +2646,7 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -2742,7 +2725,7 @@ "type": "uint32" } ], - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -2750,11 +2733,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -2766,11 +2749,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -2782,11 +2765,11 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" @@ -2798,7 +2781,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -2910,7 +2893,7 @@ "type": "bool" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -2918,7 +2901,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -3032,7 +3015,7 @@ "type": "uint64" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -3040,11 +3023,11 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-20" + "id": "libvirt-19" } { - "id": "libvirt-20", + "id": "libvirt-19", "error": { "class": "DeviceNotFound", "desc": "Device 'ide-drive' not found" @@ -3056,11 +3039,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-21" + "id": "libvirt-20" } { - "id": "libvirt-21", + "id": "libvirt-20", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -3072,11 +3055,11 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-22" + "id": "libvirt-21" } { - "id": "libvirt-22", + "id": "libvirt-21", "error": { "class": "DeviceNotFound", "desc": "Device 'usb-host' not found" @@ -3088,7 +3071,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3115,7 +3098,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3123,11 +3106,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-24" + "id": "libvirt-23" } { - "id": "libvirt-24", + "id": "libvirt-23", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -3139,11 +3122,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-25" + "id": "libvirt-24" } { - "id": "libvirt-25", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -3155,11 +3138,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-26" + "id": "libvirt-25" } { - "id": "libvirt-26", + "id": "libvirt-25", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -3171,7 +3154,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3322,7 +3305,7 @@ "type": "str" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3330,7 +3313,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3377,7 +3360,7 @@ "type": "size" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3385,11 +3368,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-29" + "id": "libvirt-28" } { - "id": "libvirt-29", + "id": "libvirt-28", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -3401,7 +3384,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -3544,7 +3527,7 @@ "type": "str" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -3552,7 +3535,7 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3614,7 +3597,7 @@ "type": "uint32" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3622,7 +3605,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3666,7 +3649,7 @@ "type": "bool" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3674,7 +3657,7 @@ "arguments": { "typename": "virtio-gpu-ccw" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3739,7 +3722,7 @@ "type": "uint32" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3747,7 +3730,7 @@ "arguments": { "typename": "virtual-css-bridge" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -3757,12 +3740,12 @@ "type": "bool" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { "execute": "query-machines", - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -3815,12 +3798,12 @@ "cpu-max": 248 } ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-cpu-definitions", - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -4354,35 +4337,35 @@ "migration-safe": true } ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-tpm-models", - "id": "libvirt-37" + "id": "libvirt-36" } { "return": [ ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-tpm-types", - "id": "libvirt-38" + "id": "libvirt-37" } { "return": [ "emulator" ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-command-line-options", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -5503,12 +5486,12 @@ "option": "drive" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-migrate-capabilities", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -5566,12 +5549,12 @@ "capability": "x-multifd" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-qmp-schema", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -15439,7 +15422,7 @@ "meta-type": "object" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -15450,7 +15433,7 @@ "name": "host" } }, - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -15489,7 +15472,7 @@ } } }, - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -15503,11 +15486,11 @@ } } }, - "id": "libvirt-43" + "id": "libvirt-42" } { - "id": "libvirt-43", + "id": "libvirt-42", "error": { "class": "GenericError", "desc": "Property '.migratable' not found" diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml index 79656e6b95..2bb4a767e4 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml @@ -28,7 +28,6 @@ - @@ -128,7 +127,7 @@ 2011000 0 - 346538 + 346345 s390x diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies index c21d681d24..a067b70377 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies @@ -505,26 +505,9 @@ "id": "libvirt-4" } -{ - "execute": "add-fd", - "arguments": { - "fdset-id": 0, - "opaque": "/dev/null" - }, - "id": "libvirt-5" -} - -{ - "return": { - "fd": 15, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - { "execute": "query-kvm", - "id": "libvirt-6" + "id": "libvirt-5" } { @@ -532,12 +515,12 @@ "enabled": true, "present": true }, - "id": "libvirt-6" + "id": "libvirt-5" } { "execute": "query-events", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -654,12 +637,12 @@ "name": "ACPI_DEVICE_OST" } ], - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "qom-list-types", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -2185,7 +2168,7 @@ "parent": "virtio-input-hid-pci" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -2193,7 +2176,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2421,7 +2404,7 @@ "type": "str" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2429,7 +2412,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2716,7 +2699,7 @@ "type": "uint16" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2724,7 +2707,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2889,7 +2872,7 @@ "type": "str" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2897,11 +2880,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-12" + "id": "libvirt-11" } { - "id": "libvirt-12", + "id": "libvirt-11", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -2913,11 +2896,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -2929,11 +2912,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" @@ -2945,11 +2928,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -2961,11 +2944,11 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" @@ -2977,7 +2960,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -3089,7 +3072,7 @@ "type": "bool" } ], - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -3097,7 +3080,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -3211,7 +3194,7 @@ "type": "uint64" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -3219,7 +3202,7 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -3295,7 +3278,7 @@ "type": "uint16" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -3303,7 +3286,7 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -3366,7 +3349,7 @@ "type": "int32" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -3374,7 +3357,7 @@ "arguments": { "typename": "usb-redir" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -3423,7 +3406,7 @@ "type": "bool" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -3431,7 +3414,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -3500,7 +3483,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -3508,7 +3491,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3535,7 +3518,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3543,7 +3526,7 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -3585,7 +3568,7 @@ "type": "bool" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -3593,7 +3576,7 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -3675,7 +3658,7 @@ "type": "uint64" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -3683,7 +3666,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -3756,7 +3739,7 @@ "type": "uint16" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -3764,7 +3747,7 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3778,7 +3761,7 @@ "type": "LostTickPolicy" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3786,7 +3769,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3843,7 +3826,7 @@ "type": "int32" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3851,7 +3834,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3894,7 +3877,7 @@ "type": "int32" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3902,7 +3885,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -3997,7 +3980,7 @@ "type": "uint32" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -4005,7 +3988,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -4166,7 +4149,7 @@ "type": "str" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -4174,7 +4157,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -4231,7 +4214,7 @@ "type": "size" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -4239,7 +4222,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -4335,7 +4318,7 @@ "type": "uint32" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -4343,7 +4326,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -4486,7 +4469,7 @@ "type": "str" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -4494,11 +4477,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-35" + "id": "libvirt-34" } { - "id": "libvirt-35", + "id": "libvirt-34", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -4510,7 +4493,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -4554,7 +4537,7 @@ "type": "bool" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -4562,7 +4545,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -4642,7 +4625,7 @@ "type": "uint32" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -4650,7 +4633,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -4685,7 +4668,7 @@ "type": "bool" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -4693,7 +4676,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -4736,12 +4719,12 @@ "type": "int32" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-machines", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -4930,12 +4913,12 @@ "cpu-max": 288 } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-cpu-definitions", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -5249,24 +5232,24 @@ "migration-safe": true } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-tpm-models", - "id": "libvirt-42" + "id": "libvirt-41" } { "return": [ "tpm-tis" ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-tpm-types", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -5274,12 +5257,12 @@ "passthrough", "emulator" ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-command-line-options", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -6574,12 +6557,12 @@ "option": "drive" } ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-migrate-capabilities", - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -6637,12 +6620,12 @@ "capability": "x-multifd" } ], - "id": "libvirt-45" + "id": "libvirt-44" } { "execute": "query-qmp-schema", - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -16510,7 +16493,7 @@ "meta-type": "object" } ], - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -16521,7 +16504,7 @@ "name": "host" } }, - "id": "libvirt-47" + "id": "libvirt-46" } { @@ -16701,7 +16684,7 @@ } } }, - "id": "libvirt-47" + "id": "libvirt-46" } { @@ -16883,7 +16866,7 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-47" } { @@ -17128,7 +17111,7 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-47" } { @@ -17142,7 +17125,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -17322,7 +17305,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -17504,7 +17487,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -17749,7 +17732,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml index 69f3f2c82f..f07ea7e796 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml @@ -59,7 +59,6 @@ - @@ -209,7 +208,7 @@ 2011000 0 - 371242 + 371049 (v2.11.0) x86_64 diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies index 85e52dc1d3..db5b5140d5 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies @@ -523,26 +523,9 @@ "id": "libvirt-4" } -{ - "execute": "add-fd", - "arguments": { - "fdset-id": 0, - "opaque": "/dev/null" - }, - "id": "libvirt-5" -} - -{ - "return": { - "fd": 20, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - { "execute": "query-kvm", - "id": "libvirt-6" + "id": "libvirt-5" } { @@ -550,12 +533,12 @@ "enabled": true, "present": true }, - "id": "libvirt-6" + "id": "libvirt-5" } { "execute": "query-events", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -678,12 +661,12 @@ "name": "SHUTDOWN" } ], - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "qom-list-types", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -3501,7 +3484,7 @@ "parent": "rng-backend" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -3509,7 +3492,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -3741,7 +3724,7 @@ "type": "str" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -3749,7 +3732,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -4044,7 +4027,7 @@ "type": "uint16" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -4052,7 +4035,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -4217,7 +4200,7 @@ "type": "str" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -4225,11 +4208,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-12" + "id": "libvirt-11" } { - "id": "libvirt-12", + "id": "libvirt-11", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -4241,11 +4224,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -4257,11 +4240,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" @@ -4273,11 +4256,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -4289,11 +4272,11 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" @@ -4305,7 +4288,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -4431,7 +4414,7 @@ "type": "str" } ], - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -4439,7 +4422,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -4553,7 +4536,7 @@ "type": "uint64" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -4561,7 +4544,7 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -4637,7 +4620,7 @@ "type": "uint16" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -4645,11 +4628,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-20" + "id": "libvirt-19" } { - "id": "libvirt-20", + "id": "libvirt-19", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -4661,7 +4644,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -4730,7 +4713,7 @@ "type": "uint32" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -4738,7 +4721,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -4769,7 +4752,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -4777,11 +4760,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-23" + "id": "libvirt-22" } { - "id": "libvirt-23", + "id": "libvirt-22", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -4793,11 +4776,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-24" + "id": "libvirt-23" } { - "id": "libvirt-24", + "id": "libvirt-23", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -4809,7 +4792,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -4882,7 +4865,7 @@ "type": "uint16" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -4890,11 +4873,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-26" + "id": "libvirt-25" } { - "id": "libvirt-26", + "id": "libvirt-25", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -4906,7 +4889,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -4963,7 +4946,7 @@ "type": "int32" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -4971,7 +4954,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -5122,7 +5105,7 @@ "type": "str" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -5130,7 +5113,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -5177,7 +5160,7 @@ "type": "size" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -5185,11 +5168,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-30" + "id": "libvirt-29" } { - "id": "libvirt-30", + "id": "libvirt-29", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -5201,7 +5184,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -5344,7 +5327,7 @@ "type": "str" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -5352,11 +5335,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-32" + "id": "libvirt-31" } { - "id": "libvirt-32", + "id": "libvirt-31", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -5368,7 +5351,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -5412,7 +5395,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -5420,7 +5403,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -5500,7 +5483,7 @@ "type": "uint32" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -5508,7 +5491,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -5562,7 +5545,7 @@ "type": "string" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -5570,11 +5553,11 @@ "arguments": { "typename": "spapr-machine" }, - "id": "libvirt-36" + "id": "libvirt-35" } { - "id": "libvirt-36", + "id": "libvirt-35", "error": { "class": "DeviceNotFound", "desc": "Class 'spapr-machine' not found" @@ -5583,7 +5566,7 @@ { "execute": "query-machines", - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -5880,12 +5863,12 @@ "cpu-max": 1 } ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-cpu-definitions", - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -6061,35 +6044,35 @@ "static": false } ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-tpm-models", - "id": "libvirt-39" + "id": "libvirt-38" } { "return": [ ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-tpm-types", - "id": "libvirt-40" + "id": "libvirt-39" } { "return": [ "emulator" ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-command-line-options", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -7250,12 +7233,12 @@ "option": "drive" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-migrate-capabilities", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -7317,12 +7300,12 @@ "capability": "dirty-bitmaps" } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-qmp-schema", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -18690,12 +18673,12 @@ "meta-type": "object" } ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-gic-capabilities", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -18711,7 +18694,7 @@ "kernel": false } ], - "id": "libvirt-44" + "id": "libvirt-43" } { diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml index 926db70f80..3c1a704100 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml @@ -46,7 +46,6 @@ - @@ -172,7 +171,7 @@ 2011090 0 - 347337 + 347144 v2.12.0-rc0 aarch64 diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies index e544ae3089..786cb1844a 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies @@ -520,26 +520,9 @@ "id": "libvirt-4" } -{ - "execute": "add-fd", - "arguments": { - "fdset-id": 0, - "opaque": "/dev/null" - }, - "id": "libvirt-5" -} - -{ - "return": { - "fd": 19, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - { "execute": "query-kvm", - "id": "libvirt-6" + "id": "libvirt-5" } { @@ -547,12 +530,12 @@ "enabled": true, "present": true }, - "id": "libvirt-6" + "id": "libvirt-5" } { "execute": "query-events", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -675,12 +658,12 @@ "name": "SHUTDOWN" } ], - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "qom-list-types", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -3490,7 +3473,7 @@ "parent": "e500v2-family-powerpc64-cpu" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -3498,7 +3481,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -3730,7 +3713,7 @@ "type": "str" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -3738,7 +3721,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -4033,7 +4016,7 @@ "type": "uint16" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -4041,7 +4024,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -4206,7 +4189,7 @@ "type": "str" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -4214,11 +4197,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-12" + "id": "libvirt-11" } { - "id": "libvirt-12", + "id": "libvirt-11", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -4230,11 +4213,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -4246,11 +4229,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" @@ -4262,11 +4245,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -4278,11 +4261,11 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" @@ -4294,7 +4277,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -4420,7 +4403,7 @@ "type": "str" } ], - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -4428,7 +4411,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -4542,7 +4525,7 @@ "type": "uint64" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -4550,7 +4533,7 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -4626,7 +4609,7 @@ "type": "uint16" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -4634,11 +4617,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-20" + "id": "libvirt-19" } { - "id": "libvirt-20", + "id": "libvirt-19", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -4650,7 +4633,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -4719,7 +4702,7 @@ "type": "uint32" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -4727,7 +4710,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -4758,7 +4741,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -4766,11 +4749,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-23" + "id": "libvirt-22" } { - "id": "libvirt-23", + "id": "libvirt-22", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -4782,11 +4765,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-24" + "id": "libvirt-23" } { - "id": "libvirt-24", + "id": "libvirt-23", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -4798,7 +4781,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -4871,7 +4854,7 @@ "type": "uint16" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -4879,11 +4862,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-26" + "id": "libvirt-25" } { - "id": "libvirt-26", + "id": "libvirt-25", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -4895,7 +4878,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -4952,7 +4935,7 @@ "type": "int32" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -4960,7 +4943,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -5111,7 +5094,7 @@ "type": "str" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -5119,7 +5102,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -5166,7 +5149,7 @@ "type": "size" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -5174,11 +5157,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-30" + "id": "libvirt-29" } { - "id": "libvirt-30", + "id": "libvirt-29", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -5190,7 +5173,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -5333,7 +5316,7 @@ "type": "str" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -5341,11 +5324,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-32" + "id": "libvirt-31" } { - "id": "libvirt-32", + "id": "libvirt-31", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -5357,7 +5340,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -5401,7 +5384,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -5409,7 +5392,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -5489,7 +5472,7 @@ "type": "uint32" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -5497,7 +5480,7 @@ "arguments": { "typename": "spapr-pci-host-bridge" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -5555,7 +5538,7 @@ "type": "uint32" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -5563,7 +5546,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -5617,7 +5600,7 @@ "type": "string" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -5625,7 +5608,7 @@ "arguments": { "typename": "spapr-machine" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -5786,12 +5769,12 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-machines", - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -5929,12 +5912,12 @@ "cpu-max": 1 } ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-cpu-definitions", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -8130,35 +8113,35 @@ "static": false } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-tpm-models", - "id": "libvirt-40" + "id": "libvirt-39" } { "return": [ ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-tpm-types", - "id": "libvirt-41" + "id": "libvirt-40" } { "return": [ "emulator" ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-command-line-options", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -9314,12 +9297,12 @@ "option": "drive" } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-migrate-capabilities", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -9381,12 +9364,12 @@ "capability": "dirty-bitmaps" } ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-qmp-schema", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -20754,7 +20737,7 @@ "meta-type": "object" } ], - "id": "libvirt-44" + "id": "libvirt-43" } { diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml index 66a77638a5..3f4ef8fc41 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml @@ -45,7 +45,6 @@ - @@ -170,7 +169,7 @@ 2011090 0 - 428121 + 427928 v2.12.0-rc0 ppc64 diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies index 70456d725c..25a005c5cd 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies @@ -532,26 +532,9 @@ "id": "libvirt-4" } -{ - "execute": "add-fd", - "arguments": { - "fdset-id": 0, - "opaque": "/dev/null" - }, - "id": "libvirt-5" -} - -{ - "return": { - "fd": 18, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - { "execute": "query-kvm", - "id": "libvirt-6" + "id": "libvirt-5" } { @@ -559,12 +542,12 @@ "enabled": true, "present": true }, - "id": "libvirt-6" + "id": "libvirt-5" } { "execute": "query-events", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -687,12 +670,12 @@ "name": "SHUTDOWN" } ], - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "qom-list-types", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -1642,7 +1625,7 @@ "parent": "virtio-device" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -1650,7 +1633,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1882,7 +1865,7 @@ "type": "str" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1890,7 +1873,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2185,7 +2168,7 @@ "type": "uint16" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2193,7 +2176,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2358,7 +2341,7 @@ "type": "str" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2366,7 +2349,7 @@ "arguments": { "typename": "virtio-blk-ccw" }, - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -2508,7 +2491,7 @@ "type": "uint32" } ], - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -2516,7 +2499,7 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { @@ -2725,7 +2708,7 @@ "type": "uint16" } ], - "id": "libvirt-13" + "id": "libvirt-12" } { @@ -2733,7 +2716,7 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -2812,7 +2795,7 @@ "type": "uint32" } ], - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -2820,11 +2803,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -2836,11 +2819,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -2852,11 +2835,11 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" @@ -2868,7 +2851,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -2994,7 +2977,7 @@ "type": "str" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -3002,7 +2985,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -3120,7 +3103,7 @@ "type": "uint32" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -3128,11 +3111,11 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-20" + "id": "libvirt-19" } { - "id": "libvirt-20", + "id": "libvirt-19", "error": { "class": "DeviceNotFound", "desc": "Device 'ide-drive' not found" @@ -3144,11 +3127,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-21" + "id": "libvirt-20" } { - "id": "libvirt-21", + "id": "libvirt-20", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -3160,11 +3143,11 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-22" + "id": "libvirt-21" } { - "id": "libvirt-22", + "id": "libvirt-21", "error": { "class": "DeviceNotFound", "desc": "Device 'usb-host' not found" @@ -3176,7 +3159,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3207,7 +3190,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3215,11 +3198,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-24" + "id": "libvirt-23" } { - "id": "libvirt-24", + "id": "libvirt-23", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -3231,11 +3214,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-25" + "id": "libvirt-24" } { - "id": "libvirt-25", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -3247,11 +3230,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-26" + "id": "libvirt-25" } { - "id": "libvirt-26", + "id": "libvirt-25", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -3263,7 +3246,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3414,7 +3397,7 @@ "type": "str" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3422,7 +3405,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3469,7 +3452,7 @@ "type": "size" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3477,11 +3460,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-29" + "id": "libvirt-28" } { - "id": "libvirt-29", + "id": "libvirt-28", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -3493,7 +3476,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -3636,7 +3619,7 @@ "type": "str" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -3644,7 +3627,7 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3706,7 +3689,7 @@ "type": "uint32" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3714,7 +3697,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3758,7 +3741,7 @@ "type": "bool" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3766,7 +3749,7 @@ "arguments": { "typename": "virtio-gpu-ccw" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3831,7 +3814,7 @@ "type": "uint32" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3839,7 +3822,7 @@ "arguments": { "typename": "virtual-css-bridge" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -3854,7 +3837,7 @@ "type": "bool" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -3862,7 +3845,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -3916,7 +3899,7 @@ "type": "string" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -3924,11 +3907,11 @@ "arguments": { "typename": "spapr-machine" }, - "id": "libvirt-36" + "id": "libvirt-35" } { - "id": "libvirt-36", + "id": "libvirt-35", "error": { "class": "DeviceNotFound", "desc": "Class 'spapr-machine' not found" @@ -3937,7 +3920,7 @@ { "execute": "query-machines", - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -3995,12 +3978,12 @@ "alias": "s390-ccw-virtio" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-cpu-definitions", - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -4535,35 +4518,35 @@ "migration-safe": true } ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-tpm-models", - "id": "libvirt-39" + "id": "libvirt-38" } { "return": [ ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-tpm-types", - "id": "libvirt-40" + "id": "libvirt-39" } { "return": [ "emulator" ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-command-line-options", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -5688,12 +5671,12 @@ "option": "drive" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-migrate-capabilities", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -5755,12 +5738,12 @@ "capability": "dirty-bitmaps" } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-qmp-schema", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -17128,7 +17111,7 @@ "meta-type": "object" } ], - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -17139,7 +17122,7 @@ "name": "host" } }, - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -17177,7 +17160,7 @@ } } }, - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -17191,11 +17174,11 @@ } } }, - "id": "libvirt-45" + "id": "libvirt-44" } { - "id": "libvirt-45", + "id": "libvirt-44", "error": { "class": "GenericError", "desc": "Property '.migratable' not found" diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml index f7c54df0d7..d1d9353f35 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml @@ -28,7 +28,6 @@ - @@ -136,7 +135,7 @@ 2012000 0 - 375786 + 375593 s390x diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies index d0a691dab9..9d7e653216 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies @@ -538,26 +538,9 @@ "id": "libvirt-4" } -{ - "execute": "add-fd", - "arguments": { - "fdset-id": 0, - "opaque": "/dev/null" - }, - "id": "libvirt-5" -} - -{ - "return": { - "fd": 19, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - { "execute": "query-kvm", - "id": "libvirt-6" + "id": "libvirt-5" } { @@ -565,12 +548,12 @@ "enabled": true, "present": true }, - "id": "libvirt-6" + "id": "libvirt-5" } { "execute": "query-events", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -693,12 +676,12 @@ "name": "SHUTDOWN" } ], - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "qom-list-types", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -2348,7 +2331,7 @@ "parent": "rng-backend" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -2356,7 +2339,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2588,7 +2571,7 @@ "type": "str" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2596,7 +2579,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2891,7 +2874,7 @@ "type": "uint16" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2899,7 +2882,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -3064,7 +3047,7 @@ "type": "str" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -3072,11 +3055,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-12" + "id": "libvirt-11" } { - "id": "libvirt-12", + "id": "libvirt-11", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -3088,11 +3071,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -3104,11 +3087,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" @@ -3120,11 +3103,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -3136,11 +3119,11 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" @@ -3152,7 +3135,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -3278,7 +3261,7 @@ "type": "str" } ], - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -3286,7 +3269,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -3400,7 +3383,7 @@ "type": "uint64" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -3408,7 +3391,7 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -3484,7 +3467,7 @@ "type": "uint16" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -3492,7 +3475,7 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -3555,7 +3538,7 @@ "type": "int32" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -3563,7 +3546,7 @@ "arguments": { "typename": "usb-redir" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -3612,7 +3595,7 @@ "type": "bool" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -3620,7 +3603,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -3689,7 +3672,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -3697,7 +3680,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3728,7 +3711,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3736,7 +3719,7 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -3778,7 +3761,7 @@ "type": "bool" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -3786,7 +3769,7 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -3868,7 +3851,7 @@ "type": "uint64" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -3876,7 +3859,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -3949,7 +3932,7 @@ "type": "uint16" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -3957,7 +3940,7 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3971,7 +3954,7 @@ "type": "LostTickPolicy" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3979,7 +3962,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -4036,7 +4019,7 @@ "type": "int32" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -4044,7 +4027,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -4087,7 +4070,7 @@ "type": "int32" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -4095,7 +4078,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -4190,7 +4173,7 @@ "type": "uint32" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -4198,7 +4181,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -4349,7 +4332,7 @@ "type": "str" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -4357,7 +4340,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -4404,7 +4387,7 @@ "type": "size" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -4412,7 +4395,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -4508,7 +4491,7 @@ "type": "uint32" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -4516,7 +4499,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -4659,7 +4642,7 @@ "type": "str" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -4667,11 +4650,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-35" + "id": "libvirt-34" } { - "id": "libvirt-35", + "id": "libvirt-34", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -4683,7 +4666,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -4727,7 +4710,7 @@ "type": "bool" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -4735,7 +4718,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -4815,7 +4798,7 @@ "type": "uint32" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -4823,7 +4806,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -4862,7 +4845,7 @@ "type": "bool" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -4870,7 +4853,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -4913,7 +4896,7 @@ "type": "int32" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -4921,7 +4904,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -4975,7 +4958,7 @@ "type": "string" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -4983,11 +4966,11 @@ "arguments": { "typename": "spapr-machine" }, - "id": "libvirt-41" + "id": "libvirt-40" } { - "id": "libvirt-41", + "id": "libvirt-40", "error": { "class": "DeviceNotFound", "desc": "Class 'spapr-machine' not found" @@ -4996,7 +4979,7 @@ { "execute": "query-machines", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -5195,12 +5178,12 @@ "cpu-max": 255 } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-cpu-definitions", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -5714,12 +5697,12 @@ "migration-safe": true } ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-tpm-models", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -5727,12 +5710,12 @@ "tpm-crb", "tpm-tis" ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-tpm-types", - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -5740,12 +5723,12 @@ "passthrough", "emulator" ], - "id": "libvirt-45" + "id": "libvirt-44" } { "execute": "query-command-line-options", - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -7032,12 +7015,12 @@ "option": "drive" } ], - "id": "libvirt-46" + "id": "libvirt-45" } { "execute": "query-migrate-capabilities", - "id": "libvirt-47" + "id": "libvirt-46" } { @@ -7099,12 +7082,12 @@ "capability": "dirty-bitmaps" } ], - "id": "libvirt-47" + "id": "libvirt-46" } { "execute": "query-qmp-schema", - "id": "libvirt-48" + "id": "libvirt-47" } { @@ -18472,7 +18455,7 @@ "meta-type": "object" } ], - "id": "libvirt-48" + "id": "libvirt-47" } { @@ -18483,7 +18466,7 @@ "name": "host" } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -18673,7 +18656,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -18865,7 +18848,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -19120,7 +19103,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -19134,7 +19117,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { @@ -19324,7 +19307,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { @@ -19516,7 +19499,7 @@ } } }, - "id": "libvirt-52" + "id": "libvirt-51" } { @@ -19771,12 +19754,12 @@ } } }, - "id": "libvirt-52" + "id": "libvirt-51" } { "execute": "query-sev-capabilities", - "id": "libvirt-53" + "id": "libvirt-52" } { @@ -19786,7 +19769,7 @@ "cert-chain": "AQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAA", "pdh": "AQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAA" }, - "id": "libvirt-53" + "id": "libvirt-52" } { diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml index 9c8a2d4a3d..b3d78f9ccb 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml @@ -59,7 +59,6 @@ - @@ -214,7 +213,7 @@ 2011090 0 - 415983 + 415790 v2.12.0-rc0 x86_64 diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies index 5c44a6aae5..32c31f406d 100644 --- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies @@ -427,33 +427,16 @@ "id": "libvirt-4" } -{ - "execute": "add-fd", - "arguments": { - "fdset-id": 0, - "opaque": "/dev/null" - }, - "id": "libvirt-5" -} - -{ - "return": { - "fd": 13, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - { "execute": "block-commit", "arguments": { "device": "bogus" }, - "id": "libvirt-6" + "id": "libvirt-5" } { - "id": "libvirt-6", + "id": "libvirt-5", "error": { "class": "DeviceNotFound", "desc": "Device 'bogus' not found" @@ -462,7 +445,7 @@ { "execute": "query-kvm", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -470,12 +453,12 @@ "enabled": true, "present": true }, - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "query-events", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -586,12 +569,12 @@ "name": "BLOCK_IMAGE_CORRUPTED" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { "execute": "qom-list-types", - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1479,7 +1462,7 @@ "name": "virtio-blk-device" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1487,7 +1470,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -1639,7 +1622,7 @@ "type": "uint32" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -1647,7 +1630,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -1860,7 +1843,7 @@ "type": "bool" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -1868,7 +1851,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -1971,7 +1954,7 @@ "type": "bool" } ], - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -1979,11 +1962,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -1995,11 +1978,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-14" + "id": "libvirt-13" } { - "id": "libvirt-14", + "id": "libvirt-13", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -2011,11 +1994,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -2027,11 +2010,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -2043,7 +2026,7 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -2095,7 +2078,7 @@ "type": "str" } ], - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -2103,7 +2086,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -2159,7 +2142,7 @@ "type": "str" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -2167,7 +2150,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2262,7 +2245,7 @@ "type": "str" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2270,7 +2253,7 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -2327,7 +2310,7 @@ "type": "str" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -2335,7 +2318,7 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -2388,7 +2371,7 @@ "type": "uint32" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -2396,7 +2379,7 @@ "arguments": { "typename": "usb-redir" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -2437,7 +2420,7 @@ "type": "str" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -2445,7 +2428,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -2510,7 +2493,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -2518,7 +2501,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -2545,7 +2528,7 @@ "type": "str" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -2553,7 +2536,7 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -2591,7 +2574,7 @@ "type": "size" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -2599,7 +2582,7 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -2653,7 +2636,7 @@ "type": "uint64" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -2661,7 +2644,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -2721,7 +2704,7 @@ "type": "str" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -2729,7 +2712,7 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -2743,7 +2726,7 @@ "type": "uint32" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -2751,7 +2734,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -2798,7 +2781,7 @@ "type": "uint32" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -2806,7 +2789,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -2839,7 +2822,7 @@ "type": "uint32" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -2847,7 +2830,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -2924,7 +2907,7 @@ "type": "uint32" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -2932,7 +2915,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3013,7 +2996,7 @@ "type": "bool" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3021,7 +3004,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3051,7 +3034,7 @@ "type": "uint32" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3059,7 +3042,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -3136,7 +3119,7 @@ "type": "bool" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -3144,7 +3127,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -3229,7 +3212,7 @@ "type": "uint32" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -3237,11 +3220,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-36" + "id": "libvirt-35" } { - "id": "libvirt-36", + "id": "libvirt-35", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -3253,7 +3236,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -3292,7 +3275,7 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -3300,7 +3283,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -3370,7 +3353,7 @@ "type": "bool" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -3378,7 +3361,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -3388,7 +3371,7 @@ "type": "uint32" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -3396,7 +3379,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -3422,12 +3405,12 @@ "type": "pci-devfn" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-machines", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -3556,12 +3539,12 @@ "cpu-max": 255 } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-cpu-definitions", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -3651,36 +3634,36 @@ "name": "qemu64" } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-tpm-models", - "id": "libvirt-43" + "id": "libvirt-42" } { "return": [ "tpm-tis" ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-tpm-types", - "id": "libvirt-44" + "id": "libvirt-43" } { "return": [ "passthrough" ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-command-line-options", - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -4688,12 +4671,12 @@ "option": "drive" } ], - "id": "libvirt-45" + "id": "libvirt-44" } { "execute": "query-migrate-capabilities", - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -4723,7 +4706,7 @@ "capability": "events" } ], - "id": "libvirt-46" + "id": "libvirt-45" } { diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml index 8b480889b8..5dc67aa2ae 100644 --- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml @@ -61,7 +61,6 @@ - @@ -158,7 +157,7 @@ 2004000 0 - 80332 + 80139 x86_64 diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies index 8fcec6431a..2e93b116f7 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies @@ -454,26 +454,9 @@ "id": "libvirt-4" } -{ - "execute": "add-fd", - "arguments": { - "fdset-id": 0, - "opaque": "/dev/null" - }, - "id": "libvirt-5" -} - -{ - "return": { - "fd": 16, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - { "execute": "query-kvm", - "id": "libvirt-6" + "id": "libvirt-5" } { @@ -481,12 +464,12 @@ "enabled": true, "present": true }, - "id": "libvirt-6" + "id": "libvirt-5" } { "execute": "query-events", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -597,12 +580,12 @@ "name": "ACPI_DEVICE_OST" } ], - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "qom-list-types", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -1508,7 +1491,7 @@ "name": "virtio-blk-device" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -1516,7 +1499,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1678,7 +1661,7 @@ "type": "str" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1686,7 +1669,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -1914,7 +1897,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -1922,7 +1905,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2040,7 +2023,7 @@ "type": "uint32" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2048,11 +2031,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-12" + "id": "libvirt-11" } { - "id": "libvirt-12", + "id": "libvirt-11", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -2064,11 +2047,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -2080,11 +2063,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" @@ -2096,11 +2079,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -2112,7 +2095,7 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -2164,7 +2147,7 @@ "type": "bool" } ], - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -2172,7 +2155,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -2256,7 +2239,7 @@ "type": "bool" } ], - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -2264,7 +2247,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -2359,7 +2342,7 @@ "type": "uint64" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -2367,7 +2350,7 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2424,7 +2407,7 @@ "type": "uint16" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2432,7 +2415,7 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -2485,7 +2468,7 @@ "type": "int32" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -2493,7 +2476,7 @@ "arguments": { "typename": "usb-redir" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -2534,7 +2517,7 @@ "type": "bool" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -2542,7 +2525,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -2607,7 +2590,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -2615,7 +2598,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -2642,7 +2625,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -2650,7 +2633,7 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -2688,7 +2671,7 @@ "type": "child" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -2696,7 +2679,7 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -2750,7 +2733,7 @@ "type": "child" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -2758,7 +2741,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -2818,7 +2801,7 @@ "type": "uint16" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -2826,7 +2809,7 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -2840,7 +2823,7 @@ "type": "LostTickPolicy" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -2848,7 +2831,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -2895,7 +2878,7 @@ "type": "int32" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -2903,7 +2886,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -2936,7 +2919,7 @@ "type": "int32" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -2944,7 +2927,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -3021,7 +3004,7 @@ "type": "uint32" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -3029,7 +3012,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3135,7 +3118,7 @@ "type": "uint32" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3143,7 +3126,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3183,7 +3166,7 @@ "type": "bool" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3191,7 +3174,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3268,7 +3251,7 @@ "type": "uint32" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3276,7 +3259,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -3376,7 +3359,7 @@ "type": "bool" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -3384,11 +3367,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-35" + "id": "libvirt-34" } { - "id": "libvirt-35", + "id": "libvirt-34", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -3400,7 +3383,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -3439,7 +3422,7 @@ "type": "bool" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -3447,7 +3430,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -3517,7 +3500,7 @@ "type": "uint32" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -3525,7 +3508,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -3535,7 +3518,7 @@ "type": "uint32" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -3543,7 +3526,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -3569,12 +3552,12 @@ "type": "pci-devfn" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-machines", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -3711,12 +3694,12 @@ "cpu-max": 255 } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-cpu-definitions", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -3806,36 +3789,36 @@ "name": "qemu64" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-tpm-models", - "id": "libvirt-42" + "id": "libvirt-41" } { "return": [ "tpm-tis" ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-tpm-types", - "id": "libvirt-43" + "id": "libvirt-42" } { "return": [ "passthrough" ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-command-line-options", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -4880,12 +4863,12 @@ "option": "drive" } ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-migrate-capabilities", - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -4919,12 +4902,12 @@ "capability": "x-postcopy-ram" } ], - "id": "libvirt-45" + "id": "libvirt-44" } { "execute": "query-qmp-schema", - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -12469,7 +12452,7 @@ "meta-type": "array" } ], - "id": "libvirt-46" + "id": "libvirt-45" } { diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml index ffa2b87f8b..23cf05b9d6 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml @@ -61,7 +61,6 @@ - @@ -164,7 +163,7 @@ 2005000 0 - 221300 + 221107 x86_64 diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies index 35cbc575f3..41a2be3a2f 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies @@ -457,26 +457,9 @@ "id": "libvirt-4" } -{ - "execute": "add-fd", - "arguments": { - "fdset-id": 0, - "opaque": "/dev/null" - }, - "id": "libvirt-5" -} - -{ - "return": { - "fd": 17, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - { "execute": "query-kvm", - "id": "libvirt-6" + "id": "libvirt-5" } { @@ -484,12 +467,12 @@ "enabled": true, "present": true }, - "id": "libvirt-6" + "id": "libvirt-5" } { "execute": "query-events", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -606,12 +589,12 @@ "name": "ACPI_DEVICE_OST" } ], - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "qom-list-types", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -2267,7 +2250,7 @@ "name": "fw-path-provider" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -2275,7 +2258,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2437,7 +2420,7 @@ "type": "str" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2445,7 +2428,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2673,7 +2656,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2681,7 +2664,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2799,7 +2782,7 @@ "type": "uint32" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2807,11 +2790,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-12" + "id": "libvirt-11" } { - "id": "libvirt-12", + "id": "libvirt-11", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -2823,11 +2806,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -2839,11 +2822,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" @@ -2855,11 +2838,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -2871,11 +2854,11 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" @@ -2887,7 +2870,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -2975,7 +2958,7 @@ "type": "bool" } ], - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -2983,7 +2966,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -3078,7 +3061,7 @@ "type": "uint64" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -3086,7 +3069,7 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -3143,7 +3126,7 @@ "type": "uint16" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -3151,11 +3134,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-20" + "id": "libvirt-19" } { - "id": "libvirt-20", + "id": "libvirt-19", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -3167,7 +3150,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -3232,7 +3215,7 @@ "type": "uint32" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -3240,7 +3223,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -3267,7 +3250,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -3275,11 +3258,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-23" + "id": "libvirt-22" } { - "id": "libvirt-23", + "id": "libvirt-22", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -3291,11 +3274,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-24" + "id": "libvirt-23" } { - "id": "libvirt-24", + "id": "libvirt-23", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -3307,7 +3290,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -3367,7 +3350,7 @@ "type": "uint16" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -3375,11 +3358,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-26" + "id": "libvirt-25" } { - "id": "libvirt-26", + "id": "libvirt-25", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -3391,7 +3374,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3438,7 +3421,7 @@ "type": "int32" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3446,7 +3429,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3542,7 +3525,7 @@ "type": "uint32" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3550,7 +3533,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3580,7 +3563,7 @@ "type": "uint32" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3588,11 +3571,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-30" + "id": "libvirt-29" } { - "id": "libvirt-30", + "id": "libvirt-29", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -3604,7 +3587,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3704,7 +3687,7 @@ "type": "bool" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3712,11 +3695,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-32" + "id": "libvirt-31" } { - "id": "libvirt-32", + "id": "libvirt-31", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -3728,7 +3711,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3767,7 +3750,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3775,7 +3758,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -3845,12 +3828,12 @@ "type": "uint32" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { "execute": "query-machines", - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -4025,12 +4008,12 @@ "cpu-max": 1 } ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-cpu-definitions", - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -4129,34 +4112,34 @@ "name": "pxa270" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-tpm-models", - "id": "libvirt-37" + "id": "libvirt-36" } { "return": [ ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-tpm-types", - "id": "libvirt-38" + "id": "libvirt-37" } { "return": [ ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-command-line-options", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -5128,12 +5111,12 @@ "option": "drive" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-migrate-capabilities", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -5167,12 +5150,12 @@ "capability": "postcopy-ram" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-qmp-schema", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -13177,12 +13160,12 @@ "meta-type": "array" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-gic-capabilities", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -13198,7 +13181,7 @@ "kernel": true } ], - "id": "libvirt-42" + "id": "libvirt-41" } { diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml index 70b5c4896f..f63e141326 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml @@ -48,7 +48,6 @@ - @@ -145,7 +144,7 @@ 2006000 0 - 232145 + 231952 aarch64 diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies index d0f8998634..4a35fee5ed 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies @@ -454,26 +454,9 @@ "id": "libvirt-4" } -{ - "execute": "add-fd", - "arguments": { - "fdset-id": 0, - "opaque": "/dev/null" - }, - "id": "libvirt-5" -} - -{ - "return": { - "fd": 15, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - { "execute": "query-kvm", - "id": "libvirt-6" + "id": "libvirt-5" } { @@ -481,12 +464,12 @@ "enabled": true, "present": true }, - "id": "libvirt-6" + "id": "libvirt-5" } { "execute": "query-events", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -603,12 +586,12 @@ "name": "ACPI_DEVICE_OST" } ], - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "qom-list-types", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -2417,7 +2400,7 @@ "name": "fw-path-provider" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -2425,7 +2408,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2587,7 +2570,7 @@ "type": "str" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2595,7 +2578,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2823,7 +2806,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2831,7 +2814,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2949,7 +2932,7 @@ "type": "uint32" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2957,11 +2940,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-12" + "id": "libvirt-11" } { - "id": "libvirt-12", + "id": "libvirt-11", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -2973,11 +2956,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -2989,11 +2972,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" @@ -3005,11 +2988,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -3021,11 +3004,11 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" @@ -3037,7 +3020,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -3125,7 +3108,7 @@ "type": "bool" } ], - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -3133,7 +3116,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -3228,7 +3211,7 @@ "type": "uint64" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -3236,7 +3219,7 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -3293,7 +3276,7 @@ "type": "uint16" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -3301,11 +3284,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-20" + "id": "libvirt-19" } { - "id": "libvirt-20", + "id": "libvirt-19", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -3317,7 +3300,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -3382,7 +3365,7 @@ "type": "uint32" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -3390,7 +3373,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -3417,7 +3400,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -3425,11 +3408,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-23" + "id": "libvirt-22" } { - "id": "libvirt-23", + "id": "libvirt-22", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -3441,11 +3424,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-24" + "id": "libvirt-23" } { - "id": "libvirt-24", + "id": "libvirt-23", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -3457,7 +3440,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -3517,7 +3500,7 @@ "type": "uint16" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -3525,11 +3508,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-26" + "id": "libvirt-25" } { - "id": "libvirt-26", + "id": "libvirt-25", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -3541,7 +3524,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3588,7 +3571,7 @@ "type": "int32" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3596,7 +3579,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3692,7 +3675,7 @@ "type": "uint32" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3700,7 +3683,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3730,7 +3713,7 @@ "type": "uint32" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3738,11 +3721,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-30" + "id": "libvirt-29" } { - "id": "libvirt-30", + "id": "libvirt-29", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -3754,7 +3737,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3854,7 +3837,7 @@ "type": "bool" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3862,11 +3845,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-32" + "id": "libvirt-31" } { - "id": "libvirt-32", + "id": "libvirt-31", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -3878,7 +3861,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3917,7 +3900,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3925,7 +3908,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -3995,7 +3978,7 @@ "type": "uint32" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -4003,7 +3986,7 @@ "arguments": { "typename": "spapr-pci-host-bridge" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -4049,12 +4032,12 @@ "type": "uint32" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-machines", - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -4126,12 +4109,12 @@ "cpu-max": 255 } ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-cpu-definitions", - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -5433,34 +5416,34 @@ "name": "MPC8541E_v11" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-tpm-models", - "id": "libvirt-38" + "id": "libvirt-37" } { "return": [ ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-tpm-types", - "id": "libvirt-39" + "id": "libvirt-38" } { "return": [ ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-command-line-options", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -6427,12 +6410,12 @@ "option": "drive" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-migrate-capabilities", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -6466,12 +6449,12 @@ "capability": "postcopy-ram" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-qmp-schema", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -14476,7 +14459,7 @@ "meta-type": "array" } ], - "id": "libvirt-42" + "id": "libvirt-41" } { diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml index 0155c85971..0a4f62996c 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml @@ -45,7 +45,6 @@ - @@ -140,7 +139,7 @@ 2006000 0 - 266971 + 266778 ppc64 diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies index db84cdf840..382feee693 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies @@ -460,26 +460,9 @@ "id": "libvirt-4" } -{ - "execute": "add-fd", - "arguments": { - "fdset-id": 0, - "opaque": "/dev/null" - }, - "id": "libvirt-5" -} - -{ - "return": { - "fd": 15, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - { "execute": "query-kvm", - "id": "libvirt-6" + "id": "libvirt-5" } { @@ -487,12 +470,12 @@ "enabled": true, "present": true }, - "id": "libvirt-6" + "id": "libvirt-5" } { "execute": "query-events", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -609,12 +592,12 @@ "name": "ACPI_DEVICE_OST" } ], - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "qom-list-types", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -1586,7 +1569,7 @@ "name": "virtio-blk-device" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -1594,7 +1577,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1756,7 +1739,7 @@ "type": "str" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1764,7 +1747,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -1992,7 +1975,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2000,7 +1983,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2118,7 +2101,7 @@ "type": "uint32" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2126,11 +2109,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-12" + "id": "libvirt-11" } { - "id": "libvirt-12", + "id": "libvirt-11", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -2142,11 +2125,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -2158,11 +2141,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" @@ -2174,11 +2157,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -2190,7 +2173,7 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -2242,7 +2225,7 @@ "type": "bool" } ], - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -2250,7 +2233,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -2338,7 +2321,7 @@ "type": "bool" } ], - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -2346,7 +2329,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -2441,7 +2424,7 @@ "type": "uint64" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -2449,7 +2432,7 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2506,7 +2489,7 @@ "type": "uint16" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2514,7 +2497,7 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -2567,7 +2550,7 @@ "type": "int32" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -2575,7 +2558,7 @@ "arguments": { "typename": "usb-redir" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -2616,7 +2599,7 @@ "type": "bool" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -2624,7 +2607,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -2689,7 +2672,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -2697,7 +2680,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -2724,7 +2707,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -2732,7 +2715,7 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -2770,7 +2753,7 @@ "type": "child" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -2778,7 +2761,7 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -2832,7 +2815,7 @@ "type": "child" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -2840,7 +2823,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -2900,7 +2883,7 @@ "type": "uint16" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -2908,7 +2891,7 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -2922,7 +2905,7 @@ "type": "LostTickPolicy" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -2930,7 +2913,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -2977,7 +2960,7 @@ "type": "int32" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -2985,7 +2968,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3018,7 +3001,7 @@ "type": "int32" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3026,7 +3009,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -3103,7 +3086,7 @@ "type": "uint32" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -3111,7 +3094,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3217,7 +3200,7 @@ "type": "uint32" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3225,7 +3208,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3265,7 +3248,7 @@ "type": "bool" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3273,7 +3256,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3350,7 +3333,7 @@ "type": "uint32" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3358,7 +3341,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -3458,7 +3441,7 @@ "type": "bool" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -3466,11 +3449,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-35" + "id": "libvirt-34" } { - "id": "libvirt-35", + "id": "libvirt-34", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -3482,7 +3465,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -3521,7 +3504,7 @@ "type": "bool" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -3529,7 +3512,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -3599,7 +3582,7 @@ "type": "uint32" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -3607,7 +3590,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -3617,7 +3600,7 @@ "type": "uint32" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -3625,7 +3608,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -3651,12 +3634,12 @@ "type": "pci-devfn" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-machines", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -3769,12 +3752,12 @@ "cpu-max": 255 } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-cpu-definitions", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -3864,36 +3847,36 @@ "name": "qemu64" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-tpm-models", - "id": "libvirt-42" + "id": "libvirt-41" } { "return": [ "tpm-tis" ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-tpm-types", - "id": "libvirt-43" + "id": "libvirt-42" } { "return": [ "passthrough" ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-command-line-options", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -4987,12 +4970,12 @@ "option": "drive" } ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-migrate-capabilities", - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -5026,12 +5009,12 @@ "capability": "postcopy-ram" } ], - "id": "libvirt-45" + "id": "libvirt-44" } { "execute": "query-qmp-schema", - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -13036,7 +13019,7 @@ "meta-type": "array" } ], - "id": "libvirt-46" + "id": "libvirt-45" } { diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml index e7bf91cc64..f8643335f1 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml @@ -61,7 +61,6 @@ - @@ -176,7 +175,7 @@ 2006000 0 - 232104 + 231911 x86_64 diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies index 81362ae7ad..977c591455 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies @@ -466,26 +466,9 @@ "id": "libvirt-4" } -{ - "execute": "add-fd", - "arguments": { - "fdset-id": 0, - "opaque": "/dev/null" - }, - "id": "libvirt-5" -} - -{ - "return": { - "fd": 16, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - { "execute": "query-kvm", - "id": "libvirt-6" + "id": "libvirt-5" } { @@ -493,12 +476,12 @@ "enabled": true, "present": true }, - "id": "libvirt-6" + "id": "libvirt-5" } { "execute": "query-events", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -615,12 +598,12 @@ "name": "ACPI_DEVICE_OST" } ], - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "qom-list-types", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -998,7 +981,7 @@ "name": "s390-skeys-kvm" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -1006,7 +989,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1191,7 +1174,7 @@ "type": "str" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1199,7 +1182,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -1431,7 +1414,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -1439,7 +1422,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -1561,7 +1544,7 @@ "type": "str" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -1569,7 +1552,7 @@ "arguments": { "typename": "virtio-blk-ccw" }, - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -1698,7 +1681,7 @@ "type": "uint32" } ], - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -1706,7 +1689,7 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { @@ -1886,7 +1869,7 @@ "type": "bool" } ], - "id": "libvirt-13" + "id": "libvirt-12" } { @@ -1894,7 +1877,7 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -1964,7 +1947,7 @@ "type": "uint32" } ], - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -1972,11 +1955,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -1988,11 +1971,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -2004,11 +1987,11 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" @@ -2020,7 +2003,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -2122,7 +2105,7 @@ "type": "bool" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -2130,7 +2113,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2240,7 +2223,7 @@ "type": "uint64" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2248,11 +2231,11 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-20" + "id": "libvirt-19" } { - "id": "libvirt-20", + "id": "libvirt-19", "error": { "class": "DeviceNotFound", "desc": "Device 'ide-drive' not found" @@ -2264,11 +2247,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-21" + "id": "libvirt-20" } { - "id": "libvirt-21", + "id": "libvirt-20", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -2280,11 +2263,11 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-22" + "id": "libvirt-21" } { - "id": "libvirt-22", + "id": "libvirt-21", "error": { "class": "DeviceNotFound", "desc": "Device 'usb-host' not found" @@ -2296,7 +2279,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -2323,7 +2306,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -2331,11 +2314,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-24" + "id": "libvirt-23" } { - "id": "libvirt-24", + "id": "libvirt-23", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -2347,11 +2330,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-25" + "id": "libvirt-24" } { - "id": "libvirt-25", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -2363,11 +2346,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-26" + "id": "libvirt-25" } { - "id": "libvirt-26", + "id": "libvirt-25", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -2379,7 +2362,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -2479,7 +2462,7 @@ "type": "uint32" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -2487,7 +2470,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -2517,7 +2500,7 @@ "type": "uint32" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -2525,11 +2508,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-29" + "id": "libvirt-28" } { - "id": "libvirt-29", + "id": "libvirt-28", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -2541,7 +2524,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -2645,7 +2628,7 @@ "type": "bool" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -2653,7 +2636,7 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -2710,7 +2693,7 @@ "type": "uint32" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -2718,7 +2701,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -2757,7 +2740,7 @@ "type": "bool" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -2765,7 +2748,7 @@ "arguments": { "typename": "virtual-css-bridge" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -2775,12 +2758,12 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { "execute": "query-machines", - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -2813,12 +2796,12 @@ "cpu-max": 248 } ], - "id": "libvirt-34" + "id": "libvirt-33" } { "execute": "query-cpu-definitions", - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -2827,34 +2810,34 @@ "name": "host" } ], - "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": [ ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-command-line-options", - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -3790,12 +3773,12 @@ "option": "drive" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-migrate-capabilities", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -3829,12 +3812,12 @@ "capability": "postcopy-ram" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-qmp-schema", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -12190,7 +12173,7 @@ "meta-type": "object" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml index 459f2da46c..945afab5c4 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml @@ -28,7 +28,6 @@ - @@ -108,7 +107,7 @@ 2007000 0 - 220579 + 220386 s390x diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies index 5de9e0b1ef..aae2b3f4de 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies @@ -469,26 +469,9 @@ "id": "libvirt-4" } -{ - "execute": "add-fd", - "arguments": { - "fdset-id": 0, - "opaque": "/dev/null" - }, - "id": "libvirt-5" -} - -{ - "return": { - "fd": 15, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - { "execute": "query-kvm", - "id": "libvirt-6" + "id": "libvirt-5" } { @@ -496,12 +479,12 @@ "enabled": true, "present": true }, - "id": "libvirt-6" + "id": "libvirt-5" } { "execute": "query-events", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -618,12 +601,12 @@ "name": "ACPI_DEVICE_OST" } ], - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "qom-list-types", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -1610,7 +1593,7 @@ "name": "virtio-blk-device" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -1618,7 +1601,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1803,7 +1786,7 @@ "type": "str" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1811,7 +1794,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2043,7 +2026,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2051,7 +2034,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2173,7 +2156,7 @@ "type": "str" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2181,11 +2164,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-12" + "id": "libvirt-11" } { - "id": "libvirt-12", + "id": "libvirt-11", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -2197,11 +2180,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -2213,11 +2196,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" @@ -2229,11 +2212,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -2245,7 +2228,7 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -2302,7 +2285,7 @@ "type": "bool" } ], - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -2310,7 +2293,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -2412,7 +2395,7 @@ "type": "bool" } ], - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -2420,7 +2403,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -2530,7 +2513,7 @@ "type": "uint64" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -2538,7 +2521,7 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2610,7 +2593,7 @@ "type": "uint16" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2618,7 +2601,7 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -2676,7 +2659,7 @@ "type": "int32" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -2684,7 +2667,7 @@ "arguments": { "typename": "usb-redir" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -2733,7 +2716,7 @@ "type": "bool" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -2741,7 +2724,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -2810,7 +2793,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -2818,7 +2801,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -2845,7 +2828,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -2853,7 +2836,7 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -2891,7 +2874,7 @@ "type": "child" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -2899,7 +2882,7 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -2977,7 +2960,7 @@ "type": "int" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -2985,7 +2968,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -3054,7 +3037,7 @@ "type": "uint16" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -3062,7 +3045,7 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3076,7 +3059,7 @@ "type": "LostTickPolicy" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3084,7 +3067,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3136,7 +3119,7 @@ "type": "int32" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3144,7 +3127,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3182,7 +3165,7 @@ "type": "int32" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3190,7 +3173,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -3272,7 +3255,7 @@ "type": "uint32" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -3280,7 +3263,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3390,7 +3373,7 @@ "type": "uint32" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3398,7 +3381,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3438,7 +3421,7 @@ "type": "bool" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3446,7 +3429,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3532,7 +3515,7 @@ "type": "uint32" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3540,7 +3523,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -3644,7 +3627,7 @@ "type": "bool" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -3652,11 +3635,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-35" + "id": "libvirt-34" } { - "id": "libvirt-35", + "id": "libvirt-34", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -3668,7 +3651,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -3707,7 +3690,7 @@ "type": "bool" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -3715,7 +3698,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -3790,7 +3773,7 @@ "type": "uint32" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -3798,7 +3781,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -3812,7 +3795,7 @@ "type": "bool" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -3820,7 +3803,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -3846,12 +3829,12 @@ "type": "pci-devfn" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-machines", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -4000,12 +3983,12 @@ "cpu-max": 255 } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-cpu-definitions", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -4098,36 +4081,36 @@ "name": "qemu64" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-tpm-models", - "id": "libvirt-42" + "id": "libvirt-41" } { "return": [ "tpm-tis" ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-tpm-types", - "id": "libvirt-43" + "id": "libvirt-42" } { "return": [ "passthrough" ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-command-line-options", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -5225,12 +5208,12 @@ "option": "drive" } ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-migrate-capabilities", - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -5264,12 +5247,12 @@ "capability": "postcopy-ram" } ], - "id": "libvirt-45" + "id": "libvirt-44" } { "execute": "query-qmp-schema", - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -13625,7 +13608,7 @@ "meta-type": "object" } ], - "id": "libvirt-46" + "id": "libvirt-45" } { diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml index defd5554e6..5e1c942bbe 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml @@ -61,7 +61,6 @@ - @@ -181,7 +180,7 @@ 2007000 0 - 243792 + 243599 (v2.7.0) x86_64 diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies index ca6be2b1a6..6eae79342e 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies @@ -478,26 +478,9 @@ "id": "libvirt-4" } -{ - "execute": "add-fd", - "arguments": { - "fdset-id": 0, - "opaque": "/dev/null" - }, - "id": "libvirt-5" -} - -{ - "return": { - "fd": 16, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - { "execute": "query-kvm", - "id": "libvirt-6" + "id": "libvirt-5" } { @@ -505,12 +488,12 @@ "enabled": true, "present": true }, - "id": "libvirt-6" + "id": "libvirt-5" } { "execute": "query-events", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -627,12 +610,12 @@ "name": "ACPI_DEVICE_OST" } ], - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "qom-list-types", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -1238,7 +1221,7 @@ "name": "virtio-blk-device" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -1246,7 +1229,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1436,7 +1419,7 @@ "type": "str" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1444,7 +1427,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -1685,7 +1668,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -1693,7 +1676,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -1820,7 +1803,7 @@ "type": "str" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -1828,7 +1811,7 @@ "arguments": { "typename": "virtio-blk-ccw" }, - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -1957,7 +1940,7 @@ "type": "uint32" } ], - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -1965,7 +1948,7 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { @@ -2149,7 +2132,7 @@ "type": "bool" } ], - "id": "libvirt-13" + "id": "libvirt-12" } { @@ -2157,7 +2140,7 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -2227,7 +2210,7 @@ "type": "uint32" } ], - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -2235,11 +2218,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -2251,11 +2234,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -2267,11 +2250,11 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" @@ -2283,7 +2266,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -2385,7 +2368,7 @@ "type": "bool" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -2393,7 +2376,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2503,7 +2486,7 @@ "type": "uint64" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2511,11 +2494,11 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-20" + "id": "libvirt-19" } { - "id": "libvirt-20", + "id": "libvirt-19", "error": { "class": "DeviceNotFound", "desc": "Device 'ide-drive' not found" @@ -2527,11 +2510,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-21" + "id": "libvirt-20" } { - "id": "libvirt-21", + "id": "libvirt-20", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -2543,11 +2526,11 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-22" + "id": "libvirt-21" } { - "id": "libvirt-22", + "id": "libvirt-21", "error": { "class": "DeviceNotFound", "desc": "Device 'usb-host' not found" @@ -2559,7 +2542,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -2586,7 +2569,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -2594,11 +2577,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-24" + "id": "libvirt-23" } { - "id": "libvirt-24", + "id": "libvirt-23", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -2610,11 +2593,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-25" + "id": "libvirt-24" } { - "id": "libvirt-25", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -2626,11 +2609,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-26" + "id": "libvirt-25" } { - "id": "libvirt-26", + "id": "libvirt-25", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -2642,7 +2625,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -2747,7 +2730,7 @@ "type": "uint32" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -2755,7 +2738,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -2785,7 +2768,7 @@ "type": "uint32" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -2793,11 +2776,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-29" + "id": "libvirt-28" } { - "id": "libvirt-29", + "id": "libvirt-28", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -2809,7 +2792,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -2918,7 +2901,7 @@ "type": "bool" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -2926,7 +2909,7 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -2983,7 +2966,7 @@ "type": "uint32" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -2991,7 +2974,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3030,7 +3013,7 @@ "type": "bool" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3038,7 +3021,7 @@ "arguments": { "typename": "virtual-css-bridge" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3048,12 +3031,12 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { "execute": "query-machines", - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -3091,12 +3074,12 @@ "alias": "s390-ccw-virtio" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { "execute": "query-cpu-definitions", - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -3422,34 +3405,34 @@ "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": [ ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-command-line-options", - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -4410,12 +4393,12 @@ "option": "drive" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-migrate-capabilities", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -4453,12 +4436,12 @@ "capability": "x-colo" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-qmp-schema", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -13228,7 +13211,7 @@ "meta-type": "object" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -13239,7 +13222,7 @@ "name": "host" } }, - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -13265,7 +13248,7 @@ } } }, - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -13279,11 +13262,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_2.8.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml index 564c6c481a..00549630c1 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml @@ -28,7 +28,6 @@ - @@ -111,7 +110,7 @@ 2007093 0 - 245993 + 245800 s390x diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies index cb87874dfc..dcfa7ea056 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies @@ -472,26 +472,9 @@ "id": "libvirt-4" } -{ - "execute": "add-fd", - "arguments": { - "fdset-id": 0, - "opaque": "/dev/null" - }, - "id": "libvirt-5" -} - -{ - "return": { - "fd": 15, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - { "execute": "query-kvm", - "id": "libvirt-6" + "id": "libvirt-5" } { @@ -499,12 +482,12 @@ "enabled": true, "present": true }, - "id": "libvirt-6" + "id": "libvirt-5" } { "execute": "query-events", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -621,12 +604,12 @@ "name": "ACPI_DEVICE_OST" } ], - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "qom-list-types", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -1694,7 +1677,7 @@ "name": "virtio-blk-device" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -1702,7 +1685,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1896,7 +1879,7 @@ "type": "str" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1904,7 +1887,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2149,7 +2132,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2157,7 +2140,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2288,7 +2271,7 @@ "type": "str" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2296,11 +2279,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-12" + "id": "libvirt-11" } { - "id": "libvirt-12", + "id": "libvirt-11", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -2312,11 +2295,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -2328,11 +2311,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" @@ -2344,11 +2327,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -2360,7 +2343,7 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -2417,7 +2400,7 @@ "type": "bool" } ], - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -2425,7 +2408,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -2527,7 +2510,7 @@ "type": "bool" } ], - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -2535,7 +2518,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -2645,7 +2628,7 @@ "type": "uint64" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -2653,7 +2636,7 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2725,7 +2708,7 @@ "type": "uint16" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2733,7 +2716,7 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -2791,7 +2774,7 @@ "type": "int32" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -2799,7 +2782,7 @@ "arguments": { "typename": "usb-redir" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -2848,7 +2831,7 @@ "type": "bool" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -2856,7 +2839,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -2925,7 +2908,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -2933,7 +2916,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -2960,7 +2943,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -2968,7 +2951,7 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -3006,7 +2989,7 @@ "type": "child" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -3014,7 +2997,7 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -3092,7 +3075,7 @@ "type": "int" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -3100,7 +3083,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -3169,7 +3152,7 @@ "type": "uint16" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -3177,7 +3160,7 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3191,7 +3174,7 @@ "type": "LostTickPolicy" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3199,7 +3182,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3251,7 +3234,7 @@ "type": "int32" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3259,7 +3242,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3297,7 +3280,7 @@ "type": "int32" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3305,7 +3288,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -3387,7 +3370,7 @@ "type": "uint32" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -3395,7 +3378,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3514,7 +3497,7 @@ "type": "uint32" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3522,7 +3505,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3562,7 +3545,7 @@ "type": "bool" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3570,7 +3553,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3656,7 +3639,7 @@ "type": "uint32" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3664,7 +3647,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -3777,7 +3760,7 @@ "type": "guest statistics" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -3785,11 +3768,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-35" + "id": "libvirt-34" } { - "id": "libvirt-35", + "id": "libvirt-34", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -3801,7 +3784,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -3840,7 +3823,7 @@ "type": "bool" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -3848,7 +3831,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -3923,7 +3906,7 @@ "type": "uint32" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -3931,7 +3914,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -3954,7 +3937,7 @@ "type": "uint32" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -3962,7 +3945,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -3988,12 +3971,12 @@ "type": "pci-devfn" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-machines", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -4162,12 +4145,12 @@ "cpu-max": 255 } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-cpu-definitions", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -4373,36 +4356,36 @@ "static": false } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-tpm-models", - "id": "libvirt-42" + "id": "libvirt-41" } { "return": [ "tpm-tis" ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-tpm-types", - "id": "libvirt-43" + "id": "libvirt-42" } { "return": [ "passthrough" ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-command-line-options", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -5525,12 +5508,12 @@ "option": "drive" } ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-migrate-capabilities", - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -5568,12 +5551,12 @@ "capability": "x-colo" } ], - "id": "libvirt-45" + "id": "libvirt-44" } { "execute": "query-qmp-schema", - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -14343,7 +14326,7 @@ "meta-type": "object" } ], - "id": "libvirt-46" + "id": "libvirt-45" } { diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml index 318059bba1..db87895552 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml @@ -61,7 +61,6 @@ - @@ -184,7 +183,7 @@ 2008000 0 - 260447 + 260254 (v2.8.0) x86_64 diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies index b2e224725c..f98ed20a6b 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies @@ -478,26 +478,9 @@ "id": "libvirt-4" } -{ - "execute": "add-fd", - "arguments": { - "fdset-id": 0, - "opaque": "/dev/null" - }, - "id": "libvirt-5" -} - -{ - "return": { - "fd": 17, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - { "execute": "query-kvm", - "id": "libvirt-6" + "id": "libvirt-5" } { @@ -505,12 +488,12 @@ "enabled": true, "present": true }, - "id": "libvirt-6" + "id": "libvirt-5" } { "execute": "query-events", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -627,12 +610,12 @@ "name": "ACPI_DEVICE_OST" } ], - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "qom-list-types", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -2582,7 +2565,7 @@ "name": "7457A_v1.2-powerpc64-cpu" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -2590,7 +2573,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2818,7 +2801,7 @@ "type": "str" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2826,7 +2809,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -3105,7 +3088,7 @@ "type": "uint16" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -3113,7 +3096,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -3274,7 +3257,7 @@ "type": "str" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -3282,11 +3265,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-12" + "id": "libvirt-11" } { - "id": "libvirt-12", + "id": "libvirt-11", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -3298,11 +3281,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -3314,11 +3297,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" @@ -3330,11 +3313,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -3346,11 +3329,11 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" @@ -3362,7 +3345,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -3469,7 +3452,7 @@ "type": "bool" } ], - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -3477,7 +3460,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -3591,7 +3574,7 @@ "type": "uint64" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -3599,7 +3582,7 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -3675,7 +3658,7 @@ "type": "uint16" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -3683,11 +3666,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-20" + "id": "libvirt-19" } { - "id": "libvirt-20", + "id": "libvirt-19", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -3699,11 +3682,11 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-21" + "id": "libvirt-20" } { - "id": "libvirt-21", + "id": "libvirt-20", "error": { "class": "DeviceNotFound", "desc": "Device 'usb-host' not found" @@ -3715,7 +3698,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -3742,7 +3725,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -3750,11 +3733,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-23" + "id": "libvirt-22" } { - "id": "libvirt-23", + "id": "libvirt-22", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -3766,11 +3749,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-24" + "id": "libvirt-23" } { - "id": "libvirt-24", + "id": "libvirt-23", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -3782,7 +3765,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -3855,7 +3838,7 @@ "type": "uint16" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -3863,11 +3846,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-26" + "id": "libvirt-25" } { - "id": "libvirt-26", + "id": "libvirt-25", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -3879,7 +3862,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3936,7 +3919,7 @@ "type": "int32" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3944,7 +3927,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -4087,7 +4070,7 @@ "type": "str" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -4095,7 +4078,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -4134,7 +4117,7 @@ "type": "size" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -4142,11 +4125,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-30" + "id": "libvirt-29" } { - "id": "libvirt-30", + "id": "libvirt-29", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -4158,7 +4141,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -4301,7 +4284,7 @@ "type": "str" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -4309,11 +4292,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-32" + "id": "libvirt-31" } { - "id": "libvirt-32", + "id": "libvirt-31", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -4325,7 +4308,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -4369,7 +4352,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -4377,7 +4360,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -4457,7 +4440,7 @@ "type": "uint32" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -4465,7 +4448,7 @@ "arguments": { "typename": "spapr-pci-host-bridge" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -4551,12 +4534,12 @@ "type": "uint32" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-machines", - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -4669,12 +4652,12 @@ "cpu-max": 1 } ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-cpu-definitions", - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -6850,34 +6833,34 @@ "static": false } ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-tpm-models", - "id": "libvirt-38" + "id": "libvirt-37" } { "return": [ ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-tpm-types", - "id": "libvirt-39" + "id": "libvirt-38" } { "return": [ ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-command-line-options", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -7987,12 +7970,12 @@ "option": "drive" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-migrate-capabilities", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -8034,12 +8017,12 @@ "capability": "release-ram" } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-qmp-schema", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -17325,7 +17308,7 @@ "meta-type": "object" } ], - "id": "libvirt-42" + "id": "libvirt-41" } { diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml index ea81b431f9..149666e093 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml @@ -44,7 +44,6 @@ - @@ -151,7 +150,7 @@ 2009000 0 - 350495 + 350302 (v2.9.0) ppc64 diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies index 5e2b4518fa..d3b60da4bf 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies @@ -490,26 +490,9 @@ "id": "libvirt-4" } -{ - "execute": "add-fd", - "arguments": { - "fdset-id": 0, - "opaque": "/dev/null" - }, - "id": "libvirt-5" -} - -{ - "return": { - "fd": 16, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - { "execute": "query-kvm", - "id": "libvirt-6" + "id": "libvirt-5" } { @@ -517,12 +500,12 @@ "enabled": true, "present": true }, - "id": "libvirt-6" + "id": "libvirt-5" } { "execute": "query-events", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -639,12 +622,12 @@ "name": "ACPI_DEVICE_OST" } ], - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "qom-list-types", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -1286,7 +1269,7 @@ "name": "virtio-blk-device" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -1294,7 +1277,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1522,7 +1505,7 @@ "type": "str" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -1530,7 +1513,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -1809,7 +1792,7 @@ "type": "uint16" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -1817,7 +1800,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -1978,7 +1961,7 @@ "type": "str" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -1986,7 +1969,7 @@ "arguments": { "typename": "virtio-blk-ccw" }, - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -2124,7 +2107,7 @@ "type": "uint32" } ], - "id": "libvirt-12" + "id": "libvirt-11" } { @@ -2132,7 +2115,7 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { @@ -2325,7 +2308,7 @@ "type": "uint16" } ], - "id": "libvirt-13" + "id": "libvirt-12" } { @@ -2333,7 +2316,7 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -2408,7 +2391,7 @@ "type": "uint32" } ], - "id": "libvirt-14" + "id": "libvirt-13" } { @@ -2416,11 +2399,11 @@ "arguments": { "typename": "virtio-net-s390" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -2432,11 +2415,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -2448,11 +2431,11 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-17" + "id": "libvirt-16" } { - "id": "libvirt-17", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" @@ -2464,7 +2447,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -2571,7 +2554,7 @@ "type": "bool" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -2579,7 +2562,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2693,7 +2676,7 @@ "type": "uint64" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2701,11 +2684,11 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-20" + "id": "libvirt-19" } { - "id": "libvirt-20", + "id": "libvirt-19", "error": { "class": "DeviceNotFound", "desc": "Device 'ide-drive' not found" @@ -2717,11 +2700,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-21" + "id": "libvirt-20" } { - "id": "libvirt-21", + "id": "libvirt-20", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -2733,11 +2716,11 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-22" + "id": "libvirt-21" } { - "id": "libvirt-22", + "id": "libvirt-21", "error": { "class": "DeviceNotFound", "desc": "Device 'usb-host' not found" @@ -2749,7 +2732,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -2776,7 +2759,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -2784,11 +2767,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-24" + "id": "libvirt-23" } { - "id": "libvirt-24", + "id": "libvirt-23", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -2800,11 +2783,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-25" + "id": "libvirt-24" } { - "id": "libvirt-25", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -2816,11 +2799,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-26" + "id": "libvirt-25" } { - "id": "libvirt-26", + "id": "libvirt-25", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -2832,7 +2815,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -2975,7 +2958,7 @@ "type": "str" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -2983,7 +2966,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3022,7 +3005,7 @@ "type": "size" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3030,11 +3013,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-29" + "id": "libvirt-28" } { - "id": "libvirt-29", + "id": "libvirt-28", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -3046,7 +3029,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -3189,7 +3172,7 @@ "type": "str" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -3197,7 +3180,7 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3259,7 +3242,7 @@ "type": "uint32" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3267,7 +3250,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3311,7 +3294,7 @@ "type": "bool" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3319,7 +3302,7 @@ "arguments": { "typename": "virtual-css-bridge" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3329,12 +3312,12 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { "execute": "query-machines", - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -3377,12 +3360,12 @@ "cpu-max": 248 } ], - "id": "libvirt-34" + "id": "libvirt-33" } { "execute": "query-cpu-definitions", - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -3772,34 +3755,34 @@ "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": [ ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-command-line-options", - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -4874,12 +4857,12 @@ "option": "drive" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-migrate-capabilities", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -4921,12 +4904,12 @@ "capability": "release-ram" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-qmp-schema", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -14212,7 +14195,7 @@ "meta-type": "object" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -14223,7 +14206,7 @@ "name": "host" } }, - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -14250,7 +14233,7 @@ } } }, - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -14264,11 +14247,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_2.9.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml index a1e0152f95..789279e24d 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml @@ -28,7 +28,6 @@ - @@ -115,7 +114,7 @@ 2009000 0 - 269412 + 269219 s390x diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies index 0e5d78e15f..c3edcc187d 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies @@ -487,26 +487,9 @@ "id": "libvirt-4" } -{ - "execute": "add-fd", - "arguments": { - "fdset-id": 0, - "opaque": "/dev/null" - }, - "id": "libvirt-5" -} - -{ - "return": { - "fd": 15, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - { "execute": "query-kvm", - "id": "libvirt-6" + "id": "libvirt-5" } { @@ -514,12 +497,12 @@ "enabled": true, "present": true }, - "id": "libvirt-6" + "id": "libvirt-5" } { "execute": "query-events", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -636,12 +619,12 @@ "name": "ACPI_DEVICE_OST" } ], - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "qom-list-types", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -1772,7 +1755,7 @@ "name": "virtio-blk-device" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -1780,7 +1763,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2008,7 +1991,7 @@ "type": "str" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2016,7 +1999,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2295,7 +2278,7 @@ "type": "uint16" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2303,7 +2286,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2464,7 +2447,7 @@ "type": "str" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -2472,11 +2455,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-12" + "id": "libvirt-11" } { - "id": "libvirt-12", + "id": "libvirt-11", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -2488,11 +2471,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -2504,11 +2487,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" @@ -2520,11 +2503,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -2536,7 +2519,7 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -2598,7 +2581,7 @@ "type": "bool" } ], - "id": "libvirt-16" + "id": "libvirt-15" } { @@ -2606,7 +2589,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -2713,7 +2696,7 @@ "type": "bool" } ], - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -2721,7 +2704,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -2835,7 +2818,7 @@ "type": "uint64" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -2843,7 +2826,7 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2919,7 +2902,7 @@ "type": "uint16" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -2927,7 +2910,7 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -2990,7 +2973,7 @@ "type": "int32" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -2998,7 +2981,7 @@ "arguments": { "typename": "usb-redir" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -3047,7 +3030,7 @@ "type": "bool" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -3055,7 +3038,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -3124,7 +3107,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -3132,7 +3115,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3159,7 +3142,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3167,7 +3150,7 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -3205,7 +3188,7 @@ "type": "child" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -3213,7 +3196,7 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -3291,7 +3274,7 @@ "type": "int" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -3299,7 +3282,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -3372,7 +3355,7 @@ "type": "uint16" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -3380,7 +3363,7 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3394,7 +3377,7 @@ "type": "LostTickPolicy" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -3402,7 +3385,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3459,7 +3442,7 @@ "type": "int32" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -3467,7 +3450,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3510,7 +3493,7 @@ "type": "int32" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -3518,7 +3501,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -3605,7 +3588,7 @@ "type": "uint32" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -3613,7 +3596,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3766,7 +3749,7 @@ "type": "str" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -3774,7 +3757,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3823,7 +3806,7 @@ "type": "size" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -3831,7 +3814,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3927,7 +3910,7 @@ "type": "uint32" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -3935,7 +3918,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -4078,7 +4061,7 @@ "type": "str" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -4086,11 +4069,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-35" + "id": "libvirt-34" } { - "id": "libvirt-35", + "id": "libvirt-34", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -4102,7 +4085,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -4146,7 +4129,7 @@ "type": "bool" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -4154,7 +4137,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -4234,7 +4217,7 @@ "type": "uint32" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -4242,7 +4225,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -4273,7 +4256,7 @@ "type": "bool" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -4281,7 +4264,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -4307,12 +4290,12 @@ "type": "pci-devfn" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-machines", - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -4491,12 +4474,12 @@ "cpu-max": 255 } ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-cpu-definitions", - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -4778,36 +4761,36 @@ "migration-safe": true } ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-tpm-models", - "id": "libvirt-42" + "id": "libvirt-41" } { "return": [ "tpm-tis" ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-tpm-types", - "id": "libvirt-43" + "id": "libvirt-42" } { "return": [ "passthrough" ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-command-line-options", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -6056,12 +6039,12 @@ "option": "drive" } ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-migrate-capabilities", - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -6103,12 +6086,12 @@ "capability": "release-ram" } ], - "id": "libvirt-45" + "id": "libvirt-44" } { "execute": "query-qmp-schema", - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -15394,7 +15377,7 @@ "meta-type": "object" } ], - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -15405,7 +15388,7 @@ "name": "host" } }, - "id": "libvirt-47" + "id": "libvirt-46" } { @@ -15584,7 +15567,7 @@ } } }, - "id": "libvirt-47" + "id": "libvirt-46" } { @@ -15765,7 +15748,7 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-47" } { @@ -16006,7 +15989,7 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-47" } { @@ -16020,7 +16003,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -16199,7 +16182,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -16380,7 +16363,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -16621,7 +16604,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml index 54c4e4ce57..8be3d77fef 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml @@ -61,7 +61,6 @@ - @@ -199,7 +198,7 @@ 2009000 0 - 343771 + 343578 (v2.9.0) x86_64 diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies index ef5189687a..932c418f3f 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies @@ -565,26 +565,9 @@ "id": "libvirt-4" } -{ - "execute": "add-fd", - "arguments": { - "fdset-id": 0, - "opaque": "/dev/null" - }, - "id": "libvirt-5" -} - -{ - "return": { - "fd": 19, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - { "execute": "query-kvm", - "id": "libvirt-6" + "id": "libvirt-5" } { @@ -592,12 +575,12 @@ "enabled": true, "present": true }, - "id": "libvirt-6" + "id": "libvirt-5" } { "execute": "query-events", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -723,12 +706,12 @@ "name": "SHUTDOWN" } ], - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "qom-list-types", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -3570,7 +3553,7 @@ "parent": "virtio-input-hid-pci" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -3578,7 +3561,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -3810,7 +3793,7 @@ "type": "str" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -3818,7 +3801,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -4108,7 +4091,7 @@ "type": "uint16" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -4116,7 +4099,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -4281,7 +4264,7 @@ "type": "str" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -4289,11 +4272,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-12" + "id": "libvirt-11" } { - "id": "libvirt-12", + "id": "libvirt-11", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -4305,11 +4288,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -4321,11 +4304,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" @@ -4337,11 +4320,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -4353,11 +4336,11 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" @@ -4369,7 +4352,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -4503,7 +4486,7 @@ "type": "str" } ], - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -4511,7 +4494,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -4629,7 +4612,7 @@ "type": "uint32" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -4637,7 +4620,7 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -4713,7 +4696,7 @@ "type": "uint16" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -4721,11 +4704,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-20" + "id": "libvirt-19" } { - "id": "libvirt-20", + "id": "libvirt-19", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -4737,7 +4720,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -4806,7 +4789,7 @@ "type": "uint32" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -4814,7 +4797,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -4845,7 +4828,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -4853,11 +4836,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-23" + "id": "libvirt-22" } { - "id": "libvirt-23", + "id": "libvirt-22", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -4869,11 +4852,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-24" + "id": "libvirt-23" } { - "id": "libvirt-24", + "id": "libvirt-23", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -4885,7 +4868,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -4958,7 +4941,7 @@ "type": "uint16" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -4966,11 +4949,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-26" + "id": "libvirt-25" } { - "id": "libvirt-26", + "id": "libvirt-25", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -4982,7 +4965,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -5039,7 +5022,7 @@ "type": "int32" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -5047,7 +5030,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -5198,7 +5181,7 @@ "type": "str" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -5206,7 +5189,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -5253,7 +5236,7 @@ "type": "size" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -5261,11 +5244,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-30" + "id": "libvirt-29" } { - "id": "libvirt-30", + "id": "libvirt-29", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -5277,7 +5260,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -5420,7 +5403,7 @@ "type": "str" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -5428,11 +5411,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-32" + "id": "libvirt-31" } { - "id": "libvirt-32", + "id": "libvirt-31", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -5444,7 +5427,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -5488,7 +5471,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -5496,7 +5479,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -5576,7 +5559,7 @@ "type": "uint32" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -5584,7 +5567,7 @@ "arguments": { "typename": "spapr-pci-host-bridge" }, - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -5642,7 +5625,7 @@ "type": "uint32" } ], - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -5650,7 +5633,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -5700,7 +5683,7 @@ "type": "string" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -5708,7 +5691,7 @@ "arguments": { "typename": "spapr-machine" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -5879,12 +5862,12 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-machines", - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -6027,12 +6010,12 @@ "cpu-max": 1 } ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-cpu-definitions", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -8228,35 +8211,35 @@ "static": false } ], - "id": "libvirt-39" + "id": "libvirt-38" } { "execute": "query-tpm-models", - "id": "libvirt-40" + "id": "libvirt-39" } { "return": [ ], - "id": "libvirt-40" + "id": "libvirt-39" } { "execute": "query-tpm-types", - "id": "libvirt-41" + "id": "libvirt-40" } { "return": [ "emulator" ], - "id": "libvirt-41" + "id": "libvirt-40" } { "execute": "query-command-line-options", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -9386,12 +9369,12 @@ "option": "drive" } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-migrate-capabilities", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -9461,12 +9444,12 @@ "capability": "late-block-activate" } ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-qmp-schema", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -21625,7 +21608,7 @@ "meta-type": "object" } ], - "id": "libvirt-44" + "id": "libvirt-43" } { diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml index 85848ecdae..7e3890e26e 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml @@ -45,7 +45,6 @@ - @@ -170,7 +169,7 @@ 2012050 0 - 446558 + 446365 v2.12.0-1689-g518d23a ppc64 diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies index b35582157c..97eeec3dbc 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies +++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies @@ -562,26 +562,9 @@ "id": "libvirt-4" } -{ - "execute": "add-fd", - "arguments": { - "fdset-id": 0, - "opaque": "/dev/null" - }, - "id": "libvirt-5" -} - -{ - "return": { - "fd": 15, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - { "execute": "query-kvm", - "id": "libvirt-6" + "id": "libvirt-5" } { @@ -589,12 +572,12 @@ "enabled": false, "present": false }, - "id": "libvirt-6" + "id": "libvirt-5" } { "execute": "query-events", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -723,12 +706,12 @@ "name": "SHUTDOWN" } ], - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "qom-list-types", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -1214,7 +1197,7 @@ "parent": "scsi-disk-base" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -1222,11 +1205,11 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-9" + "id": "libvirt-8" } { - "id": "libvirt-9", + "id": "libvirt-8", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-blk-pci' not found" @@ -1238,11 +1221,11 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { - "id": "libvirt-10", + "id": "libvirt-9", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-pci' not found" @@ -1254,11 +1237,11 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { - "id": "libvirt-11", + "id": "libvirt-10", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-pci' not found" @@ -1270,11 +1253,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-12" + "id": "libvirt-11" } { - "id": "libvirt-12", + "id": "libvirt-11", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -1286,11 +1269,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -1302,11 +1285,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" @@ -1318,11 +1301,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -1334,11 +1317,11 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" @@ -1350,7 +1333,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -1468,7 +1451,7 @@ "type": "uint32" } ], - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -1476,11 +1459,11 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-18" + "id": "libvirt-17" } { - "id": "libvirt-18", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'ide-drive' not found" @@ -1492,11 +1475,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-19" + "id": "libvirt-18" } { - "id": "libvirt-19", + "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -1508,11 +1491,11 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-20" + "id": "libvirt-19" } { - "id": "libvirt-20", + "id": "libvirt-19", "error": { "class": "DeviceNotFound", "desc": "Device 'usb-host' not found" @@ -1524,7 +1507,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -1555,7 +1538,7 @@ "type": "uint32" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -1563,11 +1546,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-22" + "id": "libvirt-21" } { - "id": "libvirt-22", + "id": "libvirt-21", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -1579,11 +1562,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-23" + "id": "libvirt-22" } { - "id": "libvirt-23", + "id": "libvirt-22", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -1595,11 +1578,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-24" + "id": "libvirt-23" } { - "id": "libvirt-24", + "id": "libvirt-23", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -1611,11 +1594,11 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-25" + "id": "libvirt-24" } { - "id": "libvirt-25", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-gpu-pci' not found" @@ -1627,7 +1610,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -1674,7 +1657,7 @@ "type": "size" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -1682,11 +1665,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-27" + "id": "libvirt-26" } { - "id": "libvirt-27", + "id": "libvirt-26", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -1698,11 +1681,11 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-28" + "id": "libvirt-27" } { - "id": "libvirt-28", + "id": "libvirt-27", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-pci' not found" @@ -1714,11 +1697,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-29" + "id": "libvirt-28" } { - "id": "libvirt-29", + "id": "libvirt-28", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -1730,7 +1713,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -1774,7 +1757,7 @@ "type": "bool" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -1782,7 +1765,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -1832,7 +1815,7 @@ "type": "string" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -1840,11 +1823,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" @@ -1853,7 +1836,7 @@ { "execute": "query-machines", - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -1890,23 +1873,23 @@ "cpu-max": 1 } ], - "id": "libvirt-33" + "id": "libvirt-32" } { "execute": "query-tpm-models", - "id": "libvirt-34" + "id": "libvirt-33" } { "return": [ ], - "id": "libvirt-34" + "id": "libvirt-33" } { "execute": "query-tpm-types", - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -1914,12 +1897,12 @@ "passthrough", "emulator" ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-command-line-options", - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -3044,12 +3027,12 @@ "option": "drive" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-migrate-capabilities", - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -3119,12 +3102,12 @@ "capability": "late-block-activate" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-qmp-schema", - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -14799,5 +14782,5 @@ "meta-type": "object" } ], - "id": "libvirt-38" + "id": "libvirt-37" } diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml index f3afc369e5..839dd95181 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml @@ -20,7 +20,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies index 1f12c26583..23188fffb6 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies +++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies @@ -562,26 +562,9 @@ "id": "libvirt-4" } -{ - "execute": "add-fd", - "arguments": { - "fdset-id": 0, - "opaque": "/dev/null" - }, - "id": "libvirt-5" -} - -{ - "return": { - "fd": 15, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - { "execute": "query-kvm", - "id": "libvirt-6" + "id": "libvirt-5" } { @@ -589,12 +572,12 @@ "enabled": false, "present": false }, - "id": "libvirt-6" + "id": "libvirt-5" } { "execute": "query-events", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -723,12 +706,12 @@ "name": "SHUTDOWN" } ], - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "qom-list-types", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -1214,7 +1197,7 @@ "parent": "scsi-disk-base" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -1222,11 +1205,11 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-9" + "id": "libvirt-8" } { - "id": "libvirt-9", + "id": "libvirt-8", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-blk-pci' not found" @@ -1238,11 +1221,11 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { - "id": "libvirt-10", + "id": "libvirt-9", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-pci' not found" @@ -1254,11 +1237,11 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { - "id": "libvirt-11", + "id": "libvirt-10", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-pci' not found" @@ -1270,11 +1253,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-12" + "id": "libvirt-11" } { - "id": "libvirt-12", + "id": "libvirt-11", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -1286,11 +1269,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -1302,11 +1285,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" @@ -1318,11 +1301,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -1334,11 +1317,11 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" @@ -1350,7 +1333,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -1468,7 +1451,7 @@ "type": "uint32" } ], - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -1476,11 +1459,11 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-18" + "id": "libvirt-17" } { - "id": "libvirt-18", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'ide-drive' not found" @@ -1492,11 +1475,11 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-19" + "id": "libvirt-18" } { - "id": "libvirt-19", + "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -1508,11 +1491,11 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-20" + "id": "libvirt-19" } { - "id": "libvirt-20", + "id": "libvirt-19", "error": { "class": "DeviceNotFound", "desc": "Device 'usb-host' not found" @@ -1524,7 +1507,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -1555,7 +1538,7 @@ "type": "uint32" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -1563,11 +1546,11 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-22" + "id": "libvirt-21" } { - "id": "libvirt-22", + "id": "libvirt-21", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -1579,11 +1562,11 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-23" + "id": "libvirt-22" } { - "id": "libvirt-23", + "id": "libvirt-22", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -1595,11 +1578,11 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-24" + "id": "libvirt-23" } { - "id": "libvirt-24", + "id": "libvirt-23", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -1611,11 +1594,11 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-25" + "id": "libvirt-24" } { - "id": "libvirt-25", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-gpu-pci' not found" @@ -1627,7 +1610,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -1674,7 +1657,7 @@ "type": "size" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -1682,11 +1665,11 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-27" + "id": "libvirt-26" } { - "id": "libvirt-27", + "id": "libvirt-26", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -1698,11 +1681,11 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-28" + "id": "libvirt-27" } { - "id": "libvirt-28", + "id": "libvirt-27", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-pci' not found" @@ -1714,11 +1697,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-29" + "id": "libvirt-28" } { - "id": "libvirt-29", + "id": "libvirt-28", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -1730,7 +1713,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -1774,7 +1757,7 @@ "type": "bool" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -1782,7 +1765,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -1832,7 +1815,7 @@ "type": "string" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -1840,11 +1823,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" @@ -1853,7 +1836,7 @@ { "execute": "query-machines", - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -1890,23 +1873,23 @@ "cpu-max": 1 } ], - "id": "libvirt-33" + "id": "libvirt-32" } { "execute": "query-tpm-models", - "id": "libvirt-34" + "id": "libvirt-33" } { "return": [ ], - "id": "libvirt-34" + "id": "libvirt-33" } { "execute": "query-tpm-types", - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -1914,12 +1897,12 @@ "passthrough", "emulator" ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-command-line-options", - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -3044,12 +3027,12 @@ "option": "drive" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-migrate-capabilities", - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -3119,12 +3102,12 @@ "capability": "late-block-activate" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-qmp-schema", - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -14799,5 +14782,5 @@ "meta-type": "object" } ], - "id": "libvirt-38" + "id": "libvirt-37" } diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml index a9cb6822bb..764d0d51fa 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml @@ -20,7 +20,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies index f1b469f0f4..fdab682f94 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies @@ -583,26 +583,9 @@ "id": "libvirt-4" } -{ - "execute": "add-fd", - "arguments": { - "fdset-id": 0, - "opaque": "/dev/null" - }, - "id": "libvirt-5" -} - -{ - "return": { - "fd": 17, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - { "execute": "query-kvm", - "id": "libvirt-6" + "id": "libvirt-5" } { @@ -610,12 +593,12 @@ "enabled": true, "present": true }, - "id": "libvirt-6" + "id": "libvirt-5" } { "execute": "query-events", - "id": "libvirt-7" + "id": "libvirt-6" } { @@ -744,12 +727,12 @@ "name": "SHUTDOWN" } ], - "id": "libvirt-7" + "id": "libvirt-6" } { "execute": "qom-list-types", - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -2415,7 +2398,7 @@ "parent": "rng-backend" } ], - "id": "libvirt-8" + "id": "libvirt-7" } { @@ -2423,7 +2406,7 @@ "arguments": { "typename": "virtio-blk-pci" }, - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2655,7 +2638,7 @@ "type": "str" } ], - "id": "libvirt-9" + "id": "libvirt-8" } { @@ -2663,7 +2646,7 @@ "arguments": { "typename": "virtio-net-pci" }, - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2953,7 +2936,7 @@ "type": "uint16" } ], - "id": "libvirt-10" + "id": "libvirt-9" } { @@ -2961,7 +2944,7 @@ "arguments": { "typename": "virtio-scsi-pci" }, - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -3126,7 +3109,7 @@ "type": "str" } ], - "id": "libvirt-11" + "id": "libvirt-10" } { @@ -3134,11 +3117,11 @@ "arguments": { "typename": "virtio-net-ccw" }, - "id": "libvirt-12" + "id": "libvirt-11" } { - "id": "libvirt-12", + "id": "libvirt-11", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -3150,11 +3133,11 @@ "arguments": { "typename": "virtio-scsi-ccw" }, - "id": "libvirt-13" + "id": "libvirt-12" } { - "id": "libvirt-13", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -3166,11 +3149,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" @@ -3182,11 +3165,11 @@ "arguments": { "typename": "pci-assign" }, - "id": "libvirt-15" + "id": "libvirt-14" } { - "id": "libvirt-15", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -3198,11 +3181,11 @@ "arguments": { "typename": "kvm-pci-assign" }, - "id": "libvirt-16" + "id": "libvirt-15" } { - "id": "libvirt-16", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" @@ -3214,7 +3197,7 @@ "arguments": { "typename": "vfio-pci" }, - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -3348,7 +3331,7 @@ "type": "str" } ], - "id": "libvirt-17" + "id": "libvirt-16" } { @@ -3356,7 +3339,7 @@ "arguments": { "typename": "scsi-disk" }, - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -3474,7 +3457,7 @@ "type": "uint32" } ], - "id": "libvirt-18" + "id": "libvirt-17" } { @@ -3482,7 +3465,7 @@ "arguments": { "typename": "ide-drive" }, - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -3558,7 +3541,7 @@ "type": "uint16" } ], - "id": "libvirt-19" + "id": "libvirt-18" } { @@ -3566,7 +3549,7 @@ "arguments": { "typename": "PIIX4_PM" }, - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -3629,7 +3612,7 @@ "type": "int32" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -3637,7 +3620,7 @@ "arguments": { "typename": "usb-redir" }, - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -3686,7 +3669,7 @@ "type": "bool" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { @@ -3694,7 +3677,7 @@ "arguments": { "typename": "usb-host" }, - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -3763,7 +3746,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-21" } { @@ -3771,7 +3754,7 @@ "arguments": { "typename": "scsi-generic" }, - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3802,7 +3785,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-22" } { @@ -3810,7 +3793,7 @@ "arguments": { "typename": "i440FX-pcihost" }, - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -3852,7 +3835,7 @@ "type": "bool" } ], - "id": "libvirt-24" + "id": "libvirt-23" } { @@ -3860,7 +3843,7 @@ "arguments": { "typename": "q35-pcihost" }, - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -3942,7 +3925,7 @@ "type": "uint64" } ], - "id": "libvirt-25" + "id": "libvirt-24" } { @@ -3950,7 +3933,7 @@ "arguments": { "typename": "usb-storage" }, - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -4033,7 +4016,7 @@ "type": "uint16" } ], - "id": "libvirt-26" + "id": "libvirt-25" } { @@ -4041,7 +4024,7 @@ "arguments": { "typename": "kvm-pit" }, - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -4055,7 +4038,7 @@ "type": "LostTickPolicy" } ], - "id": "libvirt-27" + "id": "libvirt-26" } { @@ -4063,7 +4046,7 @@ "arguments": { "typename": "VGA" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -4124,7 +4107,7 @@ "type": "bool" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -4132,7 +4115,7 @@ "arguments": { "typename": "vmware-svga" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -4179,7 +4162,7 @@ "type": "bool" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -4187,7 +4170,7 @@ "arguments": { "typename": "qxl" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -4286,7 +4269,7 @@ "type": "uint32" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -4294,7 +4277,7 @@ "arguments": { "typename": "virtio-gpu-pci" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -4455,7 +4438,7 @@ "type": "str" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -4463,7 +4446,7 @@ "arguments": { "typename": "virtio-gpu-device" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -4520,7 +4503,7 @@ "type": "size" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -4528,7 +4511,7 @@ "arguments": { "typename": "ICH9-LPC" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -4624,7 +4607,7 @@ "type": "uint32" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -4632,7 +4615,7 @@ "arguments": { "typename": "virtio-balloon-pci" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -4775,7 +4758,7 @@ "type": "str" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -4783,11 +4766,11 @@ "arguments": { "typename": "virtio-balloon-ccw" }, - "id": "libvirt-35" + "id": "libvirt-34" } { - "id": "libvirt-35", + "id": "libvirt-34", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -4799,7 +4782,7 @@ "arguments": { "typename": "virtio-balloon-device" }, - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -4843,7 +4826,7 @@ "type": "bool" } ], - "id": "libvirt-36" + "id": "libvirt-35" } { @@ -4851,7 +4834,7 @@ "arguments": { "typename": "nec-usb-xhci" }, - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -4931,7 +4914,7 @@ "type": "uint32" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -4939,7 +4922,7 @@ "arguments": { "typename": "intel-iommu" }, - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -4978,7 +4961,7 @@ "type": "bool" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -4986,7 +4969,7 @@ "arguments": { "typename": "mch" }, - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -5029,7 +5012,7 @@ "type": "int32" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -5037,7 +5020,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -5087,7 +5070,7 @@ "type": "string" } ], - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -5095,11 +5078,11 @@ "arguments": { "typename": "spapr-machine" }, - "id": "libvirt-41" + "id": "libvirt-40" } { - "id": "libvirt-41", + "id": "libvirt-40", "error": { "class": "DeviceNotFound", "desc": "Class 'spapr-machine' not found" @@ -5108,7 +5091,7 @@ { "execute": "query-machines", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -5317,12 +5300,12 @@ "cpu-max": 255 } ], - "id": "libvirt-42" + "id": "libvirt-41" } { "execute": "query-cpu-definitions", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -5759,12 +5742,12 @@ "migration-safe": true } ], - "id": "libvirt-43" + "id": "libvirt-42" } { "execute": "query-tpm-models", - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -5772,12 +5755,12 @@ "tpm-crb", "tpm-tis" ], - "id": "libvirt-44" + "id": "libvirt-43" } { "execute": "query-tpm-types", - "id": "libvirt-45" + "id": "libvirt-44" } { @@ -5785,12 +5768,12 @@ "passthrough", "emulator" ], - "id": "libvirt-45" + "id": "libvirt-44" } { "execute": "query-command-line-options", - "id": "libvirt-46" + "id": "libvirt-45" } { @@ -7089,12 +7072,12 @@ "option": "drive" } ], - "id": "libvirt-46" + "id": "libvirt-45" } { "execute": "query-migrate-capabilities", - "id": "libvirt-47" + "id": "libvirt-46" } { @@ -7164,12 +7147,12 @@ "capability": "late-block-activate" } ], - "id": "libvirt-47" + "id": "libvirt-46" } { "execute": "query-qmp-schema", - "id": "libvirt-48" + "id": "libvirt-47" } { @@ -19049,7 +19032,7 @@ "meta-type": "object" } ], - "id": "libvirt-48" + "id": "libvirt-47" } { @@ -19060,7 +19043,7 @@ "name": "host" } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -19253,7 +19236,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -19448,7 +19431,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -19711,7 +19694,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -19725,7 +19708,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { @@ -19918,7 +19901,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { @@ -20113,7 +20096,7 @@ } } }, - "id": "libvirt-52" + "id": "libvirt-51" } { @@ -20376,16 +20359,16 @@ } } }, - "id": "libvirt-52" + "id": "libvirt-51" } { "execute": "query-sev-capabilities", - "id": "libvirt-53" + "id": "libvirt-52" } { - "id": "libvirt-53", + "id": "libvirt-52", "error": { "class": "GenericError", "desc": "SEV feature is not available" diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml index 7f813228c9..9e3f562986 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml @@ -59,7 +59,6 @@ - @@ -216,7 +215,7 @@ 3000000 0 - 427584 + 427391 v3.0.0 x86_64 diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 06b62b91ae..82b5b7bbea 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2118,10 +2118,8 @@ mymain(void) QEMU_CAPS_KVM); DO_TEST("tpm-passthrough", - QEMU_CAPS_ADD_FD, QEMU_CAPS_DEVICE_TPM_PASSTHROUGH, QEMU_CAPS_DEVICE_TPM_TIS); DO_TEST("tpm-passthrough-crb", - QEMU_CAPS_ADD_FD, QEMU_CAPS_DEVICE_TPM_PASSTHROUGH, QEMU_CAPS_DEVICE_TPM_CRB); DO_TEST_PARSE_ERROR("tpm-no-backend-invalid", QEMU_CAPS_DEVICE_TPM_PASSTHROUGH, QEMU_CAPS_DEVICE_TPM_TIS);