Re: [Qemu-devel] [PULL v3 04/21] virtio-balloon: rewrite get_current_ram_size()

[Vladimir Sementsov-Ogievskiy]

pc_dimm_build_list had never been implemented. compilation is broken 
here (pull v2 was ok here). unfortunately it's too late..

On 25.02.2016 14:20, Michael S. Tsirkin wrote:
> From: Vladimir Sementsov-Ogievskiy <address@hidden>
>
> 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 <address@hidden>
> Reviewed-by: Michael S. Tsirkin <address@hidden>
> Signed-off-by: Michael S. Tsirkin <address@hidden>
> ---
>   hw/virtio/virtio-balloon.c | 23 ++++++-----------------
>   1 file changed, 6 insertions(+), 17 deletions(-)
>
> diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c
> index d6d7e96..388e873 100644
> --- a/hw/virtio/virtio-balloon.c
> +++ b/hw/virtio/virtio-balloon.c
> @@ -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;
>   }


--
Best regards,
Vladimir