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

When kernel-doc generates a 'c:function' directive for a function

one of whose arguments is a function pointer, it fails to print

the close-paren after the argument list of the function pointer

argument, for instance in the memory API documentation:

.. c:function:: void memory_region_init_resizeable_ram (MemoryRegion * mr, struct Object * owner, const char * name, uint64_t size, uint64_t max_size, void (*resized) (const char*, uint64_t length, void *host, Error ** errp)

which should have a ')' after the 'void *host' which is the

last argument to 'resized'.

Older versions of Sphinx don't try to parse the argumnet

to c:function, but Sphinx 3.0 does do this and will complain:

/home/petmay01/linaro/qemu-from-laptop/qemu/docs/../include/exec/memory.h:834: WARNING: Error in declarator or parameters

Invalid C declaration: Expecting "," or ")" in parameters, got "EOF". [error at 208]

void memory_region_init_resizeable_ram (MemoryRegion * mr, struct Object * owner, const char * name, uint64_t size, uint64_t max_size, void (*resized) (const char*, uint64_t length, void *host, Error ** errp)

----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------^

Add the missing close-paren.

Message-id: 20200411182934.28678-3-peter.maydell@linaro.org

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>

scripts/kernel-doc | 2 +-

1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/kernel-doc b/scripts/kernel-doc

index XXXXXXX..XXXXXXX 100755

--- a/scripts/kernel-doc

+++ b/scripts/kernel-doc

@@ -XXX,XX +XXX,XX @@ sub output_function_rst(%) {

    if ($type =~ m/([^\(]*\(\*)\s*\)\s*\(([^\)]*)\)/) {

     # pointer-to-function

-     print $1 . $parameter . ") (" . $2;

+     print $1 . $parameter . ") (" . $2 . ")";

    } else {

     print $type . " " . $parameter;

    }

2.20.1

The target_flat.h file is a QEMU header, so we should include it using

quotes, not angle brackets.

Coverity otherwise is unable to find the header:

"../linux-user/flatload.c", line 40: error #1712: cannot open source file

"target_flat.h"

#include <target_flat.h>

^

because the relevant directory is only on the -iquote path, not the -I path.

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

Message-id: 20200319193323.2038-5-peter.maydell@linaro.org

linux-user/flatload.c | 2 +-

diff --git a/linux-user/flatload.c b/linux-user/flatload.c

--- a/linux-user/flatload.c

+++ b/linux-user/flatload.c

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

#include "qemu.h"

#include "flat.h"

-#include <target_flat.h>

+#include "target_flat.h"

//#define DEBUG

2.20.1

The Linux kernel has dropped support for allowing 32-bit Arm systems

to host KVM guests (kernel commit 541ad0150ca4aa663a2, which just

landed upstream in the 5.7 merge window). Mark QEMU's support for

this configuration as deprecated, so that we can delete that support

code in 5.2.

Reviewed-by: Andrew Jones <drjones@redhat.com>

docs/system/deprecated.rst | 8 ++++++++

1 file changed, 8 insertions(+)

diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst

--- a/docs/system/deprecated.rst

+++ b/docs/system/deprecated.rst

@@ -XXX,XX +XXX,XX @@ The ``compat`` property used to set backwards compatibility modes for

the processor has been deprecated. The ``max-cpu-compat`` property of

the ``pseries`` machine type should be used instead.

+KVM guest support on 32-bit Arm hosts (since 5.0)

+'''''''''''''''''''''''''''''''''''''''''''''''''

+

+The Linux kernel has dropped support for allowing 32-bit Arm systems

+to host KVM guests as of the 5.7 kernel. Accordingly, QEMU is deprecating

+its support for this configuration and will remove it in a future version.

+Running 32-bit guests on a 64-bit Arm host remains supported.

+

System emulator devices

-----------------------

2.20.1

Versions of Sphinx older than 1.6 can't build all of our documentation,

because they are too picky about the syntax of the argument to the

option:: directive; see Sphinx bugs #646, #3366:

https://github.com/sphinx-doc/sphinx/issues/646

https://github.com/sphinx-doc/sphinx/issues/3366

Trying to build with a 1.4.x Sphinx fails with

docs/system/images.rst:4: SEVERE: Duplicate ID: "cmdoption-qcow2-arg-encrypt"

and a 1.5.x Sphinx fails with

docs/system/invocation.rst:544: WARNING: Malformed option description '[enable=]PATTERN', should look like "opt", "-opt

args", "--opt args", "/opt args" or "+opt args"

Update our needs_sphinx setting to indicate that we require at least

1.6. This will allow configure to fall back to "don't build the

docs" rather than causing the build to fail entirely, which is

probably what most users building on a host old enough to have such

an old Sphinx would want; if they do want the docs then they'll have

a useful indication of what they need to do (upgrade Sphinx!) rather

than a confusing error message.

In theory our distro support policy would suggest that we should

support building on the Sphinx shipped in those distros, but:

* EPEL7 has Sphinx 1.2.3 (which we've never supported!)

* Debian Stretch has Sphinx 1.4.8

Trying to get our docs to work with Sphinx 1.4 is not tractable

for the 5.0 release and I'm not sure it's worthwhile effort anyway;

at least with this change the build as a whole now succeeds.

Thanks to John Snow for doing the investigation and testing to

confirm what Sphinx versions fail in what ways and what distros

shipped what.

docs/conf.py | 6 ++++--

1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py

--- a/docs/conf.py

+++ b/docs/conf.py

@@ -XXX,XX +XXX,XX @@ sys.path.insert(0, os.path.join(qemu_docdir, "sphinx"))

# If your documentation needs a minimal Sphinx version, state it here.

#

-# 1.3 is where the 'alabaster' theme was shipped with Sphinx.

-needs_sphinx = '1.3'

+# Sphinx 1.5 and earlier can't build our docs because they are too

+# picky about the syntax of the argument to the option:: directive

+# (see Sphinx bugs #646, #3366).

+needs_sphinx = '1.6'

# Add any Sphinx extension module names here, as strings. They can be

# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom

2.20.1

All the Coverity-specific definitions of qemu_mutex_lock() and friends

have a trailing semicolon. This works fine almost everywhere because

of QEMU's mandatory-braces coding style and because most callsites are

simple, but target/s390x/sigp.c has a use of qemu_mutex_trylock() as

an if() statement, which makes the ';' a syntax error:

"../target/s390x/sigp.c", line 461: warning #18: expected a ")"

if (qemu_mutex_trylock(&qemu_sigp_mutex)) {

^

Remove the bogus semicolons from the macro definitions.

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

Message-id: 20200319193323.2038-4-peter.maydell@linaro.org

include/qemu/thread.h | 12 ++++++------

1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/qemu/thread.h b/include/qemu/thread.h

--- a/include/qemu/thread.h

+++ b/include/qemu/thread.h

@@ -XXX,XX +XXX,XX @@ extern QemuCondTimedWaitFunc qemu_cond_timedwait_func;

* hide them.

*/

#define qemu_mutex_lock(m) \

- qemu_mutex_lock_impl(m, __FILE__, __LINE__);

+ qemu_mutex_lock_impl(m, __FILE__, __LINE__)

#define qemu_mutex_trylock(m) \

- qemu_mutex_trylock_impl(m, __FILE__, __LINE__);

+ qemu_mutex_trylock_impl(m, __FILE__, __LINE__)

#define qemu_rec_mutex_lock(m) \

- qemu_rec_mutex_lock_impl(m, __FILE__, __LINE__);

+ qemu_rec_mutex_lock_impl(m, __FILE__, __LINE__)

#define qemu_rec_mutex_trylock(m) \

- qemu_rec_mutex_trylock_impl(m, __FILE__, __LINE__);

+ qemu_rec_mutex_trylock_impl(m, __FILE__, __LINE__)

#define qemu_cond_wait(c, m) \

- qemu_cond_wait_impl(c, m, __FILE__, __LINE__);

+ qemu_cond_wait_impl(c, m, __FILE__, __LINE__)

#define qemu_cond_timedwait(c, m, ms) \

- qemu_cond_timedwait_impl(c, m, ms, __FILE__, __LINE__);

+ qemu_cond_timedwait_impl(c, m, ms, __FILE__, __LINE__)

#else

#define qemu_mutex_lock(m) ({ \

QemuMutexLockFunc _f = atomic_read(&qemu_mutex_lock_func); \

2.20.1

For Coverity's benefit, we provide simpler versions of functions like

qemu_mutex_lock(), qemu_cond_wait() and qemu_cond_timedwait(). When

we added qemu_cond_timedwait() in commit 3dcc9c6ec4ea, a cut and

paste error meant that the Coverity version of qemu_cond_timedwait()

was using the wrong _impl function, which makes the Coverity parser

complain:

"/qemu/include/qemu/thread.h", line 159: warning #140: too many arguments in

function call

return qemu_cond_timedwait(cond, mutex, ms);

^

"/qemu/include/qemu/thread.h", line 159: warning #120: return value type does

not match the function type

return qemu_cond_timedwait(cond, mutex, ms);

^

"/qemu/include/qemu/thread.h", line 156: warning #1563: function

"qemu_cond_timedwait" not emitted, consider modeling it or review

parse diagnostics to improve fidelity

static inline bool (qemu_cond_timedwait)(QemuCond *cond, QemuMutex *mutex,

^

These aren't fatal, but reduce the scope of the analysis. Fix the error.

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

Message-id: 20200319193323.2038-3-peter.maydell@linaro.org

include/qemu/thread.h | 2 +-

1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/qemu/thread.h b/include/qemu/thread.h

--- a/include/qemu/thread.h

+++ b/include/qemu/thread.h

@@ -XXX,XX +XXX,XX @@ extern QemuCondTimedWaitFunc qemu_cond_timedwait_func;

#define qemu_cond_wait(c, m) \

qemu_cond_wait_impl(c, m, __FILE__, __LINE__);

#define qemu_cond_timedwait(c, m, ms) \

- qemu_cond_wait_impl(c, m, ms, __FILE__, __LINE__);

+ qemu_cond_timedwait_impl(c, m, ms, __FILE__, __LINE__);

#define qemu_mutex_lock(m) ({ \

QemuMutexLockFunc _f = atomic_read(&qemu_mutex_lock_func); \

2.20.1

If we are not making warnings fatal for compilation, make them

non-fatal when building the Sphinx documentation also. (For instance

Sphinx 3.0 warns about some constructs that older versions were happy

with, which is a build failure if we use the warnings-as-errors

flag.)

This provides a workaround at least for LP:1872113.

Message-id: 20200411182934.28678-2-peter.maydell@linaro.org

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>

configure | 9 ++++++++-

Makefile | 2 +-

2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/configure b/configure

index XXXXXXX..XXXXXXX 100755

--- a/configure

+++ b/configure

@@ -XXX,XX +XXX,XX @@ if check_include sys/kcov.h ; then

kcov=yes

fi

+# If we're making warnings fatal, apply this to Sphinx runs as well

+sphinx_werror=""

+if test "$werror" = "yes"; then

+ sphinx_werror="-W"

+fi

# Check we have a new enough version of sphinx-build

has_sphinx_build() {

# This is a bit awkward but works: create a trivial document and

@@ -XXX,XX +XXX,XX @@ has_sphinx_build() {

# sphinx-build doesn't exist at all or if it is too old.

mkdir -p "$TMPDIR1/sphinx"

touch "$TMPDIR1/sphinx/index.rst"

- "$sphinx_build" -c "$source_path/docs" -b html "$TMPDIR1/sphinx" "$TMPDIR1/sphinx/out" >/dev/null 2>&1

+ "$sphinx_build" $sphinx_werror -c "$source_path/docs" -b html "$TMPDIR1/sphinx" "$TMPDIR1/sphinx/out" >/dev/null 2>&1

# Check if tools are available to build documentation.

@@ -XXX,XX +XXX,XX @@ echo "INSTALL_PROG=$install -c -m 0755" >> $config_host_mak

echo "INSTALL_LIB=$install -c -m 0644" >> $config_host_mak

echo "PYTHON=$python" >> $config_host_mak

echo "SPHINX_BUILD=$sphinx_build" >> $config_host_mak

+echo "SPHINX_WERROR=$sphinx_werror" >> $config_host_mak

echo "GENISOIMAGE=$genisoimage" >> $config_host_mak

echo "CC=$cc" >> $config_host_mak

if $iasl -h > /dev/null 2>&1; then

diff --git a/Makefile b/Makefile

--- a/Makefile

+++ b/Makefile

@@ -XXX,XX +XXX,XX @@ sphinxdocs: $(MANUAL_BUILDDIR)/devel/index.html \

# Note the use of different doctree for each (manual, builder) tuple;

# this works around Sphinx not handling parallel invocation on

# a single doctree: https://github.com/sphinx-doc/sphinx/issues/2946

-build-manual = $(call quiet-command,CONFDIR="$(qemu_confdir)" $(SPHINX_BUILD) $(if $(V),,-q) -W -b $2 -D version=$(VERSION) -D release="$(FULL_VERSION)" -d .doctrees/$1-$2 $(SRC_PATH)/docs/$1 $(MANUAL_BUILDDIR)/$1 ,"SPHINX","$(MANUAL_BUILDDIR)/$1")

+build-manual = $(call quiet-command,CONFDIR="$(qemu_confdir)" $(SPHINX_BUILD) $(if $(V),,-q) $(SPHINX_WERROR) -b $2 -D version=$(VERSION) -D release="$(FULL_VERSION)" -d .doctrees/$1-$2 $(SRC_PATH)/docs/$1 $(MANUAL_BUILDDIR)/$1 ,"SPHINX","$(MANUAL_BUILDDIR)/$1")

# We assume all RST files in the manual's directory are used in it

manual-deps = $(wildcard $(SRC_PATH)/docs/$1/*.rst $(SRC_PATH)/docs/$1/*/*.rst) \

$(SRC_PATH)/docs/defs.rst.inc \

2.20.1

The kernel-doc Sphinx plugin and associated script currently emit

'c:type' directives for "struct foo" documentation.

Sphinx 3.0 warns about this:

/home/petmay01/linaro/qemu-from-laptop/qemu/docs/../include/exec/memory.h:3: WARNING: Type must be either just a name or a typedef-like declaration.

If just a name:

Error in declarator or parameters

Invalid C declaration: Expected identifier in nested name, got keyword: struct [error at 6]

struct MemoryListener

------^

If typedef-like declaration:

Error in declarator or parameters

Invalid C declaration: Expected identifier in nested name. [error at 21]

struct MemoryListener

---------------------^

because it wants us to use the new-in-3.0 'c:struct' instead.

Plumb the Sphinx version through to the kernel-doc script

and use it to select 'c:struct' for newer versions than 3.0.

Fixes: LP:1872113

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

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>

---

docs/sphinx/kerneldoc.py | 1 +

scripts/kernel-doc | 16 +++++++++++++++-

2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/docs/sphinx/kerneldoc.py b/docs/sphinx/kerneldoc.py

--- a/docs/sphinx/kerneldoc.py

+++ b/docs/sphinx/kerneldoc.py

@@ -XXX,XX +XXX,XX @@ class KernelDocDirective(Directive):

env.note_dependency(os.path.abspath(f))

cmd += ['-export-file', f]

+ cmd += ['-sphinx-version', sphinx.__version__]

cmd += [filename]

try:

diff --git a/scripts/kernel-doc b/scripts/kernel-doc

index XXXXXXX..XXXXXXX 100755

--- a/scripts/kernel-doc

+++ b/scripts/kernel-doc

@@ -XXX,XX +XXX,XX @@ Output selection (mutually exclusive):

            DOC: sections. May be specified multiple times.

Output selection modifiers:

+ -sphinx-version VER Generate rST syntax for the specified Sphinx version.

+ Only works with reStructuredTextFormat.

-no-doc-sections    Do not output DOC: sections.

-enable-lineno Enable output of #define LINENO lines. Only works with

reStructuredText format.

@@ -XXX,XX +XXX,XX @@ use constant {

};

my $output_selection = OUTPUT_ALL;

my $show_not_found = 0;    # No longer used

+my $sphinx_version = "0.0"; # if not specified, assume old

my @export_file_list;

@@ -XXX,XX +XXX,XX @@ while ($ARGV[0] =~ m/^--?(.*)/) {

     $enable_lineno = 1;

} elsif ($cmd eq 'show-not-found') {

    $show_not_found = 1; # A no-op but don't fail

+ } elsif ($cmd eq 'sphinx-version') {

+ $sphinx_version = shift @ARGV;

} else {

    # Unknown argument

usage();

@@ -XXX,XX +XXX,XX @@ sub output_struct_rst(%) {

my $oldprefix = $lineprefix;

my $name = $args{'type'} . " " . $args{'struct'};

- print "\n\n.. c:type:: " . $name . "\n\n";

+ # Sphinx 3.0 and up will emit warnings for "c:type:: struct Foo".

+ # It wants to see "c:struct:: Foo" (and will add the word 'struct' in

+ # the rendered output).

+ if ((split(/\./, $sphinx_version))[0] >= 3) {

+ my $sname = $name;

+ $sname =~ s/^struct //;

+ print "\n\n.. c:struct:: " . $sname . "\n\n";

+ } else {

+ print "\n\n.. c:type:: " . $name . "\n\n";

+ }

print_lineno($declaration_start_line);

$lineprefix = " ";

output_highlight_rst($args{'purpose'});

2.20.1

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