diff --git a/tests/domaincapsschemadata/qemu_2.7.0.s390x.xml b/tests/domaincapsschemadata/qemu_2.7.0.s390x.xml
new file mode 100644
index 0000000000..999e2795d8
--- /dev/null
+++ b/tests/domaincapsschemadata/qemu_2.7.0.s390x.xml
@@ -0,0 +1,78 @@
+
+ /usr/bin/qemu-system-s390x
+ kvm
+ s390-ccw-virtio-2.7
+ s390x
+
+
+
+ /usr/share/AAVMF/AAVMF_CODE.fd
+ /usr/share/OVMF/OVMF_CODE.fd
+
+ rom
+ pflash
+
+
+ yes
+ no
+
+
+
+
+
+
+
+
+
+
+
+ disk
+ cdrom
+ floppy
+ lun
+
+
+ ide
+ fdc
+ scsi
+ virtio
+
+
+
+
+ sdl
+ vnc
+
+
+
+
+
+ subsystem
+
+
+ default
+ mandatory
+ requisite
+ optional
+
+
+ usb
+ pci
+ scsi
+
+
+
+ default
+ kvm
+ vfio
+
+
+
+
+
+
+
diff --git a/tests/domaincapsschemadata/qemu_2.8.0.s390x.xml b/tests/domaincapsschemadata/qemu_2.8.0.s390x.xml
new file mode 100644
index 0000000000..92946f4549
--- /dev/null
+++ b/tests/domaincapsschemadata/qemu_2.8.0.s390x.xml
@@ -0,0 +1,142 @@
+
+ /usr/bin/qemu-system-s390x
+ kvm
+ s390-ccw-virtio-2.8
+ s390x
+
+
+
+ /usr/share/AAVMF/AAVMF_CODE.fd
+ /usr/share/OVMF/OVMF_CODE.fd
+
+ rom
+ pflash
+
+
+ yes
+ no
+
+
+
+
+
+
+
+ z10EC-base
+ z9EC-base
+ z196.2-base
+ z900-base
+ z990
+ z900.2-base
+ z900.3
+ z114
+ z890-base
+ z13.2-base
+ zEC12.2
+ z900.2
+ z10BC
+ z10BC.2
+ z196
+ z9EC
+ z990-base
+ z10EC.3
+ z900
+ z9EC.3-base
+ z990.5-base
+ z10EC.2
+ z9BC.2
+ z10EC
+ z990.3-base
+ z13s
+ z10EC.3-base
+ zEC12.2-base
+ z890.3-base
+ z9EC.3
+ z990.5
+ z13
+ z13s-base
+ z9EC.2
+ z990.4
+ zEC12-base
+ z9EC.2-base
+ zBC12
+ z196.2
+ z990.3
+ z990.2-base
+ z900.3-base
+ z890.3
+ z10EC.2-base
+ z990.2
+ z890.2
+ zBC12-base
+ z800-base
+ zEC12
+ z9BC.2-base
+ z9BC
+ z10BC.2-base
+ z990.4-base
+ qemu
+ z10BC-base
+ z9BC-base
+ z800
+ z890.2-base
+ z13.2
+ z114-base
+ z196-base
+ z13-base
+ z890
+
+
+
+
+
+ disk
+ cdrom
+ floppy
+ lun
+
+
+ ide
+ fdc
+ scsi
+ virtio
+
+
+
+
+ sdl
+ vnc
+
+
+
+
+
+ subsystem
+
+
+ default
+ mandatory
+ requisite
+ optional
+
+
+ usb
+ pci
+ scsi
+
+
+
+ default
+ kvm
+ vfio
+
+
+
+
+
+
+
diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c
index fea5120072..28d8609ac4 100644
--- a/tests/domaincapstest.c
+++ b/tests/domaincapstest.c
@@ -134,6 +134,12 @@ static virCPUDef x86Cpu = {
NULL, 0, NULL, 1, 1, 1, 0, 0, NULL,
};
+static virCPUDef s390Cpu = {
+ VIR_CPU_TYPE_HOST, 0, 0,
+ VIR_ARCH_S390X, NULL,
+ NULL, 0, NULL, 1, 1, 1, 0, 0, NULL,
+};
+
static int
fakeHostCPU(virCapsPtr caps,
virArch arch)
@@ -153,6 +159,10 @@ fakeHostCPU(virCapsPtr caps,
cpu = &x86Cpu;
break;
+ case VIR_ARCH_S390X:
+ cpu = &s390Cpu;
+ break;
+
default:
virReportError(VIR_ERR_INTERNAL_ERROR,
"cannot fake host CPU for arch %s",
@@ -443,6 +453,14 @@ mymain(void)
"/usr/bin/qemu-system-x86_64", NULL,
"x86_64", VIR_DOMAIN_VIRT_QEMU);
+ DO_TEST_QEMU("2.7.0", "caps_2.7.0",
+ "/usr/bin/qemu-system-s390x", NULL,
+ "s390x", VIR_DOMAIN_VIRT_KVM);
+
+ DO_TEST_QEMU("2.8.0", "caps_2.8.0",
+ "/usr/bin/qemu-system-s390x", NULL,
+ "s390x", VIR_DOMAIN_VIRT_KVM);
+
#endif /* WITH_QEMU */
#if WITH_LIBXL