From 750b83137b42330fcb93704aa2b5868b5ec31db2 Mon Sep 17 00:00:00 2001
From: Pavel Hrdina <phrdina@redhat.com>
Date: Sun, 22 May 2016 23:24:25 +0200
Subject: [PATCH] qemucapstest: update caps for qemu-2.6.0

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
---
 .../qemu_2.6.0.x86_64.xml                     |    2 +-
 .../caps_2.6.0.x86_64.replies                 | 2337 ++++++++++-------
 .../caps_2.6.0.x86_64.xml                     |   37 +-
 3 files changed, 1340 insertions(+), 1036 deletions(-)

diff --git a/tests/domaincapsschemadata/qemu_2.6.0.x86_64.xml b/tests/domaincapsschemadata/qemu_2.6.0.x86_64.xml
index f42d239584..c453ce35d3 100644
--- a/tests/domaincapsschemadata/qemu_2.6.0.x86_64.xml
+++ b/tests/domaincapsschemadata/qemu_2.6.0.x86_64.xml
@@ -1,7 +1,7 @@
 <domainCapabilities>
   <path>/usr/bin/qemu-system-x86_64</path>
   <domain>kvm</domain>
-  <machine>pc-i440fx-2.4</machine>
+  <machine>pc-i440fx-2.6</machine>
   <arch>x86_64</arch>
   <vcpu max='255'/>
   <os supported='yes'>
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies
index 583a5af1b9..68e64d896c 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies
@@ -2,8 +2,8 @@
   "QMP": {
     "version": {
       "qemu": {
-        "micro": 50,
-        "minor": 5,
+        "micro": 0,
+        "minor": 6,
         "major": 2
       },
       "package": ""
@@ -22,8 +22,8 @@
 {
   "return": {
     "qemu": {
-      "micro": 50,
-      "minor": 5,
+      "micro": 0,
+      "minor": 6,
       "major": 2
     },
     "package": ""
@@ -56,7 +56,7 @@
       "name": "block-set-write-threshold"
     },
     {
-      "name": "x-input-send-event"
+      "name": "input-send-event"
     },
     {
       "name": "trace-event-set-state"
@@ -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"
     },
@@ -259,6 +280,9 @@
     {
       "name": "change-backing-file"
     },
+    {
+      "name": "blockdev-mirror"
+    },
     {
       "name": "drive-mirror"
     },
@@ -268,6 +292,9 @@
     {
       "name": "blockdev-snapshot-internal-sync"
     },
+    {
+      "name": "blockdev-snapshot"
+    },
     {
       "name": "blockdev-snapshot-sync"
     },
@@ -325,6 +352,9 @@
     {
       "name": "netdev_add"
     },
+    {
+      "name": "query-dump"
+    },
     {
       "name": "query-dump-guest-memory-capability"
     },
@@ -343,6 +373,9 @@
     {
       "name": "query-migrate-cache-size"
     },
+    {
+      "name": "migrate-start-postcopy"
+    },
     {
       "name": "migrate-set-cache-size"
     },
@@ -424,7 +457,7 @@
 
 {
   "return": {
-    "fd": 11,
+    "fd": 14,
     "fdset-id": 0
   },
   "id": "libvirt-5"
@@ -441,89 +474,89 @@
 {
   "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_PASS"
+    },
+    {
+      "name": "MIGRATION"
+    },
+    {
+      "name": "MEM_UNPLUG_ERROR"
+    },
+    {
+      "name": "GUEST_PANICKED"
+    },
+    {
+      "name": "DUMP_COMPLETED"
+    },
     {
       "name": "DEVICE_TRAY_MOVED"
     },
+    {
+      "name": "DEVICE_DELETED"
+    },
     {
       "name": "BLOCK_WRITE_THRESHOLD"
     },
@@ -534,16 +567,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 +611,6 @@
     {
       "name": "Westmere-x86_64-cpu"
     },
-    {
-      "name": "e1000-82540em"
-    },
     {
       "name": "pci-serial-4x"
     },
@@ -587,12 +623,6 @@
     {
       "name": "iothread"
     },
-    {
-      "name": "pc-q35-2.3-machine"
-    },
-    {
-      "name": "icc-bridge"
-    },
     {
       "name": "cfi.pflash01"
     },
@@ -612,10 +642,10 @@
       "name": "isa-parallel"
     },
     {
-      "name": "pc-q35-2.4-machine"
+      "name": "i2c-bus"
     },
     {
-      "name": "i2c-bus"
+      "name": "pc-q35-2.4-machine"
     },
     {
       "name": "megasas"
@@ -624,10 +654,10 @@
       "name": "usb-braille"
     },
     {
-      "name": "vmware-svga"
+      "name": "mptsas1068"
     },
     {
-      "name": "pc-i440fx-2.0-machine"
+      "name": "vmware-svga"
     },
     {
       "name": "PIIX3-xen"
@@ -638,6 +668,9 @@
     {
       "name": "scsi-cd"
     },
+    {
+      "name": "pc-i440fx-2.0-machine"
+    },
     {
       "name": "isa-serial"
     },
@@ -653,6 +686,9 @@
     {
       "name": "host-x86_64-cpu"
     },
+    {
+      "name": "qemu64-x86_64-cpu"
+    },
     {
       "name": "pci-serial-2x"
     },
@@ -669,10 +705,10 @@
       "name": "virtio-net-pci"
     },
     {
-      "name": "pc-dimm"
+      "name": "hyperv-testdev"
     },
     {
-      "name": "pc-q35-1.7-machine"
+      "name": "pc-dimm"
     },
     {
       "name": "Haswell-noTSX-x86_64-cpu"
@@ -696,7 +732,7 @@
       "name": "virtio-vga"
     },
     {
-      "name": "qemu64-x86_64-cpu"
+      "name": "isa-ipmi-bt"
     },
     {
       "name": "rng-egd"
@@ -710,6 +746,9 @@
     {
       "name": "pc-1.1-machine"
     },
+    {
+      "name": "filter-buffer"
+    },
     {
       "name": "ich9-usb-ehci1"
     },
@@ -725,6 +764,9 @@
     {
       "name": "irq"
     },
+    {
+      "name": "ipmi-bmc-sim"
+    },
     {
       "name": "cirrus-vga"
     },
@@ -737,6 +779,9 @@
     {
       "name": "PCIE"
     },
+    {
+      "name": "vfio-amd-xgbe"
+    },
     {
       "name": "pentium3-x86_64-cpu"
     },
@@ -750,13 +795,10 @@
       "name": "kvm-pit"
     },
     {
-      "name": "pc-0.14-machine"
+      "name": "pc-i440fx-2.5-machine"
     },
     {
-      "name": "pc-i440fx-1.4-machine"
-    },
-    {
-      "name": "pc-q35-2.0-machine"
+      "name": "vhost-scsi-pci"
     },
     {
       "name": "usb-host"
@@ -765,7 +807,7 @@
       "name": "usb-bus"
     },
     {
-      "name": "vhost-scsi-pci"
+      "name": "pc-i440fx-1.4-machine"
     },
     {
       "name": "usb-kbd"
@@ -785,26 +827,35 @@
     {
       "name": "isa-applesmc"
     },
+    {
+      "name": "pc-i440fx-2.6-machine"
+    },
     {
       "name": "kvm-pci-assign"
     },
     {
       "name": "i82559er"
     },
+    {
+      "name": "usb-bt-dongle"
+    },
     {
       "name": "q35-pcihost"
     },
     {
       "name": "e1000-82545em"
     },
+    {
+      "name": "ipmi-interface"
+    },
+    {
+      "name": "pc-0.14-machine"
+    },
     {
       "name": "pc-i440fx-1.5-machine"
     },
     {
-      "name": "usb-bt-dongle"
-    },
-    {
-      "name": "AC97"
+      "name": "e1000-82544gc"
     },
     {
       "name": "i6300esb"
@@ -813,7 +864,7 @@
       "name": "mc146818rtc"
     },
     {
-      "name": "e1000-82544gc"
+      "name": "AC97"
     },
     {
       "name": "PIIX4_PM"
@@ -827,6 +878,9 @@
     {
       "name": "virtio-tablet-device"
     },
+    {
+      "name": "filter-redirector"
+    },
     {
       "name": "kvm-ioapic"
     },
@@ -848,12 +902,21 @@
     {
       "name": "sb16"
     },
+    {
+      "name": "qio-channel-buffer"
+    },
+    {
+      "name": "qemu-console"
+    },
     {
       "name": "pc-0.15-machine"
     },
     {
       "name": "usb-mouse"
     },
+    {
+      "name": "filter-dump"
+    },
     {
       "name": "piix3-usb-uhci"
     },
@@ -872,6 +935,9 @@
     {
       "name": "hda-output"
     },
+    {
+      "name": "pc-q35-2.5-machine"
+    },
     {
       "name": "SUNW,fdtwo"
     },
@@ -879,16 +945,16 @@
       "name": "tpci200"
     },
     {
-      "name": "Opteron_G4-x86_64-cpu"
+      "name": "i8257"
     },
     {
-      "name": "pc-q35-1.4-machine"
+      "name": "Opteron_G4-x86_64-cpu"
     },
     {
       "name": "virtio-mmio"
     },
     {
-      "name": "qemu-console"
+      "name": "filter-mirror"
     },
     {
       "name": "isa-i8259"
@@ -902,6 +968,15 @@
     {
       "name": "virtio-net-device"
     },
+    {
+      "name": "sd-bus"
+    },
+    {
+      "name": "qio-channel-file"
+    },
+    {
+      "name": "tls-creds-anon"
+    },
     {
       "name": "usb-hub"
     },
@@ -912,29 +987,41 @@
       "name": "hda-duplex"
     },
     {
-      "name": "pc-i440fx-2.3-machine"
+      "name": "igd-passthrough-i440FX"
     },
     {
       "name": "virtio-keyboard-pci"
     },
+    {
+      "name": "igd-passthrough-isa-bridge"
+    },
+    {
+      "name": "nec-usb-xhci"
+    },
+    {
+      "name": "megasas-gen2"
+    },
     {
       "name": "pci-ohci"
     },
+    {
+      "name": "input-linux"
+    },
+    {
+      "name": "xio3130-downstream"
+    },
     {
       "name": "isapc-machine"
     },
     {
       "name": "ipoctal232"
     },
-    {
-      "name": "pc-1.2-machine"
-    },
-    {
-      "name": "xio3130-downstream"
-    },
     {
       "name": "ide-cd"
     },
+    {
+      "name": "apic"
+    },
     {
       "name": "pc-i440fx-2.2-machine"
     },
@@ -942,19 +1029,16 @@
       "name": "isabus-bridge"
     },
     {
-      "name": "nec-usb-xhci"
+      "name": "isa-ipmi-kcs"
     },
     {
       "name": "memory-backend-file"
     },
-    {
-      "name": "isa-ide"
-    },
     {
       "name": "virtio-keyboard-device"
     },
     {
-      "name": "megasas-gen2"
+      "name": "isa-ide"
     },
     {
       "name": "isa-vga"
@@ -962,6 +1046,9 @@
     {
       "name": "qemu:memory-region"
     },
+    {
+      "name": "ipmi-bmc-extern"
+    },
     {
       "name": "rng-random"
     },
@@ -984,22 +1071,25 @@
       "name": "tpm-passthrough"
     },
     {
-      "name": "apic"
+      "name": "pc-1.2-machine"
     },
     {
       "name": "isa-debug-exit"
     },
     {
-      "name": "pc-0.10-machine"
+      "name": "Opteron_G1-x86_64-cpu"
     },
     {
       "name": "pc-testdev"
     },
     {
-      "name": "rocker"
+      "name": "pc-0.10-machine"
     },
     {
-      "name": "Opteron_G1-x86_64-cpu"
+      "name": "pc-i440fx-2.3-machine"
+    },
+    {
+      "name": "rocker"
     },
     {
       "name": "sga"
@@ -1016,6 +1106,9 @@
     {
       "name": "adlib"
     },
+    {
+      "name": "qio-channel-command"
+    },
     {
       "name": "lsi53c895a"
     },
@@ -1041,10 +1134,10 @@
       "name": "fw_cfg_io"
     },
     {
-      "name": "ioh3420"
+      "name": "usb-net"
     },
     {
-      "name": "pc-q35-2.1-machine"
+      "name": "ioh3420"
     },
     {
       "name": "cs4231a"
@@ -1055,6 +1148,9 @@
     {
       "name": "nvme"
     },
+    {
+      "name": "ib700"
+    },
     {
       "name": "i82801b11-bridge"
     },
@@ -1065,7 +1161,10 @@
       "name": "fw-path-provider"
     },
     {
-      "name": "usb-net"
+      "name": "usb-ccid"
+    },
+    {
+      "name": "usb-tablet"
     },
     {
       "name": "pci-bridge-seat"
@@ -1074,16 +1173,13 @@
       "name": "mch"
     },
     {
-      "name": "usb-tablet"
+      "name": "sdhci-bus"
     },
     {
       "name": "vhost-scsi"
     },
     {
-      "name": "usb-ccid"
-    },
-    {
-      "name": "pc-i440fx-1.7-machine"
+      "name": "isa-dma"
     },
     {
       "name": "tcg-accel"
@@ -1092,7 +1188,7 @@
       "name": "virtio-mmio-bus"
     },
     {
-      "name": "pc-q35-2.2-machine"
+      "name": "ich9-usb-uhci2"
     },
     {
       "name": "usb-bot"
@@ -1107,22 +1203,28 @@
       "name": "accel"
     },
     {
-      "name": "pc-i440fx-1.6-machine"
+      "name": "pxb-pcie-bus"
     },
     {
-      "name": "kvmclock"
+      "name": "pc-i440fx-1.6-machine"
     },
     {
       "name": "lsi53c810"
     },
+    {
+      "name": "kvmclock"
+    },
     {
       "name": "isa-cirrus-vga"
     },
+    {
+      "name": "ich9-usb-uhci4"
+    },
     {
       "name": "virtio-serial-bus"
     },
     {
-      "name": "ib700"
+      "name": "nvdimm"
     },
     {
       "name": "SandyBridge-x86_64-cpu"
@@ -1136,9 +1238,6 @@
     {
       "name": "ccid-card-passthru"
     },
-    {
-      "name": "ich9-usb-uhci5"
-    },
     {
       "name": "qxl"
     },
@@ -1149,7 +1248,7 @@
       "name": "ich9-usb-uhci6"
     },
     {
-      "name": "pci-bridge"
+      "name": "pc-i440fx-1.7-machine"
     },
     {
       "name": "virtio-serial-device"
@@ -1161,7 +1260,10 @@
       "name": "ICH9 SMB"
     },
     {
-      "name": "ich9-usb-uhci4"
+      "name": "ich9-usb-uhci5"
+    },
+    {
+      "name": "pxb-pcie"
     },
     {
       "name": "piix3-ide-xen"
@@ -1169,9 +1271,6 @@
     {
       "name": "virtio-input-host-device"
     },
-    {
-      "name": "icc-bus"
-    },
     {
       "name": "vmxnet3"
     },
@@ -1184,15 +1283,18 @@
     {
       "name": "pci-testdev"
     },
-    {
-      "name": "ich9-usb-uhci2"
-    },
     {
       "name": "ich9-usb-uhci1"
     },
     {
       "name": "x3130-upstream"
     },
+    {
+      "name": "pci-bridge"
+    },
+    {
+      "name": "SCSI"
+    },
     {
       "name": "none-machine"
     },
@@ -1200,7 +1302,7 @@
       "name": "sysbus-fdc"
     },
     {
-      "name": "SCSI"
+      "name": "allwinner-ahci"
     },
     {
       "name": "n270-x86_64-cpu"
@@ -1209,11 +1311,17 @@
       "name": "pci-serial"
     },
     {
-      "name": "pc-q35-1.5-machine"
+      "name": "pc-q35-2.6-machine"
     },
     {
       "name": "athlon-x86_64-cpu"
     },
+    {
+      "name": "tls-creds-x509"
+    },
+    {
+      "name": "ccid-card-emulated"
+    },
     {
       "name": "ISA"
     },
@@ -1287,10 +1395,10 @@
       "name": "virtio-serial-pci"
     },
     {
-      "name": "pc-q35-1.6-machine"
+      "name": "usb-serial"
     },
     {
-      "name": "virtio-input-host-pci"
+      "name": "qio-channel-websock"
     },
     {
       "name": "virtio-pci-bus"
@@ -1298,6 +1406,9 @@
     {
       "name": "pentium2-x86_64-cpu"
     },
+    {
+      "name": "virtio-input-host-pci"
+    },
     {
       "name": "nmi"
     },
@@ -1308,7 +1419,7 @@
       "name": "i82558a"
     },
     {
-      "name": "pc-0.12-machine"
+      "name": "virtio-rng-device"
     },
     {
       "name": "am53c974"
@@ -1322,9 +1433,6 @@
     {
       "name": "pxb"
     },
-    {
-      "name": "pxb-pcie"
-    },
     {
       "name": "kvm64-x86_64-cpu"
     },
@@ -1338,7 +1446,10 @@
       "name": "ne2k_isa"
     },
     {
-      "name": "pc-1.3-machine"
+      "name": "qio-channel-tls"
+    },
+    {
+      "name": "vt82c686b-usb-uhci"
     },
     {
       "name": "HDA"
@@ -1347,31 +1458,31 @@
       "name": "usb-storage"
     },
     {
-      "name": "usb-serial"
+      "name": "pc-1.3-machine"
     },
     {
       "name": "usb-uas"
     },
     {
-      "name": "pc-i440fx-2.4-machine"
+      "name": "usb-redir"
     },
     {
       "name": "sysbus-ohci"
     },
     {
-      "name": "usb-redir"
+      "name": "pc-i440fx-2.4-machine"
     },
     {
       "name": "i82801"
     },
     {
-      "name": "Broadwell-noTSX-x86_64-cpu"
+      "name": "i82557b"
     },
     {
       "name": "i82557c"
     },
     {
-      "name": "i82557b"
+      "name": "Broadwell-noTSX-x86_64-cpu"
     },
     {
       "name": "i82557a"
@@ -1404,10 +1515,13 @@
       "name": "ich9-ahci"
     },
     {
-      "name": "virtio-rng-device"
+      "name": "isa-fdc"
     },
     {
-      "name": "isa-fdc"
+      "name": "sd-card"
+    },
+    {
+      "name": "pc-0.12-machine"
     },
     {
       "name": "kvm32-x86_64-cpu"
@@ -1425,11 +1539,17 @@
       "name": "virtio-gpu-pci"
     },
     {
-      "name": "vt82c686b-usb-uhci"
+      "name": "ivshmem-plain"
     },
     {
       "name": "secondary-vga"
     },
+    {
+      "name": "ivshmem-doorbell"
+    },
+    {
+      "name": "qio-channel-socket"
+    },
     {
       "name": "pentium-x86_64-cpu"
     },
@@ -1443,8 +1563,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",
@@ -1456,117 +1660,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"
     },
@@ -1576,17 +1711,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"
@@ -1594,170 +1724,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",
@@ -1769,26 +1772,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"
     },
@@ -1797,130 +1905,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": "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"
+  "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"
 }
 
 {
@@ -1974,16 +2119,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"
     },
@@ -1992,25 +2128,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"
     },
@@ -2018,6 +2140,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"
@@ -2025,12 +2170,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"
     },
@@ -2039,31 +2205,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"
     },
     {
@@ -2071,9 +2231,26 @@
       "type": "uint32"
     },
     {
-      "name": "host",
-      "description": "Address (bus/device/function) of the host device, example: 04:10.0",
+      "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": "sysfsdev",
       "type": "str"
+    },
+    {
+      "name": "x-no-mmap",
+      "type": "bool"
     }
   ],
   "id": "libvirt-19"
@@ -2082,50 +2259,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",
@@ -2136,39 +2318,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"
@@ -2176,34 +2353,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"
@@ -2212,20 +2383,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"
@@ -2234,8 +2411,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"
     },
     {
@@ -2243,31 +2427,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"
@@ -2276,9 +2439,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"
@@ -2287,29 +2464,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"
     },
     {
@@ -2320,6 +2492,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"
@@ -2328,8 +2505,12 @@
 {
   "return": [
     {
-      "name": "bootindex",
-      "type": "int32"
+      "name": "isobufs",
+      "type": "uint32"
+    },
+    {
+      "name": "hostaddr",
+      "type": "uint32"
     },
     {
       "name": "msos-desc",
@@ -2337,49 +2518,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"
     },
     {
@@ -2397,11 +2574,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"
     },
     {
@@ -2409,9 +2587,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"
@@ -2420,11 +2597,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"
     },
     {
@@ -2436,20 +2617,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"
@@ -2458,32 +2635,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]",
@@ -2494,16 +2647,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"
@@ -2512,8 +2689,8 @@
 {
   "return": [
     {
-      "name": "bootindex",
-      "type": "int32"
+      "name": "serial",
+      "type": "str"
     },
     {
       "name": "msos-desc",
@@ -2521,27 +2698,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"
@@ -2550,20 +2723,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"
@@ -2571,13 +2748,13 @@
 
 {
   "return": [
-    {
-      "name": "lost_tick_policy",
-      "type": "LostTickPolicy"
-    },
     {
       "name": "iobase",
       "type": "uint32"
+    },
+    {
+      "name": "lost_tick_policy",
+      "type": "LostTickPolicy"
     }
   ],
   "id": "libvirt-29"
@@ -2586,11 +2763,11 @@
 {
   "return": [
     {
-      "name": "big-endian-framebuffer",
-      "type": "bool"
+      "name": "rombar",
+      "type": "uint32"
     },
     {
-      "name": "command_serr_enable",
+      "name": "mmio",
       "description": "on/off",
       "type": "bool"
     },
@@ -2600,31 +2777,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"
@@ -2633,9 +2810,8 @@
 {
   "return": [
     {
-      "name": "command_serr_enable",
-      "description": "on/off",
-      "type": "bool"
+      "name": "rombar",
+      "type": "uint32"
     },
     {
       "name": "multifunction",
@@ -2643,21 +2819,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"
@@ -2665,6 +2842,14 @@
 
 {
   "return": [
+    {
+      "name": "rombar",
+      "type": "uint32"
+    },
+    {
+      "name": "ram_size_mb",
+      "type": "uint32"
+    },
     {
       "name": "command_serr_enable",
       "description": "on/off",
@@ -2676,7 +2861,7 @@
       "type": "bool"
     },
     {
-      "name": "rombar",
+      "name": "vgamem_mb",
       "type": "uint32"
     },
     {
@@ -2689,15 +2874,7 @@
       "type": "int32"
     },
     {
-      "name": "surfaces",
-      "type": "int32"
-    },
-    {
-      "name": "vgamem_mb",
-      "type": "uint32"
-    },
-    {
-      "name": "vram64_size_mb",
+      "name": "debug",
       "type": "uint32"
     },
     {
@@ -2705,31 +2882,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"
     }
   ],
@@ -2738,6 +2919,14 @@
 
 {
   "return": [
+    {
+      "name": "rombar",
+      "type": "uint32"
+    },
+    {
+      "name": "ram_size_mb",
+      "type": "uint32"
+    },
     {
       "name": "command_serr_enable",
       "description": "on/off",
@@ -2749,7 +2938,7 @@
       "type": "bool"
     },
     {
-      "name": "rombar",
+      "name": "vgamem_mb",
       "type": "uint32"
     },
     {
@@ -2762,15 +2951,7 @@
       "type": "int32"
     },
     {
-      "name": "surfaces",
-      "type": "int32"
-    },
-    {
-      "name": "vgamem_mb",
-      "type": "uint32"
-    },
-    {
-      "name": "vram64_size_mb",
+      "name": "debug",
       "type": "uint32"
     },
     {
@@ -2778,31 +2959,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"
     }
   ],
@@ -2812,12 +2997,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"
     },
@@ -2832,20 +3022,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"
     },
@@ -2855,22 +3032,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",
@@ -2878,7 +3065,7 @@
       "type": "bool"
     },
     {
-      "name": "virtio-pci-bus-master-bug-migration",
+      "name": "command_serr_enable",
       "description": "on/off",
       "type": "bool"
     },
@@ -2887,92 +3074,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": [
     {
@@ -3098,14 +3302,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",
@@ -3121,88 +3325,104 @@
 }
 
 {
-    "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-0.12",
+      "cpu-max": 255
+    },
     {
       "name": "pc-i440fx-2.4",
-      "is-default": true,
-      "cpu-max": 255,
-      "alias": "pc"
+      "cpu-max": 255
     },
     {
       "name": "pc-1.3",
       "cpu-max": 255
     },
     {
-      "name": "pc-0.12",
-      "cpu-max": 255
-    },
-    {
-      "name": "pc-q35-1.6",
-      "cpu-max": 255
-    },
-    {
-      "name": "pc-q35-1.5",
-      "cpu-max": 255
+      "name": "pc-q35-2.6",
+      "cpu-max": 255,
+      "alias": "q35"
     },
     {
       "name": "none",
       "cpu-max": 1
     },
-    {
-      "name": "pc-i440fx-1.6",
-      "cpu-max": 255
-    },
-    {
-      "name": "pc-q35-2.2",
-      "cpu-max": 255
-    },
     {
       "name": "pc-i440fx-1.7",
       "cpu-max": 255
     },
     {
-      "name": "pc-q35-2.1",
+      "name": "pc-i440fx-1.6",
       "cpu-max": 255
     },
     {
@@ -3210,27 +3430,27 @@
       "cpu-max": 255
     },
     {
-      "name": "pc-0.10",
+      "name": "pc-i440fx-2.3",
       "cpu-max": 255
     },
     {
-      "name": "pc-i440fx-2.2",
+      "name": "pc-0.10",
       "cpu-max": 255
     },
     {
       "name": "pc-1.2",
       "cpu-max": 255
     },
+    {
+      "name": "pc-i440fx-2.2",
+      "cpu-max": 255
+    },
     {
       "name": "isapc",
       "cpu-max": 1
     },
     {
-      "name": "pc-i440fx-2.3",
-      "cpu-max": 255
-    },
-    {
-      "name": "pc-q35-1.4",
+      "name": "pc-q35-2.5",
       "cpu-max": 255
     },
     {
@@ -3242,15 +3462,21 @@
       "cpu-max": 255
     },
     {
-      "name": "pc-q35-2.0",
+      "name": "pc-0.14",
       "cpu-max": 255
     },
+    {
+      "name": "pc-i440fx-2.6",
+      "is-default": true,
+      "cpu-max": 255,
+      "alias": "pc"
+    },
     {
       "name": "pc-i440fx-1.4",
       "cpu-max": 255
     },
     {
-      "name": "pc-0.14",
+      "name": "pc-i440fx-2.5",
       "cpu-max": 255
     },
     {
@@ -3261,10 +3487,6 @@
       "name": "pc-i440fx-2.1",
       "cpu-max": 255
     },
-    {
-      "name": "pc-q35-1.7",
-      "cpu-max": 255
-    },
     {
       "name": "pc-1.0",
       "cpu-max": 255
@@ -3275,11 +3497,6 @@
     },
     {
       "name": "pc-q35-2.4",
-      "cpu-max": 255,
-      "alias": "q35"
-    },
-    {
-      "name": "pc-q35-2.3",
       "cpu-max": 255
     },
     {
@@ -3287,7 +3504,7 @@
       "cpu-max": 255
     }
   ],
-  "id": "libvirt-39"
+  "id": "libvirt-40"
 }
 
 {
@@ -3377,7 +3594,7 @@
       "name": "qemu64"
     }
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-41"
 }
 
 {
@@ -3385,21 +3602,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"
 }
 
 {
@@ -3421,6 +3638,11 @@
           "help": "HeaderDigest setting. {CRC32C|CRC32C-NONE|NONE-CRC32C|NONE}",
           "type": "string"
         },
+        {
+          "name": "password-secret",
+          "help": "ID of the secret providing password for CHAP authentication to target",
+          "type": "string"
+        },
         {
           "name": "password",
           "help": "password for CHAP authentication to target",
@@ -3504,6 +3726,10 @@
           "name": "x509",
           "type": "string"
         },
+        {
+          "name": "tls-creds",
+          "type": "string"
+        },
         {
           "name": "websocket",
           "type": "string"
@@ -3605,6 +3831,10 @@
           "name": "password",
           "type": "string"
         },
+        {
+          "name": "unix",
+          "type": "boolean"
+        },
         {
           "name": "ipv6",
           "type": "boolean"
@@ -3628,6 +3858,11 @@
       ],
       "option": "spice"
     },
+    {
+      "parameters": [
+      ],
+      "option": "smbios"
+    },
     {
       "parameters": [
       ],
@@ -3705,11 +3940,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",
@@ -3742,6 +3977,14 @@
     },
     {
       "parameters": [
+        {
+          "name": "rrfile",
+          "type": "string"
+        },
+        {
+          "name": "rr",
+          "type": "string"
+        },
         {
           "name": "sleep",
           "type": "boolean"
@@ -3916,6 +4159,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",
@@ -4026,6 +4279,10 @@
         {
           "name": "events",
           "type": "string"
+        },
+        {
+          "name": "enable",
+          "type": "string"
         }
       ],
       "option": "trace"
@@ -4102,9 +4359,17 @@
     },
     {
       "parameters": [
+        {
+          "name": "logappend",
+          "type": "boolean"
+        },
+        {
+          "name": "logfile",
+          "type": "string"
+        },
         {
           "name": "append",
-          "type": "bool"
+          "type": "boolean"
         },
         {
           "name": "chardev",
@@ -4146,6 +4411,10 @@
           "name": "width",
           "type": "number"
         },
+        {
+          "name": "tls-creds",
+          "type": "string"
+        },
         {
           "name": "telnet",
           "type": "boolean"
@@ -4292,6 +4561,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)",
@@ -4307,6 +4586,36 @@
           "help": "when limiting by iops max size of an I/O in bytes",
           "type": "number"
         },
+        {
+          "name": "throttling.bps-write-max-length",
+          "help": "length of the bps-write-max burst period, in seconds",
+          "type": "number"
+        },
+        {
+          "name": "throttling.bps-read-max-length",
+          "help": "length of the bps-read-max burst period, in seconds",
+          "type": "number"
+        },
+        {
+          "name": "throttling.bps-total-max-length",
+          "help": "length of the bps-total-max burst period, in seconds",
+          "type": "number"
+        },
+        {
+          "name": "throttling.iops-write-max-length",
+          "help": "length of the iops-write-max burst period, in seconds",
+          "type": "number"
+        },
+        {
+          "name": "throttling.iops-read-max-length",
+          "help": "length of the iops-read-max burst period, in seconds",
+          "type": "number"
+        },
+        {
+          "name": "throttling.iops-total-max-length",
+          "help": "length of the iops-total-max burst period, in seconds",
+          "type": "number"
+        },
         {
           "name": "throttling.bps-write-max",
           "help": "total bytes write burst",
@@ -4377,26 +4686,16 @@
           "help": "disk format (raw, qcow2, ...)",
           "type": "string"
         },
+        {
+          "name": "cache.writeback",
+          "help": "Enable writeback mode",
+          "type": "boolean"
+        },
         {
           "name": "aio",
           "help": "host AIO implementation (threads, native)",
           "type": "string"
         },
-        {
-          "name": "cache.no-flush",
-          "help": "ignore any flush requests for the device",
-          "type": "boolean"
-        },
-        {
-          "name": "cache.direct",
-          "help": "enables use of O_DIRECT (bypass the host page cache)",
-          "type": "boolean"
-        },
-        {
-          "name": "cache.writeback",
-          "help": "enables writeback mode for any caches",
-          "type": "boolean"
-        },
         {
           "name": "discard",
           "help": "discard operation (ignore/off, unmap/on)",
@@ -4411,7 +4710,7 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-44"
+  "id": "libvirt-45"
 }
 
 {
@@ -4439,7 +4738,11 @@
     {
       "state": false,
       "capability": "events"
+    },
+    {
+      "state": false,
+      "capability": "postcopy-ram"
     }
   ],
-  "id": "libvirt-45"
+  "id": "libvirt-46"
 }
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
index 9bdcb76cd7..8af0894369 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.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'/>
@@ -172,9 +175,11 @@
   <flag name='ich9-disable-s4'/>
   <flag name='vserport-change-event'/>
   <flag name='virtio-balloon-pci.deflate-on-oom'/>
+  <flag name='mptsas1068'/>
   <flag name='spice-gl'/>
   <flag name='qxl.vram64_size_mb'/>
   <flag name='qxl-vga.vram64_size_mb'/>
+  <flag name='chardev-logfile'/>
   <flag name='debug-threads'/>
   <flag name='secret'/>
   <flag name='pxb'/>
@@ -183,7 +188,7 @@
   <flag name='nec-usb-xhci-ports'/>
   <flag name='virtio-scsi-pci.iothread'/>
   <flag name='name-guest'/>
-  <version>2005050</version>
+  <version>2006000</version>
   <kvmVersion>0</kvmVersion>
   <package></package>
   <arch>x86_64</arch>
@@ -215,33 +220,29 @@
   <cpu name='core2duo'/>
   <cpu name='phenom'/>
   <cpu name='qemu64'/>
-  <machine name='pc-i440fx-2.4' alias='pc' maxCpus='255'/>
-  <machine name='pc-1.3' maxCpus='255'/>
+  <machine name='pc-i440fx-2.6' alias='pc' maxCpus='255'/>
   <machine name='pc-0.12' maxCpus='255'/>
-  <machine name='pc-q35-1.6' maxCpus='255'/>
-  <machine name='pc-q35-1.5' maxCpus='255'/>
-  <machine name='pc-i440fx-1.6' maxCpus='255'/>
-  <machine name='pc-q35-2.2' maxCpus='255'/>
+  <machine name='pc-i440fx-2.4' maxCpus='255'/>
+  <machine name='pc-1.3' maxCpus='255'/>
+  <machine name='pc-q35-2.6' alias='q35' maxCpus='255'/>
   <machine name='pc-i440fx-1.7' maxCpus='255'/>
-  <machine name='pc-q35-2.1' maxCpus='255'/>
+  <machine name='pc-i440fx-1.6' 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='isapc' maxCpus='1'/>
   <machine name='pc-i440fx-2.3' maxCpus='255'/>
-  <machine name='pc-q35-1.4' maxCpus='255'/>
+  <machine name='pc-0.10' 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-q35-2.5' 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'/>
-  <machine name='pc-i440fx-1.4' maxCpus='255'/>
   <machine name='pc-0.14' maxCpus='255'/>
+  <machine name='pc-i440fx-1.4' maxCpus='255'/>
+  <machine name='pc-i440fx-2.5' maxCpus='255'/>
   <machine name='pc-1.1' maxCpus='255'/>
   <machine name='pc-i440fx-2.1' maxCpus='255'/>
-  <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.3' maxCpus='255'/>
+  <machine name='pc-q35-2.4' maxCpus='255'/>
   <machine name='pc-0.13' maxCpus='255'/>
 </qemuCaps>