[PATCH 23/30] hppa/machine: move to new migration APIs

[Vladimir Sementsov-Ogievskiy]

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsement...@yandex-team.ru>
---
 target/hppa/machine.c | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/target/hppa/machine.c b/target/hppa/machine.c
index 6a143cf8df2..ddd9f27b772 100644
--- a/target/hppa/machine.c
+++ b/target/hppa/machine.c
@@ -23,30 +23,31 @@
 #include "migration/vmstate.h"
 
 
-static int get_psw(QEMUFile *f, void *opaque, size_t size,
-                   const VMStateField *field)
+static bool load_psw(QEMUFile *f, void *opaque, size_t size,
+                   const VMStateField *field, Error **errp)
 {
     CPUHPPAState *env = opaque;
     cpu_hppa_put_psw(env, qemu_get_be64(f));
-    return 0;
+    return true;
 }
 
-static int put_psw(QEMUFile *f, void *opaque, size_t size,
-                   const VMStateField *field, JSONWriter *vmdesc)
+static bool save_psw(QEMUFile *f, void *opaque, size_t size,
+                   const VMStateField *field, JSONWriter *vmdesc,
+                   Error **errp)
 {
     CPUHPPAState *env = opaque;
     qemu_put_be64(f, cpu_hppa_get_psw(env));
-    return 0;
+    return true;
 }
 
 static const VMStateInfo vmstate_psw = {
     .name = "psw",
-    .get = get_psw,
-    .put = put_psw,
+    .load = load_psw,
+    .save = save_psw,
 };
 
-static int get_tlb(QEMUFile *f, void *opaque, size_t size,
-                   const VMStateField *field)
+static bool load_tlb(QEMUFile *f, void *opaque, size_t size,
+                   const VMStateField *field, Error **errp)
 {
     HPPATLBEntry *ent = opaque;
     uint64_t val;
@@ -69,11 +70,12 @@ static int get_tlb(QEMUFile *f, void *opaque, size_t size,
         ent->access_id = extract64(val, 1, 31);
         ent->entry_valid = 1;
     }
-    return 0;
+    return true;
 }
 
-static int put_tlb(QEMUFile *f, void *opaque, size_t size,
-                   const VMStateField *field, JSONWriter *vmdesc)
+static bool save_tlb(QEMUFile *f, void *opaque, size_t size,
+                   const VMStateField *field, JSONWriter *vmdesc,
+                   Error **errp)
 {
     HPPATLBEntry *ent = opaque;
     uint64_t val = 0;
@@ -96,13 +98,13 @@ static int put_tlb(QEMUFile *f, void *opaque, size_t size,
     qemu_put_be64(f, ent->itree.last);
     qemu_put_be64(f, ent->pa);
     qemu_put_be64(f, val);
-    return 0;
+    return true;
 }
 
 static const VMStateInfo vmstate_tlb_entry = {
     .name = "tlb entry",
-    .get = get_tlb,
-    .put = put_tlb,
+    .load = load_tlb,
+    .save = save_tlb,
 };
 
 static int tlb_pre_load(void *opaque)
-- 
2.43.0