[libvirt] [PATCH v2 03/31] qemu: Probe KVM state earlier

Let's set QEMU_CAPS_KVM and QEMU_CAPS_ENABLE_KVM early so that the rest of the probing code can use these capabilities to handle KVM/TCG replies differently. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- src/qemu/qemu_capabilities.c | 7 +- .../qemucapabilitiesdata/caps_1.2.2.x86_64.replies | 138 ++++++++++----------- .../qemucapabilitiesdata/caps_1.3.1.x86_64.replies | 86 ++++++------- .../qemucapabilitiesdata/caps_1.4.2.x86_64.replies | 84 ++++++------- .../qemucapabilitiesdata/caps_1.5.3.x86_64.replies | 84 ++++++------- .../qemucapabilitiesdata/caps_1.6.0.x86_64.replies | 84 ++++++------- .../qemucapabilitiesdata/caps_1.7.0.x86_64.replies | 84 ++++++------- .../qemucapabilitiesdata/caps_2.1.1.x86_64.replies | 84 ++++++------- .../qemucapabilitiesdata/caps_2.4.0.x86_64.replies | 84 ++++++------- .../qemucapabilitiesdata/caps_2.5.0.x86_64.replies | 84 ++++++------- .../caps_2.6.0-gicv2.aarch64.replies | 84 ++++++------- .../caps_2.6.0-gicv3.aarch64.replies | 84 ++++++------- .../caps_2.6.0.ppc64le.replies | 84 ++++++------- .../qemucapabilitiesdata/caps_2.6.0.x86_64.replies | 84 ++++++------- .../qemucapabilitiesdata/caps_2.7.0.x86_64.replies | 84 ++++++------- 15 files changed, 621 insertions(+), 618 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 7a196ad..fe0705f 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -3980,6 +3980,11 @@ virQEMUCapsInitQMPMonitor(virQEMUCapsPtr qemuCaps, if (virQEMUCapsProbeQMPCommands(qemuCaps, mon) < 0) goto cleanup; + + /* Some capabilities may differ depending on KVM state */ + if (virQEMUCapsProbeQMPKVMState(qemuCaps, mon) < 0) + goto cleanup; + if (virQEMUCapsProbeQMPEvents(qemuCaps, mon) < 0) goto cleanup; if (virQEMUCapsProbeQMPObjects(qemuCaps, mon) < 0) @@ -3988,8 +3993,6 @@ virQEMUCapsInitQMPMonitor(virQEMUCapsPtr qemuCaps, goto cleanup; if (virQEMUCapsProbeQMPCPUDefinitions(qemuCaps, mon) < 0) goto cleanup; - if (virQEMUCapsProbeQMPKVMState(qemuCaps, mon) < 0) - goto cleanup; if (virQEMUCapsProbeQMPTPM(qemuCaps, mon) < 0) goto cleanup; if (virQEMUCapsProbeQMPCommandLine(qemuCaps, mon) < 0) diff --git a/tests/qemucapabilitiesdata/caps_1.2.2.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.2.2.x86_64.replies index dff9788..c05e110 100644 --- a/tests/qemucapabilitiesdata/caps_1.2.2.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_1.2.2.x86_64.replies @@ -278,6 +278,14 @@ } { + "return": { + "enabled": false, + "present": true + }, + "id": "libvirt-6" +} + +{ "return": [ { "name": "SPICE_MIGRATE_COMPLETED" @@ -346,7 +354,7 @@ "name": "SHUTDOWN" } ], - "id": "libvirt-6" + "id": "libvirt-7" } { @@ -769,7 +777,7 @@ "name": "VGA" } ], - "id": "libvirt-7" + "id": "libvirt-8" } { @@ -871,7 +879,7 @@ "type": "hex32" } ], - "id": "libvirt-8" + "id": "libvirt-9" } { @@ -1009,7 +1017,7 @@ "type": "on/off" } ], - "id": "libvirt-9" + "id": "libvirt-10" } { @@ -1071,11 +1079,11 @@ "type": "on/off" } ], - "id": "libvirt-10" + "id": "libvirt-11" } { - "id": "libvirt-11", + "id": "libvirt-12", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-blk-ccw' not found" @@ -1083,7 +1091,7 @@ } { - "id": "libvirt-12", + "id": "libvirt-13", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -1091,7 +1099,7 @@ } { - "id": "libvirt-13", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -1099,7 +1107,7 @@ } { - "id": "libvirt-14", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-blk-s390' not found" @@ -1107,7 +1115,7 @@ } { - "id": "libvirt-15", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -1115,7 +1123,7 @@ } { - "id": "libvirt-16", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -1123,7 +1131,7 @@ } { - "id": "libvirt-17", + "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" @@ -1131,7 +1139,7 @@ } { - "id": "libvirt-18", + "id": "libvirt-19", "error": { "class": "DeviceNotFound", "desc": "Device 'vfio-pci' not found" @@ -1209,7 +1217,7 @@ "type": "drive" } ], - "id": "libvirt-19" + "id": "libvirt-20" } { @@ -1263,7 +1271,7 @@ "type": "drive" } ], - "id": "libvirt-20" + "id": "libvirt-21" } { @@ -1305,11 +1313,11 @@ "type": "uint32" } ], - "id": "libvirt-21" + "id": "libvirt-22" } { - "id": "libvirt-22", + "id": "libvirt-23", "error": { "class": "DeviceNotFound", "desc": "Device 'usb-redir' not found" @@ -1359,7 +1367,7 @@ "type": "uint32" } ], - "id": "libvirt-23" + "id": "libvirt-24" } { @@ -1385,17 +1393,17 @@ "type": "drive" } ], - "id": "libvirt-24" + "id": "libvirt-25" } { "return": [ ], - "id": "libvirt-25" + "id": "libvirt-26" } { - "id": "libvirt-26", + "id": "libvirt-27", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -1449,7 +1457,7 @@ "type": "drive" } ], - "id": "libvirt-27" + "id": "libvirt-28" } { @@ -1463,36 +1471,6 @@ "type": "hex32" } ], - "id": "libvirt-28" -} - -{ - "return": [ - { - "name": "command_serr_enable", - "type": "on/off" - }, - { - "name": "multifunction", - "type": "on/off" - }, - { - "name": "rombar", - "type": "uint32" - }, - { - "name": "romfile", - "type": "string" - }, - { - "name": "addr", - "type": "pci-devfn" - }, - { - "name": "vgamem_mb", - "type": "uint32" - } - ], "id": "libvirt-29" } @@ -1551,6 +1529,36 @@ { "name": "vgamem_mb", "type": "uint32" + } + ], + "id": "libvirt-31" +} + +{ + "return": [ + { + "name": "command_serr_enable", + "type": "on/off" + }, + { + "name": "multifunction", + "type": "on/off" + }, + { + "name": "rombar", + "type": "uint32" + }, + { + "name": "romfile", + "type": "string" + }, + { + "name": "addr", + "type": "pci-devfn" + }, + { + "name": "vgamem_mb", + "type": "uint32" }, { "name": "vram64_size_mb", @@ -1589,11 +1597,11 @@ "type": "uint32" } ], - "id": "libvirt-31" + "id": "libvirt-32" } { - "id": "libvirt-32", + "id": "libvirt-33", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-gpu-pci' not found" @@ -1601,7 +1609,7 @@ } { - "id": "libvirt-33", + "id": "libvirt-34", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-gpu-device' not found" @@ -1609,7 +1617,7 @@ } { - "id": "libvirt-34", + "id": "libvirt-35", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -1651,11 +1659,11 @@ "type": "on/off" } ], - "id": "libvirt-35" + "id": "libvirt-36" } { - "id": "libvirt-36", + "id": "libvirt-37", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -1663,7 +1671,7 @@ } { - "id": "libvirt-37", + "id": "libvirt-38", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-device' not found" @@ -1697,7 +1705,7 @@ "type": "uint32" } ], - "id": "libvirt-38" + "id": "libvirt-39" } { @@ -1738,7 +1746,7 @@ "name": "none" } ], - "id": "libvirt-39" + "id": "libvirt-40" } { @@ -1810,14 +1818,6 @@ "name": "Opteron_G4" } ], - "id": "libvirt-40" -} - -{ - "return": { - "enabled": false, - "present": true - }, "id": "libvirt-41" } diff --git a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.replies index c40f9fe..6801a76 100644 --- a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.replies @@ -316,6 +316,14 @@ } { + "return": { + "enabled": false, + "present": true + }, + "id": "libvirt-7" +} + +{ "return": [ { "name": "SPICE_MIGRATE_COMPLETED" @@ -390,7 +398,7 @@ "name": "SHUTDOWN" } ], - "id": "libvirt-7" + "id": "libvirt-8" } { @@ -873,7 +881,7 @@ "name": "VGA" } ], - "id": "libvirt-8" + "id": "libvirt-9" } { @@ -975,7 +983,7 @@ "type": "hex32" } ], - "id": "libvirt-9" + "id": "libvirt-10" } { @@ -1113,7 +1121,7 @@ "type": "on/off" } ], - "id": "libvirt-10" + "id": "libvirt-11" } { @@ -1175,11 +1183,11 @@ "type": "on/off" } ], - "id": "libvirt-11" + "id": "libvirt-12" } { - "id": "libvirt-12", + "id": "libvirt-13", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-blk-ccw' not found" @@ -1187,7 +1195,7 @@ } { - "id": "libvirt-13", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -1195,7 +1203,7 @@ } { - "id": "libvirt-14", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -1203,7 +1211,7 @@ } { - "id": "libvirt-15", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-blk-s390' not found" @@ -1211,7 +1219,7 @@ } { - "id": "libvirt-16", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -1219,7 +1227,7 @@ } { - "id": "libvirt-17", + "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -1269,7 +1277,7 @@ "type": "pci-host-devaddr" } ], - "id": "libvirt-18" + "id": "libvirt-19" } { @@ -1303,7 +1311,7 @@ "type": "pci-host-devaddr" } ], - "id": "libvirt-19" + "id": "libvirt-20" } { @@ -1377,7 +1385,7 @@ "type": "drive" } ], - "id": "libvirt-20" + "id": "libvirt-21" } { @@ -1431,7 +1439,7 @@ "type": "drive" } ], - "id": "libvirt-21" + "id": "libvirt-22" } { @@ -1473,7 +1481,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-23" } { @@ -1503,7 +1511,7 @@ "type": "chr" } ], - "id": "libvirt-23" + "id": "libvirt-24" } { @@ -1549,7 +1557,7 @@ "type": "uint32" } ], - "id": "libvirt-24" + "id": "libvirt-25" } { @@ -1575,13 +1583,13 @@ "type": "drive" } ], - "id": "libvirt-25" + "id": "libvirt-26" } { "return": [ ], - "id": "libvirt-26" + "id": "libvirt-27" } { @@ -1591,7 +1599,7 @@ "type": "uint64" } ], - "id": "libvirt-27" + "id": "libvirt-28" } { @@ -1641,7 +1649,7 @@ "type": "drive" } ], - "id": "libvirt-28" + "id": "libvirt-29" } { @@ -1655,7 +1663,7 @@ "type": "hex32" } ], - "id": "libvirt-29" + "id": "libvirt-30" } { @@ -1689,7 +1697,7 @@ "type": "uint32" } ], - "id": "libvirt-30" + "id": "libvirt-31" } { @@ -1719,7 +1727,7 @@ "type": "uint32" } ], - "id": "libvirt-31" + "id": "libvirt-32" } { @@ -1789,11 +1797,11 @@ "type": "uint32" } ], - "id": "libvirt-32" + "id": "libvirt-33" } { - "id": "libvirt-33", + "id": "libvirt-34", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-gpu-pci' not found" @@ -1801,7 +1809,7 @@ } { - "id": "libvirt-34", + "id": "libvirt-35", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-gpu-device' not found" @@ -1809,7 +1817,7 @@ } { - "id": "libvirt-35", + "id": "libvirt-36", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -1851,11 +1859,11 @@ "type": "on/off" } ], - "id": "libvirt-36" + "id": "libvirt-37" } { - "id": "libvirt-37", + "id": "libvirt-38", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -1863,7 +1871,7 @@ } { - "id": "libvirt-38", + "id": "libvirt-39", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-device' not found" @@ -1917,7 +1925,7 @@ "type": "on/off" } ], - "id": "libvirt-39" + "id": "libvirt-40" } { @@ -1965,7 +1973,7 @@ "name": "none" } ], - "id": "libvirt-40" + "id": "libvirt-41" } { @@ -2043,14 +2051,6 @@ "name": "Opteron_G5" } ], - "id": "libvirt-41" -} - -{ - "return": { - "enabled": false, - "present": true - }, "id": "libvirt-42" } @@ -2085,5 +2085,5 @@ "capability": "xbzrle" } ], - "id": "libvirt-45" + "id": "libvirt-46" } diff --git a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.replies index 7e86cff..f9eff8e 100644 --- a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.replies @@ -328,6 +328,14 @@ } { + "return": { + "enabled": false, + "present": true + }, + "id": "libvirt-7" +} + +{ "return": [ { "name": "SPICE_MIGRATE_COMPLETED" @@ -402,7 +410,7 @@ "name": "SHUTDOWN" } ], - "id": "libvirt-7" + "id": "libvirt-8" } { @@ -912,7 +920,7 @@ "name": "VGA" } ], - "id": "libvirt-8" + "id": "libvirt-9" } { @@ -1014,7 +1022,7 @@ "type": "hex32" } ], - "id": "libvirt-9" + "id": "libvirt-10" } { @@ -1160,7 +1168,7 @@ "type": "on/off" } ], - "id": "libvirt-10" + "id": "libvirt-11" } { @@ -1222,11 +1230,11 @@ "type": "on/off" } ], - "id": "libvirt-11" + "id": "libvirt-12" } { - "id": "libvirt-12", + "id": "libvirt-13", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-blk-ccw' not found" @@ -1234,7 +1242,7 @@ } { - "id": "libvirt-13", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -1242,7 +1250,7 @@ } { - "id": "libvirt-14", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -1250,7 +1258,7 @@ } { - "id": "libvirt-15", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-blk-s390' not found" @@ -1258,7 +1266,7 @@ } { - "id": "libvirt-16", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -1266,7 +1274,7 @@ } { - "id": "libvirt-17", + "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -1316,7 +1324,7 @@ "type": "pci-host-devaddr" } ], - "id": "libvirt-18" + "id": "libvirt-19" } { @@ -1350,7 +1358,7 @@ "type": "pci-host-devaddr" } ], - "id": "libvirt-19" + "id": "libvirt-20" } { @@ -1424,7 +1432,7 @@ "type": "drive" } ], - "id": "libvirt-20" + "id": "libvirt-21" } { @@ -1478,7 +1486,7 @@ "type": "drive" } ], - "id": "libvirt-21" + "id": "libvirt-22" } { @@ -1520,7 +1528,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-23" } { @@ -1550,7 +1558,7 @@ "type": "chr" } ], - "id": "libvirt-23" + "id": "libvirt-24" } { @@ -1596,7 +1604,7 @@ "type": "uint32" } ], - "id": "libvirt-24" + "id": "libvirt-25" } { @@ -1622,13 +1630,13 @@ "type": "drive" } ], - "id": "libvirt-25" + "id": "libvirt-26" } { "return": [ ], - "id": "libvirt-26" + "id": "libvirt-27" } { @@ -1638,7 +1646,7 @@ "type": "uint64" } ], - "id": "libvirt-27" + "id": "libvirt-28" } { @@ -1688,7 +1696,7 @@ "type": "drive" } ], - "id": "libvirt-28" + "id": "libvirt-29" } { @@ -1702,7 +1710,7 @@ "type": "hex32" } ], - "id": "libvirt-29" + "id": "libvirt-30" } { @@ -1736,7 +1744,7 @@ "type": "uint32" } ], - "id": "libvirt-30" + "id": "libvirt-31" } { @@ -1766,7 +1774,7 @@ "type": "uint32" } ], - "id": "libvirt-31" + "id": "libvirt-32" } { @@ -1836,11 +1844,11 @@ "type": "uint32" } ], - "id": "libvirt-32" + "id": "libvirt-33" } { - "id": "libvirt-33", + "id": "libvirt-34", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-gpu-pci' not found" @@ -1848,7 +1856,7 @@ } { - "id": "libvirt-34", + "id": "libvirt-35", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-gpu-device' not found" @@ -1856,7 +1864,7 @@ } { - "id": "libvirt-35", + "id": "libvirt-36", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -1898,11 +1906,11 @@ "type": "on/off" } ], - "id": "libvirt-36" + "id": "libvirt-37" } { - "id": "libvirt-37", + "id": "libvirt-38", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -1910,7 +1918,7 @@ } { - "id": "libvirt-38", + "id": "libvirt-39", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-device' not found" @@ -1964,7 +1972,7 @@ "type": "on/off" } ], - "id": "libvirt-39" + "id": "libvirt-40" } { @@ -2015,7 +2023,7 @@ "name": "none" } ], - "id": "libvirt-40" + "id": "libvirt-41" } { @@ -2093,14 +2101,6 @@ "name": "qemu64" } ], - "id": "libvirt-41" -} - -{ - "return": { - "enabled": false, - "present": true - }, "id": "libvirt-42" } diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies index 7486579..8a0ae5f 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies @@ -343,6 +343,14 @@ } { + "return": { + "enabled": false, + "present": true + }, + "id": "libvirt-7" +} + +{ "return": [ { "name": "GUEST_PANICKED" @@ -423,7 +431,7 @@ "name": "SHUTDOWN" } ], - "id": "libvirt-7" + "id": "libvirt-8" } { @@ -999,7 +1007,7 @@ "name": "VGA" } ], - "id": "libvirt-8" + "id": "libvirt-9" } { @@ -1101,7 +1109,7 @@ "type": "hex32" } ], - "id": "libvirt-9" + "id": "libvirt-10" } { @@ -1247,7 +1255,7 @@ "type": "on/off" } ], - "id": "libvirt-10" + "id": "libvirt-11" } { @@ -1309,11 +1317,11 @@ "type": "on/off" } ], - "id": "libvirt-11" + "id": "libvirt-12" } { - "id": "libvirt-12", + "id": "libvirt-13", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-blk-ccw' not found" @@ -1321,7 +1329,7 @@ } { - "id": "libvirt-13", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -1329,7 +1337,7 @@ } { - "id": "libvirt-14", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -1337,7 +1345,7 @@ } { - "id": "libvirt-15", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-blk-s390' not found" @@ -1345,7 +1353,7 @@ } { - "id": "libvirt-16", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -1353,7 +1361,7 @@ } { - "id": "libvirt-17", + "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -1403,7 +1411,7 @@ "type": "pci-host-devaddr" } ], - "id": "libvirt-18" + "id": "libvirt-19" } { @@ -1445,7 +1453,7 @@ "type": "pci-host-devaddr" } ], - "id": "libvirt-19" + "id": "libvirt-20" } { @@ -1519,7 +1527,7 @@ "type": "drive" } ], - "id": "libvirt-20" + "id": "libvirt-21" } { @@ -1573,7 +1581,7 @@ "type": "drive" } ], - "id": "libvirt-21" + "id": "libvirt-22" } { @@ -1615,7 +1623,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-23" } { @@ -1645,7 +1653,7 @@ "type": "chr" } ], - "id": "libvirt-23" + "id": "libvirt-24" } { @@ -1699,7 +1707,7 @@ "type": "uint32" } ], - "id": "libvirt-24" + "id": "libvirt-25" } { @@ -1725,13 +1733,13 @@ "type": "drive" } ], - "id": "libvirt-25" + "id": "libvirt-26" } { "return": [ ], - "id": "libvirt-26" + "id": "libvirt-27" } { @@ -1741,7 +1749,7 @@ "type": "uint64" } ], - "id": "libvirt-27" + "id": "libvirt-28" } { @@ -1791,7 +1799,7 @@ "type": "drive" } ], - "id": "libvirt-28" + "id": "libvirt-29" } { @@ -1805,7 +1813,7 @@ "type": "hex32" } ], - "id": "libvirt-29" + "id": "libvirt-30" } { @@ -1839,7 +1847,7 @@ "type": "uint32" } ], - "id": "libvirt-30" + "id": "libvirt-31" } { @@ -1869,7 +1877,7 @@ "type": "uint32" } ], - "id": "libvirt-31" + "id": "libvirt-32" } { @@ -1939,11 +1947,11 @@ "type": "uint32" } ], - "id": "libvirt-32" + "id": "libvirt-33" } { - "id": "libvirt-33", + "id": "libvirt-34", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-gpu-pci' not found" @@ -1951,7 +1959,7 @@ } { - "id": "libvirt-34", + "id": "libvirt-35", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-gpu-device' not found" @@ -1959,7 +1967,7 @@ } { - "id": "libvirt-35", + "id": "libvirt-36", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -2001,11 +2009,11 @@ "type": "on/off" } ], - "id": "libvirt-36" + "id": "libvirt-37" } { - "id": "libvirt-37", + "id": "libvirt-38", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -2015,7 +2023,7 @@ { "return": [ ], - "id": "libvirt-38" + "id": "libvirt-39" } { @@ -2065,7 +2073,7 @@ "type": "on/off" } ], - "id": "libvirt-39" + "id": "libvirt-40" } { @@ -2138,7 +2146,7 @@ "cpu-max": 1 } ], - "id": "libvirt-40" + "id": "libvirt-41" } { @@ -2216,14 +2224,6 @@ "name": "qemu64" } ], - "id": "libvirt-41" -} - -{ - "return": { - "enabled": false, - "present": true - }, "id": "libvirt-42" } diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies index aad28ca..820eaf9 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies @@ -349,6 +349,14 @@ } { + "return": { + "enabled": false, + "present": true + }, + "id": "libvirt-7" +} + +{ "return": [ { "name": "GUEST_PANICKED" @@ -432,7 +440,7 @@ "name": "SHUTDOWN" } ], - "id": "libvirt-7" + "id": "libvirt-8" } { @@ -1020,7 +1028,7 @@ "name": "VGA" } ], - "id": "libvirt-8" + "id": "libvirt-9" } { @@ -1122,7 +1130,7 @@ "type": "hex32" } ], - "id": "libvirt-9" + "id": "libvirt-10" } { @@ -1276,7 +1284,7 @@ "type": "on/off" } ], - "id": "libvirt-10" + "id": "libvirt-11" } { @@ -1338,11 +1346,11 @@ "type": "on/off" } ], - "id": "libvirt-11" + "id": "libvirt-12" } { - "id": "libvirt-12", + "id": "libvirt-13", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-blk-ccw' not found" @@ -1350,7 +1358,7 @@ } { - "id": "libvirt-13", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -1358,7 +1366,7 @@ } { - "id": "libvirt-14", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -1366,7 +1374,7 @@ } { - "id": "libvirt-15", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-blk-s390' not found" @@ -1374,7 +1382,7 @@ } { - "id": "libvirt-16", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -1382,7 +1390,7 @@ } { - "id": "libvirt-17", + "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -1432,7 +1440,7 @@ "type": "pci-host-devaddr" } ], - "id": "libvirt-18" + "id": "libvirt-19" } { @@ -1474,7 +1482,7 @@ "type": "pci-host-devaddr" } ], - "id": "libvirt-19" + "id": "libvirt-20" } { @@ -1548,7 +1556,7 @@ "type": "drive" } ], - "id": "libvirt-20" + "id": "libvirt-21" } { @@ -1602,7 +1610,7 @@ "type": "drive" } ], - "id": "libvirt-21" + "id": "libvirt-22" } { @@ -1644,7 +1652,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-23" } { @@ -1678,7 +1686,7 @@ "type": "chr" } ], - "id": "libvirt-23" + "id": "libvirt-24" } { @@ -1736,7 +1744,7 @@ "type": "uint32" } ], - "id": "libvirt-24" + "id": "libvirt-25" } { @@ -1762,7 +1770,7 @@ "type": "drive" } ], - "id": "libvirt-25" + "id": "libvirt-26" } { @@ -1772,7 +1780,7 @@ "type": "size" } ], - "id": "libvirt-26" + "id": "libvirt-27" } { @@ -1786,7 +1794,7 @@ "type": "uint64" } ], - "id": "libvirt-27" + "id": "libvirt-28" } { @@ -1836,7 +1844,7 @@ "type": "drive" } ], - "id": "libvirt-28" + "id": "libvirt-29" } { @@ -1850,7 +1858,7 @@ "type": "hex32" } ], - "id": "libvirt-29" + "id": "libvirt-30" } { @@ -1884,7 +1892,7 @@ "type": "uint32" } ], - "id": "libvirt-30" + "id": "libvirt-31" } { @@ -1914,7 +1922,7 @@ "type": "uint32" } ], - "id": "libvirt-31" + "id": "libvirt-32" } { @@ -1984,11 +1992,11 @@ "type": "uint32" } ], - "id": "libvirt-32" + "id": "libvirt-33" } { - "id": "libvirt-33", + "id": "libvirt-34", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-gpu-pci' not found" @@ -1996,7 +2004,7 @@ } { - "id": "libvirt-34", + "id": "libvirt-35", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-gpu-device' not found" @@ -2004,7 +2012,7 @@ } { - "id": "libvirt-35", + "id": "libvirt-36", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -2046,11 +2054,11 @@ "type": "on/off" } ], - "id": "libvirt-36" + "id": "libvirt-37" } { - "id": "libvirt-37", + "id": "libvirt-38", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -2060,7 +2068,7 @@ { "return": [ ], - "id": "libvirt-38" + "id": "libvirt-39" } { @@ -2110,7 +2118,7 @@ "type": "on/off" } ], - "id": "libvirt-39" + "id": "libvirt-40" } { @@ -2191,7 +2199,7 @@ "cpu-max": 1 } ], - "id": "libvirt-40" + "id": "libvirt-41" } { @@ -2269,14 +2277,6 @@ "name": "qemu64" } ], - "id": "libvirt-41" -} - -{ - "return": { - "enabled": false, - "present": true - }, "id": "libvirt-42" } diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies index b44d5f1..4df07eb 100644 --- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies @@ -358,6 +358,14 @@ } { + "return": { + "enabled": false, + "present": true + }, + "id": "libvirt-7" +} + +{ "return": [ { "name": "BLOCK_IMAGE_CORRUPTED" @@ -444,7 +452,7 @@ "name": "SHUTDOWN" } ], - "id": "libvirt-7" + "id": "libvirt-8" } { @@ -1029,7 +1037,7 @@ "name": "VGA" } ], - "id": "libvirt-8" + "id": "libvirt-9" } { @@ -1131,7 +1139,7 @@ "type": "hex32" } ], - "id": "libvirt-9" + "id": "libvirt-10" } { @@ -1285,7 +1293,7 @@ "type": "on/off" } ], - "id": "libvirt-10" + "id": "libvirt-11" } { @@ -1347,11 +1355,11 @@ "type": "on/off" } ], - "id": "libvirt-11" + "id": "libvirt-12" } { - "id": "libvirt-12", + "id": "libvirt-13", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-blk-ccw' not found" @@ -1359,7 +1367,7 @@ } { - "id": "libvirt-13", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -1367,7 +1375,7 @@ } { - "id": "libvirt-14", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -1375,7 +1383,7 @@ } { - "id": "libvirt-15", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-blk-s390' not found" @@ -1383,7 +1391,7 @@ } { - "id": "libvirt-16", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -1391,7 +1399,7 @@ } { - "id": "libvirt-17", + "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -1441,7 +1449,7 @@ "type": "pci-host-devaddr" } ], - "id": "libvirt-18" + "id": "libvirt-19" } { @@ -1483,7 +1491,7 @@ "type": "pci-host-devaddr" } ], - "id": "libvirt-19" + "id": "libvirt-20" } { @@ -1557,7 +1565,7 @@ "type": "drive" } ], - "id": "libvirt-20" + "id": "libvirt-21" } { @@ -1611,7 +1619,7 @@ "type": "drive" } ], - "id": "libvirt-21" + "id": "libvirt-22" } { @@ -1653,7 +1661,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-23" } { @@ -1687,7 +1695,7 @@ "type": "chr" } ], - "id": "libvirt-23" + "id": "libvirt-24" } { @@ -1745,7 +1753,7 @@ "type": "uint32" } ], - "id": "libvirt-24" + "id": "libvirt-25" } { @@ -1771,7 +1779,7 @@ "type": "drive" } ], - "id": "libvirt-25" + "id": "libvirt-26" } { @@ -1785,7 +1793,7 @@ "type": "size" } ], - "id": "libvirt-26" + "id": "libvirt-27" } { @@ -1803,7 +1811,7 @@ "type": "uint64" } ], - "id": "libvirt-27" + "id": "libvirt-28" } { @@ -1853,7 +1861,7 @@ "type": "drive" } ], - "id": "libvirt-28" + "id": "libvirt-29" } { @@ -1867,7 +1875,7 @@ "type": "hex32" } ], - "id": "libvirt-29" + "id": "libvirt-30" } { @@ -1901,7 +1909,7 @@ "type": "uint32" } ], - "id": "libvirt-30" + "id": "libvirt-31" } { @@ -1931,7 +1939,7 @@ "type": "uint32" } ], - "id": "libvirt-31" + "id": "libvirt-32" } { @@ -2001,11 +2009,11 @@ "type": "uint32" } ], - "id": "libvirt-32" + "id": "libvirt-33" } { - "id": "libvirt-33", + "id": "libvirt-34", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-gpu-pci' not found" @@ -2013,7 +2021,7 @@ } { - "id": "libvirt-34", + "id": "libvirt-35", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-gpu-device' not found" @@ -2021,7 +2029,7 @@ } { - "id": "libvirt-35", + "id": "libvirt-36", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -2063,11 +2071,11 @@ "type": "on/off" } ], - "id": "libvirt-36" + "id": "libvirt-37" } { - "id": "libvirt-37", + "id": "libvirt-38", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -2077,7 +2085,7 @@ { "return": [ ], - "id": "libvirt-38" + "id": "libvirt-39" } { @@ -2127,7 +2135,7 @@ "type": "on/off" } ], - "id": "libvirt-39" + "id": "libvirt-40" } { @@ -2216,7 +2224,7 @@ "cpu-max": 1 } ], - "id": "libvirt-40" + "id": "libvirt-41" } { @@ -2294,14 +2302,6 @@ "name": "qemu64" } ], - "id": "libvirt-41" -} - -{ - "return": { - "enabled": false, - "present": true - }, "id": "libvirt-42" } diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies index a7d8f36..f7daf61 100644 --- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies @@ -391,6 +391,14 @@ } { + "return": { + "enabled": false, + "present": true + }, + "id": "libvirt-7" +} + +{ "return": [ { "name": "VSERPORT_CHANGE" @@ -489,7 +497,7 @@ "name": "BLOCK_IMAGE_CORRUPTED" } ], - "id": "libvirt-7" + "id": "libvirt-8" } { @@ -1272,7 +1280,7 @@ "name": "fusbh200-ehci-usb" } ], - "id": "libvirt-8" + "id": "libvirt-9" } { @@ -1382,7 +1390,7 @@ "type": "uint32" } ], - "id": "libvirt-9" + "id": "libvirt-10" } { @@ -1544,7 +1552,7 @@ "type": "on/off" } ], - "id": "libvirt-10" + "id": "libvirt-11" } { @@ -1614,11 +1622,11 @@ "type": "on/off" } ], - "id": "libvirt-11" + "id": "libvirt-12" } { - "id": "libvirt-12", + "id": "libvirt-13", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-blk-ccw' not found" @@ -1626,7 +1634,7 @@ } { - "id": "libvirt-13", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -1634,7 +1642,7 @@ } { - "id": "libvirt-14", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -1642,7 +1650,7 @@ } { - "id": "libvirt-15", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-blk-s390' not found" @@ -1650,7 +1658,7 @@ } { - "id": "libvirt-16", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -1658,7 +1666,7 @@ } { - "id": "libvirt-17", + "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -1708,7 +1716,7 @@ "type": "pci-host-devaddr" } ], - "id": "libvirt-18" + "id": "libvirt-19" } { @@ -1750,7 +1758,7 @@ "type": "pci-host-devaddr" } ], - "id": "libvirt-19" + "id": "libvirt-20" } { @@ -1836,7 +1844,7 @@ "type": "drive" } ], - "id": "libvirt-20" + "id": "libvirt-21" } { @@ -1890,7 +1898,7 @@ "type": "drive" } ], - "id": "libvirt-21" + "id": "libvirt-22" } { @@ -1940,7 +1948,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-23" } { @@ -1978,7 +1986,7 @@ "type": "chr" } ], - "id": "libvirt-23" + "id": "libvirt-24" } { @@ -2040,7 +2048,7 @@ "type": "uint32" } ], - "id": "libvirt-24" + "id": "libvirt-25" } { @@ -2066,7 +2074,7 @@ "type": "drive" } ], - "id": "libvirt-25" + "id": "libvirt-26" } { @@ -2104,7 +2112,7 @@ "type": "size" } ], - "id": "libvirt-26" + "id": "libvirt-27" } { @@ -2154,7 +2162,7 @@ "type": "uint64" } ], - "id": "libvirt-27" + "id": "libvirt-28" } { @@ -2208,7 +2216,7 @@ "type": "drive" } ], - "id": "libvirt-28" + "id": "libvirt-29" } { @@ -2222,7 +2230,7 @@ "type": "uint32" } ], - "id": "libvirt-29" + "id": "libvirt-30" } { @@ -2256,7 +2264,7 @@ "type": "uint32" } ], - "id": "libvirt-30" + "id": "libvirt-31" } { @@ -2286,7 +2294,7 @@ "type": "uint32" } ], - "id": "libvirt-31" + "id": "libvirt-32" } { @@ -2356,11 +2364,11 @@ "type": "uint32" } ], - "id": "libvirt-32" + "id": "libvirt-33" } { - "id": "libvirt-33", + "id": "libvirt-34", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-gpu-pci' not found" @@ -2368,7 +2376,7 @@ } { - "id": "libvirt-34", + "id": "libvirt-35", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-gpu-device' not found" @@ -2426,7 +2434,7 @@ "type": "pci-devfn" } ], - "id": "libvirt-35" + "id": "libvirt-36" } { @@ -2476,11 +2484,11 @@ "type": "uint32" } ], - "id": "libvirt-36" + "id": "libvirt-37" } { - "id": "libvirt-37", + "id": "libvirt-38", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -2490,7 +2498,7 @@ { "return": [ ], - "id": "libvirt-38" + "id": "libvirt-39" } { @@ -2544,7 +2552,7 @@ "type": "on/off" } ], - "id": "libvirt-39" + "id": "libvirt-40" } { @@ -2649,7 +2657,7 @@ "cpu-max": 255 } ], - "id": "libvirt-40" + "id": "libvirt-41" } { @@ -2730,14 +2738,6 @@ "name": "qemu64" } ], - "id": "libvirt-41" -} - -{ - "return": { - "enabled": false, - "present": true - }, "id": "libvirt-42" } diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies index c483c48..9f3135f 100644 --- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies @@ -439,6 +439,14 @@ } { + "return": { + "enabled": false, + "present": true + }, + "id": "libvirt-7" +} + +{ "return": [ { "name": "MEM_UNPLUG_ERROR" @@ -546,7 +554,7 @@ "name": "BLOCK_IMAGE_CORRUPTED" } ], - "id": "libvirt-7" + "id": "libvirt-8" } { @@ -1434,7 +1442,7 @@ "name": "virtio-blk-device" } ], - "id": "libvirt-8" + "id": "libvirt-9" } { @@ -1586,7 +1594,7 @@ "type": "uint32" } ], - "id": "libvirt-9" + "id": "libvirt-10" } { @@ -1799,7 +1807,7 @@ "type": "bool" } ], - "id": "libvirt-10" + "id": "libvirt-11" } { @@ -1902,11 +1910,11 @@ "type": "bool" } ], - "id": "libvirt-11" + "id": "libvirt-12" } { - "id": "libvirt-12", + "id": "libvirt-13", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-blk-ccw' not found" @@ -1914,7 +1922,7 @@ } { - "id": "libvirt-13", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -1922,7 +1930,7 @@ } { - "id": "libvirt-14", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -1930,7 +1938,7 @@ } { - "id": "libvirt-15", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-blk-s390' not found" @@ -1938,7 +1946,7 @@ } { - "id": "libvirt-16", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -1946,7 +1954,7 @@ } { - "id": "libvirt-17", + "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -2002,7 +2010,7 @@ "type": "str" } ], - "id": "libvirt-18" + "id": "libvirt-19" } { @@ -2058,7 +2066,7 @@ "type": "str" } ], - "id": "libvirt-19" + "id": "libvirt-20" } { @@ -2153,7 +2161,7 @@ "type": "str" } ], - "id": "libvirt-20" + "id": "libvirt-21" } { @@ -2210,7 +2218,7 @@ "type": "str" } ], - "id": "libvirt-21" + "id": "libvirt-22" } { @@ -2263,7 +2271,7 @@ "type": "uint32" } ], - "id": "libvirt-22" + "id": "libvirt-23" } { @@ -2304,7 +2312,7 @@ "type": "str" } ], - "id": "libvirt-23" + "id": "libvirt-24" } { @@ -2369,7 +2377,7 @@ "type": "uint32" } ], - "id": "libvirt-24" + "id": "libvirt-25" } { @@ -2396,7 +2404,7 @@ "type": "str" } ], - "id": "libvirt-25" + "id": "libvirt-26" } { @@ -2434,7 +2442,7 @@ "type": "size" } ], - "id": "libvirt-26" + "id": "libvirt-27" } { @@ -2488,7 +2496,7 @@ "type": "uint64" } ], - "id": "libvirt-27" + "id": "libvirt-28" } { @@ -2548,7 +2556,7 @@ "type": "str" } ], - "id": "libvirt-28" + "id": "libvirt-29" } { @@ -2562,7 +2570,7 @@ "type": "uint32" } ], - "id": "libvirt-29" + "id": "libvirt-30" } { @@ -2609,7 +2617,7 @@ "type": "uint32" } ], - "id": "libvirt-30" + "id": "libvirt-31" } { @@ -2642,7 +2650,7 @@ "type": "uint32" } ], - "id": "libvirt-31" + "id": "libvirt-32" } { @@ -2719,7 +2727,7 @@ "type": "uint32" } ], - "id": "libvirt-32" + "id": "libvirt-33" } { @@ -2800,7 +2808,7 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-34" } { @@ -2830,7 +2838,7 @@ "type": "uint32" } ], - "id": "libvirt-34" + "id": "libvirt-35" } { @@ -2907,7 +2915,7 @@ "type": "bool" } ], - "id": "libvirt-35" + "id": "libvirt-36" } { @@ -2992,11 +3000,11 @@ "type": "uint32" } ], - "id": "libvirt-36" + "id": "libvirt-37" } { - "id": "libvirt-37", + "id": "libvirt-38", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -3039,7 +3047,7 @@ "type": "bool" } ], - "id": "libvirt-38" + "id": "libvirt-39" } { @@ -3109,7 +3117,7 @@ "type": "bool" } ], - "id": "libvirt-39" + "id": "libvirt-40" } { @@ -3238,7 +3246,7 @@ "cpu-max": 255 } ], - "id": "libvirt-40" + "id": "libvirt-41" } { @@ -3328,14 +3336,6 @@ "name": "qemu64" } ], - "id": "libvirt-41" -} - -{ - "return": { - "enabled": false, - "present": true - }, "id": "libvirt-42" } diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies index a507542..1ed8805 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies @@ -466,6 +466,14 @@ } { + "return": { + "enabled": false, + "present": true + }, + "id": "libvirt-7" +} + +{ "return": [ { "name": "WATCHDOG" @@ -573,7 +581,7 @@ "name": "ACPI_DEVICE_OST" } ], - "id": "libvirt-7" + "id": "libvirt-8" } { @@ -1479,7 +1487,7 @@ "name": "virtio-blk-device" } ], - "id": "libvirt-8" + "id": "libvirt-9" } { @@ -1641,7 +1649,7 @@ "type": "str" } ], - "id": "libvirt-9" + "id": "libvirt-10" } { @@ -1869,7 +1877,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-11" } { @@ -1987,11 +1995,11 @@ "type": "uint32" } ], - "id": "libvirt-11" + "id": "libvirt-12" } { - "id": "libvirt-12", + "id": "libvirt-13", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-blk-ccw' not found" @@ -1999,7 +2007,7 @@ } { - "id": "libvirt-13", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -2007,7 +2015,7 @@ } { - "id": "libvirt-14", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -2015,7 +2023,7 @@ } { - "id": "libvirt-15", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-blk-s390' not found" @@ -2023,7 +2031,7 @@ } { - "id": "libvirt-16", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -2031,7 +2039,7 @@ } { - "id": "libvirt-17", + "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -2087,7 +2095,7 @@ "type": "bool" } ], - "id": "libvirt-18" + "id": "libvirt-19" } { @@ -2171,7 +2179,7 @@ "type": "bool" } ], - "id": "libvirt-19" + "id": "libvirt-20" } { @@ -2266,7 +2274,7 @@ "type": "uint64" } ], - "id": "libvirt-20" + "id": "libvirt-21" } { @@ -2323,7 +2331,7 @@ "type": "uint16" } ], - "id": "libvirt-21" + "id": "libvirt-22" } { @@ -2376,7 +2384,7 @@ "type": "int32" } ], - "id": "libvirt-22" + "id": "libvirt-23" } { @@ -2417,7 +2425,7 @@ "type": "bool" } ], - "id": "libvirt-23" + "id": "libvirt-24" } { @@ -2482,7 +2490,7 @@ "type": "uint32" } ], - "id": "libvirt-24" + "id": "libvirt-25" } { @@ -2509,7 +2517,7 @@ "type": "uint32" } ], - "id": "libvirt-25" + "id": "libvirt-26" } { @@ -2547,7 +2555,7 @@ "type": "child<qemu:memory-region>" } ], - "id": "libvirt-26" + "id": "libvirt-27" } { @@ -2601,7 +2609,7 @@ "type": "child<qemu:memory-region>" } ], - "id": "libvirt-27" + "id": "libvirt-28" } { @@ -2661,7 +2669,7 @@ "type": "uint16" } ], - "id": "libvirt-28" + "id": "libvirt-29" } { @@ -2675,7 +2683,7 @@ "type": "LostTickPolicy" } ], - "id": "libvirt-29" + "id": "libvirt-30" } { @@ -2722,7 +2730,7 @@ "type": "int32" } ], - "id": "libvirt-30" + "id": "libvirt-31" } { @@ -2755,7 +2763,7 @@ "type": "int32" } ], - "id": "libvirt-31" + "id": "libvirt-32" } { @@ -2832,7 +2840,7 @@ "type": "uint32" } ], - "id": "libvirt-32" + "id": "libvirt-33" } { @@ -2938,7 +2946,7 @@ "type": "uint32" } ], - "id": "libvirt-33" + "id": "libvirt-34" } { @@ -2978,7 +2986,7 @@ "type": "bool" } ], - "id": "libvirt-34" + "id": "libvirt-35" } { @@ -3055,7 +3063,7 @@ "type": "uint32" } ], - "id": "libvirt-35" + "id": "libvirt-36" } { @@ -3155,11 +3163,11 @@ "type": "bool" } ], - "id": "libvirt-36" + "id": "libvirt-37" } { - "id": "libvirt-37", + "id": "libvirt-38", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -3202,7 +3210,7 @@ "type": "bool" } ], - "id": "libvirt-38" + "id": "libvirt-39" } { @@ -3272,7 +3280,7 @@ "type": "uint32" } ], - "id": "libvirt-39" + "id": "libvirt-40" } { @@ -3409,7 +3417,7 @@ "cpu-max": 255 } ], - "id": "libvirt-40" + "id": "libvirt-41" } { @@ -3499,14 +3507,6 @@ "name": "qemu64" } ], - "id": "libvirt-41" -} - -{ - "return": { - "enabled": false, - "present": true - }, "id": "libvirt-42" } diff --git a/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.replies b/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.replies index f7b274c..66977ba 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.replies @@ -469,6 +469,14 @@ } { + "return": { + "enabled": false, + "present": true + }, + "id": "libvirt-7" +} + +{ "return": [ { "name": "WATCHDOG" @@ -582,7 +590,7 @@ "name": "ACPI_DEVICE_OST" } ], - "id": "libvirt-7" + "id": "libvirt-8" } { @@ -2235,7 +2243,7 @@ "name": "fw-path-provider" } ], - "id": "libvirt-8" + "id": "libvirt-9" } { @@ -2397,7 +2405,7 @@ "type": "str" } ], - "id": "libvirt-9" + "id": "libvirt-10" } { @@ -2625,7 +2633,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-11" } { @@ -2743,11 +2751,11 @@ "type": "uint32" } ], - "id": "libvirt-11" + "id": "libvirt-12" } { - "id": "libvirt-12", + "id": "libvirt-13", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-blk-ccw' not found" @@ -2755,7 +2763,7 @@ } { - "id": "libvirt-13", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -2763,7 +2771,7 @@ } { - "id": "libvirt-14", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -2771,7 +2779,7 @@ } { - "id": "libvirt-15", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-blk-s390' not found" @@ -2779,7 +2787,7 @@ } { - "id": "libvirt-16", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -2787,7 +2795,7 @@ } { - "id": "libvirt-17", + "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -2795,7 +2803,7 @@ } { - "id": "libvirt-18", + "id": "libvirt-19", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" @@ -2887,7 +2895,7 @@ "type": "bool" } ], - "id": "libvirt-19" + "id": "libvirt-20" } { @@ -2982,7 +2990,7 @@ "type": "uint64" } ], - "id": "libvirt-20" + "id": "libvirt-21" } { @@ -3039,11 +3047,11 @@ "type": "uint16" } ], - "id": "libvirt-21" + "id": "libvirt-22" } { - "id": "libvirt-22", + "id": "libvirt-23", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -3051,7 +3059,7 @@ } { - "id": "libvirt-23", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'usb-redir' not found" @@ -3120,7 +3128,7 @@ "type": "uint32" } ], - "id": "libvirt-24" + "id": "libvirt-25" } { @@ -3147,11 +3155,11 @@ "type": "uint32" } ], - "id": "libvirt-25" + "id": "libvirt-26" } { - "id": "libvirt-26", + "id": "libvirt-27", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -3159,7 +3167,7 @@ } { - "id": "libvirt-27", + "id": "libvirt-28", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -3223,11 +3231,11 @@ "type": "uint16" } ], - "id": "libvirt-28" + "id": "libvirt-29" } { - "id": "libvirt-29", + "id": "libvirt-30", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -3278,11 +3286,11 @@ "type": "int32" } ], - "id": "libvirt-30" + "id": "libvirt-31" } { - "id": "libvirt-31", + "id": "libvirt-32", "error": { "class": "DeviceNotFound", "desc": "Device 'vmware-svga' not found" @@ -3290,7 +3298,7 @@ } { - "id": "libvirt-32", + "id": "libvirt-33", "error": { "class": "DeviceNotFound", "desc": "Device 'qxl' not found" @@ -3390,7 +3398,7 @@ "type": "uint32" } ], - "id": "libvirt-33" + "id": "libvirt-34" } { @@ -3420,11 +3428,11 @@ "type": "uint32" } ], - "id": "libvirt-34" + "id": "libvirt-35" } { - "id": "libvirt-35", + "id": "libvirt-36", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -3528,11 +3536,11 @@ "type": "bool" } ], - "id": "libvirt-36" + "id": "libvirt-37" } { - "id": "libvirt-37", + "id": "libvirt-38", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -3575,7 +3583,7 @@ "type": "bool" } ], - "id": "libvirt-38" + "id": "libvirt-39" } { @@ -3645,7 +3653,7 @@ "type": "uint32" } ], - "id": "libvirt-39" + "id": "libvirt-40" } { @@ -3820,7 +3828,7 @@ "cpu-max": 1 } ], - "id": "libvirt-40" + "id": "libvirt-41" } { @@ -3916,14 +3924,6 @@ "name": "pxa270" } ], - "id": "libvirt-41" -} - -{ - "return": { - "enabled": false, - "present": true - }, "id": "libvirt-42" } diff --git a/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.replies b/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.replies index 11b9810..f1c2eab 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.replies @@ -469,6 +469,14 @@ } { + "return": { + "enabled": false, + "present": true + }, + "id": "libvirt-7" +} + +{ "return": [ { "name": "WATCHDOG" @@ -582,7 +590,7 @@ "name": "ACPI_DEVICE_OST" } ], - "id": "libvirt-7" + "id": "libvirt-8" } { @@ -2235,7 +2243,7 @@ "name": "fw-path-provider" } ], - "id": "libvirt-8" + "id": "libvirt-9" } { @@ -2397,7 +2405,7 @@ "type": "str" } ], - "id": "libvirt-9" + "id": "libvirt-10" } { @@ -2625,7 +2633,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-11" } { @@ -2743,11 +2751,11 @@ "type": "uint32" } ], - "id": "libvirt-11" + "id": "libvirt-12" } { - "id": "libvirt-12", + "id": "libvirt-13", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-blk-ccw' not found" @@ -2755,7 +2763,7 @@ } { - "id": "libvirt-13", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -2763,7 +2771,7 @@ } { - "id": "libvirt-14", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -2771,7 +2779,7 @@ } { - "id": "libvirt-15", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-blk-s390' not found" @@ -2779,7 +2787,7 @@ } { - "id": "libvirt-16", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -2787,7 +2795,7 @@ } { - "id": "libvirt-17", + "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -2795,7 +2803,7 @@ } { - "id": "libvirt-18", + "id": "libvirt-19", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" @@ -2887,7 +2895,7 @@ "type": "bool" } ], - "id": "libvirt-19" + "id": "libvirt-20" } { @@ -2982,7 +2990,7 @@ "type": "uint64" } ], - "id": "libvirt-20" + "id": "libvirt-21" } { @@ -3039,11 +3047,11 @@ "type": "uint16" } ], - "id": "libvirt-21" + "id": "libvirt-22" } { - "id": "libvirt-22", + "id": "libvirt-23", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -3051,7 +3059,7 @@ } { - "id": "libvirt-23", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'usb-redir' not found" @@ -3120,7 +3128,7 @@ "type": "uint32" } ], - "id": "libvirt-24" + "id": "libvirt-25" } { @@ -3147,11 +3155,11 @@ "type": "uint32" } ], - "id": "libvirt-25" + "id": "libvirt-26" } { - "id": "libvirt-26", + "id": "libvirt-27", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -3159,7 +3167,7 @@ } { - "id": "libvirt-27", + "id": "libvirt-28", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -3223,11 +3231,11 @@ "type": "uint16" } ], - "id": "libvirt-28" + "id": "libvirt-29" } { - "id": "libvirt-29", + "id": "libvirt-30", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -3278,11 +3286,11 @@ "type": "int32" } ], - "id": "libvirt-30" + "id": "libvirt-31" } { - "id": "libvirt-31", + "id": "libvirt-32", "error": { "class": "DeviceNotFound", "desc": "Device 'vmware-svga' not found" @@ -3290,7 +3298,7 @@ } { - "id": "libvirt-32", + "id": "libvirt-33", "error": { "class": "DeviceNotFound", "desc": "Device 'qxl' not found" @@ -3390,7 +3398,7 @@ "type": "uint32" } ], - "id": "libvirt-33" + "id": "libvirt-34" } { @@ -3425,11 +3433,11 @@ "type": "uint32" } ], - "id": "libvirt-34" + "id": "libvirt-35" } { - "id": "libvirt-35", + "id": "libvirt-36", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -3533,11 +3541,11 @@ "type": "bool" } ], - "id": "libvirt-36" + "id": "libvirt-37" } { - "id": "libvirt-37", + "id": "libvirt-38", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -3580,7 +3588,7 @@ "type": "bool" } ], - "id": "libvirt-38" + "id": "libvirt-39" } { @@ -3650,7 +3658,7 @@ "type": "uint32" } ], - "id": "libvirt-39" + "id": "libvirt-40" } { @@ -3825,7 +3833,7 @@ "cpu-max": 1 } ], - "id": "libvirt-40" + "id": "libvirt-41" } { @@ -3921,14 +3929,6 @@ "name": "pxa270" } ], - "id": "libvirt-41" -} - -{ - "return": { - "enabled": false, - "present": true - }, "id": "libvirt-42" } diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.replies b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.replies index 87988ca..5e4ccac 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.replies +++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.replies @@ -466,6 +466,14 @@ } { + "return": { + "enabled": false, + "present": true + }, + "id": "libvirt-7" +} + +{ "return": [ { "name": "WATCHDOG" @@ -579,7 +587,7 @@ "name": "ACPI_DEVICE_OST" } ], - "id": "libvirt-7" + "id": "libvirt-8" } { @@ -2388,7 +2396,7 @@ "name": "fw-path-provider" } ], - "id": "libvirt-8" + "id": "libvirt-9" } { @@ -2550,7 +2558,7 @@ "type": "str" } ], - "id": "libvirt-9" + "id": "libvirt-10" } { @@ -2778,7 +2786,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-11" } { @@ -2896,11 +2904,11 @@ "type": "uint32" } ], - "id": "libvirt-11" + "id": "libvirt-12" } { - "id": "libvirt-12", + "id": "libvirt-13", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-blk-ccw' not found" @@ -2908,7 +2916,7 @@ } { - "id": "libvirt-13", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -2916,7 +2924,7 @@ } { - "id": "libvirt-14", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -2924,7 +2932,7 @@ } { - "id": "libvirt-15", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-blk-s390' not found" @@ -2932,7 +2940,7 @@ } { - "id": "libvirt-16", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -2940,7 +2948,7 @@ } { - "id": "libvirt-17", + "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -2948,7 +2956,7 @@ } { - "id": "libvirt-18", + "id": "libvirt-19", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pci-assign' not found" @@ -3040,7 +3048,7 @@ "type": "bool" } ], - "id": "libvirt-19" + "id": "libvirt-20" } { @@ -3135,7 +3143,7 @@ "type": "uint64" } ], - "id": "libvirt-20" + "id": "libvirt-21" } { @@ -3192,11 +3200,11 @@ "type": "uint16" } ], - "id": "libvirt-21" + "id": "libvirt-22" } { - "id": "libvirt-22", + "id": "libvirt-23", "error": { "class": "DeviceNotFound", "desc": "Device 'PIIX4_PM' not found" @@ -3204,7 +3212,7 @@ } { - "id": "libvirt-23", + "id": "libvirt-24", "error": { "class": "DeviceNotFound", "desc": "Device 'usb-redir' not found" @@ -3273,7 +3281,7 @@ "type": "uint32" } ], - "id": "libvirt-24" + "id": "libvirt-25" } { @@ -3300,11 +3308,11 @@ "type": "uint32" } ], - "id": "libvirt-25" + "id": "libvirt-26" } { - "id": "libvirt-26", + "id": "libvirt-27", "error": { "class": "DeviceNotFound", "desc": "Device 'i440FX-pcihost' not found" @@ -3312,7 +3320,7 @@ } { - "id": "libvirt-27", + "id": "libvirt-28", "error": { "class": "DeviceNotFound", "desc": "Device 'q35-pcihost' not found" @@ -3376,11 +3384,11 @@ "type": "uint16" } ], - "id": "libvirt-28" + "id": "libvirt-29" } { - "id": "libvirt-29", + "id": "libvirt-30", "error": { "class": "DeviceNotFound", "desc": "Device 'kvm-pit' not found" @@ -3431,11 +3439,11 @@ "type": "int32" } ], - "id": "libvirt-30" + "id": "libvirt-31" } { - "id": "libvirt-31", + "id": "libvirt-32", "error": { "class": "DeviceNotFound", "desc": "Device 'vmware-svga' not found" @@ -3443,7 +3451,7 @@ } { - "id": "libvirt-32", + "id": "libvirt-33", "error": { "class": "DeviceNotFound", "desc": "Device 'qxl' not found" @@ -3543,7 +3551,7 @@ "type": "uint32" } ], - "id": "libvirt-33" + "id": "libvirt-34" } { @@ -3573,11 +3581,11 @@ "type": "uint32" } ], - "id": "libvirt-34" + "id": "libvirt-35" } { - "id": "libvirt-35", + "id": "libvirt-36", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -3681,11 +3689,11 @@ "type": "bool" } ], - "id": "libvirt-36" + "id": "libvirt-37" } { - "id": "libvirt-37", + "id": "libvirt-38", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -3728,7 +3736,7 @@ "type": "bool" } ], - "id": "libvirt-38" + "id": "libvirt-39" } { @@ -3798,7 +3806,7 @@ "type": "uint32" } ], - "id": "libvirt-39" + "id": "libvirt-40" } { @@ -3870,7 +3878,7 @@ "cpu-max": 255 } ], - "id": "libvirt-40" + "id": "libvirt-41" } { @@ -5166,14 +5174,6 @@ "name": "MPC8541E_v11" } ], - "id": "libvirt-41" -} - -{ - "return": { - "enabled": false, - "present": true - }, "id": "libvirt-42" } diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies index 60e8147..89a8707 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies @@ -472,6 +472,14 @@ } { + "return": { + "enabled": false, + "present": true + }, + "id": "libvirt-7" +} + +{ "return": [ { "name": "WATCHDOG" @@ -585,7 +593,7 @@ "name": "ACPI_DEVICE_OST" } ], - "id": "libvirt-7" + "id": "libvirt-8" } { @@ -1557,7 +1565,7 @@ "name": "virtio-blk-device" } ], - "id": "libvirt-8" + "id": "libvirt-9" } { @@ -1719,7 +1727,7 @@ "type": "str" } ], - "id": "libvirt-9" + "id": "libvirt-10" } { @@ -1947,7 +1955,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-11" } { @@ -2065,11 +2073,11 @@ "type": "uint32" } ], - "id": "libvirt-11" + "id": "libvirt-12" } { - "id": "libvirt-12", + "id": "libvirt-13", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-blk-ccw' not found" @@ -2077,7 +2085,7 @@ } { - "id": "libvirt-13", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -2085,7 +2093,7 @@ } { - "id": "libvirt-14", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -2093,7 +2101,7 @@ } { - "id": "libvirt-15", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-blk-s390' not found" @@ -2101,7 +2109,7 @@ } { - "id": "libvirt-16", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -2109,7 +2117,7 @@ } { - "id": "libvirt-17", + "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -2165,7 +2173,7 @@ "type": "bool" } ], - "id": "libvirt-18" + "id": "libvirt-19" } { @@ -2253,7 +2261,7 @@ "type": "bool" } ], - "id": "libvirt-19" + "id": "libvirt-20" } { @@ -2348,7 +2356,7 @@ "type": "uint64" } ], - "id": "libvirt-20" + "id": "libvirt-21" } { @@ -2405,7 +2413,7 @@ "type": "uint16" } ], - "id": "libvirt-21" + "id": "libvirt-22" } { @@ -2458,7 +2466,7 @@ "type": "int32" } ], - "id": "libvirt-22" + "id": "libvirt-23" } { @@ -2499,7 +2507,7 @@ "type": "bool" } ], - "id": "libvirt-23" + "id": "libvirt-24" } { @@ -2564,7 +2572,7 @@ "type": "uint32" } ], - "id": "libvirt-24" + "id": "libvirt-25" } { @@ -2591,7 +2599,7 @@ "type": "uint32" } ], - "id": "libvirt-25" + "id": "libvirt-26" } { @@ -2629,7 +2637,7 @@ "type": "child<qemu:memory-region>" } ], - "id": "libvirt-26" + "id": "libvirt-27" } { @@ -2683,7 +2691,7 @@ "type": "child<qemu:memory-region>" } ], - "id": "libvirt-27" + "id": "libvirt-28" } { @@ -2743,7 +2751,7 @@ "type": "uint16" } ], - "id": "libvirt-28" + "id": "libvirt-29" } { @@ -2757,7 +2765,7 @@ "type": "LostTickPolicy" } ], - "id": "libvirt-29" + "id": "libvirt-30" } { @@ -2804,7 +2812,7 @@ "type": "int32" } ], - "id": "libvirt-30" + "id": "libvirt-31" } { @@ -2837,7 +2845,7 @@ "type": "int32" } ], - "id": "libvirt-31" + "id": "libvirt-32" } { @@ -2914,7 +2922,7 @@ "type": "uint32" } ], - "id": "libvirt-32" + "id": "libvirt-33" } { @@ -3020,7 +3028,7 @@ "type": "uint32" } ], - "id": "libvirt-33" + "id": "libvirt-34" } { @@ -3060,7 +3068,7 @@ "type": "bool" } ], - "id": "libvirt-34" + "id": "libvirt-35" } { @@ -3137,7 +3145,7 @@ "type": "uint32" } ], - "id": "libvirt-35" + "id": "libvirt-36" } { @@ -3237,11 +3245,11 @@ "type": "bool" } ], - "id": "libvirt-36" + "id": "libvirt-37" } { - "id": "libvirt-37", + "id": "libvirt-38", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -3284,7 +3292,7 @@ "type": "bool" } ], - "id": "libvirt-38" + "id": "libvirt-39" } { @@ -3354,7 +3362,7 @@ "type": "uint32" } ], - "id": "libvirt-39" + "id": "libvirt-40" } { @@ -3467,7 +3475,7 @@ "cpu-max": 255 } ], - "id": "libvirt-40" + "id": "libvirt-41" } { @@ -3557,14 +3565,6 @@ "name": "qemu64" } ], - "id": "libvirt-41" -} - -{ - "return": { - "enabled": false, - "present": true - }, "id": "libvirt-42" } diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies index 95b9767..7b22dcc 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies @@ -481,6 +481,14 @@ } { + "return": { + "enabled": false, + "present": true + }, + "id": "libvirt-7" +} + +{ "return": [ { "name": "WATCHDOG" @@ -594,7 +602,7 @@ "name": "ACPI_DEVICE_OST" } ], - "id": "libvirt-7" + "id": "libvirt-8" } { @@ -1581,7 +1589,7 @@ "name": "virtio-blk-device" } ], - "id": "libvirt-8" + "id": "libvirt-9" } { @@ -1766,7 +1774,7 @@ "type": "str" } ], - "id": "libvirt-9" + "id": "libvirt-10" } { @@ -1998,7 +2006,7 @@ "type": "str" } ], - "id": "libvirt-10" + "id": "libvirt-11" } { @@ -2120,11 +2128,11 @@ "type": "str" } ], - "id": "libvirt-11" + "id": "libvirt-12" } { - "id": "libvirt-12", + "id": "libvirt-13", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-blk-ccw' not found" @@ -2132,7 +2140,7 @@ } { - "id": "libvirt-13", + "id": "libvirt-14", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-ccw' not found" @@ -2140,7 +2148,7 @@ } { - "id": "libvirt-14", + "id": "libvirt-15", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-scsi-ccw' not found" @@ -2148,7 +2156,7 @@ } { - "id": "libvirt-15", + "id": "libvirt-16", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-blk-s390' not found" @@ -2156,7 +2164,7 @@ } { - "id": "libvirt-16", + "id": "libvirt-17", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-net-s390' not found" @@ -2164,7 +2172,7 @@ } { - "id": "libvirt-17", + "id": "libvirt-18", "error": { "class": "DeviceNotFound", "desc": "Device 'pci-assign' not found" @@ -2225,7 +2233,7 @@ "type": "bool" } ], - "id": "libvirt-18" + "id": "libvirt-19" } { @@ -2327,7 +2335,7 @@ "type": "bool" } ], - "id": "libvirt-19" + "id": "libvirt-20" } { @@ -2437,7 +2445,7 @@ "type": "uint64" } ], - "id": "libvirt-20" + "id": "libvirt-21" } { @@ -2509,7 +2517,7 @@ "type": "uint16" } ], - "id": "libvirt-21" + "id": "libvirt-22" } { @@ -2567,7 +2575,7 @@ "type": "int32" } ], - "id": "libvirt-22" + "id": "libvirt-23" } { @@ -2616,7 +2624,7 @@ "type": "bool" } ], - "id": "libvirt-23" + "id": "libvirt-24" } { @@ -2685,7 +2693,7 @@ "type": "uint32" } ], - "id": "libvirt-24" + "id": "libvirt-25" } { @@ -2712,7 +2720,7 @@ "type": "uint32" } ], - "id": "libvirt-25" + "id": "libvirt-26" } { @@ -2750,7 +2758,7 @@ "type": "child<qemu:memory-region>" } ], - "id": "libvirt-26" + "id": "libvirt-27" } { @@ -2828,7 +2836,7 @@ "type": "int" } ], - "id": "libvirt-27" + "id": "libvirt-28" } { @@ -2897,7 +2905,7 @@ "type": "uint16" } ], - "id": "libvirt-28" + "id": "libvirt-29" } { @@ -2911,7 +2919,7 @@ "type": "LostTickPolicy" } ], - "id": "libvirt-29" + "id": "libvirt-30" } { @@ -2963,7 +2971,7 @@ "type": "int32" } ], - "id": "libvirt-30" + "id": "libvirt-31" } { @@ -3001,7 +3009,7 @@ "type": "int32" } ], - "id": "libvirt-31" + "id": "libvirt-32" } { @@ -3083,7 +3091,7 @@ "type": "uint32" } ], - "id": "libvirt-32" + "id": "libvirt-33" } { @@ -3193,7 +3201,7 @@ "type": "uint32" } ], - "id": "libvirt-33" + "id": "libvirt-34" } { @@ -3233,7 +3241,7 @@ "type": "bool" } ], - "id": "libvirt-34" + "id": "libvirt-35" } { @@ -3319,7 +3327,7 @@ "type": "uint32" } ], - "id": "libvirt-35" + "id": "libvirt-36" } { @@ -3423,11 +3431,11 @@ "type": "bool" } ], - "id": "libvirt-36" + "id": "libvirt-37" } { - "id": "libvirt-37", + "id": "libvirt-38", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -3470,7 +3478,7 @@ "type": "bool" } ], - "id": "libvirt-38" + "id": "libvirt-39" } { @@ -3545,7 +3553,7 @@ "type": "uint32" } ], - "id": "libvirt-39" + "id": "libvirt-40" } { @@ -3694,7 +3702,7 @@ "cpu-max": 255 } ], - "id": "libvirt-40" + "id": "libvirt-41" } { @@ -3787,14 +3795,6 @@ "name": "qemu64" } ], - "id": "libvirt-41" -} - -{ - "return": { - "enabled": false, - "present": true - }, "id": "libvirt-42" } -- 2.10.2