commit a42e9c41888bc6a5446ef6bd95745c9fd023f107
author Liu Ping Fan <qemulist@gmail.com> Sun Aug 25 10:01:21 2013 +0800
committer Jan Kiszka <jan.kiszka@siemens.com> Tue Sep 17 12:26:05 2013 +0200
tree 0a996aea98aaf4de80aa0a7622b57e772969e559
parent 9b0ca6cc64d3542be35f1ca6174de2ab6af30ed0

slirp: set mainloop timeout with more precise value

If slirp needs to emulate tcp timeout, then the timeout value
for mainloop should be more precise, which is determined by
slirp's fasttimo or slowtimo. Achieve this by swap the logic
sequence of slirp_pollfds_fill and slirp_update_timeout.

Signed-off-by: Liu Ping Fan <pingfank@linux.vnet.ibm.com>
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>

slirp/libslirp.h

diff --git a/slirp/libslirp.h b/slirp/libslirp.h
index ceabff8..5bdcbd5 100644
--- a/slirp/libslirp.h
+++ b/slirp/libslirp.h
@@ -16,8 +16,7 @@
                   void *opaque);
 void slirp_cleanup(Slirp *slirp);
 
-void slirp_update_timeout(uint32_t *timeout);
-void slirp_pollfds_fill(GArray *pollfds);
+void slirp_pollfds_fill(GArray *pollfds, uint32_t *timeout);
 
 void slirp_pollfds_poll(GArray *pollfds, int select_error);