Message ID | 1351705520-24589-3-git-send-email-lcapitulino@redhat.com |
---|---|
State | New |
Headers | show |
On Wed, Oct 31, 2012 at 03:45:17PM -0200, Luiz Capitulino wrote: > They are specific to virtio-serial code, which implements win32 > overlaped I/O. A future commit will add a different kind of I/O. > > Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com> Reviewed-by: Michael Roth <mdroth@linux.vnet.ibm.com> > --- > qga/channel-win32.c | 24 ++++++++++++------------ > 1 file changed, 12 insertions(+), 12 deletions(-) > > diff --git a/qga/channel-win32.c b/qga/channel-win32.c > index 16bf44a..c0e19a8 100644 > --- a/qga/channel-win32.c > +++ b/qga/channel-win32.c > @@ -38,7 +38,7 @@ typedef struct GAWatch { > * Called by glib prior to polling to set up poll events if polling is needed. > * > */ > -static gboolean ga_channel_prepare(GSource *source, gint *timeout_ms) > +static gboolean ga_channel_prepare_ov(GSource *source, gint *timeout_ms) > { > GAWatch *watch = (GAWatch *)source; > GAChannel *c = (GAChannel *)watch->channel; > @@ -95,7 +95,7 @@ out: > /* > * Called by glib after an outstanding read request is completed. > */ > -static gboolean ga_channel_check(GSource *source) > +static gboolean ga_channel_check_ov(GSource *source) > { > GAWatch *watch = (GAWatch *)source; > GAChannel *c = (GAChannel *)watch->channel; > @@ -152,7 +152,7 @@ static gboolean ga_channel_check(GSource *source) > /* > * Called by glib after either prepare or check routines signal readiness > */ > -static gboolean ga_channel_dispatch(GSource *source, GSourceFunc unused, > +static gboolean ga_channel_dispatch_ov(GSource *source, GSourceFunc unused, > gpointer user_data) > { > GAWatch *watch = (GAWatch *)source; > @@ -178,21 +178,21 @@ static gboolean ga_channel_dispatch(GSource *source, GSourceFunc unused, > return success; > } > > -static void ga_channel_finalize(GSource *source) > +static void ga_channel_finalize_ov(GSource *source) > { > g_debug("finalize"); > } > > -GSourceFuncs ga_channel_watch_funcs = { > - ga_channel_prepare, > - ga_channel_check, > - ga_channel_dispatch, > - ga_channel_finalize > +GSourceFuncs ga_channel_watch_funcs_ov = { > + ga_channel_prepare_ov, > + ga_channel_check_ov, > + ga_channel_dispatch_ov, > + ga_channel_finalize_ov > }; > > -static GSource *ga_channel_create_watch(GAChannel *c) > +static GSource *ga_channel_create_watch_ov(GAChannel *c) > { > - GSource *source = g_source_new(&ga_channel_watch_funcs, sizeof(GAWatch)); > + GSource *source = g_source_new(&ga_channel_watch_funcs_ov, sizeof(GAWatch)); > GAWatch *watch = (GAWatch *)source; > > watch->channel = c; > @@ -326,7 +326,7 @@ GAChannel *ga_channel_new(GAChannelMethod method, const gchar *path, > c->rstate.buf = g_malloc(QGA_READ_COUNT_DEFAULT); > c->rstate.ov.hEvent = CreateEvent(&sec_attrs, FALSE, FALSE, NULL); > > - c->source = ga_channel_create_watch(c); > + c->source = ga_channel_create_watch_ov(c); > g_source_attach(c->source, NULL); > return c; > } > -- > 1.7.12.315.g682ce8b >
diff --git a/qga/channel-win32.c b/qga/channel-win32.c index 16bf44a..c0e19a8 100644 --- a/qga/channel-win32.c +++ b/qga/channel-win32.c @@ -38,7 +38,7 @@ typedef struct GAWatch { * Called by glib prior to polling to set up poll events if polling is needed. * */ -static gboolean ga_channel_prepare(GSource *source, gint *timeout_ms) +static gboolean ga_channel_prepare_ov(GSource *source, gint *timeout_ms) { GAWatch *watch = (GAWatch *)source; GAChannel *c = (GAChannel *)watch->channel; @@ -95,7 +95,7 @@ out: /* * Called by glib after an outstanding read request is completed. */ -static gboolean ga_channel_check(GSource *source) +static gboolean ga_channel_check_ov(GSource *source) { GAWatch *watch = (GAWatch *)source; GAChannel *c = (GAChannel *)watch->channel; @@ -152,7 +152,7 @@ static gboolean ga_channel_check(GSource *source) /* * Called by glib after either prepare or check routines signal readiness */ -static gboolean ga_channel_dispatch(GSource *source, GSourceFunc unused, +static gboolean ga_channel_dispatch_ov(GSource *source, GSourceFunc unused, gpointer user_data) { GAWatch *watch = (GAWatch *)source; @@ -178,21 +178,21 @@ static gboolean ga_channel_dispatch(GSource *source, GSourceFunc unused, return success; } -static void ga_channel_finalize(GSource *source) +static void ga_channel_finalize_ov(GSource *source) { g_debug("finalize"); } -GSourceFuncs ga_channel_watch_funcs = { - ga_channel_prepare, - ga_channel_check, - ga_channel_dispatch, - ga_channel_finalize +GSourceFuncs ga_channel_watch_funcs_ov = { + ga_channel_prepare_ov, + ga_channel_check_ov, + ga_channel_dispatch_ov, + ga_channel_finalize_ov }; -static GSource *ga_channel_create_watch(GAChannel *c) +static GSource *ga_channel_create_watch_ov(GAChannel *c) { - GSource *source = g_source_new(&ga_channel_watch_funcs, sizeof(GAWatch)); + GSource *source = g_source_new(&ga_channel_watch_funcs_ov, sizeof(GAWatch)); GAWatch *watch = (GAWatch *)source; watch->channel = c; @@ -326,7 +326,7 @@ GAChannel *ga_channel_new(GAChannelMethod method, const gchar *path, c->rstate.buf = g_malloc(QGA_READ_COUNT_DEFAULT); c->rstate.ov.hEvent = CreateEvent(&sec_attrs, FALSE, FALSE, NULL); - c->source = ga_channel_create_watch(c); + c->source = ga_channel_create_watch_ov(c); g_source_attach(c->source, NULL); return c; }
They are specific to virtio-serial code, which implements win32 overlaped I/O. A future commit will add a different kind of I/O. Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com> --- qga/channel-win32.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-)