aboutsummaryrefslogtreecommitdiff
path: root/qapi/block-core.json
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2017-03-06 20:00:47 +0100
committerKevin Wolf <kwolf@redhat.com>2017-03-07 14:53:29 +0100
commit2b733709d7a29273406d341f60efe3b5d69ea362 (patch)
tree6f1b0f3e711e9fa6f27e6a0c3d3b0f856a5589f0 /qapi/block-core.json
parent85a82e852d01c2cd26d3126c5900a5bd1c464609 (diff)
qapi-schema: Rename GlusterServer to SocketAddressFlat
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 <armbru@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'qapi/block-core.json')
-rw-r--r--qapi/block-core.json46
1 files changed, 1 insertions, 45 deletions
diff --git a/qapi/block-core.json b/qapi/block-core.json
index bc0ccd615c..d63be0ae2d 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -2546,50 +2546,6 @@
'*read-pattern': 'QuorumReadPattern' } }
##
-# @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' } }