Commit 2ea1793b authored by Daniel P. Berrangé's avatar Daniel P. Berrangé Committed by Markus Armbruster
Browse files

qapi-schema: mark InetSocketAddress as mandatory again 



Revert the qapi-schema.json change done in:

  commit 0983f5e6
  Author: Daniel P. Berrange <berrange@redhat.com>
  Date:   Tue Sep 1 14:46:50 2015 +0100

    sockets: allow port to be NULL when listening on IP address

Switching "port" from mandatory to optional causes the QAPI
code generator to add a 'has_port' field to the InetSocketAddress
struct. No code that created InetSocketAddress objects was updated
to set 'has_port = true', which caused the non-NULL port strings
to be silently dropped when copying InetSocketAddress objects.

Reported-by: default avatarKnut Omang <knuto@ifi.uio.no>
Signed-off-by: default avatarDaniel P. Berrange <berrange@redhat.com>
Message-Id: <1445509543-30679-1-git-send-email-berrange@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
parent 3a958f55

qapi-schema.json

+2 −4
Original line number Diff line number Diff line
@@ -2614,9 +2614,7 @@ 
#

# @host: host part of the address

#

# @port: port part of the address, or lowest port if @to is present.

#        Kernel selects a free port if omitted for listener addresses.

#        #optional

# @port: port part of the address, or lowest port if @to is present

#

# @to: highest port to try

#
@@ -2631,7 +2629,7 @@ 
{ 'struct': 'InetSocketAddress',

  'data': {

    'host': 'str',

    '*port': 'str',

    'port': 'str',

    '*to': 'uint16',

    '*ipv4': 'bool',

    '*ipv6': 'bool' } }