diff options
| author | Greg Kurz | 2020-09-14 14:34:53 +0200 |
|---|---|---|
| committer | David Gibson | 2020-10-09 01:15:06 +0200 |
| commit | 899134eb495fe784885cb495bb38e05639cca52a (patch) | |
| tree | 6710c848861e77e3ffec0d51a9c3bebe935770c7 /target/ppc | |
| parent | ppc: Add a return value to ppc_set_compat() and ppc_set_compat_all() (diff) | |
| download | qemu-899134eb495fe784885cb495bb38e05639cca52a.tar.gz qemu-899134eb495fe784885cb495bb38e05639cca52a.tar.xz qemu-899134eb495fe784885cb495bb38e05639cca52a.zip | |
ppc: Fix return value in cpu_post_load() error path
VMState handlers are supposed to return negative errno values on failure.
Signed-off-by: Greg Kurz <groug@kaod.org>
Message-Id: <20200914123505.612812-4-groug@kaod.org>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Diffstat (limited to 'target/ppc')
| -rw-r--r-- | target/ppc/machine.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/target/ppc/machine.c b/target/ppc/machine.c index 109d071162..5e58377376 100644 --- a/target/ppc/machine.c +++ b/target/ppc/machine.c @@ -347,18 +347,19 @@ static int cpu_post_load(void *opaque, int version_id) if (cpu->compat_pvr) { uint32_t compat_pvr = cpu->compat_pvr; Error *local_err = NULL; + int ret; cpu->compat_pvr = 0; - ppc_set_compat(cpu, compat_pvr, &local_err); - if (local_err) { + ret = ppc_set_compat(cpu, compat_pvr, &local_err); + if (ret < 0) { error_report_err(local_err); - return -1; + return ret; } } else #endif { if (!pvr_match(cpu, env->spr[SPR_PVR])) { - return -1; + return -EINVAL; } } |