From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:53170) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RJUXW-0004vc-U1 for qemu-devel@nongnu.org; Thu, 27 Oct 2011 14:18:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RJUXV-0000Sy-KD for qemu-devel@nongnu.org; Thu, 27 Oct 2011 14:18:54 -0400 Received: from mout.perfora.net ([74.208.4.195]:50451) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RJUXV-0000Sn-81 for qemu-devel@nongnu.org; Thu, 27 Oct 2011 14:18:53 -0400 From: Michael Roth Date: Thu, 27 Oct 2011 13:17:21 -0500 Message-Id: <1319739445-17629-10-git-send-email-mdroth@linux.vnet.ibm.com> In-Reply-To: <1319739445-17629-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1319739445-17629-1-git-send-email-mdroth@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 09/13] virtio-balloon: convert save/load to visitors List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com, mdroth@linux.vnet.ibm.com, quintela@redhat.com Signed-off-by: Michael Roth --- hw/virtio-balloon.c | 32 ++++++++++++++++++++++++++++---- 1 files changed, 28 insertions(+), 4 deletions(-) diff --git a/hw/virtio-balloon.c b/hw/virtio-balloon.c index 5f8f4bd..242c58d 100644 --- a/hw/virtio-balloon.c +++ b/hw/virtio-balloon.c @@ -246,24 +246,48 @@ static void virtio_balloon_to_target(void *opaque, ram_addr_t target) static void virtio_balloon_save(QEMUFile *f, void *opaque) { VirtIOBalloon *s = opaque; + Visitor *v = qemu_file_get_visitor(f); + Error *err = NULL; + + visit_start_struct(v, NULL, NULL, "virtio_balloon", 0, &err); virtio_save(&s->vdev, f); - qemu_put_be32(f, s->num_pages); - qemu_put_be32(f, s->actual); + visit_type_uint32(v, &s->num_pages, "num_pages", &err); + visit_type_uint32(v, &s->actual, "actual", &err); + + visit_end_struct(v, &err); + + if (err) { + error_report("error saving virtio-balloon state: %s", error_get_pretty(err)); + error_free(err); + } } static int virtio_balloon_load(QEMUFile *f, void *opaque, int version_id) { VirtIOBalloon *s = opaque; + Visitor *v = qemu_file_get_visitor(f); + Error *err = NULL; if (version_id != 1) return -EINVAL; + visit_start_struct(v, NULL, NULL, "virtio_balloon", 0, &err); + virtio_load(&s->vdev, f); - s->num_pages = qemu_get_be32(f); - s->actual = qemu_get_be32(f); + visit_type_uint32(v, &s->num_pages, "num_pages", &err); + visit_type_uint32(v, &s->actual, "actual", &err); + + visit_end_struct(v, &err); + + if (err) { + error_report("error loading virtio-balloon state: %s", error_get_pretty(err)); + error_free(err); + return -EINVAL; + } + return 0; } -- 1.7.4.1