From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Campbell Subject: Re: [PATCH 06/29] libxl: Use libxl__xswait* in libxl__ao_device Date: Tue, 24 Mar 2015 11:04:54 +0000 Message-ID: <1427195094.21742.340.camel@citrix.com> References: <1423599016-32639-1-git-send-email-ian.jackson@eu.citrix.com> <1423599016-32639-7-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: <1423599016-32639-7-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: xen-devel@lists.xensource.com, Euan Harris List-Id: xen-devel@lists.xenproject.org On Tue, 2015-02-10 at 20:09 +0000, Ian Jackson wrote: > @@ -1164,7 +1136,7 @@ static void device_hotplug_clean(libxl__gc *gc, libxl__ao_device *aodev) > { > /* Clean events and check reentrancy */ > libxl__ev_time_deregister(gc, &aodev->timeout); You seem to have removed the initialisation of this in a previous hunk but not this deregistration or the field itself. Was that deliberate, perhaps it was serving dual purpose somewhere? > - libxl__ev_xswatch_deregister(gc, &aodev->xs_watch); > + libxl__xswait_stop(gc, &aodev->xswait); > assert(!libxl__async_exec_inuse(&aodev->aes)); > } > > diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h > index 2862c69..5a76d51 100644 > --- a/tools/libxl/libxl_internal.h > +++ b/tools/libxl/libxl_internal.h > @@ -2152,7 +2152,7 @@ struct libxl__ao_device { > /* Bodge for Qemu devices */ > libxl__ev_time timeout; > /* xenstore watch for backend path of driver domains */ > - libxl__ev_xswatch xs_watch; > + libxl__xswait_state xswait; > int num_exec; > /* for calling hotplug scripts */ > libxl__async_exec_state aes;