From: Nikolay Shirokovskiy <nshirokovskiy@virtuozzo.com>
Date: Tue, 14 Jun 2016 08:45:53 +0000 (+0300)
Subject: vz: restore accidentally removed locks around close callback calls
X-Git-Tag: v2.1.0-rc1~116
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1e697ac9f30274ce705af44b1da69a0e875cab56;p=thirdparty%2Flibvirt.git

vz: restore accidentally removed locks around close callback calls

Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy@virtuozzo.com>
---

diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c
index 6fb622293b..6d48dc4dec 100644
--- a/src/vz/vz_driver.c
+++ b/src/vz/vz_driver.c
@@ -1514,6 +1514,8 @@ vzConnectRegisterCloseCallback(virConnectPtr conn,
     vzConnPtr privconn = conn->privateData;
     int ret = -1;
 
+    virObjectLock(privconn->driver);
+
     if (virConnectCloseCallbackDataGetCallback(privconn->closeCallback) != NULL) {
         virReportError(VIR_ERR_OPERATION_INVALID, "%s",
                        _("A close callback is already registered"));
@@ -1525,6 +1527,7 @@ vzConnectRegisterCloseCallback(virConnectPtr conn,
     ret = 0;
 
  cleanup:
+    virObjectUnlock(privconn->driver);
 
     return ret;
 }
@@ -1535,6 +1538,7 @@ vzConnectUnregisterCloseCallback(virConnectPtr conn, virConnectCloseFunc cb)
     vzConnPtr privconn = conn->privateData;
     int ret = -1;
 
+    virObjectLock(privconn->driver);
 
     if (virConnectCloseCallbackDataGetCallback(privconn->closeCallback) != cb) {
         virReportError(VIR_ERR_OPERATION_INVALID, "%s",
@@ -1546,6 +1550,7 @@ vzConnectUnregisterCloseCallback(virConnectPtr conn, virConnectCloseFunc cb)
     ret = 0;
 
  cleanup:
+    virObjectUnlock(privconn->driver);
 
     return ret;
 }