Signed-off-by: Vladimir Sementsov-Ogievskiy <[email protected]>
---
target/ppc/machine.c | 80 ++++++++++++++++++++++----------------------
1 file changed, 40 insertions(+), 40 deletions(-)
diff --git a/target/ppc/machine.c b/target/ppc/machine.c
index 569536bd02d..f188bb9f5ea 100644
--- a/target/ppc/machine.c
+++ b/target/ppc/machine.c
@@ -23,31 +23,31 @@ static void post_load_update_msr(CPUPPCState *env)
ppc_store_msr(env, msr);
}
-static int get_avr(QEMUFile *f, void *pv, size_t size,
- const VMStateField *field)
+static bool load_avr(QEMUFile *f, void *pv, size_t size,
+ const VMStateField *field, Error **errp)
{
ppc_avr_t *v = pv;
v->u64[0] = qemu_get_be64(f);
v->u64[1] = qemu_get_be64(f);
- return 0;
+ return true;
}
-static int put_avr(QEMUFile *f, void *pv, size_t size,
- const VMStateField *field, JSONWriter *vmdesc)
+static bool save_avr(QEMUFile *f, void *pv, size_t size,
+ const VMStateField *field, JSONWriter *vmdesc, Error **errp)
{
ppc_avr_t *v = pv;
qemu_put_be64(f, v->u64[0]);
qemu_put_be64(f, v->u64[1]);
- return 0;
+ return true;
}
static const VMStateInfo vmstate_info_avr = {
.name = "avr",
- .get = get_avr,
- .put = put_avr,
+ .load = load_avr,
+ .save = save_avr,
};
#define VMSTATE_AVR_ARRAY_V(_f, _s, _n, _v) \
@@ -56,29 +56,29 @@ static const VMStateInfo vmstate_info_avr = {
#define VMSTATE_AVR_ARRAY(_f, _s, _n) \
VMSTATE_AVR_ARRAY_V(_f, _s, _n, 0)
-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)
{
ppc_vsr_t *v = pv;
v->VsrD(0) = qemu_get_be64(f);
- 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)
{
ppc_vsr_t *v = pv;
qemu_put_be64(f, v->VsrD(0));
- 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) \
@@ -87,29 +87,29 @@ static const VMStateInfo vmstate_info_fpr = {
#define VMSTATE_FPR_ARRAY(_f, _s, _n) \
VMSTATE_FPR_ARRAY_V(_f, _s, _n, 0)
-static int get_vsr(QEMUFile *f, void *pv, size_t size,
- const VMStateField *field)
+static bool load_vsr(QEMUFile *f, void *pv, size_t size,
+ const VMStateField *field, Error **errp)
{
ppc_vsr_t *v = pv;
v->VsrD(1) = qemu_get_be64(f);
- return 0;
+ return true;
}
-static int put_vsr(QEMUFile *f, void *pv, size_t size,
- const VMStateField *field, JSONWriter *vmdesc)
+static bool save_vsr(QEMUFile *f, void *pv, size_t size,
+ const VMStateField *field, JSONWriter *vmdesc, Error **errp)
{
ppc_vsr_t *v = pv;
qemu_put_be64(f, v->VsrD(1));
- return 0;
+ return true;
}
static const VMStateInfo vmstate_info_vsr = {
.name = "vsr",
- .get = get_vsr,
- .put = put_vsr,
+ .load = load_vsr,
+ .save = save_vsr,
};
#define VMSTATE_VSR_ARRAY_V(_f, _s, _n, _v) \
@@ -344,26 +344,26 @@ static bool altivec_needed(void *opaque)
return cpu->env.insns_flags & PPC_ALTIVEC;
}
-static int get_vscr(QEMUFile *f, void *opaque, size_t size,
- const VMStateField *field)
+static bool load_vscr(QEMUFile *f, void *opaque, size_t size,
+ const VMStateField *field, Error **errp)
{
PowerPCCPU *cpu = opaque;
ppc_store_vscr(&cpu->env, qemu_get_be32(f));
- return 0;
+ return true;
}
-static int put_vscr(QEMUFile *f, void *opaque, size_t size,
- const VMStateField *field, JSONWriter *vmdesc)
+static bool save_vscr(QEMUFile *f, void *opaque, size_t size,
+ const VMStateField *field, JSONWriter *vmdesc, Error
**errp)
{
PowerPCCPU *cpu = opaque;
qemu_put_be32(f, ppc_get_vscr(&cpu->env));
- return 0;
+ return true;
}
static const VMStateInfo vmstate_vscr = {
.name = "cpu/altivec/vscr",
- .get = get_vscr,
- .put = put_vscr,
+ .load = load_vscr,
+ .save = save_vscr,
};
static const VMStateDescription vmstate_altivec = {
@@ -465,31 +465,31 @@ static const VMStateDescription vmstate_sr = {
};
#ifdef TARGET_PPC64
-static int get_slbe(QEMUFile *f, void *pv, size_t size,
- const VMStateField *field)
+static bool load_slbe(QEMUFile *f, void *pv, size_t size,
+ const VMStateField *field, Error **errp)
{
ppc_slb_t *v = pv;
v->esid = qemu_get_be64(f);
v->vsid = qemu_get_be64(f);
- return 0;
+ return true;
}
-static int put_slbe(QEMUFile *f, void *pv, size_t size,
- const VMStateField *field, JSONWriter *vmdesc)
+static bool save_slbe(QEMUFile *f, void *pv, size_t size,
+ const VMStateField *field, JSONWriter *vmdesc, Error
**errp)
{
ppc_slb_t *v = pv;
qemu_put_be64(f, v->esid);
qemu_put_be64(f, v->vsid);
- return 0;
+ return true;
}
static const VMStateInfo vmstate_info_slbe = {
.name = "slbe",
- .get = get_slbe,
- .put = put_slbe,
+ .load = load_slbe,
+ .save = save_slbe,
};
#define VMSTATE_SLB_ARRAY_V(_f, _s, _n, _v) \
--
2.43.0
