Commit 82e1cc4b authored by Fam Zheng's avatar Fam Zheng Committed by Stefan Hajnoczi
Browse files

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: default avatarFam Zheng <famz@redhat.com>
Message-id: 1433400324-7358-8-git-send-email-famz@redhat.com
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent a90a7425

blockdev-nbd.c

+2 −2
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ void qmp_nbd_server_start(SocketAddress *addr, Error **errp) 


    server_fd = socket_listen(addr, errp);

    if (server_fd != -1) {

        qemu_set_fd_handler2(server_fd, NULL, nbd_accept, NULL, NULL);

        qemu_set_fd_handler(server_fd, nbd_accept, NULL, NULL);

    }

}
@@ -129,7 +129,7 @@ void qmp_nbd_server_stop(Error **errp) 
    }



    if (server_fd != -1) {

        qemu_set_fd_handler2(server_fd, NULL, NULL, NULL, NULL);

        qemu_set_fd_handler(server_fd, NULL, NULL, NULL);

        close(server_fd);

        server_fd = -1;

    }

main-loop.c

+1 −2
Original line number Diff line number Diff line
@@ -100,8 +100,7 @@ static int qemu_signal_init(void) 


    fcntl_setfl(sigfd, O_NONBLOCK);



    qemu_set_fd_handler2(sigfd, NULL, sigfd_handler, NULL,

                         (void *)(intptr_t)sigfd);

    qemu_set_fd_handler(sigfd, sigfd_handler, NULL, (void *)(intptr_t)sigfd);



    return 0;

}

migration/exec.c

+3 −3
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ static void exec_accept_incoming_migration(void *opaque) 
{

    QEMUFile *f = opaque;



    qemu_set_fd_handler2(qemu_get_fd(f), NULL, NULL, NULL, NULL);

    qemu_set_fd_handler(qemu_get_fd(f), NULL, NULL, NULL);

    process_incoming_migration(f);

}
@@ -64,6 +64,6 @@ void exec_start_incoming_migration(const char *command, Error **errp) 
        return;

    }



    qemu_set_fd_handler2(qemu_get_fd(f), NULL,

			 exec_accept_incoming_migration, NULL, f);

    qemu_set_fd_handler(qemu_get_fd(f), exec_accept_incoming_migration, NULL,

                        f);

}

migration/fd.c

+2 −2
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ static void fd_accept_incoming_migration(void *opaque) 
{

    QEMUFile *f = opaque;



    qemu_set_fd_handler2(qemu_get_fd(f), NULL, NULL, NULL, NULL);

    qemu_set_fd_handler(qemu_get_fd(f), NULL, NULL, NULL);

    process_incoming_migration(f);

}
@@ -84,5 +84,5 @@ void fd_start_incoming_migration(const char *infd, Error **errp) 
        return;

    }



    qemu_set_fd_handler2(fd, NULL, fd_accept_incoming_migration, NULL, f);

    qemu_set_fd_handler(fd, fd_accept_incoming_migration, NULL, f);

}

migration/rdma.c

+3 −4
Original line number Diff line number Diff line
@@ -2834,7 +2834,7 @@ static int qemu_rdma_accept(RDMAContext *rdma) 
        }

    }



    qemu_set_fd_handler2(rdma->channel->fd, NULL, NULL, NULL, NULL);

    qemu_set_fd_handler(rdma->channel->fd, NULL, NULL, NULL);



    ret = rdma_accept(rdma->cm_id, &conn_param);

    if (ret) {
@@ -3331,9 +3331,8 @@ void rdma_start_incoming_migration(const char *host_port, Error **errp) 


    trace_rdma_start_incoming_migration_after_rdma_listen();



    qemu_set_fd_handler2(rdma->channel->fd, NULL,

                         rdma_accept_incoming_migration, NULL,

                            (void *)(intptr_t) rdma);

    qemu_set_fd_handler(rdma->channel->fd, rdma_accept_incoming_migration,

                        NULL, (void *)(intptr_t)rdma);

    return;

err:

    error_propagate(errp, local_err);