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

queue was convenient for these last minute bits and pieces

for 5.0...

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

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.

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

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.

scripts/kernel-doc | 2 +-

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;

    }

The documentation of our -s and -gdb options is quite old; in

particular it still claims that it will cause QEMU to stop and wait

for the gdb connection, when this has not been true for some time:

you also need to pass -S if you want to make QEMU not launch the

guest on startup.

Improve the documentation to mention this requirement in the

executable's --help output, the documentation of the -gdb option in

the manual, and in the "GDB usage" chapter.

Includes some minor tweaks to these paragraphs of documentation

since I was editing them anyway (such as dropping the description

of our gdb support as "primitive").

Message-id: 20200403094014.9589-1-peter.maydell@linaro.org

docs/system/gdb.rst | 22 +++++++++++++++-------

qemu-options.hx | 24 ++++++++++++++++++------

2 files changed, 33 insertions(+), 13 deletions(-)

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

--- a/docs/system/gdb.rst

+++ b/docs/system/gdb.rst

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

GDB usage

---------

-QEMU has a primitive support to work with gdb, so that you can do

-'Ctrl-C' while the virtual machine is running and inspect its state.

+QEMU supports working with gdb via gdb's remote-connection facility

+(the "gdbstub"). This allows you to debug guest code in the same

+way that you might with a low-level debug facility like JTAG

+on real hardware. You can stop and start the virtual machine,

+examine state like registers and memory, and set breakpoints and

+watchpoints.

-In order to use gdb, launch QEMU with the '-s' option. It will wait for

-a gdb connection:

+In order to use gdb, launch QEMU with the ``-s`` and ``-S`` options.

+The ``-s`` option will make QEMU listen for an incoming connection

+from gdb on TCP port 1234, and ``-S`` will make QEMU not start the

+guest until you tell it to from gdb. (If you want to specify which

+TCP port to use or to use something other than TCP for the gdbstub

+connection, use the ``-gdb dev`` option instead of ``-s``.)

.. parsed-literal::

- |qemu_system| -s -kernel bzImage -hda rootdisk.img -append "root=/dev/hda"

- Connected to host network interface: tun0

- Waiting gdb connection on port 1234

+ |qemu_system| -s -S -kernel bzImage -hda rootdisk.img -append "root=/dev/hda"

+

+QEMU will launch but will silently wait for gdb to connect.

Then launch gdb on the 'vmlinux' executable::

diff --git a/qemu-options.hx b/qemu-options.hx

index XXXXXXX..XXXXXXX 100644

--- a/qemu-options.hx

+++ b/qemu-options.hx

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

ERST

DEF("gdb", HAS_ARG, QEMU_OPTION_gdb, \

- "-gdb dev wait for gdb connection on 'dev'\n", QEMU_ARCH_ALL)

+ "-gdb dev accept gdb connection on 'dev'. (QEMU defaults to starting\n"

+ " the guest without waiting for gdb to connect; use -S too\n"

+ " if you want it to not start execution.)\n",

+ QEMU_ARCH_ALL)

SRST

``-gdb dev``

- Wait for gdb connection on device dev (see

- :ref:`gdb_005fusage`). Typical connections will likely be

- TCP-based, but also UDP, pseudo TTY, or even stdio are reasonable

- use case. The latter is allowing to start QEMU from within gdb and

- establish the connection via a pipe:

+ Accept a gdb connection on device dev (see

+ :ref:`gdb_005fusage`). Note that this option does not pause QEMU

+ execution -- if you want QEMU to not start the guest until you

+ connect with gdb and issue a ``continue`` command, you will need to

+ also pass the ``-S`` option to QEMU.

+

+ The most usual configuration is to listen on a local TCP socket::

+

+ -gdb tcp::3117

+

+ but you can specify other backends; UDP, pseudo TTY, or even stdio

+ are all reasonable use cases. For example, a stdio connection

+ allows you to start QEMU from within gdb and establish the

+ connection via a pipe:

.. parsed-literal::

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.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

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

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

@@ -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

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); \

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: Richard Henderson <richard.henderson@linaro.org>

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

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

include/qemu/thread.h | 2 +-

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__);

#else

#define qemu_mutex_lock(m) ({ \

QemuMutexLockFunc _f = atomic_read(&qemu_mutex_lock_func); \

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