[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [PATCH 5/5] FIXUP: renumber replies lines after deleting section



For simpler review.

Done via tests/qemucapsfixreplies.
---
 .../qemucapabilitiesdata/caps_1.5.3.x86_64.replies | 152 ++++++++--------
 .../qemucapabilitiesdata/caps_1.6.0.x86_64.replies | 152 ++++++++--------
 .../qemucapabilitiesdata/caps_1.7.0.x86_64.replies | 152 ++++++++--------
 .../qemucapabilitiesdata/caps_2.1.1.x86_64.replies | 152 ++++++++--------
 .../caps_2.10.0.aarch64.replies                    | 152 ++++++++--------
 .../qemucapabilitiesdata/caps_2.10.0.ppc64.replies | 152 ++++++++--------
 .../qemucapabilitiesdata/caps_2.10.0.s390x.replies | 152 ++++++++--------
 .../caps_2.10.0.x86_64.replies                     | 184 +++++++++----------
 .../qemucapabilitiesdata/caps_2.11.0.s390x.replies | 156 ++++++++--------
 .../caps_2.11.0.x86_64.replies                     | 184 +++++++++----------
 .../caps_2.12.0.aarch64.replies                    | 160 ++++++++---------
 .../qemucapabilitiesdata/caps_2.12.0.ppc64.replies | 160 ++++++++---------
 .../qemucapabilitiesdata/caps_2.12.0.s390x.replies | 164 ++++++++---------
 .../caps_2.12.0.x86_64.replies                     | 196 ++++++++++-----------
 .../qemucapabilitiesdata/caps_2.4.0.x86_64.replies | 164 ++++++++---------
 .../qemucapabilitiesdata/caps_2.5.0.x86_64.replies | 168 +++++++++---------
 .../caps_2.6.0.aarch64.replies                     | 152 ++++++++--------
 .../qemucapabilitiesdata/caps_2.6.0.ppc64.replies  | 152 ++++++++--------
 .../qemucapabilitiesdata/caps_2.6.0.x86_64.replies | 168 +++++++++---------
 .../qemucapabilitiesdata/caps_2.7.0.s390x.replies  | 144 +++++++--------
 .../qemucapabilitiesdata/caps_2.7.0.x86_64.replies | 168 +++++++++---------
 .../qemucapabilitiesdata/caps_2.8.0.s390x.replies  | 152 ++++++++--------
 .../qemucapabilitiesdata/caps_2.8.0.x86_64.replies | 168 +++++++++---------
 .../qemucapabilitiesdata/caps_2.9.0.ppc64.replies  | 152 ++++++++--------
 .../qemucapabilitiesdata/caps_2.9.0.s390x.replies  | 152 ++++++++--------
 .../qemucapabilitiesdata/caps_2.9.0.x86_64.replies | 184 +++++++++----------
 .../qemucapabilitiesdata/caps_3.0.0.ppc64.replies  | 160 ++++++++---------
 .../qemucapabilitiesdata/caps_3.0.0.x86_64.replies | 196 ++++++++++-----------
 28 files changed, 2274 insertions(+), 2274 deletions(-)

diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies
index 6468691609..600ca5a6f7 100644
--- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies
@@ -336,11 +336,11 @@
   "arguments": {
     "device": "bogus"
   },
-  "id": "libvirt-6"
+  "id": "libvirt-5"
 }

 {
-  "id": "libvirt-6",
+  "id": "libvirt-5",
   "error": {
     "class": "GenericError",
     "desc": "Parameter 'top' is missing"
@@ -349,7 +349,7 @@

 {
   "execute": "query-kvm",
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

 {
@@ -357,12 +357,12 @@
     "enabled": true,
     "present": true
   },
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

 {
   "execute": "query-events",
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

 {
@@ -446,12 +446,12 @@
       "name": "SHUTDOWN"
     }
   ],
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

 {
   "execute": "qom-list-types",
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

 {
@@ -1027,7 +1027,7 @@
       "name": "VGA"
     }
   ],
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

 {
@@ -1035,7 +1035,7 @@
   "arguments": {
     "typename": "virtio-blk-pci"
   },
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

 {
@@ -1137,7 +1137,7 @@
       "type": "hex32"
     }
   ],
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

 {
@@ -1145,7 +1145,7 @@
   "arguments": {
     "typename": "virtio-net-pci"
   },
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

 {
@@ -1291,7 +1291,7 @@
       "type": "on/off"
     }
   ],
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

 {
@@ -1299,7 +1299,7 @@
   "arguments": {
     "typename": "virtio-scsi-pci"
   },
-  "id": "libvirt-12"
+  "id": "libvirt-11"
 }

 {
@@ -1361,7 +1361,7 @@
       "type": "on/off"
     }
   ],
-  "id": "libvirt-12"
+  "id": "libvirt-11"
 }

 {
@@ -1369,11 +1369,11 @@
   "arguments": {
     "typename": "virtio-net-ccw"
   },
-  "id": "libvirt-13"
+  "id": "libvirt-12"
 }

 {
-  "id": "libvirt-13",
+  "id": "libvirt-12",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-net-ccw' not found"
@@ -1385,11 +1385,11 @@
   "arguments": {
     "typename": "virtio-scsi-ccw"
   },
-  "id": "libvirt-14"
+  "id": "libvirt-13"
 }

 {
-  "id": "libvirt-14",
+  "id": "libvirt-13",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-scsi-ccw' not found"
@@ -1401,11 +1401,11 @@
   "arguments": {
     "typename": "virtio-net-s390"
   },
-  "id": "libvirt-15"
+  "id": "libvirt-14"
 }

 {
-  "id": "libvirt-15",
+  "id": "libvirt-14",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-net-s390' not found"
@@ -1417,11 +1417,11 @@
   "arguments": {
     "typename": "pci-assign"
   },
-  "id": "libvirt-16"
+  "id": "libvirt-15"
 }

 {
-  "id": "libvirt-16",
+  "id": "libvirt-15",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'pci-assign' not found"
@@ -1433,7 +1433,7 @@
   "arguments": {
     "typename": "kvm-pci-assign"
   },
-  "id": "libvirt-17"
+  "id": "libvirt-16"
 }

 {
@@ -1479,7 +1479,7 @@
       "type": "pci-host-devaddr"
     }
   ],
-  "id": "libvirt-17"
+  "id": "libvirt-16"
 }

 {
@@ -1487,7 +1487,7 @@
   "arguments": {
     "typename": "vfio-pci"
   },
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

 {
@@ -1529,7 +1529,7 @@
       "type": "pci-host-devaddr"
     }
   ],
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

 {
@@ -1537,7 +1537,7 @@
   "arguments": {
     "typename": "scsi-disk"
   },
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -1611,7 +1611,7 @@
       "type": "drive"
     }
   ],
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -1619,7 +1619,7 @@
   "arguments": {
     "typename": "ide-drive"
   },
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
@@ -1673,7 +1673,7 @@
       "type": "drive"
     }
   ],
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
@@ -1681,7 +1681,7 @@
   "arguments": {
     "typename": "PIIX4_PM"
   },
-  "id": "libvirt-21"
+  "id": "libvirt-20"
 }

 {
@@ -1723,7 +1723,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-21"
+  "id": "libvirt-20"
 }

 {
@@ -1731,7 +1731,7 @@
   "arguments": {
     "typename": "usb-redir"
   },
-  "id": "libvirt-22"
+  "id": "libvirt-21"
 }

 {
@@ -1761,7 +1761,7 @@
       "type": "chr"
     }
   ],
-  "id": "libvirt-22"
+  "id": "libvirt-21"
 }

 {
@@ -1769,7 +1769,7 @@
   "arguments": {
     "typename": "usb-host"
   },
-  "id": "libvirt-23"
+  "id": "libvirt-22"
 }

 {
@@ -1823,7 +1823,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-23"
+  "id": "libvirt-22"
 }

 {
@@ -1831,7 +1831,7 @@
   "arguments": {
     "typename": "scsi-generic"
   },
-  "id": "libvirt-24"
+  "id": "libvirt-23"
 }

 {
@@ -1857,7 +1857,7 @@
       "type": "drive"
     }
   ],
-  "id": "libvirt-24"
+  "id": "libvirt-23"
 }

 {
@@ -1865,13 +1865,13 @@
   "arguments": {
     "typename": "i440FX-pcihost"
   },
-  "id": "libvirt-25"
+  "id": "libvirt-24"
 }

 {
   "return": [
   ],
-  "id": "libvirt-25"
+  "id": "libvirt-24"
 }

 {
@@ -1879,7 +1879,7 @@
   "arguments": {
     "typename": "q35-pcihost"
   },
-  "id": "libvirt-26"
+  "id": "libvirt-25"
 }

 {
@@ -1889,7 +1889,7 @@
       "type": "uint64"
     }
   ],
-  "id": "libvirt-26"
+  "id": "libvirt-25"
 }

 {
@@ -1897,7 +1897,7 @@
   "arguments": {
     "typename": "usb-storage"
   },
-  "id": "libvirt-27"
+  "id": "libvirt-26"
 }

 {
@@ -1947,7 +1947,7 @@
       "type": "drive"
     }
   ],
-  "id": "libvirt-27"
+  "id": "libvirt-26"
 }

 {
@@ -1955,7 +1955,7 @@
   "arguments": {
     "typename": "kvm-pit"
   },
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -1969,7 +1969,7 @@
       "type": "hex32"
     }
   ],
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -1977,7 +1977,7 @@
   "arguments": {
     "typename": "VGA"
   },
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
@@ -2011,7 +2011,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
@@ -2019,7 +2019,7 @@
   "arguments": {
     "typename": "vmware-svga"
   },
-  "id": "libvirt-30"
+  "id": "libvirt-29"
 }

 {
@@ -2049,7 +2049,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-30"
+  "id": "libvirt-29"
 }

 {
@@ -2057,7 +2057,7 @@
   "arguments": {
     "typename": "qxl"
   },
-  "id": "libvirt-31"
+  "id": "libvirt-30"
 }

 {
@@ -2127,7 +2127,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-31"
+  "id": "libvirt-30"
 }

 {
@@ -2135,11 +2135,11 @@
   "arguments": {
     "typename": "ICH9-LPC"
   },
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

 {
-  "id": "libvirt-32",
+  "id": "libvirt-31",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'ICH9-LPC' not found"
@@ -2151,7 +2151,7 @@
   "arguments": {
     "typename": "virtio-balloon-pci"
   },
-  "id": "libvirt-33"
+  "id": "libvirt-32"
 }

 {
@@ -2189,7 +2189,7 @@
       "type": "on/off"
     }
   ],
-  "id": "libvirt-33"
+  "id": "libvirt-32"
 }

 {
@@ -2197,11 +2197,11 @@
   "arguments": {
     "typename": "virtio-balloon-ccw"
   },
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

 {
-  "id": "libvirt-34",
+  "id": "libvirt-33",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-balloon-ccw' not found"
@@ -2213,13 +2213,13 @@
   "arguments": {
     "typename": "virtio-balloon-device"
   },
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
   "return": [
   ],
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
@@ -2227,7 +2227,7 @@
   "arguments": {
     "typename": "nec-usb-xhci"
   },
-  "id": "libvirt-36"
+  "id": "libvirt-35"
 }

 {
@@ -2277,7 +2277,7 @@
       "type": "on/off"
     }
   ],
-  "id": "libvirt-36"
+  "id": "libvirt-35"
 }

 {
@@ -2285,7 +2285,7 @@
   "arguments": {
     "typename": "mch"
   },
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
@@ -2311,12 +2311,12 @@
       "type": "pci-devfn"
     }
   ],
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
   "execute": "query-machines",
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
@@ -2389,12 +2389,12 @@
       "cpu-max": 1
     }
   ],
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
   "execute": "query-cpu-definitions",
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
@@ -2472,34 +2472,34 @@
       "name": "qemu64"
     }
   ],
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
   "execute": "query-tpm-models",
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
   "return": [
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
   "execute": "query-tpm-types",
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
   "return": [
   ],
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
   "execute": "query-command-line-options",
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }

 {
@@ -3200,12 +3200,12 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }

 {
   "execute": "query-migrate-capabilities",
-  "id": "libvirt-43"
+  "id": "libvirt-42"
 }

 {
@@ -3215,7 +3215,7 @@
       "capability": "xbzrle"
     }
   ],
-  "id": "libvirt-43"
+  "id": "libvirt-42"
 }

 {
diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies
index 028dd103fb..e74ae6b958 100644
--- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies
@@ -342,11 +342,11 @@
   "arguments": {
     "device": "bogus"
   },
-  "id": "libvirt-6"
+  "id": "libvirt-5"
 }

 {
-  "id": "libvirt-6",
+  "id": "libvirt-5",
   "error": {
     "class": "GenericError",
     "desc": "Parameter 'top' is missing"
@@ -355,7 +355,7 @@

 {
   "execute": "query-kvm",
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

 {
@@ -363,12 +363,12 @@
     "enabled": true,
     "present": true
   },
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

 {
   "execute": "query-events",
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

 {
@@ -455,12 +455,12 @@
       "name": "SHUTDOWN"
     }
   ],
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

 {
   "execute": "qom-list-types",
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

 {
@@ -1048,7 +1048,7 @@
       "name": "VGA"
     }
   ],
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

 {
@@ -1056,7 +1056,7 @@
   "arguments": {
     "typename": "virtio-blk-pci"
   },
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

 {
@@ -1158,7 +1158,7 @@
       "type": "hex32"
     }
   ],
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

 {
@@ -1166,7 +1166,7 @@
   "arguments": {
     "typename": "virtio-net-pci"
   },
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

 {
@@ -1320,7 +1320,7 @@
       "type": "on/off"
     }
   ],
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

 {
@@ -1328,7 +1328,7 @@
   "arguments": {
     "typename": "virtio-scsi-pci"
   },
-  "id": "libvirt-12"
+  "id": "libvirt-11"
 }

 {
@@ -1390,7 +1390,7 @@
       "type": "on/off"
     }
   ],
-  "id": "libvirt-12"
+  "id": "libvirt-11"
 }

 {
@@ -1398,11 +1398,11 @@
   "arguments": {
     "typename": "virtio-net-ccw"
   },
-  "id": "libvirt-13"
+  "id": "libvirt-12"
 }

 {
-  "id": "libvirt-13",
+  "id": "libvirt-12",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-net-ccw' not found"
@@ -1414,11 +1414,11 @@
   "arguments": {
     "typename": "virtio-scsi-ccw"
   },
-  "id": "libvirt-14"
+  "id": "libvirt-13"
 }

 {
-  "id": "libvirt-14",
+  "id": "libvirt-13",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-scsi-ccw' not found"
@@ -1430,11 +1430,11 @@
   "arguments": {
     "typename": "virtio-net-s390"
   },
-  "id": "libvirt-15"
+  "id": "libvirt-14"
 }

 {
-  "id": "libvirt-15",
+  "id": "libvirt-14",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-net-s390' not found"
@@ -1446,11 +1446,11 @@
   "arguments": {
     "typename": "pci-assign"
   },
-  "id": "libvirt-16"
+  "id": "libvirt-15"
 }

 {
-  "id": "libvirt-16",
+  "id": "libvirt-15",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'pci-assign' not found"
@@ -1462,7 +1462,7 @@
   "arguments": {
     "typename": "kvm-pci-assign"
   },
-  "id": "libvirt-17"
+  "id": "libvirt-16"
 }

 {
@@ -1508,7 +1508,7 @@
       "type": "pci-host-devaddr"
     }
   ],
-  "id": "libvirt-17"
+  "id": "libvirt-16"
 }

 {
@@ -1516,7 +1516,7 @@
   "arguments": {
     "typename": "vfio-pci"
   },
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

 {
@@ -1558,7 +1558,7 @@
       "type": "pci-host-devaddr"
     }
   ],
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

 {
@@ -1566,7 +1566,7 @@
   "arguments": {
     "typename": "scsi-disk"
   },
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -1640,7 +1640,7 @@
       "type": "drive"
     }
   ],
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -1648,7 +1648,7 @@
   "arguments": {
     "typename": "ide-drive"
   },
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
@@ -1702,7 +1702,7 @@
       "type": "drive"
     }
   ],
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
@@ -1710,7 +1710,7 @@
   "arguments": {
     "typename": "PIIX4_PM"
   },
-  "id": "libvirt-21"
+  "id": "libvirt-20"
 }

 {
@@ -1752,7 +1752,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-21"
+  "id": "libvirt-20"
 }

 {
@@ -1760,7 +1760,7 @@
   "arguments": {
     "typename": "usb-redir"
   },
-  "id": "libvirt-22"
+  "id": "libvirt-21"
 }

 {
@@ -1794,7 +1794,7 @@
       "type": "chr"
     }
   ],
-  "id": "libvirt-22"
+  "id": "libvirt-21"
 }

 {
@@ -1802,7 +1802,7 @@
   "arguments": {
     "typename": "usb-host"
   },
-  "id": "libvirt-23"
+  "id": "libvirt-22"
 }

 {
@@ -1860,7 +1860,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-23"
+  "id": "libvirt-22"
 }

 {
@@ -1868,7 +1868,7 @@
   "arguments": {
     "typename": "scsi-generic"
   },
-  "id": "libvirt-24"
+  "id": "libvirt-23"
 }

 {
@@ -1894,7 +1894,7 @@
       "type": "drive"
     }
   ],
-  "id": "libvirt-24"
+  "id": "libvirt-23"
 }

 {
@@ -1902,7 +1902,7 @@
   "arguments": {
     "typename": "i440FX-pcihost"
   },
-  "id": "libvirt-25"
+  "id": "libvirt-24"
 }

 {
@@ -1912,7 +1912,7 @@
       "type": "size"
     }
   ],
-  "id": "libvirt-25"
+  "id": "libvirt-24"
 }

 {
@@ -1920,7 +1920,7 @@
   "arguments": {
     "typename": "q35-pcihost"
   },
-  "id": "libvirt-26"
+  "id": "libvirt-25"
 }

 {
@@ -1934,7 +1934,7 @@
       "type": "uint64"
     }
   ],
-  "id": "libvirt-26"
+  "id": "libvirt-25"
 }

 {
@@ -1942,7 +1942,7 @@
   "arguments": {
     "typename": "usb-storage"
   },
-  "id": "libvirt-27"
+  "id": "libvirt-26"
 }

 {
@@ -1992,7 +1992,7 @@
       "type": "drive"
     }
   ],
-  "id": "libvirt-27"
+  "id": "libvirt-26"
 }

 {
@@ -2000,7 +2000,7 @@
   "arguments": {
     "typename": "kvm-pit"
   },
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -2014,7 +2014,7 @@
       "type": "hex32"
     }
   ],
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -2022,7 +2022,7 @@
   "arguments": {
     "typename": "VGA"
   },
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
@@ -2056,7 +2056,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
@@ -2064,7 +2064,7 @@
   "arguments": {
     "typename": "vmware-svga"
   },
-  "id": "libvirt-30"
+  "id": "libvirt-29"
 }

 {
@@ -2094,7 +2094,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-30"
+  "id": "libvirt-29"
 }

 {
@@ -2102,7 +2102,7 @@
   "arguments": {
     "typename": "qxl"
   },
-  "id": "libvirt-31"
+  "id": "libvirt-30"
 }

 {
@@ -2172,7 +2172,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-31"
+  "id": "libvirt-30"
 }

 {
@@ -2180,11 +2180,11 @@
   "arguments": {
     "typename": "ICH9-LPC"
   },
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

 {
-  "id": "libvirt-32",
+  "id": "libvirt-31",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'ICH9-LPC' not found"
@@ -2196,7 +2196,7 @@
   "arguments": {
     "typename": "virtio-balloon-pci"
   },
-  "id": "libvirt-33"
+  "id": "libvirt-32"
 }

 {
@@ -2234,7 +2234,7 @@
       "type": "on/off"
     }
   ],
-  "id": "libvirt-33"
+  "id": "libvirt-32"
 }

 {
@@ -2242,11 +2242,11 @@
   "arguments": {
     "typename": "virtio-balloon-ccw"
   },
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

 {
-  "id": "libvirt-34",
+  "id": "libvirt-33",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-balloon-ccw' not found"
@@ -2258,13 +2258,13 @@
   "arguments": {
     "typename": "virtio-balloon-device"
   },
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
   "return": [
   ],
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
@@ -2272,7 +2272,7 @@
   "arguments": {
     "typename": "nec-usb-xhci"
   },
-  "id": "libvirt-36"
+  "id": "libvirt-35"
 }

 {
@@ -2322,7 +2322,7 @@
       "type": "on/off"
     }
   ],
-  "id": "libvirt-36"
+  "id": "libvirt-35"
 }

 {
@@ -2330,7 +2330,7 @@
   "arguments": {
     "typename": "mch"
   },
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
@@ -2356,12 +2356,12 @@
       "type": "pci-devfn"
     }
   ],
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
   "execute": "query-machines",
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
@@ -2442,12 +2442,12 @@
       "cpu-max": 1
     }
   ],
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
   "execute": "query-cpu-definitions",
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
@@ -2525,34 +2525,34 @@
       "name": "qemu64"
     }
   ],
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
   "execute": "query-tpm-models",
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
   "return": [
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
   "execute": "query-tpm-types",
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
   "return": [
   ],
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
   "execute": "query-command-line-options",
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }

 {
@@ -3155,12 +3155,12 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }

 {
   "execute": "query-migrate-capabilities",
-  "id": "libvirt-43"
+  "id": "libvirt-42"
 }

 {
@@ -3182,7 +3182,7 @@
       "capability": "zero-blocks"
     }
   ],
-  "id": "libvirt-43"
+  "id": "libvirt-42"
 }

 {
diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies
index 1e99156710..a6c8e1e459 100644
--- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies
@@ -351,11 +351,11 @@
   "arguments": {
     "device": "bogus"
   },
-  "id": "libvirt-6"
+  "id": "libvirt-5"
 }

 {
-  "id": "libvirt-6",
+  "id": "libvirt-5",
   "error": {
     "class": "GenericError",
     "desc": "Parameter 'top' is missing"
@@ -364,7 +364,7 @@

 {
   "execute": "query-kvm",
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

 {
@@ -372,12 +372,12 @@
     "enabled": true,
     "present": true
   },
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

 {
   "execute": "query-events",
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

 {
@@ -467,12 +467,12 @@
       "name": "SHUTDOWN"
     }
   ],
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

 {
   "execute": "qom-list-types",
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

 {
@@ -1057,7 +1057,7 @@
       "name": "VGA"
     }
   ],
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

 {
@@ -1065,7 +1065,7 @@
   "arguments": {
     "typename": "virtio-blk-pci"
   },
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

 {
@@ -1167,7 +1167,7 @@
       "type": "hex32"
     }
   ],
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

 {
@@ -1175,7 +1175,7 @@
   "arguments": {
     "typename": "virtio-net-pci"
   },
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

 {
@@ -1329,7 +1329,7 @@
       "type": "on/off"
     }
   ],
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

 {
@@ -1337,7 +1337,7 @@
   "arguments": {
     "typename": "virtio-scsi-pci"
   },
-  "id": "libvirt-12"
+  "id": "libvirt-11"
 }

 {
@@ -1399,7 +1399,7 @@
       "type": "on/off"
     }
   ],
-  "id": "libvirt-12"
+  "id": "libvirt-11"
 }

 {
@@ -1407,11 +1407,11 @@
   "arguments": {
     "typename": "virtio-net-ccw"
   },
-  "id": "libvirt-13"
+  "id": "libvirt-12"
 }

 {
-  "id": "libvirt-13",
+  "id": "libvirt-12",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-net-ccw' not found"
@@ -1423,11 +1423,11 @@
   "arguments": {
     "typename": "virtio-scsi-ccw"
   },
-  "id": "libvirt-14"
+  "id": "libvirt-13"
 }

 {
-  "id": "libvirt-14",
+  "id": "libvirt-13",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-scsi-ccw' not found"
@@ -1439,11 +1439,11 @@
   "arguments": {
     "typename": "virtio-net-s390"
   },
-  "id": "libvirt-15"
+  "id": "libvirt-14"
 }

 {
-  "id": "libvirt-15",
+  "id": "libvirt-14",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-net-s390' not found"
@@ -1455,11 +1455,11 @@
   "arguments": {
     "typename": "pci-assign"
   },
-  "id": "libvirt-16"
+  "id": "libvirt-15"
 }

 {
-  "id": "libvirt-16",
+  "id": "libvirt-15",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'pci-assign' not found"
@@ -1471,7 +1471,7 @@
   "arguments": {
     "typename": "kvm-pci-assign"
   },
-  "id": "libvirt-17"
+  "id": "libvirt-16"
 }

 {
@@ -1517,7 +1517,7 @@
       "type": "pci-host-devaddr"
     }
   ],
-  "id": "libvirt-17"
+  "id": "libvirt-16"
 }

 {
@@ -1525,7 +1525,7 @@
   "arguments": {
     "typename": "vfio-pci"
   },
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

 {
@@ -1567,7 +1567,7 @@
       "type": "pci-host-devaddr"
     }
   ],
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

 {
@@ -1575,7 +1575,7 @@
   "arguments": {
     "typename": "scsi-disk"
   },
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -1649,7 +1649,7 @@
       "type": "drive"
     }
   ],
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -1657,7 +1657,7 @@
   "arguments": {
     "typename": "ide-drive"
   },
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
@@ -1711,7 +1711,7 @@
       "type": "drive"
     }
   ],
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
@@ -1719,7 +1719,7 @@
   "arguments": {
     "typename": "PIIX4_PM"
   },
-  "id": "libvirt-21"
+  "id": "libvirt-20"
 }

 {
@@ -1761,7 +1761,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-21"
+  "id": "libvirt-20"
 }

 {
@@ -1769,7 +1769,7 @@
   "arguments": {
     "typename": "usb-redir"
   },
-  "id": "libvirt-22"
+  "id": "libvirt-21"
 }

 {
@@ -1803,7 +1803,7 @@
       "type": "chr"
     }
   ],
-  "id": "libvirt-22"
+  "id": "libvirt-21"
 }

 {
@@ -1811,7 +1811,7 @@
   "arguments": {
     "typename": "usb-host"
   },
-  "id": "libvirt-23"
+  "id": "libvirt-22"
 }

 {
@@ -1869,7 +1869,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-23"
+  "id": "libvirt-22"
 }

 {
@@ -1877,7 +1877,7 @@
   "arguments": {
     "typename": "scsi-generic"
   },
-  "id": "libvirt-24"
+  "id": "libvirt-23"
 }

 {
@@ -1903,7 +1903,7 @@
       "type": "drive"
     }
   ],
-  "id": "libvirt-24"
+  "id": "libvirt-23"
 }

 {
@@ -1911,7 +1911,7 @@
   "arguments": {
     "typename": "i440FX-pcihost"
   },
-  "id": "libvirt-25"
+  "id": "libvirt-24"
 }

 {
@@ -1925,7 +1925,7 @@
       "type": "size"
     }
   ],
-  "id": "libvirt-25"
+  "id": "libvirt-24"
 }

 {
@@ -1933,7 +1933,7 @@
   "arguments": {
     "typename": "q35-pcihost"
   },
-  "id": "libvirt-26"
+  "id": "libvirt-25"
 }

 {
@@ -1951,7 +1951,7 @@
       "type": "uint64"
     }
   ],
-  "id": "libvirt-26"
+  "id": "libvirt-25"
 }

 {
@@ -1959,7 +1959,7 @@
   "arguments": {
     "typename": "usb-storage"
   },
-  "id": "libvirt-27"
+  "id": "libvirt-26"
 }

 {
@@ -2009,7 +2009,7 @@
       "type": "drive"
     }
   ],
-  "id": "libvirt-27"
+  "id": "libvirt-26"
 }

 {
@@ -2017,7 +2017,7 @@
   "arguments": {
     "typename": "kvm-pit"
   },
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -2031,7 +2031,7 @@
       "type": "hex32"
     }
   ],
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -2039,7 +2039,7 @@
   "arguments": {
     "typename": "VGA"
   },
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
@@ -2073,7 +2073,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
@@ -2081,7 +2081,7 @@
   "arguments": {
     "typename": "vmware-svga"
   },
-  "id": "libvirt-30"
+  "id": "libvirt-29"
 }

 {
@@ -2111,7 +2111,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-30"
+  "id": "libvirt-29"
 }

 {
@@ -2119,7 +2119,7 @@
   "arguments": {
     "typename": "qxl"
   },
-  "id": "libvirt-31"
+  "id": "libvirt-30"
 }

 {
@@ -2189,7 +2189,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-31"
+  "id": "libvirt-30"
 }

 {
@@ -2197,11 +2197,11 @@
   "arguments": {
     "typename": "ICH9-LPC"
   },
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

 {
-  "id": "libvirt-32",
+  "id": "libvirt-31",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'ICH9-LPC' not found"
@@ -2213,7 +2213,7 @@
   "arguments": {
     "typename": "virtio-balloon-pci"
   },
-  "id": "libvirt-33"
+  "id": "libvirt-32"
 }

 {
@@ -2251,7 +2251,7 @@
       "type": "on/off"
     }
   ],
-  "id": "libvirt-33"
+  "id": "libvirt-32"
 }

 {
@@ -2259,11 +2259,11 @@
   "arguments": {
     "typename": "virtio-balloon-ccw"
   },
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

 {
-  "id": "libvirt-34",
+  "id": "libvirt-33",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-balloon-ccw' not found"
@@ -2275,13 +2275,13 @@
   "arguments": {
     "typename": "virtio-balloon-device"
   },
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
   "return": [
   ],
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
@@ -2289,7 +2289,7 @@
   "arguments": {
     "typename": "nec-usb-xhci"
   },
-  "id": "libvirt-36"
+  "id": "libvirt-35"
 }

 {
@@ -2339,7 +2339,7 @@
       "type": "on/off"
     }
   ],
-  "id": "libvirt-36"
+  "id": "libvirt-35"
 }

 {
@@ -2347,7 +2347,7 @@
   "arguments": {
     "typename": "mch"
   },
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
@@ -2373,12 +2373,12 @@
       "type": "pci-devfn"
     }
   ],
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
   "execute": "query-machines",
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
@@ -2467,12 +2467,12 @@
       "cpu-max": 1
     }
   ],
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
   "execute": "query-cpu-definitions",
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
@@ -2550,34 +2550,34 @@
       "name": "qemu64"
     }
   ],
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
   "execute": "query-tpm-models",
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
   "return": [
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
   "execute": "query-tpm-types",
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
   "return": [
   ],
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
   "execute": "query-command-line-options",
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }

 {
@@ -3370,12 +3370,12 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }

 {
   "execute": "query-migrate-capabilities",
-  "id": "libvirt-43"
+  "id": "libvirt-42"
 }

 {
@@ -3397,7 +3397,7 @@
       "capability": "zero-blocks"
     }
   ],
-  "id": "libvirt-43"
+  "id": "libvirt-42"
 }

 {
diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies
index c0bfec0c3a..88152e56bd 100644
--- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies
@@ -384,11 +384,11 @@
   "arguments": {
     "device": "bogus"
   },
-  "id": "libvirt-6"
+  "id": "libvirt-5"
 }

 {
-  "id": "libvirt-6",
+  "id": "libvirt-5",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'bogus' not found"
@@ -397,7 +397,7 @@

 {
   "execute": "query-kvm",
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

 {
@@ -405,12 +405,12 @@
     "enabled": true,
     "present": true
   },
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

 {
   "execute": "query-events",
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

 {
@@ -512,12 +512,12 @@
       "name": "BLOCK_IMAGE_CORRUPTED"
     }
   ],
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

 {
   "execute": "qom-list-types",
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

 {
@@ -1300,7 +1300,7 @@
       "name": "fusbh200-ehci-usb"
     }
   ],
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

 {
@@ -1308,7 +1308,7 @@
   "arguments": {
     "typename": "virtio-blk-pci"
   },
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

 {
@@ -1418,7 +1418,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

 {
@@ -1426,7 +1426,7 @@
   "arguments": {
     "typename": "virtio-net-pci"
   },
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

 {
@@ -1588,7 +1588,7 @@
       "type": "on/off"
     }
   ],
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

 {
@@ -1596,7 +1596,7 @@
   "arguments": {
     "typename": "virtio-scsi-pci"
   },
-  "id": "libvirt-12"
+  "id": "libvirt-11"
 }

 {
@@ -1666,7 +1666,7 @@
       "type": "on/off"
     }
   ],
-  "id": "libvirt-12"
+  "id": "libvirt-11"
 }

 {
@@ -1674,11 +1674,11 @@
   "arguments": {
     "typename": "virtio-net-ccw"
   },
-  "id": "libvirt-13"
+  "id": "libvirt-12"
 }

 {
-  "id": "libvirt-13",
+  "id": "libvirt-12",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-net-ccw' not found"
@@ -1690,11 +1690,11 @@
   "arguments": {
     "typename": "virtio-scsi-ccw"
   },
-  "id": "libvirt-14"
+  "id": "libvirt-13"
 }

 {
-  "id": "libvirt-14",
+  "id": "libvirt-13",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-scsi-ccw' not found"
@@ -1706,11 +1706,11 @@
   "arguments": {
     "typename": "virtio-net-s390"
   },
-  "id": "libvirt-15"
+  "id": "libvirt-14"
 }

 {
-  "id": "libvirt-15",
+  "id": "libvirt-14",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-net-s390' not found"
@@ -1722,11 +1722,11 @@
   "arguments": {
     "typename": "pci-assign"
   },
-  "id": "libvirt-16"
+  "id": "libvirt-15"
 }

 {
-  "id": "libvirt-16",
+  "id": "libvirt-15",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'pci-assign' not found"
@@ -1738,7 +1738,7 @@
   "arguments": {
     "typename": "kvm-pci-assign"
   },
-  "id": "libvirt-17"
+  "id": "libvirt-16"
 }

 {
@@ -1784,7 +1784,7 @@
       "type": "pci-host-devaddr"
     }
   ],
-  "id": "libvirt-17"
+  "id": "libvirt-16"
 }

 {
@@ -1792,7 +1792,7 @@
   "arguments": {
     "typename": "vfio-pci"
   },
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

 {
@@ -1834,7 +1834,7 @@
       "type": "pci-host-devaddr"
     }
   ],
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

 {
@@ -1842,7 +1842,7 @@
   "arguments": {
     "typename": "scsi-disk"
   },
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -1928,7 +1928,7 @@
       "type": "drive"
     }
   ],
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -1936,7 +1936,7 @@
   "arguments": {
     "typename": "ide-drive"
   },
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
@@ -1990,7 +1990,7 @@
       "type": "drive"
     }
   ],
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
@@ -1998,7 +1998,7 @@
   "arguments": {
     "typename": "PIIX4_PM"
   },
-  "id": "libvirt-21"
+  "id": "libvirt-20"
 }

 {
@@ -2048,7 +2048,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-21"
+  "id": "libvirt-20"
 }

 {
@@ -2056,7 +2056,7 @@
   "arguments": {
     "typename": "usb-redir"
   },
-  "id": "libvirt-22"
+  "id": "libvirt-21"
 }

 {
@@ -2094,7 +2094,7 @@
       "type": "chr"
     }
   ],
-  "id": "libvirt-22"
+  "id": "libvirt-21"
 }

 {
@@ -2102,7 +2102,7 @@
   "arguments": {
     "typename": "usb-host"
   },
-  "id": "libvirt-23"
+  "id": "libvirt-22"
 }

 {
@@ -2164,7 +2164,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-23"
+  "id": "libvirt-22"
 }

 {
@@ -2172,7 +2172,7 @@
   "arguments": {
     "typename": "scsi-generic"
   },
-  "id": "libvirt-24"
+  "id": "libvirt-23"
 }

 {
@@ -2198,7 +2198,7 @@
       "type": "drive"
     }
   ],
-  "id": "libvirt-24"
+  "id": "libvirt-23"
 }

 {
@@ -2206,7 +2206,7 @@
   "arguments": {
     "typename": "i440FX-pcihost"
   },
-  "id": "libvirt-25"
+  "id": "libvirt-24"
 }

 {
@@ -2244,7 +2244,7 @@
       "type": "size"
     }
   ],
-  "id": "libvirt-25"
+  "id": "libvirt-24"
 }

 {
@@ -2252,7 +2252,7 @@
   "arguments": {
     "typename": "q35-pcihost"
   },
-  "id": "libvirt-26"
+  "id": "libvirt-25"
 }

 {
@@ -2302,7 +2302,7 @@
       "type": "uint64"
     }
   ],
-  "id": "libvirt-26"
+  "id": "libvirt-25"
 }

 {
@@ -2310,7 +2310,7 @@
   "arguments": {
     "typename": "usb-storage"
   },
-  "id": "libvirt-27"
+  "id": "libvirt-26"
 }

 {
@@ -2364,7 +2364,7 @@
       "type": "drive"
     }
   ],
-  "id": "libvirt-27"
+  "id": "libvirt-26"
 }

 {
@@ -2372,7 +2372,7 @@
   "arguments": {
     "typename": "kvm-pit"
   },
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -2386,7 +2386,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -2394,7 +2394,7 @@
   "arguments": {
     "typename": "VGA"
   },
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
@@ -2428,7 +2428,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
@@ -2436,7 +2436,7 @@
   "arguments": {
     "typename": "vmware-svga"
   },
-  "id": "libvirt-30"
+  "id": "libvirt-29"
 }

 {
@@ -2466,7 +2466,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-30"
+  "id": "libvirt-29"
 }

 {
@@ -2474,7 +2474,7 @@
   "arguments": {
     "typename": "qxl"
   },
-  "id": "libvirt-31"
+  "id": "libvirt-30"
 }

 {
@@ -2544,7 +2544,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-31"
+  "id": "libvirt-30"
 }

 {
@@ -2552,7 +2552,7 @@
   "arguments": {
     "typename": "ICH9-LPC"
   },
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

 {
@@ -2606,7 +2606,7 @@
       "type": "pci-devfn"
     }
   ],
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

 {
@@ -2614,7 +2614,7 @@
   "arguments": {
     "typename": "virtio-balloon-pci"
   },
-  "id": "libvirt-33"
+  "id": "libvirt-32"
 }

 {
@@ -2664,7 +2664,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-33"
+  "id": "libvirt-32"
 }

 {
@@ -2672,11 +2672,11 @@
   "arguments": {
     "typename": "virtio-balloon-ccw"
   },
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

 {
-  "id": "libvirt-34",
+  "id": "libvirt-33",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-balloon-ccw' not found"
@@ -2688,13 +2688,13 @@
   "arguments": {
     "typename": "virtio-balloon-device"
   },
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
   "return": [
   ],
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
@@ -2702,7 +2702,7 @@
   "arguments": {
     "typename": "nec-usb-xhci"
   },
-  "id": "libvirt-36"
+  "id": "libvirt-35"
 }

 {
@@ -2756,7 +2756,7 @@
       "type": "on/off"
     }
   ],
-  "id": "libvirt-36"
+  "id": "libvirt-35"
 }

 {
@@ -2764,7 +2764,7 @@
   "arguments": {
     "typename": "mch"
   },
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
@@ -2790,12 +2790,12 @@
       "type": "pci-devfn"
     }
   ],
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
   "execute": "query-machines",
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
@@ -2900,12 +2900,12 @@
       "cpu-max": 255
     }
   ],
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
   "execute": "query-cpu-definitions",
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
@@ -2986,36 +2986,36 @@
       "name": "qemu64"
     }
   ],
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
   "execute": "query-tpm-models",
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
   "return": [
     "tpm-tis"
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
   "execute": "query-tpm-types",
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
   "return": [
     "passthrough"
   ],
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
   "execute": "query-command-line-options",
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }

 {
@@ -3875,12 +3875,12 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }

 {
   "execute": "query-migrate-capabilities",
-  "id": "libvirt-43"
+  "id": "libvirt-42"
 }

 {
@@ -3902,7 +3902,7 @@
       "capability": "zero-blocks"
     }
   ],
-  "id": "libvirt-43"
+  "id": "libvirt-42"
 }

 {
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies
index 2397471eb3..1f3378f259 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies
@@ -495,11 +495,11 @@
   "arguments": {
     "device": "bogus"
   },
-  "id": "libvirt-6"
+  "id": "libvirt-5"
 }

 {
-  "id": "libvirt-6",
+  "id": "libvirt-5",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'bogus' not found"
@@ -508,7 +508,7 @@

 {
   "execute": "query-kvm",
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

 {
@@ -516,12 +516,12 @@
     "enabled": true,
     "present": true
   },
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

 {
   "execute": "query-events",
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

 {
@@ -638,12 +638,12 @@
       "name": "ACPI_DEVICE_OST"
     }
   ],
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

 {
   "execute": "qom-list-types",
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

 {
@@ -3213,7 +3213,7 @@
       "parent": "rng-backend"
     }
   ],
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

 {
@@ -3221,7 +3221,7 @@
   "arguments": {
     "typename": "virtio-blk-pci"
   },
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

 {
@@ -3449,7 +3449,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

 {
@@ -3457,7 +3457,7 @@
   "arguments": {
     "typename": "virtio-net-pci"
   },
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

 {
@@ -3744,7 +3744,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

 {
@@ -3752,7 +3752,7 @@
   "arguments": {
     "typename": "virtio-scsi-pci"
   },
-  "id": "libvirt-12"
+  "id": "libvirt-11"
 }

 {
@@ -3913,7 +3913,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-12"
+  "id": "libvirt-11"
 }

 {
@@ -3921,11 +3921,11 @@
   "arguments": {
     "typename": "virtio-net-ccw"
   },
-  "id": "libvirt-13"
+  "id": "libvirt-12"
 }

 {
-  "id": "libvirt-13",
+  "id": "libvirt-12",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-net-ccw' not found"
@@ -3937,11 +3937,11 @@
   "arguments": {
     "typename": "virtio-scsi-ccw"
   },
-  "id": "libvirt-14"
+  "id": "libvirt-13"
 }

 {
-  "id": "libvirt-14",
+  "id": "libvirt-13",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-scsi-ccw' not found"
@@ -3953,11 +3953,11 @@
   "arguments": {
     "typename": "virtio-net-s390"
   },
-  "id": "libvirt-15"
+  "id": "libvirt-14"
 }

 {
-  "id": "libvirt-15",
+  "id": "libvirt-14",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-net-s390' not found"
@@ -3969,11 +3969,11 @@
   "arguments": {
     "typename": "pci-assign"
   },
-  "id": "libvirt-16"
+  "id": "libvirt-15"
 }

 {
-  "id": "libvirt-16",
+  "id": "libvirt-15",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'pci-assign' not found"
@@ -3985,11 +3985,11 @@
   "arguments": {
     "typename": "kvm-pci-assign"
   },
-  "id": "libvirt-17"
+  "id": "libvirt-16"
 }

 {
-  "id": "libvirt-17",
+  "id": "libvirt-16",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'kvm-pci-assign' not found"
@@ -4001,7 +4001,7 @@
   "arguments": {
     "typename": "vfio-pci"
   },
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

 {
@@ -4108,7 +4108,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

 {
@@ -4116,7 +4116,7 @@
   "arguments": {
     "typename": "scsi-disk"
   },
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -4230,7 +4230,7 @@
       "type": "uint64"
     }
   ],
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -4238,7 +4238,7 @@
   "arguments": {
     "typename": "ide-drive"
   },
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
@@ -4314,7 +4314,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
@@ -4322,11 +4322,11 @@
   "arguments": {
     "typename": "PIIX4_PM"
   },
-  "id": "libvirt-21"
+  "id": "libvirt-20"
 }

 {
-  "id": "libvirt-21",
+  "id": "libvirt-20",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'PIIX4_PM' not found"
@@ -4338,7 +4338,7 @@
   "arguments": {
     "typename": "usb-host"
   },
-  "id": "libvirt-22"
+  "id": "libvirt-21"
 }

 {
@@ -4407,7 +4407,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-22"
+  "id": "libvirt-21"
 }

 {
@@ -4415,7 +4415,7 @@
   "arguments": {
     "typename": "scsi-generic"
   },
-  "id": "libvirt-23"
+  "id": "libvirt-22"
 }

 {
@@ -4442,7 +4442,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-23"
+  "id": "libvirt-22"
 }

 {
@@ -4450,11 +4450,11 @@
   "arguments": {
     "typename": "i440FX-pcihost"
   },
-  "id": "libvirt-24"
+  "id": "libvirt-23"
 }

 {
-  "id": "libvirt-24",
+  "id": "libvirt-23",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'i440FX-pcihost' not found"
@@ -4466,11 +4466,11 @@
   "arguments": {
     "typename": "q35-pcihost"
   },
-  "id": "libvirt-25"
+  "id": "libvirt-24"
 }

 {
-  "id": "libvirt-25",
+  "id": "libvirt-24",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'q35-pcihost' not found"
@@ -4482,7 +4482,7 @@
   "arguments": {
     "typename": "usb-storage"
   },
-  "id": "libvirt-26"
+  "id": "libvirt-25"
 }

 {
@@ -4555,7 +4555,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-26"
+  "id": "libvirt-25"
 }

 {
@@ -4563,11 +4563,11 @@
   "arguments": {
     "typename": "kvm-pit"
   },
-  "id": "libvirt-27"
+  "id": "libvirt-26"
 }

 {
-  "id": "libvirt-27",
+  "id": "libvirt-26",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'kvm-pit' not found"
@@ -4579,7 +4579,7 @@
   "arguments": {
     "typename": "VGA"
   },
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -4636,7 +4636,7 @@
       "type": "int32"
     }
   ],
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -4644,7 +4644,7 @@
   "arguments": {
     "typename": "virtio-gpu-pci"
   },
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
@@ -4795,7 +4795,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
@@ -4803,7 +4803,7 @@
   "arguments": {
     "typename": "virtio-gpu-device"
   },
-  "id": "libvirt-30"
+  "id": "libvirt-29"
 }

 {
@@ -4850,7 +4850,7 @@
       "type": "size"
     }
   ],
-  "id": "libvirt-30"
+  "id": "libvirt-29"
 }

 {
@@ -4858,11 +4858,11 @@
   "arguments": {
     "typename": "ICH9-LPC"
   },
-  "id": "libvirt-31"
+  "id": "libvirt-30"
 }

 {
-  "id": "libvirt-31",
+  "id": "libvirt-30",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'ICH9-LPC' not found"
@@ -4874,7 +4874,7 @@
   "arguments": {
     "typename": "virtio-balloon-pci"
   },
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

 {
@@ -5017,7 +5017,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

 {
@@ -5025,11 +5025,11 @@
   "arguments": {
     "typename": "virtio-balloon-ccw"
   },
-  "id": "libvirt-33"
+  "id": "libvirt-32"
 }

 {
-  "id": "libvirt-33",
+  "id": "libvirt-32",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-balloon-ccw' not found"
@@ -5041,7 +5041,7 @@
   "arguments": {
     "typename": "virtio-balloon-device"
   },
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

 {
@@ -5085,7 +5085,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

 {
@@ -5093,7 +5093,7 @@
   "arguments": {
     "typename": "nec-usb-xhci"
   },
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
@@ -5173,12 +5173,12 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
   "execute": "query-machines",
-  "id": "libvirt-36"
+  "id": "libvirt-35"
 }

 {
@@ -5445,12 +5445,12 @@
       "cpu-max": 1
     }
   ],
-  "id": "libvirt-36"
+  "id": "libvirt-35"
 }

 {
   "execute": "query-cpu-definitions",
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
@@ -5616,34 +5616,34 @@
       "static": false
     }
   ],
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
   "execute": "query-tpm-models",
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
   "return": [
   ],
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
   "execute": "query-tpm-types",
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
   "return": [
   ],
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
   "execute": "query-command-line-options",
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
@@ -6788,12 +6788,12 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
   "execute": "query-migrate-capabilities",
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
@@ -6843,12 +6843,12 @@
       "capability": "return-path"
     }
   ],
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
   "execute": "query-qmp-schema",
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }

 {
@@ -16571,12 +16571,12 @@
       "meta-type": "object"
     }
   ],
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }

 {
   "execute": "query-gic-capabilities",
-  "id": "libvirt-43"
+  "id": "libvirt-42"
 }

 {
@@ -16592,7 +16592,7 @@
       "kernel": true
     }
   ],
-  "id": "libvirt-43"
+  "id": "libvirt-42"
 }

 {
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies
index bc882826e7..0acb08a6e5 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies
@@ -492,11 +492,11 @@
   "arguments": {
     "device": "bogus"
   },
-  "id": "libvirt-6"
+  "id": "libvirt-5"
 }

 {
-  "id": "libvirt-6",
+  "id": "libvirt-5",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'bogus' not found"
@@ -505,7 +505,7 @@

 {
   "execute": "query-kvm",
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

 {
@@ -513,12 +513,12 @@
     "enabled": true,
     "present": true
   },
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

 {
   "execute": "query-events",
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

 {
@@ -635,12 +635,12 @@
       "name": "ACPI_DEVICE_OST"
     }
   ],
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

 {
   "execute": "qom-list-types",
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

 {
@@ -3314,7 +3314,7 @@
       "parent": "7455-family-powerpc64-cpu"
     }
   ],
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

 {
@@ -3322,7 +3322,7 @@
   "arguments": {
     "typename": "virtio-blk-pci"
   },
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

 {
@@ -3550,7 +3550,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

 {
@@ -3558,7 +3558,7 @@
   "arguments": {
     "typename": "virtio-net-pci"
   },
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

 {
@@ -3845,7 +3845,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

 {
@@ -3853,7 +3853,7 @@
   "arguments": {
     "typename": "virtio-scsi-pci"
   },
-  "id": "libvirt-12"
+  "id": "libvirt-11"
 }

 {
@@ -4014,7 +4014,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-12"
+  "id": "libvirt-11"
 }

 {
@@ -4022,11 +4022,11 @@
   "arguments": {
     "typename": "virtio-net-ccw"
   },
-  "id": "libvirt-13"
+  "id": "libvirt-12"
 }

 {
-  "id": "libvirt-13",
+  "id": "libvirt-12",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-net-ccw' not found"
@@ -4038,11 +4038,11 @@
   "arguments": {
     "typename": "virtio-scsi-ccw"
   },
-  "id": "libvirt-14"
+  "id": "libvirt-13"
 }

 {
-  "id": "libvirt-14",
+  "id": "libvirt-13",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-scsi-ccw' not found"
@@ -4054,11 +4054,11 @@
   "arguments": {
     "typename": "virtio-net-s390"
   },
-  "id": "libvirt-15"
+  "id": "libvirt-14"
 }

 {
-  "id": "libvirt-15",
+  "id": "libvirt-14",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-net-s390' not found"
@@ -4070,11 +4070,11 @@
   "arguments": {
     "typename": "pci-assign"
   },
-  "id": "libvirt-16"
+  "id": "libvirt-15"
 }

 {
-  "id": "libvirt-16",
+  "id": "libvirt-15",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'pci-assign' not found"
@@ -4086,11 +4086,11 @@
   "arguments": {
     "typename": "kvm-pci-assign"
   },
-  "id": "libvirt-17"
+  "id": "libvirt-16"
 }

 {
-  "id": "libvirt-17",
+  "id": "libvirt-16",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'kvm-pci-assign' not found"
@@ -4102,7 +4102,7 @@
   "arguments": {
     "typename": "vfio-pci"
   },
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

 {
@@ -4209,7 +4209,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

 {
@@ -4217,7 +4217,7 @@
   "arguments": {
     "typename": "scsi-disk"
   },
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -4331,7 +4331,7 @@
       "type": "uint64"
     }
   ],
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -4339,7 +4339,7 @@
   "arguments": {
     "typename": "ide-drive"
   },
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
@@ -4415,7 +4415,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
@@ -4423,11 +4423,11 @@
   "arguments": {
     "typename": "PIIX4_PM"
   },
-  "id": "libvirt-21"
+  "id": "libvirt-20"
 }

 {
-  "id": "libvirt-21",
+  "id": "libvirt-20",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'PIIX4_PM' not found"
@@ -4439,7 +4439,7 @@
   "arguments": {
     "typename": "usb-host"
   },
-  "id": "libvirt-22"
+  "id": "libvirt-21"
 }

 {
@@ -4508,7 +4508,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-22"
+  "id": "libvirt-21"
 }

 {
@@ -4516,7 +4516,7 @@
   "arguments": {
     "typename": "scsi-generic"
   },
-  "id": "libvirt-23"
+  "id": "libvirt-22"
 }

 {
@@ -4543,7 +4543,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-23"
+  "id": "libvirt-22"
 }

 {
@@ -4551,11 +4551,11 @@
   "arguments": {
     "typename": "i440FX-pcihost"
   },
-  "id": "libvirt-24"
+  "id": "libvirt-23"
 }

 {
-  "id": "libvirt-24",
+  "id": "libvirt-23",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'i440FX-pcihost' not found"
@@ -4567,11 +4567,11 @@
   "arguments": {
     "typename": "q35-pcihost"
   },
-  "id": "libvirt-25"
+  "id": "libvirt-24"
 }

 {
-  "id": "libvirt-25",
+  "id": "libvirt-24",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'q35-pcihost' not found"
@@ -4583,7 +4583,7 @@
   "arguments": {
     "typename": "usb-storage"
   },
-  "id": "libvirt-26"
+  "id": "libvirt-25"
 }

 {
@@ -4656,7 +4656,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-26"
+  "id": "libvirt-25"
 }

 {
@@ -4664,11 +4664,11 @@
   "arguments": {
     "typename": "kvm-pit"
   },
-  "id": "libvirt-27"
+  "id": "libvirt-26"
 }

 {
-  "id": "libvirt-27",
+  "id": "libvirt-26",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'kvm-pit' not found"
@@ -4680,7 +4680,7 @@
   "arguments": {
     "typename": "VGA"
   },
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -4737,7 +4737,7 @@
       "type": "int32"
     }
   ],
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -4745,7 +4745,7 @@
   "arguments": {
     "typename": "virtio-gpu-pci"
   },
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
@@ -4896,7 +4896,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
@@ -4904,7 +4904,7 @@
   "arguments": {
     "typename": "virtio-gpu-device"
   },
-  "id": "libvirt-30"
+  "id": "libvirt-29"
 }

 {
@@ -4951,7 +4951,7 @@
       "type": "size"
     }
   ],
-  "id": "libvirt-30"
+  "id": "libvirt-29"
 }

 {
@@ -4959,11 +4959,11 @@
   "arguments": {
     "typename": "ICH9-LPC"
   },
-  "id": "libvirt-31"
+  "id": "libvirt-30"
 }

 {
-  "id": "libvirt-31",
+  "id": "libvirt-30",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'ICH9-LPC' not found"
@@ -4975,7 +4975,7 @@
   "arguments": {
     "typename": "virtio-balloon-pci"
   },
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

 {
@@ -5118,7 +5118,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

 {
@@ -5126,11 +5126,11 @@
   "arguments": {
     "typename": "virtio-balloon-ccw"
   },
-  "id": "libvirt-33"
+  "id": "libvirt-32"
 }

 {
-  "id": "libvirt-33",
+  "id": "libvirt-32",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-balloon-ccw' not found"
@@ -5142,7 +5142,7 @@
   "arguments": {
     "typename": "virtio-balloon-device"
   },
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

 {
@@ -5186,7 +5186,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

 {
@@ -5194,7 +5194,7 @@
   "arguments": {
     "typename": "nec-usb-xhci"
   },
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
@@ -5274,7 +5274,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
@@ -5282,7 +5282,7 @@
   "arguments": {
     "typename": "spapr-pci-host-bridge"
   },
-  "id": "libvirt-36"
+  "id": "libvirt-35"
 }

 {
@@ -5368,12 +5368,12 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-36"
+  "id": "libvirt-35"
 }

 {
   "execute": "query-machines",
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
@@ -5491,12 +5491,12 @@
       "cpu-max": 1
     }
   ],
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
   "execute": "query-cpu-definitions",
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
@@ -7672,34 +7672,34 @@
       "static": false
     }
   ],
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
   "execute": "query-tpm-models",
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
   "return": [
   ],
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
   "execute": "query-tpm-types",
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
   "return": [
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
   "execute": "query-command-line-options",
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
@@ -8839,12 +8839,12 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
   "execute": "query-migrate-capabilities",
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }

 {
@@ -8894,12 +8894,12 @@
       "capability": "return-path"
     }
   ],
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }

 {
   "execute": "query-qmp-schema",
-  "id": "libvirt-43"
+  "id": "libvirt-42"
 }

 {
@@ -18622,7 +18622,7 @@
       "meta-type": "object"
     }
   ],
-  "id": "libvirt-43"
+  "id": "libvirt-42"
 }

 {
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies
index eb8b3ffffe..26ab108de6 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies
@@ -504,11 +504,11 @@
   "arguments": {
     "device": "bogus"
   },
-  "id": "libvirt-6"
+  "id": "libvirt-5"
 }

 {
-  "id": "libvirt-6",
+  "id": "libvirt-5",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'bogus' not found"
@@ -517,7 +517,7 @@

 {
   "execute": "query-kvm",
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

 {
@@ -525,12 +525,12 @@
     "enabled": true,
     "present": true
   },
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

 {
   "execute": "query-events",
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

 {
@@ -647,12 +647,12 @@
       "name": "ACPI_DEVICE_OST"
     }
   ],
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

 {
   "execute": "qom-list-types",
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

 {
@@ -1554,7 +1554,7 @@
       "parent": "virtio-device"
     }
   ],
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

 {
@@ -1562,7 +1562,7 @@
   "arguments": {
     "typename": "virtio-blk-pci"
   },
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

 {
@@ -1790,7 +1790,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

 {
@@ -1798,7 +1798,7 @@
   "arguments": {
     "typename": "virtio-net-pci"
   },
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

 {
@@ -2085,7 +2085,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

 {
@@ -2093,7 +2093,7 @@
   "arguments": {
     "typename": "virtio-scsi-pci"
   },
-  "id": "libvirt-12"
+  "id": "libvirt-11"
 }

 {
@@ -2254,7 +2254,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-12"
+  "id": "libvirt-11"
 }

 {
@@ -2262,7 +2262,7 @@
   "arguments": {
     "typename": "virtio-blk-ccw"
   },
-  "id": "libvirt-13"
+  "id": "libvirt-12"
 }

 {
@@ -2400,7 +2400,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-13"
+  "id": "libvirt-12"
 }

 {
@@ -2408,7 +2408,7 @@
   "arguments": {
     "typename": "virtio-net-ccw"
   },
-  "id": "libvirt-14"
+  "id": "libvirt-13"
 }

 {
@@ -2609,7 +2609,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-14"
+  "id": "libvirt-13"
 }

 {
@@ -2617,7 +2617,7 @@
   "arguments": {
     "typename": "virtio-scsi-ccw"
   },
-  "id": "libvirt-15"
+  "id": "libvirt-14"
 }

 {
@@ -2692,7 +2692,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-15"
+  "id": "libvirt-14"
 }

 {
@@ -2700,11 +2700,11 @@
   "arguments": {
     "typename": "virtio-net-s390"
   },
-  "id": "libvirt-16"
+  "id": "libvirt-15"
 }

 {
-  "id": "libvirt-16",
+  "id": "libvirt-15",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-net-s390' not found"
@@ -2716,11 +2716,11 @@
   "arguments": {
     "typename": "pci-assign"
   },
-  "id": "libvirt-17"
+  "id": "libvirt-16"
 }

 {
-  "id": "libvirt-17",
+  "id": "libvirt-16",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'pci-assign' not found"
@@ -2732,11 +2732,11 @@
   "arguments": {
     "typename": "kvm-pci-assign"
   },
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

 {
-  "id": "libvirt-18",
+  "id": "libvirt-17",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'kvm-pci-assign' not found"
@@ -2748,7 +2748,7 @@
   "arguments": {
     "typename": "vfio-pci"
   },
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -2855,7 +2855,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -2863,7 +2863,7 @@
   "arguments": {
     "typename": "scsi-disk"
   },
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
@@ -2977,7 +2977,7 @@
       "type": "uint64"
     }
   ],
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
@@ -2985,11 +2985,11 @@
   "arguments": {
     "typename": "ide-drive"
   },
-  "id": "libvirt-21"
+  "id": "libvirt-20"
 }

 {
-  "id": "libvirt-21",
+  "id": "libvirt-20",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'ide-drive' not found"
@@ -3001,11 +3001,11 @@
   "arguments": {
     "typename": "PIIX4_PM"
   },
-  "id": "libvirt-22"
+  "id": "libvirt-21"
 }

 {
-  "id": "libvirt-22",
+  "id": "libvirt-21",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'PIIX4_PM' not found"
@@ -3017,11 +3017,11 @@
   "arguments": {
     "typename": "usb-host"
   },
-  "id": "libvirt-23"
+  "id": "libvirt-22"
 }

 {
-  "id": "libvirt-23",
+  "id": "libvirt-22",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'usb-host' not found"
@@ -3033,7 +3033,7 @@
   "arguments": {
     "typename": "scsi-generic"
   },
-  "id": "libvirt-24"
+  "id": "libvirt-23"
 }

 {
@@ -3060,7 +3060,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-24"
+  "id": "libvirt-23"
 }

 {
@@ -3068,11 +3068,11 @@
   "arguments": {
     "typename": "i440FX-pcihost"
   },
-  "id": "libvirt-25"
+  "id": "libvirt-24"
 }

 {
-  "id": "libvirt-25",
+  "id": "libvirt-24",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'i440FX-pcihost' not found"
@@ -3084,11 +3084,11 @@
   "arguments": {
     "typename": "q35-pcihost"
   },
-  "id": "libvirt-26"
+  "id": "libvirt-25"
 }

 {
-  "id": "libvirt-26",
+  "id": "libvirt-25",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'q35-pcihost' not found"
@@ -3100,11 +3100,11 @@
   "arguments": {
     "typename": "kvm-pit"
   },
-  "id": "libvirt-27"
+  "id": "libvirt-26"
 }

 {
-  "id": "libvirt-27",
+  "id": "libvirt-26",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'kvm-pit' not found"
@@ -3116,7 +3116,7 @@
   "arguments": {
     "typename": "virtio-gpu-pci"
   },
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -3267,7 +3267,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -3275,7 +3275,7 @@
   "arguments": {
     "typename": "virtio-gpu-device"
   },
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
@@ -3322,7 +3322,7 @@
       "type": "size"
     }
   ],
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
@@ -3330,11 +3330,11 @@
   "arguments": {
     "typename": "ICH9-LPC"
   },
-  "id": "libvirt-30"
+  "id": "libvirt-29"
 }

 {
-  "id": "libvirt-30",
+  "id": "libvirt-29",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'ICH9-LPC' not found"
@@ -3346,7 +3346,7 @@
   "arguments": {
     "typename": "virtio-balloon-pci"
   },
-  "id": "libvirt-31"
+  "id": "libvirt-30"
 }

 {
@@ -3489,7 +3489,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-31"
+  "id": "libvirt-30"
 }

 {
@@ -3497,7 +3497,7 @@
   "arguments": {
     "typename": "virtio-balloon-ccw"
   },
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

 {
@@ -3559,7 +3559,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

 {
@@ -3567,7 +3567,7 @@
   "arguments": {
     "typename": "virtio-balloon-device"
   },
-  "id": "libvirt-33"
+  "id": "libvirt-32"
 }

 {
@@ -3611,7 +3611,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-33"
+  "id": "libvirt-32"
 }

 {
@@ -3619,7 +3619,7 @@
   "arguments": {
     "typename": "virtual-css-bridge"
   },
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

 {
@@ -3629,12 +3629,12 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

 {
   "execute": "query-machines",
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
@@ -3682,12 +3682,12 @@
       "cpu-max": 248
     }
   ],
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
   "execute": "query-cpu-definitions",
-  "id": "libvirt-36"
+  "id": "libvirt-35"
 }

 {
@@ -4221,34 +4221,34 @@
       "migration-safe": true
     }
   ],
-  "id": "libvirt-36"
+  "id": "libvirt-35"
 }

 {
   "execute": "query-tpm-models",
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
   "return": [
   ],
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
   "execute": "query-tpm-types",
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
   "return": [
   ],
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
   "execute": "query-command-line-options",
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
@@ -5353,12 +5353,12 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
   "execute": "query-migrate-capabilities",
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
@@ -5408,12 +5408,12 @@
       "capability": "return-path"
     }
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
   "execute": "query-qmp-schema",
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
@@ -15136,7 +15136,7 @@
       "meta-type": "object"
     }
   ],
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
@@ -15147,7 +15147,7 @@
       "name": "host"
     }
   },
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }

 {
@@ -15187,7 +15187,7 @@
       }
     }
   },
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }

 {
@@ -15201,11 +15201,11 @@
       }
     }
   },
-  "id": "libvirt-43"
+  "id": "libvirt-42"
 }

 {
-  "id": "libvirt-43",
+  "id": "libvirt-42",
   "error": {
     "class": "GenericError",
     "desc": "Property '.migratable' not found"
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies
index f92b9d9a02..fc4e7d9936 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies
@@ -501,11 +501,11 @@
   "arguments": {
     "device": "bogus"
   },
-  "id": "libvirt-6"
+  "id": "libvirt-5"
 }

 {
-  "id": "libvirt-6",
+  "id": "libvirt-5",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'bogus' not found"
@@ -514,7 +514,7 @@

 {
   "execute": "query-kvm",
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

 {
@@ -522,12 +522,12 @@
     "enabled": true,
     "present": true
   },
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

 {
   "execute": "query-events",
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

 {
@@ -644,12 +644,12 @@
       "name": "ACPI_DEVICE_OST"
     }
   ],
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

 {
   "execute": "qom-list-types",
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

 {
@@ -2191,7 +2191,7 @@
       "parent": "virtio-input-hid-pci"
     }
   ],
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

 {
@@ -2199,7 +2199,7 @@
   "arguments": {
     "typename": "virtio-blk-pci"
   },
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

 {
@@ -2427,7 +2427,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

 {
@@ -2435,7 +2435,7 @@
   "arguments": {
     "typename": "virtio-net-pci"
   },
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

 {
@@ -2722,7 +2722,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

 {
@@ -2730,7 +2730,7 @@
   "arguments": {
     "typename": "virtio-scsi-pci"
   },
-  "id": "libvirt-12"
+  "id": "libvirt-11"
 }

 {
@@ -2891,7 +2891,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-12"
+  "id": "libvirt-11"
 }

 {
@@ -2899,11 +2899,11 @@
   "arguments": {
     "typename": "virtio-net-ccw"
   },
-  "id": "libvirt-13"
+  "id": "libvirt-12"
 }

 {
-  "id": "libvirt-13",
+  "id": "libvirt-12",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-net-ccw' not found"
@@ -2915,11 +2915,11 @@
   "arguments": {
     "typename": "virtio-scsi-ccw"
   },
-  "id": "libvirt-14"
+  "id": "libvirt-13"
 }

 {
-  "id": "libvirt-14",
+  "id": "libvirt-13",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-scsi-ccw' not found"
@@ -2931,11 +2931,11 @@
   "arguments": {
     "typename": "virtio-net-s390"
   },
-  "id": "libvirt-15"
+  "id": "libvirt-14"
 }

 {
-  "id": "libvirt-15",
+  "id": "libvirt-14",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-net-s390' not found"
@@ -2947,11 +2947,11 @@
   "arguments": {
     "typename": "pci-assign"
   },
-  "id": "libvirt-16"
+  "id": "libvirt-15"
 }

 {
-  "id": "libvirt-16",
+  "id": "libvirt-15",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'pci-assign' not found"
@@ -2963,7 +2963,7 @@
   "arguments": {
     "typename": "kvm-pci-assign"
   },
-  "id": "libvirt-17"
+  "id": "libvirt-16"
 }

 {
@@ -3025,7 +3025,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-17"
+  "id": "libvirt-16"
 }

 {
@@ -3033,7 +3033,7 @@
   "arguments": {
     "typename": "vfio-pci"
   },
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

 {
@@ -3140,7 +3140,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

 {
@@ -3148,7 +3148,7 @@
   "arguments": {
     "typename": "scsi-disk"
   },
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -3262,7 +3262,7 @@
       "type": "uint64"
     }
   ],
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -3270,7 +3270,7 @@
   "arguments": {
     "typename": "ide-drive"
   },
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
@@ -3346,7 +3346,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
@@ -3354,7 +3354,7 @@
   "arguments": {
     "typename": "PIIX4_PM"
   },
-  "id": "libvirt-21"
+  "id": "libvirt-20"
 }

 {
@@ -3417,7 +3417,7 @@
       "type": "int32"
     }
   ],
-  "id": "libvirt-21"
+  "id": "libvirt-20"
 }

 {
@@ -3425,7 +3425,7 @@
   "arguments": {
     "typename": "usb-redir"
   },
-  "id": "libvirt-22"
+  "id": "libvirt-21"
 }

 {
@@ -3474,7 +3474,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-22"
+  "id": "libvirt-21"
 }

 {
@@ -3482,7 +3482,7 @@
   "arguments": {
     "typename": "usb-host"
   },
-  "id": "libvirt-23"
+  "id": "libvirt-22"
 }

 {
@@ -3551,7 +3551,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-23"
+  "id": "libvirt-22"
 }

 {
@@ -3559,7 +3559,7 @@
   "arguments": {
     "typename": "scsi-generic"
   },
-  "id": "libvirt-24"
+  "id": "libvirt-23"
 }

 {
@@ -3586,7 +3586,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-24"
+  "id": "libvirt-23"
 }

 {
@@ -3594,7 +3594,7 @@
   "arguments": {
     "typename": "i440FX-pcihost"
   },
-  "id": "libvirt-25"
+  "id": "libvirt-24"
 }

 {
@@ -3632,7 +3632,7 @@
       "type": "child<qemu:memory-region>"
     }
   ],
-  "id": "libvirt-25"
+  "id": "libvirt-24"
 }

 {
@@ -3640,7 +3640,7 @@
   "arguments": {
     "typename": "q35-pcihost"
   },
-  "id": "libvirt-26"
+  "id": "libvirt-25"
 }

 {
@@ -3718,7 +3718,7 @@
       "type": "uint64"
     }
   ],
-  "id": "libvirt-26"
+  "id": "libvirt-25"
 }

 {
@@ -3726,7 +3726,7 @@
   "arguments": {
     "typename": "usb-storage"
   },
-  "id": "libvirt-27"
+  "id": "libvirt-26"
 }

 {
@@ -3799,7 +3799,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-27"
+  "id": "libvirt-26"
 }

 {
@@ -3807,7 +3807,7 @@
   "arguments": {
     "typename": "kvm-pit"
   },
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -3821,7 +3821,7 @@
       "type": "LostTickPolicy"
     }
   ],
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -3829,7 +3829,7 @@
   "arguments": {
     "typename": "VGA"
   },
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
@@ -3886,7 +3886,7 @@
       "type": "int32"
     }
   ],
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
@@ -3894,7 +3894,7 @@
   "arguments": {
     "typename": "vmware-svga"
   },
-  "id": "libvirt-30"
+  "id": "libvirt-29"
 }

 {
@@ -3937,7 +3937,7 @@
       "type": "int32"
     }
   ],
-  "id": "libvirt-30"
+  "id": "libvirt-29"
 }

 {
@@ -3945,7 +3945,7 @@
   "arguments": {
     "typename": "qxl"
   },
-  "id": "libvirt-31"
+  "id": "libvirt-30"
 }

 {
@@ -4040,7 +4040,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-31"
+  "id": "libvirt-30"
 }

 {
@@ -4048,7 +4048,7 @@
   "arguments": {
     "typename": "virtio-gpu-pci"
   },
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

 {
@@ -4209,7 +4209,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

 {
@@ -4217,7 +4217,7 @@
   "arguments": {
     "typename": "virtio-gpu-device"
   },
-  "id": "libvirt-33"
+  "id": "libvirt-32"
 }

 {
@@ -4274,7 +4274,7 @@
       "type": "size"
     }
   ],
-  "id": "libvirt-33"
+  "id": "libvirt-32"
 }

 {
@@ -4282,7 +4282,7 @@
   "arguments": {
     "typename": "ICH9-LPC"
   },
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

 {
@@ -4378,7 +4378,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

 {
@@ -4386,7 +4386,7 @@
   "arguments": {
     "typename": "virtio-balloon-pci"
   },
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
@@ -4529,7 +4529,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
@@ -4537,11 +4537,11 @@
   "arguments": {
     "typename": "virtio-balloon-ccw"
   },
-  "id": "libvirt-36"
+  "id": "libvirt-35"
 }

 {
-  "id": "libvirt-36",
+  "id": "libvirt-35",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-balloon-ccw' not found"
@@ -4553,7 +4553,7 @@
   "arguments": {
     "typename": "virtio-balloon-device"
   },
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
@@ -4597,7 +4597,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
@@ -4605,7 +4605,7 @@
   "arguments": {
     "typename": "nec-usb-xhci"
   },
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
@@ -4685,7 +4685,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
@@ -4693,7 +4693,7 @@
   "arguments": {
     "typename": "intel-iommu"
   },
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
@@ -4728,7 +4728,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
@@ -4736,7 +4736,7 @@
   "arguments": {
     "typename": "mch"
   },
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
@@ -4762,12 +4762,12 @@
       "type": "pci-devfn"
     }
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
   "execute": "query-machines",
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
@@ -4956,12 +4956,12 @@
       "alias": "q35"
     }
   ],
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
   "execute": "query-cpu-definitions",
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }

 {
@@ -5296,36 +5296,36 @@
       "migration-safe": true
     }
   ],
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }

 {
   "execute": "query-tpm-models",
-  "id": "libvirt-43"
+  "id": "libvirt-42"
 }

 {
   "return": [
     "tpm-tis"
   ],
-  "id": "libvirt-43"
+  "id": "libvirt-42"
 }

 {
   "execute": "query-tpm-types",
-  "id": "libvirt-44"
+  "id": "libvirt-43"
 }

 {
   "return": [
     "passthrough"
   ],
-  "id": "libvirt-44"
+  "id": "libvirt-43"
 }

 {
   "execute": "query-command-line-options",
-  "id": "libvirt-45"
+  "id": "libvirt-44"
 }

 {
@@ -6604,12 +6604,12 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-45"
+  "id": "libvirt-44"
 }

 {
   "execute": "query-migrate-capabilities",
-  "id": "libvirt-46"
+  "id": "libvirt-45"
 }

 {
@@ -6659,12 +6659,12 @@
       "capability": "return-path"
     }
   ],
-  "id": "libvirt-46"
+  "id": "libvirt-45"
 }

 {
   "execute": "query-qmp-schema",
-  "id": "libvirt-47"
+  "id": "libvirt-46"
 }

 {
@@ -16387,7 +16387,7 @@
       "meta-type": "object"
     }
   ],
-  "id": "libvirt-47"
+  "id": "libvirt-46"
 }

 {
@@ -16398,7 +16398,7 @@
       "name": "host"
     }
   },
-  "id": "libvirt-48"
+  "id": "libvirt-47"
 }

 {
@@ -16577,7 +16577,7 @@
       }
     }
   },
-  "id": "libvirt-48"
+  "id": "libvirt-47"
 }

 {
@@ -16758,7 +16758,7 @@
       }
     }
   },
-  "id": "libvirt-49"
+  "id": "libvirt-48"
 }

 {
@@ -17001,7 +17001,7 @@
       }
     }
   },
-  "id": "libvirt-49"
+  "id": "libvirt-48"
 }

 {
@@ -17015,7 +17015,7 @@
       }
     }
   },
-  "id": "libvirt-50"
+  "id": "libvirt-49"
 }

 {
@@ -17194,7 +17194,7 @@
       }
     }
   },
-  "id": "libvirt-50"
+  "id": "libvirt-49"
 }

 {
@@ -17375,7 +17375,7 @@
       }
     }
   },
-  "id": "libvirt-51"
+  "id": "libvirt-50"
 }

 {
@@ -17618,7 +17618,7 @@
       }
     }
   },
-  "id": "libvirt-51"
+  "id": "libvirt-50"
 }

 {
diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies
index a1e44d95b4..f9945a81b8 100644
--- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies
@@ -513,11 +513,11 @@
   "arguments": {
     "device": "bogus"
   },
-  "id": "libvirt-6"
+  "id": "libvirt-5"
 }

 {
-  "id": "libvirt-6",
+  "id": "libvirt-5",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'bogus' not found"
@@ -526,7 +526,7 @@

 {
   "execute": "query-kvm",
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

 {
@@ -534,12 +534,12 @@
     "enabled": true,
     "present": true
   },
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

 {
   "execute": "query-events",
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

 {
@@ -656,12 +656,12 @@
       "name": "ACPI_DEVICE_OST"
     }
   ],
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

 {
   "execute": "qom-list-types",
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

 {
@@ -1595,7 +1595,7 @@
       "parent": "virtio-device"
     }
   ],
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

 {
@@ -1603,7 +1603,7 @@
   "arguments": {
     "typename": "virtio-blk-pci"
   },
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

 {
@@ -1831,7 +1831,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

 {
@@ -1839,7 +1839,7 @@
   "arguments": {
     "typename": "virtio-net-pci"
   },
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

 {
@@ -2126,7 +2126,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

 {
@@ -2134,7 +2134,7 @@
   "arguments": {
     "typename": "virtio-scsi-pci"
   },
-  "id": "libvirt-12"
+  "id": "libvirt-11"
 }

 {
@@ -2299,7 +2299,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-12"
+  "id": "libvirt-11"
 }

 {
@@ -2307,7 +2307,7 @@
   "arguments": {
     "typename": "virtio-blk-ccw"
   },
-  "id": "libvirt-13"
+  "id": "libvirt-12"
 }

 {
@@ -2445,7 +2445,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-13"
+  "id": "libvirt-12"
 }

 {
@@ -2453,7 +2453,7 @@
   "arguments": {
     "typename": "virtio-net-ccw"
   },
-  "id": "libvirt-14"
+  "id": "libvirt-13"
 }

 {
@@ -2654,7 +2654,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-14"
+  "id": "libvirt-13"
 }

 {
@@ -2662,7 +2662,7 @@
   "arguments": {
     "typename": "virtio-scsi-ccw"
   },
-  "id": "libvirt-15"
+  "id": "libvirt-14"
 }

 {
@@ -2741,7 +2741,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-15"
+  "id": "libvirt-14"
 }

 {
@@ -2749,11 +2749,11 @@
   "arguments": {
     "typename": "virtio-net-s390"
   },
-  "id": "libvirt-16"
+  "id": "libvirt-15"
 }

 {
-  "id": "libvirt-16",
+  "id": "libvirt-15",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-net-s390' not found"
@@ -2765,11 +2765,11 @@
   "arguments": {
     "typename": "pci-assign"
   },
-  "id": "libvirt-17"
+  "id": "libvirt-16"
 }

 {
-  "id": "libvirt-17",
+  "id": "libvirt-16",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'pci-assign' not found"
@@ -2781,11 +2781,11 @@
   "arguments": {
     "typename": "kvm-pci-assign"
   },
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

 {
-  "id": "libvirt-18",
+  "id": "libvirt-17",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'kvm-pci-assign' not found"
@@ -2797,7 +2797,7 @@
   "arguments": {
     "typename": "vfio-pci"
   },
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -2909,7 +2909,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -2917,7 +2917,7 @@
   "arguments": {
     "typename": "scsi-disk"
   },
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
@@ -3031,7 +3031,7 @@
       "type": "uint64"
     }
   ],
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
@@ -3039,11 +3039,11 @@
   "arguments": {
     "typename": "ide-drive"
   },
-  "id": "libvirt-21"
+  "id": "libvirt-20"
 }

 {
-  "id": "libvirt-21",
+  "id": "libvirt-20",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'ide-drive' not found"
@@ -3055,11 +3055,11 @@
   "arguments": {
     "typename": "PIIX4_PM"
   },
-  "id": "libvirt-22"
+  "id": "libvirt-21"
 }

 {
-  "id": "libvirt-22",
+  "id": "libvirt-21",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'PIIX4_PM' not found"
@@ -3071,11 +3071,11 @@
   "arguments": {
     "typename": "usb-host"
   },
-  "id": "libvirt-23"
+  "id": "libvirt-22"
 }

 {
-  "id": "libvirt-23",
+  "id": "libvirt-22",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'usb-host' not found"
@@ -3087,7 +3087,7 @@
   "arguments": {
     "typename": "scsi-generic"
   },
-  "id": "libvirt-24"
+  "id": "libvirt-23"
 }

 {
@@ -3114,7 +3114,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-24"
+  "id": "libvirt-23"
 }

 {
@@ -3122,11 +3122,11 @@
   "arguments": {
     "typename": "i440FX-pcihost"
   },
-  "id": "libvirt-25"
+  "id": "libvirt-24"
 }

 {
-  "id": "libvirt-25",
+  "id": "libvirt-24",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'i440FX-pcihost' not found"
@@ -3138,11 +3138,11 @@
   "arguments": {
     "typename": "q35-pcihost"
   },
-  "id": "libvirt-26"
+  "id": "libvirt-25"
 }

 {
-  "id": "libvirt-26",
+  "id": "libvirt-25",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'q35-pcihost' not found"
@@ -3154,11 +3154,11 @@
   "arguments": {
     "typename": "kvm-pit"
   },
-  "id": "libvirt-27"
+  "id": "libvirt-26"
 }

 {
-  "id": "libvirt-27",
+  "id": "libvirt-26",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'kvm-pit' not found"
@@ -3170,7 +3170,7 @@
   "arguments": {
     "typename": "virtio-gpu-pci"
   },
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -3321,7 +3321,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -3329,7 +3329,7 @@
   "arguments": {
     "typename": "virtio-gpu-device"
   },
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
@@ -3376,7 +3376,7 @@
       "type": "size"
     }
   ],
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
@@ -3384,11 +3384,11 @@
   "arguments": {
     "typename": "ICH9-LPC"
   },
-  "id": "libvirt-30"
+  "id": "libvirt-29"
 }

 {
-  "id": "libvirt-30",
+  "id": "libvirt-29",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'ICH9-LPC' not found"
@@ -3400,7 +3400,7 @@
   "arguments": {
     "typename": "virtio-balloon-pci"
   },
-  "id": "libvirt-31"
+  "id": "libvirt-30"
 }

 {
@@ -3543,7 +3543,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-31"
+  "id": "libvirt-30"
 }

 {
@@ -3551,7 +3551,7 @@
   "arguments": {
     "typename": "virtio-balloon-ccw"
   },
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

 {
@@ -3613,7 +3613,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

 {
@@ -3621,7 +3621,7 @@
   "arguments": {
     "typename": "virtio-balloon-device"
   },
-  "id": "libvirt-33"
+  "id": "libvirt-32"
 }

 {
@@ -3665,7 +3665,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-33"
+  "id": "libvirt-32"
 }

 {
@@ -3673,7 +3673,7 @@
   "arguments": {
     "typename": "virtio-gpu-ccw"
   },
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

 {
@@ -3738,7 +3738,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

 {
@@ -3746,7 +3746,7 @@
   "arguments": {
     "typename": "virtual-css-bridge"
   },
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
@@ -3756,12 +3756,12 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
   "execute": "query-machines",
-  "id": "libvirt-36"
+  "id": "libvirt-35"
 }

 {
@@ -3814,12 +3814,12 @@
       "cpu-max": 248
     }
   ],
-  "id": "libvirt-36"
+  "id": "libvirt-35"
 }

 {
   "execute": "query-cpu-definitions",
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
@@ -4353,35 +4353,35 @@
       "migration-safe": true
     }
   ],
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
   "execute": "query-tpm-models",
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
   "return": [
   ],
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
   "execute": "query-tpm-types",
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
   "return": [
     "emulator"
   ],
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
   "execute": "query-command-line-options",
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
@@ -5502,12 +5502,12 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
   "execute": "query-migrate-capabilities",
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
@@ -5565,12 +5565,12 @@
       "capability": "x-multifd"
     }
   ],
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
   "execute": "query-qmp-schema",
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }

 {
@@ -15438,7 +15438,7 @@
       "meta-type": "object"
     }
   ],
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }

 {
@@ -15449,7 +15449,7 @@
       "name": "host"
     }
   },
-  "id": "libvirt-43"
+  "id": "libvirt-42"
 }

 {
@@ -15488,7 +15488,7 @@
       }
     }
   },
-  "id": "libvirt-43"
+  "id": "libvirt-42"
 }

 {
@@ -15502,11 +15502,11 @@
       }
     }
   },
-  "id": "libvirt-44"
+  "id": "libvirt-43"
 }

 {
-  "id": "libvirt-44",
+  "id": "libvirt-43",
   "error": {
     "class": "GenericError",
     "desc": "Property '.migratable' not found"
diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies
index 34768db3fd..11231327e8 100644
--- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies
@@ -510,11 +510,11 @@
   "arguments": {
     "device": "bogus"
   },
-  "id": "libvirt-6"
+  "id": "libvirt-5"
 }

 {
-  "id": "libvirt-6",
+  "id": "libvirt-5",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'bogus' not found"
@@ -523,7 +523,7 @@

 {
   "execute": "query-kvm",
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

 {
@@ -531,12 +531,12 @@
     "enabled": true,
     "present": true
   },
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

 {
   "execute": "query-events",
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

 {
@@ -653,12 +653,12 @@
       "name": "ACPI_DEVICE_OST"
     }
   ],
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

 {
   "execute": "qom-list-types",
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

 {
@@ -2184,7 +2184,7 @@
       "parent": "virtio-input-hid-pci"
     }
   ],
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

 {
@@ -2192,7 +2192,7 @@
   "arguments": {
     "typename": "virtio-blk-pci"
   },
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

 {
@@ -2420,7 +2420,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

 {
@@ -2428,7 +2428,7 @@
   "arguments": {
     "typename": "virtio-net-pci"
   },
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

 {
@@ -2715,7 +2715,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

 {
@@ -2723,7 +2723,7 @@
   "arguments": {
     "typename": "virtio-scsi-pci"
   },
-  "id": "libvirt-12"
+  "id": "libvirt-11"
 }

 {
@@ -2888,7 +2888,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-12"
+  "id": "libvirt-11"
 }

 {
@@ -2896,11 +2896,11 @@
   "arguments": {
     "typename": "virtio-net-ccw"
   },
-  "id": "libvirt-13"
+  "id": "libvirt-12"
 }

 {
-  "id": "libvirt-13",
+  "id": "libvirt-12",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-net-ccw' not found"
@@ -2912,11 +2912,11 @@
   "arguments": {
     "typename": "virtio-scsi-ccw"
   },
-  "id": "libvirt-14"
+  "id": "libvirt-13"
 }

 {
-  "id": "libvirt-14",
+  "id": "libvirt-13",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-scsi-ccw' not found"
@@ -2928,11 +2928,11 @@
   "arguments": {
     "typename": "virtio-net-s390"
   },
-  "id": "libvirt-15"
+  "id": "libvirt-14"
 }

 {
-  "id": "libvirt-15",
+  "id": "libvirt-14",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-net-s390' not found"
@@ -2944,11 +2944,11 @@
   "arguments": {
     "typename": "pci-assign"
   },
-  "id": "libvirt-16"
+  "id": "libvirt-15"
 }

 {
-  "id": "libvirt-16",
+  "id": "libvirt-15",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'pci-assign' not found"
@@ -2960,11 +2960,11 @@
   "arguments": {
     "typename": "kvm-pci-assign"
   },
-  "id": "libvirt-17"
+  "id": "libvirt-16"
 }

 {
-  "id": "libvirt-17",
+  "id": "libvirt-16",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'kvm-pci-assign' not found"
@@ -2976,7 +2976,7 @@
   "arguments": {
     "typename": "vfio-pci"
   },
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

 {
@@ -3088,7 +3088,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

 {
@@ -3096,7 +3096,7 @@
   "arguments": {
     "typename": "scsi-disk"
   },
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -3210,7 +3210,7 @@
       "type": "uint64"
     }
   ],
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -3218,7 +3218,7 @@
   "arguments": {
     "typename": "ide-drive"
   },
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
@@ -3294,7 +3294,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
@@ -3302,7 +3302,7 @@
   "arguments": {
     "typename": "PIIX4_PM"
   },
-  "id": "libvirt-21"
+  "id": "libvirt-20"
 }

 {
@@ -3365,7 +3365,7 @@
       "type": "int32"
     }
   ],
-  "id": "libvirt-21"
+  "id": "libvirt-20"
 }

 {
@@ -3373,7 +3373,7 @@
   "arguments": {
     "typename": "usb-redir"
   },
-  "id": "libvirt-22"
+  "id": "libvirt-21"
 }

 {
@@ -3422,7 +3422,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-22"
+  "id": "libvirt-21"
 }

 {
@@ -3430,7 +3430,7 @@
   "arguments": {
     "typename": "usb-host"
   },
-  "id": "libvirt-23"
+  "id": "libvirt-22"
 }

 {
@@ -3499,7 +3499,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-23"
+  "id": "libvirt-22"
 }

 {
@@ -3507,7 +3507,7 @@
   "arguments": {
     "typename": "scsi-generic"
   },
-  "id": "libvirt-24"
+  "id": "libvirt-23"
 }

 {
@@ -3534,7 +3534,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-24"
+  "id": "libvirt-23"
 }

 {
@@ -3542,7 +3542,7 @@
   "arguments": {
     "typename": "i440FX-pcihost"
   },
-  "id": "libvirt-25"
+  "id": "libvirt-24"
 }

 {
@@ -3584,7 +3584,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-25"
+  "id": "libvirt-24"
 }

 {
@@ -3592,7 +3592,7 @@
   "arguments": {
     "typename": "q35-pcihost"
   },
-  "id": "libvirt-26"
+  "id": "libvirt-25"
 }

 {
@@ -3674,7 +3674,7 @@
       "type": "uint64"
     }
   ],
-  "id": "libvirt-26"
+  "id": "libvirt-25"
 }

 {
@@ -3682,7 +3682,7 @@
   "arguments": {
     "typename": "usb-storage"
   },
-  "id": "libvirt-27"
+  "id": "libvirt-26"
 }

 {
@@ -3755,7 +3755,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-27"
+  "id": "libvirt-26"
 }

 {
@@ -3763,7 +3763,7 @@
   "arguments": {
     "typename": "kvm-pit"
   },
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -3777,7 +3777,7 @@
       "type": "LostTickPolicy"
     }
   ],
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -3785,7 +3785,7 @@
   "arguments": {
     "typename": "VGA"
   },
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
@@ -3842,7 +3842,7 @@
       "type": "int32"
     }
   ],
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
@@ -3850,7 +3850,7 @@
   "arguments": {
     "typename": "vmware-svga"
   },
-  "id": "libvirt-30"
+  "id": "libvirt-29"
 }

 {
@@ -3893,7 +3893,7 @@
       "type": "int32"
     }
   ],
-  "id": "libvirt-30"
+  "id": "libvirt-29"
 }

 {
@@ -3901,7 +3901,7 @@
   "arguments": {
     "typename": "qxl"
   },
-  "id": "libvirt-31"
+  "id": "libvirt-30"
 }

 {
@@ -3996,7 +3996,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-31"
+  "id": "libvirt-30"
 }

 {
@@ -4004,7 +4004,7 @@
   "arguments": {
     "typename": "virtio-gpu-pci"
   },
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

 {
@@ -4165,7 +4165,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

 {
@@ -4173,7 +4173,7 @@
   "arguments": {
     "typename": "virtio-gpu-device"
   },
-  "id": "libvirt-33"
+  "id": "libvirt-32"
 }

 {
@@ -4230,7 +4230,7 @@
       "type": "size"
     }
   ],
-  "id": "libvirt-33"
+  "id": "libvirt-32"
 }

 {
@@ -4238,7 +4238,7 @@
   "arguments": {
     "typename": "ICH9-LPC"
   },
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

 {
@@ -4334,7 +4334,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

 {
@@ -4342,7 +4342,7 @@
   "arguments": {
     "typename": "virtio-balloon-pci"
   },
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
@@ -4485,7 +4485,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
@@ -4493,11 +4493,11 @@
   "arguments": {
     "typename": "virtio-balloon-ccw"
   },
-  "id": "libvirt-36"
+  "id": "libvirt-35"
 }

 {
-  "id": "libvirt-36",
+  "id": "libvirt-35",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-balloon-ccw' not found"
@@ -4509,7 +4509,7 @@
   "arguments": {
     "typename": "virtio-balloon-device"
   },
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
@@ -4553,7 +4553,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
@@ -4561,7 +4561,7 @@
   "arguments": {
     "typename": "nec-usb-xhci"
   },
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
@@ -4641,7 +4641,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
@@ -4649,7 +4649,7 @@
   "arguments": {
     "typename": "intel-iommu"
   },
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
@@ -4684,7 +4684,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
@@ -4692,7 +4692,7 @@
   "arguments": {
     "typename": "mch"
   },
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
@@ -4735,12 +4735,12 @@
       "type": "int32"
     }
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
   "execute": "query-machines",
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
@@ -4929,12 +4929,12 @@
       "cpu-max": 288
     }
   ],
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
   "execute": "query-cpu-definitions",
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }

 {
@@ -5248,24 +5248,24 @@
       "migration-safe": true
     }
   ],
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }

 {
   "execute": "query-tpm-models",
-  "id": "libvirt-43"
+  "id": "libvirt-42"
 }

 {
   "return": [
     "tpm-tis"
   ],
-  "id": "libvirt-43"
+  "id": "libvirt-42"
 }

 {
   "execute": "query-tpm-types",
-  "id": "libvirt-44"
+  "id": "libvirt-43"
 }

 {
@@ -5273,12 +5273,12 @@
     "passthrough",
     "emulator"
   ],
-  "id": "libvirt-44"
+  "id": "libvirt-43"
 }

 {
   "execute": "query-command-line-options",
-  "id": "libvirt-45"
+  "id": "libvirt-44"
 }

 {
@@ -6573,12 +6573,12 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-45"
+  "id": "libvirt-44"
 }

 {
   "execute": "query-migrate-capabilities",
-  "id": "libvirt-46"
+  "id": "libvirt-45"
 }

 {
@@ -6636,12 +6636,12 @@
       "capability": "x-multifd"
     }
   ],
-  "id": "libvirt-46"
+  "id": "libvirt-45"
 }

 {
   "execute": "query-qmp-schema",
-  "id": "libvirt-47"
+  "id": "libvirt-46"
 }

 {
@@ -16509,7 +16509,7 @@
       "meta-type": "object"
     }
   ],
-  "id": "libvirt-47"
+  "id": "libvirt-46"
 }

 {
@@ -16520,7 +16520,7 @@
       "name": "host"
     }
   },
-  "id": "libvirt-48"
+  "id": "libvirt-47"
 }

 {
@@ -16700,7 +16700,7 @@
       }
     }
   },
-  "id": "libvirt-48"
+  "id": "libvirt-47"
 }

 {
@@ -16882,7 +16882,7 @@
       }
     }
   },
-  "id": "libvirt-49"
+  "id": "libvirt-48"
 }

 {
@@ -17127,7 +17127,7 @@
       }
     }
   },
-  "id": "libvirt-49"
+  "id": "libvirt-48"
 }

 {
@@ -17141,7 +17141,7 @@
       }
     }
   },
-  "id": "libvirt-50"
+  "id": "libvirt-49"
 }

 {
@@ -17321,7 +17321,7 @@
       }
     }
   },
-  "id": "libvirt-50"
+  "id": "libvirt-49"
 }

 {
@@ -17503,7 +17503,7 @@
       }
     }
   },
-  "id": "libvirt-51"
+  "id": "libvirt-50"
 }

 {
@@ -17748,7 +17748,7 @@
       }
     }
   },
-  "id": "libvirt-51"
+  "id": "libvirt-50"
 }

 {
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies
index 2c98faf651..402f8e9d23 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies
@@ -528,11 +528,11 @@
   "arguments": {
     "device": "bogus"
   },
-  "id": "libvirt-6"
+  "id": "libvirt-5"
 }

 {
-  "id": "libvirt-6",
+  "id": "libvirt-5",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'bogus' not found"
@@ -541,7 +541,7 @@

 {
   "execute": "query-kvm",
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

 {
@@ -549,12 +549,12 @@
     "enabled": true,
     "present": true
   },
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

 {
   "execute": "query-events",
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

 {
@@ -677,12 +677,12 @@
       "name": "SHUTDOWN"
     }
   ],
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

 {
   "execute": "qom-list-types",
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

 {
@@ -3500,7 +3500,7 @@
       "parent": "rng-backend"
     }
   ],
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

 {
@@ -3508,7 +3508,7 @@
   "arguments": {
     "typename": "virtio-blk-pci"
   },
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

 {
@@ -3740,7 +3740,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

 {
@@ -3748,7 +3748,7 @@
   "arguments": {
     "typename": "virtio-net-pci"
   },
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

 {
@@ -4043,7 +4043,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

 {
@@ -4051,7 +4051,7 @@
   "arguments": {
     "typename": "virtio-scsi-pci"
   },
-  "id": "libvirt-12"
+  "id": "libvirt-11"
 }

 {
@@ -4216,7 +4216,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-12"
+  "id": "libvirt-11"
 }

 {
@@ -4224,11 +4224,11 @@
   "arguments": {
     "typename": "virtio-net-ccw"
   },
-  "id": "libvirt-13"
+  "id": "libvirt-12"
 }

 {
-  "id": "libvirt-13",
+  "id": "libvirt-12",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-net-ccw' not found"
@@ -4240,11 +4240,11 @@
   "arguments": {
     "typename": "virtio-scsi-ccw"
   },
-  "id": "libvirt-14"
+  "id": "libvirt-13"
 }

 {
-  "id": "libvirt-14",
+  "id": "libvirt-13",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-scsi-ccw' not found"
@@ -4256,11 +4256,11 @@
   "arguments": {
     "typename": "virtio-net-s390"
   },
-  "id": "libvirt-15"
+  "id": "libvirt-14"
 }

 {
-  "id": "libvirt-15",
+  "id": "libvirt-14",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-net-s390' not found"
@@ -4272,11 +4272,11 @@
   "arguments": {
     "typename": "pci-assign"
   },
-  "id": "libvirt-16"
+  "id": "libvirt-15"
 }

 {
-  "id": "libvirt-16",
+  "id": "libvirt-15",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'pci-assign' not found"
@@ -4288,11 +4288,11 @@
   "arguments": {
     "typename": "kvm-pci-assign"
   },
-  "id": "libvirt-17"
+  "id": "libvirt-16"
 }

 {
-  "id": "libvirt-17",
+  "id": "libvirt-16",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'kvm-pci-assign' not found"
@@ -4304,7 +4304,7 @@
   "arguments": {
     "typename": "vfio-pci"
   },
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

 {
@@ -4430,7 +4430,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

 {
@@ -4438,7 +4438,7 @@
   "arguments": {
     "typename": "scsi-disk"
   },
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -4552,7 +4552,7 @@
       "type": "uint64"
     }
   ],
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -4560,7 +4560,7 @@
   "arguments": {
     "typename": "ide-drive"
   },
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
@@ -4636,7 +4636,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
@@ -4644,11 +4644,11 @@
   "arguments": {
     "typename": "PIIX4_PM"
   },
-  "id": "libvirt-21"
+  "id": "libvirt-20"
 }

 {
-  "id": "libvirt-21",
+  "id": "libvirt-20",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'PIIX4_PM' not found"
@@ -4660,7 +4660,7 @@
   "arguments": {
     "typename": "usb-host"
   },
-  "id": "libvirt-22"
+  "id": "libvirt-21"
 }

 {
@@ -4729,7 +4729,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-22"
+  "id": "libvirt-21"
 }

 {
@@ -4737,7 +4737,7 @@
   "arguments": {
     "typename": "scsi-generic"
   },
-  "id": "libvirt-23"
+  "id": "libvirt-22"
 }

 {
@@ -4768,7 +4768,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-23"
+  "id": "libvirt-22"
 }

 {
@@ -4776,11 +4776,11 @@
   "arguments": {
     "typename": "i440FX-pcihost"
   },
-  "id": "libvirt-24"
+  "id": "libvirt-23"
 }

 {
-  "id": "libvirt-24",
+  "id": "libvirt-23",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'i440FX-pcihost' not found"
@@ -4792,11 +4792,11 @@
   "arguments": {
     "typename": "q35-pcihost"
   },
-  "id": "libvirt-25"
+  "id": "libvirt-24"
 }

 {
-  "id": "libvirt-25",
+  "id": "libvirt-24",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'q35-pcihost' not found"
@@ -4808,7 +4808,7 @@
   "arguments": {
     "typename": "usb-storage"
   },
-  "id": "libvirt-26"
+  "id": "libvirt-25"
 }

 {
@@ -4881,7 +4881,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-26"
+  "id": "libvirt-25"
 }

 {
@@ -4889,11 +4889,11 @@
   "arguments": {
     "typename": "kvm-pit"
   },
-  "id": "libvirt-27"
+  "id": "libvirt-26"
 }

 {
-  "id": "libvirt-27",
+  "id": "libvirt-26",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'kvm-pit' not found"
@@ -4905,7 +4905,7 @@
   "arguments": {
     "typename": "VGA"
   },
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -4962,7 +4962,7 @@
       "type": "int32"
     }
   ],
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -4970,7 +4970,7 @@
   "arguments": {
     "typename": "virtio-gpu-pci"
   },
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
@@ -5121,7 +5121,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
@@ -5129,7 +5129,7 @@
   "arguments": {
     "typename": "virtio-gpu-device"
   },
-  "id": "libvirt-30"
+  "id": "libvirt-29"
 }

 {
@@ -5176,7 +5176,7 @@
       "type": "size"
     }
   ],
-  "id": "libvirt-30"
+  "id": "libvirt-29"
 }

 {
@@ -5184,11 +5184,11 @@
   "arguments": {
     "typename": "ICH9-LPC"
   },
-  "id": "libvirt-31"
+  "id": "libvirt-30"
 }

 {
-  "id": "libvirt-31",
+  "id": "libvirt-30",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'ICH9-LPC' not found"
@@ -5200,7 +5200,7 @@
   "arguments": {
     "typename": "virtio-balloon-pci"
   },
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

 {
@@ -5343,7 +5343,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

 {
@@ -5351,11 +5351,11 @@
   "arguments": {
     "typename": "virtio-balloon-ccw"
   },
-  "id": "libvirt-33"
+  "id": "libvirt-32"
 }

 {
-  "id": "libvirt-33",
+  "id": "libvirt-32",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-balloon-ccw' not found"
@@ -5367,7 +5367,7 @@
   "arguments": {
     "typename": "virtio-balloon-device"
   },
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

 {
@@ -5411,7 +5411,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

 {
@@ -5419,7 +5419,7 @@
   "arguments": {
     "typename": "nec-usb-xhci"
   },
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
@@ -5499,7 +5499,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
@@ -5507,7 +5507,7 @@
   "arguments": {
     "typename": "memory-backend-file"
   },
-  "id": "libvirt-36"
+  "id": "libvirt-35"
 }

 {
@@ -5561,7 +5561,7 @@
       "type": "string"
     }
   ],
-  "id": "libvirt-36"
+  "id": "libvirt-35"
 }

 {
@@ -5569,11 +5569,11 @@
   "arguments": {
     "typename": "spapr-machine"
   },
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
-  "id": "libvirt-37",
+  "id": "libvirt-36",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Class 'spapr-machine' not found"
@@ -5582,7 +5582,7 @@

 {
   "execute": "query-machines",
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
@@ -5879,12 +5879,12 @@
       "cpu-max": 1
     }
   ],
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
   "execute": "query-cpu-definitions",
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
@@ -6060,35 +6060,35 @@
       "static": false
     }
   ],
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
   "execute": "query-tpm-models",
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
   "return": [
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
   "execute": "query-tpm-types",
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
   "return": [
     "emulator"
   ],
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
   "execute": "query-command-line-options",
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }

 {
@@ -7249,12 +7249,12 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }

 {
   "execute": "query-migrate-capabilities",
-  "id": "libvirt-43"
+  "id": "libvirt-42"
 }

 {
@@ -7316,12 +7316,12 @@
       "capability": "dirty-bitmaps"
     }
   ],
-  "id": "libvirt-43"
+  "id": "libvirt-42"
 }

 {
   "execute": "query-qmp-schema",
-  "id": "libvirt-44"
+  "id": "libvirt-43"
 }

 {
@@ -18689,12 +18689,12 @@
       "meta-type": "object"
     }
   ],
-  "id": "libvirt-44"
+  "id": "libvirt-43"
 }

 {
   "execute": "query-gic-capabilities",
-  "id": "libvirt-45"
+  "id": "libvirt-44"
 }

 {
@@ -18710,7 +18710,7 @@
       "kernel": false
     }
   ],
-  "id": "libvirt-45"
+  "id": "libvirt-44"
 }

 {
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies
index bf241ba5c9..ec43c5c110 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies
@@ -525,11 +525,11 @@
   "arguments": {
     "device": "bogus"
   },
-  "id": "libvirt-6"
+  "id": "libvirt-5"
 }

 {
-  "id": "libvirt-6",
+  "id": "libvirt-5",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'bogus' not found"
@@ -538,7 +538,7 @@

 {
   "execute": "query-kvm",
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

 {
@@ -546,12 +546,12 @@
     "enabled": true,
     "present": true
   },
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

 {
   "execute": "query-events",
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

 {
@@ -674,12 +674,12 @@
       "name": "SHUTDOWN"
     }
   ],
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

 {
   "execute": "qom-list-types",
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

 {
@@ -3489,7 +3489,7 @@
       "parent": "e500v2-family-powerpc64-cpu"
     }
   ],
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

 {
@@ -3497,7 +3497,7 @@
   "arguments": {
     "typename": "virtio-blk-pci"
   },
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

 {
@@ -3729,7 +3729,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

 {
@@ -3737,7 +3737,7 @@
   "arguments": {
     "typename": "virtio-net-pci"
   },
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

 {
@@ -4032,7 +4032,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

 {
@@ -4040,7 +4040,7 @@
   "arguments": {
     "typename": "virtio-scsi-pci"
   },
-  "id": "libvirt-12"
+  "id": "libvirt-11"
 }

 {
@@ -4205,7 +4205,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-12"
+  "id": "libvirt-11"
 }

 {
@@ -4213,11 +4213,11 @@
   "arguments": {
     "typename": "virtio-net-ccw"
   },
-  "id": "libvirt-13"
+  "id": "libvirt-12"
 }

 {
-  "id": "libvirt-13",
+  "id": "libvirt-12",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-net-ccw' not found"
@@ -4229,11 +4229,11 @@
   "arguments": {
     "typename": "virtio-scsi-ccw"
   },
-  "id": "libvirt-14"
+  "id": "libvirt-13"
 }

 {
-  "id": "libvirt-14",
+  "id": "libvirt-13",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-scsi-ccw' not found"
@@ -4245,11 +4245,11 @@
   "arguments": {
     "typename": "virtio-net-s390"
   },
-  "id": "libvirt-15"
+  "id": "libvirt-14"
 }

 {
-  "id": "libvirt-15",
+  "id": "libvirt-14",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-net-s390' not found"
@@ -4261,11 +4261,11 @@
   "arguments": {
     "typename": "pci-assign"
   },
-  "id": "libvirt-16"
+  "id": "libvirt-15"
 }

 {
-  "id": "libvirt-16",
+  "id": "libvirt-15",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'pci-assign' not found"
@@ -4277,11 +4277,11 @@
   "arguments": {
     "typename": "kvm-pci-assign"
   },
-  "id": "libvirt-17"
+  "id": "libvirt-16"
 }

 {
-  "id": "libvirt-17",
+  "id": "libvirt-16",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'kvm-pci-assign' not found"
@@ -4293,7 +4293,7 @@
   "arguments": {
     "typename": "vfio-pci"
   },
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

 {
@@ -4419,7 +4419,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

 {
@@ -4427,7 +4427,7 @@
   "arguments": {
     "typename": "scsi-disk"
   },
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -4541,7 +4541,7 @@
       "type": "uint64"
     }
   ],
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -4549,7 +4549,7 @@
   "arguments": {
     "typename": "ide-drive"
   },
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
@@ -4625,7 +4625,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
@@ -4633,11 +4633,11 @@
   "arguments": {
     "typename": "PIIX4_PM"
   },
-  "id": "libvirt-21"
+  "id": "libvirt-20"
 }

 {
-  "id": "libvirt-21",
+  "id": "libvirt-20",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'PIIX4_PM' not found"
@@ -4649,7 +4649,7 @@
   "arguments": {
     "typename": "usb-host"
   },
-  "id": "libvirt-22"
+  "id": "libvirt-21"
 }

 {
@@ -4718,7 +4718,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-22"
+  "id": "libvirt-21"
 }

 {
@@ -4726,7 +4726,7 @@
   "arguments": {
     "typename": "scsi-generic"
   },
-  "id": "libvirt-23"
+  "id": "libvirt-22"
 }

 {
@@ -4757,7 +4757,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-23"
+  "id": "libvirt-22"
 }

 {
@@ -4765,11 +4765,11 @@
   "arguments": {
     "typename": "i440FX-pcihost"
   },
-  "id": "libvirt-24"
+  "id": "libvirt-23"
 }

 {
-  "id": "libvirt-24",
+  "id": "libvirt-23",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'i440FX-pcihost' not found"
@@ -4781,11 +4781,11 @@
   "arguments": {
     "typename": "q35-pcihost"
   },
-  "id": "libvirt-25"
+  "id": "libvirt-24"
 }

 {
-  "id": "libvirt-25",
+  "id": "libvirt-24",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'q35-pcihost' not found"
@@ -4797,7 +4797,7 @@
   "arguments": {
     "typename": "usb-storage"
   },
-  "id": "libvirt-26"
+  "id": "libvirt-25"
 }

 {
@@ -4870,7 +4870,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-26"
+  "id": "libvirt-25"
 }

 {
@@ -4878,11 +4878,11 @@
   "arguments": {
     "typename": "kvm-pit"
   },
-  "id": "libvirt-27"
+  "id": "libvirt-26"
 }

 {
-  "id": "libvirt-27",
+  "id": "libvirt-26",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'kvm-pit' not found"
@@ -4894,7 +4894,7 @@
   "arguments": {
     "typename": "VGA"
   },
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -4951,7 +4951,7 @@
       "type": "int32"
     }
   ],
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -4959,7 +4959,7 @@
   "arguments": {
     "typename": "virtio-gpu-pci"
   },
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
@@ -5110,7 +5110,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
@@ -5118,7 +5118,7 @@
   "arguments": {
     "typename": "virtio-gpu-device"
   },
-  "id": "libvirt-30"
+  "id": "libvirt-29"
 }

 {
@@ -5165,7 +5165,7 @@
       "type": "size"
     }
   ],
-  "id": "libvirt-30"
+  "id": "libvirt-29"
 }

 {
@@ -5173,11 +5173,11 @@
   "arguments": {
     "typename": "ICH9-LPC"
   },
-  "id": "libvirt-31"
+  "id": "libvirt-30"
 }

 {
-  "id": "libvirt-31",
+  "id": "libvirt-30",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'ICH9-LPC' not found"
@@ -5189,7 +5189,7 @@
   "arguments": {
     "typename": "virtio-balloon-pci"
   },
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

 {
@@ -5332,7 +5332,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

 {
@@ -5340,11 +5340,11 @@
   "arguments": {
     "typename": "virtio-balloon-ccw"
   },
-  "id": "libvirt-33"
+  "id": "libvirt-32"
 }

 {
-  "id": "libvirt-33",
+  "id": "libvirt-32",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-balloon-ccw' not found"
@@ -5356,7 +5356,7 @@
   "arguments": {
     "typename": "virtio-balloon-device"
   },
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

 {
@@ -5400,7 +5400,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

 {
@@ -5408,7 +5408,7 @@
   "arguments": {
     "typename": "nec-usb-xhci"
   },
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
@@ -5488,7 +5488,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
@@ -5496,7 +5496,7 @@
   "arguments": {
     "typename": "spapr-pci-host-bridge"
   },
-  "id": "libvirt-36"
+  "id": "libvirt-35"
 }

 {
@@ -5554,7 +5554,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-36"
+  "id": "libvirt-35"
 }

 {
@@ -5562,7 +5562,7 @@
   "arguments": {
     "typename": "memory-backend-file"
   },
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
@@ -5616,7 +5616,7 @@
       "type": "string"
     }
   ],
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
@@ -5624,7 +5624,7 @@
   "arguments": {
     "typename": "spapr-machine"
   },
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
@@ -5785,12 +5785,12 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
   "execute": "query-machines",
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
@@ -5928,12 +5928,12 @@
       "cpu-max": 1
     }
   ],
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
   "execute": "query-cpu-definitions",
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
@@ -8129,35 +8129,35 @@
       "static": false
     }
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
   "execute": "query-tpm-models",
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
   "return": [
   ],
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
   "execute": "query-tpm-types",
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }

 {
   "return": [
     "emulator"
   ],
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }

 {
   "execute": "query-command-line-options",
-  "id": "libvirt-43"
+  "id": "libvirt-42"
 }

 {
@@ -9313,12 +9313,12 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-43"
+  "id": "libvirt-42"
 }

 {
   "execute": "query-migrate-capabilities",
-  "id": "libvirt-44"
+  "id": "libvirt-43"
 }

 {
@@ -9380,12 +9380,12 @@
       "capability": "dirty-bitmaps"
     }
   ],
-  "id": "libvirt-44"
+  "id": "libvirt-43"
 }

 {
   "execute": "query-qmp-schema",
-  "id": "libvirt-45"
+  "id": "libvirt-44"
 }

 {
@@ -20753,7 +20753,7 @@
       "meta-type": "object"
     }
   ],
-  "id": "libvirt-45"
+  "id": "libvirt-44"
 }

 {
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies
index 5a38b8f307..5b107790d3 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies
@@ -537,11 +537,11 @@
   "arguments": {
     "device": "bogus"
   },
-  "id": "libvirt-6"
+  "id": "libvirt-5"
 }

 {
-  "id": "libvirt-6",
+  "id": "libvirt-5",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'bogus' not found"
@@ -550,7 +550,7 @@

 {
   "execute": "query-kvm",
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

 {
@@ -558,12 +558,12 @@
     "enabled": true,
     "present": true
   },
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

 {
   "execute": "query-events",
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

 {
@@ -686,12 +686,12 @@
       "name": "SHUTDOWN"
     }
   ],
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

 {
   "execute": "qom-list-types",
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

 {
@@ -1641,7 +1641,7 @@
       "parent": "virtio-device"
     }
   ],
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

 {
@@ -1649,7 +1649,7 @@
   "arguments": {
     "typename": "virtio-blk-pci"
   },
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

 {
@@ -1881,7 +1881,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

 {
@@ -1889,7 +1889,7 @@
   "arguments": {
     "typename": "virtio-net-pci"
   },
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

 {
@@ -2184,7 +2184,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

 {
@@ -2192,7 +2192,7 @@
   "arguments": {
     "typename": "virtio-scsi-pci"
   },
-  "id": "libvirt-12"
+  "id": "libvirt-11"
 }

 {
@@ -2357,7 +2357,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-12"
+  "id": "libvirt-11"
 }

 {
@@ -2365,7 +2365,7 @@
   "arguments": {
     "typename": "virtio-blk-ccw"
   },
-  "id": "libvirt-13"
+  "id": "libvirt-12"
 }

 {
@@ -2507,7 +2507,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-13"
+  "id": "libvirt-12"
 }

 {
@@ -2515,7 +2515,7 @@
   "arguments": {
     "typename": "virtio-net-ccw"
   },
-  "id": "libvirt-14"
+  "id": "libvirt-13"
 }

 {
@@ -2724,7 +2724,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-14"
+  "id": "libvirt-13"
 }

 {
@@ -2732,7 +2732,7 @@
   "arguments": {
     "typename": "virtio-scsi-ccw"
   },
-  "id": "libvirt-15"
+  "id": "libvirt-14"
 }

 {
@@ -2811,7 +2811,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-15"
+  "id": "libvirt-14"
 }

 {
@@ -2819,11 +2819,11 @@
   "arguments": {
     "typename": "virtio-net-s390"
   },
-  "id": "libvirt-16"
+  "id": "libvirt-15"
 }

 {
-  "id": "libvirt-16",
+  "id": "libvirt-15",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-net-s390' not found"
@@ -2835,11 +2835,11 @@
   "arguments": {
     "typename": "pci-assign"
   },
-  "id": "libvirt-17"
+  "id": "libvirt-16"
 }

 {
-  "id": "libvirt-17",
+  "id": "libvirt-16",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'pci-assign' not found"
@@ -2851,11 +2851,11 @@
   "arguments": {
     "typename": "kvm-pci-assign"
   },
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

 {
-  "id": "libvirt-18",
+  "id": "libvirt-17",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'kvm-pci-assign' not found"
@@ -2867,7 +2867,7 @@
   "arguments": {
     "typename": "vfio-pci"
   },
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -2993,7 +2993,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -3001,7 +3001,7 @@
   "arguments": {
     "typename": "scsi-disk"
   },
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
@@ -3119,7 +3119,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
@@ -3127,11 +3127,11 @@
   "arguments": {
     "typename": "ide-drive"
   },
-  "id": "libvirt-21"
+  "id": "libvirt-20"
 }

 {
-  "id": "libvirt-21",
+  "id": "libvirt-20",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'ide-drive' not found"
@@ -3143,11 +3143,11 @@
   "arguments": {
     "typename": "PIIX4_PM"
   },
-  "id": "libvirt-22"
+  "id": "libvirt-21"
 }

 {
-  "id": "libvirt-22",
+  "id": "libvirt-21",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'PIIX4_PM' not found"
@@ -3159,11 +3159,11 @@
   "arguments": {
     "typename": "usb-host"
   },
-  "id": "libvirt-23"
+  "id": "libvirt-22"
 }

 {
-  "id": "libvirt-23",
+  "id": "libvirt-22",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'usb-host' not found"
@@ -3175,7 +3175,7 @@
   "arguments": {
     "typename": "scsi-generic"
   },
-  "id": "libvirt-24"
+  "id": "libvirt-23"
 }

 {
@@ -3206,7 +3206,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-24"
+  "id": "libvirt-23"
 }

 {
@@ -3214,11 +3214,11 @@
   "arguments": {
     "typename": "i440FX-pcihost"
   },
-  "id": "libvirt-25"
+  "id": "libvirt-24"
 }

 {
-  "id": "libvirt-25",
+  "id": "libvirt-24",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'i440FX-pcihost' not found"
@@ -3230,11 +3230,11 @@
   "arguments": {
     "typename": "q35-pcihost"
   },
-  "id": "libvirt-26"
+  "id": "libvirt-25"
 }

 {
-  "id": "libvirt-26",
+  "id": "libvirt-25",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'q35-pcihost' not found"
@@ -3246,11 +3246,11 @@
   "arguments": {
     "typename": "kvm-pit"
   },
-  "id": "libvirt-27"
+  "id": "libvirt-26"
 }

 {
-  "id": "libvirt-27",
+  "id": "libvirt-26",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'kvm-pit' not found"
@@ -3262,7 +3262,7 @@
   "arguments": {
     "typename": "virtio-gpu-pci"
   },
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -3413,7 +3413,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -3421,7 +3421,7 @@
   "arguments": {
     "typename": "virtio-gpu-device"
   },
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
@@ -3468,7 +3468,7 @@
       "type": "size"
     }
   ],
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
@@ -3476,11 +3476,11 @@
   "arguments": {
     "typename": "ICH9-LPC"
   },
-  "id": "libvirt-30"
+  "id": "libvirt-29"
 }

 {
-  "id": "libvirt-30",
+  "id": "libvirt-29",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'ICH9-LPC' not found"
@@ -3492,7 +3492,7 @@
   "arguments": {
     "typename": "virtio-balloon-pci"
   },
-  "id": "libvirt-31"
+  "id": "libvirt-30"
 }

 {
@@ -3635,7 +3635,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-31"
+  "id": "libvirt-30"
 }

 {
@@ -3643,7 +3643,7 @@
   "arguments": {
     "typename": "virtio-balloon-ccw"
   },
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

 {
@@ -3705,7 +3705,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

 {
@@ -3713,7 +3713,7 @@
   "arguments": {
     "typename": "virtio-balloon-device"
   },
-  "id": "libvirt-33"
+  "id": "libvirt-32"
 }

 {
@@ -3757,7 +3757,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-33"
+  "id": "libvirt-32"
 }

 {
@@ -3765,7 +3765,7 @@
   "arguments": {
     "typename": "virtio-gpu-ccw"
   },
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

 {
@@ -3830,7 +3830,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

 {
@@ -3838,7 +3838,7 @@
   "arguments": {
     "typename": "virtual-css-bridge"
   },
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
@@ -3853,7 +3853,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
@@ -3861,7 +3861,7 @@
   "arguments": {
     "typename": "memory-backend-file"
   },
-  "id": "libvirt-36"
+  "id": "libvirt-35"
 }

 {
@@ -3915,7 +3915,7 @@
       "type": "string"
     }
   ],
-  "id": "libvirt-36"
+  "id": "libvirt-35"
 }

 {
@@ -3923,11 +3923,11 @@
   "arguments": {
     "typename": "spapr-machine"
   },
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
-  "id": "libvirt-37",
+  "id": "libvirt-36",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Class 'spapr-machine' not found"
@@ -3936,7 +3936,7 @@

 {
   "execute": "query-machines",
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
@@ -3994,12 +3994,12 @@
       "alias": "s390-ccw-virtio"
     }
   ],
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
   "execute": "query-cpu-definitions",
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
@@ -4534,35 +4534,35 @@
       "migration-safe": true
     }
   ],
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
   "execute": "query-tpm-models",
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
   "return": [
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
   "execute": "query-tpm-types",
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
   "return": [
     "emulator"
   ],
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
   "execute": "query-command-line-options",
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }

 {
@@ -5687,12 +5687,12 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }

 {
   "execute": "query-migrate-capabilities",
-  "id": "libvirt-43"
+  "id": "libvirt-42"
 }

 {
@@ -5754,12 +5754,12 @@
       "capability": "dirty-bitmaps"
     }
   ],
-  "id": "libvirt-43"
+  "id": "libvirt-42"
 }

 {
   "execute": "query-qmp-schema",
-  "id": "libvirt-44"
+  "id": "libvirt-43"
 }

 {
@@ -17127,7 +17127,7 @@
       "meta-type": "object"
     }
   ],
-  "id": "libvirt-44"
+  "id": "libvirt-43"
 }

 {
@@ -17138,7 +17138,7 @@
       "name": "host"
     }
   },
-  "id": "libvirt-45"
+  "id": "libvirt-44"
 }

 {
@@ -17176,7 +17176,7 @@
       }
     }
   },
-  "id": "libvirt-45"
+  "id": "libvirt-44"
 }

 {
@@ -17190,11 +17190,11 @@
       }
     }
   },
-  "id": "libvirt-46"
+  "id": "libvirt-45"
 }

 {
-  "id": "libvirt-46",
+  "id": "libvirt-45",
   "error": {
     "class": "GenericError",
     "desc": "Property '.migratable' not found"
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies
index be759fa019..d17d2f65fc 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies
@@ -543,11 +543,11 @@
   "arguments": {
     "device": "bogus"
   },
-  "id": "libvirt-6"
+  "id": "libvirt-5"
 }

 {
-  "id": "libvirt-6",
+  "id": "libvirt-5",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'bogus' not found"
@@ -556,7 +556,7 @@

 {
   "execute": "query-kvm",
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

 {
@@ -564,12 +564,12 @@
     "enabled": true,
     "present": true
   },
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

 {
   "execute": "query-events",
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

 {
@@ -692,12 +692,12 @@
       "name": "SHUTDOWN"
     }
   ],
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

 {
   "execute": "qom-list-types",
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

 {
@@ -2347,7 +2347,7 @@
       "parent": "rng-backend"
     }
   ],
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

 {
@@ -2355,7 +2355,7 @@
   "arguments": {
     "typename": "virtio-blk-pci"
   },
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

 {
@@ -2587,7 +2587,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

 {
@@ -2595,7 +2595,7 @@
   "arguments": {
     "typename": "virtio-net-pci"
   },
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

 {
@@ -2890,7 +2890,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

 {
@@ -2898,7 +2898,7 @@
   "arguments": {
     "typename": "virtio-scsi-pci"
   },
-  "id": "libvirt-12"
+  "id": "libvirt-11"
 }

 {
@@ -3063,7 +3063,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-12"
+  "id": "libvirt-11"
 }

 {
@@ -3071,11 +3071,11 @@
   "arguments": {
     "typename": "virtio-net-ccw"
   },
-  "id": "libvirt-13"
+  "id": "libvirt-12"
 }

 {
-  "id": "libvirt-13",
+  "id": "libvirt-12",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-net-ccw' not found"
@@ -3087,11 +3087,11 @@
   "arguments": {
     "typename": "virtio-scsi-ccw"
   },
-  "id": "libvirt-14"
+  "id": "libvirt-13"
 }

 {
-  "id": "libvirt-14",
+  "id": "libvirt-13",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-scsi-ccw' not found"
@@ -3103,11 +3103,11 @@
   "arguments": {
     "typename": "virtio-net-s390"
   },
-  "id": "libvirt-15"
+  "id": "libvirt-14"
 }

 {
-  "id": "libvirt-15",
+  "id": "libvirt-14",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-net-s390' not found"
@@ -3119,11 +3119,11 @@
   "arguments": {
     "typename": "pci-assign"
   },
-  "id": "libvirt-16"
+  "id": "libvirt-15"
 }

 {
-  "id": "libvirt-16",
+  "id": "libvirt-15",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'pci-assign' not found"
@@ -3135,11 +3135,11 @@
   "arguments": {
     "typename": "kvm-pci-assign"
   },
-  "id": "libvirt-17"
+  "id": "libvirt-16"
 }

 {
-  "id": "libvirt-17",
+  "id": "libvirt-16",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'kvm-pci-assign' not found"
@@ -3151,7 +3151,7 @@
   "arguments": {
     "typename": "vfio-pci"
   },
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

 {
@@ -3277,7 +3277,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

 {
@@ -3285,7 +3285,7 @@
   "arguments": {
     "typename": "scsi-disk"
   },
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -3399,7 +3399,7 @@
       "type": "uint64"
     }
   ],
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -3407,7 +3407,7 @@
   "arguments": {
     "typename": "ide-drive"
   },
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
@@ -3483,7 +3483,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
@@ -3491,7 +3491,7 @@
   "arguments": {
     "typename": "PIIX4_PM"
   },
-  "id": "libvirt-21"
+  "id": "libvirt-20"
 }

 {
@@ -3554,7 +3554,7 @@
       "type": "int32"
     }
   ],
-  "id": "libvirt-21"
+  "id": "libvirt-20"
 }

 {
@@ -3562,7 +3562,7 @@
   "arguments": {
     "typename": "usb-redir"
   },
-  "id": "libvirt-22"
+  "id": "libvirt-21"
 }

 {
@@ -3611,7 +3611,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-22"
+  "id": "libvirt-21"
 }

 {
@@ -3619,7 +3619,7 @@
   "arguments": {
     "typename": "usb-host"
   },
-  "id": "libvirt-23"
+  "id": "libvirt-22"
 }

 {
@@ -3688,7 +3688,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-23"
+  "id": "libvirt-22"
 }

 {
@@ -3696,7 +3696,7 @@
   "arguments": {
     "typename": "scsi-generic"
   },
-  "id": "libvirt-24"
+  "id": "libvirt-23"
 }

 {
@@ -3727,7 +3727,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-24"
+  "id": "libvirt-23"
 }

 {
@@ -3735,7 +3735,7 @@
   "arguments": {
     "typename": "i440FX-pcihost"
   },
-  "id": "libvirt-25"
+  "id": "libvirt-24"
 }

 {
@@ -3777,7 +3777,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-25"
+  "id": "libvirt-24"
 }

 {
@@ -3785,7 +3785,7 @@
   "arguments": {
     "typename": "q35-pcihost"
   },
-  "id": "libvirt-26"
+  "id": "libvirt-25"
 }

 {
@@ -3867,7 +3867,7 @@
       "type": "uint64"
     }
   ],
-  "id": "libvirt-26"
+  "id": "libvirt-25"
 }

 {
@@ -3875,7 +3875,7 @@
   "arguments": {
     "typename": "usb-storage"
   },
-  "id": "libvirt-27"
+  "id": "libvirt-26"
 }

 {
@@ -3948,7 +3948,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-27"
+  "id": "libvirt-26"
 }

 {
@@ -3956,7 +3956,7 @@
   "arguments": {
     "typename": "kvm-pit"
   },
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -3970,7 +3970,7 @@
       "type": "LostTickPolicy"
     }
   ],
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -3978,7 +3978,7 @@
   "arguments": {
     "typename": "VGA"
   },
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
@@ -4035,7 +4035,7 @@
       "type": "int32"
     }
   ],
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
@@ -4043,7 +4043,7 @@
   "arguments": {
     "typename": "vmware-svga"
   },
-  "id": "libvirt-30"
+  "id": "libvirt-29"
 }

 {
@@ -4086,7 +4086,7 @@
       "type": "int32"
     }
   ],
-  "id": "libvirt-30"
+  "id": "libvirt-29"
 }

 {
@@ -4094,7 +4094,7 @@
   "arguments": {
     "typename": "qxl"
   },
-  "id": "libvirt-31"
+  "id": "libvirt-30"
 }

 {
@@ -4189,7 +4189,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-31"
+  "id": "libvirt-30"
 }

 {
@@ -4197,7 +4197,7 @@
   "arguments": {
     "typename": "virtio-gpu-pci"
   },
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

 {
@@ -4348,7 +4348,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

 {
@@ -4356,7 +4356,7 @@
   "arguments": {
     "typename": "virtio-gpu-device"
   },
-  "id": "libvirt-33"
+  "id": "libvirt-32"
 }

 {
@@ -4403,7 +4403,7 @@
       "type": "size"
     }
   ],
-  "id": "libvirt-33"
+  "id": "libvirt-32"
 }

 {
@@ -4411,7 +4411,7 @@
   "arguments": {
     "typename": "ICH9-LPC"
   },
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

 {
@@ -4507,7 +4507,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

 {
@@ -4515,7 +4515,7 @@
   "arguments": {
     "typename": "virtio-balloon-pci"
   },
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
@@ -4658,7 +4658,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
@@ -4666,11 +4666,11 @@
   "arguments": {
     "typename": "virtio-balloon-ccw"
   },
-  "id": "libvirt-36"
+  "id": "libvirt-35"
 }

 {
-  "id": "libvirt-36",
+  "id": "libvirt-35",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-balloon-ccw' not found"
@@ -4682,7 +4682,7 @@
   "arguments": {
     "typename": "virtio-balloon-device"
   },
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
@@ -4726,7 +4726,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
@@ -4734,7 +4734,7 @@
   "arguments": {
     "typename": "nec-usb-xhci"
   },
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
@@ -4814,7 +4814,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
@@ -4822,7 +4822,7 @@
   "arguments": {
     "typename": "intel-iommu"
   },
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
@@ -4861,7 +4861,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
@@ -4869,7 +4869,7 @@
   "arguments": {
     "typename": "mch"
   },
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
@@ -4912,7 +4912,7 @@
       "type": "int32"
     }
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
@@ -4920,7 +4920,7 @@
   "arguments": {
     "typename": "memory-backend-file"
   },
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
@@ -4974,7 +4974,7 @@
       "type": "string"
     }
   ],
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
@@ -4982,11 +4982,11 @@
   "arguments": {
     "typename": "spapr-machine"
   },
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }

 {
-  "id": "libvirt-42",
+  "id": "libvirt-41",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Class 'spapr-machine' not found"
@@ -4995,7 +4995,7 @@

 {
   "execute": "query-machines",
-  "id": "libvirt-43"
+  "id": "libvirt-42"
 }

 {
@@ -5194,12 +5194,12 @@
       "cpu-max": 255
     }
   ],
-  "id": "libvirt-43"
+  "id": "libvirt-42"
 }

 {
   "execute": "query-cpu-definitions",
-  "id": "libvirt-44"
+  "id": "libvirt-43"
 }

 {
@@ -5713,12 +5713,12 @@
       "migration-safe": true
     }
   ],
-  "id": "libvirt-44"
+  "id": "libvirt-43"
 }

 {
   "execute": "query-tpm-models",
-  "id": "libvirt-45"
+  "id": "libvirt-44"
 }

 {
@@ -5726,12 +5726,12 @@
     "tpm-crb",
     "tpm-tis"
   ],
-  "id": "libvirt-45"
+  "id": "libvirt-44"
 }

 {
   "execute": "query-tpm-types",
-  "id": "libvirt-46"
+  "id": "libvirt-45"
 }

 {
@@ -5739,12 +5739,12 @@
     "passthrough",
     "emulator"
   ],
-  "id": "libvirt-46"
+  "id": "libvirt-45"
 }

 {
   "execute": "query-command-line-options",
-  "id": "libvirt-47"
+  "id": "libvirt-46"
 }

 {
@@ -7031,12 +7031,12 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-47"
+  "id": "libvirt-46"
 }

 {
   "execute": "query-migrate-capabilities",
-  "id": "libvirt-48"
+  "id": "libvirt-47"
 }

 {
@@ -7098,12 +7098,12 @@
       "capability": "dirty-bitmaps"
     }
   ],
-  "id": "libvirt-48"
+  "id": "libvirt-47"
 }

 {
   "execute": "query-qmp-schema",
-  "id": "libvirt-49"
+  "id": "libvirt-48"
 }

 {
@@ -18471,7 +18471,7 @@
       "meta-type": "object"
     }
   ],
-  "id": "libvirt-49"
+  "id": "libvirt-48"
 }

 {
@@ -18482,7 +18482,7 @@
       "name": "host"
     }
   },
-  "id": "libvirt-50"
+  "id": "libvirt-49"
 }

 {
@@ -18672,7 +18672,7 @@
       }
     }
   },
-  "id": "libvirt-50"
+  "id": "libvirt-49"
 }

 {
@@ -18864,7 +18864,7 @@
       }
     }
   },
-  "id": "libvirt-51"
+  "id": "libvirt-50"
 }

 {
@@ -19119,7 +19119,7 @@
       }
     }
   },
-  "id": "libvirt-51"
+  "id": "libvirt-50"
 }

 {
@@ -19133,7 +19133,7 @@
       }
     }
   },
-  "id": "libvirt-52"
+  "id": "libvirt-51"
 }

 {
@@ -19323,7 +19323,7 @@
       }
     }
   },
-  "id": "libvirt-52"
+  "id": "libvirt-51"
 }

 {
@@ -19515,7 +19515,7 @@
       }
     }
   },
-  "id": "libvirt-53"
+  "id": "libvirt-52"
 }

 {
@@ -19770,12 +19770,12 @@
       }
     }
   },
-  "id": "libvirt-53"
+  "id": "libvirt-52"
 }

 {
   "execute": "query-sev-capabilities",
-  "id": "libvirt-54"
+  "id": "libvirt-53"
 }

 {
@@ -19785,7 +19785,7 @@
     "cert-chain": "AQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAA",
     "pdh": "AQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAA"
   },
-  "id": "libvirt-54"
+  "id": "libvirt-53"
 }

 {
diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies
index 39fdf0c792..32c31f406d 100644
--- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies
@@ -432,11 +432,11 @@
   "arguments": {
     "device": "bogus"
   },
-  "id": "libvirt-6"
+  "id": "libvirt-5"
 }

 {
-  "id": "libvirt-6",
+  "id": "libvirt-5",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'bogus' not found"
@@ -445,7 +445,7 @@

 {
   "execute": "query-kvm",
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

 {
@@ -453,12 +453,12 @@
     "enabled": true,
     "present": true
   },
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

 {
   "execute": "query-events",
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

 {
@@ -569,12 +569,12 @@
       "name": "BLOCK_IMAGE_CORRUPTED"
     }
   ],
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

 {
   "execute": "qom-list-types",
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

 {
@@ -1462,7 +1462,7 @@
       "name": "virtio-blk-device"
     }
   ],
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

 {
@@ -1470,7 +1470,7 @@
   "arguments": {
     "typename": "virtio-blk-pci"
   },
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

 {
@@ -1622,7 +1622,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

 {
@@ -1630,7 +1630,7 @@
   "arguments": {
     "typename": "virtio-net-pci"
   },
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

 {
@@ -1843,7 +1843,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

 {
@@ -1851,7 +1851,7 @@
   "arguments": {
     "typename": "virtio-scsi-pci"
   },
-  "id": "libvirt-12"
+  "id": "libvirt-11"
 }

 {
@@ -1954,7 +1954,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-12"
+  "id": "libvirt-11"
 }

 {
@@ -1962,11 +1962,11 @@
   "arguments": {
     "typename": "virtio-net-ccw"
   },
-  "id": "libvirt-13"
+  "id": "libvirt-12"
 }

 {
-  "id": "libvirt-13",
+  "id": "libvirt-12",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-net-ccw' not found"
@@ -1978,11 +1978,11 @@
   "arguments": {
     "typename": "virtio-scsi-ccw"
   },
-  "id": "libvirt-14"
+  "id": "libvirt-13"
 }

 {
-  "id": "libvirt-14",
+  "id": "libvirt-13",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-scsi-ccw' not found"
@@ -1994,11 +1994,11 @@
   "arguments": {
     "typename": "virtio-net-s390"
   },
-  "id": "libvirt-15"
+  "id": "libvirt-14"
 }

 {
-  "id": "libvirt-15",
+  "id": "libvirt-14",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-net-s390' not found"
@@ -2010,11 +2010,11 @@
   "arguments": {
     "typename": "pci-assign"
   },
-  "id": "libvirt-16"
+  "id": "libvirt-15"
 }

 {
-  "id": "libvirt-16",
+  "id": "libvirt-15",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'pci-assign' not found"
@@ -2026,7 +2026,7 @@
   "arguments": {
     "typename": "kvm-pci-assign"
   },
-  "id": "libvirt-17"
+  "id": "libvirt-16"
 }

 {
@@ -2078,7 +2078,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-17"
+  "id": "libvirt-16"
 }

 {
@@ -2086,7 +2086,7 @@
   "arguments": {
     "typename": "vfio-pci"
   },
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

 {
@@ -2142,7 +2142,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

 {
@@ -2150,7 +2150,7 @@
   "arguments": {
     "typename": "scsi-disk"
   },
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -2245,7 +2245,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -2253,7 +2253,7 @@
   "arguments": {
     "typename": "ide-drive"
   },
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
@@ -2310,7 +2310,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
@@ -2318,7 +2318,7 @@
   "arguments": {
     "typename": "PIIX4_PM"
   },
-  "id": "libvirt-21"
+  "id": "libvirt-20"
 }

 {
@@ -2371,7 +2371,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-21"
+  "id": "libvirt-20"
 }

 {
@@ -2379,7 +2379,7 @@
   "arguments": {
     "typename": "usb-redir"
   },
-  "id": "libvirt-22"
+  "id": "libvirt-21"
 }

 {
@@ -2420,7 +2420,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-22"
+  "id": "libvirt-21"
 }

 {
@@ -2428,7 +2428,7 @@
   "arguments": {
     "typename": "usb-host"
   },
-  "id": "libvirt-23"
+  "id": "libvirt-22"
 }

 {
@@ -2493,7 +2493,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-23"
+  "id": "libvirt-22"
 }

 {
@@ -2501,7 +2501,7 @@
   "arguments": {
     "typename": "scsi-generic"
   },
-  "id": "libvirt-24"
+  "id": "libvirt-23"
 }

 {
@@ -2528,7 +2528,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-24"
+  "id": "libvirt-23"
 }

 {
@@ -2536,7 +2536,7 @@
   "arguments": {
     "typename": "i440FX-pcihost"
   },
-  "id": "libvirt-25"
+  "id": "libvirt-24"
 }

 {
@@ -2574,7 +2574,7 @@
       "type": "size"
     }
   ],
-  "id": "libvirt-25"
+  "id": "libvirt-24"
 }

 {
@@ -2582,7 +2582,7 @@
   "arguments": {
     "typename": "q35-pcihost"
   },
-  "id": "libvirt-26"
+  "id": "libvirt-25"
 }

 {
@@ -2636,7 +2636,7 @@
       "type": "uint64"
     }
   ],
-  "id": "libvirt-26"
+  "id": "libvirt-25"
 }

 {
@@ -2644,7 +2644,7 @@
   "arguments": {
     "typename": "usb-storage"
   },
-  "id": "libvirt-27"
+  "id": "libvirt-26"
 }

 {
@@ -2704,7 +2704,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-27"
+  "id": "libvirt-26"
 }

 {
@@ -2712,7 +2712,7 @@
   "arguments": {
     "typename": "kvm-pit"
   },
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -2726,7 +2726,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -2734,7 +2734,7 @@
   "arguments": {
     "typename": "VGA"
   },
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
@@ -2781,7 +2781,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
@@ -2789,7 +2789,7 @@
   "arguments": {
     "typename": "vmware-svga"
   },
-  "id": "libvirt-30"
+  "id": "libvirt-29"
 }

 {
@@ -2822,7 +2822,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-30"
+  "id": "libvirt-29"
 }

 {
@@ -2830,7 +2830,7 @@
   "arguments": {
     "typename": "qxl"
   },
-  "id": "libvirt-31"
+  "id": "libvirt-30"
 }

 {
@@ -2907,7 +2907,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-31"
+  "id": "libvirt-30"
 }

 {
@@ -2915,7 +2915,7 @@
   "arguments": {
     "typename": "virtio-gpu-pci"
   },
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

 {
@@ -2996,7 +2996,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

 {
@@ -3004,7 +3004,7 @@
   "arguments": {
     "typename": "virtio-gpu-device"
   },
-  "id": "libvirt-33"
+  "id": "libvirt-32"
 }

 {
@@ -3034,7 +3034,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-33"
+  "id": "libvirt-32"
 }

 {
@@ -3042,7 +3042,7 @@
   "arguments": {
     "typename": "ICH9-LPC"
   },
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

 {
@@ -3119,7 +3119,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

 {
@@ -3127,7 +3127,7 @@
   "arguments": {
     "typename": "virtio-balloon-pci"
   },
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
@@ -3212,7 +3212,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
@@ -3220,11 +3220,11 @@
   "arguments": {
     "typename": "virtio-balloon-ccw"
   },
-  "id": "libvirt-36"
+  "id": "libvirt-35"
 }

 {
-  "id": "libvirt-36",
+  "id": "libvirt-35",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-balloon-ccw' not found"
@@ -3236,7 +3236,7 @@
   "arguments": {
     "typename": "virtio-balloon-device"
   },
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
@@ -3275,7 +3275,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
@@ -3283,7 +3283,7 @@
   "arguments": {
     "typename": "nec-usb-xhci"
   },
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
@@ -3353,7 +3353,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
@@ -3361,7 +3361,7 @@
   "arguments": {
     "typename": "intel-iommu"
   },
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
@@ -3371,7 +3371,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
@@ -3379,7 +3379,7 @@
   "arguments": {
     "typename": "mch"
   },
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
@@ -3405,12 +3405,12 @@
       "type": "pci-devfn"
     }
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
   "execute": "query-machines",
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
@@ -3539,12 +3539,12 @@
       "cpu-max": 255
     }
   ],
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
   "execute": "query-cpu-definitions",
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }

 {
@@ -3634,36 +3634,36 @@
       "name": "qemu64"
     }
   ],
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }

 {
   "execute": "query-tpm-models",
-  "id": "libvirt-43"
+  "id": "libvirt-42"
 }

 {
   "return": [
     "tpm-tis"
   ],
-  "id": "libvirt-43"
+  "id": "libvirt-42"
 }

 {
   "execute": "query-tpm-types",
-  "id": "libvirt-44"
+  "id": "libvirt-43"
 }

 {
   "return": [
     "passthrough"
   ],
-  "id": "libvirt-44"
+  "id": "libvirt-43"
 }

 {
   "execute": "query-command-line-options",
-  "id": "libvirt-45"
+  "id": "libvirt-44"
 }

 {
@@ -4671,12 +4671,12 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-45"
+  "id": "libvirt-44"
 }

 {
   "execute": "query-migrate-capabilities",
-  "id": "libvirt-46"
+  "id": "libvirt-45"
 }

 {
@@ -4706,7 +4706,7 @@
       "capability": "events"
     }
   ],
-  "id": "libvirt-46"
+  "id": "libvirt-45"
 }

 {
diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies
index 565561d7f0..b9ad3600ef 100644
--- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies
@@ -459,11 +459,11 @@
   "arguments": {
     "device": "bogus"
   },
-  "id": "libvirt-6"
+  "id": "libvirt-5"
 }

 {
-  "id": "libvirt-6",
+  "id": "libvirt-5",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'bogus' not found"
@@ -472,7 +472,7 @@

 {
   "execute": "query-kvm",
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

 {
@@ -480,12 +480,12 @@
     "enabled": true,
     "present": true
   },
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

 {
   "execute": "query-events",
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

 {
@@ -596,12 +596,12 @@
       "name": "ACPI_DEVICE_OST"
     }
   ],
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

 {
   "execute": "qom-list-types",
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

 {
@@ -1507,7 +1507,7 @@
       "name": "virtio-blk-device"
     }
   ],
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

 {
@@ -1515,7 +1515,7 @@
   "arguments": {
     "typename": "virtio-blk-pci"
   },
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

 {
@@ -1677,7 +1677,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

 {
@@ -1685,7 +1685,7 @@
   "arguments": {
     "typename": "virtio-net-pci"
   },
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

 {
@@ -1913,7 +1913,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

 {
@@ -1921,7 +1921,7 @@
   "arguments": {
     "typename": "virtio-scsi-pci"
   },
-  "id": "libvirt-12"
+  "id": "libvirt-11"
 }

 {
@@ -2039,7 +2039,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-12"
+  "id": "libvirt-11"
 }

 {
@@ -2047,11 +2047,11 @@
   "arguments": {
     "typename": "virtio-net-ccw"
   },
-  "id": "libvirt-13"
+  "id": "libvirt-12"
 }

 {
-  "id": "libvirt-13",
+  "id": "libvirt-12",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-net-ccw' not found"
@@ -2063,11 +2063,11 @@
   "arguments": {
     "typename": "virtio-scsi-ccw"
   },
-  "id": "libvirt-14"
+  "id": "libvirt-13"
 }

 {
-  "id": "libvirt-14",
+  "id": "libvirt-13",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-scsi-ccw' not found"
@@ -2079,11 +2079,11 @@
   "arguments": {
     "typename": "virtio-net-s390"
   },
-  "id": "libvirt-15"
+  "id": "libvirt-14"
 }

 {
-  "id": "libvirt-15",
+  "id": "libvirt-14",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-net-s390' not found"
@@ -2095,11 +2095,11 @@
   "arguments": {
     "typename": "pci-assign"
   },
-  "id": "libvirt-16"
+  "id": "libvirt-15"
 }

 {
-  "id": "libvirt-16",
+  "id": "libvirt-15",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'pci-assign' not found"
@@ -2111,7 +2111,7 @@
   "arguments": {
     "typename": "kvm-pci-assign"
   },
-  "id": "libvirt-17"
+  "id": "libvirt-16"
 }

 {
@@ -2163,7 +2163,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-17"
+  "id": "libvirt-16"
 }

 {
@@ -2171,7 +2171,7 @@
   "arguments": {
     "typename": "vfio-pci"
   },
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

 {
@@ -2255,7 +2255,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

 {
@@ -2263,7 +2263,7 @@
   "arguments": {
     "typename": "scsi-disk"
   },
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -2358,7 +2358,7 @@
       "type": "uint64"
     }
   ],
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -2366,7 +2366,7 @@
   "arguments": {
     "typename": "ide-drive"
   },
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
@@ -2423,7 +2423,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
@@ -2431,7 +2431,7 @@
   "arguments": {
     "typename": "PIIX4_PM"
   },
-  "id": "libvirt-21"
+  "id": "libvirt-20"
 }

 {
@@ -2484,7 +2484,7 @@
       "type": "int32"
     }
   ],
-  "id": "libvirt-21"
+  "id": "libvirt-20"
 }

 {
@@ -2492,7 +2492,7 @@
   "arguments": {
     "typename": "usb-redir"
   },
-  "id": "libvirt-22"
+  "id": "libvirt-21"
 }

 {
@@ -2533,7 +2533,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-22"
+  "id": "libvirt-21"
 }

 {
@@ -2541,7 +2541,7 @@
   "arguments": {
     "typename": "usb-host"
   },
-  "id": "libvirt-23"
+  "id": "libvirt-22"
 }

 {
@@ -2606,7 +2606,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-23"
+  "id": "libvirt-22"
 }

 {
@@ -2614,7 +2614,7 @@
   "arguments": {
     "typename": "scsi-generic"
   },
-  "id": "libvirt-24"
+  "id": "libvirt-23"
 }

 {
@@ -2641,7 +2641,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-24"
+  "id": "libvirt-23"
 }

 {
@@ -2649,7 +2649,7 @@
   "arguments": {
     "typename": "i440FX-pcihost"
   },
-  "id": "libvirt-25"
+  "id": "libvirt-24"
 }

 {
@@ -2687,7 +2687,7 @@
       "type": "child<qemu:memory-region>"
     }
   ],
-  "id": "libvirt-25"
+  "id": "libvirt-24"
 }

 {
@@ -2695,7 +2695,7 @@
   "arguments": {
     "typename": "q35-pcihost"
   },
-  "id": "libvirt-26"
+  "id": "libvirt-25"
 }

 {
@@ -2749,7 +2749,7 @@
       "type": "child<qemu:memory-region>"
     }
   ],
-  "id": "libvirt-26"
+  "id": "libvirt-25"
 }

 {
@@ -2757,7 +2757,7 @@
   "arguments": {
     "typename": "usb-storage"
   },
-  "id": "libvirt-27"
+  "id": "libvirt-26"
 }

 {
@@ -2817,7 +2817,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-27"
+  "id": "libvirt-26"
 }

 {
@@ -2825,7 +2825,7 @@
   "arguments": {
     "typename": "kvm-pit"
   },
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -2839,7 +2839,7 @@
       "type": "LostTickPolicy"
     }
   ],
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -2847,7 +2847,7 @@
   "arguments": {
     "typename": "VGA"
   },
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
@@ -2894,7 +2894,7 @@
       "type": "int32"
     }
   ],
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
@@ -2902,7 +2902,7 @@
   "arguments": {
     "typename": "vmware-svga"
   },
-  "id": "libvirt-30"
+  "id": "libvirt-29"
 }

 {
@@ -2935,7 +2935,7 @@
       "type": "int32"
     }
   ],
-  "id": "libvirt-30"
+  "id": "libvirt-29"
 }

 {
@@ -2943,7 +2943,7 @@
   "arguments": {
     "typename": "qxl"
   },
-  "id": "libvirt-31"
+  "id": "libvirt-30"
 }

 {
@@ -3020,7 +3020,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-31"
+  "id": "libvirt-30"
 }

 {
@@ -3028,7 +3028,7 @@
   "arguments": {
     "typename": "virtio-gpu-pci"
   },
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

 {
@@ -3134,7 +3134,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

 {
@@ -3142,7 +3142,7 @@
   "arguments": {
     "typename": "virtio-gpu-device"
   },
-  "id": "libvirt-33"
+  "id": "libvirt-32"
 }

 {
@@ -3182,7 +3182,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-33"
+  "id": "libvirt-32"
 }

 {
@@ -3190,7 +3190,7 @@
   "arguments": {
     "typename": "ICH9-LPC"
   },
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

 {
@@ -3267,7 +3267,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

 {
@@ -3275,7 +3275,7 @@
   "arguments": {
     "typename": "virtio-balloon-pci"
   },
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
@@ -3375,7 +3375,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
@@ -3383,11 +3383,11 @@
   "arguments": {
     "typename": "virtio-balloon-ccw"
   },
-  "id": "libvirt-36"
+  "id": "libvirt-35"
 }

 {
-  "id": "libvirt-36",
+  "id": "libvirt-35",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-balloon-ccw' not found"
@@ -3399,7 +3399,7 @@
   "arguments": {
     "typename": "virtio-balloon-device"
   },
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
@@ -3438,7 +3438,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
@@ -3446,7 +3446,7 @@
   "arguments": {
     "typename": "nec-usb-xhci"
   },
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
@@ -3516,7 +3516,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
@@ -3524,7 +3524,7 @@
   "arguments": {
     "typename": "intel-iommu"
   },
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
@@ -3534,7 +3534,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
@@ -3542,7 +3542,7 @@
   "arguments": {
     "typename": "mch"
   },
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
@@ -3568,12 +3568,12 @@
       "type": "pci-devfn"
     }
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
   "execute": "query-machines",
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
@@ -3710,12 +3710,12 @@
       "cpu-max": 255
     }
   ],
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
   "execute": "query-cpu-definitions",
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }

 {
@@ -3805,36 +3805,36 @@
       "name": "qemu64"
     }
   ],
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }

 {
   "execute": "query-tpm-models",
-  "id": "libvirt-43"
+  "id": "libvirt-42"
 }

 {
   "return": [
     "tpm-tis"
   ],
-  "id": "libvirt-43"
+  "id": "libvirt-42"
 }

 {
   "execute": "query-tpm-types",
-  "id": "libvirt-44"
+  "id": "libvirt-43"
 }

 {
   "return": [
     "passthrough"
   ],
-  "id": "libvirt-44"
+  "id": "libvirt-43"
 }

 {
   "execute": "query-command-line-options",
-  "id": "libvirt-45"
+  "id": "libvirt-44"
 }

 {
@@ -4879,12 +4879,12 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-45"
+  "id": "libvirt-44"
 }

 {
   "execute": "query-migrate-capabilities",
-  "id": "libvirt-46"
+  "id": "libvirt-45"
 }

 {
@@ -4918,12 +4918,12 @@
       "capability": "x-postcopy-ram"
     }
   ],
-  "id": "libvirt-46"
+  "id": "libvirt-45"
 }

 {
   "execute": "query-qmp-schema",
-  "id": "libvirt-47"
+  "id": "libvirt-46"
 }

 {
@@ -12468,7 +12468,7 @@
       "meta-type": "array"
     }
   ],
-  "id": "libvirt-47"
+  "id": "libvirt-46"
 }

 {
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies
index 1072038e2a..4914577f14 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies
@@ -462,11 +462,11 @@
   "arguments": {
     "device": "bogus"
   },
-  "id": "libvirt-6"
+  "id": "libvirt-5"
 }

 {
-  "id": "libvirt-6",
+  "id": "libvirt-5",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'bogus' not found"
@@ -475,7 +475,7 @@

 {
   "execute": "query-kvm",
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

 {
@@ -483,12 +483,12 @@
     "enabled": true,
     "present": true
   },
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

 {
   "execute": "query-events",
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

 {
@@ -605,12 +605,12 @@
       "name": "ACPI_DEVICE_OST"
     }
   ],
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

 {
   "execute": "qom-list-types",
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

 {
@@ -2266,7 +2266,7 @@
       "name": "fw-path-provider"
     }
   ],
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

 {
@@ -2274,7 +2274,7 @@
   "arguments": {
     "typename": "virtio-blk-pci"
   },
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

 {
@@ -2436,7 +2436,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

 {
@@ -2444,7 +2444,7 @@
   "arguments": {
     "typename": "virtio-net-pci"
   },
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

 {
@@ -2672,7 +2672,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

 {
@@ -2680,7 +2680,7 @@
   "arguments": {
     "typename": "virtio-scsi-pci"
   },
-  "id": "libvirt-12"
+  "id": "libvirt-11"
 }

 {
@@ -2798,7 +2798,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-12"
+  "id": "libvirt-11"
 }

 {
@@ -2806,11 +2806,11 @@
   "arguments": {
     "typename": "virtio-net-ccw"
   },
-  "id": "libvirt-13"
+  "id": "libvirt-12"
 }

 {
-  "id": "libvirt-13",
+  "id": "libvirt-12",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-net-ccw' not found"
@@ -2822,11 +2822,11 @@
   "arguments": {
     "typename": "virtio-scsi-ccw"
   },
-  "id": "libvirt-14"
+  "id": "libvirt-13"
 }

 {
-  "id": "libvirt-14",
+  "id": "libvirt-13",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-scsi-ccw' not found"
@@ -2838,11 +2838,11 @@
   "arguments": {
     "typename": "virtio-net-s390"
   },
-  "id": "libvirt-15"
+  "id": "libvirt-14"
 }

 {
-  "id": "libvirt-15",
+  "id": "libvirt-14",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-net-s390' not found"
@@ -2854,11 +2854,11 @@
   "arguments": {
     "typename": "pci-assign"
   },
-  "id": "libvirt-16"
+  "id": "libvirt-15"
 }

 {
-  "id": "libvirt-16",
+  "id": "libvirt-15",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'pci-assign' not found"
@@ -2870,11 +2870,11 @@
   "arguments": {
     "typename": "kvm-pci-assign"
   },
-  "id": "libvirt-17"
+  "id": "libvirt-16"
 }

 {
-  "id": "libvirt-17",
+  "id": "libvirt-16",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'kvm-pci-assign' not found"
@@ -2886,7 +2886,7 @@
   "arguments": {
     "typename": "vfio-pci"
   },
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

 {
@@ -2974,7 +2974,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

 {
@@ -2982,7 +2982,7 @@
   "arguments": {
     "typename": "scsi-disk"
   },
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -3077,7 +3077,7 @@
       "type": "uint64"
     }
   ],
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -3085,7 +3085,7 @@
   "arguments": {
     "typename": "ide-drive"
   },
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
@@ -3142,7 +3142,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
@@ -3150,11 +3150,11 @@
   "arguments": {
     "typename": "PIIX4_PM"
   },
-  "id": "libvirt-21"
+  "id": "libvirt-20"
 }

 {
-  "id": "libvirt-21",
+  "id": "libvirt-20",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'PIIX4_PM' not found"
@@ -3166,7 +3166,7 @@
   "arguments": {
     "typename": "usb-host"
   },
-  "id": "libvirt-22"
+  "id": "libvirt-21"
 }

 {
@@ -3231,7 +3231,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-22"
+  "id": "libvirt-21"
 }

 {
@@ -3239,7 +3239,7 @@
   "arguments": {
     "typename": "scsi-generic"
   },
-  "id": "libvirt-23"
+  "id": "libvirt-22"
 }

 {
@@ -3266,7 +3266,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-23"
+  "id": "libvirt-22"
 }

 {
@@ -3274,11 +3274,11 @@
   "arguments": {
     "typename": "i440FX-pcihost"
   },
-  "id": "libvirt-24"
+  "id": "libvirt-23"
 }

 {
-  "id": "libvirt-24",
+  "id": "libvirt-23",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'i440FX-pcihost' not found"
@@ -3290,11 +3290,11 @@
   "arguments": {
     "typename": "q35-pcihost"
   },
-  "id": "libvirt-25"
+  "id": "libvirt-24"
 }

 {
-  "id": "libvirt-25",
+  "id": "libvirt-24",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'q35-pcihost' not found"
@@ -3306,7 +3306,7 @@
   "arguments": {
     "typename": "usb-storage"
   },
-  "id": "libvirt-26"
+  "id": "libvirt-25"
 }

 {
@@ -3366,7 +3366,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-26"
+  "id": "libvirt-25"
 }

 {
@@ -3374,11 +3374,11 @@
   "arguments": {
     "typename": "kvm-pit"
   },
-  "id": "libvirt-27"
+  "id": "libvirt-26"
 }

 {
-  "id": "libvirt-27",
+  "id": "libvirt-26",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'kvm-pit' not found"
@@ -3390,7 +3390,7 @@
   "arguments": {
     "typename": "VGA"
   },
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -3437,7 +3437,7 @@
       "type": "int32"
     }
   ],
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -3445,7 +3445,7 @@
   "arguments": {
     "typename": "virtio-gpu-pci"
   },
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
@@ -3541,7 +3541,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
@@ -3549,7 +3549,7 @@
   "arguments": {
     "typename": "virtio-gpu-device"
   },
-  "id": "libvirt-30"
+  "id": "libvirt-29"
 }

 {
@@ -3579,7 +3579,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-30"
+  "id": "libvirt-29"
 }

 {
@@ -3587,11 +3587,11 @@
   "arguments": {
     "typename": "ICH9-LPC"
   },
-  "id": "libvirt-31"
+  "id": "libvirt-30"
 }

 {
-  "id": "libvirt-31",
+  "id": "libvirt-30",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'ICH9-LPC' not found"
@@ -3603,7 +3603,7 @@
   "arguments": {
     "typename": "virtio-balloon-pci"
   },
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

 {
@@ -3703,7 +3703,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

 {
@@ -3711,11 +3711,11 @@
   "arguments": {
     "typename": "virtio-balloon-ccw"
   },
-  "id": "libvirt-33"
+  "id": "libvirt-32"
 }

 {
-  "id": "libvirt-33",
+  "id": "libvirt-32",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-balloon-ccw' not found"
@@ -3727,7 +3727,7 @@
   "arguments": {
     "typename": "virtio-balloon-device"
   },
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

 {
@@ -3766,7 +3766,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

 {
@@ -3774,7 +3774,7 @@
   "arguments": {
     "typename": "nec-usb-xhci"
   },
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
@@ -3844,12 +3844,12 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
   "execute": "query-machines",
-  "id": "libvirt-36"
+  "id": "libvirt-35"
 }

 {
@@ -4024,12 +4024,12 @@
       "cpu-max": 1
     }
   ],
-  "id": "libvirt-36"
+  "id": "libvirt-35"
 }

 {
   "execute": "query-cpu-definitions",
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
@@ -4128,34 +4128,34 @@
       "name": "pxa270"
     }
   ],
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
   "execute": "query-tpm-models",
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
   "return": [
   ],
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
   "execute": "query-tpm-types",
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
   "return": [
   ],
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
   "execute": "query-command-line-options",
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
@@ -5127,12 +5127,12 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
   "execute": "query-migrate-capabilities",
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
@@ -5166,12 +5166,12 @@
       "capability": "postcopy-ram"
     }
   ],
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
   "execute": "query-qmp-schema",
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }

 {
@@ -13176,12 +13176,12 @@
       "meta-type": "array"
     }
   ],
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }

 {
   "execute": "query-gic-capabilities",
-  "id": "libvirt-43"
+  "id": "libvirt-42"
 }

 {
@@ -13197,7 +13197,7 @@
       "kernel": true
     }
   ],
-  "id": "libvirt-43"
+  "id": "libvirt-42"
 }

 {
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies
index f6627ece81..39a4861eb5 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies
@@ -459,11 +459,11 @@
   "arguments": {
     "device": "bogus"
   },
-  "id": "libvirt-6"
+  "id": "libvirt-5"
 }

 {
-  "id": "libvirt-6",
+  "id": "libvirt-5",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'bogus' not found"
@@ -472,7 +472,7 @@

 {
   "execute": "query-kvm",
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

 {
@@ -480,12 +480,12 @@
     "enabled": true,
     "present": true
   },
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

 {
   "execute": "query-events",
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

 {
@@ -602,12 +602,12 @@
       "name": "ACPI_DEVICE_OST"
     }
   ],
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

 {
   "execute": "qom-list-types",
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

 {
@@ -2416,7 +2416,7 @@
       "name": "fw-path-provider"
     }
   ],
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

 {
@@ -2424,7 +2424,7 @@
   "arguments": {
     "typename": "virtio-blk-pci"
   },
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

 {
@@ -2586,7 +2586,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

 {
@@ -2594,7 +2594,7 @@
   "arguments": {
     "typename": "virtio-net-pci"
   },
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

 {
@@ -2822,7 +2822,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

 {
@@ -2830,7 +2830,7 @@
   "arguments": {
     "typename": "virtio-scsi-pci"
   },
-  "id": "libvirt-12"
+  "id": "libvirt-11"
 }

 {
@@ -2948,7 +2948,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-12"
+  "id": "libvirt-11"
 }

 {
@@ -2956,11 +2956,11 @@
   "arguments": {
     "typename": "virtio-net-ccw"
   },
-  "id": "libvirt-13"
+  "id": "libvirt-12"
 }

 {
-  "id": "libvirt-13",
+  "id": "libvirt-12",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-net-ccw' not found"
@@ -2972,11 +2972,11 @@
   "arguments": {
     "typename": "virtio-scsi-ccw"
   },
-  "id": "libvirt-14"
+  "id": "libvirt-13"
 }

 {
-  "id": "libvirt-14",
+  "id": "libvirt-13",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-scsi-ccw' not found"
@@ -2988,11 +2988,11 @@
   "arguments": {
     "typename": "virtio-net-s390"
   },
-  "id": "libvirt-15"
+  "id": "libvirt-14"
 }

 {
-  "id": "libvirt-15",
+  "id": "libvirt-14",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-net-s390' not found"
@@ -3004,11 +3004,11 @@
   "arguments": {
     "typename": "pci-assign"
   },
-  "id": "libvirt-16"
+  "id": "libvirt-15"
 }

 {
-  "id": "libvirt-16",
+  "id": "libvirt-15",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'pci-assign' not found"
@@ -3020,11 +3020,11 @@
   "arguments": {
     "typename": "kvm-pci-assign"
   },
-  "id": "libvirt-17"
+  "id": "libvirt-16"
 }

 {
-  "id": "libvirt-17",
+  "id": "libvirt-16",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'kvm-pci-assign' not found"
@@ -3036,7 +3036,7 @@
   "arguments": {
     "typename": "vfio-pci"
   },
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

 {
@@ -3124,7 +3124,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

 {
@@ -3132,7 +3132,7 @@
   "arguments": {
     "typename": "scsi-disk"
   },
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -3227,7 +3227,7 @@
       "type": "uint64"
     }
   ],
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -3235,7 +3235,7 @@
   "arguments": {
     "typename": "ide-drive"
   },
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
@@ -3292,7 +3292,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
@@ -3300,11 +3300,11 @@
   "arguments": {
     "typename": "PIIX4_PM"
   },
-  "id": "libvirt-21"
+  "id": "libvirt-20"
 }

 {
-  "id": "libvirt-21",
+  "id": "libvirt-20",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'PIIX4_PM' not found"
@@ -3316,7 +3316,7 @@
   "arguments": {
     "typename": "usb-host"
   },
-  "id": "libvirt-22"
+  "id": "libvirt-21"
 }

 {
@@ -3381,7 +3381,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-22"
+  "id": "libvirt-21"
 }

 {
@@ -3389,7 +3389,7 @@
   "arguments": {
     "typename": "scsi-generic"
   },
-  "id": "libvirt-23"
+  "id": "libvirt-22"
 }

 {
@@ -3416,7 +3416,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-23"
+  "id": "libvirt-22"
 }

 {
@@ -3424,11 +3424,11 @@
   "arguments": {
     "typename": "i440FX-pcihost"
   },
-  "id": "libvirt-24"
+  "id": "libvirt-23"
 }

 {
-  "id": "libvirt-24",
+  "id": "libvirt-23",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'i440FX-pcihost' not found"
@@ -3440,11 +3440,11 @@
   "arguments": {
     "typename": "q35-pcihost"
   },
-  "id": "libvirt-25"
+  "id": "libvirt-24"
 }

 {
-  "id": "libvirt-25",
+  "id": "libvirt-24",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'q35-pcihost' not found"
@@ -3456,7 +3456,7 @@
   "arguments": {
     "typename": "usb-storage"
   },
-  "id": "libvirt-26"
+  "id": "libvirt-25"
 }

 {
@@ -3516,7 +3516,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-26"
+  "id": "libvirt-25"
 }

 {
@@ -3524,11 +3524,11 @@
   "arguments": {
     "typename": "kvm-pit"
   },
-  "id": "libvirt-27"
+  "id": "libvirt-26"
 }

 {
-  "id": "libvirt-27",
+  "id": "libvirt-26",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'kvm-pit' not found"
@@ -3540,7 +3540,7 @@
   "arguments": {
     "typename": "VGA"
   },
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -3587,7 +3587,7 @@
       "type": "int32"
     }
   ],
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -3595,7 +3595,7 @@
   "arguments": {
     "typename": "virtio-gpu-pci"
   },
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
@@ -3691,7 +3691,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
@@ -3699,7 +3699,7 @@
   "arguments": {
     "typename": "virtio-gpu-device"
   },
-  "id": "libvirt-30"
+  "id": "libvirt-29"
 }

 {
@@ -3729,7 +3729,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-30"
+  "id": "libvirt-29"
 }

 {
@@ -3737,11 +3737,11 @@
   "arguments": {
     "typename": "ICH9-LPC"
   },
-  "id": "libvirt-31"
+  "id": "libvirt-30"
 }

 {
-  "id": "libvirt-31",
+  "id": "libvirt-30",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'ICH9-LPC' not found"
@@ -3753,7 +3753,7 @@
   "arguments": {
     "typename": "virtio-balloon-pci"
   },
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

 {
@@ -3853,7 +3853,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

 {
@@ -3861,11 +3861,11 @@
   "arguments": {
     "typename": "virtio-balloon-ccw"
   },
-  "id": "libvirt-33"
+  "id": "libvirt-32"
 }

 {
-  "id": "libvirt-33",
+  "id": "libvirt-32",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-balloon-ccw' not found"
@@ -3877,7 +3877,7 @@
   "arguments": {
     "typename": "virtio-balloon-device"
   },
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

 {
@@ -3916,7 +3916,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

 {
@@ -3924,7 +3924,7 @@
   "arguments": {
     "typename": "nec-usb-xhci"
   },
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
@@ -3994,7 +3994,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
@@ -4002,7 +4002,7 @@
   "arguments": {
     "typename": "spapr-pci-host-bridge"
   },
-  "id": "libvirt-36"
+  "id": "libvirt-35"
 }

 {
@@ -4048,12 +4048,12 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-36"
+  "id": "libvirt-35"
 }

 {
   "execute": "query-machines",
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
@@ -4125,12 +4125,12 @@
       "cpu-max": 255
     }
   ],
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
   "execute": "query-cpu-definitions",
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
@@ -5432,34 +5432,34 @@
       "name": "MPC8541E_v11"
     }
   ],
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
   "execute": "query-tpm-models",
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
   "return": [
   ],
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
   "execute": "query-tpm-types",
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
   "return": [
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
   "execute": "query-command-line-options",
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
@@ -6426,12 +6426,12 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
   "execute": "query-migrate-capabilities",
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }

 {
@@ -6465,12 +6465,12 @@
       "capability": "postcopy-ram"
     }
   ],
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }

 {
   "execute": "query-qmp-schema",
-  "id": "libvirt-43"
+  "id": "libvirt-42"
 }

 {
@@ -14475,7 +14475,7 @@
       "meta-type": "array"
     }
   ],
-  "id": "libvirt-43"
+  "id": "libvirt-42"
 }

 {
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies
index 472b609c94..14e4f07fc1 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies
@@ -465,11 +465,11 @@
   "arguments": {
     "device": "bogus"
   },
-  "id": "libvirt-6"
+  "id": "libvirt-5"
 }

 {
-  "id": "libvirt-6",
+  "id": "libvirt-5",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'bogus' not found"
@@ -478,7 +478,7 @@

 {
   "execute": "query-kvm",
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

 {
@@ -486,12 +486,12 @@
     "enabled": true,
     "present": true
   },
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

 {
   "execute": "query-events",
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

 {
@@ -608,12 +608,12 @@
       "name": "ACPI_DEVICE_OST"
     }
   ],
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

 {
   "execute": "qom-list-types",
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

 {
@@ -1585,7 +1585,7 @@
       "name": "virtio-blk-device"
     }
   ],
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

 {
@@ -1593,7 +1593,7 @@
   "arguments": {
     "typename": "virtio-blk-pci"
   },
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

 {
@@ -1755,7 +1755,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

 {
@@ -1763,7 +1763,7 @@
   "arguments": {
     "typename": "virtio-net-pci"
   },
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

 {
@@ -1991,7 +1991,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

 {
@@ -1999,7 +1999,7 @@
   "arguments": {
     "typename": "virtio-scsi-pci"
   },
-  "id": "libvirt-12"
+  "id": "libvirt-11"
 }

 {
@@ -2117,7 +2117,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-12"
+  "id": "libvirt-11"
 }

 {
@@ -2125,11 +2125,11 @@
   "arguments": {
     "typename": "virtio-net-ccw"
   },
-  "id": "libvirt-13"
+  "id": "libvirt-12"
 }

 {
-  "id": "libvirt-13",
+  "id": "libvirt-12",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-net-ccw' not found"
@@ -2141,11 +2141,11 @@
   "arguments": {
     "typename": "virtio-scsi-ccw"
   },
-  "id": "libvirt-14"
+  "id": "libvirt-13"
 }

 {
-  "id": "libvirt-14",
+  "id": "libvirt-13",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-scsi-ccw' not found"
@@ -2157,11 +2157,11 @@
   "arguments": {
     "typename": "virtio-net-s390"
   },
-  "id": "libvirt-15"
+  "id": "libvirt-14"
 }

 {
-  "id": "libvirt-15",
+  "id": "libvirt-14",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-net-s390' not found"
@@ -2173,11 +2173,11 @@
   "arguments": {
     "typename": "pci-assign"
   },
-  "id": "libvirt-16"
+  "id": "libvirt-15"
 }

 {
-  "id": "libvirt-16",
+  "id": "libvirt-15",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'pci-assign' not found"
@@ -2189,7 +2189,7 @@
   "arguments": {
     "typename": "kvm-pci-assign"
   },
-  "id": "libvirt-17"
+  "id": "libvirt-16"
 }

 {
@@ -2241,7 +2241,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-17"
+  "id": "libvirt-16"
 }

 {
@@ -2249,7 +2249,7 @@
   "arguments": {
     "typename": "vfio-pci"
   },
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

 {
@@ -2337,7 +2337,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

 {
@@ -2345,7 +2345,7 @@
   "arguments": {
     "typename": "scsi-disk"
   },
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -2440,7 +2440,7 @@
       "type": "uint64"
     }
   ],
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -2448,7 +2448,7 @@
   "arguments": {
     "typename": "ide-drive"
   },
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
@@ -2505,7 +2505,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
@@ -2513,7 +2513,7 @@
   "arguments": {
     "typename": "PIIX4_PM"
   },
-  "id": "libvirt-21"
+  "id": "libvirt-20"
 }

 {
@@ -2566,7 +2566,7 @@
       "type": "int32"
     }
   ],
-  "id": "libvirt-21"
+  "id": "libvirt-20"
 }

 {
@@ -2574,7 +2574,7 @@
   "arguments": {
     "typename": "usb-redir"
   },
-  "id": "libvirt-22"
+  "id": "libvirt-21"
 }

 {
@@ -2615,7 +2615,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-22"
+  "id": "libvirt-21"
 }

 {
@@ -2623,7 +2623,7 @@
   "arguments": {
     "typename": "usb-host"
   },
-  "id": "libvirt-23"
+  "id": "libvirt-22"
 }

 {
@@ -2688,7 +2688,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-23"
+  "id": "libvirt-22"
 }

 {
@@ -2696,7 +2696,7 @@
   "arguments": {
     "typename": "scsi-generic"
   },
-  "id": "libvirt-24"
+  "id": "libvirt-23"
 }

 {
@@ -2723,7 +2723,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-24"
+  "id": "libvirt-23"
 }

 {
@@ -2731,7 +2731,7 @@
   "arguments": {
     "typename": "i440FX-pcihost"
   },
-  "id": "libvirt-25"
+  "id": "libvirt-24"
 }

 {
@@ -2769,7 +2769,7 @@
       "type": "child<qemu:memory-region>"
     }
   ],
-  "id": "libvirt-25"
+  "id": "libvirt-24"
 }

 {
@@ -2777,7 +2777,7 @@
   "arguments": {
     "typename": "q35-pcihost"
   },
-  "id": "libvirt-26"
+  "id": "libvirt-25"
 }

 {
@@ -2831,7 +2831,7 @@
       "type": "child<qemu:memory-region>"
     }
   ],
-  "id": "libvirt-26"
+  "id": "libvirt-25"
 }

 {
@@ -2839,7 +2839,7 @@
   "arguments": {
     "typename": "usb-storage"
   },
-  "id": "libvirt-27"
+  "id": "libvirt-26"
 }

 {
@@ -2899,7 +2899,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-27"
+  "id": "libvirt-26"
 }

 {
@@ -2907,7 +2907,7 @@
   "arguments": {
     "typename": "kvm-pit"
   },
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -2921,7 +2921,7 @@
       "type": "LostTickPolicy"
     }
   ],
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -2929,7 +2929,7 @@
   "arguments": {
     "typename": "VGA"
   },
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
@@ -2976,7 +2976,7 @@
       "type": "int32"
     }
   ],
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
@@ -2984,7 +2984,7 @@
   "arguments": {
     "typename": "vmware-svga"
   },
-  "id": "libvirt-30"
+  "id": "libvirt-29"
 }

 {
@@ -3017,7 +3017,7 @@
       "type": "int32"
     }
   ],
-  "id": "libvirt-30"
+  "id": "libvirt-29"
 }

 {
@@ -3025,7 +3025,7 @@
   "arguments": {
     "typename": "qxl"
   },
-  "id": "libvirt-31"
+  "id": "libvirt-30"
 }

 {
@@ -3102,7 +3102,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-31"
+  "id": "libvirt-30"
 }

 {
@@ -3110,7 +3110,7 @@
   "arguments": {
     "typename": "virtio-gpu-pci"
   },
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

 {
@@ -3216,7 +3216,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

 {
@@ -3224,7 +3224,7 @@
   "arguments": {
     "typename": "virtio-gpu-device"
   },
-  "id": "libvirt-33"
+  "id": "libvirt-32"
 }

 {
@@ -3264,7 +3264,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-33"
+  "id": "libvirt-32"
 }

 {
@@ -3272,7 +3272,7 @@
   "arguments": {
     "typename": "ICH9-LPC"
   },
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

 {
@@ -3349,7 +3349,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

 {
@@ -3357,7 +3357,7 @@
   "arguments": {
     "typename": "virtio-balloon-pci"
   },
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
@@ -3457,7 +3457,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
@@ -3465,11 +3465,11 @@
   "arguments": {
     "typename": "virtio-balloon-ccw"
   },
-  "id": "libvirt-36"
+  "id": "libvirt-35"
 }

 {
-  "id": "libvirt-36",
+  "id": "libvirt-35",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-balloon-ccw' not found"
@@ -3481,7 +3481,7 @@
   "arguments": {
     "typename": "virtio-balloon-device"
   },
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
@@ -3520,7 +3520,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
@@ -3528,7 +3528,7 @@
   "arguments": {
     "typename": "nec-usb-xhci"
   },
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
@@ -3598,7 +3598,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
@@ -3606,7 +3606,7 @@
   "arguments": {
     "typename": "intel-iommu"
   },
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
@@ -3616,7 +3616,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
@@ -3624,7 +3624,7 @@
   "arguments": {
     "typename": "mch"
   },
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
@@ -3650,12 +3650,12 @@
       "type": "pci-devfn"
     }
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
   "execute": "query-machines",
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
@@ -3768,12 +3768,12 @@
       "cpu-max": 255
     }
   ],
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
   "execute": "query-cpu-definitions",
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }

 {
@@ -3863,36 +3863,36 @@
       "name": "qemu64"
     }
   ],
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }

 {
   "execute": "query-tpm-models",
-  "id": "libvirt-43"
+  "id": "libvirt-42"
 }

 {
   "return": [
     "tpm-tis"
   ],
-  "id": "libvirt-43"
+  "id": "libvirt-42"
 }

 {
   "execute": "query-tpm-types",
-  "id": "libvirt-44"
+  "id": "libvirt-43"
 }

 {
   "return": [
     "passthrough"
   ],
-  "id": "libvirt-44"
+  "id": "libvirt-43"
 }

 {
   "execute": "query-command-line-options",
-  "id": "libvirt-45"
+  "id": "libvirt-44"
 }

 {
@@ -4986,12 +4986,12 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-45"
+  "id": "libvirt-44"
 }

 {
   "execute": "query-migrate-capabilities",
-  "id": "libvirt-46"
+  "id": "libvirt-45"
 }

 {
@@ -5025,12 +5025,12 @@
       "capability": "postcopy-ram"
     }
   ],
-  "id": "libvirt-46"
+  "id": "libvirt-45"
 }

 {
   "execute": "query-qmp-schema",
-  "id": "libvirt-47"
+  "id": "libvirt-46"
 }

 {
@@ -13035,7 +13035,7 @@
       "meta-type": "array"
     }
   ],
-  "id": "libvirt-47"
+  "id": "libvirt-46"
 }

 {
diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies
index b304445238..e90a997324 100644
--- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies
@@ -471,11 +471,11 @@
   "arguments": {
     "device": "bogus"
   },
-  "id": "libvirt-6"
+  "id": "libvirt-5"
 }

 {
-  "id": "libvirt-6",
+  "id": "libvirt-5",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'bogus' not found"
@@ -484,7 +484,7 @@

 {
   "execute": "query-kvm",
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

 {
@@ -492,12 +492,12 @@
     "enabled": true,
     "present": true
   },
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

 {
   "execute": "query-events",
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

 {
@@ -614,12 +614,12 @@
       "name": "ACPI_DEVICE_OST"
     }
   ],
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

 {
   "execute": "qom-list-types",
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

 {
@@ -997,7 +997,7 @@
       "name": "s390-skeys-kvm"
     }
   ],
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

 {
@@ -1005,7 +1005,7 @@
   "arguments": {
     "typename": "virtio-blk-pci"
   },
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

 {
@@ -1190,7 +1190,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

 {
@@ -1198,7 +1198,7 @@
   "arguments": {
     "typename": "virtio-net-pci"
   },
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

 {
@@ -1430,7 +1430,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

 {
@@ -1438,7 +1438,7 @@
   "arguments": {
     "typename": "virtio-scsi-pci"
   },
-  "id": "libvirt-12"
+  "id": "libvirt-11"
 }

 {
@@ -1560,7 +1560,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-12"
+  "id": "libvirt-11"
 }

 {
@@ -1568,7 +1568,7 @@
   "arguments": {
     "typename": "virtio-blk-ccw"
   },
-  "id": "libvirt-13"
+  "id": "libvirt-12"
 }

 {
@@ -1697,7 +1697,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-13"
+  "id": "libvirt-12"
 }

 {
@@ -1705,7 +1705,7 @@
   "arguments": {
     "typename": "virtio-net-ccw"
   },
-  "id": "libvirt-14"
+  "id": "libvirt-13"
 }

 {
@@ -1885,7 +1885,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-14"
+  "id": "libvirt-13"
 }

 {
@@ -1893,7 +1893,7 @@
   "arguments": {
     "typename": "virtio-scsi-ccw"
   },
-  "id": "libvirt-15"
+  "id": "libvirt-14"
 }

 {
@@ -1963,7 +1963,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-15"
+  "id": "libvirt-14"
 }

 {
@@ -1971,11 +1971,11 @@
   "arguments": {
     "typename": "virtio-net-s390"
   },
-  "id": "libvirt-16"
+  "id": "libvirt-15"
 }

 {
-  "id": "libvirt-16",
+  "id": "libvirt-15",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-net-s390' not found"
@@ -1987,11 +1987,11 @@
   "arguments": {
     "typename": "pci-assign"
   },
-  "id": "libvirt-17"
+  "id": "libvirt-16"
 }

 {
-  "id": "libvirt-17",
+  "id": "libvirt-16",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'pci-assign' not found"
@@ -2003,11 +2003,11 @@
   "arguments": {
     "typename": "kvm-pci-assign"
   },
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

 {
-  "id": "libvirt-18",
+  "id": "libvirt-17",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'kvm-pci-assign' not found"
@@ -2019,7 +2019,7 @@
   "arguments": {
     "typename": "vfio-pci"
   },
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -2121,7 +2121,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -2129,7 +2129,7 @@
   "arguments": {
     "typename": "scsi-disk"
   },
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
@@ -2239,7 +2239,7 @@
       "type": "uint64"
     }
   ],
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
@@ -2247,11 +2247,11 @@
   "arguments": {
     "typename": "ide-drive"
   },
-  "id": "libvirt-21"
+  "id": "libvirt-20"
 }

 {
-  "id": "libvirt-21",
+  "id": "libvirt-20",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'ide-drive' not found"
@@ -2263,11 +2263,11 @@
   "arguments": {
     "typename": "PIIX4_PM"
   },
-  "id": "libvirt-22"
+  "id": "libvirt-21"
 }

 {
-  "id": "libvirt-22",
+  "id": "libvirt-21",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'PIIX4_PM' not found"
@@ -2279,11 +2279,11 @@
   "arguments": {
     "typename": "usb-host"
   },
-  "id": "libvirt-23"
+  "id": "libvirt-22"
 }

 {
-  "id": "libvirt-23",
+  "id": "libvirt-22",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'usb-host' not found"
@@ -2295,7 +2295,7 @@
   "arguments": {
     "typename": "scsi-generic"
   },
-  "id": "libvirt-24"
+  "id": "libvirt-23"
 }

 {
@@ -2322,7 +2322,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-24"
+  "id": "libvirt-23"
 }

 {
@@ -2330,11 +2330,11 @@
   "arguments": {
     "typename": "i440FX-pcihost"
   },
-  "id": "libvirt-25"
+  "id": "libvirt-24"
 }

 {
-  "id": "libvirt-25",
+  "id": "libvirt-24",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'i440FX-pcihost' not found"
@@ -2346,11 +2346,11 @@
   "arguments": {
     "typename": "q35-pcihost"
   },
-  "id": "libvirt-26"
+  "id": "libvirt-25"
 }

 {
-  "id": "libvirt-26",
+  "id": "libvirt-25",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'q35-pcihost' not found"
@@ -2362,11 +2362,11 @@
   "arguments": {
     "typename": "kvm-pit"
   },
-  "id": "libvirt-27"
+  "id": "libvirt-26"
 }

 {
-  "id": "libvirt-27",
+  "id": "libvirt-26",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'kvm-pit' not found"
@@ -2378,7 +2378,7 @@
   "arguments": {
     "typename": "virtio-gpu-pci"
   },
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -2478,7 +2478,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -2486,7 +2486,7 @@
   "arguments": {
     "typename": "virtio-gpu-device"
   },
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
@@ -2516,7 +2516,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
@@ -2524,11 +2524,11 @@
   "arguments": {
     "typename": "ICH9-LPC"
   },
-  "id": "libvirt-30"
+  "id": "libvirt-29"
 }

 {
-  "id": "libvirt-30",
+  "id": "libvirt-29",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'ICH9-LPC' not found"
@@ -2540,7 +2540,7 @@
   "arguments": {
     "typename": "virtio-balloon-pci"
   },
-  "id": "libvirt-31"
+  "id": "libvirt-30"
 }

 {
@@ -2644,7 +2644,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-31"
+  "id": "libvirt-30"
 }

 {
@@ -2652,7 +2652,7 @@
   "arguments": {
     "typename": "virtio-balloon-ccw"
   },
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

 {
@@ -2709,7 +2709,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

 {
@@ -2717,7 +2717,7 @@
   "arguments": {
     "typename": "virtio-balloon-device"
   },
-  "id": "libvirt-33"
+  "id": "libvirt-32"
 }

 {
@@ -2756,7 +2756,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-33"
+  "id": "libvirt-32"
 }

 {
@@ -2764,7 +2764,7 @@
   "arguments": {
     "typename": "virtual-css-bridge"
   },
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

 {
@@ -2774,12 +2774,12 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

 {
   "execute": "query-machines",
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
@@ -2812,12 +2812,12 @@
       "cpu-max": 248
     }
   ],
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
   "execute": "query-cpu-definitions",
-  "id": "libvirt-36"
+  "id": "libvirt-35"
 }

 {
@@ -2826,34 +2826,34 @@
       "name": "host"
     }
   ],
-  "id": "libvirt-36"
+  "id": "libvirt-35"
 }

 {
   "execute": "query-tpm-models",
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
   "return": [
   ],
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
   "execute": "query-tpm-types",
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
   "return": [
   ],
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
   "execute": "query-command-line-options",
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
@@ -3789,12 +3789,12 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
   "execute": "query-migrate-capabilities",
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
@@ -3828,12 +3828,12 @@
       "capability": "postcopy-ram"
     }
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
   "execute": "query-qmp-schema",
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
@@ -12189,7 +12189,7 @@
       "meta-type": "object"
     }
   ],
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies
index 33e90a2387..675ff81b07 100644
--- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies
@@ -474,11 +474,11 @@
   "arguments": {
     "device": "bogus"
   },
-  "id": "libvirt-6"
+  "id": "libvirt-5"
 }

 {
-  "id": "libvirt-6",
+  "id": "libvirt-5",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'bogus' not found"
@@ -487,7 +487,7 @@

 {
   "execute": "query-kvm",
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

 {
@@ -495,12 +495,12 @@
     "enabled": true,
     "present": true
   },
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

 {
   "execute": "query-events",
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

 {
@@ -617,12 +617,12 @@
       "name": "ACPI_DEVICE_OST"
     }
   ],
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

 {
   "execute": "qom-list-types",
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

 {
@@ -1609,7 +1609,7 @@
       "name": "virtio-blk-device"
     }
   ],
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

 {
@@ -1617,7 +1617,7 @@
   "arguments": {
     "typename": "virtio-blk-pci"
   },
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

 {
@@ -1802,7 +1802,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

 {
@@ -1810,7 +1810,7 @@
   "arguments": {
     "typename": "virtio-net-pci"
   },
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

 {
@@ -2042,7 +2042,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

 {
@@ -2050,7 +2050,7 @@
   "arguments": {
     "typename": "virtio-scsi-pci"
   },
-  "id": "libvirt-12"
+  "id": "libvirt-11"
 }

 {
@@ -2172,7 +2172,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-12"
+  "id": "libvirt-11"
 }

 {
@@ -2180,11 +2180,11 @@
   "arguments": {
     "typename": "virtio-net-ccw"
   },
-  "id": "libvirt-13"
+  "id": "libvirt-12"
 }

 {
-  "id": "libvirt-13",
+  "id": "libvirt-12",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-net-ccw' not found"
@@ -2196,11 +2196,11 @@
   "arguments": {
     "typename": "virtio-scsi-ccw"
   },
-  "id": "libvirt-14"
+  "id": "libvirt-13"
 }

 {
-  "id": "libvirt-14",
+  "id": "libvirt-13",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-scsi-ccw' not found"
@@ -2212,11 +2212,11 @@
   "arguments": {
     "typename": "virtio-net-s390"
   },
-  "id": "libvirt-15"
+  "id": "libvirt-14"
 }

 {
-  "id": "libvirt-15",
+  "id": "libvirt-14",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-net-s390' not found"
@@ -2228,11 +2228,11 @@
   "arguments": {
     "typename": "pci-assign"
   },
-  "id": "libvirt-16"
+  "id": "libvirt-15"
 }

 {
-  "id": "libvirt-16",
+  "id": "libvirt-15",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'pci-assign' not found"
@@ -2244,7 +2244,7 @@
   "arguments": {
     "typename": "kvm-pci-assign"
   },
-  "id": "libvirt-17"
+  "id": "libvirt-16"
 }

 {
@@ -2301,7 +2301,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-17"
+  "id": "libvirt-16"
 }

 {
@@ -2309,7 +2309,7 @@
   "arguments": {
     "typename": "vfio-pci"
   },
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

 {
@@ -2411,7 +2411,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

 {
@@ -2419,7 +2419,7 @@
   "arguments": {
     "typename": "scsi-disk"
   },
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -2529,7 +2529,7 @@
       "type": "uint64"
     }
   ],
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -2537,7 +2537,7 @@
   "arguments": {
     "typename": "ide-drive"
   },
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
@@ -2609,7 +2609,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
@@ -2617,7 +2617,7 @@
   "arguments": {
     "typename": "PIIX4_PM"
   },
-  "id": "libvirt-21"
+  "id": "libvirt-20"
 }

 {
@@ -2675,7 +2675,7 @@
       "type": "int32"
     }
   ],
-  "id": "libvirt-21"
+  "id": "libvirt-20"
 }

 {
@@ -2683,7 +2683,7 @@
   "arguments": {
     "typename": "usb-redir"
   },
-  "id": "libvirt-22"
+  "id": "libvirt-21"
 }

 {
@@ -2732,7 +2732,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-22"
+  "id": "libvirt-21"
 }

 {
@@ -2740,7 +2740,7 @@
   "arguments": {
     "typename": "usb-host"
   },
-  "id": "libvirt-23"
+  "id": "libvirt-22"
 }

 {
@@ -2809,7 +2809,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-23"
+  "id": "libvirt-22"
 }

 {
@@ -2817,7 +2817,7 @@
   "arguments": {
     "typename": "scsi-generic"
   },
-  "id": "libvirt-24"
+  "id": "libvirt-23"
 }

 {
@@ -2844,7 +2844,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-24"
+  "id": "libvirt-23"
 }

 {
@@ -2852,7 +2852,7 @@
   "arguments": {
     "typename": "i440FX-pcihost"
   },
-  "id": "libvirt-25"
+  "id": "libvirt-24"
 }

 {
@@ -2890,7 +2890,7 @@
       "type": "child<qemu:memory-region>"
     }
   ],
-  "id": "libvirt-25"
+  "id": "libvirt-24"
 }

 {
@@ -2898,7 +2898,7 @@
   "arguments": {
     "typename": "q35-pcihost"
   },
-  "id": "libvirt-26"
+  "id": "libvirt-25"
 }

 {
@@ -2976,7 +2976,7 @@
       "type": "int"
     }
   ],
-  "id": "libvirt-26"
+  "id": "libvirt-25"
 }

 {
@@ -2984,7 +2984,7 @@
   "arguments": {
     "typename": "usb-storage"
   },
-  "id": "libvirt-27"
+  "id": "libvirt-26"
 }

 {
@@ -3053,7 +3053,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-27"
+  "id": "libvirt-26"
 }

 {
@@ -3061,7 +3061,7 @@
   "arguments": {
     "typename": "kvm-pit"
   },
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -3075,7 +3075,7 @@
       "type": "LostTickPolicy"
     }
   ],
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -3083,7 +3083,7 @@
   "arguments": {
     "typename": "VGA"
   },
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
@@ -3135,7 +3135,7 @@
       "type": "int32"
     }
   ],
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
@@ -3143,7 +3143,7 @@
   "arguments": {
     "typename": "vmware-svga"
   },
-  "id": "libvirt-30"
+  "id": "libvirt-29"
 }

 {
@@ -3181,7 +3181,7 @@
       "type": "int32"
     }
   ],
-  "id": "libvirt-30"
+  "id": "libvirt-29"
 }

 {
@@ -3189,7 +3189,7 @@
   "arguments": {
     "typename": "qxl"
   },
-  "id": "libvirt-31"
+  "id": "libvirt-30"
 }

 {
@@ -3271,7 +3271,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-31"
+  "id": "libvirt-30"
 }

 {
@@ -3279,7 +3279,7 @@
   "arguments": {
     "typename": "virtio-gpu-pci"
   },
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

 {
@@ -3389,7 +3389,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

 {
@@ -3397,7 +3397,7 @@
   "arguments": {
     "typename": "virtio-gpu-device"
   },
-  "id": "libvirt-33"
+  "id": "libvirt-32"
 }

 {
@@ -3437,7 +3437,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-33"
+  "id": "libvirt-32"
 }

 {
@@ -3445,7 +3445,7 @@
   "arguments": {
     "typename": "ICH9-LPC"
   },
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

 {
@@ -3531,7 +3531,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

 {
@@ -3539,7 +3539,7 @@
   "arguments": {
     "typename": "virtio-balloon-pci"
   },
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
@@ -3643,7 +3643,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
@@ -3651,11 +3651,11 @@
   "arguments": {
     "typename": "virtio-balloon-ccw"
   },
-  "id": "libvirt-36"
+  "id": "libvirt-35"
 }

 {
-  "id": "libvirt-36",
+  "id": "libvirt-35",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-balloon-ccw' not found"
@@ -3667,7 +3667,7 @@
   "arguments": {
     "typename": "virtio-balloon-device"
   },
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
@@ -3706,7 +3706,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
@@ -3714,7 +3714,7 @@
   "arguments": {
     "typename": "nec-usb-xhci"
   },
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
@@ -3789,7 +3789,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
@@ -3797,7 +3797,7 @@
   "arguments": {
     "typename": "intel-iommu"
   },
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
@@ -3811,7 +3811,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
@@ -3819,7 +3819,7 @@
   "arguments": {
     "typename": "mch"
   },
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
@@ -3845,12 +3845,12 @@
       "type": "pci-devfn"
     }
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
   "execute": "query-machines",
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
@@ -3999,12 +3999,12 @@
       "cpu-max": 255
     }
   ],
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
   "execute": "query-cpu-definitions",
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }

 {
@@ -4097,36 +4097,36 @@
       "name": "qemu64"
     }
   ],
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }

 {
   "execute": "query-tpm-models",
-  "id": "libvirt-43"
+  "id": "libvirt-42"
 }

 {
   "return": [
     "tpm-tis"
   ],
-  "id": "libvirt-43"
+  "id": "libvirt-42"
 }

 {
   "execute": "query-tpm-types",
-  "id": "libvirt-44"
+  "id": "libvirt-43"
 }

 {
   "return": [
     "passthrough"
   ],
-  "id": "libvirt-44"
+  "id": "libvirt-43"
 }

 {
   "execute": "query-command-line-options",
-  "id": "libvirt-45"
+  "id": "libvirt-44"
 }

 {
@@ -5224,12 +5224,12 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-45"
+  "id": "libvirt-44"
 }

 {
   "execute": "query-migrate-capabilities",
-  "id": "libvirt-46"
+  "id": "libvirt-45"
 }

 {
@@ -5263,12 +5263,12 @@
       "capability": "postcopy-ram"
     }
   ],
-  "id": "libvirt-46"
+  "id": "libvirt-45"
 }

 {
   "execute": "query-qmp-schema",
-  "id": "libvirt-47"
+  "id": "libvirt-46"
 }

 {
@@ -13624,7 +13624,7 @@
       "meta-type": "object"
     }
   ],
-  "id": "libvirt-47"
+  "id": "libvirt-46"
 }

 {
diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies
index 034acd036b..2022c1175d 100644
--- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies
@@ -483,11 +483,11 @@
   "arguments": {
     "device": "bogus"
   },
-  "id": "libvirt-6"
+  "id": "libvirt-5"
 }

 {
-  "id": "libvirt-6",
+  "id": "libvirt-5",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'bogus' not found"
@@ -496,7 +496,7 @@

 {
   "execute": "query-kvm",
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

 {
@@ -504,12 +504,12 @@
     "enabled": true,
     "present": true
   },
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

 {
   "execute": "query-events",
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

 {
@@ -626,12 +626,12 @@
       "name": "ACPI_DEVICE_OST"
     }
   ],
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

 {
   "execute": "qom-list-types",
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

 {
@@ -1237,7 +1237,7 @@
       "name": "virtio-blk-device"
     }
   ],
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

 {
@@ -1245,7 +1245,7 @@
   "arguments": {
     "typename": "virtio-blk-pci"
   },
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

 {
@@ -1435,7 +1435,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

 {
@@ -1443,7 +1443,7 @@
   "arguments": {
     "typename": "virtio-net-pci"
   },
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

 {
@@ -1684,7 +1684,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

 {
@@ -1692,7 +1692,7 @@
   "arguments": {
     "typename": "virtio-scsi-pci"
   },
-  "id": "libvirt-12"
+  "id": "libvirt-11"
 }

 {
@@ -1819,7 +1819,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-12"
+  "id": "libvirt-11"
 }

 {
@@ -1827,7 +1827,7 @@
   "arguments": {
     "typename": "virtio-blk-ccw"
   },
-  "id": "libvirt-13"
+  "id": "libvirt-12"
 }

 {
@@ -1956,7 +1956,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-13"
+  "id": "libvirt-12"
 }

 {
@@ -1964,7 +1964,7 @@
   "arguments": {
     "typename": "virtio-net-ccw"
   },
-  "id": "libvirt-14"
+  "id": "libvirt-13"
 }

 {
@@ -2148,7 +2148,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-14"
+  "id": "libvirt-13"
 }

 {
@@ -2156,7 +2156,7 @@
   "arguments": {
     "typename": "virtio-scsi-ccw"
   },
-  "id": "libvirt-15"
+  "id": "libvirt-14"
 }

 {
@@ -2226,7 +2226,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-15"
+  "id": "libvirt-14"
 }

 {
@@ -2234,11 +2234,11 @@
   "arguments": {
     "typename": "virtio-net-s390"
   },
-  "id": "libvirt-16"
+  "id": "libvirt-15"
 }

 {
-  "id": "libvirt-16",
+  "id": "libvirt-15",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-net-s390' not found"
@@ -2250,11 +2250,11 @@
   "arguments": {
     "typename": "pci-assign"
   },
-  "id": "libvirt-17"
+  "id": "libvirt-16"
 }

 {
-  "id": "libvirt-17",
+  "id": "libvirt-16",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'pci-assign' not found"
@@ -2266,11 +2266,11 @@
   "arguments": {
     "typename": "kvm-pci-assign"
   },
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

 {
-  "id": "libvirt-18",
+  "id": "libvirt-17",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'kvm-pci-assign' not found"
@@ -2282,7 +2282,7 @@
   "arguments": {
     "typename": "vfio-pci"
   },
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -2384,7 +2384,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -2392,7 +2392,7 @@
   "arguments": {
     "typename": "scsi-disk"
   },
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
@@ -2502,7 +2502,7 @@
       "type": "uint64"
     }
   ],
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
@@ -2510,11 +2510,11 @@
   "arguments": {
     "typename": "ide-drive"
   },
-  "id": "libvirt-21"
+  "id": "libvirt-20"
 }

 {
-  "id": "libvirt-21",
+  "id": "libvirt-20",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'ide-drive' not found"
@@ -2526,11 +2526,11 @@
   "arguments": {
     "typename": "PIIX4_PM"
   },
-  "id": "libvirt-22"
+  "id": "libvirt-21"
 }

 {
-  "id": "libvirt-22",
+  "id": "libvirt-21",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'PIIX4_PM' not found"
@@ -2542,11 +2542,11 @@
   "arguments": {
     "typename": "usb-host"
   },
-  "id": "libvirt-23"
+  "id": "libvirt-22"
 }

 {
-  "id": "libvirt-23",
+  "id": "libvirt-22",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'usb-host' not found"
@@ -2558,7 +2558,7 @@
   "arguments": {
     "typename": "scsi-generic"
   },
-  "id": "libvirt-24"
+  "id": "libvirt-23"
 }

 {
@@ -2585,7 +2585,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-24"
+  "id": "libvirt-23"
 }

 {
@@ -2593,11 +2593,11 @@
   "arguments": {
     "typename": "i440FX-pcihost"
   },
-  "id": "libvirt-25"
+  "id": "libvirt-24"
 }

 {
-  "id": "libvirt-25",
+  "id": "libvirt-24",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'i440FX-pcihost' not found"
@@ -2609,11 +2609,11 @@
   "arguments": {
     "typename": "q35-pcihost"
   },
-  "id": "libvirt-26"
+  "id": "libvirt-25"
 }

 {
-  "id": "libvirt-26",
+  "id": "libvirt-25",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'q35-pcihost' not found"
@@ -2625,11 +2625,11 @@
   "arguments": {
     "typename": "kvm-pit"
   },
-  "id": "libvirt-27"
+  "id": "libvirt-26"
 }

 {
-  "id": "libvirt-27",
+  "id": "libvirt-26",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'kvm-pit' not found"
@@ -2641,7 +2641,7 @@
   "arguments": {
     "typename": "virtio-gpu-pci"
   },
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -2746,7 +2746,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -2754,7 +2754,7 @@
   "arguments": {
     "typename": "virtio-gpu-device"
   },
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
@@ -2784,7 +2784,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
@@ -2792,11 +2792,11 @@
   "arguments": {
     "typename": "ICH9-LPC"
   },
-  "id": "libvirt-30"
+  "id": "libvirt-29"
 }

 {
-  "id": "libvirt-30",
+  "id": "libvirt-29",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'ICH9-LPC' not found"
@@ -2808,7 +2808,7 @@
   "arguments": {
     "typename": "virtio-balloon-pci"
   },
-  "id": "libvirt-31"
+  "id": "libvirt-30"
 }

 {
@@ -2917,7 +2917,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-31"
+  "id": "libvirt-30"
 }

 {
@@ -2925,7 +2925,7 @@
   "arguments": {
     "typename": "virtio-balloon-ccw"
   },
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

 {
@@ -2982,7 +2982,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

 {
@@ -2990,7 +2990,7 @@
   "arguments": {
     "typename": "virtio-balloon-device"
   },
-  "id": "libvirt-33"
+  "id": "libvirt-32"
 }

 {
@@ -3029,7 +3029,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-33"
+  "id": "libvirt-32"
 }

 {
@@ -3037,7 +3037,7 @@
   "arguments": {
     "typename": "virtual-css-bridge"
   },
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

 {
@@ -3047,12 +3047,12 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

 {
   "execute": "query-machines",
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
@@ -3090,12 +3090,12 @@
       "alias": "s390-ccw-virtio"
     }
   ],
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
   "execute": "query-cpu-definitions",
-  "id": "libvirt-36"
+  "id": "libvirt-35"
 }

 {
@@ -3421,34 +3421,34 @@
       "migration-safe": true
     }
   ],
-  "id": "libvirt-36"
+  "id": "libvirt-35"
 }

 {
   "execute": "query-tpm-models",
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
   "return": [
   ],
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
   "execute": "query-tpm-types",
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
   "return": [
   ],
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
   "execute": "query-command-line-options",
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
@@ -4409,12 +4409,12 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
   "execute": "query-migrate-capabilities",
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
@@ -4452,12 +4452,12 @@
       "capability": "x-colo"
     }
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
   "execute": "query-qmp-schema",
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
@@ -13227,7 +13227,7 @@
       "meta-type": "object"
     }
   ],
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
@@ -13238,7 +13238,7 @@
       "name": "host"
     }
   },
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }

 {
@@ -13264,7 +13264,7 @@
       }
     }
   },
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }

 {
@@ -13278,11 +13278,11 @@
       }
     }
   },
-  "id": "libvirt-43"
+  "id": "libvirt-42"
 }

 {
-  "id": "libvirt-43",
+  "id": "libvirt-42",
   "error": {
     "class": "GenericError",
     "desc": "Property '.migratable' not found"
diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies
index 12a415eb1d..f74af5bc6d 100644
--- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies
@@ -477,11 +477,11 @@
   "arguments": {
     "device": "bogus"
   },
-  "id": "libvirt-6"
+  "id": "libvirt-5"
 }

 {
-  "id": "libvirt-6",
+  "id": "libvirt-5",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'bogus' not found"
@@ -490,7 +490,7 @@

 {
   "execute": "query-kvm",
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

 {
@@ -498,12 +498,12 @@
     "enabled": true,
     "present": true
   },
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

 {
   "execute": "query-events",
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

 {
@@ -620,12 +620,12 @@
       "name": "ACPI_DEVICE_OST"
     }
   ],
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

 {
   "execute": "qom-list-types",
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

 {
@@ -1693,7 +1693,7 @@
       "name": "virtio-blk-device"
     }
   ],
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

 {
@@ -1701,7 +1701,7 @@
   "arguments": {
     "typename": "virtio-blk-pci"
   },
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

 {
@@ -1895,7 +1895,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

 {
@@ -1903,7 +1903,7 @@
   "arguments": {
     "typename": "virtio-net-pci"
   },
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

 {
@@ -2148,7 +2148,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

 {
@@ -2156,7 +2156,7 @@
   "arguments": {
     "typename": "virtio-scsi-pci"
   },
-  "id": "libvirt-12"
+  "id": "libvirt-11"
 }

 {
@@ -2287,7 +2287,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-12"
+  "id": "libvirt-11"
 }

 {
@@ -2295,11 +2295,11 @@
   "arguments": {
     "typename": "virtio-net-ccw"
   },
-  "id": "libvirt-13"
+  "id": "libvirt-12"
 }

 {
-  "id": "libvirt-13",
+  "id": "libvirt-12",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-net-ccw' not found"
@@ -2311,11 +2311,11 @@
   "arguments": {
     "typename": "virtio-scsi-ccw"
   },
-  "id": "libvirt-14"
+  "id": "libvirt-13"
 }

 {
-  "id": "libvirt-14",
+  "id": "libvirt-13",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-scsi-ccw' not found"
@@ -2327,11 +2327,11 @@
   "arguments": {
     "typename": "virtio-net-s390"
   },
-  "id": "libvirt-15"
+  "id": "libvirt-14"
 }

 {
-  "id": "libvirt-15",
+  "id": "libvirt-14",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-net-s390' not found"
@@ -2343,11 +2343,11 @@
   "arguments": {
     "typename": "pci-assign"
   },
-  "id": "libvirt-16"
+  "id": "libvirt-15"
 }

 {
-  "id": "libvirt-16",
+  "id": "libvirt-15",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'pci-assign' not found"
@@ -2359,7 +2359,7 @@
   "arguments": {
     "typename": "kvm-pci-assign"
   },
-  "id": "libvirt-17"
+  "id": "libvirt-16"
 }

 {
@@ -2416,7 +2416,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-17"
+  "id": "libvirt-16"
 }

 {
@@ -2424,7 +2424,7 @@
   "arguments": {
     "typename": "vfio-pci"
   },
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

 {
@@ -2526,7 +2526,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

 {
@@ -2534,7 +2534,7 @@
   "arguments": {
     "typename": "scsi-disk"
   },
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -2644,7 +2644,7 @@
       "type": "uint64"
     }
   ],
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -2652,7 +2652,7 @@
   "arguments": {
     "typename": "ide-drive"
   },
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
@@ -2724,7 +2724,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
@@ -2732,7 +2732,7 @@
   "arguments": {
     "typename": "PIIX4_PM"
   },
-  "id": "libvirt-21"
+  "id": "libvirt-20"
 }

 {
@@ -2790,7 +2790,7 @@
       "type": "int32"
     }
   ],
-  "id": "libvirt-21"
+  "id": "libvirt-20"
 }

 {
@@ -2798,7 +2798,7 @@
   "arguments": {
     "typename": "usb-redir"
   },
-  "id": "libvirt-22"
+  "id": "libvirt-21"
 }

 {
@@ -2847,7 +2847,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-22"
+  "id": "libvirt-21"
 }

 {
@@ -2855,7 +2855,7 @@
   "arguments": {
     "typename": "usb-host"
   },
-  "id": "libvirt-23"
+  "id": "libvirt-22"
 }

 {
@@ -2924,7 +2924,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-23"
+  "id": "libvirt-22"
 }

 {
@@ -2932,7 +2932,7 @@
   "arguments": {
     "typename": "scsi-generic"
   },
-  "id": "libvirt-24"
+  "id": "libvirt-23"
 }

 {
@@ -2959,7 +2959,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-24"
+  "id": "libvirt-23"
 }

 {
@@ -2967,7 +2967,7 @@
   "arguments": {
     "typename": "i440FX-pcihost"
   },
-  "id": "libvirt-25"
+  "id": "libvirt-24"
 }

 {
@@ -3005,7 +3005,7 @@
       "type": "child<qemu:memory-region>"
     }
   ],
-  "id": "libvirt-25"
+  "id": "libvirt-24"
 }

 {
@@ -3013,7 +3013,7 @@
   "arguments": {
     "typename": "q35-pcihost"
   },
-  "id": "libvirt-26"
+  "id": "libvirt-25"
 }

 {
@@ -3091,7 +3091,7 @@
       "type": "int"
     }
   ],
-  "id": "libvirt-26"
+  "id": "libvirt-25"
 }

 {
@@ -3099,7 +3099,7 @@
   "arguments": {
     "typename": "usb-storage"
   },
-  "id": "libvirt-27"
+  "id": "libvirt-26"
 }

 {
@@ -3168,7 +3168,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-27"
+  "id": "libvirt-26"
 }

 {
@@ -3176,7 +3176,7 @@
   "arguments": {
     "typename": "kvm-pit"
   },
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -3190,7 +3190,7 @@
       "type": "LostTickPolicy"
     }
   ],
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -3198,7 +3198,7 @@
   "arguments": {
     "typename": "VGA"
   },
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
@@ -3250,7 +3250,7 @@
       "type": "int32"
     }
   ],
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
@@ -3258,7 +3258,7 @@
   "arguments": {
     "typename": "vmware-svga"
   },
-  "id": "libvirt-30"
+  "id": "libvirt-29"
 }

 {
@@ -3296,7 +3296,7 @@
       "type": "int32"
     }
   ],
-  "id": "libvirt-30"
+  "id": "libvirt-29"
 }

 {
@@ -3304,7 +3304,7 @@
   "arguments": {
     "typename": "qxl"
   },
-  "id": "libvirt-31"
+  "id": "libvirt-30"
 }

 {
@@ -3386,7 +3386,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-31"
+  "id": "libvirt-30"
 }

 {
@@ -3394,7 +3394,7 @@
   "arguments": {
     "typename": "virtio-gpu-pci"
   },
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

 {
@@ -3513,7 +3513,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

 {
@@ -3521,7 +3521,7 @@
   "arguments": {
     "typename": "virtio-gpu-device"
   },
-  "id": "libvirt-33"
+  "id": "libvirt-32"
 }

 {
@@ -3561,7 +3561,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-33"
+  "id": "libvirt-32"
 }

 {
@@ -3569,7 +3569,7 @@
   "arguments": {
     "typename": "ICH9-LPC"
   },
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

 {
@@ -3655,7 +3655,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

 {
@@ -3663,7 +3663,7 @@
   "arguments": {
     "typename": "virtio-balloon-pci"
   },
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
@@ -3776,7 +3776,7 @@
       "type": "guest statistics"
     }
   ],
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
@@ -3784,11 +3784,11 @@
   "arguments": {
     "typename": "virtio-balloon-ccw"
   },
-  "id": "libvirt-36"
+  "id": "libvirt-35"
 }

 {
-  "id": "libvirt-36",
+  "id": "libvirt-35",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-balloon-ccw' not found"
@@ -3800,7 +3800,7 @@
   "arguments": {
     "typename": "virtio-balloon-device"
   },
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
@@ -3839,7 +3839,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
@@ -3847,7 +3847,7 @@
   "arguments": {
     "typename": "nec-usb-xhci"
   },
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
@@ -3922,7 +3922,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
@@ -3930,7 +3930,7 @@
   "arguments": {
     "typename": "intel-iommu"
   },
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
@@ -3953,7 +3953,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
@@ -3961,7 +3961,7 @@
   "arguments": {
     "typename": "mch"
   },
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
@@ -3987,12 +3987,12 @@
       "type": "pci-devfn"
     }
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
   "execute": "query-machines",
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
@@ -4161,12 +4161,12 @@
       "cpu-max": 255
     }
   ],
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
   "execute": "query-cpu-definitions",
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }

 {
@@ -4372,36 +4372,36 @@
       "static": false
     }
   ],
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }

 {
   "execute": "query-tpm-models",
-  "id": "libvirt-43"
+  "id": "libvirt-42"
 }

 {
   "return": [
     "tpm-tis"
   ],
-  "id": "libvirt-43"
+  "id": "libvirt-42"
 }

 {
   "execute": "query-tpm-types",
-  "id": "libvirt-44"
+  "id": "libvirt-43"
 }

 {
   "return": [
     "passthrough"
   ],
-  "id": "libvirt-44"
+  "id": "libvirt-43"
 }

 {
   "execute": "query-command-line-options",
-  "id": "libvirt-45"
+  "id": "libvirt-44"
 }

 {
@@ -5524,12 +5524,12 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-45"
+  "id": "libvirt-44"
 }

 {
   "execute": "query-migrate-capabilities",
-  "id": "libvirt-46"
+  "id": "libvirt-45"
 }

 {
@@ -5567,12 +5567,12 @@
       "capability": "x-colo"
     }
   ],
-  "id": "libvirt-46"
+  "id": "libvirt-45"
 }

 {
   "execute": "query-qmp-schema",
-  "id": "libvirt-47"
+  "id": "libvirt-46"
 }

 {
@@ -14342,7 +14342,7 @@
       "meta-type": "object"
     }
   ],
-  "id": "libvirt-47"
+  "id": "libvirt-46"
 }

 {
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies
index 5daf8655fa..d3ee9f196c 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies
@@ -483,11 +483,11 @@
   "arguments": {
     "device": "bogus"
   },
-  "id": "libvirt-6"
+  "id": "libvirt-5"
 }

 {
-  "id": "libvirt-6",
+  "id": "libvirt-5",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'bogus' not found"
@@ -496,7 +496,7 @@

 {
   "execute": "query-kvm",
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

 {
@@ -504,12 +504,12 @@
     "enabled": true,
     "present": true
   },
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

 {
   "execute": "query-events",
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

 {
@@ -626,12 +626,12 @@
       "name": "ACPI_DEVICE_OST"
     }
   ],
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

 {
   "execute": "qom-list-types",
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

 {
@@ -2581,7 +2581,7 @@
       "name": "7457A_v1.2-powerpc64-cpu"
     }
   ],
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

 {
@@ -2589,7 +2589,7 @@
   "arguments": {
     "typename": "virtio-blk-pci"
   },
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

 {
@@ -2817,7 +2817,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

 {
@@ -2825,7 +2825,7 @@
   "arguments": {
     "typename": "virtio-net-pci"
   },
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

 {
@@ -3104,7 +3104,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

 {
@@ -3112,7 +3112,7 @@
   "arguments": {
     "typename": "virtio-scsi-pci"
   },
-  "id": "libvirt-12"
+  "id": "libvirt-11"
 }

 {
@@ -3273,7 +3273,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-12"
+  "id": "libvirt-11"
 }

 {
@@ -3281,11 +3281,11 @@
   "arguments": {
     "typename": "virtio-net-ccw"
   },
-  "id": "libvirt-13"
+  "id": "libvirt-12"
 }

 {
-  "id": "libvirt-13",
+  "id": "libvirt-12",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-net-ccw' not found"
@@ -3297,11 +3297,11 @@
   "arguments": {
     "typename": "virtio-scsi-ccw"
   },
-  "id": "libvirt-14"
+  "id": "libvirt-13"
 }

 {
-  "id": "libvirt-14",
+  "id": "libvirt-13",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-scsi-ccw' not found"
@@ -3313,11 +3313,11 @@
   "arguments": {
     "typename": "virtio-net-s390"
   },
-  "id": "libvirt-15"
+  "id": "libvirt-14"
 }

 {
-  "id": "libvirt-15",
+  "id": "libvirt-14",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-net-s390' not found"
@@ -3329,11 +3329,11 @@
   "arguments": {
     "typename": "pci-assign"
   },
-  "id": "libvirt-16"
+  "id": "libvirt-15"
 }

 {
-  "id": "libvirt-16",
+  "id": "libvirt-15",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'pci-assign' not found"
@@ -3345,11 +3345,11 @@
   "arguments": {
     "typename": "kvm-pci-assign"
   },
-  "id": "libvirt-17"
+  "id": "libvirt-16"
 }

 {
-  "id": "libvirt-17",
+  "id": "libvirt-16",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'kvm-pci-assign' not found"
@@ -3361,7 +3361,7 @@
   "arguments": {
     "typename": "vfio-pci"
   },
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

 {
@@ -3468,7 +3468,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

 {
@@ -3476,7 +3476,7 @@
   "arguments": {
     "typename": "scsi-disk"
   },
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -3590,7 +3590,7 @@
       "type": "uint64"
     }
   ],
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -3598,7 +3598,7 @@
   "arguments": {
     "typename": "ide-drive"
   },
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
@@ -3674,7 +3674,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
@@ -3682,11 +3682,11 @@
   "arguments": {
     "typename": "PIIX4_PM"
   },
-  "id": "libvirt-21"
+  "id": "libvirt-20"
 }

 {
-  "id": "libvirt-21",
+  "id": "libvirt-20",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'PIIX4_PM' not found"
@@ -3698,11 +3698,11 @@
   "arguments": {
     "typename": "usb-host"
   },
-  "id": "libvirt-22"
+  "id": "libvirt-21"
 }

 {
-  "id": "libvirt-22",
+  "id": "libvirt-21",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'usb-host' not found"
@@ -3714,7 +3714,7 @@
   "arguments": {
     "typename": "scsi-generic"
   },
-  "id": "libvirt-23"
+  "id": "libvirt-22"
 }

 {
@@ -3741,7 +3741,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-23"
+  "id": "libvirt-22"
 }

 {
@@ -3749,11 +3749,11 @@
   "arguments": {
     "typename": "i440FX-pcihost"
   },
-  "id": "libvirt-24"
+  "id": "libvirt-23"
 }

 {
-  "id": "libvirt-24",
+  "id": "libvirt-23",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'i440FX-pcihost' not found"
@@ -3765,11 +3765,11 @@
   "arguments": {
     "typename": "q35-pcihost"
   },
-  "id": "libvirt-25"
+  "id": "libvirt-24"
 }

 {
-  "id": "libvirt-25",
+  "id": "libvirt-24",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'q35-pcihost' not found"
@@ -3781,7 +3781,7 @@
   "arguments": {
     "typename": "usb-storage"
   },
-  "id": "libvirt-26"
+  "id": "libvirt-25"
 }

 {
@@ -3854,7 +3854,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-26"
+  "id": "libvirt-25"
 }

 {
@@ -3862,11 +3862,11 @@
   "arguments": {
     "typename": "kvm-pit"
   },
-  "id": "libvirt-27"
+  "id": "libvirt-26"
 }

 {
-  "id": "libvirt-27",
+  "id": "libvirt-26",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'kvm-pit' not found"
@@ -3878,7 +3878,7 @@
   "arguments": {
     "typename": "VGA"
   },
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -3935,7 +3935,7 @@
       "type": "int32"
     }
   ],
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -3943,7 +3943,7 @@
   "arguments": {
     "typename": "virtio-gpu-pci"
   },
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
@@ -4086,7 +4086,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
@@ -4094,7 +4094,7 @@
   "arguments": {
     "typename": "virtio-gpu-device"
   },
-  "id": "libvirt-30"
+  "id": "libvirt-29"
 }

 {
@@ -4133,7 +4133,7 @@
       "type": "size"
     }
   ],
-  "id": "libvirt-30"
+  "id": "libvirt-29"
 }

 {
@@ -4141,11 +4141,11 @@
   "arguments": {
     "typename": "ICH9-LPC"
   },
-  "id": "libvirt-31"
+  "id": "libvirt-30"
 }

 {
-  "id": "libvirt-31",
+  "id": "libvirt-30",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'ICH9-LPC' not found"
@@ -4157,7 +4157,7 @@
   "arguments": {
     "typename": "virtio-balloon-pci"
   },
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

 {
@@ -4300,7 +4300,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

 {
@@ -4308,11 +4308,11 @@
   "arguments": {
     "typename": "virtio-balloon-ccw"
   },
-  "id": "libvirt-33"
+  "id": "libvirt-32"
 }

 {
-  "id": "libvirt-33",
+  "id": "libvirt-32",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-balloon-ccw' not found"
@@ -4324,7 +4324,7 @@
   "arguments": {
     "typename": "virtio-balloon-device"
   },
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

 {
@@ -4368,7 +4368,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

 {
@@ -4376,7 +4376,7 @@
   "arguments": {
     "typename": "nec-usb-xhci"
   },
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
@@ -4456,7 +4456,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
@@ -4464,7 +4464,7 @@
   "arguments": {
     "typename": "spapr-pci-host-bridge"
   },
-  "id": "libvirt-36"
+  "id": "libvirt-35"
 }

 {
@@ -4550,12 +4550,12 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-36"
+  "id": "libvirt-35"
 }

 {
   "execute": "query-machines",
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
@@ -4668,12 +4668,12 @@
       "cpu-max": 1
     }
   ],
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
   "execute": "query-cpu-definitions",
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
@@ -6849,34 +6849,34 @@
       "static": false
     }
   ],
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
   "execute": "query-tpm-models",
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
   "return": [
   ],
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
   "execute": "query-tpm-types",
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
   "return": [
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
   "execute": "query-command-line-options",
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
@@ -7986,12 +7986,12 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
   "execute": "query-migrate-capabilities",
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }

 {
@@ -8033,12 +8033,12 @@
       "capability": "release-ram"
     }
   ],
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }

 {
   "execute": "query-qmp-schema",
-  "id": "libvirt-43"
+  "id": "libvirt-42"
 }

 {
@@ -17324,7 +17324,7 @@
       "meta-type": "object"
     }
   ],
-  "id": "libvirt-43"
+  "id": "libvirt-42"
 }

 {
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies
index 3f86d5927e..3f7e271c65 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies
@@ -495,11 +495,11 @@
   "arguments": {
     "device": "bogus"
   },
-  "id": "libvirt-6"
+  "id": "libvirt-5"
 }

 {
-  "id": "libvirt-6",
+  "id": "libvirt-5",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'bogus' not found"
@@ -508,7 +508,7 @@

 {
   "execute": "query-kvm",
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

 {
@@ -516,12 +516,12 @@
     "enabled": true,
     "present": true
   },
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

 {
   "execute": "query-events",
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

 {
@@ -638,12 +638,12 @@
       "name": "ACPI_DEVICE_OST"
     }
   ],
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

 {
   "execute": "qom-list-types",
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

 {
@@ -1285,7 +1285,7 @@
       "name": "virtio-blk-device"
     }
   ],
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

 {
@@ -1293,7 +1293,7 @@
   "arguments": {
     "typename": "virtio-blk-pci"
   },
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

 {
@@ -1521,7 +1521,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

 {
@@ -1529,7 +1529,7 @@
   "arguments": {
     "typename": "virtio-net-pci"
   },
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

 {
@@ -1808,7 +1808,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

 {
@@ -1816,7 +1816,7 @@
   "arguments": {
     "typename": "virtio-scsi-pci"
   },
-  "id": "libvirt-12"
+  "id": "libvirt-11"
 }

 {
@@ -1977,7 +1977,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-12"
+  "id": "libvirt-11"
 }

 {
@@ -1985,7 +1985,7 @@
   "arguments": {
     "typename": "virtio-blk-ccw"
   },
-  "id": "libvirt-13"
+  "id": "libvirt-12"
 }

 {
@@ -2123,7 +2123,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-13"
+  "id": "libvirt-12"
 }

 {
@@ -2131,7 +2131,7 @@
   "arguments": {
     "typename": "virtio-net-ccw"
   },
-  "id": "libvirt-14"
+  "id": "libvirt-13"
 }

 {
@@ -2324,7 +2324,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-14"
+  "id": "libvirt-13"
 }

 {
@@ -2332,7 +2332,7 @@
   "arguments": {
     "typename": "virtio-scsi-ccw"
   },
-  "id": "libvirt-15"
+  "id": "libvirt-14"
 }

 {
@@ -2407,7 +2407,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-15"
+  "id": "libvirt-14"
 }

 {
@@ -2415,11 +2415,11 @@
   "arguments": {
     "typename": "virtio-net-s390"
   },
-  "id": "libvirt-16"
+  "id": "libvirt-15"
 }

 {
-  "id": "libvirt-16",
+  "id": "libvirt-15",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-net-s390' not found"
@@ -2431,11 +2431,11 @@
   "arguments": {
     "typename": "pci-assign"
   },
-  "id": "libvirt-17"
+  "id": "libvirt-16"
 }

 {
-  "id": "libvirt-17",
+  "id": "libvirt-16",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'pci-assign' not found"
@@ -2447,11 +2447,11 @@
   "arguments": {
     "typename": "kvm-pci-assign"
   },
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

 {
-  "id": "libvirt-18",
+  "id": "libvirt-17",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'kvm-pci-assign' not found"
@@ -2463,7 +2463,7 @@
   "arguments": {
     "typename": "vfio-pci"
   },
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -2570,7 +2570,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -2578,7 +2578,7 @@
   "arguments": {
     "typename": "scsi-disk"
   },
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
@@ -2692,7 +2692,7 @@
       "type": "uint64"
     }
   ],
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
@@ -2700,11 +2700,11 @@
   "arguments": {
     "typename": "ide-drive"
   },
-  "id": "libvirt-21"
+  "id": "libvirt-20"
 }

 {
-  "id": "libvirt-21",
+  "id": "libvirt-20",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'ide-drive' not found"
@@ -2716,11 +2716,11 @@
   "arguments": {
     "typename": "PIIX4_PM"
   },
-  "id": "libvirt-22"
+  "id": "libvirt-21"
 }

 {
-  "id": "libvirt-22",
+  "id": "libvirt-21",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'PIIX4_PM' not found"
@@ -2732,11 +2732,11 @@
   "arguments": {
     "typename": "usb-host"
   },
-  "id": "libvirt-23"
+  "id": "libvirt-22"
 }

 {
-  "id": "libvirt-23",
+  "id": "libvirt-22",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'usb-host' not found"
@@ -2748,7 +2748,7 @@
   "arguments": {
     "typename": "scsi-generic"
   },
-  "id": "libvirt-24"
+  "id": "libvirt-23"
 }

 {
@@ -2775,7 +2775,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-24"
+  "id": "libvirt-23"
 }

 {
@@ -2783,11 +2783,11 @@
   "arguments": {
     "typename": "i440FX-pcihost"
   },
-  "id": "libvirt-25"
+  "id": "libvirt-24"
 }

 {
-  "id": "libvirt-25",
+  "id": "libvirt-24",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'i440FX-pcihost' not found"
@@ -2799,11 +2799,11 @@
   "arguments": {
     "typename": "q35-pcihost"
   },
-  "id": "libvirt-26"
+  "id": "libvirt-25"
 }

 {
-  "id": "libvirt-26",
+  "id": "libvirt-25",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'q35-pcihost' not found"
@@ -2815,11 +2815,11 @@
   "arguments": {
     "typename": "kvm-pit"
   },
-  "id": "libvirt-27"
+  "id": "libvirt-26"
 }

 {
-  "id": "libvirt-27",
+  "id": "libvirt-26",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'kvm-pit' not found"
@@ -2831,7 +2831,7 @@
   "arguments": {
     "typename": "virtio-gpu-pci"
   },
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -2974,7 +2974,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -2982,7 +2982,7 @@
   "arguments": {
     "typename": "virtio-gpu-device"
   },
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
@@ -3021,7 +3021,7 @@
       "type": "size"
     }
   ],
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
@@ -3029,11 +3029,11 @@
   "arguments": {
     "typename": "ICH9-LPC"
   },
-  "id": "libvirt-30"
+  "id": "libvirt-29"
 }

 {
-  "id": "libvirt-30",
+  "id": "libvirt-29",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'ICH9-LPC' not found"
@@ -3045,7 +3045,7 @@
   "arguments": {
     "typename": "virtio-balloon-pci"
   },
-  "id": "libvirt-31"
+  "id": "libvirt-30"
 }

 {
@@ -3188,7 +3188,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-31"
+  "id": "libvirt-30"
 }

 {
@@ -3196,7 +3196,7 @@
   "arguments": {
     "typename": "virtio-balloon-ccw"
   },
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

 {
@@ -3258,7 +3258,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

 {
@@ -3266,7 +3266,7 @@
   "arguments": {
     "typename": "virtio-balloon-device"
   },
-  "id": "libvirt-33"
+  "id": "libvirt-32"
 }

 {
@@ -3310,7 +3310,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-33"
+  "id": "libvirt-32"
 }

 {
@@ -3318,7 +3318,7 @@
   "arguments": {
     "typename": "virtual-css-bridge"
   },
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

 {
@@ -3328,12 +3328,12 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

 {
   "execute": "query-machines",
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
@@ -3376,12 +3376,12 @@
       "cpu-max": 248
     }
   ],
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
   "execute": "query-cpu-definitions",
-  "id": "libvirt-36"
+  "id": "libvirt-35"
 }

 {
@@ -3771,34 +3771,34 @@
       "migration-safe": true
     }
   ],
-  "id": "libvirt-36"
+  "id": "libvirt-35"
 }

 {
   "execute": "query-tpm-models",
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
   "return": [
   ],
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
   "execute": "query-tpm-types",
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
   "return": [
   ],
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
   "execute": "query-command-line-options",
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
@@ -4873,12 +4873,12 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
   "execute": "query-migrate-capabilities",
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
@@ -4920,12 +4920,12 @@
       "capability": "release-ram"
     }
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
   "execute": "query-qmp-schema",
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
@@ -14211,7 +14211,7 @@
       "meta-type": "object"
     }
   ],
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
@@ -14222,7 +14222,7 @@
       "name": "host"
     }
   },
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }

 {
@@ -14249,7 +14249,7 @@
       }
     }
   },
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }

 {
@@ -14263,11 +14263,11 @@
       }
     }
   },
-  "id": "libvirt-43"
+  "id": "libvirt-42"
 }

 {
-  "id": "libvirt-43",
+  "id": "libvirt-42",
   "error": {
     "class": "GenericError",
     "desc": "Property '.migratable' not found"
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies
index 0fe8da66fc..eac463aa49 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies
@@ -492,11 +492,11 @@
   "arguments": {
     "device": "bogus"
   },
-  "id": "libvirt-6"
+  "id": "libvirt-5"
 }

 {
-  "id": "libvirt-6",
+  "id": "libvirt-5",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'bogus' not found"
@@ -505,7 +505,7 @@

 {
   "execute": "query-kvm",
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

 {
@@ -513,12 +513,12 @@
     "enabled": true,
     "present": true
   },
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

 {
   "execute": "query-events",
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

 {
@@ -635,12 +635,12 @@
       "name": "ACPI_DEVICE_OST"
     }
   ],
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

 {
   "execute": "qom-list-types",
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

 {
@@ -1771,7 +1771,7 @@
       "name": "virtio-blk-device"
     }
   ],
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

 {
@@ -1779,7 +1779,7 @@
   "arguments": {
     "typename": "virtio-blk-pci"
   },
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

 {
@@ -2007,7 +2007,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

 {
@@ -2015,7 +2015,7 @@
   "arguments": {
     "typename": "virtio-net-pci"
   },
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

 {
@@ -2294,7 +2294,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

 {
@@ -2302,7 +2302,7 @@
   "arguments": {
     "typename": "virtio-scsi-pci"
   },
-  "id": "libvirt-12"
+  "id": "libvirt-11"
 }

 {
@@ -2463,7 +2463,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-12"
+  "id": "libvirt-11"
 }

 {
@@ -2471,11 +2471,11 @@
   "arguments": {
     "typename": "virtio-net-ccw"
   },
-  "id": "libvirt-13"
+  "id": "libvirt-12"
 }

 {
-  "id": "libvirt-13",
+  "id": "libvirt-12",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-net-ccw' not found"
@@ -2487,11 +2487,11 @@
   "arguments": {
     "typename": "virtio-scsi-ccw"
   },
-  "id": "libvirt-14"
+  "id": "libvirt-13"
 }

 {
-  "id": "libvirt-14",
+  "id": "libvirt-13",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-scsi-ccw' not found"
@@ -2503,11 +2503,11 @@
   "arguments": {
     "typename": "virtio-net-s390"
   },
-  "id": "libvirt-15"
+  "id": "libvirt-14"
 }

 {
-  "id": "libvirt-15",
+  "id": "libvirt-14",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-net-s390' not found"
@@ -2519,11 +2519,11 @@
   "arguments": {
     "typename": "pci-assign"
   },
-  "id": "libvirt-16"
+  "id": "libvirt-15"
 }

 {
-  "id": "libvirt-16",
+  "id": "libvirt-15",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'pci-assign' not found"
@@ -2535,7 +2535,7 @@
   "arguments": {
     "typename": "kvm-pci-assign"
   },
-  "id": "libvirt-17"
+  "id": "libvirt-16"
 }

 {
@@ -2597,7 +2597,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-17"
+  "id": "libvirt-16"
 }

 {
@@ -2605,7 +2605,7 @@
   "arguments": {
     "typename": "vfio-pci"
   },
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

 {
@@ -2712,7 +2712,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

 {
@@ -2720,7 +2720,7 @@
   "arguments": {
     "typename": "scsi-disk"
   },
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -2834,7 +2834,7 @@
       "type": "uint64"
     }
   ],
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -2842,7 +2842,7 @@
   "arguments": {
     "typename": "ide-drive"
   },
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
@@ -2918,7 +2918,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
@@ -2926,7 +2926,7 @@
   "arguments": {
     "typename": "PIIX4_PM"
   },
-  "id": "libvirt-21"
+  "id": "libvirt-20"
 }

 {
@@ -2989,7 +2989,7 @@
       "type": "int32"
     }
   ],
-  "id": "libvirt-21"
+  "id": "libvirt-20"
 }

 {
@@ -2997,7 +2997,7 @@
   "arguments": {
     "typename": "usb-redir"
   },
-  "id": "libvirt-22"
+  "id": "libvirt-21"
 }

 {
@@ -3046,7 +3046,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-22"
+  "id": "libvirt-21"
 }

 {
@@ -3054,7 +3054,7 @@
   "arguments": {
     "typename": "usb-host"
   },
-  "id": "libvirt-23"
+  "id": "libvirt-22"
 }

 {
@@ -3123,7 +3123,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-23"
+  "id": "libvirt-22"
 }

 {
@@ -3131,7 +3131,7 @@
   "arguments": {
     "typename": "scsi-generic"
   },
-  "id": "libvirt-24"
+  "id": "libvirt-23"
 }

 {
@@ -3158,7 +3158,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-24"
+  "id": "libvirt-23"
 }

 {
@@ -3166,7 +3166,7 @@
   "arguments": {
     "typename": "i440FX-pcihost"
   },
-  "id": "libvirt-25"
+  "id": "libvirt-24"
 }

 {
@@ -3204,7 +3204,7 @@
       "type": "child<qemu:memory-region>"
     }
   ],
-  "id": "libvirt-25"
+  "id": "libvirt-24"
 }

 {
@@ -3212,7 +3212,7 @@
   "arguments": {
     "typename": "q35-pcihost"
   },
-  "id": "libvirt-26"
+  "id": "libvirt-25"
 }

 {
@@ -3290,7 +3290,7 @@
       "type": "int"
     }
   ],
-  "id": "libvirt-26"
+  "id": "libvirt-25"
 }

 {
@@ -3298,7 +3298,7 @@
   "arguments": {
     "typename": "usb-storage"
   },
-  "id": "libvirt-27"
+  "id": "libvirt-26"
 }

 {
@@ -3371,7 +3371,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-27"
+  "id": "libvirt-26"
 }

 {
@@ -3379,7 +3379,7 @@
   "arguments": {
     "typename": "kvm-pit"
   },
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -3393,7 +3393,7 @@
       "type": "LostTickPolicy"
     }
   ],
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -3401,7 +3401,7 @@
   "arguments": {
     "typename": "VGA"
   },
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
@@ -3458,7 +3458,7 @@
       "type": "int32"
     }
   ],
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
@@ -3466,7 +3466,7 @@
   "arguments": {
     "typename": "vmware-svga"
   },
-  "id": "libvirt-30"
+  "id": "libvirt-29"
 }

 {
@@ -3509,7 +3509,7 @@
       "type": "int32"
     }
   ],
-  "id": "libvirt-30"
+  "id": "libvirt-29"
 }

 {
@@ -3517,7 +3517,7 @@
   "arguments": {
     "typename": "qxl"
   },
-  "id": "libvirt-31"
+  "id": "libvirt-30"
 }

 {
@@ -3604,7 +3604,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-31"
+  "id": "libvirt-30"
 }

 {
@@ -3612,7 +3612,7 @@
   "arguments": {
     "typename": "virtio-gpu-pci"
   },
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

 {
@@ -3765,7 +3765,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

 {
@@ -3773,7 +3773,7 @@
   "arguments": {
     "typename": "virtio-gpu-device"
   },
-  "id": "libvirt-33"
+  "id": "libvirt-32"
 }

 {
@@ -3822,7 +3822,7 @@
       "type": "size"
     }
   ],
-  "id": "libvirt-33"
+  "id": "libvirt-32"
 }

 {
@@ -3830,7 +3830,7 @@
   "arguments": {
     "typename": "ICH9-LPC"
   },
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

 {
@@ -3926,7 +3926,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

 {
@@ -3934,7 +3934,7 @@
   "arguments": {
     "typename": "virtio-balloon-pci"
   },
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
@@ -4077,7 +4077,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
@@ -4085,11 +4085,11 @@
   "arguments": {
     "typename": "virtio-balloon-ccw"
   },
-  "id": "libvirt-36"
+  "id": "libvirt-35"
 }

 {
-  "id": "libvirt-36",
+  "id": "libvirt-35",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-balloon-ccw' not found"
@@ -4101,7 +4101,7 @@
   "arguments": {
     "typename": "virtio-balloon-device"
   },
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
@@ -4145,7 +4145,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
@@ -4153,7 +4153,7 @@
   "arguments": {
     "typename": "nec-usb-xhci"
   },
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
@@ -4233,7 +4233,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
@@ -4241,7 +4241,7 @@
   "arguments": {
     "typename": "intel-iommu"
   },
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
@@ -4272,7 +4272,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
@@ -4280,7 +4280,7 @@
   "arguments": {
     "typename": "mch"
   },
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
@@ -4306,12 +4306,12 @@
       "type": "pci-devfn"
     }
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
   "execute": "query-machines",
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
@@ -4490,12 +4490,12 @@
       "cpu-max": 255
     }
   ],
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
   "execute": "query-cpu-definitions",
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }

 {
@@ -4777,36 +4777,36 @@
       "migration-safe": true
     }
   ],
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }

 {
   "execute": "query-tpm-models",
-  "id": "libvirt-43"
+  "id": "libvirt-42"
 }

 {
   "return": [
     "tpm-tis"
   ],
-  "id": "libvirt-43"
+  "id": "libvirt-42"
 }

 {
   "execute": "query-tpm-types",
-  "id": "libvirt-44"
+  "id": "libvirt-43"
 }

 {
   "return": [
     "passthrough"
   ],
-  "id": "libvirt-44"
+  "id": "libvirt-43"
 }

 {
   "execute": "query-command-line-options",
-  "id": "libvirt-45"
+  "id": "libvirt-44"
 }

 {
@@ -6055,12 +6055,12 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-45"
+  "id": "libvirt-44"
 }

 {
   "execute": "query-migrate-capabilities",
-  "id": "libvirt-46"
+  "id": "libvirt-45"
 }

 {
@@ -6102,12 +6102,12 @@
       "capability": "release-ram"
     }
   ],
-  "id": "libvirt-46"
+  "id": "libvirt-45"
 }

 {
   "execute": "query-qmp-schema",
-  "id": "libvirt-47"
+  "id": "libvirt-46"
 }

 {
@@ -15393,7 +15393,7 @@
       "meta-type": "object"
     }
   ],
-  "id": "libvirt-47"
+  "id": "libvirt-46"
 }

 {
@@ -15404,7 +15404,7 @@
       "name": "host"
     }
   },
-  "id": "libvirt-48"
+  "id": "libvirt-47"
 }

 {
@@ -15583,7 +15583,7 @@
       }
     }
   },
-  "id": "libvirt-48"
+  "id": "libvirt-47"
 }

 {
@@ -15764,7 +15764,7 @@
       }
     }
   },
-  "id": "libvirt-49"
+  "id": "libvirt-48"
 }

 {
@@ -16005,7 +16005,7 @@
       }
     }
   },
-  "id": "libvirt-49"
+  "id": "libvirt-48"
 }

 {
@@ -16019,7 +16019,7 @@
       }
     }
   },
-  "id": "libvirt-50"
+  "id": "libvirt-49"
 }

 {
@@ -16198,7 +16198,7 @@
       }
     }
   },
-  "id": "libvirt-50"
+  "id": "libvirt-49"
 }

 {
@@ -16379,7 +16379,7 @@
       }
     }
   },
-  "id": "libvirt-51"
+  "id": "libvirt-50"
 }

 {
@@ -16620,7 +16620,7 @@
       }
     }
   },
-  "id": "libvirt-51"
+  "id": "libvirt-50"
 }

 {
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies
index fa770f825c..c07fb0c401 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies
@@ -570,11 +570,11 @@
   "arguments": {
     "device": "bogus"
   },
-  "id": "libvirt-6"
+  "id": "libvirt-5"
 }

 {
-  "id": "libvirt-6",
+  "id": "libvirt-5",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'bogus' not found"
@@ -583,7 +583,7 @@

 {
   "execute": "query-kvm",
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

 {
@@ -591,12 +591,12 @@
     "enabled": true,
     "present": true
   },
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

 {
   "execute": "query-events",
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

 {
@@ -722,12 +722,12 @@
       "name": "SHUTDOWN"
     }
   ],
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

 {
   "execute": "qom-list-types",
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

 {
@@ -3569,7 +3569,7 @@
       "parent": "virtio-input-hid-pci"
     }
   ],
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

 {
@@ -3577,7 +3577,7 @@
   "arguments": {
     "typename": "virtio-blk-pci"
   },
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

 {
@@ -3809,7 +3809,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

 {
@@ -3817,7 +3817,7 @@
   "arguments": {
     "typename": "virtio-net-pci"
   },
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

 {
@@ -4107,7 +4107,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

 {
@@ -4115,7 +4115,7 @@
   "arguments": {
     "typename": "virtio-scsi-pci"
   },
-  "id": "libvirt-12"
+  "id": "libvirt-11"
 }

 {
@@ -4280,7 +4280,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-12"
+  "id": "libvirt-11"
 }

 {
@@ -4288,11 +4288,11 @@
   "arguments": {
     "typename": "virtio-net-ccw"
   },
-  "id": "libvirt-13"
+  "id": "libvirt-12"
 }

 {
-  "id": "libvirt-13",
+  "id": "libvirt-12",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-net-ccw' not found"
@@ -4304,11 +4304,11 @@
   "arguments": {
     "typename": "virtio-scsi-ccw"
   },
-  "id": "libvirt-14"
+  "id": "libvirt-13"
 }

 {
-  "id": "libvirt-14",
+  "id": "libvirt-13",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-scsi-ccw' not found"
@@ -4320,11 +4320,11 @@
   "arguments": {
     "typename": "virtio-net-s390"
   },
-  "id": "libvirt-15"
+  "id": "libvirt-14"
 }

 {
-  "id": "libvirt-15",
+  "id": "libvirt-14",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-net-s390' not found"
@@ -4336,11 +4336,11 @@
   "arguments": {
     "typename": "pci-assign"
   },
-  "id": "libvirt-16"
+  "id": "libvirt-15"
 }

 {
-  "id": "libvirt-16",
+  "id": "libvirt-15",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'pci-assign' not found"
@@ -4352,11 +4352,11 @@
   "arguments": {
     "typename": "kvm-pci-assign"
   },
-  "id": "libvirt-17"
+  "id": "libvirt-16"
 }

 {
-  "id": "libvirt-17",
+  "id": "libvirt-16",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'kvm-pci-assign' not found"
@@ -4368,7 +4368,7 @@
   "arguments": {
     "typename": "vfio-pci"
   },
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

 {
@@ -4502,7 +4502,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

 {
@@ -4510,7 +4510,7 @@
   "arguments": {
     "typename": "scsi-disk"
   },
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -4628,7 +4628,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -4636,7 +4636,7 @@
   "arguments": {
     "typename": "ide-drive"
   },
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
@@ -4712,7 +4712,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
@@ -4720,11 +4720,11 @@
   "arguments": {
     "typename": "PIIX4_PM"
   },
-  "id": "libvirt-21"
+  "id": "libvirt-20"
 }

 {
-  "id": "libvirt-21",
+  "id": "libvirt-20",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'PIIX4_PM' not found"
@@ -4736,7 +4736,7 @@
   "arguments": {
     "typename": "usb-host"
   },
-  "id": "libvirt-22"
+  "id": "libvirt-21"
 }

 {
@@ -4805,7 +4805,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-22"
+  "id": "libvirt-21"
 }

 {
@@ -4813,7 +4813,7 @@
   "arguments": {
     "typename": "scsi-generic"
   },
-  "id": "libvirt-23"
+  "id": "libvirt-22"
 }

 {
@@ -4844,7 +4844,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-23"
+  "id": "libvirt-22"
 }

 {
@@ -4852,11 +4852,11 @@
   "arguments": {
     "typename": "i440FX-pcihost"
   },
-  "id": "libvirt-24"
+  "id": "libvirt-23"
 }

 {
-  "id": "libvirt-24",
+  "id": "libvirt-23",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'i440FX-pcihost' not found"
@@ -4868,11 +4868,11 @@
   "arguments": {
     "typename": "q35-pcihost"
   },
-  "id": "libvirt-25"
+  "id": "libvirt-24"
 }

 {
-  "id": "libvirt-25",
+  "id": "libvirt-24",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'q35-pcihost' not found"
@@ -4884,7 +4884,7 @@
   "arguments": {
     "typename": "usb-storage"
   },
-  "id": "libvirt-26"
+  "id": "libvirt-25"
 }

 {
@@ -4957,7 +4957,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-26"
+  "id": "libvirt-25"
 }

 {
@@ -4965,11 +4965,11 @@
   "arguments": {
     "typename": "kvm-pit"
   },
-  "id": "libvirt-27"
+  "id": "libvirt-26"
 }

 {
-  "id": "libvirt-27",
+  "id": "libvirt-26",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'kvm-pit' not found"
@@ -4981,7 +4981,7 @@
   "arguments": {
     "typename": "VGA"
   },
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -5038,7 +5038,7 @@
       "type": "int32"
     }
   ],
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -5046,7 +5046,7 @@
   "arguments": {
     "typename": "virtio-gpu-pci"
   },
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
@@ -5197,7 +5197,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
@@ -5205,7 +5205,7 @@
   "arguments": {
     "typename": "virtio-gpu-device"
   },
-  "id": "libvirt-30"
+  "id": "libvirt-29"
 }

 {
@@ -5252,7 +5252,7 @@
       "type": "size"
     }
   ],
-  "id": "libvirt-30"
+  "id": "libvirt-29"
 }

 {
@@ -5260,11 +5260,11 @@
   "arguments": {
     "typename": "ICH9-LPC"
   },
-  "id": "libvirt-31"
+  "id": "libvirt-30"
 }

 {
-  "id": "libvirt-31",
+  "id": "libvirt-30",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'ICH9-LPC' not found"
@@ -5276,7 +5276,7 @@
   "arguments": {
     "typename": "virtio-balloon-pci"
   },
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

 {
@@ -5419,7 +5419,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

 {
@@ -5427,11 +5427,11 @@
   "arguments": {
     "typename": "virtio-balloon-ccw"
   },
-  "id": "libvirt-33"
+  "id": "libvirt-32"
 }

 {
-  "id": "libvirt-33",
+  "id": "libvirt-32",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-balloon-ccw' not found"
@@ -5443,7 +5443,7 @@
   "arguments": {
     "typename": "virtio-balloon-device"
   },
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

 {
@@ -5487,7 +5487,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

 {
@@ -5495,7 +5495,7 @@
   "arguments": {
     "typename": "nec-usb-xhci"
   },
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
@@ -5575,7 +5575,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
@@ -5583,7 +5583,7 @@
   "arguments": {
     "typename": "spapr-pci-host-bridge"
   },
-  "id": "libvirt-36"
+  "id": "libvirt-35"
 }

 {
@@ -5641,7 +5641,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-36"
+  "id": "libvirt-35"
 }

 {
@@ -5649,7 +5649,7 @@
   "arguments": {
     "typename": "memory-backend-file"
   },
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
@@ -5699,7 +5699,7 @@
       "type": "string"
     }
   ],
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
@@ -5707,7 +5707,7 @@
   "arguments": {
     "typename": "spapr-machine"
   },
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
@@ -5878,12 +5878,12 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
   "execute": "query-machines",
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
@@ -6026,12 +6026,12 @@
       "cpu-max": 1
     }
   ],
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
   "execute": "query-cpu-definitions",
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
@@ -8227,35 +8227,35 @@
       "static": false
     }
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
   "execute": "query-tpm-models",
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
   "return": [
   ],
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
   "execute": "query-tpm-types",
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }

 {
   "return": [
     "emulator"
   ],
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }

 {
   "execute": "query-command-line-options",
-  "id": "libvirt-43"
+  "id": "libvirt-42"
 }

 {
@@ -9385,12 +9385,12 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-43"
+  "id": "libvirt-42"
 }

 {
   "execute": "query-migrate-capabilities",
-  "id": "libvirt-44"
+  "id": "libvirt-43"
 }

 {
@@ -9460,12 +9460,12 @@
       "capability": "late-block-activate"
     }
   ],
-  "id": "libvirt-44"
+  "id": "libvirt-43"
 }

 {
   "execute": "query-qmp-schema",
-  "id": "libvirt-45"
+  "id": "libvirt-44"
 }

 {
@@ -21624,7 +21624,7 @@
       "meta-type": "object"
     }
   ],
-  "id": "libvirt-45"
+  "id": "libvirt-44"
 }

 {
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies
index 9846f4ae42..07e9a605ce 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies
@@ -588,11 +588,11 @@
   "arguments": {
     "device": "bogus"
   },
-  "id": "libvirt-6"
+  "id": "libvirt-5"
 }

 {
-  "id": "libvirt-6",
+  "id": "libvirt-5",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'bogus' not found"
@@ -601,7 +601,7 @@

 {
   "execute": "query-kvm",
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

 {
@@ -609,12 +609,12 @@
     "enabled": true,
     "present": true
   },
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

 {
   "execute": "query-events",
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

 {
@@ -743,12 +743,12 @@
       "name": "SHUTDOWN"
     }
   ],
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

 {
   "execute": "qom-list-types",
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

 {
@@ -2414,7 +2414,7 @@
       "parent": "rng-backend"
     }
   ],
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

 {
@@ -2422,7 +2422,7 @@
   "arguments": {
     "typename": "virtio-blk-pci"
   },
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

 {
@@ -2654,7 +2654,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

 {
@@ -2662,7 +2662,7 @@
   "arguments": {
     "typename": "virtio-net-pci"
   },
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

 {
@@ -2952,7 +2952,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

 {
@@ -2960,7 +2960,7 @@
   "arguments": {
     "typename": "virtio-scsi-pci"
   },
-  "id": "libvirt-12"
+  "id": "libvirt-11"
 }

 {
@@ -3125,7 +3125,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-12"
+  "id": "libvirt-11"
 }

 {
@@ -3133,11 +3133,11 @@
   "arguments": {
     "typename": "virtio-net-ccw"
   },
-  "id": "libvirt-13"
+  "id": "libvirt-12"
 }

 {
-  "id": "libvirt-13",
+  "id": "libvirt-12",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-net-ccw' not found"
@@ -3149,11 +3149,11 @@
   "arguments": {
     "typename": "virtio-scsi-ccw"
   },
-  "id": "libvirt-14"
+  "id": "libvirt-13"
 }

 {
-  "id": "libvirt-14",
+  "id": "libvirt-13",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-scsi-ccw' not found"
@@ -3165,11 +3165,11 @@
   "arguments": {
     "typename": "virtio-net-s390"
   },
-  "id": "libvirt-15"
+  "id": "libvirt-14"
 }

 {
-  "id": "libvirt-15",
+  "id": "libvirt-14",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-net-s390' not found"
@@ -3181,11 +3181,11 @@
   "arguments": {
     "typename": "pci-assign"
   },
-  "id": "libvirt-16"
+  "id": "libvirt-15"
 }

 {
-  "id": "libvirt-16",
+  "id": "libvirt-15",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'pci-assign' not found"
@@ -3197,11 +3197,11 @@
   "arguments": {
     "typename": "kvm-pci-assign"
   },
-  "id": "libvirt-17"
+  "id": "libvirt-16"
 }

 {
-  "id": "libvirt-17",
+  "id": "libvirt-16",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'kvm-pci-assign' not found"
@@ -3213,7 +3213,7 @@
   "arguments": {
     "typename": "vfio-pci"
   },
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

 {
@@ -3347,7 +3347,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

 {
@@ -3355,7 +3355,7 @@
   "arguments": {
     "typename": "scsi-disk"
   },
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -3473,7 +3473,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -3481,7 +3481,7 @@
   "arguments": {
     "typename": "ide-drive"
   },
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
@@ -3557,7 +3557,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
@@ -3565,7 +3565,7 @@
   "arguments": {
     "typename": "PIIX4_PM"
   },
-  "id": "libvirt-21"
+  "id": "libvirt-20"
 }

 {
@@ -3628,7 +3628,7 @@
       "type": "int32"
     }
   ],
-  "id": "libvirt-21"
+  "id": "libvirt-20"
 }

 {
@@ -3636,7 +3636,7 @@
   "arguments": {
     "typename": "usb-redir"
   },
-  "id": "libvirt-22"
+  "id": "libvirt-21"
 }

 {
@@ -3685,7 +3685,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-22"
+  "id": "libvirt-21"
 }

 {
@@ -3693,7 +3693,7 @@
   "arguments": {
     "typename": "usb-host"
   },
-  "id": "libvirt-23"
+  "id": "libvirt-22"
 }

 {
@@ -3762,7 +3762,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-23"
+  "id": "libvirt-22"
 }

 {
@@ -3770,7 +3770,7 @@
   "arguments": {
     "typename": "scsi-generic"
   },
-  "id": "libvirt-24"
+  "id": "libvirt-23"
 }

 {
@@ -3801,7 +3801,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-24"
+  "id": "libvirt-23"
 }

 {
@@ -3809,7 +3809,7 @@
   "arguments": {
     "typename": "i440FX-pcihost"
   },
-  "id": "libvirt-25"
+  "id": "libvirt-24"
 }

 {
@@ -3851,7 +3851,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-25"
+  "id": "libvirt-24"
 }

 {
@@ -3859,7 +3859,7 @@
   "arguments": {
     "typename": "q35-pcihost"
   },
-  "id": "libvirt-26"
+  "id": "libvirt-25"
 }

 {
@@ -3941,7 +3941,7 @@
       "type": "uint64"
     }
   ],
-  "id": "libvirt-26"
+  "id": "libvirt-25"
 }

 {
@@ -3949,7 +3949,7 @@
   "arguments": {
     "typename": "usb-storage"
   },
-  "id": "libvirt-27"
+  "id": "libvirt-26"
 }

 {
@@ -4032,7 +4032,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-27"
+  "id": "libvirt-26"
 }

 {
@@ -4040,7 +4040,7 @@
   "arguments": {
     "typename": "kvm-pit"
   },
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -4054,7 +4054,7 @@
       "type": "LostTickPolicy"
     }
   ],
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -4062,7 +4062,7 @@
   "arguments": {
     "typename": "VGA"
   },
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
@@ -4123,7 +4123,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
@@ -4131,7 +4131,7 @@
   "arguments": {
     "typename": "vmware-svga"
   },
-  "id": "libvirt-30"
+  "id": "libvirt-29"
 }

 {
@@ -4178,7 +4178,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-30"
+  "id": "libvirt-29"
 }

 {
@@ -4186,7 +4186,7 @@
   "arguments": {
     "typename": "qxl"
   },
-  "id": "libvirt-31"
+  "id": "libvirt-30"
 }

 {
@@ -4285,7 +4285,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-31"
+  "id": "libvirt-30"
 }

 {
@@ -4293,7 +4293,7 @@
   "arguments": {
     "typename": "virtio-gpu-pci"
   },
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

 {
@@ -4454,7 +4454,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

 {
@@ -4462,7 +4462,7 @@
   "arguments": {
     "typename": "virtio-gpu-device"
   },
-  "id": "libvirt-33"
+  "id": "libvirt-32"
 }

 {
@@ -4519,7 +4519,7 @@
       "type": "size"
     }
   ],
-  "id": "libvirt-33"
+  "id": "libvirt-32"
 }

 {
@@ -4527,7 +4527,7 @@
   "arguments": {
     "typename": "ICH9-LPC"
   },
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

 {
@@ -4623,7 +4623,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

 {
@@ -4631,7 +4631,7 @@
   "arguments": {
     "typename": "virtio-balloon-pci"
   },
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
@@ -4774,7 +4774,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
@@ -4782,11 +4782,11 @@
   "arguments": {
     "typename": "virtio-balloon-ccw"
   },
-  "id": "libvirt-36"
+  "id": "libvirt-35"
 }

 {
-  "id": "libvirt-36",
+  "id": "libvirt-35",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-balloon-ccw' not found"
@@ -4798,7 +4798,7 @@
   "arguments": {
     "typename": "virtio-balloon-device"
   },
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
@@ -4842,7 +4842,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
@@ -4850,7 +4850,7 @@
   "arguments": {
     "typename": "nec-usb-xhci"
   },
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
@@ -4930,7 +4930,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
@@ -4938,7 +4938,7 @@
   "arguments": {
     "typename": "intel-iommu"
   },
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
@@ -4977,7 +4977,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
@@ -4985,7 +4985,7 @@
   "arguments": {
     "typename": "mch"
   },
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
@@ -5028,7 +5028,7 @@
       "type": "int32"
     }
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
@@ -5036,7 +5036,7 @@
   "arguments": {
     "typename": "memory-backend-file"
   },
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
@@ -5086,7 +5086,7 @@
       "type": "string"
     }
   ],
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
@@ -5094,11 +5094,11 @@
   "arguments": {
     "typename": "spapr-machine"
   },
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }

 {
-  "id": "libvirt-42",
+  "id": "libvirt-41",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Class 'spapr-machine' not found"
@@ -5107,7 +5107,7 @@

 {
   "execute": "query-machines",
-  "id": "libvirt-43"
+  "id": "libvirt-42"
 }

 {
@@ -5316,12 +5316,12 @@
       "cpu-max": 255
     }
   ],
-  "id": "libvirt-43"
+  "id": "libvirt-42"
 }

 {
   "execute": "query-cpu-definitions",
-  "id": "libvirt-44"
+  "id": "libvirt-43"
 }

 {
@@ -5758,12 +5758,12 @@
       "migration-safe": true
     }
   ],
-  "id": "libvirt-44"
+  "id": "libvirt-43"
 }

 {
   "execute": "query-tpm-models",
-  "id": "libvirt-45"
+  "id": "libvirt-44"
 }

 {
@@ -5771,12 +5771,12 @@
     "tpm-crb",
     "tpm-tis"
   ],
-  "id": "libvirt-45"
+  "id": "libvirt-44"
 }

 {
   "execute": "query-tpm-types",
-  "id": "libvirt-46"
+  "id": "libvirt-45"
 }

 {
@@ -5784,12 +5784,12 @@
     "passthrough",
     "emulator"
   ],
-  "id": "libvirt-46"
+  "id": "libvirt-45"
 }

 {
   "execute": "query-command-line-options",
-  "id": "libvirt-47"
+  "id": "libvirt-46"
 }

 {
@@ -7088,12 +7088,12 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-47"
+  "id": "libvirt-46"
 }

 {
   "execute": "query-migrate-capabilities",
-  "id": "libvirt-48"
+  "id": "libvirt-47"
 }

 {
@@ -7163,12 +7163,12 @@
       "capability": "late-block-activate"
     }
   ],
-  "id": "libvirt-48"
+  "id": "libvirt-47"
 }

 {
   "execute": "query-qmp-schema",
-  "id": "libvirt-49"
+  "id": "libvirt-48"
 }

 {
@@ -19408,7 +19408,7 @@
       "meta-type": "object"
     }
   ],
-  "id": "libvirt-49"
+  "id": "libvirt-48"
 }

 {
@@ -19419,7 +19419,7 @@
       "name": "host"
     }
   },
-  "id": "libvirt-50"
+  "id": "libvirt-49"
 }

 {
@@ -19612,7 +19612,7 @@
       }
     }
   },
-  "id": "libvirt-50"
+  "id": "libvirt-49"
 }

 {
@@ -19807,7 +19807,7 @@
       }
     }
   },
-  "id": "libvirt-51"
+  "id": "libvirt-50"
 }

 {
@@ -20069,7 +20069,7 @@
       }
     }
   },
-  "id": "libvirt-51"
+  "id": "libvirt-50"
 }

 {
@@ -20083,7 +20083,7 @@
       }
     }
   },
-  "id": "libvirt-52"
+  "id": "libvirt-51"
 }

 {
@@ -20276,7 +20276,7 @@
       }
     }
   },
-  "id": "libvirt-52"
+  "id": "libvirt-51"
 }

 {
@@ -20471,7 +20471,7 @@
       }
     }
   },
-  "id": "libvirt-53"
+  "id": "libvirt-52"
 }

 {
@@ -20733,16 +20733,16 @@
       }
     }
   },
-  "id": "libvirt-53"
+  "id": "libvirt-52"
 }

 {
   "execute": "query-sev-capabilities",
-  "id": "libvirt-54"
+  "id": "libvirt-53"
 }

 {
-  "id": "libvirt-54",
+  "id": "libvirt-53",
   "error": {
     "class": "GenericError",
     "desc": "SEV feature is not available"
-- 
2.16.2


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]