In commit a1a98357e3fd in 2018 we added some workarounds for Coverity

not being able to handle the _Float* types introduced by recent

glibc. Newer versions of the Coverity scan tools have support for

these types, and will fail with errors about duplicate typedefs if we

have our workaround. Remove our copy of the typedefs.

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

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

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

---

include/qemu/osdep.h | 14 --------------

1 file changed, 14 deletions(-)

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

index XXXXXXX..XXXXXXX 100644

--- a/include/qemu/osdep.h

+++ b/include/qemu/osdep.h

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

#else

#include "exec/poison.h"

#endif

-#ifdef __COVERITY__

-/* Coverity does not like the new _Float* types that are used by

- * recent glibc, and croaks on every single file that includes

- * stdlib.h. These typedefs are enough to please it.

- *

- * Note that these fix parse errors so they cannot be placed in

- * scripts/coverity-model.c.

- */

-typedef float _Float32;

-typedef double _Float32x;

-typedef double _Float64;

-typedef __float80 _Float64x;

-typedef __float128 _Float128;

-#endif

#include "qemu/compiler.h"

--

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.

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

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

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

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

index XXXXXXX..XXXXXXX 100644

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

--

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.

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

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

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

index XXXXXXX..XXXXXXX 100644

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

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.

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

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

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

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

---

linux-user/flatload.c | 2 +-

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

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

index XXXXXXX..XXXXXXX 100644

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

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.

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

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

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

index XXXXXXX..XXXXXXX 100644

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

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.

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

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

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

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

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