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

spapr: Use error_append_hint() in spapr_caps.c 

We have a dedicated error API for hints. Use it instead of embedding
the hint in the error message, as recommanded in the "qapi/error.h"
header file.

While here, have cap_fwnmi_apply(), which already uses
error_append_hint(), to call ERRP_GUARD() as well.

Signed-off-by: Greg Kurz <groug@kaod.org>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Laurent Vivier <lvivier@redhat.com>
Message-Id: <159594297421.8262.14314530897345809924.stgit@bahia.lan>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Greg Kurz 2020-07-28 15:29:34 +02:00 committed by David Gibson
parent 7abf979750
commit d9c5b5fa86
1 changed files with 50 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
hw/ppc/spapr_caps.c
View File

@ -180,24 +180,24 @@ static void spapr_cap_set_pagesize(Object *obj, Visitor *v, const char *name,
static void cap_htm_apply(SpaprMachineState *spapr, uint8_t val, Error **errp) static void cap_htm_apply(SpaprMachineState *spapr, uint8_t val, Error **errp)
{ {
ERRP_GUARD();
if (!val) { if (!val) {
/* TODO: We don't support disabling htm yet */ /* TODO: We don't support disabling htm yet */
return; return;
} }
if (tcg_enabled()) { if (tcg_enabled()) {
error_setg(errp, error_setg(errp, "No Transactional Memory support in TCG");
"No Transactional Memory support in TCG," error_append_hint(errp, "Try appending -machine cap-htm=off\n");
" try appending -machine cap-htm=off");
} else if (kvm_enabled() && !kvmppc_has_cap_htm()) { } else if (kvm_enabled() && !kvmppc_has_cap_htm()) {
error_setg(errp, error_setg(errp,
"KVM implementation does not support Transactional Memory," "KVM implementation does not support Transactional Memory");
" try appending -machine cap-htm=off" error_append_hint(errp, "Try appending -machine cap-htm=off\n");
);
} }
} }
static void cap_vsx_apply(SpaprMachineState *spapr, uint8_t val, Error **errp) static void cap_vsx_apply(SpaprMachineState *spapr, uint8_t val, Error **errp)
{ {
ERRP_GUARD();
PowerPCCPU *cpu = POWERPC_CPU(first_cpu); PowerPCCPU *cpu = POWERPC_CPU(first_cpu);
CPUPPCState *env = &cpu->env; CPUPPCState *env = &cpu->env;
@ -209,13 +209,14 @@ static void cap_vsx_apply(SpaprMachineState *spapr, uint8_t val, Error **errp)
* rid of anything that doesn't do VMX */ * rid of anything that doesn't do VMX */
g_assert(env->insns_flags & PPC_ALTIVEC); g_assert(env->insns_flags & PPC_ALTIVEC);
if (!(env->insns_flags2 & PPC2_VSX)) { if (!(env->insns_flags2 & PPC2_VSX)) {
error_setg(errp, "VSX support not available," error_setg(errp, "VSX support not available");
" try appending -machine cap-vsx=off"); error_append_hint(errp, "Try appending -machine cap-vsx=off\n");
} }
} }
static void cap_dfp_apply(SpaprMachineState *spapr, uint8_t val, Error **errp) static void cap_dfp_apply(SpaprMachineState *spapr, uint8_t val, Error **errp)
{ {
ERRP_GUARD();
PowerPCCPU *cpu = POWERPC_CPU(first_cpu); PowerPCCPU *cpu = POWERPC_CPU(first_cpu);
CPUPPCState *env = &cpu->env; CPUPPCState *env = &cpu->env;
@ -224,8 +225,8 @@ static void cap_dfp_apply(SpaprMachineState *spapr, uint8_t val, Error **errp)
return; return;
} }
if (!(env->insns_flags2 & PPC2_DFP)) { if (!(env->insns_flags2 & PPC2_DFP)) {
error_setg(errp, "DFP support not available," error_setg(errp, "DFP support not available");
" try appending -machine cap-dfp=off"); error_append_hint(errp, "Try appending -machine cap-dfp=off\n");
} }
} }
@ -239,6 +240,7 @@ SpaprCapPossible cap_cfpc_possible = {
static void cap_safe_cache_apply(SpaprMachineState *spapr, uint8_t val, static void cap_safe_cache_apply(SpaprMachineState *spapr, uint8_t val,
Error **errp) Error **errp)
{ {
ERRP_GUARD();
uint8_t kvm_val = kvmppc_get_cap_safe_cache(); uint8_t kvm_val = kvmppc_get_cap_safe_cache();
if (tcg_enabled() && val) { if (tcg_enabled() && val) {
@ -247,9 +249,9 @@ static void cap_safe_cache_apply(SpaprMachineState *spapr, uint8_t val,
cap_cfpc_possible.vals[val]); cap_cfpc_possible.vals[val]);
} else if (kvm_enabled() && (val > kvm_val)) { } else if (kvm_enabled() && (val > kvm_val)) {
error_setg(errp, error_setg(errp,
"Requested safe cache capability level not supported by kvm," "Requested safe cache capability level not supported by KVM");
" try appending -machine cap-cfpc=%s", error_append_hint(errp, "Try appending -machine cap-cfpc=%s\n",
cap_cfpc_possible.vals[kvm_val]); cap_cfpc_possible.vals[kvm_val]);
} }
} }
@ -263,6 +265,7 @@ SpaprCapPossible cap_sbbc_possible = {
static void cap_safe_bounds_check_apply(SpaprMachineState *spapr, uint8_t val, static void cap_safe_bounds_check_apply(SpaprMachineState *spapr, uint8_t val,
Error **errp) Error **errp)
{ {
ERRP_GUARD();
uint8_t kvm_val = kvmppc_get_cap_safe_bounds_check(); uint8_t kvm_val = kvmppc_get_cap_safe_bounds_check();
if (tcg_enabled() && val) { if (tcg_enabled() && val) {
@ -271,9 +274,9 @@ static void cap_safe_bounds_check_apply(SpaprMachineState *spapr, uint8_t val,
cap_sbbc_possible.vals[val]); cap_sbbc_possible.vals[val]);
} else if (kvm_enabled() && (val > kvm_val)) { } else if (kvm_enabled() && (val > kvm_val)) {
error_setg(errp, error_setg(errp,
"Requested safe bounds check capability level not supported by kvm," "Requested safe bounds check capability level not supported by KVM");
" try appending -machine cap-sbbc=%s", error_append_hint(errp, "Try appending -machine cap-sbbc=%s\n",
cap_sbbc_possible.vals[kvm_val]); cap_sbbc_possible.vals[kvm_val]);
} }
} }
@ -290,6 +293,7 @@ SpaprCapPossible cap_ibs_possible = {
static void cap_safe_indirect_branch_apply(SpaprMachineState *spapr, static void cap_safe_indirect_branch_apply(SpaprMachineState *spapr,
uint8_t val, Error **errp) uint8_t val, Error **errp)
{ {
ERRP_GUARD();
uint8_t kvm_val = kvmppc_get_cap_safe_indirect_branch(); uint8_t kvm_val = kvmppc_get_cap_safe_indirect_branch();
if (tcg_enabled() && val) { if (tcg_enabled() && val) {
@ -298,9 +302,9 @@ static void cap_safe_indirect_branch_apply(SpaprMachineState *spapr,
cap_ibs_possible.vals[val]); cap_ibs_possible.vals[val]);
} else if (kvm_enabled() && (val > kvm_val)) { } else if (kvm_enabled() && (val > kvm_val)) {
error_setg(errp, error_setg(errp,
"Requested safe indirect branch capability level not supported by kvm," "Requested safe indirect branch capability level not supported by KVM");
" try appending -machine cap-ibs=%s", error_append_hint(errp, "Try appending -machine cap-ibs=%s\n",
cap_ibs_possible.vals[kvm_val]); cap_ibs_possible.vals[kvm_val]);
} }
} }
@ -377,23 +381,25 @@ static void cap_hpt_maxpagesize_cpu_apply(SpaprMachineState *spapr,
static void cap_nested_kvm_hv_apply(SpaprMachineState *spapr, static void cap_nested_kvm_hv_apply(SpaprMachineState *spapr,
uint8_t val, Error **errp) uint8_t val, Error **errp)
{ {
ERRP_GUARD();
if (!val) { if (!val) {
/* capability disabled by default */ /* capability disabled by default */
return; return;
} }
if (tcg_enabled()) { if (tcg_enabled()) {
error_setg(errp, error_setg(errp, "No Nested KVM-HV support in TCG");
"No Nested KVM-HV support in tcg," error_append_hint(errp, "Try appending -machine cap-nested-hv=off\n");
" try appending -machine cap-nested-hv=off");
} else if (kvm_enabled()) { } else if (kvm_enabled()) {
if (!kvmppc_has_cap_nested_kvm_hv()) { if (!kvmppc_has_cap_nested_kvm_hv()) {
error_setg(errp, error_setg(errp,
"KVM implementation does not support Nested KVM-HV," "KVM implementation does not support Nested KVM-HV");
" try appending -machine cap-nested-hv=off"); error_append_hint(errp,
"Try appending -machine cap-nested-hv=off\n");
} else if (kvmppc_set_cap_nested_kvm_hv(val) < 0) { } else if (kvmppc_set_cap_nested_kvm_hv(val) < 0) {
error_setg(errp, error_setg(errp, "Error enabling cap-nested-hv with KVM");
"Error enabling cap-nested-hv with KVM, try cap-nested-hv=off"); error_append_hint(errp,
"Try appending -machine cap-nested-hv=off\n");
} }
} }
} }
@ -401,6 +407,7 @@ static void cap_nested_kvm_hv_apply(SpaprMachineState *spapr,
static void cap_large_decr_apply(SpaprMachineState *spapr, static void cap_large_decr_apply(SpaprMachineState *spapr,
uint8_t val, Error **errp) uint8_t val, Error **errp)
{ {
ERRP_GUARD();
PowerPCCPU *cpu = POWERPC_CPU(first_cpu); PowerPCCPU *cpu = POWERPC_CPU(first_cpu);
PowerPCCPUClass *pcc = POWERPC_CPU_GET_CLASS(cpu); PowerPCCPUClass *pcc = POWERPC_CPU_GET_CLASS(cpu);
@ -411,22 +418,23 @@ static void cap_large_decr_apply(SpaprMachineState *spapr,
if (tcg_enabled()) { if (tcg_enabled()) {
if (!ppc_check_compat(cpu, CPU_POWERPC_LOGICAL_3_00, 0, if (!ppc_check_compat(cpu, CPU_POWERPC_LOGICAL_3_00, 0,
spapr->max_compat_pvr)) { spapr->max_compat_pvr)) {
error_setg(errp, error_setg(errp, "Large decrementer only supported on POWER9");
"Large decrementer only supported on POWER9, try -cpu POWER9"); error_append_hint(errp, "Try -cpu POWER9\n");
return; return;
} }
} else if (kvm_enabled()) { } else if (kvm_enabled()) {
int kvm_nr_bits = kvmppc_get_cap_large_decr(); int kvm_nr_bits = kvmppc_get_cap_large_decr();
if (!kvm_nr_bits) { if (!kvm_nr_bits) {
error_setg(errp, error_setg(errp, "No large decrementer support");
"No large decrementer support," error_append_hint(errp,
" try appending -machine cap-large-decr=off"); "Try appending -machine cap-large-decr=off\n");
} else if (pcc->lrg_decr_bits != kvm_nr_bits) { } else if (pcc->lrg_decr_bits != kvm_nr_bits) {
error_setg(errp, error_setg(errp,
"KVM large decrementer size (%d) differs to model (%d)," "KVM large decrementer size (%d) differs to model (%d)",
" try appending -machine cap-large-decr=off", kvm_nr_bits, pcc->lrg_decr_bits);
kvm_nr_bits, pcc->lrg_decr_bits); error_append_hint(errp,
"Try appending -machine cap-large-decr=off\n");
} }
} }
} }
@ -435,14 +443,15 @@ static void cap_large_decr_cpu_apply(SpaprMachineState *spapr,
PowerPCCPU *cpu, PowerPCCPU *cpu,
uint8_t val, Error **errp) uint8_t val, Error **errp)
{ {
ERRP_GUARD();
CPUPPCState *env = &cpu->env; CPUPPCState *env = &cpu->env;
target_ulong lpcr = env->spr[SPR_LPCR]; target_ulong lpcr = env->spr[SPR_LPCR];
if (kvm_enabled()) { if (kvm_enabled()) {
if (kvmppc_enable_cap_large_decr(cpu, val)) { if (kvmppc_enable_cap_large_decr(cpu, val)) {
error_setg(errp, error_setg(errp, "No large decrementer support");
"No large decrementer support," error_append_hint(errp,
" try appending -machine cap-large-decr=off"); "Try appending -machine cap-large-decr=off\n");
} }
} }
@ -457,6 +466,7 @@ static void cap_large_decr_cpu_apply(SpaprMachineState *spapr,
static void cap_ccf_assist_apply(SpaprMachineState *spapr, uint8_t val, static void cap_ccf_assist_apply(SpaprMachineState *spapr, uint8_t val,
Error **errp) Error **errp)
{ {
ERRP_GUARD();
uint8_t kvm_val = kvmppc_get_cap_count_cache_flush_assist(); uint8_t kvm_val = kvmppc_get_cap_count_cache_flush_assist();
if (tcg_enabled() && val) { if (tcg_enabled() && val) {
@ -479,14 +489,15 @@ static void cap_ccf_assist_apply(SpaprMachineState *spapr, uint8_t val,
return; return;
} }
error_setg(errp, error_setg(errp,
"Requested count cache flush assist capability level not supported by kvm," "Requested count cache flush assist capability level not supported by KVM");
" try appending -machine cap-ccf-assist=off"); error_append_hint(errp, "Try appending -machine cap-ccf-assist=off\n");
} }
} }
static void cap_fwnmi_apply(SpaprMachineState *spapr, uint8_t val, static void cap_fwnmi_apply(SpaprMachineState *spapr, uint8_t val,
Error **errp) Error **errp)
{ {
ERRP_GUARD();
if (!val) { if (!val) {
return; /* Disabled by default */ return; /* Disabled by default */
} }