From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58540) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a1kLU-00076p-Tp for qemu-devel@nongnu.org; Wed, 25 Nov 2015 19:23:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a1kLU-0005tR-7n for qemu-devel@nongnu.org; Wed, 25 Nov 2015 19:23:32 -0500 Received: from mx1.redhat.com ([209.132.183.28]:45196) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a1kLU-0005tD-24 for qemu-devel@nongnu.org; Wed, 25 Nov 2015 19:23:32 -0500 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id A8B74A0B4C for ; Thu, 26 Nov 2015 00:23:31 +0000 (UTC) From: Eric Blake Date: Wed, 25 Nov 2015 17:23:09 -0700 Message-Id: <1448497401-27784-13-git-send-email-eblake@redhat.com> In-Reply-To: <1448497401-27784-1-git-send-email-eblake@redhat.com> References: <1448497401-27784-1-git-send-email-eblake@redhat.com> Subject: [Qemu-devel] [PATCH v6 12/23] balloon: Improve use of qapi visitor List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: armbru@redhat.com, "Michael S. Tsirkin" Rework the control flow of balloon_stats_get_all() to make it easier for a later patch to split visit_end_struct(). Also switch to the uint64 visitor to match the data type. Signed-off-by: Eric Blake --- v6: new patch, split from RFC on v5 7/46 --- hw/virtio/virtio-balloon.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c index 9671635..1ce987a 100644 --- a/hw/virtio/virtio-balloon.c +++ b/hw/virtio/virtio-balloon.c @@ -130,10 +130,13 @@ static void balloon_stats_get_all(Object *obj, struct Visitor *v, if (err) { goto out_end; } - for (i = 0; !err && i < VIRTIO_BALLOON_S_NR; i++) { - visit_type_int64(v, (int64_t *) &s->stats[i], balloon_stat_names[i], - &err); + for (i = 0; i < VIRTIO_BALLOON_S_NR; i++) { + visit_type_uint64(v, &s->stats[i], balloon_stat_names[i], &err); + if (err) { + goto out_nested; + } } +out_nested: error_propagate(errp, err); err = NULL; visit_end_struct(v, &err); -- 2.4.3