diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-09-14 16:33:02 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-09-14 16:33:02 +0100 |
| commit | 3dabde1128b671f36ac6cb36b97b273139964420 (patch) | |
| tree | 82425e1bc40064e994dd0c342773e3d8607285e5 /qmp.c | |
| parent | dae288d7d820e12073e55ded64b226843d352c1f (diff) | |
| parent | d0f63c1e291a0c27cafc0e6faec5a84130b012e0 (diff) | |
| download | focaccia-qemu-3dabde1128b671f36ac6cb36b97b273139964420.tar.gz focaccia-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 'qmp.c')
| -rw-r--r-- | qmp.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/qmp.c b/qmp.c index b86201e349..e8c303116a 100644 --- a/qmp.c +++ b/qmp.c @@ -709,3 +709,16 @@ ACPIOSTInfoList *qmp_query_acpi_ospm_status(Error **errp) return head; } + +MemoryInfo *qmp_query_memory_size_summary(Error **errp) +{ + MemoryInfo *mem_info = g_malloc0(sizeof(MemoryInfo)); + + mem_info->base_memory = ram_size; + + mem_info->plugged_memory = get_plugged_memory_size(); + mem_info->has_plugged_memory = + mem_info->plugged_memory != (uint64_t)-1; + + return mem_info; +} |