From c1bc9c662b411f8fa06071991921a180480a0f40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
Date: Tue, 10 Apr 2018 14:52:47 +0200
Subject: [PATCH] Require QEMU 1.5.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

According to the policy described on https://libvirt.org/platforms.html
the QEMU versions in the oldest relevant releses are:

  SLES 12: 2.0.0
  RHEL 7: 1.5.3
  Ubuntu 14.04: 2.0.0

Set the minimum to 1.5.0 and drop support for RHEL 6.

This will let us assume lots of capabilities.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
---
 src/qemu/qemu_capabilities.c                  |    3 +-
 .../caps_1.2.2.x86_64.replies                 | 1886 --------------
 .../caps_1.2.2.x86_64.xml                     |  172 --
 .../caps_1.3.1.x86_64.replies                 | 2141 ----------------
 .../caps_1.3.1.x86_64.xml                     |  196 --
 .../caps_1.4.2.x86_64.replies                 | 2191 -----------------
 .../caps_1.4.2.x86_64.xml                     |  198 --
 tests/qemucapabilitiestest.c                  |    3 -
 8 files changed, 1 insertion(+), 6789 deletions(-)
 delete mode 100644 tests/qemucapabilitiesdata/caps_1.2.2.x86_64.replies
 delete mode 100644 tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml
 delete mode 100644 tests/qemucapabilitiesdata/caps_1.3.1.x86_64.replies
 delete mode 100644 tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml
 delete mode 100644 tests/qemucapabilitiesdata/caps_1.4.2.x86_64.replies
 delete mode 100644 tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 190a30d47d..91b7aa31ec 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -3758,7 +3758,7 @@ virQEMUCapsProbeQMPSchemaCapabilities(virQEMUCapsPtr qemuCaps,
 }
 
 #define QEMU_MIN_MAJOR 1
-#define QEMU_MIN_MINOR 2
+#define QEMU_MIN_MINOR 5
 #define QEMU_MIN_MICRO 0
 
 int
@@ -3796,7 +3796,6 @@ virQEMUCapsInitQMPMonitor(virQEMUCapsPtr qemuCaps,
                        _("QEMU version >= %d.%d.%d is required, but %d.%d.%d found"),
                        QEMU_MIN_MAJOR, QEMU_MIN_MINOR, QEMU_MIN_MICRO,
                        major, minor, micro);
-        ret = 0;
         goto cleanup;
     }
 
diff --git a/tests/qemucapabilitiesdata/caps_1.2.2.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.2.2.x86_64.replies
deleted file mode 100644
index a3a9510511..0000000000
--- a/tests/qemucapabilitiesdata/caps_1.2.2.x86_64.replies
+++ /dev/null
@@ -1,1886 +0,0 @@
-{
-  "QMP": {
-    "version": {
-      "qemu": {
-        "micro": 2,
-        "minor": 2,
-        "major": 1
-      },
-      "package": ""
-    },
-    "capabilities": [
-    ]
-  }
-}
-
-{
-  "return": {
-  },
-  "id": "libvirt-1"
-}
-
-{
-  "return": {
-    "qemu": {
-      "micro": 2,
-      "minor": 2,
-      "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": "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": "blockdev-snapshot-sync"
-    },
-    {
-      "name": "transaction"
-    },
-    {
-      "name": "block-job-cancel"
-    },
-    {
-      "name": "block-job-set-speed"
-    },
-    {
-      "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-save-devices-state"
-    },
-    {
-      "name": "inject-nmi"
-    },
-    {
-      "name": "pmemsave"
-    },
-    {
-      "name": "memsave"
-    },
-    {
-      "name": "cpu"
-    },
-    {
-      "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-5",
-  "error": {
-    "class": "GenericError",
-    "desc": "Parameter 'fdset-id' expects an existing fdset-id"
-  }
-}
-
-{
-  "return": {
-    "enabled": true,
-    "present": true
-  },
-  "id": "libvirt-6"
-}
-
-{
-  "return": [
-    {
-      "name": "SPICE_MIGRATE_COMPLETED"
-    },
-    {
-      "name": "BALLOON_CHANGE"
-    },
-    {
-      "name": "WAKEUP"
-    },
-    {
-      "name": "SUSPEND_DISK"
-    },
-    {
-      "name": "SUSPEND"
-    },
-    {
-      "name": "DEVICE_TRAY_MOVED"
-    },
-    {
-      "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": "apic"
-    },
-    {
-      "name": "virtio-scsi-pci"
-    },
-    {
-      "name": "i6300esb"
-    },
-    {
-      "name": "usb-ehci"
-    },
-    {
-      "name": "vt82c686b-usb-uhci"
-    },
-    {
-      "name": "ich9-ahci"
-    },
-    {
-      "name": "usb-host"
-    },
-    {
-      "name": "isa-ide"
-    },
-    {
-      "name": "ich9-usb-ehci1"
-    },
-    {
-      "name": "virtio-balloon-pci"
-    },
-    {
-      "name": "virtio-net-pci"
-    },
-    {
-      "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": "x86_64-cpu"
-    },
-    {
-      "name": "isa-cirrus-vga"
-    },
-    {
-      "name": "dc390"
-    },
-    {
-      "name": "vmware-svga"
-    },
-    {
-      "name": "smbus-eeprom"
-    },
-    {
-      "name": "i82801"
-    },
-    {
-      "name": "ccid-card-passthru"
-    },
-    {
-      "name": "fw_cfg"
-    },
-    {
-      "name": "piix4-usb-uhci"
-    },
-    {
-      "name": "i82557b"
-    },
-    {
-      "name": "piix3-usb-uhci"
-    },
-    {
-      "name": "ib700"
-    },
-    {
-      "name": "usb-audio"
-    },
-    {
-      "name": "i82557c"
-    },
-    {
-      "name": "i82557a"
-    },
-    {
-      "name": "qxl"
-    },
-    {
-      "name": "rtl8139"
-    },
-    {
-      "name": "hpet"
-    },
-    {
-      "name": "isa-applesmc"
-    },
-    {
-      "name": "container"
-    },
-    {
-      "name": "usb-kbd"
-    },
-    {
-      "name": "isa-vga"
-    },
-    {
-      "name": "usb-tablet"
-    },
-    {
-      "name": "kvmvapic"
-    },
-    {
-      "name": "usb-bt-dongle"
-    },
-    {
-      "name": "sysbus-fdc"
-    },
-    {
-      "name": "piix4-ide"
-    },
-    {
-      "name": "e1000"
-    },
-    {
-      "name": "AC97"
-    },
-    {
-      "name": "ivshmem"
-    },
-    {
-      "name": "usb-ccid"
-    },
-    {
-      "name": "sysbus-ahci"
-    },
-    {
-      "name": "kvmclock"
-    },
-    {
-      "name": "i82562"
-    },
-    {
-      "name": "hda-output"
-    },
-    {
-      "name": "ccid-bus"
-    },
-    {
-      "name": "i82559er"
-    },
-    {
-      "name": "megasas"
-    },
-    {
-      "name": "i8042"
-    },
-    {
-      "name": "intel-hda"
-    },
-    {
-      "name": "vmport"
-    },
-    {
-      "name": "hda-duplex"
-    },
-    {
-      "name": "virtio-serial-pci"
-    },
-    {
-      "name": "ne2k_pci"
-    },
-    {
-      "name": "mc146818rtc"
-    },
-    {
-      "name": "virtconsole"
-    },
-    {
-      "name": "isa-parallel"
-    },
-    {
-      "name": "ich9-usb-uhci1"
-    },
-    {
-      "name": "ich9-usb-uhci3"
-    },
-    {
-      "name": "ich9-usb-uhci2"
-    },
-    {
-      "name": "PCI"
-    },
-    {
-      "name": "SUNW,fdtwo"
-    },
-    {
-      "name": "ide-cd"
-    },
-    {
-      "name": "isa-debugcon"
-    },
-    {
-      "name": "i82551"
-    },
-    {
-      "name": "i82550"
-    },
-    {
-      "name": "isa-serial"
-    },
-    {
-      "name": "kvm-ioapic"
-    },
-    {
-      "name": "System"
-    },
-    {
-      "name": "kvm-apic"
-    },
-    {
-      "name": "usb-wacom-tablet"
-    },
-    {
-      "name": "PIIX4_PM"
-    },
-    {
-      "name": "kvm-i8259"
-    },
-    {
-      "name": "scsi-cd"
-    },
-    {
-      "name": "i440FX"
-    },
-    {
-      "name": "usb-braille"
-    },
-    {
-      "name": "virtserialport"
-    },
-    {
-      "name": "xio3130-downstream"
-    },
-    {
-      "name": "nec-usb-xhci"
-    },
-    {
-      "name": "pci-ohci"
-    },
-    {
-      "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": "ioh3420"
-    },
-    {
-      "name": "ES1370"
-    },
-    {
-      "name": "isa-i8259"
-    },
-    {
-      "name": "isa-pcspk"
-    },
-    {
-      "name": "ide-hd"
-    },
-    {
-      "name": "PIIX3"
-    },
-    {
-      "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"
-}
-
-{
-  "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-net-ccw' not found"
-  }
-}
-
-{
-  "id": "libvirt-13",
-  "error": {
-    "class": "DeviceNotFound",
-    "desc": "Device 'virtio-scsi-ccw' not found"
-  }
-}
-
-{
-  "id": "libvirt-14",
-  "error": {
-    "class": "DeviceNotFound",
-    "desc": "Device 'virtio-net-s390' not found"
-  }
-}
-
-{
-  "id": "libvirt-15",
-  "error": {
-    "class": "DeviceNotFound",
-    "desc": "Device 'pci-assign' not found"
-  }
-}
-
-{
-  "id": "libvirt-16",
-  "error": {
-    "class": "DeviceNotFound",
-    "desc": "Device 'kvm-pci-assign' not found"
-  }
-}
-
-{
-  "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-17"
-}
-
-{
-  "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-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": "s4_val",
-      "type": "uint8"
-    },
-    {
-      "name": "disable_s4",
-      "type": "uint8"
-    },
-    {
-      "name": "disable_s3",
-      "type": "uint8"
-    },
-    {
-      "name": "smb_io_base",
-      "type": "uint32"
-    }
-  ],
-  "id": "libvirt-19"
-}
-
-{
-  "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-20"
-}
-
-{
-  "return": [
-    {
-      "name": "lun",
-      "type": "uint32"
-    },
-    {
-      "name": "scsi-id",
-      "type": "uint32"
-    },
-    {
-      "name": "channel",
-      "type": "uint32"
-    },
-    {
-      "name": "bootindex",
-      "type": "int32"
-    },
-    {
-      "name": "drive",
-      "type": "drive"
-    }
-  ],
-  "id": "libvirt-21"
-}
-
-{
-  "return": [
-  ],
-  "id": "libvirt-22"
-}
-
-{
-  "id": "libvirt-23",
-  "error": {
-    "class": "DeviceNotFound",
-    "desc": "Device 'q35-pcihost' not found"
-  }
-}
-
-{
-  "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-24"
-}
-
-{
-  "return": [
-    {
-      "name": "lost_tick_policy",
-      "type": "LostTickPolicy"
-    },
-    {
-      "name": "iobase",
-      "type": "hex32"
-    }
-  ],
-  "id": "libvirt-25"
-}
-
-{
-  "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-26"
-}
-
-{
-  "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-27"
-}
-
-{
-  "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"
-    },
-    {
-      "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-28"
-}
-
-{
-  "id": "libvirt-29",
-  "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-30"
-}
-
-{
-  "id": "libvirt-31",
-  "error": {
-    "class": "DeviceNotFound",
-    "desc": "Device 'virtio-balloon-ccw' not found"
-  }
-}
-
-{
-  "id": "libvirt-32",
-  "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": "msi",
-      "type": "uint32"
-    }
-  ],
-  "id": "libvirt-33"
-}
-
-{
-  "return": [
-    {
-      "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",
-      "is-default": true,
-      "alias": "pc"
-    },
-    {
-      "name": "none"
-    }
-  ],
-  "id": "libvirt-34"
-}
-
-{
-  "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": "Opteron_G1"
-    },
-    {
-      "name": "Opteron_G2"
-    },
-    {
-      "name": "Opteron_G3"
-    },
-    {
-      "name": "Opteron_G4"
-    }
-  ],
-  "id": "libvirt-35"
-}
-
-{
-  "id": "libvirt-36",
-  "error": {
-    "class": "CommandNotFound",
-    "desc": "The command query-tpm-models has not been found"
-  }
-}
-
-{
-  "id": "libvirt-37",
-  "error": {
-    "class": "CommandNotFound",
-    "desc": "The command query-tpm-types has not been found"
-  }
-}
-
-{
-  "id": "libvirt-38",
-  "error": {
-    "class": "CommandNotFound",
-    "desc": "The command query-command-line-options has not been found"
-  }
-}
-
-{
-  "return": [
-    {
-      "state": false,
-      "capability": "xbzrle"
-    }
-  ],
-  "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": "Opteron_G1"
-    },
-    {
-      "name": "Opteron_G2"
-    },
-    {
-      "name": "Opteron_G3"
-    },
-    {
-      "name": "Opteron_G4"
-    }
-  ],
-  "id": "libvirt-2"
-}
diff --git a/tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml
deleted file mode 100644
index f361944a1c..0000000000
--- a/tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml
+++ /dev/null
@@ -1,172 +0,0 @@
-<qemuCaps>
-  <qemuctime>0</qemuctime>
-  <selfctime>0</selfctime>
-  <selfvers>0</selfvers>
-  <usedQMP/>
-  <flag name='kvm'/>
-  <flag name='mem-path'/>
-  <flag name='drive-serial'/>
-  <flag name='monitor-json'/>
-  <flag name='sdl'/>
-  <flag name='netdev'/>
-  <flag name='rtc'/>
-  <flag name='vhost-net'/>
-  <flag name='no-hpet'/>
-  <flag name='no-kvm-pit'/>
-  <flag name='nodefconfig'/>
-  <flag name='boot-menu'/>
-  <flag name='fsdev'/>
-  <flag name='name-process'/>
-  <flag name='smbios-type'/>
-  <flag name='spice'/>
-  <flag name='vga-none'/>
-  <flag name='boot-index'/>
-  <flag name='hda-duplex'/>
-  <flag name='drive-aio'/>
-  <flag name='ccid-emulated'/>
-  <flag name='ccid-passthru'/>
-  <flag name='chardev-spicevmc'/>
-  <flag name='virtio-tx-alg'/>
-  <flag name='pci-multifunction'/>
-  <flag name='virtio-blk-pci.ioeventfd'/>
-  <flag name='sga'/>
-  <flag name='virtio-blk-pci.event_idx'/>
-  <flag name='virtio-net-pci.event_idx'/>
-  <flag name='cache-directsync'/>
-  <flag name='piix3-usb-uhci'/>
-  <flag name='piix4-usb-uhci'/>
-  <flag name='usb-ehci'/>
-  <flag name='ich9-usb-ehci1'/>
-  <flag name='vt82c686b-usb-uhci'/>
-  <flag name='pci-ohci'/>
-  <flag name='usb-hub'/>
-  <flag name='no-shutdown'/>
-  <flag name='cache-unsafe'/>
-  <flag name='ich9-ahci'/>
-  <flag name='no-acpi'/>
-  <flag name='fsdev-readonly'/>
-  <flag name='virtio-blk-pci.scsi'/>
-  <flag name='drive-copy-on-read'/>
-  <flag name='fsdev-writeout'/>
-  <flag name='drive-iotune'/>
-  <flag name='system_wakeup'/>
-  <flag name='scsi-disk.channel'/>
-  <flag name='scsi-block'/>
-  <flag name='transaction'/>
-  <flag name='block-job-async'/>
-  <flag name='scsi-cd'/>
-  <flag name='ide-cd'/>
-  <flag name='no-user-config'/>
-  <flag name='hda-micro'/>
-  <flag name='dump-guest-memory'/>
-  <flag name='nec-usb-xhci'/>
-  <flag name='balloon-event'/>
-  <flag name='bridge'/>
-  <flag name='lsi'/>
-  <flag name='virtio-scsi-pci'/>
-  <flag name='blockio'/>
-  <flag name='disable-s3'/>
-  <flag name='disable-s4'/>
-  <flag name='ide-drive.wwn'/>
-  <flag name='scsi-disk.wwn'/>
-  <flag name='seccomp-sandbox'/>
-  <flag name='dump-guest-core'/>
-  <flag name='seamless-migration'/>
-  <flag name='vnc'/>
-  <flag name='usb-host.bootindex'/>
-  <flag name='blockdev-snapshot-sync'/>
-  <flag name='qxl'/>
-  <flag name='VGA'/>
-  <flag name='cirrus-vga'/>
-  <flag name='vmware-svga'/>
-  <flag name='usb-serial'/>
-  <flag name='usb-net'/>
-  <flag name='dtb'/>
-  <flag name='megasas'/>
-  <flag name='ipv6-migration'/>
-  <flag name='machine-opt'/>
-  <flag name='pci-bridge'/>
-  <flag name='scsi-generic'/>
-  <flag name='scsi-generic.bootindex'/>
-  <flag name='vnc-share-policy'/>
-  <flag name='usb-storage'/>
-  <flag name='usb-storage.removable'/>
-  <flag name='kvm-pit-lost-tick-policy'/>
-  <flag name='usb-kbd'/>
-  <flag name='host-pci-multidomain'/>
-  <flag name='usb-audio'/>
-  <flag name='ivshmem'/>
-  <flag name='VGA.vgamem_mb'/>
-  <flag name='vmware-svga.vgamem_mb'/>
-  <flag name='qxl.vgamem_mb'/>
-  <flag name='ioh3420'/>
-  <flag name='x3130-upstream'/>
-  <flag name='xio3130-downstream'/>
-  <flag name='rtl8139'/>
-  <flag name='e1000'/>
-  <flag name='virtio-net'/>
-  <flag name='qxl.vram64_size_mb'/>
-  <flag name='device-tray-moved-event'/>
-  <flag name='display'/>
-  <flag name='query-cpu-definitions'/>
-  <flag name='isa-serial'/>
-  <version>1002002</version>
-  <kvmVersion>0</kvmVersion>
-  <microcodeVersion>26169</microcodeVersion>
-  <package></package>
-  <arch>x86_64</arch>
-  <cpu type='kvm' name='qemu64'/>
-  <cpu type='kvm' name='phenom'/>
-  <cpu type='kvm' name='core2duo'/>
-  <cpu type='kvm' name='kvm64'/>
-  <cpu type='kvm' name='qemu32'/>
-  <cpu type='kvm' name='kvm32'/>
-  <cpu type='kvm' name='coreduo'/>
-  <cpu type='kvm' name='486'/>
-  <cpu type='kvm' name='pentium'/>
-  <cpu type='kvm' name='pentium2'/>
-  <cpu type='kvm' name='pentium3'/>
-  <cpu type='kvm' name='athlon'/>
-  <cpu type='kvm' name='n270'/>
-  <cpu type='kvm' name='Conroe'/>
-  <cpu type='kvm' name='Penryn'/>
-  <cpu type='kvm' name='Nehalem'/>
-  <cpu type='kvm' name='Westmere'/>
-  <cpu type='kvm' name='SandyBridge'/>
-  <cpu type='kvm' name='Opteron_G1'/>
-  <cpu type='kvm' name='Opteron_G2'/>
-  <cpu type='kvm' name='Opteron_G3'/>
-  <cpu type='kvm' name='Opteron_G4'/>
-  <cpu type='tcg' name='qemu64'/>
-  <cpu type='tcg' name='phenom'/>
-  <cpu type='tcg' name='core2duo'/>
-  <cpu type='tcg' name='kvm64'/>
-  <cpu type='tcg' name='qemu32'/>
-  <cpu type='tcg' name='kvm32'/>
-  <cpu type='tcg' name='coreduo'/>
-  <cpu type='tcg' name='486'/>
-  <cpu type='tcg' name='pentium'/>
-  <cpu type='tcg' name='pentium2'/>
-  <cpu type='tcg' name='pentium3'/>
-  <cpu type='tcg' name='athlon'/>
-  <cpu type='tcg' name='n270'/>
-  <cpu type='tcg' name='Conroe'/>
-  <cpu type='tcg' name='Penryn'/>
-  <cpu type='tcg' name='Nehalem'/>
-  <cpu type='tcg' name='Westmere'/>
-  <cpu type='tcg' name='SandyBridge'/>
-  <cpu type='tcg' name='Opteron_G1'/>
-  <cpu type='tcg' name='Opteron_G2'/>
-  <cpu type='tcg' name='Opteron_G3'/>
-  <cpu type='tcg' name='Opteron_G4'/>
-  <machine name='pc-1.2' alias='pc' maxCpus='0'/>
-  <machine name='isapc' maxCpus='0'/>
-  <machine name='pc-0.10' maxCpus='0'/>
-  <machine name='pc-0.11' maxCpus='0'/>
-  <machine name='pc-0.12' maxCpus='0'/>
-  <machine name='pc-0.13' maxCpus='0'/>
-  <machine name='pc-0.14' maxCpus='0'/>
-  <machine name='pc-0.15' maxCpus='0'/>
-  <machine name='pc-1.0' maxCpus='0'/>
-  <machine name='pc-1.1' maxCpus='0'/>
-</qemuCaps>
diff --git a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.replies
deleted file mode 100644
index fc97bfcf9f..0000000000
--- a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.replies
+++ /dev/null
@@ -1,2141 +0,0 @@
-{
-  "QMP": {
-    "version": {
-      "qemu": {
-        "micro": 1,
-        "minor": 3,
-        "major": 1
-      },
-      "package": ""
-    },
-    "capabilities": [
-    ]
-  }
-}
-
-{
-  "return": {
-  },
-  "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": 13,
-    "fdset-id": 0
-  },
-  "id": "libvirt-5"
-}
-
-{
-  "id": "libvirt-6",
-  "error": {
-    "class": "GenericError",
-    "desc": "Parameter 'top' is missing"
-  }
-}
-
-{
-  "return": {
-    "enabled": true,
-    "present": true
-  },
-  "id": "libvirt-7"
-}
-
-{
-  "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-8"
-}
-
-{
-  "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-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": "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-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": "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-11"
-}
-
-{
-  "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-12"
-}
-
-{
-  "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-net-s390' not found"
-  }
-}
-
-{
-  "id": "libvirt-16",
-  "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-17"
-}
-
-{
-  "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-18"
-}
-
-{
-  "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-19"
-}
-
-{
-  "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-20"
-}
-
-{
-  "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-21"
-}
-
-{
-  "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-22"
-}
-
-{
-  "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-23"
-}
-
-{
-  "return": [
-    {
-      "name": "lun",
-      "type": "uint32"
-    },
-    {
-      "name": "scsi-id",
-      "type": "uint32"
-    },
-    {
-      "name": "channel",
-      "type": "uint32"
-    },
-    {
-      "name": "bootindex",
-      "type": "int32"
-    },
-    {
-      "name": "drive",
-      "type": "drive"
-    }
-  ],
-  "id": "libvirt-24"
-}
-
-{
-  "return": [
-  ],
-  "id": "libvirt-25"
-}
-
-{
-  "return": [
-    {
-      "name": "MCFG",
-      "type": "uint64"
-    }
-  ],
-  "id": "libvirt-26"
-}
-
-{
-  "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-27"
-}
-
-{
-  "return": [
-    {
-      "name": "lost_tick_policy",
-      "type": "LostTickPolicy"
-    },
-    {
-      "name": "iobase",
-      "type": "hex32"
-    }
-  ],
-  "id": "libvirt-28"
-}
-
-{
-  "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-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": "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": "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-31"
-}
-
-{
-  "id": "libvirt-32",
-  "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-33"
-}
-
-{
-  "id": "libvirt-34",
-  "error": {
-    "class": "DeviceNotFound",
-    "desc": "Device 'virtio-balloon-ccw' not found"
-  }
-}
-
-{
-  "id": "libvirt-35",
-  "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-36"
-}
-
-{
-  "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-37"
-}
-
-{
-  "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-38"
-}
-
-{
-  "id": "libvirt-39",
-  "error": {
-    "class": "CommandNotFound",
-    "desc": "The command query-tpm-models has not been found"
-  }
-}
-
-{
-  "id": "libvirt-40",
-  "error": {
-    "class": "CommandNotFound",
-    "desc": "The command query-tpm-types has not been found"
-  }
-}
-
-{
-  "id": "libvirt-41",
-  "error": {
-    "class": "CommandNotFound",
-    "desc": "The command query-command-line-options has not been found"
-  }
-}
-
-{
-  "return": [
-    {
-      "state": false,
-      "capability": "xbzrle"
-    }
-  ],
-  "id": "libvirt-42"
-}
-
-{
-  "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-2"
-}
diff --git a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml
deleted file mode 100644
index d6db1ae226..0000000000
--- a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml
+++ /dev/null
@@ -1,196 +0,0 @@
-<qemuCaps>
-  <qemuctime>0</qemuctime>
-  <selfctime>0</selfctime>
-  <selfvers>0</selfvers>
-  <usedQMP/>
-  <flag name='kvm'/>
-  <flag name='mem-path'/>
-  <flag name='drive-serial'/>
-  <flag name='monitor-json'/>
-  <flag name='sdl'/>
-  <flag name='netdev'/>
-  <flag name='rtc'/>
-  <flag name='vhost-net'/>
-  <flag name='no-hpet'/>
-  <flag name='no-kvm-pit'/>
-  <flag name='pci-configfd'/>
-  <flag name='nodefconfig'/>
-  <flag name='boot-menu'/>
-  <flag name='fsdev'/>
-  <flag name='name-process'/>
-  <flag name='smbios-type'/>
-  <flag name='spice'/>
-  <flag name='vga-none'/>
-  <flag name='boot-index'/>
-  <flag name='hda-duplex'/>
-  <flag name='drive-aio'/>
-  <flag name='pci-bootindex'/>
-  <flag name='ccid-emulated'/>
-  <flag name='ccid-passthru'/>
-  <flag name='chardev-spicevmc'/>
-  <flag name='virtio-tx-alg'/>
-  <flag name='pci-multifunction'/>
-  <flag name='virtio-blk-pci.ioeventfd'/>
-  <flag name='sga'/>
-  <flag name='virtio-blk-pci.event_idx'/>
-  <flag name='virtio-net-pci.event_idx'/>
-  <flag name='cache-directsync'/>
-  <flag name='piix3-usb-uhci'/>
-  <flag name='piix4-usb-uhci'/>
-  <flag name='usb-ehci'/>
-  <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'/>
-  <flag name='ich9-ahci'/>
-  <flag name='no-acpi'/>
-  <flag name='fsdev-readonly'/>
-  <flag name='virtio-blk-pci.scsi'/>
-  <flag name='drive-copy-on-read'/>
-  <flag name='fsdev-writeout'/>
-  <flag name='drive-iotune'/>
-  <flag name='system_wakeup'/>
-  <flag name='scsi-disk.channel'/>
-  <flag name='scsi-block'/>
-  <flag name='transaction'/>
-  <flag name='block-job-async'/>
-  <flag name='scsi-cd'/>
-  <flag name='ide-cd'/>
-  <flag name='no-user-config'/>
-  <flag name='hda-micro'/>
-  <flag name='dump-guest-memory'/>
-  <flag name='nec-usb-xhci'/>
-  <flag name='balloon-event'/>
-  <flag name='bridge'/>
-  <flag name='lsi'/>
-  <flag name='virtio-scsi-pci'/>
-  <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'/>
-  <flag name='dump-guest-core'/>
-  <flag name='seamless-migration'/>
-  <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'/>
-  <flag name='VGA'/>
-  <flag name='cirrus-vga'/>
-  <flag name='vmware-svga'/>
-  <flag name='usb-serial'/>
-  <flag name='usb-net'/>
-  <flag name='add-fd'/>
-  <flag name='nbd-server'/>
-  <flag name='virtio-rng'/>
-  <flag name='rng-random'/>
-  <flag name='rng-egd'/>
-  <flag name='dtb'/>
-  <flag name='megasas'/>
-  <flag name='ipv6-migration'/>
-  <flag name='machine-opt'/>
-  <flag name='machine-usb-opt'/>
-  <flag name='pci-bridge'/>
-  <flag name='vfio-pci'/>
-  <flag name='scsi-generic'/>
-  <flag name='scsi-generic.bootindex'/>
-  <flag name='vnc-websocket'/>
-  <flag name='vnc-share-policy'/>
-  <flag name='dmi-to-pci-bridge'/>
-  <flag name='usb-storage'/>
-  <flag name='usb-storage.removable'/>
-  <flag name='kvm-pit-lost-tick-policy'/>
-  <flag name='usb-kbd'/>
-  <flag name='host-pci-multidomain'/>
-  <flag name='usb-audio'/>
-  <flag name='ivshmem'/>
-  <flag name='VGA.vgamem_mb'/>
-  <flag name='vmware-svga.vgamem_mb'/>
-  <flag name='qxl.vgamem_mb'/>
-  <flag name='pci-serial'/>
-  <flag name='ioh3420'/>
-  <flag name='x3130-upstream'/>
-  <flag name='xio3130-downstream'/>
-  <flag name='rtl8139'/>
-  <flag name='e1000'/>
-  <flag name='virtio-net'/>
-  <flag name='qxl.vram64_size_mb'/>
-  <flag name='device-tray-moved-event'/>
-  <flag name='nec-usb-xhci-ports'/>
-  <flag name='display'/>
-  <flag name='query-cpu-definitions'/>
-  <flag name='isa-serial'/>
-  <version>1003001</version>
-  <kvmVersion>0</kvmVersion>
-  <microcodeVersion>29702</microcodeVersion>
-  <package></package>
-  <arch>x86_64</arch>
-  <cpu type='kvm' name='qemu64'/>
-  <cpu type='kvm' name='phenom'/>
-  <cpu type='kvm' name='core2duo'/>
-  <cpu type='kvm' name='kvm64'/>
-  <cpu type='kvm' name='qemu32'/>
-  <cpu type='kvm' name='kvm32'/>
-  <cpu type='kvm' name='coreduo'/>
-  <cpu type='kvm' name='486'/>
-  <cpu type='kvm' name='pentium'/>
-  <cpu type='kvm' name='pentium2'/>
-  <cpu type='kvm' name='pentium3'/>
-  <cpu type='kvm' name='athlon'/>
-  <cpu type='kvm' name='n270'/>
-  <cpu type='kvm' name='Conroe'/>
-  <cpu type='kvm' name='Penryn'/>
-  <cpu type='kvm' name='Nehalem'/>
-  <cpu type='kvm' name='Westmere'/>
-  <cpu type='kvm' name='SandyBridge'/>
-  <cpu type='kvm' name='Haswell'/>
-  <cpu type='kvm' name='Opteron_G1'/>
-  <cpu type='kvm' name='Opteron_G2'/>
-  <cpu type='kvm' name='Opteron_G3'/>
-  <cpu type='kvm' name='Opteron_G4'/>
-  <cpu type='kvm' name='Opteron_G5'/>
-  <cpu type='tcg' name='qemu64'/>
-  <cpu type='tcg' name='phenom'/>
-  <cpu type='tcg' name='core2duo'/>
-  <cpu type='tcg' name='kvm64'/>
-  <cpu type='tcg' name='qemu32'/>
-  <cpu type='tcg' name='kvm32'/>
-  <cpu type='tcg' name='coreduo'/>
-  <cpu type='tcg' name='486'/>
-  <cpu type='tcg' name='pentium'/>
-  <cpu type='tcg' name='pentium2'/>
-  <cpu type='tcg' name='pentium3'/>
-  <cpu type='tcg' name='athlon'/>
-  <cpu type='tcg' name='n270'/>
-  <cpu type='tcg' name='Conroe'/>
-  <cpu type='tcg' name='Penryn'/>
-  <cpu type='tcg' name='Nehalem'/>
-  <cpu type='tcg' name='Westmere'/>
-  <cpu type='tcg' name='SandyBridge'/>
-  <cpu type='tcg' name='Haswell'/>
-  <cpu type='tcg' name='Opteron_G1'/>
-  <cpu type='tcg' name='Opteron_G2'/>
-  <cpu type='tcg' name='Opteron_G3'/>
-  <cpu type='tcg' name='Opteron_G4'/>
-  <cpu type='tcg' name='Opteron_G5'/>
-  <machine name='pc-1.3' alias='pc' maxCpus='0'/>
-  <machine name='q35-next' alias='q35' maxCpus='0'/>
-  <machine name='isapc' maxCpus='0'/>
-  <machine name='pc-0.10' maxCpus='0'/>
-  <machine name='pc-0.11' maxCpus='0'/>
-  <machine name='pc-0.12' maxCpus='0'/>
-  <machine name='pc-0.13' maxCpus='0'/>
-  <machine name='pc-0.14' maxCpus='0'/>
-  <machine name='pc-0.15' maxCpus='0'/>
-  <machine name='pc-1.0' maxCpus='0'/>
-  <machine name='pc-1.1' maxCpus='0'/>
-  <machine name='pc-1.2' maxCpus='0'/>
-</qemuCaps>
diff --git a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.replies
deleted file mode 100644
index 3c96aa71ed..0000000000
--- a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.replies
+++ /dev/null
@@ -1,2191 +0,0 @@
-{
-  "QMP": {
-    "version": {
-      "qemu": {
-        "micro": 2,
-        "minor": 4,
-        "major": 1
-      },
-      "package": ""
-    },
-    "capabilities": [
-    ]
-  }
-}
-
-{
-  "return": {
-  },
-  "id": "libvirt-1"
-}
-
-{
-  "return": {
-    "qemu": {
-      "micro": 2,
-      "minor": 4,
-      "major": 1
-    },
-    "package": ""
-  },
-  "id": "libvirt-2"
-}
-
-{
-  "return": {
-    "arch": "x86_64"
-  },
-  "id": "libvirt-3"
-}
-
-{
-  "return": [
-    {
-      "name": "chardev-remove"
-    },
-    {
-      "name": "chardev-add"
-    },
-    {
-      "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": "ringbuf-read"
-    },
-    {
-      "name": "ringbuf-write"
-    },
-    {
-      "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": 14,
-    "fdset-id": 0
-  },
-  "id": "libvirt-5"
-}
-
-{
-  "id": "libvirt-6",
-  "error": {
-    "class": "GenericError",
-    "desc": "Parameter 'top' is missing"
-  }
-}
-
-{
-  "return": {
-    "enabled": true,
-    "present": true
-  },
-  "id": "libvirt-7"
-}
-
-{
-  "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-8"
-}
-
-{
-  "return": [
-    {
-      "name": "port92"
-    },
-    {
-      "name": "ICH9 LPC"
-    },
-    {
-      "name": "pc-testdev"
-    },
-    {
-      "name": "apic"
-    },
-    {
-      "name": "i6300esb"
-    },
-    {
-      "name": "virtio-scsi-pci"
-    },
-    {
-      "name": "exynos4210-ehci-usb"
-    },
-    {
-      "name": "virtio-balloon-pci"
-    },
-    {
-      "name": "usb-host"
-    },
-    {
-      "name": "ich9-usb-ehci2"
-    },
-    {
-      "name": "usb-ehci"
-    },
-    {
-      "name": "ich9-ahci"
-    },
-    {
-      "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": "xlnx,ps7-usb"
-    },
-    {
-      "name": "vmmouse"
-    },
-    {
-      "name": "sb16"
-    },
-    {
-      "name": "i82801b11-bridge"
-    },
-    {
-      "name": "vmware-svga"
-    },
-    {
-      "name": "isa-cirrus-vga"
-    },
-    {
-      "name": "dc390"
-    },
-    {
-      "name": "piix4-usb-uhci"
-    },
-    {
-      "name": "smbus-eeprom"
-    },
-    {
-      "name": "i82801"
-    },
-    {
-      "name": "ccid-card-passthru"
-    },
-    {
-      "name": "fw_cfg"
-    },
-    {
-      "name": "x86_64-cpu"
-    },
-    {
-      "name": "piix3-usb-uhci"
-    },
-    {
-      "name": "ib700"
-    },
-    {
-      "name": "usb-audio"
-    },
-    {
-      "name": "i82557c"
-    },
-    {
-      "name": "i82557b"
-    },
-    {
-      "name": "i82557a"
-    },
-    {
-      "name": "IndustryPack"
-    },
-    {
-      "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": "ipoctal232"
-    },
-    {
-      "name": "mch"
-    },
-    {
-      "name": "ivshmem"
-    },
-    {
-      "name": "usb-ccid"
-    },
-    {
-      "name": "sysbus-ahci"
-    },
-    {
-      "name": "kvmclock"
-    },
-    {
-      "name": "mc146818rtc"
-    },
-    {
-      "name": "i82562"
-    },
-    {
-      "name": "hda-output"
-    },
-    {
-      "name": "pci-serial-4x"
-    },
-    {
-      "name": "ccid-bus"
-    },
-    {
-      "name": "i82559er"
-    },
-    {
-      "name": "megasas"
-    },
-    {
-      "name": "i8042"
-    },
-    {
-      "name": "intel-hda"
-    },
-    {
-      "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": "usb-bot"
-    },
-    {
-      "name": "isa-serial"
-    },
-    {
-      "name": "kvm-ioapic"
-    },
-    {
-      "name": "q35-pcihost"
-    },
-    {
-      "name": "System"
-    },
-    {
-      "name": "ich9-intel-hda"
-    },
-    {
-      "name": "kvm-apic"
-    },
-    {
-      "name": "usb-wacom-tablet"
-    },
-    {
-      "name": "PIIX4_PM"
-    },
-    {
-      "name": "kvm-i8259"
-    },
-    {
-      "name": "nec-usb-xhci"
-    },
-    {
-      "name": "scsi-cd"
-    },
-    {
-      "name": "usb-redir"
-    },
-    {
-      "name": "i440FX"
-    },
-    {
-      "name": "usb-braille"
-    },
-    {
-      "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": "isa-debug-exit"
-    },
-    {
-      "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": "virtio-pci-bus"
-    },
-    {
-      "name": "qxl-vga"
-    },
-    {
-      "name": "kvm-pit"
-    },
-    {
-      "name": "virtio-blk-pci"
-    },
-    {
-      "name": "sysbus-ohci"
-    },
-    {
-      "name": "esp"
-    },
-    {
-      "name": "i82559c"
-    },
-    {
-      "name": "piix3-ide-xen"
-    },
-    {
-      "name": "i82559b"
-    },
-    {
-      "name": "i82559a"
-    },
-    {
-      "name": "usb-uas"
-    },
-    {
-      "name": "scsi-hd"
-    },
-    {
-      "name": "PIIX3-xen"
-    },
-    {
-      "name": "tpci200"
-    },
-    {
-      "name": "isa-pit"
-    },
-    {
-      "name": "usb-storage"
-    },
-    {
-      "name": "VGA"
-    }
-  ],
-  "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": "event_idx",
-      "type": "on/off"
-    },
-    {
-      "name": "indirect_desc",
-      "type": "on/off"
-    },
-    {
-      "name": "vectors",
-      "type": "uint32"
-    },
-    {
-      "name": "x-data-plane",
-      "type": "on/off"
-    },
-    {
-      "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-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": "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": "mq",
-      "type": "on/off"
-    },
-    {
-      "name": "ctrl_mac_addr",
-      "type": "on/off"
-    },
-    {
-      "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-11"
-}
-
-{
-  "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-12"
-}
-
-{
-  "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-net-s390' not found"
-  }
-}
-
-{
-  "id": "libvirt-16",
-  "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-17"
-}
-
-{
-  "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-18"
-}
-
-{
-  "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-19"
-}
-
-{
-  "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-20"
-}
-
-{
-  "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-21"
-}
-
-{
-  "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-22"
-}
-
-{
-  "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-23"
-}
-
-{
-  "return": [
-    {
-      "name": "lun",
-      "type": "uint32"
-    },
-    {
-      "name": "scsi-id",
-      "type": "uint32"
-    },
-    {
-      "name": "channel",
-      "type": "uint32"
-    },
-    {
-      "name": "bootindex",
-      "type": "int32"
-    },
-    {
-      "name": "drive",
-      "type": "drive"
-    }
-  ],
-  "id": "libvirt-24"
-}
-
-{
-  "return": [
-  ],
-  "id": "libvirt-25"
-}
-
-{
-  "return": [
-    {
-      "name": "MCFG",
-      "type": "uint64"
-    }
-  ],
-  "id": "libvirt-26"
-}
-
-{
-  "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-27"
-}
-
-{
-  "return": [
-    {
-      "name": "lost_tick_policy",
-      "type": "LostTickPolicy"
-    },
-    {
-      "name": "iobase",
-      "type": "hex32"
-    }
-  ],
-  "id": "libvirt-28"
-}
-
-{
-  "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-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": "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": "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-31"
-}
-
-{
-  "id": "libvirt-32",
-  "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-33"
-}
-
-{
-  "id": "libvirt-34",
-  "error": {
-    "class": "DeviceNotFound",
-    "desc": "Device 'virtio-balloon-ccw' not found"
-  }
-}
-
-{
-  "id": "libvirt-35",
-  "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-36"
-}
-
-{
-  "return": [
-    {
-      "name": "pc-q35-1.4",
-      "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"
-    },
-    {
-      "name": "pc-i440fx-1.4",
-      "is-default": true,
-      "alias": "pc"
-    },
-    {
-      "name": "none"
-    }
-  ],
-  "id": "libvirt-37"
-}
-
-{
-  "return": [
-    {
-      "name": "Opteron_G5"
-    },
-    {
-      "name": "Opteron_G4"
-    },
-    {
-      "name": "Opteron_G3"
-    },
-    {
-      "name": "Opteron_G2"
-    },
-    {
-      "name": "Opteron_G1"
-    },
-    {
-      "name": "Haswell"
-    },
-    {
-      "name": "SandyBridge"
-    },
-    {
-      "name": "Westmere"
-    },
-    {
-      "name": "Nehalem"
-    },
-    {
-      "name": "Penryn"
-    },
-    {
-      "name": "Conroe"
-    },
-    {
-      "name": "n270"
-    },
-    {
-      "name": "athlon"
-    },
-    {
-      "name": "pentium3"
-    },
-    {
-      "name": "pentium2"
-    },
-    {
-      "name": "pentium"
-    },
-    {
-      "name": "486"
-    },
-    {
-      "name": "coreduo"
-    },
-    {
-      "name": "kvm32"
-    },
-    {
-      "name": "qemu32"
-    },
-    {
-      "name": "kvm64"
-    },
-    {
-      "name": "core2duo"
-    },
-    {
-      "name": "phenom"
-    },
-    {
-      "name": "qemu64"
-    }
-  ],
-  "id": "libvirt-38"
-}
-
-{
-  "id": "libvirt-39",
-  "error": {
-    "class": "CommandNotFound",
-    "desc": "The command query-tpm-models has not been found"
-  }
-}
-
-{
-  "id": "libvirt-40",
-  "error": {
-    "class": "CommandNotFound",
-    "desc": "The command query-tpm-types has not been found"
-  }
-}
-
-{
-  "id": "libvirt-41",
-  "error": {
-    "class": "CommandNotFound",
-    "desc": "The command query-command-line-options has not been found"
-  }
-}
-
-{
-  "return": [
-    {
-      "state": false,
-      "capability": "xbzrle"
-    }
-  ],
-  "id": "libvirt-42"
-}
-
-{
-  "return": {
-  },
-  "id": "libvirt-1"
-}
-
-{
-  "return": [
-    {
-      "name": "Opteron_G5"
-    },
-    {
-      "name": "Opteron_G4"
-    },
-    {
-      "name": "Opteron_G3"
-    },
-    {
-      "name": "Opteron_G2"
-    },
-    {
-      "name": "Opteron_G1"
-    },
-    {
-      "name": "Haswell"
-    },
-    {
-      "name": "SandyBridge"
-    },
-    {
-      "name": "Westmere"
-    },
-    {
-      "name": "Nehalem"
-    },
-    {
-      "name": "Penryn"
-    },
-    {
-      "name": "Conroe"
-    },
-    {
-      "name": "n270"
-    },
-    {
-      "name": "athlon"
-    },
-    {
-      "name": "pentium3"
-    },
-    {
-      "name": "pentium2"
-    },
-    {
-      "name": "pentium"
-    },
-    {
-      "name": "486"
-    },
-    {
-      "name": "coreduo"
-    },
-    {
-      "name": "kvm32"
-    },
-    {
-      "name": "qemu32"
-    },
-    {
-      "name": "kvm64"
-    },
-    {
-      "name": "core2duo"
-    },
-    {
-      "name": "phenom"
-    },
-    {
-      "name": "qemu64"
-    }
-  ],
-  "id": "libvirt-2"
-}
diff --git a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml
deleted file mode 100644
index 671ee93520..0000000000
--- a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml
+++ /dev/null
@@ -1,198 +0,0 @@
-<qemuCaps>
-  <qemuctime>0</qemuctime>
-  <selfctime>0</selfctime>
-  <selfvers>0</selfvers>
-  <usedQMP/>
-  <flag name='kvm'/>
-  <flag name='mem-path'/>
-  <flag name='drive-serial'/>
-  <flag name='monitor-json'/>
-  <flag name='sdl'/>
-  <flag name='netdev'/>
-  <flag name='rtc'/>
-  <flag name='vhost-net'/>
-  <flag name='no-hpet'/>
-  <flag name='no-kvm-pit'/>
-  <flag name='pci-configfd'/>
-  <flag name='nodefconfig'/>
-  <flag name='boot-menu'/>
-  <flag name='fsdev'/>
-  <flag name='name-process'/>
-  <flag name='smbios-type'/>
-  <flag name='spice'/>
-  <flag name='vga-none'/>
-  <flag name='boot-index'/>
-  <flag name='hda-duplex'/>
-  <flag name='drive-aio'/>
-  <flag name='pci-bootindex'/>
-  <flag name='ccid-emulated'/>
-  <flag name='ccid-passthru'/>
-  <flag name='chardev-spicevmc'/>
-  <flag name='virtio-tx-alg'/>
-  <flag name='pci-multifunction'/>
-  <flag name='virtio-blk-pci.ioeventfd'/>
-  <flag name='sga'/>
-  <flag name='virtio-blk-pci.event_idx'/>
-  <flag name='virtio-net-pci.event_idx'/>
-  <flag name='cache-directsync'/>
-  <flag name='piix3-usb-uhci'/>
-  <flag name='piix4-usb-uhci'/>
-  <flag name='usb-ehci'/>
-  <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'/>
-  <flag name='ich9-ahci'/>
-  <flag name='no-acpi'/>
-  <flag name='fsdev-readonly'/>
-  <flag name='virtio-blk-pci.scsi'/>
-  <flag name='drive-copy-on-read'/>
-  <flag name='fsdev-writeout'/>
-  <flag name='drive-iotune'/>
-  <flag name='system_wakeup'/>
-  <flag name='scsi-disk.channel'/>
-  <flag name='scsi-block'/>
-  <flag name='transaction'/>
-  <flag name='block-job-async'/>
-  <flag name='scsi-cd'/>
-  <flag name='ide-cd'/>
-  <flag name='no-user-config'/>
-  <flag name='hda-micro'/>
-  <flag name='dump-guest-memory'/>
-  <flag name='nec-usb-xhci'/>
-  <flag name='balloon-event'/>
-  <flag name='bridge'/>
-  <flag name='lsi'/>
-  <flag name='virtio-scsi-pci'/>
-  <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'/>
-  <flag name='dump-guest-core'/>
-  <flag name='seamless-migration'/>
-  <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'/>
-  <flag name='VGA'/>
-  <flag name='cirrus-vga'/>
-  <flag name='vmware-svga'/>
-  <flag name='usb-serial'/>
-  <flag name='usb-net'/>
-  <flag name='add-fd'/>
-  <flag name='nbd-server'/>
-  <flag name='virtio-rng'/>
-  <flag name='rng-random'/>
-  <flag name='rng-egd'/>
-  <flag name='dtb'/>
-  <flag name='megasas'/>
-  <flag name='ipv6-migration'/>
-  <flag name='machine-opt'/>
-  <flag name='machine-usb-opt'/>
-  <flag name='pci-bridge'/>
-  <flag name='vfio-pci'/>
-  <flag name='scsi-generic'/>
-  <flag name='scsi-generic.bootindex'/>
-  <flag name='vnc-websocket'/>
-  <flag name='vnc-share-policy'/>
-  <flag name='dmi-to-pci-bridge'/>
-  <flag name='usb-storage'/>
-  <flag name='usb-storage.removable'/>
-  <flag name='ich9-intel-hda'/>
-  <flag name='kvm-pit-lost-tick-policy'/>
-  <flag name='usb-kbd'/>
-  <flag name='host-pci-multidomain'/>
-  <flag name='usb-audio'/>
-  <flag name='ivshmem'/>
-  <flag name='VGA.vgamem_mb'/>
-  <flag name='vmware-svga.vgamem_mb'/>
-  <flag name='qxl.vgamem_mb'/>
-  <flag name='pci-serial'/>
-  <flag name='ioh3420'/>
-  <flag name='x3130-upstream'/>
-  <flag name='xio3130-downstream'/>
-  <flag name='rtl8139'/>
-  <flag name='e1000'/>
-  <flag name='virtio-net'/>
-  <flag name='qxl.vram64_size_mb'/>
-  <flag name='device-tray-moved-event'/>
-  <flag name='nec-usb-xhci-ports'/>
-  <flag name='display'/>
-  <flag name='query-cpu-definitions'/>
-  <flag name='isa-serial'/>
-  <version>1004002</version>
-  <kvmVersion>0</kvmVersion>
-  <microcodeVersion>30419</microcodeVersion>
-  <package></package>
-  <arch>x86_64</arch>
-  <cpu type='kvm' name='Opteron_G5'/>
-  <cpu type='kvm' name='Opteron_G4'/>
-  <cpu type='kvm' name='Opteron_G3'/>
-  <cpu type='kvm' name='Opteron_G2'/>
-  <cpu type='kvm' name='Opteron_G1'/>
-  <cpu type='kvm' name='Haswell'/>
-  <cpu type='kvm' name='SandyBridge'/>
-  <cpu type='kvm' name='Westmere'/>
-  <cpu type='kvm' name='Nehalem'/>
-  <cpu type='kvm' name='Penryn'/>
-  <cpu type='kvm' name='Conroe'/>
-  <cpu type='kvm' name='n270'/>
-  <cpu type='kvm' name='athlon'/>
-  <cpu type='kvm' name='pentium3'/>
-  <cpu type='kvm' name='pentium2'/>
-  <cpu type='kvm' name='pentium'/>
-  <cpu type='kvm' name='486'/>
-  <cpu type='kvm' name='coreduo'/>
-  <cpu type='kvm' name='kvm32'/>
-  <cpu type='kvm' name='qemu32'/>
-  <cpu type='kvm' name='kvm64'/>
-  <cpu type='kvm' name='core2duo'/>
-  <cpu type='kvm' name='phenom'/>
-  <cpu type='kvm' name='qemu64'/>
-  <cpu type='tcg' name='Opteron_G5'/>
-  <cpu type='tcg' name='Opteron_G4'/>
-  <cpu type='tcg' name='Opteron_G3'/>
-  <cpu type='tcg' name='Opteron_G2'/>
-  <cpu type='tcg' name='Opteron_G1'/>
-  <cpu type='tcg' name='Haswell'/>
-  <cpu type='tcg' name='SandyBridge'/>
-  <cpu type='tcg' name='Westmere'/>
-  <cpu type='tcg' name='Nehalem'/>
-  <cpu type='tcg' name='Penryn'/>
-  <cpu type='tcg' name='Conroe'/>
-  <cpu type='tcg' name='n270'/>
-  <cpu type='tcg' name='athlon'/>
-  <cpu type='tcg' name='pentium3'/>
-  <cpu type='tcg' name='pentium2'/>
-  <cpu type='tcg' name='pentium'/>
-  <cpu type='tcg' name='486'/>
-  <cpu type='tcg' name='coreduo'/>
-  <cpu type='tcg' name='kvm32'/>
-  <cpu type='tcg' name='qemu32'/>
-  <cpu type='tcg' name='kvm64'/>
-  <cpu type='tcg' name='core2duo'/>
-  <cpu type='tcg' name='phenom'/>
-  <cpu type='tcg' name='qemu64'/>
-  <machine name='pc-i440fx-1.4' alias='pc' maxCpus='0'/>
-  <machine name='pc-q35-1.4' alias='q35' maxCpus='0'/>
-  <machine name='isapc' maxCpus='0'/>
-  <machine name='pc-0.10' maxCpus='0'/>
-  <machine name='pc-0.11' maxCpus='0'/>
-  <machine name='pc-0.12' maxCpus='0'/>
-  <machine name='pc-0.13' maxCpus='0'/>
-  <machine name='pc-0.14' maxCpus='0'/>
-  <machine name='pc-0.15' maxCpus='0'/>
-  <machine name='pc-1.0' maxCpus='0'/>
-  <machine name='pc-1.1' maxCpus='0'/>
-  <machine name='pc-1.2' maxCpus='0'/>
-  <machine name='pc-1.3' maxCpus='0'/>
-</qemuCaps>
diff --git a/tests/qemucapabilitiestest.c b/tests/qemucapabilitiestest.c
index 0d136cc8b5..1b5970a4c5 100644
--- a/tests/qemucapabilitiestest.c
+++ b/tests/qemucapabilitiestest.c
@@ -163,9 +163,6 @@ mymain(void)
             ret = -1; \
     } while (0)
 
-    DO_TEST("x86_64", "caps_1.2.2");
-    DO_TEST("x86_64", "caps_1.3.1");
-    DO_TEST("x86_64", "caps_1.4.2");
     DO_TEST("x86_64", "caps_1.5.3");
     DO_TEST("x86_64", "caps_1.6.0");
     DO_TEST("x86_64", "caps_1.7.0");