commit 82e1cc4bf91a2e1c3b62297b10b0ab1d93adfc45
author Fam Zheng <famz@redhat.com> Thu Jun 04 14:45:18 2015 +0800
committer Stefan Hajnoczi <stefanha@redhat.com> Fri Jun 12 13:26:21 2015 +0100
tree f7c9e240735dca99283f304f2843329d188adb71
parent a90a7425cf592a3afeff3eaf32f543b83050ee5c

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 <famz@redhat.com>
Message-id: 1433400324-7358-8-git-send-email-famz@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>

net/socket.c

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_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)