[Qemu-commits] [qemu/qemu] 5fe407: configure: Fix atomic64 test for --enable-werror o...

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 5fe407656231ef3e34246fcfe32329d11887b6f9
      
https://github.com/qemu/qemu/commit/5fe407656231ef3e34246fcfe32329d11887b6f9
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2020-09-03 (Thu, 03 Sep 2020)

  Changed paths:
    M configure

  Log Message:
  -----------
  configure: Fix atomic64 test for --enable-werror on macOS

When using --enable-werror for the macOS builders in the Cirrus-CI,
the atomic64 test is currently failing, and config.log shows a bunch
of error messages like this:

 config-temp/qemu-conf.c:6:7: error: implicit declaration of function
 '__atomic_load_8' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
  y = __atomic_load_8(&x, 0);
      ^
 config-temp/qemu-conf.c:6:7: error: this function declaration is not a
 prototype [-Werror,-Wstrict-prototypes]

Seems like these __atomic_*_8 functions are available in one of the
libraries there, so that the test links and passes there when not
using --enable-werror. But there does not seem to be a valid prototype
for them in any of the header files, so that the test fails when using
--enable-werror.

Fix it by using the "official" built-in functions instead (see e.g.
https://gcc.gnu.org/onlinedocs/gcc/_005f_005fatomic-Builtins.html).
We are not using the *_8 variants in QEMU anyway.

Suggested-by: Christian Schoenebeck <qemu_oss@crudebyte.com>
Reviewed-by: Christian Schoenebeck <qemu_oss@crudebyte.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Tested-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20200728074405.13118-2-thuth@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: 91bedaaeb6e192a182cc51cdd7a7e61e74b8d525
      
https://github.com/qemu/qemu/commit/91bedaaeb6e192a182cc51cdd7a7e61e74b8d525
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2020-09-03 (Thu, 03 Sep 2020)

  Changed paths:
    M .cirrus.yml

  Log Message:
  -----------
  cirrus.yml: Compile FreeBSD with -Werror

Compiler warnings currently go unnoticed in our FreeBSD builds, since
-Werror is only enabled for Linux and MinGW builds by default. So let's
enable them here now, too.

Reviewed-by: Ed Maste <emaste@freebsd.org>
Message-Id: <20200728074405.13118-3-thuth@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


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

  Changed paths:
    M .cirrus.yml

  Log Message:
  -----------
  cirrus.yml: Compile macOS with -Werror

Compiler warnings currently go unnoticed in our macOS builds, since -Werror
is only enabled for Linux and MinGW builds by default. So let's enable them
here now, too.
Unfortunately, the sasl header is marked as deprecated in the macOS headers
and thus generates a lot of deprecation warnings. Thus we have to also use
-Wno-error=deprecated-declarations to be able to compile the code here.

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


  Commit: 7498e6afa103d1e9b71699ebc577d5891eeb6674
      
https://github.com/qemu/qemu/commit/7498e6afa103d1e9b71699ebc577d5891eeb6674
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2020-09-03 (Thu, 03 Sep 2020)

  Changed paths:
    M .cirrus.yml

  Log Message:
  -----------
  cirrus.yml: Update the macOS jobs to Catalina

When looking at the CI jobs on cirrus-ci.com, it seems like the mojave-based
images have been decomissioned a while ago already, since apparently all our
jobs get automatically upgraded to catalina. So let's update our YML script
accordingly to avoid confusion.

Reviewed-by: Ed Maste <emaste@freebsd.org>
Message-Id: <20200728074405.13118-5-thuth@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: 45f7b7b9f38f5c4d1529a37c93dedfc26a231bba
      
https://github.com/qemu/qemu/commit/45f7b7b9f38f5c4d1529a37c93dedfc26a231bba
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2020-09-03 (Thu, 03 Sep 2020)

  Changed paths:
    M .cirrus.yml

  Log Message:
  -----------
  cirrus.yml: Split FreeBSD job into two parts

The FreeBSD jobs currently hit the 1h time limit in the Cirrus-CI.
We have to split the build targets here to make sure that the job
finishes in time again. According to the Cirrus-CI docs and some
tests that I did, it also seems like the total amount of CPUs that
can be used for FreeBSD jobs is limited to 8, so each job now only
gets 4 CPUs. That increases the compilation time of each job a little
bit, but it still seems to be better to run two jobs with 4 CPUs each
in parallel than to run two jobs with 8 CPUs sequentially.

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


  Commit: 09db9b9db38e82acbc1fd4fa4661ac19c387380c
      
https://github.com/qemu/qemu/commit/09db9b9db38e82acbc1fd4fa4661ac19c387380c
  Author: Gerd Hoffmann <kraxel@redhat.com>
  Date:   2020-09-03 (Thu, 03 Sep 2020)

  Changed paths:
    M configure
    M pc-bios/keymaps/meson.build

  Log Message:
  -----------
  meson: fix keymaps without qemu-keymap

In case the qemu-keymap tool generating them is neither installed on the
system nor built from sources (due to xkbcommon not being available)
qemu will not find the keymaps when started directly from the build
tree,

This happens because commit ddcf607fa3d6 ("meson: drop keymaps symlink")
removed the symlink to the source tree, and the special handling for
install doesn't help in case we do not install qemu.

Lets fix that by simply copying over the file from the source tree as
fallback.

Reported-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-Id: <20200827102617.14448-1-kraxel@redhat.com>
[thuth: Rebased, changed "config_host['qemu_datadir']" to "qemu_datadir",
        added Gerd's UNLINK fix to configure script]
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: 853b4baf30a515d87229ee94f89f4b3ad376c9d2
      
https://github.com/qemu/qemu/commit/853b4baf30a515d87229ee94f89f4b3ad376c9d2
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2020-09-03 (Thu, 03 Sep 2020)

  Changed paths:
    M configure

  Log Message:
  -----------
  configure: Add system = 'linux' for meson when cross-compiling

Meson needs the "system = xyz" line when cross-compiling. We are already
adding a "system = 'windows'" for the MinGW cross-compilation case here,
so let's add a "system = 'linux'" now for Linux hosts, too.

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


  Commit: 0bc6746e855621398940b51d9bae1827026ea672
      
https://github.com/qemu/qemu/commit/0bc6746e855621398940b51d9bae1827026ea672
  Author: Thomas Huth <huth@tuxfamily.org>
  Date:   2020-09-03 (Thu, 03 Sep 2020)

  Changed paths:
    M hw/m68k/an5206.c
    M hw/m68k/mcf5206.c
    M include/hw/m68k/mcf.h

  Log Message:
  -----------
  hw/m68k: QOMify the mcf5206 system integration module

The mcf5206 system integration module should be a proper device.
Let's finally QOMify it.

Signed-off-by: Thomas Huth <huth@tuxfamily.org>
Message-Id: <20200819065201.4045-1-huth@tuxfamily.org>


  Commit: df1a312fea58bb3f83b5d7eba0946d43cb16675f
      
https://github.com/qemu/qemu/commit/df1a312fea58bb3f83b5d7eba0946d43cb16675f
  Author: Philippe Mathieu-Daudé <philmd@redhat.com>
  Date:   2020-09-03 (Thu, 03 Sep 2020)

  Changed paths:
    M tests/qtest/ahci-test.c

  Log Message:
  -----------
  tests/qtest/ahci: Improve error handling (NEGATIVE_RETURNS)

Fix an error handling issue reported by Coverity:

  /qemu/tests/qtest/ahci-test.c: 1452 in prepare_iso()
  1444         int fd = mkstemp(cdrom_path);
  >>>     CID 1432375:  Error handling issues  (NEGATIVE_RETURNS)
  >>>     "fd" is passed to a parameter that cannot be negative.
  1452         ret = write(fd, patt, size);

Reported-by: Coverity (CID 1432375)
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20200902080552.159806-1-philmd@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: ed943cc934a82fd78102f0df2084a8f3c556716f
      
https://github.com/qemu/qemu/commit/ed943cc934a82fd78102f0df2084a8f3c556716f
  Author: Philippe Mathieu-Daudé <philmd@redhat.com>
  Date:   2020-09-03 (Thu, 03 Sep 2020)

  Changed paths:
    M tests/qtest/tpm-tests.c
    M tests/qtest/tpm-util.c

  Log Message:
  -----------
  tests/qtest/tpm: Declare input buffers const and static

The functions using these arrays expect a "const unsigned char *"
argument, it is safe to declare these as 'static const'.

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20200902080909.161034-1-philmd@redhat.com>
Reviewed-by: Darren Kenny <darren.kenny@oracle.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: 978382b453b0e40cc17a983b8c1676386fd3cc5e
      
https://github.com/qemu/qemu/commit/978382b453b0e40cc17a983b8c1676386fd3cc5e
  Author: Philippe Mathieu-Daudé <philmd@redhat.com>
  Date:   2020-09-03 (Thu, 03 Sep 2020)

  Changed paths:
    M tests/qtest/ipmi-kcs-test.c

  Log Message:
  -----------
  tests/qtest/ipmi-kcs: Fix assert side-effect

Fix assert side-effect reported by Coverity:

  /qemu/tests/qtest/ipmi-kcs-test.c: 84 in kcs_wait_obf()
  83         while (IPMI_KCS_CMDREG_GET_OBF() == 0) {
  >>>     CID 1432368:  Incorrect expression  (ASSERT_SIDE_EFFECT)
  >>>     Argument "--count" of g_assert() has a side effect.  The containing 
function might work differently in a non-debug build.
  84             g_assert(--count != 0);

Reported-by: Coverity (CID 1432368)
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20200902080801.160652-2-philmd@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: 3bc1b8ee8cea6823295d161c0313e8441b7321f7
      
https://github.com/qemu/qemu/commit/3bc1b8ee8cea6823295d161c0313e8441b7321f7
  Author: Markus Armbruster <armbru@redhat.com>
  Date:   2020-09-03 (Thu, 03 Sep 2020)

  Changed paths:
    M tests/qtest/drive_del-test.c
    M tests/qtest/libqos/libqtest.h
    M tests/qtest/libqtest.c
    M tests/qtest/qmp-cmd-test.c
    M tests/qtest/qmp-test.c
    M tests/test-qga.c

  Log Message:
  -----------
  libqtest: Rename qmp_assert_error_class() to qmp_expect_error_and_unref()

qmp_assert_error_class() does more than just assert: it also unrefs
the @rsp argument.  Rename to qmp_expect_error_and_unref() to reduce
confusion.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20200902115733.1229537-1-armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


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

  Changed paths:
    M .gitlab-ci.yml
    M .travis.yml

  Log Message:
  -----------
  gitlab/travis: Rework the disabled features tests

Let's focus on the gitlab-ci when testing the compilation with disabled
features, thus add more switches there (and while we're at it, sort them
also alphabetically). This should cover the test from the Travis CI now,
too, so that we can remove the now-redundant job from the Travis CI.

Message-Id: <20200806155306.13717-1-thuth@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: 5ab04d5e6ff34d38b5d9a57c2e2bd30350950f86
      
https://github.com/qemu/qemu/commit/5ab04d5e6ff34d38b5d9a57c2e2bd30350950f86
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2020-09-03 (Thu, 03 Sep 2020)

  Changed paths:
    M .gitlab-ci.yml

  Log Message:
  -----------
  gitlab-ci.yml: Run check-qtest and check-unit at the end of the fuzzer job

The fuzzer job finishes quite early, so we can run the unit tests and
qtests with -fsanitize=address here without extending the total test time.

Message-Id: <20200831153228.229185-1-thuth@redhat.com>
Reviewed-by: Alexander Bulekov <alxndr@bu.edu>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: 0a796d63bcd4e840bb94fbe894ae2ad77b9ee2f7
      
https://github.com/qemu/qemu/commit/0a796d63bcd4e840bb94fbe894ae2ad77b9ee2f7
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2020-09-03 (Thu, 03 Sep 2020)

  Changed paths:
    M .gitlab-ci.yml

  Log Message:
  -----------
  gitlab-ci.yml: Set artifacts expiration time

The default expiration time for artifacts seems to be very high (30 days?).
Since we only need the artifacts to pass the binaries from one stage to
the next one, we can decrease the expiration time to avoid to spam the
file server too much. Two days should be enough in case someone still wants
to have a look after the pipeline finished.

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


  Commit: 67a7bfe560a1bba59efab085cb3430f45176d382
      
https://github.com/qemu/qemu/commit/67a7bfe560a1bba59efab085cb3430f45176d382
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2020-09-03 (Thu, 03 Sep 2020)

  Changed paths:
    M .cirrus.yml
    M .gitlab-ci.yml
    M .travis.yml
    M configure
    M hw/m68k/an5206.c
    M hw/m68k/mcf5206.c
    M include/hw/m68k/mcf.h
    M pc-bios/keymaps/meson.build
    M tests/qtest/ahci-test.c
    M tests/qtest/drive_del-test.c
    M tests/qtest/ipmi-kcs-test.c
    M tests/qtest/libqos/libqtest.h
    M tests/qtest/libqtest.c
    M tests/qtest/qmp-cmd-test.c
    M tests/qtest/qmp-test.c
    M tests/qtest/tpm-tests.c
    M tests/qtest/tpm-util.c
    M tests/test-qga.c

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

* Cirrus-CI improvements and fixes (compile with -Werror & fix for 1h problem)
* Two build system fixes to fix some failures the CI
* One m68k QOMification patch
* Some trivial qtest patches
* Some small improvements for the Gitlab CI

# gpg: Signature made Thu 03 Sep 2020 12:04:32 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-03:
  gitlab-ci.yml: Set artifacts expiration time
  gitlab-ci.yml: Run check-qtest and check-unit at the end of the fuzzer job
  gitlab/travis: Rework the disabled features tests
  libqtest: Rename qmp_assert_error_class() to qmp_expect_error_and_unref()
  tests/qtest/ipmi-kcs: Fix assert side-effect
  tests/qtest/tpm: Declare input buffers const and static
  tests/qtest/ahci: Improve error handling (NEGATIVE_RETURNS)
  hw/m68k: QOMify the mcf5206 system integration module
  configure: Add system = 'linux' for meson when cross-compiling
  meson: fix keymaps without qemu-keymap
  cirrus.yml: Split FreeBSD job into two parts
  cirrus.yml: Update the macOS jobs to Catalina
  cirrus.yml: Compile macOS with -Werror
  cirrus.yml: Compile FreeBSD with -Werror
  configure: Fix atomic64 test for --enable-werror on macOS

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


Compare: https://github.com/qemu/qemu/compare/3dd23a4fb8fd...67a7bfe560a1