diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 202859abac..08cf822b88 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -1191,9 +1191,6 @@ static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsVirtioSCSI[] = {
{ "ats", QEMU_CAPS_VIRTIO_PCI_ATS },
};
-static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsPCIAssign[] = {
-};
-
static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsVfioPCI[] = {
{ "display", QEMU_CAPS_VFIO_PCI_DISPLAY },
};
@@ -1220,12 +1217,6 @@ static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsUSBRedir[] = {
{ "filter", QEMU_CAPS_USB_REDIR_FILTER },
};
-static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsUSBHost[] = {
-};
-
-static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsSCSIGeneric[] = {
-};
-
static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsI440FXPCIHost[] = {
{ "pci-hole64-size", QEMU_CAPS_I440FX_PCI_HOLE64_SIZE },
};
@@ -1340,12 +1331,6 @@ static virQEMUCapsObjectTypeProps virQEMUCapsDeviceProps[] = {
{ "virtio-net-s390", virQEMUCapsDevicePropsVirtioNet,
ARRAY_CARDINALITY(virQEMUCapsDevicePropsVirtioNet),
QEMU_CAPS_DEVICE_VIRTIO_NET },
- { "pci-assign", virQEMUCapsDevicePropsPCIAssign,
- ARRAY_CARDINALITY(virQEMUCapsDevicePropsPCIAssign),
- -1 },
- { "kvm-pci-assign", virQEMUCapsDevicePropsPCIAssign,
- ARRAY_CARDINALITY(virQEMUCapsDevicePropsPCIAssign),
- -1 },
{ "vfio-pci", virQEMUCapsDevicePropsVfioPCI,
ARRAY_CARDINALITY(virQEMUCapsDevicePropsVfioPCI),
QEMU_CAPS_DEVICE_VFIO_PCI },
@@ -1361,12 +1346,6 @@ static virQEMUCapsObjectTypeProps virQEMUCapsDeviceProps[] = {
{ "usb-redir", virQEMUCapsDevicePropsUSBRedir,
ARRAY_CARDINALITY(virQEMUCapsDevicePropsUSBRedir),
QEMU_CAPS_USB_REDIR },
- { "usb-host", virQEMUCapsDevicePropsUSBHost,
- ARRAY_CARDINALITY(virQEMUCapsDevicePropsUSBHost),
- -1 },
- { "scsi-generic", virQEMUCapsDevicePropsSCSIGeneric,
- ARRAY_CARDINALITY(virQEMUCapsDevicePropsSCSIGeneric),
- QEMU_CAPS_DEVICE_SCSI_GENERIC },
{ "i440FX-pcihost", virQEMUCapsDevicePropsI440FXPCIHost,
ARRAY_CARDINALITY(virQEMUCapsDevicePropsI440FXPCIHost),
-1 },
diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies
index 600ca5a6f7..88bc93be3a 100644
--- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies
@@ -1412,82 +1412,12 @@
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "pci-assign"
- },
- "id": "libvirt-15"
-}
-
-{
- "id": "libvirt-15",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'pci-assign' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "kvm-pci-assign"
- },
- "id": "libvirt-16"
-}
-
-{
- "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": "configfd",
- "type": "string"
- },
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "share_intx",
- "type": "on/off"
- },
- {
- "name": "prefer_msi",
- "type": "on/off"
- },
- {
- "name": "host",
- "type": "pci-host-devaddr"
- }
- ],
- "id": "libvirt-16"
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -1529,7 +1459,7 @@
"type": "pci-host-devaddr"
}
],
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -1537,7 +1467,7 @@
"arguments": {
"typename": "scsi-disk"
},
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -1611,7 +1541,7 @@
"type": "drive"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -1619,7 +1549,7 @@
"arguments": {
"typename": "ide-drive"
},
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
@@ -1673,7 +1603,7 @@
"type": "drive"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
@@ -1681,7 +1611,7 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
@@ -1723,7 +1653,7 @@
"type": "uint32"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
@@ -1731,7 +1661,7 @@
"arguments": {
"typename": "usb-redir"
},
- "id": "libvirt-21"
+ "id": "libvirt-19"
}
{
@@ -1761,103 +1691,7 @@
"type": "chr"
}
],
- "id": "libvirt-21"
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-22"
-}
-
-{
- "return": [
- {
- "name": "full-path",
- "type": "on/off"
- },
- {
- "name": "port",
- "type": "string"
- },
- {
- "name": "pipeline",
- "type": "on/off"
- },
- {
- "name": "loglevel",
- "type": "uint32"
- },
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "isobsize",
- "type": "uint32"
- },
- {
- "name": "isobufs",
- "type": "uint32"
- },
- {
- "name": "productid",
- "type": "hex32"
- },
- {
- "name": "vendorid",
- "type": "hex32"
- },
- {
- "name": "hostport",
- "type": "string"
- },
- {
- "name": "hostaddr",
- "type": "uint32"
- },
- {
- "name": "hostbus",
- "type": "uint32"
- }
- ],
- "id": "libvirt-22"
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "scsi-generic"
- },
- "id": "libvirt-23"
-}
-
-{
- "return": [
- {
- "name": "lun",
- "type": "uint32"
- },
- {
- "name": "scsi-id",
- "type": "uint32"
- },
- {
- "name": "channel",
- "type": "uint32"
- },
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "drive",
- "type": "drive"
- }
- ],
- "id": "libvirt-23"
+ "id": "libvirt-19"
}
{
@@ -1865,13 +1699,13 @@
"arguments": {
"typename": "i440FX-pcihost"
},
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
"return": [
],
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
@@ -1879,7 +1713,7 @@
"arguments": {
"typename": "q35-pcihost"
},
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
@@ -1889,7 +1723,7 @@
"type": "uint64"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
@@ -1897,7 +1731,7 @@
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -1947,7 +1781,7 @@
"type": "drive"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -1955,7 +1789,7 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -1969,7 +1803,7 @@
"type": "hex32"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -1977,7 +1811,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
@@ -2011,7 +1845,7 @@
"type": "uint32"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
@@ -2019,7 +1853,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
@@ -2049,7 +1883,7 @@
"type": "uint32"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
@@ -2057,7 +1891,7 @@
"arguments": {
"typename": "qxl"
},
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -2127,7 +1961,7 @@
"type": "uint32"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -2135,11 +1969,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
- "id": "libvirt-31",
+ "id": "libvirt-27",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
@@ -2151,7 +1985,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -2189,7 +2023,7 @@
"type": "on/off"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -2197,11 +2031,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
- "id": "libvirt-33",
+ "id": "libvirt-29",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -2213,13 +2047,13 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
"return": [
],
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
@@ -2227,7 +2061,7 @@
"arguments": {
"typename": "nec-usb-xhci"
},
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
@@ -2277,7 +2111,7 @@
"type": "on/off"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
@@ -2285,7 +2119,7 @@
"arguments": {
"typename": "mch"
},
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
@@ -2311,12 +2145,12 @@
"type": "pci-devfn"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
"execute": "query-machines",
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
@@ -2389,12 +2223,12 @@
"cpu-max": 1
}
],
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
@@ -2472,34 +2306,34 @@
"name": "qemu64"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
"return": [
],
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
"return": [
],
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
@@ -3200,12 +3034,12 @@
"option": "drive"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-42"
+ "id": "libvirt-38"
}
{
@@ -3215,7 +3049,7 @@
"capability": "xbzrle"
}
],
- "id": "libvirt-42"
+ "id": "libvirt-38"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
index fd8b56045d..b791b13830 100644
--- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
@@ -101,7 +101,7 @@
1005003
0
- 50896
+ 48498
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 e74ae6b958..ea04d55f2a 100644
--- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies
@@ -1441,82 +1441,12 @@
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "pci-assign"
- },
- "id": "libvirt-15"
-}
-
-{
- "id": "libvirt-15",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'pci-assign' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "kvm-pci-assign"
- },
- "id": "libvirt-16"
-}
-
-{
- "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": "configfd",
- "type": "string"
- },
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "share_intx",
- "type": "on/off"
- },
- {
- "name": "prefer_msi",
- "type": "on/off"
- },
- {
- "name": "host",
- "type": "pci-host-devaddr"
- }
- ],
- "id": "libvirt-16"
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -1558,7 +1488,7 @@
"type": "pci-host-devaddr"
}
],
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -1566,7 +1496,7 @@
"arguments": {
"typename": "scsi-disk"
},
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -1640,7 +1570,7 @@
"type": "drive"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -1648,7 +1578,7 @@
"arguments": {
"typename": "ide-drive"
},
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
@@ -1702,7 +1632,7 @@
"type": "drive"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
@@ -1710,7 +1640,7 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
@@ -1752,7 +1682,7 @@
"type": "uint32"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
@@ -1760,7 +1690,7 @@
"arguments": {
"typename": "usb-redir"
},
- "id": "libvirt-21"
+ "id": "libvirt-19"
}
{
@@ -1794,107 +1724,7 @@
"type": "chr"
}
],
- "id": "libvirt-21"
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-22"
-}
-
-{
- "return": [
- {
- "name": "full-path",
- "type": "on/off"
- },
- {
- "name": "serial",
- "type": "string"
- },
- {
- "name": "port",
- "type": "string"
- },
- {
- "name": "pipeline",
- "type": "on/off"
- },
- {
- "name": "loglevel",
- "type": "uint32"
- },
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "isobsize",
- "type": "uint32"
- },
- {
- "name": "isobufs",
- "type": "uint32"
- },
- {
- "name": "productid",
- "type": "hex32"
- },
- {
- "name": "vendorid",
- "type": "hex32"
- },
- {
- "name": "hostport",
- "type": "string"
- },
- {
- "name": "hostaddr",
- "type": "uint32"
- },
- {
- "name": "hostbus",
- "type": "uint32"
- }
- ],
- "id": "libvirt-22"
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "scsi-generic"
- },
- "id": "libvirt-23"
-}
-
-{
- "return": [
- {
- "name": "lun",
- "type": "uint32"
- },
- {
- "name": "scsi-id",
- "type": "uint32"
- },
- {
- "name": "channel",
- "type": "uint32"
- },
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "drive",
- "type": "drive"
- }
- ],
- "id": "libvirt-23"
+ "id": "libvirt-19"
}
{
@@ -1902,7 +1732,7 @@
"arguments": {
"typename": "i440FX-pcihost"
},
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
@@ -1912,7 +1742,7 @@
"type": "size"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
@@ -1920,7 +1750,7 @@
"arguments": {
"typename": "q35-pcihost"
},
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
@@ -1934,7 +1764,7 @@
"type": "uint64"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
@@ -1942,7 +1772,7 @@
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -1992,7 +1822,7 @@
"type": "drive"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -2000,7 +1830,7 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -2014,7 +1844,7 @@
"type": "hex32"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -2022,7 +1852,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
@@ -2056,7 +1886,7 @@
"type": "uint32"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
@@ -2064,7 +1894,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
@@ -2094,7 +1924,7 @@
"type": "uint32"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
@@ -2102,7 +1932,7 @@
"arguments": {
"typename": "qxl"
},
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -2172,7 +2002,7 @@
"type": "uint32"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -2180,11 +2010,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
- "id": "libvirt-31",
+ "id": "libvirt-27",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
@@ -2196,7 +2026,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -2234,7 +2064,7 @@
"type": "on/off"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -2242,11 +2072,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
- "id": "libvirt-33",
+ "id": "libvirt-29",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -2258,13 +2088,13 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
"return": [
],
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
@@ -2272,7 +2102,7 @@
"arguments": {
"typename": "nec-usb-xhci"
},
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
@@ -2322,7 +2152,7 @@
"type": "on/off"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
@@ -2330,7 +2160,7 @@
"arguments": {
"typename": "mch"
},
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
@@ -2356,12 +2186,12 @@
"type": "pci-devfn"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
"execute": "query-machines",
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
@@ -2442,12 +2272,12 @@
"cpu-max": 1
}
],
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
@@ -2525,34 +2355,34 @@
"name": "qemu64"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
"return": [
],
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
"return": [
],
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
@@ -3155,12 +2985,12 @@
"option": "drive"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-42"
+ "id": "libvirt-38"
}
{
@@ -3182,7 +3012,7 @@
"capability": "zero-blocks"
}
],
- "id": "libvirt-42"
+ "id": "libvirt-38"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
index 6831149379..3a0df4d417 100644
--- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
@@ -106,7 +106,7 @@
1006000
0
- 49125
+ 46667
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 a6c8e1e459..1261a2bdc1 100644
--- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies
@@ -1450,82 +1450,12 @@
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "pci-assign"
- },
- "id": "libvirt-15"
-}
-
-{
- "id": "libvirt-15",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'pci-assign' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "kvm-pci-assign"
- },
- "id": "libvirt-16"
-}
-
-{
- "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": "configfd",
- "type": "string"
- },
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "share_intx",
- "type": "on/off"
- },
- {
- "name": "prefer_msi",
- "type": "on/off"
- },
- {
- "name": "host",
- "type": "pci-host-devaddr"
- }
- ],
- "id": "libvirt-16"
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -1567,7 +1497,7 @@
"type": "pci-host-devaddr"
}
],
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -1575,7 +1505,7 @@
"arguments": {
"typename": "scsi-disk"
},
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -1649,7 +1579,7 @@
"type": "drive"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -1657,7 +1587,7 @@
"arguments": {
"typename": "ide-drive"
},
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
@@ -1711,7 +1641,7 @@
"type": "drive"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
@@ -1719,7 +1649,7 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
@@ -1761,7 +1691,7 @@
"type": "uint32"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
@@ -1769,7 +1699,7 @@
"arguments": {
"typename": "usb-redir"
},
- "id": "libvirt-21"
+ "id": "libvirt-19"
}
{
@@ -1803,107 +1733,7 @@
"type": "chr"
}
],
- "id": "libvirt-21"
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-22"
-}
-
-{
- "return": [
- {
- "name": "full-path",
- "type": "on/off"
- },
- {
- "name": "serial",
- "type": "string"
- },
- {
- "name": "port",
- "type": "string"
- },
- {
- "name": "pipeline",
- "type": "on/off"
- },
- {
- "name": "loglevel",
- "type": "uint32"
- },
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "isobsize",
- "type": "uint32"
- },
- {
- "name": "isobufs",
- "type": "uint32"
- },
- {
- "name": "productid",
- "type": "hex32"
- },
- {
- "name": "vendorid",
- "type": "hex32"
- },
- {
- "name": "hostport",
- "type": "string"
- },
- {
- "name": "hostaddr",
- "type": "uint32"
- },
- {
- "name": "hostbus",
- "type": "uint32"
- }
- ],
- "id": "libvirt-22"
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "scsi-generic"
- },
- "id": "libvirt-23"
-}
-
-{
- "return": [
- {
- "name": "lun",
- "type": "uint32"
- },
- {
- "name": "scsi-id",
- "type": "uint32"
- },
- {
- "name": "channel",
- "type": "uint32"
- },
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "drive",
- "type": "drive"
- }
- ],
- "id": "libvirt-23"
+ "id": "libvirt-19"
}
{
@@ -1911,7 +1741,7 @@
"arguments": {
"typename": "i440FX-pcihost"
},
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
@@ -1925,7 +1755,7 @@
"type": "size"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
@@ -1933,7 +1763,7 @@
"arguments": {
"typename": "q35-pcihost"
},
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
@@ -1951,7 +1781,7 @@
"type": "uint64"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
@@ -1959,7 +1789,7 @@
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -2009,7 +1839,7 @@
"type": "drive"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -2017,7 +1847,7 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -2031,7 +1861,7 @@
"type": "hex32"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -2039,7 +1869,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
@@ -2073,7 +1903,7 @@
"type": "uint32"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
@@ -2081,7 +1911,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
@@ -2111,7 +1941,7 @@
"type": "uint32"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
@@ -2119,7 +1949,7 @@
"arguments": {
"typename": "qxl"
},
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -2189,7 +2019,7 @@
"type": "uint32"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -2197,11 +2027,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
- "id": "libvirt-31",
+ "id": "libvirt-27",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
@@ -2213,7 +2043,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -2251,7 +2081,7 @@
"type": "on/off"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -2259,11 +2089,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
- "id": "libvirt-33",
+ "id": "libvirt-29",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -2275,13 +2105,13 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
"return": [
],
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
@@ -2289,7 +2119,7 @@
"arguments": {
"typename": "nec-usb-xhci"
},
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
@@ -2339,7 +2169,7 @@
"type": "on/off"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
@@ -2347,7 +2177,7 @@
"arguments": {
"typename": "mch"
},
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
@@ -2373,12 +2203,12 @@
"type": "pci-devfn"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
"execute": "query-machines",
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
@@ -2467,12 +2297,12 @@
"cpu-max": 1
}
],
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
@@ -2550,34 +2380,34 @@
"name": "qemu64"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
"return": [
],
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
"return": [
],
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
@@ -3370,12 +3200,12 @@
"option": "drive"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-42"
+ "id": "libvirt-38"
}
{
@@ -3397,7 +3227,7 @@
"capability": "zero-blocks"
}
],
- "id": "libvirt-42"
+ "id": "libvirt-38"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
index 852dcb0226..dede48d65f 100644
--- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
@@ -108,7 +108,7 @@
1007000
0
- 54569
+ 52111
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 88152e56bd..b6efe1d3a1 100644
--- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies
@@ -1717,82 +1717,12 @@
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "pci-assign"
- },
- "id": "libvirt-15"
-}
-
-{
- "id": "libvirt-15",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'pci-assign' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "kvm-pci-assign"
- },
- "id": "libvirt-16"
-}
-
-{
- "return": [
- {
- "name": "command_serr_enable",
- "type": "on/off"
- },
- {
- "name": "multifunction",
- "type": "on/off"
- },
- {
- "name": "rombar",
- "type": "uint32"
- },
- {
- "name": "romfile",
- "type": "str"
- },
- {
- "name": "addr",
- "type": "pci-devfn"
- },
- {
- "name": "configfd",
- "type": "str"
- },
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "share_intx",
- "type": "on/off"
- },
- {
- "name": "prefer_msi",
- "type": "on/off"
- },
- {
- "name": "host",
- "type": "pci-host-devaddr"
- }
- ],
- "id": "libvirt-16"
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -1834,7 +1764,7 @@
"type": "pci-host-devaddr"
}
],
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -1842,7 +1772,7 @@
"arguments": {
"typename": "scsi-disk"
},
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -1928,7 +1858,7 @@
"type": "drive"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -1936,7 +1866,7 @@
"arguments": {
"typename": "ide-drive"
},
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
@@ -1990,7 +1920,7 @@
"type": "drive"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
@@ -1998,7 +1928,7 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
@@ -2048,7 +1978,7 @@
"type": "uint32"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
@@ -2056,7 +1986,7 @@
"arguments": {
"typename": "usb-redir"
},
- "id": "libvirt-21"
+ "id": "libvirt-19"
}
{
@@ -2094,111 +2024,7 @@
"type": "chr"
}
],
- "id": "libvirt-21"
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-22"
-}
-
-{
- "return": [
- {
- "name": "msos-desc",
- "type": "on/off"
- },
- {
- "name": "full-path",
- "type": "on/off"
- },
- {
- "name": "serial",
- "type": "str"
- },
- {
- "name": "port",
- "type": "str"
- },
- {
- "name": "pipeline",
- "type": "on/off"
- },
- {
- "name": "loglevel",
- "type": "uint32"
- },
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "isobsize",
- "type": "uint32"
- },
- {
- "name": "isobufs",
- "type": "uint32"
- },
- {
- "name": "productid",
- "type": "uint32"
- },
- {
- "name": "vendorid",
- "type": "uint32"
- },
- {
- "name": "hostport",
- "type": "str"
- },
- {
- "name": "hostaddr",
- "type": "uint32"
- },
- {
- "name": "hostbus",
- "type": "uint32"
- }
- ],
- "id": "libvirt-22"
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "scsi-generic"
- },
- "id": "libvirt-23"
-}
-
-{
- "return": [
- {
- "name": "lun",
- "type": "uint32"
- },
- {
- "name": "scsi-id",
- "type": "uint32"
- },
- {
- "name": "channel",
- "type": "uint32"
- },
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "drive",
- "type": "drive"
- }
- ],
- "id": "libvirt-23"
+ "id": "libvirt-19"
}
{
@@ -2206,7 +2032,7 @@
"arguments": {
"typename": "i440FX-pcihost"
},
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
@@ -2244,7 +2070,7 @@
"type": "size"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
@@ -2252,7 +2078,7 @@
"arguments": {
"typename": "q35-pcihost"
},
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
@@ -2302,7 +2128,7 @@
"type": "uint64"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
@@ -2310,7 +2136,7 @@
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -2364,7 +2190,7 @@
"type": "drive"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -2372,7 +2198,7 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -2386,7 +2212,7 @@
"type": "uint32"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -2394,7 +2220,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
@@ -2428,7 +2254,7 @@
"type": "uint32"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
@@ -2436,7 +2262,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
@@ -2466,7 +2292,7 @@
"type": "uint32"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
@@ -2474,7 +2300,7 @@
"arguments": {
"typename": "qxl"
},
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -2544,7 +2370,7 @@
"type": "uint32"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -2552,7 +2378,7 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
@@ -2606,7 +2432,7 @@
"type": "pci-devfn"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
@@ -2614,7 +2440,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -2664,7 +2490,7 @@
"type": "uint32"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -2672,11 +2498,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
- "id": "libvirt-33",
+ "id": "libvirt-29",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -2688,13 +2514,13 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
"return": [
],
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
@@ -2702,7 +2528,7 @@
"arguments": {
"typename": "nec-usb-xhci"
},
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
@@ -2756,7 +2582,7 @@
"type": "on/off"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
@@ -2764,7 +2590,7 @@
"arguments": {
"typename": "mch"
},
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
@@ -2790,12 +2616,12 @@
"type": "pci-devfn"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
"execute": "query-machines",
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
@@ -2900,12 +2726,12 @@
"cpu-max": 255
}
],
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
@@ -2986,36 +2812,36 @@
"name": "qemu64"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
"return": [
"tpm-tis"
],
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
"return": [
"passthrough"
],
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
@@ -3875,12 +3701,12 @@
"option": "drive"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-42"
+ "id": "libvirt-38"
}
{
@@ -3902,7 +3728,7 @@
"capability": "zero-blocks"
}
],
- "id": "libvirt-42"
+ "id": "libvirt-38"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
index af35d676cb..05badb6675 100644
--- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
@@ -124,7 +124,7 @@
2001001
0
- 63365
+ 60857
x86_64
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies
index fee785692f..c8b73cd7e2 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies
@@ -3948,44 +3948,12 @@
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "pci-assign"
- },
- "id": "libvirt-14"
-}
-
-{
- "id": "libvirt-14",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'pci-assign' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "kvm-pci-assign"
- },
- "id": "libvirt-15"
-}
-
-{
- "id": "libvirt-15",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'kvm-pci-assign' not found"
- }
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-16"
+ "id": "libvirt-14"
}
{
@@ -4092,7 +4060,7 @@
"type": "bool"
}
],
- "id": "libvirt-16"
+ "id": "libvirt-14"
}
{
@@ -4100,7 +4068,7 @@
"arguments": {
"typename": "scsi-disk"
},
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -4214,7 +4182,7 @@
"type": "uint64"
}
],
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -4222,7 +4190,7 @@
"arguments": {
"typename": "ide-drive"
},
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -4298,7 +4266,7 @@
"type": "uint16"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -4306,139 +4274,27 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
- "id": "libvirt-19",
+ "id": "libvirt-17",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'PIIX4_PM' not found"
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-20"
-}
-
-{
- "return": [
- {
- "name": "isobufs",
- "type": "uint32"
- },
- {
- "name": "hostaddr",
- "type": "uint32"
- },
- {
- "name": "msos-desc",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "productid",
- "type": "uint32"
- },
- {
- "name": "serial",
- "type": "str"
- },
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "isobsize",
- "type": "uint32"
- },
- {
- "name": "port",
- "type": "str"
- },
- {
- "name": "vendorid",
- "type": "uint32"
- },
- {
- "name": "pipeline",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "attached",
- "type": "bool"
- },
- {
- "name": "hostport",
- "type": "str"
- },
- {
- "name": "full-path",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "loglevel",
- "type": "uint32"
- },
- {
- "name": "hostbus",
- "type": "uint32"
- }
- ],
- "id": "libvirt-20"
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "scsi-generic"
- },
- "id": "libvirt-21"
-}
-
-{
- "return": [
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "drive",
- "description": "Node name or ID of a block device to use as a backend",
- "type": "str"
- },
- {
- "name": "lun",
- "type": "uint32"
- },
- {
- "name": "channel",
- "type": "uint32"
- },
- {
- "name": "scsi-id",
- "type": "uint32"
- }
- ],
- "id": "libvirt-21"
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "i440FX-pcihost"
},
- "id": "libvirt-22"
+ "id": "libvirt-18"
}
{
- "id": "libvirt-22",
+ "id": "libvirt-18",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'i440FX-pcihost' not found"
@@ -4450,11 +4306,11 @@
"arguments": {
"typename": "q35-pcihost"
},
- "id": "libvirt-23"
+ "id": "libvirt-19"
}
{
- "id": "libvirt-23",
+ "id": "libvirt-19",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'q35-pcihost' not found"
@@ -4466,7 +4322,7 @@
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
@@ -4539,7 +4395,7 @@
"type": "uint16"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
@@ -4547,11 +4403,11 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
- "id": "libvirt-25",
+ "id": "libvirt-21",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pit' not found"
@@ -4563,7 +4419,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -4620,7 +4476,7 @@
"type": "int32"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -4628,7 +4484,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -4779,7 +4635,7 @@
"type": "str"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -4787,7 +4643,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
@@ -4834,7 +4690,7 @@
"type": "size"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
@@ -4842,11 +4698,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
- "id": "libvirt-29",
+ "id": "libvirt-25",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
@@ -4858,7 +4714,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -5001,7 +4857,7 @@
"type": "str"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -5009,11 +4865,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
- "id": "libvirt-31",
+ "id": "libvirt-27",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -5025,7 +4881,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -5069,7 +4925,7 @@
"type": "bool"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -5077,7 +4933,7 @@
"arguments": {
"typename": "nec-usb-xhci"
},
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
@@ -5157,12 +5013,12 @@
"type": "uint32"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
"execute": "query-machines",
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
@@ -5429,12 +5285,12 @@
"cpu-max": 1
}
],
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
@@ -5600,34 +5456,34 @@
"static": false
}
],
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
"return": [
],
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
"return": [
],
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
@@ -6772,12 +6628,12 @@
"option": "drive"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
@@ -6827,12 +6683,12 @@
"capability": "return-path"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
"execute": "query-qmp-schema",
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
@@ -16555,12 +16411,12 @@
"meta-type": "object"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
"execute": "query-gic-capabilities",
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
@@ -16576,7 +16432,7 @@
"kernel": true
}
],
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
index 8d22cd8ca6..d1224410f6 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
@@ -156,7 +156,7 @@
2010000
0
- 307241
+ 305067
(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 e3047f133e..20e5b47541 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies
@@ -4049,44 +4049,12 @@
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "pci-assign"
- },
- "id": "libvirt-14"
-}
-
-{
- "id": "libvirt-14",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'pci-assign' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "kvm-pci-assign"
- },
- "id": "libvirt-15"
-}
-
-{
- "id": "libvirt-15",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'kvm-pci-assign' not found"
- }
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-16"
+ "id": "libvirt-14"
}
{
@@ -4193,7 +4161,7 @@
"type": "bool"
}
],
- "id": "libvirt-16"
+ "id": "libvirt-14"
}
{
@@ -4201,7 +4169,7 @@
"arguments": {
"typename": "scsi-disk"
},
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -4315,7 +4283,7 @@
"type": "uint64"
}
],
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -4323,7 +4291,7 @@
"arguments": {
"typename": "ide-drive"
},
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -4399,7 +4367,7 @@
"type": "uint16"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -4407,139 +4375,27 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
- "id": "libvirt-19",
+ "id": "libvirt-17",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'PIIX4_PM' not found"
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-20"
-}
-
-{
- "return": [
- {
- "name": "isobufs",
- "type": "uint32"
- },
- {
- "name": "hostaddr",
- "type": "uint32"
- },
- {
- "name": "msos-desc",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "productid",
- "type": "uint32"
- },
- {
- "name": "serial",
- "type": "str"
- },
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "isobsize",
- "type": "uint32"
- },
- {
- "name": "port",
- "type": "str"
- },
- {
- "name": "vendorid",
- "type": "uint32"
- },
- {
- "name": "pipeline",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "attached",
- "type": "bool"
- },
- {
- "name": "hostport",
- "type": "str"
- },
- {
- "name": "full-path",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "loglevel",
- "type": "uint32"
- },
- {
- "name": "hostbus",
- "type": "uint32"
- }
- ],
- "id": "libvirt-20"
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "scsi-generic"
- },
- "id": "libvirt-21"
-}
-
-{
- "return": [
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "drive",
- "description": "Node name or ID of a block device to use as a backend",
- "type": "str"
- },
- {
- "name": "lun",
- "type": "uint32"
- },
- {
- "name": "channel",
- "type": "uint32"
- },
- {
- "name": "scsi-id",
- "type": "uint32"
- }
- ],
- "id": "libvirt-21"
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "i440FX-pcihost"
},
- "id": "libvirt-22"
+ "id": "libvirt-18"
}
{
- "id": "libvirt-22",
+ "id": "libvirt-18",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'i440FX-pcihost' not found"
@@ -4551,11 +4407,11 @@
"arguments": {
"typename": "q35-pcihost"
},
- "id": "libvirt-23"
+ "id": "libvirt-19"
}
{
- "id": "libvirt-23",
+ "id": "libvirt-19",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'q35-pcihost' not found"
@@ -4567,7 +4423,7 @@
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
@@ -4640,7 +4496,7 @@
"type": "uint16"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
@@ -4648,11 +4504,11 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
- "id": "libvirt-25",
+ "id": "libvirt-21",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pit' not found"
@@ -4664,7 +4520,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -4721,7 +4577,7 @@
"type": "int32"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -4729,7 +4585,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -4880,7 +4736,7 @@
"type": "str"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -4888,7 +4744,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
@@ -4935,7 +4791,7 @@
"type": "size"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
@@ -4943,11 +4799,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
- "id": "libvirt-29",
+ "id": "libvirt-25",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
@@ -4959,7 +4815,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -5102,7 +4958,7 @@
"type": "str"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -5110,11 +4966,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
- "id": "libvirt-31",
+ "id": "libvirt-27",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -5126,7 +4982,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -5170,7 +5026,7 @@
"type": "bool"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -5178,7 +5034,7 @@
"arguments": {
"typename": "nec-usb-xhci"
},
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
@@ -5258,7 +5114,7 @@
"type": "uint32"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
@@ -5266,7 +5122,7 @@
"arguments": {
"typename": "spapr-pci-host-bridge"
},
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
@@ -5352,12 +5208,12 @@
"type": "uint32"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
"execute": "query-machines",
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
@@ -5475,12 +5331,12 @@
"cpu-max": 1
}
],
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
@@ -7656,34 +7512,34 @@
"static": false
}
],
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
"return": [
],
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
"return": [
],
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
@@ -8823,12 +8679,12 @@
"option": "drive"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
@@ -8878,12 +8734,12 @@
"capability": "return-path"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
"execute": "query-qmp-schema",
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
@@ -18606,7 +18462,7 @@
"meta-type": "object"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
index ee9faac3cd..8eac816b3a 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
@@ -155,7 +155,7 @@
2010000
0
- 386586
+ 384412
(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 f30a3eaa2b..a79fad62df 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies
@@ -2695,44 +2695,12 @@
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "pci-assign"
- },
- "id": "libvirt-15"
-}
-
-{
- "id": "libvirt-15",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'pci-assign' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "kvm-pci-assign"
- },
- "id": "libvirt-16"
-}
-
-{
- "id": "libvirt-16",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'kvm-pci-assign' not found"
- }
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -2839,7 +2807,7 @@
"type": "bool"
}
],
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -2847,7 +2815,7 @@
"arguments": {
"typename": "scsi-disk"
},
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -2961,7 +2929,7 @@
"type": "uint64"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -2969,11 +2937,11 @@
"arguments": {
"typename": "ide-drive"
},
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
- "id": "libvirt-19",
+ "id": "libvirt-17",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ide-drive' not found"
@@ -2985,78 +2953,27 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
- "id": "libvirt-20",
+ "id": "libvirt-18",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'PIIX4_PM' not found"
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-21"
-}
-
-{
- "id": "libvirt-21",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'usb-host' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "scsi-generic"
- },
- "id": "libvirt-22"
-}
-
-{
- "return": [
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "drive",
- "description": "Node name or ID of a block device to use as a backend",
- "type": "str"
- },
- {
- "name": "lun",
- "type": "uint32"
- },
- {
- "name": "channel",
- "type": "uint32"
- },
- {
- "name": "scsi-id",
- "type": "uint32"
- }
- ],
- "id": "libvirt-22"
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "i440FX-pcihost"
},
- "id": "libvirt-23"
+ "id": "libvirt-19"
}
{
- "id": "libvirt-23",
+ "id": "libvirt-19",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'i440FX-pcihost' not found"
@@ -3068,11 +2985,11 @@
"arguments": {
"typename": "q35-pcihost"
},
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
- "id": "libvirt-24",
+ "id": "libvirt-20",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'q35-pcihost' not found"
@@ -3084,11 +3001,11 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
- "id": "libvirt-25",
+ "id": "libvirt-21",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pit' not found"
@@ -3100,7 +3017,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -3251,7 +3168,7 @@
"type": "str"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -3259,7 +3176,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -3306,7 +3223,7 @@
"type": "size"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -3314,11 +3231,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
- "id": "libvirt-28",
+ "id": "libvirt-24",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
@@ -3330,7 +3247,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
@@ -3473,7 +3390,7 @@
"type": "str"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
@@ -3481,7 +3398,7 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -3543,7 +3460,7 @@
"type": "uint32"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -3551,7 +3468,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
@@ -3595,7 +3512,7 @@
"type": "bool"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
@@ -3603,7 +3520,7 @@
"arguments": {
"typename": "virtual-css-bridge"
},
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -3613,12 +3530,12 @@
"type": "bool"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
"execute": "query-machines",
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
@@ -3666,12 +3583,12 @@
"cpu-max": 248
}
],
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
@@ -4205,34 +4122,34 @@
"migration-safe": true
}
],
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
"return": [
],
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
"return": [
],
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
@@ -5337,12 +5254,12 @@
"option": "drive"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
@@ -5392,12 +5309,12 @@
"capability": "return-path"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
"execute": "query-qmp-schema",
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
@@ -15120,7 +15037,7 @@
"meta-type": "object"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
@@ -15131,7 +15048,7 @@
"name": "host"
}
},
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
@@ -15171,7 +15088,7 @@
}
}
},
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
@@ -15185,11 +15102,11 @@
}
}
},
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
- "id": "libvirt-41",
+ "id": "libvirt-37",
"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 c2b41249da..a8cd1fe158 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
@@ -118,7 +118,7 @@
2010000
0
- 307493
+ 306247
s390x
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies
index b3937c1d9c..0f385734b2 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies
@@ -2926,98 +2926,12 @@
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "pci-assign"
- },
- "id": "libvirt-14"
-}
-
-{
- "id": "libvirt-14",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'pci-assign' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "kvm-pci-assign"
- },
- "id": "libvirt-15"
-}
-
-{
- "return": [
- {
- "name": "share_intx",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "rombar",
- "type": "uint32"
- },
- {
- "name": "x-pcie-lnksta-dllla",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "multifunction",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "host",
- "description": "Address (bus/device/function) of the host device, example: 04:10.0",
- "type": "str"
- },
- {
- "name": "romfile",
- "type": "str"
- },
- {
- "name": "configfd",
- "type": "str"
- },
- {
- "name": "x-pcie-extcap-init",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "command_serr_enable",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "addr",
- "description": "Slot and optional function number, example: 06.0 or 06",
- "type": "int32"
- },
- {
- "name": "prefer_msi",
- "description": "on/off",
- "type": "bool"
- }
- ],
- "id": "libvirt-15"
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-16"
+ "id": "libvirt-14"
}
{
@@ -3124,7 +3038,7 @@
"type": "bool"
}
],
- "id": "libvirt-16"
+ "id": "libvirt-14"
}
{
@@ -3132,7 +3046,7 @@
"arguments": {
"typename": "scsi-disk"
},
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -3246,7 +3160,7 @@
"type": "uint64"
}
],
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -3254,7 +3168,7 @@
"arguments": {
"typename": "ide-drive"
},
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -3330,7 +3244,7 @@
"type": "uint16"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -3338,7 +3252,7 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
@@ -3401,7 +3315,7 @@
"type": "int32"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
@@ -3409,7 +3323,7 @@
"arguments": {
"typename": "usb-redir"
},
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
@@ -3458,119 +3372,7 @@
"type": "bool"
}
],
- "id": "libvirt-20"
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-21"
-}
-
-{
- "return": [
- {
- "name": "isobufs",
- "type": "uint32"
- },
- {
- "name": "hostaddr",
- "type": "uint32"
- },
- {
- "name": "msos-desc",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "productid",
- "type": "uint32"
- },
- {
- "name": "serial",
- "type": "str"
- },
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "isobsize",
- "type": "uint32"
- },
- {
- "name": "port",
- "type": "str"
- },
- {
- "name": "vendorid",
- "type": "uint32"
- },
- {
- "name": "pipeline",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "attached",
- "type": "bool"
- },
- {
- "name": "hostport",
- "type": "str"
- },
- {
- "name": "full-path",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "loglevel",
- "type": "uint32"
- },
- {
- "name": "hostbus",
- "type": "uint32"
- }
- ],
- "id": "libvirt-21"
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "scsi-generic"
- },
- "id": "libvirt-22"
-}
-
-{
- "return": [
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "drive",
- "description": "Node name or ID of a block device to use as a backend",
- "type": "str"
- },
- {
- "name": "lun",
- "type": "uint32"
- },
- {
- "name": "channel",
- "type": "uint32"
- },
- {
- "name": "scsi-id",
- "type": "uint32"
- }
- ],
- "id": "libvirt-22"
+ "id": "libvirt-18"
}
{
@@ -3578,7 +3380,7 @@
"arguments": {
"typename": "i440FX-pcihost"
},
- "id": "libvirt-23"
+ "id": "libvirt-19"
}
{
@@ -3616,7 +3418,7 @@
"type": "child"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-19"
}
{
@@ -3624,7 +3426,7 @@
"arguments": {
"typename": "q35-pcihost"
},
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
@@ -3702,7 +3504,7 @@
"type": "uint64"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
@@ -3710,7 +3512,7 @@
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
@@ -3783,7 +3585,7 @@
"type": "uint16"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
@@ -3791,7 +3593,7 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -3805,7 +3607,7 @@
"type": "LostTickPolicy"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -3813,7 +3615,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -3870,7 +3672,7 @@
"type": "int32"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -3878,7 +3680,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
@@ -3921,7 +3723,7 @@
"type": "int32"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
@@ -3929,7 +3731,7 @@
"arguments": {
"typename": "qxl"
},
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
@@ -4024,7 +3826,7 @@
"type": "uint32"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
@@ -4032,7 +3834,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -4193,7 +3995,7 @@
"type": "str"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -4201,7 +4003,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
@@ -4258,7 +4060,7 @@
"type": "size"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
@@ -4266,7 +4068,7 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -4362,7 +4164,7 @@
"type": "uint32"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -4370,7 +4172,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
@@ -4513,7 +4315,7 @@
"type": "str"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
@@ -4521,11 +4323,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
- "id": "libvirt-34",
+ "id": "libvirt-30",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -4537,7 +4339,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
@@ -4581,7 +4383,7 @@
"type": "bool"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
@@ -4589,7 +4391,7 @@
"arguments": {
"typename": "nec-usb-xhci"
},
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
@@ -4669,7 +4471,7 @@
"type": "uint32"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
@@ -4677,7 +4479,7 @@
"arguments": {
"typename": "intel-iommu"
},
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
@@ -4712,7 +4514,7 @@
"type": "bool"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
@@ -4720,7 +4522,7 @@
"arguments": {
"typename": "mch"
},
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
@@ -4746,12 +4548,12 @@
"type": "pci-devfn"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
"execute": "query-machines",
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
@@ -4940,12 +4742,12 @@
"alias": "q35"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
@@ -5280,36 +5082,36 @@
"migration-safe": true
}
],
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
"return": [
"tpm-tis"
],
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-42"
+ "id": "libvirt-38"
}
{
"return": [
"passthrough"
],
- "id": "libvirt-42"
+ "id": "libvirt-38"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-43"
+ "id": "libvirt-39"
}
{
@@ -6588,12 +6390,12 @@
"option": "drive"
}
],
- "id": "libvirt-43"
+ "id": "libvirt-39"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-44"
+ "id": "libvirt-40"
}
{
@@ -6643,12 +6445,12 @@
"capability": "return-path"
}
],
- "id": "libvirt-44"
+ "id": "libvirt-40"
}
{
"execute": "query-qmp-schema",
- "id": "libvirt-45"
+ "id": "libvirt-41"
}
{
@@ -16371,7 +16173,7 @@
"meta-type": "object"
}
],
- "id": "libvirt-45"
+ "id": "libvirt-41"
}
{
@@ -16382,7 +16184,7 @@
"name": "host"
}
},
- "id": "libvirt-46"
+ "id": "libvirt-42"
}
{
@@ -16561,7 +16363,7 @@
}
}
},
- "id": "libvirt-46"
+ "id": "libvirt-42"
}
{
@@ -16742,7 +16544,7 @@
}
}
},
- "id": "libvirt-47"
+ "id": "libvirt-43"
}
{
@@ -16985,7 +16787,7 @@
}
}
},
- "id": "libvirt-47"
+ "id": "libvirt-43"
}
{
@@ -16999,7 +16801,7 @@
}
}
},
- "id": "libvirt-48"
+ "id": "libvirt-44"
}
{
@@ -17178,7 +16980,7 @@
}
}
},
- "id": "libvirt-48"
+ "id": "libvirt-44"
}
{
@@ -17359,7 +17161,7 @@
}
}
},
- "id": "libvirt-49"
+ "id": "libvirt-45"
}
{
@@ -17602,7 +17404,7 @@
}
}
},
- "id": "libvirt-49"
+ "id": "libvirt-45"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
index 46f6f6c492..abe2f8e930 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
@@ -197,7 +197,7 @@
2010000
0
- 367589
+ 364386
(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 d47a19130c..3a03f390b2 100644
--- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies
@@ -2744,44 +2744,12 @@
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "pci-assign"
- },
- "id": "libvirt-15"
-}
-
-{
- "id": "libvirt-15",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'pci-assign' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "kvm-pci-assign"
- },
- "id": "libvirt-16"
-}
-
-{
- "id": "libvirt-16",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'kvm-pci-assign' not found"
- }
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -2893,7 +2861,7 @@
"type": "bool"
}
],
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -2901,7 +2869,7 @@
"arguments": {
"typename": "scsi-disk"
},
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -3015,7 +2983,7 @@
"type": "uint64"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -3023,11 +2991,11 @@
"arguments": {
"typename": "ide-drive"
},
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
- "id": "libvirt-19",
+ "id": "libvirt-17",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ide-drive' not found"
@@ -3039,78 +3007,27 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
- "id": "libvirt-20",
+ "id": "libvirt-18",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'PIIX4_PM' not found"
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-21"
-}
-
-{
- "id": "libvirt-21",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'usb-host' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "scsi-generic"
- },
- "id": "libvirt-22"
-}
-
-{
- "return": [
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "drive",
- "description": "Node name or ID of a block device to use as a backend",
- "type": "str"
- },
- {
- "name": "lun",
- "type": "uint32"
- },
- {
- "name": "channel",
- "type": "uint32"
- },
- {
- "name": "scsi-id",
- "type": "uint32"
- }
- ],
- "id": "libvirt-22"
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "i440FX-pcihost"
},
- "id": "libvirt-23"
+ "id": "libvirt-19"
}
{
- "id": "libvirt-23",
+ "id": "libvirt-19",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'i440FX-pcihost' not found"
@@ -3122,11 +3039,11 @@
"arguments": {
"typename": "q35-pcihost"
},
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
- "id": "libvirt-24",
+ "id": "libvirt-20",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'q35-pcihost' not found"
@@ -3138,11 +3055,11 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
- "id": "libvirt-25",
+ "id": "libvirt-21",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pit' not found"
@@ -3154,7 +3071,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -3305,7 +3222,7 @@
"type": "str"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -3313,7 +3230,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -3360,7 +3277,7 @@
"type": "size"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -3368,11 +3285,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
- "id": "libvirt-28",
+ "id": "libvirt-24",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
@@ -3384,7 +3301,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
@@ -3527,7 +3444,7 @@
"type": "str"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
@@ -3535,7 +3452,7 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -3597,7 +3514,7 @@
"type": "uint32"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -3605,7 +3522,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
@@ -3649,7 +3566,7 @@
"type": "bool"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
@@ -3657,7 +3574,7 @@
"arguments": {
"typename": "virtio-gpu-ccw"
},
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -3722,7 +3639,7 @@
"type": "uint32"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -3730,7 +3647,7 @@
"arguments": {
"typename": "virtual-css-bridge"
},
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
@@ -3740,12 +3657,12 @@
"type": "bool"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
"execute": "query-machines",
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
@@ -3798,12 +3715,12 @@
"cpu-max": 248
}
],
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
@@ -4337,35 +4254,35 @@
"migration-safe": true
}
],
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
"return": [
],
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
"return": [
"emulator"
],
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
@@ -5486,12 +5403,12 @@
"option": "drive"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
@@ -5549,12 +5466,12 @@
"capability": "x-multifd"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
"execute": "query-qmp-schema",
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
@@ -15422,7 +15339,7 @@
"meta-type": "object"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
@@ -15433,7 +15350,7 @@
"name": "host"
}
},
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
@@ -15472,7 +15389,7 @@
}
}
},
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
@@ -15486,11 +15403,11 @@
}
}
},
- "id": "libvirt-42"
+ "id": "libvirt-38"
}
{
- "id": "libvirt-42",
+ "id": "libvirt-38",
"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 fa515d455b..b1a7b167b2 100644
--- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
@@ -125,7 +125,7 @@
2011000
0
- 346345
+ 345099
s390x
diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies
index a067b70377..c9a9a7043d 100644
--- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies
@@ -2923,44 +2923,12 @@
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "pci-assign"
- },
- "id": "libvirt-14"
-}
-
-{
- "id": "libvirt-14",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'pci-assign' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "kvm-pci-assign"
- },
- "id": "libvirt-15"
-}
-
-{
- "id": "libvirt-15",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'kvm-pci-assign' not found"
- }
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-16"
+ "id": "libvirt-14"
}
{
@@ -3072,7 +3040,7 @@
"type": "bool"
}
],
- "id": "libvirt-16"
+ "id": "libvirt-14"
}
{
@@ -3080,7 +3048,7 @@
"arguments": {
"typename": "scsi-disk"
},
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -3194,7 +3162,7 @@
"type": "uint64"
}
],
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -3202,7 +3170,7 @@
"arguments": {
"typename": "ide-drive"
},
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -3278,7 +3246,7 @@
"type": "uint16"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -3286,7 +3254,7 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
@@ -3349,7 +3317,7 @@
"type": "int32"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
@@ -3357,7 +3325,7 @@
"arguments": {
"typename": "usb-redir"
},
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
@@ -3406,119 +3374,7 @@
"type": "bool"
}
],
- "id": "libvirt-20"
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-21"
-}
-
-{
- "return": [
- {
- "name": "isobufs",
- "type": "uint32"
- },
- {
- "name": "hostaddr",
- "type": "uint32"
- },
- {
- "name": "msos-desc",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "productid",
- "type": "uint32"
- },
- {
- "name": "serial",
- "type": "str"
- },
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "isobsize",
- "type": "uint32"
- },
- {
- "name": "port",
- "type": "str"
- },
- {
- "name": "vendorid",
- "type": "uint32"
- },
- {
- "name": "pipeline",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "attached",
- "type": "bool"
- },
- {
- "name": "hostport",
- "type": "str"
- },
- {
- "name": "full-path",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "loglevel",
- "type": "uint32"
- },
- {
- "name": "hostbus",
- "type": "uint32"
- }
- ],
- "id": "libvirt-21"
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "scsi-generic"
- },
- "id": "libvirt-22"
-}
-
-{
- "return": [
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "drive",
- "description": "Node name or ID of a block device to use as a backend",
- "type": "str"
- },
- {
- "name": "lun",
- "type": "uint32"
- },
- {
- "name": "channel",
- "type": "uint32"
- },
- {
- "name": "scsi-id",
- "type": "uint32"
- }
- ],
- "id": "libvirt-22"
+ "id": "libvirt-18"
}
{
@@ -3526,7 +3382,7 @@
"arguments": {
"typename": "i440FX-pcihost"
},
- "id": "libvirt-23"
+ "id": "libvirt-19"
}
{
@@ -3568,7 +3424,7 @@
"type": "bool"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-19"
}
{
@@ -3576,7 +3432,7 @@
"arguments": {
"typename": "q35-pcihost"
},
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
@@ -3658,7 +3514,7 @@
"type": "uint64"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
@@ -3666,7 +3522,7 @@
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
@@ -3739,7 +3595,7 @@
"type": "uint16"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
@@ -3747,7 +3603,7 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -3761,7 +3617,7 @@
"type": "LostTickPolicy"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -3769,7 +3625,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -3826,7 +3682,7 @@
"type": "int32"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -3834,7 +3690,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
@@ -3877,7 +3733,7 @@
"type": "int32"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
@@ -3885,7 +3741,7 @@
"arguments": {
"typename": "qxl"
},
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
@@ -3980,7 +3836,7 @@
"type": "uint32"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
@@ -3988,7 +3844,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -4149,7 +4005,7 @@
"type": "str"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -4157,7 +4013,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
@@ -4214,7 +4070,7 @@
"type": "size"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
@@ -4222,7 +4078,7 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -4318,7 +4174,7 @@
"type": "uint32"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -4326,7 +4182,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
@@ -4469,7 +4325,7 @@
"type": "str"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
@@ -4477,11 +4333,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
- "id": "libvirt-34",
+ "id": "libvirt-30",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -4493,7 +4349,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
@@ -4537,7 +4393,7 @@
"type": "bool"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
@@ -4545,7 +4401,7 @@
"arguments": {
"typename": "nec-usb-xhci"
},
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
@@ -4625,7 +4481,7 @@
"type": "uint32"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
@@ -4633,7 +4489,7 @@
"arguments": {
"typename": "intel-iommu"
},
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
@@ -4668,7 +4524,7 @@
"type": "bool"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
@@ -4676,7 +4532,7 @@
"arguments": {
"typename": "mch"
},
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
@@ -4719,12 +4575,12 @@
"type": "int32"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
"execute": "query-machines",
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
@@ -4913,12 +4769,12 @@
"cpu-max": 288
}
],
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
@@ -5232,24 +5088,24 @@
"migration-safe": true
}
],
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
"return": [
"tpm-tis"
],
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-42"
+ "id": "libvirt-38"
}
{
@@ -5257,12 +5113,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-42"
+ "id": "libvirt-38"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-43"
+ "id": "libvirt-39"
}
{
@@ -6557,12 +6413,12 @@
"option": "drive"
}
],
- "id": "libvirt-43"
+ "id": "libvirt-39"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-44"
+ "id": "libvirt-40"
}
{
@@ -6620,12 +6476,12 @@
"capability": "x-multifd"
}
],
- "id": "libvirt-44"
+ "id": "libvirt-40"
}
{
"execute": "query-qmp-schema",
- "id": "libvirt-45"
+ "id": "libvirt-41"
}
{
@@ -16493,7 +16349,7 @@
"meta-type": "object"
}
],
- "id": "libvirt-45"
+ "id": "libvirt-41"
}
{
@@ -16504,7 +16360,7 @@
"name": "host"
}
},
- "id": "libvirt-46"
+ "id": "libvirt-42"
}
{
@@ -16684,7 +16540,7 @@
}
}
},
- "id": "libvirt-46"
+ "id": "libvirt-42"
}
{
@@ -16866,7 +16722,7 @@
}
}
},
- "id": "libvirt-47"
+ "id": "libvirt-43"
}
{
@@ -17111,7 +16967,7 @@
}
}
},
- "id": "libvirt-47"
+ "id": "libvirt-43"
}
{
@@ -17125,7 +16981,7 @@
}
}
},
- "id": "libvirt-48"
+ "id": "libvirt-44"
}
{
@@ -17305,7 +17161,7 @@
}
}
},
- "id": "libvirt-48"
+ "id": "libvirt-44"
}
{
@@ -17487,7 +17343,7 @@
}
}
},
- "id": "libvirt-49"
+ "id": "libvirt-45"
}
{
@@ -17732,7 +17588,7 @@
}
}
},
- "id": "libvirt-49"
+ "id": "libvirt-45"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
index f3be49a288..90bb897485 100644
--- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
@@ -203,7 +203,7 @@
2011000
0
- 371049
+ 368875
(v2.11.0)
x86_64
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies
index db5b5140d5..4208a66156 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies
@@ -4251,44 +4251,12 @@
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "pci-assign"
- },
- "id": "libvirt-14"
-}
-
-{
- "id": "libvirt-14",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'pci-assign' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "kvm-pci-assign"
- },
- "id": "libvirt-15"
-}
-
-{
- "id": "libvirt-15",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'kvm-pci-assign' not found"
- }
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-16"
+ "id": "libvirt-14"
}
{
@@ -4414,7 +4382,7 @@
"type": "str"
}
],
- "id": "libvirt-16"
+ "id": "libvirt-14"
}
{
@@ -4422,7 +4390,7 @@
"arguments": {
"typename": "scsi-disk"
},
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -4536,7 +4504,7 @@
"type": "uint64"
}
],
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -4544,7 +4512,7 @@
"arguments": {
"typename": "ide-drive"
},
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -4620,7 +4588,7 @@
"type": "uint16"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -4628,143 +4596,27 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
- "id": "libvirt-19",
+ "id": "libvirt-17",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'PIIX4_PM' not found"
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-20"
-}
-
-{
- "return": [
- {
- "name": "isobufs",
- "type": "uint32"
- },
- {
- "name": "hostaddr",
- "type": "uint32"
- },
- {
- "name": "msos-desc",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "productid",
- "type": "uint32"
- },
- {
- "name": "serial",
- "type": "str"
- },
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "isobsize",
- "type": "uint32"
- },
- {
- "name": "port",
- "type": "str"
- },
- {
- "name": "vendorid",
- "type": "uint32"
- },
- {
- "name": "pipeline",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "attached",
- "type": "bool"
- },
- {
- "name": "hostport",
- "type": "str"
- },
- {
- "name": "full-path",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "loglevel",
- "type": "uint32"
- },
- {
- "name": "hostbus",
- "type": "uint32"
- }
- ],
- "id": "libvirt-20"
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "scsi-generic"
- },
- "id": "libvirt-21"
-}
-
-{
- "return": [
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "drive",
- "description": "Node name or ID of a block device to use as a backend",
- "type": "str"
- },
- {
- "name": "lun",
- "type": "uint32"
- },
- {
- "name": "share-rw",
- "type": "bool"
- },
- {
- "name": "channel",
- "type": "uint32"
- },
- {
- "name": "scsi-id",
- "type": "uint32"
- }
- ],
- "id": "libvirt-21"
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "i440FX-pcihost"
},
- "id": "libvirt-22"
+ "id": "libvirt-18"
}
{
- "id": "libvirt-22",
+ "id": "libvirt-18",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'i440FX-pcihost' not found"
@@ -4776,11 +4628,11 @@
"arguments": {
"typename": "q35-pcihost"
},
- "id": "libvirt-23"
+ "id": "libvirt-19"
}
{
- "id": "libvirt-23",
+ "id": "libvirt-19",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'q35-pcihost' not found"
@@ -4792,7 +4644,7 @@
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
@@ -4865,7 +4717,7 @@
"type": "uint16"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
@@ -4873,11 +4725,11 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
- "id": "libvirt-25",
+ "id": "libvirt-21",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pit' not found"
@@ -4889,7 +4741,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -4946,7 +4798,7 @@
"type": "int32"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -4954,7 +4806,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -5105,7 +4957,7 @@
"type": "str"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -5113,7 +4965,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
@@ -5160,7 +5012,7 @@
"type": "size"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
@@ -5168,11 +5020,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
- "id": "libvirt-29",
+ "id": "libvirt-25",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
@@ -5184,7 +5036,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -5327,7 +5179,7 @@
"type": "str"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -5335,11 +5187,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
- "id": "libvirt-31",
+ "id": "libvirt-27",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -5351,7 +5203,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -5395,7 +5247,7 @@
"type": "bool"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -5403,7 +5255,7 @@
"arguments": {
"typename": "nec-usb-xhci"
},
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
@@ -5483,7 +5335,7 @@
"type": "uint32"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
@@ -5491,7 +5343,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
@@ -5545,7 +5397,7 @@
"type": "string"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
@@ -5553,11 +5405,11 @@
"arguments": {
"typename": "spapr-machine"
},
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
- "id": "libvirt-35",
+ "id": "libvirt-31",
"error": {
"class": "DeviceNotFound",
"desc": "Class 'spapr-machine' not found"
@@ -5566,7 +5418,7 @@
{
"execute": "query-machines",
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
@@ -5863,12 +5715,12 @@
"cpu-max": 1
}
],
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
@@ -6044,35 +5896,35 @@
"static": false
}
],
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
"return": [
],
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
"return": [
"emulator"
],
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
@@ -7233,12 +7085,12 @@
"option": "drive"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
@@ -7300,12 +7152,12 @@
"capability": "dirty-bitmaps"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
"execute": "query-qmp-schema",
- "id": "libvirt-42"
+ "id": "libvirt-38"
}
{
@@ -18673,12 +18525,12 @@
"meta-type": "object"
}
],
- "id": "libvirt-42"
+ "id": "libvirt-38"
}
{
"execute": "query-gic-capabilities",
- "id": "libvirt-43"
+ "id": "libvirt-39"
}
{
@@ -18694,7 +18546,7 @@
"kernel": false
}
],
- "id": "libvirt-43"
+ "id": "libvirt-39"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
index 4f13281e3d..d83d8d42f5 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
@@ -167,7 +167,7 @@
2011090
0
- 347144
+ 344910
v2.12.0-rc0
aarch64
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies
index 786cb1844a..bd28546275 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies
@@ -4240,44 +4240,12 @@
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "pci-assign"
- },
- "id": "libvirt-14"
-}
-
-{
- "id": "libvirt-14",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'pci-assign' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "kvm-pci-assign"
- },
- "id": "libvirt-15"
-}
-
-{
- "id": "libvirt-15",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'kvm-pci-assign' not found"
- }
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-16"
+ "id": "libvirt-14"
}
{
@@ -4403,7 +4371,7 @@
"type": "str"
}
],
- "id": "libvirt-16"
+ "id": "libvirt-14"
}
{
@@ -4411,7 +4379,7 @@
"arguments": {
"typename": "scsi-disk"
},
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -4525,7 +4493,7 @@
"type": "uint64"
}
],
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -4533,7 +4501,7 @@
"arguments": {
"typename": "ide-drive"
},
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -4609,7 +4577,7 @@
"type": "uint16"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -4617,143 +4585,27 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
- "id": "libvirt-19",
+ "id": "libvirt-17",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'PIIX4_PM' not found"
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-20"
-}
-
-{
- "return": [
- {
- "name": "isobufs",
- "type": "uint32"
- },
- {
- "name": "hostaddr",
- "type": "uint32"
- },
- {
- "name": "msos-desc",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "productid",
- "type": "uint32"
- },
- {
- "name": "serial",
- "type": "str"
- },
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "isobsize",
- "type": "uint32"
- },
- {
- "name": "port",
- "type": "str"
- },
- {
- "name": "vendorid",
- "type": "uint32"
- },
- {
- "name": "pipeline",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "attached",
- "type": "bool"
- },
- {
- "name": "hostport",
- "type": "str"
- },
- {
- "name": "full-path",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "loglevel",
- "type": "uint32"
- },
- {
- "name": "hostbus",
- "type": "uint32"
- }
- ],
- "id": "libvirt-20"
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "scsi-generic"
- },
- "id": "libvirt-21"
-}
-
-{
- "return": [
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "drive",
- "description": "Node name or ID of a block device to use as a backend",
- "type": "str"
- },
- {
- "name": "lun",
- "type": "uint32"
- },
- {
- "name": "share-rw",
- "type": "bool"
- },
- {
- "name": "channel",
- "type": "uint32"
- },
- {
- "name": "scsi-id",
- "type": "uint32"
- }
- ],
- "id": "libvirt-21"
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "i440FX-pcihost"
},
- "id": "libvirt-22"
+ "id": "libvirt-18"
}
{
- "id": "libvirt-22",
+ "id": "libvirt-18",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'i440FX-pcihost' not found"
@@ -4765,11 +4617,11 @@
"arguments": {
"typename": "q35-pcihost"
},
- "id": "libvirt-23"
+ "id": "libvirt-19"
}
{
- "id": "libvirt-23",
+ "id": "libvirt-19",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'q35-pcihost' not found"
@@ -4781,7 +4633,7 @@
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
@@ -4854,7 +4706,7 @@
"type": "uint16"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
@@ -4862,11 +4714,11 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
- "id": "libvirt-25",
+ "id": "libvirt-21",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pit' not found"
@@ -4878,7 +4730,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -4935,7 +4787,7 @@
"type": "int32"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -4943,7 +4795,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -5094,7 +4946,7 @@
"type": "str"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -5102,7 +4954,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
@@ -5149,7 +5001,7 @@
"type": "size"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
@@ -5157,11 +5009,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
- "id": "libvirt-29",
+ "id": "libvirt-25",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
@@ -5173,7 +5025,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -5316,7 +5168,7 @@
"type": "str"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -5324,11 +5176,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
- "id": "libvirt-31",
+ "id": "libvirt-27",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -5340,7 +5192,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -5384,7 +5236,7 @@
"type": "bool"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -5392,7 +5244,7 @@
"arguments": {
"typename": "nec-usb-xhci"
},
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
@@ -5472,7 +5324,7 @@
"type": "uint32"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
@@ -5480,7 +5332,7 @@
"arguments": {
"typename": "spapr-pci-host-bridge"
},
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
@@ -5538,7 +5390,7 @@
"type": "uint32"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
@@ -5546,7 +5398,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
@@ -5600,7 +5452,7 @@
"type": "string"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
@@ -5608,7 +5460,7 @@
"arguments": {
"typename": "spapr-machine"
},
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
@@ -5769,12 +5621,12 @@
"type": "bool"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
"execute": "query-machines",
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
@@ -5912,12 +5764,12 @@
"cpu-max": 1
}
],
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
@@ -8113,35 +7965,35 @@
"static": false
}
],
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
"return": [
],
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
"return": [
"emulator"
],
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
@@ -9297,12 +9149,12 @@
"option": "drive"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-42"
+ "id": "libvirt-38"
}
{
@@ -9364,12 +9216,12 @@
"capability": "dirty-bitmaps"
}
],
- "id": "libvirt-42"
+ "id": "libvirt-38"
}
{
"execute": "query-qmp-schema",
- "id": "libvirt-43"
+ "id": "libvirt-39"
}
{
@@ -20737,7 +20589,7 @@
"meta-type": "object"
}
],
- "id": "libvirt-43"
+ "id": "libvirt-39"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
index 295e6062df..790bebfb4d 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
@@ -165,7 +165,7 @@
2011090
0
- 427928
+ 425694
v2.12.0-rc0
ppc64
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies
index 25a005c5cd..f98afbceae 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies
@@ -2814,44 +2814,12 @@
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "pci-assign"
- },
- "id": "libvirt-15"
-}
-
-{
- "id": "libvirt-15",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'pci-assign' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "kvm-pci-assign"
- },
- "id": "libvirt-16"
-}
-
-{
- "id": "libvirt-16",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'kvm-pci-assign' not found"
- }
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -2977,7 +2945,7 @@
"type": "str"
}
],
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -2985,7 +2953,7 @@
"arguments": {
"typename": "scsi-disk"
},
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -3103,7 +3071,7 @@
"type": "uint32"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -3111,11 +3079,11 @@
"arguments": {
"typename": "ide-drive"
},
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
- "id": "libvirt-19",
+ "id": "libvirt-17",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ide-drive' not found"
@@ -3127,82 +3095,27 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
- "id": "libvirt-20",
+ "id": "libvirt-18",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'PIIX4_PM' not found"
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-21"
-}
-
-{
- "id": "libvirt-21",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'usb-host' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "scsi-generic"
- },
- "id": "libvirt-22"
-}
-
-{
- "return": [
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "drive",
- "description": "Node name or ID of a block device to use as a backend",
- "type": "str"
- },
- {
- "name": "lun",
- "type": "uint32"
- },
- {
- "name": "share-rw",
- "type": "bool"
- },
- {
- "name": "channel",
- "type": "uint32"
- },
- {
- "name": "scsi-id",
- "type": "uint32"
- }
- ],
- "id": "libvirt-22"
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "i440FX-pcihost"
},
- "id": "libvirt-23"
+ "id": "libvirt-19"
}
{
- "id": "libvirt-23",
+ "id": "libvirt-19",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'i440FX-pcihost' not found"
@@ -3214,11 +3127,11 @@
"arguments": {
"typename": "q35-pcihost"
},
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
- "id": "libvirt-24",
+ "id": "libvirt-20",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'q35-pcihost' not found"
@@ -3230,11 +3143,11 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
- "id": "libvirt-25",
+ "id": "libvirt-21",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pit' not found"
@@ -3246,7 +3159,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -3397,7 +3310,7 @@
"type": "str"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -3405,7 +3318,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -3452,7 +3365,7 @@
"type": "size"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -3460,11 +3373,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
- "id": "libvirt-28",
+ "id": "libvirt-24",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
@@ -3476,7 +3389,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
@@ -3619,7 +3532,7 @@
"type": "str"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
@@ -3627,7 +3540,7 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -3689,7 +3602,7 @@
"type": "uint32"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -3697,7 +3610,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
@@ -3741,7 +3654,7 @@
"type": "bool"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
@@ -3749,7 +3662,7 @@
"arguments": {
"typename": "virtio-gpu-ccw"
},
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -3814,7 +3727,7 @@
"type": "uint32"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -3822,7 +3735,7 @@
"arguments": {
"typename": "virtual-css-bridge"
},
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
@@ -3837,7 +3750,7 @@
"type": "bool"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
@@ -3845,7 +3758,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
@@ -3899,7 +3812,7 @@
"type": "string"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
@@ -3907,11 +3820,11 @@
"arguments": {
"typename": "spapr-machine"
},
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
- "id": "libvirt-35",
+ "id": "libvirt-31",
"error": {
"class": "DeviceNotFound",
"desc": "Class 'spapr-machine' not found"
@@ -3920,7 +3833,7 @@
{
"execute": "query-machines",
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
@@ -3978,12 +3891,12 @@
"alias": "s390-ccw-virtio"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
@@ -4518,35 +4431,35 @@
"migration-safe": true
}
],
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
"return": [
],
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
"return": [
"emulator"
],
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
@@ -5671,12 +5584,12 @@
"option": "drive"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
@@ -5738,12 +5651,12 @@
"capability": "dirty-bitmaps"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
"execute": "query-qmp-schema",
- "id": "libvirt-42"
+ "id": "libvirt-38"
}
{
@@ -17111,7 +17024,7 @@
"meta-type": "object"
}
],
- "id": "libvirt-42"
+ "id": "libvirt-38"
}
{
@@ -17122,7 +17035,7 @@
"name": "host"
}
},
- "id": "libvirt-43"
+ "id": "libvirt-39"
}
{
@@ -17160,7 +17073,7 @@
}
}
},
- "id": "libvirt-43"
+ "id": "libvirt-39"
}
{
@@ -17174,11 +17087,11 @@
}
}
},
- "id": "libvirt-44"
+ "id": "libvirt-40"
}
{
- "id": "libvirt-44",
+ "id": "libvirt-40",
"error": {
"class": "GenericError",
"desc": "Property '.migratable' not found"
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
index d19ad59b31..abc40ec795 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
@@ -133,7 +133,7 @@
2012000
0
- 375593
+ 374287
s390x
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies
index 9d7e653216..e0b6d2f937 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies
@@ -3098,44 +3098,12 @@
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "pci-assign"
- },
- "id": "libvirt-14"
-}
-
-{
- "id": "libvirt-14",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'pci-assign' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "kvm-pci-assign"
- },
- "id": "libvirt-15"
-}
-
-{
- "id": "libvirt-15",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'kvm-pci-assign' not found"
- }
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-16"
+ "id": "libvirt-14"
}
{
@@ -3261,7 +3229,7 @@
"type": "str"
}
],
- "id": "libvirt-16"
+ "id": "libvirt-14"
}
{
@@ -3269,7 +3237,7 @@
"arguments": {
"typename": "scsi-disk"
},
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -3383,7 +3351,7 @@
"type": "uint64"
}
],
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -3391,7 +3359,7 @@
"arguments": {
"typename": "ide-drive"
},
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -3467,7 +3435,7 @@
"type": "uint16"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -3475,7 +3443,7 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
@@ -3538,7 +3506,7 @@
"type": "int32"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
@@ -3546,7 +3514,7 @@
"arguments": {
"typename": "usb-redir"
},
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
@@ -3595,123 +3563,7 @@
"type": "bool"
}
],
- "id": "libvirt-20"
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-21"
-}
-
-{
- "return": [
- {
- "name": "isobufs",
- "type": "uint32"
- },
- {
- "name": "hostaddr",
- "type": "uint32"
- },
- {
- "name": "msos-desc",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "productid",
- "type": "uint32"
- },
- {
- "name": "serial",
- "type": "str"
- },
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "isobsize",
- "type": "uint32"
- },
- {
- "name": "port",
- "type": "str"
- },
- {
- "name": "vendorid",
- "type": "uint32"
- },
- {
- "name": "pipeline",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "attached",
- "type": "bool"
- },
- {
- "name": "hostport",
- "type": "str"
- },
- {
- "name": "full-path",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "loglevel",
- "type": "uint32"
- },
- {
- "name": "hostbus",
- "type": "uint32"
- }
- ],
- "id": "libvirt-21"
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "scsi-generic"
- },
- "id": "libvirt-22"
-}
-
-{
- "return": [
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "drive",
- "description": "Node name or ID of a block device to use as a backend",
- "type": "str"
- },
- {
- "name": "lun",
- "type": "uint32"
- },
- {
- "name": "share-rw",
- "type": "bool"
- },
- {
- "name": "channel",
- "type": "uint32"
- },
- {
- "name": "scsi-id",
- "type": "uint32"
- }
- ],
- "id": "libvirt-22"
+ "id": "libvirt-18"
}
{
@@ -3719,7 +3571,7 @@
"arguments": {
"typename": "i440FX-pcihost"
},
- "id": "libvirt-23"
+ "id": "libvirt-19"
}
{
@@ -3761,7 +3613,7 @@
"type": "bool"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-19"
}
{
@@ -3769,7 +3621,7 @@
"arguments": {
"typename": "q35-pcihost"
},
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
@@ -3851,7 +3703,7 @@
"type": "uint64"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
@@ -3859,7 +3711,7 @@
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
@@ -3932,7 +3784,7 @@
"type": "uint16"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
@@ -3940,7 +3792,7 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -3954,7 +3806,7 @@
"type": "LostTickPolicy"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -3962,7 +3814,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -4019,7 +3871,7 @@
"type": "int32"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -4027,7 +3879,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
@@ -4070,7 +3922,7 @@
"type": "int32"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
@@ -4078,7 +3930,7 @@
"arguments": {
"typename": "qxl"
},
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
@@ -4173,7 +4025,7 @@
"type": "uint32"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
@@ -4181,7 +4033,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -4332,7 +4184,7 @@
"type": "str"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -4340,7 +4192,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
@@ -4387,7 +4239,7 @@
"type": "size"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
@@ -4395,7 +4247,7 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -4491,7 +4343,7 @@
"type": "uint32"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -4499,7 +4351,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
@@ -4642,7 +4494,7 @@
"type": "str"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
@@ -4650,11 +4502,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
- "id": "libvirt-34",
+ "id": "libvirt-30",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -4666,7 +4518,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
@@ -4710,7 +4562,7 @@
"type": "bool"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
@@ -4718,7 +4570,7 @@
"arguments": {
"typename": "nec-usb-xhci"
},
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
@@ -4798,7 +4650,7 @@
"type": "uint32"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
@@ -4806,7 +4658,7 @@
"arguments": {
"typename": "intel-iommu"
},
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
@@ -4845,7 +4697,7 @@
"type": "bool"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
@@ -4853,7 +4705,7 @@
"arguments": {
"typename": "mch"
},
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
@@ -4896,7 +4748,7 @@
"type": "int32"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
@@ -4904,7 +4756,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
@@ -4958,7 +4810,7 @@
"type": "string"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
@@ -4966,11 +4818,11 @@
"arguments": {
"typename": "spapr-machine"
},
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
- "id": "libvirt-40",
+ "id": "libvirt-36",
"error": {
"class": "DeviceNotFound",
"desc": "Class 'spapr-machine' not found"
@@ -4979,7 +4831,7 @@
{
"execute": "query-machines",
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
@@ -5178,12 +5030,12 @@
"cpu-max": 255
}
],
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-42"
+ "id": "libvirt-38"
}
{
@@ -5697,12 +5549,12 @@
"migration-safe": true
}
],
- "id": "libvirt-42"
+ "id": "libvirt-38"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-43"
+ "id": "libvirt-39"
}
{
@@ -5710,12 +5562,12 @@
"tpm-crb",
"tpm-tis"
],
- "id": "libvirt-43"
+ "id": "libvirt-39"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-44"
+ "id": "libvirt-40"
}
{
@@ -5723,12 +5575,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-44"
+ "id": "libvirt-40"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-45"
+ "id": "libvirt-41"
}
{
@@ -7015,12 +6867,12 @@
"option": "drive"
}
],
- "id": "libvirt-45"
+ "id": "libvirt-41"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-46"
+ "id": "libvirt-42"
}
{
@@ -7082,12 +6934,12 @@
"capability": "dirty-bitmaps"
}
],
- "id": "libvirt-46"
+ "id": "libvirt-42"
}
{
"execute": "query-qmp-schema",
- "id": "libvirt-47"
+ "id": "libvirt-43"
}
{
@@ -18455,7 +18307,7 @@
"meta-type": "object"
}
],
- "id": "libvirt-47"
+ "id": "libvirt-43"
}
{
@@ -18466,7 +18318,7 @@
"name": "host"
}
},
- "id": "libvirt-48"
+ "id": "libvirt-44"
}
{
@@ -18656,7 +18508,7 @@
}
}
},
- "id": "libvirt-48"
+ "id": "libvirt-44"
}
{
@@ -18848,7 +18700,7 @@
}
}
},
- "id": "libvirt-49"
+ "id": "libvirt-45"
}
{
@@ -19103,7 +18955,7 @@
}
}
},
- "id": "libvirt-49"
+ "id": "libvirt-45"
}
{
@@ -19117,7 +18969,7 @@
}
}
},
- "id": "libvirt-50"
+ "id": "libvirt-46"
}
{
@@ -19307,7 +19159,7 @@
}
}
},
- "id": "libvirt-50"
+ "id": "libvirt-46"
}
{
@@ -19499,7 +19351,7 @@
}
}
},
- "id": "libvirt-51"
+ "id": "libvirt-47"
}
{
@@ -19754,12 +19606,12 @@
}
}
},
- "id": "libvirt-51"
+ "id": "libvirt-47"
}
{
"execute": "query-sev-capabilities",
- "id": "libvirt-52"
+ "id": "libvirt-48"
}
{
@@ -19769,7 +19621,7 @@
"cert-chain": "AQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAA",
"pdh": "AQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAA"
},
- "id": "libvirt-52"
+ "id": "libvirt-48"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
index 16861727cf..76e3bd79e7 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
@@ -208,7 +208,7 @@
2011090
0
- 415790
+ 413556
v2.12.0-rc0
x86_64
diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies
index 32c31f406d..ee248e38aa 100644
--- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies
@@ -2005,88 +2005,12 @@
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "pci-assign"
- },
- "id": "libvirt-15"
-}
-
-{
- "id": "libvirt-15",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'pci-assign' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "kvm-pci-assign"
- },
- "id": "libvirt-16"
-}
-
-{
- "return": [
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "command_serr_enable",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "multifunction",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "rombar",
- "type": "uint32"
- },
- {
- "name": "romfile",
- "type": "str"
- },
- {
- "name": "addr",
- "description": "Slot and optional function number, example: 06.0 or 06",
- "type": "int32"
- },
- {
- "name": "configfd",
- "type": "str"
- },
- {
- "name": "share_intx",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "prefer_msi",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "host",
- "description": "Address (bus/device/function) of the host device, example: 04:10.0",
- "type": "str"
- }
- ],
- "id": "libvirt-16"
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -2142,7 +2066,7 @@
"type": "str"
}
],
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -2150,7 +2074,7 @@
"arguments": {
"typename": "scsi-disk"
},
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -2245,7 +2169,7 @@
"type": "str"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -2253,7 +2177,7 @@
"arguments": {
"typename": "ide-drive"
},
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
@@ -2310,7 +2234,7 @@
"type": "str"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
@@ -2318,7 +2242,7 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
@@ -2371,7 +2295,7 @@
"type": "uint32"
}
],
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
@@ -2379,7 +2303,7 @@
"arguments": {
"typename": "usb-redir"
},
- "id": "libvirt-21"
+ "id": "libvirt-19"
}
{
@@ -2420,115 +2344,7 @@
"type": "str"
}
],
- "id": "libvirt-21"
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-22"
-}
-
-{
- "return": [
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "msos-desc",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "full-path",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "serial",
- "type": "str"
- },
- {
- "name": "port",
- "type": "str"
- },
- {
- "name": "pipeline",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "loglevel",
- "type": "uint32"
- },
- {
- "name": "isobsize",
- "type": "uint32"
- },
- {
- "name": "isobufs",
- "type": "uint32"
- },
- {
- "name": "productid",
- "type": "uint32"
- },
- {
- "name": "vendorid",
- "type": "uint32"
- },
- {
- "name": "hostport",
- "type": "str"
- },
- {
- "name": "hostaddr",
- "type": "uint32"
- },
- {
- "name": "hostbus",
- "type": "uint32"
- }
- ],
- "id": "libvirt-22"
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "scsi-generic"
- },
- "id": "libvirt-23"
-}
-
-{
- "return": [
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "lun",
- "type": "uint32"
- },
- {
- "name": "scsi-id",
- "type": "uint32"
- },
- {
- "name": "channel",
- "type": "uint32"
- },
- {
- "name": "drive",
- "description": "ID of a drive to use as a backend",
- "type": "str"
- }
- ],
- "id": "libvirt-23"
+ "id": "libvirt-19"
}
{
@@ -2536,7 +2352,7 @@
"arguments": {
"typename": "i440FX-pcihost"
},
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
@@ -2574,7 +2390,7 @@
"type": "size"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
@@ -2582,7 +2398,7 @@
"arguments": {
"typename": "q35-pcihost"
},
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
@@ -2636,7 +2452,7 @@
"type": "uint64"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
@@ -2644,7 +2460,7 @@
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -2704,7 +2520,7 @@
"type": "str"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -2712,7 +2528,7 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -2726,7 +2542,7 @@
"type": "uint32"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -2734,7 +2550,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
@@ -2781,7 +2597,7 @@
"type": "uint32"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
@@ -2789,7 +2605,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
@@ -2822,7 +2638,7 @@
"type": "uint32"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
@@ -2830,7 +2646,7 @@
"arguments": {
"typename": "qxl"
},
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -2907,7 +2723,7 @@
"type": "uint32"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -2915,7 +2731,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
@@ -2996,7 +2812,7 @@
"type": "bool"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
@@ -3004,7 +2820,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -3034,7 +2850,7 @@
"type": "uint32"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -3042,7 +2858,7 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
@@ -3119,7 +2935,7 @@
"type": "bool"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
@@ -3127,7 +2943,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
@@ -3212,7 +3028,7 @@
"type": "uint32"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
@@ -3220,11 +3036,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
- "id": "libvirt-35",
+ "id": "libvirt-31",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -3236,7 +3052,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
@@ -3275,7 +3091,7 @@
"type": "bool"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
@@ -3283,7 +3099,7 @@
"arguments": {
"typename": "nec-usb-xhci"
},
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
@@ -3353,7 +3169,7 @@
"type": "bool"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
@@ -3361,7 +3177,7 @@
"arguments": {
"typename": "intel-iommu"
},
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
@@ -3371,7 +3187,7 @@
"type": "uint32"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
@@ -3379,7 +3195,7 @@
"arguments": {
"typename": "mch"
},
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
@@ -3405,12 +3221,12 @@
"type": "pci-devfn"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
"execute": "query-machines",
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
@@ -3539,12 +3355,12 @@
"cpu-max": 255
}
],
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
@@ -3634,36 +3450,36 @@
"name": "qemu64"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-42"
+ "id": "libvirt-38"
}
{
"return": [
"tpm-tis"
],
- "id": "libvirt-42"
+ "id": "libvirt-38"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-43"
+ "id": "libvirt-39"
}
{
"return": [
"passthrough"
],
- "id": "libvirt-43"
+ "id": "libvirt-39"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-44"
+ "id": "libvirt-40"
}
{
@@ -4671,12 +4487,12 @@
"option": "drive"
}
],
- "id": "libvirt-44"
+ "id": "libvirt-40"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-45"
+ "id": "libvirt-41"
}
{
@@ -4706,7 +4522,7 @@
"capability": "events"
}
],
- "id": "libvirt-45"
+ "id": "libvirt-41"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
index 7759fe9f99..d8d2b7939f 100644
--- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
@@ -150,7 +150,7 @@
2004000
0
- 80139
+ 77219
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 2e93b116f7..6065200d39 100644
--- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies
@@ -2074,88 +2074,12 @@
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "pci-assign"
- },
- "id": "libvirt-14"
-}
-
-{
- "id": "libvirt-14",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'pci-assign' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "kvm-pci-assign"
- },
- "id": "libvirt-15"
-}
-
-{
- "return": [
- {
- "name": "share_intx",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "rombar",
- "type": "uint32"
- },
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "multifunction",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "host",
- "description": "Address (bus/device/function) of the host device, example: 04:10.0",
- "type": "str"
- },
- {
- "name": "romfile",
- "type": "str"
- },
- {
- "name": "configfd",
- "type": "str"
- },
- {
- "name": "command_serr_enable",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "addr",
- "description": "Slot and optional function number, example: 06.0 or 06",
- "type": "int32"
- },
- {
- "name": "prefer_msi",
- "description": "on/off",
- "type": "bool"
- }
- ],
- "id": "libvirt-15"
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-16"
+ "id": "libvirt-14"
}
{
@@ -2239,7 +2163,7 @@
"type": "bool"
}
],
- "id": "libvirt-16"
+ "id": "libvirt-14"
}
{
@@ -2247,7 +2171,7 @@
"arguments": {
"typename": "scsi-disk"
},
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -2342,7 +2266,7 @@
"type": "uint64"
}
],
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -2350,7 +2274,7 @@
"arguments": {
"typename": "ide-drive"
},
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -2407,7 +2331,7 @@
"type": "uint16"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -2415,7 +2339,7 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
@@ -2468,7 +2392,7 @@
"type": "int32"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
@@ -2476,7 +2400,7 @@
"arguments": {
"typename": "usb-redir"
},
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
@@ -2517,115 +2441,7 @@
"type": "bool"
}
],
- "id": "libvirt-20"
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-21"
-}
-
-{
- "return": [
- {
- "name": "isobufs",
- "type": "uint32"
- },
- {
- "name": "hostaddr",
- "type": "uint32"
- },
- {
- "name": "msos-desc",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "productid",
- "type": "uint32"
- },
- {
- "name": "serial",
- "type": "str"
- },
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "isobsize",
- "type": "uint32"
- },
- {
- "name": "port",
- "type": "str"
- },
- {
- "name": "vendorid",
- "type": "uint32"
- },
- {
- "name": "pipeline",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "hostport",
- "type": "str"
- },
- {
- "name": "full-path",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "loglevel",
- "type": "uint32"
- },
- {
- "name": "hostbus",
- "type": "uint32"
- }
- ],
- "id": "libvirt-21"
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "scsi-generic"
- },
- "id": "libvirt-22"
-}
-
-{
- "return": [
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "drive",
- "description": "ID of a drive to use as a backend",
- "type": "str"
- },
- {
- "name": "lun",
- "type": "uint32"
- },
- {
- "name": "channel",
- "type": "uint32"
- },
- {
- "name": "scsi-id",
- "type": "uint32"
- }
- ],
- "id": "libvirt-22"
+ "id": "libvirt-18"
}
{
@@ -2633,7 +2449,7 @@
"arguments": {
"typename": "i440FX-pcihost"
},
- "id": "libvirt-23"
+ "id": "libvirt-19"
}
{
@@ -2671,7 +2487,7 @@
"type": "child"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-19"
}
{
@@ -2679,7 +2495,7 @@
"arguments": {
"typename": "q35-pcihost"
},
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
@@ -2733,7 +2549,7 @@
"type": "child"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
@@ -2741,7 +2557,7 @@
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
@@ -2801,7 +2617,7 @@
"type": "uint16"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
@@ -2809,7 +2625,7 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -2823,7 +2639,7 @@
"type": "LostTickPolicy"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -2831,7 +2647,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -2878,7 +2694,7 @@
"type": "int32"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -2886,7 +2702,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
@@ -2919,7 +2735,7 @@
"type": "int32"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
@@ -2927,7 +2743,7 @@
"arguments": {
"typename": "qxl"
},
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
@@ -3004,7 +2820,7 @@
"type": "uint32"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
@@ -3012,7 +2828,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -3118,7 +2934,7 @@
"type": "uint32"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -3126,7 +2942,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
@@ -3166,7 +2982,7 @@
"type": "bool"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
@@ -3174,7 +2990,7 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -3251,7 +3067,7 @@
"type": "uint32"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -3259,7 +3075,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
@@ -3359,7 +3175,7 @@
"type": "bool"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
@@ -3367,11 +3183,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
- "id": "libvirt-34",
+ "id": "libvirt-30",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -3383,7 +3199,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
@@ -3422,7 +3238,7 @@
"type": "bool"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
@@ -3430,7 +3246,7 @@
"arguments": {
"typename": "nec-usb-xhci"
},
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
@@ -3500,7 +3316,7 @@
"type": "uint32"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
@@ -3508,7 +3324,7 @@
"arguments": {
"typename": "intel-iommu"
},
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
@@ -3518,7 +3334,7 @@
"type": "uint32"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
@@ -3526,7 +3342,7 @@
"arguments": {
"typename": "mch"
},
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
@@ -3552,12 +3368,12 @@
"type": "pci-devfn"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
"execute": "query-machines",
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
@@ -3694,12 +3510,12 @@
"cpu-max": 255
}
],
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
@@ -3789,36 +3605,36 @@
"name": "qemu64"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
"return": [
"tpm-tis"
],
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-42"
+ "id": "libvirt-38"
}
{
"return": [
"passthrough"
],
- "id": "libvirt-42"
+ "id": "libvirt-38"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-43"
+ "id": "libvirt-39"
}
{
@@ -4863,12 +4679,12 @@
"option": "drive"
}
],
- "id": "libvirt-43"
+ "id": "libvirt-39"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-44"
+ "id": "libvirt-40"
}
{
@@ -4902,12 +4718,12 @@
"capability": "x-postcopy-ram"
}
],
- "id": "libvirt-44"
+ "id": "libvirt-40"
}
{
"execute": "query-qmp-schema",
- "id": "libvirt-45"
+ "id": "libvirt-41"
}
{
@@ -12452,7 +12268,7 @@
"meta-type": "array"
}
],
- "id": "libvirt-45"
+ "id": "libvirt-41"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
index d9c352ca17..698ea77af6 100644
--- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
@@ -156,7 +156,7 @@
2005000
0
- 221107
+ 218187
x86_64
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies
index 41a2be3a2f..2bf4b91e47 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies
@@ -2833,44 +2833,12 @@
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "pci-assign"
- },
- "id": "libvirt-14"
-}
-
-{
- "id": "libvirt-14",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'pci-assign' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "kvm-pci-assign"
- },
- "id": "libvirt-15"
-}
-
-{
- "id": "libvirt-15",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'kvm-pci-assign' not found"
- }
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-16"
+ "id": "libvirt-14"
}
{
@@ -2958,7 +2926,7 @@
"type": "bool"
}
],
- "id": "libvirt-16"
+ "id": "libvirt-14"
}
{
@@ -2966,7 +2934,7 @@
"arguments": {
"typename": "scsi-disk"
},
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -3061,7 +3029,7 @@
"type": "uint64"
}
],
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -3069,7 +3037,7 @@
"arguments": {
"typename": "ide-drive"
},
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -3126,7 +3094,7 @@
"type": "uint16"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -3134,135 +3102,27 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
- "id": "libvirt-19",
+ "id": "libvirt-17",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'PIIX4_PM' not found"
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-20"
-}
-
-{
- "return": [
- {
- "name": "isobufs",
- "type": "uint32"
- },
- {
- "name": "hostaddr",
- "type": "uint32"
- },
- {
- "name": "msos-desc",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "productid",
- "type": "uint32"
- },
- {
- "name": "serial",
- "type": "str"
- },
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "isobsize",
- "type": "uint32"
- },
- {
- "name": "port",
- "type": "str"
- },
- {
- "name": "vendorid",
- "type": "uint32"
- },
- {
- "name": "pipeline",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "hostport",
- "type": "str"
- },
- {
- "name": "full-path",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "loglevel",
- "type": "uint32"
- },
- {
- "name": "hostbus",
- "type": "uint32"
- }
- ],
- "id": "libvirt-20"
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "scsi-generic"
- },
- "id": "libvirt-21"
-}
-
-{
- "return": [
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "drive",
- "description": "ID of a drive to use as a backend",
- "type": "str"
- },
- {
- "name": "lun",
- "type": "uint32"
- },
- {
- "name": "channel",
- "type": "uint32"
- },
- {
- "name": "scsi-id",
- "type": "uint32"
- }
- ],
- "id": "libvirt-21"
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "i440FX-pcihost"
},
- "id": "libvirt-22"
+ "id": "libvirt-18"
}
{
- "id": "libvirt-22",
+ "id": "libvirt-18",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'i440FX-pcihost' not found"
@@ -3274,11 +3134,11 @@
"arguments": {
"typename": "q35-pcihost"
},
- "id": "libvirt-23"
+ "id": "libvirt-19"
}
{
- "id": "libvirt-23",
+ "id": "libvirt-19",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'q35-pcihost' not found"
@@ -3290,7 +3150,7 @@
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
@@ -3350,7 +3210,7 @@
"type": "uint16"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
@@ -3358,11 +3218,11 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
- "id": "libvirt-25",
+ "id": "libvirt-21",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pit' not found"
@@ -3374,7 +3234,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -3421,7 +3281,7 @@
"type": "int32"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -3429,7 +3289,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -3525,7 +3385,7 @@
"type": "uint32"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -3533,7 +3393,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
@@ -3563,7 +3423,7 @@
"type": "uint32"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
@@ -3571,11 +3431,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
- "id": "libvirt-29",
+ "id": "libvirt-25",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
@@ -3587,7 +3447,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -3687,7 +3547,7 @@
"type": "bool"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -3695,11 +3555,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
- "id": "libvirt-31",
+ "id": "libvirt-27",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -3711,7 +3571,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -3750,7 +3610,7 @@
"type": "bool"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -3758,7 +3618,7 @@
"arguments": {
"typename": "nec-usb-xhci"
},
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
@@ -3828,12 +3688,12 @@
"type": "uint32"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
"execute": "query-machines",
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
@@ -4008,12 +3868,12 @@
"cpu-max": 1
}
],
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
@@ -4112,34 +3972,34 @@
"name": "pxa270"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
"return": [
],
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
"return": [
],
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
@@ -5111,12 +4971,12 @@
"option": "drive"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
@@ -5150,12 +5010,12 @@
"capability": "postcopy-ram"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
"execute": "query-qmp-schema",
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
@@ -13160,12 +13020,12 @@
"meta-type": "array"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
"execute": "query-gic-capabilities",
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
@@ -13181,7 +13041,7 @@
"kernel": true
}
],
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
index 283a290799..4ca53ff85d 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
@@ -140,7 +140,7 @@
2006000
0
- 231952
+ 229858
aarch64
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies
index 4a35fee5ed..99af9c8a46 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies
@@ -2983,44 +2983,12 @@
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "pci-assign"
- },
- "id": "libvirt-14"
-}
-
-{
- "id": "libvirt-14",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'pci-assign' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "kvm-pci-assign"
- },
- "id": "libvirt-15"
-}
-
-{
- "id": "libvirt-15",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'kvm-pci-assign' not found"
- }
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-16"
+ "id": "libvirt-14"
}
{
@@ -3108,7 +3076,7 @@
"type": "bool"
}
],
- "id": "libvirt-16"
+ "id": "libvirt-14"
}
{
@@ -3116,7 +3084,7 @@
"arguments": {
"typename": "scsi-disk"
},
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -3211,7 +3179,7 @@
"type": "uint64"
}
],
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -3219,7 +3187,7 @@
"arguments": {
"typename": "ide-drive"
},
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -3276,7 +3244,7 @@
"type": "uint16"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -3284,135 +3252,27 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
- "id": "libvirt-19",
+ "id": "libvirt-17",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'PIIX4_PM' not found"
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-20"
-}
-
-{
- "return": [
- {
- "name": "isobufs",
- "type": "uint32"
- },
- {
- "name": "hostaddr",
- "type": "uint32"
- },
- {
- "name": "msos-desc",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "productid",
- "type": "uint32"
- },
- {
- "name": "serial",
- "type": "str"
- },
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "isobsize",
- "type": "uint32"
- },
- {
- "name": "port",
- "type": "str"
- },
- {
- "name": "vendorid",
- "type": "uint32"
- },
- {
- "name": "pipeline",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "hostport",
- "type": "str"
- },
- {
- "name": "full-path",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "loglevel",
- "type": "uint32"
- },
- {
- "name": "hostbus",
- "type": "uint32"
- }
- ],
- "id": "libvirt-20"
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "scsi-generic"
- },
- "id": "libvirt-21"
-}
-
-{
- "return": [
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "drive",
- "description": "ID of a drive to use as a backend",
- "type": "str"
- },
- {
- "name": "lun",
- "type": "uint32"
- },
- {
- "name": "channel",
- "type": "uint32"
- },
- {
- "name": "scsi-id",
- "type": "uint32"
- }
- ],
- "id": "libvirt-21"
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "i440FX-pcihost"
},
- "id": "libvirt-22"
+ "id": "libvirt-18"
}
{
- "id": "libvirt-22",
+ "id": "libvirt-18",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'i440FX-pcihost' not found"
@@ -3424,11 +3284,11 @@
"arguments": {
"typename": "q35-pcihost"
},
- "id": "libvirt-23"
+ "id": "libvirt-19"
}
{
- "id": "libvirt-23",
+ "id": "libvirt-19",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'q35-pcihost' not found"
@@ -3440,7 +3300,7 @@
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
@@ -3500,7 +3360,7 @@
"type": "uint16"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
@@ -3508,11 +3368,11 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
- "id": "libvirt-25",
+ "id": "libvirt-21",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pit' not found"
@@ -3524,7 +3384,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -3571,7 +3431,7 @@
"type": "int32"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -3579,7 +3439,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -3675,7 +3535,7 @@
"type": "uint32"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -3683,7 +3543,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
@@ -3713,7 +3573,7 @@
"type": "uint32"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
@@ -3721,11 +3581,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
- "id": "libvirt-29",
+ "id": "libvirt-25",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
@@ -3737,7 +3597,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -3837,7 +3697,7 @@
"type": "bool"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -3845,11 +3705,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
- "id": "libvirt-31",
+ "id": "libvirt-27",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -3861,7 +3721,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -3900,7 +3760,7 @@
"type": "bool"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -3908,7 +3768,7 @@
"arguments": {
"typename": "nec-usb-xhci"
},
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
@@ -3978,7 +3838,7 @@
"type": "uint32"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
@@ -3986,7 +3846,7 @@
"arguments": {
"typename": "spapr-pci-host-bridge"
},
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
@@ -4032,12 +3892,12 @@
"type": "uint32"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
"execute": "query-machines",
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
@@ -4109,12 +3969,12 @@
"cpu-max": 255
}
],
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
@@ -5416,34 +5276,34 @@
"name": "MPC8541E_v11"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
"return": [
],
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
"return": [
],
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
@@ -6410,12 +6270,12 @@
"option": "drive"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
@@ -6449,12 +6309,12 @@
"capability": "postcopy-ram"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
"execute": "query-qmp-schema",
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
@@ -14459,7 +14319,7 @@
"meta-type": "array"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
index c78fa35834..f2c1e2c5b8 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
@@ -135,7 +135,7 @@
2006000
0
- 266778
+ 264684
ppc64
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies
index 382feee693..428903d17d 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies
@@ -2152,88 +2152,12 @@
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "pci-assign"
- },
- "id": "libvirt-14"
-}
-
-{
- "id": "libvirt-14",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'pci-assign' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "kvm-pci-assign"
- },
- "id": "libvirt-15"
-}
-
-{
- "return": [
- {
- "name": "share_intx",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "rombar",
- "type": "uint32"
- },
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "multifunction",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "host",
- "description": "Address (bus/device/function) of the host device, example: 04:10.0",
- "type": "str"
- },
- {
- "name": "romfile",
- "type": "str"
- },
- {
- "name": "configfd",
- "type": "str"
- },
- {
- "name": "command_serr_enable",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "addr",
- "description": "Slot and optional function number, example: 06.0 or 06",
- "type": "int32"
- },
- {
- "name": "prefer_msi",
- "description": "on/off",
- "type": "bool"
- }
- ],
- "id": "libvirt-15"
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-16"
+ "id": "libvirt-14"
}
{
@@ -2321,7 +2245,7 @@
"type": "bool"
}
],
- "id": "libvirt-16"
+ "id": "libvirt-14"
}
{
@@ -2329,7 +2253,7 @@
"arguments": {
"typename": "scsi-disk"
},
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -2424,7 +2348,7 @@
"type": "uint64"
}
],
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -2432,7 +2356,7 @@
"arguments": {
"typename": "ide-drive"
},
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -2489,7 +2413,7 @@
"type": "uint16"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -2497,7 +2421,7 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
@@ -2550,7 +2474,7 @@
"type": "int32"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
@@ -2558,7 +2482,7 @@
"arguments": {
"typename": "usb-redir"
},
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
@@ -2599,115 +2523,7 @@
"type": "bool"
}
],
- "id": "libvirt-20"
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-21"
-}
-
-{
- "return": [
- {
- "name": "isobufs",
- "type": "uint32"
- },
- {
- "name": "hostaddr",
- "type": "uint32"
- },
- {
- "name": "msos-desc",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "productid",
- "type": "uint32"
- },
- {
- "name": "serial",
- "type": "str"
- },
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "isobsize",
- "type": "uint32"
- },
- {
- "name": "port",
- "type": "str"
- },
- {
- "name": "vendorid",
- "type": "uint32"
- },
- {
- "name": "pipeline",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "hostport",
- "type": "str"
- },
- {
- "name": "full-path",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "loglevel",
- "type": "uint32"
- },
- {
- "name": "hostbus",
- "type": "uint32"
- }
- ],
- "id": "libvirt-21"
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "scsi-generic"
- },
- "id": "libvirt-22"
-}
-
-{
- "return": [
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "drive",
- "description": "ID of a drive to use as a backend",
- "type": "str"
- },
- {
- "name": "lun",
- "type": "uint32"
- },
- {
- "name": "channel",
- "type": "uint32"
- },
- {
- "name": "scsi-id",
- "type": "uint32"
- }
- ],
- "id": "libvirt-22"
+ "id": "libvirt-18"
}
{
@@ -2715,7 +2531,7 @@
"arguments": {
"typename": "i440FX-pcihost"
},
- "id": "libvirt-23"
+ "id": "libvirt-19"
}
{
@@ -2753,7 +2569,7 @@
"type": "child"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-19"
}
{
@@ -2761,7 +2577,7 @@
"arguments": {
"typename": "q35-pcihost"
},
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
@@ -2815,7 +2631,7 @@
"type": "child"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
@@ -2823,7 +2639,7 @@
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
@@ -2883,7 +2699,7 @@
"type": "uint16"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
@@ -2891,7 +2707,7 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -2905,7 +2721,7 @@
"type": "LostTickPolicy"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -2913,7 +2729,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -2960,7 +2776,7 @@
"type": "int32"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -2968,7 +2784,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
@@ -3001,7 +2817,7 @@
"type": "int32"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
@@ -3009,7 +2825,7 @@
"arguments": {
"typename": "qxl"
},
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
@@ -3086,7 +2902,7 @@
"type": "uint32"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
@@ -3094,7 +2910,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -3200,7 +3016,7 @@
"type": "uint32"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -3208,7 +3024,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
@@ -3248,7 +3064,7 @@
"type": "bool"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
@@ -3256,7 +3072,7 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -3333,7 +3149,7 @@
"type": "uint32"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -3341,7 +3157,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
@@ -3441,7 +3257,7 @@
"type": "bool"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
@@ -3449,11 +3265,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
- "id": "libvirt-34",
+ "id": "libvirt-30",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -3465,7 +3281,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
@@ -3504,7 +3320,7 @@
"type": "bool"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
@@ -3512,7 +3328,7 @@
"arguments": {
"typename": "nec-usb-xhci"
},
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
@@ -3582,7 +3398,7 @@
"type": "uint32"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
@@ -3590,7 +3406,7 @@
"arguments": {
"typename": "intel-iommu"
},
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
@@ -3600,7 +3416,7 @@
"type": "uint32"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
@@ -3608,7 +3424,7 @@
"arguments": {
"typename": "mch"
},
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
@@ -3634,12 +3450,12 @@
"type": "pci-devfn"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
"execute": "query-machines",
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
@@ -3752,12 +3568,12 @@
"cpu-max": 255
}
],
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
@@ -3847,36 +3663,36 @@
"name": "qemu64"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
"return": [
"tpm-tis"
],
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-42"
+ "id": "libvirt-38"
}
{
"return": [
"passthrough"
],
- "id": "libvirt-42"
+ "id": "libvirt-38"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-43"
+ "id": "libvirt-39"
}
{
@@ -4970,12 +4786,12 @@
"option": "drive"
}
],
- "id": "libvirt-43"
+ "id": "libvirt-39"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-44"
+ "id": "libvirt-40"
}
{
@@ -5009,12 +4825,12 @@
"capability": "postcopy-ram"
}
],
- "id": "libvirt-44"
+ "id": "libvirt-40"
}
{
"execute": "query-qmp-schema",
- "id": "libvirt-45"
+ "id": "libvirt-41"
}
{
@@ -13019,7 +12835,7 @@
"meta-type": "array"
}
],
- "id": "libvirt-45"
+ "id": "libvirt-41"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
index 9af99e6244..6ff4e10169 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
@@ -168,7 +168,7 @@
2006000
0
- 231911
+ 228991
x86_64
diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies
index 977c591455..38d1fa6e52 100644
--- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies
@@ -1966,44 +1966,12 @@
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "pci-assign"
- },
- "id": "libvirt-15"
-}
-
-{
- "id": "libvirt-15",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'pci-assign' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "kvm-pci-assign"
- },
- "id": "libvirt-16"
-}
-
-{
- "id": "libvirt-16",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'kvm-pci-assign' not found"
- }
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -2105,7 +2073,7 @@
"type": "bool"
}
],
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -2113,7 +2081,7 @@
"arguments": {
"typename": "scsi-disk"
},
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -2223,7 +2191,7 @@
"type": "uint64"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -2231,11 +2199,11 @@
"arguments": {
"typename": "ide-drive"
},
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
- "id": "libvirt-19",
+ "id": "libvirt-17",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ide-drive' not found"
@@ -2247,78 +2215,27 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
- "id": "libvirt-20",
+ "id": "libvirt-18",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'PIIX4_PM' not found"
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-21"
-}
-
-{
- "id": "libvirt-21",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'usb-host' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "scsi-generic"
- },
- "id": "libvirt-22"
-}
-
-{
- "return": [
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "drive",
- "description": "Node name or ID of a block device to use as a backend",
- "type": "str"
- },
- {
- "name": "lun",
- "type": "uint32"
- },
- {
- "name": "channel",
- "type": "uint32"
- },
- {
- "name": "scsi-id",
- "type": "uint32"
- }
- ],
- "id": "libvirt-22"
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "i440FX-pcihost"
},
- "id": "libvirt-23"
+ "id": "libvirt-19"
}
{
- "id": "libvirt-23",
+ "id": "libvirt-19",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'i440FX-pcihost' not found"
@@ -2330,11 +2247,11 @@
"arguments": {
"typename": "q35-pcihost"
},
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
- "id": "libvirt-24",
+ "id": "libvirt-20",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'q35-pcihost' not found"
@@ -2346,11 +2263,11 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
- "id": "libvirt-25",
+ "id": "libvirt-21",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pit' not found"
@@ -2362,7 +2279,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -2462,7 +2379,7 @@
"type": "uint32"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -2470,7 +2387,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -2500,7 +2417,7 @@
"type": "uint32"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -2508,11 +2425,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
- "id": "libvirt-28",
+ "id": "libvirt-24",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
@@ -2524,7 +2441,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
@@ -2628,7 +2545,7 @@
"type": "bool"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
@@ -2636,7 +2553,7 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -2693,7 +2610,7 @@
"type": "uint32"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -2701,7 +2618,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
@@ -2740,7 +2657,7 @@
"type": "bool"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
@@ -2748,7 +2665,7 @@
"arguments": {
"typename": "virtual-css-bridge"
},
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -2758,12 +2675,12 @@
"type": "bool"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
"execute": "query-machines",
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
@@ -2796,12 +2713,12 @@
"cpu-max": 248
}
],
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
@@ -2810,34 +2727,34 @@
"name": "host"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
"return": [
],
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
"return": [
],
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
@@ -3773,12 +3690,12 @@
"option": "drive"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
@@ -3812,12 +3729,12 @@
"capability": "postcopy-ram"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
"execute": "query-qmp-schema",
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
@@ -12173,7 +12090,7 @@
"meta-type": "object"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
index ad60b5b6d2..bb8849f55c 100644
--- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
@@ -105,7 +105,7 @@
2007000
0
- 220386
+ 219140
s390x
diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies
index aae2b3f4de..c764174320 100644
--- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies
@@ -2207,93 +2207,12 @@
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "pci-assign"
- },
- "id": "libvirt-14"
-}
-
-{
- "id": "libvirt-14",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'pci-assign' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "kvm-pci-assign"
- },
- "id": "libvirt-15"
-}
-
-{
- "return": [
- {
- "name": "share_intx",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "rombar",
- "type": "uint32"
- },
- {
- "name": "x-pcie-lnksta-dllla",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "multifunction",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "host",
- "description": "Address (bus/device/function) of the host device, example: 04:10.0",
- "type": "str"
- },
- {
- "name": "romfile",
- "type": "str"
- },
- {
- "name": "configfd",
- "type": "str"
- },
- {
- "name": "command_serr_enable",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "addr",
- "description": "Slot and optional function number, example: 06.0 or 06",
- "type": "int32"
- },
- {
- "name": "prefer_msi",
- "description": "on/off",
- "type": "bool"
- }
- ],
- "id": "libvirt-15"
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-16"
+ "id": "libvirt-14"
}
{
@@ -2395,7 +2314,7 @@
"type": "bool"
}
],
- "id": "libvirt-16"
+ "id": "libvirt-14"
}
{
@@ -2403,7 +2322,7 @@
"arguments": {
"typename": "scsi-disk"
},
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -2513,7 +2432,7 @@
"type": "uint64"
}
],
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -2521,7 +2440,7 @@
"arguments": {
"typename": "ide-drive"
},
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -2593,7 +2512,7 @@
"type": "uint16"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -2601,7 +2520,7 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
@@ -2659,7 +2578,7 @@
"type": "int32"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
@@ -2667,7 +2586,7 @@
"arguments": {
"typename": "usb-redir"
},
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
@@ -2716,119 +2635,7 @@
"type": "bool"
}
],
- "id": "libvirt-20"
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-21"
-}
-
-{
- "return": [
- {
- "name": "isobufs",
- "type": "uint32"
- },
- {
- "name": "hostaddr",
- "type": "uint32"
- },
- {
- "name": "msos-desc",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "productid",
- "type": "uint32"
- },
- {
- "name": "serial",
- "type": "str"
- },
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "isobsize",
- "type": "uint32"
- },
- {
- "name": "port",
- "type": "str"
- },
- {
- "name": "vendorid",
- "type": "uint32"
- },
- {
- "name": "pipeline",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "attached",
- "type": "bool"
- },
- {
- "name": "hostport",
- "type": "str"
- },
- {
- "name": "full-path",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "loglevel",
- "type": "uint32"
- },
- {
- "name": "hostbus",
- "type": "uint32"
- }
- ],
- "id": "libvirt-21"
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "scsi-generic"
- },
- "id": "libvirt-22"
-}
-
-{
- "return": [
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "drive",
- "description": "Node name or ID of a block device to use as a backend",
- "type": "str"
- },
- {
- "name": "lun",
- "type": "uint32"
- },
- {
- "name": "channel",
- "type": "uint32"
- },
- {
- "name": "scsi-id",
- "type": "uint32"
- }
- ],
- "id": "libvirt-22"
+ "id": "libvirt-18"
}
{
@@ -2836,7 +2643,7 @@
"arguments": {
"typename": "i440FX-pcihost"
},
- "id": "libvirt-23"
+ "id": "libvirt-19"
}
{
@@ -2874,7 +2681,7 @@
"type": "child"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-19"
}
{
@@ -2882,7 +2689,7 @@
"arguments": {
"typename": "q35-pcihost"
},
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
@@ -2960,7 +2767,7 @@
"type": "int"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
@@ -2968,7 +2775,7 @@
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
@@ -3037,7 +2844,7 @@
"type": "uint16"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
@@ -3045,7 +2852,7 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -3059,7 +2866,7 @@
"type": "LostTickPolicy"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -3067,7 +2874,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -3119,7 +2926,7 @@
"type": "int32"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -3127,7 +2934,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
@@ -3165,7 +2972,7 @@
"type": "int32"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
@@ -3173,7 +2980,7 @@
"arguments": {
"typename": "qxl"
},
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
@@ -3255,7 +3062,7 @@
"type": "uint32"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
@@ -3263,7 +3070,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -3373,7 +3180,7 @@
"type": "uint32"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -3381,7 +3188,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
@@ -3421,7 +3228,7 @@
"type": "bool"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
@@ -3429,7 +3236,7 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -3515,7 +3322,7 @@
"type": "uint32"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -3523,7 +3330,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
@@ -3627,7 +3434,7 @@
"type": "bool"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
@@ -3635,11 +3442,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
- "id": "libvirt-34",
+ "id": "libvirt-30",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -3651,7 +3458,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
@@ -3690,7 +3497,7 @@
"type": "bool"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
@@ -3698,7 +3505,7 @@
"arguments": {
"typename": "nec-usb-xhci"
},
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
@@ -3773,7 +3580,7 @@
"type": "uint32"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
@@ -3781,7 +3588,7 @@
"arguments": {
"typename": "intel-iommu"
},
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
@@ -3795,7 +3602,7 @@
"type": "bool"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
@@ -3803,7 +3610,7 @@
"arguments": {
"typename": "mch"
},
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
@@ -3829,12 +3636,12 @@
"type": "pci-devfn"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
"execute": "query-machines",
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
@@ -3983,12 +3790,12 @@
"cpu-max": 255
}
],
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
@@ -4081,36 +3888,36 @@
"name": "qemu64"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
"return": [
"tpm-tis"
],
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-42"
+ "id": "libvirt-38"
}
{
"return": [
"passthrough"
],
- "id": "libvirt-42"
+ "id": "libvirt-38"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-43"
+ "id": "libvirt-39"
}
{
@@ -5208,12 +5015,12 @@
"option": "drive"
}
],
- "id": "libvirt-43"
+ "id": "libvirt-39"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-44"
+ "id": "libvirt-40"
}
{
@@ -5247,12 +5054,12 @@
"capability": "postcopy-ram"
}
],
- "id": "libvirt-44"
+ "id": "libvirt-40"
}
{
"execute": "query-qmp-schema",
- "id": "libvirt-45"
+ "id": "libvirt-41"
}
{
@@ -13608,7 +13415,7 @@
"meta-type": "object"
}
],
- "id": "libvirt-45"
+ "id": "libvirt-41"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
index 164639c6e7..40b07a58f0 100644
--- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
@@ -173,7 +173,7 @@
2007000
0
- 243599
+ 240497
(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 6eae79342e..1836b6bfc9 100644
--- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies
@@ -2229,44 +2229,12 @@
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "pci-assign"
- },
- "id": "libvirt-15"
-}
-
-{
- "id": "libvirt-15",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'pci-assign' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "kvm-pci-assign"
- },
- "id": "libvirt-16"
-}
-
-{
- "id": "libvirt-16",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'kvm-pci-assign' not found"
- }
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -2368,7 +2336,7 @@
"type": "bool"
}
],
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -2376,7 +2344,7 @@
"arguments": {
"typename": "scsi-disk"
},
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -2486,7 +2454,7 @@
"type": "uint64"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -2494,11 +2462,11 @@
"arguments": {
"typename": "ide-drive"
},
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
- "id": "libvirt-19",
+ "id": "libvirt-17",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ide-drive' not found"
@@ -2510,78 +2478,27 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
- "id": "libvirt-20",
+ "id": "libvirt-18",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'PIIX4_PM' not found"
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-21"
-}
-
-{
- "id": "libvirt-21",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'usb-host' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "scsi-generic"
- },
- "id": "libvirt-22"
-}
-
-{
- "return": [
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "drive",
- "description": "Node name or ID of a block device to use as a backend",
- "type": "str"
- },
- {
- "name": "lun",
- "type": "uint32"
- },
- {
- "name": "channel",
- "type": "uint32"
- },
- {
- "name": "scsi-id",
- "type": "uint32"
- }
- ],
- "id": "libvirt-22"
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "i440FX-pcihost"
},
- "id": "libvirt-23"
+ "id": "libvirt-19"
}
{
- "id": "libvirt-23",
+ "id": "libvirt-19",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'i440FX-pcihost' not found"
@@ -2593,11 +2510,11 @@
"arguments": {
"typename": "q35-pcihost"
},
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
- "id": "libvirt-24",
+ "id": "libvirt-20",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'q35-pcihost' not found"
@@ -2609,11 +2526,11 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
- "id": "libvirt-25",
+ "id": "libvirt-21",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pit' not found"
@@ -2625,7 +2542,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -2730,7 +2647,7 @@
"type": "uint32"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -2738,7 +2655,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -2768,7 +2685,7 @@
"type": "uint32"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -2776,11 +2693,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
- "id": "libvirt-28",
+ "id": "libvirt-24",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
@@ -2792,7 +2709,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
@@ -2901,7 +2818,7 @@
"type": "bool"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
@@ -2909,7 +2826,7 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -2966,7 +2883,7 @@
"type": "uint32"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -2974,7 +2891,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
@@ -3013,7 +2930,7 @@
"type": "bool"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
@@ -3021,7 +2938,7 @@
"arguments": {
"typename": "virtual-css-bridge"
},
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -3031,12 +2948,12 @@
"type": "bool"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
"execute": "query-machines",
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
@@ -3074,12 +2991,12 @@
"alias": "s390-ccw-virtio"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
@@ -3405,34 +3322,34 @@
"migration-safe": true
}
],
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
"return": [
],
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
"return": [
],
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
@@ -4393,12 +4310,12 @@
"option": "drive"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
@@ -4436,12 +4353,12 @@
"capability": "x-colo"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
"execute": "query-qmp-schema",
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
@@ -13211,7 +13128,7 @@
"meta-type": "object"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
@@ -13222,7 +13139,7 @@
"name": "host"
}
},
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
@@ -13248,7 +13165,7 @@
}
}
},
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
@@ -13262,11 +13179,11 @@
}
}
},
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
- "id": "libvirt-41",
+ "id": "libvirt-37",
"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 5cd2cd8552..5c655caff3 100644
--- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
@@ -108,7 +108,7 @@
2007093
0
- 245800
+ 244554
s390x
diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies
index dcfa7ea056..33db454cb4 100644
--- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies
@@ -2322,93 +2322,12 @@
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "pci-assign"
- },
- "id": "libvirt-14"
-}
-
-{
- "id": "libvirt-14",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'pci-assign' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "kvm-pci-assign"
- },
- "id": "libvirt-15"
-}
-
-{
- "return": [
- {
- "name": "share_intx",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "rombar",
- "type": "uint32"
- },
- {
- "name": "x-pcie-lnksta-dllla",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "multifunction",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "host",
- "description": "Address (bus/device/function) of the host device, example: 04:10.0",
- "type": "str"
- },
- {
- "name": "romfile",
- "type": "str"
- },
- {
- "name": "configfd",
- "type": "str"
- },
- {
- "name": "command_serr_enable",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "addr",
- "description": "Slot and optional function number, example: 06.0 or 06",
- "type": "int32"
- },
- {
- "name": "prefer_msi",
- "description": "on/off",
- "type": "bool"
- }
- ],
- "id": "libvirt-15"
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-16"
+ "id": "libvirt-14"
}
{
@@ -2510,7 +2429,7 @@
"type": "bool"
}
],
- "id": "libvirt-16"
+ "id": "libvirt-14"
}
{
@@ -2518,7 +2437,7 @@
"arguments": {
"typename": "scsi-disk"
},
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -2628,7 +2547,7 @@
"type": "uint64"
}
],
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -2636,7 +2555,7 @@
"arguments": {
"typename": "ide-drive"
},
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -2708,7 +2627,7 @@
"type": "uint16"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -2716,7 +2635,7 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
@@ -2774,7 +2693,7 @@
"type": "int32"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
@@ -2782,7 +2701,7 @@
"arguments": {
"typename": "usb-redir"
},
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
@@ -2831,119 +2750,7 @@
"type": "bool"
}
],
- "id": "libvirt-20"
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-21"
-}
-
-{
- "return": [
- {
- "name": "isobufs",
- "type": "uint32"
- },
- {
- "name": "hostaddr",
- "type": "uint32"
- },
- {
- "name": "msos-desc",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "productid",
- "type": "uint32"
- },
- {
- "name": "serial",
- "type": "str"
- },
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "isobsize",
- "type": "uint32"
- },
- {
- "name": "port",
- "type": "str"
- },
- {
- "name": "vendorid",
- "type": "uint32"
- },
- {
- "name": "pipeline",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "attached",
- "type": "bool"
- },
- {
- "name": "hostport",
- "type": "str"
- },
- {
- "name": "full-path",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "loglevel",
- "type": "uint32"
- },
- {
- "name": "hostbus",
- "type": "uint32"
- }
- ],
- "id": "libvirt-21"
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "scsi-generic"
- },
- "id": "libvirt-22"
-}
-
-{
- "return": [
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "drive",
- "description": "Node name or ID of a block device to use as a backend",
- "type": "str"
- },
- {
- "name": "lun",
- "type": "uint32"
- },
- {
- "name": "channel",
- "type": "uint32"
- },
- {
- "name": "scsi-id",
- "type": "uint32"
- }
- ],
- "id": "libvirt-22"
+ "id": "libvirt-18"
}
{
@@ -2951,7 +2758,7 @@
"arguments": {
"typename": "i440FX-pcihost"
},
- "id": "libvirt-23"
+ "id": "libvirt-19"
}
{
@@ -2989,7 +2796,7 @@
"type": "child"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-19"
}
{
@@ -2997,7 +2804,7 @@
"arguments": {
"typename": "q35-pcihost"
},
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
@@ -3075,7 +2882,7 @@
"type": "int"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
@@ -3083,7 +2890,7 @@
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
@@ -3152,7 +2959,7 @@
"type": "uint16"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
@@ -3160,7 +2967,7 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -3174,7 +2981,7 @@
"type": "LostTickPolicy"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -3182,7 +2989,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -3234,7 +3041,7 @@
"type": "int32"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -3242,7 +3049,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
@@ -3280,7 +3087,7 @@
"type": "int32"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
@@ -3288,7 +3095,7 @@
"arguments": {
"typename": "qxl"
},
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
@@ -3370,7 +3177,7 @@
"type": "uint32"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
@@ -3378,7 +3185,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -3497,7 +3304,7 @@
"type": "uint32"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -3505,7 +3312,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
@@ -3545,7 +3352,7 @@
"type": "bool"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
@@ -3553,7 +3360,7 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -3639,7 +3446,7 @@
"type": "uint32"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -3647,7 +3454,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
@@ -3760,7 +3567,7 @@
"type": "guest statistics"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
@@ -3768,11 +3575,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
- "id": "libvirt-34",
+ "id": "libvirt-30",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -3784,7 +3591,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
@@ -3823,7 +3630,7 @@
"type": "bool"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
@@ -3831,7 +3638,7 @@
"arguments": {
"typename": "nec-usb-xhci"
},
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
@@ -3906,7 +3713,7 @@
"type": "uint32"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
@@ -3914,7 +3721,7 @@
"arguments": {
"typename": "intel-iommu"
},
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
@@ -3937,7 +3744,7 @@
"type": "uint32"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
@@ -3945,7 +3752,7 @@
"arguments": {
"typename": "mch"
},
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
@@ -3971,12 +3778,12 @@
"type": "pci-devfn"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
"execute": "query-machines",
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
@@ -4145,12 +3952,12 @@
"cpu-max": 255
}
],
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
@@ -4356,36 +4163,36 @@
"static": false
}
],
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
"return": [
"tpm-tis"
],
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-42"
+ "id": "libvirt-38"
}
{
"return": [
"passthrough"
],
- "id": "libvirt-42"
+ "id": "libvirt-38"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-43"
+ "id": "libvirt-39"
}
{
@@ -5508,12 +5315,12 @@
"option": "drive"
}
],
- "id": "libvirt-43"
+ "id": "libvirt-39"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-44"
+ "id": "libvirt-40"
}
{
@@ -5551,12 +5358,12 @@
"capability": "x-colo"
}
],
- "id": "libvirt-44"
+ "id": "libvirt-40"
}
{
"execute": "query-qmp-schema",
- "id": "libvirt-45"
+ "id": "libvirt-41"
}
{
@@ -14326,7 +14133,7 @@
"meta-type": "object"
}
],
- "id": "libvirt-45"
+ "id": "libvirt-41"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
index f11af45f57..f316ab7fbd 100644
--- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
@@ -176,7 +176,7 @@
2008000
0
- 260254
+ 257152
(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 f98ed20a6b..c92663e299 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies
@@ -3308,44 +3308,12 @@
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "pci-assign"
- },
- "id": "libvirt-14"
-}
-
-{
- "id": "libvirt-14",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'pci-assign' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "kvm-pci-assign"
- },
- "id": "libvirt-15"
-}
-
-{
- "id": "libvirt-15",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'kvm-pci-assign' not found"
- }
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-16"
+ "id": "libvirt-14"
}
{
@@ -3452,7 +3420,7 @@
"type": "bool"
}
],
- "id": "libvirt-16"
+ "id": "libvirt-14"
}
{
@@ -3460,7 +3428,7 @@
"arguments": {
"typename": "scsi-disk"
},
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -3574,7 +3542,7 @@
"type": "uint64"
}
],
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -3582,7 +3550,7 @@
"arguments": {
"typename": "ide-drive"
},
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -3658,7 +3626,7 @@
"type": "uint16"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -3666,78 +3634,27 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
- "id": "libvirt-19",
+ "id": "libvirt-17",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'PIIX4_PM' not found"
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-20"
-}
-
-{
- "id": "libvirt-20",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'usb-host' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "scsi-generic"
- },
- "id": "libvirt-21"
-}
-
-{
- "return": [
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "drive",
- "description": "Node name or ID of a block device to use as a backend",
- "type": "str"
- },
- {
- "name": "lun",
- "type": "uint32"
- },
- {
- "name": "channel",
- "type": "uint32"
- },
- {
- "name": "scsi-id",
- "type": "uint32"
- }
- ],
- "id": "libvirt-21"
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "i440FX-pcihost"
},
- "id": "libvirt-22"
+ "id": "libvirt-18"
}
{
- "id": "libvirt-22",
+ "id": "libvirt-18",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'i440FX-pcihost' not found"
@@ -3749,11 +3666,11 @@
"arguments": {
"typename": "q35-pcihost"
},
- "id": "libvirt-23"
+ "id": "libvirt-19"
}
{
- "id": "libvirt-23",
+ "id": "libvirt-19",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'q35-pcihost' not found"
@@ -3765,7 +3682,7 @@
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
@@ -3838,7 +3755,7 @@
"type": "uint16"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
@@ -3846,11 +3763,11 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
- "id": "libvirt-25",
+ "id": "libvirt-21",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pit' not found"
@@ -3862,7 +3779,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -3919,7 +3836,7 @@
"type": "int32"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -3927,7 +3844,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -4070,7 +3987,7 @@
"type": "str"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -4078,7 +3995,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
@@ -4117,7 +4034,7 @@
"type": "size"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
@@ -4125,11 +4042,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
- "id": "libvirt-29",
+ "id": "libvirt-25",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
@@ -4141,7 +4058,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -4284,7 +4201,7 @@
"type": "str"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -4292,11 +4209,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
- "id": "libvirt-31",
+ "id": "libvirt-27",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -4308,7 +4225,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -4352,7 +4269,7 @@
"type": "bool"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -4360,7 +4277,7 @@
"arguments": {
"typename": "nec-usb-xhci"
},
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
@@ -4440,7 +4357,7 @@
"type": "uint32"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
@@ -4448,7 +4365,7 @@
"arguments": {
"typename": "spapr-pci-host-bridge"
},
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
@@ -4534,12 +4451,12 @@
"type": "uint32"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
"execute": "query-machines",
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
@@ -4652,12 +4569,12 @@
"cpu-max": 1
}
],
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
@@ -6833,34 +6750,34 @@
"static": false
}
],
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
"return": [
],
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
"return": [
],
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
@@ -7970,12 +7887,12 @@
"option": "drive"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
@@ -8017,12 +7934,12 @@
"capability": "release-ram"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
"execute": "query-qmp-schema",
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
@@ -17308,7 +17225,7 @@
"meta-type": "object"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
index 6089f96f72..af7a11504b 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
@@ -147,7 +147,7 @@
2009000
0
- 350302
+ 349056
(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 d3b60da4bf..891cd0180b 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies
@@ -2410,44 +2410,12 @@
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "pci-assign"
- },
- "id": "libvirt-15"
-}
-
-{
- "id": "libvirt-15",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'pci-assign' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "kvm-pci-assign"
- },
- "id": "libvirt-16"
-}
-
-{
- "id": "libvirt-16",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'kvm-pci-assign' not found"
- }
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -2554,7 +2522,7 @@
"type": "bool"
}
],
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -2562,7 +2530,7 @@
"arguments": {
"typename": "scsi-disk"
},
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -2676,7 +2644,7 @@
"type": "uint64"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -2684,11 +2652,11 @@
"arguments": {
"typename": "ide-drive"
},
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
- "id": "libvirt-19",
+ "id": "libvirt-17",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ide-drive' not found"
@@ -2700,78 +2668,27 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
- "id": "libvirt-20",
+ "id": "libvirt-18",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'PIIX4_PM' not found"
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-21"
-}
-
-{
- "id": "libvirt-21",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'usb-host' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "scsi-generic"
- },
- "id": "libvirt-22"
-}
-
-{
- "return": [
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "drive",
- "description": "Node name or ID of a block device to use as a backend",
- "type": "str"
- },
- {
- "name": "lun",
- "type": "uint32"
- },
- {
- "name": "channel",
- "type": "uint32"
- },
- {
- "name": "scsi-id",
- "type": "uint32"
- }
- ],
- "id": "libvirt-22"
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "i440FX-pcihost"
},
- "id": "libvirt-23"
+ "id": "libvirt-19"
}
{
- "id": "libvirt-23",
+ "id": "libvirt-19",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'i440FX-pcihost' not found"
@@ -2783,11 +2700,11 @@
"arguments": {
"typename": "q35-pcihost"
},
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
- "id": "libvirt-24",
+ "id": "libvirt-20",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'q35-pcihost' not found"
@@ -2799,11 +2716,11 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
- "id": "libvirt-25",
+ "id": "libvirt-21",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pit' not found"
@@ -2815,7 +2732,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -2958,7 +2875,7 @@
"type": "str"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -2966,7 +2883,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -3005,7 +2922,7 @@
"type": "size"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -3013,11 +2930,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
- "id": "libvirt-28",
+ "id": "libvirt-24",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
@@ -3029,7 +2946,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
@@ -3172,7 +3089,7 @@
"type": "str"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
@@ -3180,7 +3097,7 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -3242,7 +3159,7 @@
"type": "uint32"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -3250,7 +3167,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
@@ -3294,7 +3211,7 @@
"type": "bool"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
@@ -3302,7 +3219,7 @@
"arguments": {
"typename": "virtual-css-bridge"
},
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -3312,12 +3229,12 @@
"type": "bool"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
"execute": "query-machines",
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
@@ -3360,12 +3277,12 @@
"cpu-max": 248
}
],
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
@@ -3755,34 +3672,34 @@
"migration-safe": true
}
],
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
"return": [
],
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
"return": [
],
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
@@ -4857,12 +4774,12 @@
"option": "drive"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
@@ -4904,12 +4821,12 @@
"capability": "release-ram"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
"execute": "query-qmp-schema",
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
@@ -14195,7 +14112,7 @@
"meta-type": "object"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
@@ -14206,7 +14123,7 @@
"name": "host"
}
},
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
@@ -14233,7 +14150,7 @@
}
}
},
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
@@ -14247,11 +14164,11 @@
}
}
},
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
- "id": "libvirt-41",
+ "id": "libvirt-37",
"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 a5a8d2d551..1e44c1952c 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
@@ -112,7 +112,7 @@
2009000
0
- 269219
+ 267973
s390x
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies
index c3edcc187d..1057028505 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies
@@ -2498,98 +2498,12 @@
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "pci-assign"
- },
- "id": "libvirt-14"
-}
-
-{
- "id": "libvirt-14",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'pci-assign' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "kvm-pci-assign"
- },
- "id": "libvirt-15"
-}
-
-{
- "return": [
- {
- "name": "share_intx",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "rombar",
- "type": "uint32"
- },
- {
- "name": "x-pcie-lnksta-dllla",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "multifunction",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "host",
- "description": "Address (bus/device/function) of the host device, example: 04:10.0",
- "type": "str"
- },
- {
- "name": "romfile",
- "type": "str"
- },
- {
- "name": "configfd",
- "type": "str"
- },
- {
- "name": "x-pcie-extcap-init",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "command_serr_enable",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "addr",
- "description": "Slot and optional function number, example: 06.0 or 06",
- "type": "int32"
- },
- {
- "name": "prefer_msi",
- "description": "on/off",
- "type": "bool"
- }
- ],
- "id": "libvirt-15"
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-16"
+ "id": "libvirt-14"
}
{
@@ -2696,7 +2610,7 @@
"type": "bool"
}
],
- "id": "libvirt-16"
+ "id": "libvirt-14"
}
{
@@ -2704,7 +2618,7 @@
"arguments": {
"typename": "scsi-disk"
},
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -2818,7 +2732,7 @@
"type": "uint64"
}
],
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -2826,7 +2740,7 @@
"arguments": {
"typename": "ide-drive"
},
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -2902,7 +2816,7 @@
"type": "uint16"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -2910,7 +2824,7 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
@@ -2973,7 +2887,7 @@
"type": "int32"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
@@ -2981,7 +2895,7 @@
"arguments": {
"typename": "usb-redir"
},
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
@@ -3030,119 +2944,7 @@
"type": "bool"
}
],
- "id": "libvirt-20"
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-21"
-}
-
-{
- "return": [
- {
- "name": "isobufs",
- "type": "uint32"
- },
- {
- "name": "hostaddr",
- "type": "uint32"
- },
- {
- "name": "msos-desc",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "productid",
- "type": "uint32"
- },
- {
- "name": "serial",
- "type": "str"
- },
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "isobsize",
- "type": "uint32"
- },
- {
- "name": "port",
- "type": "str"
- },
- {
- "name": "vendorid",
- "type": "uint32"
- },
- {
- "name": "pipeline",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "attached",
- "type": "bool"
- },
- {
- "name": "hostport",
- "type": "str"
- },
- {
- "name": "full-path",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "loglevel",
- "type": "uint32"
- },
- {
- "name": "hostbus",
- "type": "uint32"
- }
- ],
- "id": "libvirt-21"
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "scsi-generic"
- },
- "id": "libvirt-22"
-}
-
-{
- "return": [
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "drive",
- "description": "Node name or ID of a block device to use as a backend",
- "type": "str"
- },
- {
- "name": "lun",
- "type": "uint32"
- },
- {
- "name": "channel",
- "type": "uint32"
- },
- {
- "name": "scsi-id",
- "type": "uint32"
- }
- ],
- "id": "libvirt-22"
+ "id": "libvirt-18"
}
{
@@ -3150,7 +2952,7 @@
"arguments": {
"typename": "i440FX-pcihost"
},
- "id": "libvirt-23"
+ "id": "libvirt-19"
}
{
@@ -3188,7 +2990,7 @@
"type": "child"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-19"
}
{
@@ -3196,7 +2998,7 @@
"arguments": {
"typename": "q35-pcihost"
},
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
@@ -3274,7 +3076,7 @@
"type": "int"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
@@ -3282,7 +3084,7 @@
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
@@ -3355,7 +3157,7 @@
"type": "uint16"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
@@ -3363,7 +3165,7 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -3377,7 +3179,7 @@
"type": "LostTickPolicy"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -3385,7 +3187,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -3442,7 +3244,7 @@
"type": "int32"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -3450,7 +3252,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
@@ -3493,7 +3295,7 @@
"type": "int32"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
@@ -3501,7 +3303,7 @@
"arguments": {
"typename": "qxl"
},
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
@@ -3588,7 +3390,7 @@
"type": "uint32"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
@@ -3596,7 +3398,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -3749,7 +3551,7 @@
"type": "str"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -3757,7 +3559,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
@@ -3806,7 +3608,7 @@
"type": "size"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
@@ -3814,7 +3616,7 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -3910,7 +3712,7 @@
"type": "uint32"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -3918,7 +3720,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
@@ -4061,7 +3863,7 @@
"type": "str"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
@@ -4069,11 +3871,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
- "id": "libvirt-34",
+ "id": "libvirt-30",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -4085,7 +3887,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
@@ -4129,7 +3931,7 @@
"type": "bool"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
@@ -4137,7 +3939,7 @@
"arguments": {
"typename": "nec-usb-xhci"
},
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
@@ -4217,7 +4019,7 @@
"type": "uint32"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
@@ -4225,7 +4027,7 @@
"arguments": {
"typename": "intel-iommu"
},
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
@@ -4256,7 +4058,7 @@
"type": "bool"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
@@ -4264,7 +4066,7 @@
"arguments": {
"typename": "mch"
},
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
@@ -4290,12 +4092,12 @@
"type": "pci-devfn"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
"execute": "query-machines",
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
@@ -4474,12 +4276,12 @@
"cpu-max": 255
}
],
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
@@ -4761,36 +4563,36 @@
"migration-safe": true
}
],
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
"return": [
"tpm-tis"
],
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-42"
+ "id": "libvirt-38"
}
{
"return": [
"passthrough"
],
- "id": "libvirt-42"
+ "id": "libvirt-38"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-43"
+ "id": "libvirt-39"
}
{
@@ -6039,12 +5841,12 @@
"option": "drive"
}
],
- "id": "libvirt-43"
+ "id": "libvirt-39"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-44"
+ "id": "libvirt-40"
}
{
@@ -6086,12 +5888,12 @@
"capability": "release-ram"
}
],
- "id": "libvirt-44"
+ "id": "libvirt-40"
}
{
"execute": "query-qmp-schema",
- "id": "libvirt-45"
+ "id": "libvirt-41"
}
{
@@ -15377,7 +15179,7 @@
"meta-type": "object"
}
],
- "id": "libvirt-45"
+ "id": "libvirt-41"
}
{
@@ -15388,7 +15190,7 @@
"name": "host"
}
},
- "id": "libvirt-46"
+ "id": "libvirt-42"
}
{
@@ -15567,7 +15369,7 @@
}
}
},
- "id": "libvirt-46"
+ "id": "libvirt-42"
}
{
@@ -15748,7 +15550,7 @@
}
}
},
- "id": "libvirt-47"
+ "id": "libvirt-43"
}
{
@@ -15989,7 +15791,7 @@
}
}
},
- "id": "libvirt-47"
+ "id": "libvirt-43"
}
{
@@ -16003,7 +15805,7 @@
}
}
},
- "id": "libvirt-48"
+ "id": "libvirt-44"
}
{
@@ -16182,7 +15984,7 @@
}
}
},
- "id": "libvirt-48"
+ "id": "libvirt-44"
}
{
@@ -16363,7 +16165,7 @@
}
}
},
- "id": "libvirt-49"
+ "id": "libvirt-45"
}
{
@@ -16604,7 +16406,7 @@
}
}
},
- "id": "libvirt-49"
+ "id": "libvirt-45"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
index b1bf8c57e2..96f21561bd 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
@@ -191,7 +191,7 @@
2009000
0
- 343578
+ 340375
(v2.9.0)
x86_64
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies
index 932c418f3f..eb57c77a90 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies
@@ -4315,44 +4315,12 @@
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "pci-assign"
- },
- "id": "libvirt-14"
-}
-
-{
- "id": "libvirt-14",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'pci-assign' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "kvm-pci-assign"
- },
- "id": "libvirt-15"
-}
-
-{
- "id": "libvirt-15",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'kvm-pci-assign' not found"
- }
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-16"
+ "id": "libvirt-14"
}
{
@@ -4486,7 +4454,7 @@
"type": "str"
}
],
- "id": "libvirt-16"
+ "id": "libvirt-14"
}
{
@@ -4494,7 +4462,7 @@
"arguments": {
"typename": "scsi-disk"
},
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -4612,7 +4580,7 @@
"type": "uint32"
}
],
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -4620,7 +4588,7 @@
"arguments": {
"typename": "ide-drive"
},
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -4696,7 +4664,7 @@
"type": "uint16"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -4704,143 +4672,27 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
- "id": "libvirt-19",
+ "id": "libvirt-17",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'PIIX4_PM' not found"
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-20"
-}
-
-{
- "return": [
- {
- "name": "isobufs",
- "type": "uint32"
- },
- {
- "name": "hostaddr",
- "type": "uint32"
- },
- {
- "name": "msos-desc",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "productid",
- "type": "uint32"
- },
- {
- "name": "serial",
- "type": "str"
- },
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "isobsize",
- "type": "uint32"
- },
- {
- "name": "port",
- "type": "str"
- },
- {
- "name": "vendorid",
- "type": "uint32"
- },
- {
- "name": "pipeline",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "attached",
- "type": "bool"
- },
- {
- "name": "hostport",
- "type": "str"
- },
- {
- "name": "full-path",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "loglevel",
- "type": "uint32"
- },
- {
- "name": "hostbus",
- "type": "uint32"
- }
- ],
- "id": "libvirt-20"
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "scsi-generic"
- },
- "id": "libvirt-21"
-}
-
-{
- "return": [
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "drive",
- "description": "Node name or ID of a block device to use as a backend",
- "type": "str"
- },
- {
- "name": "lun",
- "type": "uint32"
- },
- {
- "name": "share-rw",
- "type": "bool"
- },
- {
- "name": "channel",
- "type": "uint32"
- },
- {
- "name": "scsi-id",
- "type": "uint32"
- }
- ],
- "id": "libvirt-21"
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "i440FX-pcihost"
},
- "id": "libvirt-22"
+ "id": "libvirt-18"
}
{
- "id": "libvirt-22",
+ "id": "libvirt-18",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'i440FX-pcihost' not found"
@@ -4852,11 +4704,11 @@
"arguments": {
"typename": "q35-pcihost"
},
- "id": "libvirt-23"
+ "id": "libvirt-19"
}
{
- "id": "libvirt-23",
+ "id": "libvirt-19",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'q35-pcihost' not found"
@@ -4868,7 +4720,7 @@
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
@@ -4941,7 +4793,7 @@
"type": "uint16"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
@@ -4949,11 +4801,11 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
- "id": "libvirt-25",
+ "id": "libvirt-21",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pit' not found"
@@ -4965,7 +4817,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -5022,7 +4874,7 @@
"type": "int32"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -5030,7 +4882,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -5181,7 +5033,7 @@
"type": "str"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -5189,7 +5041,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
@@ -5236,7 +5088,7 @@
"type": "size"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
@@ -5244,11 +5096,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
- "id": "libvirt-29",
+ "id": "libvirt-25",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
@@ -5260,7 +5112,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -5403,7 +5255,7 @@
"type": "str"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -5411,11 +5263,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
- "id": "libvirt-31",
+ "id": "libvirt-27",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -5427,7 +5279,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -5471,7 +5323,7 @@
"type": "bool"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -5479,7 +5331,7 @@
"arguments": {
"typename": "nec-usb-xhci"
},
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
@@ -5559,7 +5411,7 @@
"type": "uint32"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
@@ -5567,7 +5419,7 @@
"arguments": {
"typename": "spapr-pci-host-bridge"
},
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
@@ -5625,7 +5477,7 @@
"type": "uint32"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
@@ -5633,7 +5485,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
@@ -5683,7 +5535,7 @@
"type": "string"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
@@ -5691,7 +5543,7 @@
"arguments": {
"typename": "spapr-machine"
},
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
@@ -5862,12 +5714,12 @@
"type": "bool"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
"execute": "query-machines",
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
@@ -6010,12 +5862,12 @@
"cpu-max": 1
}
],
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
@@ -8211,35 +8063,35 @@
"static": false
}
],
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
"return": [
],
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
"return": [
"emulator"
],
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
@@ -9369,12 +9221,12 @@
"option": "drive"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-42"
+ "id": "libvirt-38"
}
{
@@ -9444,12 +9296,12 @@
"capability": "late-block-activate"
}
],
- "id": "libvirt-42"
+ "id": "libvirt-38"
}
{
"execute": "query-qmp-schema",
- "id": "libvirt-43"
+ "id": "libvirt-39"
}
{
@@ -21608,7 +21460,7 @@
"meta-type": "object"
}
],
- "id": "libvirt-43"
+ "id": "libvirt-39"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
index 9a0281e3c6..7c674ffb9c 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
@@ -165,7 +165,7 @@
2012050
0
- 446365
+ 444131
v2.12.0-1689-g518d23a
ppc64
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies
index 97eeec3dbc..3e8d136a32 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies
@@ -1296,44 +1296,12 @@
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "pci-assign"
- },
- "id": "libvirt-14"
-}
-
-{
- "id": "libvirt-14",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'pci-assign' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "kvm-pci-assign"
- },
- "id": "libvirt-15"
-}
-
-{
- "id": "libvirt-15",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'kvm-pci-assign' not found"
- }
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "scsi-disk"
},
- "id": "libvirt-16"
+ "id": "libvirt-14"
}
{
@@ -1451,7 +1419,7 @@
"type": "uint32"
}
],
- "id": "libvirt-16"
+ "id": "libvirt-14"
}
{
@@ -1459,11 +1427,11 @@
"arguments": {
"typename": "ide-drive"
},
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
- "id": "libvirt-17",
+ "id": "libvirt-15",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ide-drive' not found"
@@ -1475,82 +1443,27 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
- "id": "libvirt-18",
+ "id": "libvirt-16",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'PIIX4_PM' not found"
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-19"
-}
-
-{
- "id": "libvirt-19",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'usb-host' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "scsi-generic"
- },
- "id": "libvirt-20"
-}
-
-{
- "return": [
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "drive",
- "description": "Node name or ID of a block device to use as a backend",
- "type": "str"
- },
- {
- "name": "lun",
- "type": "uint32"
- },
- {
- "name": "share-rw",
- "type": "bool"
- },
- {
- "name": "channel",
- "type": "uint32"
- },
- {
- "name": "scsi-id",
- "type": "uint32"
- }
- ],
- "id": "libvirt-20"
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "i440FX-pcihost"
},
- "id": "libvirt-21"
+ "id": "libvirt-17"
}
{
- "id": "libvirt-21",
+ "id": "libvirt-17",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'i440FX-pcihost' not found"
@@ -1562,11 +1475,11 @@
"arguments": {
"typename": "q35-pcihost"
},
- "id": "libvirt-22"
+ "id": "libvirt-18"
}
{
- "id": "libvirt-22",
+ "id": "libvirt-18",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'q35-pcihost' not found"
@@ -1578,11 +1491,11 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-23"
+ "id": "libvirt-19"
}
{
- "id": "libvirt-23",
+ "id": "libvirt-19",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pit' not found"
@@ -1594,11 +1507,11 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
- "id": "libvirt-24",
+ "id": "libvirt-20",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-gpu-pci' not found"
@@ -1610,7 +1523,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
@@ -1657,7 +1570,7 @@
"type": "size"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
@@ -1665,11 +1578,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
- "id": "libvirt-26",
+ "id": "libvirt-22",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
@@ -1681,11 +1594,11 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
- "id": "libvirt-27",
+ "id": "libvirt-23",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-pci' not found"
@@ -1697,11 +1610,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
- "id": "libvirt-28",
+ "id": "libvirt-24",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -1713,7 +1626,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
@@ -1757,7 +1670,7 @@
"type": "bool"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
@@ -1765,7 +1678,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -1815,7 +1728,7 @@
"type": "string"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -1823,11 +1736,11 @@
"arguments": {
"typename": "spapr-machine"
},
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
- "id": "libvirt-31",
+ "id": "libvirt-27",
"error": {
"class": "DeviceNotFound",
"desc": "Class 'spapr-machine' not found"
@@ -1836,7 +1749,7 @@
{
"execute": "query-machines",
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -1873,23 +1786,23 @@
"cpu-max": 1
}
],
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
"return": [
],
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
@@ -1897,12 +1810,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
@@ -3027,12 +2940,12 @@
"option": "drive"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
@@ -3102,12 +3015,12 @@
"capability": "late-block-activate"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
"execute": "query-qmp-schema",
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
@@ -14782,5 +14695,5 @@
"meta-type": "object"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies
index 23188fffb6..3631193566 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies
@@ -1296,44 +1296,12 @@
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "pci-assign"
- },
- "id": "libvirt-14"
-}
-
-{
- "id": "libvirt-14",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'pci-assign' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "kvm-pci-assign"
- },
- "id": "libvirt-15"
-}
-
-{
- "id": "libvirt-15",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'kvm-pci-assign' not found"
- }
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "scsi-disk"
},
- "id": "libvirt-16"
+ "id": "libvirt-14"
}
{
@@ -1451,7 +1419,7 @@
"type": "uint32"
}
],
- "id": "libvirt-16"
+ "id": "libvirt-14"
}
{
@@ -1459,11 +1427,11 @@
"arguments": {
"typename": "ide-drive"
},
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
- "id": "libvirt-17",
+ "id": "libvirt-15",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ide-drive' not found"
@@ -1475,82 +1443,27 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
- "id": "libvirt-18",
+ "id": "libvirt-16",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'PIIX4_PM' not found"
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-19"
-}
-
-{
- "id": "libvirt-19",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'usb-host' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "scsi-generic"
- },
- "id": "libvirt-20"
-}
-
-{
- "return": [
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "drive",
- "description": "Node name or ID of a block device to use as a backend",
- "type": "str"
- },
- {
- "name": "lun",
- "type": "uint32"
- },
- {
- "name": "share-rw",
- "type": "bool"
- },
- {
- "name": "channel",
- "type": "uint32"
- },
- {
- "name": "scsi-id",
- "type": "uint32"
- }
- ],
- "id": "libvirt-20"
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "i440FX-pcihost"
},
- "id": "libvirt-21"
+ "id": "libvirt-17"
}
{
- "id": "libvirt-21",
+ "id": "libvirt-17",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'i440FX-pcihost' not found"
@@ -1562,11 +1475,11 @@
"arguments": {
"typename": "q35-pcihost"
},
- "id": "libvirt-22"
+ "id": "libvirt-18"
}
{
- "id": "libvirt-22",
+ "id": "libvirt-18",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'q35-pcihost' not found"
@@ -1578,11 +1491,11 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-23"
+ "id": "libvirt-19"
}
{
- "id": "libvirt-23",
+ "id": "libvirt-19",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'kvm-pit' not found"
@@ -1594,11 +1507,11 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
- "id": "libvirt-24",
+ "id": "libvirt-20",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-gpu-pci' not found"
@@ -1610,7 +1523,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
@@ -1657,7 +1570,7 @@
"type": "size"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
@@ -1665,11 +1578,11 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
- "id": "libvirt-26",
+ "id": "libvirt-22",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'ICH9-LPC' not found"
@@ -1681,11 +1594,11 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
- "id": "libvirt-27",
+ "id": "libvirt-23",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-pci' not found"
@@ -1697,11 +1610,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
- "id": "libvirt-28",
+ "id": "libvirt-24",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -1713,7 +1626,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
@@ -1757,7 +1670,7 @@
"type": "bool"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
@@ -1765,7 +1678,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -1815,7 +1728,7 @@
"type": "string"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -1823,11 +1736,11 @@
"arguments": {
"typename": "spapr-machine"
},
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
- "id": "libvirt-31",
+ "id": "libvirt-27",
"error": {
"class": "DeviceNotFound",
"desc": "Class 'spapr-machine' not found"
@@ -1836,7 +1749,7 @@
{
"execute": "query-machines",
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -1873,23 +1786,23 @@
"cpu-max": 1
}
],
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
"return": [
],
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
@@ -1897,12 +1810,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
@@ -3027,12 +2940,12 @@
"option": "drive"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
@@ -3102,12 +3015,12 @@
"capability": "late-block-activate"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
"execute": "query-qmp-schema",
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
@@ -14782,5 +14695,5 @@
"meta-type": "object"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies
index fdab682f94..17edb990e1 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies
@@ -3160,44 +3160,12 @@
}
}
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "pci-assign"
- },
- "id": "libvirt-14"
-}
-
-{
- "id": "libvirt-14",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'pci-assign' not found"
- }
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "kvm-pci-assign"
- },
- "id": "libvirt-15"
-}
-
-{
- "id": "libvirt-15",
- "error": {
- "class": "DeviceNotFound",
- "desc": "Device 'kvm-pci-assign' not found"
- }
-}
-
{
"execute": "device-list-properties",
"arguments": {
"typename": "vfio-pci"
},
- "id": "libvirt-16"
+ "id": "libvirt-14"
}
{
@@ -3331,7 +3299,7 @@
"type": "str"
}
],
- "id": "libvirt-16"
+ "id": "libvirt-14"
}
{
@@ -3339,7 +3307,7 @@
"arguments": {
"typename": "scsi-disk"
},
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -3457,7 +3425,7 @@
"type": "uint32"
}
],
- "id": "libvirt-17"
+ "id": "libvirt-15"
}
{
@@ -3465,7 +3433,7 @@
"arguments": {
"typename": "ide-drive"
},
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -3541,7 +3509,7 @@
"type": "uint16"
}
],
- "id": "libvirt-18"
+ "id": "libvirt-16"
}
{
@@ -3549,7 +3517,7 @@
"arguments": {
"typename": "PIIX4_PM"
},
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
@@ -3612,7 +3580,7 @@
"type": "int32"
}
],
- "id": "libvirt-19"
+ "id": "libvirt-17"
}
{
@@ -3620,7 +3588,7 @@
"arguments": {
"typename": "usb-redir"
},
- "id": "libvirt-20"
+ "id": "libvirt-18"
}
{
@@ -3669,123 +3637,7 @@
"type": "bool"
}
],
- "id": "libvirt-20"
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "usb-host"
- },
- "id": "libvirt-21"
-}
-
-{
- "return": [
- {
- "name": "isobufs",
- "type": "uint32"
- },
- {
- "name": "hostaddr",
- "type": "uint32"
- },
- {
- "name": "msos-desc",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "productid",
- "type": "uint32"
- },
- {
- "name": "serial",
- "type": "str"
- },
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "isobsize",
- "type": "uint32"
- },
- {
- "name": "port",
- "type": "str"
- },
- {
- "name": "vendorid",
- "type": "uint32"
- },
- {
- "name": "pipeline",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "attached",
- "type": "bool"
- },
- {
- "name": "hostport",
- "type": "str"
- },
- {
- "name": "full-path",
- "description": "on/off",
- "type": "bool"
- },
- {
- "name": "loglevel",
- "type": "uint32"
- },
- {
- "name": "hostbus",
- "type": "uint32"
- }
- ],
- "id": "libvirt-21"
-}
-
-{
- "execute": "device-list-properties",
- "arguments": {
- "typename": "scsi-generic"
- },
- "id": "libvirt-22"
-}
-
-{
- "return": [
- {
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "drive",
- "description": "Node name or ID of a block device to use as a backend",
- "type": "str"
- },
- {
- "name": "lun",
- "type": "uint32"
- },
- {
- "name": "share-rw",
- "type": "bool"
- },
- {
- "name": "channel",
- "type": "uint32"
- },
- {
- "name": "scsi-id",
- "type": "uint32"
- }
- ],
- "id": "libvirt-22"
+ "id": "libvirt-18"
}
{
@@ -3793,7 +3645,7 @@
"arguments": {
"typename": "i440FX-pcihost"
},
- "id": "libvirt-23"
+ "id": "libvirt-19"
}
{
@@ -3835,7 +3687,7 @@
"type": "bool"
}
],
- "id": "libvirt-23"
+ "id": "libvirt-19"
}
{
@@ -3843,7 +3695,7 @@
"arguments": {
"typename": "q35-pcihost"
},
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
@@ -3925,7 +3777,7 @@
"type": "uint64"
}
],
- "id": "libvirt-24"
+ "id": "libvirt-20"
}
{
@@ -3933,7 +3785,7 @@
"arguments": {
"typename": "usb-storage"
},
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
@@ -4016,7 +3868,7 @@
"type": "uint16"
}
],
- "id": "libvirt-25"
+ "id": "libvirt-21"
}
{
@@ -4024,7 +3876,7 @@
"arguments": {
"typename": "kvm-pit"
},
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -4038,7 +3890,7 @@
"type": "LostTickPolicy"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-22"
}
{
@@ -4046,7 +3898,7 @@
"arguments": {
"typename": "VGA"
},
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -4107,7 +3959,7 @@
"type": "bool"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-23"
}
{
@@ -4115,7 +3967,7 @@
"arguments": {
"typename": "vmware-svga"
},
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
@@ -4162,7 +4014,7 @@
"type": "bool"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-24"
}
{
@@ -4170,7 +4022,7 @@
"arguments": {
"typename": "qxl"
},
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
@@ -4269,7 +4121,7 @@
"type": "uint32"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-25"
}
{
@@ -4277,7 +4129,7 @@
"arguments": {
"typename": "virtio-gpu-pci"
},
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -4438,7 +4290,7 @@
"type": "str"
}
],
- "id": "libvirt-30"
+ "id": "libvirt-26"
}
{
@@ -4446,7 +4298,7 @@
"arguments": {
"typename": "virtio-gpu-device"
},
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
@@ -4503,7 +4355,7 @@
"type": "size"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-27"
}
{
@@ -4511,7 +4363,7 @@
"arguments": {
"typename": "ICH9-LPC"
},
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -4607,7 +4459,7 @@
"type": "uint32"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-28"
}
{
@@ -4615,7 +4467,7 @@
"arguments": {
"typename": "virtio-balloon-pci"
},
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
@@ -4758,7 +4610,7 @@
"type": "str"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-29"
}
{
@@ -4766,11 +4618,11 @@
"arguments": {
"typename": "virtio-balloon-ccw"
},
- "id": "libvirt-34"
+ "id": "libvirt-30"
}
{
- "id": "libvirt-34",
+ "id": "libvirt-30",
"error": {
"class": "DeviceNotFound",
"desc": "Device 'virtio-balloon-ccw' not found"
@@ -4782,7 +4634,7 @@
"arguments": {
"typename": "virtio-balloon-device"
},
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
@@ -4826,7 +4678,7 @@
"type": "bool"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-31"
}
{
@@ -4834,7 +4686,7 @@
"arguments": {
"typename": "nec-usb-xhci"
},
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
@@ -4914,7 +4766,7 @@
"type": "uint32"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-32"
}
{
@@ -4922,7 +4774,7 @@
"arguments": {
"typename": "intel-iommu"
},
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
@@ -4961,7 +4813,7 @@
"type": "bool"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-33"
}
{
@@ -4969,7 +4821,7 @@
"arguments": {
"typename": "mch"
},
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
@@ -5012,7 +4864,7 @@
"type": "int32"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-34"
}
{
@@ -5020,7 +4872,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
@@ -5070,7 +4922,7 @@
"type": "string"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-35"
}
{
@@ -5078,11 +4930,11 @@
"arguments": {
"typename": "spapr-machine"
},
- "id": "libvirt-40"
+ "id": "libvirt-36"
}
{
- "id": "libvirt-40",
+ "id": "libvirt-36",
"error": {
"class": "DeviceNotFound",
"desc": "Class 'spapr-machine' not found"
@@ -5091,7 +4943,7 @@
{
"execute": "query-machines",
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
@@ -5300,12 +5152,12 @@
"cpu-max": 255
}
],
- "id": "libvirt-41"
+ "id": "libvirt-37"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-42"
+ "id": "libvirt-38"
}
{
@@ -5742,12 +5594,12 @@
"migration-safe": true
}
],
- "id": "libvirt-42"
+ "id": "libvirt-38"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-43"
+ "id": "libvirt-39"
}
{
@@ -5755,12 +5607,12 @@
"tpm-crb",
"tpm-tis"
],
- "id": "libvirt-43"
+ "id": "libvirt-39"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-44"
+ "id": "libvirt-40"
}
{
@@ -5768,12 +5620,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-44"
+ "id": "libvirt-40"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-45"
+ "id": "libvirt-41"
}
{
@@ -7072,12 +6924,12 @@
"option": "drive"
}
],
- "id": "libvirt-45"
+ "id": "libvirt-41"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-46"
+ "id": "libvirt-42"
}
{
@@ -7147,12 +6999,12 @@
"capability": "late-block-activate"
}
],
- "id": "libvirt-46"
+ "id": "libvirt-42"
}
{
"execute": "query-qmp-schema",
- "id": "libvirt-47"
+ "id": "libvirt-43"
}
{
@@ -19032,7 +18884,7 @@
"meta-type": "object"
}
],
- "id": "libvirt-47"
+ "id": "libvirt-43"
}
{
@@ -19043,7 +18895,7 @@
"name": "host"
}
},
- "id": "libvirt-48"
+ "id": "libvirt-44"
}
{
@@ -19236,7 +19088,7 @@
}
}
},
- "id": "libvirt-48"
+ "id": "libvirt-44"
}
{
@@ -19431,7 +19283,7 @@
}
}
},
- "id": "libvirt-49"
+ "id": "libvirt-45"
}
{
@@ -19694,7 +19546,7 @@
}
}
},
- "id": "libvirt-49"
+ "id": "libvirt-45"
}
{
@@ -19708,7 +19560,7 @@
}
}
},
- "id": "libvirt-50"
+ "id": "libvirt-46"
}
{
@@ -19901,7 +19753,7 @@
}
}
},
- "id": "libvirt-50"
+ "id": "libvirt-46"
}
{
@@ -20096,7 +19948,7 @@
}
}
},
- "id": "libvirt-51"
+ "id": "libvirt-47"
}
{
@@ -20359,16 +20211,16 @@
}
}
},
- "id": "libvirt-51"
+ "id": "libvirt-47"
}
{
"execute": "query-sev-capabilities",
- "id": "libvirt-52"
+ "id": "libvirt-48"
}
{
- "id": "libvirt-52",
+ "id": "libvirt-48",
"error": {
"class": "GenericError",
"desc": "SEV feature is not available"
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
index eeb0941f27..1a2d1b6a53 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
@@ -210,7 +210,7 @@
3000000
0
- 427391
+ 425157
v3.0.0
x86_64