aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Hajnoczi <stefanha@redhat.com>2013-05-16 17:36:00 +0200
committerAnthony Liguori <aliguori@us.ibm.com>2013-05-16 14:18:47 -0500
commit8db165b36ef893ac69af0452f20eeb78e7b26b5a (patch)
tree75e19a7e9017e41baeef3ef1d47d4b733cdce9aa
parent6d46895b51103fa26c97ee0e0d895c004e9594d7 (diff)
downloadqemu-8db165b36ef893ac69af0452f20eeb78e7b26b5a.zip
qemu-8db165b36ef893ac69af0452f20eeb78e7b26b5a.tar.gz
qemu-8db165b36ef893ac69af0452f20eeb78e7b26b5a.tar.bz2
main-loop: narrow win32 pollfds_fill() event bitmasks
pollfds_fill() and pollfds_poll() translate GPollFD to rfds/wfds/xfds for sockets on win32. select(2) is the underlying system call which is used to monitor sockets for activity. Currently file descriptors that monitor G_IO_ERR will be included in both rfds and wfds. As a result, select(2) will report writability on file descriptors where we only really wanted to monitor readability (with errors). slirp_pollfds_poll() hit this issue: UDP sockets are blocking sockets so we hang in sorecvfrom() when G_IO_ERR is set due to the socket being writable (we only wanted to check for readability). This patch fixes the slirp_pollfds_poll() hang. Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> Message-id: 1368718561-7816-2-git-send-email-stefanha@redhat.com Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r--main-loop.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/main-loop.c b/main-loop.c
index f46aece..2b8eed7 100644
--- a/main-loop.c
+++ b/main-loop.c
@@ -333,11 +333,11 @@ static int pollfds_fill(GArray *pollfds, fd_set *rfds, fd_set *wfds,
GPollFD *pfd = &g_array_index(pollfds, GPollFD, i);
int fd = pfd->fd;
int events = pfd->events;
- if (events & (G_IO_IN | G_IO_HUP | G_IO_ERR)) {
+ if (events & G_IO_IN) {
FD_SET(fd, rfds);
nfds = MAX(nfds, fd);
}
- if (events & (G_IO_OUT | G_IO_ERR)) {
+ if (events & G_IO_OUT) {
FD_SET(fd, wfds);
nfds = MAX(nfds, fd);
}
@@ -360,10 +360,10 @@ static void pollfds_poll(GArray *pollfds, int nfds, fd_set *rfds,
int revents = 0;
if (FD_ISSET(fd, rfds)) {
- revents |= G_IO_IN | G_IO_HUP | G_IO_ERR;
+ revents |= G_IO_IN;
}
if (FD_ISSET(fd, wfds)) {
- revents |= G_IO_OUT | G_IO_ERR;
+ revents |= G_IO_OUT;
}
if (FD_ISSET(fd, xfds)) {
revents |= G_IO_PRI;