On 5/12/21 6:11 PM, Andrea Bolognani wrote: > On Mon, May 10, 2021 at 01:39:07PM +0200, Shalini Chellathurai Saroja wrote: >> Add replies and xml files for QEMU 6.0.0 on s390x. >> >> Signed-off-by: Shalini Chellathurai Saroja<shal...@linux.ibm.com> >> Reviewed-by: Bjoern Walk<bw...@linux.ibm.com> >> Reviewed-by: Boris Fiuczynski<fiu...@linux.ibm.com> >> --- >> The replies file is removed from this patch and is available in >> https://gitlab.com/shalinichellathurai/libvirt/-/commit/ad5883c66c80e9945be67f936e3d86ee2d107701 >> >> tests/domaincapsdata/qemu_6.0.0.s390x.xml | 238 + >> .../caps_6.0.0.s390x.replies | 27084 ++++++++++++++++ >> .../qemucapabilitiesdata/caps_6.0.0.s390x.xml | 3304 ++ >> ...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, 30662 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 > > Overall looks reasonable, but comparing the computed capabilities > with those for QEMU 5.2 highlights a couple of changes that I'm not > so sure about, specifically > > --- tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml 2021-05-12 > 10:52:29.826021415 +0200 > +++ tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml 2021-05-12 > 17:39:47.778445212 +0200 > @@ -87,7 +87,6 @@ > <flag name='disk-share-rw'/> > <flag name='iscsi.password-secret'/> > <flag name='dump-completed'/> > - <flag name='virtio-gpu-ccw'/> > @@ -115,7 +114,6 @@ > <flag name='iothread.poll-max-ns'/> > <flag name='egl-headless.rendernode'/> > <flag name='memory-backend-file.align'/> > - <flag name='memory-backend-file.pmem'/> > > Because of the former I would expect the s390x-ccw-graphics xml2argv > test to fail, but it looks like we don't do a good job at validating > the <video> element and that QEMU_CAPS_DEVICE_VIRTIO_GPU_CCW in > particular is completely unused. > > As for the latter there doesn't seem to be any test coverage outside > of x86_64, so perhaps it would be a good idea to look into that? >
pmem was reported by QEMU even if it was later denied. This was fixed by: https://gitlab.com/qemu-project/qemu/-/commit/def835f0da0d153b397071e6bb8f2b46f51f96b4 qemu.git $ git describe --contains def835f0da0d153b397071e6bb8f2b46f51f96b4 v6.0.0-rc0~77^2 And it's the same story with virtio-gpu-ccw: https://gitlab.com/qemu-project/qemu/-/commit/adcf33a504de29feb720736051dc32889314c9e6 qemu.git $ git describe --contains adcf33a504de29feb720736051dc32889314c9e6 v6.0.0-rc1~5^2~1 To me patch looks good. Michal
