From 22f9a094f854d8bfc19b47d2eef68328e7b89b5c 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:55:05 +0200
Subject: [PATCH] qmp-commands: move 'query-memory-devices' 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 | 19 -------------------
 qapi-schema.json      | 16 ++++++++++++++++
 2 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/docs/qmp-commands.txt b/docs/qmp-commands.txt
index 06b4cbac82..1e34523892 100644
--- a/docs/qmp-commands.txt
+++ b/docs/qmp-commands.txt
@@ -1534,25 +1534,6 @@ Examples:
 
 <- { "return": {} }
 
-query-memory-devices
---------------------
-
-Return a list of memory devices.
-
-Example:
--> { "execute": "query-memory-devices" }
-<- { "return": [ { "data":
-                      { "addr": 5368709120,
-                        "hotpluggable": true,
-                        "hotplugged": true,
-                        "id": "d1",
-                        "memdev": "/objects/memX",
-                        "node": 0,
-                        "size": 1073741824,
-                        "slot": 0},
-                   "type": "dimm"
-                 } ] }
-
 query-acpi-ospm-status
 ----------------------
 
diff --git a/qapi-schema.json b/qapi-schema.json
index 0618de88bb..054e0c57f9 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -5641,6 +5641,22 @@
 # Lists available memory devices and their state
 #
 # Since: 2.1
+#
+# Example:
+#
+# -> { "execute": "query-memory-devices" }
+# <- { "return": [ { "data":
+#                       { "addr": 5368709120,
+#                         "hotpluggable": true,
+#                         "hotplugged": true,
+#                         "id": "d1",
+#                         "memdev": "/objects/memX",
+#                         "node": 0,
+#                         "size": 1073741824,
+#                         "slot": 0},
+#                    "type": "dimm"
+#                  } ] }
+#
 ##
 { 'command': 'query-memory-devices', 'returns': ['MemoryDeviceInfo'] }