mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qemu-ga: Handle errors uniformely in ga_channel_open()

Browse Source 
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 <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Reviewed-by: Luiz Capitulino <lcapitulino@redhat.com>

*minor fix-up of commit msg

Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
This commit is contained in:
Markus Armbruster 2013-01-11 11:25:02 +01:00 committed by Michael Roth
parent d4f4a3efdf
commit 7868181f98
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
qga/channel-posix.c
View File

@ -141,14 +141,15 @@ static gboolean ga_channel_open(GAChannel *c, const gchar *path, GAChannelMethod
); );
if (fd == -1) { if (fd == -1) {
g_critical("error opening channel: %s", strerror(errno)); g_critical("error opening channel: %s", strerror(errno));
exit(EXIT_FAILURE); return false;
} }
#ifdef CONFIG_SOLARIS #ifdef CONFIG_SOLARIS
ret = ioctl(fd, I_SETSIG, S_OUTPUT | S_INPUT | S_HIPRI); ret = ioctl(fd, I_SETSIG, S_OUTPUT | S_INPUT | S_HIPRI);
if (ret == -1) { if (ret == -1) {
g_critical("error setting event mask for channel: %s", g_critical("error setting event mask for channel: %s",
strerror(errno)); strerror(errno));
exit(EXIT_FAILURE); close(fd);
return false;
} }
#endif #endif
ret = ga_channel_client_add(c, fd); 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); int fd = qemu_open(path, O_RDWR | O_NOCTTY | O_NONBLOCK);
if (fd == -1) { if (fd == -1) {
g_critical("error opening channel: %s", strerror(errno)); g_critical("error opening channel: %s", strerror(errno));
exit(EXIT_FAILURE); return false;
} }
tcgetattr(fd, &tio); tcgetattr(fd, &tio);
/* set up serial port for non-canonical, dumb byte streaming */ /* 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); tcsetattr(fd, TCSANOW, &tio);
ret = ga_channel_client_add(c, fd); ret = ga_channel_client_add(c, fd);
if (ret) { if (ret) {
g_error("error adding channel to main loop"); g_critical("error adding channel to main loop");
close(fd);
return false;
} }
break; break;
} }