diff options
author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2016-06-23 13:54:38 +0200 |
---|---|---|
committer | Markus Armbruster <armbru@redhat.com> | 2017-01-16 09:19:15 +0100 |
commit | cfc84c8b458bf3a64a1478173e132cf29698df22 (patch) | |
tree | a7eb38dff3eeeeb2ddc496935324b0ab4b617eed | |
parent | 70d5b0c2539543e9ace53984902122fccae7a7de (diff) |
qmp-commands: move 'query-memdev' doc to schema
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
[Straightforward conflict with commit e1ff3c6 resolved]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
-rw-r--r-- | docs/qmp-commands.txt | 30 | ||||
-rw-r--r-- | qapi-schema.json | 25 |
2 files changed, 25 insertions, 30 deletions
diff --git a/docs/qmp-commands.txt b/docs/qmp-commands.txt index 5131a3bc89..06b4cbac82 100644 --- a/docs/qmp-commands.txt +++ b/docs/qmp-commands.txt @@ -1534,36 +1534,6 @@ Examples: <- { "return": {} } -query-memdev ------------- - -Show memory devices information. - - -Example (1): - --> { "execute": "query-memdev" } -<- { "return": [ - { - "size": 536870912, - "merge": false, - "dump": true, - "prealloc": false, - "host-nodes": [0, 1], - "policy": "bind" - }, - { - "id": "mem1", - "size": 536870912, - "merge": false, - "dump": true, - "prealloc": true, - "host-nodes": [2, 3], - "policy": "preferred" - } - ] - } - query-memory-devices -------------------- diff --git a/qapi-schema.json b/qapi-schema.json index efec8182ea..0618de88bb 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -5563,6 +5563,31 @@ # Returns: a list of @Memdev. # # Since: 2.1 +# +# Example: +# +# -> { "execute": "query-memdev" } +# <- { "return": [ +# { +# "id": "mem1", +# "size": 536870912, +# "merge": false, +# "dump": true, +# "prealloc": false, +# "host-nodes": [0, 1], +# "policy": "bind" +# }, +# { +# "size": 536870912, +# "merge": false, +# "dump": true, +# "prealloc": true, +# "host-nodes": [2, 3], +# "policy": "preferred" +# } +# ] +# } +# ## { 'command': 'query-memdev', 'returns': ['Memdev'] } |