aboutsummaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorzhanghailiang <zhang.zhanghailiang@huawei.com>2014-11-17 13:11:08 +0800
committerLuiz Capitulino <lcapitulino@redhat.com>2015-03-04 13:00:04 -0500
commit87a45cfee6b169a68e43f284a8a3c1bc20bd5dc9 (patch)
tree1dc22e400df100c87fb2c7c763fed45db0b2b76b /hw
parent3539bbb93e944ffde31c61c369ea9eedcc5697a6 (diff)
downloadqemu-87a45cfee6b169a68e43f284a8a3c1bc20bd5dc9.zip
qemu-87a45cfee6b169a68e43f284a8a3c1bc20bd5dc9.tar.gz
qemu-87a45cfee6b169a68e43f284a8a3c1bc20bd5dc9.tar.bz2
pc-dimm: add a function to calculate VM's current RAM size
The global parameter 'ram_size' does not take into account the hotplugged memory. In some codes, we use 'ram_size' as current VM's real RAM size, which is not correct. Add function 'get_current_ram_size' to calculate VM's current RAM size, it will enumerate present memory devices and also plus ram_size. Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com> Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
Diffstat (limited to 'hw')
-rw-r--r--hw/mem/pc-dimm.c26
1 files changed, 26 insertions, 0 deletions
diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c
index f27a087..de81b9c 100644
--- a/hw/mem/pc-dimm.c
+++ b/hw/mem/pc-dimm.c
@@ -100,6 +100,32 @@ int qmp_pc_dimm_device_list(Object *obj, void *opaque)
return 0;
}
+ram_addr_t get_current_ram_size(void)
+{
+ MemoryDeviceInfoList *info_list = NULL;
+ MemoryDeviceInfoList **prev = &info_list;
+ MemoryDeviceInfoList *info;
+ ram_addr_t size = ram_size;
+
+ qmp_pc_dimm_device_list(qdev_get_machine(), &prev);
+ for (info = info_list; info; info = info->next) {
+ MemoryDeviceInfo *value = info->value;
+
+ if (value) {
+ switch (value->kind) {
+ case MEMORY_DEVICE_INFO_KIND_DIMM:
+ size += value->dimm->size;
+ break;
+ default:
+ break;
+ }
+ }
+ }
+ qapi_free_MemoryDeviceInfoList(info_list);
+
+ return size;
+}
+
static int pc_dimm_slot2bitmap(Object *obj, void *opaque)
{
unsigned long *bitmap = opaque;