From: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: Thu, 23 Jun 2016 14:26:36 +0000 (+0200)
Subject: qmp-events: move 'WATCHDOG' doc to schema
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=9ba5cec9dd68ac1b38fbb7ab45f389e5e05b89f1;p=qemu.git

qmp-events: move 'WATCHDOG' doc to schema

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---

diff --git a/docs/qmp-events.txt b/docs/qmp-events.txt
index 35760649aa..fbcf4f83f1 100644
--- a/docs/qmp-events.txt
+++ b/docs/qmp-events.txt
@@ -401,24 +401,3 @@ Example:
     "timestamp": { "seconds": 1401385907, "microseconds": 422329 } }
 
 Note: this event is rate-limited separately for each "id".
-
-WATCHDOG
---------
-
-Emitted when the watchdog device's timer is expired.
-
-Data:
-
-- "action": Action that has been taken, it's one of the following (json-string):
-            "reset", "shutdown", "poweroff", "pause", "debug", or "none"
-
-Example:
-
-{ "event": "WATCHDOG",
-     "data": { "action": "reset" },
-     "timestamp": { "seconds": 1267061043, "microseconds": 959568 } }
-
-Note: If action is "reset", "shutdown", or "pause" the WATCHDOG event is
-followed respectively by the RESET, SHUTDOWN, or STOP events.
-
-Note: this event is rate-limited.
diff --git a/qapi/event.json b/qapi/event.json
index e2ab2c760a..43d27ecbeb 100644
--- a/qapi/event.json
+++ b/qapi/event.json
@@ -165,7 +165,16 @@
 # Note: If action is "reset", "shutdown", or "pause" the WATCHDOG event is
 # followed respectively by the RESET, SHUTDOWN, or STOP events
 #
+# Note: This event is rate-limited.
+#
 # Since: 0.13.0
+#
+# Example:
+#
+# <- { "event": "WATCHDOG",
+#      "data": { "action": "reset" },
+#      "timestamp": { "seconds": 1267061043, "microseconds": 959568 } }
+#
 ##
 { 'event': 'WATCHDOG',
   'data': { 'action': 'WatchdogExpirationAction' } }