From 82e1cc4bf91a2e1c3b62297b10b0ab1d93adfc45 Mon Sep 17 00:00:00 2001 From: Fam Zheng Date: Thu, 4 Jun 2015 14:45:18 +0800 Subject: Change qemu_set_fd_handler2(..., NULL, ...) to qemu_set_fd_handler Done with following Coccinelle semantic patch, plus manual cosmetic changes in net/*.c. @@ expression E1, E2, E3, E4; @@ - qemu_set_fd_handler2(E1, NULL, E2, E3, E4); + qemu_set_fd_handler(E1, E2, E3, E4); Signed-off-by: Fam Zheng Message-id: 1433400324-7358-8-git-send-email-famz@redhat.com Signed-off-by: Stefan Hajnoczi --- net/l2tpv3.c | 8 ++++---- net/netmap.c | 8 ++++---- net/socket.c | 8 ++++---- net/tap.c | 8 ++++---- 4 files changed, 16 insertions(+), 16 deletions(-) (limited to 'net') diff --git a/net/l2tpv3.c b/net/l2tpv3.c index 99d80b6..356dae2 100644 --- a/net/l2tpv3.c +++ b/net/l2tpv3.c @@ -138,10 +138,10 @@ static void l2tpv3_writable(void *opaque); static void l2tpv3_update_fd_handler(NetL2TPV3State *s) { - qemu_set_fd_handler2(s->fd, NULL, - s->read_poll ? net_l2tpv3_send : NULL, - s->write_poll ? l2tpv3_writable : NULL, - s); + qemu_set_fd_handler(s->fd, + s->read_poll ? net_l2tpv3_send : NULL, + s->write_poll ? l2tpv3_writable : NULL, + s); } static void l2tpv3_read_poll(NetL2TPV3State *s, bool enable) diff --git a/net/netmap.c b/net/netmap.c index 19d0542..508b829 100644 --- a/net/netmap.c +++ b/net/netmap.c @@ -138,10 +138,10 @@ static void netmap_writable(void *opaque); /* Set the event-loop handlers for the netmap backend. */ static void netmap_update_fd_handler(NetmapState *s) { - qemu_set_fd_handler2(s->me.fd, NULL, - s->read_poll ? netmap_send : NULL, - s->write_poll ? netmap_writable : NULL, - s); + qemu_set_fd_handler(s->me.fd, + s->read_poll ? netmap_send : NULL, + s->write_poll ? netmap_writable : NULL, + s); } /* Update the read handler. */ diff --git a/net/socket.c b/net/socket.c index 7055d1e..c752696 100644 --- a/net/socket.c +++ b/net/socket.c @@ -53,10 +53,10 @@ static void net_socket_writable(void *opaque); static void net_socket_update_fd_handler(NetSocketState *s) { - qemu_set_fd_handler2(s->fd, NULL, - s->read_poll ? s->send_fn : NULL, - s->write_poll ? net_socket_writable : NULL, - s); + qemu_set_fd_handler(s->fd, + s->read_poll ? s->send_fn : NULL, + s->write_poll ? net_socket_writable : NULL, + s); } static void net_socket_read_poll(NetSocketState *s, bool enable) diff --git a/net/tap.c b/net/tap.c index 0d184cf..aa8b3f5 100644 --- a/net/tap.c +++ b/net/tap.c @@ -67,10 +67,10 @@ static void tap_writable(void *opaque); static void tap_update_fd_handler(TAPState *s) { - qemu_set_fd_handler2(s->fd, NULL, - s->read_poll && s->enabled ? tap_send : NULL, - s->write_poll && s->enabled ? tap_writable : NULL, - s); + qemu_set_fd_handler(s->fd, + s->read_poll && s->enabled ? tap_send : NULL, + s->write_poll && s->enabled ? tap_writable : NULL, + s); } static void tap_read_poll(TAPState *s, bool enable) -- cgit v1.1