From 18b43003d4738f6ea3466ba1a70b0f25c23b0b02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
Date: Thu, 23 Jun 2016 13:56:06 +0200
Subject: [PATCH] qmp-commands: move 'query-acpi-ospm-status' doc to schema
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 docs/qmp-commands.txt | 14 --------------
 qapi-schema.json      | 14 ++++++++++++--
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/docs/qmp-commands.txt b/docs/qmp-commands.txt
index 1e34523892..c7e566c89b 100644
--- a/docs/qmp-commands.txt
+++ b/docs/qmp-commands.txt
@@ -1534,20 +1534,6 @@ Examples:
 
 <- { "return": {} }
 
-query-acpi-ospm-status
-----------------------
-
-Return list of ACPIOSTInfo for devices that support status reporting
-via ACPI _OST method.
-
-Example:
--> { "execute": "query-acpi-ospm-status" }
-<- { "return": [ { "device": "d1", "slot": "0", "slot-type": "DIMM", "source": 1, "status": 0},
-                 { "slot": "1", "slot-type": "DIMM", "source": 0, "status": 0},
-                 { "slot": "2", "slot-type": "DIMM", "source": 0, "status": 0},
-                 { "slot": "3", "slot-type": "DIMM", "source": 0, "status": 0}
-   ]}
-
 rtc-reset-reinjection
 ---------------------
 
diff --git a/qapi-schema.json b/qapi-schema.json
index 054e0c57f9..f7906f9859 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -5697,10 +5697,20 @@
 ##
 # @query-acpi-ospm-status:
 #
-# Lists ACPI OSPM status of ACPI device objects,
-# which might be reported via _OST method
+# Return a list of ACPIOSTInfo for devices that support status
+# reporting via ACPI _OST method.
 #
 # Since: 2.1
+#
+# Example:
+#
+# -> { "execute": "query-acpi-ospm-status" }
+# <- { "return": [ { "device": "d1", "slot": "0", "slot-type": "DIMM", "source": 1, "status": 0},
+#                  { "slot": "1", "slot-type": "DIMM", "source": 0, "status": 0},
+#                  { "slot": "2", "slot-type": "DIMM", "source": 0, "status": 0},
+#                  { "slot": "3", "slot-type": "DIMM", "source": 0, "status": 0}
+#    ]}
+#
 ##
 { 'command': 'query-acpi-ospm-status', 'returns': ['ACPIOSTInfo'] }