[qemu-s390x] 'make check-unit' breakage on s390x host

[Cornelia Huck]

I just noticed a breakage with 'make check-unit' when running on an
s390x host (on my laptop, it runs fine; haven't tried other
architectures). This happens with current master, but I managed to
track the original breakage down to

commit ff3dc8fefe953fd3650279e064bf63b212c5699a
Author: Daniel P. Berrangé <address@hidden>
Date:   Wed Mar 13 17:36:18 2019 +0000

    filemon: ensure watch IDs are unique to QFileMonitor scope
    
    The watch IDs are mistakenly only unique within the scope of the
    directory being monitored. This is not useful for clients which are
    monitoring multiple directories. They require watch IDs to be unique
    globally within the QFileMonitor scope.
    
    Reviewed-by: Marc-André Lureau <address@hidden>
    Tested-by: Bandan Das <address@hidden>
    Reviewed-by: Bandan Das <address@hidden>
    Signed-off-by: Daniel P. Berrangé <address@hidden>

On that commit, make check-unit fails with

  TEST    check-unit: tests/test-util-filemonitor
Expected watch id 4 but got 0
**
ERROR:/root/git/qemu/tests/test-util-filemonitor.c:651:test_file_monitor_events:
 assertion failed: (err == 0)
ERROR - Bail out! 
ERROR:/root/git/qemu/tests/test-util-filemonitor.c:651:test_file_monitor_events:
 assertion failed: (err == 0)
make: *** [/root/git/qemu/tests/Makefile.include:908: check-unit] Error 1

(I usually run as root on that box and as a normal user on my laptop;
not sure if that makes a difference.)

On master, the failure looks a bit different, but it's probably the
same issue:

  TEST    check-unit: tests/test-util-filemonitor
Expected watch id 200000000 but got 100000000
**
ERROR:/root/git/qemu/tests/test-util-filemonitor.c:665:test_file_monitor_events:
 assertion failed: (err == 0)
ERROR - Bail out! 
ERROR:/root/git/qemu/tests/test-util-filemonitor.c:665:test_file_monitor_events:
 assertion failed: (err == 0)
make: *** [/root/git/qemu/tests/Makefile.include:904: check-unit] Error 1

Fedora 29, QEMU built with '/root/git/qemu/build/../configure'
'--target-list=s390x-softmmu x86_64-softmmu' '--enable-kvm'
'--enable-linux-aio' '--enable-virtfs' '--enable-trace-backends=simple'
'--python=/usr/bin/python3'

I can try to collect extra info if you tell me what would be helpful.