Jim Fehlig
2012-Nov-15 02:03 UTC
[PATCH] 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>
---
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 41fd5bb..72cb723 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);
}
}
--
1.7.7
Ian Campbell
2012-Nov-15 10:26 UTC
Re: [PATCH] libxl: Fix passing of application data to timeout_deregister hook
On Thu, 2012-11-15 at 02:03 +0000, Jim Fehlig wrote:> 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 + applied, thanks. Ian, this should be a candidate for the next 4.2.1 rc IMHO.> --- > 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 41fd5bb..72cb723 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); > } > }
Jim Fehlig
2012-Nov-15 15:09 UTC
Re: [PATCH] libxl: Fix passing of application data to timeout_deregister hook
On 11/15/2012 03:26 AM, Ian Campbell wrote:> On Thu, 2012-11-15 at 02:03 +0000, Jim Fehlig wrote: >> 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 + applied, thanks. > > Ian, this should be a candidate for the next 4.2.1 rc IMHO.Yes, that would be much appreciated. Thanks! Regards, Jim
Ian Jackson
2012-Nov-16 15:56 UTC
Re: [PATCH] libxl: Fix passing of application data to timeout_deregister hook
Ian Campbell writes ("Re: [Xen-devel] [PATCH] libxl: Fix passing of
application data to timeout_deregister hook"):> On Thu, 2012-11-15 at 02:03 +0000, Jim Fehlig wrote:
> > 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 + applied, thanks.
>
> Ian, this should be a candidate for the next 4.2.1 rc IMHO.
I have pushed it to 4.2-testing.hg.
Ian.