[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 8/8] qemu-ga: Handle errors uniformely in ga_channel
From: |
Michael Roth |
Subject: |
[Qemu-devel] [PATCH 8/8] qemu-ga: Handle errors uniformely in ga_channel_open() |
Date: |
Mon, 14 Jan 2013 13:55:12 -0600 |
From: Markus Armbruster <address@hidden>
We detect errors in several 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 <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Michael Roth <address@hidden>
Reviewed-by: Luiz Capitulino <address@hidden>
*minor fix-up of commit msg
Signed-off-by: Michael Roth <address@hidden>
---
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 05e8386..e65dda3 100644
--- a/qga/channel-posix.c
+++ b/qga/channel-posix.c
@@ -141,14 +141,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);
@@ -164,7 +165,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 */
@@ -184,7 +185,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.9.5
- [Qemu-devel] [PULL 0/8] qemu-ga: cleanups and minor fixes, Michael Roth, 2013/01/14
- [Qemu-devel] [PATCH 4/8] qemu-ga: Drop pointless lseek() from ga_open_pidfile(), Michael Roth, 2013/01/14
- [Qemu-devel] [PATCH 1/8] qemu-ga: ga_open_pidfile(): use qemu_open(), Michael Roth, 2013/01/14
- [Qemu-devel] [PATCH 3/8] qemu-ga: Document intentional fall through in channel_event_cb(), Michael Roth, 2013/01/14
- [Qemu-devel] [PATCH 7/8] qemu-ga: Plug fd leak on ga_channel_open() error paths, Michael Roth, 2013/01/14
- [Qemu-devel] [PATCH 5/8] qemu-ga: Plug file descriptor leak on ga_open_pidfile() error path, Michael Roth, 2013/01/14
- [Qemu-devel] [PATCH 6/8] qemu-ga: Plug fd leak on ga_channel_listen_accept() error path, Michael Roth, 2013/01/14
- [Qemu-devel] [PATCH 2/8] qemu-ga: add ga_open_logfile(), Michael Roth, 2013/01/14
- [Qemu-devel] [PATCH 8/8] qemu-ga: Handle errors uniformely in ga_channel_open(),
Michael Roth <=
- Re: [Qemu-devel] [PULL 0/8] qemu-ga: cleanups and minor fixes, Anthony Liguori, 2013/01/15