diff options
author | Markus Armbruster <armbru@redhat.com> | 2017-03-06 20:00:48 +0100 |
---|---|---|
committer | Kevin Wolf <kwolf@redhat.com> | 2017-03-07 14:53:29 +0100 |
commit | c5f1ae3ae7b19591c78a61e46cf812b0b968fef0 (patch) | |
tree | 86e73beb854913f10a50a4db4d47499e1f8c8c4a /qapi-schema.json | |
parent | 2b733709d7a29273406d341f60efe3b5d69ea362 (diff) |
qapi-schema: Rename SocketAddressFlat's variant tcp to inet
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=tcp.
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 <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'qapi-schema.json')
-rw-r--r-- | qapi-schema.json | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/qapi-schema.json b/qapi-schema.json index 15a8f7d3b0..32b4a4b782 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' ] } ## # @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' } } ## # @getfd: |