aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel P. Berrange <berrange@redhat.com>2015-10-22 11:25:43 +0100
committerMarkus Armbruster <armbru@redhat.com>2015-11-02 08:30:25 +0100
commit2ea1793bd90f04c34fbb75a1b84d71cb5b1f9c08 (patch)
treee104f874c0f601158567ef84be20429ad16e1d5f
parent3a958f559ecd0511583d27b10011fa7f3cf79b63 (diff)
downloadqemu-2ea1793bd90f04c34fbb75a1b84d71cb5b1f9c08.zip
qemu-2ea1793bd90f04c34fbb75a1b84d71cb5b1f9c08.tar.gz
qemu-2ea1793bd90f04c34fbb75a1b84d71cb5b1f9c08.tar.bz2
qapi-schema: mark InetSocketAddress as mandatory again
Revert the qapi-schema.json change done in: commit 0983f5e6af76d5df8c6346cbdfff9d8305fb6da0 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: Knut Omang <knuto@ifi.uio.no> Signed-off-by: Daniel P. Berrange <berrange@redhat.com> Message-Id: <1445509543-30679-1-git-send-email-berrange@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Signed-off-by: Markus Armbruster <armbru@redhat.com>
-rw-r--r--qapi-schema.json6
1 files changed, 2 insertions, 4 deletions
diff --git a/qapi-schema.json b/qapi-schema.json
index f60be29..702b7b5 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -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' } }