ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

socket: Make errp the last parameter of vsock_connect_saddr 

Signed-off-by: Fam Zheng <famz@redhat.com>
Message-Id: <20170421122710.15373-5-famz@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
Fam Zheng 2017-04-21 20:27:00 +08:00 committed by Markus Armbruster
parent 2bdc6791b9
commit 1a9a7f25a0
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
util/qemu-sockets.c
View File

@ -728,9 +728,10 @@ static int vsock_connect_addr(const struct sockaddr_vm *svm, bool *in_progress,
return sock; return sock;
} }
static int vsock_connect_saddr(VsockSocketAddress *vaddr, Error **errp, static int vsock_connect_saddr(VsockSocketAddress *vaddr,
NonBlockingConnectHandler *callback, NonBlockingConnectHandler *callback,
void *opaque) void *opaque,
Error **errp)
{ {
struct sockaddr_vm svm; struct sockaddr_vm svm;
int sock = -1; int sock = -1;
@ -819,9 +820,9 @@ static void vsock_unsupported(Error **errp)
error_setg(errp, "socket family AF_VSOCK unsupported"); 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, NonBlockingConnectHandler *callback,
void *opaque) void *opaque, Error **errp)
{ {
vsock_unsupported(errp); vsock_unsupported(errp);
return -1; return -1;
@ -1100,7 +1101,7 @@ int socket_connect(SocketAddress *addr, NonBlockingConnectHandler *callback,
break; break;
case SOCKET_ADDRESS_KIND_VSOCK: 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; break;
default: default: