From: Luiz Capitulino <lcapitulino@redhat.com>
To: aliguori@us.ibm.com
Cc: qemu-devel@nongnu.org
Subject: [Qemu-devel] [PATCH 39/48] qmp: qmp-events.txt: put events in alphabetical order
Date: Mon, 13 Aug 2012 16:49:00 -0300 [thread overview]
Message-ID: <1344887349-13041-40-git-send-email-lcapitulino@redhat.com> (raw)
In-Reply-To: <1344887349-13041-1-git-send-email-lcapitulino@redhat.com>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
---
QMP/qmp-events.txt | 266 ++++++++++++++++++++++++++---------------------------
1 file changed, 130 insertions(+), 136 deletions(-)
diff --git a/QMP/qmp-events.txt b/QMP/qmp-events.txt
index 10f69d1..2389370 100644
--- a/QMP/qmp-events.txt
+++ b/QMP/qmp-events.txt
@@ -1,6 +1,23 @@
QEMU Monitor Protocol Events
============================
+BALLOON_CHANGE
+--------------
+
+Emitted when the guest changes the actual BALLOON level. This
+value is equivalent to the 'actual' field return by the
+'query-balloon' command
+
+Data:
+
+- "actual": actual level of the guest memory balloon in bytes (json-number)
+
+Example:
+
+{ "event": "BALLOON_CHANGE",
+ "data": { "actual": 944766976 },
+ "timestamp": { "seconds": 1267020223, "microseconds": 435656 } }
+
BLOCK_IO_ERROR
--------------
@@ -26,6 +43,57 @@ Example:
Note: If action is "stop", a STOP event will eventually follow the
BLOCK_IO_ERROR event.
+BLOCK_JOB_CANCELLED
+-------------------
+
+Emitted when a block job has been cancelled.
+
+Data:
+
+- "type": Job type ("stream" for image streaming, json-string)
+- "device": Device name (json-string)
+- "len": Maximum progress value (json-int)
+- "offset": Current progress value (json-int)
+ On success this is equal to len.
+ On failure this is less than len.
+- "speed": Rate limit, bytes per second (json-int)
+
+Example:
+
+{ "event": "BLOCK_JOB_CANCELLED",
+ "data": { "type": "stream", "device": "virtio-disk0",
+ "len": 10737418240, "offset": 134217728,
+ "speed": 0 },
+ "timestamp": { "seconds": 1267061043, "microseconds": 959568 } }
+
+BLOCK_JOB_COMPLETED
+-------------------
+
+Emitted when a block job has completed.
+
+Data:
+
+- "type": Job type ("stream" for image streaming, json-string)
+- "device": Device name (json-string)
+- "len": Maximum progress value (json-int)
+- "offset": Current progress value (json-int)
+ On success this is equal to len.
+ On failure this is less than len.
+- "speed": Rate limit, bytes per second (json-int)
+- "error": Error message (json-string, optional)
+ Only present on failure. This field contains a human-readable
+ error message. There are no semantics other than that streaming
+ has failed and clients should not try to interpret the error
+ string.
+
+Example:
+
+{ "event": "BLOCK_JOB_COMPLETED",
+ "data": { "type": "stream", "device": "virtio-disk0",
+ "len": 10737418240, "offset": 10737418240,
+ "speed": 0 },
+ "timestamp": { "seconds": 1267061043, "microseconds": 959568 } }
+
DEVICE_TRAY_MOVED
-----------------
@@ -98,6 +166,68 @@ Example:
Note: If the command-line option "-no-shutdown" has been specified, a STOP
event will eventually follow the SHUTDOWN event.
+SPICE_CONNECTED, SPICE_DISCONNECTED
+-----------------------------------
+
+Emitted when a SPICE client connects or disconnects.
+
+Data:
+
+- "server": Server information (json-object)
+ - "host": IP address (json-string)
+ - "port": port number (json-string)
+ - "family": address family (json-string, "ipv4" or "ipv6")
+- "client": Client information (json-object)
+ - "host": IP address (json-string)
+ - "port": port number (json-string)
+ - "family": address family (json-string, "ipv4" or "ipv6")
+
+Example:
+
+{ "timestamp": {"seconds": 1290688046, "microseconds": 388707},
+ "event": "SPICE_CONNECTED",
+ "data": {
+ "server": { "port": "5920", "family": "ipv4", "host": "127.0.0.1"},
+ "client": {"port": "52873", "family": "ipv4", "host": "127.0.0.1"}
+}}
+
+SPICE_INITIALIZED
+-----------------
+
+Emitted after initial handshake and authentication takes place (if any)
+and the SPICE channel is up'n'running
+
+Data:
+
+- "server": Server information (json-object)
+ - "host": IP address (json-string)
+ - "port": 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)
+ - "port": port number (json-string)
+ - "family": address family (json-string, "ipv4" or "ipv6")
+ - "connection-id": spice connection id. All channels with the same id
+ belong to the same spice session (json-int)
+ - "channel-type": channel type. "1" is the main control channel, filter for
+ this one if you want track spice sessions only (json-int)
+ - "channel-id": channel id. Usually "0", might be different needed when
+ multiple channels of the same type exist, such as multiple
+ display channels in a multihead setup (json-int)
+ - "tls": whevener the channel is encrypted (json-bool)
+
+Example:
+
+{ "timestamp": {"seconds": 1290688046, "microseconds": 417172},
+ "event": "SPICE_INITIALIZED",
+ "data": {"server": {"auth": "spice", "port": "5921",
+ "family": "ipv4", "host": "127.0.0.1"},
+ "client": {"port": "49004", "family": "ipv4", "channel-type": 3,
+ "connection-id": 1804289383, "host": "127.0.0.1",
+ "channel-id": 0, "tls": true}
+}}
+
STOP
----
@@ -200,70 +330,6 @@ Example:
"host": "127.0.0.1", "sasl_username": "luiz" } },
"timestamp": { "seconds": 1263475302, "microseconds": 150772 } }
-SPICE_CONNECTED, SPICE_DISCONNECTED
------------------------------------
-
-Emitted when a SPICE client connects or disconnects.
-
-Data:
-
-- "server": Server information (json-object)
- - "host": IP address (json-string)
- - "port": port number (json-string)
- - "family": address family (json-string, "ipv4" or "ipv6")
-- "client": Client information (json-object)
- - "host": IP address (json-string)
- - "port": port number (json-string)
- - "family": address family (json-string, "ipv4" or "ipv6")
-
-Example:
-
-{ "timestamp": {"seconds": 1290688046, "microseconds": 388707},
- "event": "SPICE_CONNECTED",
- "data": {
- "server": { "port": "5920", "family": "ipv4", "host": "127.0.0.1"},
- "client": {"port": "52873", "family": "ipv4", "host": "127.0.0.1"}
-}}
-
-
-SPICE_INITIALIZED
------------------
-
-Emitted after initial handshake and authentication takes place (if any)
-and the SPICE channel is up'n'running
-
-Data:
-
-- "server": Server information (json-object)
- - "host": IP address (json-string)
- - "port": 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)
- - "port": port number (json-string)
- - "family": address family (json-string, "ipv4" or "ipv6")
- - "connection-id": spice connection id. All channels with the same id
- belong to the same spice session (json-int)
- - "channel-type": channel type. "1" is the main control channel, filter for
- this one if you want track spice sessions only (json-int)
- - "channel-id": channel id. Usually "0", might be different needed when
- multiple channels of the same type exist, such as multiple
- display channels in a multihead setup (json-int)
- - "tls": whevener the channel is encrypted (json-bool)
-
-Example:
-
-{ "timestamp": {"seconds": 1290688046, "microseconds": 417172},
- "event": "SPICE_INITIALIZED",
- "data": {"server": {"auth": "spice", "port": "5921",
- "family": "ipv4", "host": "127.0.0.1"},
- "client": {"port": "49004", "family": "ipv4", "channel-type": 3,
- "connection-id": 1804289383, "host": "127.0.0.1",
- "channel-id": 0, "tls": true}
-}}
-
-
WAKEUP
------
@@ -276,7 +342,6 @@ Example:
{ "event": "WATCHDOG",
"timestamp": { "seconds": 1344522075, "microseconds": 745528 } }
-
WATCHDOG
--------
@@ -295,74 +360,3 @@ Example:
Note: If action is "reset", "shutdown", or "pause" the WATCHDOG event is
followed respectively by the RESET, SHUTDOWN, or STOP events.
-
-
-BLOCK_JOB_COMPLETED
--------------------
-
-Emitted when a block job has completed.
-
-Data:
-
-- "type": Job type ("stream" for image streaming, json-string)
-- "device": Device name (json-string)
-- "len": Maximum progress value (json-int)
-- "offset": Current progress value (json-int)
- On success this is equal to len.
- On failure this is less than len.
-- "speed": Rate limit, bytes per second (json-int)
-- "error": Error message (json-string, optional)
- Only present on failure. This field contains a human-readable
- error message. There are no semantics other than that streaming
- has failed and clients should not try to interpret the error
- string.
-
-Example:
-
-{ "event": "BLOCK_JOB_COMPLETED",
- "data": { "type": "stream", "device": "virtio-disk0",
- "len": 10737418240, "offset": 10737418240,
- "speed": 0 },
- "timestamp": { "seconds": 1267061043, "microseconds": 959568 } }
-
-
-BLOCK_JOB_CANCELLED
--------------------
-
-Emitted when a block job has been cancelled.
-
-Data:
-
-- "type": Job type ("stream" for image streaming, json-string)
-- "device": Device name (json-string)
-- "len": Maximum progress value (json-int)
-- "offset": Current progress value (json-int)
- On success this is equal to len.
- On failure this is less than len.
-- "speed": Rate limit, bytes per second (json-int)
-
-Example:
-
-{ "event": "BLOCK_JOB_CANCELLED",
- "data": { "type": "stream", "device": "virtio-disk0",
- "len": 10737418240, "offset": 134217728,
- "speed": 0 },
- "timestamp": { "seconds": 1267061043, "microseconds": 959568 } }
-
-
-BALLOON_CHANGE
-----------
-
-Emitted when the guest changes the actual BALLOON level. This
-value is equivalent to the 'actual' field return by the
-'query-balloon' command
-
-Data:
-
-- "actual": actual level of the guest memory balloon in bytes (json-number)
-
-Example:
-
-{ "event": "BALLOON_CHANGE",
- "data": { "actual": 944766976 },
- "timestamp": { "seconds": 1267020223, "microseconds": 435656 } }
--
1.7.11.2.249.g31c7954.dirty
next prev parent reply other threads:[~2012-08-13 19:49 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-13 19:48 [Qemu-devel] [PULL 00/48]: QMP queue Luiz Capitulino
2012-08-13 19:48 ` [Qemu-devel] [PATCH 01/48] monitor: drop unused monitor debug code Luiz Capitulino
2012-08-13 19:48 ` [Qemu-devel] [PATCH 02/48] qerror: QERR_AMBIGUOUS_PATH: drop %(object) from human msg Luiz Capitulino
2012-08-13 19:48 ` [Qemu-devel] [PATCH 03/48] qerror: QERR_DEVICE_ENCRYPTED: change error message Luiz Capitulino
2012-08-13 19:48 ` [Qemu-devel] [PATCH 04/48] qerror: reduce public exposure Luiz Capitulino
2012-08-13 19:48 ` [Qemu-devel] [PATCH 05/48] qerror: drop qerror_abort() Luiz Capitulino
2012-08-13 19:48 ` [Qemu-devel] [PATCH 06/48] qerror: avoid passing qerr pointer Luiz Capitulino
2012-08-13 19:48 ` [Qemu-devel] [PATCH 07/48] qerror: QError: drop file, linenr, func Luiz Capitulino
2012-08-13 19:48 ` [Qemu-devel] [PATCH 08/48] qerror: qerror_format(): return an allocated string Luiz Capitulino
2012-08-13 19:48 ` [Qemu-devel] [PATCH 09/48] qerror: don't delay error message construction Luiz Capitulino
2012-08-13 19:48 ` [Qemu-devel] [PATCH 10/48] error: " Luiz Capitulino
2012-08-13 19:48 ` [Qemu-devel] [PATCH 11/48] qmp: query-block: add 'encryption_key_missing' field Luiz Capitulino
2012-08-13 19:48 ` [Qemu-devel] [PATCH 12/48] hmp: hmp_cont(): don't rely on QERR_DEVICE_ENCRYPTED Luiz Capitulino
2012-08-13 19:48 ` [Qemu-devel] [PATCH 13/48] hmp_change(): don't access DeviceEncrypted's data Luiz Capitulino
2012-08-13 19:48 ` [Qemu-devel] [PATCH 14/48] net: inet_connect(), inet_connect_opts(): add in_progress argument Luiz Capitulino
2012-08-13 19:48 ` [Qemu-devel] [PATCH 15/48] migration: don't rely on any QERR_SOCKET_* Luiz Capitulino
2012-08-13 19:48 ` [Qemu-devel] [PATCH 16/48] qerror: drop QERR_SOCKET_CONNECT_IN_PROGRESS Luiz Capitulino
2012-08-13 19:48 ` [Qemu-devel] [PATCH 17/48] block: block_int: include qerror.h Luiz Capitulino
2012-08-13 19:48 ` [Qemu-devel] [PATCH 18/48] hmp: hmp.h: include qdict.h Luiz Capitulino
2012-08-13 19:48 ` [Qemu-devel] [PATCH 19/48] qapi: qapi-types.h: don't include qapi/qapi-types-core.h Luiz Capitulino
2012-08-13 19:48 ` [Qemu-devel] [PATCH 20/48] qapi: generate correct enum names for camel case enums Luiz Capitulino
2012-08-13 19:48 ` [Qemu-devel] [PATCH 21/48] qapi: don't convert enum strings to lowercase Luiz Capitulino
2012-08-13 19:48 ` [Qemu-devel] [PATCH 22/48] qapi-schema: add ErrorClass enum Luiz Capitulino
2012-08-13 19:48 ` [Qemu-devel] [PATCH 23/48] qerror: qerror_table: don't use C99 struct initializers Luiz Capitulino
2012-08-13 19:48 ` [Qemu-devel] [PATCH 24/48] error, qerror: add ErrorClass argument to error functions Luiz Capitulino
2012-08-13 19:48 ` [Qemu-devel] [PATCH 25/48] qerror: add proper ErrorClass value for QERR_ macros Luiz Capitulino
2012-08-13 19:48 ` [Qemu-devel] [PATCH 26/48] error: add error_get_class() Luiz Capitulino
2012-08-13 19:48 ` [Qemu-devel] [PATCH 27/48] hmp: hmp_change(): use error_get_class() Luiz Capitulino
2012-08-13 19:48 ` [Qemu-devel] [PATCH 28/48] error: drop unused functions Luiz Capitulino
2012-08-13 19:48 ` [Qemu-devel] [PATCH 29/48] qmp: switch to the new error format on the wire Luiz Capitulino
2012-08-13 19:48 ` [Qemu-devel] [PATCH 30/48] qemu-ga: " Luiz Capitulino
2012-08-13 19:48 ` [Qemu-devel] [PATCH 31/48] error: drop error_get_qobject()/error_set_qobject() Luiz Capitulino
2012-08-13 19:48 ` [Qemu-devel] [PATCH 32/48] error, qerror: pass desc string to error calls Luiz Capitulino
2012-08-13 19:48 ` [Qemu-devel] [PATCH 33/48] qerror: drop qerror_table and qerror_format() Luiz Capitulino
2012-08-13 19:48 ` [Qemu-devel] [PATCH 34/48] error, qerror: drop QDict member Luiz Capitulino
2012-08-13 19:48 ` [Qemu-devel] [PATCH 35/48] docs: writing-qmp-commands.txt: update error section Luiz Capitulino
2012-08-13 19:48 ` [Qemu-devel] [PATCH 36/48] scripts: qapi-commands.py: qmp-commands.h: include qdict.h Luiz Capitulino
2012-08-13 19:48 ` [Qemu-devel] [PATCH 37/48] qmp: don't emit the RESET event on wakeup from S3 Luiz Capitulino
2012-08-13 19:48 ` [Qemu-devel] [PATCH 38/48] qmp: emit the WAKEUP event when the guest is put to run Luiz Capitulino
2012-08-13 19:49 ` Luiz Capitulino [this message]
2012-08-13 19:49 ` [Qemu-devel] [PATCH 40/48] qmp: qmp-events.txt: add missing doc for the SUSPEND event Luiz Capitulino
2012-08-13 19:49 ` [Qemu-devel] [PATCH 41/48] qmp: add SUSPEND_DISK event Luiz Capitulino
2012-08-13 19:49 ` [Qemu-devel] [PATCH 42/48] qmp: introduce device-list-properties command Luiz Capitulino
2012-08-13 19:49 ` [Qemu-devel] [PATCH 43/48] qapi: mark QOM commands stable Luiz Capitulino
2012-08-13 19:49 ` [Qemu-devel] [PATCH 44/48] qapi: add query-machines command Luiz Capitulino
2012-08-13 19:49 ` [Qemu-devel] [PATCH 45/48] compiler: add macro for GCC weak symbols Luiz Capitulino
2012-08-13 19:49 ` [Qemu-devel] [PATCH 46/48] qapi: add query-cpu-definitions command (v2) Luiz Capitulino
2012-08-13 19:49 ` [Qemu-devel] [PATCH 47/48] target-i386: add implementation of query-cpu-definitions (v2) Luiz Capitulino
2012-08-13 19:49 ` [Qemu-devel] [PATCH 48/48] target-ppc: " Luiz Capitulino
2012-08-14 0:12 ` [Qemu-devel] [PULL 00/48]: QMP queue Anthony Liguori
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1344887349-13041-40-git-send-email-lcapitulino@redhat.com \
--to=lcapitulino@redhat.com \
--cc=aliguori@us.ibm.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).