ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

qemu-char: retry g_poll on EINTR 

This is a case where pty_chr_update_read_handler_locked's lack
of error checking can produce incorrect values.  We are not using
SIGUSR1 anymore, so this is quite theoretical, but easy to fix.

Reported-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2015-12-01 11:27:00 +01:00
parent 55b4e80b04
commit c1f2448998
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
qemu-char.c
View File

@ -1241,11 +1241,16 @@ static void pty_chr_update_read_handler_locked(CharDriverState *chr)
{ {
PtyCharDriver *s = chr->opaque; PtyCharDriver *s = chr->opaque;
GPollFD pfd; GPollFD pfd;
int rc;
pfd.fd = g_io_channel_unix_get_fd(s->fd); pfd.fd = g_io_channel_unix_get_fd(s->fd);
pfd.events = G_IO_OUT; pfd.events = G_IO_OUT;
pfd.revents = 0; pfd.revents = 0;
g_poll(&pfd, 1, 0); do {
rc = g_poll(&pfd, 1, 0);
} while (rc == -1 && errno == EINTR);
assert(rc >= 0);
if (pfd.revents & G_IO_HUP) { if (pfd.revents & G_IO_HUP) {
pty_chr_state(chr, 0); pty_chr_state(chr, 0);
} else { } else {