diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index b5eb8cf46a..4dec0046df 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1838,25 +1838,25 @@ static struct virQEMUCapsObjectTypeProps virQEMUCapsObjectProps[] = { -1 }, { "virtio-net-pci", virQEMUCapsObjectPropsVirtioNet, ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtioNet), - -1 }, + QEMU_CAPS_DEVICE_VIRTIO_NET }, { "virtio-scsi-pci", virQEMUCapsObjectPropsVirtioSCSI, ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtioSCSI), - -1 }, + QEMU_CAPS_VIRTIO_SCSI }, { "virtio-blk-ccw", virQEMUCapsObjectPropsVirtioBlk, ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtioBlk), - -1 }, + QEMU_CAPS_VIRTIO_CCW }, { "virtio-net-ccw", virQEMUCapsObjectPropsVirtioNet, ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtioNet), - -1 }, + QEMU_CAPS_DEVICE_VIRTIO_NET }, { "virtio-scsi-ccw", virQEMUCapsObjectPropsVirtioSCSI, ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtioSCSI), - -1 }, + QEMU_CAPS_VIRTIO_SCSI }, { "virtio-blk-s390", virQEMUCapsObjectPropsVirtioBlk, ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtioBlk), - -1 }, + QEMU_CAPS_VIRTIO_S390 }, { "virtio-net-s390", virQEMUCapsObjectPropsVirtioNet, ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtioNet), - -1 }, + QEMU_CAPS_DEVICE_VIRTIO_NET }, { "pci-assign", virQEMUCapsObjectPropsPCIAssign, ARRAY_CARDINALITY(virQEMUCapsObjectPropsPCIAssign), -1 }, @@ -1865,7 +1865,7 @@ static struct virQEMUCapsObjectTypeProps virQEMUCapsObjectProps[] = { -1 }, { "vfio-pci", virQEMUCapsObjectPropsVfioPCI, ARRAY_CARDINALITY(virQEMUCapsObjectPropsVfioPCI), - -1 }, + QEMU_CAPS_DEVICE_VFIO_PCI }, { "scsi-disk", virQEMUCapsObjectPropsSCSIDisk, ARRAY_CARDINALITY(virQEMUCapsObjectPropsSCSIDisk), -1 }, @@ -1877,13 +1877,13 @@ static struct virQEMUCapsObjectTypeProps virQEMUCapsObjectProps[] = { -1 }, { "usb-redir", virQEMUCapsObjectPropsUSBRedir, ARRAY_CARDINALITY(virQEMUCapsObjectPropsUSBRedir), - -1 }, + QEMU_CAPS_USB_REDIR }, { "usb-host", virQEMUCapsObjectPropsUSBHost, ARRAY_CARDINALITY(virQEMUCapsObjectPropsUSBHost), -1 }, { "scsi-generic", virQEMUCapsObjectPropsSCSIGeneric, ARRAY_CARDINALITY(virQEMUCapsObjectPropsSCSIGeneric), - -1 }, + QEMU_CAPS_DEVICE_SCSI_GENERIC }, { "i440FX-pcihost", virQEMUCapsObjectPropsI440FXPCIHost, ARRAY_CARDINALITY(virQEMUCapsObjectPropsI440FXPCIHost), -1 }, @@ -1892,25 +1892,25 @@ static struct virQEMUCapsObjectTypeProps virQEMUCapsObjectProps[] = { -1 }, { "usb-storage", virQEMUCapsObjectPropsUSBStorage, ARRAY_CARDINALITY(virQEMUCapsObjectPropsUSBStorage), - -1 }, + QEMU_CAPS_DEVICE_USB_STORAGE }, { "kvm-pit", virQEMUCapsObjectPropsKVMPit, ARRAY_CARDINALITY(virQEMUCapsObjectPropsKVMPit), -1 }, { "VGA", virQEMUCapsObjectPropsVGA, ARRAY_CARDINALITY(virQEMUCapsObjectPropsVGA), - -1 }, + QEMU_CAPS_DEVICE_VGA }, { "vmware-svga", virQEMUCapsObjectPropsVmwareSvga, ARRAY_CARDINALITY(virQEMUCapsObjectPropsVmwareSvga), - -1 }, + QEMU_CAPS_DEVICE_VMWARE_SVGA }, { "qxl", virQEMUCapsObjectPropsQxl, ARRAY_CARDINALITY(virQEMUCapsObjectPropsQxl), - -1 }, + QEMU_CAPS_DEVICE_QXL }, { "virtio-gpu-pci", virQEMUCapsObjectPropsVirtioGpu, ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtioGpu), - -1 }, + QEMU_CAPS_DEVICE_VIRTIO_GPU }, { "virtio-gpu-device", virQEMUCapsObjectPropsVirtioGpu, ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtioGpu), - -1 }, + QEMU_CAPS_DEVICE_VIRTIO_GPU }, { "ICH9-LPC", virQEMUCapsObjectPropsICH9, ARRAY_CARDINALITY(virQEMUCapsObjectPropsICH9), -1 }, @@ -1925,7 +1925,7 @@ static struct virQEMUCapsObjectTypeProps virQEMUCapsObjectProps[] = { -1 }, { "nec-usb-xhci", virQEMUCapsObjectPropsUSBNECXHCI, ARRAY_CARDINALITY(virQEMUCapsObjectPropsUSBNECXHCI), - -1 }, + QEMU_CAPS_NEC_USB_XHCI }, { "intel-iommu", virQEMUCapsObjectPropsIntelIOMMU, ARRAY_CARDINALITY(virQEMUCapsObjectPropsIntelIOMMU), QEMU_CAPS_DEVICE_INTEL_IOMMU }, diff --git a/tests/qemucapabilitiesdata/caps_1.2.2.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.2.2.x86_64.replies index 62c31774c0..a3a9510511 100644 --- a/tests/qemucapabilitiesdata/caps_1.2.2.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_1.2.2.x86_64.replies @@ -1086,7 +1086,7 @@ "id": "libvirt-12", "error": { "class": "DeviceNotFound", - "desc": "Device 'virtio-blk-ccw' not found" + "desc": "Device 'virtio-net-ccw' not found" } } @@ -1094,7 +1094,7 @@ "id": "libvirt-13", "error": { "class": "DeviceNotFound", - "desc": "Device 'virtio-net-ccw' not found" + "desc": "Device 'virtio-scsi-ccw' not found" } } @@ -1102,7 +1102,7 @@ "id": "libvirt-14", "error": { "class": "DeviceNotFound", - "desc": "Device 'virtio-scsi-ccw' not found" + "desc": "Device 'virtio-net-s390' not found" } } @@ -1110,42 +1110,18 @@ "id": "libvirt-15", "error": { "class": "DeviceNotFound", - "desc": "Device 'virtio-blk-s390' not found" + "desc": "Device 'pci-assign' not found" } } { "id": "libvirt-16", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-net-s390' not found" - } -} - -{ - "id": "libvirt-17", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'pci-assign' not found" - } -} - -{ - "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" } } -{ - "id": "libvirt-19", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'vfio-pci' not found" - } -} - { "return": [ { @@ -1217,7 +1193,7 @@ "type": "drive" } ], - "id": "libvirt-20" + "id": "libvirt-17" } { @@ -1271,7 +1247,7 @@ "type": "drive" } ], - "id": "libvirt-21" + "id": "libvirt-18" } { @@ -1313,15 +1289,7 @@ "type": "uint32" } ], - "id": "libvirt-22" -} - -{ - "id": "libvirt-23", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'usb-redir' not found" - } + "id": "libvirt-19" } { @@ -1367,7 +1335,7 @@ "type": "uint32" } ], - "id": "libvirt-24" + "id": "libvirt-20" } { @@ -1393,17 +1361,17 @@ "type": "drive" } ], - "id": "libvirt-25" + "id": "libvirt-21" } { "return": [ ], - "id": "libvirt-26" + "id": "libvirt-22" } { - "id": "libvirt-27", + "id": "libvirt-23", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -1457,7 +1425,7 @@ "type": "drive" } ], - "id": "libvirt-28" + "id": "libvirt-24" } { @@ -1471,7 +1439,7 @@ "type": "hex32" } ], - "id": "libvirt-29" + "id": "libvirt-25" } { @@ -1501,7 +1469,7 @@ "type": "uint32" } ], - "id": "libvirt-30" + "id": "libvirt-26" } { @@ -1531,7 +1499,7 @@ "type": "uint32" } ], - "id": "libvirt-31" + "id": "libvirt-27" } { @@ -1597,27 +1565,11 @@ "type": "uint32" } ], - "id": "libvirt-32" + "id": "libvirt-28" } { - "id": "libvirt-33", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-gpu-pci' not found" - } -} - -{ - "id": "libvirt-34", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-gpu-device' not found" - } -} - -{ - "id": "libvirt-35", + "id": "libvirt-29", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -1659,11 +1611,11 @@ "type": "on/off" } ], - "id": "libvirt-36" + "id": "libvirt-30" } { - "id": "libvirt-37", + "id": "libvirt-31", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -1671,7 +1623,7 @@ } { - "id": "libvirt-38", + "id": "libvirt-32", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-device' not found" @@ -1705,7 +1657,7 @@ "type": "uint32" } ], - "id": "libvirt-39" + "id": "libvirt-33" } { @@ -1746,7 +1698,7 @@ "name": "none" } ], - "id": "libvirt-40" + "id": "libvirt-34" } { @@ -1818,11 +1770,11 @@ "name": "Opteron_G4" } ], - "id": "libvirt-41" + "id": "libvirt-35" } { - "id": "libvirt-42", + "id": "libvirt-36", "error": { "class": "CommandNotFound", "desc": "The command query-tpm-models has not been found" @@ -1830,7 +1782,7 @@ } { - "id": "libvirt-43", + "id": "libvirt-37", "error": { "class": "CommandNotFound", "desc": "The command query-tpm-types has not been found" @@ -1838,7 +1790,7 @@ } { - "id": "libvirt-44", + "id": "libvirt-38", "error": { "class": "CommandNotFound", "desc": "The command query-command-line-options has not been found" @@ -1852,7 +1804,7 @@ "capability": "xbzrle" } ], - "id": "libvirt-45" + "id": "libvirt-39" } { diff --git a/tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml index 3001d487c6..f361944a1c 100644 --- a/tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml @@ -112,7 +112,7 @@ 1002002 0 - 26900 + 26169 x86_64 diff --git a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.replies index a5729740e2..fc97bfcf9f 100644 --- a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.replies @@ -1190,7 +1190,7 @@ "id": "libvirt-13", "error": { "class": "DeviceNotFound", - "desc": "Device 'virtio-blk-ccw' not found" + "desc": "Device 'virtio-net-ccw' not found" } } @@ -1198,28 +1198,12 @@ "id": "libvirt-14", "error": { "class": "DeviceNotFound", - "desc": "Device 'virtio-net-ccw' not found" + "desc": "Device 'virtio-scsi-ccw' not found" } } { "id": "libvirt-15", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-scsi-ccw' not found" - } -} - -{ - "id": "libvirt-16", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-blk-s390' not found" - } -} - -{ - "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -1227,7 +1211,7 @@ } { - "id": "libvirt-18", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -1277,7 +1261,7 @@ "type": "pci-host-devaddr" } ], - "id": "libvirt-19" + "id": "libvirt-17" } { @@ -1311,7 +1295,7 @@ "type": "pci-host-devaddr" } ], - "id": "libvirt-20" + "id": "libvirt-18" } { @@ -1385,7 +1369,7 @@ "type": "drive" } ], - "id": "libvirt-21" + "id": "libvirt-19" } { @@ -1439,7 +1423,7 @@ "type": "drive" } ], - "id": "libvirt-22" + "id": "libvirt-20" } { @@ -1481,7 +1465,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-21" } { @@ -1511,7 +1495,7 @@ "type": "chr" } ], - "id": "libvirt-24" + "id": "libvirt-22" } { @@ -1557,7 +1541,7 @@ "type": "uint32" } ], - "id": "libvirt-25" + "id": "libvirt-23" } { @@ -1583,13 +1567,13 @@ "type": "drive" } ], - "id": "libvirt-26" + "id": "libvirt-24" } { "return": [ ], - "id": "libvirt-27" + "id": "libvirt-25" } { @@ -1599,7 +1583,7 @@ "type": "uint64" } ], - "id": "libvirt-28" + "id": "libvirt-26" } { @@ -1649,7 +1633,7 @@ "type": "drive" } ], - "id": "libvirt-29" + "id": "libvirt-27" } { @@ -1663,7 +1647,7 @@ "type": "hex32" } ], - "id": "libvirt-30" + "id": "libvirt-28" } { @@ -1697,7 +1681,7 @@ "type": "uint32" } ], - "id": "libvirt-31" + "id": "libvirt-29" } { @@ -1727,7 +1711,7 @@ "type": "uint32" } ], - "id": "libvirt-32" + "id": "libvirt-30" } { @@ -1797,27 +1781,11 @@ "type": "uint32" } ], - "id": "libvirt-33" + "id": "libvirt-31" } { - "id": "libvirt-34", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-gpu-pci' not found" - } -} - -{ - "id": "libvirt-35", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-gpu-device' not found" - } -} - -{ - "id": "libvirt-36", + "id": "libvirt-32", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -1859,11 +1827,11 @@ "type": "on/off" } ], - "id": "libvirt-37" + "id": "libvirt-33" } { - "id": "libvirt-38", + "id": "libvirt-34", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -1871,7 +1839,7 @@ } { - "id": "libvirt-39", + "id": "libvirt-35", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-device' not found" @@ -1925,7 +1893,7 @@ "type": "on/off" } ], - "id": "libvirt-40" + "id": "libvirt-36" } { @@ -1973,7 +1941,7 @@ "name": "none" } ], - "id": "libvirt-41" + "id": "libvirt-37" } { @@ -2051,11 +2019,11 @@ "name": "Opteron_G5" } ], - "id": "libvirt-42" + "id": "libvirt-38" } { - "id": "libvirt-43", + "id": "libvirt-39", "error": { "class": "CommandNotFound", "desc": "The command query-tpm-models has not been found" @@ -2063,7 +2031,7 @@ } { - "id": "libvirt-44", + "id": "libvirt-40", "error": { "class": "CommandNotFound", "desc": "The command query-tpm-types has not been found" @@ -2071,7 +2039,7 @@ } { - "id": "libvirt-45", + "id": "libvirt-41", "error": { "class": "CommandNotFound", "desc": "The command query-command-line-options has not been found" @@ -2085,7 +2053,7 @@ "capability": "xbzrle" } ], - "id": "libvirt-46" + "id": "libvirt-42" } { diff --git a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml index 283f30ef07..d6db1ae226 100644 --- a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml @@ -130,7 +130,7 @@ 1003001 0 - 30198 + 29702 x86_64 diff --git a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.replies index 01c75f0d1e..3c96aa71ed 100644 --- a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.replies @@ -1237,7 +1237,7 @@ "id": "libvirt-13", "error": { "class": "DeviceNotFound", - "desc": "Device 'virtio-blk-ccw' not found" + "desc": "Device 'virtio-net-ccw' not found" } } @@ -1245,28 +1245,12 @@ "id": "libvirt-14", "error": { "class": "DeviceNotFound", - "desc": "Device 'virtio-net-ccw' not found" + "desc": "Device 'virtio-scsi-ccw' not found" } } { "id": "libvirt-15", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-scsi-ccw' not found" - } -} - -{ - "id": "libvirt-16", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-blk-s390' not found" - } -} - -{ - "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -1274,7 +1258,7 @@ } { - "id": "libvirt-18", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -1324,7 +1308,7 @@ "type": "pci-host-devaddr" } ], - "id": "libvirt-19" + "id": "libvirt-17" } { @@ -1358,7 +1342,7 @@ "type": "pci-host-devaddr" } ], - "id": "libvirt-20" + "id": "libvirt-18" } { @@ -1432,7 +1416,7 @@ "type": "drive" } ], - "id": "libvirt-21" + "id": "libvirt-19" } { @@ -1486,7 +1470,7 @@ "type": "drive" } ], - "id": "libvirt-22" + "id": "libvirt-20" } { @@ -1528,7 +1512,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-21" } { @@ -1558,7 +1542,7 @@ "type": "chr" } ], - "id": "libvirt-24" + "id": "libvirt-22" } { @@ -1604,7 +1588,7 @@ "type": "uint32" } ], - "id": "libvirt-25" + "id": "libvirt-23" } { @@ -1630,13 +1614,13 @@ "type": "drive" } ], - "id": "libvirt-26" + "id": "libvirt-24" } { "return": [ ], - "id": "libvirt-27" + "id": "libvirt-25" } { @@ -1646,7 +1630,7 @@ "type": "uint64" } ], - "id": "libvirt-28" + "id": "libvirt-26" } { @@ -1696,7 +1680,7 @@ "type": "drive" } ], - "id": "libvirt-29" + "id": "libvirt-27" } { @@ -1710,7 +1694,7 @@ "type": "hex32" } ], - "id": "libvirt-30" + "id": "libvirt-28" } { @@ -1744,7 +1728,7 @@ "type": "uint32" } ], - "id": "libvirt-31" + "id": "libvirt-29" } { @@ -1774,7 +1758,7 @@ "type": "uint32" } ], - "id": "libvirt-32" + "id": "libvirt-30" } { @@ -1844,27 +1828,11 @@ "type": "uint32" } ], - "id": "libvirt-33" + "id": "libvirt-31" } { - "id": "libvirt-34", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-gpu-pci' not found" - } -} - -{ - "id": "libvirt-35", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-gpu-device' not found" - } -} - -{ - "id": "libvirt-36", + "id": "libvirt-32", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -1906,11 +1874,11 @@ "type": "on/off" } ], - "id": "libvirt-37" + "id": "libvirt-33" } { - "id": "libvirt-38", + "id": "libvirt-34", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -1918,7 +1886,7 @@ } { - "id": "libvirt-39", + "id": "libvirt-35", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-device' not found" @@ -1972,7 +1940,7 @@ "type": "on/off" } ], - "id": "libvirt-40" + "id": "libvirt-36" } { @@ -2023,7 +1991,7 @@ "name": "none" } ], - "id": "libvirt-41" + "id": "libvirt-37" } { @@ -2101,11 +2069,11 @@ "name": "qemu64" } ], - "id": "libvirt-42" + "id": "libvirt-38" } { - "id": "libvirt-43", + "id": "libvirt-39", "error": { "class": "CommandNotFound", "desc": "The command query-tpm-models has not been found" @@ -2113,7 +2081,7 @@ } { - "id": "libvirt-44", + "id": "libvirt-40", "error": { "class": "CommandNotFound", "desc": "The command query-tpm-types has not been found" @@ -2121,7 +2089,7 @@ } { - "id": "libvirt-45", + "id": "libvirt-41", "error": { "class": "CommandNotFound", "desc": "The command query-command-line-options has not been found" @@ -2135,7 +2103,7 @@ "capability": "xbzrle" } ], - "id": "libvirt-46" + "id": "libvirt-42" } { diff --git a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml index 200069ae86..671ee93520 100644 --- a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml @@ -131,7 +131,7 @@ 1004002 0 - 30915 + 30419 x86_64 diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies index e8d76cfdef..8da1b149d0 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies @@ -1324,7 +1324,7 @@ "id": "libvirt-13", "error": { "class": "DeviceNotFound", - "desc": "Device 'virtio-blk-ccw' not found" + "desc": "Device 'virtio-net-ccw' not found" } } @@ -1332,28 +1332,12 @@ "id": "libvirt-14", "error": { "class": "DeviceNotFound", - "desc": "Device 'virtio-net-ccw' not found" + "desc": "Device 'virtio-scsi-ccw' not found" } } { "id": "libvirt-15", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-scsi-ccw' not found" - } -} - -{ - "id": "libvirt-16", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-blk-s390' not found" - } -} - -{ - "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -1361,7 +1345,7 @@ } { - "id": "libvirt-18", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -1411,7 +1395,7 @@ "type": "pci-host-devaddr" } ], - "id": "libvirt-19" + "id": "libvirt-17" } { @@ -1453,7 +1437,7 @@ "type": "pci-host-devaddr" } ], - "id": "libvirt-20" + "id": "libvirt-18" } { @@ -1527,7 +1511,7 @@ "type": "drive" } ], - "id": "libvirt-21" + "id": "libvirt-19" } { @@ -1581,7 +1565,7 @@ "type": "drive" } ], - "id": "libvirt-22" + "id": "libvirt-20" } { @@ -1623,7 +1607,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-21" } { @@ -1653,7 +1637,7 @@ "type": "chr" } ], - "id": "libvirt-24" + "id": "libvirt-22" } { @@ -1707,7 +1691,7 @@ "type": "uint32" } ], - "id": "libvirt-25" + "id": "libvirt-23" } { @@ -1733,13 +1717,13 @@ "type": "drive" } ], - "id": "libvirt-26" + "id": "libvirt-24" } { "return": [ ], - "id": "libvirt-27" + "id": "libvirt-25" } { @@ -1749,7 +1733,7 @@ "type": "uint64" } ], - "id": "libvirt-28" + "id": "libvirt-26" } { @@ -1799,7 +1783,7 @@ "type": "drive" } ], - "id": "libvirt-29" + "id": "libvirt-27" } { @@ -1813,7 +1797,7 @@ "type": "hex32" } ], - "id": "libvirt-30" + "id": "libvirt-28" } { @@ -1847,7 +1831,7 @@ "type": "uint32" } ], - "id": "libvirt-31" + "id": "libvirt-29" } { @@ -1877,7 +1861,7 @@ "type": "uint32" } ], - "id": "libvirt-32" + "id": "libvirt-30" } { @@ -1947,27 +1931,11 @@ "type": "uint32" } ], - "id": "libvirt-33" + "id": "libvirt-31" } { - "id": "libvirt-34", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-gpu-pci' not found" - } -} - -{ - "id": "libvirt-35", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-gpu-device' not found" - } -} - -{ - "id": "libvirt-36", + "id": "libvirt-32", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -2009,11 +1977,11 @@ "type": "on/off" } ], - "id": "libvirt-37" + "id": "libvirt-33" } { - "id": "libvirt-38", + "id": "libvirt-34", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -2023,7 +1991,7 @@ { "return": [ ], - "id": "libvirt-39" + "id": "libvirt-35" } { @@ -2073,7 +2041,7 @@ "type": "on/off" } ], - "id": "libvirt-40" + "id": "libvirt-36" } { @@ -2146,7 +2114,7 @@ "cpu-max": 1 } ], - "id": "libvirt-41" + "id": "libvirt-37" } { @@ -2224,19 +2192,19 @@ "name": "qemu64" } ], - "id": "libvirt-42" + "id": "libvirt-38" } { "return": [ ], - "id": "libvirt-43" + "id": "libvirt-39" } { "return": [ ], - "id": "libvirt-44" + "id": "libvirt-40" } { @@ -2937,7 +2905,7 @@ "option": "drive" } ], - "id": "libvirt-45" + "id": "libvirt-41" } { @@ -2947,7 +2915,7 @@ "capability": "xbzrle" } ], - "id": "libvirt-46" + "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 e02c0961cd..04c8016490 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml @@ -143,7 +143,7 @@ 1005003 0 - 47019 + 46523 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 eef8d30238..d53fb576d2 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies @@ -1353,7 +1353,7 @@ "id": "libvirt-13", "error": { "class": "DeviceNotFound", - "desc": "Device 'virtio-blk-ccw' not found" + "desc": "Device 'virtio-net-ccw' not found" } } @@ -1361,28 +1361,12 @@ "id": "libvirt-14", "error": { "class": "DeviceNotFound", - "desc": "Device 'virtio-net-ccw' not found" + "desc": "Device 'virtio-scsi-ccw' not found" } } { "id": "libvirt-15", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-scsi-ccw' not found" - } -} - -{ - "id": "libvirt-16", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-blk-s390' not found" - } -} - -{ - "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -1390,7 +1374,7 @@ } { - "id": "libvirt-18", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -1440,7 +1424,7 @@ "type": "pci-host-devaddr" } ], - "id": "libvirt-19" + "id": "libvirt-17" } { @@ -1482,7 +1466,7 @@ "type": "pci-host-devaddr" } ], - "id": "libvirt-20" + "id": "libvirt-18" } { @@ -1556,7 +1540,7 @@ "type": "drive" } ], - "id": "libvirt-21" + "id": "libvirt-19" } { @@ -1610,7 +1594,7 @@ "type": "drive" } ], - "id": "libvirt-22" + "id": "libvirt-20" } { @@ -1652,7 +1636,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-21" } { @@ -1686,7 +1670,7 @@ "type": "chr" } ], - "id": "libvirt-24" + "id": "libvirt-22" } { @@ -1744,7 +1728,7 @@ "type": "uint32" } ], - "id": "libvirt-25" + "id": "libvirt-23" } { @@ -1770,7 +1754,7 @@ "type": "drive" } ], - "id": "libvirt-26" + "id": "libvirt-24" } { @@ -1780,7 +1764,7 @@ "type": "size" } ], - "id": "libvirt-27" + "id": "libvirt-25" } { @@ -1794,7 +1778,7 @@ "type": "uint64" } ], - "id": "libvirt-28" + "id": "libvirt-26" } { @@ -1844,7 +1828,7 @@ "type": "drive" } ], - "id": "libvirt-29" + "id": "libvirt-27" } { @@ -1858,7 +1842,7 @@ "type": "hex32" } ], - "id": "libvirt-30" + "id": "libvirt-28" } { @@ -1892,7 +1876,7 @@ "type": "uint32" } ], - "id": "libvirt-31" + "id": "libvirt-29" } { @@ -1922,7 +1906,7 @@ "type": "uint32" } ], - "id": "libvirt-32" + "id": "libvirt-30" } { @@ -1992,27 +1976,11 @@ "type": "uint32" } ], - "id": "libvirt-33" + "id": "libvirt-31" } { - "id": "libvirt-34", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-gpu-pci' not found" - } -} - -{ - "id": "libvirt-35", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-gpu-device' not found" - } -} - -{ - "id": "libvirt-36", + "id": "libvirt-32", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -2054,11 +2022,11 @@ "type": "on/off" } ], - "id": "libvirt-37" + "id": "libvirt-33" } { - "id": "libvirt-38", + "id": "libvirt-34", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -2068,7 +2036,7 @@ { "return": [ ], - "id": "libvirt-39" + "id": "libvirt-35" } { @@ -2118,7 +2086,7 @@ "type": "on/off" } ], - "id": "libvirt-40" + "id": "libvirt-36" } { @@ -2199,7 +2167,7 @@ "cpu-max": 1 } ], - "id": "libvirt-41" + "id": "libvirt-37" } { @@ -2277,19 +2245,19 @@ "name": "qemu64" } ], - "id": "libvirt-42" + "id": "libvirt-38" } { "return": [ ], - "id": "libvirt-43" + "id": "libvirt-39" } { "return": [ ], - "id": "libvirt-44" + "id": "libvirt-40" } { @@ -2892,7 +2860,7 @@ "option": "drive" } ], - "id": "libvirt-45" + "id": "libvirt-41" } { @@ -2914,7 +2882,7 @@ "capability": "zero-blocks" } ], - "id": "libvirt-46" + "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 e3896685e9..d977bdb64b 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml @@ -148,7 +148,7 @@ 1006000 0 - 45248 + 44752 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 416ece1afb..4fcc7aa25a 100644 --- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies @@ -1362,7 +1362,7 @@ "id": "libvirt-13", "error": { "class": "DeviceNotFound", - "desc": "Device 'virtio-blk-ccw' not found" + "desc": "Device 'virtio-net-ccw' not found" } } @@ -1370,28 +1370,12 @@ "id": "libvirt-14", "error": { "class": "DeviceNotFound", - "desc": "Device 'virtio-net-ccw' not found" + "desc": "Device 'virtio-scsi-ccw' not found" } } { "id": "libvirt-15", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-scsi-ccw' not found" - } -} - -{ - "id": "libvirt-16", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-blk-s390' not found" - } -} - -{ - "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -1399,7 +1383,7 @@ } { - "id": "libvirt-18", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -1449,7 +1433,7 @@ "type": "pci-host-devaddr" } ], - "id": "libvirt-19" + "id": "libvirt-17" } { @@ -1491,7 +1475,7 @@ "type": "pci-host-devaddr" } ], - "id": "libvirt-20" + "id": "libvirt-18" } { @@ -1565,7 +1549,7 @@ "type": "drive" } ], - "id": "libvirt-21" + "id": "libvirt-19" } { @@ -1619,7 +1603,7 @@ "type": "drive" } ], - "id": "libvirt-22" + "id": "libvirt-20" } { @@ -1661,7 +1645,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-21" } { @@ -1695,7 +1679,7 @@ "type": "chr" } ], - "id": "libvirt-24" + "id": "libvirt-22" } { @@ -1753,7 +1737,7 @@ "type": "uint32" } ], - "id": "libvirt-25" + "id": "libvirt-23" } { @@ -1779,7 +1763,7 @@ "type": "drive" } ], - "id": "libvirt-26" + "id": "libvirt-24" } { @@ -1793,7 +1777,7 @@ "type": "size" } ], - "id": "libvirt-27" + "id": "libvirt-25" } { @@ -1811,7 +1795,7 @@ "type": "uint64" } ], - "id": "libvirt-28" + "id": "libvirt-26" } { @@ -1861,7 +1845,7 @@ "type": "drive" } ], - "id": "libvirt-29" + "id": "libvirt-27" } { @@ -1875,7 +1859,7 @@ "type": "hex32" } ], - "id": "libvirt-30" + "id": "libvirt-28" } { @@ -1909,7 +1893,7 @@ "type": "uint32" } ], - "id": "libvirt-31" + "id": "libvirt-29" } { @@ -1939,7 +1923,7 @@ "type": "uint32" } ], - "id": "libvirt-32" + "id": "libvirt-30" } { @@ -2009,27 +1993,11 @@ "type": "uint32" } ], - "id": "libvirt-33" + "id": "libvirt-31" } { - "id": "libvirt-34", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-gpu-pci' not found" - } -} - -{ - "id": "libvirt-35", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-gpu-device' not found" - } -} - -{ - "id": "libvirt-36", + "id": "libvirt-32", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -2071,11 +2039,11 @@ "type": "on/off" } ], - "id": "libvirt-37" + "id": "libvirt-33" } { - "id": "libvirt-38", + "id": "libvirt-34", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -2085,7 +2053,7 @@ { "return": [ ], - "id": "libvirt-39" + "id": "libvirt-35" } { @@ -2135,7 +2103,7 @@ "type": "on/off" } ], - "id": "libvirt-40" + "id": "libvirt-36" } { @@ -2224,7 +2192,7 @@ "cpu-max": 1 } ], - "id": "libvirt-41" + "id": "libvirt-37" } { @@ -2302,19 +2270,19 @@ "name": "qemu64" } ], - "id": "libvirt-42" + "id": "libvirt-38" } { "return": [ ], - "id": "libvirt-43" + "id": "libvirt-39" } { "return": [ ], - "id": "libvirt-44" + "id": "libvirt-40" } { @@ -3107,7 +3075,7 @@ "option": "drive" } ], - "id": "libvirt-45" + "id": "libvirt-41" } { @@ -3129,7 +3097,7 @@ "capability": "zero-blocks" } ], - "id": "libvirt-46" + "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 5b4d1ea661..687d29251b 100644 --- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml @@ -150,7 +150,7 @@ 1007000 0 - 50692 + 50196 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 52546ad3c9..543bce9def 100644 --- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies @@ -1629,7 +1629,7 @@ "id": "libvirt-13", "error": { "class": "DeviceNotFound", - "desc": "Device 'virtio-blk-ccw' not found" + "desc": "Device 'virtio-net-ccw' not found" } } @@ -1637,28 +1637,12 @@ "id": "libvirt-14", "error": { "class": "DeviceNotFound", - "desc": "Device 'virtio-net-ccw' not found" + "desc": "Device 'virtio-scsi-ccw' not found" } } { "id": "libvirt-15", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-scsi-ccw' not found" - } -} - -{ - "id": "libvirt-16", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-blk-s390' not found" - } -} - -{ - "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -1666,7 +1650,7 @@ } { - "id": "libvirt-18", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -1716,7 +1700,7 @@ "type": "pci-host-devaddr" } ], - "id": "libvirt-19" + "id": "libvirt-17" } { @@ -1758,7 +1742,7 @@ "type": "pci-host-devaddr" } ], - "id": "libvirt-20" + "id": "libvirt-18" } { @@ -1844,7 +1828,7 @@ "type": "drive" } ], - "id": "libvirt-21" + "id": "libvirt-19" } { @@ -1898,7 +1882,7 @@ "type": "drive" } ], - "id": "libvirt-22" + "id": "libvirt-20" } { @@ -1948,7 +1932,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-21" } { @@ -1986,7 +1970,7 @@ "type": "chr" } ], - "id": "libvirt-24" + "id": "libvirt-22" } { @@ -2048,7 +2032,7 @@ "type": "uint32" } ], - "id": "libvirt-25" + "id": "libvirt-23" } { @@ -2074,7 +2058,7 @@ "type": "drive" } ], - "id": "libvirt-26" + "id": "libvirt-24" } { @@ -2112,7 +2096,7 @@ "type": "size" } ], - "id": "libvirt-27" + "id": "libvirt-25" } { @@ -2162,7 +2146,7 @@ "type": "uint64" } ], - "id": "libvirt-28" + "id": "libvirt-26" } { @@ -2216,7 +2200,7 @@ "type": "drive" } ], - "id": "libvirt-29" + "id": "libvirt-27" } { @@ -2230,7 +2214,7 @@ "type": "uint32" } ], - "id": "libvirt-30" + "id": "libvirt-28" } { @@ -2264,7 +2248,7 @@ "type": "uint32" } ], - "id": "libvirt-31" + "id": "libvirt-29" } { @@ -2294,7 +2278,7 @@ "type": "uint32" } ], - "id": "libvirt-32" + "id": "libvirt-30" } { @@ -2364,23 +2348,7 @@ "type": "uint32" } ], - "id": "libvirt-33" -} - -{ - "id": "libvirt-34", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-gpu-pci' not found" - } -} - -{ - "id": "libvirt-35", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-gpu-device' not found" - } + "id": "libvirt-31" } { @@ -2434,7 +2402,7 @@ "type": "pci-devfn" } ], - "id": "libvirt-36" + "id": "libvirt-32" } { @@ -2484,11 +2452,11 @@ "type": "uint32" } ], - "id": "libvirt-37" + "id": "libvirt-33" } { - "id": "libvirt-38", + "id": "libvirt-34", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -2498,7 +2466,7 @@ { "return": [ ], - "id": "libvirt-39" + "id": "libvirt-35" } { @@ -2552,7 +2520,7 @@ "type": "on/off" } ], - "id": "libvirt-40" + "id": "libvirt-36" } { @@ -2657,7 +2625,7 @@ "cpu-max": 255 } ], - "id": "libvirt-41" + "id": "libvirt-37" } { @@ -2738,21 +2706,21 @@ "name": "qemu64" } ], - "id": "libvirt-42" + "id": "libvirt-38" } { "return": [ "tpm-tis" ], - "id": "libvirt-43" + "id": "libvirt-39" } { "return": [ "passthrough" ], - "id": "libvirt-44" + "id": "libvirt-40" } { @@ -3612,7 +3580,7 @@ "option": "drive" } ], - "id": "libvirt-45" + "id": "libvirt-41" } { @@ -3634,7 +3602,7 @@ "capability": "zero-blocks" } ], - "id": "libvirt-46" + "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 200e57adac..dd89b83005 100644 --- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml @@ -166,7 +166,7 @@ 2001001 0 - 59488 + 58992 x86_64 diff --git a/tests/qemucapabilitiesdata/caps_2.10.0-gicv2.aarch64.replies b/tests/qemucapabilitiesdata/caps_2.10.0-gicv2.aarch64.replies index 410270284f..11171d5b3f 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0-gicv2.aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_2.10.0-gicv2.aarch64.replies @@ -3876,7 +3876,7 @@ "id": "libvirt-13", "error": { "class": "DeviceNotFound", - "desc": "Device 'virtio-blk-ccw' not found" + "desc": "Device 'virtio-net-ccw' not found" } } @@ -3884,7 +3884,7 @@ "id": "libvirt-14", "error": { "class": "DeviceNotFound", - "desc": "Device 'virtio-net-ccw' not found" + "desc": "Device 'virtio-scsi-ccw' not found" } } @@ -3892,28 +3892,12 @@ "id": "libvirt-15", "error": { "class": "DeviceNotFound", - "desc": "Device 'virtio-scsi-ccw' not found" + "desc": "Device 'virtio-net-s390' not found" } } { "id": "libvirt-16", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-blk-s390' not found" - } -} - -{ - "id": "libvirt-17", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-net-s390' not found" - } -} - -{ - "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -3921,7 +3905,7 @@ } { - "id": "libvirt-19", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" @@ -4032,7 +4016,7 @@ "type": "bool" } ], - "id": "libvirt-20" + "id": "libvirt-18" } { @@ -4146,7 +4130,7 @@ "type": "uint64" } ], - "id": "libvirt-21" + "id": "libvirt-19" } { @@ -4222,25 +4206,17 @@ "type": "uint16" } ], - "id": "libvirt-22" + "id": "libvirt-20" } { - "id": "libvirt-23", + "id": "libvirt-21", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" } } -{ - "id": "libvirt-24", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'usb-redir' not found" - } -} - { "return": [ { @@ -4307,7 +4283,7 @@ "type": "uint32" } ], - "id": "libvirt-25" + "id": "libvirt-22" } { @@ -4334,11 +4310,11 @@ "type": "uint32" } ], - "id": "libvirt-26" + "id": "libvirt-23" } { - "id": "libvirt-27", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -4346,7 +4322,7 @@ } { - "id": "libvirt-28", + "id": "libvirt-25", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -4423,11 +4399,11 @@ "type": "uint16" } ], - "id": "libvirt-29" + "id": "libvirt-26" } { - "id": "libvirt-30", + "id": "libvirt-27", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -4488,23 +4464,7 @@ "type": "int32" } ], - "id": "libvirt-31" -} - -{ - "id": "libvirt-32", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'vmware-svga' not found" - } -} - -{ - "id": "libvirt-33", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'qxl' not found" - } + "id": "libvirt-28" } { @@ -4655,7 +4615,7 @@ "type": "str" } ], - "id": "libvirt-34" + "id": "libvirt-29" } { @@ -4702,11 +4662,11 @@ "type": "size" } ], - "id": "libvirt-35" + "id": "libvirt-30" } { - "id": "libvirt-36", + "id": "libvirt-31", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -4853,11 +4813,11 @@ "type": "str" } ], - "id": "libvirt-37" + "id": "libvirt-32" } { - "id": "libvirt-38", + "id": "libvirt-33", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -4905,7 +4865,7 @@ "type": "bool" } ], - "id": "libvirt-39" + "id": "libvirt-34" } { @@ -4985,7 +4945,7 @@ "type": "uint32" } ], - "id": "libvirt-40" + "id": "libvirt-35" } { @@ -5252,7 +5212,7 @@ "cpu-max": 1 } ], - "id": "libvirt-41" + "id": "libvirt-36" } { @@ -5418,19 +5378,19 @@ "static": false } ], - "id": "libvirt-42" + "id": "libvirt-37" } { "return": [ ], - "id": "libvirt-43" + "id": "libvirt-38" } { "return": [ ], - "id": "libvirt-44" + "id": "libvirt-39" } { @@ -6575,7 +6535,7 @@ "option": "drive" } ], - "id": "libvirt-45" + "id": "libvirt-40" } { @@ -6625,7 +6585,7 @@ "capability": "return-path" } ], - "id": "libvirt-46" + "id": "libvirt-41" } { @@ -16348,7 +16308,7 @@ "meta-type": "object" } ], - "id": "libvirt-47" + "id": "libvirt-42" } { @@ -16364,7 +16324,7 @@ "kernel": true } ], - "id": "libvirt-48" + "id": "libvirt-43" } { diff --git a/tests/qemucapabilitiesdata/caps_2.10.0-gicv2.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0-gicv2.aarch64.xml index 588bb0d4d9..17d388e815 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0-gicv2.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0-gicv2.aarch64.xml @@ -188,7 +188,7 @@ 2010000 0 - 304138 + 303541 (v2.10.0) aarch64 diff --git a/tests/qemucapabilitiesdata/caps_2.10.0-gicv3.aarch64.replies b/tests/qemucapabilitiesdata/caps_2.10.0-gicv3.aarch64.replies index 50d327c98f..8843ae72bf 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0-gicv3.aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_2.10.0-gicv3.aarch64.replies @@ -3876,7 +3876,7 @@ "id": "libvirt-13", "error": { "class": "DeviceNotFound", - "desc": "Device 'virtio-blk-ccw' not found" + "desc": "Device 'virtio-net-ccw' not found" } } @@ -3884,7 +3884,7 @@ "id": "libvirt-14", "error": { "class": "DeviceNotFound", - "desc": "Device 'virtio-net-ccw' not found" + "desc": "Device 'virtio-scsi-ccw' not found" } } @@ -3892,28 +3892,12 @@ "id": "libvirt-15", "error": { "class": "DeviceNotFound", - "desc": "Device 'virtio-scsi-ccw' not found" + "desc": "Device 'virtio-net-s390' not found" } } { "id": "libvirt-16", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-blk-s390' not found" - } -} - -{ - "id": "libvirt-17", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-net-s390' not found" - } -} - -{ - "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -3921,7 +3905,7 @@ } { - "id": "libvirt-19", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" @@ -4032,7 +4016,7 @@ "type": "bool" } ], - "id": "libvirt-20" + "id": "libvirt-18" } { @@ -4146,7 +4130,7 @@ "type": "uint64" } ], - "id": "libvirt-21" + "id": "libvirt-19" } { @@ -4222,25 +4206,17 @@ "type": "uint16" } ], - "id": "libvirt-22" + "id": "libvirt-20" } { - "id": "libvirt-23", + "id": "libvirt-21", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" } } -{ - "id": "libvirt-24", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'usb-redir' not found" - } -} - { "return": [ { @@ -4307,7 +4283,7 @@ "type": "uint32" } ], - "id": "libvirt-25" + "id": "libvirt-22" } { @@ -4334,11 +4310,11 @@ "type": "uint32" } ], - "id": "libvirt-26" + "id": "libvirt-23" } { - "id": "libvirt-27", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -4346,7 +4322,7 @@ } { - "id": "libvirt-28", + "id": "libvirt-25", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -4423,11 +4399,11 @@ "type": "uint16" } ], - "id": "libvirt-29" + "id": "libvirt-26" } { - "id": "libvirt-30", + "id": "libvirt-27", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -4488,23 +4464,7 @@ "type": "int32" } ], - "id": "libvirt-31" -} - -{ - "id": "libvirt-32", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'vmware-svga' not found" - } -} - -{ - "id": "libvirt-33", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'qxl' not found" - } + "id": "libvirt-28" } { @@ -4655,7 +4615,7 @@ "type": "str" } ], - "id": "libvirt-34" + "id": "libvirt-29" } { @@ -4702,11 +4662,11 @@ "type": "size" } ], - "id": "libvirt-35" + "id": "libvirt-30" } { - "id": "libvirt-36", + "id": "libvirt-31", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -4853,11 +4813,11 @@ "type": "str" } ], - "id": "libvirt-37" + "id": "libvirt-32" } { - "id": "libvirt-38", + "id": "libvirt-33", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -4905,7 +4865,7 @@ "type": "bool" } ], - "id": "libvirt-39" + "id": "libvirt-34" } { @@ -4985,7 +4945,7 @@ "type": "uint32" } ], - "id": "libvirt-40" + "id": "libvirt-35" } { @@ -5252,7 +5212,7 @@ "cpu-max": 1 } ], - "id": "libvirt-41" + "id": "libvirt-36" } { @@ -5418,19 +5378,19 @@ "static": false } ], - "id": "libvirt-42" + "id": "libvirt-37" } { "return": [ ], - "id": "libvirt-43" + "id": "libvirt-38" } { "return": [ ], - "id": "libvirt-44" + "id": "libvirt-39" } { @@ -6575,7 +6535,7 @@ "option": "drive" } ], - "id": "libvirt-45" + "id": "libvirt-40" } { @@ -6625,7 +6585,7 @@ "capability": "return-path" } ], - "id": "libvirt-46" + "id": "libvirt-41" } { @@ -16348,7 +16308,7 @@ "meta-type": "object" } ], - "id": "libvirt-47" + "id": "libvirt-42" } { @@ -16364,7 +16324,7 @@ "kernel": false } ], - "id": "libvirt-48" + "id": "libvirt-43" } { diff --git a/tests/qemucapabilitiesdata/caps_2.10.0-gicv3.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0-gicv3.aarch64.xml index a88a4609df..0f5f724c3e 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0-gicv3.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0-gicv3.aarch64.xml @@ -188,7 +188,7 @@ 2010000 0 - 304138 + 303541 (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 065e2b4dc2..980f8ecc11 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies @@ -3977,7 +3977,7 @@ "id": "libvirt-13", "error": { "class": "DeviceNotFound", - "desc": "Device 'virtio-blk-ccw' not found" + "desc": "Device 'virtio-net-ccw' not found" } } @@ -3985,7 +3985,7 @@ "id": "libvirt-14", "error": { "class": "DeviceNotFound", - "desc": "Device 'virtio-net-ccw' not found" + "desc": "Device 'virtio-scsi-ccw' not found" } } @@ -3993,28 +3993,12 @@ "id": "libvirt-15", "error": { "class": "DeviceNotFound", - "desc": "Device 'virtio-scsi-ccw' not found" + "desc": "Device 'virtio-net-s390' not found" } } { "id": "libvirt-16", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-blk-s390' not found" - } -} - -{ - "id": "libvirt-17", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-net-s390' not found" - } -} - -{ - "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -4022,7 +4006,7 @@ } { - "id": "libvirt-19", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" @@ -4133,7 +4117,7 @@ "type": "bool" } ], - "id": "libvirt-20" + "id": "libvirt-18" } { @@ -4247,7 +4231,7 @@ "type": "uint64" } ], - "id": "libvirt-21" + "id": "libvirt-19" } { @@ -4323,25 +4307,17 @@ "type": "uint16" } ], - "id": "libvirt-22" + "id": "libvirt-20" } { - "id": "libvirt-23", + "id": "libvirt-21", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" } } -{ - "id": "libvirt-24", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'usb-redir' not found" - } -} - { "return": [ { @@ -4408,7 +4384,7 @@ "type": "uint32" } ], - "id": "libvirt-25" + "id": "libvirt-22" } { @@ -4435,11 +4411,11 @@ "type": "uint32" } ], - "id": "libvirt-26" + "id": "libvirt-23" } { - "id": "libvirt-27", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -4447,7 +4423,7 @@ } { - "id": "libvirt-28", + "id": "libvirt-25", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -4524,11 +4500,11 @@ "type": "uint16" } ], - "id": "libvirt-29" + "id": "libvirt-26" } { - "id": "libvirt-30", + "id": "libvirt-27", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -4589,23 +4565,7 @@ "type": "int32" } ], - "id": "libvirt-31" -} - -{ - "id": "libvirt-32", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'vmware-svga' not found" - } -} - -{ - "id": "libvirt-33", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'qxl' not found" - } + "id": "libvirt-28" } { @@ -4756,7 +4716,7 @@ "type": "str" } ], - "id": "libvirt-34" + "id": "libvirt-29" } { @@ -4803,11 +4763,11 @@ "type": "size" } ], - "id": "libvirt-35" + "id": "libvirt-30" } { - "id": "libvirt-36", + "id": "libvirt-31", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -4954,11 +4914,11 @@ "type": "str" } ], - "id": "libvirt-37" + "id": "libvirt-32" } { - "id": "libvirt-38", + "id": "libvirt-33", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -5006,7 +4966,7 @@ "type": "bool" } ], - "id": "libvirt-39" + "id": "libvirt-34" } { @@ -5086,7 +5046,7 @@ "type": "uint32" } ], - "id": "libvirt-40" + "id": "libvirt-35" } { @@ -5172,7 +5132,7 @@ "type": "uint32" } ], - "id": "libvirt-41" + "id": "libvirt-36" } { @@ -5290,7 +5250,7 @@ "cpu-max": 1 } ], - "id": "libvirt-42" + "id": "libvirt-37" } { @@ -7466,19 +7426,19 @@ "static": false } ], - "id": "libvirt-43" + "id": "libvirt-38" } { "return": [ ], - "id": "libvirt-44" + "id": "libvirt-39" } { "return": [ ], - "id": "libvirt-45" + "id": "libvirt-40" } { @@ -8618,7 +8578,7 @@ "option": "drive" } ], - "id": "libvirt-46" + "id": "libvirt-41" } { @@ -8668,7 +8628,7 @@ "capability": "return-path" } ], - "id": "libvirt-47" + "id": "libvirt-42" } { @@ -18391,7 +18351,7 @@ "meta-type": "object" } ], - "id": "libvirt-48" + "id": "libvirt-43" } { diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml index 04e2e77091..403b538628 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml @@ -187,7 +187,7 @@ 2010000 0 - 383421 + 382824 (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 2958c3eaa8..534756f0b3 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies @@ -2631,20 +2631,12 @@ "id": "libvirt-16", "error": { "class": "DeviceNotFound", - "desc": "Device 'virtio-blk-s390' not found" + "desc": "Device 'virtio-net-s390' not found" } } { "id": "libvirt-17", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-net-s390' not found" - } -} - -{ - "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -2652,7 +2644,7 @@ } { - "id": "libvirt-19", + "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" @@ -2763,7 +2755,7 @@ "type": "bool" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -2877,11 +2869,11 @@ "type": "uint64" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { - "id": "libvirt-22", + "id": "libvirt-21", "error": { "class": "DeviceNotFound", "desc": "Device 'ide-drive' not found" @@ -2889,7 +2881,7 @@ } { - "id": "libvirt-23", + "id": "libvirt-22", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -2897,15 +2889,7 @@ } { - "id": "libvirt-24", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'usb-redir' not found" - } -} - -{ - "id": "libvirt-25", + "id": "libvirt-23", "error": { "class": "DeviceNotFound", "desc": "Device 'usb-host' not found" @@ -2936,11 +2920,11 @@ "type": "uint32" } ], - "id": "libvirt-26" + "id": "libvirt-24" } { - "id": "libvirt-27", + "id": "libvirt-25", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -2948,7 +2932,7 @@ } { - "id": "libvirt-28", + "id": "libvirt-26", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -2956,45 +2940,13 @@ } { - "id": "libvirt-29", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'usb-storage' not found" - } -} - -{ - "id": "libvirt-30", + "id": "libvirt-27", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" } } -{ - "id": "libvirt-31", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'VGA' not found" - } -} - -{ - "id": "libvirt-32", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'vmware-svga' not found" - } -} - -{ - "id": "libvirt-33", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'qxl' not found" - } -} - { "return": [ { @@ -3143,7 +3095,7 @@ "type": "str" } ], - "id": "libvirt-34" + "id": "libvirt-28" } { @@ -3190,11 +3142,11 @@ "type": "size" } ], - "id": "libvirt-35" + "id": "libvirt-29" } { - "id": "libvirt-36", + "id": "libvirt-30", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -3341,7 +3293,7 @@ "type": "str" } ], - "id": "libvirt-37" + "id": "libvirt-31" } { @@ -3403,7 +3355,7 @@ "type": "uint32" } ], - "id": "libvirt-38" + "id": "libvirt-32" } { @@ -3447,15 +3399,7 @@ "type": "bool" } ], - "id": "libvirt-39" -} - -{ - "id": "libvirt-40", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'nec-usb-xhci' not found" - } + "id": "libvirt-33" } { @@ -3503,7 +3447,7 @@ "cpu-max": 248 } ], - "id": "libvirt-41" + "id": "libvirt-34" } { @@ -4037,19 +3981,19 @@ "migration-safe": true } ], - "id": "libvirt-42" + "id": "libvirt-35" } { "return": [ ], - "id": "libvirt-43" + "id": "libvirt-36" } { "return": [ ], - "id": "libvirt-44" + "id": "libvirt-37" } { @@ -5154,7 +5098,7 @@ "option": "drive" } ], - "id": "libvirt-45" + "id": "libvirt-38" } { @@ -5204,7 +5148,7 @@ "capability": "return-path" } ], - "id": "libvirt-46" + "id": "libvirt-39" } { @@ -14927,7 +14871,7 @@ "meta-type": "object" } ], - "id": "libvirt-47" + "id": "libvirt-40" } { @@ -14967,11 +14911,11 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-41" } { - "id": "libvirt-49", + "id": "libvirt-42", "error": { "class": "GenericError", "desc": "Property '.migratable' not found" diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml index bbd351c0a2..1096495f00 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml @@ -148,7 +148,7 @@ 2010000 0 - 304153 + 303326 s390x diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies index 5ddaa0316b..6c6ecc2687 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies @@ -2854,7 +2854,7 @@ "id": "libvirt-13", "error": { "class": "DeviceNotFound", - "desc": "Device 'virtio-blk-ccw' not found" + "desc": "Device 'virtio-net-ccw' not found" } } @@ -2862,28 +2862,12 @@ "id": "libvirt-14", "error": { "class": "DeviceNotFound", - "desc": "Device 'virtio-net-ccw' not found" + "desc": "Device 'virtio-scsi-ccw' not found" } } { "id": "libvirt-15", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-scsi-ccw' not found" - } -} - -{ - "id": "libvirt-16", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-blk-s390' not found" - } -} - -{ - "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -2891,7 +2875,7 @@ } { - "id": "libvirt-18", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -2957,7 +2941,7 @@ "type": "bool" } ], - "id": "libvirt-19" + "id": "libvirt-17" } { @@ -3064,7 +3048,7 @@ "type": "bool" } ], - "id": "libvirt-20" + "id": "libvirt-18" } { @@ -3178,7 +3162,7 @@ "type": "uint64" } ], - "id": "libvirt-21" + "id": "libvirt-19" } { @@ -3254,7 +3238,7 @@ "type": "uint16" } ], - "id": "libvirt-22" + "id": "libvirt-20" } { @@ -3317,7 +3301,7 @@ "type": "int32" } ], - "id": "libvirt-23" + "id": "libvirt-21" } { @@ -3366,7 +3350,7 @@ "type": "bool" } ], - "id": "libvirt-24" + "id": "libvirt-22" } { @@ -3435,7 +3419,7 @@ "type": "uint32" } ], - "id": "libvirt-25" + "id": "libvirt-23" } { @@ -3462,7 +3446,7 @@ "type": "uint32" } ], - "id": "libvirt-26" + "id": "libvirt-24" } { @@ -3500,7 +3484,7 @@ "type": "child" } ], - "id": "libvirt-27" + "id": "libvirt-25" } { @@ -3578,7 +3562,7 @@ "type": "uint64" } ], - "id": "libvirt-28" + "id": "libvirt-26" } { @@ -3651,7 +3635,7 @@ "type": "uint16" } ], - "id": "libvirt-29" + "id": "libvirt-27" } { @@ -3665,7 +3649,7 @@ "type": "LostTickPolicy" } ], - "id": "libvirt-30" + "id": "libvirt-28" } { @@ -3722,7 +3706,7 @@ "type": "int32" } ], - "id": "libvirt-31" + "id": "libvirt-29" } { @@ -3765,7 +3749,7 @@ "type": "int32" } ], - "id": "libvirt-32" + "id": "libvirt-30" } { @@ -3860,7 +3844,7 @@ "type": "uint32" } ], - "id": "libvirt-33" + "id": "libvirt-31" } { @@ -4021,7 +4005,7 @@ "type": "str" } ], - "id": "libvirt-34" + "id": "libvirt-32" } { @@ -4078,7 +4062,7 @@ "type": "size" } ], - "id": "libvirt-35" + "id": "libvirt-33" } { @@ -4174,7 +4158,7 @@ "type": "uint32" } ], - "id": "libvirt-36" + "id": "libvirt-34" } { @@ -4317,11 +4301,11 @@ "type": "str" } ], - "id": "libvirt-37" + "id": "libvirt-35" } { - "id": "libvirt-38", + "id": "libvirt-36", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -4369,7 +4353,7 @@ "type": "bool" } ], - "id": "libvirt-39" + "id": "libvirt-37" } { @@ -4449,7 +4433,7 @@ "type": "uint32" } ], - "id": "libvirt-40" + "id": "libvirt-38" } { @@ -4484,7 +4468,7 @@ "type": "bool" } ], - "id": "libvirt-41" + "id": "libvirt-39" } { @@ -4673,7 +4657,7 @@ "alias": "q35" } ], - "id": "libvirt-42" + "id": "libvirt-40" } { @@ -5008,21 +4992,21 @@ "migration-safe": true } ], - "id": "libvirt-43" + "id": "libvirt-41" } { "return": [ "tpm-tis" ], - "id": "libvirt-44" + "id": "libvirt-42" } { "return": [ "passthrough" ], - "id": "libvirt-45" + "id": "libvirt-43" } { @@ -6301,7 +6285,7 @@ "option": "drive" } ], - "id": "libvirt-46" + "id": "libvirt-44" } { @@ -6351,7 +6335,7 @@ "capability": "return-path" } ], - "id": "libvirt-47" + "id": "libvirt-45" } { @@ -16074,7 +16058,7 @@ "meta-type": "object" } ], - "id": "libvirt-48" + "id": "libvirt-46" } { @@ -16253,6 +16237,428 @@ } } }, + "id": "libvirt-47" +} + +{ + "return": { + "model": { + "name": "base", + "props": { + "phys-bits": 0, + "core-id": -1, + "xlevel": 2147483656, + "cmov": true, + "ia64": false, + "aes": true, + "mmx": true, + "arat": true, + "rdpid": false, + "pause-filter": false, + "xsavec": false, + "osxsave": false, + "tsc-frequency": 0, + "xd": true, + "hv-vendor-id": "", + "kvm-asyncpf": true, + "kvm_asyncpf": true, + "perfctr_core": false, + "perfctr-core": false, + "mpx": false, + "avx512cd": false, + "decodeassists": false, + "pbe": false, + "sse4_1": true, + "sse4.1": true, + "sse4-1": true, + "family": 6, + "vmware-cpuid-freq": true, + "avx512f": false, + "xcrypt": false, + "hv-runtime": false, + "msr": true, + "mce": true, + "mca": true, + "thread-id": -1, + "min-level": 13, + "xgetbv1": false, + "cid": false, + "hv-relaxed": false, + "fxsr": true, + "ds": false, + "hv-crash": false, + "xsaveopt": true, + "xtpr": false, + "avx512-vpopcntdq": false, + "phe": false, + "avx512vl": false, + "extapic": false, + "3dnowprefetch": false, + "cr8legacy": false, + "cpuid-0xb": true, + "xcrypt-en": false, + "kvm_pv_eoi": true, + "apic-id": 4294967295, + "pn": false, + "dca": false, + "vendor": "GenuineIntel", + "pku": false, + "smx": false, + "cmp-legacy": false, + "cmp_legacy": false, + "node-id": -1, + "avx512-4fmaps": false, + "vmcb-clean": false, + "vmcb_clean": false, + "3dnowext": false, + "hle": false, + "npt": false, + "memory": "/machine/unattached/system[0]", + "clwb": false, + "lbrv": false, + "adx": false, + "ss": true, + "pni": true, + "svm_lock": false, + "svm-lock": false, + "smep": true, + "pfthreshold": false, + "smap": false, + "x2apic": true, + "avx512vbmi": false, + "hv-stimer": false, + "i64": true, + "flushbyasid": false, + "f16c": true, + "ace2-en": false, + "pat": true, + "pae": true, + "sse": true, + "phe-en": false, + "kvm-nopiodelay": true, + "kvm_nopiodelay": true, + "tm": false, + "kvmclock-stable-bit": true, + "hypervisor": true, + "socket-id": -1, + "pcommit": false, + "syscall": true, + "level": 13, + "avx512dq": false, + "svm": false, + "full-cpuid-auto-level": true, + "hv-reset": false, + "invtsc": false, + "sse3": true, + "sse2": true, + "est": false, + "avx512ifma": false, + "tm2": false, + "kvm-pv-eoi": true, + "cx8": true, + "kvm-mmu": false, + "kvm_mmu": false, + "sse4_2": true, + "sse4.2": true, + "sse4-2": true, + "pge": true, + "fill-mtrr-mask": true, + "pdcm": false, + "nodeid_msr": false, + "model": 60, + "movbe": true, + "nrip-save": false, + "nrip_save": false, + "sse4a": false, + "ssse3": true, + "kvm_pv_unhalt": true, + "invpcid": true, + "pdpe1gb": true, + "tsc-deadline": true, + "fma": true, + "cx16": true, + "de": true, + "enforce": false, + "stepping": 3, + "xsave": true, + "clflush": true, + "skinit": false, + "tce": false, + "tsc": true, + "fpu": true, + "ds-cpl": false, + "ds_cpl": false, + "ibs": false, + "host-phys-bits": false, + "fma4": false, + "la57": false, + "osvw": false, + "check": true, + "hv-spinlocks": -1, + "pmm": false, + "apic": true, + "pmu": false, + "min-xlevel2": 0, + "tsc-adjust": true, + "tsc_adjust": true, + "kvm-steal-time": true, + "kvm_steal_time": true, + "kvmclock": true, + "l3-cache": true, + "lwp": false, + "xop": false, + "avx": true, + "ospke": false, + "ace2": false, + "acpi": false, + "avx512bw": false, + "hv-vapic": false, + "fsgsbase": true, + "ht": false, + "nx": true, + "pclmulqdq": true, + "mmxext": false, + "popcnt": true, + "xsaves": false, + "tcg-cpuid": true, + "lm": true, + "umip": false, + "avx2": true, + "pse": true, + "sep": true, + "pclmuldq": true, + "nodeid-msr": false, + "kvm": true, + "misalignsse": false, + "min-xlevel": 2147483656, + "bmi2": true, + "bmi1": true, + "kvm-pv-unhalt": true, + "realized": false, + "tsc_scale": false, + "tsc-scale": false, + "topoext": false, + "hv-vpindex": false, + "xlevel2": 0, + "clflushopt": false, + "kvm-no-smi-migration": false, + "monitor": false, + "avx512er": false, + "pmm-en": false, + "pcid": true, + "3dnow": false, + "erms": true, + "lahf-lm": true, + "lahf_lm": true, + "xstore": false, + "hv-synic": false, + "fxsr-opt": false, + "fxsr_opt": false, + "rtm": false, + "lmce": true, + "hv-time": false, + "perfctr-nb": false, + "perfctr_nb": false, + "ffxsr": false, + "rdrand": true, + "rdseed": false, + "avx512-4vnniw": false, + "vme": true, + "vmx": true, + "dtes64": false, + "mtrr": true, + "rdtscp": true, + "pse36": true, + "tbm": false, + "wdt": false, + "pause_filter": false, + "model-id": "Intel(R) Core(TM) i7-4810MQ CPU @ 2.80GHz", + "sha-ni": false, + "abm": true, + "avx512pf": false, + "xstore-en": false + } + } + }, + "id": "libvirt-48" +} + +{ + "return": { + "model": { + "name": "base", + "props": { + "cmov": true, + "ia64": false, + "aes": true, + "mmx": true, + "rdpid": false, + "arat": true, + "pause-filter": false, + "xsavec": false, + "osxsave": false, + "kvm-asyncpf": true, + "perfctr-core": false, + "mpx": false, + "pbe": false, + "avx512cd": false, + "decodeassists": false, + "sse4.1": true, + "family": 6, + "avx512f": false, + "msr": true, + "mce": true, + "mca": true, + "xcrypt": false, + "min-level": 13, + "xgetbv1": false, + "cid": false, + "ds": false, + "fxsr": true, + "xsaveopt": true, + "xtpr": false, + "avx512vl": false, + "avx512-vpopcntdq": false, + "phe": false, + "extapic": false, + "3dnowprefetch": false, + "cr8legacy": false, + "xcrypt-en": false, + "pn": false, + "dca": false, + "vendor": "GenuineIntel", + "pku": false, + "smx": false, + "cmp-legacy": false, + "avx512-4fmaps": false, + "vmcb-clean": false, + "hle": false, + "3dnowext": false, + "npt": false, + "clwb": false, + "lbrv": false, + "adx": false, + "ss": true, + "pni": true, + "svm-lock": false, + "smep": true, + "smap": false, + "pfthreshold": false, + "x2apic": true, + "avx512vbmi": false, + "flushbyasid": false, + "f16c": true, + "ace2-en": false, + "pae": true, + "pat": true, + "sse": true, + "phe-en": false, + "kvm-nopiodelay": true, + "tm": false, + "kvmclock-stable-bit": true, + "hypervisor": true, + "pcommit": false, + "syscall": true, + "avx512dq": false, + "svm": false, + "invtsc": true, + "sse2": true, + "est": false, + "avx512ifma": false, + "tm2": false, + "kvm-pv-eoi": true, + "cx8": true, + "kvm-mmu": false, + "sse4.2": true, + "pge": true, + "pdcm": false, + "model": 60, + "movbe": true, + "nrip-save": false, + "ssse3": true, + "sse4a": false, + "invpcid": true, + "pdpe1gb": true, + "tsc-deadline": true, + "fma": true, + "cx16": true, + "de": true, + "stepping": 3, + "xsave": true, + "clflush": true, + "skinit": false, + "tsc": true, + "tce": false, + "fpu": true, + "ds-cpl": false, + "ibs": false, + "fma4": false, + "la57": false, + "osvw": false, + "apic": true, + "pmm": false, + "tsc-adjust": true, + "kvm-steal-time": true, + "kvmclock": true, + "lwp": false, + "xop": false, + "avx": true, + "ospke": false, + "acpi": false, + "avx512bw": false, + "ace2": false, + "fsgsbase": true, + "ht": false, + "nx": true, + "pclmulqdq": true, + "mmxext": false, + "popcnt": true, + "xsaves": false, + "lm": true, + "umip": false, + "pse": true, + "avx2": true, + "sep": true, + "nodeid-msr": false, + "misalignsse": false, + "min-xlevel": 2147483656, + "bmi1": true, + "bmi2": true, + "kvm-pv-unhalt": true, + "tsc-scale": false, + "topoext": false, + "clflushopt": false, + "monitor": false, + "avx512er": false, + "pmm-en": false, + "pcid": true, + "3dnow": false, + "erms": true, + "lahf-lm": true, + "fxsr-opt": false, + "xstore": false, + "rtm": false, + "lmce": true, + "perfctr-nb": false, + "rdrand": true, + "rdseed": false, + "avx512-4vnniw": false, + "vme": true, + "vmx": true, + "dtes64": false, + "mtrr": true, + "rdtscp": true, + "pse36": true, + "tbm": false, + "wdt": false, + "model-id": "Intel(R) Core(TM) i7-4810MQ CPU @ 2.80GHz", + "sha-ni": false, + "abm": true, + "avx512pf": false, + "xstore-en": false + } + } + }, "id": "libvirt-49" } @@ -16364,7 +16770,7 @@ "svm": false, "full-cpuid-auto-level": true, "hv-reset": false, - "invtsc": false, + "invtsc": true, "sse3": true, "sse2": true, "est": false, @@ -16499,428 +16905,6 @@ "id": "libvirt-50" } -{ - "return": { - "model": { - "name": "base", - "props": { - "cmov": true, - "ia64": false, - "aes": true, - "mmx": true, - "rdpid": false, - "arat": true, - "pause-filter": false, - "xsavec": false, - "osxsave": false, - "kvm-asyncpf": true, - "perfctr-core": false, - "mpx": false, - "pbe": false, - "avx512cd": false, - "decodeassists": false, - "sse4.1": true, - "family": 6, - "avx512f": false, - "msr": true, - "mce": true, - "mca": true, - "xcrypt": false, - "min-level": 13, - "xgetbv1": false, - "cid": false, - "ds": false, - "fxsr": true, - "xsaveopt": true, - "xtpr": false, - "avx512vl": false, - "avx512-vpopcntdq": false, - "phe": false, - "extapic": false, - "3dnowprefetch": false, - "cr8legacy": false, - "xcrypt-en": false, - "pn": false, - "dca": false, - "vendor": "GenuineIntel", - "pku": false, - "smx": false, - "cmp-legacy": false, - "avx512-4fmaps": false, - "vmcb-clean": false, - "hle": false, - "3dnowext": false, - "npt": false, - "clwb": false, - "lbrv": false, - "adx": false, - "ss": true, - "pni": true, - "svm-lock": false, - "smep": true, - "smap": false, - "pfthreshold": false, - "x2apic": true, - "avx512vbmi": false, - "flushbyasid": false, - "f16c": true, - "ace2-en": false, - "pae": true, - "pat": true, - "sse": true, - "phe-en": false, - "kvm-nopiodelay": true, - "tm": false, - "kvmclock-stable-bit": true, - "hypervisor": true, - "pcommit": false, - "syscall": true, - "avx512dq": false, - "svm": false, - "invtsc": true, - "sse2": true, - "est": false, - "avx512ifma": false, - "tm2": false, - "kvm-pv-eoi": true, - "cx8": true, - "kvm-mmu": false, - "sse4.2": true, - "pge": true, - "pdcm": false, - "model": 60, - "movbe": true, - "nrip-save": false, - "ssse3": true, - "sse4a": false, - "invpcid": true, - "pdpe1gb": true, - "tsc-deadline": true, - "fma": true, - "cx16": true, - "de": true, - "stepping": 3, - "xsave": true, - "clflush": true, - "skinit": false, - "tsc": true, - "tce": false, - "fpu": true, - "ds-cpl": false, - "ibs": false, - "fma4": false, - "la57": false, - "osvw": false, - "apic": true, - "pmm": false, - "tsc-adjust": true, - "kvm-steal-time": true, - "kvmclock": true, - "lwp": false, - "xop": false, - "avx": true, - "ospke": false, - "acpi": false, - "avx512bw": false, - "ace2": false, - "fsgsbase": true, - "ht": false, - "nx": true, - "pclmulqdq": true, - "mmxext": false, - "popcnt": true, - "xsaves": false, - "lm": true, - "umip": false, - "pse": true, - "avx2": true, - "sep": true, - "nodeid-msr": false, - "misalignsse": false, - "min-xlevel": 2147483656, - "bmi1": true, - "bmi2": true, - "kvm-pv-unhalt": true, - "tsc-scale": false, - "topoext": false, - "clflushopt": false, - "monitor": false, - "avx512er": false, - "pmm-en": false, - "pcid": true, - "3dnow": false, - "erms": true, - "lahf-lm": true, - "fxsr-opt": false, - "xstore": false, - "rtm": false, - "lmce": true, - "perfctr-nb": false, - "rdrand": true, - "rdseed": false, - "avx512-4vnniw": false, - "vme": true, - "vmx": true, - "dtes64": false, - "mtrr": true, - "rdtscp": true, - "pse36": true, - "tbm": false, - "wdt": false, - "model-id": "Intel(R) Core(TM) i7-4810MQ CPU @ 2.80GHz", - "sha-ni": false, - "abm": true, - "avx512pf": false, - "xstore-en": false - } - } - }, - "id": "libvirt-51" -} - -{ - "return": { - "model": { - "name": "base", - "props": { - "phys-bits": 0, - "core-id": -1, - "xlevel": 2147483656, - "cmov": true, - "ia64": false, - "aes": true, - "mmx": true, - "arat": true, - "rdpid": false, - "pause-filter": false, - "xsavec": false, - "osxsave": false, - "tsc-frequency": 0, - "xd": true, - "hv-vendor-id": "", - "kvm-asyncpf": true, - "kvm_asyncpf": true, - "perfctr_core": false, - "perfctr-core": false, - "mpx": false, - "avx512cd": false, - "decodeassists": false, - "pbe": false, - "sse4_1": true, - "sse4.1": true, - "sse4-1": true, - "family": 6, - "vmware-cpuid-freq": true, - "avx512f": false, - "xcrypt": false, - "hv-runtime": false, - "msr": true, - "mce": true, - "mca": true, - "thread-id": -1, - "min-level": 13, - "xgetbv1": false, - "cid": false, - "hv-relaxed": false, - "fxsr": true, - "ds": false, - "hv-crash": false, - "xsaveopt": true, - "xtpr": false, - "avx512-vpopcntdq": false, - "phe": false, - "avx512vl": false, - "extapic": false, - "3dnowprefetch": false, - "cr8legacy": false, - "cpuid-0xb": true, - "xcrypt-en": false, - "kvm_pv_eoi": true, - "apic-id": 4294967295, - "pn": false, - "dca": false, - "vendor": "GenuineIntel", - "pku": false, - "smx": false, - "cmp-legacy": false, - "cmp_legacy": false, - "node-id": -1, - "avx512-4fmaps": false, - "vmcb-clean": false, - "vmcb_clean": false, - "3dnowext": false, - "hle": false, - "npt": false, - "memory": "/machine/unattached/system[0]", - "clwb": false, - "lbrv": false, - "adx": false, - "ss": true, - "pni": true, - "svm_lock": false, - "svm-lock": false, - "smep": true, - "pfthreshold": false, - "smap": false, - "x2apic": true, - "avx512vbmi": false, - "hv-stimer": false, - "i64": true, - "flushbyasid": false, - "f16c": true, - "ace2-en": false, - "pat": true, - "pae": true, - "sse": true, - "phe-en": false, - "kvm-nopiodelay": true, - "kvm_nopiodelay": true, - "tm": false, - "kvmclock-stable-bit": true, - "hypervisor": true, - "socket-id": -1, - "pcommit": false, - "syscall": true, - "level": 13, - "avx512dq": false, - "svm": false, - "full-cpuid-auto-level": true, - "hv-reset": false, - "invtsc": true, - "sse3": true, - "sse2": true, - "est": false, - "avx512ifma": false, - "tm2": false, - "kvm-pv-eoi": true, - "cx8": true, - "kvm-mmu": false, - "kvm_mmu": false, - "sse4_2": true, - "sse4.2": true, - "sse4-2": true, - "pge": true, - "fill-mtrr-mask": true, - "pdcm": false, - "nodeid_msr": false, - "model": 60, - "movbe": true, - "nrip-save": false, - "nrip_save": false, - "sse4a": false, - "ssse3": true, - "kvm_pv_unhalt": true, - "invpcid": true, - "pdpe1gb": true, - "tsc-deadline": true, - "fma": true, - "cx16": true, - "de": true, - "enforce": false, - "stepping": 3, - "xsave": true, - "clflush": true, - "skinit": false, - "tce": false, - "tsc": true, - "fpu": true, - "ds-cpl": false, - "ds_cpl": false, - "ibs": false, - "host-phys-bits": false, - "fma4": false, - "la57": false, - "osvw": false, - "check": true, - "hv-spinlocks": -1, - "pmm": false, - "apic": true, - "pmu": false, - "min-xlevel2": 0, - "tsc-adjust": true, - "tsc_adjust": true, - "kvm-steal-time": true, - "kvm_steal_time": true, - "kvmclock": true, - "l3-cache": true, - "lwp": false, - "xop": false, - "avx": true, - "ospke": false, - "ace2": false, - "acpi": false, - "avx512bw": false, - "hv-vapic": false, - "fsgsbase": true, - "ht": false, - "nx": true, - "pclmulqdq": true, - "mmxext": false, - "popcnt": true, - "xsaves": false, - "tcg-cpuid": true, - "lm": true, - "umip": false, - "avx2": true, - "pse": true, - "sep": true, - "pclmuldq": true, - "nodeid-msr": false, - "kvm": true, - "misalignsse": false, - "min-xlevel": 2147483656, - "bmi2": true, - "bmi1": true, - "kvm-pv-unhalt": true, - "realized": false, - "tsc_scale": false, - "tsc-scale": false, - "topoext": false, - "hv-vpindex": false, - "xlevel2": 0, - "clflushopt": false, - "kvm-no-smi-migration": false, - "monitor": false, - "avx512er": false, - "pmm-en": false, - "pcid": true, - "3dnow": false, - "erms": true, - "lahf-lm": true, - "lahf_lm": true, - "xstore": false, - "hv-synic": false, - "fxsr-opt": false, - "fxsr_opt": false, - "rtm": false, - "lmce": true, - "hv-time": false, - "perfctr-nb": false, - "perfctr_nb": false, - "ffxsr": false, - "rdrand": true, - "rdseed": false, - "avx512-4vnniw": false, - "vme": true, - "vmx": true, - "dtes64": false, - "mtrr": true, - "rdtscp": true, - "pse36": true, - "tbm": false, - "wdt": false, - "pause_filter": false, - "model-id": "Intel(R) Core(TM) i7-4810MQ CPU @ 2.80GHz", - "sha-ni": false, - "abm": true, - "avx512pf": false, - "xstore-en": false - } - } - }, - "id": "libvirt-52" -} - { "return": { }, diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml index 91ab3b0838..dacb5c4599 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml @@ -231,7 +231,7 @@ 2010000 0 - 345185 + 344938 (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 6768937bd5..860904b1e0 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies @@ -2680,20 +2680,12 @@ "id": "libvirt-16", "error": { "class": "DeviceNotFound", - "desc": "Device 'virtio-blk-s390' not found" + "desc": "Device 'virtio-net-s390' not found" } } { "id": "libvirt-17", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-net-s390' not found" - } -} - -{ - "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -2701,7 +2693,7 @@ } { - "id": "libvirt-19", + "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" @@ -2817,7 +2809,7 @@ "type": "bool" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -2931,11 +2923,11 @@ "type": "uint64" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { - "id": "libvirt-22", + "id": "libvirt-21", "error": { "class": "DeviceNotFound", "desc": "Device 'ide-drive' not found" @@ -2943,7 +2935,7 @@ } { - "id": "libvirt-23", + "id": "libvirt-22", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -2951,15 +2943,7 @@ } { - "id": "libvirt-24", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'usb-redir' not found" - } -} - -{ - "id": "libvirt-25", + "id": "libvirt-23", "error": { "class": "DeviceNotFound", "desc": "Device 'usb-host' not found" @@ -2990,11 +2974,11 @@ "type": "uint32" } ], - "id": "libvirt-26" + "id": "libvirt-24" } { - "id": "libvirt-27", + "id": "libvirt-25", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -3002,7 +2986,7 @@ } { - "id": "libvirt-28", + "id": "libvirt-26", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -3010,45 +2994,13 @@ } { - "id": "libvirt-29", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'usb-storage' not found" - } -} - -{ - "id": "libvirt-30", + "id": "libvirt-27", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" } } -{ - "id": "libvirt-31", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'VGA' not found" - } -} - -{ - "id": "libvirt-32", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'vmware-svga' not found" - } -} - -{ - "id": "libvirt-33", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'qxl' not found" - } -} - { "return": [ { @@ -3197,7 +3149,7 @@ "type": "str" } ], - "id": "libvirt-34" + "id": "libvirt-28" } { @@ -3244,11 +3196,11 @@ "type": "size" } ], - "id": "libvirt-35" + "id": "libvirt-29" } { - "id": "libvirt-36", + "id": "libvirt-30", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -3395,7 +3347,7 @@ "type": "str" } ], - "id": "libvirt-37" + "id": "libvirt-31" } { @@ -3457,7 +3409,7 @@ "type": "uint32" } ], - "id": "libvirt-38" + "id": "libvirt-32" } { @@ -3501,15 +3453,7 @@ "type": "bool" } ], - "id": "libvirt-39" -} - -{ - "id": "libvirt-40", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'nec-usb-xhci' not found" - } + "id": "libvirt-33" } { @@ -3562,7 +3506,7 @@ "cpu-max": 248 } ], - "id": "libvirt-41" + "id": "libvirt-34" } { @@ -4096,20 +4040,20 @@ "migration-safe": true } ], - "id": "libvirt-42" + "id": "libvirt-35" } { "return": [ ], - "id": "libvirt-43" + "id": "libvirt-36" } { "return": [ "emulator" ], - "id": "libvirt-44" + "id": "libvirt-37" } { @@ -5230,7 +5174,7 @@ "option": "drive" } ], - "id": "libvirt-45" + "id": "libvirt-38" } { @@ -5288,7 +5232,7 @@ "capability": "x-multifd" } ], - "id": "libvirt-46" + "id": "libvirt-39" } { @@ -15156,7 +15100,7 @@ "meta-type": "object" } ], - "id": "libvirt-47" + "id": "libvirt-40" } { @@ -15195,11 +15139,11 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-41" } { - "id": "libvirt-49", + "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 f7f102fe4c..17abac9102 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml @@ -148,7 +148,7 @@ 2011000 0 - 341724 + 340897 s390x diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies index 9f256c48a4..68ecb0c17d 100644 --- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies @@ -1917,7 +1917,7 @@ "id": "libvirt-13", "error": { "class": "DeviceNotFound", - "desc": "Device 'virtio-blk-ccw' not found" + "desc": "Device 'virtio-net-ccw' not found" } } @@ -1925,28 +1925,12 @@ "id": "libvirt-14", "error": { "class": "DeviceNotFound", - "desc": "Device 'virtio-net-ccw' not found" + "desc": "Device 'virtio-scsi-ccw' not found" } } { "id": "libvirt-15", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-scsi-ccw' not found" - } -} - -{ - "id": "libvirt-16", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-blk-s390' not found" - } -} - -{ - "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -1954,7 +1938,7 @@ } { - "id": "libvirt-18", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -2010,7 +1994,7 @@ "type": "str" } ], - "id": "libvirt-19" + "id": "libvirt-17" } { @@ -2066,7 +2050,7 @@ "type": "str" } ], - "id": "libvirt-20" + "id": "libvirt-18" } { @@ -2161,7 +2145,7 @@ "type": "str" } ], - "id": "libvirt-21" + "id": "libvirt-19" } { @@ -2218,7 +2202,7 @@ "type": "str" } ], - "id": "libvirt-22" + "id": "libvirt-20" } { @@ -2271,7 +2255,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-21" } { @@ -2312,7 +2296,7 @@ "type": "str" } ], - "id": "libvirt-24" + "id": "libvirt-22" } { @@ -2377,7 +2361,7 @@ "type": "uint32" } ], - "id": "libvirt-25" + "id": "libvirt-23" } { @@ -2404,7 +2388,7 @@ "type": "str" } ], - "id": "libvirt-26" + "id": "libvirt-24" } { @@ -2442,7 +2426,7 @@ "type": "size" } ], - "id": "libvirt-27" + "id": "libvirt-25" } { @@ -2496,7 +2480,7 @@ "type": "uint64" } ], - "id": "libvirt-28" + "id": "libvirt-26" } { @@ -2556,7 +2540,7 @@ "type": "str" } ], - "id": "libvirt-29" + "id": "libvirt-27" } { @@ -2570,7 +2554,7 @@ "type": "uint32" } ], - "id": "libvirt-30" + "id": "libvirt-28" } { @@ -2617,7 +2601,7 @@ "type": "uint32" } ], - "id": "libvirt-31" + "id": "libvirt-29" } { @@ -2650,7 +2634,7 @@ "type": "uint32" } ], - "id": "libvirt-32" + "id": "libvirt-30" } { @@ -2727,7 +2711,7 @@ "type": "uint32" } ], - "id": "libvirt-33" + "id": "libvirt-31" } { @@ -2808,7 +2792,7 @@ "type": "bool" } ], - "id": "libvirt-34" + "id": "libvirt-32" } { @@ -2838,7 +2822,7 @@ "type": "uint32" } ], - "id": "libvirt-35" + "id": "libvirt-33" } { @@ -2915,7 +2899,7 @@ "type": "bool" } ], - "id": "libvirt-36" + "id": "libvirt-34" } { @@ -3000,11 +2984,11 @@ "type": "uint32" } ], - "id": "libvirt-37" + "id": "libvirt-35" } { - "id": "libvirt-38", + "id": "libvirt-36", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -3047,7 +3031,7 @@ "type": "bool" } ], - "id": "libvirt-39" + "id": "libvirt-37" } { @@ -3117,7 +3101,7 @@ "type": "bool" } ], - "id": "libvirt-40" + "id": "libvirt-38" } { @@ -3127,7 +3111,7 @@ "type": "uint32" } ], - "id": "libvirt-41" + "id": "libvirt-39" } { @@ -3256,7 +3240,7 @@ "cpu-max": 255 } ], - "id": "libvirt-42" + "id": "libvirt-40" } { @@ -3346,21 +3330,21 @@ "name": "qemu64" } ], - "id": "libvirt-43" + "id": "libvirt-41" } { "return": [ "tpm-tis" ], - "id": "libvirt-44" + "id": "libvirt-42" } { "return": [ "passthrough" ], - "id": "libvirt-45" + "id": "libvirt-43" } { @@ -4368,7 +4352,7 @@ "option": "drive" } ], - "id": "libvirt-46" + "id": "libvirt-44" } { @@ -4398,7 +4382,7 @@ "capability": "events" } ], - "id": "libvirt-47" + "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 9b315aecf4..178f37f8a5 100644 --- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml @@ -191,7 +191,7 @@ 2004000 0 - 75653 + 75406 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 876bc2f0a4..5bc505abb3 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies @@ -2002,7 +2002,7 @@ "id": "libvirt-13", "error": { "class": "DeviceNotFound", - "desc": "Device 'virtio-blk-ccw' not found" + "desc": "Device 'virtio-net-ccw' not found" } } @@ -2010,28 +2010,12 @@ "id": "libvirt-14", "error": { "class": "DeviceNotFound", - "desc": "Device 'virtio-net-ccw' not found" + "desc": "Device 'virtio-scsi-ccw' not found" } } { "id": "libvirt-15", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-scsi-ccw' not found" - } -} - -{ - "id": "libvirt-16", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-blk-s390' not found" - } -} - -{ - "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -2039,7 +2023,7 @@ } { - "id": "libvirt-18", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -2095,7 +2079,7 @@ "type": "bool" } ], - "id": "libvirt-19" + "id": "libvirt-17" } { @@ -2179,7 +2163,7 @@ "type": "bool" } ], - "id": "libvirt-20" + "id": "libvirt-18" } { @@ -2274,7 +2258,7 @@ "type": "uint64" } ], - "id": "libvirt-21" + "id": "libvirt-19" } { @@ -2331,7 +2315,7 @@ "type": "uint16" } ], - "id": "libvirt-22" + "id": "libvirt-20" } { @@ -2384,7 +2368,7 @@ "type": "int32" } ], - "id": "libvirt-23" + "id": "libvirt-21" } { @@ -2425,7 +2409,7 @@ "type": "bool" } ], - "id": "libvirt-24" + "id": "libvirt-22" } { @@ -2490,7 +2474,7 @@ "type": "uint32" } ], - "id": "libvirt-25" + "id": "libvirt-23" } { @@ -2517,7 +2501,7 @@ "type": "uint32" } ], - "id": "libvirt-26" + "id": "libvirt-24" } { @@ -2555,7 +2539,7 @@ "type": "child" } ], - "id": "libvirt-27" + "id": "libvirt-25" } { @@ -2609,7 +2593,7 @@ "type": "child" } ], - "id": "libvirt-28" + "id": "libvirt-26" } { @@ -2669,7 +2653,7 @@ "type": "uint16" } ], - "id": "libvirt-29" + "id": "libvirt-27" } { @@ -2683,7 +2667,7 @@ "type": "LostTickPolicy" } ], - "id": "libvirt-30" + "id": "libvirt-28" } { @@ -2730,7 +2714,7 @@ "type": "int32" } ], - "id": "libvirt-31" + "id": "libvirt-29" } { @@ -2763,7 +2747,7 @@ "type": "int32" } ], - "id": "libvirt-32" + "id": "libvirt-30" } { @@ -2840,7 +2824,7 @@ "type": "uint32" } ], - "id": "libvirt-33" + "id": "libvirt-31" } { @@ -2946,7 +2930,7 @@ "type": "uint32" } ], - "id": "libvirt-34" + "id": "libvirt-32" } { @@ -2986,7 +2970,7 @@ "type": "bool" } ], - "id": "libvirt-35" + "id": "libvirt-33" } { @@ -3063,7 +3047,7 @@ "type": "uint32" } ], - "id": "libvirt-36" + "id": "libvirt-34" } { @@ -3163,11 +3147,11 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-35" } { - "id": "libvirt-38", + "id": "libvirt-36", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -3210,7 +3194,7 @@ "type": "bool" } ], - "id": "libvirt-39" + "id": "libvirt-37" } { @@ -3280,7 +3264,7 @@ "type": "uint32" } ], - "id": "libvirt-40" + "id": "libvirt-38" } { @@ -3290,7 +3274,7 @@ "type": "uint32" } ], - "id": "libvirt-41" + "id": "libvirt-39" } { @@ -3427,7 +3411,7 @@ "cpu-max": 255 } ], - "id": "libvirt-42" + "id": "libvirt-40" } { @@ -3517,21 +3501,21 @@ "name": "qemu64" } ], - "id": "libvirt-43" + "id": "libvirt-41" } { "return": [ "tpm-tis" ], - "id": "libvirt-44" + "id": "libvirt-42" } { "return": [ "passthrough" ], - "id": "libvirt-45" + "id": "libvirt-43" } { @@ -4576,7 +4560,7 @@ "option": "drive" } ], - "id": "libvirt-46" + "id": "libvirt-44" } { @@ -4610,7 +4594,7 @@ "capability": "x-postcopy-ram" } ], - "id": "libvirt-47" + "id": "libvirt-45" } { @@ -12155,7 +12139,7 @@ "meta-type": "array" } ], - "id": "libvirt-48" + "id": "libvirt-46" } { diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml index 3096eadf72..1e8ee4e59f 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml @@ -197,7 +197,7 @@ 2005000 0 - 216775 + 216528 x86_64 diff --git a/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.replies b/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.replies index 219616aa3b..0ec7193b09 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.replies @@ -2761,7 +2761,7 @@ "id": "libvirt-13", "error": { "class": "DeviceNotFound", - "desc": "Device 'virtio-blk-ccw' not found" + "desc": "Device 'virtio-net-ccw' not found" } } @@ -2769,7 +2769,7 @@ "id": "libvirt-14", "error": { "class": "DeviceNotFound", - "desc": "Device 'virtio-net-ccw' not found" + "desc": "Device 'virtio-scsi-ccw' not found" } } @@ -2777,28 +2777,12 @@ "id": "libvirt-15", "error": { "class": "DeviceNotFound", - "desc": "Device 'virtio-scsi-ccw' not found" + "desc": "Device 'virtio-net-s390' not found" } } { "id": "libvirt-16", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-blk-s390' not found" - } -} - -{ - "id": "libvirt-17", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-net-s390' not found" - } -} - -{ - "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -2806,7 +2790,7 @@ } { - "id": "libvirt-19", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" @@ -2898,7 +2882,7 @@ "type": "bool" } ], - "id": "libvirt-20" + "id": "libvirt-18" } { @@ -2993,7 +2977,7 @@ "type": "uint64" } ], - "id": "libvirt-21" + "id": "libvirt-19" } { @@ -3050,25 +3034,17 @@ "type": "uint16" } ], - "id": "libvirt-22" + "id": "libvirt-20" } { - "id": "libvirt-23", + "id": "libvirt-21", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" } } -{ - "id": "libvirt-24", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'usb-redir' not found" - } -} - { "return": [ { @@ -3131,7 +3107,7 @@ "type": "uint32" } ], - "id": "libvirt-25" + "id": "libvirt-22" } { @@ -3158,11 +3134,11 @@ "type": "uint32" } ], - "id": "libvirt-26" + "id": "libvirt-23" } { - "id": "libvirt-27", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -3170,7 +3146,7 @@ } { - "id": "libvirt-28", + "id": "libvirt-25", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -3234,11 +3210,11 @@ "type": "uint16" } ], - "id": "libvirt-29" + "id": "libvirt-26" } { - "id": "libvirt-30", + "id": "libvirt-27", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -3289,23 +3265,7 @@ "type": "int32" } ], - "id": "libvirt-31" -} - -{ - "id": "libvirt-32", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'vmware-svga' not found" - } -} - -{ - "id": "libvirt-33", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'qxl' not found" - } + "id": "libvirt-28" } { @@ -3401,7 +3361,7 @@ "type": "uint32" } ], - "id": "libvirt-34" + "id": "libvirt-29" } { @@ -3431,11 +3391,11 @@ "type": "uint32" } ], - "id": "libvirt-35" + "id": "libvirt-30" } { - "id": "libvirt-36", + "id": "libvirt-31", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -3539,11 +3499,11 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-32" } { - "id": "libvirt-38", + "id": "libvirt-33", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -3586,7 +3546,7 @@ "type": "bool" } ], - "id": "libvirt-39" + "id": "libvirt-34" } { @@ -3656,7 +3616,7 @@ "type": "uint32" } ], - "id": "libvirt-40" + "id": "libvirt-35" } { @@ -3831,7 +3791,7 @@ "cpu-max": 1 } ], - "id": "libvirt-41" + "id": "libvirt-36" } { @@ -3930,19 +3890,19 @@ "name": "pxa270" } ], - "id": "libvirt-42" + "id": "libvirt-37" } { "return": [ ], - "id": "libvirt-43" + "id": "libvirt-38" } { "return": [ ], - "id": "libvirt-44" + "id": "libvirt-39" } { @@ -4914,7 +4874,7 @@ "option": "drive" } ], - "id": "libvirt-45" + "id": "libvirt-40" } { @@ -4948,7 +4908,7 @@ "capability": "postcopy-ram" } ], - "id": "libvirt-46" + "id": "libvirt-41" } { @@ -12953,7 +12913,7 @@ "meta-type": "array" } ], - "id": "libvirt-47" + "id": "libvirt-42" } { @@ -12969,7 +12929,7 @@ "kernel": true } ], - "id": "libvirt-48" + "id": "libvirt-43" } { diff --git a/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml index 7f8721bec9..160ab1e9ee 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml @@ -177,7 +177,7 @@ 2006000 0 - 228838 + 228241 aarch64 diff --git a/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.replies b/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.replies index 7723c40970..920b14d6f0 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.replies @@ -2761,7 +2761,7 @@ "id": "libvirt-13", "error": { "class": "DeviceNotFound", - "desc": "Device 'virtio-blk-ccw' not found" + "desc": "Device 'virtio-net-ccw' not found" } } @@ -2769,7 +2769,7 @@ "id": "libvirt-14", "error": { "class": "DeviceNotFound", - "desc": "Device 'virtio-net-ccw' not found" + "desc": "Device 'virtio-scsi-ccw' not found" } } @@ -2777,28 +2777,12 @@ "id": "libvirt-15", "error": { "class": "DeviceNotFound", - "desc": "Device 'virtio-scsi-ccw' not found" + "desc": "Device 'virtio-net-s390' not found" } } { "id": "libvirt-16", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-blk-s390' not found" - } -} - -{ - "id": "libvirt-17", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-net-s390' not found" - } -} - -{ - "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -2806,7 +2790,7 @@ } { - "id": "libvirt-19", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" @@ -2898,7 +2882,7 @@ "type": "bool" } ], - "id": "libvirt-20" + "id": "libvirt-18" } { @@ -2993,7 +2977,7 @@ "type": "uint64" } ], - "id": "libvirt-21" + "id": "libvirt-19" } { @@ -3050,25 +3034,17 @@ "type": "uint16" } ], - "id": "libvirt-22" + "id": "libvirt-20" } { - "id": "libvirt-23", + "id": "libvirt-21", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" } } -{ - "id": "libvirt-24", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'usb-redir' not found" - } -} - { "return": [ { @@ -3131,7 +3107,7 @@ "type": "uint32" } ], - "id": "libvirt-25" + "id": "libvirt-22" } { @@ -3158,11 +3134,11 @@ "type": "uint32" } ], - "id": "libvirt-26" + "id": "libvirt-23" } { - "id": "libvirt-27", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -3170,7 +3146,7 @@ } { - "id": "libvirt-28", + "id": "libvirt-25", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -3234,11 +3210,11 @@ "type": "uint16" } ], - "id": "libvirt-29" + "id": "libvirt-26" } { - "id": "libvirt-30", + "id": "libvirt-27", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -3289,23 +3265,7 @@ "type": "int32" } ], - "id": "libvirt-31" -} - -{ - "id": "libvirt-32", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'vmware-svga' not found" - } -} - -{ - "id": "libvirt-33", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'qxl' not found" - } + "id": "libvirt-28" } { @@ -3401,7 +3361,7 @@ "type": "uint32" } ], - "id": "libvirt-34" + "id": "libvirt-29" } { @@ -3431,11 +3391,11 @@ "type": "uint32" } ], - "id": "libvirt-35" + "id": "libvirt-30" } { - "id": "libvirt-36", + "id": "libvirt-31", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -3539,11 +3499,11 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-32" } { - "id": "libvirt-38", + "id": "libvirt-33", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -3586,7 +3546,7 @@ "type": "bool" } ], - "id": "libvirt-39" + "id": "libvirt-34" } { @@ -3656,7 +3616,7 @@ "type": "uint32" } ], - "id": "libvirt-40" + "id": "libvirt-35" } { @@ -3831,7 +3791,7 @@ "cpu-max": 1 } ], - "id": "libvirt-41" + "id": "libvirt-36" } { @@ -3930,19 +3890,19 @@ "name": "pxa270" } ], - "id": "libvirt-42" + "id": "libvirt-37" } { "return": [ ], - "id": "libvirt-43" + "id": "libvirt-38" } { "return": [ ], - "id": "libvirt-44" + "id": "libvirt-39" } { @@ -4914,7 +4874,7 @@ "option": "drive" } ], - "id": "libvirt-45" + "id": "libvirt-40" } { @@ -4948,7 +4908,7 @@ "capability": "postcopy-ram" } ], - "id": "libvirt-46" + "id": "libvirt-41" } { @@ -12953,7 +12913,7 @@ "meta-type": "array" } ], - "id": "libvirt-47" + "id": "libvirt-42" } { @@ -12969,7 +12929,7 @@ "kernel": false } ], - "id": "libvirt-48" + "id": "libvirt-43" } { diff --git a/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml index a6ba48ec73..880a49fc55 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml @@ -177,7 +177,7 @@ 2006000 0 - 228838 + 228241 aarch64 diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies index 2e4fa72daa..d4a893bb4d 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies @@ -2911,7 +2911,7 @@ "id": "libvirt-13", "error": { "class": "DeviceNotFound", - "desc": "Device 'virtio-blk-ccw' not found" + "desc": "Device 'virtio-net-ccw' not found" } } @@ -2919,7 +2919,7 @@ "id": "libvirt-14", "error": { "class": "DeviceNotFound", - "desc": "Device 'virtio-net-ccw' not found" + "desc": "Device 'virtio-scsi-ccw' not found" } } @@ -2927,28 +2927,12 @@ "id": "libvirt-15", "error": { "class": "DeviceNotFound", - "desc": "Device 'virtio-scsi-ccw' not found" + "desc": "Device 'virtio-net-s390' not found" } } { "id": "libvirt-16", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-blk-s390' not found" - } -} - -{ - "id": "libvirt-17", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-net-s390' not found" - } -} - -{ - "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -2956,7 +2940,7 @@ } { - "id": "libvirt-19", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" @@ -3048,7 +3032,7 @@ "type": "bool" } ], - "id": "libvirt-20" + "id": "libvirt-18" } { @@ -3143,7 +3127,7 @@ "type": "uint64" } ], - "id": "libvirt-21" + "id": "libvirt-19" } { @@ -3200,25 +3184,17 @@ "type": "uint16" } ], - "id": "libvirt-22" + "id": "libvirt-20" } { - "id": "libvirt-23", + "id": "libvirt-21", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" } } -{ - "id": "libvirt-24", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'usb-redir' not found" - } -} - { "return": [ { @@ -3281,7 +3257,7 @@ "type": "uint32" } ], - "id": "libvirt-25" + "id": "libvirt-22" } { @@ -3308,11 +3284,11 @@ "type": "uint32" } ], - "id": "libvirt-26" + "id": "libvirt-23" } { - "id": "libvirt-27", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -3320,7 +3296,7 @@ } { - "id": "libvirt-28", + "id": "libvirt-25", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -3384,11 +3360,11 @@ "type": "uint16" } ], - "id": "libvirt-29" + "id": "libvirt-26" } { - "id": "libvirt-30", + "id": "libvirt-27", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -3439,23 +3415,7 @@ "type": "int32" } ], - "id": "libvirt-31" -} - -{ - "id": "libvirt-32", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'vmware-svga' not found" - } -} - -{ - "id": "libvirt-33", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'qxl' not found" - } + "id": "libvirt-28" } { @@ -3551,7 +3511,7 @@ "type": "uint32" } ], - "id": "libvirt-34" + "id": "libvirt-29" } { @@ -3581,11 +3541,11 @@ "type": "uint32" } ], - "id": "libvirt-35" + "id": "libvirt-30" } { - "id": "libvirt-36", + "id": "libvirt-31", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -3689,11 +3649,11 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-32" } { - "id": "libvirt-38", + "id": "libvirt-33", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -3736,7 +3696,7 @@ "type": "bool" } ], - "id": "libvirt-39" + "id": "libvirt-34" } { @@ -3806,7 +3766,7 @@ "type": "uint32" } ], - "id": "libvirt-40" + "id": "libvirt-35" } { @@ -3852,7 +3812,7 @@ "type": "uint32" } ], - "id": "libvirt-41" + "id": "libvirt-36" } { @@ -3924,7 +3884,7 @@ "cpu-max": 255 } ], - "id": "libvirt-42" + "id": "libvirt-37" } { @@ -5226,19 +5186,19 @@ "name": "MPC8541E_v11" } ], - "id": "libvirt-43" + "id": "libvirt-38" } { "return": [ ], - "id": "libvirt-44" + "id": "libvirt-39" } { "return": [ ], - "id": "libvirt-45" + "id": "libvirt-40" } { @@ -6205,7 +6165,7 @@ "option": "drive" } ], - "id": "libvirt-46" + "id": "libvirt-41" } { @@ -6239,7 +6199,7 @@ "capability": "postcopy-ram" } ], - "id": "libvirt-47" + "id": "libvirt-42" } { @@ -14244,7 +14204,7 @@ "meta-type": "array" } ], - "id": "libvirt-48" + "id": "libvirt-43" } { diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml index eb6c63c6e9..84df918806 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml @@ -172,7 +172,7 @@ 2006000 0 - 263602 + 263005 ppc64 diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies index d6d0b5786d..73a22ed0bb 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies @@ -2080,7 +2080,7 @@ "id": "libvirt-13", "error": { "class": "DeviceNotFound", - "desc": "Device 'virtio-blk-ccw' not found" + "desc": "Device 'virtio-net-ccw' not found" } } @@ -2088,28 +2088,12 @@ "id": "libvirt-14", "error": { "class": "DeviceNotFound", - "desc": "Device 'virtio-net-ccw' not found" + "desc": "Device 'virtio-scsi-ccw' not found" } } { "id": "libvirt-15", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-scsi-ccw' not found" - } -} - -{ - "id": "libvirt-16", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-blk-s390' not found" - } -} - -{ - "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -2117,7 +2101,7 @@ } { - "id": "libvirt-18", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -2173,7 +2157,7 @@ "type": "bool" } ], - "id": "libvirt-19" + "id": "libvirt-17" } { @@ -2261,7 +2245,7 @@ "type": "bool" } ], - "id": "libvirt-20" + "id": "libvirt-18" } { @@ -2356,7 +2340,7 @@ "type": "uint64" } ], - "id": "libvirt-21" + "id": "libvirt-19" } { @@ -2413,7 +2397,7 @@ "type": "uint16" } ], - "id": "libvirt-22" + "id": "libvirt-20" } { @@ -2466,7 +2450,7 @@ "type": "int32" } ], - "id": "libvirt-23" + "id": "libvirt-21" } { @@ -2507,7 +2491,7 @@ "type": "bool" } ], - "id": "libvirt-24" + "id": "libvirt-22" } { @@ -2572,7 +2556,7 @@ "type": "uint32" } ], - "id": "libvirt-25" + "id": "libvirt-23" } { @@ -2599,7 +2583,7 @@ "type": "uint32" } ], - "id": "libvirt-26" + "id": "libvirt-24" } { @@ -2637,7 +2621,7 @@ "type": "child" } ], - "id": "libvirt-27" + "id": "libvirt-25" } { @@ -2691,7 +2675,7 @@ "type": "child" } ], - "id": "libvirt-28" + "id": "libvirt-26" } { @@ -2751,7 +2735,7 @@ "type": "uint16" } ], - "id": "libvirt-29" + "id": "libvirt-27" } { @@ -2765,7 +2749,7 @@ "type": "LostTickPolicy" } ], - "id": "libvirt-30" + "id": "libvirt-28" } { @@ -2812,7 +2796,7 @@ "type": "int32" } ], - "id": "libvirt-31" + "id": "libvirt-29" } { @@ -2845,7 +2829,7 @@ "type": "int32" } ], - "id": "libvirt-32" + "id": "libvirt-30" } { @@ -2922,7 +2906,7 @@ "type": "uint32" } ], - "id": "libvirt-33" + "id": "libvirt-31" } { @@ -3028,7 +3012,7 @@ "type": "uint32" } ], - "id": "libvirt-34" + "id": "libvirt-32" } { @@ -3068,7 +3052,7 @@ "type": "bool" } ], - "id": "libvirt-35" + "id": "libvirt-33" } { @@ -3145,7 +3129,7 @@ "type": "uint32" } ], - "id": "libvirt-36" + "id": "libvirt-34" } { @@ -3245,11 +3229,11 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-35" } { - "id": "libvirt-38", + "id": "libvirt-36", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -3292,7 +3276,7 @@ "type": "bool" } ], - "id": "libvirt-39" + "id": "libvirt-37" } { @@ -3362,7 +3346,7 @@ "type": "uint32" } ], - "id": "libvirt-40" + "id": "libvirt-38" } { @@ -3372,7 +3356,7 @@ "type": "uint32" } ], - "id": "libvirt-41" + "id": "libvirt-39" } { @@ -3485,7 +3469,7 @@ "cpu-max": 255 } ], - "id": "libvirt-42" + "id": "libvirt-40" } { @@ -3575,21 +3559,21 @@ "name": "qemu64" } ], - "id": "libvirt-43" + "id": "libvirt-41" } { "return": [ "tpm-tis" ], - "id": "libvirt-44" + "id": "libvirt-42" } { "return": [ "passthrough" ], - "id": "libvirt-45" + "id": "libvirt-43" } { @@ -4683,7 +4667,7 @@ "option": "drive" } ], - "id": "libvirt-46" + "id": "libvirt-44" } { @@ -4717,7 +4701,7 @@ "capability": "postcopy-ram" } ], - "id": "libvirt-47" + "id": "libvirt-45" } { @@ -12722,7 +12706,7 @@ "meta-type": "array" } ], - "id": "libvirt-48" + "id": "libvirt-46" } { diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml index e7a43ed3e8..24d9dccbc0 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml @@ -208,7 +208,7 @@ 2006000 0 - 227579 + 227332 x86_64 diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies index 95f15c106a..61fbd9a667 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies @@ -1902,20 +1902,12 @@ "id": "libvirt-16", "error": { "class": "DeviceNotFound", - "desc": "Device 'virtio-blk-s390' not found" + "desc": "Device 'virtio-net-s390' not found" } } { "id": "libvirt-17", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-net-s390' not found" - } -} - -{ - "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -1923,7 +1915,7 @@ } { - "id": "libvirt-19", + "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" @@ -2029,7 +2021,7 @@ "type": "bool" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -2139,11 +2131,11 @@ "type": "uint64" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { - "id": "libvirt-22", + "id": "libvirt-21", "error": { "class": "DeviceNotFound", "desc": "Device 'ide-drive' not found" @@ -2151,7 +2143,7 @@ } { - "id": "libvirt-23", + "id": "libvirt-22", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -2159,15 +2151,7 @@ } { - "id": "libvirt-24", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'usb-redir' not found" - } -} - -{ - "id": "libvirt-25", + "id": "libvirt-23", "error": { "class": "DeviceNotFound", "desc": "Device 'usb-host' not found" @@ -2198,11 +2182,11 @@ "type": "uint32" } ], - "id": "libvirt-26" + "id": "libvirt-24" } { - "id": "libvirt-27", + "id": "libvirt-25", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -2210,7 +2194,7 @@ } { - "id": "libvirt-28", + "id": "libvirt-26", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -2218,45 +2202,13 @@ } { - "id": "libvirt-29", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'usb-storage' not found" - } -} - -{ - "id": "libvirt-30", + "id": "libvirt-27", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" } } -{ - "id": "libvirt-31", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'VGA' not found" - } -} - -{ - "id": "libvirt-32", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'vmware-svga' not found" - } -} - -{ - "id": "libvirt-33", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'qxl' not found" - } -} - { "return": [ { @@ -2354,7 +2306,7 @@ "type": "uint32" } ], - "id": "libvirt-34" + "id": "libvirt-28" } { @@ -2384,11 +2336,11 @@ "type": "uint32" } ], - "id": "libvirt-35" + "id": "libvirt-29" } { - "id": "libvirt-36", + "id": "libvirt-30", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -2496,7 +2448,7 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-31" } { @@ -2553,7 +2505,7 @@ "type": "uint32" } ], - "id": "libvirt-38" + "id": "libvirt-32" } { @@ -2592,15 +2544,7 @@ "type": "bool" } ], - "id": "libvirt-39" -} - -{ - "id": "libvirt-40", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'nec-usb-xhci' not found" - } + "id": "libvirt-33" } { @@ -2633,7 +2577,7 @@ "cpu-max": 248 } ], - "id": "libvirt-41" + "id": "libvirt-34" } { @@ -2642,19 +2586,19 @@ "name": "host" } ], - "id": "libvirt-42" + "id": "libvirt-35" } { "return": [ ], - "id": "libvirt-43" + "id": "libvirt-36" } { "return": [ ], - "id": "libvirt-44" + "id": "libvirt-37" } { @@ -3590,7 +3534,7 @@ "option": "drive" } ], - "id": "libvirt-45" + "id": "libvirt-38" } { @@ -3624,7 +3568,7 @@ "capability": "postcopy-ram" } ], - "id": "libvirt-46" + "id": "libvirt-39" } { @@ -11980,7 +11924,7 @@ "meta-type": "object" } ], - "id": "libvirt-47" + "id": "libvirt-40" } { diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml index c881cf326c..b58c3a1bda 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml @@ -139,7 +139,7 @@ 2007000 0 - 217559 + 216732 s390x diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies index 671a958be6..eaa84d3381 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies @@ -2135,7 +2135,7 @@ "id": "libvirt-13", "error": { "class": "DeviceNotFound", - "desc": "Device 'virtio-blk-ccw' not found" + "desc": "Device 'virtio-net-ccw' not found" } } @@ -2143,28 +2143,12 @@ "id": "libvirt-14", "error": { "class": "DeviceNotFound", - "desc": "Device 'virtio-net-ccw' not found" + "desc": "Device 'virtio-scsi-ccw' not found" } } { "id": "libvirt-15", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-scsi-ccw' not found" - } -} - -{ - "id": "libvirt-16", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-blk-s390' not found" - } -} - -{ - "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -2172,7 +2156,7 @@ } { - "id": "libvirt-18", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -2233,7 +2217,7 @@ "type": "bool" } ], - "id": "libvirt-19" + "id": "libvirt-17" } { @@ -2335,7 +2319,7 @@ "type": "bool" } ], - "id": "libvirt-20" + "id": "libvirt-18" } { @@ -2445,7 +2429,7 @@ "type": "uint64" } ], - "id": "libvirt-21" + "id": "libvirt-19" } { @@ -2517,7 +2501,7 @@ "type": "uint16" } ], - "id": "libvirt-22" + "id": "libvirt-20" } { @@ -2575,7 +2559,7 @@ "type": "int32" } ], - "id": "libvirt-23" + "id": "libvirt-21" } { @@ -2624,7 +2608,7 @@ "type": "bool" } ], - "id": "libvirt-24" + "id": "libvirt-22" } { @@ -2693,7 +2677,7 @@ "type": "uint32" } ], - "id": "libvirt-25" + "id": "libvirt-23" } { @@ -2720,7 +2704,7 @@ "type": "uint32" } ], - "id": "libvirt-26" + "id": "libvirt-24" } { @@ -2758,7 +2742,7 @@ "type": "child" } ], - "id": "libvirt-27" + "id": "libvirt-25" } { @@ -2836,7 +2820,7 @@ "type": "int" } ], - "id": "libvirt-28" + "id": "libvirt-26" } { @@ -2905,7 +2889,7 @@ "type": "uint16" } ], - "id": "libvirt-29" + "id": "libvirt-27" } { @@ -2919,7 +2903,7 @@ "type": "LostTickPolicy" } ], - "id": "libvirt-30" + "id": "libvirt-28" } { @@ -2971,7 +2955,7 @@ "type": "int32" } ], - "id": "libvirt-31" + "id": "libvirt-29" } { @@ -3009,7 +2993,7 @@ "type": "int32" } ], - "id": "libvirt-32" + "id": "libvirt-30" } { @@ -3091,7 +3075,7 @@ "type": "uint32" } ], - "id": "libvirt-33" + "id": "libvirt-31" } { @@ -3201,7 +3185,7 @@ "type": "uint32" } ], - "id": "libvirt-34" + "id": "libvirt-32" } { @@ -3241,7 +3225,7 @@ "type": "bool" } ], - "id": "libvirt-35" + "id": "libvirt-33" } { @@ -3327,7 +3311,7 @@ "type": "uint32" } ], - "id": "libvirt-36" + "id": "libvirt-34" } { @@ -3431,11 +3415,11 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-35" } { - "id": "libvirt-38", + "id": "libvirt-36", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -3478,7 +3462,7 @@ "type": "bool" } ], - "id": "libvirt-39" + "id": "libvirt-37" } { @@ -3553,7 +3537,7 @@ "type": "uint32" } ], - "id": "libvirt-40" + "id": "libvirt-38" } { @@ -3567,7 +3551,7 @@ "type": "bool" } ], - "id": "libvirt-41" + "id": "libvirt-39" } { @@ -3716,7 +3700,7 @@ "cpu-max": 255 } ], - "id": "libvirt-42" + "id": "libvirt-40" } { @@ -3809,21 +3793,21 @@ "name": "qemu64" } ], - "id": "libvirt-43" + "id": "libvirt-41" } { "return": [ "tpm-tis" ], - "id": "libvirt-44" + "id": "libvirt-42" } { "return": [ "passthrough" ], - "id": "libvirt-45" + "id": "libvirt-43" } { @@ -4921,7 +4905,7 @@ "option": "drive" } ], - "id": "libvirt-46" + "id": "libvirt-44" } { @@ -4955,7 +4939,7 @@ "capability": "postcopy-ram" } ], - "id": "libvirt-47" + "id": "libvirt-45" } { @@ -13311,7 +13295,7 @@ "meta-type": "object" } ], - "id": "libvirt-48" + "id": "libvirt-46" } { diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml index 6e868d544c..736e61aeb2 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml @@ -212,7 +212,7 @@ 2007000 0 - 239276 + 239029 (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 ae214aa7b5..818118caf2 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies @@ -2165,20 +2165,12 @@ "id": "libvirt-16", "error": { "class": "DeviceNotFound", - "desc": "Device 'virtio-blk-s390' not found" + "desc": "Device 'virtio-net-s390' not found" } } { "id": "libvirt-17", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-net-s390' not found" - } -} - -{ - "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -2186,7 +2178,7 @@ } { - "id": "libvirt-19", + "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" @@ -2292,7 +2284,7 @@ "type": "bool" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -2402,11 +2394,11 @@ "type": "uint64" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { - "id": "libvirt-22", + "id": "libvirt-21", "error": { "class": "DeviceNotFound", "desc": "Device 'ide-drive' not found" @@ -2414,7 +2406,7 @@ } { - "id": "libvirt-23", + "id": "libvirt-22", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -2422,15 +2414,7 @@ } { - "id": "libvirt-24", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'usb-redir' not found" - } -} - -{ - "id": "libvirt-25", + "id": "libvirt-23", "error": { "class": "DeviceNotFound", "desc": "Device 'usb-host' not found" @@ -2461,11 +2445,11 @@ "type": "uint32" } ], - "id": "libvirt-26" + "id": "libvirt-24" } { - "id": "libvirt-27", + "id": "libvirt-25", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -2473,7 +2457,7 @@ } { - "id": "libvirt-28", + "id": "libvirt-26", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -2481,45 +2465,13 @@ } { - "id": "libvirt-29", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'usb-storage' not found" - } -} - -{ - "id": "libvirt-30", + "id": "libvirt-27", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" } } -{ - "id": "libvirt-31", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'VGA' not found" - } -} - -{ - "id": "libvirt-32", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'vmware-svga' not found" - } -} - -{ - "id": "libvirt-33", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'qxl' not found" - } -} - { "return": [ { @@ -2622,7 +2574,7 @@ "type": "uint32" } ], - "id": "libvirt-34" + "id": "libvirt-28" } { @@ -2652,11 +2604,11 @@ "type": "uint32" } ], - "id": "libvirt-35" + "id": "libvirt-29" } { - "id": "libvirt-36", + "id": "libvirt-30", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -2769,7 +2721,7 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-31" } { @@ -2826,7 +2778,7 @@ "type": "uint32" } ], - "id": "libvirt-38" + "id": "libvirt-32" } { @@ -2865,15 +2817,7 @@ "type": "bool" } ], - "id": "libvirt-39" -} - -{ - "id": "libvirt-40", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'nec-usb-xhci' not found" - } + "id": "libvirt-33" } { @@ -2911,7 +2855,7 @@ "alias": "s390-ccw-virtio" } ], - "id": "libvirt-41" + "id": "libvirt-34" } { @@ -3237,19 +3181,19 @@ "migration-safe": true } ], - "id": "libvirt-42" + "id": "libvirt-35" } { "return": [ ], - "id": "libvirt-43" + "id": "libvirt-36" } { "return": [ ], - "id": "libvirt-44" + "id": "libvirt-37" } { @@ -4210,7 +4154,7 @@ "option": "drive" } ], - "id": "libvirt-45" + "id": "libvirt-38" } { @@ -4248,7 +4192,7 @@ "capability": "x-colo" } ], - "id": "libvirt-46" + "id": "libvirt-39" } { @@ -13018,7 +12962,7 @@ "meta-type": "object" } ], - "id": "libvirt-47" + "id": "libvirt-40" } { @@ -13044,11 +12988,11 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-41" } { - "id": "libvirt-49", + "id": "libvirt-42", "error": { "class": "GenericError", "desc": "Property '.migratable' not found" diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml index efed9881db..2b91337fde 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml @@ -141,7 +141,7 @@ 2007093 0 - 242460 + 241633 s390x diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies index 3087d76807..30d28c7b5f 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies @@ -2250,7 +2250,7 @@ "id": "libvirt-13", "error": { "class": "DeviceNotFound", - "desc": "Device 'virtio-blk-ccw' not found" + "desc": "Device 'virtio-net-ccw' not found" } } @@ -2258,28 +2258,12 @@ "id": "libvirt-14", "error": { "class": "DeviceNotFound", - "desc": "Device 'virtio-net-ccw' not found" + "desc": "Device 'virtio-scsi-ccw' not found" } } { "id": "libvirt-15", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-scsi-ccw' not found" - } -} - -{ - "id": "libvirt-16", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-blk-s390' not found" - } -} - -{ - "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -2287,7 +2271,7 @@ } { - "id": "libvirt-18", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -2348,7 +2332,7 @@ "type": "bool" } ], - "id": "libvirt-19" + "id": "libvirt-17" } { @@ -2450,7 +2434,7 @@ "type": "bool" } ], - "id": "libvirt-20" + "id": "libvirt-18" } { @@ -2560,7 +2544,7 @@ "type": "uint64" } ], - "id": "libvirt-21" + "id": "libvirt-19" } { @@ -2632,7 +2616,7 @@ "type": "uint16" } ], - "id": "libvirt-22" + "id": "libvirt-20" } { @@ -2690,7 +2674,7 @@ "type": "int32" } ], - "id": "libvirt-23" + "id": "libvirt-21" } { @@ -2739,7 +2723,7 @@ "type": "bool" } ], - "id": "libvirt-24" + "id": "libvirt-22" } { @@ -2808,7 +2792,7 @@ "type": "uint32" } ], - "id": "libvirt-25" + "id": "libvirt-23" } { @@ -2835,7 +2819,7 @@ "type": "uint32" } ], - "id": "libvirt-26" + "id": "libvirt-24" } { @@ -2873,7 +2857,7 @@ "type": "child" } ], - "id": "libvirt-27" + "id": "libvirt-25" } { @@ -2951,7 +2935,7 @@ "type": "int" } ], - "id": "libvirt-28" + "id": "libvirt-26" } { @@ -3020,7 +3004,7 @@ "type": "uint16" } ], - "id": "libvirt-29" + "id": "libvirt-27" } { @@ -3034,7 +3018,7 @@ "type": "LostTickPolicy" } ], - "id": "libvirt-30" + "id": "libvirt-28" } { @@ -3086,7 +3070,7 @@ "type": "int32" } ], - "id": "libvirt-31" + "id": "libvirt-29" } { @@ -3124,7 +3108,7 @@ "type": "int32" } ], - "id": "libvirt-32" + "id": "libvirt-30" } { @@ -3206,7 +3190,7 @@ "type": "uint32" } ], - "id": "libvirt-33" + "id": "libvirt-31" } { @@ -3325,7 +3309,7 @@ "type": "uint32" } ], - "id": "libvirt-34" + "id": "libvirt-32" } { @@ -3365,7 +3349,7 @@ "type": "bool" } ], - "id": "libvirt-35" + "id": "libvirt-33" } { @@ -3451,7 +3435,7 @@ "type": "uint32" } ], - "id": "libvirt-36" + "id": "libvirt-34" } { @@ -3564,11 +3548,11 @@ "type": "guest statistics" } ], - "id": "libvirt-37" + "id": "libvirt-35" } { - "id": "libvirt-38", + "id": "libvirt-36", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -3611,7 +3595,7 @@ "type": "bool" } ], - "id": "libvirt-39" + "id": "libvirt-37" } { @@ -3686,7 +3670,7 @@ "type": "uint32" } ], - "id": "libvirt-40" + "id": "libvirt-38" } { @@ -3709,7 +3693,7 @@ "type": "uint32" } ], - "id": "libvirt-41" + "id": "libvirt-39" } { @@ -3878,7 +3862,7 @@ "cpu-max": 255 } ], - "id": "libvirt-42" + "id": "libvirt-40" } { @@ -4084,21 +4068,21 @@ "static": false } ], - "id": "libvirt-43" + "id": "libvirt-41" } { "return": [ "tpm-tis" ], - "id": "libvirt-44" + "id": "libvirt-42" } { "return": [ "passthrough" ], - "id": "libvirt-45" + "id": "libvirt-43" } { @@ -5221,7 +5205,7 @@ "option": "drive" } ], - "id": "libvirt-46" + "id": "libvirt-44" } { @@ -5259,7 +5243,7 @@ "capability": "x-colo" } ], - "id": "libvirt-47" + "id": "libvirt-45" } { @@ -14029,7 +14013,7 @@ "meta-type": "object" } ], - "id": "libvirt-48" + "id": "libvirt-46" } { diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml index 4018f58680..df6f7be340 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml @@ -214,7 +214,7 @@ 2008000 0 - 255931 + 255684 (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 0b286dc967..f367da8d2b 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies @@ -3236,7 +3236,7 @@ "id": "libvirt-13", "error": { "class": "DeviceNotFound", - "desc": "Device 'virtio-blk-ccw' not found" + "desc": "Device 'virtio-net-ccw' not found" } } @@ -3244,7 +3244,7 @@ "id": "libvirt-14", "error": { "class": "DeviceNotFound", - "desc": "Device 'virtio-net-ccw' not found" + "desc": "Device 'virtio-scsi-ccw' not found" } } @@ -3252,28 +3252,12 @@ "id": "libvirt-15", "error": { "class": "DeviceNotFound", - "desc": "Device 'virtio-scsi-ccw' not found" + "desc": "Device 'virtio-net-s390' not found" } } { "id": "libvirt-16", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-blk-s390' not found" - } -} - -{ - "id": "libvirt-17", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-net-s390' not found" - } -} - -{ - "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -3281,7 +3265,7 @@ } { - "id": "libvirt-19", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" @@ -3392,7 +3376,7 @@ "type": "bool" } ], - "id": "libvirt-20" + "id": "libvirt-18" } { @@ -3506,7 +3490,7 @@ "type": "uint64" } ], - "id": "libvirt-21" + "id": "libvirt-19" } { @@ -3582,11 +3566,11 @@ "type": "uint16" } ], - "id": "libvirt-22" + "id": "libvirt-20" } { - "id": "libvirt-23", + "id": "libvirt-21", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -3594,15 +3578,7 @@ } { - "id": "libvirt-24", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'usb-redir' not found" - } -} - -{ - "id": "libvirt-25", + "id": "libvirt-22", "error": { "class": "DeviceNotFound", "desc": "Device 'usb-host' not found" @@ -3633,11 +3609,11 @@ "type": "uint32" } ], - "id": "libvirt-26" + "id": "libvirt-23" } { - "id": "libvirt-27", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -3645,7 +3621,7 @@ } { - "id": "libvirt-28", + "id": "libvirt-25", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -3722,11 +3698,11 @@ "type": "uint16" } ], - "id": "libvirt-29" + "id": "libvirt-26" } { - "id": "libvirt-30", + "id": "libvirt-27", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -3787,23 +3763,7 @@ "type": "int32" } ], - "id": "libvirt-31" -} - -{ - "id": "libvirt-32", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'vmware-svga' not found" - } -} - -{ - "id": "libvirt-33", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'qxl' not found" - } + "id": "libvirt-28" } { @@ -3946,7 +3906,7 @@ "type": "str" } ], - "id": "libvirt-34" + "id": "libvirt-29" } { @@ -3985,11 +3945,11 @@ "type": "size" } ], - "id": "libvirt-35" + "id": "libvirt-30" } { - "id": "libvirt-36", + "id": "libvirt-31", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -4136,11 +4096,11 @@ "type": "str" } ], - "id": "libvirt-37" + "id": "libvirt-32" } { - "id": "libvirt-38", + "id": "libvirt-33", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -4188,7 +4148,7 @@ "type": "bool" } ], - "id": "libvirt-39" + "id": "libvirt-34" } { @@ -4268,7 +4228,7 @@ "type": "uint32" } ], - "id": "libvirt-40" + "id": "libvirt-35" } { @@ -4354,7 +4314,7 @@ "type": "uint32" } ], - "id": "libvirt-41" + "id": "libvirt-36" } { @@ -4467,7 +4427,7 @@ "cpu-max": 1 } ], - "id": "libvirt-42" + "id": "libvirt-37" } { @@ -6643,19 +6603,19 @@ "static": false } ], - "id": "libvirt-43" + "id": "libvirt-38" } { "return": [ ], - "id": "libvirt-44" + "id": "libvirt-39" } { "return": [ ], - "id": "libvirt-45" + "id": "libvirt-40" } { @@ -7765,7 +7725,7 @@ "option": "drive" } ], - "id": "libvirt-46" + "id": "libvirt-41" } { @@ -7807,7 +7767,7 @@ "capability": "release-ram" } ], - "id": "libvirt-47" + "id": "libvirt-42" } { @@ -17093,7 +17053,7 @@ "meta-type": "object" } ], - "id": "libvirt-48" + "id": "libvirt-43" } { diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml index 97adc3856e..c83b5211f3 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml @@ -180,7 +180,7 @@ 2009000 0 - 347135 + 346538 (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 2f310d416a..cbacec6d02 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies @@ -2346,20 +2346,12 @@ "id": "libvirt-16", "error": { "class": "DeviceNotFound", - "desc": "Device 'virtio-blk-s390' not found" + "desc": "Device 'virtio-net-s390' not found" } } { "id": "libvirt-17", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-net-s390' not found" - } -} - -{ - "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -2367,7 +2359,7 @@ } { - "id": "libvirt-19", + "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" @@ -2478,7 +2470,7 @@ "type": "bool" } ], - "id": "libvirt-20" + "id": "libvirt-19" } { @@ -2592,11 +2584,11 @@ "type": "uint64" } ], - "id": "libvirt-21" + "id": "libvirt-20" } { - "id": "libvirt-22", + "id": "libvirt-21", "error": { "class": "DeviceNotFound", "desc": "Device 'ide-drive' not found" @@ -2604,7 +2596,7 @@ } { - "id": "libvirt-23", + "id": "libvirt-22", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -2612,15 +2604,7 @@ } { - "id": "libvirt-24", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'usb-redir' not found" - } -} - -{ - "id": "libvirt-25", + "id": "libvirt-23", "error": { "class": "DeviceNotFound", "desc": "Device 'usb-host' not found" @@ -2651,11 +2635,11 @@ "type": "uint32" } ], - "id": "libvirt-26" + "id": "libvirt-24" } { - "id": "libvirt-27", + "id": "libvirt-25", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -2663,7 +2647,7 @@ } { - "id": "libvirt-28", + "id": "libvirt-26", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -2671,45 +2655,13 @@ } { - "id": "libvirt-29", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'usb-storage' not found" - } -} - -{ - "id": "libvirt-30", + "id": "libvirt-27", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" } } -{ - "id": "libvirt-31", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'VGA' not found" - } -} - -{ - "id": "libvirt-32", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'vmware-svga' not found" - } -} - -{ - "id": "libvirt-33", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'qxl' not found" - } -} - { "return": [ { @@ -2850,7 +2802,7 @@ "type": "str" } ], - "id": "libvirt-34" + "id": "libvirt-28" } { @@ -2889,11 +2841,11 @@ "type": "size" } ], - "id": "libvirt-35" + "id": "libvirt-29" } { - "id": "libvirt-36", + "id": "libvirt-30", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -3040,7 +2992,7 @@ "type": "str" } ], - "id": "libvirt-37" + "id": "libvirt-31" } { @@ -3102,7 +3054,7 @@ "type": "uint32" } ], - "id": "libvirt-38" + "id": "libvirt-32" } { @@ -3146,15 +3098,7 @@ "type": "bool" } ], - "id": "libvirt-39" -} - -{ - "id": "libvirt-40", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'nec-usb-xhci' not found" - } + "id": "libvirt-33" } { @@ -3197,7 +3141,7 @@ "cpu-max": 248 } ], - "id": "libvirt-41" + "id": "libvirt-34" } { @@ -3587,19 +3531,19 @@ "migration-safe": true } ], - "id": "libvirt-42" + "id": "libvirt-35" } { "return": [ ], - "id": "libvirt-43" + "id": "libvirt-36" } { "return": [ ], - "id": "libvirt-44" + "id": "libvirt-37" } { @@ -4674,7 +4618,7 @@ "option": "drive" } ], - "id": "libvirt-45" + "id": "libvirt-38" } { @@ -4716,7 +4660,7 @@ "capability": "release-ram" } ], - "id": "libvirt-46" + "id": "libvirt-39" } { @@ -14002,7 +13946,7 @@ "meta-type": "object" } ], - "id": "libvirt-47" + "id": "libvirt-40" } { @@ -14029,11 +13973,11 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-41" } { - "id": "libvirt-49", + "id": "libvirt-42", "error": { "class": "GenericError", "desc": "Property '.migratable' not found" diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml index 3ba8e1043b..ac8d145d19 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml @@ -144,7 +144,7 @@ 2009000 0 - 265878 + 265051 s390x diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies index 37fbb6d80e..5da1b41c2e 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies @@ -2426,7 +2426,7 @@ "id": "libvirt-13", "error": { "class": "DeviceNotFound", - "desc": "Device 'virtio-blk-ccw' not found" + "desc": "Device 'virtio-net-ccw' not found" } } @@ -2434,28 +2434,12 @@ "id": "libvirt-14", "error": { "class": "DeviceNotFound", - "desc": "Device 'virtio-net-ccw' not found" + "desc": "Device 'virtio-scsi-ccw' not found" } } { "id": "libvirt-15", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-scsi-ccw' not found" - } -} - -{ - "id": "libvirt-16", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-blk-s390' not found" - } -} - -{ - "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -2463,7 +2447,7 @@ } { - "id": "libvirt-18", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -2529,7 +2513,7 @@ "type": "bool" } ], - "id": "libvirt-19" + "id": "libvirt-17" } { @@ -2636,7 +2620,7 @@ "type": "bool" } ], - "id": "libvirt-20" + "id": "libvirt-18" } { @@ -2750,7 +2734,7 @@ "type": "uint64" } ], - "id": "libvirt-21" + "id": "libvirt-19" } { @@ -2826,7 +2810,7 @@ "type": "uint16" } ], - "id": "libvirt-22" + "id": "libvirt-20" } { @@ -2889,7 +2873,7 @@ "type": "int32" } ], - "id": "libvirt-23" + "id": "libvirt-21" } { @@ -2938,7 +2922,7 @@ "type": "bool" } ], - "id": "libvirt-24" + "id": "libvirt-22" } { @@ -3007,7 +2991,7 @@ "type": "uint32" } ], - "id": "libvirt-25" + "id": "libvirt-23" } { @@ -3034,7 +3018,7 @@ "type": "uint32" } ], - "id": "libvirt-26" + "id": "libvirt-24" } { @@ -3072,7 +3056,7 @@ "type": "child" } ], - "id": "libvirt-27" + "id": "libvirt-25" } { @@ -3150,7 +3134,7 @@ "type": "int" } ], - "id": "libvirt-28" + "id": "libvirt-26" } { @@ -3223,7 +3207,7 @@ "type": "uint16" } ], - "id": "libvirt-29" + "id": "libvirt-27" } { @@ -3237,7 +3221,7 @@ "type": "LostTickPolicy" } ], - "id": "libvirt-30" + "id": "libvirt-28" } { @@ -3294,7 +3278,7 @@ "type": "int32" } ], - "id": "libvirt-31" + "id": "libvirt-29" } { @@ -3337,7 +3321,7 @@ "type": "int32" } ], - "id": "libvirt-32" + "id": "libvirt-30" } { @@ -3424,7 +3408,7 @@ "type": "uint32" } ], - "id": "libvirt-33" + "id": "libvirt-31" } { @@ -3577,7 +3561,7 @@ "type": "str" } ], - "id": "libvirt-34" + "id": "libvirt-32" } { @@ -3626,7 +3610,7 @@ "type": "size" } ], - "id": "libvirt-35" + "id": "libvirt-33" } { @@ -3722,7 +3706,7 @@ "type": "uint32" } ], - "id": "libvirt-36" + "id": "libvirt-34" } { @@ -3865,11 +3849,11 @@ "type": "str" } ], - "id": "libvirt-37" + "id": "libvirt-35" } { - "id": "libvirt-38", + "id": "libvirt-36", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -3917,7 +3901,7 @@ "type": "bool" } ], - "id": "libvirt-39" + "id": "libvirt-37" } { @@ -3997,7 +3981,7 @@ "type": "uint32" } ], - "id": "libvirt-40" + "id": "libvirt-38" } { @@ -4028,7 +4012,7 @@ "type": "bool" } ], - "id": "libvirt-41" + "id": "libvirt-39" } { @@ -4207,7 +4191,7 @@ "cpu-max": 255 } ], - "id": "libvirt-42" + "id": "libvirt-40" } { @@ -4489,21 +4473,21 @@ "migration-safe": true } ], - "id": "libvirt-43" + "id": "libvirt-41" } { "return": [ "tpm-tis" ], - "id": "libvirt-44" + "id": "libvirt-42" } { "return": [ "passthrough" ], - "id": "libvirt-45" + "id": "libvirt-43" } { @@ -5752,7 +5736,7 @@ "option": "drive" } ], - "id": "libvirt-46" + "id": "libvirt-44" } { @@ -5794,7 +5778,7 @@ "capability": "release-ram" } ], - "id": "libvirt-47" + "id": "libvirt-45" } { @@ -15080,7 +15064,7 @@ "meta-type": "object" } ], - "id": "libvirt-48" + "id": "libvirt-46" } { @@ -15259,6 +15243,426 @@ } } }, + "id": "libvirt-47" +} + +{ + "return": { + "model": { + "name": "base", + "props": { + "phys-bits": 0, + "core-id": -1, + "xlevel": 2147483656, + "cmov": true, + "ia64": false, + "aes": true, + "mmx": true, + "arat": true, + "rdpid": false, + "pause-filter": false, + "xsavec": true, + "osxsave": false, + "tsc-frequency": 0, + "xd": true, + "hv-vendor-id": "", + "kvm-asyncpf": true, + "kvm_asyncpf": true, + "perfctr_core": false, + "perfctr-core": false, + "mpx": true, + "avx512cd": false, + "decodeassists": false, + "pbe": false, + "sse4_1": true, + "sse4.1": true, + "sse4-1": true, + "family": 6, + "vmware-cpuid-freq": true, + "avx512f": false, + "xcrypt": false, + "hv-runtime": false, + "msr": true, + "mce": true, + "mca": true, + "thread-id": -1, + "min-level": 13, + "xgetbv1": true, + "cid": false, + "hv-relaxed": false, + "fxsr": true, + "ds": false, + "hv-crash": false, + "xsaveopt": true, + "xtpr": false, + "avx512-vpopcntdq": false, + "phe": false, + "avx512vl": false, + "extapic": false, + "3dnowprefetch": true, + "cr8legacy": false, + "cpuid-0xb": true, + "xcrypt-en": false, + "kvm_pv_eoi": true, + "apic-id": 4294967295, + "pn": false, + "dca": false, + "vendor": "GenuineIntel", + "pku": false, + "smx": false, + "cmp-legacy": false, + "cmp_legacy": false, + "avx512-4fmaps": false, + "vmcb-clean": false, + "vmcb_clean": false, + "3dnowext": false, + "hle": true, + "npt": false, + "memory": "/machine/unattached/system[0]", + "clwb": false, + "lbrv": false, + "adx": true, + "ss": true, + "pni": true, + "svm_lock": false, + "svm-lock": false, + "smep": true, + "pfthreshold": false, + "smap": true, + "x2apic": true, + "avx512vbmi": false, + "hv-stimer": false, + "i64": true, + "flushbyasid": false, + "f16c": true, + "ace2-en": false, + "pat": true, + "pae": true, + "sse": true, + "phe-en": false, + "kvm-nopiodelay": true, + "kvm_nopiodelay": true, + "tm": false, + "kvmclock-stable-bit": true, + "hypervisor": true, + "socket-id": -1, + "pcommit": false, + "syscall": true, + "level": 13, + "avx512dq": false, + "svm": false, + "full-cpuid-auto-level": true, + "hv-reset": false, + "invtsc": false, + "sse3": true, + "sse2": true, + "est": false, + "avx512ifma": false, + "tm2": false, + "kvm-pv-eoi": true, + "cx8": true, + "kvm-mmu": false, + "kvm_mmu": false, + "sse4_2": true, + "sse4.2": true, + "sse4-2": true, + "pge": true, + "fill-mtrr-mask": true, + "pdcm": false, + "nodeid_msr": false, + "model": 94, + "movbe": true, + "nrip-save": false, + "nrip_save": false, + "sse4a": false, + "ssse3": true, + "kvm_pv_unhalt": true, + "invpcid": true, + "pdpe1gb": true, + "tsc-deadline": true, + "fma": true, + "cx16": true, + "de": true, + "enforce": false, + "stepping": 3, + "xsave": true, + "clflush": true, + "skinit": false, + "tce": false, + "tsc": true, + "fpu": true, + "ds-cpl": false, + "ds_cpl": false, + "ibs": false, + "host-phys-bits": false, + "fma4": false, + "la57": false, + "osvw": false, + "check": true, + "hv-spinlocks": -1, + "pmm": false, + "apic": true, + "pmu": false, + "min-xlevel2": 0, + "tsc-adjust": true, + "tsc_adjust": true, + "kvm-steal-time": true, + "kvm_steal_time": true, + "kvmclock": true, + "l3-cache": true, + "lwp": false, + "xop": false, + "avx": true, + "ospke": false, + "ace2": false, + "acpi": false, + "avx512bw": false, + "hv-vapic": false, + "fsgsbase": true, + "ht": false, + "nx": true, + "pclmulqdq": true, + "mmxext": false, + "popcnt": true, + "xsaves": true, + "lm": true, + "umip": false, + "avx2": true, + "pse": true, + "sep": true, + "pclmuldq": true, + "nodeid-msr": false, + "kvm": true, + "misalignsse": false, + "min-xlevel": 2147483656, + "bmi2": true, + "bmi1": true, + "kvm-pv-unhalt": true, + "realized": false, + "tsc_scale": false, + "tsc-scale": false, + "topoext": false, + "hv-vpindex": false, + "xlevel2": 0, + "clflushopt": true, + "kvm-no-smi-migration": false, + "monitor": false, + "avx512er": false, + "pmm-en": false, + "pcid": true, + "3dnow": false, + "erms": true, + "lahf-lm": true, + "lahf_lm": true, + "xstore": false, + "hv-synic": false, + "fxsr-opt": false, + "fxsr_opt": false, + "rtm": true, + "lmce": true, + "hv-time": false, + "perfctr-nb": false, + "perfctr_nb": false, + "ffxsr": false, + "rdrand": true, + "rdseed": true, + "avx512-4vnniw": false, + "vme": true, + "vmx": true, + "dtes64": false, + "mtrr": true, + "rdtscp": true, + "pse36": true, + "tbm": false, + "wdt": false, + "pause_filter": false, + "model-id": "Intel(R) Xeon(R) CPU E3-1245 v5 @ 3.50GHz", + "sha-ni": false, + "abm": true, + "avx512pf": false, + "xstore-en": false + } + } + }, + "id": "libvirt-48" +} + +{ + "return": { + "model": { + "name": "base", + "props": { + "cmov": true, + "ia64": false, + "aes": true, + "mmx": true, + "rdpid": false, + "arat": true, + "pause-filter": false, + "xsavec": true, + "osxsave": false, + "kvm-asyncpf": true, + "perfctr-core": false, + "mpx": true, + "pbe": false, + "avx512cd": false, + "decodeassists": false, + "sse4.1": true, + "family": 6, + "avx512f": false, + "msr": true, + "mce": true, + "mca": true, + "xcrypt": false, + "min-level": 13, + "xgetbv1": true, + "cid": false, + "ds": false, + "fxsr": true, + "xsaveopt": true, + "xtpr": false, + "avx512vl": false, + "avx512-vpopcntdq": false, + "phe": false, + "extapic": false, + "3dnowprefetch": true, + "cr8legacy": false, + "xcrypt-en": false, + "pn": false, + "dca": false, + "vendor": "GenuineIntel", + "pku": false, + "smx": false, + "cmp-legacy": false, + "avx512-4fmaps": false, + "vmcb-clean": false, + "hle": true, + "3dnowext": false, + "npt": false, + "clwb": false, + "lbrv": false, + "adx": true, + "ss": true, + "pni": true, + "svm-lock": false, + "smep": true, + "smap": true, + "pfthreshold": false, + "x2apic": true, + "avx512vbmi": false, + "flushbyasid": false, + "f16c": true, + "ace2-en": false, + "pae": true, + "pat": true, + "sse": true, + "phe-en": false, + "kvm-nopiodelay": true, + "tm": false, + "kvmclock-stable-bit": true, + "hypervisor": true, + "pcommit": false, + "syscall": true, + "avx512dq": false, + "svm": false, + "invtsc": true, + "sse2": true, + "est": false, + "avx512ifma": false, + "tm2": false, + "kvm-pv-eoi": true, + "cx8": true, + "kvm-mmu": false, + "sse4.2": true, + "pge": true, + "pdcm": false, + "model": 94, + "movbe": true, + "nrip-save": false, + "ssse3": true, + "sse4a": false, + "invpcid": true, + "pdpe1gb": true, + "tsc-deadline": true, + "fma": true, + "cx16": true, + "de": true, + "stepping": 3, + "xsave": true, + "clflush": true, + "skinit": false, + "tsc": true, + "tce": false, + "fpu": true, + "ds-cpl": false, + "ibs": false, + "fma4": false, + "la57": false, + "osvw": false, + "apic": true, + "pmm": false, + "tsc-adjust": true, + "kvm-steal-time": true, + "kvmclock": true, + "lwp": false, + "xop": false, + "avx": true, + "ospke": false, + "acpi": false, + "avx512bw": false, + "ace2": false, + "fsgsbase": true, + "ht": false, + "nx": true, + "pclmulqdq": true, + "mmxext": false, + "popcnt": true, + "xsaves": true, + "lm": true, + "umip": false, + "pse": true, + "avx2": true, + "sep": true, + "nodeid-msr": false, + "misalignsse": false, + "min-xlevel": 2147483656, + "bmi1": true, + "bmi2": true, + "kvm-pv-unhalt": true, + "tsc-scale": false, + "topoext": false, + "clflushopt": true, + "monitor": false, + "avx512er": false, + "pmm-en": false, + "pcid": true, + "3dnow": false, + "erms": true, + "lahf-lm": true, + "fxsr-opt": false, + "xstore": false, + "rtm": true, + "lmce": true, + "perfctr-nb": false, + "rdrand": true, + "rdseed": true, + "avx512-4vnniw": false, + "vme": true, + "vmx": true, + "dtes64": false, + "mtrr": true, + "rdtscp": true, + "pse36": true, + "tbm": false, + "wdt": false, + "model-id": "Intel(R) Xeon(R) CPU E3-1245 v5 @ 3.50GHz", + "sha-ni": false, + "abm": true, + "avx512pf": false, + "xstore-en": false + } + } + }, "id": "libvirt-49" } @@ -15369,426 +15773,6 @@ "svm": false, "full-cpuid-auto-level": true, "hv-reset": false, - "invtsc": false, - "sse3": true, - "sse2": true, - "est": false, - "avx512ifma": false, - "tm2": false, - "kvm-pv-eoi": true, - "cx8": true, - "kvm-mmu": false, - "kvm_mmu": false, - "sse4_2": true, - "sse4.2": true, - "sse4-2": true, - "pge": true, - "fill-mtrr-mask": true, - "pdcm": false, - "nodeid_msr": false, - "model": 94, - "movbe": true, - "nrip-save": false, - "nrip_save": false, - "sse4a": false, - "ssse3": true, - "kvm_pv_unhalt": true, - "invpcid": true, - "pdpe1gb": true, - "tsc-deadline": true, - "fma": true, - "cx16": true, - "de": true, - "enforce": false, - "stepping": 3, - "xsave": true, - "clflush": true, - "skinit": false, - "tce": false, - "tsc": true, - "fpu": true, - "ds-cpl": false, - "ds_cpl": false, - "ibs": false, - "host-phys-bits": false, - "fma4": false, - "la57": false, - "osvw": false, - "check": true, - "hv-spinlocks": -1, - "pmm": false, - "apic": true, - "pmu": false, - "min-xlevel2": 0, - "tsc-adjust": true, - "tsc_adjust": true, - "kvm-steal-time": true, - "kvm_steal_time": true, - "kvmclock": true, - "l3-cache": true, - "lwp": false, - "xop": false, - "avx": true, - "ospke": false, - "ace2": false, - "acpi": false, - "avx512bw": false, - "hv-vapic": false, - "fsgsbase": true, - "ht": false, - "nx": true, - "pclmulqdq": true, - "mmxext": false, - "popcnt": true, - "xsaves": true, - "lm": true, - "umip": false, - "avx2": true, - "pse": true, - "sep": true, - "pclmuldq": true, - "nodeid-msr": false, - "kvm": true, - "misalignsse": false, - "min-xlevel": 2147483656, - "bmi2": true, - "bmi1": true, - "kvm-pv-unhalt": true, - "realized": false, - "tsc_scale": false, - "tsc-scale": false, - "topoext": false, - "hv-vpindex": false, - "xlevel2": 0, - "clflushopt": true, - "kvm-no-smi-migration": false, - "monitor": false, - "avx512er": false, - "pmm-en": false, - "pcid": true, - "3dnow": false, - "erms": true, - "lahf-lm": true, - "lahf_lm": true, - "xstore": false, - "hv-synic": false, - "fxsr-opt": false, - "fxsr_opt": false, - "rtm": true, - "lmce": true, - "hv-time": false, - "perfctr-nb": false, - "perfctr_nb": false, - "ffxsr": false, - "rdrand": true, - "rdseed": true, - "avx512-4vnniw": false, - "vme": true, - "vmx": true, - "dtes64": false, - "mtrr": true, - "rdtscp": true, - "pse36": true, - "tbm": false, - "wdt": false, - "pause_filter": false, - "model-id": "Intel(R) Xeon(R) CPU E3-1245 v5 @ 3.50GHz", - "sha-ni": false, - "abm": true, - "avx512pf": false, - "xstore-en": false - } - } - }, - "id": "libvirt-50" -} - -{ - "return": { - "model": { - "name": "base", - "props": { - "cmov": true, - "ia64": false, - "aes": true, - "mmx": true, - "rdpid": false, - "arat": true, - "pause-filter": false, - "xsavec": true, - "osxsave": false, - "kvm-asyncpf": true, - "perfctr-core": false, - "mpx": true, - "pbe": false, - "avx512cd": false, - "decodeassists": false, - "sse4.1": true, - "family": 6, - "avx512f": false, - "msr": true, - "mce": true, - "mca": true, - "xcrypt": false, - "min-level": 13, - "xgetbv1": true, - "cid": false, - "ds": false, - "fxsr": true, - "xsaveopt": true, - "xtpr": false, - "avx512vl": false, - "avx512-vpopcntdq": false, - "phe": false, - "extapic": false, - "3dnowprefetch": true, - "cr8legacy": false, - "xcrypt-en": false, - "pn": false, - "dca": false, - "vendor": "GenuineIntel", - "pku": false, - "smx": false, - "cmp-legacy": false, - "avx512-4fmaps": false, - "vmcb-clean": false, - "hle": true, - "3dnowext": false, - "npt": false, - "clwb": false, - "lbrv": false, - "adx": true, - "ss": true, - "pni": true, - "svm-lock": false, - "smep": true, - "smap": true, - "pfthreshold": false, - "x2apic": true, - "avx512vbmi": false, - "flushbyasid": false, - "f16c": true, - "ace2-en": false, - "pae": true, - "pat": true, - "sse": true, - "phe-en": false, - "kvm-nopiodelay": true, - "tm": false, - "kvmclock-stable-bit": true, - "hypervisor": true, - "pcommit": false, - "syscall": true, - "avx512dq": false, - "svm": false, - "invtsc": true, - "sse2": true, - "est": false, - "avx512ifma": false, - "tm2": false, - "kvm-pv-eoi": true, - "cx8": true, - "kvm-mmu": false, - "sse4.2": true, - "pge": true, - "pdcm": false, - "model": 94, - "movbe": true, - "nrip-save": false, - "ssse3": true, - "sse4a": false, - "invpcid": true, - "pdpe1gb": true, - "tsc-deadline": true, - "fma": true, - "cx16": true, - "de": true, - "stepping": 3, - "xsave": true, - "clflush": true, - "skinit": false, - "tsc": true, - "tce": false, - "fpu": true, - "ds-cpl": false, - "ibs": false, - "fma4": false, - "la57": false, - "osvw": false, - "apic": true, - "pmm": false, - "tsc-adjust": true, - "kvm-steal-time": true, - "kvmclock": true, - "lwp": false, - "xop": false, - "avx": true, - "ospke": false, - "acpi": false, - "avx512bw": false, - "ace2": false, - "fsgsbase": true, - "ht": false, - "nx": true, - "pclmulqdq": true, - "mmxext": false, - "popcnt": true, - "xsaves": true, - "lm": true, - "umip": false, - "pse": true, - "avx2": true, - "sep": true, - "nodeid-msr": false, - "misalignsse": false, - "min-xlevel": 2147483656, - "bmi1": true, - "bmi2": true, - "kvm-pv-unhalt": true, - "tsc-scale": false, - "topoext": false, - "clflushopt": true, - "monitor": false, - "avx512er": false, - "pmm-en": false, - "pcid": true, - "3dnow": false, - "erms": true, - "lahf-lm": true, - "fxsr-opt": false, - "xstore": false, - "rtm": true, - "lmce": true, - "perfctr-nb": false, - "rdrand": true, - "rdseed": true, - "avx512-4vnniw": false, - "vme": true, - "vmx": true, - "dtes64": false, - "mtrr": true, - "rdtscp": true, - "pse36": true, - "tbm": false, - "wdt": false, - "model-id": "Intel(R) Xeon(R) CPU E3-1245 v5 @ 3.50GHz", - "sha-ni": false, - "abm": true, - "avx512pf": false, - "xstore-en": false - } - } - }, - "id": "libvirt-50" -} - -{ - "return": { - "model": { - "name": "base", - "props": { - "phys-bits": 0, - "core-id": -1, - "xlevel": 2147483656, - "cmov": true, - "ia64": false, - "aes": true, - "mmx": true, - "arat": true, - "rdpid": false, - "pause-filter": false, - "xsavec": true, - "osxsave": false, - "tsc-frequency": 0, - "xd": true, - "hv-vendor-id": "", - "kvm-asyncpf": true, - "kvm_asyncpf": true, - "perfctr_core": false, - "perfctr-core": false, - "mpx": true, - "avx512cd": false, - "decodeassists": false, - "pbe": false, - "sse4_1": true, - "sse4.1": true, - "sse4-1": true, - "family": 6, - "vmware-cpuid-freq": true, - "avx512f": false, - "xcrypt": false, - "hv-runtime": false, - "msr": true, - "mce": true, - "mca": true, - "thread-id": -1, - "min-level": 13, - "xgetbv1": true, - "cid": false, - "hv-relaxed": false, - "fxsr": true, - "ds": false, - "hv-crash": false, - "xsaveopt": true, - "xtpr": false, - "avx512-vpopcntdq": false, - "phe": false, - "avx512vl": false, - "extapic": false, - "3dnowprefetch": true, - "cr8legacy": false, - "cpuid-0xb": true, - "xcrypt-en": false, - "kvm_pv_eoi": true, - "apic-id": 4294967295, - "pn": false, - "dca": false, - "vendor": "GenuineIntel", - "pku": false, - "smx": false, - "cmp-legacy": false, - "cmp_legacy": false, - "avx512-4fmaps": false, - "vmcb-clean": false, - "vmcb_clean": false, - "3dnowext": false, - "hle": true, - "npt": false, - "memory": "/machine/unattached/system[0]", - "clwb": false, - "lbrv": false, - "adx": true, - "ss": true, - "pni": true, - "svm_lock": false, - "svm-lock": false, - "smep": true, - "pfthreshold": false, - "smap": true, - "x2apic": true, - "avx512vbmi": false, - "hv-stimer": false, - "i64": true, - "flushbyasid": false, - "f16c": true, - "ace2-en": false, - "pat": true, - "pae": true, - "sse": true, - "phe-en": false, - "kvm-nopiodelay": true, - "kvm_nopiodelay": true, - "tm": false, - "kvmclock-stable-bit": true, - "hypervisor": true, - "socket-id": -1, - "pcommit": false, - "syscall": true, - "level": 13, - "avx512dq": false, - "svm": false, - "full-cpuid-auto-level": true, - "hv-reset": false, "invtsc": true, "sse3": true, "sse2": true, @@ -15920,7 +15904,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml index b6ecf7fbde..13fc8c143f 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml @@ -227,7 +227,7 @@ 2009000 0 - 321194 + 320947 (v2.9.0) x86_64