[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 04/15] socket: Make errp the last parameter of unix_c
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 04/15] socket: Make errp the last parameter of unix_connect_saddr |
Date: |
Mon, 24 Apr 2017 09:26:49 +0200 |
From: Fam Zheng <address@hidden>
Signed-off-by: Fam Zheng <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
---
util/qemu-sockets.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c
index 8e11349..0fe5f13 100644
--- a/util/qemu-sockets.c
+++ b/util/qemu-sockets.c
@@ -911,8 +911,9 @@ err:
return -1;
}
-static int unix_connect_saddr(UnixSocketAddress *saddr, Error **errp,
- NonBlockingConnectHandler *callback, void
*opaque)
+static int unix_connect_saddr(UnixSocketAddress *saddr,
+ NonBlockingConnectHandler *callback, void
*opaque,
+ Error **errp)
{
struct sockaddr_un un;
ConnectState *connect_state = NULL;
@@ -979,8 +980,9 @@ static int unix_listen_saddr(UnixSocketAddress *saddr,
return -1;
}
-static int unix_connect_saddr(UnixSocketAddress *saddr, Error **errp,
- NonBlockingConnectHandler *callback, void
*opaque)
+static int unix_connect_saddr(UnixSocketAddress *saddr,
+ NonBlockingConnectHandler *callback, void
*opaque,
+ Error **errp)
{
error_setg(errp, "unix sockets are not available on windows");
errno = ENOTSUP;
@@ -1026,7 +1028,7 @@ int unix_connect(const char *path, Error **errp)
saddr = g_new0(UnixSocketAddress, 1);
saddr->path = g_strdup(path);
- sock = unix_connect_saddr(saddr, errp, NULL, NULL);
+ sock = unix_connect_saddr(saddr, NULL, NULL, errp);
qapi_free_UnixSocketAddress(saddr);
return sock;
}
@@ -1086,7 +1088,7 @@ int socket_connect(SocketAddress *addr,
NonBlockingConnectHandler *callback,
break;
case SOCKET_ADDRESS_KIND_UNIX:
- fd = unix_connect_saddr(addr->u.q_unix.data, errp, callback, opaque);
+ fd = unix_connect_saddr(addr->u.q_unix.data, callback, opaque, errp);
break;
case SOCKET_ADDRESS_KIND_FD:
--
2.7.4
- [Qemu-devel] [PULL 00/15] Error reporting patches for 2017-04-24, Markus Armbruster, 2017/04/24
- [Qemu-devel] [PULL 01/15] util/error: Fix leak in error_vprepend(), Markus Armbruster, 2017/04/24
- [Qemu-devel] [PULL 02/15] socket: Make errp the last parameter of socket_connect, Markus Armbruster, 2017/04/24
- [Qemu-devel] [PULL 15/15] error: Apply error_propagate_null.cocci again, Markus Armbruster, 2017/04/24
- [Qemu-devel] [PULL 07/15] crypto: Make errp the last parameter of functions, Markus Armbruster, 2017/04/24
- [Qemu-devel] [PULL 10/15] nfs: Make errp the last parameter of nfs_client_open, Markus Armbruster, 2017/04/24
- [Qemu-devel] [PULL 04/15] socket: Make errp the last parameter of unix_connect_saddr,
Markus Armbruster <=
- [Qemu-devel] [PULL 08/15] mirror: Make errp the last parameter of mirror_start_job, Markus Armbruster, 2017/04/24
- [Qemu-devel] [PULL 05/15] socket: Make errp the last parameter of vsock_connect_saddr, Markus Armbruster, 2017/04/24
- [Qemu-devel] [PULL 14/15] qga: Make errp the last parameter of qga_vss_fsfreeze, Markus Armbruster, 2017/04/24
- [Qemu-devel] [PULL 11/15] fdc: Make errp the last parameter of fdctrl_connect_drives, Markus Armbruster, 2017/04/24
- [Qemu-devel] [PULL 09/15] block: Make errp the last parameter of commit_active_start, Markus Armbruster, 2017/04/24
- [Qemu-devel] [PULL 03/15] socket: Make errp the last parameter of inet_connect_saddr, Markus Armbruster, 2017/04/24
- [Qemu-devel] [PULL 06/15] block: Make errp the last parameter of bdrv_img_create, Markus Armbruster, 2017/04/24
- [Qemu-devel] [PULL 13/15] migration: Make errp the last parameter of local functions, Markus Armbruster, 2017/04/24
- [Qemu-devel] [PULL 12/15] scsi: Make errp the last parameter of virtio_scsi_common_realize, Markus Armbruster, 2017/04/24
- Re: [Qemu-devel] [PULL 00/15] Error reporting patches for 2017-04-24, Peter Maydell, 2017/04/24