diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies
index 0d9409918e..d25b82b865 100644
--- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies
@@ -3,7 +3,7 @@
     "version": {
       "qemu": {
         "micro": 0,
-        "minor": 4,
+        "minor": 5,
         "major": 2
       },
       "package": ""
@@ -23,7 +23,7 @@
   "return": {
     "qemu": {
       "micro": 0,
-      "minor": 4,
+      "minor": 5,
       "major": 2
     },
     "package": ""
@@ -76,9 +76,27 @@
     {
       "name": "query-memdev"
     },
+    {
+      "name": "blockdev-change-medium"
+    },
     {
       "name": "query-named-block-nodes"
     },
+    {
+      "name": "x-blockdev-insert-medium"
+    },
+    {
+      "name": "x-blockdev-remove-medium"
+    },
+    {
+      "name": "blockdev-close-tray"
+    },
+    {
+      "name": "blockdev-open-tray"
+    },
+    {
+      "name": "x-blockdev-del"
+    },
     {
       "name": "blockdev-add"
     },
@@ -205,6 +223,9 @@
     {
       "name": "query-chardev"
     },
+    {
+      "name": "query-qmp-schema"
+    },
     {
       "name": "query-events"
     },
@@ -268,6 +289,9 @@
     {
       "name": "blockdev-snapshot-internal-sync"
     },
+    {
+      "name": "blockdev-snapshot"
+    },
     {
       "name": "blockdev-snapshot-sync"
     },
@@ -343,6 +367,9 @@
     {
       "name": "query-migrate-cache-size"
     },
+    {
+      "name": "migrate-start-postcopy"
+    },
     {
       "name": "migrate-set-cache-size"
     },
@@ -424,7 +451,7 @@
 
 {
   "return": {
-    "fd": 11,
+    "fd": 14,
     "fdset-id": 0
   },
   "id": "libvirt-5"
@@ -441,89 +468,83 @@
 {
   "return": [
     {
-      "name": "MEM_UNPLUG_ERROR"
+      "name": "WATCHDOG"
+    },
+    {
+      "name": "WAKEUP"
     },
     {
       "name": "VSERPORT_CHANGE"
     },
     {
-      "name": "QUORUM_REPORT_BAD"
-    },
-    {
-      "name": "QUORUM_FAILURE"
-    },
-    {
-      "name": "GUEST_PANICKED"
-    },
-    {
-      "name": "BALLOON_CHANGE"
-    },
-    {
-      "name": "ACPI_DEVICE_OST"
-    },
-    {
-      "name": "MIGRATION"
-    },
-    {
-      "name": "SPICE_MIGRATE_COMPLETED"
-    },
-    {
-      "name": "SPICE_DISCONNECTED"
-    },
-    {
-      "name": "SPICE_INITIALIZED"
-    },
-    {
-      "name": "SPICE_CONNECTED"
+      "name": "VNC_INITIALIZED"
     },
     {
       "name": "VNC_DISCONNECTED"
     },
-    {
-      "name": "VNC_INITIALIZED"
-    },
     {
       "name": "VNC_CONNECTED"
     },
-    {
-      "name": "NIC_RX_FILTER_CHANGED"
-    },
-    {
-      "name": "DEVICE_DELETED"
-    },
-    {
-      "name": "WATCHDOG"
-    },
-    {
-      "name": "RTC_CHANGE"
-    },
-    {
-      "name": "WAKEUP"
-    },
     {
       "name": "SUSPEND_DISK"
     },
     {
       "name": "SUSPEND"
     },
-    {
-      "name": "RESUME"
-    },
     {
       "name": "STOP"
     },
     {
-      "name": "RESET"
+      "name": "SPICE_MIGRATE_COMPLETED"
     },
     {
-      "name": "POWERDOWN"
+      "name": "SPICE_INITIALIZED"
+    },
+    {
+      "name": "SPICE_DISCONNECTED"
+    },
+    {
+      "name": "SPICE_CONNECTED"
     },
     {
       "name": "SHUTDOWN"
     },
+    {
+      "name": "RTC_CHANGE"
+    },
+    {
+      "name": "RESUME"
+    },
+    {
+      "name": "RESET"
+    },
+    {
+      "name": "QUORUM_REPORT_BAD"
+    },
+    {
+      "name": "QUORUM_FAILURE"
+    },
+    {
+      "name": "POWERDOWN"
+    },
+    {
+      "name": "NIC_RX_FILTER_CHANGED"
+    },
+    {
+      "name": "MIGRATION"
+    },
+    {
+      "name": "MEM_UNPLUG_ERROR"
+    },
+    {
+      "name": "GUEST_PANICKED"
+    },
     {
       "name": "DEVICE_TRAY_MOVED"
     },
+    {
+      "name": "DEVICE_DELETED"
+    },
     {
       "name": "BLOCK_WRITE_THRESHOLD"
     },
@@ -534,16 +555,22 @@
       "name": "BLOCK_JOB_ERROR"
     },
     {
-      "name": "BLOCK_JOB_CANCELLED"
+      "name": "BLOCK_JOB_COMPLETED"
     },
     {
-      "name": "BLOCK_JOB_COMPLETED"
+      "name": "BLOCK_JOB_CANCELLED"
     },
     {
       "name": "BLOCK_IO_ERROR"
     },
     {
       "name": "BLOCK_IMAGE_CORRUPTED"
+    },
+    {
+      "name": "BALLOON_CHANGE"
+    },
+    {
+      "name": "ACPI_DEVICE_OST"
     }
   ],
   "id": "libvirt-7"
@@ -572,9 +599,6 @@
     {
       "name": "Westmere-x86_64-cpu"
     },
-    {
-      "name": "e1000-82540em"
-    },
     {
       "name": "pci-serial-4x"
     },
@@ -590,9 +614,6 @@
     {
       "name": "pc-q35-2.3-machine"
     },
-    {
-      "name": "icc-bridge"
-    },
     {
       "name": "cfi.pflash01"
     },
@@ -725,6 +746,9 @@
     {
       "name": "irq"
     },
+    {
+      "name": "filter-buffer"
+    },
     {
       "name": "cirrus-vga"
     },
@@ -737,6 +761,9 @@
     {
       "name": "PCIE"
     },
+    {
+      "name": "pc-0.14-machine"
+    },
     {
       "name": "pentium3-x86_64-cpu"
     },
@@ -750,7 +777,7 @@
       "name": "kvm-pit"
     },
     {
-      "name": "pc-0.14-machine"
+      "name": "pc-i440fx-2.5-machine"
     },
     {
       "name": "pc-i440fx-1.4-machine"
@@ -854,12 +881,18 @@
     {
       "name": "usb-mouse"
     },
+    {
+      "name": "pc-q35-2.5-machine"
+    },
     {
       "name": "piix3-usb-uhci"
     },
     {
       "name": "vfio-calxeda-xgmac"
     },
+    {
+      "name": "filter-dump"
+    },
     {
       "name": "virtio-scsi-device"
     },
@@ -879,10 +912,10 @@
       "name": "tpci200"
     },
     {
-      "name": "Opteron_G4-x86_64-cpu"
+      "name": "pc-q35-1.4-machine"
     },
     {
-      "name": "pc-q35-1.4-machine"
+      "name": "Opteron_G4-x86_64-cpu"
     },
     {
       "name": "virtio-mmio"
@@ -902,6 +935,9 @@
     {
       "name": "virtio-net-device"
     },
+    {
+      "name": "pc-i440fx-2.3-machine"
+    },
     {
       "name": "usb-hub"
     },
@@ -912,16 +948,22 @@
       "name": "hda-duplex"
     },
     {
-      "name": "pc-i440fx-2.3-machine"
+      "name": "igd-passthrough-i440FX"
+    },
+    {
+      "name": "igd-passthrough-isa-bridge"
     },
     {
       "name": "virtio-keyboard-pci"
     },
+    {
+      "name": "isapc-machine"
+    },
     {
       "name": "pci-ohci"
     },
     {
-      "name": "isapc-machine"
+      "name": "pc-i440fx-2.2-machine"
     },
     {
       "name": "ipoctal232"
@@ -936,7 +978,7 @@
       "name": "ide-cd"
     },
     {
-      "name": "pc-i440fx-2.2-machine"
+      "name": "tls-creds-anon"
     },
     {
       "name": "isabus-bridge"
@@ -1136,9 +1178,6 @@
     {
       "name": "ccid-card-passthru"
     },
-    {
-      "name": "ich9-usb-uhci5"
-    },
     {
       "name": "qxl"
     },
@@ -1160,6 +1199,9 @@
     {
       "name": "ICH9 SMB"
     },
+    {
+      "name": "ich9-usb-uhci5"
+    },
     {
       "name": "ich9-usb-uhci4"
     },
@@ -1169,9 +1211,6 @@
     {
       "name": "virtio-input-host-device"
     },
-    {
-      "name": "icc-bus"
-    },
     {
       "name": "vmxnet3"
     },
@@ -1196,11 +1235,14 @@
     {
       "name": "none-machine"
     },
+    {
+      "name": "SCSI"
+    },
     {
       "name": "sysbus-fdc"
     },
     {
-      "name": "SCSI"
+      "name": "allwinner-ahci"
     },
     {
       "name": "n270-x86_64-cpu"
@@ -1214,6 +1256,12 @@
     {
       "name": "athlon-x86_64-cpu"
     },
+    {
+      "name": "tls-creds-x509"
+    },
+    {
+      "name": "ccid-card-emulated"
+    },
     {
       "name": "ISA"
     },
@@ -1286,15 +1334,15 @@
     {
       "name": "pc-q35-1.6-machine"
     },
-    {
-      "name": "virtio-input-host-pci"
-    },
     {
       "name": "virtio-pci-bus"
     },
     {
       "name": "pentium2-x86_64-cpu"
     },
+    {
+      "name": "virtio-input-host-pci"
+    },
     {
       "name": "nmi"
     },
@@ -1308,7 +1356,7 @@
       "name": "pc-0.12-machine"
     },
     {
-      "name": "am53c974"
+      "name": "kvm64-x86_64-cpu"
     },
     {
       "name": "sdhci-pci"
@@ -1320,7 +1368,7 @@
       "name": "pxb"
     },
     {
-      "name": "kvm64-x86_64-cpu"
+      "name": "ne2k_isa"
     },
     {
       "name": "e1000"
@@ -1329,7 +1377,7 @@
       "name": "Conroe-x86_64-cpu"
     },
     {
-      "name": "ne2k_isa"
+      "name": "am53c974"
     },
     {
       "name": "pc-1.3-machine"
@@ -1437,8 +1485,92 @@
 {
   "return": [
     {
-      "name": "bootindex",
-      "type": "int32"
+      "name": "request-merging",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "min_io_size",
+      "type": "uint16"
+    },
+    {
+      "name": "secs",
+      "type": "uint32"
+    },
+    {
+      "name": "event_idx",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "heads",
+      "type": "uint32"
+    },
+    {
+      "name": "serial",
+      "type": "str"
+    },
+    {
+      "name": "ioeventfd",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "multifunction",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "rombar",
+      "type": "uint32"
+    },
+    {
+      "name": "scsi",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "cyls",
+      "type": "uint32"
+    },
+    {
+      "name": "logical_block_size",
+      "description": "A power of two between 512 and 32768",
+      "type": "uint16"
+    },
+    {
+      "name": "x-disable-pcie",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "indirect_desc",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "disable-modern",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "drive",
+      "description": "ID of a drive to use as a backend",
+      "type": "str"
+    },
+    {
+      "name": "disable-legacy",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "command_serr_enable",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "discard_granularity",
+      "type": "uint32"
     },
     {
       "name": "iothread",
@@ -1450,117 +1582,48 @@
       "type": "bool"
     },
     {
-      "name": "notify_on_empty",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "event_idx",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "indirect_desc",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "x-data-plane",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "request-merging",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "scsi",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "config-wce",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "serial",
-      "type": "str"
-    },
-    {
-      "name": "secs",
+      "name": "class",
       "type": "uint32"
     },
     {
-      "name": "heads",
-      "type": "uint32"
-    },
-    {
-      "name": "cyls",
-      "type": "uint32"
-    },
-    {
-      "name": "discard_granularity",
-      "type": "uint32"
-    },
-    {
-      "name": "opt_io_size",
-      "type": "uint32"
-    },
-    {
-      "name": "min_io_size",
-      "type": "uint16"
-    },
-    {
-      "name": "physical_block_size",
-      "description": "A power of two between 512 and 32768",
-      "type": "uint16"
-    },
-    {
-      "name": "logical_block_size",
-      "description": "A power of two between 512 and 32768",
-      "type": "uint16"
-    },
-    {
-      "name": "drive",
-      "description": "ID of a drive to use as a backend",
-      "type": "str"
-    },
-    {
-      "name": "virtio-backend",
-      "type": "child<virtio-blk-device>"
-    },
-    {
-      "name": "command_serr_enable",
+      "name": "migrate-extra",
       "description": "on/off",
       "type": "bool"
     },
-    {
-      "name": "multifunction",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "rombar",
-      "type": "uint32"
-    },
-    {
-      "name": "romfile",
-      "type": "str"
-    },
     {
       "name": "addr",
       "description": "Slot and optional function number, example: 06.0 or 06",
       "type": "int32"
     },
     {
-      "name": "disable-modern",
+      "name": "modern-pio-notify",
       "description": "on/off",
       "type": "bool"
     },
     {
-      "name": "disable-legacy",
+      "name": "vectors",
+      "type": "uint32"
+    },
+    {
+      "name": "physical_block_size",
+      "description": "A power of two between 512 and 32768",
+      "type": "uint16"
+    },
+    {
+      "name": "bootindex",
+      "type": "int32"
+    },
+    {
+      "name": "virtio-backend",
+      "type": "child<virtio-blk-device>"
+    },
+    {
+      "name": "config-wce",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "notify_on_empty",
       "description": "on/off",
       "type": "bool"
     },
@@ -1570,17 +1633,12 @@
       "type": "bool"
     },
     {
-      "name": "vectors",
+      "name": "opt_io_size",
       "type": "uint32"
     },
     {
-      "name": "ioeventfd",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "class",
-      "type": "uint32"
+      "name": "romfile",
+      "type": "str"
     }
   ],
   "id": "libvirt-9"
@@ -1588,170 +1646,43 @@
 
 {
   "return": [
-    {
-      "name": "bootindex",
-      "type": "int32"
-    },
-    {
-      "name": "any_layout",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "notify_on_empty",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "event_idx",
-      "description": "on/off",
-      "type": "bool"
-    },
     {
       "name": "indirect_desc",
       "description": "on/off",
       "type": "bool"
     },
-    {
-      "name": "tx",
-      "type": "str"
-    },
-    {
-      "name": "x-txburst",
-      "type": "int32"
-    },
     {
       "name": "x-txtimer",
       "type": "uint32"
     },
     {
-      "name": "netdev",
-      "description": "ID of a netdev to use as a backend",
-      "type": "str"
-    },
-    {
-      "name": "vlan",
-      "description": "Integer VLAN id to connect to",
-      "type": "int32"
-    },
-    {
-      "name": "mac",
-      "description": "Ethernet 6-byte MAC Address, example: 52:54:00:12:34:56",
-      "type": "str"
+      "name": "guest_ufo",
+      "description": "on/off",
+      "type": "bool"
     },
     {
       "name": "mq",
       "description": "on/off",
       "type": "bool"
     },
-    {
-      "name": "ctrl_guest_offloads",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "ctrl_mac_addr",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "ctrl_rx_extra",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "ctrl_vlan",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "ctrl_rx",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "ctrl_vq",
-      "description": "on/off",
-      "type": "bool"
-    },
     {
       "name": "status",
       "description": "on/off",
       "type": "bool"
     },
-    {
-      "name": "mrg_rxbuf",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "host_ufo",
-      "description": "on/off",
-      "type": "bool"
-    },
     {
       "name": "host_ecn",
       "description": "on/off",
       "type": "bool"
     },
     {
-      "name": "host_tso6",
+      "name": "ioeventfd",
       "description": "on/off",
       "type": "bool"
     },
     {
-      "name": "host_tso4",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "guest_announce",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "guest_ufo",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "guest_ecn",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "guest_tso6",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "guest_tso4",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "gso",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "guest_csum",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "csum",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "virtio-backend",
-      "type": "child<virtio-net-device>"
-    },
-    {
-      "name": "command_serr_enable",
-      "description": "on/off",
-      "type": "bool"
+      "name": "tx",
+      "type": "str"
     },
     {
       "name": "multifunction",
@@ -1763,26 +1694,131 @@
       "type": "uint32"
     },
     {
-      "name": "romfile",
+      "name": "ctrl_rx_extra",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "ctrl_vq",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "mac",
+      "description": "Ethernet 6-byte MAC Address, example: 52:54:00:12:34:56",
       "type": "str"
     },
     {
-      "name": "addr",
-      "description": "Slot and optional function number, example: 06.0 or 06",
-      "type": "int32"
+      "name": "event_idx",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "x-disable-pcie",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "guest_tso6",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "gso",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "guest_ecn",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "ctrl_rx",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "guest_tso4",
+      "description": "on/off",
+      "type": "bool"
     },
     {
       "name": "disable-modern",
       "description": "on/off",
       "type": "bool"
     },
+    {
+      "name": "guest_csum",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "guest_announce",
+      "description": "on/off",
+      "type": "bool"
+    },
     {
       "name": "disable-legacy",
       "description": "on/off",
       "type": "bool"
     },
     {
-      "name": "virtio-pci-bus-master-bug-migration",
+      "name": "command_serr_enable",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "x-txburst",
+      "type": "int32"
+    },
+    {
+      "name": "ctrl_vlan",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "csum",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "mrg_rxbuf",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "any_layout",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "ctrl_guest_offloads",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "host_tso6",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "ctrl_mac_addr",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "addr",
+      "description": "Slot and optional function number, example: 06.0 or 06",
+      "type": "int32"
+    },
+    {
+      "name": "migrate-extra",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "modern-pio-notify",
       "description": "on/off",
       "type": "bool"
     },
@@ -1791,135 +1827,167 @@
       "type": "uint32"
     },
     {
-      "name": "ioeventfd",
+      "name": "vlan",
+      "description": "Integer VLAN id to connect to",
+      "type": "int32"
+    },
+    {
+      "name": "host_tso4",
       "description": "on/off",
       "type": "bool"
+    },
+    {
+      "name": "host_ufo",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "virtio-backend",
+      "type": "child<virtio-net-device>"
+    },
+    {
+      "name": "bootindex",
+      "type": "int32"
+    },
+    {
+      "name": "netdev",
+      "description": "ID of a netdev to use as a backend",
+      "type": "str"
+    },
+    {
+      "name": "notify_on_empty",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "virtio-pci-bus-master-bug-migration",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "romfile",
+      "type": "str"
     }
   ],
   "id": "libvirt-10"
 }
 
 {
-    "return": [
-        {
-            "name": "iothread",
-            "type": "link<iothread>"
-        },
-        {
-            "name": "any_layout",
-            "description": "on/off",
-            "type": "bool"
-        },
-        {
-            "name": "notify_on_empty",
-            "description": "on/off",
-            "type": "bool"
-        },
-        {
-            "name": "event_idx",
-            "description": "on/off",
-            "type": "bool"
-        },
-        {
-            "name": "indirect_desc",
-            "description": "on/off",
-            "type": "bool"
-        },
-        {
-            "name": "param_change",
-            "description": "on/off",
-            "type": "bool"
-        },
-        {
-            "name": "hotplug",
-            "description": "on/off",
-            "type": "bool"
-        },
-        {
-            "name": "modern-pio-notify",
-            "description": "on/off",
-            "type":"bool"
-        },
-        {
-            "name": "cmd_per_lun",
-            "type": "uint32"
-        },
-        {
-            "name": "max_sectors",
-            "type": "uint32"
-        },
-        {
-            "name": "num_queues",
-            "type": "uint32"
-        },
-        {
-            "name": "virtio-backend",
-            "type": "child<virtio-scsi-device>"
-        },
-        {
-            "name": "command_serr_enable",
-            "description":"on/off",
-            "type": "bool"
-        },
-        {
-            "name": "multifunction",
-            "description": "on/off",
-            "type": "bool"
-        },
-        {
-            "name": "migrate-extra",
-            "description": "on/off",
-            "type": "bool"
-        },
-        {
-            "name": "migrate-extra",
-            "description": "on/off",
-            "type": "bool"
-        },
-        {
-            "name": "rombar",
-            "type": "uint32"
-        },
-        {
-            "name": "romfile",
-            "type": "str"
-        },
-        {
-            "name": "x-disable-pcie",
-            "description": "on/off",
-            "type": "bool"
-        },
-        {
-            "name": "addr",
-            "description": "Slot and optional function number, example: 06.0 or 06",
-            "type": "int32"
-        },
-        {
-            "name": "disable-modern",
-            "description": "on/off",
-            "type": "bool"
-        },
-        {
-            "name": "disable-legacy",
-            "description": "on/off",
-            "type": "bool"
-        },
-        {
-            "name": "virtio-pci-bus-master-bug-migration",
-            "description": "on/off",
-            "type": "bool"
-        },
-        {
-            "name": "vectors",
-            "type": "uint32"
-        },
-        {
-            "name": "ioeventfd",
-            "description": "on/off",
-            "type": "bool"
-        }
-    ],
-    "id": "libvirt-11"
+  "return": [
+    {
+      "name": "disable-modern",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "ioeventfd",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "virtio-pci-bus-master-bug-migration",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "event_idx",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "cmd_per_lun",
+      "type": "uint32"
+    },
+    {
+      "name": "indirect_desc",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "param_change",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "iothread",
+      "type": "link<iothread>"
+    },
+    {
+      "name": "multifunction",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "migrate-extra",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "notify_on_empty",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "hotplug",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "modern-pio-notify",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "num_queues",
+      "type": "uint32"
+    },
+    {
+      "name": "romfile",
+      "type": "str"
+    },
+    {
+      "name": "virtio-backend",
+      "type": "child<virtio-scsi-device>"
+    },
+    {
+      "name": "disable-legacy",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "command_serr_enable",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "vectors",
+      "type": "uint32"
+    },
+    {
+      "name": "x-disable-pcie",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "addr",
+      "description": "Slot and optional function number, example: 06.0 or 06",
+      "type": "int32"
+    },
+    {
+      "name": "any_layout",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "max_sectors",
+      "type": "uint32"
+    },
+    {
+      "name": "rombar",
+      "type": "uint32"
+    }
+  ],
+  "id": "libvirt-11"
 }
 
 {
@@ -1973,16 +2041,7 @@
 {
   "return": [
     {
-      "name": "bootindex",
-      "type": "int32"
-    },
-    {
-      "name": "command_serr_enable",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "multifunction",
+      "name": "share_intx",
       "description": "on/off",
       "type": "bool"
     },
@@ -1991,25 +2050,11 @@
       "type": "uint32"
     },
     {
-      "name": "romfile",
-      "type": "str"
-    },
-    {
-      "name": "addr",
-      "description": "Slot and optional function number, example: 06.0 or 06",
+      "name": "bootindex",
       "type": "int32"
     },
     {
-      "name": "configfd",
-      "type": "str"
-    },
-    {
-      "name": "share_intx",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "prefer_msi",
+      "name": "multifunction",
       "description": "on/off",
       "type": "bool"
     },
@@ -2017,6 +2062,29 @@
       "name": "host",
       "description": "Address (bus/device/function) of the host device, example: 04:10.0",
       "type": "str"
+    },
+    {
+      "name": "romfile",
+      "type": "str"
+    },
+    {
+      "name": "configfd",
+      "type": "str"
+    },
+    {
+      "name": "command_serr_enable",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "addr",
+      "description": "Slot and optional function number, example: 06.0 or 06",
+      "type": "int32"
+    },
+    {
+      "name": "prefer_msi",
+      "description": "on/off",
+      "type": "bool"
     }
   ],
   "id": "libvirt-18"
@@ -2024,12 +2092,33 @@
 
 {
   "return": [
+    {
+      "name": "x-pci-sub-device-id",
+      "type": "uint32"
+    },
+    {
+      "name": "x-no-kvm-msi",
+      "type": "bool"
+    },
+    {
+      "name": "rombar",
+      "type": "uint32"
+    },
+    {
+      "name": "x-vga",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "x-pci-vendor-id",
+      "type": "uint32"
+    },
     {
       "name": "bootindex",
       "type": "int32"
     },
     {
-      "name": "command_serr_enable",
+      "name": "x-req",
       "description": "on/off",
       "type": "bool"
     },
@@ -2038,31 +2127,25 @@
       "description": "on/off",
       "type": "bool"
     },
-    {
-      "name": "rombar",
-      "type": "uint32"
-    },
     {
       "name": "romfile",
       "type": "str"
     },
     {
-      "name": "addr",
-      "description": "Slot and optional function number, example: 06.0 or 06",
-      "type": "int32"
-    },
-    {
-      "name": "x-mmap",
+      "name": "x-no-kvm-intx",
       "type": "bool"
     },
     {
-      "name": "x-req",
-      "description": "on/off",
-      "type": "bool"
+      "name": "x-pci-device-id",
+      "type": "uint32"
     },
     {
-      "name": "x-vga",
-      "description": "on/off",
+      "name": "host",
+      "description": "Address (bus/device/function) of the host device, example: 04:10.0",
+      "type": "str"
+    },
+    {
+      "name": "x-no-kvm-msix",
       "type": "bool"
     },
     {
@@ -2070,9 +2153,22 @@
       "type": "uint32"
     },
     {
-      "name": "host",
-      "description": "Address (bus/device/function) of the host device, example: 04:10.0",
-      "type": "str"
+      "name": "command_serr_enable",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "addr",
+      "description": "Slot and optional function number, example: 06.0 or 06",
+      "type": "int32"
+    },
+    {
+      "name": "x-pci-sub-vendor-id",
+      "type": "uint32"
+    },
+    {
+      "name": "x-no-mmap",
+      "type": "bool"
     }
   ],
   "id": "libvirt-19"
@@ -2081,50 +2177,55 @@
 {
   "return": [
     {
-      "name": "bootindex",
-      "type": "int32"
-    },
-    {
-      "name": "lun",
-      "type": "uint32"
-    },
-    {
-      "name": "scsi-id",
-      "type": "uint32"
-    },
-    {
-      "name": "channel",
-      "type": "uint32"
-    },
-    {
-      "name": "max_io_size",
-      "type": "uint64"
-    },
-    {
-      "name": "max_unmap_size",
-      "type": "uint64"
+      "name": "serial",
+      "type": "str"
     },
     {
       "name": "port_index",
       "type": "uint16"
     },
-    {
-      "name": "port_wwn",
-      "type": "uint64"
-    },
-    {
-      "name": "wwn",
-      "type": "uint64"
-    },
     {
       "name": "dpofua",
       "description": "on/off",
       "type": "bool"
     },
     {
-      "name": "removable",
-      "description": "on/off",
-      "type": "bool"
+      "name": "bootindex",
+      "type": "int32"
+    },
+    {
+      "name": "logical_block_size",
+      "description": "A power of two between 512 and 32768",
+      "type": "uint16"
+    },
+    {
+      "name": "discard_granularity",
+      "type": "uint32"
+    },
+    {
+      "name": "lun",
+      "type": "uint32"
+    },
+    {
+      "name": "drive",
+      "description": "ID of a drive to use as a backend",
+      "type": "str"
+    },
+    {
+      "name": "port_wwn",
+      "type": "uint64"
+    },
+    {
+      "name": "max_unmap_size",
+      "type": "uint64"
+    },
+    {
+      "name": "opt_io_size",
+      "type": "uint32"
+    },
+    {
+      "name": "min_io_size",
+      "type": "uint16"
     },
     {
       "name": "product",
@@ -2135,39 +2236,34 @@
       "type": "str"
     },
     {
-      "name": "serial",
-      "type": "str"
+      "name": "channel",
+      "type": "uint32"
+    },
+    {
+      "name": "wwn",
+      "type": "uint64"
+    },
+    {
+      "name": "removable",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "scsi-id",
+      "type": "uint32"
     },
     {
       "name": "ver",
       "type": "str"
     },
-    {
-      "name": "discard_granularity",
-      "type": "uint32"
-    },
-    {
-      "name": "opt_io_size",
-      "type": "uint32"
-    },
-    {
-      "name": "min_io_size",
-      "type": "uint16"
-    },
     {
       "name": "physical_block_size",
       "description": "A power of two between 512 and 32768",
       "type": "uint16"
     },
     {
-      "name": "logical_block_size",
-      "description": "A power of two between 512 and 32768",
-      "type": "uint16"
-    },
-    {
-      "name": "drive",
-      "description": "ID of a drive to use as a backend",
-      "type": "str"
+      "name": "max_io_size",
+      "type": "uint64"
     }
   ],
   "id": "libvirt-20"
@@ -2175,34 +2271,28 @@
 
 {
   "return": [
-    {
-      "name": "bootindex",
-      "type": "int32"
-    },
-    {
-      "name": "unit",
-      "type": "uint32"
-    },
-    {
-      "name": "model",
-      "type": "str"
-    },
     {
       "name": "serial",
       "type": "str"
     },
     {
-      "name": "wwn",
-      "type": "uint64"
-    },
-    {
-      "name": "ver",
-      "type": "str"
+      "name": "logical_block_size",
+      "description": "A power of two between 512 and 32768",
+      "type": "uint16"
     },
     {
       "name": "discard_granularity",
       "type": "uint32"
     },
+    {
+      "name": "drive",
+      "description": "ID of a drive to use as a backend",
+      "type": "str"
+    },
+    {
+      "name": "bootindex",
+      "type": "int32"
+    },
     {
       "name": "opt_io_size",
       "type": "uint32"
@@ -2211,20 +2301,26 @@
       "name": "min_io_size",
       "type": "uint16"
     },
+    {
+      "name": "unit",
+      "type": "uint32"
+    },
+    {
+      "name": "wwn",
+      "type": "uint64"
+    },
+    {
+      "name": "model",
+      "type": "str"
+    },
+    {
+      "name": "ver",
+      "type": "str"
+    },
     {
       "name": "physical_block_size",
       "description": "A power of two between 512 and 32768",
       "type": "uint16"
-    },
-    {
-      "name": "logical_block_size",
-      "description": "A power of two between 512 and 32768",
-      "type": "uint16"
-    },
-    {
-      "name": "drive",
-      "description": "ID of a drive to use as a backend",
-      "type": "str"
     }
   ],
   "id": "libvirt-21"
@@ -2233,8 +2329,15 @@
 {
   "return": [
     {
-      "name": "command_serr_enable",
-      "description": "on/off",
+      "name": "memory-hotplug-support",
+      "type": "bool"
+    },
+    {
+      "name": "rombar",
+      "type": "uint32"
+    },
+    {
+      "name": "acpi-pci-hotplug-with-bridge-support",
       "type": "bool"
     },
     {
@@ -2242,31 +2345,10 @@
       "description": "on/off",
       "type": "bool"
     },
-    {
-      "name": "rombar",
-      "type": "uint32"
-    },
     {
       "name": "romfile",
       "type": "str"
     },
-    {
-      "name": "addr",
-      "description": "Slot and optional function number, example: 06.0 or 06",
-      "type": "int32"
-    },
-    {
-      "name": "memory-hotplug-support",
-      "type": "bool"
-    },
-    {
-      "name": "acpi-pci-hotplug-with-bridge-support",
-      "type": "bool"
-    },
-    {
-      "name": "s4_val",
-      "type": "uint8"
-    },
     {
       "name": "disable_s4",
       "type": "uint8"
@@ -2275,9 +2357,23 @@
       "name": "disable_s3",
       "type": "uint8"
     },
+    {
+      "name": "command_serr_enable",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "s4_val",
+      "type": "uint8"
+    },
     {
       "name": "smb_io_base",
       "type": "uint32"
+    },
+    {
+      "name": "addr",
+      "description": "Slot and optional function number, example: 06.0 or 06",
+      "type": "int32"
     }
   ],
   "id": "libvirt-22"
@@ -2286,29 +2382,24 @@
 {
   "return": [
     {
-      "name": "bootindex",
-      "type": "int32"
+      "name": "filter",
+      "type": "str"
     },
     {
       "name": "msos-desc",
       "description": "on/off",
       "type": "bool"
     },
-    {
-      "name": "full-path",
-      "description": "on/off",
-      "type": "bool"
-    },
     {
       "name": "serial",
       "type": "str"
     },
     {
-      "name": "port",
-      "type": "str"
+      "name": "bootindex",
+      "type": "int32"
     },
     {
-      "name": "filter",
+      "name": "port",
       "type": "str"
     },
     {
@@ -2319,6 +2410,11 @@
       "name": "chardev",
       "description": "ID of a chardev to use as a backend",
       "type": "str"
+    },
+    {
+      "name": "full-path",
+      "description": "on/off",
+      "type": "bool"
     }
   ],
   "id": "libvirt-23"
@@ -2327,8 +2423,12 @@
 {
   "return": [
     {
-      "name": "bootindex",
-      "type": "int32"
+      "name": "isobufs",
+      "type": "uint32"
+    },
+    {
+      "name": "hostaddr",
+      "type": "uint32"
     },
     {
       "name": "msos-desc",
@@ -2336,49 +2436,45 @@
       "type": "bool"
     },
     {
-      "name": "full-path",
-      "description": "on/off",
-      "type": "bool"
+      "name": "productid",
+      "type": "uint32"
     },
     {
       "name": "serial",
       "type": "str"
     },
+    {
+      "name": "bootindex",
+      "type": "int32"
+    },
+    {
+      "name": "isobsize",
+      "type": "uint32"
+    },
     {
       "name": "port",
       "type": "str"
     },
+    {
+      "name": "vendorid",
+      "type": "uint32"
+    },
     {
       "name": "pipeline",
       "description": "on/off",
       "type": "bool"
     },
-    {
-      "name": "loglevel",
-      "type": "uint32"
-    },
-    {
-      "name": "isobsize",
-      "type": "uint32"
-    },
-    {
-      "name": "isobufs",
-      "type": "uint32"
-    },
-    {
-      "name": "productid",
-      "type": "uint32"
-    },
-    {
-      "name": "vendorid",
-      "type": "uint32"
-    },
     {
       "name": "hostport",
       "type": "str"
     },
     {
-      "name": "hostaddr",
+      "name": "full-path",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "loglevel",
       "type": "uint32"
     },
     {
@@ -2396,11 +2492,12 @@
       "type": "int32"
     },
     {
-      "name": "lun",
-      "type": "uint32"
+      "name": "drive",
+      "description": "ID of a drive to use as a backend",
+      "type": "str"
     },
     {
-      "name": "scsi-id",
+      "name": "lun",
       "type": "uint32"
     },
     {
@@ -2408,9 +2505,8 @@
       "type": "uint32"
     },
     {
-      "name": "drive",
-      "description": "ID of a drive to use as a backend",
-      "type": "str"
+      "name": "scsi-id",
+      "type": "uint32"
     }
   ],
   "id": "libvirt-25"
@@ -2419,11 +2515,15 @@
 {
   "return": [
     {
-      "name": "pci-hole64-end",
-      "type": "int"
+      "name": "short_root_bus",
+      "type": "uint32"
     },
     {
-      "name": "pci-hole64-start",
+      "name": "pci-conf-idx[0]",
+      "type": "child<qemu:memory-region>"
+    },
+    {
+      "name": "pci-hole64-end",
       "type": "int"
     },
     {
@@ -2435,20 +2535,16 @@
       "type": "int"
     },
     {
-      "name": "pci-conf-data[0]",
-      "type": "child<qemu:memory-region>"
-    },
-    {
-      "name": "pci-conf-idx[0]",
-      "type": "child<qemu:memory-region>"
-    },
-    {
-      "name": "short_root_bus",
-      "type": "uint32"
+      "name": "pci-hole64-start",
+      "type": "int"
     },
     {
       "name": "pci-hole64-size",
       "type": "size"
+    },
+    {
+      "name": "pci-conf-data[0]",
+      "type": "child<qemu:memory-region>"
     }
   ],
   "id": "libvirt-26"
@@ -2457,32 +2553,8 @@
 {
   "return": [
     {
-      "name": "mcfg_size",
-      "type": "int"
-    },
-    {
-      "name": "pci-hole64-end",
-      "type": "int"
-    },
-    {
-      "name": "pci-hole64-start",
-      "type": "int"
-    },
-    {
-      "name": "pci-hole-end",
-      "type": "int"
-    },
-    {
-      "name": "pci-hole-start",
-      "type": "int"
-    },
-    {
-      "name": "mch",
-      "type": "child<mch>"
-    },
-    {
-      "name": "pci-conf-data[0]",
-      "type": "child<qemu:memory-region>"
+      "name": "short_root_bus",
+      "type": "uint32"
     },
     {
       "name": "pci-conf-idx[0]",
@@ -2493,16 +2565,40 @@
       "type": "child<qemu:memory-region>"
     },
     {
-      "name": "short_root_bus",
-      "type": "uint32"
+      "name": "mcfg_size",
+      "type": "int"
+    },
+    {
+      "name": "pci-hole64-end",
+      "type": "int"
+    },
+    {
+      "name": "pci-hole-end",
+      "type": "int"
+    },
+    {
+      "name": "pci-hole64-start",
+      "type": "int"
+    },
+    {
+      "name": "pci-hole-start",
+      "type": "int"
+    },
+    {
+      "name": "MCFG",
+      "type": "uint64"
+    },
+    {
+      "name": "mch",
+      "type": "child<mch>"
     },
     {
       "name": "pci-hole64-size",
       "type": "size"
     },
     {
-      "name": "MCFG",
-      "type": "uint64"
+      "name": "pci-conf-data[0]",
+      "type": "child<qemu:memory-region>"
     }
   ],
   "id": "libvirt-27"
@@ -2511,8 +2607,8 @@
 {
   "return": [
     {
-      "name": "bootindex",
-      "type": "int32"
+      "name": "serial",
+      "type": "str"
     },
     {
       "name": "msos-desc",
@@ -2520,27 +2616,23 @@
       "type": "bool"
     },
     {
-      "name": "full-path",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "serial",
-      "type": "str"
-    },
-    {
-      "name": "port",
-      "type": "str"
-    },
-    {
-      "name": "removable",
-      "description": "on/off",
-      "type": "bool"
+      "name": "logical_block_size",
+      "description": "A power of two between 512 and 32768",
+      "type": "uint16"
     },
     {
       "name": "discard_granularity",
       "type": "uint32"
     },
+    {
+      "name": "drive",
+      "description": "ID of a drive to use as a backend",
+      "type": "str"
+    },
+    {
+      "name": "bootindex",
+      "type": "int32"
+    },
     {
       "name": "opt_io_size",
       "type": "uint32"
@@ -2549,20 +2641,24 @@
       "name": "min_io_size",
       "type": "uint16"
     },
+    {
+      "name": "port",
+      "type": "str"
+    },
+    {
+      "name": "full-path",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "removable",
+      "description": "on/off",
+      "type": "bool"
+    },
     {
       "name": "physical_block_size",
       "description": "A power of two between 512 and 32768",
       "type": "uint16"
-    },
-    {
-      "name": "logical_block_size",
-      "description": "A power of two between 512 and 32768",
-      "type": "uint16"
-    },
-    {
-      "name": "drive",
-      "description": "ID of a drive to use as a backend",
-      "type": "str"
     }
   ],
   "id": "libvirt-28"
@@ -2570,13 +2666,13 @@
 
 {
   "return": [
-    {
-      "name": "lost_tick_policy",
-      "type": "LostTickPolicy"
-    },
     {
       "name": "iobase",
       "type": "uint32"
+    },
+    {
+      "name": "lost_tick_policy",
+      "type": "LostTickPolicy"
     }
   ],
   "id": "libvirt-29"
@@ -2585,11 +2681,11 @@
 {
   "return": [
     {
-      "name": "big-endian-framebuffer",
-      "type": "bool"
+      "name": "rombar",
+      "type": "uint32"
     },
     {
-      "name": "command_serr_enable",
+      "name": "mmio",
       "description": "on/off",
       "type": "bool"
     },
@@ -2599,31 +2695,31 @@
       "type": "bool"
     },
     {
-      "name": "rombar",
-      "type": "uint32"
+      "name": "qemu-extended-regs",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "big-endian-framebuffer",
+      "type": "bool"
     },
     {
       "name": "romfile",
       "type": "str"
     },
+    {
+      "name": "vgamem_mb",
+      "type": "uint32"
+    },
+    {
+      "name": "command_serr_enable",
+      "description": "on/off",
+      "type": "bool"
+    },
     {
       "name": "addr",
       "description": "Slot and optional function number, example: 06.0 or 06",
       "type": "int32"
-    },
-    {
-      "name": "qemu-extended-regs",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "mmio",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "vgamem_mb",
-      "type": "uint32"
     }
   ],
   "id": "libvirt-30"
@@ -2632,9 +2728,8 @@
 {
   "return": [
     {
-      "name": "command_serr_enable",
-      "description": "on/off",
-      "type": "bool"
+      "name": "rombar",
+      "type": "uint32"
     },
     {
       "name": "multifunction",
@@ -2642,21 +2737,22 @@
       "type": "bool"
     },
     {
-      "name": "rombar",
+      "name": "romfile",
+      "type": "str"
+    },
+    {
+      "name": "vgamem_mb",
       "type": "uint32"
     },
     {
-      "name": "romfile",
-      "type": "str"
+      "name": "command_serr_enable",
+      "description": "on/off",
+      "type": "bool"
     },
     {
       "name": "addr",
       "description": "Slot and optional function number, example: 06.0 or 06",
       "type": "int32"
-    },
-    {
-      "name": "vgamem_mb",
-      "type": "uint32"
     }
   ],
   "id": "libvirt-31"
@@ -2664,6 +2760,14 @@
 
 {
   "return": [
+    {
+      "name": "rombar",
+      "type": "uint32"
+    },
+    {
+      "name": "ram_size_mb",
+      "type": "uint32"
+    },
     {
       "name": "command_serr_enable",
       "description": "on/off",
@@ -2675,7 +2779,7 @@
       "type": "bool"
     },
     {
-      "name": "rombar",
+      "name": "vgamem_mb",
       "type": "uint32"
     },
     {
@@ -2688,15 +2792,7 @@
       "type": "int32"
     },
     {
-      "name": "surfaces",
-      "type": "int32"
-    },
-    {
-      "name": "vgamem_mb",
-      "type": "uint32"
-    },
-    {
-      "name": "vram64_size_mb",
+      "name": "debug",
       "type": "uint32"
     },
     {
@@ -2704,31 +2800,35 @@
       "type": "uint32"
     },
     {
-      "name": "ram_size_mb",
+      "name": "revision",
       "type": "uint32"
     },
     {
-      "name": "cmdlog",
+      "name": "ram_size",
+      "type": "uint32"
+    },
+    {
+      "name": "vram64_size_mb",
       "type": "uint32"
     },
     {
       "name": "guestdebug",
       "type": "uint32"
     },
-    {
-      "name": "debug",
-      "type": "uint32"
-    },
-    {
-      "name": "revision",
-      "type": "uint32"
-    },
     {
       "name": "vram_size",
       "type": "uint32"
     },
     {
-      "name": "ram_size",
+      "name": "surfaces",
+      "type": "int32"
+    },
+    {
+      "name": "max_outputs",
+      "type": "uint16"
+    },
+    {
+      "name": "cmdlog",
       "type": "uint32"
     }
   ],
@@ -2737,6 +2837,14 @@
 
 {
   "return": [
+    {
+      "name": "rombar",
+      "type": "uint32"
+    },
+    {
+      "name": "ram_size_mb",
+      "type": "uint32"
+    },
     {
       "name": "command_serr_enable",
       "description": "on/off",
@@ -2748,7 +2856,7 @@
       "type": "bool"
     },
     {
-      "name": "rombar",
+      "name": "vgamem_mb",
       "type": "uint32"
     },
     {
@@ -2761,15 +2869,7 @@
       "type": "int32"
     },
     {
-      "name": "surfaces",
-      "type": "int32"
-    },
-    {
-      "name": "vgamem_mb",
-      "type": "uint32"
-    },
-    {
-      "name": "vram64_size_mb",
+      "name": "debug",
       "type": "uint32"
     },
     {
@@ -2777,31 +2877,35 @@
       "type": "uint32"
     },
     {
-      "name": "ram_size_mb",
+      "name": "revision",
       "type": "uint32"
     },
     {
-      "name": "cmdlog",
+      "name": "ram_size",
+      "type": "uint32"
+    },
+    {
+      "name": "vram64_size_mb",
       "type": "uint32"
     },
     {
       "name": "guestdebug",
       "type": "uint32"
     },
-    {
-      "name": "debug",
-      "type": "uint32"
-    },
-    {
-      "name": "revision",
-      "type": "uint32"
-    },
     {
       "name": "vram_size",
       "type": "uint32"
     },
     {
-      "name": "ram_size",
+      "name": "surfaces",
+      "type": "int32"
+    },
+    {
+      "name": "max_outputs",
+      "type": "uint16"
+    },
+    {
+      "name": "cmdlog",
       "type": "uint32"
     }
   ],
@@ -2811,12 +2915,17 @@
 {
   "return": [
     {
-      "name": "any_layout",
+      "name": "disable-modern",
       "description": "on/off",
       "type": "bool"
     },
     {
-      "name": "notify_on_empty",
+      "name": "ioeventfd",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "virtio-pci-bus-master-bug-migration",
       "description": "on/off",
       "type": "bool"
     },
@@ -2831,20 +2940,7 @@
       "type": "bool"
     },
     {
-      "name": "virgl",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "max_outputs",
-      "type": "uint32"
-    },
-    {
-      "name": "virtio-backend",
-      "type": "child<virtio-gpu-device>"
-    },
-    {
-      "name": "command_serr_enable",
+      "name": "stats",
       "description": "on/off",
       "type": "bool"
     },
@@ -2854,22 +2950,32 @@
       "type": "bool"
     },
     {
-      "name": "rombar",
-      "type": "uint32"
+      "name": "migrate-extra",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "notify_on_empty",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "virgl",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "modern-pio-notify",
+      "description": "on/off",
+      "type": "bool"
     },
     {
       "name": "romfile",
       "type": "str"
     },
     {
-      "name": "addr",
-      "description": "Slot and optional function number, example: 06.0 or 06",
-      "type": "int32"
-    },
-    {
-      "name": "disable-modern",
-      "description": "on/off",
-      "type": "bool"
+      "name": "virtio-backend",
+      "type": "child<virtio-gpu-device>"
     },
     {
       "name": "disable-legacy",
@@ -2877,7 +2983,7 @@
       "type": "bool"
     },
     {
-      "name": "virtio-pci-bus-master-bug-migration",
+      "name": "command_serr_enable",
       "description": "on/off",
       "type": "bool"
     },
@@ -2886,92 +2992,109 @@
       "type": "uint32"
     },
     {
-      "name": "ioeventfd",
+      "name": "x-disable-pcie",
       "description": "on/off",
       "type": "bool"
+    },
+    {
+      "name": "addr",
+      "description": "Slot and optional function number, example: 06.0 or 06",
+      "type": "int32"
+    },
+    {
+      "name": "any_layout",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "max_outputs",
+      "type": "uint32"
+    },
+    {
+      "name": "rombar",
+      "type": "uint32"
     }
   ],
   "id": "libvirt-34"
 }
 
 {
-  "return":  [
+  "return": [
     {
-      "type": "bool",
-      "name": "memory-hotplug-support"
+      "name": "memory-hotplug-support",
+      "type": "bool"
     },
     {
-      "type": "uint32",
-      "name": "rombar"
+      "name": "rombar",
+      "type": "uint32"
     },
     {
-      "type": "uint32",
-      "name": "sci_int"
+      "name": "sci_int",
+      "type": "uint32"
     },
     {
-      "type": "uint32",
-      "name": "gpe0_blk_len"
+      "name": "gpe0_blk_len",
+      "type": "uint32"
     },
     {
-      "type": "uint32",
-      "name": "pm_io_base"
+      "name": "pm_io_base",
+      "type": "uint32"
     },
     {
-      "type": "bool",
-      "name": "noreboot"
+      "name": "noreboot",
+      "type": "bool"
     },
     {
-      "type": "bool",
       "name": "multifunction",
-      "description": "on/off"
+      "description": "on/off",
+      "type": "bool"
     },
     {
-      "type": "uint8",
-      "name": "disable_s4"
+      "name": "disable_s4",
+      "type": "uint8"
     },
     {
-      "type": "uint8",
-      "name": "acpi_disable_cmd"
+      "name": "acpi_disable_cmd",
+      "type": "uint8"
     },
     {
-      "type": "str",
-      "name": "romfile"
+      "name": "romfile",
+      "type": "str"
     },
     {
-      "type": "uint8",
-      "name": "disable_s3"
+      "name": "disable_s3",
+      "type": "uint8"
     },
     {
-      "type": "uint8",
-      "name": "s4_val"
+      "name": "s4_val",
+      "type": "uint8"
     },
     {
-      "type": "uint8",
-      "name": "acpi_enable_cmd"
+      "name": "acpi_enable_cmd",
+      "type": "uint8"
     },
     {
-      "type": "bool",
       "name": "command_serr_enable",
-      "description": "on/off"
+      "description": "on/off",
+      "type": "bool"
     },
     {
-      "type": "int32",
       "name": "addr",
-      "description": "Slot and optional function number, example: 06.0 or 06"
+      "description": "Slot and optional function number, example: 06.0 or 06",
+      "type": "int32"
     },
     {
-      "type": "bool",
-      "name": "enable_tco"
+      "name": "enable_tco",
+      "type": "bool"
     },
     {
-      "type": "uint32",
-      "name": "gpe0_blk"
+      "name": "gpe0_blk",
+      "type": "uint32"
     }
   ],
   "id": "libvirt-35"
 }
 
-
 {
   "return": [
     {
@@ -3097,14 +3220,14 @@
       "description": "on/off",
       "type": "bool"
     },
-    {
-      "name": "guest-stats-polling-interval",
-      "type": "int"
-    },
     {
       "name": "guest-stats",
       "type": "guest statistics"
     },
+    {
+      "name": "guest-stats-polling-interval",
+      "type": "int"
+    },
     {
       "name": "event_idx",
       "description": "on/off",
@@ -3120,53 +3243,80 @@
 }
 
 {
-    "return": [
-        {
-            "name": "msi",
-            "type": "on/off"
-        },
-        {
-            "name": "msix",
-            "type": "on/off"
-        },
-        {
-            "name": "superspeed-ports-first",
-            "type": "on/off"
-        },
-        {
-            "name": "force-pcie-endcap",
-            "type": "on/off"
-        },
-        {
-            "name": "streams",
-            "type": "on/off"
-        },
-        {
-            "name": "intrs",
-            "type": "uint32"
-        },
-        {
-            "name": "slots",
-            "type": "uint32"
-        },
-        {
-            "name": "2",
-            "type": "uint32"
-        },
-        {
-            "name": "p3",
-            "type": "uint32"
-        }
-    ]
+  "return": [
+    {
+      "name": "rombar",
+      "type": "uint32"
+    },
+    {
+      "name": "intrs",
+      "type": "uint32"
+    },
+    {
+      "name": "msix",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "multifunction",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "msi",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "superspeed-ports-first",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "streams",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "romfile",
+      "type": "str"
+    },
+    {
+      "name": "force-pcie-endcap",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "command_serr_enable",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "addr",
+      "description": "Slot and optional function number, example: 06.0 or 06",
+      "type": "int32"
+    },
+    {
+      "name": "p3",
+      "type": "uint32"
+    },
+    {
+      "name": "p2",
+      "type": "uint32"
+    },
+    {
+      "name": "slots",
+      "type": "uint32"
+    }
+  ],
+  "id": "libvirt-39"
 }
 
 {
   "return": [
     {
       "name": "pc-i440fx-2.4",
-      "is-default": true,
-      "cpu-max": 255,
-      "alias": "pc"
+      "cpu-max": 255
     },
     {
       "name": "pc-1.3",
@@ -3213,11 +3363,11 @@
       "cpu-max": 255
     },
     {
-      "name": "pc-i440fx-2.2",
+      "name": "pc-1.2",
       "cpu-max": 255
     },
     {
-      "name": "pc-1.2",
+      "name": "pc-i440fx-2.2",
       "cpu-max": 255
     },
     {
@@ -3232,6 +3382,11 @@
       "name": "pc-q35-1.4",
       "cpu-max": 255
     },
+    {
+      "name": "pc-q35-2.5",
+      "cpu-max": 255,
+      "alias": "q35"
+    },
     {
       "name": "pc-0.15",
       "cpu-max": 255
@@ -3248,6 +3403,12 @@
       "name": "pc-i440fx-1.4",
       "cpu-max": 255
     },
+    {
+      "name": "pc-i440fx-2.5",
+      "is-default": true,
+      "cpu-max": 255,
+      "alias": "pc"
+    },
     {
       "name": "pc-0.14",
       "cpu-max": 255
@@ -3274,8 +3435,7 @@
     },
     {
       "name": "pc-q35-2.4",
-      "cpu-max": 255,
-      "alias": "q35"
+      "cpu-max": 255
     },
     {
       "name": "pc-q35-2.3",
@@ -3286,7 +3446,7 @@
       "cpu-max": 255
     }
   ],
-  "id": "libvirt-39"
+  "id": "libvirt-40"
 }
 
 {
@@ -3376,7 +3536,7 @@
       "name": "qemu64"
     }
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-41"
 }
 
 {
@@ -3384,21 +3544,21 @@
     "enabled": false,
     "present": true
   },
-  "id": "libvirt-41"
+  "id": "libvirt-42"
 }
 
 {
   "return": [
     "tpm-tis"
   ],
-  "id": "libvirt-42"
+  "id": "libvirt-43"
 }
 
 {
   "return": [
     "passthrough"
   ],
-  "id": "libvirt-43"
+  "id": "libvirt-44"
 }
 
 {
@@ -3503,6 +3663,10 @@
           "name": "x509",
           "type": "string"
         },
+        {
+          "name": "tls-creds",
+          "type": "string"
+        },
         {
           "name": "websocket",
           "type": "string"
@@ -3600,6 +3764,10 @@
           "name": "password",
           "type": "string"
         },
+        {
+          "name": "unix",
+          "type": "boolean"
+        },
         {
           "name": "ipv6",
           "type": "boolean"
@@ -3623,6 +3791,11 @@
       ],
       "option": "spice"
     },
+    {
+      "parameters": [
+      ],
+      "option": "smbios"
+    },
     {
       "parameters": [
       ],
@@ -3700,11 +3873,11 @@
     },
     {
       "parameters": [
-      ],
-      "option": "smbios"
-    },
-    {
-      "parameters": [
+        {
+          "name": "string",
+          "help": "Sets content of the blob to be inserted from a string",
+          "type": "string"
+        },
         {
           "name": "file",
           "help": "Sets the name of the file from which\nthe fw_cfg blob will be loaded",
@@ -3737,6 +3910,14 @@
     },
     {
       "parameters": [
+        {
+          "name": "rrfile",
+          "type": "string"
+        },
+        {
+          "name": "rr",
+          "type": "string"
+        },
         {
           "name": "sleep",
           "type": "boolean"
@@ -3911,6 +4092,16 @@
     },
     {
       "parameters": [
+        {
+          "name": "dea-key-wrap",
+          "help": "enable/disable DEA key wrapping using the CPACF wrapping key",
+          "type": "boolean"
+        },
+        {
+          "name": "aes-key-wrap",
+          "help": "enable/disable AES key wrapping using the CPACF wrapping key",
+          "type": "boolean"
+        },
         {
           "name": "suppress-vmdesc",
           "help": "Set on to disable self-describing migration",
@@ -4283,6 +4474,16 @@
           "help": "bus number",
           "type": "number"
         },
+        {
+          "name": "stats-account-failed",
+          "help": "whether to account for failed I/O operations in the statistics",
+          "type": "boolean"
+        },
+        {
+          "name": "stats-account-invalid",
+          "help": "whether to account for invalid I/O operations in the statistics",
+          "type": "boolean"
+        },
         {
           "name": "detect-zeroes",
           "help": "try to optimize zero writes (off, on, unmap)",
@@ -4402,7 +4603,7 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-44"
+  "id": "libvirt-45"
 }
 
 {
@@ -4430,7 +4631,11 @@
     {
       "state": false,
       "capability": "events"
+    },
+    {
+      "state": false,
+      "capability": "x-postcopy-ram"
     }
   ],
-  "id": "libvirt-45"
+  "id": "libvirt-46"
 }
diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
index c08f7cc27a..4df48435c4 100644
--- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
@@ -29,6 +29,7 @@
   <flag name='drive-aio'/>
   <flag name='pci-multibus'/>
   <flag name='pci-bootindex'/>
+  <flag name='ccid-emulated'/>
   <flag name='ccid-passthru'/>
   <flag name='chardev-spicevmc'/>
   <flag name='virtio-tx-alg'/>
@@ -150,6 +151,8 @@
   <flag name='qxl-vga.vgamem_mb'/>
   <flag name='pc-dimm'/>
   <flag name='machine-vmport-opt'/>
+  <flag name='aes-key-wrap'/>
+  <flag name='dea-key-wrap'/>
   <flag name='pci-serial'/>
   <flag name='vhost-user-multiqueue'/>
   <flag name='migration-event'/>
@@ -159,6 +162,7 @@
   <flag name='rtl8139'/>
   <flag name='e1000'/>
   <flag name='virtio-net'/>
+  <flag name='gic-version'/>
   <flag name='incoming-defer'/>
   <flag name='virtio-gpu'/>
   <flag name='virtio-gpu.virgl'/>
@@ -178,7 +182,7 @@
   <flag name='nec-usb-xhci-ports'/>
   <flag name='virtio-scsi-pci.iothread'/>
   <flag name='name-guest'/>
-  <version>2004000</version>
+  <version>2005000</version>
   <kvmVersion>0</kvmVersion>
   <package></package>
   <arch>x86_64</arch>
@@ -210,7 +214,8 @@
   <cpu name='core2duo'/>
   <cpu name='phenom'/>
   <cpu name='qemu64'/>
-  <machine name='pc-i440fx-2.4' alias='pc' maxCpus='255'/>
+  <machine name='pc-i440fx-2.5' alias='pc' maxCpus='255'/>
+  <machine name='pc-i440fx-2.4' maxCpus='255'/>
   <machine name='pc-1.3' maxCpus='255'/>
   <machine name='pc-0.12' maxCpus='255'/>
   <machine name='pc-q35-1.6' maxCpus='255'/>
@@ -221,11 +226,12 @@
   <machine name='pc-q35-2.1' maxCpus='255'/>
   <machine name='pc-0.11' maxCpus='255'/>
   <machine name='pc-0.10' maxCpus='255'/>
-  <machine name='pc-i440fx-2.2' maxCpus='255'/>
   <machine name='pc-1.2' maxCpus='255'/>
+  <machine name='pc-i440fx-2.2' maxCpus='255'/>
   <machine name='isapc' maxCpus='1'/>
   <machine name='pc-i440fx-2.3' maxCpus='255'/>
   <machine name='pc-q35-1.4' maxCpus='255'/>
+  <machine name='pc-q35-2.5' alias='q35' maxCpus='255'/>
   <machine name='pc-0.15' maxCpus='255'/>
   <machine name='pc-i440fx-1.5' maxCpus='255'/>
   <machine name='pc-q35-2.0' maxCpus='255'/>
@@ -236,7 +242,7 @@
   <machine name='pc-q35-1.7' maxCpus='255'/>
   <machine name='pc-1.0' maxCpus='255'/>
   <machine name='pc-i440fx-2.0' maxCpus='255'/>
-  <machine name='pc-q35-2.4' alias='q35' maxCpus='255'/>
+  <machine name='pc-q35-2.4' maxCpus='255'/>
   <machine name='pc-q35-2.3' maxCpus='255'/>
   <machine name='pc-0.13' maxCpus='255'/>
 </qemuCaps>