aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc-André Lureau <marcandre.lureau@redhat.com>2016-06-23 16:29:24 +0200
committerMarkus Armbruster <armbru@redhat.com>2017-01-16 09:19:49 +0100
commitf46052fd139d8990c0d6395b563972ca1f2cf2fe (patch)
treea31449cbc75f4f3db9369a774300f3122b47b450
parent5dbdcf43243497f5350b311aff98dcf583bfdbc2 (diff)
qmp-events: move 'VNC_CONNECTED' doc to schema
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Signed-off-by: Markus Armbruster <armbru@redhat.com>
-rw-r--r--docs/qmp-events.txt31
-rw-r--r--qapi/event.json11
2 files changed, 11 insertions, 31 deletions
diff --git a/docs/qmp-events.txt b/docs/qmp-events.txt
index a4323f9489..f0eb626456 100644
--- a/docs/qmp-events.txt
+++ b/docs/qmp-events.txt
@@ -259,37 +259,6 @@ Example:
{"timestamp": {"seconds": 1449669631, "microseconds": 239225},
"event": "MIGRATION_PASS", "data": {"pass": 2}}
-VNC_CONNECTED
--------------
-
-Emitted when a VNC client establishes a connection.
-
-Data:
-
-- "server": Server information (json-object)
- - "host": IP address (json-string)
- - "service": port number (json-string)
- - "family": address family (json-string, "ipv4" or "ipv6")
- - "auth": authentication method (json-string, optional)
-- "client": Client information (json-object)
- - "host": IP address (json-string)
- - "service": port number (json-string)
- - "family": address family (json-string, "ipv4" or "ipv6")
-
-Example:
-
-{ "event": "VNC_CONNECTED",
- "data": {
- "server": { "auth": "sasl", "family": "ipv4",
- "service": "5901", "host": "0.0.0.0" },
- "client": { "family": "ipv4", "service": "58425",
- "host": "127.0.0.1" } },
- "timestamp": { "seconds": 1262976601, "microseconds": 975795 } }
-
-
-Note: This event is emitted before any authentication takes place, thus
-the authentication ID is not provided.
-
VNC_DISCONNECTED
----------------
diff --git a/qapi/event.json b/qapi/event.json
index 84b761ae3d..ffb07c92fc 100644
--- a/qapi/event.json
+++ b/qapi/event.json
@@ -240,6 +240,17 @@
# the authentication ID is not provided
#
# Since: 0.13.0
+#
+# Example:
+#
+# <- { "event": "VNC_CONNECTED",
+# "data": {
+# "server": { "auth": "sasl", "family": "ipv4",
+# "service": "5901", "host": "0.0.0.0" },
+# "client": { "family": "ipv4", "service": "58425",
+# "host": "127.0.0.1" } },
+# "timestamp": { "seconds": 1262976601, "microseconds": 975795 } }
+#
##
{ 'event': 'VNC_CONNECTED',
'data': { 'server': 'VncServerInfo',