| Message ID | 1357899902-5316-7-git-send-email-armbru@redhat.com |
|---|---|
| State | New |
| Headers | show |
On Fri, Jan 11, 2013 at 11:25:02AM +0100, Markus Armbruster wrote: > We detect errors in seven places. One reports with g_error(), which Do you mean "in several places"? I can fix this in tree. > calls abort(), the others report with g_critical(). Three of them > exit(), three return false. > > Always report with g_critical(), and return false. > > Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Michael Roth <mdroth@linux.vnet.ibm.com> > --- > qga/channel-posix.c | 11 +++++++---- > 1 file changed, 7 insertions(+), 4 deletions(-) > > diff --git a/qga/channel-posix.c b/qga/channel-posix.c > index b530808..96274f5 100644 > --- a/qga/channel-posix.c > +++ b/qga/channel-posix.c > @@ -140,14 +140,15 @@ static gboolean ga_channel_open(GAChannel *c, const gchar *path, GAChannelMethod > ); > if (fd == -1) { > g_critical("error opening channel: %s", strerror(errno)); > - exit(EXIT_FAILURE); > + return false; > } > #ifdef CONFIG_SOLARIS > ret = ioctl(fd, I_SETSIG, S_OUTPUT | S_INPUT | S_HIPRI); > if (ret == -1) { > g_critical("error setting event mask for channel: %s", > strerror(errno)); > - exit(EXIT_FAILURE); > + close(fd); > + return false; > } > #endif > ret = ga_channel_client_add(c, fd); > @@ -163,7 +164,7 @@ static gboolean ga_channel_open(GAChannel *c, const gchar *path, GAChannelMethod > int fd = qemu_open(path, O_RDWR | O_NOCTTY | O_NONBLOCK); > if (fd == -1) { > g_critical("error opening channel: %s", strerror(errno)); > - exit(EXIT_FAILURE); > + return false; > } > tcgetattr(fd, &tio); > /* set up serial port for non-canonical, dumb byte streaming */ > @@ -183,7 +184,9 @@ static gboolean ga_channel_open(GAChannel *c, const gchar *path, GAChannelMethod > tcsetattr(fd, TCSANOW, &tio); > ret = ga_channel_client_add(c, fd); > if (ret) { > - g_error("error adding channel to main loop"); > + g_critical("error adding channel to main loop"); > + close(fd); > + return false; > } > break; > } > -- > 1.7.11.7 >
mdroth <mdroth@linux.vnet.ibm.com> writes: > On Fri, Jan 11, 2013 at 11:25:02AM +0100, Markus Armbruster wrote: >> We detect errors in seven places. One reports with g_error(), which > > Do you mean "in several places"? I can fix this in tree. I counted seven places, but it doesn't really matter, "several" would be fine, too. >> calls abort(), the others report with g_critical(). Three of them >> exit(), three return false. >> >> Always report with g_critical(), and return false. >> >> Signed-off-by: Markus Armbruster <armbru@redhat.com> > > Reviewed-by: Michael Roth <mdroth@linux.vnet.ibm.com> Thanks!
diff --git a/qga/channel-posix.c b/qga/channel-posix.c index b530808..96274f5 100644 --- a/qga/channel-posix.c +++ b/qga/channel-posix.c @@ -140,14 +140,15 @@ static gboolean ga_channel_open(GAChannel *c, const gchar *path, GAChannelMethod ); if (fd == -1) { g_critical("error opening channel: %s", strerror(errno)); - exit(EXIT_FAILURE); + return false; } #ifdef CONFIG_SOLARIS ret = ioctl(fd, I_SETSIG, S_OUTPUT | S_INPUT | S_HIPRI); if (ret == -1) { g_critical("error setting event mask for channel: %s", strerror(errno)); - exit(EXIT_FAILURE); + close(fd); + return false; } #endif ret = ga_channel_client_add(c, fd); @@ -163,7 +164,7 @@ static gboolean ga_channel_open(GAChannel *c, const gchar *path, GAChannelMethod int fd = qemu_open(path, O_RDWR | O_NOCTTY | O_NONBLOCK); if (fd == -1) { g_critical("error opening channel: %s", strerror(errno)); - exit(EXIT_FAILURE); + return false; } tcgetattr(fd, &tio); /* set up serial port for non-canonical, dumb byte streaming */ @@ -183,7 +184,9 @@ static gboolean ga_channel_open(GAChannel *c, const gchar *path, GAChannelMethod tcsetattr(fd, TCSANOW, &tio); ret = ga_channel_client_add(c, fd); if (ret) { - g_error("error adding channel to main loop"); + g_critical("error adding channel to main loop"); + close(fd); + return false; } break; }
We detect errors in seven places. One reports with g_error(), which calls abort(), the others report with g_critical(). Three of them exit(), three return false. Always report with g_critical(), and return false. Signed-off-by: Markus Armbruster <armbru@redhat.com> --- qga/channel-posix.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)