From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51627) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aanA2-00037D-4y for qemu-devel@nongnu.org; Tue, 01 Mar 2016 11:28:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aan9x-0006or-13 for qemu-devel@nongnu.org; Tue, 01 Mar 2016 11:28:34 -0500 Received: from mx2.parallels.com ([199.115.105.18]:44506) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aan9w-0006oP-Ry for qemu-devel@nongnu.org; Tue, 01 Mar 2016 11:28:28 -0500 Message-ID: <56D5C321.5070603@virtuozzo.com> Date: Tue, 1 Mar 2016 19:28:17 +0300 From: Vladimir Sementsov-Ogievskiy MIME-Version: 1.0 References: <1456399032-6172-1-git-send-email-mst@redhat.com> <1456399032-6172-5-git-send-email-mst@redhat.com> In-Reply-To: <1456399032-6172-5-git-send-email-mst@redhat.com> Content-Type: text/plain; charset="windows-1252"; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [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: "Michael S. Tsirkin" , qemu-devel@nongnu.org Cc: Peter Maydell 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 > > 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; > } -- Best regards, Vladimir