From nobody Mon Feb 9 00:02:11 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 1488902481684433.529254000233; Tue, 7 Mar 2017 08:01:21 -0800 (PST) Received: from localhost ([::1]:51373 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1clHY7-00030O-Ai for importer@patchew.org; Tue, 07 Mar 2017 11:01:19 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43074) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1clHFA-0002gC-SB for qemu-devel@nongnu.org; Tue, 07 Mar 2017 10:41:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1clHF9-0002ze-AU for qemu-devel@nongnu.org; Tue, 07 Mar 2017 10:41:44 -0500 Received: from mx1.redhat.com ([209.132.183.28]:35580) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1clHF3-0002vr-Gn; Tue, 07 Mar 2017 10:41:37 -0500 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9C90D81226; Tue, 7 Mar 2017 15:41:37 +0000 (UTC) Received: from noname.str.redhat.com (dhcp-192-197.str.redhat.com [10.33.192.197]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v27FeuUr032123; Tue, 7 Mar 2017 10:41:36 -0500 From: Kevin Wolf To: qemu-block@nongnu.org Date: Tue, 7 Mar 2017 16:40:48 +0100 Message-Id: <1488901251-16214-25-git-send-email-kwolf@redhat.com> In-Reply-To: <1488901251-16214-1-git-send-email-kwolf@redhat.com> References: <1488901251-16214-1-git-send-email-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Tue, 07 Mar 2017 15:41:37 +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 24/27] qapi-schema: Rename SocketAddressFlat's variant tcp to inet 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: kwolf@redhat.com, qemu-devel@nongnu.org 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: Markus Armbruster QAPI type SocketAddressFlat differs from SocketAddress pointlessly: the discriminator value for variant InetSocketAddress is 'tcp' instead of 'inet'. Rename. The type is so far only used by the Gluster block drivers. Take care to keep 'tcp' working in things like -drive's file.server.0.type=3Dtcp. The "gluster+tcp" URI scheme in pseudo-filenames stays the same. blockdev-add changes, but it has changed incompatibly since 2.8 already. Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Signed-off-by: Kevin Wolf --- block/gluster.c | 59 +++++++++++++++++++++++++++++-----------------------= ---- qapi-schema.json | 8 ++++---- 2 files changed, 35 insertions(+), 32 deletions(-) diff --git a/block/gluster.c b/block/gluster.c index 64b0217..a577dae 100644 --- a/block/gluster.c +++ b/block/gluster.c @@ -152,7 +152,7 @@ static QemuOptsList runtime_type_opts =3D { { .name =3D GLUSTER_OPT_TYPE, .type =3D QEMU_OPT_STRING, - .help =3D "tcp|unix", + .help =3D "inet|unix", }, { /* end of list */ } }, @@ -171,14 +171,14 @@ static QemuOptsList runtime_unix_opts =3D { }, }; =20 -static QemuOptsList runtime_tcp_opts =3D { - .name =3D "gluster_tcp", - .head =3D QTAILQ_HEAD_INITIALIZER(runtime_tcp_opts.head), +static QemuOptsList runtime_inet_opts =3D { + .name =3D "gluster_inet", + .head =3D QTAILQ_HEAD_INITIALIZER(runtime_inet_opts.head), .desc =3D { { .name =3D GLUSTER_OPT_TYPE, .type =3D QEMU_OPT_STRING, - .help =3D "tcp|unix", + .help =3D "inet|unix", }, { .name =3D GLUSTER_OPT_HOST, @@ -337,14 +337,14 @@ static int qemu_gluster_parse_uri(BlockdevOptionsGlus= ter *gconf, =20 /* transport */ if (!uri->scheme || !strcmp(uri->scheme, "gluster")) { - gsconf->type =3D SOCKET_ADDRESS_FLAT_TYPE_TCP; + gsconf->type =3D SOCKET_ADDRESS_FLAT_TYPE_INET; } else if (!strcmp(uri->scheme, "gluster+tcp")) { - gsconf->type =3D SOCKET_ADDRESS_FLAT_TYPE_TCP; + gsconf->type =3D SOCKET_ADDRESS_FLAT_TYPE_INET; } else if (!strcmp(uri->scheme, "gluster+unix")) { gsconf->type =3D SOCKET_ADDRESS_FLAT_TYPE_UNIX; is_unix =3D true; } else if (!strcmp(uri->scheme, "gluster+rdma")) { - gsconf->type =3D SOCKET_ADDRESS_FLAT_TYPE_TCP; + gsconf->type =3D SOCKET_ADDRESS_FLAT_TYPE_INET; error_report("Warning: rdma feature is not supported, falling " "back to tcp"); } else { @@ -374,11 +374,11 @@ static int qemu_gluster_parse_uri(BlockdevOptionsGlus= ter *gconf, } gsconf->u.q_unix.path =3D g_strdup(qp->p[0].value); } else { - gsconf->u.tcp.host =3D g_strdup(uri->server ? uri->server : "local= host"); + gsconf->u.inet.host =3D g_strdup(uri->server ? uri->server : "loca= lhost"); if (uri->port) { - gsconf->u.tcp.port =3D g_strdup_printf("%d", uri->port); + gsconf->u.inet.port =3D g_strdup_printf("%d", uri->port); } else { - gsconf->u.tcp.port =3D g_strdup_printf("%d", GLUSTER_DEFAULT_P= ORT); + gsconf->u.inet.port =3D g_strdup_printf("%d", GLUSTER_DEFAULT_= PORT); } } =20 @@ -416,15 +416,15 @@ static struct glfs *qemu_gluster_glfs_init(BlockdevOp= tionsGluster *gconf, ret =3D glfs_set_volfile_server(glfs, "unix", server->value->u.q_unix.path, 0); } else { - if (parse_uint_full(server->value->u.tcp.port, &port, 10) < 0 = || + if (parse_uint_full(server->value->u.inet.port, &port, 10) < 0= || port > 65535) { error_setg(errp, "'%s' is not a valid port number", - server->value->u.tcp.port); + server->value->u.inet.port); errno =3D EINVAL; goto out; } ret =3D glfs_set_volfile_server(glfs, "tcp", - server->value->u.tcp.host, + server->value->u.inet.host, (int)port); } =20 @@ -448,8 +448,8 @@ static struct glfs *qemu_gluster_glfs_init(BlockdevOpti= onsGluster *gconf, server->value->u.q_unix.path); } else { error_append_hint(errp, "hint: failed on host %s and port = %s ", - server->value->u.tcp.host, - server->value->u.tcp.port); + server->value->u.inet.host, + server->value->u.inet.port); } } =20 @@ -536,21 +536,24 @@ static int qemu_gluster_parse_json(BlockdevOptionsGlu= ster *gconf, =20 } gsconf =3D g_new0(SocketAddressFlat, 1); + if (!strcmp(ptr, "tcp")) { + ptr =3D "inet"; /* accept legacy "tcp" */ + } gsconf->type =3D qapi_enum_parse(SocketAddressFlatType_lookup, ptr, SOCKET_ADDRESS_FLAT_TYPE__MAX, -1, &local_err); if (local_err) { error_append_hint(&local_err, - "Parameter '%s' may be 'tcp' or 'unix'\n", + "Parameter '%s' may be 'inet' or 'unix'\n", GLUSTER_OPT_TYPE); error_append_hint(&local_err, GERR_INDEX_HINT, i); goto out; } qemu_opts_del(opts); =20 - if (gsconf->type =3D=3D SOCKET_ADDRESS_FLAT_TYPE_TCP) { - /* create opts info from runtime_tcp_opts list */ - opts =3D qemu_opts_create(&runtime_tcp_opts, NULL, 0, &error_a= bort); + if (gsconf->type =3D=3D SOCKET_ADDRESS_FLAT_TYPE_INET) { + /* create opts info from runtime_inet_opts list */ + opts =3D qemu_opts_create(&runtime_inet_opts, NULL, 0, &error_= abort); qemu_opts_absorb_qdict(opts, backing_options, &local_err); if (local_err) { goto out; @@ -563,7 +566,7 @@ static int qemu_gluster_parse_json(BlockdevOptionsGlust= er *gconf, error_append_hint(&local_err, GERR_INDEX_HINT, i); goto out; } - gsconf->u.tcp.host =3D g_strdup(ptr); + gsconf->u.inet.host =3D g_strdup(ptr); ptr =3D qemu_opt_get(opts, GLUSTER_OPT_PORT); if (!ptr) { error_setg(&local_err, QERR_MISSING_PARAMETER, @@ -571,28 +574,28 @@ static int qemu_gluster_parse_json(BlockdevOptionsGlu= ster *gconf, error_append_hint(&local_err, GERR_INDEX_HINT, i); goto out; } - gsconf->u.tcp.port =3D g_strdup(ptr); + gsconf->u.inet.port =3D g_strdup(ptr); =20 /* defend for unsupported fields in InetSocketAddress, * i.e. @ipv4, @ipv6 and @to */ ptr =3D qemu_opt_get(opts, GLUSTER_OPT_TO); if (ptr) { - gsconf->u.tcp.has_to =3D true; + gsconf->u.inet.has_to =3D true; } ptr =3D qemu_opt_get(opts, GLUSTER_OPT_IPV4); if (ptr) { - gsconf->u.tcp.has_ipv4 =3D true; + gsconf->u.inet.has_ipv4 =3D true; } ptr =3D qemu_opt_get(opts, GLUSTER_OPT_IPV6); if (ptr) { - gsconf->u.tcp.has_ipv6 =3D true; + gsconf->u.inet.has_ipv6 =3D true; } - if (gsconf->u.tcp.has_to) { + if (gsconf->u.inet.has_to) { error_setg(&local_err, "Parameter 'to' not supported"); goto out; } - if (gsconf->u.tcp.has_ipv4 || gsconf->u.tcp.has_ipv6) { + if (gsconf->u.inet.has_ipv4 || gsconf->u.inet.has_ipv6) { error_setg(&local_err, "Parameters 'ipv4/ipv6' not support= ed"); goto out; } @@ -669,7 +672,7 @@ static struct glfs *qemu_gluster_init(BlockdevOptionsGl= uster *gconf, "file.volume=3Dtestvol,file.path=3D/path/a.qc= ow2" "[,file.debug=3D9]" "[,file.logfile=3D/path/filename.log]," - "file.server.0.type=3Dtcp," + "file.server.0.type=3Dinet," "file.server.0.host=3D1.2.3.4," "file.server.0.port=3D24007," "file.server.1.transport=3Dunix," diff --git a/qapi-schema.json b/qapi-schema.json index 15a8f7d..32b4a4b 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -4105,14 +4105,14 @@ # # Available SocketAddressFlat types # -# @tcp: Internet address +# @inet: Internet address # # @unix: Unix domain socket # # Since: 2.9 ## { 'enum': 'SocketAddressFlatType', - 'data': [ 'unix', 'tcp' ] } + 'data': [ 'unix', 'inet' ] } =20 ## # @SocketAddressFlat: @@ -4127,7 +4127,7 @@ # A flat union is nicer than simple because it avoids nesting # (i.e. more {}) on the wire. # -# 2. SocketAddressFlat supports only types 'unix' and 'tcp', because +# 2. SocketAddressFlat supports only types 'unix' and 'inet', because # that's what its current users need. # # Since: 2.9 @@ -4136,7 +4136,7 @@ 'base': { 'type': 'SocketAddressFlatType' }, 'discriminator': 'type', 'data': { 'unix': 'UnixSocketAddress', - 'tcp': 'InetSocketAddress' } } + 'inet': 'InetSocketAddress' } } =20 ## # @getfd: --=20 1.8.3.1