[Qemu-devel] [PATCH 02/13] ivshmem: convert save/load to visitor

[Michael Roth]

Signed-off-by: Michael Roth <address@hidden>
---
 hw/ivshmem.c |   44 ++++++++++++++++++++++++++++++++++----------
 1 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/hw/ivshmem.c b/hw/ivshmem.c
index 242fbea..48e27f5 100644
--- a/hw/ivshmem.c
+++ b/hw/ivshmem.c
@@ -563,38 +563,55 @@ static void ivshmem_setup_msi(IVShmemState * s) {
 static void ivshmem_save(QEMUFile* f, void *opaque)
 {
     IVShmemState *proxy = opaque;
+    Visitor *v = qemu_file_get_visitor(f);
+    Error *err = NULL;
 
     IVSHMEM_DPRINTF("ivshmem_save\n");
+
+    visit_start_struct(v, NULL, NULL, "ivshmem", 0, &err);
+
     pci_device_save(&proxy->dev, f);
 
     if (ivshmem_has_feature(proxy, IVSHMEM_MSI)) {
         msix_save(&proxy->dev, f);
     } else {
-        qemu_put_be32(f, proxy->intrstatus);
-        qemu_put_be32(f, proxy->intrmask);
+        visit_type_uint32(v, &proxy->intrstatus, "proxy.intrstatus", &err);
+        visit_type_uint32(v, &proxy->intrmask, "proxy.intrmask", &err);
     }
 
+    visit_end_struct(v, &err);
+
+    if (err) {
+        error_report("error saving ivshmem state: %s", error_get_pretty(err));
+        error_free(err);
+    }
 }
 
 static int ivshmem_load(QEMUFile* f, void *opaque, int version_id)
 {
-    IVSHMEM_DPRINTF("ivshmem_load\n");
-
     IVShmemState *proxy = opaque;
     int ret, i;
+    Visitor *v = qemu_file_get_visitor(f);
+    Error *err = NULL;
+
+    IVSHMEM_DPRINTF("ivshmem_load\n");
+
+    visit_start_struct(v, NULL, NULL, "ivshmem", 0, &err);
 
     if (version_id > 0) {
-        return -EINVAL;
+        ret = -EINVAL;
+        goto out;
     }
 
     if (proxy->role_val == IVSHMEM_PEER) {
         fprintf(stderr, "ivshmem: 'peer' devices are not migratable\n");
-        return -EINVAL;
+        ret = -EINVAL;
+        goto out;
     }
 
     ret = pci_device_load(&proxy->dev, f);
     if (ret) {
-        return ret;
+        goto out;
     }
 
     if (ivshmem_has_feature(proxy, IVSHMEM_MSI)) {
@@ -603,11 +620,18 @@ static int ivshmem_load(QEMUFile* f, void *opaque, int 
version_id)
             msix_vector_use(&proxy->dev, i);
         }
     } else {
-        proxy->intrstatus = qemu_get_be32(f);
-        proxy->intrmask = qemu_get_be32(f);
+        visit_type_uint32(v, &proxy->intrstatus, "proxy.intrstatus", &err);
+        visit_type_uint32(v, &proxy->intrmask, "proxy.intrmask", &err);
     }
 
-    return 0;
+    visit_end_struct(v, &err);
+
+out:
+    if (err) {
+        error_report("error loading ivshmem state: %s", error_get_pretty(err));
+        error_free(err);
+    }
+    return ret;
 }
 
 static int pci_ivshmem_init(PCIDevice *dev)
-- 
1.7.4.1