[PATCH 20/30] avr/machine: move to new migration APIs

[Vladimir Sementsov-Ogievskiy]

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsement...@yandex-team.ru>
---
 target/avr/machine.c | 50 +++++++++++++++++++++++---------------------
 1 file changed, 26 insertions(+), 24 deletions(-)

diff --git a/target/avr/machine.c b/target/avr/machine.c
index 8064a7214a3..2f6283743c7 100644
--- a/target/avr/machine.c
+++ b/target/avr/machine.c
@@ -23,78 +23,80 @@
 #include "migration/qemu-file-types.h"
 #include "migration/vmstate.h"
 
-static int get_sreg(QEMUFile *f, void *opaque, size_t size,
-                    const VMStateField *field)
+static bool load_sreg(QEMUFile *f, void *opaque, size_t size,
+                     const VMStateField *field, Error **errp)
 {
     CPUAVRState *env = opaque;
     uint8_t sreg;
 
     sreg = qemu_get_byte(f);
     cpu_set_sreg(env, sreg);
-    return 0;
+    return true;
 }
 
-static int put_sreg(QEMUFile *f, void *opaque, size_t size,
-                    const VMStateField *field, JSONWriter *vmdesc)
+static bool save_sreg(QEMUFile *f, void *opaque, size_t size,
+                     const VMStateField *field, JSONWriter *vmdesc,
+                     Error **errp)
 {
     CPUAVRState *env = opaque;
     uint8_t sreg = cpu_get_sreg(env);
 
     qemu_put_byte(f, sreg);
-    return 0;
+    return true;
 }
 
 static const VMStateInfo vms_sreg = {
     .name = "sreg",
-    .get = get_sreg,
-    .put = put_sreg,
+    .load = load_sreg,
+    .save = save_sreg,
 };
 
-static int get_segment(QEMUFile *f, void *opaque, size_t size,
-                       const VMStateField *field)
+static bool load_segment(QEMUFile *f, void *opaque, size_t size,
+                        const VMStateField *field, Error **errp)
 {
     uint32_t *ramp = opaque;
     uint8_t temp;
 
     temp = qemu_get_byte(f);
     *ramp = ((uint32_t)temp) << 16;
-    return 0;
+    return true;
 }
 
-static int put_segment(QEMUFile *f, void *opaque, size_t size,
-                       const VMStateField *field, JSONWriter *vmdesc)
+static bool save_segment(QEMUFile *f, void *opaque, size_t size,
+                        const VMStateField *field, JSONWriter *vmdesc,
+                        Error **errp)
 {
     uint32_t *ramp = opaque;
     uint8_t temp = *ramp >> 16;
 
     qemu_put_byte(f, temp);
-    return 0;
+    return true;
 }
 
 static const VMStateInfo vms_rampD = {
     .name = "rampD",
-    .get = get_segment,
-    .put = put_segment,
+    .load = load_segment,
+    .save = save_segment,
 };
 static const VMStateInfo vms_rampX = {
     .name = "rampX",
-    .get = get_segment,
-    .put = put_segment,
+    .load = load_segment,
+    .save = save_segment,
 };
 static const VMStateInfo vms_rampY = {
     .name = "rampY",
-    .get = get_segment,
-    .put = put_segment,
+    .load = load_segment,
+    .save = save_segment,
 };
 static const VMStateInfo vms_rampZ = {
     .name = "rampZ",
-    .get = get_segment,
-    .put = put_segment,
+    .load = load_segment,
+    .save = save_segment,
 };
 static const VMStateInfo vms_eind = {
     .name = "eind",
-    .get = get_segment,
-    .put = put_segment,
+    .load = load_segment,
+    .save = save_segment,
 };
 
 const VMStateDescription vms_avr_cpu = {
-- 
2.43.0