slirp: Kill slirp_is_inited
Avoid the need for slirp_is_inited by refactoring the protected
slirp_select_* functions. This also avoids the clearing of all fd sets
on select errors.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
diff --git a/slirp/slirp.c b/slirp/slirp.c
index 20c691f..cf52d36 100644
--- a/slirp/slirp.c
+++ b/slirp/slirp.c
@@ -271,6 +271,10 @@
int nfds;
int tmp_time;
+ if (!link_up) {
+ return;
+ }
+
/* fail safe */
global_readfds = NULL;
global_writefds = NULL;
@@ -281,7 +285,7 @@
* First, TCP sockets
*/
do_slowtimo = 0;
- if (link_up) {
+
/*
* *_slowtimo needs calling if there are IP fragments
* in the fragment queue, or there are TCP connections active
@@ -375,7 +379,6 @@
UPD_NFDS(so->s);
}
}
- }
/*
* Setup timeout to use minimum CPU usage, especially when idle
@@ -413,11 +416,16 @@
*pnfds = nfds;
}
-void slirp_select_poll(fd_set *readfds, fd_set *writefds, fd_set *xfds)
+void slirp_select_poll(fd_set *readfds, fd_set *writefds, fd_set *xfds,
+ int select_error)
{
struct socket *so, *so_next;
int ret;
+ if (!link_up) {
+ return;
+ }
+
global_readfds = readfds;
global_writefds = writefds;
global_xfds = xfds;
@@ -428,7 +436,6 @@
/*
* See if anything has timed out
*/
- if (link_up) {
if (time_fasttimo && ((curtime - time_fasttimo) >= 2)) {
tcp_fasttimo();
time_fasttimo = 0;
@@ -438,12 +445,11 @@
tcp_slowtimo();
last_slowtimo = curtime;
}
- }
/*
* Check sockets
*/
- if (link_up) {
+ if (!select_error) {
/*
* Check TCP sockets
*/
@@ -576,7 +582,7 @@
/*
* See if we can start outputting
*/
- if (if_queued && link_up)
+ if (if_queued)
if_start();
/* clear global file descriptor sets.
