Re: [DRAFT PATCH 000/143] Meson integration for 5.2

[Paolo Bonzini]

On 10/08/20 12:04, Cornelia Huck wrote:
> 'make check' is unhappy, however:
> 
> Running test qtest-s390x: device-introspect-test
> missing object type 'virtio-gpu-device'
> Broken pipe
> ../tests/qtest/libqtest.c:175: kill_qemu() detected QEMU death from signal 6 
> (Aborted) (core dumped)
> ERROR qtest-s390x: device-introspect-test - too few tests run (expected 6, 
> got 5)

It could be an unnecessary dependency on virgl that was detected by the GitLab 
CI:

diff --git a/hw/display/meson.build b/hw/display/meson.build
index ffcccc0..fa4f806 100644
--- a/hw/display/meson.build
+++ b/hw/display/meson.build
@@ -77,7 +77,7 @@ if config_all_devices.has_key('CONFIG_VIRTIO_GPU')
   #hw_display_modules += [[ 'virtio-gpu', virtio_gpu.sources(), [pixman, 
virgl],
   #                         ['CONFIG_VIRTIO_GPU']]]
 
-  softmmu_ss.add_all(when: [pixman, virgl, 'CONFIG_VIRTIO_GPU'],
+  softmmu_ss.add_all(when: [pixman, 'CONFIG_VIRTIO_GPU'],
                      if_true: virtio_gpu_ss)
 endif
 

In any case I'll post another version today or tomorrow.  (I decided to bite the
bullet, include the unit tests conversion and get rid of more Makefile gunk).

Paolo