Signed-off-by: Vladimir Sementsov-Ogievskiy <[email protected]>
---
target/sparc/machine.c | 68 ++++++++++++++++++++++--------------------
1 file changed, 36 insertions(+), 32 deletions(-)
diff --git a/target/sparc/machine.c b/target/sparc/machine.c
index 0d5d79b5e7b..46f1e12344c 100644
--- a/target/sparc/machine.c
+++ b/target/sparc/machine.c
@@ -51,8 +51,8 @@ static const VMStateDescription vmstate_tlb_entry = {
};
#endif
-static int get_psr(QEMUFile *f, void *opaque, size_t size,
- const VMStateField *field)
+static bool load_psr(QEMUFile *f, void *opaque, size_t size,
+ const VMStateField *field, Error **errp)
{
SPARCCPU *cpu = opaque;
CPUSPARCState *env = &cpu->env;
@@ -62,11 +62,12 @@ static int get_psr(QEMUFile *f, void *opaque, size_t size,
env->cwp = 0;
cpu_put_psr_raw(env, val);
- return 0;
+ return true;
}
-static int put_psr(QEMUFile *f, void *opaque, size_t size,
- const VMStateField *field, JSONWriter *vmdesc)
+static bool save_psr(QEMUFile *f, void *opaque, size_t size,
+ const VMStateField *field, JSONWriter *vmdesc,
+ Error **errp)
{
SPARCCPU *cpu = opaque;
CPUSPARCState *env = &cpu->env;
@@ -75,17 +76,17 @@ static int put_psr(QEMUFile *f, void *opaque, size_t size,
val = cpu_get_psr(env);
qemu_put_be32(f, val);
- return 0;
+ return true;
}
static const VMStateInfo vmstate_psr = {
.name = "psr",
- .get = get_psr,
- .put = put_psr,
+ .load = load_psr,
+ .save = save_psr,
};
-static int get_fsr(QEMUFile *f, void *opaque, size_t size,
- const VMStateField *field)
+static bool load_fsr(QEMUFile *f, void *opaque, size_t size,
+ const VMStateField *field, Error **errp)
{
SPARCCPU *cpu = opaque;
@@ -95,11 +96,12 @@ static int get_fsr(QEMUFile *f, void *opaque, size_t size,
cpu_put_fsr(&cpu->env, qemu_get_be32(f));
}
- return 0;
+ return true;
}
-static int put_fsr(QEMUFile *f, void *opaque, size_t size,
- const VMStateField *field, JSONWriter *vmdesc)
+static bool save_fsr(QEMUFile *f, void *opaque, size_t size,
+ const VMStateField *field, JSONWriter *vmdesc,
+ Error **errp)
{
SPARCCPU *cpu = opaque;
@@ -108,18 +110,18 @@ static int put_fsr(QEMUFile *f, void *opaque, size_t size,
} else {
qemu_put_be32(f, cpu_get_fsr(&cpu->env));
}
- return 0;
+ return true;
}
static const VMStateInfo vmstate_fsr = {
.name = "fsr",
- .get = get_fsr,
- .put = put_fsr,
+ .load = load_fsr,
+ .save = save_fsr,
};
#ifdef TARGET_SPARC64
-static int get_xcc(QEMUFile *f, void *opaque, size_t size,
- const VMStateField *field)
+static bool load_xcc(QEMUFile *f, void *opaque, size_t size,
+ const VMStateField *field, Error **errp)
{
SPARCCPU *cpu = opaque;
CPUSPARCState *env = &cpu->env;
@@ -131,11 +133,12 @@ static int get_xcc(QEMUFile *f, void *opaque, size_t size,
env->xcc_Z = ~val & PSR_ZERO;
env->xcc_C = (val >> PSR_CARRY_SHIFT) & 1;
- return 0;
+ return true;
}
-static int put_xcc(QEMUFile *f, void *opaque, size_t size,
- const VMStateField *field, JSONWriter *vmdesc)
+static bool save_xcc(QEMUFile *f, void *opaque, size_t size,
+ const VMStateField *field, JSONWriter *vmdesc,
+ Error **errp)
{
SPARCCPU *cpu = opaque;
CPUSPARCState *env = &cpu->env;
@@ -143,17 +146,17 @@ static int put_xcc(QEMUFile *f, void *opaque, size_t size,
/* Extract just xcc out of ccr and shift into legacy position. */
qemu_put_be32(f, (val & 0xf0) << (20 - 4));
- return 0;
+ return true;
}
static const VMStateInfo vmstate_xcc = {
.name = "xcc",
- .get = get_xcc,
- .put = put_xcc,
+ .load = load_xcc,
+ .save = save_xcc,
};
-static int get_cwp(QEMUFile *f, void *opaque, size_t size,
- const VMStateField *field)
+static bool load_cwp(QEMUFile *f, void *opaque, size_t size,
+ const VMStateField *field, Error **errp)
{
SPARCCPU *cpu = opaque;
CPUSPARCState *env = &cpu->env;
@@ -163,24 +166,25 @@ static int get_cwp(QEMUFile *f, void *opaque, size_t size,
env->cwp = 0;
cpu_set_cwp(env, val);
- return 0;
+ return true;
}
-static int put_cwp(QEMUFile *f, void *opaque, size_t size,
- const VMStateField *field, JSONWriter *vmdesc)
+static bool save_cwp(QEMUFile *f, void *opaque, size_t size,
+ const VMStateField *field, JSONWriter *vmdesc,
+ Error **errp)
{
SPARCCPU *cpu = opaque;
CPUSPARCState *env = &cpu->env;
uint32_t val = env->cwp;
qemu_put_be32(f, val);
- return 0;
+ return true;
}
static const VMStateInfo vmstate_cwp = {
.name = "uint32",
- .get = get_cwp,
- .put = put_cwp,
+ .load = load_cwp,
+ .save = save_cwp,
};
#else
static bool fq_needed(void *opaque)
--
2.43.0
