Almost nothing in here is arm-related, but the target-arm

queue was convenient for these last minute bits and pieces

for 5.0...

thanks

-- PMM

The following changes since commit 14e5526b51910efd62cd31cd95b49baca975c83f:

Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging (2020-04-13 15:42:51 +0100)

https://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20200414

for you to fetch changes up to 84f82ddcbb4ac4ed04c8675e85155329f23184f0:

Deprecate KVM support for AArch32 (2020-04-14 17:20:22 +0100)

patch queue:

* Fix some problems that trip up Coverity's scanner

* run-coverity-scan: New script automating the scan-and-upload process

* docs: Improve our gdbstub documentation

* configure: Honour --disable-werror for Sphinx

* docs: Fix errors produced when building with Sphinx 3.0

* docs: Require Sphinx 1.6 or better

* Add deprecation notice for KVM support on AArch32 hosts

Peter Maydell (12):

osdep.h: Drop no-longer-needed Coverity workarounds

thread.h: Fix Coverity version of qemu_cond_timedwait()

thread.h: Remove trailing semicolons from Coverity qemu_mutex_lock() etc

linux-user/flatload.c: Use "" for include of QEMU header target_flat.h

scripts/run-coverity-scan: Script to run Coverity Scan build

scripts/coverity-scan: Add Docker support

docs: Improve our gdbstub documentation

configure: Honour --disable-werror for Sphinx

scripts/kernel-doc: Add missing close-paren in c:function directives

kernel-doc: Use c:struct for Sphinx 3.0 and later

docs: Require Sphinx 1.6 or better

Deprecate KVM support for AArch32

configure | 9 +-

Makefile | 2 +-

include/qemu/osdep.h | 14 -

include/qemu/thread.h | 12 +-

linux-user/flatload.c | 2 +-

MAINTAINERS | 5 +

docs/conf.py | 6 +-

docs/sphinx/kerneldoc.py | 1 +

docs/system/deprecated.rst | 8 +

docs/system/gdb.rst | 22 +-

qemu-options.hx | 24 +-

scripts/coverity-scan/coverity-scan.docker | 131 ++++++++++

scripts/coverity-scan/run-coverity-scan | 401 +++++++++++++++++++++++++++++

scripts/kernel-doc | 18 +-

14 files changed, 615 insertions(+), 40 deletions(-)

create mode 100644 scripts/coverity-scan/coverity-scan.docker

create mode 100755 scripts/coverity-scan/run-coverity-scan

Add a new script to automate the process of running the Coverity

Scan build tools and uploading the resulting tarball to the

website.

This is intended eventually to be driven from Travis,

but it can be run locally, if you are a maintainer of the

QEMU project on the Coverity Scan website and have the secret

upload token.

The script must be run on a Fedora 30 system. Support for using a

Docker container is added in a following commit.

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

MAINTAINERS | 5 +

scripts/coverity-scan/run-coverity-scan | 311 ++++++++++++++++++++++++

2 files changed, 316 insertions(+)

create mode 100755 scripts/coverity-scan/run-coverity-scan

@@ -XXX,XX +XXX,XX @@ M: Markus Armbruster <armbru@redhat.com>

S: Supported

F: scripts/coverity-model.c

+Coverity Scan integration

+M: Peter Maydell <peter.maydell@linaro.org>

+F: scripts/coverity-scan/

Device Tree

M: Alistair Francis <alistair.francis@wdc.com>

R: David Gibson <david@gibson.dropbear.id.au>

diff --git a/scripts/coverity-scan/run-coverity-scan b/scripts/coverity-scan/run-coverity-scan

new file mode 100755

index XXXXXXX..XXXXXXX

--- /dev/null

+++ b/scripts/coverity-scan/run-coverity-scan

@@ -XXX,XX +XXX,XX @@

+#!/bin/sh -e

+# Upload a created tarball to Coverity Scan, as per

+# https://scan.coverity.com/projects/qemu/builds/new

+

+# This work is licensed under the terms of the GNU GPL version 2,

+# or (at your option) any later version.

+# See the COPYING file in the top-level directory.

+#

+# Copyright (c) 2017-2020 Linaro Limited

+# Written by Peter Maydell

+

+# Note that this script will automatically download and

+# run the (closed-source) coverity build tools, so don't

+# use it if you don't trust them!

+

+# This script assumes that you're running it from a QEMU source

+# tree, and that tree is a fresh clean one, because we do an in-tree

+# build. (This is necessary so that the filenames that the Coverity

+# Scan server sees are relative paths that match up with the component

+# regular expressions it uses; an out-of-tree build won't work for this.)

+# The host machine should have as many of QEMU's dependencies

+# installed as possible, for maximum coverity coverage.

+

+# To do an upload you need to be a maintainer in the Coverity online

+# service, and you will need to know the "Coverity token", which is a

+# secret 8 digit hex string. You can find that from the web UI in the

+# project settings, if you have maintainer access there.

+

+# Command line options:

+# --dry-run : run the tools, but don't actually do the upload

+# --update-tools-only : update the cached copy of the tools, but don't run them

+# --tokenfile : file to read Coverity token from

+# --version ver : specify version being analyzed (default: ask git)

+# --description desc : specify description of this version (default: ask git)

+# --srcdir : QEMU source tree to analyze (default: current working dir)

+# --results-tarball : path to copy the results tarball to (default: don't

+# copy it anywhere, just upload it)

+#

+# User-specifiable environment variables:

+# COVERITY_TOKEN -- Coverity token

+# COVERITY_EMAIL -- the email address to use for uploads (default:

+# looks at your git user.email config)

+# COVERITY_BUILD_CMD -- make command (default: 'make -jN' where N is

+# number of CPUs as determined by 'nproc')

+# COVERITY_TOOL_BASE -- set to directory to put coverity tools

+# (default: /tmp/coverity-tools)

+#

+# You must specify the token, either by environment variable or by

+# putting it in a file and using --tokenfile. Everything else has

+# a reasonable default if this is run from a git tree.

+

+check_upload_permissions() {

+ # Check whether we can do an upload to the server; will exit the script

+ # with status 1 if the check failed (usually a bad token);

+ # will exit the script with status 0 if the check indicated that we

+ # can't upload yet (ie we are at quota)

+ # Assumes that PROJTOKEN, PROJNAME and DRYRUN have been initialized.

+

+ echo "Checking upload permissions..."

+

+ if ! up_perm="$(wget https://scan.coverity.com/api/upload_permitted --post-data "token=$PROJTOKEN&project=$PROJNAME" -q -O -)"; then

+ echo "Coverity Scan API access denied: bad token?"

+ exit 1

+ fi

+

+ # Really up_perm is a JSON response with either

+ # {upload_permitted:true} or {next_upload_permitted_at:<date>}

+ # We do some hacky string parsing instead of properly parsing it.

+ case "$up_perm" in

+ *upload_permitted*true*)

+ echo "Coverity Scan: upload permitted"

+ ;;

+ *next_upload_permitted_at*)

+ if [ "$DRYRUN" = yes ]; then

+ echo "Coverity Scan: upload quota reached, continuing dry run"

+ else

+ echo "Coverity Scan: upload quota reached; stopping here"

+ # Exit success as this isn't a build error.

+ exit 0

+ fi

+ ;;

+ *)

+ echo "Coverity Scan upload check: unexpected result $up_perm"

+ exit 1

+ ;;

+ esac

+}

+

+

+update_coverity_tools () {

+ # Check for whether we need to download the Coverity tools

+ # (either because we don't have a copy, or because it's out of date)

+ # Assumes that COVERITY_TOOL_BASE, PROJTOKEN and PROJNAME are set.

+

+ mkdir -p "$COVERITY_TOOL_BASE"

+ cd "$COVERITY_TOOL_BASE"

+

+ echo "Checking for new version of coverity build tools..."

+ wget https://scan.coverity.com/download/linux64 --post-data "token=$PROJTOKEN&project=$PROJNAME&md5=1" -O coverity_tool.md5.new

+

+ if ! cmp -s coverity_tool.md5 coverity_tool.md5.new; then

+ # out of date md5 or no md5: download new build tool

+ # blow away the old build tool

+ echo "Downloading coverity build tools..."

+ rm -rf coverity_tool coverity_tool.tgz

+ wget https://scan.coverity.com/download/linux64 --post-data "token=$PROJTOKEN&project=$PROJNAME" -O coverity_tool.tgz

+ if ! (cat coverity_tool.md5.new; echo " coverity_tool.tgz") | md5sum -c --status; then

+ echo "Downloaded tarball didn't match md5sum!"

+ exit 1

+ fi

+ # extract the new one, keeping it corralled in a 'coverity_tool' directory

+ echo "Unpacking coverity build tools..."

+ mkdir -p coverity_tool

+ cd coverity_tool

+ tar xf ../coverity_tool.tgz

+ cd ..

+ mv coverity_tool.md5.new coverity_tool.md5

+ fi

+

+ rm -f coverity_tool.md5.new

+}

+

+

+# Check user-provided environment variables and arguments

+DRYRUN=no

+UPDATE_ONLY=no

+

+while [ "$#" -ge 1 ]; do

+ case "$1" in

+ --dry-run)

+ shift

+ DRYRUN=yes

+ ;;

+ --update-tools-only)

+ shift

+ UPDATE_ONLY=yes

+ ;;

+ --version)

+ shift

+ if [ $# -eq 0 ]; then

+ echo "--version needs an argument"

+ exit 1

+ fi

+ VERSION="$1"

+ shift

+ ;;

+ --description)

+ shift

+ if [ $# -eq 0 ]; then

+ echo "--description needs an argument"

+ exit 1

+ fi

+ DESCRIPTION="$1"

+ shift

+ ;;

+ --tokenfile)

+ shift

+ if [ $# -eq 0 ]; then

+ echo "--tokenfile needs an argument"

+ exit 1

+ fi

+ COVERITY_TOKEN="$(cat "$1")"

+ shift

+ ;;

+ --srcdir)

+ shift

+ if [ $# -eq 0 ]; then

+ echo "--srcdir needs an argument"

+ exit 1

+ fi

+ SRCDIR="$1"

+ shift

+ ;;

+ --results-tarball)

+ shift

+ if [ $# -eq 0 ]; then

+ echo "--results-tarball needs an argument"

+ exit 1

+ fi

+ RESULTSTARBALL="$1"

+ shift

+ ;;

+ *)

+ echo "Unexpected argument '$1'"

+ exit 1

+ ;;

+ esac

+done

+

+if [ -z "$COVERITY_TOKEN" ]; then

+ echo "COVERITY_TOKEN environment variable not set"

+ exit 1

+fi

+

+if [ -z "$COVERITY_BUILD_CMD" ]; then

+ NPROC=$(nproc)

+ COVERITY_BUILD_CMD="make -j$NPROC"

+ echo "COVERITY_BUILD_CMD: using default '$COVERITY_BUILD_CMD'"

+fi

+

+if [ -z "$COVERITY_TOOL_BASE" ]; then

+ echo "COVERITY_TOOL_BASE: using default /tmp/coverity-tools"

+ COVERITY_TOOL_BASE=/tmp/coverity-tools

+fi

+

+if [ -z "$SRCDIR" ]; then

+ SRCDIR="$PWD"

+fi

+

+PROJTOKEN="$COVERITY_TOKEN"

+PROJNAME=QEMU

+TARBALL=cov-int.tar.xz

+

+

+if [ "$UPDATE_ONLY" = yes ]; then

+ # Just do the tools update; we don't need to check whether

+ # we are in a source tree or have upload rights for this,

+ # so do it before some of the command line and source tree checks.

+ update_coverity_tools

+ exit 0

+fi

+

+cd "$SRCDIR"

+

+echo "Checking this is a QEMU source tree..."

+if ! [ -e "$SRCDIR/VERSION" ]; then

+ echo "Not in a QEMU source tree?"

+ exit 1

+fi

+

+# Fill in defaults used by the non-update-only process

+if [ -z "$VERSION" ]; then

+ VERSION="$(git describe --always HEAD)"

+fi

+

+if [ -z "$DESCRIPTION" ]; then

+ DESCRIPTION="$(git rev-parse HEAD)"

+fi

+

+if [ -z "$COVERITY_EMAIL" ]; then

+ COVERITY_EMAIL="$(git config user.email)"

+fi

+

+check_upload_permissions

+

+update_coverity_tools

+

+TOOLBIN="$(cd "$COVERITY_TOOL_BASE" && echo $PWD/coverity_tool/cov-analysis-*/bin)"

+

+if ! test -x "$TOOLBIN/cov-build"; then

+ echo "Couldn't find cov-build in the coverity build-tool directory??"

+ exit 1

+fi

+

+export PATH="$TOOLBIN:$PATH"

+

+cd "$SRCDIR"

+

+echo "Doing make distclean..."

+make distclean

+

+echo "Configuring..."

+# We configure with a fixed set of enables here to ensure that we don't

+# accidentally reduce the scope of the analysis by doing the build on

+# the system that's missing a dependency that we need to build part of

+# the codebase.

+./configure --disable-modules --enable-sdl --enable-gtk \

+ --enable-opengl --enable-vte --enable-gnutls \

+ --enable-nettle --enable-curses --enable-curl \

+ --audio-drv-list=oss,alsa,sdl,pa --enable-virtfs \

+ --enable-vnc --enable-vnc-sasl --enable-vnc-jpeg --enable-vnc-png \

+ --enable-xen --enable-brlapi \

+ --enable-linux-aio --enable-attr \

+ --enable-cap-ng --enable-trace-backends=log --enable-spice --enable-rbd \

+ --enable-xfsctl --enable-libusb --enable-usb-redir \

+ --enable-libiscsi --enable-libnfs --enable-seccomp \

+ --enable-tpm --enable-libssh --enable-lzo --enable-snappy --enable-bzip2 \

+ --enable-numa --enable-rdma --enable-smartcard --enable-virglrenderer \

+ --enable-mpath --enable-libxml2 --enable-glusterfs \

+ --enable-virtfs --enable-zstd

+

+echo "Making libqemustub.a..."

+make libqemustub.a

+

+echo "Running cov-build..."

+rm -rf cov-int

+mkdir cov-int

+cov-build --dir cov-int $COVERITY_BUILD_CMD

+

+echo "Creating results tarball..."

+tar cvf - cov-int | xz > "$TARBALL"

+

+if [ ! -z "$RESULTSTARBALL" ]; then

+ echo "Copying results tarball to $RESULTSTARBALL..."

+ cp "$TARBALL" "$RESULTSTARBALL"

+fi

+

+echo "Uploading results tarball..."

+

+if [ "$DRYRUN" = yes ]; then

+ echo "Dry run only, not uploading $TARBALL"

+ exit 0

+fi

+

+curl --form token="$PROJTOKEN" --form email="$COVERITY_EMAIL" \

+ --form file=@"$TARBALL" --form version="$VERSION" \

+ --form description="$DESCRIPTION" \

+ https://scan.coverity.com/builds?project="$PROJNAME"

+

+echo "Done."

2.20.1