From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54261) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aYtyF-0004sh-Ak for qemu-devel@nongnu.org; Thu, 25 Feb 2016 06:20:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aYtyE-0005XB-Ej for qemu-devel@nongnu.org; Thu, 25 Feb 2016 06:20:35 -0500 Received: from mx1.redhat.com ([209.132.183.28]:49156) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aYtyE-0005X4-A3 for qemu-devel@nongnu.org; Thu, 25 Feb 2016 06:20:34 -0500 Date: Thu, 25 Feb 2016 13:20:31 +0200 From: "Michael S. Tsirkin" Message-ID: <1456399032-6172-5-git-send-email-mst@redhat.com> References: <1456399032-6172-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1456399032-6172-1-git-send-email-mst@redhat.com> Subject: [Qemu-devel] [PULL v3 04/21] virtio-balloon: rewrite get_current_ram_size() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Vladimir Sementsov-Ogievskiy From: Vladimir Sementsov-Ogievskiy 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 Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- 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; } -- MST