From nobody Mon Feb 9 06:49:17 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 1493912282935368.03522694590345; Thu, 4 May 2017 08:38:02 -0700 (PDT) Received: from localhost ([::1]:42590 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d6IpN-0007UN-MY for importer@patchew.org; Thu, 04 May 2017 11:38:01 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56369) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d6Ic2-00025y-Rp for qemu-devel@nongnu.org; Thu, 04 May 2017 11:24:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d6Ic0-0008Jt-6k for qemu-devel@nongnu.org; Thu, 04 May 2017 11:24:14 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41732) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d6Ibz-0008Ia-Si for qemu-devel@nongnu.org; Thu, 04 May 2017 11:24:12 -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 E4F7861E4A for ; Thu, 4 May 2017 15:24:10 +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 B02E917963 for ; Thu, 4 May 2017 15:24:10 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 2842811386D1; Thu, 4 May 2017 17:24:06 +0200 (CEST) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com E4F7861E4A Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=armbru@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com E4F7861E4A From: Markus Armbruster To: qemu-devel@nongnu.org Date: Thu, 4 May 2017 17:23:50 +0200 Message-Id: <1493911445-19568-14-git-send-email-armbru@redhat.com> In-Reply-To: <1493911445-19568-1-git-send-email-armbru@redhat.com> References: <1493911445-19568-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.39]); Thu, 04 May 2017 15:24:11 +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 13/28] sockets: Prepare vsock_parse() for flattened SocketAddress 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: , 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" I'm going to flatten SocketAddress: rename SocketAddress to SocketAddressLegacy, SocketAddressFlat to SocketAddress, eliminate SocketAddressLegacy except in external interfaces. vsock_parse() returns a newly allocated VsockSocketAddress. Lift the allocation from vsock_parse() into its caller socket_parse() to prepare for flattening SocketAddress. Signed-off-by: Markus Armbruster Message-Id: <1493192202-3184-2-git-send-email-armbru@redhat.com> Reviewed-by: Eric Blake --- util/qemu-sockets.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c index 8188d9a..1abe095 100644 --- a/util/qemu-sockets.c +++ b/util/qemu-sockets.c @@ -793,26 +793,25 @@ static int vsock_listen_saddr(VsockSocketAddress *vad= dr, return slisten; } =20 -static VsockSocketAddress *vsock_parse(const char *str, Error **errp) +static int vsock_parse(VsockSocketAddress *addr, const char *str, + Error **errp) { - VsockSocketAddress *addr =3D NULL; char cid[33]; char port[33]; int n; =20 if (sscanf(str, "%32[^:]:%32[^,]%n", cid, port, &n) !=3D 2) { error_setg(errp, "error parsing address '%s'", str); - return NULL; + return -1; } if (str[n] !=3D '\0') { error_setg(errp, "trailing characters in address '%s'", str); - return NULL; + return -1; } =20 - addr =3D g_new0(VsockSocketAddress, 1); addr->cid =3D g_strdup(cid); addr->port =3D g_strdup(port); - return addr; + return 0; } #else static void vsock_unsupported(Error **errp) @@ -835,10 +834,11 @@ static int vsock_listen_saddr(VsockSocketAddress *vad= dr, return -1; } =20 -static VsockSocketAddress *vsock_parse(const char *str, Error **errp) +static int vsock_parse(VsockSocketAddress *addr, const char *str, + Error **errp) { vsock_unsupported(errp); - return NULL; + return -1; } #endif /* CONFIG_AF_VSOCK */ =20 @@ -1060,8 +1060,8 @@ SocketAddress *socket_parse(const char *str, Error **= errp) } } else if (strstart(str, "vsock:", NULL)) { addr->type =3D SOCKET_ADDRESS_KIND_VSOCK; - addr->u.vsock.data =3D vsock_parse(str + strlen("vsock:"), errp); - if (addr->u.vsock.data =3D=3D NULL) { + addr->u.vsock.data =3D g_new(VsockSocketAddress, 1); + if (vsock_parse(addr->u.vsock.data, str + strlen("vsock:"), errp))= { goto fail; } } else { --=20 2.7.4