From 44b1ff319c4781c7ab13f7e119b3114a1e6a52e2 Mon Sep 17 00:00:00 2001 From: "Dr. David Alan Gilbert" Date: Mon, 25 Sep 2017 12:29:12 +0100 Subject: migration: pre_save return int Modify the pre_save method on VMStateDescription to return an int rather than void so that it potentially can fail. Changed zillions of devices to make them return 0; the only case I've made it return non-0 is hw/intc/s390_flic_kvm.c that already had an error_report/return case. Note: If you add an error exit in your pre_save you must emit an error_report to say why. Signed-off-by: Dr. David Alan Gilbert Message-Id: <20170925112917.21340-2-dgilbert@redhat.com> Reviewed-by: Peter Xu Reviewed-by: Cornelia Huck Reviewed-by: Juan Quintela Signed-off-by: Dr. David Alan Gilbert --- target/sparc/machine.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'target/sparc') diff --git a/target/sparc/machine.c b/target/sparc/machine.c index 6bd6b8ee3e..8ff9dea297 100644 --- a/target/sparc/machine.c +++ b/target/sparc/machine.c @@ -88,7 +88,7 @@ static const VMStateInfo vmstate_psr = { .put = put_psr, }; -static void cpu_pre_save(void *opaque) +static int cpu_pre_save(void *opaque) { SPARCCPU *cpu = opaque; CPUSPARCState *env = &cpu->env; @@ -97,6 +97,8 @@ static void cpu_pre_save(void *opaque) * window as the outs of the first window */ cpu_set_cwp(env, env->cwp); + + return 0; } /* 32-bit SPARC retains migration compatibility with older versions -- cgit v1.2.3