From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:53723) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TtbnY-0006vm-BT for qemu-devel@nongnu.org; Fri, 11 Jan 2013 05:25:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TtbnV-0008IV-62 for qemu-devel@nongnu.org; Fri, 11 Jan 2013 05:25:16 -0500 Received: from oxygen.pond.sub.org ([2a01:4f8:121:10e4::3]:50759) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TtbnU-0008HS-V9 for qemu-devel@nongnu.org; Fri, 11 Jan 2013 05:25:13 -0500 From: Markus Armbruster Date: Fri, 11 Jan 2013 11:25:02 +0100 Message-Id: <1357899902-5316-7-git-send-email-armbru@redhat.com> In-Reply-To: <1357899902-5316-1-git-send-email-armbru@redhat.com> References: <1357899902-5316-1-git-send-email-armbru@redhat.com> Subject: [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: qemu-devel@nongnu.org Cc: mdroth@linux.vnet.ibm.com, lcapitulino@redhat.com 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 --- 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