From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jim Fehlig Subject: Re: [PATCH 2/4] libxl: Fix passing of application data to timeout_deregister hook Date: Wed, 23 Jan 2013 15:00:37 -0700 Message-ID: <51005D85.9060501@suse.com> References: <1358960210-22667-1-git-send-email-ian.jackson@eu.citrix.com> <1358960210-22667-3-git-send-email-ian.jackson@eu.citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1358960210-22667-3-git-send-email-ian.jackson@eu.citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Ian Jackson Cc: Stefano Stabellini , Ian Campbell , xen-devel@lists.xen.org List-Id: xen-devel@lists.xenproject.org Ian Jackson wrote: > From: Jim Fehlig > > 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 > Acked-by: Ian Campbell > Committed-by: Ian Campbell > > xen-unstable changeset: 26155:babb84d9a82e > Backport-requested-by: Ian Jackson > Backported-by: Ian Jackson > Signed-off-by: Ian Jackson > --- > tools/libxl/libxl_event.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c > index aea58bb..06a29f2 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); > } > } > This one is already in 4.2-testing as c/s 25927. Regards, Jim