Eric Blake <ebl...@redhat.com> writes: > On 03/02/2017 03:44 PM, Markus Armbruster wrote: >> QAPI type SocketAddressFlat differs from SocketAddress pointlessly: >> the discriminator value for variant InetSocketAddress is 'tcp' instead >> of 'inet'. Rename. >> >> The type is far only used by the Gluster block drivers. Take care to >> keep 'tcp' working there. > > The old name was visible in QMP in 2.8, but only by blockdev-add, which > we've already argued was not stable (and where we've already made other > non-back-compat changes to it). But that means this HAS to go into 2.9, > if we're declaring blockdev-add stable for 2.9.
Yes. Note that the command line pseudo-filename's URI syntax stays the same (file=gluster+tcp://), and the command line's dotted key syntax keeps accepting tcp for compatiblity (file.server.0.type=tcp works in addition to =inet). > It wouldn't hurt to mention that additional information in the commit > message. I'll cook something up. >> >> Signed-off-by: Markus Armbruster <arm...@redhat.com> >> --- >> 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 77ce45b..0155188 100644 >> --- a/block/gluster.c >> +++ b/block/gluster.c [...] >> @@ -536,21 +536,24 @@ static int >> qemu_gluster_parse_json(BlockdevOptionsGluster *gconf, >> >> } >> gsconf = g_new0(SocketAddressFlat, 1); >> + if (!strcmp(ptr, "tcp")) { >> + ptr = "inet"; /* accept legacy "tcp" */ >> + } >> gsconf->type = qapi_enum_parse(SocketAddressFlatType_lookup, ptr, >> SOCKET_ADDRESS_FLAT_TYPE__MAX, 0, >> &local_err); This is where I keep file.server.N.type=tcp working. [...] >> +++ b/qapi-schema.json >> @@ -4105,14 +4105,14 @@ >> # >> # Available SocketAddressFlat types >> # >> -# @tcp: Internet address >> +# @inet: Internet address >> # >> # @unix: Unix domain socket > > Nit: Spacing is now inconsistent. Will fix. > Reviewed-by: Eric Blake <ebl...@redhat.com> Thanks!