From: Nikolay Shirokovskiy <nshirokovskiy@virtuozzo.com>
Date: Wed, 17 Feb 2016 12:14:58 +0000 (+0300)
Subject: close callback API: remove unnecessary locks
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=fa8c1645015af04e0838f71e573115c1c472d471;p=libvirt.git

close callback API: remove unnecessary locks

closeCallback pointer is immutable (set on connection object creation)
and self-locking.
---

diff --git a/src/libvirt-host.c b/src/libvirt-host.c
index ced6a549a2..b0597ee2fb 100644
--- a/src/libvirt-host.c
+++ b/src/libvirt-host.c
@@ -1214,10 +1214,7 @@ virConnectRegisterCloseCallback(virConnectPtr conn,
     VIR_DEBUG("conn=%p", conn);
 
     virResetLastError();
-
     virCheckConnectReturn(conn, -1);
-    virObjectLock(conn);
-
     virCheckNonNullArgGoto(cb, error);
 
     if (virConnectCloseCallbackDataGetCallback(conn->closeCallback) != NULL) {
@@ -1229,11 +1226,9 @@ virConnectRegisterCloseCallback(virConnectPtr conn,
     virConnectCloseCallbackDataRegister(conn->closeCallback, conn, cb,
                                         opaque, freecb);
 
-    virObjectUnlock(conn);
     return 0;
 
  error:
-    virObjectUnlock(conn);
     virDispatchError(conn);
     return -1;
 }
@@ -1259,10 +1254,7 @@ virConnectUnregisterCloseCallback(virConnectPtr conn,
     VIR_DEBUG("conn=%p", conn);
 
     virResetLastError();
-
     virCheckConnectReturn(conn, -1);
-    virObjectLock(conn);
-
     virCheckNonNullArgGoto(cb, error);
 
     if (virConnectCloseCallbackDataGetCallback(conn->closeCallback) != cb) {
@@ -1273,11 +1265,9 @@ virConnectUnregisterCloseCallback(virConnectPtr conn,
 
     virConnectCloseCallbackDataUnregister(conn->closeCallback, cb);
 
-    virObjectUnlock(conn);
     return 0;
 
  error:
-    virObjectUnlock(conn);
     virDispatchError(conn);
     return -1;
 }