From nobody Tue Feb 10 10:04:16 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 1493018930571372.48869324032796; Mon, 24 Apr 2017 00:28:50 -0700 (PDT) Received: from localhost ([::1]:42403 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d2YQT-00058R-50 for importer@patchew.org; Mon, 24 Apr 2017 03:28:49 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53564) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d2YOo-0003wi-Os for qemu-devel@nongnu.org; Mon, 24 Apr 2017 03:27:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d2YOn-0006vy-QO for qemu-devel@nongnu.org; Mon, 24 Apr 2017 03:27:06 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58392) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d2YOn-0006vO-KJ for qemu-devel@nongnu.org; Mon, 24 Apr 2017 03:27:05 -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 9A8C9BDD7C for ; Mon, 24 Apr 2017 07:27:04 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-149.ams2.redhat.com [10.36.116.149]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 139AC17A62; Mon, 24 Apr 2017 07:27:02 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 8870D1138656; Mon, 24 Apr 2017 09:27:00 +0200 (CEST) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 9A8C9BDD7C Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=armbru@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 9A8C9BDD7C From: Markus Armbruster To: qemu-devel@nongnu.org Date: Mon, 24 Apr 2017 09:26:49 +0200 Message-Id: <1493018820-23445-5-git-send-email-armbru@redhat.com> In-Reply-To: <1493018820-23445-1-git-send-email-armbru@redhat.com> References: <1493018820-23445-1-git-send-email-armbru@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.25]); Mon, 24 Apr 2017 07:27:04 +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] [PULL 04/15] socket: Make errp the last parameter of unix_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: Fam Zheng 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" From: Fam Zheng Signed-off-by: Fam Zheng Message-Id: <20170421122710.15373-4-famz@redhat.com> Reviewed-by: Markus Armbruster Reviewed-by: Eric Blake Signed-off-by: Markus Armbruster --- 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; } =20 -static int unix_connect_saddr(UnixSocketAddress *saddr, Error **errp, - NonBlockingConnectHandler *callback, void *o= paque) +static int unix_connect_saddr(UnixSocketAddress *saddr, + NonBlockingConnectHandler *callback, void *o= paque, + Error **errp) { struct sockaddr_un un; ConnectState *connect_state =3D NULL; @@ -979,8 +980,9 @@ static int unix_listen_saddr(UnixSocketAddress *saddr, return -1; } =20 -static int unix_connect_saddr(UnixSocketAddress *saddr, Error **errp, - NonBlockingConnectHandler *callback, void *o= paque) +static int unix_connect_saddr(UnixSocketAddress *saddr, + NonBlockingConnectHandler *callback, void *o= paque, + Error **errp) { error_setg(errp, "unix sockets are not available on windows"); errno =3D ENOTSUP; @@ -1026,7 +1028,7 @@ int unix_connect(const char *path, Error **errp) =20 saddr =3D g_new0(UnixSocketAddress, 1); saddr->path =3D g_strdup(path); - sock =3D unix_connect_saddr(saddr, errp, NULL, NULL); + sock =3D unix_connect_saddr(saddr, NULL, NULL, errp); qapi_free_UnixSocketAddress(saddr); return sock; } @@ -1086,7 +1088,7 @@ int socket_connect(SocketAddress *addr, NonBlockingCo= nnectHandler *callback, break; =20 case SOCKET_ADDRESS_KIND_UNIX: - fd =3D unix_connect_saddr(addr->u.q_unix.data, errp, callback, opa= que); + fd =3D unix_connect_saddr(addr->u.q_unix.data, callback, opaque, e= rrp); break; =20 case SOCKET_ADDRESS_KIND_FD: --=20 2.7.4