From: Michal Privoznik <mprivozn@redhat.com>
Date: Tue, 10 Mar 2015 10:06:35 +0000 (+0100)
Subject: virnet*: Don't unlock object in dispose
X-Git-Tag: v1.2.14-rc1~226
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a663c34ad015e7911a885a4f1badef54a9ea2677;p=thirdparty%2Flibvirt.git

virnet*: Don't unlock object in dispose

As of bba93d40 all of our RPC objects are derived from
virObjectLockable. However, during rewrite some errors sneaked
in. For instance, the dispose functions to virNetClient and
virNetServerClient objects were not only freeing allocated
memory, but unlocking themselves. This is wrong. Object should
never disappear while locked.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
---

diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c
index d7455b571d..7fca055e86 100644
--- a/src/rpc/virnetclient.c
+++ b/src/rpc/virnetclient.c
@@ -622,8 +622,6 @@ void virNetClientDispose(void *obj)
 #endif
 
     virNetMessageClear(&client->msg);
-
-    virObjectUnlock(client);
 }
 
 
diff --git a/src/rpc/virnetserverclient.c b/src/rpc/virnetserverclient.c
index b2a4fdf775..f5259c22db 100644
--- a/src/rpc/virnetserverclient.c
+++ b/src/rpc/virnetserverclient.c
@@ -866,7 +866,6 @@ void virNetServerClientDispose(void *obj)
     virObjectUnref(client->tlsCtxt);
 #endif
     virObjectUnref(client->sock);
-    virObjectUnlock(client);
 }