From nobody Sat Apr 27 23:10:01 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linux.ibm.com ARC-Seal: i=1; a=rsa-sha256; t=1564981866; cv=none; d=zoho.com; s=zohoarc; b=How3g6UmJVbaCF9psNqLoqsDOzxocIaG3unDpXitIVN9g4FgCyMToJ6H10tY5+YmGdoIrXPX/pZlc/PFQ+dofAAQd+SUh79HOeriaO7CPiTw24cPIBJNvC9hiz2xzK3iJUKbC+Mmwv5I4Q/B3Mx7v8Yj1W/VongUugryrdAhTZE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1564981866; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=7zHvlFxEKTC9Tvw1E8d7oQvms5cffSARefctdrHeGEw=; b=N2XFC8Z2NWPJDYlFqGP1hPdKc33ea/Tmpn47XKRrTI0Ut03D46qFeV2w2GBI+nj16ev10gj37OXOHkqtfgjng6bB7ZRSZ1SYMU1r23SfOgXsOsD/vR6iq02Aq6koepfd7OnmI7IdGy96aXuupsISomBO0CIq3Eg4KNHGOjR71xs= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1564981866437388.5933522899386; Sun, 4 Aug 2019 22:11:06 -0700 (PDT) Received: from localhost ([::1]:50682 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1huVGs-0005TK-3w for importer@patchew.org; Mon, 05 Aug 2019 01:10:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45799) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1huVGO-0004s9-BH for qemu-devel@nongnu.org; Mon, 05 Aug 2019 01:10:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1huVGM-0006Fi-7n for qemu-devel@nongnu.org; Mon, 05 Aug 2019 01:10:28 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:62402) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1huVGK-0006ET-GV for qemu-devel@nongnu.org; Mon, 05 Aug 2019 01:10:26 -0400 Received: from pps.filterd (m0098399.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x7557uTa089684 for ; Mon, 5 Aug 2019 01:10:22 -0400 Received: from e06smtp02.uk.ibm.com (e06smtp02.uk.ibm.com [195.75.94.98]) by mx0a-001b2d01.pphosted.com with ESMTP id 2u680n3p47-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 05 Aug 2019 01:10:21 -0400 Received: from localhost by e06smtp02.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 5 Aug 2019 06:10:19 +0100 Received: from b06cxnps3074.portsmouth.uk.ibm.com (9.149.109.194) by e06smtp02.uk.ibm.com (192.168.101.132) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Mon, 5 Aug 2019 06:10:18 +0100 Received: from d06av24.portsmouth.uk.ibm.com (mk.ibm.com [9.149.105.60]) by b06cxnps3074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id x755AHJR47186122 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 5 Aug 2019 05:10:17 GMT Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 283B74204B; Mon, 5 Aug 2019 05:10:17 +0000 (GMT) Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 8AC424204D; Mon, 5 Aug 2019 05:10:16 +0000 (GMT) Received: from ozlabs.au.ibm.com (unknown [9.192.253.14]) by d06av24.portsmouth.uk.ibm.com (Postfix) with ESMTP; Mon, 5 Aug 2019 05:10:16 +0000 (GMT) Received: from volution.ozlabs.ibm.com (haven.au.ibm.com [9.192.254.114]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.au.ibm.com (Postfix) with ESMTPSA id 8DF63A0259; Mon, 5 Aug 2019 15:10:15 +1000 (AEST) From: Daniel Black To: qemu-devel@nongnu.org Date: Mon, 5 Aug 2019 15:09:58 +1000 X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 x-cbid: 19080505-0008-0000-0000-0000030546C3 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 19080505-0009-0000-0000-0000A17F4A9E Message-Id: <20190805050959.19935-1-daniel@linux.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-08-05_02:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1906280000 definitions=main-1908050057 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 148.163.156.1 Subject: [Qemu-devel] [PATCH v3] spapr: quantify error messages regarding capability settings 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: "open list:sPAPR" , Greg Kurz , Daniel Black , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Its not immediately obvious how cap-X=3DY setting need to be applied to the command line so, for spapr capability hints, this has been clarified= to: ..try appending -machine cap-X=3DY The wrong value messages have been left as is, as the user has found the ri= ght location. Warning messages have been left as is for now. Reviewed-by: Greg Kurz Signed-off-by: Daniel Black --- tcg (broken only for cap-{cfpc|sbbc|ibs}: $ ppc64-softmmu/qemu-system-ppc64 -nodefaults -nographic -machine pseries,a= ccel=3Dtcg qemu-system-ppc64: warning: TCG doesn't support requested feature, cap-cfpc= =3Dworkaround qemu-system-ppc64: warning: TCG doesn't support requested feature, cap-sbbc= =3Dworkaround qemu-system-ppc64: warning: TCG doesn't support requested feature, cap-ibs= =3Dworkaround ^Cqemu-system-ppc64: terminating on signal 2 $ ppc64-softmmu/qemu-system-ppc64 -nodefaults -nographic -machine pseries,= accel=3Dtcg -machine cap-cfpc=3Dworkaround qemu-system-ppc64: warning: TCG doesn't support requested feature, cap-cfpc= =3Dworkaround qemu-system-ppc64: warning: TCG doesn't support requested feature, cap-sbbc= =3Dworkaround qemu-system-ppc64: warning: TCG doesn't support requested feature, cap-ibs= =3Dworkaround $ ppc64-softmmu/qemu-system-ppc64 -nodefaults -nographic -machine pseries,a= ccel=3Dtcg -machine cap-cfpc=3Dbroken qemu-system-ppc64: warning: TCG doesn't support requested feature, cap-sbbc= =3Dworkaround qemu-system-ppc64: warning: TCG doesn't support requested feature, cap-ibs= =3Dworkaround ^Cqemu-system-ppc64: terminating on signal 2 $ ppc64-softmmu/qemu-system-ppc64 -nodefaults -nographic -machine pseries,a= ccel=3Dtcg -machine cap-cfpc=3Dfixed qemu-system-ppc64: warning: TCG doesn't support requested feature, cap-cfpc= =3Dfixed qemu-system-ppc64: warning: TCG doesn't support requested feature, cap-sbbc= =3Dworkaround qemu-system-ppc64: warning: TCG doesn't support requested feature, cap-ibs= =3Dworkaround ^Cqemu-system-ppc64: terminating on signal 2 $ ppc64-softmmu/qemu-system-ppc64 -nodefaults -nographic -machine pseries,a= ccel=3Dtcg -machine cap-cfpc=3Dbroken -machine cap-sbbc=3Dfixed qemu-system-ppc64: warning: TCG doesn't support requested feature, cap-sbbc= =3Dfixed qemu-system-ppc64: warning: TCG doesn't support requested feature, cap-ibs= =3Dworkaround ^Cqemu-system-ppc64: terminating on signal 2 $ ppc64-softmmu/qemu-system-ppc64 -nodefaults -nographic -machine pseries,a= ccel=3Dtcg -machine cap-cfpc=3Dbroken -machine cap-sbbc=3Dbroken qemu-system-ppc64: warning: TCG doesn't support requested feature, cap-ibs= =3Dworkaround ^Cqemu-system-ppc64: terminating on signal 2 $ ppc64-softmmu/qemu-system-ppc64 -nodefaults -nographic -machine pseries,a= ccel=3Dtcg -machine cap-cfpc=3Dbroken -machine cap-sbbc=3Dbroken -machin= e cap-ibs=3Dfixed-ibs qemu-system-ppc64: warning: TCG doesn't support requested feature, cap-ibs= =3Dfixed-ibs ^Cqemu-system-ppc64: terminating on signal 2 $ ppc64-softmmu/qemu-system-ppc64 -nodefaults -nographic -machine pseries,a= ccel=3Dtcg -machine cap-cfpc=3Dbroken -machine cap-sbbc=3Dbroken -machin= e cap-ibs=3Dfixed-ccd qemu-system-ppc64: warning: TCG doesn't support requested feature, cap-ibs= =3Dfixed-ccd ^Cqemu-system-ppc64: terminating on signal 2 $ ppc64-softmmu/qemu-system-ppc64 -nodefaults -nographic -machine pseries,a= ccel=3Dtcg -machine cap-cfpc=3Dbroken -machine cap-sbbc=3Dbroken -machin= e cap-ibs=3Dfixed-na qemu-system-ppc64: warning: TCG doesn't support requested feature, cap-ibs= =3Dfixed-na ^Cqemu-system-ppc64: terminating on signal 2 $ ppc64-softmmu/qemu-system-ppc64 -nodefaults -nographic -machine pseries,a= ccel=3Dtcg -machine cap-cfpc=3Dbroken -machine cap-sbbc=3Dbroken -machin= e cap-ibs=3Dfixed-broken qemu-system-ppc64: Invalid capability mode "fixed-broken" for cap-ibs $ ppc64-softmmu/qemu-system-ppc64 -nodefaults -nographic -machine pseries,a= ccel=3Dtcg -machine cap-cfpc=3Dbroken -machine cap-sbbc=3Dbroken -machin= e cap-ibs=3Dbroken ^Cqemu-system-ppc64: terminating on signal 2 result: No silly messages kvm (older firmware without features "for testing"): $ ppc64-softmmu/qemu-system-ppc64 -nodefaults -nographic -machine pseries -= accel kvm -machine cap-cfpc=3Dworkaround qemu-system-ppc64: Requested safe cache capability level not supported by k= vm, try appending -machine cap-cfpc=3Dbroken $ ppc64-softmmu/qemu-system-ppc64 -nodefaults -nographic -machine pseries -= accel kvm -machine cap-cfpc=3Dfixed qemu-system-ppc64: Requested safe cache capability level not supported by k= vm, try appending -machine cap-cfpc=3Dbroken $ ppc64-softmmu/qemu-system-ppc64 -nodefaults -nographic -machine pseries -= accel kvm -machine cap-sbbc=3Dbroken qemu-system-ppc64: Requested safe cache capability level not supported by k= vm, try appending -machine cap-cfpc=3Dbroken $ ppc64-softmmu/qemu-system-ppc64 -nodefaults -nographic -machine pseries -= accel kvm -machine cap-cfpc=3Dbroken -machine cap-sbbc=3Dbroken qemu-system-ppc64: Requested safe indirect branch capability level not supp= orted by kvm, try appending -machine cap-ibs=3Dbroken $ ppc64-softmmu/qemu-system-ppc64 -nodefaults -nographic -machine pseries -= accel kvm -machine cap-cfpc=3Dbroken -machine cap-sbbc=3Dfixed qemu-system-ppc64: Requested safe bounds check capability level not support= ed by kvm, try appending -machine cap-sbbc=3Dbroken $ ppc64-softmmu/qemu-system-ppc64 -nodefaults -nographic -machine pseries -= accel kvm -machine cap-cfpc=3Dbroken -machine cap-sbbc=3Dworkaround qemu-system-ppc64: Requested safe bounds check capability level not support= ed by kvm, try appending -machine cap-sbbc=3Dbroken $ ppc64-softmmu/qemu-system-ppc64 -nodefaults -nographic -machine pseries -= accel kvm -machine cap-cfpc=3Dbroken -machine cap-sbbc=3Dbroken qemu-system-ppc64: Requested safe indirect branch capability level not supp= orted by kvm, try appending -machine cap-ibs=3Dbroken $ ppc64-softmmu/qemu-system-ppc64 -nodefaults -nographic -machine pseries -= accel kvm -machine cap-cfpc=3Dbroken -machine cap-sbbc=3Dbroken -machine c= ap-ibs=3Dworkaround qemu-system-ppc64: Requested safe indirect branch capability level not supp= orted by kvm, try appending -machine cap-ibs=3Dbroken $ ppc64-softmmu/qemu-system-ppc64 -nodefaults -nographic -machine pseries -= accel kvm -machine cap-cfpc=3Dbroken -machine cap-sbbc=3Dbroken -machine c= ap-ibs=3Dfixed qemu-system-ppc64: Invalid capability mode "fixed" for cap-ibs $ ppc64-softmmu/qemu-system-ppc64 -nodefaults -nographic -machine pseries -= accel kvm -machine cap-cfpc=3Dbroken -machine cap-sbbc=3Dbroken -machine c= ap-ibs=3Dfixed-ibs qemu-system-ppc64: Requested safe indirect branch capability level not supp= orted by kvm, try appending -machine cap-ibs=3Dbroken $ ppc64-softmmu/qemu-system-ppc64 -nodefaults -nographic -machine pseries -= accel kvm -machine cap-cfpc=3Dbroken -machine cap-sbbc=3Dbroken -machine c= ap-ibs=3Dfixed-ccd qemu-system-ppc64: Requested safe indirect branch capability level not supp= orted by kvm, try appending -machine cap-ibs=3Dbroken $ ppc64-softmmu/qemu-system-ppc64 -nodefaults -nographic -machine pseries -= accel kvm -machine cap-cfpc=3Dbroken -machine cap-sbbc=3Dbroken -machine c= ap-ibs=3Dfixed-na qemu-system-ppc64: Requested safe indirect branch capability level not supp= orted by kvm, try appending -machine cap-ibs=3Dbroken $ ppc64-softmmu/qemu-system-ppc64 -nodefaults -nographic -machine pseries -= accel kvm -machine cap-cfpc=3Dbroken -machine cap-sbbc=3Dbroken -machine c= ap-ibs=3Dbroken KVM: Failed to create TCE64 table for liobn 0x80000000 result: instructions can be followed. v3 Hint, and not all messages, (can't use error_append_hint on error_fatal) from Greg Kurz v2 Improved error message thanks David Gibson --- hw/ppc/spapr_caps.c | 44 ++++++++++++++++++++++++++++++-------------- 1 file changed, 30 insertions(+), 14 deletions(-) diff --git a/hw/ppc/spapr_caps.c b/hw/ppc/spapr_caps.c index bbb001f84a..b06faee7f6 100644 --- a/hw/ppc/spapr_caps.c +++ b/hw/ppc/spapr_caps.c @@ -37,6 +37,8 @@ =20 #include "hw/ppc/spapr.h" =20 +#define CAPABILITY_HINT(X) " try appending -machine " X + typedef struct SpaprCapPossible { int num; /* size of vals array below */ const char *help; /* help text for vals */ @@ -194,10 +196,12 @@ static void cap_htm_apply(SpaprMachineState *spapr, u= int8_t val, Error **errp) } if (tcg_enabled()) { error_setg(errp, - "No Transactional Memory support in TCG, try cap-htm=3D= off"); + "No Transactional Memory support in TCG," + CAPABILITY_HINT("cap-htm=3Doff")); } else if (kvm_enabled() && !kvmppc_has_cap_htm()) { error_setg(errp, -"KVM implementation does not support Transactional Memory, try cap-htm=3Do= ff" +"KVM implementation does not support Transactional Memory," + CAPABILITY_HINT("cap-htm=3Doff") ); } } @@ -215,7 +219,8 @@ static void cap_vsx_apply(SpaprMachineState *spapr, uin= t8_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 cap-vsx=3Doff"); + error_setg(errp, "VSX support not available," + CAPABILITY_HINT("cap-vsx=3Doff")); } } =20 @@ -229,7 +234,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 cap-dfp=3Doff"); + error_setg(errp, "DFP support not available," + CAPABILITY_HINT("cap-dfp=3Doff")); } } =20 @@ -253,7 +259,8 @@ 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 cap-cfpc= =3D%s", + "Requested safe cache capability level not supported by= kvm," + CAPABILITY_HINT("cap-cfpc=3D%s"), cap_cfpc_possible.vals[kvm_val]); } =20 @@ -281,7 +288,8 @@ 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 ca= p-sbbc=3D%s", +"Requested safe bounds check capability level not supported by kvm," + CAPABILITY_HINT("cap-sbbc=3D%s"), cap_sbbc_possible.vals[kvm_val]); } =20 @@ -312,7 +320,8 @@ 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= cap-ibs=3D%s", +"Requested safe indirect branch capability level not supported by kvm," + CAPABILITY_HINT("cap-ibs=3D%s"), cap_ibs_possible.vals[kvm_val]); } =20 @@ -401,11 +410,13 @@ static void cap_nested_kvm_hv_apply(SpaprMachineState= *spapr, =20 if (tcg_enabled()) { error_setg(errp, - "No Nested KVM-HV support in tcg, try cap-nested-hv=3Do= ff"); + "No Nested KVM-HV support in tcg," + CAPABILITY_HINT("cap-nested-hv=3Doff")); } else if (kvm_enabled()) { if (!kvmppc_has_cap_nested_kvm_hv()) { error_setg(errp, -"KVM implementation does not support Nested KVM-HV, try cap-nested-hv=3Dof= f"); +"KVM implementation does not support Nested KVM-HV," + CAPABILITY_HINT("cap-nested-hv=3Doff")); } 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"); @@ -435,10 +446,12 @@ static void cap_large_decr_apply(SpaprMachineState *s= papr, =20 if (!kvm_nr_bits) { error_setg(errp, - "No large decrementer support, try cap-large-decr= =3Doff"); + "No large decrementer support," + CAPABILITY_HINT("cap-large-decr=3Doff")); } else if (pcc->lrg_decr_bits !=3D kvm_nr_bits) { error_setg(errp, -"KVM large decrementer size (%d) differs to model (%d), try -cap-large-dec= r=3Doff", +"KVM large decrementer size (%d) differs to model (%d)," + CAPABILITY_HINT("cap-large-decr=3Doff"), kvm_nr_bits, pcc->lrg_decr_bits); } } @@ -454,7 +467,8 @@ static void cap_large_decr_cpu_apply(SpaprMachineState = *spapr, if (kvm_enabled()) { if (kvmppc_enable_cap_large_decr(cpu, val)) { error_setg(errp, - "No large decrementer support, try cap-large-decr= =3Doff"); + "No large decrementer support," + CAPABILITY_HINT("cap-large-decr=3Doff")); } } =20 @@ -474,10 +488,12 @@ static void cap_ccf_assist_apply(SpaprMachineState *s= papr, uint8_t val, if (tcg_enabled() && val) { /* TODO - for now only allow broken for TCG */ error_setg(errp, -"Requested count cache flush assist capability level not supported by tcg,= try cap-ccf-assist=3Doff"); +"Requested count cache flush assist capability level not supported by tcg," + CAPABILITY_HINT("cap-ccf-assist=3Doff")); } else if (kvm_enabled() && (val > kvm_val)) { error_setg(errp, -"Requested count cache flush assist capability level not supported by kvm,= try cap-ccf-assist=3Doff"); +"Requested count cache flush assist capability level not supported by kvm," + CAPABILITY_HINT("cap-ccf-assist=3Doff")); } } =20 --=20 2.21.0