External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-05 22:05:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

vz: Use automatic mutex management

Browse Source 
Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Tim Wiederhake 2022-02-07 14:22:32 +01:00
parent a7d77e2587
commit 5305908789
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/vz/vz_driver.c
View File

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