The following changes since commit 9af638cc1f665712522608c5d6b8c03d8fa67666:

Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20200504' into staging (2020-05-04 13:37:17 +0100)

are available in the Git repository at:

https://github.com/stefanha/qemu.git tags/block-pull-request

for you to fetch changes up to 08b689aa6b521964b8275dd7a2564aefa5d68129:

lockable: Replace locks with lock guard macros (2020-05-04 16:07:43 +0100)

Pull request

v2:

* Fixed stray slirp submodule change [Peter]

Fixes for the lock guard macros, code conversions to the lock guard macros, and

support for selecting fuzzer targets with argv[0].

Alexander Bulekov (1):

fuzz: select fuzz target using executable name

Daniel Brodsky (2):

lockable: fix __COUNTER__ macro to be referenced properly

lockable: replaced locks with lock guard macros where appropriate

Simran Singhal (1):

lockable: Replace locks with lock guard macros

include/qemu/lockable.h | 7 +++---

include/qemu/rcu.h | 2 +-

block/iscsi.c | 7 ++----

block/nfs.c | 51 +++++++++++++++++++----------------------

cpus-common.c | 14 ++++-------

hw/display/qxl.c | 43 ++++++++++++++++------------------

hw/hyperv/hyperv.c | 15 ++++++------

hw/rdma/rdma_backend.c | 50 ++++++++++++++++++++--------------------

hw/rdma/rdma_rm.c | 3 +--

hw/vfio/platform.c | 5 ++--

migration/migration.c | 3 +--

migration/multifd.c | 8 +++----

migration/ram.c | 3 +--

monitor/misc.c | 4 +---

tests/qtest/fuzz/fuzz.c | 19 ++++++++-------

ui/spice-display.c | 14 +++++------

util/log.c | 4 ++--

util/qemu-timer.c | 17 +++++++-------

util/rcu.c | 8 +++----

util/thread-pool.c | 3 +--

util/vfio-helpers.c | 5 ++--

21 files changed, 132 insertions(+), 153 deletions(-)

2.25.3

From: Simran Singhal <singhalsimran0@gmail.com>

Replace manual lock()/unlock() calls with lock guard macros

(QEMU_LOCK_GUARD/WITH_QEMU_LOCK_GUARD).

Signed-off-by: Simran Singhal <singhalsimran0@gmail.com>

Reviewed-by: Yuval Shaia <yuval.shaia.ml@gmail.com>

Reviewed-by: Marcel Apfelbaum<marcel.apfelbaum@gmail.com>

Tested-by: Yuval Shaia <yuval.shaia.ml@gmail.com>

Message-id: 20200402065035.GA15477@simran-Inspiron-5558

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>

---

hw/hyperv/hyperv.c | 15 ++++++-------

hw/rdma/rdma_backend.c | 50 +++++++++++++++++++++---------------------

hw/rdma/rdma_rm.c | 3 +--

3 files changed, 33 insertions(+), 35 deletions(-)

diff --git a/hw/hyperv/hyperv.c b/hw/hyperv/hyperv.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/hyperv/hyperv.c

+++ b/hw/hyperv/hyperv.c

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

#include "sysemu/kvm.h"

#include "qemu/bitops.h"

#include "qemu/error-report.h"

+#include "qemu/lockable.h"

#include "qemu/queue.h"

#include "qemu/rcu.h"

#include "qemu/rcu_queue.h"

@@ -XXX,XX +XXX,XX @@ int hyperv_set_msg_handler(uint32_t conn_id, HvMsgHandler handler, void *data)

int ret;

MsgHandler *mh;

- qemu_mutex_lock(&handlers_mutex);

+ QEMU_LOCK_GUARD(&handlers_mutex);

QLIST_FOREACH(mh, &msg_handlers, link) {

if (mh->conn_id == conn_id) {

if (handler) {

@@ -XXX,XX +XXX,XX @@ int hyperv_set_msg_handler(uint32_t conn_id, HvMsgHandler handler, void *data)

g_free_rcu(mh, rcu);

ret = 0;

}

- goto unlock;

+ return ret;

}

}

@@ -XXX,XX +XXX,XX @@ int hyperv_set_msg_handler(uint32_t conn_id, HvMsgHandler handler, void *data)

} else {

ret = -ENOENT;

}

-unlock:

- qemu_mutex_unlock(&handlers_mutex);

+

return ret;

}

@@ -XXX,XX +XXX,XX @@ static int set_event_flag_handler(uint32_t conn_id, EventNotifier *notifier)

int ret;

EventFlagHandler *handler;

- qemu_mutex_lock(&handlers_mutex);

+ QEMU_LOCK_GUARD(&handlers_mutex);

QLIST_FOREACH(handler, &event_flag_handlers, link) {

if (handler->conn_id == conn_id) {

if (notifier) {

@@ -XXX,XX +XXX,XX @@ static int set_event_flag_handler(uint32_t conn_id, EventNotifier *notifier)

g_free_rcu(handler, rcu);

ret = 0;

}

- goto unlock;

+ return ret;

}

}

@@ -XXX,XX +XXX,XX @@ static int set_event_flag_handler(uint32_t conn_id, EventNotifier *notifier)

} else {

ret = -ENOENT;

}

-unlock:

- qemu_mutex_unlock(&handlers_mutex);

+

return ret;

}

diff --git a/hw/rdma/rdma_backend.c b/hw/rdma/rdma_backend.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/rdma/rdma_backend.c

+++ b/hw/rdma/rdma_backend.c

@@ -XXX,XX +XXX,XX @@ static int rdma_poll_cq(RdmaDeviceResources *rdma_dev_res, struct ibv_cq *ibcq)

struct ibv_wc wc[2];

RdmaProtectedGSList *cqe_ctx_list;

- qemu_mutex_lock(&rdma_dev_res->lock);

- do {

- ne = ibv_poll_cq(ibcq, ARRAY_SIZE(wc), wc);

+ WITH_QEMU_LOCK_GUARD(&rdma_dev_res->lock) {

+ do {

+ ne = ibv_poll_cq(ibcq, ARRAY_SIZE(wc), wc);

- trace_rdma_poll_cq(ne, ibcq);

+ trace_rdma_poll_cq(ne, ibcq);

- for (i = 0; i < ne; i++) {

- bctx = rdma_rm_get_cqe_ctx(rdma_dev_res, wc[i].wr_id);

- if (unlikely(!bctx)) {

- rdma_error_report("No matching ctx for req %"PRId64,

- wc[i].wr_id);

- continue;

- }

+ for (i = 0; i < ne; i++) {

+ bctx = rdma_rm_get_cqe_ctx(rdma_dev_res, wc[i].wr_id);

+ if (unlikely(!bctx)) {

+ rdma_error_report("No matching ctx for req %"PRId64,

+ wc[i].wr_id);

+ continue;

+ }

- comp_handler(bctx->up_ctx, &wc[i]);

+ comp_handler(bctx->up_ctx, &wc[i]);

- if (bctx->backend_qp) {

- cqe_ctx_list = &bctx->backend_qp->cqe_ctx_list;

- } else {

- cqe_ctx_list = &bctx->backend_srq->cqe_ctx_list;

- }

+ if (bctx->backend_qp) {

+ cqe_ctx_list = &bctx->backend_qp->cqe_ctx_list;

+ } else {

+ cqe_ctx_list = &bctx->backend_srq->cqe_ctx_list;

+ }

- rdma_protected_gslist_remove_int32(cqe_ctx_list, wc[i].wr_id);

- rdma_rm_dealloc_cqe_ctx(rdma_dev_res, wc[i].wr_id);

- g_free(bctx);

- }

- total_ne += ne;

- } while (ne > 0);

- atomic_sub(&rdma_dev_res->stats.missing_cqe, total_ne);

- qemu_mutex_unlock(&rdma_dev_res->lock);

+ rdma_protected_gslist_remove_int32(cqe_ctx_list, wc[i].wr_id);

+ rdma_rm_dealloc_cqe_ctx(rdma_dev_res, wc[i].wr_id);

+ g_free(bctx);

+ }

+ total_ne += ne;

+ } while (ne > 0);

+ atomic_sub(&rdma_dev_res->stats.missing_cqe, total_ne);

+ }

if (ne < 0) {

rdma_error_report("ibv_poll_cq fail, rc=%d, errno=%d", ne, errno);

diff --git a/hw/rdma/rdma_rm.c b/hw/rdma/rdma_rm.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/rdma/rdma_rm.c

+++ b/hw/rdma/rdma_rm.c

@@ -XXX,XX +XXX,XX @@ static inline void rdma_res_tbl_dealloc(RdmaRmResTbl *tbl, uint32_t handle)

{

trace_rdma_res_tbl_dealloc(tbl->name, handle);

- qemu_mutex_lock(&tbl->lock);

+ QEMU_LOCK_GUARD(&tbl->lock);

if (handle < tbl->tbl_sz) {

clear_bit(handle, tbl->bitmap);

tbl->used--;

}

- qemu_mutex_unlock(&tbl->lock);

}

int rdma_rm_alloc_pd(RdmaDeviceResources *dev_res, RdmaBackendDev *backend_dev,

--

2.25.3