[PATCH libvirt v2] tests: Add capabilities for QEMU 6.0.0 on s390x

[Andrea Bolognani]

On Tue, May 18, 2021 at 03:53:09PM +0200, Shalini Chellathurai Saroja wrote:
> Introduce replies and xml files for QEMU 6.0.0 on s390x.
>
> Signed-off-by: Shalini Chellathurai Saroja <shalini at linux.ibm.com>
> ---
> The replies file is removed from this patch and is available in
> https://gitlab.com/shalinichellathurai/libvirt/-/commit/3fb78dee79a668cae084d4a6d6ed2aa096e25004
>
>  tests/domaincapsdata/qemu_6.0.0.s390x.xml     |   238 +
>  .../caps_6.0.0.s390x.replies                  | 27223 ++++++++++++++++
>  .../qemucapabilitiesdata/caps_6.0.0.s390x.xml |  3305 ++
>  ...default-video-type-s390x.s390x-latest.args |     6 +-
>  .../disk-error-policy-s390x.s390x-latest.args |     4 +-
>  .../fs9p-ccw.s390x-latest.args                |     4 +-
>  ...tdev-subsys-mdev-vfio-ap.s390x-latest.args |     4 +-
>  ...ubsys-mdev-vfio-ccw-boot.s390x-latest.args |     4 +-
>  ...othreads-virtio-scsi-ccw.s390x-latest.args |     8 +-
>  ...t-cpu-kvm-ccw-virtio-2.7.s390x-latest.args |     4 +-
>  ...t-cpu-kvm-ccw-virtio-4.2.s390x-latest.args |     6 +-
>  ...t-cpu-tcg-ccw-virtio-2.7.s390x-latest.args |     4 +-
>  ...t-cpu-tcg-ccw-virtio-4.2.s390x-latest.args |     4 +-
>  .../s390x-ccw-graphics.s390x-latest.args      |     6 +-
>  .../s390x-ccw-headless.s390x-latest.args      |     6 +-
>  .../vhost-vsock-ccw-auto.s390x-latest.args    |     4 +-
>  .../vhost-vsock-ccw-iommu.s390x-latest.args   |     4 +-
>  .../vhost-vsock-ccw.s390x-latest.args         |     4 +-
>  18 files changed, 30802 insertions(+), 36 deletions(-)
>  create mode 100644 tests/domaincapsdata/qemu_6.0.0.s390x.xml
>  create mode 100644 tests/qemucapabilitiesdata/caps_6.0.0.s390x.replies
>  create mode 100644 tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml

Looks great now, thanks!

After rebasing on top of master, domaincapstest was failing so I ran

  $ VIR_TEST_REGENERATE_OUTPUT=1 meson test

and squashed in the resulting diff, which you can see below.

With that taken care of,

  Reviewed-by: Andrea Bolognani <abologna at redhat.com>

and pushed.


diff --git a/tests/domaincapsdata/qemu_6.0.0.s390x.xml
b/tests/domaincapsdata/qemu_6.0.0.s390x.xml
index 00b8f2c9c5..d384f0859b 100644
--- a/tests/domaincapsdata/qemu_6.0.0.s390x.xml
+++ b/tests/domaincapsdata/qemu_6.0.0.s390x.xml
@@ -226,6 +226,13 @@
         <value>builtin</value>
       </enum>
     </rng>
+    <filesystem supported='yes'>
+      <enum name='driverType'>
+        <value>path</value>
+        <value>handle</value>
+        <value>virtiofs</value>
+      </enum>
+    </filesystem>
   </devices>
   <features>
     <gic supported='no'/>
-- 
Andrea Bolognani / Red Hat / Virtualization