Skip to content

Commit

Permalink
virtio-balloon: rewrite get_current_ram_size()
Browse files Browse the repository at this point in the history
Use pc_dimm_built_list() instead of qmp_pc_dimm_device_list()

Actually, Qapi is not related to this internal helper.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
  • Loading branch information
Vladimir Sementsov-Ogievskiy authored and mstsirkin committed Feb 25, 2016
1 parent 39de998 commit e8dc06d
Showing 1 changed file with 6 additions and 17 deletions.
23 changes: 6 additions & 17 deletions hw/virtio/virtio-balloon.c
Expand Up @@ -307,26 +307,15 @@ static void virtio_balloon_get_config(VirtIODevice *vdev, uint8_t *config_data)

static ram_addr_t get_current_ram_size(void)
{
MemoryDeviceInfoList *info_list = NULL;
MemoryDeviceInfoList **prev = &info_list;
MemoryDeviceInfoList *info;
GSList *list = NULL, *item;
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->type) {
case MEMORY_DEVICE_INFO_KIND_DIMM:
size += value->u.dimm->size;
break;
default:
break;
}
}
pc_dimm_build_list(qdev_get_machine(), &list);
for (item = list; item; item = g_slist_next(item)) {
Object *obj = OBJECT(item->data);
size += object_property_get_int(obj, PC_DIMM_SIZE_PROP, &error_abort);
}
qapi_free_MemoryDeviceInfoList(info_list);
g_slist_free(list);

return size;
}
Expand Down

0 comments on commit e8dc06d

Please sign in to comment.