These changes are the raw update to qemu-2.6.

[kvmfornfv.git] / qemu / docs / qmp-spec.txt

diff --git a/qemu/docs/qmp/qmp-spec.txt b/qemu/docs/qmp-spec.txt
similarity index 96%
rename from qemu/docs/qmp/qmp-spec.txt
rename to qemu/docs/qmp-spec.txt
index 4c28cd9..f8b5356 100644 (file)
--- a/qemu/docs/qmp/qmp-spec.txt
+++ b/qemu/docs/qmp-spec.txt
@@ -3,7 +3,7 @@
 0. About This Document
 ======================
 
-Copyright (C) 2009-2015 Red Hat, Inc.
+Copyright (C) 2009-2016 Red Hat, Inc.
 
 This work is licensed under the terms of the GNU GPL, version 2 or
 later. See the COPYING file in the top-level directory.
@@ -175,7 +175,12 @@ The format of asynchronous events is:
 For a listing of supported asynchronous events, please, refer to the
 qmp-events.txt file.
 
-2.5 QGA Synchronization
+Some events are rate-limited to at most one per second.  If additional
+"similar" events arrive within one second, all but the last one are
+dropped, and the last one is delayed.  "Similar" normally means same
+event type.  See qmp-events.txt for details.
+
+2.6 QGA Synchronization
 -----------------------
 
 When using QGA, an additional synchronization feature is built into
@@ -272,7 +277,7 @@ However, Clients must not assume any particular:
 - Amount of errors generated by a command, that is, new errors can be added
   to any existing command in newer versions of the Server
 
-Any command or field name beginning with "x-" is deemed experimental,
+Any command or member name beginning with "x-" is deemed experimental,
 and may be withdrawn or changed in an incompatible manner in a future
 release.