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

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



Split up for simpler reviews.
---
 .../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.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 ++++++++++-----------
 23 files changed, 1842 insertions(+), 1842 deletions(-)

diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies
index e9712caad0..3751702864 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies
@@ -509,7 +509,7 @@

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

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

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

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

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

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

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

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

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

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

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

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

 {
@@ -3922,11 +3922,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"
@@ -3938,11 +3938,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"
@@ -3954,11 +3954,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"
@@ -3970,11 +3970,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"
@@ -3986,11 +3986,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"
@@ -4002,7 +4002,7 @@
   "arguments": {
     "typename": "vfio-pci"
   },
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

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

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

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

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

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

 {
@@ -4323,11 +4323,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"
@@ -4339,7 +4339,7 @@
   "arguments": {
     "typename": "usb-host"
   },
-  "id": "libvirt-22"
+  "id": "libvirt-21"
 }

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

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

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

 {
@@ -4451,11 +4451,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"
@@ -4467,11 +4467,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"
@@ -4483,7 +4483,7 @@
   "arguments": {
     "typename": "usb-storage"
   },
-  "id": "libvirt-26"
+  "id": "libvirt-25"
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 {
@@ -5617,34 +5617,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"
 }

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

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

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

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

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

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

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

 {
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies
index 12c7611891..232896ed8a 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies
@@ -506,7 +506,7 @@

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

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

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

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

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

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

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

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

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

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

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

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

 {
@@ -4023,11 +4023,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"
@@ -4039,11 +4039,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"
@@ -4055,11 +4055,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"
@@ -4071,11 +4071,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"
@@ -4087,11 +4087,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"
@@ -4103,7 +4103,7 @@
   "arguments": {
     "typename": "vfio-pci"
   },
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

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

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

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

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

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

 {
@@ -4424,11 +4424,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"
@@ -4440,7 +4440,7 @@
   "arguments": {
     "typename": "usb-host"
   },
-  "id": "libvirt-22"
+  "id": "libvirt-21"
 }

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

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

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

 {
@@ -4552,11 +4552,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"
@@ -4568,11 +4568,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"
@@ -4584,7 +4584,7 @@
   "arguments": {
     "typename": "usb-storage"
   },
-  "id": "libvirt-26"
+  "id": "libvirt-25"
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 {
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies
index 6dc6a96d8d..3d1d2a3133 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies
@@ -518,7 +518,7 @@

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 {
@@ -3331,11 +3331,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"
@@ -3347,7 +3347,7 @@
   "arguments": {
     "typename": "virtio-balloon-pci"
   },
-  "id": "libvirt-31"
+  "id": "libvirt-30"
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 {
-  "id": "libvirt-43",
+  "id": "libvirt-42",
   "error": {
     "class": "GenericError",
     "desc": "Property '.migratable' not found"
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies
index d9c59b04c7..79958080e3 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies
@@ -515,7 +515,7 @@

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

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

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

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

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

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

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

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

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

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

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

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

 {
@@ -2900,11 +2900,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"
@@ -2916,11 +2916,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"
@@ -2932,11 +2932,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"
@@ -2948,11 +2948,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"
@@ -2964,7 +2964,7 @@
   "arguments": {
     "typename": "kvm-pci-assign"
   },
-  "id": "libvirt-17"
+  "id": "libvirt-16"
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 {
@@ -4538,11 +4538,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"
@@ -4554,7 +4554,7 @@
   "arguments": {
     "typename": "virtio-balloon-device"
   },
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 {
diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies
index c9057fcea3..a9f08ea573 100644
--- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies
@@ -527,7 +527,7 @@

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 {
@@ -3385,11 +3385,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"
@@ -3401,7 +3401,7 @@
   "arguments": {
     "typename": "virtio-balloon-pci"
   },
-  "id": "libvirt-31"
+  "id": "libvirt-30"
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 {
-  "id": "libvirt-44",
+  "id": "libvirt-43",
   "error": {
     "class": "GenericError",
     "desc": "Property '.migratable' not found"
diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies
index 96d03d256d..c21d681d24 100644
--- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies
@@ -524,7 +524,7 @@

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

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

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

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

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

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

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

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

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

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

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

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

 {
@@ -2897,11 +2897,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"
@@ -2913,11 +2913,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"
@@ -2929,11 +2929,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"
@@ -2945,11 +2945,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"
@@ -2961,11 +2961,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"
@@ -2977,7 +2977,7 @@
   "arguments": {
     "typename": "vfio-pci"
   },
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 {
@@ -4494,11 +4494,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"
@@ -4510,7 +4510,7 @@
   "arguments": {
     "typename": "virtio-balloon-device"
   },
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 {
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies
index 17c7b3f34f..85e52dc1d3 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies
@@ -542,7 +542,7 @@

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

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

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

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

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

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

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

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

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

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

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

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

 {
@@ -4225,11 +4225,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"
@@ -4241,11 +4241,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"
@@ -4257,11 +4257,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"
@@ -4273,11 +4273,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"
@@ -4289,11 +4289,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"
@@ -4305,7 +4305,7 @@
   "arguments": {
     "typename": "vfio-pci"
   },
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

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

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

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

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

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

 {
@@ -4645,11 +4645,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"
@@ -4661,7 +4661,7 @@
   "arguments": {
     "typename": "usb-host"
   },
-  "id": "libvirt-22"
+  "id": "libvirt-21"
 }

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

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

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

 {
@@ -4777,11 +4777,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"
@@ -4793,11 +4793,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"
@@ -4809,7 +4809,7 @@
   "arguments": {
     "typename": "usb-storage"
   },
-  "id": "libvirt-26"
+  "id": "libvirt-25"
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 {
@@ -6061,35 +6061,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"
 }

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

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

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

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

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

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

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

 {
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies
index a6365cf43c..e544ae3089 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies
@@ -539,7 +539,7 @@

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

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

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

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

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

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

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

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

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

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

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

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

 {
@@ -4214,11 +4214,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"
@@ -4230,11 +4230,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"
@@ -4246,11 +4246,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"
@@ -4262,11 +4262,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"
@@ -4278,11 +4278,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"
@@ -4294,7 +4294,7 @@
   "arguments": {
     "typename": "vfio-pci"
   },
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

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

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

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

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

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

 {
@@ -4634,11 +4634,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"
@@ -4650,7 +4650,7 @@
   "arguments": {
     "typename": "usb-host"
   },
-  "id": "libvirt-22"
+  "id": "libvirt-21"
 }

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

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

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

 {
@@ -4766,11 +4766,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"
@@ -4782,11 +4782,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"
@@ -4798,7 +4798,7 @@
   "arguments": {
     "typename": "usb-storage"
   },
-  "id": "libvirt-26"
+  "id": "libvirt-25"
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 {
@@ -5555,7 +5555,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-36"
+  "id": "libvirt-35"
 }

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

 {
@@ -5617,7 +5617,7 @@
       "type": "string"
     }
   ],
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

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

 {
@@ -5786,12 +5786,12 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

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

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

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

 {
@@ -8130,35 +8130,35 @@
       "static": false
     }
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

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

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

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

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

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

 {
@@ -9314,12 +9314,12 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-43"
+  "id": "libvirt-42"
 }

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

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

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

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

 {
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies
index ec84f16d31..70456d725c 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies
@@ -551,7 +551,7 @@

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 {
@@ -2994,7 +2994,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

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

 {
@@ -3120,7 +3120,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

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

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

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

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

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

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

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

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

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

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

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

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

 {
@@ -3477,11 +3477,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"
@@ -3493,7 +3493,7 @@
   "arguments": {
     "typename": "virtio-balloon-pci"
   },
-  "id": "libvirt-31"
+  "id": "libvirt-30"
 }

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

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

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

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

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

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

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

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

 {
@@ -3854,7 +3854,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 {
@@ -17139,7 +17139,7 @@
       "name": "host"
     }
   },
-  "id": "libvirt-45"
+  "id": "libvirt-44"
 }

 {
@@ -17177,7 +17177,7 @@
       }
     }
   },
-  "id": "libvirt-45"
+  "id": "libvirt-44"
 }

 {
@@ -17191,11 +17191,11 @@
       }
     }
   },
-  "id": "libvirt-46"
+  "id": "libvirt-45"
 }

 {
-  "id": "libvirt-46",
+  "id": "libvirt-45",
   "error": {
     "class": "GenericError",
     "desc": "Property '.migratable' not found"
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies
index 95e8ef1174..d0a691dab9 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies
@@ -557,7 +557,7 @@

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

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

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

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

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

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

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

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

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

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

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

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

 {
@@ -3072,11 +3072,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"
@@ -3088,11 +3088,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"
@@ -3104,11 +3104,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"
@@ -3120,11 +3120,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"
@@ -3136,11 +3136,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"
@@ -3152,7 +3152,7 @@
   "arguments": {
     "typename": "vfio-pci"
   },
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 {
@@ -4667,11 +4667,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"
@@ -4683,7 +4683,7 @@
   "arguments": {
     "typename": "virtio-balloon-device"
   },
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

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

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

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

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

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

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

 {
@@ -4913,7 +4913,7 @@
       "type": "int32"
     }
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

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

 {
@@ -4975,7 +4975,7 @@
       "type": "string"
     }
   ],
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

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

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

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

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

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

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

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

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

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

 {
@@ -5740,12 +5740,12 @@
     "passthrough",
     "emulator"
   ],
-  "id": "libvirt-46"
+  "id": "libvirt-45"
 }

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

 {
@@ -7032,12 +7032,12 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-47"
+  "id": "libvirt-46"
 }

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

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

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

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

 {
@@ -18483,7 +18483,7 @@
       "name": "host"
     }
   },
-  "id": "libvirt-50"
+  "id": "libvirt-49"
 }

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

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

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

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

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

 {
@@ -19516,7 +19516,7 @@
       }
     }
   },
-  "id": "libvirt-53"
+  "id": "libvirt-52"
 }

 {
@@ -19771,12 +19771,12 @@
       }
     }
   },
-  "id": "libvirt-53"
+  "id": "libvirt-52"
 }

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

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

 {
diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies
index c1a124adf2..8fcec6431a 100644
--- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies
@@ -473,7 +473,7 @@

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

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

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

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

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

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

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

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

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

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

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

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

 {
@@ -2048,11 +2048,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"
@@ -2064,11 +2064,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"
@@ -2080,11 +2080,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"
@@ -2096,11 +2096,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"
@@ -2112,7 +2112,7 @@
   "arguments": {
     "typename": "kvm-pci-assign"
   },
-  "id": "libvirt-17"
+  "id": "libvirt-16"
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 {
@@ -3376,7 +3376,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
@@ -3384,11 +3384,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"
@@ -3400,7 +3400,7 @@
   "arguments": {
     "typename": "virtio-balloon-device"
   },
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

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

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

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

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

 {
@@ -3535,7 +3535,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

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

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

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

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

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

 {
@@ -3806,36 +3806,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"
 }

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

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

 {
@@ -4919,12 +4919,12 @@
       "capability": "x-postcopy-ram"
     }
   ],
-  "id": "libvirt-46"
+  "id": "libvirt-45"
 }

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

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

 {
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies
index ec0cc7e55e..35cbc575f3 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies
@@ -476,7 +476,7 @@

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

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

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

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

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

 {
@@ -2267,7 +2267,7 @@
       "name": "fw-path-provider"
     }
   ],
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

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

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

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

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

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

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

 {
@@ -2807,11 +2807,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"
@@ -2823,11 +2823,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"
@@ -2839,11 +2839,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"
@@ -2855,11 +2855,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"
@@ -2871,11 +2871,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"
@@ -2887,7 +2887,7 @@
   "arguments": {
     "typename": "vfio-pci"
   },
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

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

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

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

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

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

 {
@@ -3151,11 +3151,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"
@@ -3167,7 +3167,7 @@
   "arguments": {
     "typename": "usb-host"
   },
-  "id": "libvirt-22"
+  "id": "libvirt-21"
 }

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

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

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

 {
@@ -3275,11 +3275,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"
@@ -3291,11 +3291,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"
@@ -3307,7 +3307,7 @@
   "arguments": {
     "typename": "usb-storage"
   },
-  "id": "libvirt-26"
+  "id": "libvirt-25"
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 {
@@ -4129,34 +4129,34 @@
       "name": "pxa270"
     }
   ],
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

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

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

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

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

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

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

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

 {
@@ -5167,12 +5167,12 @@
       "capability": "postcopy-ram"
     }
   ],
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

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

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

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

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

 {
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies
index c803001670..d0f8998634 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies
@@ -473,7 +473,7 @@

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

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

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

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

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

 {
@@ -2417,7 +2417,7 @@
       "name": "fw-path-provider"
     }
   ],
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

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

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

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

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

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

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

 {
@@ -2957,11 +2957,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"
@@ -2973,11 +2973,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"
@@ -2989,11 +2989,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"
@@ -3005,11 +3005,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"
@@ -3021,11 +3021,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"
@@ -3037,7 +3037,7 @@
   "arguments": {
     "typename": "vfio-pci"
   },
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

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

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

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

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

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

 {
@@ -3301,11 +3301,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"
@@ -3317,7 +3317,7 @@
   "arguments": {
     "typename": "usb-host"
   },
-  "id": "libvirt-22"
+  "id": "libvirt-21"
 }

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

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

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

 {
@@ -3425,11 +3425,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"
@@ -3441,11 +3441,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"
@@ -3457,7 +3457,7 @@
   "arguments": {
     "typename": "usb-storage"
   },
-  "id": "libvirt-26"
+  "id": "libvirt-25"
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 {
@@ -5433,34 +5433,34 @@
       "name": "MPC8541E_v11"
     }
   ],
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

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

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

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

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

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

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

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

 {
@@ -6466,12 +6466,12 @@
       "capability": "postcopy-ram"
     }
   ],
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }

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

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

 {
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies
index 9733d48be6..db84cdf840 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies
@@ -479,7 +479,7 @@

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

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

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

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

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

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

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

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

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

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

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

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

 {
@@ -2126,11 +2126,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"
@@ -2142,11 +2142,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"
@@ -2158,11 +2158,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"
@@ -2174,11 +2174,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"
@@ -2190,7 +2190,7 @@
   "arguments": {
     "typename": "kvm-pci-assign"
   },
-  "id": "libvirt-17"
+  "id": "libvirt-16"
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 {
@@ -2724,7 +2724,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-24"
+  "id": "libvirt-23"
 }

 {
@@ -2732,7 +2732,7 @@
   "arguments": {
     "typename": "i440FX-pcihost"
   },
-  "id": "libvirt-25"
+  "id": "libvirt-24"
 }

 {
@@ -2770,7 +2770,7 @@
       "type": "child<qemu:memory-region>"
     }
   ],
-  "id": "libvirt-25"
+  "id": "libvirt-24"
 }

 {
@@ -2778,7 +2778,7 @@
   "arguments": {
     "typename": "q35-pcihost"
   },
-  "id": "libvirt-26"
+  "id": "libvirt-25"
 }

 {
@@ -2832,7 +2832,7 @@
       "type": "child<qemu:memory-region>"
     }
   ],
-  "id": "libvirt-26"
+  "id": "libvirt-25"
 }

 {
@@ -2840,7 +2840,7 @@
   "arguments": {
     "typename": "usb-storage"
   },
-  "id": "libvirt-27"
+  "id": "libvirt-26"
 }

 {
@@ -2900,7 +2900,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-27"
+  "id": "libvirt-26"
 }

 {
@@ -2908,7 +2908,7 @@
   "arguments": {
     "typename": "kvm-pit"
   },
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -2922,7 +2922,7 @@
       "type": "LostTickPolicy"
     }
   ],
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -2930,7 +2930,7 @@
   "arguments": {
     "typename": "VGA"
   },
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
@@ -2977,7 +2977,7 @@
       "type": "int32"
     }
   ],
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
@@ -2985,7 +2985,7 @@
   "arguments": {
     "typename": "vmware-svga"
   },
-  "id": "libvirt-30"
+  "id": "libvirt-29"
 }

 {
@@ -3018,7 +3018,7 @@
       "type": "int32"
     }
   ],
-  "id": "libvirt-30"
+  "id": "libvirt-29"
 }

 {
@@ -3026,7 +3026,7 @@
   "arguments": {
     "typename": "qxl"
   },
-  "id": "libvirt-31"
+  "id": "libvirt-30"
 }

 {
@@ -3103,7 +3103,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-31"
+  "id": "libvirt-30"
 }

 {
@@ -3111,7 +3111,7 @@
   "arguments": {
     "typename": "virtio-gpu-pci"
   },
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

 {
@@ -3217,7 +3217,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

 {
@@ -3225,7 +3225,7 @@
   "arguments": {
     "typename": "virtio-gpu-device"
   },
-  "id": "libvirt-33"
+  "id": "libvirt-32"
 }

 {
@@ -3265,7 +3265,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-33"
+  "id": "libvirt-32"
 }

 {
@@ -3273,7 +3273,7 @@
   "arguments": {
     "typename": "ICH9-LPC"
   },
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

 {
@@ -3350,7 +3350,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

 {
@@ -3358,7 +3358,7 @@
   "arguments": {
     "typename": "virtio-balloon-pci"
   },
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
@@ -3458,7 +3458,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
@@ -3466,11 +3466,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"
@@ -3482,7 +3482,7 @@
   "arguments": {
     "typename": "virtio-balloon-device"
   },
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
@@ -3521,7 +3521,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
@@ -3529,7 +3529,7 @@
   "arguments": {
     "typename": "nec-usb-xhci"
   },
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
@@ -3599,7 +3599,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
@@ -3607,7 +3607,7 @@
   "arguments": {
     "typename": "intel-iommu"
   },
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
@@ -3617,7 +3617,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
@@ -3625,7 +3625,7 @@
   "arguments": {
     "typename": "mch"
   },
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
@@ -3651,12 +3651,12 @@
       "type": "pci-devfn"
     }
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
   "execute": "query-machines",
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
@@ -3769,12 +3769,12 @@
       "cpu-max": 255
     }
   ],
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
   "execute": "query-cpu-definitions",
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }

 {
@@ -3864,36 +3864,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"
 }

 {
@@ -4987,12 +4987,12 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-45"
+  "id": "libvirt-44"
 }

 {
   "execute": "query-migrate-capabilities",
-  "id": "libvirt-46"
+  "id": "libvirt-45"
 }

 {
@@ -5026,12 +5026,12 @@
       "capability": "postcopy-ram"
     }
   ],
-  "id": "libvirt-46"
+  "id": "libvirt-45"
 }

 {
   "execute": "query-qmp-schema",
-  "id": "libvirt-47"
+  "id": "libvirt-46"
 }

 {
@@ -13036,7 +13036,7 @@
       "meta-type": "array"
     }
   ],
-  "id": "libvirt-47"
+  "id": "libvirt-46"
 }

 {
diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies
index 621aea5896..81362ae7ad 100644
--- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies
@@ -485,7 +485,7 @@

 {
   "execute": "query-kvm",
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

 {
@@ -493,12 +493,12 @@
     "enabled": true,
     "present": true
   },
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

 {
   "execute": "query-events",
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

 {
@@ -615,12 +615,12 @@
       "name": "ACPI_DEVICE_OST"
     }
   ],
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

 {
   "execute": "qom-list-types",
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

 {
@@ -998,7 +998,7 @@
       "name": "s390-skeys-kvm"
     }
   ],
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

 {
@@ -1006,7 +1006,7 @@
   "arguments": {
     "typename": "virtio-blk-pci"
   },
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

 {
@@ -1191,7 +1191,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

 {
@@ -1199,7 +1199,7 @@
   "arguments": {
     "typename": "virtio-net-pci"
   },
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

 {
@@ -1431,7 +1431,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

 {
@@ -1439,7 +1439,7 @@
   "arguments": {
     "typename": "virtio-scsi-pci"
   },
-  "id": "libvirt-12"
+  "id": "libvirt-11"
 }

 {
@@ -1561,7 +1561,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-12"
+  "id": "libvirt-11"
 }

 {
@@ -1569,7 +1569,7 @@
   "arguments": {
     "typename": "virtio-blk-ccw"
   },
-  "id": "libvirt-13"
+  "id": "libvirt-12"
 }

 {
@@ -1698,7 +1698,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-13"
+  "id": "libvirt-12"
 }

 {
@@ -1706,7 +1706,7 @@
   "arguments": {
     "typename": "virtio-net-ccw"
   },
-  "id": "libvirt-14"
+  "id": "libvirt-13"
 }

 {
@@ -1886,7 +1886,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-14"
+  "id": "libvirt-13"
 }

 {
@@ -1894,7 +1894,7 @@
   "arguments": {
     "typename": "virtio-scsi-ccw"
   },
-  "id": "libvirt-15"
+  "id": "libvirt-14"
 }

 {
@@ -1964,7 +1964,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-15"
+  "id": "libvirt-14"
 }

 {
@@ -1972,11 +1972,11 @@
   "arguments": {
     "typename": "virtio-net-s390"
   },
-  "id": "libvirt-16"
+  "id": "libvirt-15"
 }

 {
-  "id": "libvirt-16",
+  "id": "libvirt-15",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-net-s390' not found"
@@ -1988,11 +1988,11 @@
   "arguments": {
     "typename": "pci-assign"
   },
-  "id": "libvirt-17"
+  "id": "libvirt-16"
 }

 {
-  "id": "libvirt-17",
+  "id": "libvirt-16",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'pci-assign' not found"
@@ -2004,11 +2004,11 @@
   "arguments": {
     "typename": "kvm-pci-assign"
   },
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

 {
-  "id": "libvirt-18",
+  "id": "libvirt-17",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'kvm-pci-assign' not found"
@@ -2020,7 +2020,7 @@
   "arguments": {
     "typename": "vfio-pci"
   },
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -2122,7 +2122,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -2130,7 +2130,7 @@
   "arguments": {
     "typename": "scsi-disk"
   },
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
@@ -2240,7 +2240,7 @@
       "type": "uint64"
     }
   ],
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
@@ -2248,11 +2248,11 @@
   "arguments": {
     "typename": "ide-drive"
   },
-  "id": "libvirt-21"
+  "id": "libvirt-20"
 }

 {
-  "id": "libvirt-21",
+  "id": "libvirt-20",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'ide-drive' not found"
@@ -2264,11 +2264,11 @@
   "arguments": {
     "typename": "PIIX4_PM"
   },
-  "id": "libvirt-22"
+  "id": "libvirt-21"
 }

 {
-  "id": "libvirt-22",
+  "id": "libvirt-21",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'PIIX4_PM' not found"
@@ -2280,11 +2280,11 @@
   "arguments": {
     "typename": "usb-host"
   },
-  "id": "libvirt-23"
+  "id": "libvirt-22"
 }

 {
-  "id": "libvirt-23",
+  "id": "libvirt-22",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'usb-host' not found"
@@ -2296,7 +2296,7 @@
   "arguments": {
     "typename": "scsi-generic"
   },
-  "id": "libvirt-24"
+  "id": "libvirt-23"
 }

 {
@@ -2323,7 +2323,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-24"
+  "id": "libvirt-23"
 }

 {
@@ -2331,11 +2331,11 @@
   "arguments": {
     "typename": "i440FX-pcihost"
   },
-  "id": "libvirt-25"
+  "id": "libvirt-24"
 }

 {
-  "id": "libvirt-25",
+  "id": "libvirt-24",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'i440FX-pcihost' not found"
@@ -2347,11 +2347,11 @@
   "arguments": {
     "typename": "q35-pcihost"
   },
-  "id": "libvirt-26"
+  "id": "libvirt-25"
 }

 {
-  "id": "libvirt-26",
+  "id": "libvirt-25",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'q35-pcihost' not found"
@@ -2363,11 +2363,11 @@
   "arguments": {
     "typename": "kvm-pit"
   },
-  "id": "libvirt-27"
+  "id": "libvirt-26"
 }

 {
-  "id": "libvirt-27",
+  "id": "libvirt-26",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'kvm-pit' not found"
@@ -2379,7 +2379,7 @@
   "arguments": {
     "typename": "virtio-gpu-pci"
   },
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -2479,7 +2479,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -2487,7 +2487,7 @@
   "arguments": {
     "typename": "virtio-gpu-device"
   },
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
@@ -2517,7 +2517,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
@@ -2525,11 +2525,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"
@@ -2541,7 +2541,7 @@
   "arguments": {
     "typename": "virtio-balloon-pci"
   },
-  "id": "libvirt-31"
+  "id": "libvirt-30"
 }

 {
@@ -2645,7 +2645,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-31"
+  "id": "libvirt-30"
 }

 {
@@ -2653,7 +2653,7 @@
   "arguments": {
     "typename": "virtio-balloon-ccw"
   },
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

 {
@@ -2710,7 +2710,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

 {
@@ -2718,7 +2718,7 @@
   "arguments": {
     "typename": "virtio-balloon-device"
   },
-  "id": "libvirt-33"
+  "id": "libvirt-32"
 }

 {
@@ -2757,7 +2757,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-33"
+  "id": "libvirt-32"
 }

 {
@@ -2765,7 +2765,7 @@
   "arguments": {
     "typename": "virtual-css-bridge"
   },
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

 {
@@ -2775,12 +2775,12 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

 {
   "execute": "query-machines",
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
@@ -2813,12 +2813,12 @@
       "cpu-max": 248
     }
   ],
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
   "execute": "query-cpu-definitions",
-  "id": "libvirt-36"
+  "id": "libvirt-35"
 }

 {
@@ -2827,34 +2827,34 @@
       "name": "host"
     }
   ],
-  "id": "libvirt-36"
+  "id": "libvirt-35"
 }

 {
   "execute": "query-tpm-models",
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
   "return": [
   ],
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
   "execute": "query-tpm-types",
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
   "return": [
   ],
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
   "execute": "query-command-line-options",
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
@@ -3790,12 +3790,12 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
   "execute": "query-migrate-capabilities",
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
@@ -3829,12 +3829,12 @@
       "capability": "postcopy-ram"
     }
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
   "execute": "query-qmp-schema",
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
@@ -12190,7 +12190,7 @@
       "meta-type": "object"
     }
   ],
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies
index 4f7be9337f..5de9e0b1ef 100644
--- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies
@@ -488,7 +488,7 @@

 {
   "execute": "query-kvm",
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

 {
@@ -496,12 +496,12 @@
     "enabled": true,
     "present": true
   },
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

 {
   "execute": "query-events",
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

 {
@@ -618,12 +618,12 @@
       "name": "ACPI_DEVICE_OST"
     }
   ],
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

 {
   "execute": "qom-list-types",
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

 {
@@ -1610,7 +1610,7 @@
       "name": "virtio-blk-device"
     }
   ],
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

 {
@@ -1618,7 +1618,7 @@
   "arguments": {
     "typename": "virtio-blk-pci"
   },
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

 {
@@ -1803,7 +1803,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

 {
@@ -1811,7 +1811,7 @@
   "arguments": {
     "typename": "virtio-net-pci"
   },
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

 {
@@ -2043,7 +2043,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

 {
@@ -2051,7 +2051,7 @@
   "arguments": {
     "typename": "virtio-scsi-pci"
   },
-  "id": "libvirt-12"
+  "id": "libvirt-11"
 }

 {
@@ -2173,7 +2173,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-12"
+  "id": "libvirt-11"
 }

 {
@@ -2181,11 +2181,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"
@@ -2197,11 +2197,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"
@@ -2213,11 +2213,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"
@@ -2229,11 +2229,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"
@@ -2245,7 +2245,7 @@
   "arguments": {
     "typename": "kvm-pci-assign"
   },
-  "id": "libvirt-17"
+  "id": "libvirt-16"
 }

 {
@@ -2302,7 +2302,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-17"
+  "id": "libvirt-16"
 }

 {
@@ -2310,7 +2310,7 @@
   "arguments": {
     "typename": "vfio-pci"
   },
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

 {
@@ -2412,7 +2412,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

 {
@@ -2420,7 +2420,7 @@
   "arguments": {
     "typename": "scsi-disk"
   },
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -2530,7 +2530,7 @@
       "type": "uint64"
     }
   ],
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -2538,7 +2538,7 @@
   "arguments": {
     "typename": "ide-drive"
   },
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
@@ -2610,7 +2610,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
@@ -2618,7 +2618,7 @@
   "arguments": {
     "typename": "PIIX4_PM"
   },
-  "id": "libvirt-21"
+  "id": "libvirt-20"
 }

 {
@@ -2676,7 +2676,7 @@
       "type": "int32"
     }
   ],
-  "id": "libvirt-21"
+  "id": "libvirt-20"
 }

 {
@@ -2684,7 +2684,7 @@
   "arguments": {
     "typename": "usb-redir"
   },
-  "id": "libvirt-22"
+  "id": "libvirt-21"
 }

 {
@@ -2733,7 +2733,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-22"
+  "id": "libvirt-21"
 }

 {
@@ -2741,7 +2741,7 @@
   "arguments": {
     "typename": "usb-host"
   },
-  "id": "libvirt-23"
+  "id": "libvirt-22"
 }

 {
@@ -2810,7 +2810,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-23"
+  "id": "libvirt-22"
 }

 {
@@ -2818,7 +2818,7 @@
   "arguments": {
     "typename": "scsi-generic"
   },
-  "id": "libvirt-24"
+  "id": "libvirt-23"
 }

 {
@@ -2845,7 +2845,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-24"
+  "id": "libvirt-23"
 }

 {
@@ -2853,7 +2853,7 @@
   "arguments": {
     "typename": "i440FX-pcihost"
   },
-  "id": "libvirt-25"
+  "id": "libvirt-24"
 }

 {
@@ -2891,7 +2891,7 @@
       "type": "child<qemu:memory-region>"
     }
   ],
-  "id": "libvirt-25"
+  "id": "libvirt-24"
 }

 {
@@ -2899,7 +2899,7 @@
   "arguments": {
     "typename": "q35-pcihost"
   },
-  "id": "libvirt-26"
+  "id": "libvirt-25"
 }

 {
@@ -2977,7 +2977,7 @@
       "type": "int"
     }
   ],
-  "id": "libvirt-26"
+  "id": "libvirt-25"
 }

 {
@@ -2985,7 +2985,7 @@
   "arguments": {
     "typename": "usb-storage"
   },
-  "id": "libvirt-27"
+  "id": "libvirt-26"
 }

 {
@@ -3054,7 +3054,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-27"
+  "id": "libvirt-26"
 }

 {
@@ -3062,7 +3062,7 @@
   "arguments": {
     "typename": "kvm-pit"
   },
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -3076,7 +3076,7 @@
       "type": "LostTickPolicy"
     }
   ],
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -3084,7 +3084,7 @@
   "arguments": {
     "typename": "VGA"
   },
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
@@ -3136,7 +3136,7 @@
       "type": "int32"
     }
   ],
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
@@ -3144,7 +3144,7 @@
   "arguments": {
     "typename": "vmware-svga"
   },
-  "id": "libvirt-30"
+  "id": "libvirt-29"
 }

 {
@@ -3182,7 +3182,7 @@
       "type": "int32"
     }
   ],
-  "id": "libvirt-30"
+  "id": "libvirt-29"
 }

 {
@@ -3190,7 +3190,7 @@
   "arguments": {
     "typename": "qxl"
   },
-  "id": "libvirt-31"
+  "id": "libvirt-30"
 }

 {
@@ -3272,7 +3272,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-31"
+  "id": "libvirt-30"
 }

 {
@@ -3280,7 +3280,7 @@
   "arguments": {
     "typename": "virtio-gpu-pci"
   },
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

 {
@@ -3390,7 +3390,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

 {
@@ -3398,7 +3398,7 @@
   "arguments": {
     "typename": "virtio-gpu-device"
   },
-  "id": "libvirt-33"
+  "id": "libvirt-32"
 }

 {
@@ -3438,7 +3438,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-33"
+  "id": "libvirt-32"
 }

 {
@@ -3446,7 +3446,7 @@
   "arguments": {
     "typename": "ICH9-LPC"
   },
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

 {
@@ -3532,7 +3532,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

 {
@@ -3540,7 +3540,7 @@
   "arguments": {
     "typename": "virtio-balloon-pci"
   },
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
@@ -3644,7 +3644,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
@@ -3652,11 +3652,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"
@@ -3668,7 +3668,7 @@
   "arguments": {
     "typename": "virtio-balloon-device"
   },
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
@@ -3707,7 +3707,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
@@ -3715,7 +3715,7 @@
   "arguments": {
     "typename": "nec-usb-xhci"
   },
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
@@ -3790,7 +3790,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
@@ -3798,7 +3798,7 @@
   "arguments": {
     "typename": "intel-iommu"
   },
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
@@ -3812,7 +3812,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
@@ -3820,7 +3820,7 @@
   "arguments": {
     "typename": "mch"
   },
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
@@ -3846,12 +3846,12 @@
       "type": "pci-devfn"
     }
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
   "execute": "query-machines",
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
@@ -4000,12 +4000,12 @@
       "cpu-max": 255
     }
   ],
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
   "execute": "query-cpu-definitions",
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }

 {
@@ -4098,36 +4098,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"
 }

 {
@@ -5225,12 +5225,12 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-45"
+  "id": "libvirt-44"
 }

 {
   "execute": "query-migrate-capabilities",
-  "id": "libvirt-46"
+  "id": "libvirt-45"
 }

 {
@@ -5264,12 +5264,12 @@
       "capability": "postcopy-ram"
     }
   ],
-  "id": "libvirt-46"
+  "id": "libvirt-45"
 }

 {
   "execute": "query-qmp-schema",
-  "id": "libvirt-47"
+  "id": "libvirt-46"
 }

 {
@@ -13625,7 +13625,7 @@
       "meta-type": "object"
     }
   ],
-  "id": "libvirt-47"
+  "id": "libvirt-46"
 }

 {
diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies
index 52de79df75..ca6be2b1a6 100644
--- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies
@@ -497,7 +497,7 @@

 {
   "execute": "query-kvm",
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

 {
@@ -505,12 +505,12 @@
     "enabled": true,
     "present": true
   },
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

 {
   "execute": "query-events",
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

 {
@@ -627,12 +627,12 @@
       "name": "ACPI_DEVICE_OST"
     }
   ],
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

 {
   "execute": "qom-list-types",
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

 {
@@ -1238,7 +1238,7 @@
       "name": "virtio-blk-device"
     }
   ],
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

 {
@@ -1246,7 +1246,7 @@
   "arguments": {
     "typename": "virtio-blk-pci"
   },
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

 {
@@ -1436,7 +1436,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

 {
@@ -1444,7 +1444,7 @@
   "arguments": {
     "typename": "virtio-net-pci"
   },
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

 {
@@ -1685,7 +1685,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

 {
@@ -1693,7 +1693,7 @@
   "arguments": {
     "typename": "virtio-scsi-pci"
   },
-  "id": "libvirt-12"
+  "id": "libvirt-11"
 }

 {
@@ -1820,7 +1820,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-12"
+  "id": "libvirt-11"
 }

 {
@@ -1828,7 +1828,7 @@
   "arguments": {
     "typename": "virtio-blk-ccw"
   },
-  "id": "libvirt-13"
+  "id": "libvirt-12"
 }

 {
@@ -1957,7 +1957,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-13"
+  "id": "libvirt-12"
 }

 {
@@ -1965,7 +1965,7 @@
   "arguments": {
     "typename": "virtio-net-ccw"
   },
-  "id": "libvirt-14"
+  "id": "libvirt-13"
 }

 {
@@ -2149,7 +2149,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-14"
+  "id": "libvirt-13"
 }

 {
@@ -2157,7 +2157,7 @@
   "arguments": {
     "typename": "virtio-scsi-ccw"
   },
-  "id": "libvirt-15"
+  "id": "libvirt-14"
 }

 {
@@ -2227,7 +2227,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-15"
+  "id": "libvirt-14"
 }

 {
@@ -2235,11 +2235,11 @@
   "arguments": {
     "typename": "virtio-net-s390"
   },
-  "id": "libvirt-16"
+  "id": "libvirt-15"
 }

 {
-  "id": "libvirt-16",
+  "id": "libvirt-15",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-net-s390' not found"
@@ -2251,11 +2251,11 @@
   "arguments": {
     "typename": "pci-assign"
   },
-  "id": "libvirt-17"
+  "id": "libvirt-16"
 }

 {
-  "id": "libvirt-17",
+  "id": "libvirt-16",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'pci-assign' not found"
@@ -2267,11 +2267,11 @@
   "arguments": {
     "typename": "kvm-pci-assign"
   },
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

 {
-  "id": "libvirt-18",
+  "id": "libvirt-17",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'kvm-pci-assign' not found"
@@ -2283,7 +2283,7 @@
   "arguments": {
     "typename": "vfio-pci"
   },
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -2385,7 +2385,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -2393,7 +2393,7 @@
   "arguments": {
     "typename": "scsi-disk"
   },
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
@@ -2503,7 +2503,7 @@
       "type": "uint64"
     }
   ],
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
@@ -2511,11 +2511,11 @@
   "arguments": {
     "typename": "ide-drive"
   },
-  "id": "libvirt-21"
+  "id": "libvirt-20"
 }

 {
-  "id": "libvirt-21",
+  "id": "libvirt-20",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'ide-drive' not found"
@@ -2527,11 +2527,11 @@
   "arguments": {
     "typename": "PIIX4_PM"
   },
-  "id": "libvirt-22"
+  "id": "libvirt-21"
 }

 {
-  "id": "libvirt-22",
+  "id": "libvirt-21",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'PIIX4_PM' not found"
@@ -2543,11 +2543,11 @@
   "arguments": {
     "typename": "usb-host"
   },
-  "id": "libvirt-23"
+  "id": "libvirt-22"
 }

 {
-  "id": "libvirt-23",
+  "id": "libvirt-22",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'usb-host' not found"
@@ -2559,7 +2559,7 @@
   "arguments": {
     "typename": "scsi-generic"
   },
-  "id": "libvirt-24"
+  "id": "libvirt-23"
 }

 {
@@ -2586,7 +2586,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-24"
+  "id": "libvirt-23"
 }

 {
@@ -2594,11 +2594,11 @@
   "arguments": {
     "typename": "i440FX-pcihost"
   },
-  "id": "libvirt-25"
+  "id": "libvirt-24"
 }

 {
-  "id": "libvirt-25",
+  "id": "libvirt-24",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'i440FX-pcihost' not found"
@@ -2610,11 +2610,11 @@
   "arguments": {
     "typename": "q35-pcihost"
   },
-  "id": "libvirt-26"
+  "id": "libvirt-25"
 }

 {
-  "id": "libvirt-26",
+  "id": "libvirt-25",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'q35-pcihost' not found"
@@ -2626,11 +2626,11 @@
   "arguments": {
     "typename": "kvm-pit"
   },
-  "id": "libvirt-27"
+  "id": "libvirt-26"
 }

 {
-  "id": "libvirt-27",
+  "id": "libvirt-26",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'kvm-pit' not found"
@@ -2642,7 +2642,7 @@
   "arguments": {
     "typename": "virtio-gpu-pci"
   },
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -2747,7 +2747,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -2755,7 +2755,7 @@
   "arguments": {
     "typename": "virtio-gpu-device"
   },
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
@@ -2785,7 +2785,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
@@ -2793,11 +2793,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"
@@ -2809,7 +2809,7 @@
   "arguments": {
     "typename": "virtio-balloon-pci"
   },
-  "id": "libvirt-31"
+  "id": "libvirt-30"
 }

 {
@@ -2918,7 +2918,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-31"
+  "id": "libvirt-30"
 }

 {
@@ -2926,7 +2926,7 @@
   "arguments": {
     "typename": "virtio-balloon-ccw"
   },
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

 {
@@ -2983,7 +2983,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

 {
@@ -2991,7 +2991,7 @@
   "arguments": {
     "typename": "virtio-balloon-device"
   },
-  "id": "libvirt-33"
+  "id": "libvirt-32"
 }

 {
@@ -3030,7 +3030,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-33"
+  "id": "libvirt-32"
 }

 {
@@ -3038,7 +3038,7 @@
   "arguments": {
     "typename": "virtual-css-bridge"
   },
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

 {
@@ -3048,12 +3048,12 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

 {
   "execute": "query-machines",
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
@@ -3091,12 +3091,12 @@
       "alias": "s390-ccw-virtio"
     }
   ],
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
   "execute": "query-cpu-definitions",
-  "id": "libvirt-36"
+  "id": "libvirt-35"
 }

 {
@@ -3422,34 +3422,34 @@
       "migration-safe": true
     }
   ],
-  "id": "libvirt-36"
+  "id": "libvirt-35"
 }

 {
   "execute": "query-tpm-models",
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
   "return": [
   ],
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
   "execute": "query-tpm-types",
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
   "return": [
   ],
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
   "execute": "query-command-line-options",
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
@@ -4410,12 +4410,12 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
   "execute": "query-migrate-capabilities",
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
@@ -4453,12 +4453,12 @@
       "capability": "x-colo"
     }
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
   "execute": "query-qmp-schema",
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
@@ -13228,7 +13228,7 @@
       "meta-type": "object"
     }
   ],
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
@@ -13239,7 +13239,7 @@
       "name": "host"
     }
   },
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }

 {
@@ -13265,7 +13265,7 @@
       }
     }
   },
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }

 {
@@ -13279,11 +13279,11 @@
       }
     }
   },
-  "id": "libvirt-43"
+  "id": "libvirt-42"
 }

 {
-  "id": "libvirt-43",
+  "id": "libvirt-42",
   "error": {
     "class": "GenericError",
     "desc": "Property '.migratable' not found"
diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies
index e0783e7e7e..cb87874dfc 100644
--- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies
@@ -491,7 +491,7 @@

 {
   "execute": "query-kvm",
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

 {
@@ -499,12 +499,12 @@
     "enabled": true,
     "present": true
   },
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

 {
   "execute": "query-events",
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

 {
@@ -621,12 +621,12 @@
       "name": "ACPI_DEVICE_OST"
     }
   ],
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

 {
   "execute": "qom-list-types",
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

 {
@@ -1694,7 +1694,7 @@
       "name": "virtio-blk-device"
     }
   ],
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

 {
@@ -1702,7 +1702,7 @@
   "arguments": {
     "typename": "virtio-blk-pci"
   },
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

 {
@@ -1896,7 +1896,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

 {
@@ -1904,7 +1904,7 @@
   "arguments": {
     "typename": "virtio-net-pci"
   },
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

 {
@@ -2149,7 +2149,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

 {
@@ -2157,7 +2157,7 @@
   "arguments": {
     "typename": "virtio-scsi-pci"
   },
-  "id": "libvirt-12"
+  "id": "libvirt-11"
 }

 {
@@ -2288,7 +2288,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-12"
+  "id": "libvirt-11"
 }

 {
@@ -2296,11 +2296,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"
@@ -2312,11 +2312,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"
@@ -2328,11 +2328,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"
@@ -2344,11 +2344,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"
@@ -2360,7 +2360,7 @@
   "arguments": {
     "typename": "kvm-pci-assign"
   },
-  "id": "libvirt-17"
+  "id": "libvirt-16"
 }

 {
@@ -2417,7 +2417,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-17"
+  "id": "libvirt-16"
 }

 {
@@ -2425,7 +2425,7 @@
   "arguments": {
     "typename": "vfio-pci"
   },
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

 {
@@ -2527,7 +2527,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

 {
@@ -2535,7 +2535,7 @@
   "arguments": {
     "typename": "scsi-disk"
   },
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -2645,7 +2645,7 @@
       "type": "uint64"
     }
   ],
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -2653,7 +2653,7 @@
   "arguments": {
     "typename": "ide-drive"
   },
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
@@ -2725,7 +2725,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
@@ -2733,7 +2733,7 @@
   "arguments": {
     "typename": "PIIX4_PM"
   },
-  "id": "libvirt-21"
+  "id": "libvirt-20"
 }

 {
@@ -2791,7 +2791,7 @@
       "type": "int32"
     }
   ],
-  "id": "libvirt-21"
+  "id": "libvirt-20"
 }

 {
@@ -2799,7 +2799,7 @@
   "arguments": {
     "typename": "usb-redir"
   },
-  "id": "libvirt-22"
+  "id": "libvirt-21"
 }

 {
@@ -2848,7 +2848,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-22"
+  "id": "libvirt-21"
 }

 {
@@ -2856,7 +2856,7 @@
   "arguments": {
     "typename": "usb-host"
   },
-  "id": "libvirt-23"
+  "id": "libvirt-22"
 }

 {
@@ -2925,7 +2925,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-23"
+  "id": "libvirt-22"
 }

 {
@@ -2933,7 +2933,7 @@
   "arguments": {
     "typename": "scsi-generic"
   },
-  "id": "libvirt-24"
+  "id": "libvirt-23"
 }

 {
@@ -2960,7 +2960,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-24"
+  "id": "libvirt-23"
 }

 {
@@ -2968,7 +2968,7 @@
   "arguments": {
     "typename": "i440FX-pcihost"
   },
-  "id": "libvirt-25"
+  "id": "libvirt-24"
 }

 {
@@ -3006,7 +3006,7 @@
       "type": "child<qemu:memory-region>"
     }
   ],
-  "id": "libvirt-25"
+  "id": "libvirt-24"
 }

 {
@@ -3014,7 +3014,7 @@
   "arguments": {
     "typename": "q35-pcihost"
   },
-  "id": "libvirt-26"
+  "id": "libvirt-25"
 }

 {
@@ -3092,7 +3092,7 @@
       "type": "int"
     }
   ],
-  "id": "libvirt-26"
+  "id": "libvirt-25"
 }

 {
@@ -3100,7 +3100,7 @@
   "arguments": {
     "typename": "usb-storage"
   },
-  "id": "libvirt-27"
+  "id": "libvirt-26"
 }

 {
@@ -3169,7 +3169,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-27"
+  "id": "libvirt-26"
 }

 {
@@ -3177,7 +3177,7 @@
   "arguments": {
     "typename": "kvm-pit"
   },
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -3191,7 +3191,7 @@
       "type": "LostTickPolicy"
     }
   ],
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -3199,7 +3199,7 @@
   "arguments": {
     "typename": "VGA"
   },
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
@@ -3251,7 +3251,7 @@
       "type": "int32"
     }
   ],
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
@@ -3259,7 +3259,7 @@
   "arguments": {
     "typename": "vmware-svga"
   },
-  "id": "libvirt-30"
+  "id": "libvirt-29"
 }

 {
@@ -3297,7 +3297,7 @@
       "type": "int32"
     }
   ],
-  "id": "libvirt-30"
+  "id": "libvirt-29"
 }

 {
@@ -3305,7 +3305,7 @@
   "arguments": {
     "typename": "qxl"
   },
-  "id": "libvirt-31"
+  "id": "libvirt-30"
 }

 {
@@ -3387,7 +3387,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-31"
+  "id": "libvirt-30"
 }

 {
@@ -3395,7 +3395,7 @@
   "arguments": {
     "typename": "virtio-gpu-pci"
   },
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

 {
@@ -3514,7 +3514,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

 {
@@ -3522,7 +3522,7 @@
   "arguments": {
     "typename": "virtio-gpu-device"
   },
-  "id": "libvirt-33"
+  "id": "libvirt-32"
 }

 {
@@ -3562,7 +3562,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-33"
+  "id": "libvirt-32"
 }

 {
@@ -3570,7 +3570,7 @@
   "arguments": {
     "typename": "ICH9-LPC"
   },
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

 {
@@ -3656,7 +3656,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

 {
@@ -3664,7 +3664,7 @@
   "arguments": {
     "typename": "virtio-balloon-pci"
   },
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
@@ -3777,7 +3777,7 @@
       "type": "guest statistics"
     }
   ],
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
@@ -3785,11 +3785,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"
@@ -3801,7 +3801,7 @@
   "arguments": {
     "typename": "virtio-balloon-device"
   },
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
@@ -3840,7 +3840,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
@@ -3848,7 +3848,7 @@
   "arguments": {
     "typename": "nec-usb-xhci"
   },
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
@@ -3923,7 +3923,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
@@ -3931,7 +3931,7 @@
   "arguments": {
     "typename": "intel-iommu"
   },
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
@@ -3954,7 +3954,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
@@ -3962,7 +3962,7 @@
   "arguments": {
     "typename": "mch"
   },
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
@@ -3988,12 +3988,12 @@
       "type": "pci-devfn"
     }
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
   "execute": "query-machines",
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
@@ -4162,12 +4162,12 @@
       "cpu-max": 255
     }
   ],
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
   "execute": "query-cpu-definitions",
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }

 {
@@ -4373,36 +4373,36 @@
       "static": false
     }
   ],
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }

 {
   "execute": "query-tpm-models",
-  "id": "libvirt-43"
+  "id": "libvirt-42"
 }

 {
   "return": [
     "tpm-tis"
   ],
-  "id": "libvirt-43"
+  "id": "libvirt-42"
 }

 {
   "execute": "query-tpm-types",
-  "id": "libvirt-44"
+  "id": "libvirt-43"
 }

 {
   "return": [
     "passthrough"
   ],
-  "id": "libvirt-44"
+  "id": "libvirt-43"
 }

 {
   "execute": "query-command-line-options",
-  "id": "libvirt-45"
+  "id": "libvirt-44"
 }

 {
@@ -5525,12 +5525,12 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-45"
+  "id": "libvirt-44"
 }

 {
   "execute": "query-migrate-capabilities",
-  "id": "libvirt-46"
+  "id": "libvirt-45"
 }

 {
@@ -5568,12 +5568,12 @@
       "capability": "x-colo"
     }
   ],
-  "id": "libvirt-46"
+  "id": "libvirt-45"
 }

 {
   "execute": "query-qmp-schema",
-  "id": "libvirt-47"
+  "id": "libvirt-46"
 }

 {
@@ -14343,7 +14343,7 @@
       "meta-type": "object"
     }
   ],
-  "id": "libvirt-47"
+  "id": "libvirt-46"
 }

 {
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies
index 53a3c0a580..b2e224725c 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies
@@ -497,7 +497,7 @@

 {
   "execute": "query-kvm",
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

 {
@@ -505,12 +505,12 @@
     "enabled": true,
     "present": true
   },
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

 {
   "execute": "query-events",
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

 {
@@ -627,12 +627,12 @@
       "name": "ACPI_DEVICE_OST"
     }
   ],
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

 {
   "execute": "qom-list-types",
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

 {
@@ -2582,7 +2582,7 @@
       "name": "7457A_v1.2-powerpc64-cpu"
     }
   ],
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

 {
@@ -2590,7 +2590,7 @@
   "arguments": {
     "typename": "virtio-blk-pci"
   },
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

 {
@@ -2818,7 +2818,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

 {
@@ -2826,7 +2826,7 @@
   "arguments": {
     "typename": "virtio-net-pci"
   },
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

 {
@@ -3105,7 +3105,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

 {
@@ -3113,7 +3113,7 @@
   "arguments": {
     "typename": "virtio-scsi-pci"
   },
-  "id": "libvirt-12"
+  "id": "libvirt-11"
 }

 {
@@ -3274,7 +3274,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-12"
+  "id": "libvirt-11"
 }

 {
@@ -3282,11 +3282,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"
@@ -3298,11 +3298,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"
@@ -3314,11 +3314,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"
@@ -3330,11 +3330,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"
@@ -3346,11 +3346,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"
@@ -3362,7 +3362,7 @@
   "arguments": {
     "typename": "vfio-pci"
   },
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

 {
@@ -3469,7 +3469,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

 {
@@ -3477,7 +3477,7 @@
   "arguments": {
     "typename": "scsi-disk"
   },
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -3591,7 +3591,7 @@
       "type": "uint64"
     }
   ],
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -3599,7 +3599,7 @@
   "arguments": {
     "typename": "ide-drive"
   },
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
@@ -3675,7 +3675,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
@@ -3683,11 +3683,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"
@@ -3699,11 +3699,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"
@@ -3715,7 +3715,7 @@
   "arguments": {
     "typename": "scsi-generic"
   },
-  "id": "libvirt-23"
+  "id": "libvirt-22"
 }

 {
@@ -3742,7 +3742,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-23"
+  "id": "libvirt-22"
 }

 {
@@ -3750,11 +3750,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"
@@ -3766,11 +3766,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"
@@ -3782,7 +3782,7 @@
   "arguments": {
     "typename": "usb-storage"
   },
-  "id": "libvirt-26"
+  "id": "libvirt-25"
 }

 {
@@ -3855,7 +3855,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-26"
+  "id": "libvirt-25"
 }

 {
@@ -3863,11 +3863,11 @@
   "arguments": {
     "typename": "kvm-pit"
   },
-  "id": "libvirt-27"
+  "id": "libvirt-26"
 }

 {
-  "id": "libvirt-27",
+  "id": "libvirt-26",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'kvm-pit' not found"
@@ -3879,7 +3879,7 @@
   "arguments": {
     "typename": "VGA"
   },
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -3936,7 +3936,7 @@
       "type": "int32"
     }
   ],
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -3944,7 +3944,7 @@
   "arguments": {
     "typename": "virtio-gpu-pci"
   },
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
@@ -4087,7 +4087,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
@@ -4095,7 +4095,7 @@
   "arguments": {
     "typename": "virtio-gpu-device"
   },
-  "id": "libvirt-30"
+  "id": "libvirt-29"
 }

 {
@@ -4134,7 +4134,7 @@
       "type": "size"
     }
   ],
-  "id": "libvirt-30"
+  "id": "libvirt-29"
 }

 {
@@ -4142,11 +4142,11 @@
   "arguments": {
     "typename": "ICH9-LPC"
   },
-  "id": "libvirt-31"
+  "id": "libvirt-30"
 }

 {
-  "id": "libvirt-31",
+  "id": "libvirt-30",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'ICH9-LPC' not found"
@@ -4158,7 +4158,7 @@
   "arguments": {
     "typename": "virtio-balloon-pci"
   },
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

 {
@@ -4301,7 +4301,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

 {
@@ -4309,11 +4309,11 @@
   "arguments": {
     "typename": "virtio-balloon-ccw"
   },
-  "id": "libvirt-33"
+  "id": "libvirt-32"
 }

 {
-  "id": "libvirt-33",
+  "id": "libvirt-32",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-balloon-ccw' not found"
@@ -4325,7 +4325,7 @@
   "arguments": {
     "typename": "virtio-balloon-device"
   },
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

 {
@@ -4369,7 +4369,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

 {
@@ -4377,7 +4377,7 @@
   "arguments": {
     "typename": "nec-usb-xhci"
   },
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
@@ -4457,7 +4457,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
@@ -4465,7 +4465,7 @@
   "arguments": {
     "typename": "spapr-pci-host-bridge"
   },
-  "id": "libvirt-36"
+  "id": "libvirt-35"
 }

 {
@@ -4551,12 +4551,12 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-36"
+  "id": "libvirt-35"
 }

 {
   "execute": "query-machines",
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
@@ -4669,12 +4669,12 @@
       "cpu-max": 1
     }
   ],
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
   "execute": "query-cpu-definitions",
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
@@ -6850,34 +6850,34 @@
       "static": false
     }
   ],
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
   "execute": "query-tpm-models",
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
   "return": [
   ],
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
   "execute": "query-tpm-types",
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
   "return": [
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
   "execute": "query-command-line-options",
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
@@ -7987,12 +7987,12 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
   "execute": "query-migrate-capabilities",
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }

 {
@@ -8034,12 +8034,12 @@
       "capability": "release-ram"
     }
   ],
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }

 {
   "execute": "query-qmp-schema",
-  "id": "libvirt-43"
+  "id": "libvirt-42"
 }

 {
@@ -17325,7 +17325,7 @@
       "meta-type": "object"
     }
   ],
-  "id": "libvirt-43"
+  "id": "libvirt-42"
 }

 {
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies
index 5c28c38ccd..5e2b4518fa 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies
@@ -509,7 +509,7 @@

 {
   "execute": "query-kvm",
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

 {
@@ -517,12 +517,12 @@
     "enabled": true,
     "present": true
   },
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

 {
   "execute": "query-events",
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

 {
@@ -639,12 +639,12 @@
       "name": "ACPI_DEVICE_OST"
     }
   ],
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

 {
   "execute": "qom-list-types",
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

 {
@@ -1286,7 +1286,7 @@
       "name": "virtio-blk-device"
     }
   ],
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

 {
@@ -1294,7 +1294,7 @@
   "arguments": {
     "typename": "virtio-blk-pci"
   },
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

 {
@@ -1522,7 +1522,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

 {
@@ -1530,7 +1530,7 @@
   "arguments": {
     "typename": "virtio-net-pci"
   },
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

 {
@@ -1809,7 +1809,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

 {
@@ -1817,7 +1817,7 @@
   "arguments": {
     "typename": "virtio-scsi-pci"
   },
-  "id": "libvirt-12"
+  "id": "libvirt-11"
 }

 {
@@ -1978,7 +1978,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-12"
+  "id": "libvirt-11"
 }

 {
@@ -1986,7 +1986,7 @@
   "arguments": {
     "typename": "virtio-blk-ccw"
   },
-  "id": "libvirt-13"
+  "id": "libvirt-12"
 }

 {
@@ -2124,7 +2124,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-13"
+  "id": "libvirt-12"
 }

 {
@@ -2132,7 +2132,7 @@
   "arguments": {
     "typename": "virtio-net-ccw"
   },
-  "id": "libvirt-14"
+  "id": "libvirt-13"
 }

 {
@@ -2325,7 +2325,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-14"
+  "id": "libvirt-13"
 }

 {
@@ -2333,7 +2333,7 @@
   "arguments": {
     "typename": "virtio-scsi-ccw"
   },
-  "id": "libvirt-15"
+  "id": "libvirt-14"
 }

 {
@@ -2408,7 +2408,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-15"
+  "id": "libvirt-14"
 }

 {
@@ -2416,11 +2416,11 @@
   "arguments": {
     "typename": "virtio-net-s390"
   },
-  "id": "libvirt-16"
+  "id": "libvirt-15"
 }

 {
-  "id": "libvirt-16",
+  "id": "libvirt-15",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-net-s390' not found"
@@ -2432,11 +2432,11 @@
   "arguments": {
     "typename": "pci-assign"
   },
-  "id": "libvirt-17"
+  "id": "libvirt-16"
 }

 {
-  "id": "libvirt-17",
+  "id": "libvirt-16",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'pci-assign' not found"
@@ -2448,11 +2448,11 @@
   "arguments": {
     "typename": "kvm-pci-assign"
   },
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

 {
-  "id": "libvirt-18",
+  "id": "libvirt-17",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'kvm-pci-assign' not found"
@@ -2464,7 +2464,7 @@
   "arguments": {
     "typename": "vfio-pci"
   },
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -2571,7 +2571,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -2579,7 +2579,7 @@
   "arguments": {
     "typename": "scsi-disk"
   },
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
@@ -2693,7 +2693,7 @@
       "type": "uint64"
     }
   ],
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
@@ -2701,11 +2701,11 @@
   "arguments": {
     "typename": "ide-drive"
   },
-  "id": "libvirt-21"
+  "id": "libvirt-20"
 }

 {
-  "id": "libvirt-21",
+  "id": "libvirt-20",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'ide-drive' not found"
@@ -2717,11 +2717,11 @@
   "arguments": {
     "typename": "PIIX4_PM"
   },
-  "id": "libvirt-22"
+  "id": "libvirt-21"
 }

 {
-  "id": "libvirt-22",
+  "id": "libvirt-21",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'PIIX4_PM' not found"
@@ -2733,11 +2733,11 @@
   "arguments": {
     "typename": "usb-host"
   },
-  "id": "libvirt-23"
+  "id": "libvirt-22"
 }

 {
-  "id": "libvirt-23",
+  "id": "libvirt-22",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'usb-host' not found"
@@ -2749,7 +2749,7 @@
   "arguments": {
     "typename": "scsi-generic"
   },
-  "id": "libvirt-24"
+  "id": "libvirt-23"
 }

 {
@@ -2776,7 +2776,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-24"
+  "id": "libvirt-23"
 }

 {
@@ -2784,11 +2784,11 @@
   "arguments": {
     "typename": "i440FX-pcihost"
   },
-  "id": "libvirt-25"
+  "id": "libvirt-24"
 }

 {
-  "id": "libvirt-25",
+  "id": "libvirt-24",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'i440FX-pcihost' not found"
@@ -2800,11 +2800,11 @@
   "arguments": {
     "typename": "q35-pcihost"
   },
-  "id": "libvirt-26"
+  "id": "libvirt-25"
 }

 {
-  "id": "libvirt-26",
+  "id": "libvirt-25",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'q35-pcihost' not found"
@@ -2816,11 +2816,11 @@
   "arguments": {
     "typename": "kvm-pit"
   },
-  "id": "libvirt-27"
+  "id": "libvirt-26"
 }

 {
-  "id": "libvirt-27",
+  "id": "libvirt-26",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'kvm-pit' not found"
@@ -2832,7 +2832,7 @@
   "arguments": {
     "typename": "virtio-gpu-pci"
   },
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -2975,7 +2975,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -2983,7 +2983,7 @@
   "arguments": {
     "typename": "virtio-gpu-device"
   },
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
@@ -3022,7 +3022,7 @@
       "type": "size"
     }
   ],
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
@@ -3030,11 +3030,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"
@@ -3046,7 +3046,7 @@
   "arguments": {
     "typename": "virtio-balloon-pci"
   },
-  "id": "libvirt-31"
+  "id": "libvirt-30"
 }

 {
@@ -3189,7 +3189,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-31"
+  "id": "libvirt-30"
 }

 {
@@ -3197,7 +3197,7 @@
   "arguments": {
     "typename": "virtio-balloon-ccw"
   },
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

 {
@@ -3259,7 +3259,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

 {
@@ -3267,7 +3267,7 @@
   "arguments": {
     "typename": "virtio-balloon-device"
   },
-  "id": "libvirt-33"
+  "id": "libvirt-32"
 }

 {
@@ -3311,7 +3311,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-33"
+  "id": "libvirt-32"
 }

 {
@@ -3319,7 +3319,7 @@
   "arguments": {
     "typename": "virtual-css-bridge"
   },
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

 {
@@ -3329,12 +3329,12 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

 {
   "execute": "query-machines",
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
@@ -3377,12 +3377,12 @@
       "cpu-max": 248
     }
   ],
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
   "execute": "query-cpu-definitions",
-  "id": "libvirt-36"
+  "id": "libvirt-35"
 }

 {
@@ -3772,34 +3772,34 @@
       "migration-safe": true
     }
   ],
-  "id": "libvirt-36"
+  "id": "libvirt-35"
 }

 {
   "execute": "query-tpm-models",
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
   "return": [
   ],
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
   "execute": "query-tpm-types",
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
   "return": [
   ],
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
   "execute": "query-command-line-options",
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
@@ -4874,12 +4874,12 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
   "execute": "query-migrate-capabilities",
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
@@ -4921,12 +4921,12 @@
       "capability": "release-ram"
     }
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
   "execute": "query-qmp-schema",
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
@@ -14212,7 +14212,7 @@
       "meta-type": "object"
     }
   ],
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
@@ -14223,7 +14223,7 @@
       "name": "host"
     }
   },
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }

 {
@@ -14250,7 +14250,7 @@
       }
     }
   },
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }

 {
@@ -14264,11 +14264,11 @@
       }
     }
   },
-  "id": "libvirt-43"
+  "id": "libvirt-42"
 }

 {
-  "id": "libvirt-43",
+  "id": "libvirt-42",
   "error": {
     "class": "GenericError",
     "desc": "Property '.migratable' not found"
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies
index a432c5b9d2..0e5d78e15f 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies
@@ -506,7 +506,7 @@

 {
   "execute": "query-kvm",
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

 {
@@ -514,12 +514,12 @@
     "enabled": true,
     "present": true
   },
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

 {
   "execute": "query-events",
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

 {
@@ -636,12 +636,12 @@
       "name": "ACPI_DEVICE_OST"
     }
   ],
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

 {
   "execute": "qom-list-types",
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

 {
@@ -1772,7 +1772,7 @@
       "name": "virtio-blk-device"
     }
   ],
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

 {
@@ -1780,7 +1780,7 @@
   "arguments": {
     "typename": "virtio-blk-pci"
   },
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

 {
@@ -2008,7 +2008,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

 {
@@ -2016,7 +2016,7 @@
   "arguments": {
     "typename": "virtio-net-pci"
   },
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

 {
@@ -2295,7 +2295,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

 {
@@ -2303,7 +2303,7 @@
   "arguments": {
     "typename": "virtio-scsi-pci"
   },
-  "id": "libvirt-12"
+  "id": "libvirt-11"
 }

 {
@@ -2464,7 +2464,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-12"
+  "id": "libvirt-11"
 }

 {
@@ -2472,11 +2472,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"
@@ -2488,11 +2488,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"
@@ -2504,11 +2504,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"
@@ -2520,11 +2520,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"
@@ -2536,7 +2536,7 @@
   "arguments": {
     "typename": "kvm-pci-assign"
   },
-  "id": "libvirt-17"
+  "id": "libvirt-16"
 }

 {
@@ -2598,7 +2598,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-17"
+  "id": "libvirt-16"
 }

 {
@@ -2606,7 +2606,7 @@
   "arguments": {
     "typename": "vfio-pci"
   },
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

 {
@@ -2713,7 +2713,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

 {
@@ -2721,7 +2721,7 @@
   "arguments": {
     "typename": "scsi-disk"
   },
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -2835,7 +2835,7 @@
       "type": "uint64"
     }
   ],
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -2843,7 +2843,7 @@
   "arguments": {
     "typename": "ide-drive"
   },
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
@@ -2919,7 +2919,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
@@ -2927,7 +2927,7 @@
   "arguments": {
     "typename": "PIIX4_PM"
   },
-  "id": "libvirt-21"
+  "id": "libvirt-20"
 }

 {
@@ -2990,7 +2990,7 @@
       "type": "int32"
     }
   ],
-  "id": "libvirt-21"
+  "id": "libvirt-20"
 }

 {
@@ -2998,7 +2998,7 @@
   "arguments": {
     "typename": "usb-redir"
   },
-  "id": "libvirt-22"
+  "id": "libvirt-21"
 }

 {
@@ -3047,7 +3047,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-22"
+  "id": "libvirt-21"
 }

 {
@@ -3055,7 +3055,7 @@
   "arguments": {
     "typename": "usb-host"
   },
-  "id": "libvirt-23"
+  "id": "libvirt-22"
 }

 {
@@ -3124,7 +3124,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-23"
+  "id": "libvirt-22"
 }

 {
@@ -3132,7 +3132,7 @@
   "arguments": {
     "typename": "scsi-generic"
   },
-  "id": "libvirt-24"
+  "id": "libvirt-23"
 }

 {
@@ -3159,7 +3159,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-24"
+  "id": "libvirt-23"
 }

 {
@@ -3167,7 +3167,7 @@
   "arguments": {
     "typename": "i440FX-pcihost"
   },
-  "id": "libvirt-25"
+  "id": "libvirt-24"
 }

 {
@@ -3205,7 +3205,7 @@
       "type": "child<qemu:memory-region>"
     }
   ],
-  "id": "libvirt-25"
+  "id": "libvirt-24"
 }

 {
@@ -3213,7 +3213,7 @@
   "arguments": {
     "typename": "q35-pcihost"
   },
-  "id": "libvirt-26"
+  "id": "libvirt-25"
 }

 {
@@ -3291,7 +3291,7 @@
       "type": "int"
     }
   ],
-  "id": "libvirt-26"
+  "id": "libvirt-25"
 }

 {
@@ -3299,7 +3299,7 @@
   "arguments": {
     "typename": "usb-storage"
   },
-  "id": "libvirt-27"
+  "id": "libvirt-26"
 }

 {
@@ -3372,7 +3372,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-27"
+  "id": "libvirt-26"
 }

 {
@@ -3380,7 +3380,7 @@
   "arguments": {
     "typename": "kvm-pit"
   },
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -3394,7 +3394,7 @@
       "type": "LostTickPolicy"
     }
   ],
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -3402,7 +3402,7 @@
   "arguments": {
     "typename": "VGA"
   },
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
@@ -3459,7 +3459,7 @@
       "type": "int32"
     }
   ],
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
@@ -3467,7 +3467,7 @@
   "arguments": {
     "typename": "vmware-svga"
   },
-  "id": "libvirt-30"
+  "id": "libvirt-29"
 }

 {
@@ -3510,7 +3510,7 @@
       "type": "int32"
     }
   ],
-  "id": "libvirt-30"
+  "id": "libvirt-29"
 }

 {
@@ -3518,7 +3518,7 @@
   "arguments": {
     "typename": "qxl"
   },
-  "id": "libvirt-31"
+  "id": "libvirt-30"
 }

 {
@@ -3605,7 +3605,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-31"
+  "id": "libvirt-30"
 }

 {
@@ -3613,7 +3613,7 @@
   "arguments": {
     "typename": "virtio-gpu-pci"
   },
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

 {
@@ -3766,7 +3766,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

 {
@@ -3774,7 +3774,7 @@
   "arguments": {
     "typename": "virtio-gpu-device"
   },
-  "id": "libvirt-33"
+  "id": "libvirt-32"
 }

 {
@@ -3823,7 +3823,7 @@
       "type": "size"
     }
   ],
-  "id": "libvirt-33"
+  "id": "libvirt-32"
 }

 {
@@ -3831,7 +3831,7 @@
   "arguments": {
     "typename": "ICH9-LPC"
   },
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

 {
@@ -3927,7 +3927,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

 {
@@ -3935,7 +3935,7 @@
   "arguments": {
     "typename": "virtio-balloon-pci"
   },
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
@@ -4078,7 +4078,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
@@ -4086,11 +4086,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"
@@ -4102,7 +4102,7 @@
   "arguments": {
     "typename": "virtio-balloon-device"
   },
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
@@ -4146,7 +4146,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
@@ -4154,7 +4154,7 @@
   "arguments": {
     "typename": "nec-usb-xhci"
   },
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
@@ -4234,7 +4234,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
@@ -4242,7 +4242,7 @@
   "arguments": {
     "typename": "intel-iommu"
   },
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
@@ -4273,7 +4273,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
@@ -4281,7 +4281,7 @@
   "arguments": {
     "typename": "mch"
   },
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
@@ -4307,12 +4307,12 @@
       "type": "pci-devfn"
     }
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
   "execute": "query-machines",
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
@@ -4491,12 +4491,12 @@
       "cpu-max": 255
     }
   ],
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
   "execute": "query-cpu-definitions",
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }

 {
@@ -4778,36 +4778,36 @@
       "migration-safe": true
     }
   ],
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }

 {
   "execute": "query-tpm-models",
-  "id": "libvirt-43"
+  "id": "libvirt-42"
 }

 {
   "return": [
     "tpm-tis"
   ],
-  "id": "libvirt-43"
+  "id": "libvirt-42"
 }

 {
   "execute": "query-tpm-types",
-  "id": "libvirt-44"
+  "id": "libvirt-43"
 }

 {
   "return": [
     "passthrough"
   ],
-  "id": "libvirt-44"
+  "id": "libvirt-43"
 }

 {
   "execute": "query-command-line-options",
-  "id": "libvirt-45"
+  "id": "libvirt-44"
 }

 {
@@ -6056,12 +6056,12 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-45"
+  "id": "libvirt-44"
 }

 {
   "execute": "query-migrate-capabilities",
-  "id": "libvirt-46"
+  "id": "libvirt-45"
 }

 {
@@ -6103,12 +6103,12 @@
       "capability": "release-ram"
     }
   ],
-  "id": "libvirt-46"
+  "id": "libvirt-45"
 }

 {
   "execute": "query-qmp-schema",
-  "id": "libvirt-47"
+  "id": "libvirt-46"
 }

 {
@@ -15394,7 +15394,7 @@
       "meta-type": "object"
     }
   ],
-  "id": "libvirt-47"
+  "id": "libvirt-46"
 }

 {
@@ -15405,7 +15405,7 @@
       "name": "host"
     }
   },
-  "id": "libvirt-48"
+  "id": "libvirt-47"
 }

 {
@@ -15584,7 +15584,7 @@
       }
     }
   },
-  "id": "libvirt-48"
+  "id": "libvirt-47"
 }

 {
@@ -15765,7 +15765,7 @@
       }
     }
   },
-  "id": "libvirt-49"
+  "id": "libvirt-48"
 }

 {
@@ -16006,7 +16006,7 @@
       }
     }
   },
-  "id": "libvirt-49"
+  "id": "libvirt-48"
 }

 {
@@ -16020,7 +16020,7 @@
       }
     }
   },
-  "id": "libvirt-50"
+  "id": "libvirt-49"
 }

 {
@@ -16199,7 +16199,7 @@
       }
     }
   },
-  "id": "libvirt-50"
+  "id": "libvirt-49"
 }

 {
@@ -16380,7 +16380,7 @@
       }
     }
   },
-  "id": "libvirt-51"
+  "id": "libvirt-50"
 }

 {
@@ -16621,7 +16621,7 @@
       }
     }
   },
-  "id": "libvirt-51"
+  "id": "libvirt-50"
 }

 {
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies
index 533404112c..ef5189687a 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies
@@ -584,7 +584,7 @@

 {
   "execute": "query-kvm",
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

 {
@@ -592,12 +592,12 @@
     "enabled": true,
     "present": true
   },
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

 {
   "execute": "query-events",
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

 {
@@ -723,12 +723,12 @@
       "name": "SHUTDOWN"
     }
   ],
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

 {
   "execute": "qom-list-types",
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

 {
@@ -3570,7 +3570,7 @@
       "parent": "virtio-input-hid-pci"
     }
   ],
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

 {
@@ -3578,7 +3578,7 @@
   "arguments": {
     "typename": "virtio-blk-pci"
   },
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

 {
@@ -3810,7 +3810,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

 {
@@ -3818,7 +3818,7 @@
   "arguments": {
     "typename": "virtio-net-pci"
   },
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

 {
@@ -4108,7 +4108,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

 {
@@ -4116,7 +4116,7 @@
   "arguments": {
     "typename": "virtio-scsi-pci"
   },
-  "id": "libvirt-12"
+  "id": "libvirt-11"
 }

 {
@@ -4281,7 +4281,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-12"
+  "id": "libvirt-11"
 }

 {
@@ -4289,11 +4289,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"
@@ -4305,11 +4305,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"
@@ -4321,11 +4321,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"
@@ -4337,11 +4337,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"
@@ -4353,11 +4353,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"
@@ -4369,7 +4369,7 @@
   "arguments": {
     "typename": "vfio-pci"
   },
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

 {
@@ -4503,7 +4503,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

 {
@@ -4511,7 +4511,7 @@
   "arguments": {
     "typename": "scsi-disk"
   },
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -4629,7 +4629,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -4637,7 +4637,7 @@
   "arguments": {
     "typename": "ide-drive"
   },
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
@@ -4713,7 +4713,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
@@ -4721,11 +4721,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"
@@ -4737,7 +4737,7 @@
   "arguments": {
     "typename": "usb-host"
   },
-  "id": "libvirt-22"
+  "id": "libvirt-21"
 }

 {
@@ -4806,7 +4806,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-22"
+  "id": "libvirt-21"
 }

 {
@@ -4814,7 +4814,7 @@
   "arguments": {
     "typename": "scsi-generic"
   },
-  "id": "libvirt-23"
+  "id": "libvirt-22"
 }

 {
@@ -4845,7 +4845,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-23"
+  "id": "libvirt-22"
 }

 {
@@ -4853,11 +4853,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"
@@ -4869,11 +4869,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"
@@ -4885,7 +4885,7 @@
   "arguments": {
     "typename": "usb-storage"
   },
-  "id": "libvirt-26"
+  "id": "libvirt-25"
 }

 {
@@ -4958,7 +4958,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-26"
+  "id": "libvirt-25"
 }

 {
@@ -4966,11 +4966,11 @@
   "arguments": {
     "typename": "kvm-pit"
   },
-  "id": "libvirt-27"
+  "id": "libvirt-26"
 }

 {
-  "id": "libvirt-27",
+  "id": "libvirt-26",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'kvm-pit' not found"
@@ -4982,7 +4982,7 @@
   "arguments": {
     "typename": "VGA"
   },
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -5039,7 +5039,7 @@
       "type": "int32"
     }
   ],
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -5047,7 +5047,7 @@
   "arguments": {
     "typename": "virtio-gpu-pci"
   },
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
@@ -5198,7 +5198,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
@@ -5206,7 +5206,7 @@
   "arguments": {
     "typename": "virtio-gpu-device"
   },
-  "id": "libvirt-30"
+  "id": "libvirt-29"
 }

 {
@@ -5253,7 +5253,7 @@
       "type": "size"
     }
   ],
-  "id": "libvirt-30"
+  "id": "libvirt-29"
 }

 {
@@ -5261,11 +5261,11 @@
   "arguments": {
     "typename": "ICH9-LPC"
   },
-  "id": "libvirt-31"
+  "id": "libvirt-30"
 }

 {
-  "id": "libvirt-31",
+  "id": "libvirt-30",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'ICH9-LPC' not found"
@@ -5277,7 +5277,7 @@
   "arguments": {
     "typename": "virtio-balloon-pci"
   },
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

 {
@@ -5420,7 +5420,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

 {
@@ -5428,11 +5428,11 @@
   "arguments": {
     "typename": "virtio-balloon-ccw"
   },
-  "id": "libvirt-33"
+  "id": "libvirt-32"
 }

 {
-  "id": "libvirt-33",
+  "id": "libvirt-32",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-balloon-ccw' not found"
@@ -5444,7 +5444,7 @@
   "arguments": {
     "typename": "virtio-balloon-device"
   },
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

 {
@@ -5488,7 +5488,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

 {
@@ -5496,7 +5496,7 @@
   "arguments": {
     "typename": "nec-usb-xhci"
   },
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
@@ -5576,7 +5576,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
@@ -5584,7 +5584,7 @@
   "arguments": {
     "typename": "spapr-pci-host-bridge"
   },
-  "id": "libvirt-36"
+  "id": "libvirt-35"
 }

 {
@@ -5642,7 +5642,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-36"
+  "id": "libvirt-35"
 }

 {
@@ -5650,7 +5650,7 @@
   "arguments": {
     "typename": "memory-backend-file"
   },
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
@@ -5700,7 +5700,7 @@
       "type": "string"
     }
   ],
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
@@ -5708,7 +5708,7 @@
   "arguments": {
     "typename": "spapr-machine"
   },
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
@@ -5879,12 +5879,12 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
   "execute": "query-machines",
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
@@ -6027,12 +6027,12 @@
       "cpu-max": 1
     }
   ],
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
   "execute": "query-cpu-definitions",
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
@@ -8228,35 +8228,35 @@
       "static": false
     }
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
   "execute": "query-tpm-models",
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
   "return": [
   ],
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
   "execute": "query-tpm-types",
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }

 {
   "return": [
     "emulator"
   ],
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }

 {
   "execute": "query-command-line-options",
-  "id": "libvirt-43"
+  "id": "libvirt-42"
 }

 {
@@ -9386,12 +9386,12 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-43"
+  "id": "libvirt-42"
 }

 {
   "execute": "query-migrate-capabilities",
-  "id": "libvirt-44"
+  "id": "libvirt-43"
 }

 {
@@ -9461,12 +9461,12 @@
       "capability": "late-block-activate"
     }
   ],
-  "id": "libvirt-44"
+  "id": "libvirt-43"
 }

 {
   "execute": "query-qmp-schema",
-  "id": "libvirt-45"
+  "id": "libvirt-44"
 }

 {
@@ -21625,7 +21625,7 @@
       "meta-type": "object"
     }
   ],
-  "id": "libvirt-45"
+  "id": "libvirt-44"
 }

 {
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies
index 2c822a5034..f1b469f0f4 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies
@@ -602,7 +602,7 @@

 {
   "execute": "query-kvm",
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

 {
@@ -610,12 +610,12 @@
     "enabled": true,
     "present": true
   },
-  "id": "libvirt-7"
+  "id": "libvirt-6"
 }

 {
   "execute": "query-events",
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

 {
@@ -744,12 +744,12 @@
       "name": "SHUTDOWN"
     }
   ],
-  "id": "libvirt-8"
+  "id": "libvirt-7"
 }

 {
   "execute": "qom-list-types",
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

 {
@@ -2415,7 +2415,7 @@
       "parent": "rng-backend"
     }
   ],
-  "id": "libvirt-9"
+  "id": "libvirt-8"
 }

 {
@@ -2423,7 +2423,7 @@
   "arguments": {
     "typename": "virtio-blk-pci"
   },
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

 {
@@ -2655,7 +2655,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-10"
+  "id": "libvirt-9"
 }

 {
@@ -2663,7 +2663,7 @@
   "arguments": {
     "typename": "virtio-net-pci"
   },
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

 {
@@ -2953,7 +2953,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-11"
+  "id": "libvirt-10"
 }

 {
@@ -2961,7 +2961,7 @@
   "arguments": {
     "typename": "virtio-scsi-pci"
   },
-  "id": "libvirt-12"
+  "id": "libvirt-11"
 }

 {
@@ -3126,7 +3126,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-12"
+  "id": "libvirt-11"
 }

 {
@@ -3134,11 +3134,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"
@@ -3150,11 +3150,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"
@@ -3166,11 +3166,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"
@@ -3182,11 +3182,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"
@@ -3198,11 +3198,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"
@@ -3214,7 +3214,7 @@
   "arguments": {
     "typename": "vfio-pci"
   },
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

 {
@@ -3348,7 +3348,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-18"
+  "id": "libvirt-17"
 }

 {
@@ -3356,7 +3356,7 @@
   "arguments": {
     "typename": "scsi-disk"
   },
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -3474,7 +3474,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-19"
+  "id": "libvirt-18"
 }

 {
@@ -3482,7 +3482,7 @@
   "arguments": {
     "typename": "ide-drive"
   },
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
@@ -3558,7 +3558,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-20"
+  "id": "libvirt-19"
 }

 {
@@ -3566,7 +3566,7 @@
   "arguments": {
     "typename": "PIIX4_PM"
   },
-  "id": "libvirt-21"
+  "id": "libvirt-20"
 }

 {
@@ -3629,7 +3629,7 @@
       "type": "int32"
     }
   ],
-  "id": "libvirt-21"
+  "id": "libvirt-20"
 }

 {
@@ -3637,7 +3637,7 @@
   "arguments": {
     "typename": "usb-redir"
   },
-  "id": "libvirt-22"
+  "id": "libvirt-21"
 }

 {
@@ -3686,7 +3686,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-22"
+  "id": "libvirt-21"
 }

 {
@@ -3694,7 +3694,7 @@
   "arguments": {
     "typename": "usb-host"
   },
-  "id": "libvirt-23"
+  "id": "libvirt-22"
 }

 {
@@ -3763,7 +3763,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-23"
+  "id": "libvirt-22"
 }

 {
@@ -3771,7 +3771,7 @@
   "arguments": {
     "typename": "scsi-generic"
   },
-  "id": "libvirt-24"
+  "id": "libvirt-23"
 }

 {
@@ -3802,7 +3802,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-24"
+  "id": "libvirt-23"
 }

 {
@@ -3810,7 +3810,7 @@
   "arguments": {
     "typename": "i440FX-pcihost"
   },
-  "id": "libvirt-25"
+  "id": "libvirt-24"
 }

 {
@@ -3852,7 +3852,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-25"
+  "id": "libvirt-24"
 }

 {
@@ -3860,7 +3860,7 @@
   "arguments": {
     "typename": "q35-pcihost"
   },
-  "id": "libvirt-26"
+  "id": "libvirt-25"
 }

 {
@@ -3942,7 +3942,7 @@
       "type": "uint64"
     }
   ],
-  "id": "libvirt-26"
+  "id": "libvirt-25"
 }

 {
@@ -3950,7 +3950,7 @@
   "arguments": {
     "typename": "usb-storage"
   },
-  "id": "libvirt-27"
+  "id": "libvirt-26"
 }

 {
@@ -4033,7 +4033,7 @@
       "type": "uint16"
     }
   ],
-  "id": "libvirt-27"
+  "id": "libvirt-26"
 }

 {
@@ -4041,7 +4041,7 @@
   "arguments": {
     "typename": "kvm-pit"
   },
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -4055,7 +4055,7 @@
       "type": "LostTickPolicy"
     }
   ],
-  "id": "libvirt-28"
+  "id": "libvirt-27"
 }

 {
@@ -4063,7 +4063,7 @@
   "arguments": {
     "typename": "VGA"
   },
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
@@ -4124,7 +4124,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-29"
+  "id": "libvirt-28"
 }

 {
@@ -4132,7 +4132,7 @@
   "arguments": {
     "typename": "vmware-svga"
   },
-  "id": "libvirt-30"
+  "id": "libvirt-29"
 }

 {
@@ -4179,7 +4179,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-30"
+  "id": "libvirt-29"
 }

 {
@@ -4187,7 +4187,7 @@
   "arguments": {
     "typename": "qxl"
   },
-  "id": "libvirt-31"
+  "id": "libvirt-30"
 }

 {
@@ -4286,7 +4286,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-31"
+  "id": "libvirt-30"
 }

 {
@@ -4294,7 +4294,7 @@
   "arguments": {
     "typename": "virtio-gpu-pci"
   },
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

 {
@@ -4455,7 +4455,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-32"
+  "id": "libvirt-31"
 }

 {
@@ -4463,7 +4463,7 @@
   "arguments": {
     "typename": "virtio-gpu-device"
   },
-  "id": "libvirt-33"
+  "id": "libvirt-32"
 }

 {
@@ -4520,7 +4520,7 @@
       "type": "size"
     }
   ],
-  "id": "libvirt-33"
+  "id": "libvirt-32"
 }

 {
@@ -4528,7 +4528,7 @@
   "arguments": {
     "typename": "ICH9-LPC"
   },
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

 {
@@ -4624,7 +4624,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }

 {
@@ -4632,7 +4632,7 @@
   "arguments": {
     "typename": "virtio-balloon-pci"
   },
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
@@ -4775,7 +4775,7 @@
       "type": "str"
     }
   ],
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }

 {
@@ -4783,11 +4783,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"
@@ -4799,7 +4799,7 @@
   "arguments": {
     "typename": "virtio-balloon-device"
   },
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
@@ -4843,7 +4843,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-37"
+  "id": "libvirt-36"
 }

 {
@@ -4851,7 +4851,7 @@
   "arguments": {
     "typename": "nec-usb-xhci"
   },
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
@@ -4931,7 +4931,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }

 {
@@ -4939,7 +4939,7 @@
   "arguments": {
     "typename": "intel-iommu"
   },
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
@@ -4978,7 +4978,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }

 {
@@ -4986,7 +4986,7 @@
   "arguments": {
     "typename": "mch"
   },
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
@@ -5029,7 +5029,7 @@
       "type": "int32"
     }
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }

 {
@@ -5037,7 +5037,7 @@
   "arguments": {
     "typename": "memory-backend-file"
   },
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
@@ -5087,7 +5087,7 @@
       "type": "string"
     }
   ],
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }

 {
@@ -5095,11 +5095,11 @@
   "arguments": {
     "typename": "spapr-machine"
   },
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }

 {
-  "id": "libvirt-42",
+  "id": "libvirt-41",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Class 'spapr-machine' not found"
@@ -5108,7 +5108,7 @@

 {
   "execute": "query-machines",
-  "id": "libvirt-43"
+  "id": "libvirt-42"
 }

 {
@@ -5317,12 +5317,12 @@
       "cpu-max": 255
     }
   ],
-  "id": "libvirt-43"
+  "id": "libvirt-42"
 }

 {
   "execute": "query-cpu-definitions",
-  "id": "libvirt-44"
+  "id": "libvirt-43"
 }

 {
@@ -5759,12 +5759,12 @@
       "migration-safe": true
     }
   ],
-  "id": "libvirt-44"
+  "id": "libvirt-43"
 }

 {
   "execute": "query-tpm-models",
-  "id": "libvirt-45"
+  "id": "libvirt-44"
 }

 {
@@ -5772,12 +5772,12 @@
     "tpm-crb",
     "tpm-tis"
   ],
-  "id": "libvirt-45"
+  "id": "libvirt-44"
 }

 {
   "execute": "query-tpm-types",
-  "id": "libvirt-46"
+  "id": "libvirt-45"
 }

 {
@@ -5785,12 +5785,12 @@
     "passthrough",
     "emulator"
   ],
-  "id": "libvirt-46"
+  "id": "libvirt-45"
 }

 {
   "execute": "query-command-line-options",
-  "id": "libvirt-47"
+  "id": "libvirt-46"
 }

 {
@@ -7089,12 +7089,12 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-47"
+  "id": "libvirt-46"
 }

 {
   "execute": "query-migrate-capabilities",
-  "id": "libvirt-48"
+  "id": "libvirt-47"
 }

 {
@@ -7164,12 +7164,12 @@
       "capability": "late-block-activate"
     }
   ],
-  "id": "libvirt-48"
+  "id": "libvirt-47"
 }

 {
   "execute": "query-qmp-schema",
-  "id": "libvirt-49"
+  "id": "libvirt-48"
 }

 {
@@ -19049,7 +19049,7 @@
       "meta-type": "object"
     }
   ],
-  "id": "libvirt-49"
+  "id": "libvirt-48"
 }

 {
@@ -19060,7 +19060,7 @@
       "name": "host"
     }
   },
-  "id": "libvirt-50"
+  "id": "libvirt-49"
 }

 {
@@ -19253,7 +19253,7 @@
       }
     }
   },
-  "id": "libvirt-50"
+  "id": "libvirt-49"
 }

 {
@@ -19448,7 +19448,7 @@
       }
     }
   },
-  "id": "libvirt-51"
+  "id": "libvirt-50"
 }

 {
@@ -19711,7 +19711,7 @@
       }
     }
   },
-  "id": "libvirt-51"
+  "id": "libvirt-50"
 }

 {
@@ -19725,7 +19725,7 @@
       }
     }
   },
-  "id": "libvirt-52"
+  "id": "libvirt-51"
 }

 {
@@ -19918,7 +19918,7 @@
       }
     }
   },
-  "id": "libvirt-52"
+  "id": "libvirt-51"
 }

 {
@@ -20113,7 +20113,7 @@
       }
     }
   },
-  "id": "libvirt-53"
+  "id": "libvirt-52"
 }

 {
@@ -20376,16 +20376,16 @@
       }
     }
   },
-  "id": "libvirt-53"
+  "id": "libvirt-52"
 }

 {
   "execute": "query-sev-capabilities",
-  "id": "libvirt-54"
+  "id": "libvirt-53"
 }

 {
-  "id": "libvirt-54",
+  "id": "libvirt-53",
   "error": {
     "class": "GenericError",
     "desc": "SEV feature is not available"
-- 
2.16.2


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]