{"id":808796,"url":"http://patchwork.ozlabs.org/api/patches/808796/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170901153758.8628-20-armbru@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170901153758.8628-20-armbru@redhat.com>","list_archive_url":null,"date":"2017-09-01T15:37:30","name":"[PULL,v2,19/47] qapi-schema: Collect sockets stuff in qapi/sockets.json","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"414f89e83e6dcfd1287bcc438c7b21cd392421d9","submitter":{"id":2645,"url":"http://patchwork.ozlabs.org/api/people/2645/?format=json","name":"Markus Armbruster","email":"armbru@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170901153758.8628-20-armbru@redhat.com/mbox/","series":[{"id":1049,"url":"http://patchwork.ozlabs.org/api/series/1049/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=1049","date":"2017-09-01T15:37:14","name":"[PULL,v2,01/47] qapi: Fix error handling code on alternate conflict","version":2,"mbox":"http://patchwork.ozlabs.org/series/1049/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/808796/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/808796/checks/","tags":{},"related":[],"headers":{"Return-Path":"<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=208.118.235.17; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=<UNKNOWN>)","ext-mx07.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx07.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=armbru@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [208.118.235.17])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xkPYZ0dbSz9t1t\n\tfor <incoming@patchwork.ozlabs.org>;\n\tSat,  2 Sep 2017 02:18:25 +1000 (AEST)","from localhost ([::1]:47172 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>)\n\tid 1dnoeF-0004WO-85\n\tfor incoming@patchwork.ozlabs.org; Fri, 01 Sep 2017 12:18:23 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:51871)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <armbru@redhat.com>) id 1dno1c-0006ve-5V\n\tfor qemu-devel@nongnu.org; Fri, 01 Sep 2017 11:38:31 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <armbru@redhat.com>) id 1dno1T-0001qA-L0\n\tfor qemu-devel@nongnu.org; Fri, 01 Sep 2017 11:38:28 -0400","from mx1.redhat.com ([209.132.183.28]:33226)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from <armbru@redhat.com>) id 1dno1T-0001pO-BA\n\tfor qemu-devel@nongnu.org; Fri, 01 Sep 2017 11:38:19 -0400","from smtp.corp.redhat.com\n\t(int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 6756DC047B74\n\tfor <qemu-devel@nongnu.org>; Fri,  1 Sep 2017 15:38:18 +0000 (UTC)","from blackfin.pond.sub.org (ovpn-116-75.ams2.redhat.com\n\t[10.36.116.75])\n\tby smtp.corp.redhat.com (Postfix) with ESMTPS id D41667835E;\n\tFri,  1 Sep 2017 15:38:08 +0000 (UTC)","by blackfin.pond.sub.org (Postfix, from userid 1000)\n\tid 7A4981138557; Fri,  1 Sep 2017 17:37:58 +0200 (CEST)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 6756DC047B74","From":"Markus Armbruster <armbru@redhat.com>","To":"qemu-devel@nongnu.org","Date":"Fri,  1 Sep 2017 17:37:30 +0200","Message-Id":"<20170901153758.8628-20-armbru@redhat.com>","In-Reply-To":"<20170901153758.8628-1-armbru@redhat.com>","References":"<20170901153758.8628-1-armbru@redhat.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.13","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.31]);\n\tFri, 01 Sep 2017 15:38:18 +0000 (UTC)","Content-Transfer-Encoding":"quoted-printable","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"[Qemu-devel] [PULL v2 19/47] qapi-schema: Collect sockets stuff in\n\tqapi/sockets.json","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"<qemu-devel.nongnu.org>","List-Unsubscribe":"<https://lists.nongnu.org/mailman/options/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>","List-Archive":"<http://lists.nongnu.org/archive/html/qemu-devel/>","List-Post":"<mailto:qemu-devel@nongnu.org>","List-Help":"<mailto:qemu-devel-request@nongnu.org?subject=help>","List-Subscribe":"<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=subscribe>","Cc":"Paolo Bonzini <pbonzini@redhat.com>, Gerd Hoffmann <kraxel@redhat.com>","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>"},"content":"Cc: \"Daniel P. Berrange\" <berrange@redhat.com>\nCc: Gerd Hoffmann <kraxel@redhat.com>\nCc: Paolo Bonzini <pbonzini@redhat.com>\nSigned-off-by: Markus Armbruster <armbru@redhat.com>\nMessage-Id: <1503602048-12268-5-git-send-email-armbru@redhat.com>\nReviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>\n---\n MAINTAINERS          |   1 +\n Makefile             |   4 +-\n qapi-schema.json     | 152 +--------------------------------------------------\n qapi/block-core.json |   2 +-\n qapi/common.json     |  11 ++++\n qapi/sockets.json    | 147 +++++++++++++++++++++++++++++++++++++++++++++++++\n 6 files changed, 164 insertions(+), 153 deletions(-)\n create mode 100644 qapi/sockets.json","diff":"diff --git a/MAINTAINERS b/MAINTAINERS\nindex ccee28b12d..fb90a19b3d 100644\n--- a/MAINTAINERS\n+++ b/MAINTAINERS\n@@ -1535,6 +1535,7 @@ M: Paolo Bonzini <pbonzini@redhat.com>\n S: Maintained\n F: include/qemu/sockets.h\n F: util/qemu-sockets.c\n+F: qapi/sockets.json\n \n Throttling infrastructure\n M: Alberto Garcia <berto@igalia.com>\ndiff --git a/Makefile b/Makefile\nindex 81447b1f08..ca4a03c376 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -410,8 +410,10 @@ $(SRC_PATH)/qga/qapi-schema.json $(SRC_PATH)/scripts/qapi-commands.py $(qapi-py)\n \n qapi-modules = $(SRC_PATH)/qapi-schema.json $(SRC_PATH)/qapi/common.json \\\n                $(SRC_PATH)/qapi/block.json $(SRC_PATH)/qapi/block-core.json \\\n+               $(SRC_PATH)/qapi/crypto.json \\\n                $(SRC_PATH)/qapi/event.json $(SRC_PATH)/qapi/introspect.json \\\n-               $(SRC_PATH)/qapi/crypto.json $(SRC_PATH)/qapi/rocker.json \\\n+               $(SRC_PATH)/qapi/rocker.json \\\n+               $(SRC_PATH)/qapi/sockets.json \\\n                $(SRC_PATH)/qapi/trace.json\n \n qapi-types.c qapi-types.h :\\\ndiff --git a/qapi-schema.json b/qapi-schema.json\nindex add4777e9a..d69b6da5ec 100644\n--- a/qapi-schema.json\n+++ b/qapi-schema.json\n@@ -79,6 +79,7 @@\n # include it first in qapi-schema.json.\n \n { 'include': 'qapi/common.json' }\n+{ 'include': 'qapi/sockets.json' }\n { 'include': 'qapi/crypto.json' }\n { 'include': 'qapi/block.json' }\n { 'include': 'qapi/rocker.json' }\n@@ -1616,26 +1617,6 @@\n { 'command': 'query-iothreads', 'returns': ['IOThreadInfo'] }\n \n ##\n-# @NetworkAddressFamily:\n-#\n-# The network address family\n-#\n-# @ipv4: IPV4 family\n-#\n-# @ipv6: IPV6 family\n-#\n-# @unix: unix socket\n-#\n-# @vsock: vsock family (since 2.8)\n-#\n-# @unknown: otherwise\n-#\n-# Since: 2.1\n-##\n-{ 'enum': 'NetworkAddressFamily',\n-  'data': [ 'ipv4', 'ipv6', 'unix', 'vsock', 'unknown' ] }\n-\n-##\n # @VncBasicInfo:\n #\n # The basic information for vnc network connection\n@@ -3696,17 +3677,6 @@\n     '*vectors': 'uint32' } }\n \n ##\n-# @String:\n-#\n-# A fat type wrapping 'str', to be embedded in lists.\n-#\n-# Since: 1.2\n-##\n-{ 'struct': 'String',\n-  'data': {\n-    'str': 'str' } }\n-\n-##\n # @NetdevUserOptions:\n #\n # Use the user mode network stack which requires no administrator privilege to\n@@ -4157,126 +4127,6 @@\n   'data': [ 'all', 'rx', 'tx' ] }\n \n ##\n-# @InetSocketAddressBase:\n-#\n-# @host: host part of the address\n-# @port: port part of the address\n-##\n-{ 'struct': 'InetSocketAddressBase',\n-  'data': {\n-    'host': 'str',\n-    'port': 'str' } }\n-\n-##\n-# @InetSocketAddress:\n-#\n-# Captures a socket address or address range in the Internet namespace.\n-#\n-# @numeric: true if the host/port are guaranteed to be numeric,\n-#           false if name resolution should be attempted. Defaults to false.\n-#           (Since 2.9)\n-#\n-# @to: If present, this is range of possible addresses, with port\n-#      between @port and @to.\n-#\n-# @ipv4: whether to accept IPv4 addresses, default try both IPv4 and IPv6\n-#\n-# @ipv6: whether to accept IPv6 addresses, default try both IPv4 and IPv6\n-#\n-# Since: 1.3\n-##\n-{ 'struct': 'InetSocketAddress',\n-  'base': 'InetSocketAddressBase',\n-  'data': {\n-    '*numeric':  'bool',\n-    '*to': 'uint16',\n-    '*ipv4': 'bool',\n-    '*ipv6': 'bool' } }\n-\n-##\n-# @UnixSocketAddress:\n-#\n-# Captures a socket address in the local (\"Unix socket\") namespace.\n-#\n-# @path: filesystem path to use\n-#\n-# Since: 1.3\n-##\n-{ 'struct': 'UnixSocketAddress',\n-  'data': {\n-    'path': 'str' } }\n-\n-##\n-# @VsockSocketAddress:\n-#\n-# Captures a socket address in the vsock namespace.\n-#\n-# @cid: unique host identifier\n-# @port: port\n-#\n-# Note: string types are used to allow for possible future hostname or\n-# service resolution support.\n-#\n-# Since: 2.8\n-##\n-{ 'struct': 'VsockSocketAddress',\n-  'data': {\n-    'cid': 'str',\n-    'port': 'str' } }\n-\n-##\n-# @SocketAddressLegacy:\n-#\n-# Captures the address of a socket, which could also be a named file descriptor\n-#\n-# Note: This type is deprecated in favor of SocketAddress.  The\n-# difference between SocketAddressLegacy and SocketAddress is that the\n-# latter is a flat union rather than a simple union. Flat is nicer\n-# because it avoids nesting on the wire, i.e. that form has fewer {}.\n-\n-#\n-# Since: 1.3\n-##\n-{ 'union': 'SocketAddressLegacy',\n-  'data': {\n-    'inet': 'InetSocketAddress',\n-    'unix': 'UnixSocketAddress',\n-    'vsock': 'VsockSocketAddress',\n-    'fd': 'String' } }\n-\n-##\n-# @SocketAddressType:\n-#\n-# Available SocketAddress types\n-#\n-# @inet:  Internet address\n-#\n-# @unix:  Unix domain socket\n-#\n-# Since: 2.9\n-##\n-{ 'enum': 'SocketAddressType',\n-  'data': [ 'inet', 'unix', 'vsock', 'fd' ] }\n-\n-##\n-# @SocketAddress:\n-#\n-# Captures the address of a socket, which could also be a named file\n-# descriptor\n-#\n-# @type:       Transport type\n-#\n-# Since: 2.9\n-##\n-{ 'union': 'SocketAddress',\n-  'base': { 'type': 'SocketAddressType' },\n-  'discriminator': 'type',\n-  'data': { 'inet': 'InetSocketAddress',\n-            'unix': 'UnixSocketAddress',\n-            'vsock': 'VsockSocketAddress',\n-            'fd': 'String' } }\n-\n-##\n # @getfd:\n #\n # Receive a file descriptor via SCM rights and assign it a name\ndiff --git a/qapi/block-core.json b/qapi/block-core.json\nindex 833c602150..5379674292 100644\n--- a/qapi/block-core.json\n+++ b/qapi/block-core.json\n@@ -4,8 +4,8 @@\n # == QAPI block core definitions (vm unrelated)\n ##\n \n-# QAPI common definitions\n { 'include': 'common.json' }\n+{ 'include': 'sockets.json' }\n \n ##\n # @SnapshotInfo:\ndiff --git a/qapi/common.json b/qapi/common.json\nindex 8355d5a2f3..862e73f982 100644\n--- a/qapi/common.json\n+++ b/qapi/common.json\n@@ -162,3 +162,14 @@\n ##\n { 'enum': 'OnOffSplit',\n   'data': [ 'on', 'off', 'split' ] }\n+\n+##\n+# @String:\n+#\n+# A fat type wrapping 'str', to be embedded in lists.\n+#\n+# Since: 1.2\n+##\n+{ 'struct': 'String',\n+  'data': {\n+    'str': 'str' } }\ndiff --git a/qapi/sockets.json b/qapi/sockets.json\nnew file mode 100644\nindex 0000000000..ac022c6ad0\n--- /dev/null\n+++ b/qapi/sockets.json\n@@ -0,0 +1,147 @@\n+# -*- Mode: Python -*-\n+\n+##\n+# = Socket data types\n+##\n+\n+{ 'include': 'common.json' }\n+\n+##\n+# @NetworkAddressFamily:\n+#\n+# The network address family\n+#\n+# @ipv4: IPV4 family\n+#\n+# @ipv6: IPV6 family\n+#\n+# @unix: unix socket\n+#\n+# @vsock: vsock family (since 2.8)\n+#\n+# @unknown: otherwise\n+#\n+# Since: 2.1\n+##\n+{ 'enum': 'NetworkAddressFamily',\n+  'data': [ 'ipv4', 'ipv6', 'unix', 'vsock', 'unknown' ] }\n+\n+##\n+# @InetSocketAddressBase:\n+#\n+# @host: host part of the address\n+# @port: port part of the address\n+##\n+{ 'struct': 'InetSocketAddressBase',\n+  'data': {\n+    'host': 'str',\n+    'port': 'str' } }\n+\n+##\n+# @InetSocketAddress:\n+#\n+# Captures a socket address or address range in the Internet namespace.\n+#\n+# @numeric: true if the host/port are guaranteed to be numeric,\n+#           false if name resolution should be attempted. Defaults to false.\n+#           (Since 2.9)\n+#\n+# @to: If present, this is range of possible addresses, with port\n+#      between @port and @to.\n+#\n+# @ipv4: whether to accept IPv4 addresses, default try both IPv4 and IPv6\n+#\n+# @ipv6: whether to accept IPv6 addresses, default try both IPv4 and IPv6\n+#\n+# Since: 1.3\n+##\n+{ 'struct': 'InetSocketAddress',\n+  'base': 'InetSocketAddressBase',\n+  'data': {\n+    '*numeric':  'bool',\n+    '*to': 'uint16',\n+    '*ipv4': 'bool',\n+    '*ipv6': 'bool' } }\n+\n+##\n+# @UnixSocketAddress:\n+#\n+# Captures a socket address in the local (\"Unix socket\") namespace.\n+#\n+# @path: filesystem path to use\n+#\n+# Since: 1.3\n+##\n+{ 'struct': 'UnixSocketAddress',\n+  'data': {\n+    'path': 'str' } }\n+\n+##\n+# @VsockSocketAddress:\n+#\n+# Captures a socket address in the vsock namespace.\n+#\n+# @cid: unique host identifier\n+# @port: port\n+#\n+# Note: string types are used to allow for possible future hostname or\n+# service resolution support.\n+#\n+# Since: 2.8\n+##\n+{ 'struct': 'VsockSocketAddress',\n+  'data': {\n+    'cid': 'str',\n+    'port': 'str' } }\n+\n+##\n+# @SocketAddressLegacy:\n+#\n+# Captures the address of a socket, which could also be a named file descriptor\n+#\n+# Note: This type is deprecated in favor of SocketAddress.  The\n+# difference between SocketAddressLegacy and SocketAddress is that the\n+# latter is a flat union rather than a simple union. Flat is nicer\n+# because it avoids nesting on the wire, i.e. that form has fewer {}.\n+\n+#\n+# Since: 1.3\n+##\n+{ 'union': 'SocketAddressLegacy',\n+  'data': {\n+    'inet': 'InetSocketAddress',\n+    'unix': 'UnixSocketAddress',\n+    'vsock': 'VsockSocketAddress',\n+    'fd': 'String' } }\n+\n+##\n+# @SocketAddressType:\n+#\n+# Available SocketAddress types\n+#\n+# @inet:  Internet address\n+#\n+# @unix:  Unix domain socket\n+#\n+# Since: 2.9\n+##\n+{ 'enum': 'SocketAddressType',\n+  'data': [ 'inet', 'unix', 'vsock', 'fd' ] }\n+\n+##\n+# @SocketAddress:\n+#\n+# Captures the address of a socket, which could also be a named file\n+# descriptor\n+#\n+# @type:       Transport type\n+#\n+# Since: 2.9\n+##\n+{ 'union': 'SocketAddress',\n+  'base': { 'type': 'SocketAddressType' },\n+  'discriminator': 'type',\n+  'data': { 'inet': 'InetSocketAddress',\n+            'unix': 'UnixSocketAddress',\n+            'vsock': 'VsockSocketAddress',\n+            'fd': 'String' } }\n","prefixes":["PULL","v2","19/47"]}