summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnthony Liguori2013-02-26 20:36:09 +0100
committerAnthony Liguori2013-02-26 20:36:09 +0100
commitee24aaf356f44ca7c8fbef136a438c12091cffd0 (patch)
treec4ed83a105f3f06dafc3422ce233de51d23c9637
parentglib: Add compat wrapper for g_poll on old glib (diff)
parentslirp: Properly initialize pollfds_idx of new sockets (diff)
downloadqemu-ee24aaf356f44ca7c8fbef136a438c12091cffd0.tar.gz
qemu-ee24aaf356f44ca7c8fbef136a438c12091cffd0.tar.xz
qemu-ee24aaf356f44ca7c8fbef136a438c12091cffd0.zip
Merge remote-tracking branch 'kiszka/queues/slirp' into staging
# By Jan Kiszka # Via Jan Kiszka * kiszka/queues/slirp: slirp: Properly initialize pollfds_idx of new sockets
-rw-r--r--slirp/socket.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/slirp/socket.c b/slirp/socket.c
index a7ab933c43..bb639aed9c 100644
--- a/slirp/socket.c
+++ b/slirp/socket.c
@@ -51,6 +51,7 @@ socreate(Slirp *slirp)
so->so_state = SS_NOFDREF;
so->s = -1;
so->slirp = slirp;
+ so->pollfds_idx = -1;
}
return(so);
}