aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJim Fehlig <jfehlig@suse.com>2012-11-16 15:56:14 +0000
committerJim Fehlig <jfehlig@suse.com>2012-11-16 15:56:14 +0000
commitf5f20508d2b538cecb5e9da8f001610d560bddd0 (patch)
tree59a68b407c071a5f1f40ae70f0f13c9e5a14f0cb
parent19dbefda22f5ac0f2681f93c006626a802259a5d (diff)
downloadxen-f5f20508d2b538cecb5e9da8f001610d560bddd0.tar.gz
xen-f5f20508d2b538cecb5e9da8f001610d560bddd0.tar.bz2
xen-f5f20508d2b538cecb5e9da8f001610d560bddd0.zip
libxl: Fix passing of application data to timeout_deregister hook
When deregistering a timeout, the address of application data was being passed to the timeout_deregister hook instead of the data itself. Signed-off-by: Jim Fehlig <jfehlig@suse.com> Acked-by: Ian Campbell <ian.campbell@citrix.com> Committed-by: Ian Campbell <ian.campbell@citrix.com> xen-unstable changeset: 26155:babb84d9a82e Backport-requested-by: Ian Campbell <Ian.Campbell@citrix.com> Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
-rw-r--r--tools/libxl/libxl_event.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c
index 128b6a4760..3092a71471 100644
--- a/tools/libxl/libxl_event.c
+++ b/tools/libxl/libxl_event.c
@@ -184,7 +184,7 @@ static int time_register_finite(libxl__gc *gc, libxl__ev_time *ev,
static void time_deregister(libxl__gc *gc, libxl__ev_time *ev)
{
if (!ev->infinite) {
- OSEVENT_HOOK_VOID(timeout_deregister, &ev->for_app_reg);
+ OSEVENT_HOOK_VOID(timeout_deregister, ev->for_app_reg);
LIBXL_TAILQ_REMOVE(&CTX->etimes, ev, entry);
}
}