From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51506) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZpD4D-0004Ge-Cx for qemu-devel@nongnu.org; Thu, 22 Oct 2015 06:25:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZpD49-0002zI-DL for qemu-devel@nongnu.org; Thu, 22 Oct 2015 06:25:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40388) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZpD49-0002zE-7B for qemu-devel@nongnu.org; Thu, 22 Oct 2015 06:25:49 -0400 From: "Daniel P. Berrange" Date: Thu, 22 Oct 2015 11:25:43 +0100 Message-Id: <1445509543-30679-1-git-send-email-berrange@redhat.com> Subject: [Qemu-devel] [PATCH] qapi-schema: mark InetSocketAddress as mandatory again List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Knut Omang Revert the qapi-schema.json change done in: commit 0983f5e6af76d5df8c6346cbdfff9d8305fb6da0 Author: Daniel P. Berrange 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 Signed-off-by: Daniel P. Berrange --- qapi-schema.json | 6 ++---- 1 file 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' } } -- 2.4.3