From: Daniel P. Berrange <berrange@redhat.com>
Date: Mon, 24 Sep 2012 14:13:10 +0000 (+0100)
Subject: Remove pointless virLXCProcessMonitorDestroy method
X-Git-Tag: v1.0.0-rc1~250
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dd0371764f90f31fa8e596b40c0269cdbd5082f6;p=thirdparty%2Flibvirt.git

Remove pointless virLXCProcessMonitorDestroy method

Asynchronously setting priv->mon to NULL was pointless,
just remove the destroy callback entirely.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---

diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c
index 15572cd982..b9cff85c36 100644
--- a/src/lxc/lxc_process.c
+++ b/src/lxc/lxc_process.c
@@ -554,20 +554,6 @@ cleanup:
 }
 
 
-static void virLXCProcessMonitorDestroy(virLXCMonitorPtr mon,
-                                        virDomainObjPtr vm)
-{
-    virLXCDomainObjPrivatePtr priv;
-
-    virDomainObjLock(vm);
-    priv = vm->privateData;
-    if (priv->monitor == mon)
-        priv->monitor = NULL;
-    if (virObjectUnref(vm))
-        virDomainObjUnlock(vm);
-}
-
-
 extern virLXCDriverPtr lxc_driver;
 static void virLXCProcessMonitorEOFNotify(virLXCMonitorPtr mon ATTRIBUTE_UNUSED,
                                           virDomainObjPtr vm)
@@ -649,7 +635,6 @@ static void virLXCProcessMonitorExitNotify(virLXCMonitorPtr mon ATTRIBUTE_UNUSED
 
 static virLXCMonitorCallbacks monitorCallbacks = {
     .eofNotify = virLXCProcessMonitorEOFNotify,
-    .destroy = virLXCProcessMonitorDestroy,
     .exitNotify = virLXCProcessMonitorExitNotify,
 };