diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2022-04-11 09:26:06 +0200 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2022-05-12 12:29:44 +0200 |
commit | ad2e5b87d7d070cb4c0a3ba1c20a4ec5e6429301 (patch) | |
tree | c2465b06789d51e0adfe9a029631d016d6ccca15 /net | |
parent | 0c1450e2045e1a046854c34f34ed9f03dcdab0fb (diff) | |
download | qemu-ad2e5b87d7d070cb4c0a3ba1c20a4ec5e6429301.zip qemu-ad2e5b87d7d070cb4c0a3ba1c20a4ec5e6429301.tar.gz qemu-ad2e5b87d7d070cb4c0a3ba1c20a4ec5e6429301.tar.bz2 |
net: slirp: introduce a wrapper struct for QemuTimer
This struct will be extended in the next few patches to support the
new slirp_handle_timer() call. For that we need to store an additional
"int" for each SLIRP timer, in addition to the cb_opaque.
Reviewed-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Reviewed-by: Marc-André Lureau <malureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'net')
-rw-r--r-- | net/slirp.c | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/net/slirp.c b/net/slirp.c index bc5e9e4..f1e25d7 100644 --- a/net/slirp.c +++ b/net/slirp.c @@ -184,23 +184,32 @@ static int64_t net_slirp_clock_get_ns(void *opaque) return qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL); } +struct SlirpTimer { + QEMUTimer timer; +} + static void *net_slirp_timer_new(SlirpTimerCb cb, void *cb_opaque, void *opaque) { - return timer_new_full(NULL, QEMU_CLOCK_VIRTUAL, - SCALE_MS, QEMU_TIMER_ATTR_EXTERNAL, - cb, cb_opaque); + SlirpTimer *t = g_new(SlirpTimer, 1); + timer_init_full(&t->timer, NULL, QEMU_CLOCK_VIRTUAL, + SCALE_MS, QEMU_TIMER_ATTR_EXTERNAL, + cb, cb_opaque); + return t; } static void net_slirp_timer_free(void *timer, void *opaque) { - timer_free(timer); + SlirpTimer *t = timer; + timer_del(&t->timer); + g_free(t); } static void net_slirp_timer_mod(void *timer, int64_t expire_timer, void *opaque) { - timer_mod(timer, expire_timer); + SlirpTimer *t = timer; + timer_mod(&t->timer, expire_timer); } static void net_slirp_register_poll_fd(int fd, void *opaque) |