Signed-off-by: Fam Zheng <f...@redhat.com> --- main-loop.c | 4 ++-- slirp/libslirp.h | 4 ++-- slirp/slirp.c | 4 ++-- stubs/slirp.c | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/main-loop.c b/main-loop.c index 18b7508..b3808ae 100644 --- a/main-loop.c +++ b/main-loop.c @@ -478,7 +478,7 @@ int main_loop_wait(int nonblocking) g_array_set_size(gpollfds, 0); /* reset for new iteration */ /* XXX: separate device handlers from system ones */ #ifdef CONFIG_SLIRP - slirp_pollfds_fill(gpollfds, &timeout); + slirp_poll_prepare(&timeout); #endif if (timeout == UINT32_MAX) { @@ -493,7 +493,7 @@ int main_loop_wait(int nonblocking) ret = os_host_main_loop_wait(timeout_ns); #ifdef CONFIG_SLIRP - slirp_pollfds_poll(gpollfds, (ret < 0)); + slirp_poll(); #endif qemu_clock_run_all_timers(); diff --git a/slirp/libslirp.h b/slirp/libslirp.h index 7f329d9..94032ba 100644 --- a/slirp/libslirp.h +++ b/slirp/libslirp.h @@ -17,9 +17,9 @@ Slirp *slirp_init(int restricted, struct in_addr vnetwork, void *opaque); void slirp_cleanup(Slirp *slirp); -void slirp_pollfds_fill(GArray *pollfds, uint32_t *timeout); +void slirp_poll_prepare(uint32_t *timeout); -void slirp_pollfds_poll(GArray *pollfds, int select_error); +void slirp_poll(void); void slirp_input(Slirp *slirp, const uint8_t *pkt, int pkt_len); diff --git a/slirp/slirp.c b/slirp/slirp.c index 4cfa190..bd80708 100644 --- a/slirp/slirp.c +++ b/slirp/slirp.c @@ -499,7 +499,7 @@ static bool slirp_poll_update_icmp(struct socket *so) return ret; } -void slirp_pollfds_fill(GArray *pollfds, uint32_t *timeout) +void slirp_poll_prepare(uint32_t *timeout) { Slirp *slirp; struct socket *so, *so_next; @@ -547,7 +547,7 @@ void slirp_pollfds_fill(GArray *pollfds, uint32_t *timeout) slirp_update_timeout(timeout); } -void slirp_pollfds_poll(GArray *pollfds, int select_error) +void slirp_poll(void) { Slirp *slirp; diff --git a/stubs/slirp.c b/stubs/slirp.c index bd0ac7f..6b6d211 100644 --- a/stubs/slirp.c +++ b/stubs/slirp.c @@ -1,11 +1,11 @@ #include "qemu-common.h" #include "slirp/slirp.h" -void slirp_pollfds_fill(GArray *pollfds, uint32_t *timeout) +void slirp_poll_prepare(uint32_t *timeout) { } -void slirp_pollfds_poll(GArray *pollfds, int select_error) +void slirp_poll(void) { } -- 2.4.2