From 3957dd1acfcefd2b9da19e62c383f3acaa738d49 Mon Sep 17 00:00:00 2001
From: Jiri Denemark <jdenemar@redhat.com>
Date: Thu, 28 Apr 2016 14:24:51 +0200
Subject: [PATCH] domaincapstest: Add tests for QEMU 2.6
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
---
.../domaincaps-qemu_2.6.0-1.xml | 63 +++++++++++++++++
.../domaincaps-qemu_2.6.0-2.xml | 63 +++++++++++++++++
.../domaincaps-qemu_2.6.0-3.xml | 67 +++++++++++++++++++
.../domaincaps-qemu_2.6.0-4.xml | 67 +++++++++++++++++++
.../domaincaps-qemu_2.6.0-5.xml | 61 +++++++++++++++++
tests/domaincapstest.c | 20 ++++++
6 files changed, 341 insertions(+)
create mode 100644 tests/domaincapsschemadata/domaincaps-qemu_2.6.0-1.xml
create mode 100644 tests/domaincapsschemadata/domaincaps-qemu_2.6.0-2.xml
create mode 100644 tests/domaincapsschemadata/domaincaps-qemu_2.6.0-3.xml
create mode 100644 tests/domaincapsschemadata/domaincaps-qemu_2.6.0-4.xml
create mode 100644 tests/domaincapsschemadata/domaincaps-qemu_2.6.0-5.xml
diff --git a/tests/domaincapsschemadata/domaincaps-qemu_2.6.0-1.xml b/tests/domaincapsschemadata/domaincaps-qemu_2.6.0-1.xml
new file mode 100644
index 0000000000..244700a1e1
--- /dev/null
+++ b/tests/domaincapsschemadata/domaincaps-qemu_2.6.0-1.xml
@@ -0,0 +1,63 @@
+<domainCapabilities>
+ <path>/usr/bin/qemu-system-x86_64</path>
+ <domain>kvm</domain>
+ <machine>pc-i440fx-2.4</machine>
+ <arch>x86_64</arch>
+ <vcpu max='255'/>
+ <os supported='yes'>
+ <loader supported='yes'>
+ <value>/usr/share/AAVMF/AAVMF_CODE.fd</value>
+ <value>/usr/share/OVMF/OVMF_CODE.fd</value>
+ <enum name='type'>
+ <value>rom</value>
+ <value>pflash</value>
+ </enum>
+ <enum name='readonly'>
+ <value>yes</value>
+ <value>no</value>
+ </enum>
+ </loader>
+ </os>
+ <devices>
+ <disk supported='yes'>
+ <enum name='diskDevice'>
+ <value>disk</value>
+ <value>cdrom</value>
+ <value>floppy</value>
+ <value>lun</value>
+ </enum>
+ <enum name='bus'>
+ <value>ide</value>
+ <value>fdc</value>
+ <value>scsi</value>
+ <value>virtio</value>
+ <value>usb</value>
+ </enum>
+ </disk>
+ <hostdev supported='yes'>
+ <enum name='mode'>
+ <value>subsystem</value>
+ </enum>
+ <enum name='startupPolicy'>
+ <value>default</value>
+ <value>mandatory</value>
+ <value>requisite</value>
+ <value>optional</value>
+ </enum>
+ <enum name='subsysType'>
+ <value>usb</value>
+ <value>pci</value>
+ <value>scsi</value>
+ </enum>
+ <enum name='capsType'/>
+ <enum name='pciBackend'>
+ <value>default</value>
+ <value>kvm</value>
+ <value>vfio</value>
+ </enum>
+ </hostdev>
+ </devices>
+ <features>
+ <gic supported='no'/>
+ </features>
+</domainCapabilities>
diff --git a/tests/domaincapsschemadata/domaincaps-qemu_2.6.0-2.xml b/tests/domaincapsschemadata/domaincaps-qemu_2.6.0-2.xml
new file mode 100644
index 0000000000..411c6b7a0b
--- /dev/null
+++ b/tests/domaincapsschemadata/domaincaps-qemu_2.6.0-2.xml
@@ -0,0 +1,63 @@
+<domainCapabilities>
+ <path>/usr/bin/qemu-system-aarch64</path>
+ <domain>kvm</domain>
+ <machine>integratorcp</machine>
+ <arch>aarch64</arch>
+ <vcpu max='1'/>
+ <os supported='yes'>
+ <loader supported='yes'>
+ <value>/usr/share/AAVMF/AAVMF_CODE.fd</value>
+ <value>/usr/share/OVMF/OVMF_CODE.fd</value>
+ <enum name='type'>
+ <value>rom</value>
+ <value>pflash</value>
+ </enum>
+ <enum name='readonly'>
+ <value>yes</value>
+ <value>no</value>
+ </enum>
+ </loader>
+ </os>
+ <devices>
+ <disk supported='yes'>
+ <enum name='diskDevice'>
+ <value>disk</value>
+ <value>cdrom</value>
+ <value>floppy</value>
+ <value>lun</value>
+ </enum>
+ <enum name='bus'>
+ <value>ide</value>
+ <value>fdc</value>
+ <value>scsi</value>
+ <value>virtio</value>
+ <value>usb</value>
+ </enum>
+ </disk>
+ <hostdev supported='yes'>
+ <enum name='mode'>
+ <value>subsystem</value>
+ </enum>
+ <enum name='startupPolicy'>
+ <value>default</value>
+ <value>mandatory</value>
+ <value>requisite</value>
+ <value>optional</value>
+ </enum>
+ <enum name='subsysType'>
+ <value>usb</value>
+ <value>pci</value>
+ <value>scsi</value>
+ </enum>
+ <enum name='capsType'/>
+ <enum name='pciBackend'>
+ <value>default</value>
+ <value>kvm</value>
+ <value>vfio</value>
+ </enum>
+ </hostdev>
+ </devices>
+ <features>
+ <gic supported='no'/>
+ </features>
+</domainCapabilities>
diff --git a/tests/domaincapsschemadata/domaincaps-qemu_2.6.0-3.xml b/tests/domaincapsschemadata/domaincaps-qemu_2.6.0-3.xml
new file mode 100644
index 0000000000..21c59a89f5
--- /dev/null
+++ b/tests/domaincapsschemadata/domaincaps-qemu_2.6.0-3.xml
@@ -0,0 +1,67 @@
+<domainCapabilities>
+ <path>/usr/bin/qemu-system-aarch64</path>
+ <domain>kvm</domain>
+ <machine>virt-2.6</machine>
+ <arch>aarch64</arch>
+ <vcpu max='255'/>
+ <os supported='yes'>
+ <loader supported='yes'>
+ <value>/usr/share/AAVMF/AAVMF_CODE.fd</value>
+ <value>/usr/share/OVMF/OVMF_CODE.fd</value>
+ <enum name='type'>
+ <value>rom</value>
+ <value>pflash</value>
+ </enum>
+ <enum name='readonly'>
+ <value>yes</value>
+ <value>no</value>
+ </enum>
+ </loader>
+ </os>
+ <devices>
+ <disk supported='yes'>
+ <enum name='diskDevice'>
+ <value>disk</value>
+ <value>cdrom</value>
+ <value>floppy</value>
+ <value>lun</value>
+ </enum>
+ <enum name='bus'>
+ <value>ide</value>
+ <value>fdc</value>
+ <value>scsi</value>
+ <value>virtio</value>
+ <value>usb</value>
+ </enum>
+ </disk>
+ <hostdev supported='yes'>
+ <enum name='mode'>
+ <value>subsystem</value>
+ </enum>
+ <enum name='startupPolicy'>
+ <value>default</value>
+ <value>mandatory</value>
+ <value>requisite</value>
+ <value>optional</value>
+ </enum>
+ <enum name='subsysType'>
+ <value>usb</value>
+ <value>pci</value>
+ <value>scsi</value>
+ </enum>
+ <enum name='capsType'/>
+ <enum name='pciBackend'>
+ <value>default</value>
+ <value>kvm</value>
+ <value>vfio</value>
+ </enum>
+ </hostdev>
+ </devices>
+ <features>
+ <gic supported='yes'>
+ <enum name='version'>
+ <value>2</value>
+ </enum>
+ </gic>
+ </features>
+</domainCapabilities>
diff --git a/tests/domaincapsschemadata/domaincaps-qemu_2.6.0-4.xml b/tests/domaincapsschemadata/domaincaps-qemu_2.6.0-4.xml
new file mode 100644
index 0000000000..c972d5eea4
--- /dev/null
+++ b/tests/domaincapsschemadata/domaincaps-qemu_2.6.0-4.xml
@@ -0,0 +1,67 @@
+<domainCapabilities>
+ <path>/usr/bin/qemu-system-aarch64</path>
+ <domain>kvm</domain>
+ <machine>virt-2.6</machine>
+ <arch>aarch64</arch>
+ <vcpu max='255'/>
+ <os supported='yes'>
+ <loader supported='yes'>
+ <value>/usr/share/AAVMF/AAVMF_CODE.fd</value>
+ <value>/usr/share/OVMF/OVMF_CODE.fd</value>
+ <enum name='type'>
+ <value>rom</value>
+ <value>pflash</value>
+ </enum>
+ <enum name='readonly'>
+ <value>yes</value>
+ <value>no</value>
+ </enum>
+ </loader>
+ </os>
+ <devices>
+ <disk supported='yes'>
+ <enum name='diskDevice'>
+ <value>disk</value>
+ <value>cdrom</value>
+ <value>floppy</value>
+ <value>lun</value>
+ </enum>
+ <enum name='bus'>
+ <value>ide</value>
+ <value>fdc</value>
+ <value>scsi</value>
+ <value>virtio</value>
+ <value>usb</value>
+ </enum>
+ </disk>
+ <hostdev supported='yes'>
+ <enum name='mode'>
+ <value>subsystem</value>
+ </enum>
+ <enum name='startupPolicy'>
+ <value>default</value>
+ <value>mandatory</value>
+ <value>requisite</value>
+ <value>optional</value>
+ </enum>
+ <enum name='subsysType'>
+ <value>usb</value>
+ <value>pci</value>
+ <value>scsi</value>
+ </enum>
+ <enum name='capsType'/>
+ <enum name='pciBackend'>
+ <value>default</value>
+ <value>kvm</value>
+ <value>vfio</value>
+ </enum>
+ </hostdev>
+ </devices>
+ <features>
+ <gic supported='yes'>
+ <enum name='version'>
+ <value>3</value>
+ </enum>
+ </gic>
+ </features>
+</domainCapabilities>
diff --git a/tests/domaincapsschemadata/domaincaps-qemu_2.6.0-5.xml b/tests/domaincapsschemadata/domaincaps-qemu_2.6.0-5.xml
new file mode 100644
index 0000000000..e4b8c3a0b9
--- /dev/null
+++ b/tests/domaincapsschemadata/domaincaps-qemu_2.6.0-5.xml
@@ -0,0 +1,61 @@
+<domainCapabilities>
+ <path>/usr/bin/qemu-system-ppc64</path>
+ <domain>kvm</domain>
+ <machine>pseries-2.6</machine>
+ <arch>ppc64le</arch>
+ <vcpu max='255'/>
+ <os supported='yes'>
+ <loader supported='yes'>
+ <value>/usr/share/AAVMF/AAVMF_CODE.fd</value>
+ <value>/usr/share/OVMF/OVMF_CODE.fd</value>
+ <enum name='type'>
+ <value>rom</value>
+ <value>pflash</value>
+ </enum>
+ <enum name='readonly'>
+ <value>yes</value>
+ <value>no</value>
+ </enum>
+ </loader>
+ </os>
+ <devices>
+ <disk supported='yes'>
+ <enum name='diskDevice'>
+ <value>disk</value>
+ <value>cdrom</value>
+ <value>lun</value>
+ </enum>
+ <enum name='bus'>
+ <value>ide</value>
+ <value>scsi</value>
+ <value>virtio</value>
+ <value>usb</value>
+ </enum>
+ </disk>
+ <hostdev supported='yes'>
+ <enum name='mode'>
+ <value>subsystem</value>
+ </enum>
+ <enum name='startupPolicy'>
+ <value>default</value>
+ <value>mandatory</value>
+ <value>requisite</value>
+ <value>optional</value>
+ </enum>
+ <enum name='subsysType'>
+ <value>usb</value>
+ <value>pci</value>
+ <value>scsi</value>
+ </enum>
+ <enum name='capsType'/>
+ <enum name='pciBackend'>
+ <value>default</value>
+ <value>kvm</value>
+ <value>vfio</value>
+ </enum>
+ </hostdev>
+ </devices>
+ <features>
+ <gic supported='no'/>
+ </features>
+</domainCapabilities>
diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c
index d9d110a932..ee78555363 100644
--- a/tests/domaincapstest.c
+++ b/tests/domaincapstest.c
@@ -272,6 +272,26 @@ mymain(void)
"/usr/bin/qemu-system-x86_64", NULL,
VIR_ARCH_X86_64, VIR_DOMAIN_VIRT_KVM);
+ DO_TEST_QEMU("qemu_2.6.0-1", "caps_2.6.0-1",
+ "/usr/bin/qemu-system-x86_64", NULL,
+ VIR_ARCH_X86_64, VIR_DOMAIN_VIRT_KVM);
+
+ DO_TEST_QEMU("qemu_2.6.0-2", "caps_2.6.0-1",
+ "/usr/bin/qemu-system-aarch64", NULL,
+ VIR_ARCH_AARCH64, VIR_DOMAIN_VIRT_KVM);
+
+ DO_TEST_QEMU("qemu_2.6.0-3", "caps_2.6.0-1",
+ "/usr/bin/qemu-system-aarch64", "virt",
+ VIR_ARCH_AARCH64, VIR_DOMAIN_VIRT_KVM);
+
+ DO_TEST_QEMU("qemu_2.6.0-4", "caps_2.6.0-2",
+ "/usr/bin/qemu-system-aarch64", "virt",
+ VIR_ARCH_AARCH64, VIR_DOMAIN_VIRT_KVM);
+
+ DO_TEST_QEMU("qemu_2.6.0-5", "caps_2.6.0-1",
+ "/usr/bin/qemu-system-ppc64", NULL,
+ VIR_ARCH_PPC64LE, VIR_DOMAIN_VIRT_KVM);
+
#endif /* WITH_QEMU */
return ret;
--
GitLab