diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-03-08 12:47:13 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-03-08 12:47:13 +0000 |
| commit | 9c31a8219a8fb6e790d5510987ae2c810ff968b5 (patch) | |
| tree | 5c5edf0a2689898e157e696dc94cc270224f0db7 /include | |
| parent | 033c7ddf86fe4315069ac4cf3cfab9bc6035dee7 (diff) | |
| parent | a3b042179859c68b3d08f8aa43866d28d6b56987 (diff) | |
| download | qemu-9c31a8219a8fb6e790d5510987ae2c810ff968b5.zip qemu-9c31a8219a8fb6e790d5510987ae2c810ff968b5.tar.gz qemu-9c31a8219a8fb6e790d5510987ae2c810ff968b5.tar.bz2 | |
Merge remote-tracking branch 'remotes/qmp-unstable/queue/qmp' into staging
* remotes/qmp-unstable/queue/qmp:
docs: add memory-hotplug.txt
qemu-options.hx: improve -m description
virtio-balloon: Add some trace events
virtio-balloon: Fix balloon not working correctly when hotplug memory
pc-dimm: add a function to calculate VM's current RAM size
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/exec/cpu-common.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/exec/cpu-common.h b/include/exec/cpu-common.h index 427b851..fcc3162 100644 --- a/include/exec/cpu-common.h +++ b/include/exec/cpu-common.h @@ -52,6 +52,7 @@ typedef uintptr_t ram_addr_t; #endif extern ram_addr_t ram_size; +ram_addr_t get_current_ram_size(void); /* memory API */ |