From: Nikolay Shirokovskiy <nshirokovskiy@virtuozzo.com>
Date: Wed, 17 Feb 2016 12:14:56 +0000 (+0300)
Subject: close callback: make unregister clean after connect close event
X-Git-Tag: v1.3.3-rc1~315
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=42b0f7510d656431d148f07a76e22cb8dc0b71cf;p=thirdparty%2Flibvirt.git

close callback: make unregister clean after connect close event

If connect close is fired then following unregister will fail
as we set callback to NULL and thus callback equality checking
will fail.

Callback is set to NULL to make it fired only one time probabaly.
Instead lets use connection equality to NULL to check if callback
is already fired.

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

diff --git a/src/datatypes.c b/src/datatypes.c
index a60b05c02b..8d90a4aa0f 100644
--- a/src/datatypes.c
+++ b/src/datatypes.c
@@ -239,7 +239,7 @@ void virConnectCloseCallbackDataCall(virConnectCloseCallbackDataPtr close,
 {
     virObjectLock(close);
 
-    if (!close->callback)
+    if (!close->conn)
         goto exit;
 
     VIR_DEBUG("Triggering connection close callback %p reason=%d, opaque=%p",
@@ -248,7 +248,6 @@ void virConnectCloseCallbackDataCall(virConnectCloseCallbackDataPtr close,
 
     if (close->freeCallback)
         close->freeCallback(close->opaque);
-    close->callback = NULL;
     close->freeCallback = NULL;
     virObjectUnref(close->conn);
     close->conn = NULL;