[Spice-devel] [PATCH spice-gtk] channel: HUP is not an error condition

Christophe Fergeau cfergeau at redhat.com
Tue Apr 14 05:00:09 PDT 2015


On Tue, Apr 14, 2015 at 07:52:17AM -0400, Marc-André Lureau wrote:
> > 
> > > ---
> > >  gtk/spice-channel.c | 4 ++--
> > >  1 file changed, 2 insertions(+), 2 deletions(-)
> > > 
> > > diff --git a/gtk/spice-channel.c b/gtk/spice-channel.c
> > > index 12d61ee..1c19544 100644
> > > --- a/gtk/spice-channel.c
> > > +++ b/gtk/spice-channel.c
> > > @@ -2151,9 +2151,9 @@ static gboolean spice_channel_iterate(SpiceChannel
> > > *channel)
> > >  
> > >          /* We don't want to report an error if the socket was closed
> > >          gracefully
> > >           * on the other end (VM shutdown) */
> > > -        ret = g_socket_condition_check(c->sock, G_IO_IN | G_IO_ERR |
> > > G_IO_HUP);
> > > +        ret = g_socket_condition_check(c->sock, G_IO_ERR);
> > 
> > Looks good to me, though I'm not sure why the G_IO_IN which you removed
> > was there in the first place.
> 
> I don't know, you added this code in:
> 
> commit 9cd267a9db91aee10459a4a2bbb984663b03dd9e
> Author: Christophe Fergeau <cfergeau at redhat.com>
> Date:   Wed Sep 10 15:50:53 2014 +0200
> 
>     Don't report IO error on clean guest shutdown

Nope, you did add it in

commit 07a7ef001686c626ab9400876cf7117ab74abb62
Author: Marc-André Lureau <marcandre.lureau at gmail.com>
Date:   Fri Sep 6 20:52:45 2013 +0200

    channel: do not reenter the mainloop at every iteration


Christophe
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/spice-devel/attachments/20150414/57eb849f/attachment.sig>


More information about the Spice-devel mailing list