[Qemu-commits] [qemu/qemu] 908437: tests/docker: add python3-setuptools the docker im...

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 90843750e375f7c6701c8797ae04c14fad44fe89
      
https://github.com/qemu/qemu/commit/90843750e375f7c6701c8797ae04c14fad44fe89
  Author: Alex Bennée <alex.bennee@linaro.org>
  Date:   2020-09-06 (Sun, 06 Sep 2020)

  Changed paths:
    M tests/docker/dockerfiles/debian10.docker
    M tests/docker/dockerfiles/debian9.docker

  Log Message:
  -----------
  tests/docker: add python3-setuptools the docker images

We need these now for builds to work.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20200903112107.27367-4-alex.bennee@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: fec7bcf16b1b77d648b23d7832a39aef9f11aea0
      
https://github.com/qemu/qemu/commit/fec7bcf16b1b77d648b23d7832a39aef9f11aea0
  Author: Yonggang Luo <luoyonggang@gmail.com>
  Date:   2020-09-06 (Sun, 06 Sep 2020)

  Changed paths:
    M tests/test-replication.c

  Log Message:
  -----------
  tests: handling signal on win32 properly

SIGABRT should use signal(SIGABRT, sigabrt_handler) to handle on win32

The error:
E:/CI-Cor-Ready/xemu/qemu.org/tests/test-replication.c:559:33: error: invalid 
use of undefined type 'struct sigaction'
  559 |     sigact = (struct sigaction) {
      |                                 ^

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Message-Id: <20200902170054.810-6-luoyonggang@gmail.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: 85c93c57f162e47025441ce39e2aadd0c1e0914f
      
https://github.com/qemu/qemu/commit/85c93c57f162e47025441ce39e2aadd0c1e0914f
  Author: Yonggang Luo <luoyonggang@gmail.com>
  Date:   2020-09-07 (Mon, 07 Sep 2020)

  Changed paths:
    M tests/test-vmstate.c

  Log Message:
  -----------
  tests: fixes test-vmstate.c compile error on msys2

../tests/test-vmstate.c: In function 'int_cmp':
../tests/test-vmstate.c:884:5: error: unknown type name 'uint'; did you mean 
'uInt'?
  884 |     uint ua = GPOINTER_TO_UINT(a);
      |     ^~~~
      |     uInt
../tests/test-vmstate.c:885:5: error: unknown type name 'uint'; did you mean 
'uInt'?
  885 |     uint ub = GPOINTER_TO_UINT(b);
      |     ^~~~
      |     uInt
make: *** [Makefile.ninja:5461：tests/test-vmstate.exe.p/test-vmstate.c.obj] 错误 1

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Message-Id: <20200905063813.1875-1-luoyonggang@gmail.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: 0fdc1f2f5e0998f7daf49a8ead5a2007822c64be
      
https://github.com/qemu/qemu/commit/0fdc1f2f5e0998f7daf49a8ead5a2007822c64be
  Author: Yonggang Luo <luoyonggang@gmail.com>
  Date:   2020-09-07 (Mon, 07 Sep 2020)

  Changed paths:
    M tests/test-util-filemonitor.c

  Log Message:
  -----------
  tests: Fixes building test-util-filemonitor.c on msys2/mingw

Fixes the following compiling error:
../tests/test-util-filemonitor.c: In function 'test_file_monitor_events':
../tests/test-util-filemonitor.c:620:17: error: too many arguments to function 
'mkdir'
  620 |             if (mkdir(pathsrc, 0700) < 0) {
      |                 ^~~~~
In file included from 
C:/CI-Tools/msys64/mingw64/x86_64-w64-mingw32/include/unistd.h:10,
                 from C:/work/xemu/qemu/include/qemu/osdep.h:93,
                 from ../tests/test-util-filemonitor.c:21:
C:/CI-Tools/msys64/mingw64/x86_64-w64-mingw32/include/io.h:282:15: note: 
declared here
  282 |   int __cdecl mkdir (const char *) __MINGW_ATTRIB_DEPRECATED_MSVC2005;
      |               ^~~~~

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Message-Id: <20200905203425.1470-1-luoyonggang@gmail.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: ce4e510ac721fa3a48603e777700aef375f85c26
      
https://github.com/qemu/qemu/commit/ce4e510ac721fa3a48603e777700aef375f85c26
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2020-09-07 (Mon, 07 Sep 2020)

  Changed paths:
    M tests/Makefile.include

  Log Message:
  -----------
  tests/Makefile: test-image-locking needs CONFIG_POSIX

test-image-locking.c uses the qemu_lock_fd_test() function which is
only available on POSIX-like systems.

Message-Id: <20200804170055.2851-4-thuth@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Message-Id: <20200823111757.72002-4-thuth@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: d3dd34a1e5e1341167a0d3a1d35eda85f47f52d8
      
https://github.com/qemu/qemu/commit/d3dd34a1e5e1341167a0d3a1d35eda85f47f52d8
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2020-09-07 (Mon, 07 Sep 2020)

  Changed paths:
    M tests/docker/dockerfiles/debian-win64-cross.docker

  Log Message:
  -----------
  dockerfiles/debian-win64-cross: Download WHPX MinGW headers

To compile-test the WHPX accelerator, we need to download these system
headers first (they are unfortunately not part of any released and
packaged MinGW toolchain yet).

Idea taken from another patch by Stefan Weil.

Message-Id: <20200804170055.2851-12-thuth@redhat.com>
Message-Id: <20200823111757.72002-6-thuth@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: e7a222aeb813a06076f5a7b6c56c1b7301b40712
      
https://github.com/qemu/qemu/commit/e7a222aeb813a06076f5a7b6c56c1b7301b40712
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2020-09-07 (Mon, 07 Sep 2020)

  Changed paths:
    M configure

  Log Message:
  -----------
  configure: Allow automatic WHPX detection

The whpx variable is currently initialized to "no" which causes the WHPX
check to skip the detection unless the user specified --enable-whpx.
Since the detection code should be able to figure it out correctly, let's
initialized the variable to "" on MinGW-builds for proper auto-detection
instead.

Message-Id: <20200804170055.2851-11-thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Stefan Weil <sw@weilnetz.de>
Message-Id: <20200823111757.72002-7-thuth@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: b0476d6602adbf818132dc896b585e01f47eaf96
      
https://github.com/qemu/qemu/commit/b0476d6602adbf818132dc896b585e01f47eaf96
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2020-09-07 (Mon, 07 Sep 2020)

  Changed paths:
    M stubs/cpu-get-icount.c
    M stubs/meson.build
    R stubs/notify-event.c
    A stubs/qemu-timer-notify-cb.c

  Log Message:
  -----------
  stubs: Move qemu_timer_notify_cb() and remove qemu_notify_event() stub

When cross-compiling with MinGW, there are sometimes some weird linker
errors like:

ibqemuutil.a(util_main-loop.c.obj): In function `qemu_notify_event':
/builds/huth/qemu/build/../util/main-loop.c:139: multiple definition of
 `qemu_notify_event'
libqemuutil.a(stubs_notify-event.c.obj):/builds/huth/qemu/stubs/notify-event.c:5:
 first defined here
collect2: error: ld returned 1 exit status
/builds/huth/qemu/rules.mak:88: recipe for target 'tests/test-timed-average.exe'
 failed

It seems like it works better when the qemu_timer_notify_cb() stub (which
calls qemu_notify_event()) is in a separate file - then we can also even
remove the qemu_notify_event() stub now.

This patch is based on ideas from the patch "stubs: Remove qemu_notify_event()"
by Philippe Mathieu-Daudé and the patch "cpu-timers, icount: new modules" from
Claudio Fontana.

Message-Id: <20200902102433.304737-1-thuth@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: 8c2787629eee73ca8ce4f100cff4f4946583b4e8
      
https://github.com/qemu/qemu/commit/8c2787629eee73ca8ce4f100cff4f4946583b4e8
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2020-09-07 (Mon, 07 Sep 2020)

  Changed paths:
    R stubs/fd-register.c
    M stubs/meson.build
    M util/main-loop.c

  Log Message:
  -----------
  stubs: Move qemu_fd_register stub to util/main-loop.c

The linker of MinGW sometimes runs into the following problem:

libqemuutil.a(util_main-loop.c.obj): In function `qemu_fd_register':
/builds/huth/qemu/build/../util/main-loop.c:331: multiple definition of
 `qemu_fd_register'
libqemuutil.a(stubs_fd-register.c.obj):/builds/huth/qemu/stubs/fd-register.c:5:
 first defined here
collect2: error: ld returned 1 exit status
/builds/huth/qemu/rules.mak:88: recipe for target 'tests/test-timed-average.exe'
 failed

qemu_fd_register() is defined in util/main-loop.c for WIN32, so let's simply
move the stub also there in the #else part of the corresponding #ifndef
to fix this problem.

Message-Id: <20200903054503.425435-1-thuth@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: 6bcb5fc0f7a543320fbfaabbb3ffe4a9db241222
      
https://github.com/qemu/qemu/commit/6bcb5fc0f7a543320fbfaabbb3ffe4a9db241222
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2020-09-07 (Mon, 07 Sep 2020)

  Changed paths:
    A .gitlab-ci.d/crossbuilds.yml
    M .gitlab-ci.yml
    M MAINTAINERS

  Log Message:
  -----------
  gitlab-ci: Add cross-compiling build tests

Now that we can use all our QEMU test containers in the gitlab-CI, we can
easily add some jobs that test cross-compilation for various architectures.
There is just only small ugliness: Since the shared runners on gitlab.com
are single-threaded, we have to split each compilation job into two parts
(--disable-user and --disable-system), and exclude some additional targets,
to avoid that the jobs are running too long and hitting the timeout of 1 h.

Message-Id: <20200823111757.72002-8-thuth@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: 46859d939832f666acecd63d7aac6731ade916d9
      
https://github.com/qemu/qemu/commit/46859d939832f666acecd63d7aac6731ade916d9
  Author: Daniel P. Berrangé <berrange@redhat.com>
  Date:   2020-09-07 (Mon, 07 Sep 2020)

  Changed paths:
    M configure
    M crypto/meson.build
    M meson.build

  Log Message:
  -----------
  crypto: fix build with gcrypt enabled

If nettle is disabled and gcrypt enabled, the compiler and linker flags
needed for gcrypt are not passed.

Gnutls was also not added as a dependancy when gcrypt is enabled.

Attempting to add the library dependencies at the same time as the
source dependencies is error prone, as there are alot of different
rules for picking which sources to use, and some of the source files
use code level conditionals intead. It is thus clearer to add the
library dependencies separately.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20200901133050.381844-2-berrange@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Tested-by: Alex Bennée <alex.bennee@linaro.org>
Tested-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: affcc09c2d54780b76f135bca79a65a1343a7269
      
https://github.com/qemu/qemu/commit/affcc09c2d54780b76f135bca79a65a1343a7269
  Author: Daniel P. Berrangé <berrange@redhat.com>
  Date:   2020-09-07 (Mon, 07 Sep 2020)

  Changed paths:
    M .gitlab-ci.yml
    M tests/docker/dockerfiles/centos7.docker
    M tests/docker/dockerfiles/centos8.docker

  Log Message:
  -----------
  gitlab: expand test coverage for crypto builds

Most jobs test the latest nettle library. This adds explicit coverage
for latest gcrypt using Fedora, and old gcrypt and nettle using
CentOS-7. The latter does a minimal tools-only build, as we only need to
validate that the crypto code builds and unit tests pass. Finally a job
disabling both nettle and gcrypt is provided to validate that gnutls
still works.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20200901133050.381844-3-berrange@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: cc9962d8ea80b39118d921109fd2f8db308e1d4a
      
https://github.com/qemu/qemu/commit/cc9962d8ea80b39118d921109fd2f8db308e1d4a
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2020-09-07 (Mon, 07 Sep 2020)

  Changed paths:
    M tests/qtest/meson.build

  Log Message:
  -----------
  tests/qtest: do not list ahci-test twice

This is caught by "meson test", which complains about two tests with the
same name.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200904120342.11370-1-pbonzini@redhat.com>
Fixes: a2ce7dbd917 ("meson: convert tests/qtest to meson")
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: 88e74b6122bb40852b1c98befd47a572f0c06930
      
https://github.com/qemu/qemu/commit/88e74b6122bb40852b1c98befd47a572f0c06930
  Author: Richard Henderson <richard.henderson@linaro.org>
  Date:   2020-09-07 (Mon, 07 Sep 2020)

  Changed paths:
    M target/microblaze/cpu.c
    M target/microblaze/cpu.h
    M target/microblaze/helper.c
    M target/microblaze/translate.c

  Log Message:
  -----------
  target/microblaze: Collected fixes for env->iflags

There are several problems here that can result in soft lockup,
depending on exactly where an interrupt or exception is delivered:

Include BIMM_FLAG in IFLAGS_TB_MASK, since it needs to follow D_FLAG.
Ensure that iflags is 0 when entering an interrupt/exception handler.
Add mb_cpu_synchronize_from_tb to restore iflags from tb->flags.
The change to t_sync_flags is cosmetic, but makes the code clearer.

This fixes the reported regression in acceptance/replay_kernel.py.

Fixes: 683a247ed7a4 ("target/microblaze: Store "current" iflags in insn_start")
Tested-by: Thomas Huth <thuth@redhat.com>
Reported-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20200904190842.2282109-2-richard.henderson@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: e11bd71f89649da3cff439c030d2ccac0cc914e3
      
https://github.com/qemu/qemu/commit/e11bd71f89649da3cff439c030d2ccac0cc914e3
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2020-09-07 (Mon, 07 Sep 2020)

  Changed paths:
    A .gitlab-ci.d/crossbuilds.yml
    M .gitlab-ci.yml
    M MAINTAINERS
    M configure
    M crypto/meson.build
    M meson.build
    M stubs/cpu-get-icount.c
    R stubs/fd-register.c
    M stubs/meson.build
    R stubs/notify-event.c
    A stubs/qemu-timer-notify-cb.c
    M target/microblaze/cpu.c
    M target/microblaze/cpu.h
    M target/microblaze/helper.c
    M target/microblaze/translate.c
    M tests/Makefile.include
    M tests/docker/dockerfiles/centos7.docker
    M tests/docker/dockerfiles/centos8.docker
    M tests/docker/dockerfiles/debian-win64-cross.docker
    M tests/docker/dockerfiles/debian10.docker
    M tests/docker/dockerfiles/debian9.docker
    M tests/qtest/meson.build
    M tests/test-replication.c
    M tests/test-util-filemonitor.c
    M tests/test-vmstate.c
    M util/main-loop.c

  Log Message:
  -----------
  Merge remote-tracking branch 
'remotes/huth-gitlab/tags/pull-request-2020-09-07' into staging

* Fixes for cross-compiling with MinGW / compiling with MSYS2
* Enable cross-compiler builds in the Gitlab CI
* Improvements / fixes for the crypto tests in the Gitlab CI
* Fix for the "make check-acceptance" microblaze failure
  (required to get the Gitlab CI green again)

# gpg: Signature made Mon 07 Sep 2020 13:03:31 BST
# gpg:                using RSA key 27B88847EEE0250118F3EAB92ED9D774FE702DB5
# gpg:                issuer "thuth@redhat.com"
# gpg: Good signature from "Thomas Huth <th.huth@gmx.de>" [full]
# gpg:                 aka "Thomas Huth <thuth@redhat.com>" [full]
# gpg:                 aka "Thomas Huth <huth@tuxfamily.org>" [full]
# gpg:                 aka "Thomas Huth <th.huth@posteo.de>" [unknown]
# Primary key fingerprint: 27B8 8847 EEE0 2501 18F3  EAB9 2ED9 D774 FE70 2DB5

* remotes/huth-gitlab/tags/pull-request-2020-09-07:
  target/microblaze: Collected fixes for env->iflags
  tests/qtest: do not list ahci-test twice
  gitlab: expand test coverage for crypto builds
  crypto: fix build with gcrypt enabled
  gitlab-ci: Add cross-compiling build tests
  stubs: Move qemu_fd_register stub to util/main-loop.c
  stubs: Move qemu_timer_notify_cb() and remove qemu_notify_event() stub
  configure: Allow automatic WHPX detection
  dockerfiles/debian-win64-cross: Download WHPX MinGW headers
  tests/Makefile: test-image-locking needs CONFIG_POSIX
  tests: Fixes building test-util-filemonitor.c on msys2/mingw
  tests: fixes test-vmstate.c compile error on msys2
  tests: handling signal on win32 properly
  tests/docker: add python3-setuptools the docker images

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>


Compare: https://github.com/qemu/qemu/compare/9d5589bb3fee...e11bd71f8964