qemucapabilitiestest: Rename *.caps to *.xml

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>

diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c
index 1aa6bb135248dba1843fe27770cbd71eb4bf3d5c..f7a3868ff2043f7a72650dfdeec6c4881ce43ff9 100644 (file)
--- a/tests/domaincapstest.c
+++ b/tests/domaincapstest.c
@@ -103,7 +103,7 @@ fillQemuCaps(virDomainCapsPtr domCaps,
     virQEMUCapsPtr qemuCaps = NULL;
     virDomainCapsLoaderPtr loader = &domCaps->os.loader;
 
-    if (virAsprintf(&path, "%s/qemucapabilitiesdata/%s.%s.caps",
+    if (virAsprintf(&path, "%s/qemucapabilitiesdata/%s.%s.xml",
                     abs_srcdir, name, virArchToString(arch)) < 0 ||
         !(qemuCaps = qemuTestParseCapabilities(path)))
         goto cleanup;

diff --git a/tests/qemucapabilitiesdata/caps_1.2.2-1.x86_64.caps b/tests/qemucapabilitiesdata/caps_1.2.2-1.x86_64.caps
deleted file mode 100644 (file)
index 257a123..0000000
--- a/tests/qemucapabilitiesdata/caps_1.2.2-1.x86_64.caps
+++ /dev/null
@@ -1,159 +0,0 @@
-<qemuCaps>
-  <qemuctime>0</qemuctime>
-  <selfctime>0</selfctime>
-  <selfvers>0</selfvers>
-  <usedQMP/>
-  <flag name='mem-path'/>
-  <flag name='drive-serial'/>
-  <flag name='chardev'/>
-  <flag name='enable-kvm'/>
-  <flag name='monitor-json'/>
-  <flag name='device'/>
-  <flag name='sdl'/>
-  <flag name='smp-topology'/>
-  <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='drive-readonly'/>
-  <flag name='smbios-type'/>
-  <flag name='vga-qxl'/>
-  <flag name='spice'/>
-  <flag name='vga-none'/>
-  <flag name='boot-index'/>
-  <flag name='hda-duplex'/>
-  <flag name='drive-aio'/>
-  <flag name='pci-multibus'/>
-  <flag name='ccid-emulated'/>
-  <flag name='ccid-passthru'/>
-  <flag name='chardev-spicevmc'/>
-  <flag name='virtio-tx-alg'/>
-  <flag name='device-qxl-vga'/>
-  <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='blk-sg-io'/>
-  <flag name='drive-copy-on-read'/>
-  <flag name='cpu-host'/>
-  <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='qxl-vga.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='qxl-vga.vram64_size_mb'/>
-  <flag name='device-tray-moved-event'/>
-  <version>1002002</version>
-  <kvmVersion>0</kvmVersion>
-  <package></package>
-  <arch>x86_64</arch>
-  <cpu name='qemu64'/>
-  <cpu name='phenom'/>
-  <cpu name='core2duo'/>
-  <cpu name='kvm64'/>
-  <cpu name='qemu32'/>
-  <cpu name='kvm32'/>
-  <cpu name='coreduo'/>
-  <cpu name='486'/>
-  <cpu name='pentium'/>
-  <cpu name='pentium2'/>
-  <cpu name='pentium3'/>
-  <cpu name='athlon'/>
-  <cpu name='n270'/>
-  <cpu name='Conroe'/>
-  <cpu name='Penryn'/>
-  <cpu name='Nehalem'/>
-  <cpu name='Westmere'/>
-  <cpu name='SandyBridge'/>
-  <cpu name='Opteron_G1'/>
-  <cpu name='Opteron_G2'/>
-  <cpu name='Opteron_G3'/>
-  <cpu name='Opteron_G4'/>
-  <machine name='pc-1.2' alias='pc' maxCpus='0'/>
-  <machine name='xenpv' maxCpus='0'/>
-  <machine name='xenfv' maxCpus='0'/>
-  <machine name='isapc' maxCpus='0'/>
-  <machine name='pc-0.10' maxCpus='0'/>
-  <machine name='pc-0.11' maxCpus='0'/>
-  <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.2.2-1.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.2.2-1.x86_64.xml
new file mode 100644 (file)
index 0000000..257a123
--- /dev/null
+++ b/tests/qemucapabilitiesdata/caps_1.2.2-1.x86_64.xml
@@ -0,0 +1,159 @@
+<qemuCaps>
+  <qemuctime>0</qemuctime>
+  <selfctime>0</selfctime>
+  <selfvers>0</selfvers>
+  <usedQMP/>
+  <flag name='mem-path'/>
+  <flag name='drive-serial'/>
+  <flag name='chardev'/>
+  <flag name='enable-kvm'/>
+  <flag name='monitor-json'/>
+  <flag name='device'/>
+  <flag name='sdl'/>
+  <flag name='smp-topology'/>
+  <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='drive-readonly'/>
+  <flag name='smbios-type'/>
+  <flag name='vga-qxl'/>
+  <flag name='spice'/>
+  <flag name='vga-none'/>
+  <flag name='boot-index'/>
+  <flag name='hda-duplex'/>
+  <flag name='drive-aio'/>
+  <flag name='pci-multibus'/>
+  <flag name='ccid-emulated'/>
+  <flag name='ccid-passthru'/>
+  <flag name='chardev-spicevmc'/>
+  <flag name='virtio-tx-alg'/>
+  <flag name='device-qxl-vga'/>
+  <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='blk-sg-io'/>
+  <flag name='drive-copy-on-read'/>
+  <flag name='cpu-host'/>
+  <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='qxl-vga.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='qxl-vga.vram64_size_mb'/>
+  <flag name='device-tray-moved-event'/>
+  <version>1002002</version>
+  <kvmVersion>0</kvmVersion>
+  <package></package>
+  <arch>x86_64</arch>
+  <cpu name='qemu64'/>
+  <cpu name='phenom'/>
+  <cpu name='core2duo'/>
+  <cpu name='kvm64'/>
+  <cpu name='qemu32'/>
+  <cpu name='kvm32'/>
+  <cpu name='coreduo'/>
+  <cpu name='486'/>
+  <cpu name='pentium'/>
+  <cpu name='pentium2'/>
+  <cpu name='pentium3'/>
+  <cpu name='athlon'/>
+  <cpu name='n270'/>
+  <cpu name='Conroe'/>
+  <cpu name='Penryn'/>
+  <cpu name='Nehalem'/>
+  <cpu name='Westmere'/>
+  <cpu name='SandyBridge'/>
+  <cpu name='Opteron_G1'/>
+  <cpu name='Opteron_G2'/>
+  <cpu name='Opteron_G3'/>
+  <cpu name='Opteron_G4'/>
+  <machine name='pc-1.2' alias='pc' maxCpus='0'/>
+  <machine name='xenpv' maxCpus='0'/>
+  <machine name='xenfv' maxCpus='0'/>
+  <machine name='isapc' maxCpus='0'/>
+  <machine name='pc-0.10' maxCpus='0'/>
+  <machine name='pc-0.11' maxCpus='0'/>
+  <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-1.x86_64.caps b/tests/qemucapabilitiesdata/caps_1.3.1-1.x86_64.caps
deleted file mode 100644 (file)
index 6f6a5b9..0000000
--- a/tests/qemucapabilitiesdata/caps_1.3.1-1.x86_64.caps
+++ /dev/null
@@ -1,179 +0,0 @@
-<qemuCaps>
-  <qemuctime>0</qemuctime>
-  <selfctime>0</selfctime>
-  <selfvers>0</selfvers>
-  <usedQMP/>
-  <flag name='mem-path'/>
-  <flag name='drive-serial'/>
-  <flag name='chardev'/>
-  <flag name='enable-kvm'/>
-  <flag name='monitor-json'/>
-  <flag name='device'/>
-  <flag name='sdl'/>
-  <flag name='smp-topology'/>
-  <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='drive-readonly'/>
-  <flag name='smbios-type'/>
-  <flag name='vga-qxl'/>
-  <flag name='spice'/>
-  <flag name='vga-none'/>
-  <flag name='boot-index'/>
-  <flag name='hda-duplex'/>
-  <flag name='drive-aio'/>
-  <flag name='pci-multibus'/>
-  <flag name='pci-bootindex'/>
-  <flag name='ccid-emulated'/>
-  <flag name='ccid-passthru'/>
-  <flag name='chardev-spicevmc'/>
-  <flag name='virtio-tx-alg'/>
-  <flag name='device-qxl-vga'/>
-  <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='rombar'/>
-  <flag name='ich9-ahci'/>
-  <flag name='no-acpi'/>
-  <flag name='fsdev-readonly'/>
-  <flag name='virtio-blk-pci.scsi'/>
-  <flag name='blk-sg-io'/>
-  <flag name='drive-copy-on-read'/>
-  <flag name='cpu-host'/>
-  <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='block-commit'/>
-  <flag name='vnc'/>
-  <flag name='drive-mirror'/>
-  <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='qxl-vga.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='qxl-vga.vram64_size_mb'/>
-  <flag name='device-tray-moved-event'/>
-  <flag name='nec-usb-xhci-ports'/>
-  <version>1003001</version>
-  <kvmVersion>0</kvmVersion>
-  <package></package>
-  <arch>x86_64</arch>
-  <cpu name='qemu64'/>
-  <cpu name='phenom'/>
-  <cpu name='core2duo'/>
-  <cpu name='kvm64'/>
-  <cpu name='qemu32'/>
-  <cpu name='kvm32'/>
-  <cpu name='coreduo'/>
-  <cpu name='486'/>
-  <cpu name='pentium'/>
-  <cpu name='pentium2'/>
-  <cpu name='pentium3'/>
-  <cpu name='athlon'/>
-  <cpu name='n270'/>
-  <cpu name='Conroe'/>
-  <cpu name='Penryn'/>
-  <cpu name='Nehalem'/>
-  <cpu name='Westmere'/>
-  <cpu name='SandyBridge'/>
-  <cpu name='Haswell'/>
-  <cpu name='Opteron_G1'/>
-  <cpu name='Opteron_G2'/>
-  <cpu name='Opteron_G3'/>
-  <cpu name='Opteron_G4'/>
-  <cpu name='Opteron_G5'/>
-  <machine name='pc-1.3' alias='pc' maxCpus='0'/>
-  <machine name='xenpv' maxCpus='0'/>
-  <machine name='q35-next' alias='q35' maxCpus='0'/>
-  <machine name='xenfv' maxCpus='0'/>
-  <machine name='isapc' maxCpus='0'/>
-  <machine name='pc-0.10' maxCpus='0'/>
-  <machine name='pc-0.11' maxCpus='0'/>
-  <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.3.1-1.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.3.1-1.x86_64.xml
new file mode 100644 (file)
index 0000000..6f6a5b9
--- /dev/null
+++ b/tests/qemucapabilitiesdata/caps_1.3.1-1.x86_64.xml
@@ -0,0 +1,179 @@
+<qemuCaps>
+  <qemuctime>0</qemuctime>
+  <selfctime>0</selfctime>
+  <selfvers>0</selfvers>
+  <usedQMP/>
+  <flag name='mem-path'/>
+  <flag name='drive-serial'/>
+  <flag name='chardev'/>
+  <flag name='enable-kvm'/>
+  <flag name='monitor-json'/>
+  <flag name='device'/>
+  <flag name='sdl'/>
+  <flag name='smp-topology'/>
+  <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='drive-readonly'/>
+  <flag name='smbios-type'/>
+  <flag name='vga-qxl'/>
+  <flag name='spice'/>
+  <flag name='vga-none'/>
+  <flag name='boot-index'/>
+  <flag name='hda-duplex'/>
+  <flag name='drive-aio'/>
+  <flag name='pci-multibus'/>
+  <flag name='pci-bootindex'/>
+  <flag name='ccid-emulated'/>
+  <flag name='ccid-passthru'/>
+  <flag name='chardev-spicevmc'/>
+  <flag name='virtio-tx-alg'/>
+  <flag name='device-qxl-vga'/>
+  <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='rombar'/>
+  <flag name='ich9-ahci'/>
+  <flag name='no-acpi'/>
+  <flag name='fsdev-readonly'/>
+  <flag name='virtio-blk-pci.scsi'/>
+  <flag name='blk-sg-io'/>
+  <flag name='drive-copy-on-read'/>
+  <flag name='cpu-host'/>
+  <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='block-commit'/>
+  <flag name='vnc'/>
+  <flag name='drive-mirror'/>
+  <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='qxl-vga.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='qxl-vga.vram64_size_mb'/>
+  <flag name='device-tray-moved-event'/>
+  <flag name='nec-usb-xhci-ports'/>
+  <version>1003001</version>
+  <kvmVersion>0</kvmVersion>
+  <package></package>
+  <arch>x86_64</arch>
+  <cpu name='qemu64'/>
+  <cpu name='phenom'/>
+  <cpu name='core2duo'/>
+  <cpu name='kvm64'/>
+  <cpu name='qemu32'/>
+  <cpu name='kvm32'/>
+  <cpu name='coreduo'/>
+  <cpu name='486'/>
+  <cpu name='pentium'/>
+  <cpu name='pentium2'/>
+  <cpu name='pentium3'/>
+  <cpu name='athlon'/>
+  <cpu name='n270'/>
+  <cpu name='Conroe'/>
+  <cpu name='Penryn'/>
+  <cpu name='Nehalem'/>
+  <cpu name='Westmere'/>
+  <cpu name='SandyBridge'/>
+  <cpu name='Haswell'/>
+  <cpu name='Opteron_G1'/>
+  <cpu name='Opteron_G2'/>
+  <cpu name='Opteron_G3'/>
+  <cpu name='Opteron_G4'/>
+  <cpu name='Opteron_G5'/>
+  <machine name='pc-1.3' alias='pc' maxCpus='0'/>
+  <machine name='xenpv' maxCpus='0'/>
+  <machine name='q35-next' alias='q35' maxCpus='0'/>
+  <machine name='xenfv' maxCpus='0'/>
+  <machine name='isapc' maxCpus='0'/>
+  <machine name='pc-0.10' maxCpus='0'/>
+  <machine name='pc-0.11' maxCpus='0'/>
+  <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-1.x86_64.caps b/tests/qemucapabilitiesdata/caps_1.4.2-1.x86_64.caps
deleted file mode 100644 (file)
index 18550e2..0000000
--- a/tests/qemucapabilitiesdata/caps_1.4.2-1.x86_64.caps
+++ /dev/null
@@ -1,181 +0,0 @@
-<qemuCaps>
-  <qemuctime>0</qemuctime>
-  <selfctime>0</selfctime>
-  <selfvers>0</selfvers>
-  <usedQMP/>
-  <flag name='mem-path'/>
-  <flag name='drive-serial'/>
-  <flag name='chardev'/>
-  <flag name='enable-kvm'/>
-  <flag name='monitor-json'/>
-  <flag name='device'/>
-  <flag name='sdl'/>
-  <flag name='smp-topology'/>
-  <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='drive-readonly'/>
-  <flag name='smbios-type'/>
-  <flag name='vga-qxl'/>
-  <flag name='spice'/>
-  <flag name='vga-none'/>
-  <flag name='boot-index'/>
-  <flag name='hda-duplex'/>
-  <flag name='drive-aio'/>
-  <flag name='pci-multibus'/>
-  <flag name='pci-bootindex'/>
-  <flag name='ccid-emulated'/>
-  <flag name='ccid-passthru'/>
-  <flag name='chardev-spicevmc'/>
-  <flag name='virtio-tx-alg'/>
-  <flag name='device-qxl-vga'/>
-  <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='rombar'/>
-  <flag name='ich9-ahci'/>
-  <flag name='no-acpi'/>
-  <flag name='fsdev-readonly'/>
-  <flag name='virtio-blk-pci.scsi'/>
-  <flag name='blk-sg-io'/>
-  <flag name='drive-copy-on-read'/>
-  <flag name='cpu-host'/>
-  <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='block-commit'/>
-  <flag name='vnc'/>
-  <flag name='drive-mirror'/>
-  <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='qxl-vga.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='qxl-vga.vram64_size_mb'/>
-  <flag name='device-tray-moved-event'/>
-  <flag name='nec-usb-xhci-ports'/>
-  <version>1004002</version>
-  <kvmVersion>0</kvmVersion>
-  <package></package>
-  <arch>x86_64</arch>
-  <cpu name='Opteron_G5'/>
-  <cpu name='Opteron_G4'/>
-  <cpu name='Opteron_G3'/>
-  <cpu name='Opteron_G2'/>
-  <cpu name='Opteron_G1'/>
-  <cpu name='Haswell'/>
-  <cpu name='SandyBridge'/>
-  <cpu name='Westmere'/>
-  <cpu name='Nehalem'/>
-  <cpu name='Penryn'/>
-  <cpu name='Conroe'/>
-  <cpu name='n270'/>
-  <cpu name='athlon'/>
-  <cpu name='pentium3'/>
-  <cpu name='pentium2'/>
-  <cpu name='pentium'/>
-  <cpu name='486'/>
-  <cpu name='coreduo'/>
-  <cpu name='kvm32'/>
-  <cpu name='qemu32'/>
-  <cpu name='kvm64'/>
-  <cpu name='core2duo'/>
-  <cpu name='phenom'/>
-  <cpu name='qemu64'/>
-  <machine name='pc-i440fx-1.4' alias='pc' maxCpus='0'/>
-  <machine name='xenpv' maxCpus='0'/>
-  <machine name='pc-q35-1.4' alias='q35' maxCpus='0'/>
-  <machine name='xenfv' maxCpus='0'/>
-  <machine name='isapc' maxCpus='0'/>
-  <machine name='pc-0.10' maxCpus='0'/>
-  <machine name='pc-0.11' maxCpus='0'/>
-  <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/qemucapabilitiesdata/caps_1.4.2-1.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.4.2-1.x86_64.xml
new file mode 100644 (file)
index 0000000..18550e2
--- /dev/null
+++ b/tests/qemucapabilitiesdata/caps_1.4.2-1.x86_64.xml
@@ -0,0 +1,181 @@
+<qemuCaps>
+  <qemuctime>0</qemuctime>
+  <selfctime>0</selfctime>
+  <selfvers>0</selfvers>
+  <usedQMP/>
+  <flag name='mem-path'/>
+  <flag name='drive-serial'/>
+  <flag name='chardev'/>
+  <flag name='enable-kvm'/>
+  <flag name='monitor-json'/>
+  <flag name='device'/>
+  <flag name='sdl'/>
+  <flag name='smp-topology'/>
+  <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='drive-readonly'/>
+  <flag name='smbios-type'/>
+  <flag name='vga-qxl'/>
+  <flag name='spice'/>
+  <flag name='vga-none'/>
+  <flag name='boot-index'/>
+  <flag name='hda-duplex'/>
+  <flag name='drive-aio'/>
+  <flag name='pci-multibus'/>
+  <flag name='pci-bootindex'/>
+  <flag name='ccid-emulated'/>
+  <flag name='ccid-passthru'/>
+  <flag name='chardev-spicevmc'/>
+  <flag name='virtio-tx-alg'/>
+  <flag name='device-qxl-vga'/>
+  <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='rombar'/>
+  <flag name='ich9-ahci'/>
+  <flag name='no-acpi'/>
+  <flag name='fsdev-readonly'/>
+  <flag name='virtio-blk-pci.scsi'/>
+  <flag name='blk-sg-io'/>
+  <flag name='drive-copy-on-read'/>
+  <flag name='cpu-host'/>
+  <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='block-commit'/>
+  <flag name='vnc'/>
+  <flag name='drive-mirror'/>
+  <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='qxl-vga.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='qxl-vga.vram64_size_mb'/>
+  <flag name='device-tray-moved-event'/>
+  <flag name='nec-usb-xhci-ports'/>
+  <version>1004002</version>
+  <kvmVersion>0</kvmVersion>
+  <package></package>
+  <arch>x86_64</arch>
+  <cpu name='Opteron_G5'/>
+  <cpu name='Opteron_G4'/>
+  <cpu name='Opteron_G3'/>
+  <cpu name='Opteron_G2'/>
+  <cpu name='Opteron_G1'/>
+  <cpu name='Haswell'/>
+  <cpu name='SandyBridge'/>
+  <cpu name='Westmere'/>
+  <cpu name='Nehalem'/>
+  <cpu name='Penryn'/>
+  <cpu name='Conroe'/>
+  <cpu name='n270'/>
+  <cpu name='athlon'/>
+  <cpu name='pentium3'/>
+  <cpu name='pentium2'/>
+  <cpu name='pentium'/>
+  <cpu name='486'/>
+  <cpu name='coreduo'/>
+  <cpu name='kvm32'/>
+  <cpu name='qemu32'/>
+  <cpu name='kvm64'/>
+  <cpu name='core2duo'/>
+  <cpu name='phenom'/>
+  <cpu name='qemu64'/>
+  <machine name='pc-i440fx-1.4' alias='pc' maxCpus='0'/>
+  <machine name='xenpv' maxCpus='0'/>
+  <machine name='pc-q35-1.4' alias='q35' maxCpus='0'/>
+  <machine name='xenfv' maxCpus='0'/>
+  <machine name='isapc' maxCpus='0'/>
+  <machine name='pc-0.10' maxCpus='0'/>
+  <machine name='pc-0.11' maxCpus='0'/>
+  <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/qemucapabilitiesdata/caps_1.5.3-1.x86_64.caps b/tests/qemucapabilitiesdata/caps_1.5.3-1.x86_64.caps
deleted file mode 100644 (file)
index 72f09f7..0000000
--- a/tests/qemucapabilitiesdata/caps_1.5.3-1.x86_64.caps
+++ /dev/null
@@ -1,190 +0,0 @@
-<qemuCaps>
-  <qemuctime>0</qemuctime>
-  <selfctime>0</selfctime>
-  <selfvers>0</selfvers>
-  <usedQMP/>
-  <flag name='mem-path'/>
-  <flag name='drive-serial'/>
-  <flag name='chardev'/>
-  <flag name='enable-kvm'/>
-  <flag name='monitor-json'/>
-  <flag name='device'/>
-  <flag name='sdl'/>
-  <flag name='smp-topology'/>
-  <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='drive-readonly'/>
-  <flag name='smbios-type'/>
-  <flag name='vga-qxl'/>
-  <flag name='spice'/>
-  <flag name='vga-none'/>
-  <flag name='boot-index'/>
-  <flag name='hda-duplex'/>
-  <flag name='drive-aio'/>
-  <flag name='pci-multibus'/>
-  <flag name='pci-bootindex'/>
-  <flag name='ccid-passthru'/>
-  <flag name='chardev-spicevmc'/>
-  <flag name='virtio-tx-alg'/>
-  <flag name='device-qxl-vga'/>
-  <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='rombar'/>
-  <flag name='ich9-ahci'/>
-  <flag name='no-acpi'/>
-  <flag name='fsdev-readonly'/>
-  <flag name='virtio-blk-pci.scsi'/>
-  <flag name='blk-sg-io'/>
-  <flag name='drive-copy-on-read'/>
-  <flag name='cpu-host'/>
-  <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='reboot-timeout'/>
-  <flag name='dump-guest-core'/>
-  <flag name='seamless-migration'/>
-  <flag name='block-commit'/>
-  <flag name='vnc'/>
-  <flag name='drive-mirror'/>
-  <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='vfio-pci.bootindex'/>
-  <flag name='scsi-generic'/>
-  <flag name='scsi-generic.bootindex'/>
-  <flag name='mem-merge'/>
-  <flag name='vnc-websocket'/>
-  <flag name='drive-discard'/>
-  <flag name='mlock'/>
-  <flag name='vnc-share-policy'/>
-  <flag name='device-del-event'/>
-  <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='boot-strict'/>
-  <flag name='pvpanic'/>
-  <flag name='spiceport'/>
-  <flag name='usb-kbd'/>
-  <flag name='host-pci-multidomain'/>
-  <flag name='usb-audio'/>
-  <flag name='splash-timeout'/>
-  <flag name='ivshmem'/>
-  <flag name='VGA.vgamem_mb'/>
-  <flag name='vmware-svga.vgamem_mb'/>
-  <flag name='qxl.vgamem_mb'/>
-  <flag name='qxl-vga.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='qxl-vga.vram64_size_mb'/>
-  <flag name='device-tray-moved-event'/>
-  <flag name='nec-usb-xhci-ports'/>
-  <version>1005003</version>
-  <kvmVersion>0</kvmVersion>
-  <package></package>
-  <arch>x86_64</arch>
-  <cpu name='Opteron_G5'/>
-  <cpu name='Opteron_G4'/>
-  <cpu name='Opteron_G3'/>
-  <cpu name='Opteron_G2'/>
-  <cpu name='Opteron_G1'/>
-  <cpu name='Haswell'/>
-  <cpu name='SandyBridge'/>
-  <cpu name='Westmere'/>
-  <cpu name='Nehalem'/>
-  <cpu name='Penryn'/>
-  <cpu name='Conroe'/>
-  <cpu name='n270'/>
-  <cpu name='athlon'/>
-  <cpu name='pentium3'/>
-  <cpu name='pentium2'/>
-  <cpu name='pentium'/>
-  <cpu name='486'/>
-  <cpu name='coreduo'/>
-  <cpu name='kvm32'/>
-  <cpu name='qemu32'/>
-  <cpu name='kvm64'/>
-  <cpu name='core2duo'/>
-  <cpu name='phenom'/>
-  <cpu name='qemu64'/>
-  <machine name='pc-i440fx-1.5' alias='pc' maxCpus='255'/>
-  <machine name='pc-q35-1.4' maxCpus='255'/>
-  <machine name='pc-q35-1.5' alias='q35' maxCpus='255'/>
-  <machine name='isapc' maxCpus='1'/>
-  <machine name='pc-0.10' maxCpus='255'/>
-  <machine name='pc-0.11' maxCpus='255'/>
-  <machine name='pc-0.12' maxCpus='255'/>
-  <machine name='pc-0.13' maxCpus='255'/>
-  <machine name='pc-0.14' maxCpus='255'/>
-  <machine name='pc-0.15' maxCpus='255'/>
-  <machine name='pc-1.0' maxCpus='255'/>
-  <machine name='pc-1.1' maxCpus='255'/>
-  <machine name='pc-1.2' maxCpus='255'/>
-  <machine name='pc-1.3' maxCpus='255'/>
-  <machine name='pc-i440fx-1.4' maxCpus='255'/>
-</qemuCaps>

diff --git a/tests/qemucapabilitiesdata/caps_1.5.3-1.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3-1.x86_64.xml
new file mode 100644 (file)
index 0000000..72f09f7
--- /dev/null
+++ b/tests/qemucapabilitiesdata/caps_1.5.3-1.x86_64.xml
@@ -0,0 +1,190 @@
+<qemuCaps>
+  <qemuctime>0</qemuctime>
+  <selfctime>0</selfctime>
+  <selfvers>0</selfvers>
+  <usedQMP/>
+  <flag name='mem-path'/>
+  <flag name='drive-serial'/>
+  <flag name='chardev'/>
+  <flag name='enable-kvm'/>
+  <flag name='monitor-json'/>
+  <flag name='device'/>
+  <flag name='sdl'/>
+  <flag name='smp-topology'/>
+  <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='drive-readonly'/>
+  <flag name='smbios-type'/>
+  <flag name='vga-qxl'/>
+  <flag name='spice'/>
+  <flag name='vga-none'/>
+  <flag name='boot-index'/>
+  <flag name='hda-duplex'/>
+  <flag name='drive-aio'/>
+  <flag name='pci-multibus'/>
+  <flag name='pci-bootindex'/>
+  <flag name='ccid-passthru'/>
+  <flag name='chardev-spicevmc'/>
+  <flag name='virtio-tx-alg'/>
+  <flag name='device-qxl-vga'/>
+  <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='rombar'/>
+  <flag name='ich9-ahci'/>
+  <flag name='no-acpi'/>
+  <flag name='fsdev-readonly'/>
+  <flag name='virtio-blk-pci.scsi'/>
+  <flag name='blk-sg-io'/>
+  <flag name='drive-copy-on-read'/>
+  <flag name='cpu-host'/>
+  <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='reboot-timeout'/>
+  <flag name='dump-guest-core'/>
+  <flag name='seamless-migration'/>
+  <flag name='block-commit'/>
+  <flag name='vnc'/>
+  <flag name='drive-mirror'/>
+  <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='vfio-pci.bootindex'/>
+  <flag name='scsi-generic'/>
+  <flag name='scsi-generic.bootindex'/>
+  <flag name='mem-merge'/>
+  <flag name='vnc-websocket'/>
+  <flag name='drive-discard'/>
+  <flag name='mlock'/>
+  <flag name='vnc-share-policy'/>
+  <flag name='device-del-event'/>
+  <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='boot-strict'/>
+  <flag name='pvpanic'/>
+  <flag name='spiceport'/>
+  <flag name='usb-kbd'/>
+  <flag name='host-pci-multidomain'/>
+  <flag name='usb-audio'/>
+  <flag name='splash-timeout'/>
+  <flag name='ivshmem'/>
+  <flag name='VGA.vgamem_mb'/>
+  <flag name='vmware-svga.vgamem_mb'/>
+  <flag name='qxl.vgamem_mb'/>
+  <flag name='qxl-vga.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='qxl-vga.vram64_size_mb'/>
+  <flag name='device-tray-moved-event'/>
+  <flag name='nec-usb-xhci-ports'/>
+  <version>1005003</version>
+  <kvmVersion>0</kvmVersion>
+  <package></package>
+  <arch>x86_64</arch>
+  <cpu name='Opteron_G5'/>
+  <cpu name='Opteron_G4'/>
+  <cpu name='Opteron_G3'/>
+  <cpu name='Opteron_G2'/>
+  <cpu name='Opteron_G1'/>
+  <cpu name='Haswell'/>
+  <cpu name='SandyBridge'/>
+  <cpu name='Westmere'/>
+  <cpu name='Nehalem'/>
+  <cpu name='Penryn'/>
+  <cpu name='Conroe'/>
+  <cpu name='n270'/>
+  <cpu name='athlon'/>
+  <cpu name='pentium3'/>
+  <cpu name='pentium2'/>
+  <cpu name='pentium'/>
+  <cpu name='486'/>
+  <cpu name='coreduo'/>
+  <cpu name='kvm32'/>
+  <cpu name='qemu32'/>
+  <cpu name='kvm64'/>
+  <cpu name='core2duo'/>
+  <cpu name='phenom'/>
+  <cpu name='qemu64'/>
+  <machine name='pc-i440fx-1.5' alias='pc' maxCpus='255'/>
+  <machine name='pc-q35-1.4' maxCpus='255'/>
+  <machine name='pc-q35-1.5' alias='q35' maxCpus='255'/>
+  <machine name='isapc' maxCpus='1'/>
+  <machine name='pc-0.10' maxCpus='255'/>
+  <machine name='pc-0.11' maxCpus='255'/>
+  <machine name='pc-0.12' maxCpus='255'/>
+  <machine name='pc-0.13' maxCpus='255'/>
+  <machine name='pc-0.14' maxCpus='255'/>
+  <machine name='pc-0.15' maxCpus='255'/>
+  <machine name='pc-1.0' maxCpus='255'/>
+  <machine name='pc-1.1' maxCpus='255'/>
+  <machine name='pc-1.2' maxCpus='255'/>
+  <machine name='pc-1.3' maxCpus='255'/>
+  <machine name='pc-i440fx-1.4' maxCpus='255'/>
+</qemuCaps>

diff --git a/tests/qemucapabilitiesdata/caps_1.6.0-1.x86_64.caps b/tests/qemucapabilitiesdata/caps_1.6.0-1.x86_64.caps
deleted file mode 100644 (file)
index c612c11..0000000
--- a/tests/qemucapabilitiesdata/caps_1.6.0-1.x86_64.caps
+++ /dev/null
@@ -1,200 +0,0 @@
-<qemuCaps>
-  <qemuctime>0</qemuctime>
-  <selfctime>0</selfctime>
-  <selfvers>0</selfvers>
-  <usedQMP/>
-  <flag name='mem-path'/>
-  <flag name='drive-serial'/>
-  <flag name='chardev'/>
-  <flag name='enable-kvm'/>
-  <flag name='monitor-json'/>
-  <flag name='device'/>
-  <flag name='sdl'/>
-  <flag name='smp-topology'/>
-  <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='drive-readonly'/>
-  <flag name='smbios-type'/>
-  <flag name='vga-qxl'/>
-  <flag name='spice'/>
-  <flag name='vga-none'/>
-  <flag name='boot-index'/>
-  <flag name='hda-duplex'/>
-  <flag name='drive-aio'/>
-  <flag name='pci-multibus'/>
-  <flag name='pci-bootindex'/>
-  <flag name='ccid-emulated'/>
-  <flag name='ccid-passthru'/>
-  <flag name='chardev-spicevmc'/>
-  <flag name='virtio-tx-alg'/>
-  <flag name='device-qxl-vga'/>
-  <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='rombar'/>
-  <flag name='ich9-ahci'/>
-  <flag name='no-acpi'/>
-  <flag name='fsdev-readonly'/>
-  <flag name='virtio-blk-pci.scsi'/>
-  <flag name='blk-sg-io'/>
-  <flag name='drive-copy-on-read'/>
-  <flag name='cpu-host'/>
-  <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='reboot-timeout'/>
-  <flag name='dump-guest-core'/>
-  <flag name='seamless-migration'/>
-  <flag name='block-commit'/>
-  <flag name='vnc'/>
-  <flag name='drive-mirror'/>
-  <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='device-video-primary'/>
-  <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='vfio-pci.bootindex'/>
-  <flag name='scsi-generic'/>
-  <flag name='scsi-generic.bootindex'/>
-  <flag name='mem-merge'/>
-  <flag name='vnc-websocket'/>
-  <flag name='mlock'/>
-  <flag name='vnc-share-policy'/>
-  <flag name='device-del-event'/>
-  <flag name='dmi-to-pci-bridge'/>
-  <flag name='i440fx-pci-hole64-size'/>
-  <flag name='q35-pci-hole64-size'/>
-  <flag name='usb-storage'/>
-  <flag name='usb-storage.removable'/>
-  <flag name='virtio-mmio'/>
-  <flag name='ich9-intel-hda'/>
-  <flag name='kvm-pit-lost-tick-policy'/>
-  <flag name='boot-strict'/>
-  <flag name='pvpanic'/>
-  <flag name='spice-file-xfer-disable'/>
-  <flag name='spiceport'/>
-  <flag name='usb-kbd'/>
-  <flag name='host-pci-multidomain'/>
-  <flag name='msg-timestamp'/>
-  <flag name='usb-audio'/>
-  <flag name='splash-timeout'/>
-  <flag name='ivshmem'/>
-  <flag name='VGA.vgamem_mb'/>
-  <flag name='vmware-svga.vgamem_mb'/>
-  <flag name='qxl.vgamem_mb'/>
-  <flag name='qxl-vga.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='qxl-vga.vram64_size_mb'/>
-  <flag name='device-tray-moved-event'/>
-  <flag name='nec-usb-xhci-ports'/>
-  <version>1006000</version>
-  <kvmVersion>0</kvmVersion>
-  <package></package>
-  <arch>x86_64</arch>
-  <cpu name='Opteron_G5'/>
-  <cpu name='Opteron_G4'/>
-  <cpu name='Opteron_G3'/>
-  <cpu name='Opteron_G2'/>
-  <cpu name='Opteron_G1'/>
-  <cpu name='Haswell'/>
-  <cpu name='SandyBridge'/>
-  <cpu name='Westmere'/>
-  <cpu name='Nehalem'/>
-  <cpu name='Penryn'/>
-  <cpu name='Conroe'/>
-  <cpu name='n270'/>
-  <cpu name='athlon'/>
-  <cpu name='pentium3'/>
-  <cpu name='pentium2'/>
-  <cpu name='pentium'/>
-  <cpu name='486'/>
-  <cpu name='coreduo'/>
-  <cpu name='kvm32'/>
-  <cpu name='qemu32'/>
-  <cpu name='kvm64'/>
-  <cpu name='core2duo'/>
-  <cpu name='phenom'/>
-  <cpu name='qemu64'/>
-  <machine name='pc-i440fx-1.6' alias='pc' maxCpus='255'/>
-  <machine name='xenpv' maxCpus='1'/>
-  <machine name='pc-q35-1.4' maxCpus='255'/>
-  <machine name='pc-q35-1.5' maxCpus='255'/>
-  <machine name='pc-q35-1.6' alias='q35' maxCpus='255'/>
-  <machine name='xenfv' maxCpus='128'/>
-  <machine name='isapc' maxCpus='1'/>
-  <machine name='pc-0.10' maxCpus='255'/>
-  <machine name='pc-0.11' maxCpus='255'/>
-  <machine name='pc-0.12' maxCpus='255'/>
-  <machine name='pc-0.13' maxCpus='255'/>
-  <machine name='pc-0.14' maxCpus='255'/>
-  <machine name='pc-0.15' maxCpus='255'/>
-  <machine name='pc-1.0' maxCpus='255'/>
-  <machine name='pc-1.1' maxCpus='255'/>
-  <machine name='pc-1.2' maxCpus='255'/>
-  <machine name='pc-1.3' maxCpus='255'/>
-  <machine name='pc-i440fx-1.4' maxCpus='255'/>
-  <machine name='pc-i440fx-1.5' maxCpus='255'/>
-</qemuCaps>

diff --git a/tests/qemucapabilitiesdata/caps_1.6.0-1.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0-1.x86_64.xml
new file mode 100644 (file)
index 0000000..c612c11
--- /dev/null
+++ b/tests/qemucapabilitiesdata/caps_1.6.0-1.x86_64.xml
@@ -0,0 +1,200 @@
+<qemuCaps>
+  <qemuctime>0</qemuctime>
+  <selfctime>0</selfctime>
+  <selfvers>0</selfvers>
+  <usedQMP/>
+  <flag name='mem-path'/>
+  <flag name='drive-serial'/>
+  <flag name='chardev'/>
+  <flag name='enable-kvm'/>
+  <flag name='monitor-json'/>
+  <flag name='device'/>
+  <flag name='sdl'/>
+  <flag name='smp-topology'/>
+  <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='drive-readonly'/>
+  <flag name='smbios-type'/>
+  <flag name='vga-qxl'/>
+  <flag name='spice'/>
+  <flag name='vga-none'/>
+  <flag name='boot-index'/>
+  <flag name='hda-duplex'/>
+  <flag name='drive-aio'/>
+  <flag name='pci-multibus'/>
+  <flag name='pci-bootindex'/>
+  <flag name='ccid-emulated'/>
+  <flag name='ccid-passthru'/>
+  <flag name='chardev-spicevmc'/>
+  <flag name='virtio-tx-alg'/>
+  <flag name='device-qxl-vga'/>
+  <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='rombar'/>
+  <flag name='ich9-ahci'/>
+  <flag name='no-acpi'/>
+  <flag name='fsdev-readonly'/>
+  <flag name='virtio-blk-pci.scsi'/>
+  <flag name='blk-sg-io'/>
+  <flag name='drive-copy-on-read'/>
+  <flag name='cpu-host'/>
+  <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='reboot-timeout'/>
+  <flag name='dump-guest-core'/>
+  <flag name='seamless-migration'/>
+  <flag name='block-commit'/>
+  <flag name='vnc'/>
+  <flag name='drive-mirror'/>
+  <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='device-video-primary'/>
+  <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='vfio-pci.bootindex'/>
+  <flag name='scsi-generic'/>
+  <flag name='scsi-generic.bootindex'/>
+  <flag name='mem-merge'/>
+  <flag name='vnc-websocket'/>
+  <flag name='mlock'/>
+  <flag name='vnc-share-policy'/>
+  <flag name='device-del-event'/>
+  <flag name='dmi-to-pci-bridge'/>
+  <flag name='i440fx-pci-hole64-size'/>
+  <flag name='q35-pci-hole64-size'/>
+  <flag name='usb-storage'/>
+  <flag name='usb-storage.removable'/>
+  <flag name='virtio-mmio'/>
+  <flag name='ich9-intel-hda'/>
+  <flag name='kvm-pit-lost-tick-policy'/>
+  <flag name='boot-strict'/>
+  <flag name='pvpanic'/>
+  <flag name='spice-file-xfer-disable'/>
+  <flag name='spiceport'/>
+  <flag name='usb-kbd'/>
+  <flag name='host-pci-multidomain'/>
+  <flag name='msg-timestamp'/>
+  <flag name='usb-audio'/>
+  <flag name='splash-timeout'/>
+  <flag name='ivshmem'/>
+  <flag name='VGA.vgamem_mb'/>
+  <flag name='vmware-svga.vgamem_mb'/>
+  <flag name='qxl.vgamem_mb'/>
+  <flag name='qxl-vga.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='qxl-vga.vram64_size_mb'/>
+  <flag name='device-tray-moved-event'/>
+  <flag name='nec-usb-xhci-ports'/>
+  <version>1006000</version>
+  <kvmVersion>0</kvmVersion>
+  <package></package>
+  <arch>x86_64</arch>
+  <cpu name='Opteron_G5'/>
+  <cpu name='Opteron_G4'/>
+  <cpu name='Opteron_G3'/>
+  <cpu name='Opteron_G2'/>
+  <cpu name='Opteron_G1'/>
+  <cpu name='Haswell'/>
+  <cpu name='SandyBridge'/>
+  <cpu name='Westmere'/>
+  <cpu name='Nehalem'/>
+  <cpu name='Penryn'/>
+  <cpu name='Conroe'/>
+  <cpu name='n270'/>
+  <cpu name='athlon'/>
+  <cpu name='pentium3'/>
+  <cpu name='pentium2'/>
+  <cpu name='pentium'/>
+  <cpu name='486'/>
+  <cpu name='coreduo'/>
+  <cpu name='kvm32'/>
+  <cpu name='qemu32'/>
+  <cpu name='kvm64'/>
+  <cpu name='core2duo'/>
+  <cpu name='phenom'/>
+  <cpu name='qemu64'/>
+  <machine name='pc-i440fx-1.6' alias='pc' maxCpus='255'/>
+  <machine name='xenpv' maxCpus='1'/>
+  <machine name='pc-q35-1.4' maxCpus='255'/>
+  <machine name='pc-q35-1.5' maxCpus='255'/>
+  <machine name='pc-q35-1.6' alias='q35' maxCpus='255'/>
+  <machine name='xenfv' maxCpus='128'/>
+  <machine name='isapc' maxCpus='1'/>
+  <machine name='pc-0.10' maxCpus='255'/>
+  <machine name='pc-0.11' maxCpus='255'/>
+  <machine name='pc-0.12' maxCpus='255'/>
+  <machine name='pc-0.13' maxCpus='255'/>
+  <machine name='pc-0.14' maxCpus='255'/>
+  <machine name='pc-0.15' maxCpus='255'/>
+  <machine name='pc-1.0' maxCpus='255'/>
+  <machine name='pc-1.1' maxCpus='255'/>
+  <machine name='pc-1.2' maxCpus='255'/>
+  <machine name='pc-1.3' maxCpus='255'/>
+  <machine name='pc-i440fx-1.4' maxCpus='255'/>
+  <machine name='pc-i440fx-1.5' maxCpus='255'/>
+</qemuCaps>

diff --git a/tests/qemucapabilitiesdata/caps_1.6.50-1.x86_64.caps b/tests/qemucapabilitiesdata/caps_1.6.50-1.x86_64.caps
deleted file mode 100644 (file)
index f4603c1..0000000
--- a/tests/qemucapabilitiesdata/caps_1.6.50-1.x86_64.caps
+++ /dev/null
@@ -1,202 +0,0 @@
-<qemuCaps>
-  <qemuctime>0</qemuctime>
-  <selfctime>0</selfctime>
-  <selfvers>0</selfvers>
-  <usedQMP/>
-  <flag name='mem-path'/>
-  <flag name='drive-serial'/>
-  <flag name='chardev'/>
-  <flag name='enable-kvm'/>
-  <flag name='monitor-json'/>
-  <flag name='device'/>
-  <flag name='sdl'/>
-  <flag name='smp-topology'/>
-  <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='drive-readonly'/>
-  <flag name='smbios-type'/>
-  <flag name='vga-qxl'/>
-  <flag name='spice'/>
-  <flag name='vga-none'/>
-  <flag name='boot-index'/>
-  <flag name='hda-duplex'/>
-  <flag name='drive-aio'/>
-  <flag name='pci-multibus'/>
-  <flag name='pci-bootindex'/>
-  <flag name='ccid-emulated'/>
-  <flag name='ccid-passthru'/>
-  <flag name='chardev-spicevmc'/>
-  <flag name='virtio-tx-alg'/>
-  <flag name='device-qxl-vga'/>
-  <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='rombar'/>
-  <flag name='ich9-ahci'/>
-  <flag name='no-acpi'/>
-  <flag name='fsdev-readonly'/>
-  <flag name='virtio-blk-pci.scsi'/>
-  <flag name='blk-sg-io'/>
-  <flag name='drive-copy-on-read'/>
-  <flag name='cpu-host'/>
-  <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='reboot-timeout'/>
-  <flag name='dump-guest-core'/>
-  <flag name='seamless-migration'/>
-  <flag name='block-commit'/>
-  <flag name='vnc'/>
-  <flag name='drive-mirror'/>
-  <flag name='blockdev-snapshot-sync'/>
-  <flag name='qxl'/>
-  <flag name='VGA'/>
-  <flag name='cirrus-vga'/>
-  <flag name='vmware-svga'/>
-  <flag name='device-video-primary'/>
-  <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='vfio-pci.bootindex'/>
-  <flag name='scsi-generic'/>
-  <flag name='scsi-generic.bootindex'/>
-  <flag name='mem-merge'/>
-  <flag name='vnc-websocket'/>
-  <flag name='mlock'/>
-  <flag name='vnc-share-policy'/>
-  <flag name='device-del-event'/>
-  <flag name='dmi-to-pci-bridge'/>
-  <flag name='i440fx-pci-hole64-size'/>
-  <flag name='q35-pci-hole64-size'/>
-  <flag name='usb-storage'/>
-  <flag name='usb-storage.removable'/>
-  <flag name='virtio-mmio'/>
-  <flag name='ich9-intel-hda'/>
-  <flag name='kvm-pit-lost-tick-policy'/>
-  <flag name='boot-strict'/>
-  <flag name='pvpanic'/>
-  <flag name='spice-file-xfer-disable'/>
-  <flag name='spiceport'/>
-  <flag name='usb-kbd'/>
-  <flag name='host-pci-multidomain'/>
-  <flag name='msg-timestamp'/>
-  <flag name='numa'/>
-  <flag name='usb-audio'/>
-  <flag name='splash-timeout'/>
-  <flag name='ivshmem'/>
-  <flag name='VGA.vgamem_mb'/>
-  <flag name='vmware-svga.vgamem_mb'/>
-  <flag name='qxl.vgamem_mb'/>
-  <flag name='qxl-vga.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='qxl-vga.vram64_size_mb'/>
-  <flag name='device-tray-moved-event'/>
-  <flag name='nec-usb-xhci-ports'/>
-  <version>1006050</version>
-  <kvmVersion>0</kvmVersion>
-  <package></package>
-  <arch>x86_64</arch>
-  <cpu name='Opteron_G5'/>
-  <cpu name='Opteron_G4'/>
-  <cpu name='Opteron_G3'/>
-  <cpu name='Opteron_G2'/>
-  <cpu name='Opteron_G1'/>
-  <cpu name='Haswell'/>
-  <cpu name='SandyBridge'/>
-  <cpu name='Westmere'/>
-  <cpu name='Nehalem'/>
-  <cpu name='Penryn'/>
-  <cpu name='Conroe'/>
-  <cpu name='n270'/>
-  <cpu name='athlon'/>
-  <cpu name='pentium3'/>
-  <cpu name='pentium2'/>
-  <cpu name='pentium'/>
-  <cpu name='486'/>
-  <cpu name='coreduo'/>
-  <cpu name='kvm32'/>
-  <cpu name='qemu32'/>
-  <cpu name='kvm64'/>
-  <cpu name='core2duo'/>
-  <cpu name='phenom'/>
-  <cpu name='qemu64'/>
-  <machine name='pc-i440fx-1.7' alias='pc' maxCpus='255'/>
-  <machine name='xenpv' maxCpus='1'/>
-  <machine name='pc-q35-1.4' maxCpus='255'/>
-  <machine name='pc-q35-1.5' maxCpus='255'/>
-  <machine name='pc-q35-1.6' maxCpus='255'/>
-  <machine name='pc-q35-1.7' alias='q35' maxCpus='255'/>
-  <machine name='xenfv' maxCpus='128'/>
-  <machine name='isapc' maxCpus='1'/>
-  <machine name='pc-0.10' maxCpus='255'/>
-  <machine name='pc-0.11' maxCpus='255'/>
-  <machine name='pc-0.12' maxCpus='255'/>
-  <machine name='pc-0.13' maxCpus='255'/>
-  <machine name='pc-0.14' maxCpus='255'/>
-  <machine name='pc-0.15' maxCpus='255'/>
-  <machine name='pc-1.0' maxCpus='255'/>
-  <machine name='pc-1.1' maxCpus='255'/>
-  <machine name='pc-1.2' maxCpus='255'/>
-  <machine name='pc-1.3' maxCpus='255'/>
-  <machine name='pc-i440fx-1.4' maxCpus='255'/>
-  <machine name='pc-i440fx-1.5' maxCpus='255'/>
-  <machine name='pc-i440fx-1.6' maxCpus='255'/>
-</qemuCaps>

diff --git a/tests/qemucapabilitiesdata/caps_1.6.50-1.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.50-1.x86_64.xml
new file mode 100644 (file)
index 0000000..f4603c1
--- /dev/null
+++ b/tests/qemucapabilitiesdata/caps_1.6.50-1.x86_64.xml
@@ -0,0 +1,202 @@
+<qemuCaps>
+  <qemuctime>0</qemuctime>
+  <selfctime>0</selfctime>
+  <selfvers>0</selfvers>
+  <usedQMP/>
+  <flag name='mem-path'/>
+  <flag name='drive-serial'/>
+  <flag name='chardev'/>
+  <flag name='enable-kvm'/>
+  <flag name='monitor-json'/>
+  <flag name='device'/>
+  <flag name='sdl'/>
+  <flag name='smp-topology'/>
+  <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='drive-readonly'/>
+  <flag name='smbios-type'/>
+  <flag name='vga-qxl'/>
+  <flag name='spice'/>
+  <flag name='vga-none'/>
+  <flag name='boot-index'/>
+  <flag name='hda-duplex'/>
+  <flag name='drive-aio'/>
+  <flag name='pci-multibus'/>
+  <flag name='pci-bootindex'/>
+  <flag name='ccid-emulated'/>
+  <flag name='ccid-passthru'/>
+  <flag name='chardev-spicevmc'/>
+  <flag name='virtio-tx-alg'/>
+  <flag name='device-qxl-vga'/>
+  <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='rombar'/>
+  <flag name='ich9-ahci'/>
+  <flag name='no-acpi'/>
+  <flag name='fsdev-readonly'/>
+  <flag name='virtio-blk-pci.scsi'/>
+  <flag name='blk-sg-io'/>
+  <flag name='drive-copy-on-read'/>
+  <flag name='cpu-host'/>
+  <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='reboot-timeout'/>
+  <flag name='dump-guest-core'/>
+  <flag name='seamless-migration'/>
+  <flag name='block-commit'/>
+  <flag name='vnc'/>
+  <flag name='drive-mirror'/>
+  <flag name='blockdev-snapshot-sync'/>
+  <flag name='qxl'/>
+  <flag name='VGA'/>
+  <flag name='cirrus-vga'/>
+  <flag name='vmware-svga'/>
+  <flag name='device-video-primary'/>
+  <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='vfio-pci.bootindex'/>
+  <flag name='scsi-generic'/>
+  <flag name='scsi-generic.bootindex'/>
+  <flag name='mem-merge'/>
+  <flag name='vnc-websocket'/>
+  <flag name='mlock'/>
+  <flag name='vnc-share-policy'/>
+  <flag name='device-del-event'/>
+  <flag name='dmi-to-pci-bridge'/>
+  <flag name='i440fx-pci-hole64-size'/>
+  <flag name='q35-pci-hole64-size'/>
+  <flag name='usb-storage'/>
+  <flag name='usb-storage.removable'/>
+  <flag name='virtio-mmio'/>
+  <flag name='ich9-intel-hda'/>
+  <flag name='kvm-pit-lost-tick-policy'/>
+  <flag name='boot-strict'/>
+  <flag name='pvpanic'/>
+  <flag name='spice-file-xfer-disable'/>
+  <flag name='spiceport'/>
+  <flag name='usb-kbd'/>
+  <flag name='host-pci-multidomain'/>
+  <flag name='msg-timestamp'/>
+  <flag name='numa'/>
+  <flag name='usb-audio'/>
+  <flag name='splash-timeout'/>
+  <flag name='ivshmem'/>
+  <flag name='VGA.vgamem_mb'/>
+  <flag name='vmware-svga.vgamem_mb'/>
+  <flag name='qxl.vgamem_mb'/>
+  <flag name='qxl-vga.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='qxl-vga.vram64_size_mb'/>
+  <flag name='device-tray-moved-event'/>
+  <flag name='nec-usb-xhci-ports'/>
+  <version>1006050</version>
+  <kvmVersion>0</kvmVersion>
+  <package></package>
+  <arch>x86_64</arch>
+  <cpu name='Opteron_G5'/>
+  <cpu name='Opteron_G4'/>
+  <cpu name='Opteron_G3'/>
+  <cpu name='Opteron_G2'/>
+  <cpu name='Opteron_G1'/>
+  <cpu name='Haswell'/>
+  <cpu name='SandyBridge'/>
+  <cpu name='Westmere'/>
+  <cpu name='Nehalem'/>
+  <cpu name='Penryn'/>
+  <cpu name='Conroe'/>
+  <cpu name='n270'/>
+  <cpu name='athlon'/>
+  <cpu name='pentium3'/>
+  <cpu name='pentium2'/>
+  <cpu name='pentium'/>
+  <cpu name='486'/>
+  <cpu name='coreduo'/>
+  <cpu name='kvm32'/>
+  <cpu name='qemu32'/>
+  <cpu name='kvm64'/>
+  <cpu name='core2duo'/>
+  <cpu name='phenom'/>
+  <cpu name='qemu64'/>
+  <machine name='pc-i440fx-1.7' alias='pc' maxCpus='255'/>
+  <machine name='xenpv' maxCpus='1'/>
+  <machine name='pc-q35-1.4' maxCpus='255'/>
+  <machine name='pc-q35-1.5' maxCpus='255'/>
+  <machine name='pc-q35-1.6' maxCpus='255'/>
+  <machine name='pc-q35-1.7' alias='q35' maxCpus='255'/>
+  <machine name='xenfv' maxCpus='128'/>
+  <machine name='isapc' maxCpus='1'/>
+  <machine name='pc-0.10' maxCpus='255'/>
+  <machine name='pc-0.11' maxCpus='255'/>
+  <machine name='pc-0.12' maxCpus='255'/>
+  <machine name='pc-0.13' maxCpus='255'/>
+  <machine name='pc-0.14' maxCpus='255'/>
+  <machine name='pc-0.15' maxCpus='255'/>
+  <machine name='pc-1.0' maxCpus='255'/>
+  <machine name='pc-1.1' maxCpus='255'/>
+  <machine name='pc-1.2' maxCpus='255'/>
+  <machine name='pc-1.3' maxCpus='255'/>
+  <machine name='pc-i440fx-1.4' maxCpus='255'/>
+  <machine name='pc-i440fx-1.5' maxCpus='255'/>
+  <machine name='pc-i440fx-1.6' maxCpus='255'/>
+</qemuCaps>

diff --git a/tests/qemucapabilitiesdata/caps_2.1.1-1.x86_64.caps b/tests/qemucapabilitiesdata/caps_2.1.1-1.x86_64.caps
deleted file mode 100644 (file)
index 4663e19..0000000
--- a/tests/qemucapabilitiesdata/caps_2.1.1-1.x86_64.caps
+++ /dev/null
@@ -1,225 +0,0 @@
-<qemuCaps>
-  <qemuctime>0</qemuctime>
-  <selfctime>0</selfctime>
-  <selfvers>0</selfvers>
-  <usedQMP/>
-  <flag name='mem-path'/>
-  <flag name='drive-serial'/>
-  <flag name='chardev'/>
-  <flag name='enable-kvm'/>
-  <flag name='monitor-json'/>
-  <flag name='device'/>
-  <flag name='sdl'/>
-  <flag name='smp-topology'/>
-  <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='drive-readonly'/>
-  <flag name='smbios-type'/>
-  <flag name='vga-qxl'/>
-  <flag name='spice'/>
-  <flag name='vga-none'/>
-  <flag name='boot-index'/>
-  <flag name='hda-duplex'/>
-  <flag name='drive-aio'/>
-  <flag name='pci-multibus'/>
-  <flag name='pci-bootindex'/>
-  <flag name='ccid-emulated'/>
-  <flag name='ccid-passthru'/>
-  <flag name='chardev-spicevmc'/>
-  <flag name='virtio-tx-alg'/>
-  <flag name='device-qxl-vga'/>
-  <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='rombar'/>
-  <flag name='ich9-ahci'/>
-  <flag name='no-acpi'/>
-  <flag name='fsdev-readonly'/>
-  <flag name='virtio-blk-pci.scsi'/>
-  <flag name='blk-sg-io'/>
-  <flag name='drive-copy-on-read'/>
-  <flag name='cpu-host'/>
-  <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='reboot-timeout'/>
-  <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='device-video-primary'/>
-  <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='tpm-passthrough'/>
-  <flag name='tpm-tis'/>
-  <flag name='pci-bridge'/>
-  <flag name='vfio-pci'/>
-  <flag name='vfio-pci.bootindex'/>
-  <flag name='scsi-generic'/>
-  <flag name='scsi-generic.bootindex'/>
-  <flag name='mem-merge'/>
-  <flag name='vnc-websocket'/>
-  <flag name='drive-discard'/>
-  <flag name='mlock'/>
-  <flag name='vnc-share-policy'/>
-  <flag name='device-del-event'/>
-  <flag name='dmi-to-pci-bridge'/>
-  <flag name='i440fx-pci-hole64-size'/>
-  <flag name='q35-pci-hole64-size'/>
-  <flag name='usb-storage'/>
-  <flag name='usb-storage.removable'/>
-  <flag name='virtio-mmio'/>
-  <flag name='ich9-intel-hda'/>
-  <flag name='kvm-pit-lost-tick-policy'/>
-  <flag name='boot-strict'/>
-  <flag name='pvpanic'/>
-  <flag name='spice-file-xfer-disable'/>
-  <flag name='spiceport'/>
-  <flag name='usb-kbd'/>
-  <flag name='host-pci-multidomain'/>
-  <flag name='msg-timestamp'/>
-  <flag name='active-commit'/>
-  <flag name='change-backing-file'/>
-  <flag name='memory-backend-ram'/>
-  <flag name='numa'/>
-  <flag name='memory-backend-file'/>
-  <flag name='usb-audio'/>
-  <flag name='rtc-reset-reinjection'/>
-  <flag name='splash-timeout'/>
-  <flag name='iothread'/>
-  <flag name='migrate-rdma'/>
-  <flag name='ivshmem'/>
-  <flag name='drive-iotune-max'/>
-  <flag name='VGA.vgamem_mb'/>
-  <flag name='vmware-svga.vgamem_mb'/>
-  <flag name='qxl.vgamem_mb'/>
-  <flag name='qxl-vga.vgamem_mb'/>
-  <flag name='pc-dimm'/>
-  <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='vserport-change-event'/>
-  <flag name='qxl.vram64_size_mb'/>
-  <flag name='qxl-vga.vram64_size_mb'/>
-  <flag name='debug-threads'/>
-  <flag name='device-tray-moved-event'/>
-  <flag name='nec-usb-xhci-ports'/>
-  <version>2001001</version>
-  <kvmVersion>0</kvmVersion>
-  <package></package>
-  <arch>x86_64</arch>
-  <cpu name='Opteron_G5'/>
-  <cpu name='Opteron_G4'/>
-  <cpu name='Opteron_G3'/>
-  <cpu name='Opteron_G2'/>
-  <cpu name='Opteron_G1'/>
-  <cpu name='Broadwell'/>
-  <cpu name='Haswell'/>
-  <cpu name='SandyBridge'/>
-  <cpu name='Westmere'/>
-  <cpu name='Nehalem'/>
-  <cpu name='Penryn'/>
-  <cpu name='Conroe'/>
-  <cpu name='n270'/>
-  <cpu name='athlon'/>
-  <cpu name='pentium3'/>
-  <cpu name='pentium2'/>
-  <cpu name='pentium'/>
-  <cpu name='486'/>
-  <cpu name='coreduo'/>
-  <cpu name='kvm32'/>
-  <cpu name='qemu32'/>
-  <cpu name='kvm64'/>
-  <cpu name='core2duo'/>
-  <cpu name='phenom'/>
-  <cpu name='qemu64'/>
-  <machine name='pc-i440fx-2.1' alias='pc' maxCpus='255'/>
-  <machine name='pc-1.3' maxCpus='255'/>
-  <machine name='pc-0.12' maxCpus='255'/>
-  <machine name='pc-q35-1.6' maxCpus='255'/>
-  <machine name='pc-q35-1.5' maxCpus='255'/>
-  <machine name='xenpv' maxCpus='1'/>
-  <machine name='pc-i440fx-1.6' maxCpus='255'/>
-  <machine name='pc-i440fx-1.7' maxCpus='255'/>
-  <machine name='pc-q35-2.1' alias='q35' maxCpus='255'/>
-  <machine name='pc-0.11' maxCpus='255'/>
-  <machine name='pc-0.10' maxCpus='255'/>
-  <machine name='pc-1.2' maxCpus='255'/>
-  <machine name='isapc' maxCpus='1'/>
-  <machine name='pc-q35-1.4' maxCpus='255'/>
-  <machine name='xenfv' maxCpus='128'/>
-  <machine name='pc-0.15' maxCpus='255'/>
-  <machine name='pc-i440fx-1.5' maxCpus='255'/>
-  <machine name='pc-i440fx-1.4' maxCpus='255'/>
-  <machine name='pc-q35-2.0' maxCpus='255'/>
-  <machine name='pc-0.14' maxCpus='255'/>
-  <machine name='pc-1.1' maxCpus='255'/>
-  <machine name='pc-q35-1.7' maxCpus='255'/>
-  <machine name='pc-1.0' maxCpus='255'/>
-  <machine name='pc-i440fx-2.0' maxCpus='255'/>
-  <machine name='pc-0.13' maxCpus='255'/>
-</qemuCaps>

diff --git a/tests/qemucapabilitiesdata/caps_2.1.1-1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1-1.x86_64.xml
new file mode 100644 (file)
index 0000000..4663e19
--- /dev/null
+++ b/tests/qemucapabilitiesdata/caps_2.1.1-1.x86_64.xml
@@ -0,0 +1,225 @@
+<qemuCaps>
+  <qemuctime>0</qemuctime>
+  <selfctime>0</selfctime>
+  <selfvers>0</selfvers>
+  <usedQMP/>
+  <flag name='mem-path'/>
+  <flag name='drive-serial'/>
+  <flag name='chardev'/>
+  <flag name='enable-kvm'/>
+  <flag name='monitor-json'/>
+  <flag name='device'/>
+  <flag name='sdl'/>
+  <flag name='smp-topology'/>
+  <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='drive-readonly'/>
+  <flag name='smbios-type'/>
+  <flag name='vga-qxl'/>
+  <flag name='spice'/>
+  <flag name='vga-none'/>
+  <flag name='boot-index'/>
+  <flag name='hda-duplex'/>
+  <flag name='drive-aio'/>
+  <flag name='pci-multibus'/>
+  <flag name='pci-bootindex'/>
+  <flag name='ccid-emulated'/>
+  <flag name='ccid-passthru'/>
+  <flag name='chardev-spicevmc'/>
+  <flag name='virtio-tx-alg'/>
+  <flag name='device-qxl-vga'/>
+  <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='rombar'/>
+  <flag name='ich9-ahci'/>
+  <flag name='no-acpi'/>
+  <flag name='fsdev-readonly'/>
+  <flag name='virtio-blk-pci.scsi'/>
+  <flag name='blk-sg-io'/>
+  <flag name='drive-copy-on-read'/>
+  <flag name='cpu-host'/>
+  <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='reboot-timeout'/>
+  <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='device-video-primary'/>
+  <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='tpm-passthrough'/>
+  <flag name='tpm-tis'/>
+  <flag name='pci-bridge'/>
+  <flag name='vfio-pci'/>
+  <flag name='vfio-pci.bootindex'/>
+  <flag name='scsi-generic'/>
+  <flag name='scsi-generic.bootindex'/>
+  <flag name='mem-merge'/>
+  <flag name='vnc-websocket'/>
+  <flag name='drive-discard'/>
+  <flag name='mlock'/>
+  <flag name='vnc-share-policy'/>
+  <flag name='device-del-event'/>
+  <flag name='dmi-to-pci-bridge'/>
+  <flag name='i440fx-pci-hole64-size'/>
+  <flag name='q35-pci-hole64-size'/>
+  <flag name='usb-storage'/>
+  <flag name='usb-storage.removable'/>
+  <flag name='virtio-mmio'/>
+  <flag name='ich9-intel-hda'/>
+  <flag name='kvm-pit-lost-tick-policy'/>
+  <flag name='boot-strict'/>
+  <flag name='pvpanic'/>
+  <flag name='spice-file-xfer-disable'/>
+  <flag name='spiceport'/>
+  <flag name='usb-kbd'/>
+  <flag name='host-pci-multidomain'/>
+  <flag name='msg-timestamp'/>
+  <flag name='active-commit'/>
+  <flag name='change-backing-file'/>
+  <flag name='memory-backend-ram'/>
+  <flag name='numa'/>
+  <flag name='memory-backend-file'/>
+  <flag name='usb-audio'/>
+  <flag name='rtc-reset-reinjection'/>
+  <flag name='splash-timeout'/>
+  <flag name='iothread'/>
+  <flag name='migrate-rdma'/>
+  <flag name='ivshmem'/>
+  <flag name='drive-iotune-max'/>
+  <flag name='VGA.vgamem_mb'/>
+  <flag name='vmware-svga.vgamem_mb'/>
+  <flag name='qxl.vgamem_mb'/>
+  <flag name='qxl-vga.vgamem_mb'/>
+  <flag name='pc-dimm'/>
+  <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='vserport-change-event'/>
+  <flag name='qxl.vram64_size_mb'/>
+  <flag name='qxl-vga.vram64_size_mb'/>
+  <flag name='debug-threads'/>
+  <flag name='device-tray-moved-event'/>
+  <flag name='nec-usb-xhci-ports'/>
+  <version>2001001</version>
+  <kvmVersion>0</kvmVersion>
+  <package></package>
+  <arch>x86_64</arch>
+  <cpu name='Opteron_G5'/>
+  <cpu name='Opteron_G4'/>
+  <cpu name='Opteron_G3'/>
+  <cpu name='Opteron_G2'/>
+  <cpu name='Opteron_G1'/>
+  <cpu name='Broadwell'/>
+  <cpu name='Haswell'/>
+  <cpu name='SandyBridge'/>
+  <cpu name='Westmere'/>
+  <cpu name='Nehalem'/>
+  <cpu name='Penryn'/>
+  <cpu name='Conroe'/>
+  <cpu name='n270'/>
+  <cpu name='athlon'/>
+  <cpu name='pentium3'/>
+  <cpu name='pentium2'/>
+  <cpu name='pentium'/>
+  <cpu name='486'/>
+  <cpu name='coreduo'/>
+  <cpu name='kvm32'/>
+  <cpu name='qemu32'/>
+  <cpu name='kvm64'/>
+  <cpu name='core2duo'/>
+  <cpu name='phenom'/>
+  <cpu name='qemu64'/>
+  <machine name='pc-i440fx-2.1' alias='pc' maxCpus='255'/>
+  <machine name='pc-1.3' maxCpus='255'/>
+  <machine name='pc-0.12' maxCpus='255'/>
+  <machine name='pc-q35-1.6' maxCpus='255'/>
+  <machine name='pc-q35-1.5' maxCpus='255'/>
+  <machine name='xenpv' maxCpus='1'/>
+  <machine name='pc-i440fx-1.6' maxCpus='255'/>
+  <machine name='pc-i440fx-1.7' maxCpus='255'/>
+  <machine name='pc-q35-2.1' alias='q35' maxCpus='255'/>
+  <machine name='pc-0.11' maxCpus='255'/>
+  <machine name='pc-0.10' maxCpus='255'/>
+  <machine name='pc-1.2' maxCpus='255'/>
+  <machine name='isapc' maxCpus='1'/>
+  <machine name='pc-q35-1.4' maxCpus='255'/>
+  <machine name='xenfv' maxCpus='128'/>
+  <machine name='pc-0.15' maxCpus='255'/>
+  <machine name='pc-i440fx-1.5' maxCpus='255'/>
+  <machine name='pc-i440fx-1.4' maxCpus='255'/>
+  <machine name='pc-q35-2.0' maxCpus='255'/>
+  <machine name='pc-0.14' maxCpus='255'/>
+  <machine name='pc-1.1' maxCpus='255'/>
+  <machine name='pc-q35-1.7' maxCpus='255'/>
+  <machine name='pc-1.0' maxCpus='255'/>
+  <machine name='pc-i440fx-2.0' maxCpus='255'/>
+  <machine name='pc-0.13' maxCpus='255'/>
+</qemuCaps>

diff --git a/tests/qemucapabilitiesdata/caps_2.4.0-1.x86_64.caps b/tests/qemucapabilitiesdata/caps_2.4.0-1.x86_64.caps
deleted file mode 100644 (file)
index a8df7e1..0000000
--- a/tests/qemucapabilitiesdata/caps_2.4.0-1.x86_64.caps
+++ /dev/null
@@ -1,245 +0,0 @@
-<qemuCaps>
-  <qemuctime>0</qemuctime>
-  <selfctime>0</selfctime>
-  <selfvers>0</selfvers>
-  <usedQMP/>
-  <flag name='mem-path'/>
-  <flag name='drive-serial'/>
-  <flag name='chardev'/>
-  <flag name='enable-kvm'/>
-  <flag name='monitor-json'/>
-  <flag name='device'/>
-  <flag name='sdl'/>
-  <flag name='smp-topology'/>
-  <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='drive-readonly'/>
-  <flag name='smbios-type'/>
-  <flag name='vga-qxl'/>
-  <flag name='spice'/>
-  <flag name='vga-none'/>
-  <flag name='boot-index'/>
-  <flag name='hda-duplex'/>
-  <flag name='drive-aio'/>
-  <flag name='pci-multibus'/>
-  <flag name='pci-bootindex'/>
-  <flag name='ccid-passthru'/>
-  <flag name='chardev-spicevmc'/>
-  <flag name='virtio-tx-alg'/>
-  <flag name='device-qxl-vga'/>
-  <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='rombar'/>
-  <flag name='ich9-ahci'/>
-  <flag name='no-acpi'/>
-  <flag name='fsdev-readonly'/>
-  <flag name='virtio-blk-pci.scsi'/>
-  <flag name='blk-sg-io'/>
-  <flag name='drive-copy-on-read'/>
-  <flag name='cpu-host'/>
-  <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='reboot-timeout'/>
-  <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='device-video-primary'/>
-  <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='tpm-passthrough'/>
-  <flag name='tpm-tis'/>
-  <flag name='pci-bridge'/>
-  <flag name='vfio-pci'/>
-  <flag name='vfio-pci.bootindex'/>
-  <flag name='scsi-generic'/>
-  <flag name='scsi-generic.bootindex'/>
-  <flag name='mem-merge'/>
-  <flag name='vnc-websocket'/>
-  <flag name='drive-discard'/>
-  <flag name='mlock'/>
-  <flag name='vnc-share-policy'/>
-  <flag name='device-del-event'/>
-  <flag name='dmi-to-pci-bridge'/>
-  <flag name='i440fx-pci-hole64-size'/>
-  <flag name='q35-pci-hole64-size'/>
-  <flag name='usb-storage'/>
-  <flag name='usb-storage.removable'/>
-  <flag name='virtio-mmio'/>
-  <flag name='ich9-intel-hda'/>
-  <flag name='kvm-pit-lost-tick-policy'/>
-  <flag name='boot-strict'/>
-  <flag name='pvpanic'/>
-  <flag name='spice-file-xfer-disable'/>
-  <flag name='spiceport'/>
-  <flag name='usb-kbd'/>
-  <flag name='host-pci-multidomain'/>
-  <flag name='msg-timestamp'/>
-  <flag name='active-commit'/>
-  <flag name='change-backing-file'/>
-  <flag name='memory-backend-ram'/>
-  <flag name='numa'/>
-  <flag name='memory-backend-file'/>
-  <flag name='usb-audio'/>
-  <flag name='rtc-reset-reinjection'/>
-  <flag name='splash-timeout'/>
-  <flag name='iothread'/>
-  <flag name='migrate-rdma'/>
-  <flag name='ivshmem'/>
-  <flag name='drive-iotune-max'/>
-  <flag name='VGA.vgamem_mb'/>
-  <flag name='vmware-svga.vgamem_mb'/>
-  <flag name='qxl.vgamem_mb'/>
-  <flag name='qxl-vga.vgamem_mb'/>
-  <flag name='pc-dimm'/>
-  <flag name='machine-vmport-opt'/>
-  <flag name='pci-serial'/>
-  <flag name='vhost-user-multiqueue'/>
-  <flag name='migration-event'/>
-  <flag name='ioh3420'/>
-  <flag name='x3130-upstream'/>
-  <flag name='xio3130-downstream'/>
-  <flag name='rtl8139'/>
-  <flag name='e1000'/>
-  <flag name='virtio-net'/>
-  <flag name='incoming-defer'/>
-  <flag name='virtio-gpu'/>
-  <flag name='virtio-keyboard'/>
-  <flag name='virtio-mouse'/>
-  <flag name='virtio-tablet'/>
-  <flag name='virtio-input-host'/>
-  <flag name='ich9-disable-s3'/>
-  <flag name='ich9-disable-s4'/>
-  <flag name='vserport-change-event'/>
-  <flag name='virtio-balloon-pci.deflate-on-oom'/>
-  <flag name='qxl.vram64_size_mb'/>
-  <flag name='qxl-vga.vram64_size_mb'/>
-  <flag name='debug-threads'/>
-  <flag name='pxb'/>
-  <flag name='device-tray-moved-event'/>
-  <flag name='nec-usb-xhci-ports'/>
-  <flag name='virtio-scsi-pci.iothread'/>
-  <version>2004000</version>
-  <kvmVersion>0</kvmVersion>
-  <package></package>
-  <arch>x86_64</arch>
-  <cpu name='Opteron_G5'/>
-  <cpu name='Opteron_G4'/>
-  <cpu name='Opteron_G3'/>
-  <cpu name='Opteron_G2'/>
-  <cpu name='Opteron_G1'/>
-  <cpu name='Broadwell'/>
-  <cpu name='Broadwell-noTSX'/>
-  <cpu name='Haswell'/>
-  <cpu name='Haswell-noTSX'/>
-  <cpu name='IvyBridge'/>
-  <cpu name='SandyBridge'/>
-  <cpu name='Westmere'/>
-  <cpu name='Nehalem'/>
-  <cpu name='Penryn'/>
-  <cpu name='Conroe'/>
-  <cpu name='n270'/>
-  <cpu name='athlon'/>
-  <cpu name='pentium3'/>
-  <cpu name='pentium2'/>
-  <cpu name='pentium'/>
-  <cpu name='486'/>
-  <cpu name='coreduo'/>
-  <cpu name='kvm32'/>
-  <cpu name='qemu32'/>
-  <cpu name='kvm64'/>
-  <cpu name='core2duo'/>
-  <cpu name='phenom'/>
-  <cpu name='qemu64'/>
-  <machine name='pc-i440fx-2.4' alias='pc' maxCpus='255'/>
-  <machine name='pc-1.3' maxCpus='255'/>
-  <machine name='pc-0.12' maxCpus='255'/>
-  <machine name='pc-q35-1.6' maxCpus='255'/>
-  <machine name='pc-q35-1.5' maxCpus='255'/>
-  <machine name='pc-i440fx-1.6' maxCpus='255'/>
-  <machine name='pc-q35-2.2' maxCpus='255'/>
-  <machine name='pc-i440fx-1.7' maxCpus='255'/>
-  <machine name='pc-q35-2.1' maxCpus='255'/>
-  <machine name='pc-0.11' maxCpus='255'/>
-  <machine name='pc-0.10' maxCpus='255'/>
-  <machine name='pc-i440fx-2.2' maxCpus='255'/>
-  <machine name='pc-1.2' maxCpus='255'/>
-  <machine name='isapc' maxCpus='1'/>
-  <machine name='pc-i440fx-2.3' maxCpus='255'/>
-  <machine name='pc-q35-1.4' maxCpus='255'/>
-  <machine name='pc-0.15' maxCpus='255'/>
-  <machine name='pc-i440fx-1.5' maxCpus='255'/>
-  <machine name='pc-q35-2.0' maxCpus='255'/>
-  <machine name='pc-i440fx-1.4' maxCpus='255'/>
-  <machine name='pc-0.14' maxCpus='255'/>
-  <machine name='pc-1.1' maxCpus='255'/>
-  <machine name='pc-i440fx-2.1' maxCpus='255'/>
-  <machine name='pc-q35-1.7' maxCpus='255'/>
-  <machine name='pc-1.0' maxCpus='255'/>
-  <machine name='pc-i440fx-2.0' maxCpus='255'/>
-  <machine name='pc-q35-2.4' alias='q35' maxCpus='255'/>
-  <machine name='pc-q35-2.3' maxCpus='255'/>
-  <machine name='pc-0.13' maxCpus='255'/>
-</qemuCaps>

diff --git a/tests/qemucapabilitiesdata/caps_2.4.0-1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0-1.x86_64.xml
new file mode 100644 (file)
index 0000000..a8df7e1
--- /dev/null
+++ b/tests/qemucapabilitiesdata/caps_2.4.0-1.x86_64.xml
@@ -0,0 +1,245 @@
+<qemuCaps>
+  <qemuctime>0</qemuctime>
+  <selfctime>0</selfctime>
+  <selfvers>0</selfvers>
+  <usedQMP/>
+  <flag name='mem-path'/>
+  <flag name='drive-serial'/>
+  <flag name='chardev'/>
+  <flag name='enable-kvm'/>
+  <flag name='monitor-json'/>
+  <flag name='device'/>
+  <flag name='sdl'/>
+  <flag name='smp-topology'/>
+  <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='drive-readonly'/>
+  <flag name='smbios-type'/>
+  <flag name='vga-qxl'/>
+  <flag name='spice'/>
+  <flag name='vga-none'/>
+  <flag name='boot-index'/>
+  <flag name='hda-duplex'/>
+  <flag name='drive-aio'/>
+  <flag name='pci-multibus'/>
+  <flag name='pci-bootindex'/>
+  <flag name='ccid-passthru'/>
+  <flag name='chardev-spicevmc'/>
+  <flag name='virtio-tx-alg'/>
+  <flag name='device-qxl-vga'/>
+  <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='rombar'/>
+  <flag name='ich9-ahci'/>
+  <flag name='no-acpi'/>
+  <flag name='fsdev-readonly'/>
+  <flag name='virtio-blk-pci.scsi'/>
+  <flag name='blk-sg-io'/>
+  <flag name='drive-copy-on-read'/>
+  <flag name='cpu-host'/>
+  <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='reboot-timeout'/>
+  <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='device-video-primary'/>
+  <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='tpm-passthrough'/>
+  <flag name='tpm-tis'/>
+  <flag name='pci-bridge'/>
+  <flag name='vfio-pci'/>
+  <flag name='vfio-pci.bootindex'/>
+  <flag name='scsi-generic'/>
+  <flag name='scsi-generic.bootindex'/>
+  <flag name='mem-merge'/>
+  <flag name='vnc-websocket'/>
+  <flag name='drive-discard'/>
+  <flag name='mlock'/>
+  <flag name='vnc-share-policy'/>
+  <flag name='device-del-event'/>
+  <flag name='dmi-to-pci-bridge'/>
+  <flag name='i440fx-pci-hole64-size'/>
+  <flag name='q35-pci-hole64-size'/>
+  <flag name='usb-storage'/>
+  <flag name='usb-storage.removable'/>
+  <flag name='virtio-mmio'/>
+  <flag name='ich9-intel-hda'/>
+  <flag name='kvm-pit-lost-tick-policy'/>
+  <flag name='boot-strict'/>
+  <flag name='pvpanic'/>
+  <flag name='spice-file-xfer-disable'/>
+  <flag name='spiceport'/>
+  <flag name='usb-kbd'/>
+  <flag name='host-pci-multidomain'/>
+  <flag name='msg-timestamp'/>
+  <flag name='active-commit'/>
+  <flag name='change-backing-file'/>
+  <flag name='memory-backend-ram'/>
+  <flag name='numa'/>
+  <flag name='memory-backend-file'/>
+  <flag name='usb-audio'/>
+  <flag name='rtc-reset-reinjection'/>
+  <flag name='splash-timeout'/>
+  <flag name='iothread'/>
+  <flag name='migrate-rdma'/>
+  <flag name='ivshmem'/>
+  <flag name='drive-iotune-max'/>
+  <flag name='VGA.vgamem_mb'/>
+  <flag name='vmware-svga.vgamem_mb'/>
+  <flag name='qxl.vgamem_mb'/>
+  <flag name='qxl-vga.vgamem_mb'/>
+  <flag name='pc-dimm'/>
+  <flag name='machine-vmport-opt'/>
+  <flag name='pci-serial'/>
+  <flag name='vhost-user-multiqueue'/>
+  <flag name='migration-event'/>
+  <flag name='ioh3420'/>
+  <flag name='x3130-upstream'/>
+  <flag name='xio3130-downstream'/>
+  <flag name='rtl8139'/>
+  <flag name='e1000'/>
+  <flag name='virtio-net'/>
+  <flag name='incoming-defer'/>
+  <flag name='virtio-gpu'/>
+  <flag name='virtio-keyboard'/>
+  <flag name='virtio-mouse'/>
+  <flag name='virtio-tablet'/>
+  <flag name='virtio-input-host'/>
+  <flag name='ich9-disable-s3'/>
+  <flag name='ich9-disable-s4'/>
+  <flag name='vserport-change-event'/>
+  <flag name='virtio-balloon-pci.deflate-on-oom'/>
+  <flag name='qxl.vram64_size_mb'/>
+  <flag name='qxl-vga.vram64_size_mb'/>
+  <flag name='debug-threads'/>
+  <flag name='pxb'/>
+  <flag name='device-tray-moved-event'/>
+  <flag name='nec-usb-xhci-ports'/>
+  <flag name='virtio-scsi-pci.iothread'/>
+  <version>2004000</version>
+  <kvmVersion>0</kvmVersion>
+  <package></package>
+  <arch>x86_64</arch>
+  <cpu name='Opteron_G5'/>
+  <cpu name='Opteron_G4'/>
+  <cpu name='Opteron_G3'/>
+  <cpu name='Opteron_G2'/>
+  <cpu name='Opteron_G1'/>
+  <cpu name='Broadwell'/>
+  <cpu name='Broadwell-noTSX'/>
+  <cpu name='Haswell'/>
+  <cpu name='Haswell-noTSX'/>
+  <cpu name='IvyBridge'/>
+  <cpu name='SandyBridge'/>
+  <cpu name='Westmere'/>
+  <cpu name='Nehalem'/>
+  <cpu name='Penryn'/>
+  <cpu name='Conroe'/>
+  <cpu name='n270'/>
+  <cpu name='athlon'/>
+  <cpu name='pentium3'/>
+  <cpu name='pentium2'/>
+  <cpu name='pentium'/>
+  <cpu name='486'/>
+  <cpu name='coreduo'/>
+  <cpu name='kvm32'/>
+  <cpu name='qemu32'/>
+  <cpu name='kvm64'/>
+  <cpu name='core2duo'/>
+  <cpu name='phenom'/>
+  <cpu name='qemu64'/>
+  <machine name='pc-i440fx-2.4' alias='pc' maxCpus='255'/>
+  <machine name='pc-1.3' maxCpus='255'/>
+  <machine name='pc-0.12' maxCpus='255'/>
+  <machine name='pc-q35-1.6' maxCpus='255'/>
+  <machine name='pc-q35-1.5' maxCpus='255'/>
+  <machine name='pc-i440fx-1.6' maxCpus='255'/>
+  <machine name='pc-q35-2.2' maxCpus='255'/>
+  <machine name='pc-i440fx-1.7' maxCpus='255'/>
+  <machine name='pc-q35-2.1' maxCpus='255'/>
+  <machine name='pc-0.11' maxCpus='255'/>
+  <machine name='pc-0.10' maxCpus='255'/>
+  <machine name='pc-i440fx-2.2' maxCpus='255'/>
+  <machine name='pc-1.2' maxCpus='255'/>
+  <machine name='isapc' maxCpus='1'/>
+  <machine name='pc-i440fx-2.3' maxCpus='255'/>
+  <machine name='pc-q35-1.4' maxCpus='255'/>
+  <machine name='pc-0.15' maxCpus='255'/>
+  <machine name='pc-i440fx-1.5' maxCpus='255'/>
+  <machine name='pc-q35-2.0' maxCpus='255'/>
+  <machine name='pc-i440fx-1.4' maxCpus='255'/>
+  <machine name='pc-0.14' maxCpus='255'/>
+  <machine name='pc-1.1' maxCpus='255'/>
+  <machine name='pc-i440fx-2.1' maxCpus='255'/>
+  <machine name='pc-q35-1.7' maxCpus='255'/>
+  <machine name='pc-1.0' maxCpus='255'/>
+  <machine name='pc-i440fx-2.0' maxCpus='255'/>
+  <machine name='pc-q35-2.4' alias='q35' maxCpus='255'/>
+  <machine name='pc-q35-2.3' maxCpus='255'/>
+  <machine name='pc-0.13' maxCpus='255'/>
+</qemuCaps>

diff --git a/tests/qemucapabilitiesdata/caps_2.5.0-1.x86_64.caps b/tests/qemucapabilitiesdata/caps_2.5.0-1.x86_64.caps
deleted file mode 100644 (file)
index 2160173..0000000
--- a/tests/qemucapabilitiesdata/caps_2.5.0-1.x86_64.caps
+++ /dev/null
@@ -1,246 +0,0 @@
-<qemuCaps>
-  <qemuctime>0</qemuctime>
-  <selfctime>0</selfctime>
-  <selfvers>0</selfvers>
-  <usedQMP/>
-  <flag name='mem-path'/>
-  <flag name='drive-serial'/>
-  <flag name='chardev'/>
-  <flag name='enable-kvm'/>
-  <flag name='monitor-json'/>
-  <flag name='device'/>
-  <flag name='sdl'/>
-  <flag name='smp-topology'/>
-  <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='drive-readonly'/>
-  <flag name='smbios-type'/>
-  <flag name='vga-qxl'/>
-  <flag name='spice'/>
-  <flag name='vga-none'/>
-  <flag name='boot-index'/>
-  <flag name='hda-duplex'/>
-  <flag name='drive-aio'/>
-  <flag name='pci-multibus'/>
-  <flag name='pci-bootindex'/>
-  <flag name='ccid-passthru'/>
-  <flag name='chardev-spicevmc'/>
-  <flag name='virtio-tx-alg'/>
-  <flag name='device-qxl-vga'/>
-  <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='rombar'/>
-  <flag name='ich9-ahci'/>
-  <flag name='no-acpi'/>
-  <flag name='fsdev-readonly'/>
-  <flag name='virtio-blk-pci.scsi'/>
-  <flag name='blk-sg-io'/>
-  <flag name='drive-copy-on-read'/>
-  <flag name='cpu-host'/>
-  <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='reboot-timeout'/>
-  <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='device-video-primary'/>
-  <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='tpm-passthrough'/>
-  <flag name='tpm-tis'/>
-  <flag name='pci-bridge'/>
-  <flag name='vfio-pci'/>
-  <flag name='vfio-pci.bootindex'/>
-  <flag name='scsi-generic'/>
-  <flag name='scsi-generic.bootindex'/>
-  <flag name='mem-merge'/>
-  <flag name='vnc-websocket'/>
-  <flag name='drive-discard'/>
-  <flag name='mlock'/>
-  <flag name='vnc-share-policy'/>
-  <flag name='device-del-event'/>
-  <flag name='dmi-to-pci-bridge'/>
-  <flag name='i440fx-pci-hole64-size'/>
-  <flag name='q35-pci-hole64-size'/>
-  <flag name='usb-storage'/>
-  <flag name='usb-storage.removable'/>
-  <flag name='virtio-mmio'/>
-  <flag name='ich9-intel-hda'/>
-  <flag name='kvm-pit-lost-tick-policy'/>
-  <flag name='boot-strict'/>
-  <flag name='pvpanic'/>
-  <flag name='spice-file-xfer-disable'/>
-  <flag name='spiceport'/>
-  <flag name='usb-kbd'/>
-  <flag name='host-pci-multidomain'/>
-  <flag name='msg-timestamp'/>
-  <flag name='active-commit'/>
-  <flag name='change-backing-file'/>
-  <flag name='memory-backend-ram'/>
-  <flag name='numa'/>
-  <flag name='memory-backend-file'/>
-  <flag name='usb-audio'/>
-  <flag name='rtc-reset-reinjection'/>
-  <flag name='splash-timeout'/>
-  <flag name='iothread'/>
-  <flag name='migrate-rdma'/>
-  <flag name='ivshmem'/>
-  <flag name='drive-iotune-max'/>
-  <flag name='VGA.vgamem_mb'/>
-  <flag name='vmware-svga.vgamem_mb'/>
-  <flag name='qxl.vgamem_mb'/>
-  <flag name='qxl-vga.vgamem_mb'/>
-  <flag name='pc-dimm'/>
-  <flag name='machine-vmport-opt'/>
-  <flag name='pci-serial'/>
-  <flag name='vhost-user-multiqueue'/>
-  <flag name='migration-event'/>
-  <flag name='ioh3420'/>
-  <flag name='x3130-upstream'/>
-  <flag name='xio3130-downstream'/>
-  <flag name='rtl8139'/>
-  <flag name='e1000'/>
-  <flag name='virtio-net'/>
-  <flag name='incoming-defer'/>
-  <flag name='virtio-gpu'/>
-  <flag name='virtio-gpu.virgl'/>
-  <flag name='virtio-keyboard'/>
-  <flag name='virtio-mouse'/>
-  <flag name='virtio-tablet'/>
-  <flag name='virtio-input-host'/>
-  <flag name='ich9-disable-s3'/>
-  <flag name='ich9-disable-s4'/>
-  <flag name='vserport-change-event'/>
-  <flag name='virtio-balloon-pci.deflate-on-oom'/>
-  <flag name='qxl.vram64_size_mb'/>
-  <flag name='qxl-vga.vram64_size_mb'/>
-  <flag name='debug-threads'/>
-  <flag name='pxb'/>
-  <flag name='device-tray-moved-event'/>
-  <flag name='nec-usb-xhci-ports'/>
-  <flag name='virtio-scsi-pci.iothread'/>
-  <version>2004000</version>
-  <kvmVersion>0</kvmVersion>
-  <package></package>
-  <arch>x86_64</arch>
-  <cpu name='Opteron_G5'/>
-  <cpu name='Opteron_G4'/>
-  <cpu name='Opteron_G3'/>
-  <cpu name='Opteron_G2'/>
-  <cpu name='Opteron_G1'/>
-  <cpu name='Broadwell'/>
-  <cpu name='Broadwell-noTSX'/>
-  <cpu name='Haswell'/>
-  <cpu name='Haswell-noTSX'/>
-  <cpu name='IvyBridge'/>
-  <cpu name='SandyBridge'/>
-  <cpu name='Westmere'/>
-  <cpu name='Nehalem'/>
-  <cpu name='Penryn'/>
-  <cpu name='Conroe'/>
-  <cpu name='n270'/>
-  <cpu name='athlon'/>
-  <cpu name='pentium3'/>
-  <cpu name='pentium2'/>
-  <cpu name='pentium'/>
-  <cpu name='486'/>
-  <cpu name='coreduo'/>
-  <cpu name='kvm32'/>
-  <cpu name='qemu32'/>
-  <cpu name='kvm64'/>
-  <cpu name='core2duo'/>
-  <cpu name='phenom'/>
-  <cpu name='qemu64'/>
-  <machine name='pc-i440fx-2.4' alias='pc' maxCpus='255'/>
-  <machine name='pc-1.3' maxCpus='255'/>
-  <machine name='pc-0.12' maxCpus='255'/>
-  <machine name='pc-q35-1.6' maxCpus='255'/>
-  <machine name='pc-q35-1.5' maxCpus='255'/>
-  <machine name='pc-i440fx-1.6' maxCpus='255'/>
-  <machine name='pc-q35-2.2' maxCpus='255'/>
-  <machine name='pc-i440fx-1.7' maxCpus='255'/>
-  <machine name='pc-q35-2.1' maxCpus='255'/>
-  <machine name='pc-0.11' maxCpus='255'/>
-  <machine name='pc-0.10' maxCpus='255'/>
-  <machine name='pc-i440fx-2.2' maxCpus='255'/>
-  <machine name='pc-1.2' maxCpus='255'/>
-  <machine name='isapc' maxCpus='1'/>
-  <machine name='pc-i440fx-2.3' maxCpus='255'/>
-  <machine name='pc-q35-1.4' maxCpus='255'/>
-  <machine name='pc-0.15' maxCpus='255'/>
-  <machine name='pc-i440fx-1.5' maxCpus='255'/>
-  <machine name='pc-q35-2.0' maxCpus='255'/>
-  <machine name='pc-i440fx-1.4' maxCpus='255'/>
-  <machine name='pc-0.14' maxCpus='255'/>
-  <machine name='pc-1.1' maxCpus='255'/>
-  <machine name='pc-i440fx-2.1' maxCpus='255'/>
-  <machine name='pc-q35-1.7' maxCpus='255'/>
-  <machine name='pc-1.0' maxCpus='255'/>
-  <machine name='pc-i440fx-2.0' maxCpus='255'/>
-  <machine name='pc-q35-2.4' alias='q35' maxCpus='255'/>
-  <machine name='pc-q35-2.3' maxCpus='255'/>
-  <machine name='pc-0.13' maxCpus='255'/>
-</qemuCaps>

diff --git a/tests/qemucapabilitiesdata/caps_2.5.0-1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0-1.x86_64.xml
new file mode 100644 (file)
index 0000000..2160173
--- /dev/null
+++ b/tests/qemucapabilitiesdata/caps_2.5.0-1.x86_64.xml
@@ -0,0 +1,246 @@
+<qemuCaps>
+  <qemuctime>0</qemuctime>
+  <selfctime>0</selfctime>
+  <selfvers>0</selfvers>
+  <usedQMP/>
+  <flag name='mem-path'/>
+  <flag name='drive-serial'/>
+  <flag name='chardev'/>
+  <flag name='enable-kvm'/>
+  <flag name='monitor-json'/>
+  <flag name='device'/>
+  <flag name='sdl'/>
+  <flag name='smp-topology'/>
+  <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='drive-readonly'/>
+  <flag name='smbios-type'/>
+  <flag name='vga-qxl'/>
+  <flag name='spice'/>
+  <flag name='vga-none'/>
+  <flag name='boot-index'/>
+  <flag name='hda-duplex'/>
+  <flag name='drive-aio'/>
+  <flag name='pci-multibus'/>
+  <flag name='pci-bootindex'/>
+  <flag name='ccid-passthru'/>
+  <flag name='chardev-spicevmc'/>
+  <flag name='virtio-tx-alg'/>
+  <flag name='device-qxl-vga'/>
+  <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='rombar'/>
+  <flag name='ich9-ahci'/>
+  <flag name='no-acpi'/>
+  <flag name='fsdev-readonly'/>
+  <flag name='virtio-blk-pci.scsi'/>
+  <flag name='blk-sg-io'/>
+  <flag name='drive-copy-on-read'/>
+  <flag name='cpu-host'/>
+  <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='reboot-timeout'/>
+  <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='device-video-primary'/>
+  <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='tpm-passthrough'/>
+  <flag name='tpm-tis'/>
+  <flag name='pci-bridge'/>
+  <flag name='vfio-pci'/>
+  <flag name='vfio-pci.bootindex'/>
+  <flag name='scsi-generic'/>
+  <flag name='scsi-generic.bootindex'/>
+  <flag name='mem-merge'/>
+  <flag name='vnc-websocket'/>
+  <flag name='drive-discard'/>
+  <flag name='mlock'/>
+  <flag name='vnc-share-policy'/>
+  <flag name='device-del-event'/>
+  <flag name='dmi-to-pci-bridge'/>
+  <flag name='i440fx-pci-hole64-size'/>
+  <flag name='q35-pci-hole64-size'/>
+  <flag name='usb-storage'/>
+  <flag name='usb-storage.removable'/>
+  <flag name='virtio-mmio'/>
+  <flag name='ich9-intel-hda'/>
+  <flag name='kvm-pit-lost-tick-policy'/>
+  <flag name='boot-strict'/>
+  <flag name='pvpanic'/>
+  <flag name='spice-file-xfer-disable'/>
+  <flag name='spiceport'/>
+  <flag name='usb-kbd'/>
+  <flag name='host-pci-multidomain'/>
+  <flag name='msg-timestamp'/>
+  <flag name='active-commit'/>
+  <flag name='change-backing-file'/>
+  <flag name='memory-backend-ram'/>
+  <flag name='numa'/>
+  <flag name='memory-backend-file'/>
+  <flag name='usb-audio'/>
+  <flag name='rtc-reset-reinjection'/>
+  <flag name='splash-timeout'/>
+  <flag name='iothread'/>
+  <flag name='migrate-rdma'/>
+  <flag name='ivshmem'/>
+  <flag name='drive-iotune-max'/>
+  <flag name='VGA.vgamem_mb'/>
+  <flag name='vmware-svga.vgamem_mb'/>
+  <flag name='qxl.vgamem_mb'/>
+  <flag name='qxl-vga.vgamem_mb'/>
+  <flag name='pc-dimm'/>
+  <flag name='machine-vmport-opt'/>
+  <flag name='pci-serial'/>
+  <flag name='vhost-user-multiqueue'/>
+  <flag name='migration-event'/>
+  <flag name='ioh3420'/>
+  <flag name='x3130-upstream'/>
+  <flag name='xio3130-downstream'/>
+  <flag name='rtl8139'/>
+  <flag name='e1000'/>
+  <flag name='virtio-net'/>
+  <flag name='incoming-defer'/>
+  <flag name='virtio-gpu'/>
+  <flag name='virtio-gpu.virgl'/>
+  <flag name='virtio-keyboard'/>
+  <flag name='virtio-mouse'/>
+  <flag name='virtio-tablet'/>
+  <flag name='virtio-input-host'/>
+  <flag name='ich9-disable-s3'/>
+  <flag name='ich9-disable-s4'/>
+  <flag name='vserport-change-event'/>
+  <flag name='virtio-balloon-pci.deflate-on-oom'/>
+  <flag name='qxl.vram64_size_mb'/>
+  <flag name='qxl-vga.vram64_size_mb'/>
+  <flag name='debug-threads'/>
+  <flag name='pxb'/>
+  <flag name='device-tray-moved-event'/>
+  <flag name='nec-usb-xhci-ports'/>
+  <flag name='virtio-scsi-pci.iothread'/>
+  <version>2004000</version>
+  <kvmVersion>0</kvmVersion>
+  <package></package>
+  <arch>x86_64</arch>
+  <cpu name='Opteron_G5'/>
+  <cpu name='Opteron_G4'/>
+  <cpu name='Opteron_G3'/>
+  <cpu name='Opteron_G2'/>
+  <cpu name='Opteron_G1'/>
+  <cpu name='Broadwell'/>
+  <cpu name='Broadwell-noTSX'/>
+  <cpu name='Haswell'/>
+  <cpu name='Haswell-noTSX'/>
+  <cpu name='IvyBridge'/>
+  <cpu name='SandyBridge'/>
+  <cpu name='Westmere'/>
+  <cpu name='Nehalem'/>
+  <cpu name='Penryn'/>
+  <cpu name='Conroe'/>
+  <cpu name='n270'/>
+  <cpu name='athlon'/>
+  <cpu name='pentium3'/>
+  <cpu name='pentium2'/>
+  <cpu name='pentium'/>
+  <cpu name='486'/>
+  <cpu name='coreduo'/>
+  <cpu name='kvm32'/>
+  <cpu name='qemu32'/>
+  <cpu name='kvm64'/>
+  <cpu name='core2duo'/>
+  <cpu name='phenom'/>
+  <cpu name='qemu64'/>
+  <machine name='pc-i440fx-2.4' alias='pc' maxCpus='255'/>
+  <machine name='pc-1.3' maxCpus='255'/>
+  <machine name='pc-0.12' maxCpus='255'/>
+  <machine name='pc-q35-1.6' maxCpus='255'/>
+  <machine name='pc-q35-1.5' maxCpus='255'/>
+  <machine name='pc-i440fx-1.6' maxCpus='255'/>
+  <machine name='pc-q35-2.2' maxCpus='255'/>
+  <machine name='pc-i440fx-1.7' maxCpus='255'/>
+  <machine name='pc-q35-2.1' maxCpus='255'/>
+  <machine name='pc-0.11' maxCpus='255'/>
+  <machine name='pc-0.10' maxCpus='255'/>
+  <machine name='pc-i440fx-2.2' maxCpus='255'/>
+  <machine name='pc-1.2' maxCpus='255'/>
+  <machine name='isapc' maxCpus='1'/>
+  <machine name='pc-i440fx-2.3' maxCpus='255'/>
+  <machine name='pc-q35-1.4' maxCpus='255'/>
+  <machine name='pc-0.15' maxCpus='255'/>
+  <machine name='pc-i440fx-1.5' maxCpus='255'/>
+  <machine name='pc-q35-2.0' maxCpus='255'/>
+  <machine name='pc-i440fx-1.4' maxCpus='255'/>
+  <machine name='pc-0.14' maxCpus='255'/>
+  <machine name='pc-1.1' maxCpus='255'/>
+  <machine name='pc-i440fx-2.1' maxCpus='255'/>
+  <machine name='pc-q35-1.7' maxCpus='255'/>
+  <machine name='pc-1.0' maxCpus='255'/>
+  <machine name='pc-i440fx-2.0' maxCpus='255'/>
+  <machine name='pc-q35-2.4' alias='q35' maxCpus='255'/>
+  <machine name='pc-q35-2.3' maxCpus='255'/>
+  <machine name='pc-0.13' maxCpus='255'/>
+</qemuCaps>

diff --git a/tests/qemucapabilitiesdata/caps_2.6.0-1.x86_64.caps b/tests/qemucapabilitiesdata/caps_2.6.0-1.x86_64.caps
deleted file mode 100644 (file)
index 9024d63..0000000
--- a/tests/qemucapabilitiesdata/caps_2.6.0-1.x86_64.caps
+++ /dev/null
@@ -1,251 +0,0 @@
-<qemuCaps>
-  <qemuctime>0</qemuctime>
-  <selfctime>0</selfctime>
-  <selfvers>0</selfvers>
-  <usedQMP/>
-  <flag name='mem-path'/>
-  <flag name='drive-serial'/>
-  <flag name='chardev'/>
-  <flag name='enable-kvm'/>
-  <flag name='monitor-json'/>
-  <flag name='device'/>
-  <flag name='sdl'/>
-  <flag name='smp-topology'/>
-  <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='drive-readonly'/>
-  <flag name='smbios-type'/>
-  <flag name='vga-qxl'/>
-  <flag name='spice'/>
-  <flag name='vga-none'/>
-  <flag name='boot-index'/>
-  <flag name='hda-duplex'/>
-  <flag name='drive-aio'/>
-  <flag name='pci-multibus'/>
-  <flag name='pci-bootindex'/>
-  <flag name='ccid-passthru'/>
-  <flag name='chardev-spicevmc'/>
-  <flag name='virtio-tx-alg'/>
-  <flag name='device-qxl-vga'/>
-  <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='rombar'/>
-  <flag name='ich9-ahci'/>
-  <flag name='no-acpi'/>
-  <flag name='fsdev-readonly'/>
-  <flag name='virtio-blk-pci.scsi'/>
-  <flag name='blk-sg-io'/>
-  <flag name='drive-copy-on-read'/>
-  <flag name='cpu-host'/>
-  <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='reboot-timeout'/>
-  <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='device-video-primary'/>
-  <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='tpm-passthrough'/>
-  <flag name='tpm-tis'/>
-  <flag name='pci-bridge'/>
-  <flag name='vfio-pci'/>
-  <flag name='vfio-pci.bootindex'/>
-  <flag name='scsi-generic'/>
-  <flag name='scsi-generic.bootindex'/>
-  <flag name='mem-merge'/>
-  <flag name='vnc-websocket'/>
-  <flag name='drive-discard'/>
-  <flag name='mlock'/>
-  <flag name='vnc-share-policy'/>
-  <flag name='device-del-event'/>
-  <flag name='dmi-to-pci-bridge'/>
-  <flag name='i440fx-pci-hole64-size'/>
-  <flag name='q35-pci-hole64-size'/>
-  <flag name='usb-storage'/>
-  <flag name='usb-storage.removable'/>
-  <flag name='virtio-mmio'/>
-  <flag name='ich9-intel-hda'/>
-  <flag name='kvm-pit-lost-tick-policy'/>
-  <flag name='boot-strict'/>
-  <flag name='pvpanic'/>
-  <flag name='spice-file-xfer-disable'/>
-  <flag name='spiceport'/>
-  <flag name='usb-kbd'/>
-  <flag name='host-pci-multidomain'/>
-  <flag name='msg-timestamp'/>
-  <flag name='active-commit'/>
-  <flag name='change-backing-file'/>
-  <flag name='memory-backend-ram'/>
-  <flag name='numa'/>
-  <flag name='memory-backend-file'/>
-  <flag name='usb-audio'/>
-  <flag name='rtc-reset-reinjection'/>
-  <flag name='splash-timeout'/>
-  <flag name='iothread'/>
-  <flag name='migrate-rdma'/>
-  <flag name='ivshmem'/>
-  <flag name='drive-iotune-max'/>
-  <flag name='VGA.vgamem_mb'/>
-  <flag name='vmware-svga.vgamem_mb'/>
-  <flag name='qxl.vgamem_mb'/>
-  <flag name='qxl-vga.vgamem_mb'/>
-  <flag name='pc-dimm'/>
-  <flag name='machine-vmport-opt'/>
-  <flag name='pci-serial'/>
-  <flag name='vhost-user-multiqueue'/>
-  <flag name='migration-event'/>
-  <flag name='ioh3420'/>
-  <flag name='x3130-upstream'/>
-  <flag name='xio3130-downstream'/>
-  <flag name='rtl8139'/>
-  <flag name='e1000'/>
-  <flag name='virtio-net'/>
-  <flag name='gic-version'/>
-  <flag name='incoming-defer'/>
-  <flag name='virtio-gpu'/>
-  <flag name='virtio-gpu.virgl'/>
-  <flag name='virtio-keyboard'/>
-  <flag name='virtio-mouse'/>
-  <flag name='virtio-tablet'/>
-  <flag name='virtio-input-host'/>
-  <flag name='chardev-file-append'/>
-  <flag name='ich9-disable-s3'/>
-  <flag name='ich9-disable-s4'/>
-  <flag name='vserport-change-event'/>
-  <flag name='virtio-balloon-pci.deflate-on-oom'/>
-  <flag name='spice-gl'/>
-  <flag name='qxl.vram64_size_mb'/>
-  <flag name='qxl-vga.vram64_size_mb'/>
-  <flag name='debug-threads'/>
-  <flag name='secret'/>
-  <flag name='pxb'/>
-  <flag name='pxb-pcie'/>
-  <flag name='device-tray-moved-event'/>
-  <flag name='nec-usb-xhci-ports'/>
-  <flag name='virtio-scsi-pci.iothread'/>
-  <version>2005050</version>
-  <kvmVersion>0</kvmVersion>
-  <package></package>
-  <arch>x86_64</arch>
-  <cpu name='Opteron_G5'/>
-  <cpu name='Opteron_G4'/>
-  <cpu name='Opteron_G3'/>
-  <cpu name='Opteron_G2'/>
-  <cpu name='Opteron_G1'/>
-  <cpu name='Broadwell'/>
-  <cpu name='Broadwell-noTSX'/>
-  <cpu name='Haswell'/>
-  <cpu name='Haswell-noTSX'/>
-  <cpu name='IvyBridge'/>
-  <cpu name='SandyBridge'/>
-  <cpu name='Westmere'/>
-  <cpu name='Nehalem'/>
-  <cpu name='Penryn'/>
-  <cpu name='Conroe'/>
-  <cpu name='n270'/>
-  <cpu name='athlon'/>
-  <cpu name='pentium3'/>
-  <cpu name='pentium2'/>
-  <cpu name='pentium'/>
-  <cpu name='486'/>
-  <cpu name='coreduo'/>
-  <cpu name='kvm32'/>
-  <cpu name='qemu32'/>
-  <cpu name='kvm64'/>
-  <cpu name='core2duo'/>
-  <cpu name='phenom'/>
-  <cpu name='qemu64'/>
-  <machine name='pc-i440fx-2.4' alias='pc' maxCpus='255'/>
-  <machine name='pc-1.3' maxCpus='255'/>
-  <machine name='pc-0.12' maxCpus='255'/>
-  <machine name='pc-q35-1.6' maxCpus='255'/>
-  <machine name='pc-q35-1.5' maxCpus='255'/>
-  <machine name='pc-i440fx-1.6' maxCpus='255'/>
-  <machine name='pc-q35-2.2' maxCpus='255'/>
-  <machine name='pc-i440fx-1.7' maxCpus='255'/>
-  <machine name='pc-q35-2.1' maxCpus='255'/>
-  <machine name='pc-0.11' maxCpus='255'/>
-  <machine name='pc-0.10' maxCpus='255'/>
-  <machine name='pc-i440fx-2.2' maxCpus='255'/>
-  <machine name='pc-1.2' maxCpus='255'/>
-  <machine name='isapc' maxCpus='1'/>
-  <machine name='pc-i440fx-2.3' maxCpus='255'/>
-  <machine name='pc-q35-1.4' maxCpus='255'/>
-  <machine name='pc-0.15' maxCpus='255'/>
-  <machine name='pc-i440fx-1.5' maxCpus='255'/>
-  <machine name='pc-q35-2.0' maxCpus='255'/>
-  <machine name='pc-i440fx-1.4' maxCpus='255'/>
-  <machine name='pc-0.14' maxCpus='255'/>
-  <machine name='pc-1.1' maxCpus='255'/>
-  <machine name='pc-i440fx-2.1' maxCpus='255'/>
-  <machine name='pc-q35-1.7' maxCpus='255'/>
-  <machine name='pc-1.0' maxCpus='255'/>
-  <machine name='pc-i440fx-2.0' maxCpus='255'/>
-  <machine name='pc-q35-2.4' alias='q35' maxCpus='255'/>
-  <machine name='pc-q35-2.3' maxCpus='255'/>
-  <machine name='pc-0.13' maxCpus='255'/>
-</qemuCaps>

diff --git a/tests/qemucapabilitiesdata/caps_2.6.0-1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0-1.x86_64.xml
new file mode 100644 (file)
index 0000000..9024d63
--- /dev/null
+++ b/tests/qemucapabilitiesdata/caps_2.6.0-1.x86_64.xml
@@ -0,0 +1,251 @@
+<qemuCaps>
+  <qemuctime>0</qemuctime>
+  <selfctime>0</selfctime>
+  <selfvers>0</selfvers>
+  <usedQMP/>
+  <flag name='mem-path'/>
+  <flag name='drive-serial'/>
+  <flag name='chardev'/>
+  <flag name='enable-kvm'/>
+  <flag name='monitor-json'/>
+  <flag name='device'/>
+  <flag name='sdl'/>
+  <flag name='smp-topology'/>
+  <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='drive-readonly'/>
+  <flag name='smbios-type'/>
+  <flag name='vga-qxl'/>
+  <flag name='spice'/>
+  <flag name='vga-none'/>
+  <flag name='boot-index'/>
+  <flag name='hda-duplex'/>
+  <flag name='drive-aio'/>
+  <flag name='pci-multibus'/>
+  <flag name='pci-bootindex'/>
+  <flag name='ccid-passthru'/>
+  <flag name='chardev-spicevmc'/>
+  <flag name='virtio-tx-alg'/>
+  <flag name='device-qxl-vga'/>
+  <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='rombar'/>
+  <flag name='ich9-ahci'/>
+  <flag name='no-acpi'/>
+  <flag name='fsdev-readonly'/>
+  <flag name='virtio-blk-pci.scsi'/>
+  <flag name='blk-sg-io'/>
+  <flag name='drive-copy-on-read'/>
+  <flag name='cpu-host'/>
+  <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='reboot-timeout'/>
+  <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='device-video-primary'/>
+  <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='tpm-passthrough'/>
+  <flag name='tpm-tis'/>
+  <flag name='pci-bridge'/>
+  <flag name='vfio-pci'/>
+  <flag name='vfio-pci.bootindex'/>
+  <flag name='scsi-generic'/>
+  <flag name='scsi-generic.bootindex'/>
+  <flag name='mem-merge'/>
+  <flag name='vnc-websocket'/>
+  <flag name='drive-discard'/>
+  <flag name='mlock'/>
+  <flag name='vnc-share-policy'/>
+  <flag name='device-del-event'/>
+  <flag name='dmi-to-pci-bridge'/>
+  <flag name='i440fx-pci-hole64-size'/>
+  <flag name='q35-pci-hole64-size'/>
+  <flag name='usb-storage'/>
+  <flag name='usb-storage.removable'/>
+  <flag name='virtio-mmio'/>
+  <flag name='ich9-intel-hda'/>
+  <flag name='kvm-pit-lost-tick-policy'/>
+  <flag name='boot-strict'/>
+  <flag name='pvpanic'/>
+  <flag name='spice-file-xfer-disable'/>
+  <flag name='spiceport'/>
+  <flag name='usb-kbd'/>
+  <flag name='host-pci-multidomain'/>
+  <flag name='msg-timestamp'/>
+  <flag name='active-commit'/>
+  <flag name='change-backing-file'/>
+  <flag name='memory-backend-ram'/>
+  <flag name='numa'/>
+  <flag name='memory-backend-file'/>
+  <flag name='usb-audio'/>
+  <flag name='rtc-reset-reinjection'/>
+  <flag name='splash-timeout'/>
+  <flag name='iothread'/>
+  <flag name='migrate-rdma'/>
+  <flag name='ivshmem'/>
+  <flag name='drive-iotune-max'/>
+  <flag name='VGA.vgamem_mb'/>
+  <flag name='vmware-svga.vgamem_mb'/>
+  <flag name='qxl.vgamem_mb'/>
+  <flag name='qxl-vga.vgamem_mb'/>
+  <flag name='pc-dimm'/>
+  <flag name='machine-vmport-opt'/>
+  <flag name='pci-serial'/>
+  <flag name='vhost-user-multiqueue'/>
+  <flag name='migration-event'/>
+  <flag name='ioh3420'/>
+  <flag name='x3130-upstream'/>
+  <flag name='xio3130-downstream'/>
+  <flag name='rtl8139'/>
+  <flag name='e1000'/>
+  <flag name='virtio-net'/>
+  <flag name='gic-version'/>
+  <flag name='incoming-defer'/>
+  <flag name='virtio-gpu'/>
+  <flag name='virtio-gpu.virgl'/>
+  <flag name='virtio-keyboard'/>
+  <flag name='virtio-mouse'/>
+  <flag name='virtio-tablet'/>
+  <flag name='virtio-input-host'/>
+  <flag name='chardev-file-append'/>
+  <flag name='ich9-disable-s3'/>
+  <flag name='ich9-disable-s4'/>
+  <flag name='vserport-change-event'/>
+  <flag name='virtio-balloon-pci.deflate-on-oom'/>
+  <flag name='spice-gl'/>
+  <flag name='qxl.vram64_size_mb'/>
+  <flag name='qxl-vga.vram64_size_mb'/>
+  <flag name='debug-threads'/>
+  <flag name='secret'/>
+  <flag name='pxb'/>
+  <flag name='pxb-pcie'/>
+  <flag name='device-tray-moved-event'/>
+  <flag name='nec-usb-xhci-ports'/>
+  <flag name='virtio-scsi-pci.iothread'/>
+  <version>2005050</version>
+  <kvmVersion>0</kvmVersion>
+  <package></package>
+  <arch>x86_64</arch>
+  <cpu name='Opteron_G5'/>
+  <cpu name='Opteron_G4'/>
+  <cpu name='Opteron_G3'/>
+  <cpu name='Opteron_G2'/>
+  <cpu name='Opteron_G1'/>
+  <cpu name='Broadwell'/>
+  <cpu name='Broadwell-noTSX'/>
+  <cpu name='Haswell'/>
+  <cpu name='Haswell-noTSX'/>
+  <cpu name='IvyBridge'/>
+  <cpu name='SandyBridge'/>
+  <cpu name='Westmere'/>
+  <cpu name='Nehalem'/>
+  <cpu name='Penryn'/>
+  <cpu name='Conroe'/>
+  <cpu name='n270'/>
+  <cpu name='athlon'/>
+  <cpu name='pentium3'/>
+  <cpu name='pentium2'/>
+  <cpu name='pentium'/>
+  <cpu name='486'/>
+  <cpu name='coreduo'/>
+  <cpu name='kvm32'/>
+  <cpu name='qemu32'/>
+  <cpu name='kvm64'/>
+  <cpu name='core2duo'/>
+  <cpu name='phenom'/>
+  <cpu name='qemu64'/>
+  <machine name='pc-i440fx-2.4' alias='pc' maxCpus='255'/>
+  <machine name='pc-1.3' maxCpus='255'/>
+  <machine name='pc-0.12' maxCpus='255'/>
+  <machine name='pc-q35-1.6' maxCpus='255'/>
+  <machine name='pc-q35-1.5' maxCpus='255'/>
+  <machine name='pc-i440fx-1.6' maxCpus='255'/>
+  <machine name='pc-q35-2.2' maxCpus='255'/>
+  <machine name='pc-i440fx-1.7' maxCpus='255'/>
+  <machine name='pc-q35-2.1' maxCpus='255'/>
+  <machine name='pc-0.11' maxCpus='255'/>
+  <machine name='pc-0.10' maxCpus='255'/>
+  <machine name='pc-i440fx-2.2' maxCpus='255'/>
+  <machine name='pc-1.2' maxCpus='255'/>
+  <machine name='isapc' maxCpus='1'/>
+  <machine name='pc-i440fx-2.3' maxCpus='255'/>
+  <machine name='pc-q35-1.4' maxCpus='255'/>
+  <machine name='pc-0.15' maxCpus='255'/>
+  <machine name='pc-i440fx-1.5' maxCpus='255'/>
+  <machine name='pc-q35-2.0' maxCpus='255'/>
+  <machine name='pc-i440fx-1.4' maxCpus='255'/>
+  <machine name='pc-0.14' maxCpus='255'/>
+  <machine name='pc-1.1' maxCpus='255'/>
+  <machine name='pc-i440fx-2.1' maxCpus='255'/>
+  <machine name='pc-q35-1.7' maxCpus='255'/>
+  <machine name='pc-1.0' maxCpus='255'/>
+  <machine name='pc-i440fx-2.0' maxCpus='255'/>
+  <machine name='pc-q35-2.4' alias='q35' maxCpus='255'/>
+  <machine name='pc-q35-2.3' maxCpus='255'/>
+  <machine name='pc-0.13' maxCpus='255'/>
+</qemuCaps>

diff --git a/tests/qemucapabilitiestest.c b/tests/qemucapabilitiestest.c
index 8b73a8910ae661e320d916c429bc44234c328706..b8f931af576066cd80069593df9c1bb3147c0728 100644 (file)
--- a/tests/qemucapabilitiestest.c
+++ b/tests/qemucapabilitiestest.c
@@ -100,7 +100,7 @@ testQemuCaps(const void *opaque)
 
     if (virAsprintf(&repliesFile, "%s/qemucapabilitiesdata/%s.%s.replies",
                     abs_srcdir, data->base, data->archName) < 0 ||
-        virAsprintf(&capsFile, "%s/qemucapabilitiesdata/%s.%s.caps",
+        virAsprintf(&capsFile, "%s/qemucapabilitiesdata/%s.%s.xml",
                     abs_srcdir, data->base, data->archName) < 0)
         goto cleanup;