From nobody Tue Feb 10 05:45:46 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1492778241943915.0755254724127; Fri, 21 Apr 2017 05:37:21 -0700 (PDT) Received: from localhost ([::1]:59018 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d1XoO-00029g-Hr for importer@patchew.org; Fri, 21 Apr 2017 08:37:20 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54026) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d1Xei-00029Z-55 for qemu-devel@nongnu.org; Fri, 21 Apr 2017 08:27:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d1Xeg-0000cK-Op for qemu-devel@nongnu.org; Fri, 21 Apr 2017 08:27:20 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37354) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d1Xeg-0000bj-Fs for qemu-devel@nongnu.org; Fri, 21 Apr 2017 08:27:18 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7B120C04B326 for ; Fri, 21 Apr 2017 12:27:17 +0000 (UTC) Received: from lemon.redhat.com (ovpn-8-35.pek2.redhat.com [10.72.8.35]) by smtp.corp.redhat.com (Postfix) with ESMTP id 438CF17F43; Fri, 21 Apr 2017 12:27:15 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 7B120C04B326 Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=famz@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 7B120C04B326 From: Fam Zheng To: qemu-devel@nongnu.org Date: Fri, 21 Apr 2017 20:26:58 +0800 Message-Id: <20170421122710.15373-3-famz@redhat.com> In-Reply-To: <20170421122710.15373-1-famz@redhat.com> References: <20170421122710.15373-1-famz@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Fri, 21 Apr 2017 12:27:17 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 02/14] socket: Make errp the last parameter of inet_connect_saddr X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Markus Armbruster Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Fam Zheng --- 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 *optio= ns, } =20 /* Open the socket and connect. */ - s->sock =3D inet_connect_saddr(s->inet, errp, NULL, NULL); + s->sock =3D inet_connect_saddr(s->inet, NULL, NULL, errp); if (s->sock < 0) { ret =3D -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); =20 NetworkAddressFamily inet_netfamily(int family); =20 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(InetSo= cketAddress *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 =3D NULL; struct addrinfo *res, *e; @@ -659,7 +660,7 @@ int inet_connect(const char *str, Error **errp) =20 addr =3D inet_parse(str, errp); if (addr !=3D NULL) { - sock =3D inet_connect_saddr(addr, errp, NULL, NULL); + sock =3D inet_connect_saddr(addr, NULL, NULL, errp); qapi_free_InetSocketAddress(addr); } return sock; @@ -1081,7 +1082,7 @@ int socket_connect(SocketAddress *addr, NonBlockingCo= nnectHandler *callback, =20 switch (addr->type) { case SOCKET_ADDRESS_KIND_INET: - fd =3D inet_connect_saddr(addr->u.inet.data, errp, callback, opaqu= e); + fd =3D inet_connect_saddr(addr->u.inet.data, callback, opaque, err= p); break; =20 case SOCKET_ADDRESS_KIND_UNIX: --=20 2.9.3