Commit 6dffc1f6 authored by Fam Zheng's avatar Fam Zheng Committed by Markus Armbruster
Browse files

socket: Make errp the last parameter of inet_connect_saddr 



Signed-off-by: default avatarFam Zheng <famz@redhat.com>
Message-Id: <20170421122710.15373-3-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 226799ce

block/ssh.c

+1 −1
Original line number Diff line number Diff line
@@ -681,7 +681,7 @@ static int connect_to_ssh(BDRVSSHState *s, QDict *options, 
    }



    /* Open the socket and connect. */

    s->sock = inet_connect_saddr(s->inet, errp, NULL, NULL);

    s->sock = inet_connect_saddr(s->inet, NULL, NULL, errp);

    if (s->sock < 0) {

        ret = -EIO;

        goto err;

include/qemu/sockets.h

+3 −2
Original line number Diff line number Diff line
@@ -36,8 +36,9 @@ int inet_ai_family_from_address(InetSocketAddress *addr, 
                                Error **errp);

InetSocketAddress *inet_parse(const char *str, Error **errp);

int inet_connect(const char *str, Error **errp);

int inet_connect_saddr(InetSocketAddress *saddr, Error **errp,

                       NonBlockingConnectHandler *callback, void *opaque);

int inet_connect_saddr(InetSocketAddress *saddr,

                       NonBlockingConnectHandler *callback, void *opaque,

                       Error **errp);



NetworkAddressFamily inet_netfamily(int family);

util/qemu-sockets.c

+5 −4
Original line number Diff line number Diff line
@@ -427,8 +427,9 @@ static struct addrinfo *inet_parse_connect_saddr(InetSocketAddress *saddr, 
 * function succeeds, callback will be called when the connection

 * completes, with the file descriptor on success, or -1 on error.

 */

int inet_connect_saddr(InetSocketAddress *saddr, Error **errp,

                       NonBlockingConnectHandler *callback, void *opaque)

int inet_connect_saddr(InetSocketAddress *saddr,

                       NonBlockingConnectHandler *callback, void *opaque,

                       Error **errp)

{

    Error *local_err = NULL;

    struct addrinfo *res, *e;
@@ -659,7 +660,7 @@ int inet_connect(const char *str, Error **errp) 


    addr = inet_parse(str, errp);

    if (addr != NULL) {

        sock = inet_connect_saddr(addr, errp, NULL, NULL);

        sock = inet_connect_saddr(addr, NULL, NULL, errp);

        qapi_free_InetSocketAddress(addr);

    }

    return sock;
@@ -1081,7 +1082,7 @@ int socket_connect(SocketAddress *addr, NonBlockingConnectHandler *callback, 


    switch (addr->type) {

    case SOCKET_ADDRESS_KIND_INET:

        fd = inet_connect_saddr(addr->u.inet.data, errp, callback, opaque);

        fd = inet_connect_saddr(addr->u.inet.data, callback, opaque, errp);

        break;



    case SOCKET_ADDRESS_KIND_UNIX: