diff options
| author | Anthony Liguori | 2013-09-17 17:01:24 +0200 |
|---|---|---|
| committer | Anthony Liguori | 2013-09-17 17:01:24 +0200 |
| commit | 6c2679fc19560699679200fb42ab4659bcbe7f79 (patch) | |
| tree | 8bc60715e3ac0eb73a3ea14d8161098dc35a8c3d /main-loop.c | |
| parent | Merge remote-tracking branch 'kwolf/for-anthony' into staging (diff) | |
| parent | slirp: clean up slirp_update_timeout (diff) | |
| download | qemu-6c2679fc19560699679200fb42ab4659bcbe7f79.tar.gz qemu-6c2679fc19560699679200fb42ab4659bcbe7f79.tar.xz qemu-6c2679fc19560699679200fb42ab4659bcbe7f79.zip | |
Merge remote-tracking branch 'kiszka/queues/slirp' into staging
# By Liu Ping Fan (3) and Jan Kiszka (1)
# Via Jan Kiszka
* kiszka/queues/slirp:
slirp: clean up slirp_update_timeout
slirp: set mainloop timeout with more precise value
slirp: define timeout as macro
slirp: make timeout local
Message-id: cover.1379415024.git.jan.kiszka@siemens.com
Diffstat (limited to 'main-loop.c')
| -rw-r--r-- | main-loop.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/main-loop.c b/main-loop.c index 1c38ea2b93..c3c9c28fba 100644 --- a/main-loop.c +++ b/main-loop.c @@ -466,8 +466,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_update_timeout(&timeout); - slirp_pollfds_fill(gpollfds); + slirp_pollfds_fill(gpollfds, &timeout); #endif qemu_iohandler_fill(gpollfds); |