[Qemu-commits] [qemu/qemu] f4ce3a: qemu/atomic.h: add #ifdef guards for stdatomic.h

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: f4ce3adf6b29e8e984b1a69e4876eaf4ac4022a9
      
https://github.com/qemu/qemu/commit/f4ce3adf6b29e8e984b1a69e4876eaf4ac4022a9
  Author: Alex Bennée <address@hidden>
  Date:   2020-03-27 (Fri, 27 Mar 2020)

  Changed paths:
    M include/qemu/atomic.h

  Log Message:
  -----------
  qemu/atomic.h: add #ifdef guards for stdatomic.h

Deep inside the FreeBSD netmap headers we end up including stdatomic.h
which clashes with qemu's atomic functions which are modelled along
the C11 standard. To avoid a massive rename lets just ifdef around the
problem.

Signed-off-by: Alex Bennée <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>


  Commit: 698a64f94814eb5e6a4bad5afe00ab09f163bc44
      
https://github.com/qemu/qemu/commit/698a64f94814eb5e6a4bad5afe00ab09f163bc44
  Author: Gerd Hoffmann <address@hidden>
  Date:   2020-03-27 (Fri, 27 Mar 2020)

  Changed paths:
    M tests/vm/basevm.py

  Log Message:
  -----------
  tests/vm: write raw console log

Run "tail -f /var/tmp/*/qemu*console.raw" in another terminal
to watch the install console.

Signed-off-by: Gerd Hoffmann <address@hidden>
Signed-off-by: Alex Bennée <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
Message-Id: <address@hidden>


  Commit: 50a06452c75424ad5f0a8d57997d7e16011160b3
      
https://github.com/qemu/qemu/commit/50a06452c75424ad5f0a8d57997d7e16011160b3
  Author: Gerd Hoffmann <address@hidden>
  Date:   2020-03-27 (Fri, 27 Mar 2020)

  Changed paths:
    M tests/vm/basevm.py
    M tests/vm/fedora
    M tests/vm/freebsd
    M tests/vm/netbsd
    M tests/vm/openbsd
    M tests/vm/ubuntu.i386

  Log Message:
  -----------
  tests/vm: move vga setup

Move '-device VGA' from basevm.py to the guests, so they have
the chance to opt out and run without display device.

Signed-off-by: Gerd Hoffmann <address@hidden>
Signed-off-by: Alex Bennée <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
Message-Id: <address@hidden>


  Commit: 610bd2cf2f3b828c8ad03c63ed589ffb73fad650
      
https://github.com/qemu/qemu/commit/610bd2cf2f3b828c8ad03c63ed589ffb73fad650
  Author: Gerd Hoffmann <address@hidden>
  Date:   2020-03-27 (Fri, 27 Mar 2020)

  Changed paths:
    M tests/vm/freebsd

  Log Message:
  -----------
  tests/vm: update FreeBSD to 12.1

Signed-off-by: Gerd Hoffmann <address@hidden>
Signed-off-by: Alex Bennée <address@hidden>
Message-Id: <address@hidden>
Message-Id: <address@hidden>


  Commit: 2cc3e591b3321aa44ea09527ae1e4d443615d2c7
      
https://github.com/qemu/qemu/commit/2cc3e591b3321aa44ea09527ae1e4d443615d2c7
  Author: Gerd Hoffmann <address@hidden>
  Date:   2020-03-27 (Fri, 27 Mar 2020)

  Changed paths:
    M tests/vm/netbsd

  Log Message:
  -----------
  tests/vm: update NetBSD to 9.0

The installer supports GPT now, so the install workflow has changed a
bit.  Also: run without VGA device.  This works around a bug in the
seabios sercon code and makes the bootloader menu show up on the serial
line, so we can drop the quirk for that.

Signed-off-by: Gerd Hoffmann <address@hidden>
Signed-off-by: Alex Bennée <address@hidden>
Message-Id: <address@hidden>
Message-Id: <address@hidden>


  Commit: f01454ad17e3dcede67625e846cfbbd603e768e8
      
https://github.com/qemu/qemu/commit/f01454ad17e3dcede67625e846cfbbd603e768e8
  Author: Alex Bennée <address@hidden>
  Date:   2020-03-27 (Fri, 27 Mar 2020)

  Changed paths:
    M tests/vm/basevm.py

  Log Message:
  -----------
  tests/vm: fix basevm config

When the patch was merged it was part of a longer series which had
already merged the config changes. Semu-revert the config related
changes for now so things will build.

Fixes: b081986c85fd2
Signed-off-by: Alex Bennée <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>


  Commit: a092a95547710bcbb8c168e5ec03f55fb4ab1ad7
      
https://github.com/qemu/qemu/commit/a092a95547710bcbb8c168e5ec03f55fb4ab1ad7
  Author: Alex Bennée <address@hidden>
  Date:   2020-03-27 (Fri, 27 Mar 2020)

  Changed paths:
    M configure

  Log Message:
  -----------
  configure: disable MTTCG for MIPS guests

While debugging check-acceptance failures I found an instability in
the mips64el test case. Briefly the test case:

  retry.py -n 100 -c -- ./mips64el-softmmu/qemu-system-mips64el \
    -display none -vga none -serial mon:stdio \
    -machine malta -kernel ./vmlinux-4.7.0-rc1.I6400 \
    -cpu I6400 -smp 8 -vga std \
    -append "printk.time=0 clocksource=GIC console=tty0 console=ttyS0 panic=-1" 
\
    --no-reboot

Reports about a 9% failure rate:

  Results summary:
  0: 91 times (91.00%), avg time 5.547 (0.45 varience/0.67 deviation)
  -6: 9 times (9.00%), avg time 3.394 (0.02 varience/0.13 deviation)
  Ran command 100 times, 91 passes

When re-run with "--accel tcg,thread=single" the instability goes
away.

  Results summary:
  0: 100 times (100.00%), avg time 17.318 (249.76 varience/15.80 deviation)
  Ran command 100 times, 100 passes

Which seems to indicate there is some aspect of the MIPS MTTCG fixes
that has been missed. Ideally we would fix that but I'm afraid I don't
have time to investigate and am not super familiar with the
architecture anyway. In lieu of someone tracking down the failure lets
disable it for now.

Signed-off-by: Alex Bennée <address@hidden>
Acked-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Acked-by: Richard Henderson <address@hidden>
Reviewed-by: Aleksandar Markovic <address@hidden>
Cc: Aurelien Jarno <address@hidden>
Cc: Aleksandar Rikalo <address@hidden>
Message-Id: <address@hidden>


  Commit: cdb1a84cfe57558a34d73d0252ad0271539194e0
      
https://github.com/qemu/qemu/commit/cdb1a84cfe57558a34d73d0252ad0271539194e0
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2020-03-27 (Fri, 27 Mar 2020)

  Changed paths:
    M tests/docker/dockerfiles/centos7.docker
    M tests/docker/dockerfiles/fedora.docker

  Log Message:
  -----------
  tests/docker: Keep package list sorted

Keep package list sorted, this eases rebase/cherry-pick.

Fixes: 3a6784813
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Alex Bennée <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
Message-Id: <address@hidden>
Message-Id: <address@hidden>


  Commit: 9274ae32c34971c2bb3a640ec265e886cdd438c9
      
https://github.com/qemu/qemu/commit/9274ae32c34971c2bb3a640ec265e886cdd438c9
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2020-03-27 (Fri, 27 Mar 2020)

  Changed paths:
    M tests/docker/dockerfiles/debian-amd64.docker

  Log Message:
  -----------
  tests/docker: Install gcrypt devel package in Debian image

In commit 6f8bbb374be we enabled building with the gcrypt library
on the the Debian 'x86 host', which was based on Debian Stretch.
Later in commit 698a71edbed we upgraded the Debian base image to
Buster.

Apparently Debian Stretch was listing gcrypt as a QEMU dependency,
but this is not the case anymore in Buster, so we need to install
it manually (it it not listed by 'apt-get -s build-dep qemu' in
the common debian10.docker anymore). This fixes:

 $ ../configure $QEMU_CONFIGURE_OPTS

  ERROR: User requested feature gcrypt
         configure was not able to find it.
         Install gcrypt devel >= 1.5.0

Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Alex Bennée <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
Message-Id: <address@hidden>
Message-Id: <address@hidden>


  Commit: 6d8e7738b0375d9bf247b73ed4739f741df03f21
      
https://github.com/qemu/qemu/commit/6d8e7738b0375d9bf247b73ed4739f741df03f21
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2020-03-27 (Fri, 27 Mar 2020)

  Changed paths:
    M tests/docker/dockerfiles/fedora.docker

  Log Message:
  -----------
  tests/docker: Use Python3 PyYAML in the Fedora image

The Python2 PyYAML is now pointless, switch to the Python3 version.

Fixes: bcbf27947 (docker: move tests from python2 to python3)
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Alex Bennée <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
Message-Id: <address@hidden>
Message-Id: <address@hidden>


  Commit: 3e3207337b51f7a1a3cf4c93085f5afe904f1d5d
      
https://github.com/qemu/qemu/commit/3e3207337b51f7a1a3cf4c93085f5afe904f1d5d
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2020-03-27 (Fri, 27 Mar 2020)

  Changed paths:
    M tests/docker/dockerfiles/fedora.docker

  Log Message:
  -----------
  tests/docker: Add libepoxy and libudev packages to the Fedora image

Install optional dependencies of QEMU to get better coverage.

Suggested-by: Peter Maydell <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Alex Bennée <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
Message-Id: <address@hidden>
Message-Id: <address@hidden>


  Commit: 41e1f0e2256e4c21bc5671ecb64191e776477c35
      
https://github.com/qemu/qemu/commit/41e1f0e2256e4c21bc5671ecb64191e776477c35
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2020-03-27 (Fri, 27 Mar 2020)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  .travis.yml: Add a KVM-only s390x job

Add a job to build QEMU on s390x with TCG disabled, so
this configuration won't bitrot over time.

This job is quick, running check-unit: Ran for 5 min 30 sec
https://travis-ci.org/github/philmd/qemu/jobs/665456423

Acked-by: Cornelia Huck <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Alex Bennée <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
Message-Id: <address@hidden>
Message-Id: <address@hidden>


  Commit: 127fe8643340c330cbc0a4194ea56e3d522dbb71
      
https://github.com/qemu/qemu/commit/127fe8643340c330cbc0a4194ea56e3d522dbb71
  Author: Peter Maydell <address@hidden>
  Date:   2020-03-27 (Fri, 27 Mar 2020)

  Changed paths:
    M .travis.yml
    M configure
    M include/qemu/atomic.h
    M tests/docker/dockerfiles/centos7.docker
    M tests/docker/dockerfiles/debian-amd64.docker
    M tests/docker/dockerfiles/fedora.docker
    M tests/vm/basevm.py
    M tests/vm/fedora
    M tests/vm/freebsd
    M tests/vm/netbsd
    M tests/vm/openbsd
    M tests/vm/ubuntu.i386

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/stsquad/tags/pull-testing-270320-2' 
into staging

Testing updates:

  - docker updates (various dependencies)
  - travis updates (s390x KVM build)
  - tweak qemu/atomic.h headers in event of clash
  - test/vm updates (NetBSD -> 9.0, FreeBSD -> 12.1)
  - disable MTTCG for mips64/mips64el

# gpg: Signature made Fri 27 Mar 2020 13:45:18 GMT
# gpg:                using RSA key 6685AE99E75167BCAFC8DF35FBD0DB095A9E2A44
# gpg: Good signature from "Alex Bennée (Master Work Key) <address@hidden>" 
[full]
# Primary key fingerprint: 6685 AE99 E751 67BC AFC8  DF35 FBD0 DB09 5A9E 2A44

* remotes/stsquad/tags/pull-testing-270320-2:
  .travis.yml: Add a KVM-only s390x job
  tests/docker: Add libepoxy and libudev packages to the Fedora image
  tests/docker: Use Python3 PyYAML in the Fedora image
  tests/docker: Install gcrypt devel package in Debian image
  tests/docker: Keep package list sorted
  configure: disable MTTCG for MIPS guests
  tests/vm: fix basevm config
  tests/vm: update NetBSD to 9.0
  tests/vm: update FreeBSD to 12.1
  tests/vm: move vga setup
  tests/vm: write raw console log
  qemu/atomic.h: add #ifdef guards for stdatomic.h

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/77a48a743f9e...127fe8643340