From 6815c9e0eb742c62e04413502dfaa0680e723adc Mon Sep 17 00:00:00 2001
From: Pavel Hrdina <phrdina@redhat.com>
Date: Sun, 22 May 2016 23:21:09 +0200
Subject: [PATCH] qemucapstest: update caps for qemu-1.3.1

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
---
 .../caps_1.3.1.x86_64.replies                 | 4165 +++++++++--------
 .../caps_1.3.1.x86_64.xml                     |    5 +-
 2 files changed, 2128 insertions(+), 2042 deletions(-)

diff --git a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.replies
index bf5195227c..110858bd06 100644
--- a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.replies
@@ -1,2066 +1,2151 @@
 {
-    "QMP": {
-        "version": {
-            "qemu": {
-                "micro": 1,
-                "minor": 3,
-                "major": 1
-            },
-            "package": ""
-        },
-        "capabilities": [
-        ]
-    }
-}
-
-{
-    "return": {
+  "QMP": {
+    "version": {
+      "qemu": {
+        "micro": 1,
+        "minor": 3,
+        "major": 1
+      },
+      "package": ""
     },
-    "id": "libvirt-1"
-}
-
-{
-    "return": {
-        "qemu": {
-            "micro": 1,
-            "minor": 3,
-            "major": 1
-        },
-        "package": ""
-    },
-    "id": "libvirt-2"
-}
-
-{
-    "return": {
-        "arch": "x86_64"
-    },
-    "id": "libvirt-3"
-}
-
-{
-    "return": [
-        {
-            "name": "query-target"
-        },
-        {
-            "name": "query-cpu-definitions"
-        },
-        {
-            "name": "query-machines"
-        },
-        {
-            "name": "device-list-properties"
-        },
-        {
-            "name": "qom-list-types"
-        },
-        {
-            "name": "change-vnc-password"
-        },
-        {
-            "name": "nbd-server-stop"
-        },
-        {
-            "name": "nbd-server-add"
-        },
-        {
-            "name": "nbd-server-start"
-        },
-        {
-            "name": "qom-get"
-        },
-        {
-            "name": "qom-set"
-        },
-        {
-            "name": "qom-list"
-        },
-        {
-            "name": "query-block-jobs"
-        },
-        {
-            "name": "query-balloon"
-        },
-        {
-            "name": "query-migrate-capabilities"
-        },
-        {
-            "name": "migrate-set-capabilities"
-        },
-        {
-            "name": "query-migrate"
-        },
-        {
-            "name": "query-uuid"
-        },
-        {
-            "name": "query-name"
-        },
-        {
-            "name": "query-spice"
-        },
-        {
-            "name": "query-vnc"
-        },
-        {
-            "name": "query-mice"
-        },
-        {
-            "name": "query-status"
-        },
-        {
-            "name": "query-kvm"
-        },
-        {
-            "name": "query-pci"
-        },
-        {
-            "name": "query-cpus"
-        },
-        {
-            "name": "query-blockstats"
-        },
-        {
-            "name": "query-block"
-        },
-        {
-            "name": "query-chardev"
-        },
-        {
-            "name": "query-events"
-        },
-        {
-            "name": "query-commands"
-        },
-        {
-            "name": "query-version"
-        },
-        {
-            "name": "human-monitor-command"
-        },
-        {
-            "name": "qmp_capabilities"
-        },
-        {
-            "name": "add_client"
-        },
-        {
-            "name": "expire_password"
-        },
-        {
-            "name": "set_password"
-        },
-        {
-            "name": "block_set_io_throttle"
-        },
-        {
-            "name": "block_passwd"
-        },
-        {
-            "name": "query-fdsets"
-        },
-        {
-            "name": "remove-fd"
-        },
-        {
-            "name": "add-fd"
-        },
-        {
-            "name": "closefd"
-        },
-        {
-            "name": "getfd"
-        },
-        {
-            "name": "set_link"
-        },
-        {
-            "name": "balloon"
-        },
-        {
-            "name": "drive-mirror"
-        },
-        {
-            "name": "blockdev-snapshot-sync"
-        },
-        {
-            "name": "transaction"
-        },
-        {
-            "name": "block-job-complete"
-        },
-        {
-            "name": "block-job-resume"
-        },
-        {
-            "name": "block-job-pause"
-        },
-        {
-            "name": "block-job-cancel"
-        },
-        {
-            "name": "block-job-set-speed"
-        },
-        {
-            "name": "block-commit"
-        },
-        {
-            "name": "block-stream"
-        },
-        {
-            "name": "block_resize"
-        },
-        {
-            "name": "netdev_del"
-        },
-        {
-            "name": "netdev_add"
-        },
-        {
-            "name": "dump-guest-memory"
-        },
-        {
-            "name": "client_migrate_info"
-        },
-        {
-            "name": "migrate_set_downtime"
-        },
-        {
-            "name": "migrate_set_speed"
-        },
-        {
-            "name": "query-migrate-cache-size"
-        },
-        {
-            "name": "migrate-set-cache-size"
-        },
-        {
-            "name": "migrate_cancel"
-        },
-        {
-            "name": "migrate"
-        },
-        {
-            "name": "xen-set-global-dirty-log"
-        },
-        {
-            "name": "xen-save-devices-state"
-        },
-        {
-            "name": "inject-nmi"
-        },
-        {
-            "name": "pmemsave"
-        },
-        {
-            "name": "memsave"
-        },
-        {
-            "name": "cpu"
-        },
-        {
-            "name": "send-key"
-        },
-        {
-            "name": "device_del"
-        },
-        {
-            "name": "device_add"
-        },
-        {
-            "name": "system_powerdown"
-        },
-        {
-            "name": "system_reset"
-        },
-        {
-            "name": "system_wakeup"
-        },
-        {
-            "name": "cont"
-        },
-        {
-            "name": "stop"
-        },
-        {
-            "name": "screendump"
-        },
-        {
-            "name": "change"
-        },
-        {
-            "name": "eject"
-        },
-        {
-            "name": "quit"
-        }
-    ],
-    "id": "libvirt-4"
-}
-
-{
-    "return": {
-        "fd": 11,
-        "fdset-id": 0
-    },
-    "id": "libvirt-5"
-}
-
-{
-    "id": "libvirt-6",
-    "error": {
-        "class": "GenericError",
-        "desc": "Parameter 'top' is missing"
-    }
-}
-
-{
-    "return": [
-        {
-            "name": "SPICE_MIGRATE_COMPLETED"
-        },
-        {
-            "name": "BALLOON_CHANGE"
-        },
-        {
-            "name": "WAKEUP"
-        },
-        {
-            "name": "SUSPEND_DISK"
-        },
-        {
-            "name": "SUSPEND"
-        },
-        {
-            "name": "DEVICE_TRAY_MOVED"
-        },
-        {
-            "name": "BLOCK_JOB_READY"
-        },
-        {
-            "name": "BLOCK_JOB_ERROR"
-        },
-        {
-            "name": "BLOCK_JOB_CANCELLED"
-        },
-        {
-            "name": "BLOCK_JOB_COMPLETED"
-        },
-        {
-            "name": "SPICE_DISCONNECTED"
-        },
-        {
-            "name": "SPICE_INITIALIZED"
-        },
-        {
-            "name": "SPICE_CONNECTED"
-        },
-        {
-            "name": "WATCHDOG"
-        },
-        {
-            "name": "RTC_CHANGE"
-        },
-        {
-            "name": "BLOCK_IO_ERROR"
-        },
-        {
-            "name": "VNC_DISCONNECTED"
-        },
-        {
-            "name": "VNC_INITIALIZED"
-        },
-        {
-            "name": "VNC_CONNECTED"
-        },
-        {
-            "name": "RESUME"
-        },
-        {
-            "name": "STOP"
-        },
-        {
-            "name": "POWERDOWN"
-        },
-        {
-            "name": "RESET"
-        },
-        {
-            "name": "SHUTDOWN"
-        }
-    ],
-    "id": "libvirt-7"
-}
-
-{
-    "return": [
-        {
-            "name": "port92"
-        },
-        {
-            "name": "i6300esb"
-        },
-        {
-            "name": "apic"
-        },
-        {
-            "name": "virtio-balloon-pci"
-        },
-        {
-            "name": "virtio-scsi-pci"
-        },
-        {
-            "name": "ICH9 LPC"
-        },
-        {
-            "name": "usb-host"
-        },
-        {
-            "name": "usb-ehci"
-        },
-        {
-            "name": "ich9-ahci"
-        },
-        {
-            "name": "ich9-usb-ehci2"
-        },
-        {
-            "name": "ICH9 SMB"
-        },
-        {
-            "name": "isa-ide"
-        },
-        {
-            "name": "ich9-usb-ehci1"
-        },
-        {
-            "name": "virtio-net-pci"
-        },
-        {
-            "name": "vt82c686b-usb-uhci"
-        },
-        {
-            "name": "i82558b"
-        },
-        {
-            "name": "i82558a"
-        },
-        {
-            "name": "isa-fdc"
-        },
-        {
-            "name": "isabus-bridge"
-        },
-        {
-            "name": "i2c-bus"
-        },
-        {
-            "name": "piix3-ide"
-        },
-        {
-            "name": "ioapic"
-        },
-        {
-            "name": "pci-bridge"
-        },
-        {
-            "name": "HDA"
-        },
-        {
-            "name": "am53c974"
-        },
-        {
-            "name": "vmmouse"
-        },
-        {
-            "name": "sb16"
-        },
-        {
-            "name": "i82801b11-bridge"
-        },
-        {
-            "name": "xlnx,ps7-usb"
-        },
-        {
-            "name": "isa-cirrus-vga"
-        },
-        {
-            "name": "dc390"
-        },
-        {
-            "name": "vmware-svga"
-        },
-        {
-            "name": "smbus-eeprom"
-        },
-        {
-            "name": "i82801"
-        },
-        {
-            "name": "ccid-card-passthru"
-        },
-        {
-            "name": "piix4-usb-uhci"
-        },
-        {
-            "name": "fw_cfg"
-        },
-        {
-            "name": "x86_64-cpu"
-        },
-        {
-            "name": "piix3-usb-uhci"
-        },
-        {
-            "name": "ib700"
-        },
-        {
-            "name": "usb-audio"
-        },
-        {
-            "name": "i82557c"
-        },
-        {
-            "name": "i82557b"
-        },
-        {
-            "name": "i82557a"
-        },
-        {
-            "name": "qxl"
-        },
-        {
-            "name": "rtl8139"
-        },
-        {
-            "name": "hpet"
-        },
-        {
-            "name": "isa-applesmc"
-        },
-        {
-            "name": "xen-platform"
-        },
-        {
-            "name": "kvm-pci-assign"
-        },
-        {
-            "name": "container"
-        },
-        {
-            "name": "cfi.pflash01"
-        },
-        {
-            "name": "usb-kbd"
-        },
-        {
-            "name": "vfio-pci"
-        },
-        {
-            "name": "isa-vga"
-        },
-        {
-            "name": "usb-tablet"
-        },
-        {
-            "name": "vmport"
-        },
-        {
-            "name": "virtio-rng-pci"
-        },
-        {
-            "name": "kvmvapic"
-        },
-        {
-            "name": "usb-bt-dongle"
-        },
-        {
-            "name": "sysbus-fdc"
-        },
-        {
-            "name": "piix4-ide"
-        },
-        {
-            "name": "xen-pci-passthrough"
-        },
-        {
-            "name": "e1000"
-        },
-        {
-            "name": "AC97"
-        },
-        {
-            "name": "mch"
-        },
-        {
-            "name": "ivshmem"
-        },
-        {
-            "name": "usb-ccid"
-        },
-        {
-            "name": "sysbus-ahci"
-        },
-        {
-            "name": "kvmclock"
-        },
-        {
-            "name": "i82562"
-        },
-        {
-            "name": "hda-output"
-        },
-        {
-            "name": "pci-serial-4x"
-        },
-        {
-            "name": "ccid-bus"
-        },
-        {
-            "name": "i82559er"
-        },
-        {
-            "name": "megasas"
-        },
-        {
-            "name": "i8042"
-        },
-        {
-            "name": "intel-hda"
-        },
-        {
-            "name": "mc146818rtc"
-        },
-        {
-            "name": "hda-duplex"
-        },
-        {
-            "name": "virtio-serial-pci"
-        },
-        {
-            "name": "ne2k_pci"
-        },
-        {
-            "name": "ich9-usb-uhci6"
-        },
-        {
-            "name": "virtconsole"
-        },
-        {
-            "name": "ich9-usb-uhci3"
-        },
-        {
-            "name": "ich9-usb-uhci5"
-        },
-        {
-            "name": "ich9-usb-uhci4"
-        },
-        {
-            "name": "isa-parallel"
-        },
-        {
-            "name": "pci-serial"
-        },
-        {
-            "name": "ich9-usb-uhci2"
-        },
-        {
-            "name": "ich9-usb-uhci1"
-        },
-        {
-            "name": "PCI"
-        },
-        {
-            "name": "SUNW,fdtwo"
-        },
-        {
-            "name": "ide-cd"
-        },
-        {
-            "name": "isa-debugcon"
-        },
-        {
-            "name": "i82551"
-        },
-        {
-            "name": "i82550"
-        },
-        {
-            "name": "isa-serial"
-        },
-        {
-            "name": "kvm-ioapic"
-        },
-        {
-            "name": "q35-pcihost"
-        },
-        {
-            "name": "System"
-        },
-        {
-            "name": "kvm-apic"
-        },
-        {
-            "name": "usb-wacom-tablet"
-        },
-        {
-            "name": "PIIX4_PM"
-        },
-        {
-            "name": "kvm-i8259"
-        },
-        {
-            "name": "nec-usb-xhci"
-        },
-        {
-            "name": "scsi-cd"
-        },
-        {
-            "name": "i440FX"
-        },
-        {
-            "name": "usb-braille"
-        },
-        {
-            "name": "xen-apic"
-        },
-        {
-            "name": "pci-serial-2x"
-        },
-        {
-            "name": "virtserialport"
-        },
-        {
-            "name": "xio3130-downstream"
-        },
-        {
-            "name": "pci-ohci"
-        },
-        {
-            "name": "rng-random"
-        },
-        {
-            "name": "hda-micro"
-        },
-        {
-            "name": "scsi-disk"
-        },
-        {
-            "name": "lsi53c895a"
-        },
-        {
-            "name": "SCSI"
-        },
-        {
-            "name": "pcnet"
-        },
-        {
-            "name": "scsi-generic"
-        },
-        {
-            "name": "virtio-serial-bus"
-        },
-        {
-            "name": "usb-bus"
-        },
-        {
-            "name": "ne2k_isa"
-        },
-        {
-            "name": "IDE"
-        },
-        {
-            "name": "ccid-card-emulated"
-        },
-        {
-            "name": "i440FX-pcihost"
-        },
-        {
-            "name": "usb-hub"
-        },
-        {
-            "name": "usb-net"
-        },
-        {
-            "name": "usb-mouse"
-        },
-        {
-            "name": "ISA"
-        },
-        {
-            "name": "pc-sysfw"
-        },
-        {
-            "name": "usb-serial"
-        },
-        {
-            "name": "scsi-block"
-        },
-        {
-            "name": "sga"
-        },
-        {
-            "name": "PIIX3"
-        },
-        {
-            "name": "ioh3420"
-        },
-        {
-            "name": "ES1370"
-        },
-        {
-            "name": "isa-i8259"
-        },
-        {
-            "name": "isa-pcspk"
-        },
-        {
-            "name": "ide-hd"
-        },
-        {
-            "name": "rng-egd"
-        },
-        {
-            "name": "cirrus-vga"
-        },
-        {
-            "name": "virtio-9p-pci"
-        },
-        {
-            "name": "x3130-upstream"
-        },
-        {
-            "name": "ide-drive"
-        },
-        {
-            "name": "qxl-vga"
-        },
-        {
-            "name": "usb-uas"
-        },
-        {
-            "name": "kvm-pit"
-        },
-        {
-            "name": "virtio-blk-pci"
-        },
-        {
-            "name": "sysbus-ohci"
-        },
-        {
-            "name": "esp"
-        },
-        {
-            "name": "piix3-ide-xen"
-        },
-        {
-            "name": "i82559c"
-        },
-        {
-            "name": "i82559b"
-        },
-        {
-            "name": "i82559a"
-        },
-        {
-            "name": "scsi-hd"
-        },
-        {
-            "name": "PIIX3-xen"
-        },
-        {
-            "name": "isa-pit"
-        },
-        {
-            "name": "usb-storage"
-        },
-        {
-            "name": "VGA"
-        }
-    ],
-    "id": "libvirt-8"
-}
-
-{
-    "return": [
-        {
-            "name": "command_serr_enable",
-            "type": "on/off"
-        },
-        {
-            "name": "multifunction",
-            "type": "on/off"
-        },
-        {
-            "name": "rombar",
-            "type": "uint32"
-        },
-        {
-            "name": "romfile",
-            "type": "string"
-        },
-        {
-            "name": "addr",
-            "type": "pci-devfn"
-        },
-        {
-            "name": "config-wce",
-            "type": "on/off"
-        },
-        {
-            "name": "event_idx",
-            "type": "on/off"
-        },
-        {
-            "name": "indirect_desc",
-            "type": "on/off"
-        },
-        {
-            "name": "vectors",
-            "type": "uint32"
-        },
-        {
-            "name": "ioeventfd",
-            "type": "on/off"
-        },
-        {
-            "name": "config-wce",
-            "type": "on/off"
-        },
-        {
-            "name": "scsi",
-            "type": "on/off"
-        },
-        {
-            "name": "serial",
-            "type": "string"
-        },
-        {
-            "name": "secs",
-            "type": "uint32"
-        },
-        {
-            "name": "heads",
-            "type": "uint32"
-        },
-        {
-            "name": "cyls",
-            "type": "uint32"
-        },
-        {
-            "name": "discard_granularity",
-            "type": "uint32"
-        },
-        {
-            "name": "bootindex",
-            "type": "int32"
-        },
-        {
-            "name": "opt_io_size",
-            "type": "uint32"
-        },
-        {
-            "name": "min_io_size",
-            "type": "uint16"
-        },
-        {
-            "name": "physical_block_size",
-            "type": "blocksize"
-        },
-        {
-            "name": "logical_block_size",
-            "type": "blocksize"
-        },
-        {
-            "name": "drive",
-            "type": "drive"
-        },
-        {
-            "name": "class",
-            "type": "hex32"
-        }
-    ],
-    "id": "libvirt-9"
-}
-
-{
-    "return": [
-        {
-            "name": "command_serr_enable",
-            "type": "on/off"
-        },
-        {
-            "name": "multifunction",
-            "type": "on/off"
-        },
-        {
-            "name": "rombar",
-            "type": "uint32"
-        },
-        {
-            "name": "romfile",
-            "type": "string"
-        },
-        {
-            "name": "addr",
-            "type": "pci-devfn"
-        },
-        {
-            "name": "tx",
-            "type": "string"
-        },
-        {
-            "name": "x-txburst",
-            "type": "int32"
-        },
-        {
-            "name": "x-txtimer",
-            "type": "uint32"
-        },
-        {
-            "name": "bootindex",
-            "type": "int32"
-        },
-        {
-            "name": "netdev",
-            "type": "netdev"
-        },
-        {
-            "name": "vlan",
-            "type": "vlan"
-        },
-        {
-            "name": "mac",
-            "type": "macaddr"
-        },
-        {
-            "name": "ctrl_rx_extra",
-            "type": "on/off"
-        },
-        {
-            "name": "ctrl_vlan",
-            "type": "on/off"
-        },
-        {
-            "name": "ctrl_rx",
-            "type": "on/off"
-        },
-        {
-            "name": "ctrl_vq",
-            "type": "on/off"
-        },
-        {
-            "name": "status",
-            "type": "on/off"
-        },
-        {
-            "name": "mrg_rxbuf",
-            "type": "on/off"
-        },
-        {
-            "name": "host_ufo",
-            "type": "on/off"
-        },
-        {
-            "name": "host_ecn",
-            "type": "on/off"
-        },
-        {
-            "name": "host_tso6",
-            "type": "on/off"
-        },
-        {
-            "name": "host_tso4",
-            "type": "on/off"
-        },
-        {
-            "name": "guest_ufo",
-            "type": "on/off"
-        },
-        {
-            "name": "guest_ecn",
-            "type": "on/off"
-        },
-        {
-            "name": "guest_tso6",
-            "type": "on/off"
-        },
-        {
-            "name": "guest_tso4",
-            "type": "on/off"
-        },
-        {
-            "name": "gso",
-            "type": "on/off"
-        },
-        {
-            "name": "guest_csum",
-            "type": "on/off"
-        },
-        {
-            "name": "csum",
-            "type": "on/off"
-        },
-        {
-            "name": "event_idx",
-            "type": "on/off"
-        },
-        {
-            "name": "indirect_desc",
-            "type": "on/off"
-        },
-        {
-            "name": "vectors",
-            "type": "uint32"
-        },
-        {
-            "name": "ioeventfd",
-            "type": "on/off"
-        }
-    ],
-    "id": "libvirt-10"
-}
-
-{
-    "id": "libvirt-11",
-    "error": {
-        "class": "DeviceNotFound",
-        "desc": "Device 'virtio-scsi-pci' not found"
-    }
-}
-
-{
-    "id": "libvirt-12",
-    "error": {
-        "class": "DeviceNotFound",
-        "desc": "Device 'virtio-blk-ccw' not found"
-    }
-}
-
-{
-    "id": "libvirt-13",
-    "error": {
-        "class": "DeviceNotFound",
-        "desc": "Device 'virtio-net-ccw' not found"
-    }
-}
-
-{
-    "id": "libvirt-14",
-    "error": {
-        "class": "DeviceNotFound",
-        "desc": "Device 'virtio-scsi-ccw' not found"
-    }
-}
-
-{
-    "id": "libvirt-15",
-    "error": {
-        "class": "DeviceNotFound",
-        "desc": "Device 'virtio-blk-s390' not found"
-    }
-}
-
-{
-    "id": "libvirt-16",
-    "error": {
-        "class": "DeviceNotFound",
-        "desc": "Device 'virtio-net-s390' not found"
-    }
-}
-
-{
-    "id": "libvirt-17",
-    "error": {
-        "class": "DeviceNotFound",
-        "desc": "Device 'pci-assign' not found"
-    }
-}
-
-{
-    "return": [
-        {
-            "name": "command_serr_enable",
-            "type": "on/off"
-        },
-        {
-            "name": "multifunction",
-            "type": "on/off"
-        },
-        {
-            "name": "rombar",
-            "type": "uint32"
-        },
-        {
-            "name": "romfile",
-            "type": "string"
-        },
-        {
-            "name": "addr",
-            "type": "pci-devfn"
-        },
-        {
-            "name": "configfd",
-            "type": "string"
-        },
-        {
-            "name": "bootindex",
-            "type": "int32"
-        },
-        {
-            "name": "share_intx",
-            "type": "on/off"
-        },
-        {
-            "name": "prefer_msi",
-            "type": "on/off"
-        },
-        {
-            "name": "host",
-            "type": "pci-host-devaddr"
-        }
-    ],
-    "id": "libvirt-18"
-}
-
-{
-    "return": [
-        {
-            "name": "command_serr_enable",
-            "type": "on/off"
-        },
-        {
-            "name": "multifunction",
-            "type": "on/off"
-        },
-        {
-            "name": "rombar",
-            "type": "uint32"
-        },
-        {
-            "name": "romfile",
-            "type": "string"
-        },
-        {
-            "name": "addr",
-            "type": "pci-devfn"
-        },
-        {
-            "name": "x-intx-mmap-timeout-ms",
-            "type": "uint32"
-        },
-        {
-            "name": "host",
-            "type": "pci-host-devaddr"
-        }
-    ],
-    "id": "libvirt-19"
-}
-
-{
-    "return": [
-        {
-            "name": "lun",
-            "type": "uint32"
-        },
-        {
-            "name": "scsi-id",
-            "type": "uint32"
-        },
-        {
-            "name": "channel",
-            "type": "uint32"
-        },
-        {
-            "name": "wwn",
-            "type": "hex64"
-        },
-        {
-            "name": "dpofua",
-            "type": "on/off"
-        },
-        {
-            "name": "removable",
-            "type": "on/off"
-        },
-        {
-            "name": "product",
-            "type": "string"
-        },
-        {
-            "name": "vendor",
-            "type": "string"
-        },
-        {
-            "name": "serial",
-            "type": "string"
-        },
-        {
-            "name": "ver",
-            "type": "string"
-        },
-        {
-            "name": "discard_granularity",
-            "type": "uint32"
-        },
-        {
-            "name": "bootindex",
-            "type": "int32"
-        },
-        {
-            "name": "opt_io_size",
-            "type": "uint32"
-        },
-        {
-            "name": "min_io_size",
-            "type": "uint16"
-        },
-        {
-            "name": "physical_block_size",
-            "type": "blocksize"
-        },
-        {
-            "name": "logical_block_size",
-            "type": "blocksize"
-        },
-        {
-            "name": "drive",
-            "type": "drive"
-        }
-    ],
-    "id": "libvirt-20"
-}
-
-{
-    "return": [
-        {
-            "name": "unit",
-            "type": "uint32"
-        },
-        {
-            "name": "model",
-            "type": "string"
-        },
-        {
-            "name": "serial",
-            "type": "string"
-        },
-        {
-            "name": "wwn",
-            "type": "hex64"
-        },
-        {
-            "name": "ver",
-            "type": "string"
-        },
-        {
-            "name": "discard_granularity",
-            "type": "uint32"
-        },
-        {
-            "name": "bootindex",
-            "type": "int32"
-        },
-        {
-            "name": "opt_io_size",
-            "type": "uint32"
-        },
-        {
-            "name": "min_io_size",
-            "type": "uint16"
-        },
-        {
-            "name": "physical_block_size",
-            "type": "blocksize"
-        },
-        {
-            "name": "logical_block_size",
-            "type": "blocksize"
-        },
-        {
-            "name": "drive",
-            "type": "drive"
-        }
-    ],
-    "id": "libvirt-21"
-}
-
-{
-    "return": [
-        {
-            "name": "command_serr_enable",
-            "type": "on/off"
-        },
-        {
-            "name": "multifunction",
-            "type": "on/off"
-        },
-        {
-            "name": "rombar",
-            "type": "uint32"
-        },
-        {
-            "name": "romfile",
-            "type": "string"
-        },
-        {
-            "name": "addr",
-            "type": "pci-devfn"
-        },
-        {
-            "name": "s4_val",
-            "type": "uint8"
-        },
-        {
-            "name": "disable_s4",
-            "type": "uint8"
-        },
-        {
-            "name": "disable_s3",
-            "type": "uint8"
-        },
-        {
-            "name": "smb_io_base",
-            "type": "uint32"
-        }
-    ],
-    "id": "libvirt-22"
-}
-
-{
-    "id": "libvirt-23",
-    "error": {
-        "class": "DeviceNotFound",
-        "desc": "Device 'usb-redir' not found"
-    }
-}
-
-{
-    "return": [
-        {
-            "name": "full-path",
-            "type": "on/off"
-        },
-        {
-            "name": "port",
-            "type": "string"
-        },
-        {
-            "name": "pipeline",
-            "type": "on/off"
-        },
-        {
-            "name": "bootindex",
-            "type": "int32"
-        },
-        {
-            "name": "isobufs",
-            "type": "uint32"
-        },
-        {
-            "name": "productid",
-            "type": "hex32"
-        },
-        {
-            "name": "vendorid",
-            "type": "hex32"
-        },
-        {
-            "name": "hostport",
-            "type": "string"
-        },
-        {
-            "name": "hostaddr",
-            "type": "uint32"
-        },
-        {
-            "name": "hostbus",
-            "type": "uint32"
-        }
-    ],
-    "id": "libvirt-24"
-}
-
-{
-    "return": [
-        {
-            "name": "lun",
-            "type": "uint32"
-        },
-        {
-            "name": "scsi-id",
-            "type": "uint32"
-        },
-        {
-            "name": "channel",
-            "type": "uint32"
-        },
-        {
-            "name": "bootindex",
-            "type": "int32"
-        },
-        {
-            "name": "drive",
-            "type": "drive"
-        }
-    ],
-    "id": "libvirt-25"
-}
-
-{
-    "return": [
-    ],
-    "id": "libvirt-26"
-}
-
-{
-    "return": [
-        {
-            "name": "MCFG",
-            "type": "uint64"
-        }
-    ],
-    "id": "libvirt-27"
-}
-
-{
-    "return": [
-        {
-            "name": "full-path",
-            "type": "on/off"
-        },
-        {
-            "name": "port",
-            "type": "string"
-        },
-        {
-            "name": "removable",
-            "type": "on/off"
-        },
-        {
-            "name": "serial",
-            "type": "string"
-        },
-        {
-            "name": "discard_granularity",
-            "type": "uint32"
-        },
-        {
-            "name": "bootindex",
-            "type": "int32"
-        },
-        {
-            "name": "opt_io_size",
-            "type": "uint32"
-        },
-        {
-            "name": "min_io_size",
-            "type": "uint16"
-        },
-        {
-            "name": "physical_block_size",
-            "type": "blocksize"
-        },
-        {
-            "name": "logical_block_size",
-            "type": "blocksize"
-        },
-        {
-            "name": "drive",
-            "type": "drive"
-        }
-    ],
-    "id": "libvirt-28"
-}
-
-{
-    "return": [
-        {
-            "name": "lost_tick_policy",
-            "type": "LostTickPolicy"
-        },
-        {
-            "name": "iobase",
-            "type": "hex32"
-        }
-    ],
-    "id": "libvirt-29"
-}
-
-{
-    "return": [
-        {
-            "name": "command_serr_enable",
-            "type": "on/off"
-        },
-        {
-            "name": "multifunction",
-            "type": "on/off"
-        },
-        {
-            "name": "rombar",
-            "type": "uint32"
-        },
-        {
-            "name": "romfile",
-            "type": "string"
-        },
-        {
-            "name": "addr",
-            "type": "pci-devfn"
-        },
-        {
-            "name": "mmio",
-            "type": "on/off"
-        },
-        {
-            "name": "vgamem_mb",
-            "type": "uint32"
-        }
-    ],
-    "id": "libvirt-30"
-}
-
-{
-    "return": [
-        {
-            "name": "command_serr_enable",
-            "type": "on/off"
-        },
-        {
-            "name": "multifunction",
-            "type": "on/off"
-        },
-        {
-            "name": "rombar",
-            "type": "uint32"
-        },
-        {
-            "name": "romfile",
-            "type": "string"
-        },
-        {
-            "name": "addr",
-            "type": "pci-devfn"
-        },
-        {
-            "name": "vgamem_mb",
-            "type": "uint32"
-        }
-    ],
-    "id": "libvirt-31"
-}
-
-{
-    "return": [
-        {
-            "name": "command_serr_enable",
-            "type": "on/off"
-        },
-        {
-            "name": "multifunction",
-            "type": "on/off"
-        },
-        {
-            "name": "rombar",
-            "type": "uint32"
-        },
-        {
-            "name": "romfile",
-            "type": "string"
-        },
-        {
-            "name": "addr",
-            "type": "pci-devfn"
-        },
-        {
-            "name": "surfaces",
-            "type": "int32"
-        },
-        {
-            "name": "vgamem_mb",
-            "type": "uint32"
-        },
-        {
-            "name": "vram64_size_mb",
-            "type": "uint32"
-        },
-        {
-            "name": "vram_size_mb",
-            "type": "uint32"
-        },
-        {
-            "name": "ram_size_mb",
-            "type": "uint32"
-        },
-        {
-            "name": "cmdlog",
-            "type": "uint32"
-        },
-        {
-            "name": "guestdebug",
-            "type": "uint32"
-        },
-        {
-            "name": "debug",
-            "type": "uint32"
-        },
-        {
-            "name": "revision",
-            "type": "uint32"
-        },
-        {
-            "name": "vram_size",
-            "type": "uint32"
-        },
-        {
-            "name": "ram_size",
-            "type": "uint32"
-        }
-    ],
-    "id": "libvirt-32"
-}
-
-{
-    "return": [
-        {
-            "name": "command_serr_enable",
-            "type": "on/off"
-        },
-        {
-            "name": "multifunction",
-            "type": "on/off"
-        },
-        {
-            "name": "rombar",
-            "type": "uint32"
-        },
-        {
-            "name": "romfile",
-            "type": "string"
-        },
-        {
-            "name": "addr",
-            "type": "pci-devfn"
-        },
-        {
-            "name": "surfaces",
-            "type": "int32"
-        },
-        {
-            "name": "vgamem_mb",
-            "type": "uint32"
-        },
-        {
-            "name": "vram64_size_mb",
-            "type": "uint32"
-        },
-        {
-            "name": "vram_size_mb",
-            "type": "uint32"
-        },
-        {
-            "name": "ram_size_mb",
-            "type": "uint32"
-        },
-        {
-            "name": "cmdlog",
-            "type": "uint32"
-        },
-        {
-            "name": "guestdebug",
-            "type": "uint32"
-        },
-        {
-            "name": "debug",
-            "type": "uint32"
-        },
-        {
-            "name": "revision",
-            "type": "uint32"
-        },
-        {
-            "name": "vram_size",
-            "type": "uint32"
-        },
-        {
-            "name": "ram_size",
-            "type": "uint32"
-        }
-    ],
-    "id": "libvirt-33"
-}
-
-{
-    "id": "libvirt-34",
-    "error": {
-        "class": "DeviceNotFound",
-        "desc": "Device 'virtio-gpu-pci' not found"
-    }
-}
-
-{
-    "id": "libvirt-35",
-    "error": {
-        "class": "DeviceNotFound",
-        "desc": "Device 'ICH9-LPC' not found"
-    }
-}
-
-{
-    "return": [
-        {
-             "name": "command_serr_enable",
-             "type": "on/off"
-        },
-        {
-            "name": "multifunction",
-            "type": "on/off"
-        },
-        {
-            "name": "rombar",
-            "type": "uint32"
-        },
-        {
-            "name": "romfile",
-            "type": "string"
-        },
-        {
-            "name": "addr",
-            "type": "pci-devfn"
-        },
-        {
-            "name": "class",
-            "type": "hex32"
-        },
-        {
-            "name": "event_idx",
-            "type": "on/off"
-        },
-        {
-            "name": "indirect_desc",
-            "type": "on/off"
-        }
-    ],
-    "id": "libvirt-36"
-}
-
-{
-    "id": "libvirt-37",
-    "error": {
-        "class": "DeviceNotFound",
-        "desc": "Device 'virtio-balloon-ccw' not found"
-    }
-}
-
-{
-    "id": "libvirt-38",
-    "error": {
-        "class": "DeviceNotFound",
-        "desc": "Device 'virtio-balloon-device' not found"
-    }
-}
-
-{
-    "return": [
-        {
-            "name": "msi",
-            "type": "on/off"
-        },
-        {
-            "name": "msix",
-            "type": "on/off"
-        },
-        {
-            "name": "intrs",
-            "type": "uint32"
-        },
-        {
-            "name": "slots",
-            "type": "uint32"
-        },
-        {
-            "name": "2",
-            "type": "uint32"
-        },
-        {
-            "name": "p3",
-            "type": "uint32"
-        }
+    "capabilities": [
     ]
+  }
 }
 
 {
-    "return": [
-        {
-            "name": "xenpv"
-        },
-        {
-            "name": "q35-next",
-            "alias": "q35"
-        },
-        {
-            "name": "xenfv"
-        },
-        {
-            "name": "isapc"
-        },
-        {
-            "name": "pc-0.10"
-        },
-        {
-            "name": "pc-0.11"
-        },
-        {
-            "name": "pc-0.12"
-        },
-        {
-            "name": "pc-0.13"
-        },
-        {
-            "name": "pc-0.14"
-        },
-        {
-            "name": "pc-0.15"
-        },
-        {
-            "name": "pc-1.0"
-        },
-        {
-            "name": "pc-1.1"
-        },
-        {
-            "name": "pc-1.2"
-        },
-        {
-            "name": "pc-1.3",
-            "is-default": true,
-            "alias": "pc"
-        },
-        {
-            "name": "none"
-        }
-    ],
-    "id": "libvirt-39"
+  "return": {
+  },
+  "id": "libvirt-1"
 }
 
 {
-    "return": [
-        {
-            "name": "qemu64"
-        },
-        {
-            "name": "phenom"
-        },
-        {
-            "name": "core2duo"
-        },
-        {
-            "name": "kvm64"
-        },
-        {
-            "name": "qemu32"
-        },
-        {
-            "name": "kvm32"
-        },
-        {
-            "name": "coreduo"
-        },
-        {
-            "name": "486"
-        },
-        {
-            "name": "pentium"
-        },
-        {
-            "name": "pentium2"
-        },
-        {
-            "name": "pentium3"
-        },
-        {
-            "name": "athlon"
-        },
-        {
-            "name": "n270"
-        },
-        {
-            "name": "Conroe"
-        },
-        {
-            "name": "Penryn"
-        },
-        {
-            "name": "Nehalem"
-        },
-        {
-            "name": "Westmere"
-        },
-        {
-            "name": "SandyBridge"
-        },
-        {
-            "name": "Haswell"
-        },
-        {
-            "name": "Opteron_G1"
-        },
-        {
-            "name": "Opteron_G2"
-        },
-        {
-            "name": "Opteron_G3"
-        },
-        {
-            "name": "Opteron_G4"
-        },
-        {
-            "name": "Opteron_G5"
-        }
-    ],
-    "id": "libvirt-40"
-}
-
-{
-    "return": {
-        "enabled": false,
-        "present": true
+  "return": {
+    "qemu": {
+      "micro": 1,
+      "minor": 3,
+      "major": 1
     },
-    "id": "libvirt-41"
+    "package": ""
+  },
+  "id": "libvirt-2"
 }
 
 {
-    "id": "libvirt-42",
-    "error": {
-        "class": "CommandNotFound",
-        "desc": "The command query-tpm-models has not been found"
+  "return": {
+    "arch": "x86_64"
+  },
+  "id": "libvirt-3"
+}
+
+{
+  "return": [
+    {
+      "name": "query-target"
+    },
+    {
+      "name": "query-cpu-definitions"
+    },
+    {
+      "name": "query-machines"
+    },
+    {
+      "name": "device-list-properties"
+    },
+    {
+      "name": "qom-list-types"
+    },
+    {
+      "name": "change-vnc-password"
+    },
+    {
+      "name": "nbd-server-stop"
+    },
+    {
+      "name": "nbd-server-add"
+    },
+    {
+      "name": "nbd-server-start"
+    },
+    {
+      "name": "qom-get"
+    },
+    {
+      "name": "qom-set"
+    },
+    {
+      "name": "qom-list"
+    },
+    {
+      "name": "query-block-jobs"
+    },
+    {
+      "name": "query-balloon"
+    },
+    {
+      "name": "query-migrate-capabilities"
+    },
+    {
+      "name": "migrate-set-capabilities"
+    },
+    {
+      "name": "query-migrate"
+    },
+    {
+      "name": "query-uuid"
+    },
+    {
+      "name": "query-name"
+    },
+    {
+      "name": "query-spice"
+    },
+    {
+      "name": "query-vnc"
+    },
+    {
+      "name": "query-mice"
+    },
+    {
+      "name": "query-status"
+    },
+    {
+      "name": "query-kvm"
+    },
+    {
+      "name": "query-pci"
+    },
+    {
+      "name": "query-cpus"
+    },
+    {
+      "name": "query-blockstats"
+    },
+    {
+      "name": "query-block"
+    },
+    {
+      "name": "query-chardev"
+    },
+    {
+      "name": "query-events"
+    },
+    {
+      "name": "query-commands"
+    },
+    {
+      "name": "query-version"
+    },
+    {
+      "name": "human-monitor-command"
+    },
+    {
+      "name": "qmp_capabilities"
+    },
+    {
+      "name": "add_client"
+    },
+    {
+      "name": "expire_password"
+    },
+    {
+      "name": "set_password"
+    },
+    {
+      "name": "block_set_io_throttle"
+    },
+    {
+      "name": "block_passwd"
+    },
+    {
+      "name": "query-fdsets"
+    },
+    {
+      "name": "remove-fd"
+    },
+    {
+      "name": "add-fd"
+    },
+    {
+      "name": "closefd"
+    },
+    {
+      "name": "getfd"
+    },
+    {
+      "name": "set_link"
+    },
+    {
+      "name": "balloon"
+    },
+    {
+      "name": "drive-mirror"
+    },
+    {
+      "name": "blockdev-snapshot-sync"
+    },
+    {
+      "name": "transaction"
+    },
+    {
+      "name": "block-job-complete"
+    },
+    {
+      "name": "block-job-resume"
+    },
+    {
+      "name": "block-job-pause"
+    },
+    {
+      "name": "block-job-cancel"
+    },
+    {
+      "name": "block-job-set-speed"
+    },
+    {
+      "name": "block-commit"
+    },
+    {
+      "name": "block-stream"
+    },
+    {
+      "name": "block_resize"
+    },
+    {
+      "name": "netdev_del"
+    },
+    {
+      "name": "netdev_add"
+    },
+    {
+      "name": "dump-guest-memory"
+    },
+    {
+      "name": "client_migrate_info"
+    },
+    {
+      "name": "migrate_set_downtime"
+    },
+    {
+      "name": "migrate_set_speed"
+    },
+    {
+      "name": "query-migrate-cache-size"
+    },
+    {
+      "name": "migrate-set-cache-size"
+    },
+    {
+      "name": "migrate_cancel"
+    },
+    {
+      "name": "migrate"
+    },
+    {
+      "name": "xen-set-global-dirty-log"
+    },
+    {
+      "name": "xen-save-devices-state"
+    },
+    {
+      "name": "inject-nmi"
+    },
+    {
+      "name": "pmemsave"
+    },
+    {
+      "name": "memsave"
+    },
+    {
+      "name": "cpu"
+    },
+    {
+      "name": "send-key"
+    },
+    {
+      "name": "device_del"
+    },
+    {
+      "name": "device_add"
+    },
+    {
+      "name": "system_powerdown"
+    },
+    {
+      "name": "system_reset"
+    },
+    {
+      "name": "system_wakeup"
+    },
+    {
+      "name": "cont"
+    },
+    {
+      "name": "stop"
+    },
+    {
+      "name": "screendump"
+    },
+    {
+      "name": "change"
+    },
+    {
+      "name": "eject"
+    },
+    {
+      "name": "quit"
     }
+  ],
+  "id": "libvirt-4"
 }
 
 {
-    "id": "libvirt-43",
-    "error": {
-        "class": "CommandNotFound",
-        "desc": "The command query-tpm-types has not been found"
+  "return": {
+    "fd": 11,
+    "fdset-id": 0
+  },
+  "id": "libvirt-5"
+}
+
+{
+  "id": "libvirt-6",
+  "error": {
+    "class": "GenericError",
+    "desc": "Parameter 'top' is missing"
+  }
+}
+
+{
+  "return": [
+    {
+      "name": "SPICE_MIGRATE_COMPLETED"
+    },
+    {
+      "name": "BALLOON_CHANGE"
+    },
+    {
+      "name": "WAKEUP"
+    },
+    {
+      "name": "SUSPEND_DISK"
+    },
+    {
+      "name": "SUSPEND"
+    },
+    {
+      "name": "DEVICE_TRAY_MOVED"
+    },
+    {
+      "name": "BLOCK_JOB_READY"
+    },
+    {
+      "name": "BLOCK_JOB_ERROR"
+    },
+    {
+      "name": "BLOCK_JOB_CANCELLED"
+    },
+    {
+      "name": "BLOCK_JOB_COMPLETED"
+    },
+    {
+      "name": "SPICE_DISCONNECTED"
+    },
+    {
+      "name": "SPICE_INITIALIZED"
+    },
+    {
+      "name": "SPICE_CONNECTED"
+    },
+    {
+      "name": "WATCHDOG"
+    },
+    {
+      "name": "RTC_CHANGE"
+    },
+    {
+      "name": "BLOCK_IO_ERROR"
+    },
+    {
+      "name": "VNC_DISCONNECTED"
+    },
+    {
+      "name": "VNC_INITIALIZED"
+    },
+    {
+      "name": "VNC_CONNECTED"
+    },
+    {
+      "name": "RESUME"
+    },
+    {
+      "name": "STOP"
+    },
+    {
+      "name": "POWERDOWN"
+    },
+    {
+      "name": "RESET"
+    },
+    {
+      "name": "SHUTDOWN"
     }
+  ],
+  "id": "libvirt-7"
 }
 
 {
-    "id": "libvirt-44",
-    "error": {
-        "class": "CommandNotFound",
-        "desc": "The command query-command-line-options has not been found"
+  "return": [
+    {
+      "name": "port92"
+    },
+    {
+      "name": "i6300esb"
+    },
+    {
+      "name": "apic"
+    },
+    {
+      "name": "virtio-balloon-pci"
+    },
+    {
+      "name": "virtio-scsi-pci"
+    },
+    {
+      "name": "ICH9 LPC"
+    },
+    {
+      "name": "usb-host"
+    },
+    {
+      "name": "usb-ehci"
+    },
+    {
+      "name": "ich9-ahci"
+    },
+    {
+      "name": "ich9-usb-ehci2"
+    },
+    {
+      "name": "ICH9 SMB"
+    },
+    {
+      "name": "isa-ide"
+    },
+    {
+      "name": "ich9-usb-ehci1"
+    },
+    {
+      "name": "virtio-net-pci"
+    },
+    {
+      "name": "vt82c686b-usb-uhci"
+    },
+    {
+      "name": "i82558b"
+    },
+    {
+      "name": "i82558a"
+    },
+    {
+      "name": "isa-fdc"
+    },
+    {
+      "name": "isabus-bridge"
+    },
+    {
+      "name": "i2c-bus"
+    },
+    {
+      "name": "piix3-ide"
+    },
+    {
+      "name": "ioapic"
+    },
+    {
+      "name": "pci-bridge"
+    },
+    {
+      "name": "HDA"
+    },
+    {
+      "name": "am53c974"
+    },
+    {
+      "name": "vmmouse"
+    },
+    {
+      "name": "sb16"
+    },
+    {
+      "name": "i82801b11-bridge"
+    },
+    {
+      "name": "xlnx,ps7-usb"
+    },
+    {
+      "name": "isa-cirrus-vga"
+    },
+    {
+      "name": "dc390"
+    },
+    {
+      "name": "vmware-svga"
+    },
+    {
+      "name": "smbus-eeprom"
+    },
+    {
+      "name": "i82801"
+    },
+    {
+      "name": "ccid-card-passthru"
+    },
+    {
+      "name": "piix4-usb-uhci"
+    },
+    {
+      "name": "fw_cfg"
+    },
+    {
+      "name": "x86_64-cpu"
+    },
+    {
+      "name": "piix3-usb-uhci"
+    },
+    {
+      "name": "ib700"
+    },
+    {
+      "name": "usb-audio"
+    },
+    {
+      "name": "i82557c"
+    },
+    {
+      "name": "i82557b"
+    },
+    {
+      "name": "i82557a"
+    },
+    {
+      "name": "qxl"
+    },
+    {
+      "name": "rtl8139"
+    },
+    {
+      "name": "hpet"
+    },
+    {
+      "name": "isa-applesmc"
+    },
+    {
+      "name": "kvm-pci-assign"
+    },
+    {
+      "name": "container"
+    },
+    {
+      "name": "cfi.pflash01"
+    },
+    {
+      "name": "usb-kbd"
+    },
+    {
+      "name": "vfio-pci"
+    },
+    {
+      "name": "isa-vga"
+    },
+    {
+      "name": "usb-tablet"
+    },
+    {
+      "name": "vmport"
+    },
+    {
+      "name": "virtio-rng-pci"
+    },
+    {
+      "name": "kvmvapic"
+    },
+    {
+      "name": "usb-bt-dongle"
+    },
+    {
+      "name": "sysbus-fdc"
+    },
+    {
+      "name": "piix4-ide"
+    },
+    {
+      "name": "e1000"
+    },
+    {
+      "name": "AC97"
+    },
+    {
+      "name": "mch"
+    },
+    {
+      "name": "ivshmem"
+    },
+    {
+      "name": "usb-ccid"
+    },
+    {
+      "name": "sysbus-ahci"
+    },
+    {
+      "name": "kvmclock"
+    },
+    {
+      "name": "i82562"
+    },
+    {
+      "name": "hda-output"
+    },
+    {
+      "name": "pci-serial-4x"
+    },
+    {
+      "name": "ccid-bus"
+    },
+    {
+      "name": "i82559er"
+    },
+    {
+      "name": "megasas"
+    },
+    {
+      "name": "i8042"
+    },
+    {
+      "name": "intel-hda"
+    },
+    {
+      "name": "mc146818rtc"
+    },
+    {
+      "name": "hda-duplex"
+    },
+    {
+      "name": "virtio-serial-pci"
+    },
+    {
+      "name": "ne2k_pci"
+    },
+    {
+      "name": "ich9-usb-uhci6"
+    },
+    {
+      "name": "virtconsole"
+    },
+    {
+      "name": "ich9-usb-uhci3"
+    },
+    {
+      "name": "ich9-usb-uhci5"
+    },
+    {
+      "name": "ich9-usb-uhci4"
+    },
+    {
+      "name": "isa-parallel"
+    },
+    {
+      "name": "pci-serial"
+    },
+    {
+      "name": "ich9-usb-uhci2"
+    },
+    {
+      "name": "ich9-usb-uhci1"
+    },
+    {
+      "name": "PCI"
+    },
+    {
+      "name": "SUNW,fdtwo"
+    },
+    {
+      "name": "ide-cd"
+    },
+    {
+      "name": "isa-debugcon"
+    },
+    {
+      "name": "i82551"
+    },
+    {
+      "name": "i82550"
+    },
+    {
+      "name": "isa-serial"
+    },
+    {
+      "name": "kvm-ioapic"
+    },
+    {
+      "name": "q35-pcihost"
+    },
+    {
+      "name": "System"
+    },
+    {
+      "name": "kvm-apic"
+    },
+    {
+      "name": "usb-wacom-tablet"
+    },
+    {
+      "name": "PIIX4_PM"
+    },
+    {
+      "name": "kvm-i8259"
+    },
+    {
+      "name": "nec-usb-xhci"
+    },
+    {
+      "name": "scsi-cd"
+    },
+    {
+      "name": "i440FX"
+    },
+    {
+      "name": "usb-braille"
+    },
+    {
+      "name": "usb-redir"
+    },
+    {
+      "name": "pci-serial-2x"
+    },
+    {
+      "name": "virtserialport"
+    },
+    {
+      "name": "xio3130-downstream"
+    },
+    {
+      "name": "pci-ohci"
+    },
+    {
+      "name": "rng-random"
+    },
+    {
+      "name": "hda-micro"
+    },
+    {
+      "name": "scsi-disk"
+    },
+    {
+      "name": "lsi53c895a"
+    },
+    {
+      "name": "SCSI"
+    },
+    {
+      "name": "pcnet"
+    },
+    {
+      "name": "scsi-generic"
+    },
+    {
+      "name": "virtio-serial-bus"
+    },
+    {
+      "name": "usb-bus"
+    },
+    {
+      "name": "ne2k_isa"
+    },
+    {
+      "name": "IDE"
+    },
+    {
+      "name": "ccid-card-emulated"
+    },
+    {
+      "name": "i440FX-pcihost"
+    },
+    {
+      "name": "usb-hub"
+    },
+    {
+      "name": "usb-net"
+    },
+    {
+      "name": "usb-mouse"
+    },
+    {
+      "name": "ISA"
+    },
+    {
+      "name": "pc-sysfw"
+    },
+    {
+      "name": "usb-serial"
+    },
+    {
+      "name": "scsi-block"
+    },
+    {
+      "name": "sga"
+    },
+    {
+      "name": "PIIX3"
+    },
+    {
+      "name": "ioh3420"
+    },
+    {
+      "name": "ES1370"
+    },
+    {
+      "name": "isa-i8259"
+    },
+    {
+      "name": "isa-pcspk"
+    },
+    {
+      "name": "ide-hd"
+    },
+    {
+      "name": "rng-egd"
+    },
+    {
+      "name": "cirrus-vga"
+    },
+    {
+      "name": "virtio-9p-pci"
+    },
+    {
+      "name": "x3130-upstream"
+    },
+    {
+      "name": "ide-drive"
+    },
+    {
+      "name": "qxl-vga"
+    },
+    {
+      "name": "usb-uas"
+    },
+    {
+      "name": "kvm-pit"
+    },
+    {
+      "name": "virtio-blk-pci"
+    },
+    {
+      "name": "sysbus-ohci"
+    },
+    {
+      "name": "esp"
+    },
+    {
+      "name": "piix3-ide-xen"
+    },
+    {
+      "name": "i82559c"
+    },
+    {
+      "name": "i82559b"
+    },
+    {
+      "name": "i82559a"
+    },
+    {
+      "name": "scsi-hd"
+    },
+    {
+      "name": "PIIX3-xen"
+    },
+    {
+      "name": "isa-pit"
+    },
+    {
+      "name": "usb-storage"
+    },
+    {
+      "name": "VGA"
     }
+  ],
+  "id": "libvirt-8"
 }
 
 {
-    "return": [
-        {
-            "capability": "xbzrle",
-            "state": false
-        }
-    ],
-    "id": "libvirt-45"
+  "return": [
+    {
+      "name": "command_serr_enable",
+      "type": "on/off"
+    },
+    {
+      "name": "multifunction",
+      "type": "on/off"
+    },
+    {
+      "name": "rombar",
+      "type": "uint32"
+    },
+    {
+      "name": "romfile",
+      "type": "string"
+    },
+    {
+      "name": "addr",
+      "type": "pci-devfn"
+    },
+    {
+      "name": "config-wce",
+      "type": "on/off"
+    },
+    {
+      "name": "event_idx",
+      "type": "on/off"
+    },
+    {
+      "name": "indirect_desc",
+      "type": "on/off"
+    },
+    {
+      "name": "vectors",
+      "type": "uint32"
+    },
+    {
+      "name": "ioeventfd",
+      "type": "on/off"
+    },
+    {
+      "name": "config-wce",
+      "type": "on/off"
+    },
+    {
+      "name": "scsi",
+      "type": "on/off"
+    },
+    {
+      "name": "serial",
+      "type": "string"
+    },
+    {
+      "name": "secs",
+      "type": "uint32"
+    },
+    {
+      "name": "heads",
+      "type": "uint32"
+    },
+    {
+      "name": "cyls",
+      "type": "uint32"
+    },
+    {
+      "name": "discard_granularity",
+      "type": "uint32"
+    },
+    {
+      "name": "bootindex",
+      "type": "int32"
+    },
+    {
+      "name": "opt_io_size",
+      "type": "uint32"
+    },
+    {
+      "name": "min_io_size",
+      "type": "uint16"
+    },
+    {
+      "name": "physical_block_size",
+      "type": "blocksize"
+    },
+    {
+      "name": "logical_block_size",
+      "type": "blocksize"
+    },
+    {
+      "name": "drive",
+      "type": "drive"
+    },
+    {
+      "name": "class",
+      "type": "hex32"
+    }
+  ],
+  "id": "libvirt-9"
+}
+
+{
+  "return": [
+    {
+      "name": "command_serr_enable",
+      "type": "on/off"
+    },
+    {
+      "name": "multifunction",
+      "type": "on/off"
+    },
+    {
+      "name": "rombar",
+      "type": "uint32"
+    },
+    {
+      "name": "romfile",
+      "type": "string"
+    },
+    {
+      "name": "addr",
+      "type": "pci-devfn"
+    },
+    {
+      "name": "tx",
+      "type": "string"
+    },
+    {
+      "name": "x-txburst",
+      "type": "int32"
+    },
+    {
+      "name": "x-txtimer",
+      "type": "uint32"
+    },
+    {
+      "name": "bootindex",
+      "type": "int32"
+    },
+    {
+      "name": "netdev",
+      "type": "netdev"
+    },
+    {
+      "name": "vlan",
+      "type": "vlan"
+    },
+    {
+      "name": "mac",
+      "type": "macaddr"
+    },
+    {
+      "name": "ctrl_rx_extra",
+      "type": "on/off"
+    },
+    {
+      "name": "ctrl_vlan",
+      "type": "on/off"
+    },
+    {
+      "name": "ctrl_rx",
+      "type": "on/off"
+    },
+    {
+      "name": "ctrl_vq",
+      "type": "on/off"
+    },
+    {
+      "name": "status",
+      "type": "on/off"
+    },
+    {
+      "name": "mrg_rxbuf",
+      "type": "on/off"
+    },
+    {
+      "name": "host_ufo",
+      "type": "on/off"
+    },
+    {
+      "name": "host_ecn",
+      "type": "on/off"
+    },
+    {
+      "name": "host_tso6",
+      "type": "on/off"
+    },
+    {
+      "name": "host_tso4",
+      "type": "on/off"
+    },
+    {
+      "name": "guest_ufo",
+      "type": "on/off"
+    },
+    {
+      "name": "guest_ecn",
+      "type": "on/off"
+    },
+    {
+      "name": "guest_tso6",
+      "type": "on/off"
+    },
+    {
+      "name": "guest_tso4",
+      "type": "on/off"
+    },
+    {
+      "name": "gso",
+      "type": "on/off"
+    },
+    {
+      "name": "guest_csum",
+      "type": "on/off"
+    },
+    {
+      "name": "csum",
+      "type": "on/off"
+    },
+    {
+      "name": "event_idx",
+      "type": "on/off"
+    },
+    {
+      "name": "indirect_desc",
+      "type": "on/off"
+    },
+    {
+      "name": "vectors",
+      "type": "uint32"
+    },
+    {
+      "name": "ioeventfd",
+      "type": "on/off"
+    }
+  ],
+  "id": "libvirt-10"
+}
+
+{
+  "return": [
+    {
+      "name": "command_serr_enable",
+      "type": "on/off"
+    },
+    {
+      "name": "multifunction",
+      "type": "on/off"
+    },
+    {
+      "name": "rombar",
+      "type": "uint32"
+    },
+    {
+      "name": "romfile",
+      "type": "string"
+    },
+    {
+      "name": "addr",
+      "type": "pci-devfn"
+    },
+    {
+      "name": "param_change",
+      "type": "on/off"
+    },
+    {
+      "name": "hotplug",
+      "type": "on/off"
+    },
+    {
+      "name": "cmd_per_lun",
+      "type": "uint32"
+    },
+    {
+      "name": "max_sectors",
+      "type": "uint32"
+    },
+    {
+      "name": "num_queues",
+      "type": "uint32"
+    },
+    {
+      "name": "event_idx",
+      "type": "on/off"
+    },
+    {
+      "name": "indirect_desc",
+      "type": "on/off"
+    },
+    {
+      "name": "vectors",
+      "type": "uint32"
+    },
+    {
+      "name": "ioeventfd",
+      "type": "on/off"
+    }
+  ],
+  "id": "libvirt-11"
+}
+
+{
+  "id": "libvirt-12",
+  "error": {
+    "class": "DeviceNotFound",
+    "desc": "Device 'virtio-blk-ccw' not found"
+  }
+}
+
+{
+  "id": "libvirt-13",
+  "error": {
+    "class": "DeviceNotFound",
+    "desc": "Device 'virtio-net-ccw' not found"
+  }
+}
+
+{
+  "id": "libvirt-14",
+  "error": {
+    "class": "DeviceNotFound",
+    "desc": "Device 'virtio-scsi-ccw' not found"
+  }
+}
+
+{
+  "id": "libvirt-15",
+  "error": {
+    "class": "DeviceNotFound",
+    "desc": "Device 'virtio-blk-s390' not found"
+  }
+}
+
+{
+  "id": "libvirt-16",
+  "error": {
+    "class": "DeviceNotFound",
+    "desc": "Device 'virtio-net-s390' not found"
+  }
+}
+
+{
+  "id": "libvirt-17",
+  "error": {
+    "class": "DeviceNotFound",
+    "desc": "Device 'pci-assign' not found"
+  }
+}
+
+{
+  "return": [
+    {
+      "name": "command_serr_enable",
+      "type": "on/off"
+    },
+    {
+      "name": "multifunction",
+      "type": "on/off"
+    },
+    {
+      "name": "rombar",
+      "type": "uint32"
+    },
+    {
+      "name": "romfile",
+      "type": "string"
+    },
+    {
+      "name": "addr",
+      "type": "pci-devfn"
+    },
+    {
+      "name": "configfd",
+      "type": "string"
+    },
+    {
+      "name": "bootindex",
+      "type": "int32"
+    },
+    {
+      "name": "share_intx",
+      "type": "on/off"
+    },
+    {
+      "name": "prefer_msi",
+      "type": "on/off"
+    },
+    {
+      "name": "host",
+      "type": "pci-host-devaddr"
+    }
+  ],
+  "id": "libvirt-18"
+}
+
+{
+  "return": [
+    {
+      "name": "command_serr_enable",
+      "type": "on/off"
+    },
+    {
+      "name": "multifunction",
+      "type": "on/off"
+    },
+    {
+      "name": "rombar",
+      "type": "uint32"
+    },
+    {
+      "name": "romfile",
+      "type": "string"
+    },
+    {
+      "name": "addr",
+      "type": "pci-devfn"
+    },
+    {
+      "name": "x-intx-mmap-timeout-ms",
+      "type": "uint32"
+    },
+    {
+      "name": "host",
+      "type": "pci-host-devaddr"
+    }
+  ],
+  "id": "libvirt-19"
+}
+
+{
+  "return": [
+    {
+      "name": "lun",
+      "type": "uint32"
+    },
+    {
+      "name": "scsi-id",
+      "type": "uint32"
+    },
+    {
+      "name": "channel",
+      "type": "uint32"
+    },
+    {
+      "name": "wwn",
+      "type": "hex64"
+    },
+    {
+      "name": "dpofua",
+      "type": "on/off"
+    },
+    {
+      "name": "removable",
+      "type": "on/off"
+    },
+    {
+      "name": "product",
+      "type": "string"
+    },
+    {
+      "name": "vendor",
+      "type": "string"
+    },
+    {
+      "name": "serial",
+      "type": "string"
+    },
+    {
+      "name": "ver",
+      "type": "string"
+    },
+    {
+      "name": "discard_granularity",
+      "type": "uint32"
+    },
+    {
+      "name": "bootindex",
+      "type": "int32"
+    },
+    {
+      "name": "opt_io_size",
+      "type": "uint32"
+    },
+    {
+      "name": "min_io_size",
+      "type": "uint16"
+    },
+    {
+      "name": "physical_block_size",
+      "type": "blocksize"
+    },
+    {
+      "name": "logical_block_size",
+      "type": "blocksize"
+    },
+    {
+      "name": "drive",
+      "type": "drive"
+    }
+  ],
+  "id": "libvirt-20"
+}
+
+{
+  "return": [
+    {
+      "name": "unit",
+      "type": "uint32"
+    },
+    {
+      "name": "model",
+      "type": "string"
+    },
+    {
+      "name": "serial",
+      "type": "string"
+    },
+    {
+      "name": "wwn",
+      "type": "hex64"
+    },
+    {
+      "name": "ver",
+      "type": "string"
+    },
+    {
+      "name": "discard_granularity",
+      "type": "uint32"
+    },
+    {
+      "name": "bootindex",
+      "type": "int32"
+    },
+    {
+      "name": "opt_io_size",
+      "type": "uint32"
+    },
+    {
+      "name": "min_io_size",
+      "type": "uint16"
+    },
+    {
+      "name": "physical_block_size",
+      "type": "blocksize"
+    },
+    {
+      "name": "logical_block_size",
+      "type": "blocksize"
+    },
+    {
+      "name": "drive",
+      "type": "drive"
+    }
+  ],
+  "id": "libvirt-21"
+}
+
+{
+  "return": [
+    {
+      "name": "command_serr_enable",
+      "type": "on/off"
+    },
+    {
+      "name": "multifunction",
+      "type": "on/off"
+    },
+    {
+      "name": "rombar",
+      "type": "uint32"
+    },
+    {
+      "name": "romfile",
+      "type": "string"
+    },
+    {
+      "name": "addr",
+      "type": "pci-devfn"
+    },
+    {
+      "name": "s4_val",
+      "type": "uint8"
+    },
+    {
+      "name": "disable_s4",
+      "type": "uint8"
+    },
+    {
+      "name": "disable_s3",
+      "type": "uint8"
+    },
+    {
+      "name": "smb_io_base",
+      "type": "uint32"
+    }
+  ],
+  "id": "libvirt-22"
+}
+
+{
+  "return": [
+    {
+      "name": "full-path",
+      "type": "on/off"
+    },
+    {
+      "name": "port",
+      "type": "string"
+    },
+    {
+      "name": "bootindex",
+      "type": "int32"
+    },
+    {
+      "name": "filter",
+      "type": "string"
+    },
+    {
+      "name": "debug",
+      "type": "uint8"
+    },
+    {
+      "name": "chardev",
+      "type": "chr"
+    }
+  ],
+  "id": "libvirt-23"
+}
+
+{
+  "return": [
+    {
+      "name": "full-path",
+      "type": "on/off"
+    },
+    {
+      "name": "port",
+      "type": "string"
+    },
+    {
+      "name": "pipeline",
+      "type": "on/off"
+    },
+    {
+      "name": "bootindex",
+      "type": "int32"
+    },
+    {
+      "name": "isobufs",
+      "type": "uint32"
+    },
+    {
+      "name": "productid",
+      "type": "hex32"
+    },
+    {
+      "name": "vendorid",
+      "type": "hex32"
+    },
+    {
+      "name": "hostport",
+      "type": "string"
+    },
+    {
+      "name": "hostaddr",
+      "type": "uint32"
+    },
+    {
+      "name": "hostbus",
+      "type": "uint32"
+    }
+  ],
+  "id": "libvirt-24"
+}
+
+{
+  "return": [
+    {
+      "name": "lun",
+      "type": "uint32"
+    },
+    {
+      "name": "scsi-id",
+      "type": "uint32"
+    },
+    {
+      "name": "channel",
+      "type": "uint32"
+    },
+    {
+      "name": "bootindex",
+      "type": "int32"
+    },
+    {
+      "name": "drive",
+      "type": "drive"
+    }
+  ],
+  "id": "libvirt-25"
+}
+
+{
+  "return": [
+  ],
+  "id": "libvirt-26"
+}
+
+{
+  "return": [
+    {
+      "name": "MCFG",
+      "type": "uint64"
+    }
+  ],
+  "id": "libvirt-27"
+}
+
+{
+  "return": [
+    {
+      "name": "full-path",
+      "type": "on/off"
+    },
+    {
+      "name": "port",
+      "type": "string"
+    },
+    {
+      "name": "removable",
+      "type": "on/off"
+    },
+    {
+      "name": "serial",
+      "type": "string"
+    },
+    {
+      "name": "discard_granularity",
+      "type": "uint32"
+    },
+    {
+      "name": "bootindex",
+      "type": "int32"
+    },
+    {
+      "name": "opt_io_size",
+      "type": "uint32"
+    },
+    {
+      "name": "min_io_size",
+      "type": "uint16"
+    },
+    {
+      "name": "physical_block_size",
+      "type": "blocksize"
+    },
+    {
+      "name": "logical_block_size",
+      "type": "blocksize"
+    },
+    {
+      "name": "drive",
+      "type": "drive"
+    }
+  ],
+  "id": "libvirt-28"
+}
+
+{
+  "return": [
+    {
+      "name": "lost_tick_policy",
+      "type": "LostTickPolicy"
+    },
+    {
+      "name": "iobase",
+      "type": "hex32"
+    }
+  ],
+  "id": "libvirt-29"
+}
+
+{
+  "return": [
+    {
+      "name": "command_serr_enable",
+      "type": "on/off"
+    },
+    {
+      "name": "multifunction",
+      "type": "on/off"
+    },
+    {
+      "name": "rombar",
+      "type": "uint32"
+    },
+    {
+      "name": "romfile",
+      "type": "string"
+    },
+    {
+      "name": "addr",
+      "type": "pci-devfn"
+    },
+    {
+      "name": "mmio",
+      "type": "on/off"
+    },
+    {
+      "name": "vgamem_mb",
+      "type": "uint32"
+    }
+  ],
+  "id": "libvirt-30"
+}
+
+{
+  "return": [
+    {
+      "name": "command_serr_enable",
+      "type": "on/off"
+    },
+    {
+      "name": "multifunction",
+      "type": "on/off"
+    },
+    {
+      "name": "rombar",
+      "type": "uint32"
+    },
+    {
+      "name": "romfile",
+      "type": "string"
+    },
+    {
+      "name": "addr",
+      "type": "pci-devfn"
+    },
+    {
+      "name": "vgamem_mb",
+      "type": "uint32"
+    }
+  ],
+  "id": "libvirt-31"
+}
+
+{
+  "return": [
+    {
+      "name": "command_serr_enable",
+      "type": "on/off"
+    },
+    {
+      "name": "multifunction",
+      "type": "on/off"
+    },
+    {
+      "name": "rombar",
+      "type": "uint32"
+    },
+    {
+      "name": "romfile",
+      "type": "string"
+    },
+    {
+      "name": "addr",
+      "type": "pci-devfn"
+    },
+    {
+      "name": "surfaces",
+      "type": "int32"
+    },
+    {
+      "name": "vgamem_mb",
+      "type": "uint32"
+    },
+    {
+      "name": "vram64_size_mb",
+      "type": "uint32"
+    },
+    {
+      "name": "vram_size_mb",
+      "type": "uint32"
+    },
+    {
+      "name": "ram_size_mb",
+      "type": "uint32"
+    },
+    {
+      "name": "cmdlog",
+      "type": "uint32"
+    },
+    {
+      "name": "guestdebug",
+      "type": "uint32"
+    },
+    {
+      "name": "debug",
+      "type": "uint32"
+    },
+    {
+      "name": "revision",
+      "type": "uint32"
+    },
+    {
+      "name": "vram_size",
+      "type": "uint32"
+    },
+    {
+      "name": "ram_size",
+      "type": "uint32"
+    }
+  ],
+  "id": "libvirt-32"
+}
+
+{
+  "return": [
+    {
+      "name": "command_serr_enable",
+      "type": "on/off"
+    },
+    {
+      "name": "multifunction",
+      "type": "on/off"
+    },
+    {
+      "name": "rombar",
+      "type": "uint32"
+    },
+    {
+      "name": "romfile",
+      "type": "string"
+    },
+    {
+      "name": "addr",
+      "type": "pci-devfn"
+    },
+    {
+      "name": "surfaces",
+      "type": "int32"
+    },
+    {
+      "name": "vgamem_mb",
+      "type": "uint32"
+    },
+    {
+      "name": "vram64_size_mb",
+      "type": "uint32"
+    },
+    {
+      "name": "vram_size_mb",
+      "type": "uint32"
+    },
+    {
+      "name": "ram_size_mb",
+      "type": "uint32"
+    },
+    {
+      "name": "cmdlog",
+      "type": "uint32"
+    },
+    {
+      "name": "guestdebug",
+      "type": "uint32"
+    },
+    {
+      "name": "debug",
+      "type": "uint32"
+    },
+    {
+      "name": "revision",
+      "type": "uint32"
+    },
+    {
+      "name": "vram_size",
+      "type": "uint32"
+    },
+    {
+      "name": "ram_size",
+      "type": "uint32"
+    }
+  ],
+  "id": "libvirt-33"
+}
+
+{
+  "id": "libvirt-34",
+  "error": {
+    "class": "DeviceNotFound",
+    "desc": "Device 'virtio-gpu-pci' not found"
+  }
+}
+
+{
+  "id": "libvirt-35",
+  "error": {
+    "class": "DeviceNotFound",
+    "desc": "Device 'ICH9-LPC' not found"
+  }
+}
+
+{
+  "return": [
+    {
+      "name": "command_serr_enable",
+      "type": "on/off"
+    },
+    {
+      "name": "multifunction",
+      "type": "on/off"
+    },
+    {
+      "name": "rombar",
+      "type": "uint32"
+    },
+    {
+      "name": "romfile",
+      "type": "string"
+    },
+    {
+      "name": "addr",
+      "type": "pci-devfn"
+    },
+    {
+      "name": "class",
+      "type": "hex32"
+    },
+    {
+      "name": "event_idx",
+      "type": "on/off"
+    },
+    {
+      "name": "indirect_desc",
+      "type": "on/off"
+    }
+  ],
+  "id": "libvirt-36"
+}
+
+{
+  "id": "libvirt-37",
+  "error": {
+    "class": "DeviceNotFound",
+    "desc": "Device 'virtio-balloon-ccw' not found"
+  }
+}
+
+{
+  "id": "libvirt-38",
+  "error": {
+    "class": "DeviceNotFound",
+    "desc": "Device 'virtio-balloon-device' not found"
+  }
+}
+
+{
+  "return": [
+    {
+      "name": "command_serr_enable",
+      "type": "on/off"
+    },
+    {
+      "name": "multifunction",
+      "type": "on/off"
+    },
+    {
+      "name": "rombar",
+      "type": "uint32"
+    },
+    {
+      "name": "romfile",
+      "type": "string"
+    },
+    {
+      "name": "addr",
+      "type": "pci-devfn"
+    },
+    {
+      "name": "p3",
+      "type": "uint32"
+    },
+    {
+      "name": "p2",
+      "type": "uint32"
+    },
+    {
+      "name": "slots",
+      "type": "uint32"
+    },
+    {
+      "name": "intrs",
+      "type": "uint32"
+    },
+    {
+      "name": "msix",
+      "type": "on/off"
+    },
+    {
+      "name": "msi",
+      "type": "on/off"
+    }
+  ],
+  "id": "libvirt-39"
+}
+
+{
+  "return": [
+    {
+      "name": "q35-next",
+      "alias": "q35"
+    },
+    {
+      "name": "isapc"
+    },
+    {
+      "name": "pc-0.10"
+    },
+    {
+      "name": "pc-0.11"
+    },
+    {
+      "name": "pc-0.12"
+    },
+    {
+      "name": "pc-0.13"
+    },
+    {
+      "name": "pc-0.14"
+    },
+    {
+      "name": "pc-0.15"
+    },
+    {
+      "name": "pc-1.0"
+    },
+    {
+      "name": "pc-1.1"
+    },
+    {
+      "name": "pc-1.2"
+    },
+    {
+      "name": "pc-1.3",
+      "is-default": true,
+      "alias": "pc"
+    },
+    {
+      "name": "none"
+    }
+  ],
+  "id": "libvirt-40"
+}
+
+{
+  "return": [
+    {
+      "name": "qemu64"
+    },
+    {
+      "name": "phenom"
+    },
+    {
+      "name": "core2duo"
+    },
+    {
+      "name": "kvm64"
+    },
+    {
+      "name": "qemu32"
+    },
+    {
+      "name": "kvm32"
+    },
+    {
+      "name": "coreduo"
+    },
+    {
+      "name": "486"
+    },
+    {
+      "name": "pentium"
+    },
+    {
+      "name": "pentium2"
+    },
+    {
+      "name": "pentium3"
+    },
+    {
+      "name": "athlon"
+    },
+    {
+      "name": "n270"
+    },
+    {
+      "name": "Conroe"
+    },
+    {
+      "name": "Penryn"
+    },
+    {
+      "name": "Nehalem"
+    },
+    {
+      "name": "Westmere"
+    },
+    {
+      "name": "SandyBridge"
+    },
+    {
+      "name": "Haswell"
+    },
+    {
+      "name": "Opteron_G1"
+    },
+    {
+      "name": "Opteron_G2"
+    },
+    {
+      "name": "Opteron_G3"
+    },
+    {
+      "name": "Opteron_G4"
+    },
+    {
+      "name": "Opteron_G5"
+    }
+  ],
+  "id": "libvirt-41"
+}
+
+{
+  "return": {
+    "enabled": false,
+    "present": true
+  },
+  "id": "libvirt-42"
+}
+
+{
+  "id": "libvirt-43",
+  "error": {
+    "class": "CommandNotFound",
+    "desc": "The command query-tpm-models has not been found"
+  }
+}
+
+{
+  "id": "libvirt-44",
+  "error": {
+    "class": "CommandNotFound",
+    "desc": "The command query-tpm-types has not been found"
+  }
+}
+
+{
+  "id": "libvirt-45",
+  "error": {
+    "class": "CommandNotFound",
+    "desc": "The command query-command-line-options has not been found"
+  }
+}
+
+{
+  "return": [
+    {
+      "state": false,
+      "capability": "xbzrle"
+    }
+  ],
+  "id": "libvirt-46"
 }
diff --git a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml
index ce2e02f238..3ac7bddbc9 100644
--- a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml
@@ -46,6 +46,7 @@
   <flag name='ich9-usb-ehci1'/>
   <flag name='vt82c686b-usb-uhci'/>
   <flag name='pci-ohci'/>
+  <flag name='usb-redir'/>
   <flag name='usb-hub'/>
   <flag name='no-shutdown'/>
   <flag name='cache-unsafe'/>
@@ -74,6 +75,7 @@
   <flag name='blockio'/>
   <flag name='disable-s3'/>
   <flag name='disable-s4'/>
+  <flag name='usb-redir.filter'/>
   <flag name='ide-drive.wwn'/>
   <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
@@ -82,6 +84,7 @@
   <flag name='block-commit'/>
   <flag name='vnc'/>
   <flag name='drive-mirror'/>
+  <flag name='usb-redir.bootindex'/>
   <flag name='usb-host.bootindex'/>
   <flag name='blockdev-snapshot-sync'/>
   <flag name='qxl'/>
@@ -158,9 +161,7 @@
   <cpu name='Opteron_G4'/>
   <cpu name='Opteron_G5'/>
   <machine name='pc-1.3' alias='pc' maxCpus='0'/>
-  <machine name='xenpv' maxCpus='0'/>
   <machine name='q35-next' alias='q35' maxCpus='0'/>
-  <machine name='xenfv' maxCpus='0'/>
   <machine name='isapc' maxCpus='0'/>
   <machine name='pc-0.10' maxCpus='0'/>
   <machine name='pc-0.11' maxCpus='0'/>