On 3/19/20 8:33 PM, Peter Maydell wrote:
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.mayd...@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 047db0307e7..10262c63f58 100644
--- a/include/qemu/thread.h
+++ b/include/qemu/thread.h
@@ -67,7 +67,7 @@ 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);  \


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


Reply via email to