[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 03/15] socket: Make errp the last parameter of inet_c
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 03/15] socket: Make errp the last parameter of inet_connect_saddr |
Date: |
Mon, 24 Apr 2017 09:26:48 +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>
---
block/ssh.c | 2 +-
include/qemu/sockets.h | 5 +++--
util/qemu-sockets.c | 9 +++++----
3 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/block/ssh.c b/block/ssh.c
index 471ba8a..df09f6c 100644
--- a/block/ssh.c
+++ b/block/ssh.c
@@ -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;
diff --git a/include/qemu/sockets.h b/include/qemu/sockets.h
index 567eef1..af28532 100644
--- a/include/qemu/sockets.h
+++ b/include/qemu/sockets.h
@@ -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);
diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c
index f79d334..8e11349 100644
--- a/util/qemu-sockets.c
+++ b/util/qemu-sockets.c
@@ -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:
--
2.7.4
- [Qemu-devel] [PULL 02/15] socket: Make errp the last parameter of socket_connect, (continued)
- [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, 2017/04/24
- [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 <=
- [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