Commit 226799ce authored by Fam Zheng's avatar Fam Zheng Committed by Markus Armbruster
Browse files

socket: Make errp the last parameter of socket_connect 



Signed-off-by: default avatarFam Zheng <famz@redhat.com>
Message-Id: <20170421122710.15373-2-famz@redhat.com>
Reviewed-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
parent 536eeea8

block/sheepdog.c

+1 −1
Original line number Diff line number Diff line
@@ -595,7 +595,7 @@ static int connect_to_sdog(BDRVSheepdogState *s, Error **errp) 
{

    int fd;



    fd = socket_connect(s->addr, errp, NULL, NULL);

    fd = socket_connect(s->addr, NULL, NULL, errp);



    if (s->addr->type == SOCKET_ADDRESS_KIND_INET && fd >= 0) {

        int ret = socket_set_nodelay(fd);

include/qemu/sockets.h

+2 −2
Original line number Diff line number Diff line
@@ -45,8 +45,8 @@ int unix_listen(const char *path, char *ostr, int olen, Error **errp); 
int unix_connect(const char *path, Error **errp);



SocketAddress *socket_parse(const char *str, Error **errp);

int socket_connect(SocketAddress *addr, Error **errp,

                   NonBlockingConnectHandler *callback, void *opaque);

int socket_connect(SocketAddress *addr, NonBlockingConnectHandler *callback,

                   void *opaque, Error **errp);

int socket_listen(SocketAddress *addr, Error **errp);

void socket_listen_cleanup(int fd, Error **errp);

int socket_dgram(SocketAddress *remote, SocketAddress *local, Error **errp);

io/channel-socket.c

+1 −1
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ int qio_channel_socket_connect_sync(QIOChannelSocket *ioc, 
    int fd;



    trace_qio_channel_socket_connect_sync(ioc, addr);

    fd = socket_connect(addr, errp, NULL, NULL);

    fd = socket_connect(addr, NULL, NULL, errp);

    if (fd < 0) {

        trace_qio_channel_socket_connect_fail(ioc);

        return -1;

net/socket.c

+1 −1
Original line number Diff line number Diff line
@@ -578,7 +578,7 @@ static int net_socket_connect_init(NetClientState *peer, 
        goto err;

    }



    fd = socket_connect(c->saddr, &local_error, net_socket_connected, c);

    fd = socket_connect(c->saddr, net_socket_connected, c, &local_error);

    if (fd < 0) {

        goto err;

    }

util/qemu-sockets.c

+2 −2
Original line number Diff line number Diff line
@@ -1074,8 +1074,8 @@ fail: 
    return NULL;

}



int socket_connect(SocketAddress *addr, Error **errp,

                   NonBlockingConnectHandler *callback, void *opaque)

int socket_connect(SocketAddress *addr, NonBlockingConnectHandler *callback,

                   void *opaque, Error **errp)

{

    int fd;