From efc29ab2e530e431cc0f958430189d42e493df9d Mon Sep 17 00:00:00 2001
From: Boris Fiuczynski <fiuczy@linux.ibm.com>
Date: Thu, 20 Sep 2018 12:20:57 +0200
Subject: [PATCH] tests: domaincaps: Add QEMU 3.0 for s390x

Signed-off-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
---
 .../domaincapsschemadata/qemu_3.0.0.s390x.xml | 183 ++++++++++++++++++
 tests/domaincapstest.c                        |   4 +
 2 files changed, 187 insertions(+)
 create mode 100644 tests/domaincapsschemadata/qemu_3.0.0.s390x.xml

diff --git a/tests/domaincapsschemadata/qemu_3.0.0.s390x.xml b/tests/domaincapsschemadata/qemu_3.0.0.s390x.xml
new file mode 100644
index 0000000000..97231e044f
--- /dev/null
+++ b/tests/domaincapsschemadata/qemu_3.0.0.s390x.xml
@@ -0,0 +1,183 @@
+<domainCapabilities>
+  <path>/usr/bin/qemu-system-s390x</path>
+  <domain>kvm</domain>
+  <machine>s390-ccw-virtio-3.0</machine>
+  <arch>s390x</arch>
+  <vcpu max='248'/>
+  <iothreads supported='yes'/>
+  <os supported='yes'>
+    <loader supported='yes'>
+      <value>/usr/share/AAVMF/AAVMF_CODE.fd</value>
+      <value>/usr/share/AAVMF/AAVMF32_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>
+  <cpu>
+    <mode name='host-passthrough' supported='yes'/>
+    <mode name='host-model' supported='yes'>
+      <model fallback='forbid'>z14-base</model>
+      <feature policy='require' name='aen'/>
+      <feature policy='require' name='cmmnt'/>
+      <feature policy='require' name='aefsi'/>
+      <feature policy='require' name='mepoch'/>
+      <feature policy='require' name='msa8'/>
+      <feature policy='require' name='msa7'/>
+      <feature policy='require' name='msa6'/>
+      <feature policy='require' name='msa5'/>
+      <feature policy='require' name='msa4'/>
+      <feature policy='require' name='msa3'/>
+      <feature policy='require' name='msa2'/>
+      <feature policy='require' name='msa1'/>
+      <feature policy='require' name='sthyi'/>
+      <feature policy='require' name='edat'/>
+      <feature policy='require' name='ri'/>
+      <feature policy='require' name='edat2'/>
+      <feature policy='require' name='vx'/>
+      <feature policy='require' name='ipter'/>
+      <feature policy='require' name='mepochptff'/>
+      <feature policy='require' name='vxeh'/>
+      <feature policy='require' name='vxpd'/>
+      <feature policy='require' name='esop'/>
+      <feature policy='require' name='iep'/>
+      <feature policy='require' name='cte'/>
+      <feature policy='require' name='bpb'/>
+      <feature policy='require' name='gs'/>
+      <feature policy='require' name='ppa15'/>
+      <feature policy='require' name='zpci'/>
+      <feature policy='require' name='sea_esop2'/>
+      <feature policy='require' name='te'/>
+      <feature policy='require' name='cmm'/>
+    </mode>
+    <mode name='custom' supported='yes'>
+      <model usable='yes'>z890.2</model>
+      <model usable='yes'>z990.4</model>
+      <model usable='yes'>z14ZR1</model>
+      <model usable='yes'>z10BC.2</model>
+      <model usable='yes'>z196.2</model>
+      <model usable='yes'>z14</model>
+      <model usable='yes'>z9BC-base</model>
+      <model usable='yes'>zEC12-base</model>
+      <model usable='yes'>z196-base</model>
+      <model usable='yes'>z13-base</model>
+      <model usable='yes'>z990.3</model>
+      <model usable='yes'>z9EC</model>
+      <model usable='yes'>zBC12</model>
+      <model usable='yes'>z9EC.3</model>
+      <model usable='yes'>z196.2-base</model>
+      <model usable='no'>qemu</model>
+      <model usable='yes'>zEC12.2-base</model>
+      <model usable='yes'>z800-base</model>
+      <model usable='yes'>z9EC.2</model>
+      <model usable='yes'>z900.2-base</model>
+      <model usable='yes'>z14ZR1-base</model>
+      <model usable='yes'>z900.3</model>
+      <model usable='yes'>z890-base</model>
+      <model usable='yes'>z890</model>
+      <model usable='yes'>z990.4-base</model>
+      <model usable='yes'>z10BC.2-base</model>
+      <model usable='yes'>z900.2</model>
+      <model usable='yes'>z9BC.2-base</model>
+      <model usable='yes'>z800</model>
+      <model usable='yes'>z114</model>
+      <model usable='yes'>z13</model>
+      <model usable='yes'>z13s-base</model>
+      <model usable='yes'>z990</model>
+      <model usable='yes'>z990.2</model>
+      <model usable='yes'>z14-base</model>
+      <model usable='yes'>z890.2-base</model>
+      <model usable='yes'>z196</model>
+      <model usable='yes'>z10EC</model>
+      <model usable='yes'>z13s</model>
+      <model usable='yes'>z900</model>
+      <model usable='yes'>z10EC.3</model>
+      <model usable='yes'>z10EC.2-base</model>
+      <model usable='yes'>z114-base</model>
+      <model usable='yes'>z990.2-base</model>
+      <model usable='yes'>z9EC.2-base</model>
+      <model usable='yes'>z890.3</model>
+      <model usable='yes'>z900.3-base</model>
+      <model usable='yes'>z9BC.2</model>
+      <model usable='yes'>z10BC</model>
+      <model usable='yes'>z990.5</model>
+      <model usable='yes'>zEC12.2</model>
+      <model usable='yes'>z10EC-base</model>
+      <model usable='yes'>z9EC-base</model>
+      <model usable='yes'>z9EC.3-base</model>
+      <model usable='yes'>zEC12</model>
+      <model usable='yes'>z990.5-base</model>
+      <model usable='yes'>z10BC-base</model>
+      <model usable='yes'>z900-base</model>
+      <model usable='yes'>z13.2</model>
+      <model usable='yes'>zBC12-base</model>
+      <model usable='yes'>z13.2-base</model>
+      <model usable='yes'>z890.3-base</model>
+      <model usable='yes'>z990-base</model>
+      <model usable='yes'>z10EC.2</model>
+      <model usable='yes'>z9BC</model>
+      <model usable='yes'>z10EC.3-base</model>
+      <model usable='yes'>z990.3-base</model>
+    </mode>
+  </cpu>
+  <devices>
+    <disk supported='yes'>
+      <enum name='diskDevice'>
+        <value>disk</value>
+        <value>cdrom</value>
+        <value>floppy</value>
+        <value>lun</value>
+      </enum>
+      <enum name='bus'>
+        <value>fdc</value>
+        <value>scsi</value>
+        <value>virtio</value>
+      </enum>
+    </disk>
+    <graphics supported='yes'>
+      <enum name='type'>
+        <value>sdl</value>
+        <value>vnc</value>
+      </enum>
+    </graphics>
+    <video supported='yes'>
+      <enum name='modelType'>
+        <value>virtio</value>
+      </enum>
+    </video>
+    <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'/>
+    <vmcoreinfo supported='no'/>
+    <genid supported='no'/>
+    <sev supported='no'/>
+  </features>
+</domainCapabilities>
diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c
index 85431e397a..7df1739d81 100644
--- a/tests/domaincapstest.c
+++ b/tests/domaincapstest.c
@@ -503,6 +503,10 @@ mymain(void)
                  "/usr/bin/qemu-system-s390x", NULL,
                  "s390x", VIR_DOMAIN_VIRT_KVM);
 
+    DO_TEST_QEMU("3.0.0", "caps_3.0.0",
+                 "/usr/bin/qemu-system-s390x", NULL,
+                 "s390x", VIR_DOMAIN_VIRT_KVM);
+
     virObjectUnref(cfg);
 
 #endif /* WITH_QEMU */
-- 
GitLab