From nobody Sun Feb 8 20:59:47 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 1488902577001741.0593134578495; Tue, 7 Mar 2017 08:02:57 -0800 (PST) Received: from localhost ([::1]:51386 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1clHZc-0004EU-6y for importer@patchew.org; Tue, 07 Mar 2017 11:02:52 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43066) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1clHFA-0002fY-ES for qemu-devel@nongnu.org; Tue, 07 Mar 2017 10:41:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1clHF9-0002zS-40 for qemu-devel@nongnu.org; Tue, 07 Mar 2017 10:41:44 -0500 Received: from mx1.redhat.com ([209.132.183.28]:50732) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1clHF2-0002vX-RH; 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 EAFE680F75; Tue, 7 Mar 2017 15:41:36 +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 v27FeuUq032123; Tue, 7 Mar 2017 10:41:36 -0500 From: Kevin Wolf To: qemu-block@nongnu.org Date: Tue, 7 Mar 2017 16:40:47 +0100 Message-Id: <1488901251-16214-24-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.27]); Tue, 07 Mar 2017 15:41:36 +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 23/27] qapi-schema: Rename GlusterServer to SocketAddressFlat 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 As its documentation says, it's not specific to Gluster. Rename it, as I'm going to use it for something else. Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Signed-off-by: Kevin Wolf --- block/gluster.c | 38 +++++++++++++++++++------------------- qapi-schema.json | 38 ++++++++++++++++++++++++++++++++++++++ qapi/block-core.json | 46 +--------------------------------------------- 3 files changed, 58 insertions(+), 64 deletions(-) diff --git a/block/gluster.c b/block/gluster.c index 991f18f..64b0217 100644 --- a/block/gluster.c +++ b/block/gluster.c @@ -321,7 +321,7 @@ static int parse_volume_options(BlockdevOptionsGluster = *gconf, char *path) static int qemu_gluster_parse_uri(BlockdevOptionsGluster *gconf, const char *filename) { - GlusterServer *gsconf; + SocketAddressFlat *gsconf; URI *uri; QueryParams *qp =3D NULL; bool is_unix =3D false; @@ -332,19 +332,19 @@ static int qemu_gluster_parse_uri(BlockdevOptionsGlus= ter *gconf, return -EINVAL; } =20 - gconf->server =3D g_new0(GlusterServerList, 1); - gconf->server->value =3D gsconf =3D g_new0(GlusterServer, 1); + gconf->server =3D g_new0(SocketAddressFlatList, 1); + gconf->server->value =3D gsconf =3D g_new0(SocketAddressFlat, 1); =20 /* transport */ if (!uri->scheme || !strcmp(uri->scheme, "gluster")) { - gsconf->type =3D GLUSTER_TRANSPORT_TCP; + gsconf->type =3D SOCKET_ADDRESS_FLAT_TYPE_TCP; } else if (!strcmp(uri->scheme, "gluster+tcp")) { - gsconf->type =3D GLUSTER_TRANSPORT_TCP; + gsconf->type =3D SOCKET_ADDRESS_FLAT_TYPE_TCP; } else if (!strcmp(uri->scheme, "gluster+unix")) { - gsconf->type =3D GLUSTER_TRANSPORT_UNIX; + gsconf->type =3D SOCKET_ADDRESS_FLAT_TYPE_UNIX; is_unix =3D true; } else if (!strcmp(uri->scheme, "gluster+rdma")) { - gsconf->type =3D GLUSTER_TRANSPORT_TCP; + gsconf->type =3D SOCKET_ADDRESS_FLAT_TYPE_TCP; error_report("Warning: rdma feature is not supported, falling " "back to tcp"); } else { @@ -396,7 +396,7 @@ static struct glfs *qemu_gluster_glfs_init(BlockdevOpti= onsGluster *gconf, struct glfs *glfs; int ret; int old_errno; - GlusterServerList *server; + SocketAddressFlatList *server; unsigned long long port; =20 glfs =3D glfs_find_preopened(gconf->volume); @@ -412,7 +412,7 @@ static struct glfs *qemu_gluster_glfs_init(BlockdevOpti= onsGluster *gconf, glfs_set_preopened(gconf->volume, glfs); =20 for (server =3D gconf->server; server; server =3D server->next) { - if (server->value->type =3D=3D GLUSTER_TRANSPORT_UNIX) { + if (server->value->type =3D=3D SOCKET_ADDRESS_FLAT_TYPE_UNIX) { ret =3D glfs_set_volfile_server(glfs, "unix", server->value->u.q_unix.path, 0); } else { @@ -443,7 +443,7 @@ static struct glfs *qemu_gluster_glfs_init(BlockdevOpti= onsGluster *gconf, error_setg(errp, "Gluster connection for volume %s, path %s failed" " to connect", gconf->volume, gconf->path); for (server =3D gconf->server; server; server =3D server->next) { - if (server->value->type =3D=3D GLUSTER_TRANSPORT_UNIX) { + if (server->value->type =3D=3D SOCKET_ADDRESS_FLAT_TYPE_UNIX)= { error_append_hint(errp, "hint: failed on socket %s ", server->value->u.q_unix.path); } else { @@ -480,8 +480,8 @@ static int qemu_gluster_parse_json(BlockdevOptionsGlust= er *gconf, QDict *options, Error **errp) { QemuOpts *opts; - GlusterServer *gsconf =3D NULL; - GlusterServerList *curr =3D NULL; + SocketAddressFlat *gsconf =3D NULL; + SocketAddressFlatList *curr =3D NULL; QDict *backing_options =3D NULL; Error *local_err =3D NULL; char *str =3D NULL; @@ -535,9 +535,9 @@ static int qemu_gluster_parse_json(BlockdevOptionsGlust= er *gconf, goto out; =20 } - gsconf =3D g_new0(GlusterServer, 1); - gsconf->type =3D qapi_enum_parse(GlusterTransport_lookup, ptr, - GLUSTER_TRANSPORT__MAX, -1, + gsconf =3D g_new0(SocketAddressFlat, 1); + 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, @@ -548,7 +548,7 @@ static int qemu_gluster_parse_json(BlockdevOptionsGlust= er *gconf, } qemu_opts_del(opts); =20 - if (gsconf->type =3D=3D GLUSTER_TRANSPORT_TCP) { + 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); qemu_opts_absorb_qdict(opts, backing_options, &local_err); @@ -617,11 +617,11 @@ static int qemu_gluster_parse_json(BlockdevOptionsGlu= ster *gconf, } =20 if (gconf->server =3D=3D NULL) { - gconf->server =3D g_new0(GlusterServerList, 1); + gconf->server =3D g_new0(SocketAddressFlatList, 1); gconf->server->value =3D gsconf; curr =3D gconf->server; } else { - curr->next =3D g_new0(GlusterServerList, 1); + curr->next =3D g_new0(SocketAddressFlatList, 1); curr->next->value =3D gsconf; curr =3D curr->next; } @@ -637,7 +637,7 @@ static int qemu_gluster_parse_json(BlockdevOptionsGlust= er *gconf, =20 out: error_propagate(errp, local_err); - qapi_free_GlusterServer(gsconf); + qapi_free_SocketAddressFlat(gsconf); qemu_opts_del(opts); g_free(str); QDECREF(backing_options); diff --git a/qapi-schema.json b/qapi-schema.json index 6febfa7..15a8f7d 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -4101,6 +4101,44 @@ 'fd': 'String' } } =20 ## +# @SocketAddressFlatType: +# +# Available SocketAddressFlat types +# +# @tcp: Internet address +# +# @unix: Unix domain socket +# +# Since: 2.9 +## +{ 'enum': 'SocketAddressFlatType', + 'data': [ 'unix', 'tcp' ] } + +## +# @SocketAddressFlat: +# +# Captures the address of a socket +# +# @type: Transport type +# +# This is similar to SocketAddress, only distinction: +# +# 1. SocketAddressFlat is a flat union, SocketAddress is a simple union. +# 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 +# that's what its current users need. +# +# Since: 2.9 +## +{ 'union': 'SocketAddressFlat', + 'base': { 'type': 'SocketAddressFlatType' }, + 'discriminator': 'type', + 'data': { 'unix': 'UnixSocketAddress', + 'tcp': 'InetSocketAddress' } } + +## # @getfd: # # Receive a file descriptor via SCM rights and assign it a name diff --git a/qapi/block-core.json b/qapi/block-core.json index bc0ccd6..d63be0a 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -2546,50 +2546,6 @@ '*read-pattern': 'QuorumReadPattern' } } =20 ## -# @GlusterTransport: -# -# An enumeration of Gluster transport types -# -# @tcp: TCP - Transmission Control Protocol -# -# @unix: UNIX - Unix domain socket -# -# Since: 2.7 -## -{ 'enum': 'GlusterTransport', - 'data': [ 'unix', 'tcp' ] } - - -## -# @GlusterServer: -# -# Captures the address of a socket -# -# Details for connecting to a gluster server -# -# @type: Transport type used for gluster connection -# -# This is similar to SocketAddress, only distinction: -# -# 1. GlusterServer is a flat union, SocketAddress is a simple union. -# A flat union is nicer than simple because it avoids nesting -# (i.e. more {}) on the wire. -# -# 2. GlusterServer lacks case 'fd', since gluster doesn't let you -# pass in a file descriptor. -# -# GlusterServer is actually not Gluster-specific, its a -# compatibility evolved into an alternate for SocketAddress. -# -# Since: 2.7 -## -{ 'union': 'GlusterServer', - 'base': { 'type': 'GlusterTransport' }, - 'discriminator': 'type', - 'data': { 'unix': 'UnixSocketAddress', - 'tcp': 'InetSocketAddress' } } - -## # @BlockdevOptionsGluster: # # Driver specific block device options for Gluster @@ -2610,7 +2566,7 @@ { 'struct': 'BlockdevOptionsGluster', 'data': { 'volume': 'str', 'path': 'str', - 'server': ['GlusterServer'], + 'server': ['SocketAddressFlat'], '*debug': 'int', '*logfile': 'str' } } =20 --=20 1.8.3.1