diff options
| author | Peter Maydell | 2017-09-14 17:33:02 +0200 |
|---|---|---|
| committer | Peter Maydell | 2017-09-14 17:33:02 +0200 |
| commit | 3dabde1128b671f36ac6cb36b97b273139964420 (patch) | |
| tree | 82425e1bc40064e994dd0c342773e3d8607285e5 /qapi-schema.json | |
| parent | Merge remote-tracking branch 'remotes/kraxel/tags/usb-20170913-pull-request' ... (diff) | |
| parent | hmp: introduce 'info memory_size_summary' command (diff) | |
| download | qemu-3dabde1128b671f36ac6cb36b97b273139964420.tar.gz qemu-3dabde1128b671f36ac6cb36b97b273139964420.tar.xz qemu-3dabde1128b671f36ac6cb36b97b273139964420.zip | |
Merge remote-tracking branch 'remotes/dgilbert/tags/pull-hmp-20170914' into staging
HMP pull 2017-09-14
# gpg: Signature made Thu 14 Sep 2017 15:57:30 BST
# gpg: using RSA key 0x0516331EBC5BFDE7
# gpg: Good signature from "Dr. David Alan Gilbert (RH2) <dgilbert@redhat.com>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg: It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 45F5 C71B 4A0C B7FB 977A 9FA9 0516 331E BC5B FDE7
* remotes/dgilbert/tags/pull-hmp-20170914:
hmp: introduce 'info memory_size_summary' command
qmp: introduce query-memory-size-summary command
hmp: extend "info numa" with hotplugged memory information
tests/hmp: test "none" machine with memory
dump: do not dump non-existent guest memory
hmp: fix "dump-quest-memory" segfault (arm)
hmp: fix "dump-quest-memory" segfault (ppc)
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qapi-schema.json')
| -rw-r--r-- | qapi-schema.json | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/qapi-schema.json b/qapi-schema.json index f3af2cb851..cdff39a456 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -1966,6 +1966,38 @@ '*unavailable-features': [ 'str' ], 'typename': 'str' } } ## +# @MemoryInfo: +# +# Actual memory information in bytes. +# +# @base-memory: size of "base" memory specified with command line +# option -m. +# +# @plugged-memory: size of memory that can be hot-unplugged. This field +# is omitted if target doesn't support memory hotplug +# (i.e. CONFIG_MEM_HOTPLUG not defined on build time). +# +# Since: 2.11.0 +## +{ 'struct': 'MemoryInfo', + 'data' : { 'base-memory': 'size', '*plugged-memory': 'size' } } + +## +# @query-memory-size-summary: +# +# Return the amount of initially allocated and present hotpluggable (if +# enabled) memory in bytes. +# +# Example: +# +# -> { "execute": "query-memory-size-summary" } +# <- { "return": { "base-memory": 4294967296, "plugged-memory": 0 } } +# +# Since: 2.11.0 +## +{ 'command': 'query-memory-size-summary', 'returns': 'MemoryInfo' } + +## # @query-cpu-definitions: # # Return a list of supported virtual CPU definitions |