[Qemu-devel] [PATCH v2 for-2.1 4/5] docs: document missing POWERDOWN event

2014-07-23 Thread Eric Blake 
The POWERDOWN event was first documented in 0aab9ec3.  But since
dfab4892 later restored this file to the state prior to qmp events,
and we never documented it in the past, anyone using this file
instead of qapi will miss out on this event.  Tweak the existing
wording of SHUTDOWN to match 84321831, and make the difference
between the two events apparent.

* docs/qmp/qmp-events.txt (POWERDOWN): Add.
(SHUTDOWN): Tweak.

Signed-off-by: Eric Blake ebl...@redhat.com
---
 docs/qmp/qmp-events.txt | 16 +++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/docs/qmp/qmp-events.txt b/docs/qmp/qmp-events.txt
index 22d552f..9d7439e 100644
--- a/docs/qmp/qmp-events.txt
+++ b/docs/qmp/qmp-events.txt
@@ -243,6 +243,19 @@ Data:
   timestamp: { seconds: 1368697518, microseconds: 326866 } }
 }

+POWERDOWN
+-
+
+Emitted when the Virtual Machine is powered down through the power
+control system, such as via ACPI.
+
+Data: None.
+
+Example:
+
+{ event: POWERDOWN,
+timestamp: { seconds: 1267040730, microseconds: 682951 } }
+
 QUORUM_FAILURE
 --

@@ -325,7 +338,8 @@ Example:
 SHUTDOWN
 

-Emitted when the Virtual Machine is powered down.
+Emitted when the Virtual Machine has shut down, indicating that qemu
+is about to exit.

 Data: None.

-- 
1.9.3

Re: [Qemu-devel] [PATCH v2 for-2.1 4/5] docs: document missing POWERDOWN event

2014-07-23 Thread Wenchao Xia 
于 2014/7/23 20:26, Eric Blake 写道:
 The POWERDOWN event was first documented in 0aab9ec3.  But since
 dfab4892 later restored this file to the state prior to qmp events,
 and we never documented it in the past, anyone using this file
 instead of qapi will miss out on this event.  Tweak the existing
 wording of SHUTDOWN to match 84321831, and make the difference
 between the two events apparent.
 
 * docs/qmp/qmp-events.txt (POWERDOWN): Add.
 (SHUTDOWN): Tweak.
 
 Signed-off-by: Eric Blake ebl...@redhat.com
 ---
   docs/qmp/qmp-events.txt | 16 +++-
   1 file changed, 15 insertions(+), 1 deletion(-)
 
 diff --git a/docs/qmp/qmp-events.txt b/docs/qmp/qmp-events.txt
 index 22d552f..9d7439e 100644
 --- a/docs/qmp/qmp-events.txt
 +++ b/docs/qmp/qmp-events.txt
 @@ -243,6 +243,19 @@ Data:
 timestamp: { seconds: 1368697518, microseconds: 326866 } }
   }
 
 +POWERDOWN
 +-
 +
 +Emitted when the Virtual Machine is powered down through the power
 +control system, such as via ACPI.
 +
 +Data: None.
 +
 +Example:
 +
 +{ event: POWERDOWN,
 +timestamp: { seconds: 1267040730, microseconds: 682951 } }
 +
   QUORUM_FAILURE
   --
 
 @@ -325,7 +338,8 @@ Example:
   SHUTDOWN
   
 
 -Emitted when the Virtual Machine is powered down.
 +Emitted when the Virtual Machine has shut down, indicating that qemu
 +is about to exit.
 
   Data: None.
 
  Nice to have explantion about the difference.