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

[libvirt] [PATCH v2 10/10] FIXUP: regenerate ordering in replies files



Split up for simpler reviews.
---
 .../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                    | 148 ++++++++--------
 .../qemucapabilitiesdata/caps_2.10.0.ppc64.replies | 148 ++++++++--------
 .../qemucapabilitiesdata/caps_2.10.0.s390x.replies | 148 ++++++++--------
 .../caps_2.10.0.x86_64.replies                     | 180 +++++++++----------
 .../qemucapabilitiesdata/caps_2.11.0.s390x.replies | 152 ++++++++--------
 .../caps_2.11.0.x86_64.replies                     | 180 +++++++++----------
 .../caps_2.12.0.aarch64.replies                    | 156 ++++++++---------
 .../qemucapabilitiesdata/caps_2.12.0.ppc64.replies | 156 ++++++++---------
 .../qemucapabilitiesdata/caps_2.12.0.s390x.replies | 160 ++++++++---------
 .../caps_2.12.0.x86_64.replies                     | 192 ++++++++++-----------
 .../qemucapabilitiesdata/caps_2.4.0.x86_64.replies | 164 +++++++++---------
 .../qemucapabilitiesdata/caps_2.5.0.x86_64.replies | 164 +++++++++---------
 .../caps_2.6.0.aarch64.replies                     | 148 ++++++++--------
 .../qemucapabilitiesdata/caps_2.6.0.ppc64.replies  | 148 ++++++++--------
 .../qemucapabilitiesdata/caps_2.6.0.x86_64.replies | 164 +++++++++---------
 .../qemucapabilitiesdata/caps_2.7.0.s390x.replies  | 140 +++++++--------
 .../qemucapabilitiesdata/caps_2.7.0.x86_64.replies | 164 +++++++++---------
 .../qemucapabilitiesdata/caps_2.8.0.s390x.replies  | 148 ++++++++--------
 .../qemucapabilitiesdata/caps_2.8.0.x86_64.replies | 164 +++++++++---------
 .../qemucapabilitiesdata/caps_2.9.0.ppc64.replies  | 148 ++++++++--------
 .../qemucapabilitiesdata/caps_2.9.0.s390x.replies  | 148 ++++++++--------
 .../qemucapabilitiesdata/caps_2.9.0.x86_64.replies | 180 +++++++++----------
 .../qemucapabilitiesdata/caps_3.0.0.ppc64.replies  | 156 ++++++++---------
 .../qemucapabilitiesdata/caps_3.0.0.x86_64.replies | 192 ++++++++++-----------
 28 files changed, 2228 insertions(+), 2228 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 961b189a78..fee785692f 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies
@@ -492,7 +492,7 @@

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

 {
@@ -500,12 +500,12 @@
     "enabled": true,
     "present": true
   },
-  "id": "libvirt-6"
+  "id": "libvirt-5"
 }

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

 {
@@ -622,12 +622,12 @@
       "name": "ACPI_DEVICE_OST"
     }
   ],
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

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

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

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

 {
@@ -3433,7 +3433,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

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

 {
@@ -3728,7 +3728,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

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

 {
@@ -3897,7 +3897,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

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

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

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

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

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

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

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

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

 {
@@ -4214,7 +4214,7 @@
       "type": "uint64"
     }
   ],
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

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

 {
@@ -4298,7 +4298,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -4306,11 +4306,11 @@
   "arguments": {
     "typename": "PIIX4_PM"
   },
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

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

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

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

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

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

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

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

 {
@@ -4539,7 +4539,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-25"
+  "id": "libvirt-24"
 }

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

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

 {
@@ -4620,7 +4620,7 @@
       "type": "int32"
     }
   ],
-  "id": "libvirt-27"
+  "id": "libvirt-26"
 }

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

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

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

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

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

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

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

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

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

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

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

 {
@@ -5157,12 +5157,12 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

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

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

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

 {
@@ -5600,34 +5600,34 @@
       "static": false
     }
   ],
-  "id": "libvirt-36"
+  "id": "libvirt-35"
 }

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

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

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

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

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

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

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

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

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

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

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

 {
@@ -16576,7 +16576,7 @@
       "kernel": true
     }
   ],
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }

 {
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies
index 80dabec28d..e3047f133e 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies
@@ -489,7 +489,7 @@

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

 {
@@ -497,12 +497,12 @@
     "enabled": true,
     "present": true
   },
-  "id": "libvirt-6"
+  "id": "libvirt-5"
 }

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

 {
@@ -619,12 +619,12 @@
       "name": "ACPI_DEVICE_OST"
     }
   ],
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

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

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

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

 {
@@ -3534,7 +3534,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

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

 {
@@ -3829,7 +3829,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

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

 {
@@ -3998,7 +3998,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

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

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

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

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

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

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

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

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

 {
@@ -4315,7 +4315,7 @@
       "type": "uint64"
     }
   ],
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

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

 {
@@ -4399,7 +4399,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -4407,11 +4407,11 @@
   "arguments": {
     "typename": "PIIX4_PM"
   },
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

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

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

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

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

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

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

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

 {
@@ -4640,7 +4640,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-25"
+  "id": "libvirt-24"
 }

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

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

 {
@@ -4721,7 +4721,7 @@
       "type": "int32"
     }
   ],
-  "id": "libvirt-27"
+  "id": "libvirt-26"
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 {
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies
index 84680be49d..f30a3eaa2b 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies
@@ -501,7 +501,7 @@

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

 {
@@ -509,12 +509,12 @@
     "enabled": true,
     "present": true
   },
-  "id": "libvirt-6"
+  "id": "libvirt-5"
 }

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

 {
@@ -631,12 +631,12 @@
       "name": "ACPI_DEVICE_OST"
     }
   ],
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

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

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

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

 {
@@ -1774,7 +1774,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

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

 {
@@ -2069,7 +2069,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

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

 {
@@ -2238,7 +2238,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

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

 {
@@ -2384,7 +2384,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-12"
+  "id": "libvirt-11"
 }

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

 {
@@ -2593,7 +2593,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-13"
+  "id": "libvirt-12"
 }

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

 {
@@ -2676,7 +2676,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-14"
+  "id": "libvirt-13"
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 {
@@ -3251,7 +3251,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-27"
+  "id": "libvirt-26"
 }

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

 {
@@ -3306,7 +3306,7 @@
       "type": "size"
     }
   ],
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

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

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

 {
@@ -3473,7 +3473,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-30"
+  "id": "libvirt-29"
 }

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

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

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

 {
@@ -3595,7 +3595,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

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

 {
@@ -3613,12 +3613,12 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-33"
+  "id": "libvirt-32"
 }

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

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

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

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

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

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

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

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

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

 {
@@ -5337,12 +5337,12 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

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

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

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

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

 {
@@ -15131,7 +15131,7 @@
       "name": "host"
     }
   },
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
@@ -15171,7 +15171,7 @@
       }
     }
   },
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
@@ -15185,11 +15185,11 @@
       }
     }
   },
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }

 {
-  "id": "libvirt-42",
+  "id": "libvirt-41",
   "error": {
     "class": "GenericError",
     "desc": "Property '.migratable' not found"
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies
index cff292be8c..b3937c1d9c 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies
@@ -498,7 +498,7 @@

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

 {
@@ -506,12 +506,12 @@
     "enabled": true,
     "present": true
   },
-  "id": "libvirt-6"
+  "id": "libvirt-5"
 }

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

 {
@@ -628,12 +628,12 @@
       "name": "ACPI_DEVICE_OST"
     }
   ],
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

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

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

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

 {
@@ -2411,7 +2411,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

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

 {
@@ -2706,7 +2706,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

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

 {
@@ -2875,7 +2875,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

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

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

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

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

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

 {
@@ -3009,7 +3009,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-16"
+  "id": "libvirt-15"
 }

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

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

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

 {
@@ -3246,7 +3246,7 @@
       "type": "uint64"
     }
   ],
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

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

 {
@@ -3330,7 +3330,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -3338,7 +3338,7 @@
   "arguments": {
     "typename": "PIIX4_PM"
   },
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
@@ -3401,7 +3401,7 @@
       "type": "int32"
     }
   ],
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

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

 {
@@ -3458,7 +3458,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-21"
+  "id": "libvirt-20"
 }

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

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

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

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

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

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

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

 {
@@ -3702,7 +3702,7 @@
       "type": "uint64"
     }
   ],
-  "id": "libvirt-25"
+  "id": "libvirt-24"
 }

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

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

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

 {
@@ -3805,7 +3805,7 @@
       "type": "LostTickPolicy"
     }
   ],
-  "id": "libvirt-27"
+  "id": "libvirt-26"
 }

 {
@@ -3813,7 +3813,7 @@
   "arguments": {
     "typename": "VGA"
   },
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

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

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

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

 {
@@ -3929,7 +3929,7 @@
   "arguments": {
     "typename": "qxl"
   },
-  "id": "libvirt-30"
+  "id": "libvirt-29"
 }

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

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

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

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

 {
@@ -4258,7 +4258,7 @@
       "type": "size"
     }
   ],
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

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

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

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

 {
@@ -4513,7 +4513,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

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

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

 {
@@ -4581,7 +4581,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-36"
+  "id": "libvirt-35"
 }

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

 {
@@ -4669,7 +4669,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

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

 {
@@ -4712,7 +4712,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
@@ -4720,7 +4720,7 @@
   "arguments": {
     "typename": "mch"
   },
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

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

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

 {
@@ -4940,12 +4940,12 @@
       "alias": "q35"
     }
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

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

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

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

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

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

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

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

 {
@@ -6588,12 +6588,12 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-44"
+  "id": "libvirt-43"
 }

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

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

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

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

 {
@@ -16382,7 +16382,7 @@
       "name": "host"
     }
   },
-  "id": "libvirt-47"
+  "id": "libvirt-46"
 }

 {
@@ -16561,7 +16561,7 @@
       }
     }
   },
-  "id": "libvirt-47"
+  "id": "libvirt-46"
 }

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

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

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

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

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

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

 {
diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies
index 1711915888..d47a19130c 100644
--- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies
@@ -510,7 +510,7 @@

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

 {
@@ -518,12 +518,12 @@
     "enabled": true,
     "present": true
   },
-  "id": "libvirt-6"
+  "id": "libvirt-5"
 }

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

 {
@@ -640,12 +640,12 @@
       "name": "ACPI_DEVICE_OST"
     }
   ],
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

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

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

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

 {
@@ -1815,7 +1815,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

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

 {
@@ -2110,7 +2110,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

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

 {
@@ -2283,7 +2283,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

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

 {
@@ -2429,7 +2429,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-12"
+  "id": "libvirt-11"
 }

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

 {
@@ -2638,7 +2638,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-13"
+  "id": "libvirt-12"
 }

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

 {
@@ -2725,7 +2725,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-14"
+  "id": "libvirt-13"
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 {
@@ -3305,7 +3305,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-27"
+  "id": "libvirt-26"
 }

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

 {
@@ -3360,7 +3360,7 @@
       "type": "size"
     }
   ],
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

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

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

 {
@@ -3527,7 +3527,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-30"
+  "id": "libvirt-29"
 }

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

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

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

 {
@@ -3649,7 +3649,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 {
-  "id": "libvirt-43",
+  "id": "libvirt-42",
   "error": {
     "class": "GenericError",
     "desc": "Property '.migratable' not found"
diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies
index 355786cec7..a067b70377 100644
--- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies
@@ -507,7 +507,7 @@

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

 {
@@ -515,12 +515,12 @@
     "enabled": true,
     "present": true
   },
-  "id": "libvirt-6"
+  "id": "libvirt-5"
 }

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

 {
@@ -637,12 +637,12 @@
       "name": "ACPI_DEVICE_OST"
     }
   ],
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

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

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

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

 {
@@ -2404,7 +2404,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

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

 {
@@ -2699,7 +2699,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

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

 {
@@ -2872,7 +2872,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

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

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

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

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

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

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

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

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

 {
@@ -3194,7 +3194,7 @@
       "type": "uint64"
     }
   ],
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

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

 {
@@ -3278,7 +3278,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -3286,7 +3286,7 @@
   "arguments": {
     "typename": "PIIX4_PM"
   },
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
@@ -3349,7 +3349,7 @@
       "type": "int32"
     }
   ],
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

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

 {
@@ -3406,7 +3406,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-21"
+  "id": "libvirt-20"
 }

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

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

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

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

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

 {
@@ -3568,7 +3568,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-24"
+  "id": "libvirt-23"
 }

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

 {
@@ -3658,7 +3658,7 @@
       "type": "uint64"
     }
   ],
-  "id": "libvirt-25"
+  "id": "libvirt-24"
 }

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

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

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

 {
@@ -3761,7 +3761,7 @@
       "type": "LostTickPolicy"
     }
   ],
-  "id": "libvirt-27"
+  "id": "libvirt-26"
 }

 {
@@ -3769,7 +3769,7 @@
   "arguments": {
     "typename": "VGA"
   },
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

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

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

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

 {
@@ -3885,7 +3885,7 @@
   "arguments": {
     "typename": "qxl"
   },
-  "id": "libvirt-30"
+  "id": "libvirt-29"
 }

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

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

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

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

 {
@@ -4214,7 +4214,7 @@
       "type": "size"
     }
   ],
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

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

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

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

 {
@@ -4469,7 +4469,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

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

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

 {
@@ -4537,7 +4537,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-36"
+  "id": "libvirt-35"
 }

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

 {
@@ -4625,7 +4625,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

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

 {
@@ -4668,7 +4668,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
@@ -4676,7 +4676,7 @@
   "arguments": {
     "typename": "mch"
   },
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
@@ -4719,12 +4719,12 @@
       "type": "int32"
     }
   ],
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

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

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

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

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

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

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

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

 {
@@ -5257,12 +5257,12 @@
     "passthrough",
     "emulator"
   ],
-  "id": "libvirt-43"
+  "id": "libvirt-42"
 }

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

 {
@@ -6557,12 +6557,12 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-44"
+  "id": "libvirt-43"
 }

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

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

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

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

 {
@@ -16504,7 +16504,7 @@
       "name": "host"
     }
   },
-  "id": "libvirt-47"
+  "id": "libvirt-46"
 }

 {
@@ -16684,7 +16684,7 @@
       }
     }
   },
-  "id": "libvirt-47"
+  "id": "libvirt-46"
 }

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

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

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

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

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

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

 {
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies
index e919c93efa..db5b5140d5 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies
@@ -525,7 +525,7 @@

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

 {
@@ -533,12 +533,12 @@
     "enabled": true,
     "present": true
   },
-  "id": "libvirt-6"
+  "id": "libvirt-5"
 }

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

 {
@@ -661,12 +661,12 @@
       "name": "SHUTDOWN"
     }
   ],
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

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

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

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

 {
@@ -3724,7 +3724,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

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

 {
@@ -4027,7 +4027,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

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

 {
@@ -4200,7 +4200,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

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

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

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

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

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

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

 {
@@ -4414,7 +4414,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-17"
+  "id": "libvirt-16"
 }

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

 {
@@ -4536,7 +4536,7 @@
       "type": "uint64"
     }
   ],
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

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

 {
@@ -4620,7 +4620,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -4628,11 +4628,11 @@
   "arguments": {
     "typename": "PIIX4_PM"
   },
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

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

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

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

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

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

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

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

 {
@@ -4865,7 +4865,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-25"
+  "id": "libvirt-24"
 }

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

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

 {
@@ -4946,7 +4946,7 @@
       "type": "int32"
     }
   ],
-  "id": "libvirt-27"
+  "id": "libvirt-26"
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

 {
@@ -5545,7 +5545,7 @@
       "type": "string"
     }
   ],
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

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

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

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

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

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

 {
@@ -6044,35 +6044,35 @@
       "static": false
     }
   ],
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

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

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

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

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

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

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

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

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

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

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

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

 {
@@ -18694,7 +18694,7 @@
       "kernel": false
     }
   ],
-  "id": "libvirt-44"
+  "id": "libvirt-43"
 }

 {
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies
index 343f27576f..786cb1844a 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies
@@ -522,7 +522,7 @@

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

 {
@@ -530,12 +530,12 @@
     "enabled": true,
     "present": true
   },
-  "id": "libvirt-6"
+  "id": "libvirt-5"
 }

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

 {
@@ -658,12 +658,12 @@
       "name": "SHUTDOWN"
     }
   ],
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

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

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

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

 {
@@ -3713,7 +3713,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

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

 {
@@ -4016,7 +4016,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

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

 {
@@ -4189,7 +4189,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

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

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

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

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

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

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

 {
@@ -4403,7 +4403,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-17"
+  "id": "libvirt-16"
 }

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

 {
@@ -4525,7 +4525,7 @@
       "type": "uint64"
     }
   ],
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

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

 {
@@ -4609,7 +4609,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -4617,11 +4617,11 @@
   "arguments": {
     "typename": "PIIX4_PM"
   },
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

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

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

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

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

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

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

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

 {
@@ -4854,7 +4854,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-25"
+  "id": "libvirt-24"
 }

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

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

 {
@@ -4935,7 +4935,7 @@
       "type": "int32"
     }
   ],
-  "id": "libvirt-27"
+  "id": "libvirt-26"
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 {
@@ -5769,12 +5769,12 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 {
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies
index 2031a692d6..25a005c5cd 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies
@@ -534,7 +534,7 @@

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

 {
@@ -542,12 +542,12 @@
     "enabled": true,
     "present": true
   },
-  "id": "libvirt-6"
+  "id": "libvirt-5"
 }

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

 {
@@ -670,12 +670,12 @@
       "name": "SHUTDOWN"
     }
   ],
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

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

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

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

 {
@@ -1865,7 +1865,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

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

 {
@@ -2168,7 +2168,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

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

 {
@@ -2341,7 +2341,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

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

 {
@@ -2491,7 +2491,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-12"
+  "id": "libvirt-11"
 }

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

 {
@@ -2708,7 +2708,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-13"
+  "id": "libvirt-12"
 }

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

 {
@@ -2795,7 +2795,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-14"
+  "id": "libvirt-13"
 }

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

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

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

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

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

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

 {
@@ -3103,7 +3103,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

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

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

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

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

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

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

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

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

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

 {
@@ -3397,7 +3397,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-27"
+  "id": "libvirt-26"
 }

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

 {
@@ -3452,7 +3452,7 @@
       "type": "size"
     }
   ],
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

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

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

 {
@@ -3619,7 +3619,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-30"
+  "id": "libvirt-29"
 }

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

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

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

 {
@@ -3741,7 +3741,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

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

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

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

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

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

 {
@@ -3899,7 +3899,7 @@
       "type": "string"
     }
   ],
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

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

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

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

 {
@@ -3978,12 +3978,12 @@
       "alias": "s390-ccw-virtio"
     }
   ],
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

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

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

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

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

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

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

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

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

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

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

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

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

 {
@@ -17122,7 +17122,7 @@
       "name": "host"
     }
   },
-  "id": "libvirt-44"
+  "id": "libvirt-43"
 }

 {
@@ -17160,7 +17160,7 @@
       }
     }
   },
-  "id": "libvirt-44"
+  "id": "libvirt-43"
 }

 {
@@ -17174,11 +17174,11 @@
       }
     }
   },
-  "id": "libvirt-45"
+  "id": "libvirt-44"
 }

 {
-  "id": "libvirt-45",
+  "id": "libvirt-44",
   "error": {
     "class": "GenericError",
     "desc": "Property '.migratable' not found"
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies
index 3d900d827a..9d7e653216 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies
@@ -540,7 +540,7 @@

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

 {
@@ -548,12 +548,12 @@
     "enabled": true,
     "present": true
   },
-  "id": "libvirt-6"
+  "id": "libvirt-5"
 }

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

 {
@@ -676,12 +676,12 @@
       "name": "SHUTDOWN"
     }
   ],
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

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

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

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

 {
@@ -2571,7 +2571,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

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

 {
@@ -2874,7 +2874,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

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

 {
@@ -3047,7 +3047,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

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

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

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

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

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

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

 {
@@ -3261,7 +3261,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-17"
+  "id": "libvirt-16"
 }

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

 {
@@ -3383,7 +3383,7 @@
       "type": "uint64"
     }
   ],
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

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

 {
@@ -3467,7 +3467,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -3475,7 +3475,7 @@
   "arguments": {
     "typename": "PIIX4_PM"
   },
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
@@ -3538,7 +3538,7 @@
       "type": "int32"
     }
   ],
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

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

 {
@@ -3595,7 +3595,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-21"
+  "id": "libvirt-20"
 }

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

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

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

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

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

 {
@@ -3761,7 +3761,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-24"
+  "id": "libvirt-23"
 }

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

 {
@@ -3851,7 +3851,7 @@
       "type": "uint64"
     }
   ],
-  "id": "libvirt-25"
+  "id": "libvirt-24"
 }

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

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

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

 {
@@ -3954,7 +3954,7 @@
       "type": "LostTickPolicy"
     }
   ],
-  "id": "libvirt-27"
+  "id": "libvirt-26"
 }

 {
@@ -3962,7 +3962,7 @@
   "arguments": {
     "typename": "VGA"
   },
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

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

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

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

 {
@@ -4078,7 +4078,7 @@
   "arguments": {
     "typename": "qxl"
   },
-  "id": "libvirt-30"
+  "id": "libvirt-29"
 }

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

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

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

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

 {
@@ -4387,7 +4387,7 @@
       "type": "size"
     }
   ],
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

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

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

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

 {
@@ -4642,7 +4642,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

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

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

 {
@@ -4710,7 +4710,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-36"
+  "id": "libvirt-35"
 }

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

 {
@@ -4798,7 +4798,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

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

 {
@@ -4845,7 +4845,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
@@ -4853,7 +4853,7 @@
   "arguments": {
     "typename": "mch"
   },
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
@@ -4896,7 +4896,7 @@
       "type": "int32"
     }
   ],
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
@@ -4904,7 +4904,7 @@
   "arguments": {
     "typename": "memory-backend-file"
   },
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
@@ -4958,7 +4958,7 @@
       "type": "string"
     }
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
@@ -4966,11 +4966,11 @@
   "arguments": {
     "typename": "spapr-machine"
   },
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
-  "id": "libvirt-41",
+  "id": "libvirt-40",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Class 'spapr-machine' not found"
@@ -4979,7 +4979,7 @@

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

 {
@@ -5178,12 +5178,12 @@
       "cpu-max": 255
     }
   ],
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }

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

 {
@@ -5697,12 +5697,12 @@
       "migration-safe": true
     }
   ],
-  "id": "libvirt-43"
+  "id": "libvirt-42"
 }

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

 {
@@ -5710,12 +5710,12 @@
     "tpm-crb",
     "tpm-tis"
   ],
-  "id": "libvirt-44"
+  "id": "libvirt-43"
 }

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

 {
@@ -5723,12 +5723,12 @@
     "passthrough",
     "emulator"
   ],
-  "id": "libvirt-45"
+  "id": "libvirt-44"
 }

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

 {
@@ -7015,12 +7015,12 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-46"
+  "id": "libvirt-45"
 }

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

 {
@@ -7082,12 +7082,12 @@
       "capability": "dirty-bitmaps"
     }
   ],
-  "id": "libvirt-47"
+  "id": "libvirt-46"
 }

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

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

 {
@@ -18466,7 +18466,7 @@
       "name": "host"
     }
   },
-  "id": "libvirt-49"
+  "id": "libvirt-48"
 }

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

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

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

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

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

 {
@@ -19499,7 +19499,7 @@
       }
     }
   },
-  "id": "libvirt-52"
+  "id": "libvirt-51"
 }

 {
@@ -19754,12 +19754,12 @@
       }
     }
   },
-  "id": "libvirt-52"
+  "id": "libvirt-51"
 }

 {
   "execute": "query-sev-capabilities",
-  "id": "libvirt-53"
+  "id": "libvirt-52"
 }

 {
@@ -19769,7 +19769,7 @@
     "cert-chain": "AQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAA",
     "pdh": "AQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAA"
   },
-  "id": "libvirt-53"
+  "id": "libvirt-52"
 }

 {
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 9f2ed91843..2e93b116f7 100644
--- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies
@@ -456,7 +456,7 @@

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

 {
@@ -464,12 +464,12 @@
     "enabled": true,
     "present": true
   },
-  "id": "libvirt-6"
+  "id": "libvirt-5"
 }

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

 {
@@ -580,12 +580,12 @@
       "name": "ACPI_DEVICE_OST"
     }
   ],
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

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

 {
@@ -1491,7 +1491,7 @@
       "name": "virtio-blk-device"
     }
   ],
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

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

 {
@@ -1661,7 +1661,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

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

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

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

 {
@@ -2023,7 +2023,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

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

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

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

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

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

 {
@@ -2147,7 +2147,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-16"
+  "id": "libvirt-15"
 }

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

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

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

 {
@@ -2342,7 +2342,7 @@
       "type": "uint64"
     }
   ],
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

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

 {
@@ -2407,7 +2407,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -2415,7 +2415,7 @@
   "arguments": {
     "typename": "PIIX4_PM"
   },
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
@@ -2468,7 +2468,7 @@
       "type": "int32"
     }
   ],
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

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

 {
@@ -2517,7 +2517,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-21"
+  "id": "libvirt-20"
 }

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

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

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

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

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

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

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

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

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

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

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

 {
@@ -2823,7 +2823,7 @@
       "type": "LostTickPolicy"
     }
   ],
-  "id": "libvirt-27"
+  "id": "libvirt-26"
 }

 {
@@ -2831,7 +2831,7 @@
   "arguments": {
     "typename": "VGA"
   },
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

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

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

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

 {
@@ -2927,7 +2927,7 @@
   "arguments": {
     "typename": "qxl"
   },
-  "id": "libvirt-30"
+  "id": "libvirt-29"
 }

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

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

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

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

 {
@@ -3166,7 +3166,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

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

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

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

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

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

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

 {
@@ -3422,7 +3422,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-36"
+  "id": "libvirt-35"
 }

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

 {
@@ -3500,7 +3500,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

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

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

 {
@@ -3526,7 +3526,7 @@
   "arguments": {
     "typename": "mch"
   },
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

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

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

 {
@@ -3694,12 +3694,12 @@
       "cpu-max": 255
     }
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

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

 {
@@ -3789,36 +3789,36 @@
       "name": "qemu64"
     }
   ],
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

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

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

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

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

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

 {
@@ -4863,12 +4863,12 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-44"
+  "id": "libvirt-43"
 }

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

 {
@@ -4902,12 +4902,12 @@
       "capability": "x-postcopy-ram"
     }
   ],
-  "id": "libvirt-45"
+  "id": "libvirt-44"
 }

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

 {
@@ -12452,7 +12452,7 @@
       "meta-type": "array"
     }
   ],
-  "id": "libvirt-46"
+  "id": "libvirt-45"
 }

 {
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies
index da3ee9ffe3..41a2be3a2f 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies
@@ -459,7 +459,7 @@

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

 {
@@ -467,12 +467,12 @@
     "enabled": true,
     "present": true
   },
-  "id": "libvirt-6"
+  "id": "libvirt-5"
 }

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

 {
@@ -589,12 +589,12 @@
       "name": "ACPI_DEVICE_OST"
     }
   ],
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

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

 {
@@ -2250,7 +2250,7 @@
       "name": "fw-path-provider"
     }
   ],
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

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

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

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

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

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

 {
@@ -2782,7 +2782,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

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

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

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

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

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

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

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

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

 {
@@ -3061,7 +3061,7 @@
       "type": "uint64"
     }
   ],
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

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

 {
@@ -3126,7 +3126,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -3134,11 +3134,11 @@
   "arguments": {
     "typename": "PIIX4_PM"
   },
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

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

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

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

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

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

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

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

 {
@@ -3350,7 +3350,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-25"
+  "id": "libvirt-24"
 }

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

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

 {
@@ -3421,7 +3421,7 @@
       "type": "int32"
     }
   ],
-  "id": "libvirt-27"
+  "id": "libvirt-26"
 }

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

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

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

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

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

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

 {
@@ -3687,7 +3687,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-31"
+  "id": "libvirt-30"
 }

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

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

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

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

 {
@@ -3828,12 +3828,12 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

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

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

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

 {
@@ -4112,34 +4112,34 @@
       "name": "pxa270"
     }
   ],
-  "id": "libvirt-36"
+  "id": "libvirt-35"
 }

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

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

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

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

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

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

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

 {
@@ -5150,12 +5150,12 @@
       "capability": "postcopy-ram"
     }
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

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

 {
@@ -13160,12 +13160,12 @@
       "meta-type": "array"
     }
   ],
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

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

 {
@@ -13181,7 +13181,7 @@
       "kernel": true
     }
   ],
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }

 {
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies
index fb710d0a6f..4a35fee5ed 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies
@@ -456,7 +456,7 @@

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

 {
@@ -464,12 +464,12 @@
     "enabled": true,
     "present": true
   },
-  "id": "libvirt-6"
+  "id": "libvirt-5"
 }

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

 {
@@ -586,12 +586,12 @@
       "name": "ACPI_DEVICE_OST"
     }
   ],
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

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

 {
@@ -2400,7 +2400,7 @@
       "name": "fw-path-provider"
     }
   ],
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

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

 {
@@ -2570,7 +2570,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

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

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

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

 {
@@ -2932,7 +2932,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

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

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

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

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

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

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

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

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

 {
@@ -3211,7 +3211,7 @@
       "type": "uint64"
     }
   ],
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

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

 {
@@ -3276,7 +3276,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -3284,11 +3284,11 @@
   "arguments": {
     "typename": "PIIX4_PM"
   },
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

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

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

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

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

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

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

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

 {
@@ -3500,7 +3500,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-25"
+  "id": "libvirt-24"
 }

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

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

 {
@@ -3571,7 +3571,7 @@
       "type": "int32"
     }
   ],
-  "id": "libvirt-27"
+  "id": "libvirt-26"
 }

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

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

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

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

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

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

 {
@@ -3837,7 +3837,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-31"
+  "id": "libvirt-30"
 }

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

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

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

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

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

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

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

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

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

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

 {
@@ -5416,34 +5416,34 @@
       "name": "MPC8541E_v11"
     }
   ],
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

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

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

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

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

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

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

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

 {
@@ -6449,12 +6449,12 @@
       "capability": "postcopy-ram"
     }
   ],
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

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

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

 {
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies
index 626d43d3e8..382feee693 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies
@@ -462,7 +462,7 @@

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

 {
@@ -470,12 +470,12 @@
     "enabled": true,
     "present": true
   },
-  "id": "libvirt-6"
+  "id": "libvirt-5"
 }

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

 {
@@ -592,12 +592,12 @@
       "name": "ACPI_DEVICE_OST"
     }
   ],
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

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

 {
@@ -1569,7 +1569,7 @@
       "name": "virtio-blk-device"
     }
   ],
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

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

 {
@@ -1739,7 +1739,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

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

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

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

 {
@@ -2101,7 +2101,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

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

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

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

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

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

 {
@@ -2225,7 +2225,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-16"
+  "id": "libvirt-15"
 }

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

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

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

 {
@@ -2424,7 +2424,7 @@
       "type": "uint64"
     }
   ],
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

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

 {
@@ -2489,7 +2489,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -2497,7 +2497,7 @@
   "arguments": {
     "typename": "PIIX4_PM"
   },
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
@@ -2550,7 +2550,7 @@
       "type": "int32"
     }
   ],
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

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

 {
@@ -2599,7 +2599,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-21"
+  "id": "libvirt-20"
 }

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

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

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

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

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

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

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

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

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

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

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

 {
@@ -2905,7 +2905,7 @@
       "type": "LostTickPolicy"
     }
   ],
-  "id": "libvirt-27"
+  "id": "libvirt-26"
 }

 {
@@ -2913,7 +2913,7 @@
   "arguments": {
     "typename": "VGA"
   },
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

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

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

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

 {
@@ -3009,7 +3009,7 @@
   "arguments": {
     "typename": "qxl"
   },
-  "id": "libvirt-30"
+  "id": "libvirt-29"
 }

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

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

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

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

 {
@@ -3248,7 +3248,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

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

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

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

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

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

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

 {
@@ -3504,7 +3504,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-36"
+  "id": "libvirt-35"
 }

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

 {
@@ -3582,7 +3582,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

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

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

 {
@@ -3608,7 +3608,7 @@
   "arguments": {
     "typename": "mch"
   },
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

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

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

 {
@@ -3752,12 +3752,12 @@
       "cpu-max": 255
     }
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

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

 {
@@ -3847,36 +3847,36 @@
       "name": "qemu64"
     }
   ],
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

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

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

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

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

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

 {
@@ -4970,12 +4970,12 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-44"
+  "id": "libvirt-43"
 }

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

 {
@@ -5009,12 +5009,12 @@
       "capability": "postcopy-ram"
     }
   ],
-  "id": "libvirt-45"
+  "id": "libvirt-44"
 }

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

 {
@@ -13019,7 +13019,7 @@
       "meta-type": "array"
     }
   ],
-  "id": "libvirt-46"
+  "id": "libvirt-45"
 }

 {
diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies
index 2eb9ecd86c..977c591455 100644
--- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies
@@ -468,7 +468,7 @@

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

 {
@@ -476,12 +476,12 @@
     "enabled": true,
     "present": true
   },
-  "id": "libvirt-6"
+  "id": "libvirt-5"
 }

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

 {
@@ -598,12 +598,12 @@
       "name": "ACPI_DEVICE_OST"
     }
   ],
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

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

 {
@@ -981,7 +981,7 @@
       "name": "s390-skeys-kvm"
     }
   ],
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

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

 {
@@ -1174,7 +1174,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

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

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

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

 {
@@ -1544,7 +1544,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

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

 {
@@ -1681,7 +1681,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-12"
+  "id": "libvirt-11"
 }

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

 {
@@ -1869,7 +1869,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-13"
+  "id": "libvirt-12"
 }

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

 {
@@ -1947,7 +1947,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-14"
+  "id": "libvirt-13"
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 {
@@ -2462,7 +2462,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-27"
+  "id": "libvirt-26"
 }

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

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

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

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

 {
@@ -2628,7 +2628,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-30"
+  "id": "libvirt-29"
 }

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

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

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

 {
@@ -2740,7 +2740,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

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

 {
@@ -2758,12 +2758,12 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-33"
+  "id": "libvirt-32"
 }

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

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

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

 {
@@ -2810,34 +2810,34 @@
       "name": "host"
     }
   ],
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

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

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

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

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

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

 {
@@ -3773,12 +3773,12 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

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

 {
@@ -3812,12 +3812,12 @@
       "capability": "postcopy-ram"
     }
   ],
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

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

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

 {
diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies
index 79fed5c27b..aae2b3f4de 100644
--- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies
@@ -471,7 +471,7 @@

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

 {
@@ -479,12 +479,12 @@
     "enabled": true,
     "present": true
   },
-  "id": "libvirt-6"
+  "id": "libvirt-5"
 }

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

 {
@@ -601,12 +601,12 @@
       "name": "ACPI_DEVICE_OST"
     }
   ],
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

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

 {
@@ -1593,7 +1593,7 @@
       "name": "virtio-blk-device"
     }
   ],
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

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

 {
@@ -1786,7 +1786,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

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

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

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

 {
@@ -2156,7 +2156,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

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

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

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

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

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

 {
@@ -2285,7 +2285,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-16"
+  "id": "libvirt-15"
 }

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

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

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

 {
@@ -2513,7 +2513,7 @@
       "type": "uint64"
     }
   ],
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

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

 {
@@ -2593,7 +2593,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -2601,7 +2601,7 @@
   "arguments": {
     "typename": "PIIX4_PM"
   },
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
@@ -2659,7 +2659,7 @@
       "type": "int32"
     }
   ],
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

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

 {
@@ -2716,7 +2716,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-21"
+  "id": "libvirt-20"
 }

 {
@@ -2724,7 +2724,7 @@
   "arguments": {
     "typename": "usb-host"
   },
-  "id": "libvirt-22"
+  "id": "libvirt-21"
 }

 {
@@ -2793,7 +2793,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-22"
+  "id": "libvirt-21"
 }

 {
@@ -2801,7 +2801,7 @@
   "arguments": {
     "typename": "scsi-generic"
   },
-  "id": "libvirt-23"
+  "id": "libvirt-22"
 }

 {
@@ -2828,7 +2828,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-23"
+  "id": "libvirt-22"
 }

 {
@@ -2836,7 +2836,7 @@
   "arguments": {
     "typename": "i440FX-pcihost"
   },
-  "id": "libvirt-24"
+  "id": "libvirt-23"
 }

 {
@@ -2874,7 +2874,7 @@
       "type": "child<qemu:memory-region>"
     }
   ],
-  "id": "libvirt-24"
+  "id": "libvirt-23"
 }

 {
@@ -2882,7 +2882,7 @@
   "arguments": {
     "typename": "q35-pcihost"
   },
-  "id": "libvirt-25"
+  "id": "libvirt-24"
 }

 {
@@ -2960,7 +2960,7 @@
       "type": "int"
     }
   ],
-  "id": "libvirt-25"
+  "id": "libvirt-24"
 }

 {
@@ -2968,7 +2968,7 @@
   "arguments": {
     "typename": "usb-storage"
   },
-  "id": "libvirt-26"
+  "id": "libvirt-25"
 }

 {
@@ -3037,7 +3037,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-26"
+  "id": "libvirt-25"
 }

 {
@@ -3045,7 +3045,7 @@
   "arguments": {
     "typename": "kvm-pit"
   },
-  "id": "libvirt-27"
+  "id": "libvirt-26"
 }

 {
@@ -3059,7 +3059,7 @@
       "type": "LostTickPolicy"
     }
   ],
-  "id": "libvirt-27"
+  "id": "libvirt-26"
 }

 {
@@ -3067,7 +3067,7 @@
   "arguments": {
     "typename": "VGA"
   },
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -3119,7 +3119,7 @@
       "type": "int32"
     }
   ],
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -3127,7 +3127,7 @@
   "arguments": {
     "typename": "vmware-svga"
   },
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
@@ -3165,7 +3165,7 @@
       "type": "int32"
     }
   ],
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
@@ -3173,7 +3173,7 @@
   "arguments": {
     "typename": "qxl"
   },
-  "id": "libvirt-30"
+  "id": "libvirt-29"
 }

 {
@@ -3255,7 +3255,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-30"
+  "id": "libvirt-29"
 }

 {
@@ -3263,7 +3263,7 @@
   "arguments": {
     "typename": "virtio-gpu-pci"
   },
-  "id": "libvirt-31"
+  "id": "libvirt-30"
 }

 {
@@ -3373,7 +3373,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-31"
+  "id": "libvirt-30"
 }

 {
@@ -3381,7 +3381,7 @@
   "arguments": {
     "typename": "virtio-gpu-device"
   },
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

 {
@@ -3421,7 +3421,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

 {
@@ -3429,7 +3429,7 @@
   "arguments": {
     "typename": "ICH9-LPC"
   },
-  "id": "libvirt-33"
+  "id": "libvirt-32"
 }

 {
@@ -3515,7 +3515,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-33"
+  "id": "libvirt-32"
 }

 {
@@ -3523,7 +3523,7 @@
   "arguments": {
     "typename": "virtio-balloon-pci"
   },
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

 {
@@ -3627,7 +3627,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

 {
@@ -3635,11 +3635,11 @@
   "arguments": {
     "typename": "virtio-balloon-ccw"
   },
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
-  "id": "libvirt-35",
+  "id": "libvirt-34",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-balloon-ccw' not found"
@@ -3651,7 +3651,7 @@
   "arguments": {
     "typename": "virtio-balloon-device"
   },
-  "id": "libvirt-36"
+  "id": "libvirt-35"
 }

 {
@@ -3690,7 +3690,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-36"
+  "id": "libvirt-35"
 }

 {
@@ -3698,7 +3698,7 @@
   "arguments": {
     "typename": "nec-usb-xhci"
   },
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
@@ -3773,7 +3773,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
@@ -3781,7 +3781,7 @@
   "arguments": {
     "typename": "intel-iommu"
   },
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
@@ -3795,7 +3795,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
@@ -3803,7 +3803,7 @@
   "arguments": {
     "typename": "mch"
   },
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
@@ -3829,12 +3829,12 @@
       "type": "pci-devfn"
     }
   ],
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
   "execute": "query-machines",
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
@@ -3983,12 +3983,12 @@
       "cpu-max": 255
     }
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
   "execute": "query-cpu-definitions",
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
@@ -4081,36 +4081,36 @@
       "name": "qemu64"
     }
   ],
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
   "execute": "query-tpm-models",
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }

 {
   "return": [
     "tpm-tis"
   ],
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }

 {
   "execute": "query-tpm-types",
-  "id": "libvirt-43"
+  "id": "libvirt-42"
 }

 {
   "return": [
     "passthrough"
   ],
-  "id": "libvirt-43"
+  "id": "libvirt-42"
 }

 {
   "execute": "query-command-line-options",
-  "id": "libvirt-44"
+  "id": "libvirt-43"
 }

 {
@@ -5208,12 +5208,12 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-44"
+  "id": "libvirt-43"
 }

 {
   "execute": "query-migrate-capabilities",
-  "id": "libvirt-45"
+  "id": "libvirt-44"
 }

 {
@@ -5247,12 +5247,12 @@
       "capability": "postcopy-ram"
     }
   ],
-  "id": "libvirt-45"
+  "id": "libvirt-44"
 }

 {
   "execute": "query-qmp-schema",
-  "id": "libvirt-46"
+  "id": "libvirt-45"
 }

 {
@@ -13608,7 +13608,7 @@
       "meta-type": "object"
     }
   ],
-  "id": "libvirt-46"
+  "id": "libvirt-45"
 }

 {
diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies
index 2f0f90ce0c..6eae79342e 100644
--- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies
@@ -480,7 +480,7 @@

 {
   "execute": "query-kvm",
-  "id": "libvirt-6"
+  "id": "libvirt-5"
 }

 {
@@ -488,12 +488,12 @@
     "enabled": true,
     "present": true
   },
-  "id": "libvirt-6"
+  "id": "libvirt-5"
 }

 {
   "execute": "query-events",
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

 {
@@ -610,12 +610,12 @@
       "name": "ACPI_DEVICE_OST"
     }
   ],
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

 {
   "execute": "qom-list-types",
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

 {
@@ -1221,7 +1221,7 @@
       "name": "virtio-blk-device"
     }
   ],
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

 {
@@ -1229,7 +1229,7 @@
   "arguments": {
     "typename": "virtio-blk-pci"
   },
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

 {
@@ -1419,7 +1419,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

 {
@@ -1427,7 +1427,7 @@
   "arguments": {
     "typename": "virtio-net-pci"
   },
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

 {
@@ -1668,7 +1668,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

 {
@@ -1676,7 +1676,7 @@
   "arguments": {
     "typename": "virtio-scsi-pci"
   },
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

 {
@@ -1803,7 +1803,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

 {
@@ -1811,7 +1811,7 @@
   "arguments": {
     "typename": "virtio-blk-ccw"
   },
-  "id": "libvirt-12"
+  "id": "libvirt-11"
 }

 {
@@ -1940,7 +1940,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-12"
+  "id": "libvirt-11"
 }

 {
@@ -1948,7 +1948,7 @@
   "arguments": {
     "typename": "virtio-net-ccw"
   },
-  "id": "libvirt-13"
+  "id": "libvirt-12"
 }

 {
@@ -2132,7 +2132,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-13"
+  "id": "libvirt-12"
 }

 {
@@ -2140,7 +2140,7 @@
   "arguments": {
     "typename": "virtio-scsi-ccw"
   },
-  "id": "libvirt-14"
+  "id": "libvirt-13"
 }

 {
@@ -2210,7 +2210,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-14"
+  "id": "libvirt-13"
 }

 {
@@ -2218,11 +2218,11 @@
   "arguments": {
     "typename": "virtio-net-s390"
   },
-  "id": "libvirt-15"
+  "id": "libvirt-14"
 }

 {
-  "id": "libvirt-15",
+  "id": "libvirt-14",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-net-s390' not found"
@@ -2234,11 +2234,11 @@
   "arguments": {
     "typename": "pci-assign"
   },
-  "id": "libvirt-16"
+  "id": "libvirt-15"
 }

 {
-  "id": "libvirt-16",
+  "id": "libvirt-15",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'pci-assign' not found"
@@ -2250,11 +2250,11 @@
   "arguments": {
     "typename": "kvm-pci-assign"
   },
-  "id": "libvirt-17"
+  "id": "libvirt-16"
 }

 {
-  "id": "libvirt-17",
+  "id": "libvirt-16",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'kvm-pci-assign' not found"
@@ -2266,7 +2266,7 @@
   "arguments": {
     "typename": "vfio-pci"
   },
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

 {
@@ -2368,7 +2368,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

 {
@@ -2376,7 +2376,7 @@
   "arguments": {
     "typename": "scsi-disk"
   },
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -2486,7 +2486,7 @@
       "type": "uint64"
     }
   ],
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -2494,11 +2494,11 @@
   "arguments": {
     "typename": "ide-drive"
   },
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
-  "id": "libvirt-20",
+  "id": "libvirt-19",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'ide-drive' not found"
@@ -2510,11 +2510,11 @@
   "arguments": {
     "typename": "PIIX4_PM"
   },
-  "id": "libvirt-21"
+  "id": "libvirt-20"
 }

 {
-  "id": "libvirt-21",
+  "id": "libvirt-20",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'PIIX4_PM' not found"
@@ -2526,11 +2526,11 @@
   "arguments": {
     "typename": "usb-host"
   },
-  "id": "libvirt-22"
+  "id": "libvirt-21"
 }

 {
-  "id": "libvirt-22",
+  "id": "libvirt-21",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'usb-host' not found"
@@ -2542,7 +2542,7 @@
   "arguments": {
     "typename": "scsi-generic"
   },
-  "id": "libvirt-23"
+  "id": "libvirt-22"
 }

 {
@@ -2569,7 +2569,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-23"
+  "id": "libvirt-22"
 }

 {
@@ -2577,11 +2577,11 @@
   "arguments": {
     "typename": "i440FX-pcihost"
   },
-  "id": "libvirt-24"
+  "id": "libvirt-23"
 }

 {
-  "id": "libvirt-24",
+  "id": "libvirt-23",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'i440FX-pcihost' not found"
@@ -2593,11 +2593,11 @@
   "arguments": {
     "typename": "q35-pcihost"
   },
-  "id": "libvirt-25"
+  "id": "libvirt-24"
 }

 {
-  "id": "libvirt-25",
+  "id": "libvirt-24",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'q35-pcihost' not found"
@@ -2609,11 +2609,11 @@
   "arguments": {
     "typename": "kvm-pit"
   },
-  "id": "libvirt-26"
+  "id": "libvirt-25"
 }

 {
-  "id": "libvirt-26",
+  "id": "libvirt-25",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'kvm-pit' not found"
@@ -2625,7 +2625,7 @@
   "arguments": {
     "typename": "virtio-gpu-pci"
   },
-  "id": "libvirt-27"
+  "id": "libvirt-26"
 }

 {
@@ -2730,7 +2730,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-27"
+  "id": "libvirt-26"
 }

 {
@@ -2738,7 +2738,7 @@
   "arguments": {
     "typename": "virtio-gpu-device"
   },
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -2768,7 +2768,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -2776,11 +2776,11 @@
   "arguments": {
     "typename": "ICH9-LPC"
   },
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
-  "id": "libvirt-29",
+  "id": "libvirt-28",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'ICH9-LPC' not found"
@@ -2792,7 +2792,7 @@
   "arguments": {
     "typename": "virtio-balloon-pci"
   },
-  "id": "libvirt-30"
+  "id": "libvirt-29"
 }

 {
@@ -2901,7 +2901,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-30"
+  "id": "libvirt-29"
 }

 {
@@ -2909,7 +2909,7 @@
   "arguments": {
     "typename": "virtio-balloon-ccw"
   },
-  "id": "libvirt-31"
+  "id": "libvirt-30"
 }

 {
@@ -2966,7 +2966,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-31"
+  "id": "libvirt-30"
 }

 {
@@ -2974,7 +2974,7 @@
   "arguments": {
     "typename": "virtio-balloon-device"
   },
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

 {
@@ -3013,7 +3013,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

 {
@@ -3021,7 +3021,7 @@
   "arguments": {
     "typename": "virtual-css-bridge"
   },
-  "id": "libvirt-33"
+  "id": "libvirt-32"
 }

 {
@@ -3031,12 +3031,12 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-33"
+  "id": "libvirt-32"
 }

 {
   "execute": "query-machines",
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

 {
@@ -3074,12 +3074,12 @@
       "alias": "s390-ccw-virtio"
     }
   ],
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

 {
   "execute": "query-cpu-definitions",
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
@@ -3405,34 +3405,34 @@
       "migration-safe": true
     }
   ],
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
   "execute": "query-tpm-models",
-  "id": "libvirt-36"
+  "id": "libvirt-35"
 }

 {
   "return": [
   ],
-  "id": "libvirt-36"
+  "id": "libvirt-35"
 }

 {
   "execute": "query-tpm-types",
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
   "return": [
   ],
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
   "execute": "query-command-line-options",
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
@@ -4393,12 +4393,12 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
   "execute": "query-migrate-capabilities",
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
@@ -4436,12 +4436,12 @@
       "capability": "x-colo"
     }
   ],
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
   "execute": "query-qmp-schema",
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
@@ -13211,7 +13211,7 @@
       "meta-type": "object"
     }
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
@@ -13222,7 +13222,7 @@
       "name": "host"
     }
   },
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
@@ -13248,7 +13248,7 @@
       }
     }
   },
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
@@ -13262,11 +13262,11 @@
       }
     }
   },
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }

 {
-  "id": "libvirt-42",
+  "id": "libvirt-41",
   "error": {
     "class": "GenericError",
     "desc": "Property '.migratable' not found"
diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies
index 2edc628898..dcfa7ea056 100644
--- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies
@@ -474,7 +474,7 @@

 {
   "execute": "query-kvm",
-  "id": "libvirt-6"
+  "id": "libvirt-5"
 }

 {
@@ -482,12 +482,12 @@
     "enabled": true,
     "present": true
   },
-  "id": "libvirt-6"
+  "id": "libvirt-5"
 }

 {
   "execute": "query-events",
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

 {
@@ -604,12 +604,12 @@
       "name": "ACPI_DEVICE_OST"
     }
   ],
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

 {
   "execute": "qom-list-types",
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

 {
@@ -1677,7 +1677,7 @@
       "name": "virtio-blk-device"
     }
   ],
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

 {
@@ -1685,7 +1685,7 @@
   "arguments": {
     "typename": "virtio-blk-pci"
   },
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

 {
@@ -1879,7 +1879,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

 {
@@ -1887,7 +1887,7 @@
   "arguments": {
     "typename": "virtio-net-pci"
   },
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

 {
@@ -2132,7 +2132,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

 {
@@ -2140,7 +2140,7 @@
   "arguments": {
     "typename": "virtio-scsi-pci"
   },
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

 {
@@ -2271,7 +2271,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

 {
@@ -2279,11 +2279,11 @@
   "arguments": {
     "typename": "virtio-net-ccw"
   },
-  "id": "libvirt-12"
+  "id": "libvirt-11"
 }

 {
-  "id": "libvirt-12",
+  "id": "libvirt-11",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-net-ccw' not found"
@@ -2295,11 +2295,11 @@
   "arguments": {
     "typename": "virtio-scsi-ccw"
   },
-  "id": "libvirt-13"
+  "id": "libvirt-12"
 }

 {
-  "id": "libvirt-13",
+  "id": "libvirt-12",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-scsi-ccw' not found"
@@ -2311,11 +2311,11 @@
   "arguments": {
     "typename": "virtio-net-s390"
   },
-  "id": "libvirt-14"
+  "id": "libvirt-13"
 }

 {
-  "id": "libvirt-14",
+  "id": "libvirt-13",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-net-s390' not found"
@@ -2327,11 +2327,11 @@
   "arguments": {
     "typename": "pci-assign"
   },
-  "id": "libvirt-15"
+  "id": "libvirt-14"
 }

 {
-  "id": "libvirt-15",
+  "id": "libvirt-14",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'pci-assign' not found"
@@ -2343,7 +2343,7 @@
   "arguments": {
     "typename": "kvm-pci-assign"
   },
-  "id": "libvirt-16"
+  "id": "libvirt-15"
 }

 {
@@ -2400,7 +2400,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-16"
+  "id": "libvirt-15"
 }

 {
@@ -2408,7 +2408,7 @@
   "arguments": {
     "typename": "vfio-pci"
   },
-  "id": "libvirt-17"
+  "id": "libvirt-16"
 }

 {
@@ -2510,7 +2510,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-17"
+  "id": "libvirt-16"
 }

 {
@@ -2518,7 +2518,7 @@
   "arguments": {
     "typename": "scsi-disk"
   },
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

 {
@@ -2628,7 +2628,7 @@
       "type": "uint64"
     }
   ],
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

 {
@@ -2636,7 +2636,7 @@
   "arguments": {
     "typename": "ide-drive"
   },
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -2708,7 +2708,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -2716,7 +2716,7 @@
   "arguments": {
     "typename": "PIIX4_PM"
   },
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
@@ -2774,7 +2774,7 @@
       "type": "int32"
     }
   ],
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
@@ -2782,7 +2782,7 @@
   "arguments": {
     "typename": "usb-redir"
   },
-  "id": "libvirt-21"
+  "id": "libvirt-20"
 }

 {
@@ -2831,7 +2831,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-21"
+  "id": "libvirt-20"
 }

 {
@@ -2839,7 +2839,7 @@
   "arguments": {
     "typename": "usb-host"
   },
-  "id": "libvirt-22"
+  "id": "libvirt-21"
 }

 {
@@ -2908,7 +2908,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-22"
+  "id": "libvirt-21"
 }

 {
@@ -2916,7 +2916,7 @@
   "arguments": {
     "typename": "scsi-generic"
   },
-  "id": "libvirt-23"
+  "id": "libvirt-22"
 }

 {
@@ -2943,7 +2943,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-23"
+  "id": "libvirt-22"
 }

 {
@@ -2951,7 +2951,7 @@
   "arguments": {
     "typename": "i440FX-pcihost"
   },
-  "id": "libvirt-24"
+  "id": "libvirt-23"
 }

 {
@@ -2989,7 +2989,7 @@
       "type": "child<qemu:memory-region>"
     }
   ],
-  "id": "libvirt-24"
+  "id": "libvirt-23"
 }

 {
@@ -2997,7 +2997,7 @@
   "arguments": {
     "typename": "q35-pcihost"
   },
-  "id": "libvirt-25"
+  "id": "libvirt-24"
 }

 {
@@ -3075,7 +3075,7 @@
       "type": "int"
     }
   ],
-  "id": "libvirt-25"
+  "id": "libvirt-24"
 }

 {
@@ -3083,7 +3083,7 @@
   "arguments": {
     "typename": "usb-storage"
   },
-  "id": "libvirt-26"
+  "id": "libvirt-25"
 }

 {
@@ -3152,7 +3152,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-26"
+  "id": "libvirt-25"
 }

 {
@@ -3160,7 +3160,7 @@
   "arguments": {
     "typename": "kvm-pit"
   },
-  "id": "libvirt-27"
+  "id": "libvirt-26"
 }

 {
@@ -3174,7 +3174,7 @@
       "type": "LostTickPolicy"
     }
   ],
-  "id": "libvirt-27"
+  "id": "libvirt-26"
 }

 {
@@ -3182,7 +3182,7 @@
   "arguments": {
     "typename": "VGA"
   },
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -3234,7 +3234,7 @@
       "type": "int32"
     }
   ],
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -3242,7 +3242,7 @@
   "arguments": {
     "typename": "vmware-svga"
   },
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
@@ -3280,7 +3280,7 @@
       "type": "int32"
     }
   ],
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
@@ -3288,7 +3288,7 @@
   "arguments": {
     "typename": "qxl"
   },
-  "id": "libvirt-30"
+  "id": "libvirt-29"
 }

 {
@@ -3370,7 +3370,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-30"
+  "id": "libvirt-29"
 }

 {
@@ -3378,7 +3378,7 @@
   "arguments": {
     "typename": "virtio-gpu-pci"
   },
-  "id": "libvirt-31"
+  "id": "libvirt-30"
 }

 {
@@ -3497,7 +3497,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-31"
+  "id": "libvirt-30"
 }

 {
@@ -3505,7 +3505,7 @@
   "arguments": {
     "typename": "virtio-gpu-device"
   },
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

 {
@@ -3545,7 +3545,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

 {
@@ -3553,7 +3553,7 @@
   "arguments": {
     "typename": "ICH9-LPC"
   },
-  "id": "libvirt-33"
+  "id": "libvirt-32"
 }

 {
@@ -3639,7 +3639,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-33"
+  "id": "libvirt-32"
 }

 {
@@ -3647,7 +3647,7 @@
   "arguments": {
     "typename": "virtio-balloon-pci"
   },
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

 {
@@ -3760,7 +3760,7 @@
       "type": "guest statistics"
     }
   ],
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

 {
@@ -3768,11 +3768,11 @@
   "arguments": {
     "typename": "virtio-balloon-ccw"
   },
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
-  "id": "libvirt-35",
+  "id": "libvirt-34",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-balloon-ccw' not found"
@@ -3784,7 +3784,7 @@
   "arguments": {
     "typename": "virtio-balloon-device"
   },
-  "id": "libvirt-36"
+  "id": "libvirt-35"
 }

 {
@@ -3823,7 +3823,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-36"
+  "id": "libvirt-35"
 }

 {
@@ -3831,7 +3831,7 @@
   "arguments": {
     "typename": "nec-usb-xhci"
   },
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
@@ -3906,7 +3906,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
@@ -3914,7 +3914,7 @@
   "arguments": {
     "typename": "intel-iommu"
   },
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
@@ -3937,7 +3937,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
@@ -3945,7 +3945,7 @@
   "arguments": {
     "typename": "mch"
   },
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
@@ -3971,12 +3971,12 @@
       "type": "pci-devfn"
     }
   ],
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
   "execute": "query-machines",
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
@@ -4145,12 +4145,12 @@
       "cpu-max": 255
     }
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
   "execute": "query-cpu-definitions",
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
@@ -4356,36 +4356,36 @@
       "static": false
     }
   ],
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
   "execute": "query-tpm-models",
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }

 {
   "return": [
     "tpm-tis"
   ],
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }

 {
   "execute": "query-tpm-types",
-  "id": "libvirt-43"
+  "id": "libvirt-42"
 }

 {
   "return": [
     "passthrough"
   ],
-  "id": "libvirt-43"
+  "id": "libvirt-42"
 }

 {
   "execute": "query-command-line-options",
-  "id": "libvirt-44"
+  "id": "libvirt-43"
 }

 {
@@ -5508,12 +5508,12 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-44"
+  "id": "libvirt-43"
 }

 {
   "execute": "query-migrate-capabilities",
-  "id": "libvirt-45"
+  "id": "libvirt-44"
 }

 {
@@ -5551,12 +5551,12 @@
       "capability": "x-colo"
     }
   ],
-  "id": "libvirt-45"
+  "id": "libvirt-44"
 }

 {
   "execute": "query-qmp-schema",
-  "id": "libvirt-46"
+  "id": "libvirt-45"
 }

 {
@@ -14326,7 +14326,7 @@
       "meta-type": "object"
     }
   ],
-  "id": "libvirt-46"
+  "id": "libvirt-45"
 }

 {
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies
index 977f60078f..f98ed20a6b 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies
@@ -480,7 +480,7 @@

 {
   "execute": "query-kvm",
-  "id": "libvirt-6"
+  "id": "libvirt-5"
 }

 {
@@ -488,12 +488,12 @@
     "enabled": true,
     "present": true
   },
-  "id": "libvirt-6"
+  "id": "libvirt-5"
 }

 {
   "execute": "query-events",
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

 {
@@ -610,12 +610,12 @@
       "name": "ACPI_DEVICE_OST"
     }
   ],
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

 {
   "execute": "qom-list-types",
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

 {
@@ -2565,7 +2565,7 @@
       "name": "7457A_v1.2-powerpc64-cpu"
     }
   ],
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

 {
@@ -2573,7 +2573,7 @@
   "arguments": {
     "typename": "virtio-blk-pci"
   },
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

 {
@@ -2801,7 +2801,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

 {
@@ -2809,7 +2809,7 @@
   "arguments": {
     "typename": "virtio-net-pci"
   },
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

 {
@@ -3088,7 +3088,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

 {
@@ -3096,7 +3096,7 @@
   "arguments": {
     "typename": "virtio-scsi-pci"
   },
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

 {
@@ -3257,7 +3257,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

 {
@@ -3265,11 +3265,11 @@
   "arguments": {
     "typename": "virtio-net-ccw"
   },
-  "id": "libvirt-12"
+  "id": "libvirt-11"
 }

 {
-  "id": "libvirt-12",
+  "id": "libvirt-11",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-net-ccw' not found"
@@ -3281,11 +3281,11 @@
   "arguments": {
     "typename": "virtio-scsi-ccw"
   },
-  "id": "libvirt-13"
+  "id": "libvirt-12"
 }

 {
-  "id": "libvirt-13",
+  "id": "libvirt-12",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-scsi-ccw' not found"
@@ -3297,11 +3297,11 @@
   "arguments": {
     "typename": "virtio-net-s390"
   },
-  "id": "libvirt-14"
+  "id": "libvirt-13"
 }

 {
-  "id": "libvirt-14",
+  "id": "libvirt-13",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-net-s390' not found"
@@ -3313,11 +3313,11 @@
   "arguments": {
     "typename": "pci-assign"
   },
-  "id": "libvirt-15"
+  "id": "libvirt-14"
 }

 {
-  "id": "libvirt-15",
+  "id": "libvirt-14",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'pci-assign' not found"
@@ -3329,11 +3329,11 @@
   "arguments": {
     "typename": "kvm-pci-assign"
   },
-  "id": "libvirt-16"
+  "id": "libvirt-15"
 }

 {
-  "id": "libvirt-16",
+  "id": "libvirt-15",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'kvm-pci-assign' not found"
@@ -3345,7 +3345,7 @@
   "arguments": {
     "typename": "vfio-pci"
   },
-  "id": "libvirt-17"
+  "id": "libvirt-16"
 }

 {
@@ -3452,7 +3452,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-17"
+  "id": "libvirt-16"
 }

 {
@@ -3460,7 +3460,7 @@
   "arguments": {
     "typename": "scsi-disk"
   },
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

 {
@@ -3574,7 +3574,7 @@
       "type": "uint64"
     }
   ],
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

 {
@@ -3582,7 +3582,7 @@
   "arguments": {
     "typename": "ide-drive"
   },
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -3658,7 +3658,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -3666,11 +3666,11 @@
   "arguments": {
     "typename": "PIIX4_PM"
   },
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
-  "id": "libvirt-20",
+  "id": "libvirt-19",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'PIIX4_PM' not found"
@@ -3682,11 +3682,11 @@
   "arguments": {
     "typename": "usb-host"
   },
-  "id": "libvirt-21"
+  "id": "libvirt-20"
 }

 {
-  "id": "libvirt-21",
+  "id": "libvirt-20",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'usb-host' not found"
@@ -3698,7 +3698,7 @@
   "arguments": {
     "typename": "scsi-generic"
   },
-  "id": "libvirt-22"
+  "id": "libvirt-21"
 }

 {
@@ -3725,7 +3725,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-22"
+  "id": "libvirt-21"
 }

 {
@@ -3733,11 +3733,11 @@
   "arguments": {
     "typename": "i440FX-pcihost"
   },
-  "id": "libvirt-23"
+  "id": "libvirt-22"
 }

 {
-  "id": "libvirt-23",
+  "id": "libvirt-22",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'i440FX-pcihost' not found"
@@ -3749,11 +3749,11 @@
   "arguments": {
     "typename": "q35-pcihost"
   },
-  "id": "libvirt-24"
+  "id": "libvirt-23"
 }

 {
-  "id": "libvirt-24",
+  "id": "libvirt-23",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'q35-pcihost' not found"
@@ -3765,7 +3765,7 @@
   "arguments": {
     "typename": "usb-storage"
   },
-  "id": "libvirt-25"
+  "id": "libvirt-24"
 }

 {
@@ -3838,7 +3838,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-25"
+  "id": "libvirt-24"
 }

 {
@@ -3846,11 +3846,11 @@
   "arguments": {
     "typename": "kvm-pit"
   },
-  "id": "libvirt-26"
+  "id": "libvirt-25"
 }

 {
-  "id": "libvirt-26",
+  "id": "libvirt-25",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'kvm-pit' not found"
@@ -3862,7 +3862,7 @@
   "arguments": {
     "typename": "VGA"
   },
-  "id": "libvirt-27"
+  "id": "libvirt-26"
 }

 {
@@ -3919,7 +3919,7 @@
       "type": "int32"
     }
   ],
-  "id": "libvirt-27"
+  "id": "libvirt-26"
 }

 {
@@ -3927,7 +3927,7 @@
   "arguments": {
     "typename": "virtio-gpu-pci"
   },
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -4070,7 +4070,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -4078,7 +4078,7 @@
   "arguments": {
     "typename": "virtio-gpu-device"
   },
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
@@ -4117,7 +4117,7 @@
       "type": "size"
     }
   ],
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
@@ -4125,11 +4125,11 @@
   "arguments": {
     "typename": "ICH9-LPC"
   },
-  "id": "libvirt-30"
+  "id": "libvirt-29"
 }

 {
-  "id": "libvirt-30",
+  "id": "libvirt-29",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'ICH9-LPC' not found"
@@ -4141,7 +4141,7 @@
   "arguments": {
     "typename": "virtio-balloon-pci"
   },
-  "id": "libvirt-31"
+  "id": "libvirt-30"
 }

 {
@@ -4284,7 +4284,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-31"
+  "id": "libvirt-30"
 }

 {
@@ -4292,11 +4292,11 @@
   "arguments": {
     "typename": "virtio-balloon-ccw"
   },
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

 {
-  "id": "libvirt-32",
+  "id": "libvirt-31",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-balloon-ccw' not found"
@@ -4308,7 +4308,7 @@
   "arguments": {
     "typename": "virtio-balloon-device"
   },
-  "id": "libvirt-33"
+  "id": "libvirt-32"
 }

 {
@@ -4352,7 +4352,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-33"
+  "id": "libvirt-32"
 }

 {
@@ -4360,7 +4360,7 @@
   "arguments": {
     "typename": "nec-usb-xhci"
   },
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

 {
@@ -4440,7 +4440,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

 {
@@ -4448,7 +4448,7 @@
   "arguments": {
     "typename": "spapr-pci-host-bridge"
   },
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
@@ -4534,12 +4534,12 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
   "execute": "query-machines",
-  "id": "libvirt-36"
+  "id": "libvirt-35"
 }

 {
@@ -4652,12 +4652,12 @@
       "cpu-max": 1
     }
   ],
-  "id": "libvirt-36"
+  "id": "libvirt-35"
 }

 {
   "execute": "query-cpu-definitions",
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
@@ -6833,34 +6833,34 @@
       "static": false
     }
   ],
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
   "execute": "query-tpm-models",
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
   "return": [
   ],
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
   "execute": "query-tpm-types",
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
   "return": [
   ],
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
   "execute": "query-command-line-options",
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
@@ -7970,12 +7970,12 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
   "execute": "query-migrate-capabilities",
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
@@ -8017,12 +8017,12 @@
       "capability": "release-ram"
     }
   ],
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
   "execute": "query-qmp-schema",
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }

 {
@@ -17308,7 +17308,7 @@
       "meta-type": "object"
     }
   ],
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }

 {
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies
index 1e2a93ff0a..d3b60da4bf 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies
@@ -492,7 +492,7 @@

 {
   "execute": "query-kvm",
-  "id": "libvirt-6"
+  "id": "libvirt-5"
 }

 {
@@ -500,12 +500,12 @@
     "enabled": true,
     "present": true
   },
-  "id": "libvirt-6"
+  "id": "libvirt-5"
 }

 {
   "execute": "query-events",
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

 {
@@ -622,12 +622,12 @@
       "name": "ACPI_DEVICE_OST"
     }
   ],
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

 {
   "execute": "qom-list-types",
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

 {
@@ -1269,7 +1269,7 @@
       "name": "virtio-blk-device"
     }
   ],
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

 {
@@ -1277,7 +1277,7 @@
   "arguments": {
     "typename": "virtio-blk-pci"
   },
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

 {
@@ -1505,7 +1505,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

 {
@@ -1513,7 +1513,7 @@
   "arguments": {
     "typename": "virtio-net-pci"
   },
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

 {
@@ -1792,7 +1792,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

 {
@@ -1800,7 +1800,7 @@
   "arguments": {
     "typename": "virtio-scsi-pci"
   },
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

 {
@@ -1961,7 +1961,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

 {
@@ -1969,7 +1969,7 @@
   "arguments": {
     "typename": "virtio-blk-ccw"
   },
-  "id": "libvirt-12"
+  "id": "libvirt-11"
 }

 {
@@ -2107,7 +2107,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-12"
+  "id": "libvirt-11"
 }

 {
@@ -2115,7 +2115,7 @@
   "arguments": {
     "typename": "virtio-net-ccw"
   },
-  "id": "libvirt-13"
+  "id": "libvirt-12"
 }

 {
@@ -2308,7 +2308,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-13"
+  "id": "libvirt-12"
 }

 {
@@ -2316,7 +2316,7 @@
   "arguments": {
     "typename": "virtio-scsi-ccw"
   },
-  "id": "libvirt-14"
+  "id": "libvirt-13"
 }

 {
@@ -2391,7 +2391,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-14"
+  "id": "libvirt-13"
 }

 {
@@ -2399,11 +2399,11 @@
   "arguments": {
     "typename": "virtio-net-s390"
   },
-  "id": "libvirt-15"
+  "id": "libvirt-14"
 }

 {
-  "id": "libvirt-15",
+  "id": "libvirt-14",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-net-s390' not found"
@@ -2415,11 +2415,11 @@
   "arguments": {
     "typename": "pci-assign"
   },
-  "id": "libvirt-16"
+  "id": "libvirt-15"
 }

 {
-  "id": "libvirt-16",
+  "id": "libvirt-15",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'pci-assign' not found"
@@ -2431,11 +2431,11 @@
   "arguments": {
     "typename": "kvm-pci-assign"
   },
-  "id": "libvirt-17"
+  "id": "libvirt-16"
 }

 {
-  "id": "libvirt-17",
+  "id": "libvirt-16",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'kvm-pci-assign' not found"
@@ -2447,7 +2447,7 @@
   "arguments": {
     "typename": "vfio-pci"
   },
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

 {
@@ -2554,7 +2554,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

 {
@@ -2562,7 +2562,7 @@
   "arguments": {
     "typename": "scsi-disk"
   },
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -2676,7 +2676,7 @@
       "type": "uint64"
     }
   ],
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -2684,11 +2684,11 @@
   "arguments": {
     "typename": "ide-drive"
   },
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
-  "id": "libvirt-20",
+  "id": "libvirt-19",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'ide-drive' not found"
@@ -2700,11 +2700,11 @@
   "arguments": {
     "typename": "PIIX4_PM"
   },
-  "id": "libvirt-21"
+  "id": "libvirt-20"
 }

 {
-  "id": "libvirt-21",
+  "id": "libvirt-20",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'PIIX4_PM' not found"
@@ -2716,11 +2716,11 @@
   "arguments": {
     "typename": "usb-host"
   },
-  "id": "libvirt-22"
+  "id": "libvirt-21"
 }

 {
-  "id": "libvirt-22",
+  "id": "libvirt-21",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'usb-host' not found"
@@ -2732,7 +2732,7 @@
   "arguments": {
     "typename": "scsi-generic"
   },
-  "id": "libvirt-23"
+  "id": "libvirt-22"
 }

 {
@@ -2759,7 +2759,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-23"
+  "id": "libvirt-22"
 }

 {
@@ -2767,11 +2767,11 @@
   "arguments": {
     "typename": "i440FX-pcihost"
   },
-  "id": "libvirt-24"
+  "id": "libvirt-23"
 }

 {
-  "id": "libvirt-24",
+  "id": "libvirt-23",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'i440FX-pcihost' not found"
@@ -2783,11 +2783,11 @@
   "arguments": {
     "typename": "q35-pcihost"
   },
-  "id": "libvirt-25"
+  "id": "libvirt-24"
 }

 {
-  "id": "libvirt-25",
+  "id": "libvirt-24",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'q35-pcihost' not found"
@@ -2799,11 +2799,11 @@
   "arguments": {
     "typename": "kvm-pit"
   },
-  "id": "libvirt-26"
+  "id": "libvirt-25"
 }

 {
-  "id": "libvirt-26",
+  "id": "libvirt-25",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'kvm-pit' not found"
@@ -2815,7 +2815,7 @@
   "arguments": {
     "typename": "virtio-gpu-pci"
   },
-  "id": "libvirt-27"
+  "id": "libvirt-26"
 }

 {
@@ -2958,7 +2958,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-27"
+  "id": "libvirt-26"
 }

 {
@@ -2966,7 +2966,7 @@
   "arguments": {
     "typename": "virtio-gpu-device"
   },
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -3005,7 +3005,7 @@
       "type": "size"
     }
   ],
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -3013,11 +3013,11 @@
   "arguments": {
     "typename": "ICH9-LPC"
   },
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
-  "id": "libvirt-29",
+  "id": "libvirt-28",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'ICH9-LPC' not found"
@@ -3029,7 +3029,7 @@
   "arguments": {
     "typename": "virtio-balloon-pci"
   },
-  "id": "libvirt-30"
+  "id": "libvirt-29"
 }

 {
@@ -3172,7 +3172,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-30"
+  "id": "libvirt-29"
 }

 {
@@ -3180,7 +3180,7 @@
   "arguments": {
     "typename": "virtio-balloon-ccw"
   },
-  "id": "libvirt-31"
+  "id": "libvirt-30"
 }

 {
@@ -3242,7 +3242,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-31"
+  "id": "libvirt-30"
 }

 {
@@ -3250,7 +3250,7 @@
   "arguments": {
     "typename": "virtio-balloon-device"
   },
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

 {
@@ -3294,7 +3294,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

 {
@@ -3302,7 +3302,7 @@
   "arguments": {
     "typename": "virtual-css-bridge"
   },
-  "id": "libvirt-33"
+  "id": "libvirt-32"
 }

 {
@@ -3312,12 +3312,12 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-33"
+  "id": "libvirt-32"
 }

 {
   "execute": "query-machines",
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

 {
@@ -3360,12 +3360,12 @@
       "cpu-max": 248
     }
   ],
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

 {
   "execute": "query-cpu-definitions",
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
@@ -3755,34 +3755,34 @@
       "migration-safe": true
     }
   ],
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
   "execute": "query-tpm-models",
-  "id": "libvirt-36"
+  "id": "libvirt-35"
 }

 {
   "return": [
   ],
-  "id": "libvirt-36"
+  "id": "libvirt-35"
 }

 {
   "execute": "query-tpm-types",
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
   "return": [
   ],
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
   "execute": "query-command-line-options",
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
@@ -4857,12 +4857,12 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
   "execute": "query-migrate-capabilities",
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
@@ -4904,12 +4904,12 @@
       "capability": "release-ram"
     }
   ],
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
   "execute": "query-qmp-schema",
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
@@ -14195,7 +14195,7 @@
       "meta-type": "object"
     }
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
@@ -14206,7 +14206,7 @@
       "name": "host"
     }
   },
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
@@ -14233,7 +14233,7 @@
       }
     }
   },
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
@@ -14247,11 +14247,11 @@
       }
     }
   },
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }

 {
-  "id": "libvirt-42",
+  "id": "libvirt-41",
   "error": {
     "class": "GenericError",
     "desc": "Property '.migratable' not found"
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies
index a55a4a111a..c3edcc187d 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies
@@ -489,7 +489,7 @@

 {
   "execute": "query-kvm",
-  "id": "libvirt-6"
+  "id": "libvirt-5"
 }

 {
@@ -497,12 +497,12 @@
     "enabled": true,
     "present": true
   },
-  "id": "libvirt-6"
+  "id": "libvirt-5"
 }

 {
   "execute": "query-events",
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

 {
@@ -619,12 +619,12 @@
       "name": "ACPI_DEVICE_OST"
     }
   ],
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

 {
   "execute": "qom-list-types",
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

 {
@@ -1755,7 +1755,7 @@
       "name": "virtio-blk-device"
     }
   ],
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

 {
@@ -1763,7 +1763,7 @@
   "arguments": {
     "typename": "virtio-blk-pci"
   },
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

 {
@@ -1991,7 +1991,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

 {
@@ -1999,7 +1999,7 @@
   "arguments": {
     "typename": "virtio-net-pci"
   },
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

 {
@@ -2278,7 +2278,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

 {
@@ -2286,7 +2286,7 @@
   "arguments": {
     "typename": "virtio-scsi-pci"
   },
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

 {
@@ -2447,7 +2447,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

 {
@@ -2455,11 +2455,11 @@
   "arguments": {
     "typename": "virtio-net-ccw"
   },
-  "id": "libvirt-12"
+  "id": "libvirt-11"
 }

 {
-  "id": "libvirt-12",
+  "id": "libvirt-11",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-net-ccw' not found"
@@ -2471,11 +2471,11 @@
   "arguments": {
     "typename": "virtio-scsi-ccw"
   },
-  "id": "libvirt-13"
+  "id": "libvirt-12"
 }

 {
-  "id": "libvirt-13",
+  "id": "libvirt-12",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-scsi-ccw' not found"
@@ -2487,11 +2487,11 @@
   "arguments": {
     "typename": "virtio-net-s390"
   },
-  "id": "libvirt-14"
+  "id": "libvirt-13"
 }

 {
-  "id": "libvirt-14",
+  "id": "libvirt-13",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-net-s390' not found"
@@ -2503,11 +2503,11 @@
   "arguments": {
     "typename": "pci-assign"
   },
-  "id": "libvirt-15"
+  "id": "libvirt-14"
 }

 {
-  "id": "libvirt-15",
+  "id": "libvirt-14",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'pci-assign' not found"
@@ -2519,7 +2519,7 @@
   "arguments": {
     "typename": "kvm-pci-assign"
   },
-  "id": "libvirt-16"
+  "id": "libvirt-15"
 }

 {
@@ -2581,7 +2581,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-16"
+  "id": "libvirt-15"
 }

 {
@@ -2589,7 +2589,7 @@
   "arguments": {
     "typename": "vfio-pci"
   },
-  "id": "libvirt-17"
+  "id": "libvirt-16"
 }

 {
@@ -2696,7 +2696,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-17"
+  "id": "libvirt-16"
 }

 {
@@ -2704,7 +2704,7 @@
   "arguments": {
     "typename": "scsi-disk"
   },
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

 {
@@ -2818,7 +2818,7 @@
       "type": "uint64"
     }
   ],
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

 {
@@ -2826,7 +2826,7 @@
   "arguments": {
     "typename": "ide-drive"
   },
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -2902,7 +2902,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -2910,7 +2910,7 @@
   "arguments": {
     "typename": "PIIX4_PM"
   },
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
@@ -2973,7 +2973,7 @@
       "type": "int32"
     }
   ],
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
@@ -2981,7 +2981,7 @@
   "arguments": {
     "typename": "usb-redir"
   },
-  "id": "libvirt-21"
+  "id": "libvirt-20"
 }

 {
@@ -3030,7 +3030,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-21"
+  "id": "libvirt-20"
 }

 {
@@ -3038,7 +3038,7 @@
   "arguments": {
     "typename": "usb-host"
   },
-  "id": "libvirt-22"
+  "id": "libvirt-21"
 }

 {
@@ -3107,7 +3107,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-22"
+  "id": "libvirt-21"
 }

 {
@@ -3115,7 +3115,7 @@
   "arguments": {
     "typename": "scsi-generic"
   },
-  "id": "libvirt-23"
+  "id": "libvirt-22"
 }

 {
@@ -3142,7 +3142,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-23"
+  "id": "libvirt-22"
 }

 {
@@ -3150,7 +3150,7 @@
   "arguments": {
     "typename": "i440FX-pcihost"
   },
-  "id": "libvirt-24"
+  "id": "libvirt-23"
 }

 {
@@ -3188,7 +3188,7 @@
       "type": "child<qemu:memory-region>"
     }
   ],
-  "id": "libvirt-24"
+  "id": "libvirt-23"
 }

 {
@@ -3196,7 +3196,7 @@
   "arguments": {
     "typename": "q35-pcihost"
   },
-  "id": "libvirt-25"
+  "id": "libvirt-24"
 }

 {
@@ -3274,7 +3274,7 @@
       "type": "int"
     }
   ],
-  "id": "libvirt-25"
+  "id": "libvirt-24"
 }

 {
@@ -3282,7 +3282,7 @@
   "arguments": {
     "typename": "usb-storage"
   },
-  "id": "libvirt-26"
+  "id": "libvirt-25"
 }

 {
@@ -3355,7 +3355,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-26"
+  "id": "libvirt-25"
 }

 {
@@ -3363,7 +3363,7 @@
   "arguments": {
     "typename": "kvm-pit"
   },
-  "id": "libvirt-27"
+  "id": "libvirt-26"
 }

 {
@@ -3377,7 +3377,7 @@
       "type": "LostTickPolicy"
     }
   ],
-  "id": "libvirt-27"
+  "id": "libvirt-26"
 }

 {
@@ -3385,7 +3385,7 @@
   "arguments": {
     "typename": "VGA"
   },
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -3442,7 +3442,7 @@
       "type": "int32"
     }
   ],
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -3450,7 +3450,7 @@
   "arguments": {
     "typename": "vmware-svga"
   },
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
@@ -3493,7 +3493,7 @@
       "type": "int32"
     }
   ],
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
@@ -3501,7 +3501,7 @@
   "arguments": {
     "typename": "qxl"
   },
-  "id": "libvirt-30"
+  "id": "libvirt-29"
 }

 {
@@ -3588,7 +3588,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-30"
+  "id": "libvirt-29"
 }

 {
@@ -3596,7 +3596,7 @@
   "arguments": {
     "typename": "virtio-gpu-pci"
   },
-  "id": "libvirt-31"
+  "id": "libvirt-30"
 }

 {
@@ -3749,7 +3749,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-31"
+  "id": "libvirt-30"
 }

 {
@@ -3757,7 +3757,7 @@
   "arguments": {
     "typename": "virtio-gpu-device"
   },
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

 {
@@ -3806,7 +3806,7 @@
       "type": "size"
     }
   ],
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

 {
@@ -3814,7 +3814,7 @@
   "arguments": {
     "typename": "ICH9-LPC"
   },
-  "id": "libvirt-33"
+  "id": "libvirt-32"
 }

 {
@@ -3910,7 +3910,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-33"
+  "id": "libvirt-32"
 }

 {
@@ -3918,7 +3918,7 @@
   "arguments": {
     "typename": "virtio-balloon-pci"
   },
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

 {
@@ -4061,7 +4061,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

 {
@@ -4069,11 +4069,11 @@
   "arguments": {
     "typename": "virtio-balloon-ccw"
   },
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
-  "id": "libvirt-35",
+  "id": "libvirt-34",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-balloon-ccw' not found"
@@ -4085,7 +4085,7 @@
   "arguments": {
     "typename": "virtio-balloon-device"
   },
-  "id": "libvirt-36"
+  "id": "libvirt-35"
 }

 {
@@ -4129,7 +4129,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-36"
+  "id": "libvirt-35"
 }

 {
@@ -4137,7 +4137,7 @@
   "arguments": {
     "typename": "nec-usb-xhci"
   },
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
@@ -4217,7 +4217,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
@@ -4225,7 +4225,7 @@
   "arguments": {
     "typename": "intel-iommu"
   },
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
@@ -4256,7 +4256,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
@@ -4264,7 +4264,7 @@
   "arguments": {
     "typename": "mch"
   },
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
@@ -4290,12 +4290,12 @@
       "type": "pci-devfn"
     }
   ],
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
   "execute": "query-machines",
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
@@ -4474,12 +4474,12 @@
       "cpu-max": 255
     }
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
   "execute": "query-cpu-definitions",
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
@@ -4761,36 +4761,36 @@
       "migration-safe": true
     }
   ],
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
   "execute": "query-tpm-models",
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }

 {
   "return": [
     "tpm-tis"
   ],
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }

 {
   "execute": "query-tpm-types",
-  "id": "libvirt-43"
+  "id": "libvirt-42"
 }

 {
   "return": [
     "passthrough"
   ],
-  "id": "libvirt-43"
+  "id": "libvirt-42"
 }

 {
   "execute": "query-command-line-options",
-  "id": "libvirt-44"
+  "id": "libvirt-43"
 }

 {
@@ -6039,12 +6039,12 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-44"
+  "id": "libvirt-43"
 }

 {
   "execute": "query-migrate-capabilities",
-  "id": "libvirt-45"
+  "id": "libvirt-44"
 }

 {
@@ -6086,12 +6086,12 @@
       "capability": "release-ram"
     }
   ],
-  "id": "libvirt-45"
+  "id": "libvirt-44"
 }

 {
   "execute": "query-qmp-schema",
-  "id": "libvirt-46"
+  "id": "libvirt-45"
 }

 {
@@ -15377,7 +15377,7 @@
       "meta-type": "object"
     }
   ],
-  "id": "libvirt-46"
+  "id": "libvirt-45"
 }

 {
@@ -15388,7 +15388,7 @@
       "name": "host"
     }
   },
-  "id": "libvirt-47"
+  "id": "libvirt-46"
 }

 {
@@ -15567,7 +15567,7 @@
       }
     }
   },
-  "id": "libvirt-47"
+  "id": "libvirt-46"
 }

 {
@@ -15748,7 +15748,7 @@
       }
     }
   },
-  "id": "libvirt-48"
+  "id": "libvirt-47"
 }

 {
@@ -15989,7 +15989,7 @@
       }
     }
   },
-  "id": "libvirt-48"
+  "id": "libvirt-47"
 }

 {
@@ -16003,7 +16003,7 @@
       }
     }
   },
-  "id": "libvirt-49"
+  "id": "libvirt-48"
 }

 {
@@ -16182,7 +16182,7 @@
       }
     }
   },
-  "id": "libvirt-49"
+  "id": "libvirt-48"
 }

 {
@@ -16363,7 +16363,7 @@
       }
     }
   },
-  "id": "libvirt-50"
+  "id": "libvirt-49"
 }

 {
@@ -16604,7 +16604,7 @@
       }
     }
   },
-  "id": "libvirt-50"
+  "id": "libvirt-49"
 }

 {
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies
index cf1a8bfe3d..932c418f3f 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies
@@ -567,7 +567,7 @@

 {
   "execute": "query-kvm",
-  "id": "libvirt-6"
+  "id": "libvirt-5"
 }

 {
@@ -575,12 +575,12 @@
     "enabled": true,
     "present": true
   },
-  "id": "libvirt-6"
+  "id": "libvirt-5"
 }

 {
   "execute": "query-events",
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

 {
@@ -706,12 +706,12 @@
       "name": "SHUTDOWN"
     }
   ],
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

 {
   "execute": "qom-list-types",
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

 {
@@ -3553,7 +3553,7 @@
       "parent": "virtio-input-hid-pci"
     }
   ],
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

 {
@@ -3561,7 +3561,7 @@
   "arguments": {
     "typename": "virtio-blk-pci"
   },
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

 {
@@ -3793,7 +3793,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

 {
@@ -3801,7 +3801,7 @@
   "arguments": {
     "typename": "virtio-net-pci"
   },
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

 {
@@ -4091,7 +4091,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

 {
@@ -4099,7 +4099,7 @@
   "arguments": {
     "typename": "virtio-scsi-pci"
   },
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

 {
@@ -4264,7 +4264,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

 {
@@ -4272,11 +4272,11 @@
   "arguments": {
     "typename": "virtio-net-ccw"
   },
-  "id": "libvirt-12"
+  "id": "libvirt-11"
 }

 {
-  "id": "libvirt-12",
+  "id": "libvirt-11",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-net-ccw' not found"
@@ -4288,11 +4288,11 @@
   "arguments": {
     "typename": "virtio-scsi-ccw"
   },
-  "id": "libvirt-13"
+  "id": "libvirt-12"
 }

 {
-  "id": "libvirt-13",
+  "id": "libvirt-12",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-scsi-ccw' not found"
@@ -4304,11 +4304,11 @@
   "arguments": {
     "typename": "virtio-net-s390"
   },
-  "id": "libvirt-14"
+  "id": "libvirt-13"
 }

 {
-  "id": "libvirt-14",
+  "id": "libvirt-13",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-net-s390' not found"
@@ -4320,11 +4320,11 @@
   "arguments": {
     "typename": "pci-assign"
   },
-  "id": "libvirt-15"
+  "id": "libvirt-14"
 }

 {
-  "id": "libvirt-15",
+  "id": "libvirt-14",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'pci-assign' not found"
@@ -4336,11 +4336,11 @@
   "arguments": {
     "typename": "kvm-pci-assign"
   },
-  "id": "libvirt-16"
+  "id": "libvirt-15"
 }

 {
-  "id": "libvirt-16",
+  "id": "libvirt-15",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'kvm-pci-assign' not found"
@@ -4352,7 +4352,7 @@
   "arguments": {
     "typename": "vfio-pci"
   },
-  "id": "libvirt-17"
+  "id": "libvirt-16"
 }

 {
@@ -4486,7 +4486,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-17"
+  "id": "libvirt-16"
 }

 {
@@ -4494,7 +4494,7 @@
   "arguments": {
     "typename": "scsi-disk"
   },
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

 {
@@ -4612,7 +4612,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

 {
@@ -4620,7 +4620,7 @@
   "arguments": {
     "typename": "ide-drive"
   },
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -4696,7 +4696,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -4704,11 +4704,11 @@
   "arguments": {
     "typename": "PIIX4_PM"
   },
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
-  "id": "libvirt-20",
+  "id": "libvirt-19",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'PIIX4_PM' not found"
@@ -4720,7 +4720,7 @@
   "arguments": {
     "typename": "usb-host"
   },
-  "id": "libvirt-21"
+  "id": "libvirt-20"
 }

 {
@@ -4789,7 +4789,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-21"
+  "id": "libvirt-20"
 }

 {
@@ -4797,7 +4797,7 @@
   "arguments": {
     "typename": "scsi-generic"
   },
-  "id": "libvirt-22"
+  "id": "libvirt-21"
 }

 {
@@ -4828,7 +4828,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-22"
+  "id": "libvirt-21"
 }

 {
@@ -4836,11 +4836,11 @@
   "arguments": {
     "typename": "i440FX-pcihost"
   },
-  "id": "libvirt-23"
+  "id": "libvirt-22"
 }

 {
-  "id": "libvirt-23",
+  "id": "libvirt-22",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'i440FX-pcihost' not found"
@@ -4852,11 +4852,11 @@
   "arguments": {
     "typename": "q35-pcihost"
   },
-  "id": "libvirt-24"
+  "id": "libvirt-23"
 }

 {
-  "id": "libvirt-24",
+  "id": "libvirt-23",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'q35-pcihost' not found"
@@ -4868,7 +4868,7 @@
   "arguments": {
     "typename": "usb-storage"
   },
-  "id": "libvirt-25"
+  "id": "libvirt-24"
 }

 {
@@ -4941,7 +4941,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-25"
+  "id": "libvirt-24"
 }

 {
@@ -4949,11 +4949,11 @@
   "arguments": {
     "typename": "kvm-pit"
   },
-  "id": "libvirt-26"
+  "id": "libvirt-25"
 }

 {
-  "id": "libvirt-26",
+  "id": "libvirt-25",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'kvm-pit' not found"
@@ -4965,7 +4965,7 @@
   "arguments": {
     "typename": "VGA"
   },
-  "id": "libvirt-27"
+  "id": "libvirt-26"
 }

 {
@@ -5022,7 +5022,7 @@
       "type": "int32"
     }
   ],
-  "id": "libvirt-27"
+  "id": "libvirt-26"
 }

 {
@@ -5030,7 +5030,7 @@
   "arguments": {
     "typename": "virtio-gpu-pci"
   },
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -5181,7 +5181,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -5189,7 +5189,7 @@
   "arguments": {
     "typename": "virtio-gpu-device"
   },
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
@@ -5236,7 +5236,7 @@
       "type": "size"
     }
   ],
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
@@ -5244,11 +5244,11 @@
   "arguments": {
     "typename": "ICH9-LPC"
   },
-  "id": "libvirt-30"
+  "id": "libvirt-29"
 }

 {
-  "id": "libvirt-30",
+  "id": "libvirt-29",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'ICH9-LPC' not found"
@@ -5260,7 +5260,7 @@
   "arguments": {
     "typename": "virtio-balloon-pci"
   },
-  "id": "libvirt-31"
+  "id": "libvirt-30"
 }

 {
@@ -5403,7 +5403,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-31"
+  "id": "libvirt-30"
 }

 {
@@ -5411,11 +5411,11 @@
   "arguments": {
     "typename": "virtio-balloon-ccw"
   },
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

 {
-  "id": "libvirt-32",
+  "id": "libvirt-31",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-balloon-ccw' not found"
@@ -5427,7 +5427,7 @@
   "arguments": {
     "typename": "virtio-balloon-device"
   },
-  "id": "libvirt-33"
+  "id": "libvirt-32"
 }

 {
@@ -5471,7 +5471,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-33"
+  "id": "libvirt-32"
 }

 {
@@ -5479,7 +5479,7 @@
   "arguments": {
     "typename": "nec-usb-xhci"
   },
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

 {
@@ -5559,7 +5559,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

 {
@@ -5567,7 +5567,7 @@
   "arguments": {
     "typename": "spapr-pci-host-bridge"
   },
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
@@ -5625,7 +5625,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
@@ -5633,7 +5633,7 @@
   "arguments": {
     "typename": "memory-backend-file"
   },
-  "id": "libvirt-36"
+  "id": "libvirt-35"
 }

 {
@@ -5683,7 +5683,7 @@
       "type": "string"
     }
   ],
-  "id": "libvirt-36"
+  "id": "libvirt-35"
 }

 {
@@ -5691,7 +5691,7 @@
   "arguments": {
     "typename": "spapr-machine"
   },
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
@@ -5862,12 +5862,12 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
   "execute": "query-machines",
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
@@ -6010,12 +6010,12 @@
       "cpu-max": 1
     }
   ],
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
   "execute": "query-cpu-definitions",
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
@@ -8211,35 +8211,35 @@
       "static": false
     }
   ],
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
   "execute": "query-tpm-models",
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
   "return": [
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
   "execute": "query-tpm-types",
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
   "return": [
     "emulator"
   ],
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
   "execute": "query-command-line-options",
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }

 {
@@ -9369,12 +9369,12 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }

 {
   "execute": "query-migrate-capabilities",
-  "id": "libvirt-43"
+  "id": "libvirt-42"
 }

 {
@@ -9444,12 +9444,12 @@
       "capability": "late-block-activate"
     }
   ],
-  "id": "libvirt-43"
+  "id": "libvirt-42"
 }

 {
   "execute": "query-qmp-schema",
-  "id": "libvirt-44"
+  "id": "libvirt-43"
 }

 {
@@ -21608,7 +21608,7 @@
       "meta-type": "object"
     }
   ],
-  "id": "libvirt-44"
+  "id": "libvirt-43"
 }

 {
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies
index d6e0967172..fdab682f94 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies
@@ -585,7 +585,7 @@

 {
   "execute": "query-kvm",
-  "id": "libvirt-6"
+  "id": "libvirt-5"
 }

 {
@@ -593,12 +593,12 @@
     "enabled": true,
     "present": true
   },
-  "id": "libvirt-6"
+  "id": "libvirt-5"
 }

 {
   "execute": "query-events",
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

 {
@@ -727,12 +727,12 @@
       "name": "SHUTDOWN"
     }
   ],
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

 {
   "execute": "qom-list-types",
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

 {
@@ -2398,7 +2398,7 @@
       "parent": "rng-backend"
     }
   ],
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

 {
@@ -2406,7 +2406,7 @@
   "arguments": {
     "typename": "virtio-blk-pci"
   },
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

 {
@@ -2638,7 +2638,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

 {
@@ -2646,7 +2646,7 @@
   "arguments": {
     "typename": "virtio-net-pci"
   },
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

 {
@@ -2936,7 +2936,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

 {
@@ -2944,7 +2944,7 @@
   "arguments": {
     "typename": "virtio-scsi-pci"
   },
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

 {
@@ -3109,7 +3109,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

 {
@@ -3117,11 +3117,11 @@
   "arguments": {
     "typename": "virtio-net-ccw"
   },
-  "id": "libvirt-12"
+  "id": "libvirt-11"
 }

 {
-  "id": "libvirt-12",
+  "id": "libvirt-11",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-net-ccw' not found"
@@ -3133,11 +3133,11 @@
   "arguments": {
     "typename": "virtio-scsi-ccw"
   },
-  "id": "libvirt-13"
+  "id": "libvirt-12"
 }

 {
-  "id": "libvirt-13",
+  "id": "libvirt-12",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-scsi-ccw' not found"
@@ -3149,11 +3149,11 @@
   "arguments": {
     "typename": "virtio-net-s390"
   },
-  "id": "libvirt-14"
+  "id": "libvirt-13"
 }

 {
-  "id": "libvirt-14",
+  "id": "libvirt-13",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-net-s390' not found"
@@ -3165,11 +3165,11 @@
   "arguments": {
     "typename": "pci-assign"
   },
-  "id": "libvirt-15"
+  "id": "libvirt-14"
 }

 {
-  "id": "libvirt-15",
+  "id": "libvirt-14",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'pci-assign' not found"
@@ -3181,11 +3181,11 @@
   "arguments": {
     "typename": "kvm-pci-assign"
   },
-  "id": "libvirt-16"
+  "id": "libvirt-15"
 }

 {
-  "id": "libvirt-16",
+  "id": "libvirt-15",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'kvm-pci-assign' not found"
@@ -3197,7 +3197,7 @@
   "arguments": {
     "typename": "vfio-pci"
   },
-  "id": "libvirt-17"
+  "id": "libvirt-16"
 }

 {
@@ -3331,7 +3331,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-17"
+  "id": "libvirt-16"
 }

 {
@@ -3339,7 +3339,7 @@
   "arguments": {
     "typename": "scsi-disk"
   },
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

 {
@@ -3457,7 +3457,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

 {
@@ -3465,7 +3465,7 @@
   "arguments": {
     "typename": "ide-drive"
   },
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -3541,7 +3541,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -3549,7 +3549,7 @@
   "arguments": {
     "typename": "PIIX4_PM"
   },
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
@@ -3612,7 +3612,7 @@
       "type": "int32"
     }
   ],
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
@@ -3620,7 +3620,7 @@
   "arguments": {
     "typename": "usb-redir"
   },
-  "id": "libvirt-21"
+  "id": "libvirt-20"
 }

 {
@@ -3669,7 +3669,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-21"
+  "id": "libvirt-20"
 }

 {
@@ -3677,7 +3677,7 @@
   "arguments": {
     "typename": "usb-host"
   },
-  "id": "libvirt-22"
+  "id": "libvirt-21"
 }

 {
@@ -3746,7 +3746,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-22"
+  "id": "libvirt-21"
 }

 {
@@ -3754,7 +3754,7 @@
   "arguments": {
     "typename": "scsi-generic"
   },
-  "id": "libvirt-23"
+  "id": "libvirt-22"
 }

 {
@@ -3785,7 +3785,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-23"
+  "id": "libvirt-22"
 }

 {
@@ -3793,7 +3793,7 @@
   "arguments": {
     "typename": "i440FX-pcihost"
   },
-  "id": "libvirt-24"
+  "id": "libvirt-23"
 }

 {
@@ -3835,7 +3835,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-24"
+  "id": "libvirt-23"
 }

 {
@@ -3843,7 +3843,7 @@
   "arguments": {
     "typename": "q35-pcihost"
   },
-  "id": "libvirt-25"
+  "id": "libvirt-24"
 }

 {
@@ -3925,7 +3925,7 @@
       "type": "uint64"
     }
   ],
-  "id": "libvirt-25"
+  "id": "libvirt-24"
 }

 {
@@ -3933,7 +3933,7 @@
   "arguments": {
     "typename": "usb-storage"
   },
-  "id": "libvirt-26"
+  "id": "libvirt-25"
 }

 {
@@ -4016,7 +4016,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-26"
+  "id": "libvirt-25"
 }

 {
@@ -4024,7 +4024,7 @@
   "arguments": {
     "typename": "kvm-pit"
   },
-  "id": "libvirt-27"
+  "id": "libvirt-26"
 }

 {
@@ -4038,7 +4038,7 @@
       "type": "LostTickPolicy"
     }
   ],
-  "id": "libvirt-27"
+  "id": "libvirt-26"
 }

 {
@@ -4046,7 +4046,7 @@
   "arguments": {
     "typename": "VGA"
   },
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -4107,7 +4107,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -4115,7 +4115,7 @@
   "arguments": {
     "typename": "vmware-svga"
   },
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
@@ -4162,7 +4162,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
@@ -4170,7 +4170,7 @@
   "arguments": {
     "typename": "qxl"
   },
-  "id": "libvirt-30"
+  "id": "libvirt-29"
 }

 {
@@ -4269,7 +4269,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-30"
+  "id": "libvirt-29"
 }

 {
@@ -4277,7 +4277,7 @@
   "arguments": {
     "typename": "virtio-gpu-pci"
   },
-  "id": "libvirt-31"
+  "id": "libvirt-30"
 }

 {
@@ -4438,7 +4438,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-31"
+  "id": "libvirt-30"
 }

 {
@@ -4446,7 +4446,7 @@
   "arguments": {
     "typename": "virtio-gpu-device"
   },
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

 {
@@ -4503,7 +4503,7 @@
       "type": "size"
     }
   ],
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

 {
@@ -4511,7 +4511,7 @@
   "arguments": {
     "typename": "ICH9-LPC"
   },
-  "id": "libvirt-33"
+  "id": "libvirt-32"
 }

 {
@@ -4607,7 +4607,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-33"
+  "id": "libvirt-32"
 }

 {
@@ -4615,7 +4615,7 @@
   "arguments": {
     "typename": "virtio-balloon-pci"
   },
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

 {
@@ -4758,7 +4758,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

 {
@@ -4766,11 +4766,11 @@
   "arguments": {
     "typename": "virtio-balloon-ccw"
   },
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
-  "id": "libvirt-35",
+  "id": "libvirt-34",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-balloon-ccw' not found"
@@ -4782,7 +4782,7 @@
   "arguments": {
     "typename": "virtio-balloon-device"
   },
-  "id": "libvirt-36"
+  "id": "libvirt-35"
 }

 {
@@ -4826,7 +4826,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-36"
+  "id": "libvirt-35"
 }

 {
@@ -4834,7 +4834,7 @@
   "arguments": {
     "typename": "nec-usb-xhci"
   },
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
@@ -4914,7 +4914,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
@@ -4922,7 +4922,7 @@
   "arguments": {
     "typename": "intel-iommu"
   },
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
@@ -4961,7 +4961,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
@@ -4969,7 +4969,7 @@
   "arguments": {
     "typename": "mch"
   },
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
@@ -5012,7 +5012,7 @@
       "type": "int32"
     }
   ],
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
@@ -5020,7 +5020,7 @@
   "arguments": {
     "typename": "memory-backend-file"
   },
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
@@ -5070,7 +5070,7 @@
       "type": "string"
     }
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
@@ -5078,11 +5078,11 @@
   "arguments": {
     "typename": "spapr-machine"
   },
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
-  "id": "libvirt-41",
+  "id": "libvirt-40",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Class 'spapr-machine' not found"
@@ -5091,7 +5091,7 @@

 {
   "execute": "query-machines",
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }

 {
@@ -5300,12 +5300,12 @@
       "cpu-max": 255
     }
   ],
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }

 {
   "execute": "query-cpu-definitions",
-  "id": "libvirt-43"
+  "id": "libvirt-42"
 }

 {
@@ -5742,12 +5742,12 @@
       "migration-safe": true
     }
   ],
-  "id": "libvirt-43"
+  "id": "libvirt-42"
 }

 {
   "execute": "query-tpm-models",
-  "id": "libvirt-44"
+  "id": "libvirt-43"
 }

 {
@@ -5755,12 +5755,12 @@
     "tpm-crb",
     "tpm-tis"
   ],
-  "id": "libvirt-44"
+  "id": "libvirt-43"
 }

 {
   "execute": "query-tpm-types",
-  "id": "libvirt-45"
+  "id": "libvirt-44"
 }

 {
@@ -5768,12 +5768,12 @@
     "passthrough",
     "emulator"
   ],
-  "id": "libvirt-45"
+  "id": "libvirt-44"
 }

 {
   "execute": "query-command-line-options",
-  "id": "libvirt-46"
+  "id": "libvirt-45"
 }

 {
@@ -7072,12 +7072,12 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-46"
+  "id": "libvirt-45"
 }

 {
   "execute": "query-migrate-capabilities",
-  "id": "libvirt-47"
+  "id": "libvirt-46"
 }

 {
@@ -7147,12 +7147,12 @@
       "capability": "late-block-activate"
     }
   ],
-  "id": "libvirt-47"
+  "id": "libvirt-46"
 }

 {
   "execute": "query-qmp-schema",
-  "id": "libvirt-48"
+  "id": "libvirt-47"
 }

 {
@@ -19032,7 +19032,7 @@
       "meta-type": "object"
     }
   ],
-  "id": "libvirt-48"
+  "id": "libvirt-47"
 }

 {
@@ -19043,7 +19043,7 @@
       "name": "host"
     }
   },
-  "id": "libvirt-49"
+  "id": "libvirt-48"
 }

 {
@@ -19236,7 +19236,7 @@
       }
     }
   },
-  "id": "libvirt-49"
+  "id": "libvirt-48"
 }

 {
@@ -19431,7 +19431,7 @@
       }
     }
   },
-  "id": "libvirt-50"
+  "id": "libvirt-49"
 }

 {
@@ -19694,7 +19694,7 @@
       }
     }
   },
-  "id": "libvirt-50"
+  "id": "libvirt-49"
 }

 {
@@ -19708,7 +19708,7 @@
       }
     }
   },
-  "id": "libvirt-51"
+  "id": "libvirt-50"
 }

 {
@@ -19901,7 +19901,7 @@
       }
     }
   },
-  "id": "libvirt-51"
+  "id": "libvirt-50"
 }

 {
@@ -20096,7 +20096,7 @@
       }
     }
   },
-  "id": "libvirt-52"
+  "id": "libvirt-51"
 }

 {
@@ -20359,16 +20359,16 @@
       }
     }
   },
-  "id": "libvirt-52"
+  "id": "libvirt-51"
 }

 {
   "execute": "query-sev-capabilities",
-  "id": "libvirt-53"
+  "id": "libvirt-52"
 }

 {
-  "id": "libvirt-53",
+  "id": "libvirt-52",
   "error": {
     "class": "GenericError",
     "desc": "SEV feature is not available"
-- 
2.16.2


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]