diff options
| author | Anthony Liguori <anthony@codemonkey.ws> | 2013-09-17 10:01:24 -0500 |
|---|---|---|
| committer | Anthony Liguori <anthony@codemonkey.ws> | 2013-09-17 10:01:24 -0500 |
| commit | 6c2679fc19560699679200fb42ab4659bcbe7f79 (patch) | |
| tree | 8bc60715e3ac0eb73a3ea14d8161098dc35a8c3d /stubs | |
| parent | 5dc11192b23fbb09fab277d58ac3c42b9699a8b0 (diff) | |
| parent | 426e3e6ce1abdb0d85faefbfac3cf4dcc7f224a3 (diff) | |
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 'stubs')
| -rw-r--r-- | stubs/slirp.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/stubs/slirp.c b/stubs/slirp.c index f1fc833f7a..bd0ac7f27d 100644 --- a/stubs/slirp.c +++ b/stubs/slirp.c @@ -1,11 +1,7 @@ #include "qemu-common.h" #include "slirp/slirp.h" -void slirp_update_timeout(uint32_t *timeout) -{ -} - -void slirp_pollfds_fill(GArray *pollfds) +void slirp_pollfds_fill(GArray *pollfds, uint32_t *timeout) { } |