Commit 1a9a7f25 authored by Fam Zheng's avatar Fam Zheng Committed by Markus Armbruster
Browse files

socket: Make errp the last parameter of vsock_connect_saddr 



Signed-off-by: default avatarFam Zheng <famz@redhat.com>
Message-Id: <20170421122710.15373-5-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 2bdc6791

util/qemu-sockets.c

+6 −5
Original line number Diff line number Diff line
@@ -728,9 +728,10 @@ static int vsock_connect_addr(const struct sockaddr_vm *svm, bool *in_progress, 
    return sock;

}



static int vsock_connect_saddr(VsockSocketAddress *vaddr, Error **errp,

static int vsock_connect_saddr(VsockSocketAddress *vaddr,

                               NonBlockingConnectHandler *callback,

                               void *opaque)

                               void *opaque,

                               Error **errp)

{

    struct sockaddr_vm svm;

    int sock = -1;
@@ -819,9 +820,9 @@ static void vsock_unsupported(Error **errp) 
    error_setg(errp, "socket family AF_VSOCK unsupported");

}



static int vsock_connect_saddr(VsockSocketAddress *vaddr, Error **errp,

static int vsock_connect_saddr(VsockSocketAddress *vaddr,

                               NonBlockingConnectHandler *callback,

                               void *opaque)

                               void *opaque, Error **errp)

{

    vsock_unsupported(errp);

    return -1;
@@ -1100,7 +1101,7 @@ int socket_connect(SocketAddress *addr, NonBlockingConnectHandler *callback, 
        break;



    case SOCKET_ADDRESS_KIND_VSOCK:

        fd = vsock_connect_saddr(addr->u.vsock.data, errp, callback, opaque);

        fd = vsock_connect_saddr(addr->u.vsock.data, callback, opaque, errp);

        break;



    default: