From: Jim Fehlig <jfehlig@suse.com>
Date: Thu, 12 Feb 2015 17:42:25 +0000 (-0700)
Subject: libxl: remove redundant calls to libxl_evdisable_domain_death
X-Git-Tag: v1.2.14-rc1~265
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fc3ef44ea42bfceab3f46f726c969cd43437358d;p=thirdparty%2Flibvirt.git

libxl: remove redundant calls to libxl_evdisable_domain_death

Domain death watch is already disabled in libxlDomainCleanup.  No
need to disable it a second and third time.

Signed-off-by: Jim Fehlig <jfehlig@suse.com>
---

diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c
index 21c41d7424..e186c5317c 100644
--- a/src/libxl/libxl_domain.c
+++ b/src/libxl/libxl_domain.c
@@ -439,9 +439,6 @@ libxlDomainObjPrivateDispose(void *obj)
 {
     libxlDomainObjPrivatePtr priv = obj;
 
-    if (priv->deathW)
-        libxl_evdisable_domain_death(priv->ctx, priv->deathW);
-
     libxlDomainObjFreeJob(priv);
     virChrdevFree(priv->devs);
     libxl_ctx_free(priv->ctx);
@@ -456,11 +453,6 @@ libxlDomainObjPrivateFree(void *data)
 {
     libxlDomainObjPrivatePtr priv = data;
 
-    if (priv->deathW) {
-        libxl_evdisable_domain_death(priv->ctx, priv->deathW);
-        priv->deathW = NULL;
-    }
-
     virObjectUnref(priv);
 }