Commit 8bc0673f authored by Markus Armbruster's avatar Markus Armbruster Committed by Max Reitz
Browse files

qapi-schema: SocketAddressFlat variants 'vsock' and 'fd' 



Note that the new variants are impossible in qemu_gluster_glfs_init(),
because the gconf->server can only come from qemu_gluster_parse_uri()
or qemu_gluster_parse_json(), and neither can create anything but
'inet' or 'unix'.

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarMax Reitz <mreitz@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Message-id: 1490895797-29094-7-git-send-email-armbru@redhat.com
Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
parent fce5d538

block/gluster.c

+2 −0
Original line number Diff line number Diff line
@@ -429,6 +429,8 @@ static struct glfs *qemu_gluster_glfs_init(BlockdevOptionsGluster *gconf, 
                                   server->value->u.inet.host,

                                   (int)port);

            break;

        case SOCKET_ADDRESS_FLAT_TYPE_VSOCK:

        case SOCKET_ADDRESS_FLAT_TYPE_FD:

        default:

            abort();

        }

qapi-schema.json

+8 −11
Original line number Diff line number Diff line
@@ -4144,7 +4144,7 @@ 
# Since: 2.9

##

{ 'enum': 'SocketAddressFlatType',

  'data': [ 'unix', 'inet' ] }

  'data': [ 'inet', 'unix', 'vsock', 'fd' ] }



##

# @SocketAddressFlat:
@@ -4153,22 +4153,19 @@ 
#

# @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 'inet', because

#    that's what its current users need.

# This is just like SocketAddress, except it's a flat union rather

# than a simple union.  Nicer because it avoids nesting on the wire,

# i.e. this form has fewer {}.

#

# Since: 2.9

##

{ 'union': 'SocketAddressFlat',

  'base': { 'type': 'SocketAddressFlatType' },

  'discriminator': 'type',

  'data': { 'unix': 'UnixSocketAddress',

            'inet': 'InetSocketAddress' } }

  'data': { 'inet': 'InetSocketAddress',

            'unix': 'UnixSocketAddress',

            'vsock': 'VsockSocketAddress',

            'fd': 'String' } }



##

# @getfd: