Monday, 6 November
2017
Mon, 6 Nov
'17
7:26 a.m.
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
.../caps_2.10.0-gicv2.aarch64.replies | 16535 +++++++++++++++++++
.../caps_2.10.0-gicv2.aarch64.xml | 303 +
tests/qemucapabilitiestest.c | 1 +
3 files changed, 16839 insertions(+)
create mode 100644 tests/qemucapabilitiesdata/caps_2.10.0-gicv2.aarch64.replies
create mode 100644 tests/qemucapabilitiesdata/caps_2.10.0-gicv2.aarch64.xml
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0-gicv2.aarch64.replies
b/tests/qemucapabilitiesdata/caps_2.10.0-gicv2.aarch64.replies
new file mode 100644
index 000000000..410270284
--- /dev/null
+++ b/tests/qemucapabilitiesdata/caps_2.10.0-gicv2.aarch64.replies
@@ -0,0 +1,16535 @@
+{
+ "QMP": {
+ "version": {
+ "qemu": {
+ "micro": 0,
+ "minor": 10,
+ "major": 2
+ },
+ "package": " (v2.10.0)"
+ },
+ "capabilities": [
+ ]
+ }
+}
+
+{
+ "return": {
+ },
+ "id": "libvirt-1"
+}
+
+{
+ "return": {
+ "qemu": {
+ "micro": 0,
+ "minor": 10,
+ "major": 2
+ },
+ "package": " (v2.10.0)"
+ },
+ "id": "libvirt-2"
+}
+
+{
+ "return": {
+ "arch": "aarch64"
+ },
+ "id": "libvirt-3"
+}
[REDACTED]
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0-gicv2.aarch64.xml
b/tests/qemucapabilitiesdata/caps_2.10.0-gicv2.aarch64.xml
new file mode 100644
index 000000000..9f9dceb68
--- /dev/null
+++ b/tests/qemucapabilitiesdata/caps_2.10.0-gicv2.aarch64.xml
@@ -0,0 +1,303 @@
+<qemuCaps>
+ <qemuctime>0</qemuctime>
+ <selfctime>0</selfctime>
+ <selfvers>0</selfvers>
+ <usedQMP/>
+ <flag name='kvm'/>
+ <flag name='mem-path'/>
+ <flag name='drive-serial'/>
+ <flag name='monitor-json'/>
+ <flag name='sdl'/>
+ <flag name='netdev'/>
+ <flag name='rtc'/>
+ <flag name='vhost-net'/>
+ <flag name='nodefconfig'/>
+ <flag name='boot-menu'/>
+ <flag name='fsdev'/>
+ <flag name='name-process'/>
+ <flag name='smbios-type'/>
+ <flag name='vga-none'/>
+ <flag name='boot-index'/>
+ <flag name='hda-duplex'/>
+ <flag name='drive-aio'/>
+ <flag name='chardev-spicevmc'/>
+ <flag name='virtio-tx-alg'/>
+ <flag name='pci-multifunction'/>
+ <flag name='virtio-blk-pci.ioeventfd'/>
+ <flag name='virtio-blk-pci.event_idx'/>
+ <flag name='virtio-net-pci.event_idx'/>
+ <flag name='cache-directsync'/>
+ <flag name='piix3-usb-uhci'/>
+ <flag name='piix4-usb-uhci'/>
+ <flag name='usb-ehci'/>
+ <flag name='ich9-usb-ehci1'/>
+ <flag name='vt82c686b-usb-uhci'/>
+ <flag name='pci-ohci'/>
+ <flag name='usb-hub'/>
+ <flag name='no-shutdown'/>
+ <flag name='cache-unsafe'/>
+ <flag name='ich9-ahci'/>
+ <flag name='no-acpi'/>
+ <flag name='fsdev-readonly'/>
+ <flag name='virtio-blk-pci.scsi'/>
+ <flag name='drive-copy-on-read'/>
+ <flag name='fsdev-writeout'/>
+ <flag name='drive-iotune'/>
+ <flag name='system_wakeup'/>
+ <flag name='scsi-disk.channel'/>
+ <flag name='scsi-block'/>
+ <flag name='transaction'/>
+ <flag name='block-job-async'/>
+ <flag name='scsi-cd'/>
+ <flag name='ide-cd'/>
+ <flag name='no-user-config'/>
+ <flag name='hda-micro'/>
+ <flag name='dump-guest-memory'/>
+ <flag name='nec-usb-xhci'/>
+ <flag name='balloon-event'/>
+ <flag name='bridge'/>
+ <flag name='lsi'/>
+ <flag name='virtio-scsi-pci'/>
+ <flag name='blockio'/>
+ <flag name='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='VGA'/>
+ <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='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='virtio-mmio'/>
+ <flag name='ich9-intel-hda'/>
+ <flag name='boot-strict'/>
+ <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='splash-timeout'/>
+ <flag name='iothread'/>
+ <flag name='migrate-rdma'/>
+ <flag name='ivshmem'/>
+ <flag name='drive-iotune-max'/>
+ <flag name='VGA.vgamem_mb'/>
+ <flag name='machine-vmport-opt'/>
+ <flag name='aes-key-wrap'/>
+ <flag name='dea-key-wrap'/>
+ <flag name='pci-serial'/>
+ <flag name='aarch64-off'/>
+ <flag name='vhost-user-multiqueue'/>
+ <flag name='migration-event'/>
+ <flag name='gpex-pcihost'/>
+ <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-keyboard'/>
+ <flag name='virtio-mouse'/>
+ <flag name='virtio-tablet'/>
+ <flag name='virtio-input-host'/>
+ <flag name='chardev-file-append'/>
+ <flag name='vserport-change-event'/>
+ <flag name='virtio-balloon-pci.deflate-on-oom'/>
+ <flag name='mptsas1068'/>
+ <flag name='chardev-logfile'/>
+ <flag name='debug-threads'/>
+ <flag name='secret'/>
+ <flag name='device-tray-moved-event'/>
+ <flag name='nec-usb-xhci-ports'/>
+ <flag name='virtio-scsi-pci.iothread'/>
+ <flag name='name-guest'/>
+ <flag name='drive-detect-zeroes'/>
+ <flag name='tls-creds-x509'/>
+ <flag name='display'/>
+ <flag name='smm'/>
+ <flag name='virtio-pci-disable-legacy'/>
+ <flag name='query-hotpluggable-cpus'/>
+ <flag name='virtio-net.rx_queue_size'/>
+ <flag name='drive-iotune-max-length'/>
+ <flag name='ivshmem-plain'/>
+ <flag name='ivshmem-doorbell'/>
+ <flag name='query-qmp-schema'/>
+ <flag name='gluster.debug_level'/>
+ <flag name='vhost-scsi'/>
+ <flag name='drive-iotune-group'/>
+ <flag name='virtio-net.host_mtu'/>
+ <flag name='pcie-root-port'/>
+ <flag name='query-cpu-definitions'/>
+ <flag name='block-write-threshold'/>
+ <flag name='query-named-block-nodes'/>
+ <flag name='qemu-xhci'/>
+ <flag name='kernel-irqchip'/>
+ <flag name='kernel-irqchip.split'/>
+ <flag name='virtio.iommu_platform'/>
+ <flag name='virtio.ats'/>
+ <flag name='loadparm'/>
+ <flag name='vnc-multi-servers'/>
+ <flag name='virtio-net.tx_queue_size'/>
+ <flag name='chardev-reconnect'/>
+ <flag name='virtio-gpu.max_outputs'/>
+ <flag name='vxhs'/>
+ <flag name='virtio-blk.num-queues'/>
+ <version>2010000</version>
+ <kvmVersion>0</kvmVersion>
+ <package> (v2.10.0)</package>
+ <arch>aarch64</arch>
+ <cpu type='kvm' name='pxa262'/>
+ <cpu type='kvm' name='pxa270-a0'/>
+ <cpu type='kvm' name='arm1136'/>
+ <cpu type='kvm' name='cortex-a15'/>
+ <cpu type='kvm' name='pxa260'/>
+ <cpu type='kvm' name='arm1136-r2'/>
+ <cpu type='kvm' name='pxa261'/>
+ <cpu type='kvm' name='pxa255'/>
+ <cpu type='kvm' name='arm926'/>
+ <cpu type='kvm' name='arm11mpcore'/>
+ <cpu type='kvm' name='pxa250'/>
+ <cpu type='kvm' name='ti925t'/>
+ <cpu type='kvm' name='cortex-a57'/>
+ <cpu type='kvm' name='sa1110'/>
+ <cpu type='kvm' name='arm1176'/>
+ <cpu type='kvm' name='cortex-a53'/>
+ <cpu type='kvm' name='host'/>
+ <cpu type='kvm' name='sa1100'/>
+ <cpu type='kvm' name='pxa270-c5'/>
+ <cpu type='kvm' name='cortex-a9'/>
+ <cpu type='kvm' name='cortex-a8'/>
+ <cpu type='kvm' name='pxa270-c0'/>
+ <cpu type='kvm' name='cortex-a7'/>
+ <cpu type='kvm' name='arm1026'/>
+ <cpu type='kvm' name='pxa270-b1'/>
+ <cpu type='kvm' name='cortex-m3'/>
+ <cpu type='kvm' name='cortex-m4'/>
+ <cpu type='kvm' name='pxa270-b0'/>
+ <cpu type='kvm' name='arm946'/>
+ <cpu type='kvm' name='cortex-r5'/>
+ <cpu type='kvm' name='pxa270-a1'/>
+ <cpu type='kvm' name='pxa270'/>
+ <cpu type='tcg' name='pxa262'/>
+ <cpu type='tcg' name='pxa270-a0'/>
+ <cpu type='tcg' name='arm1136'/>
+ <cpu type='tcg' name='cortex-a15'/>
+ <cpu type='tcg' name='pxa260'/>
+ <cpu type='tcg' name='arm1136-r2'/>
+ <cpu type='tcg' name='pxa261'/>
+ <cpu type='tcg' name='pxa255'/>
+ <cpu type='tcg' name='arm926'/>
+ <cpu type='tcg' name='arm11mpcore'/>
+ <cpu type='tcg' name='pxa250'/>
+ <cpu type='tcg' name='ti925t'/>
+ <cpu type='tcg' name='cortex-a57'/>
+ <cpu type='tcg' name='sa1110'/>
+ <cpu type='tcg' name='arm1176'/>
+ <cpu type='tcg' name='cortex-a53'/>
+ <cpu type='tcg' name='sa1100'/>
+ <cpu type='tcg' name='pxa270-c5'/>
+ <cpu type='tcg' name='cortex-a9'/>
+ <cpu type='tcg' name='cortex-a8'/>
+ <cpu type='tcg' name='pxa270-c0'/>
+ <cpu type='tcg' name='cortex-a7'/>
+ <cpu type='tcg' name='arm1026'/>
+ <cpu type='tcg' name='pxa270-b1'/>
+ <cpu type='tcg' name='cortex-m3'/>
+ <cpu type='tcg' name='cortex-m4'/>
+ <cpu type='tcg' name='pxa270-b0'/>
+ <cpu type='tcg' name='arm946'/>
+ <cpu type='tcg' name='cortex-r5'/>
+ <cpu type='tcg' name='pxa270-a1'/>
+ <cpu type='tcg' name='pxa270'/>
+ <machine name='integratorcp' maxCpus='1'/>
+ <machine name='nuri' maxCpus='2'/>
+ <machine name='mps2-an511' maxCpus='1'/>
+ <machine name='verdex' maxCpus='1'/>
+ <machine name='ast2500-evb' maxCpus='1'/>
+ <machine name='smdkc210' maxCpus='2'/>
+ <machine name='collie' maxCpus='1'/>
+ <machine name='imx25-pdk' maxCpus='1'/>
+ <machine name='spitz' maxCpus='1'/>
+ <machine name='realview-pbx-a9' maxCpus='4'/>
+ <machine name='realview-eb' maxCpus='1'/>
+ <machine name='versatilepb' maxCpus='1'/>
+ <machine name='realview-pb-a8' maxCpus='1'/>
+ <machine name='virt-2.9' maxCpus='255'/>
+ <machine name='musicpal' maxCpus='1'/>
+ <machine name='z2' maxCpus='1'/>
+ <machine name='akita' maxCpus='1'/>
+ <machine name='virt-2.7' maxCpus='255'/>
+ <machine name='kzm' maxCpus='1'/>
+ <machine name='virt-2.8' maxCpus='255'/>
+ <machine name='realview-eb-mpcore' maxCpus='4'/>
+ <machine name='sx1' maxCpus='1'/>
+ <machine name='sx1-v1' maxCpus='1'/>
+ <machine name='virt-2.6' maxCpus='255'/>
+ <machine name='cubieboard' maxCpus='1'/>
+ <machine name='highbank' maxCpus='4'/>
+ <machine name='raspi2' maxCpus='4'/>
+ <machine name='netduino2' maxCpus='1'/>
+ <machine name='terrier' maxCpus='1'/>
+ <machine name='n810' maxCpus='1'/>
+ <machine name='mainstone' maxCpus='1'/>
+ <machine name='palmetto-bmc' maxCpus='1'/>
+ <machine name='sabrelite' maxCpus='4'/>
+ <machine name='midway' maxCpus='4'/>
+ <machine name='romulus-bmc' maxCpus='1'/>
+ <machine name='cheetah' maxCpus='1'/>
+ <machine name='tosa' maxCpus='1'/>
+ <machine name='borzoi' maxCpus='1'/>
+ <machine name='versatileab' maxCpus='1'/>
+ <machine name='lm3s6965evb' maxCpus='1'/>
+ <machine name='n800' maxCpus='1'/>
+ <machine name='virt-2.10' alias='virt' maxCpus='255'/>
+ <machine name='connex' maxCpus='1'/>
+ <machine name='xilinx-zynq-a9' maxCpus='1'/>
+ <machine name='xlnx-ep108' maxCpus='1'/>
+ <machine name='mps2-an385' maxCpus='1'/>
+ <machine name='vexpress-a9' maxCpus='4'/>
+ <machine name='vexpress-a15' maxCpus='4'/>
+ <machine name='xlnx-zcu102' maxCpus='1'/>
+ <machine name='canon-a1100' maxCpus='1'/>
+ <machine name='lm3s811evb' maxCpus='1'/>
+ <gic version='3' kernel='no' emulated='yes'/>
+ <gic version='2' kernel='yes' emulated='yes'/>
+</qemuCaps>
diff --git a/tests/qemucapabilitiestest.c b/tests/qemucapabilitiestest.c
index d32a5c2fa..40de8f54c 100644
--- a/tests/qemucapabilitiestest.c
+++ b/tests/qemucapabilitiestest.c
@@ -173,6 +173,7 @@ mymain(void)
DO_TEST("x86_64", "caps_2.10.0");
DO_TEST("aarch64", "caps_2.6.0-gicv2");
DO_TEST("aarch64", "caps_2.6.0-gicv3");
+ DO_TEST("aarch64", "caps_2.10.0-gicv2");
DO_TEST("ppc64le", "caps_2.6.0");
DO_TEST("ppc64le", "caps_2.9.0");
DO_TEST("s390x", "caps_2.7.0");
--
2.13.6