[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 04/14] socket: Make errp the last parameter of vsock
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PATCH 04/14] socket: Make errp the last parameter of vsock_connect_saddr |
Date: |
Fri, 21 Apr 2017 20:27:00 +0800 |
Signed-off-by: Fam Zheng <address@hidden>
---
util/qemu-sockets.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c
index 0fe5f13..8188d9a 100644
--- a/util/qemu-sockets.c
+++ b/util/qemu-sockets.c
@@ -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:
--
2.9.3
- [Qemu-devel] [PATCH 00/14] Trivial cleanups around error reporting, Fam Zheng, 2017/04/21
- [Qemu-devel] [PATCH 01/14] socket: Make errp the last parameter of socket_connect, Fam Zheng, 2017/04/21
- [Qemu-devel] [PATCH 02/14] socket: Make errp the last parameter of inet_connect_saddr, Fam Zheng, 2017/04/21
- [Qemu-devel] [PATCH 03/14] socket: Make errp the last parameter of unix_connect_saddr, Fam Zheng, 2017/04/21
- [Qemu-devel] [PATCH 04/14] socket: Make errp the last parameter of vsock_connect_saddr,
Fam Zheng <=
- [Qemu-devel] [PATCH 05/14] block: Make errp the last parameter of bdrv_img_create, Fam Zheng, 2017/04/21
- [Qemu-devel] [PATCH 06/14] crypto: Make errp the last parameter of functions, Fam Zheng, 2017/04/21
[Qemu-devel] [PATCH 07/14] mirror: Make errp the last parameter of mirror_start_job, Fam Zheng, 2017/04/21
[Qemu-devel] [PATCH 08/14] block: Make errp the last parameter of commit_active_start, Fam Zheng, 2017/04/21
[Qemu-devel] [PATCH 09/14] nfs: Make errp the last parameter of nfs_client_open, Fam Zheng, 2017/04/21