From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:40206) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TtikD-0001X0-Gm for qemu-devel@nongnu.org; Fri, 11 Jan 2013 12:50:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ttik7-0005ZE-BR for qemu-devel@nongnu.org; Fri, 11 Jan 2013 12:50:15 -0500 Received: from mail-ia0-f178.google.com ([209.85.210.178]:57298) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ttik6-0005MT-OV for qemu-devel@nongnu.org; Fri, 11 Jan 2013 12:50:11 -0500 Received: by mail-ia0-f178.google.com with SMTP id k25so1749886iah.23 for ; Fri, 11 Jan 2013 09:50:02 -0800 (PST) Sender: fluxion Date: Fri, 11 Jan 2013 11:47:40 -0600 From: mdroth Message-ID: <20130111174740.GM1543@vm> References: <1357899902-5316-1-git-send-email-armbru@redhat.com> <1357899902-5316-7-git-send-email-armbru@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1357899902-5316-7-git-send-email-armbru@redhat.com> Subject: Re: [Qemu-devel] [PATCH 6/6] qemu-ga: Handle errors uniformely in ga_channel_open() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Markus Armbruster Cc: qemu-devel@nongnu.org, lcapitulino@redhat.com 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 Reviewed-by: Michael Roth > --- > 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 >