[Qemu-devel] [PATCH 09/13] virtio-balloon: convert save/load to visitors

[Michael Roth]

Signed-off-by: Michael Roth <address@hidden>
---
 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