From nobody Tue Feb 10 04:08:09 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1597724796; cv=none; d=zohomail.com; s=zohoarc; b=ets/yKqCU8xE1beDP/7tndfPzM6l3XIU6XoMTrFlHG2SdxbQqSJ3+hfJ1k+6EYFRJWs+1gWDJwHuf7bHY3S667xP8jIhksmmVzMaLiWxk6XqlGhQDAOtQnTcXTeZPqq8O/z/7raCOyTRAfKby9qcjEPWslOv/qYwCQn3cLIu5Jw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597724796; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=WXOMm3iX48/iQ3lNO6SYm/hnFoaQ9Sww4P5kpgw+7J4=; b=fk998G0krtHMZq0c6t7kzLf+TwSBFNxdqbM/qPdvUmV1rN8KW6jyPKuHJO3FvLoIDNrwGUQXltJ6TChb/ENPVLznRZRjBddQmyzk4u2GN8EG2svSLahi+2budAsvR2UOwdsFwhLwoKrCQInn+Z+GRv076tecgLREiGTt6QUhGXQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1597724796362927.9157226395283; Mon, 17 Aug 2020 21:26:36 -0700 (PDT) Received: from localhost ([::1]:53836 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7tCk-0002rn-Rn for importer@patchew.org; Tue, 18 Aug 2020 00:26:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49904) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7t67-0007If-7v; Tue, 18 Aug 2020 00:19:43 -0400 Received: from bilbo.ozlabs.org ([2401:3900:2:1::2]:53501 helo=ozlabs.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7t65-0006L4-3J; Tue, 18 Aug 2020 00:19:42 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 4BVyNZ35WZz9sTy; Tue, 18 Aug 2020 14:19:26 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1597724366; bh=GzchIm7DStOF8X8JiH3RRIrOXxvgBdXuhASFMZERPbs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EYC5wxOCvd5zyWU6ByKFmesYLWF/+KBipCnRrwJ8aQxkN3tQ0hWvjAIZ8RLcyXZvn 7pUazdKxRzVrWKRzf4vlNbierKP8AdzmcTvyTL1nl1X0Ny2eVBUPAJ6D7lRoGsvPg4 TJieQT2KkHt6AMP9SNgVlF77LVC7T8dbRtQWIbJE= From: David Gibson To: peter.maydell@linaro.org, groug@kaod.org Subject: [PULL 08/40] spapr: Use error_append_hint() in spapr_caps.c Date: Tue, 18 Aug 2020 14:18:50 +1000 Message-Id: <20200818041922.251708-9-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200818041922.251708-1-david@gibson.dropbear.id.au> References: <20200818041922.251708-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2401:3900:2:1::2; envelope-from=dgibson@ozlabs.org; helo=ozlabs.org X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -9 X-Spam_score: -1.0 X-Spam_bar: - X-Spam_report: (-1.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, HEADER_FROM_DIFFERENT_DOMAINS=1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Vladimir Sementsov-Ogievskiy , qemu-ppc@nongnu.org, qemu-devel@nongnu.org, David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Greg Kurz 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 Reviewed-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Laurent Vivier Message-Id: <159594297421.8262.14314530897345809924.stgit@bahia.lan> Signed-off-by: David Gibson --- hw/ppc/spapr_caps.c | 89 +++++++++++++++++++++++++-------------------- 1 file changed, 50 insertions(+), 39 deletions(-) diff --git a/hw/ppc/spapr_caps.c b/hw/ppc/spapr_caps.c index 3225fc5a2e..275f5bd034 100644 --- a/hw/ppc/spapr_caps.c +++ b/hw/ppc/spapr_caps.c @@ -180,24 +180,24 @@ static void spapr_cap_set_pagesize(Object *obj, Visit= or *v, const char *name, =20 static void cap_htm_apply(SpaprMachineState *spapr, uint8_t val, Error **e= rrp) { + ERRP_GUARD(); if (!val) { /* TODO: We don't support disabling htm yet */ return; } if (tcg_enabled()) { - error_setg(errp, - "No Transactional Memory support in TCG," - " try appending -machine cap-htm=3Doff"); + error_setg(errp, "No Transactional Memory support in TCG"); + error_append_hint(errp, "Try appending -machine cap-htm=3Doff\n"); } else if (kvm_enabled() && !kvmppc_has_cap_htm()) { error_setg(errp, -"KVM implementation does not support Transactional Memory," - " try appending -machine cap-htm=3Doff" - ); + "KVM implementation does not support Transactional Memo= ry"); + error_append_hint(errp, "Try appending -machine cap-htm=3Doff\n"); } } =20 static void cap_vsx_apply(SpaprMachineState *spapr, uint8_t val, Error **e= rrp) { + ERRP_GUARD(); PowerPCCPU *cpu =3D POWERPC_CPU(first_cpu); CPUPPCState *env =3D &cpu->env; =20 @@ -209,13 +209,14 @@ static void cap_vsx_apply(SpaprMachineState *spapr, u= int8_t val, Error **errp) * rid of anything that doesn't do VMX */ g_assert(env->insns_flags & PPC_ALTIVEC); if (!(env->insns_flags2 & PPC2_VSX)) { - error_setg(errp, "VSX support not available," - " try appending -machine cap-vsx=3Doff"); + error_setg(errp, "VSX support not available"); + error_append_hint(errp, "Try appending -machine cap-vsx=3Doff\n"); } } =20 static void cap_dfp_apply(SpaprMachineState *spapr, uint8_t val, Error **e= rrp) { + ERRP_GUARD(); PowerPCCPU *cpu =3D POWERPC_CPU(first_cpu); CPUPPCState *env =3D &cpu->env; =20 @@ -224,8 +225,8 @@ static void cap_dfp_apply(SpaprMachineState *spapr, uin= t8_t val, Error **errp) return; } if (!(env->insns_flags2 & PPC2_DFP)) { - error_setg(errp, "DFP support not available," - " try appending -machine cap-dfp=3Doff"); + error_setg(errp, "DFP support not available"); + error_append_hint(errp, "Try appending -machine cap-dfp=3Doff\n"); } } =20 @@ -239,6 +240,7 @@ SpaprCapPossible cap_cfpc_possible =3D { static void cap_safe_cache_apply(SpaprMachineState *spapr, uint8_t val, Error **errp) { + ERRP_GUARD(); uint8_t kvm_val =3D kvmppc_get_cap_safe_cache(); =20 if (tcg_enabled() && val) { @@ -247,9 +249,9 @@ static void cap_safe_cache_apply(SpaprMachineState *spa= pr, uint8_t val, cap_cfpc_possible.vals[val]); } else if (kvm_enabled() && (val > kvm_val)) { error_setg(errp, - "Requested safe cache capability level not supported by= kvm," - " try appending -machine cap-cfpc=3D%s", - cap_cfpc_possible.vals[kvm_val]); + "Requested safe cache capability level not supported by= KVM"); + error_append_hint(errp, "Try appending -machine cap-cfpc=3D%s\n", + cap_cfpc_possible.vals[kvm_val]); } } =20 @@ -263,6 +265,7 @@ SpaprCapPossible cap_sbbc_possible =3D { static void cap_safe_bounds_check_apply(SpaprMachineState *spapr, uint8_t = val, Error **errp) { + ERRP_GUARD(); uint8_t kvm_val =3D kvmppc_get_cap_safe_bounds_check(); =20 if (tcg_enabled() && val) { @@ -271,9 +274,9 @@ static void cap_safe_bounds_check_apply(SpaprMachineSta= te *spapr, uint8_t val, cap_sbbc_possible.vals[val]); } else if (kvm_enabled() && (val > kvm_val)) { error_setg(errp, -"Requested safe bounds check capability level not supported by kvm," - " try appending -machine cap-sbbc=3D%s", - cap_sbbc_possible.vals[kvm_val]); +"Requested safe bounds check capability level not supported by KVM"); + error_append_hint(errp, "Try appending -machine cap-sbbc=3D%s\n", + cap_sbbc_possible.vals[kvm_val]); } } =20 @@ -290,6 +293,7 @@ SpaprCapPossible cap_ibs_possible =3D { static void cap_safe_indirect_branch_apply(SpaprMachineState *spapr, uint8_t val, Error **errp) { + ERRP_GUARD(); uint8_t kvm_val =3D kvmppc_get_cap_safe_indirect_branch(); =20 if (tcg_enabled() && val) { @@ -298,9 +302,9 @@ static void cap_safe_indirect_branch_apply(SpaprMachine= State *spapr, cap_ibs_possible.vals[val]); } else if (kvm_enabled() && (val > kvm_val)) { error_setg(errp, -"Requested safe indirect branch capability level not supported by kvm," - " try appending -machine cap-ibs=3D%s", - cap_ibs_possible.vals[kvm_val]); +"Requested safe indirect branch capability level not supported by KVM"); + error_append_hint(errp, "Try appending -machine cap-ibs=3D%s\n", + cap_ibs_possible.vals[kvm_val]); } } =20 @@ -377,23 +381,25 @@ static void cap_hpt_maxpagesize_cpu_apply(SpaprMachin= eState *spapr, static void cap_nested_kvm_hv_apply(SpaprMachineState *spapr, uint8_t val, Error **errp) { + ERRP_GUARD(); if (!val) { /* capability disabled by default */ return; } =20 if (tcg_enabled()) { - error_setg(errp, - "No Nested KVM-HV support in tcg," - " try appending -machine cap-nested-hv=3Doff"); + error_setg(errp, "No Nested KVM-HV support in TCG"); + error_append_hint(errp, "Try appending -machine cap-nested-hv=3Dof= f\n"); } else if (kvm_enabled()) { if (!kvmppc_has_cap_nested_kvm_hv()) { error_setg(errp, -"KVM implementation does not support Nested KVM-HV," - " try appending -machine cap-nested-hv=3Doff"); + "KVM implementation does not support Nested KVM-HV"= ); + error_append_hint(errp, + "Try appending -machine cap-nested-hv=3Doff\= n"); } else if (kvmppc_set_cap_nested_kvm_hv(val) < 0) { - error_setg(errp, -"Error enabling cap-nested-hv with KVM, try cap-nested-hv=3Doff"); + error_setg(errp, "Error enabling cap-nested-hv with KVM"); + error_append_hint(errp, + "Try appending -machine cap-nested-hv=3D= off\n"); } } } @@ -401,6 +407,7 @@ static void cap_nested_kvm_hv_apply(SpaprMachineState *= spapr, static void cap_large_decr_apply(SpaprMachineState *spapr, uint8_t val, Error **errp) { + ERRP_GUARD(); PowerPCCPU *cpu =3D POWERPC_CPU(first_cpu); PowerPCCPUClass *pcc =3D POWERPC_CPU_GET_CLASS(cpu); =20 @@ -411,22 +418,23 @@ static void cap_large_decr_apply(SpaprMachineState *s= papr, if (tcg_enabled()) { if (!ppc_check_compat(cpu, CPU_POWERPC_LOGICAL_3_00, 0, spapr->max_compat_pvr)) { - error_setg(errp, - "Large decrementer only supported on POWER9, try -cpu POWE= R9"); + error_setg(errp, "Large decrementer only supported on POWER9"); + error_append_hint(errp, "Try -cpu POWER9\n"); return; } } else if (kvm_enabled()) { int kvm_nr_bits =3D kvmppc_get_cap_large_decr(); =20 if (!kvm_nr_bits) { - error_setg(errp, - "No large decrementer support," - " try appending -machine cap-large-decr=3Doff"); + error_setg(errp, "No large decrementer support"); + error_append_hint(errp, + "Try appending -machine cap-large-decr=3Doff= \n"); } else if (pcc->lrg_decr_bits !=3D kvm_nr_bits) { error_setg(errp, -"KVM large decrementer size (%d) differs to model (%d)," - " try appending -machine cap-large-decr=3Doff", - kvm_nr_bits, pcc->lrg_decr_bits); + "KVM large decrementer size (%d) differs to model (= %d)", + kvm_nr_bits, pcc->lrg_decr_bits); + error_append_hint(errp, + "Try appending -machine cap-large-decr=3Doff= \n"); } } } @@ -435,14 +443,15 @@ static void cap_large_decr_cpu_apply(SpaprMachineStat= e *spapr, PowerPCCPU *cpu, uint8_t val, Error **errp) { + ERRP_GUARD(); CPUPPCState *env =3D &cpu->env; target_ulong lpcr =3D env->spr[SPR_LPCR]; =20 if (kvm_enabled()) { if (kvmppc_enable_cap_large_decr(cpu, val)) { - error_setg(errp, - "No large decrementer support," - " try appending -machine cap-large-decr=3Doff"); + error_setg(errp, "No large decrementer support"); + error_append_hint(errp, + "Try appending -machine cap-large-decr=3Doff= \n"); } } =20 @@ -457,6 +466,7 @@ static void cap_large_decr_cpu_apply(SpaprMachineState = *spapr, static void cap_ccf_assist_apply(SpaprMachineState *spapr, uint8_t val, Error **errp) { + ERRP_GUARD(); uint8_t kvm_val =3D kvmppc_get_cap_count_cache_flush_assist(); =20 if (tcg_enabled() && val) { @@ -479,14 +489,15 @@ static void cap_ccf_assist_apply(SpaprMachineState *s= papr, uint8_t val, return; } error_setg(errp, -"Requested count cache flush assist capability level not supported by kvm," - " try appending -machine cap-ccf-assist=3Doff"); + "Requested count cache flush assist capability level no= t supported by KVM"); + error_append_hint(errp, "Try appending -machine cap-ccf-assist=3Do= ff\n"); } } =20 static void cap_fwnmi_apply(SpaprMachineState *spapr, uint8_t val, Error **errp) { + ERRP_GUARD(); if (!val) { return; /* Disabled by default */ } --=20 2.26.2