[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 03/15] ppc: Fix return value in cpu_post_load() error path
From: |
Greg Kurz |
Subject: |
[PATCH 03/15] ppc: Fix return value in cpu_post_load() error path |
Date: |
Mon, 14 Sep 2020 14:34:53 +0200 |
VMState handlers are supposed to return negative errno values on failure.
Signed-off-by: Greg Kurz <groug@kaod.org>
---
target/ppc/machine.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/target/ppc/machine.c b/target/ppc/machine.c
index 109d0711628f..5e5837737679 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;
}
}
--
2.26.2
- [PATCH 00/15] spapr: Error handling fixes and cleanups (round 2), Greg Kurz, 2020/09/14
- [PATCH 01/15] spapr: Fix error leak in spapr_realize_vcpu(), Greg Kurz, 2020/09/14
- [PATCH 02/15] ppc: Add a return value to ppc_set_compat() and ppc_set_compat_all(), Greg Kurz, 2020/09/14
- [PATCH 03/15] ppc: Fix return value in cpu_post_load() error path,
Greg Kurz <=
- [PATCH 08/15] spapr: Add a return value to spapr_drc_attach(), Greg Kurz, 2020/09/14
- [PATCH 04/15] spapr: Simplify error handling in callers of ppc_set_compat(), Greg Kurz, 2020/09/14
- [PATCH 05/15] spapr: Get rid of cas_check_pvr() error reporting, Greg Kurz, 2020/09/14