[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 05/15] spapr: Get rid of cas_check_pvr() error reporting
From: |
Greg Kurz |
Subject: |
[PATCH 05/15] spapr: Get rid of cas_check_pvr() error reporting |
Date: |
Mon, 14 Sep 2020 14:34:55 +0200 |
The cas_check_pvr() function has two purposes:
- finding the "best" logical PVR, ie. the most recent one supported by
the guest for this CPU type
- checking if the guest supports the real PVR of this CPU type, which
is just an optional extra information to workaround the lack of
support for "compat" mode in PR KVM
This logic doesn't need error reporting, really. If we don't find a
suitable logical PVR, we return the special value 0 which is definitely
not a valid PVR. Let the caller decide on whether it should error out
or not.
This doesn't change the behavior.
Signed-off-by: Greg Kurz <groug@kaod.org>
---
hw/ppc/spapr_hcall.c | 27 ++++++++++++---------------
1 file changed, 12 insertions(+), 15 deletions(-)
diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c
index c2776b6a7de2..885ea60778ba 100644
--- a/hw/ppc/spapr_hcall.c
+++ b/hw/ppc/spapr_hcall.c
@@ -1590,12 +1590,11 @@ static target_ulong h_signal_sys_reset(PowerPCCPU *cpu,
}
}
-static uint32_t cas_check_pvr(SpaprMachineState *spapr, PowerPCCPU *cpu,
- target_ulong *addr, bool *raw_mode_supported,
- Error **errp)
+/* Returns either a logical PVR or zero if none was found */
+static uint32_t cas_check_pvr(PowerPCCPU *cpu, uint32_t max_compat,
+ target_ulong *addr, bool *raw_mode_supported)
{
bool explicit_match = false; /* Matched the CPU's real PVR */
- uint32_t max_compat = spapr->max_compat_pvr;
uint32_t best_compat = 0;
int i;
@@ -1624,14 +1623,6 @@ static uint32_t cas_check_pvr(SpaprMachineState *spapr,
PowerPCCPU *cpu,
}
}
- if ((best_compat == 0) && (!explicit_match || max_compat)) {
- /* We couldn't find a suitable compatibility mode, and either
- * the guest doesn't support "raw" mode for this CPU, or raw
- * mode is disabled because a maximum compat mode is set */
- error_setg(errp, "Couldn't negotiate a suitable PVR during CAS");
- return 0;
- }
-
*raw_mode_supported = explicit_match;
/* Parsing finished */
@@ -1680,6 +1671,7 @@ target_ulong do_client_architecture_support(PowerPCCPU
*cpu,
bool guest_xive;
CPUState *cs;
void *fdt;
+ uint32_t max_compat = spapr->max_compat_pvr;
/* CAS is supposed to be called early when only the boot vCPU is active. */
CPU_FOREACH(cs) {
@@ -1692,9 +1684,14 @@ target_ulong do_client_architecture_support(PowerPCCPU
*cpu,
}
}
- cas_pvr = cas_check_pvr(spapr, cpu, &vec, &raw_mode_supported, &local_err);
- if (local_err) {
- error_report_err(local_err);
+ cas_pvr = cas_check_pvr(cpu, max_compat, &vec, &raw_mode_supported);
+ if (!cas_pvr && (!raw_mode_supported || max_compat)) {
+ /*
+ * We couldn't find a suitable compatibility mode, and either
+ * the guest doesn't support "raw" mode for this CPU, or "raw"
+ * mode is disabled because a maximum compat mode is set.
+ */
+ error_report("Couldn't negotiate a suitable PVR during CAS");
return H_HARDWARE;
}
--
2.26.2
- Re: [PATCH 02/15] ppc: Add a return value to ppc_set_compat() and ppc_set_compat_all(), (continued)
- [PATCH 03/15] ppc: Fix return value in cpu_post_load() error path, Greg Kurz, 2020/09/14
- [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 <=
- [PATCH 06/15] spapr: Simplify error handling in do_client_architecture_support(), Greg Kurz, 2020/09/14
- [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