Signed-off-by: Vladimir Sementsov-Ogievskiy <[email protected]>
---
target/mips/system/machine.c | 49 ++++++++++++++++++------------------
1 file changed, 25 insertions(+), 24 deletions(-)
diff --git a/target/mips/system/machine.c b/target/mips/system/machine.c
index bd1e4002cfd..dc8a9920e5a 100644
--- a/target/mips/system/machine.c
+++ b/target/mips/system/machine.c
@@ -22,8 +22,8 @@ static int cpu_post_load(void *opaque, int version_id)
/* FPU state */
-static int get_fpr(QEMUFile *f, void *pv, size_t size,
- const VMStateField *field)
+static bool load_fpr(QEMUFile *f, void *pv, size_t size,
+ const VMStateField *field, Error **errp)
{
int i;
fpr_t *v = pv;
@@ -31,11 +31,11 @@ static int get_fpr(QEMUFile *f, void *pv, size_t size,
for (i = 0; i < MSA_WRLEN / 64; i++) {
qemu_get_sbe64s(f, &v->wr.d[i]);
}
- return 0;
+ return true;
}
-static int put_fpr(QEMUFile *f, void *pv, size_t size,
- const VMStateField *field, JSONWriter *vmdesc)
+static bool save_fpr(QEMUFile *f, void *pv, size_t size,
+ const VMStateField *field, JSONWriter *vmdesc, Error **errp)
{
int i;
fpr_t *v = pv;
@@ -44,13 +44,13 @@ static int put_fpr(QEMUFile *f, void *pv, size_t size,
qemu_put_sbe64s(f, &v->wr.d[i]);
}
- return 0;
+ return true;
}
static const VMStateInfo vmstate_info_fpr = {
.name = "fpr",
- .get = get_fpr,
- .put = put_fpr,
+ .load = load_fpr,
+ .save = save_fpr,
};
#define VMSTATE_FPR_ARRAY_V(_f, _s, _n, _v) \
@@ -145,8 +145,9 @@ static gboolean put_octeon_llm_tree_entry(gpointer key,
gpointer value,
return false;
}
-static int put_octeon_llm_tree(QEMUFile *f, void *pv, size_t size,
- const VMStateField *field, JSONWriter *vmdesc)
+static bool save_octeon_llm_tree(QEMUFile *f, void *pv, size_t size,
+ const VMStateField *field,
+ JSONWriter *vmdesc, Error **errp)
{
QTree *tree = *(QTree **)pv;
OcteonLLMTreePutData data = { .f = f };
@@ -157,11 +158,11 @@ static int put_octeon_llm_tree(QEMUFile *f, void *pv,
size_t size,
q_tree_foreach(tree, put_octeon_llm_tree_entry, &data);
}
- return 0;
+ return true;
}
-static int get_octeon_llm_tree(QEMUFile *f, void *pv, size_t size,
- const VMStateField *field)
+static bool load_octeon_llm_tree(QEMUFile *f, void *pv, size_t size,
+ const VMStateField *field, Error **errp)
{
QTree **treep = pv;
uint32_t nnodes = qemu_get_be32(f);
@@ -178,13 +179,13 @@ static int get_octeon_llm_tree(QEMUFile *f, void *pv,
size_t size,
mips_octeon_llm_store(treep, addr, value);
}
- return 0;
+ return true;
}
static const VMStateInfo vmstate_info_octeon_llm_tree = {
.name = "octeon_llm_tree",
- .get = get_octeon_llm_tree,
- .put = put_octeon_llm_tree,
+ .load = load_octeon_llm_tree,
+ .save = save_octeon_llm_tree,
};
#define VMSTATE_OCTEON_LLM_TREE(_f, _s) { \
@@ -210,8 +211,8 @@ static const VMStateDescription vmstate_mvp = {
/* TLB state */
-static int get_tlb(QEMUFile *f, void *pv, size_t size,
- const VMStateField *field)
+static bool load_tlb(QEMUFile *f, void *pv, size_t size,
+ const VMStateField *field, Error **errp)
{
r4k_tlb_t *v = pv;
uint16_t flags;
@@ -240,11 +241,11 @@ static int get_tlb(QEMUFile *f, void *pv, size_t size,
qemu_get_be64s(f, &v->PFN[0]);
qemu_get_be64s(f, &v->PFN[1]);
- return 0;
+ return true;
}
-static int put_tlb(QEMUFile *f, void *pv, size_t size,
- const VMStateField *field, JSONWriter *vmdesc)
+static bool save_tlb(QEMUFile *f, void *pv, size_t size,
+ const VMStateField *field, JSONWriter *vmdesc, Error **errp)
{
r4k_tlb_t *v = pv;
@@ -275,13 +276,13 @@ static int put_tlb(QEMUFile *f, void *pv, size_t size,
qemu_put_be64s(f, &v->PFN[0]);
qemu_put_be64s(f, &v->PFN[1]);
- return 0;
+ return true;
}
static const VMStateInfo vmstate_info_tlb = {
.name = "tlb_entry",
- .get = get_tlb,
- .put = put_tlb,
+ .load = load_tlb,
+ .save = save_tlb,
};
#define VMSTATE_TLB_ARRAY_V(_f, _s, _n, _v) \
--
2.43.0
