ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

spapr: Simplify error handling in do_client_architecture_support() 

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>
Message-Id: <20200914123505.612812-7-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>
This commit is contained in:
Greg Kurz 2020-09-14 14:34:56 +02:00 committed by David Gibson
parent 121afbe487
commit 7e92da81be
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hw/ppc/spapr_hcall.c
View File

@ -1666,7 +1666,6 @@ target_ulong do_client_architecture_support(PowerPCCPU *cpu,
uint32_t cas_pvr; uint32_t cas_pvr;
SpaprOptionVector *ov1_guest, *ov5_guest; SpaprOptionVector *ov1_guest, *ov5_guest;
bool guest_radix; bool guest_radix;
Error *local_err = NULL;
bool raw_mode_supported = false; bool raw_mode_supported = false;
bool guest_xive; bool guest_xive;
CPUState *cs; CPUState *cs;
@ -1697,8 +1696,9 @@ target_ulong do_client_architecture_support(PowerPCCPU *cpu,
/* Update CPUs */ /* Update CPUs */
if (cpu->compat_pvr != cas_pvr) { if (cpu->compat_pvr != cas_pvr) {
ppc_set_compat_all(cas_pvr, &local_err); Error *local_err = NULL;
if (local_err) {
if (ppc_set_compat_all(cas_pvr, &local_err) < 0) {
/* We fail to set compat mode (likely because running with KVM PR), /* 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. * 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; return H_HARDWARE;
} }
error_free(local_err); error_free(local_err);
local_err = NULL;
} }
} }