[libvirt PATCH 01/10] vz: Use automatic mutex management

Signed-off-by: Tim Wiederhake <twiederh(a)redhat.com&gt; --- src/vz/vz_driver.c | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index be3e5e4b49..86bc53d631 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -169,11 +169,12 @@ vzGetDriverConnection(void) "%s", _("vz state driver is not active")); return NULL; } - virMutexLock(&vz_driver_lock); - if (!vz_driver) - vz_driver = vzDriverObjNew(); - virObjectRef(vz_driver); - virMutexUnlock(&vz_driver_lock); + + VIR_WITH_MUTEX_LOCK_GUARD(&vz_driver_lock) { + if (!vz_driver) + vz_driver = vzDriverObjNew(); + virObjectRef(vz_driver); + } return vz_driver; } @@ -181,13 +182,13 @@ vzGetDriverConnection(void) void vzDestroyDriverConnection(void) { - struct _vzDriver *driver; - struct _vzConn *privconn_list; + struct _vzDriver *driver = NULL; + struct _vzConn *privconn_list = NULL; - virMutexLock(&vz_driver_lock); - driver = g_steal_pointer(&vz_driver); - privconn_list = g_steal_pointer(&vz_conn_list); - virMutexUnlock(&vz_driver_lock); + VIR_WITH_MUTEX_LOCK_GUARD(&vz_driver_lock) { + driver = g_steal_pointer(&vz_driver); + privconn_list = g_steal_pointer(&vz_conn_list); + } while (privconn_list) { struct _vzConn *privconn = privconn_list; @@ -382,10 +383,10 @@ vzConnectOpen(virConnectPtr conn, if (!(privconn->closeCallback = virNewConnectCloseCallbackData())) goto error; - virMutexLock(&vz_driver_lock); - privconn->next = vz_conn_list; - vz_conn_list = privconn; - virMutexUnlock(&vz_driver_lock); + VIR_WITH_MUTEX_LOCK_GUARD(&vz_driver_lock) { + privconn->next = vz_conn_list; + vz_conn_list = privconn; + } return VIR_DRV_OPEN_SUCCESS; @@ -407,16 +408,15 @@ vzConnectClose(virConnectPtr conn) if (!privconn) return 0; - virMutexLock(&vz_driver_lock); - for (curr = vz_conn_list; curr; prev = &curr->next, curr = curr->next) { - if (curr == privconn) { - *prev = curr->next; - break; + VIR_WITH_MUTEX_LOCK_GUARD(&vz_driver_lock) { + for (curr = vz_conn_list; curr; prev = &curr->next, curr = curr->next) { + if (curr == privconn) { + *prev = curr->next; + break; + } } } - virMutexUnlock(&vz_driver_lock); - virObjectUnref(privconn->closeCallback); virObjectUnref(privconn->driver); VIR_FREE(privconn); -- 2.31.1