[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 06/15] spapr: Simplify error handling in do_client_architecture_s
From: |
Greg Kurz |
Subject: |
[PATCH 06/15] spapr: Simplify error handling in do_client_architecture_support() |
Date: |
Mon, 14 Sep 2020 14:34:56 +0200 |
Use the return value of ppc_set_compat_all() to check failures,
which is preferred over hijacking local_err.
Signed-off-by: Greg Kurz <groug@kaod.org>
---
hw/ppc/spapr_hcall.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c
index 885ea60778ba..607740150fa2 100644
--- a/hw/ppc/spapr_hcall.c
+++ b/hw/ppc/spapr_hcall.c
@@ -1666,7 +1666,6 @@ target_ulong do_client_architecture_support(PowerPCCPU
*cpu,
uint32_t cas_pvr;
SpaprOptionVector *ov1_guest, *ov5_guest;
bool guest_radix;
- Error *local_err = NULL;
bool raw_mode_supported = false;
bool guest_xive;
CPUState *cs;
@@ -1697,8 +1696,9 @@ target_ulong do_client_architecture_support(PowerPCCPU
*cpu,
/* Update CPUs */
if (cpu->compat_pvr != cas_pvr) {
- ppc_set_compat_all(cas_pvr, &local_err);
- if (local_err) {
+ Error *local_err = NULL;
+
+ if (ppc_set_compat_all(cas_pvr, &local_err) < 0) {
/* We fail to set compat mode (likely because running with KVM PR),
* but maybe we can fallback to raw mode if the guest supports it.
*/
@@ -1707,7 +1707,6 @@ target_ulong do_client_architecture_support(PowerPCCPU
*cpu,
return H_HARDWARE;
}
error_free(local_err);
- local_err = NULL;
}
}
--
2.26.2
- Re: [PATCH 03/15] ppc: Fix return value in cpu_post_load() error path, (continued)
- [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
- [PATCH 06/15] spapr: Simplify error handling in do_client_architecture_support(),
Greg Kurz <=
- [PATCH 07/15] spapr: Simplify error handling in spapr_vio_busdev_realize(), Greg Kurz, 2020/09/14
- [PATCH 10/15] spapr: Add a return value to spapr_set_vcpu_id(), Greg Kurz, 2020/09/14
- [PATCH 12/15] spapr: Add a return value to spapr_nvdimm_validate(), Greg Kurz, 2020/09/14