From nobody Sun Apr 28 02:06:25 2024 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=1593153701; cv=none; d=zohomail.com; s=zohoarc; b=MTF3hqiCUFdYfUbGuUyNnasAoMAsF1EQB6Tnnd93BsfJN/QL63NUsQidwP7IUhdUEB0Lg9r3S2OaqsxmyTR1XqyUpxgl4ajqdekNLiOf0ihJ1jCyM9070yPkAPmIoeVLWKa4sna7uIZNtP24wWrhielKreSsAB4eBJlBT8v6iB0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593153701; 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=nALfudigX6i31dj7vBXlEtnEMyxi6TpiNiBL2aJ4ZWY=; b=lh1AUbuZ7OedNs4EB6kjDXBLLcPxmZZMVQX7SqyNy0Yqi7P+4NuZmT/9H2FFDwscSsJWyT25N1howshRxjvDPwDRQ6ntrLHGeCkpsM8s0KzCckZnm7xJ90CZqHrYsIecl+PUogsAsrao4dU383Hj7ttCSy5481F7ecuN72G4occ= 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 1593153700621324.7375492466058; Thu, 25 Jun 2020 23:41:40 -0700 (PDT) Received: from localhost ([::1]:48646 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1joi3P-0002zW-HM for importer@patchew.org; Fri, 26 Jun 2020 02:41:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49704) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1joi2N-0001PH-9w; Fri, 26 Jun 2020 02:40:35 -0400 Received: from ozlabs.org ([203.11.71.1]:39473) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1joi2K-0001ES-Jf; Fri, 26 Jun 2020 02:40:35 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 49tS1l4VBWz9sRR; Fri, 26 Jun 2020 16:40:27 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1593153627; bh=o+KHJQVzpFO+ZEGV70kRkztoAAIYNBYFB3V3S/KxQWY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qAZA4KFWYn+kYNhe+nYW8jQegk/ysUYTMPEV/mAtq7ss0X51mqSdOerSwEPZvOQXQ 25bgC7pcEBDivHkVdB1cjihrDnzMrE/cpHUX3sk9aKgQeGs05+tt4TnSYk1k9Ksbq9 fp7px2wEA24acLFRS1dvIXXHoG7X+GkX7Q7JEULE= From: David Gibson To: peter.maydell@linaro.org Subject: [PULL 1/4] spapr: Simplify some warning printing paths in spapr_caps.c Date: Fri, 26 Jun 2020 16:40:21 +1000 Message-Id: <20200626064024.383996-2-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200626064024.383996-1-david@gibson.dropbear.id.au> References: <20200626064024.383996-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=203.11.71.1; envelope-from=dgibson@ozlabs.org; helo=ozlabs.org X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/26 00:31:19 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] 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=_AUTOLEARN 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-devel@nongnu.org, groug@kaod.org, qemu-ppc@nongnu.org, clg@kaod.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 obviously only want to print a warning in these cases, but this is done in a rather convoluted manner. Just use warn_report() instead. Signed-off-by: Greg Kurz Message-Id: <159188281098.70166.18387926536399257573.stgit@bahia.lan> Reviewed-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Laurent Vivier Signed-off-by: David Gibson --- hw/ppc/spapr_caps.c | 28 ++++++---------------------- 1 file changed, 6 insertions(+), 22 deletions(-) diff --git a/hw/ppc/spapr_caps.c b/hw/ppc/spapr_caps.c index efdc0dbbcf..0c2bc8e06e 100644 --- a/hw/ppc/spapr_caps.c +++ b/hw/ppc/spapr_caps.c @@ -248,23 +248,18 @@ SpaprCapPossible cap_cfpc_possible =3D { static void cap_safe_cache_apply(SpaprMachineState *spapr, uint8_t val, Error **errp) { - Error *local_err =3D NULL; uint8_t kvm_val =3D kvmppc_get_cap_safe_cache(); =20 if (tcg_enabled() && val) { /* TCG only supports broken, allow other values and print a warnin= g */ - error_setg(&local_err, - "TCG doesn't support requested feature, cap-cfpc=3D%s", - cap_cfpc_possible.vals[val]); + warn_report("TCG doesn't support requested feature, cap-cfpc=3D%s", + 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]); } - - if (local_err !=3D NULL) - warn_report_err(local_err); } =20 SpaprCapPossible cap_sbbc_possible =3D { @@ -277,23 +272,18 @@ SpaprCapPossible cap_sbbc_possible =3D { static void cap_safe_bounds_check_apply(SpaprMachineState *spapr, uint8_t = val, Error **errp) { - Error *local_err =3D NULL; uint8_t kvm_val =3D kvmppc_get_cap_safe_bounds_check(); =20 if (tcg_enabled() && val) { /* TCG only supports broken, allow other values and print a warnin= g */ - error_setg(&local_err, - "TCG doesn't support requested feature, cap-sbbc=3D%s", - cap_sbbc_possible.vals[val]); + warn_report("TCG doesn't support requested feature, cap-sbbc=3D%s", + 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]); } - - if (local_err !=3D NULL) - warn_report_err(local_err); } =20 SpaprCapPossible cap_ibs_possible =3D { @@ -309,24 +299,18 @@ SpaprCapPossible cap_ibs_possible =3D { static void cap_safe_indirect_branch_apply(SpaprMachineState *spapr, uint8_t val, Error **errp) { - Error *local_err =3D NULL; uint8_t kvm_val =3D kvmppc_get_cap_safe_indirect_branch(); =20 if (tcg_enabled() && val) { /* TCG only supports broken, allow other values and print a warnin= g */ - error_setg(&local_err, - "TCG doesn't support requested feature, cap-ibs=3D%s", - cap_ibs_possible.vals[val]); + warn_report("TCG doesn't support requested feature, cap-ibs=3D%s", + 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]); } - - if (local_err !=3D NULL) { - warn_report_err(local_err); - } } =20 #define VALUE_DESC_TRISTATE " (broken, workaround, fixed)" --=20 2.26.2 From nobody Sun Apr 28 02:06:25 2024 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=1593153791; cv=none; d=zohomail.com; s=zohoarc; b=ceUr4uryPQOzfkIB/nY1RrdYPODcKJYRVNcOg/cQFmq/85vpCQG7PCImTlzT4hVxj2LR4uP3DerczpJm4uVCmbsOEbmd7YJ/HUS9TimahkQvOs92UuGFSLIvPPaXPbdZLuGRJWjOgSpEhFwgNnh+0U7XuZsspt9RCUbQU1PeUL0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593153791; h=Content-Type: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=z/wxl4+Z33y3fv00x+9/rPxvtJKVXvRDWCB3JPpVVr8=; b=Rpw3QGejz8feyd24EJe4vWpoccRSDPyAtE1ys4u46YqzaoLyzEzsENbqPCzuBwDXMLo0ZJvMWVSgujgysEnCWBSMl7P3IRk0EYpmU5xSQq5tfhiDQp8XxdvOwM1Klni/THsv0XGbgqOJ5J5duj6ruHNo9OoH3hv+dW8k59OuKeo= 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 1593153791766593.8371207155013; Thu, 25 Jun 2020 23:43:11 -0700 (PDT) Received: from localhost ([::1]:55840 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1joi4t-0005wC-1w for importer@patchew.org; Fri, 26 Jun 2020 02:43:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49732) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1joi2O-0001Pm-KN; Fri, 26 Jun 2020 02:40:36 -0400 Received: from bilbo.ozlabs.org ([2401:3900:2:1::2]:33727 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 1joi2L-0001EO-AJ; Fri, 26 Jun 2020 02:40:36 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 49tS1l5GXJz9sSn; Fri, 26 Jun 2020 16:40:27 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1593153627; bh=Zyd+21TNwqZFVKinK1W1M3pyiXHfAgldAX7SQP9sG7M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=a3jP50fJ/pRcUgCgBjAiNZy64+/5W/KehzC+xNUPrDW9YwsW26QsaryGKwMAa7Doa JOXoUKGA590YmrbLMpRdFyCWHWPEZyEredUtsDLmmE2DXenDmqcvvURfecN/1JKvQG O/1VzUDrD4D+saf7I+GzARIyuRLOYvnqcMz0mWMM= From: David Gibson To: peter.maydell@linaro.org Subject: [PULL 2/4] spapr: Fix typos in comments and macro indentation Date: Fri, 26 Jun 2020 16:40:22 +1000 Message-Id: <20200626064024.383996-3-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200626064024.383996-1-david@gibson.dropbear.id.au> References: <20200626064024.383996-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=_AUTOLEARN 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: Gustavo Romero , qemu-devel@nongnu.org, groug@kaod.org, qemu-ppc@nongnu.org, clg@kaod.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) From: Gustavo Romero This commit fixes typos in spapr_vio_reg_to_irq() comments and a macro indentation. Signed-off-by: Gustavo Romero Message-Id: <1590710681-12873-1-git-send-email-gromero@linux.ibm.com> Acked-by: C=C3=A9dric Le Goater Signed-off-by: David Gibson --- hw/ppc/spapr_vio.c | 6 +++--- include/hw/ppc/xive_regs.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/ppc/spapr_vio.c b/hw/ppc/spapr_vio.c index 4318ed9638..731080d989 100644 --- a/hw/ppc/spapr_vio.c +++ b/hw/ppc/spapr_vio.c @@ -420,7 +420,7 @@ static void spapr_vio_busdev_reset(DeviceState *qdev) } =20 /* - * The register property of a VIO device is defined in livirt using + * The register property of a VIO device is defined in libvirt using * 0x1000 as a base register number plus a 0x1000 increment. For the * VIO tty device, the base number is changed to 0x30000000. QEMU uses * a base register number of 0x71000000 and then a simple increment. @@ -450,7 +450,7 @@ static inline uint32_t spapr_vio_reg_to_irq(uint32_t re= g) =20 } else if (reg >=3D 0x30000000) { /* - * VIO tty devices register values, when allocated by livirt, + * VIO tty devices register values, when allocated by libvirt, * are mapped in range [0xf0 - 0xff], gives us a maximum of 16 * vtys. */ @@ -459,7 +459,7 @@ static inline uint32_t spapr_vio_reg_to_irq(uint32_t re= g) } else { /* * Other VIO devices register values, when allocated by - * livirt, should be mapped in range [0x00 - 0xef]. Conflicts + * libvirt, should be mapped in range [0x00 - 0xef]. Conflicts * will be detected when IRQ is claimed. */ irq =3D (reg >> 12) & 0xff; diff --git a/include/hw/ppc/xive_regs.h b/include/hw/ppc/xive_regs.h index 09f243600c..7879692825 100644 --- a/include/hw/ppc/xive_regs.h +++ b/include/hw/ppc/xive_regs.h @@ -71,7 +71,7 @@ * QW word 2 contains the valid bit at the top and other fields * depending on the QW. */ -#define TM_WORD2 0x8 +#define TM_WORD2 0x8 #define TM_QW0W2_VU PPC_BIT32(0) #define TM_QW0W2_LOGIC_SERV PPC_BITMASK32(1, 31) /* XX 2,31 ? */ #define TM_QW1W2_VO PPC_BIT32(0) --=20 2.26.2 From nobody Sun Apr 28 02:06:25 2024 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=1593153695; cv=none; d=zohomail.com; s=zohoarc; b=YntD3BzwxSZhAw7Hxi6n9pkHTz7LJvYaf5cDYJTFW1BmttFB/o/kvSr7qPWrK1Ctn3cMLRyBuq/OC23UkhzVMKa000yEihZzKK+FuhjHue35CjwtncSNt1kuU/WZNhhZgYugzKbj+9h1dlxkzcdI4EAHdkBqGblDNBhP7HfXBzU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593153695; h=Content-Type: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=83C50iZcPECDXH/U9JQqXRNUPSje3kJ8cvAzod0to7o=; b=Y52fcispnCH2sOu17s6ACnhe8QvkFifaaQ4uw8RgifgbM/R/pIG2GEI3aRC5ebtf8u/XZw64Nc4o859iPXzNi7pEoUTaY4HuZpt7vlABuAkRySuvbvq9+10YCgcxKqMDzxJqhhEddGsKUekmzitMQ37s6AyFRsyjgI8qwgejE/Y= 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 1593153694850259.50682123682304; Thu, 25 Jun 2020 23:41:34 -0700 (PDT) Received: from localhost ([::1]:48068 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1joi3I-0002lb-R0 for importer@patchew.org; Fri, 26 Jun 2020 02:41:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49700) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1joi2N-0001PG-7i; Fri, 26 Jun 2020 02:40:35 -0400 Received: from bilbo.ozlabs.org ([2401:3900:2:1::2]:48735 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 1joi2L-0001ER-Cw; Fri, 26 Jun 2020 02:40:34 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 49tS1l5zWtz9sT6; Fri, 26 Jun 2020 16:40:27 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1593153627; bh=3YYjwnPyp550Q+yo6TL9Otc/NC6+mV01kdh4w7Mzckk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PkcUJTGvkmBtOAq1pmuy4urmJz8ik/0MMF95QSuIgQXdoAR/OVnVNjXfaqoiuNXIu olXnWPdbvSxFJ2JT5Uq8SVkhEr0cVvVWIhdqMTP6ZCQgqfECFVUkLCXFlbRG5spibv mtEEP8dr3tUJjdsay/1MDW2Ws1q379kgWnYcw7OM= From: David Gibson To: peter.maydell@linaro.org Subject: [PULL 3/4] ppc/pnv: Silence missing BMC warning with qtest Date: Fri, 26 Jun 2020 16:40:23 +1000 Message-Id: <20200626064024.383996-4-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200626064024.383996-1-david@gibson.dropbear.id.au> References: <20200626064024.383996-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=_AUTOLEARN 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: qemu-devel@nongnu.org, groug@kaod.org, qemu-ppc@nongnu.org, clg@kaod.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Greg Kurz The device introspect test in qtest emits some warnings with the the pnv machine types during the "nodefaults" phase: TEST check-qtest-ppc64: tests/qtest/device-introspect-test qemu-system-ppc64: warning: machine has no BMC device. Use '-device ipmi-bmc-sim,id=3Dbmc0 -device isa-ipmi-bt,bmc=3Dbmc0,irq=3D10' to define one qemu-system-ppc64: warning: machine has no BMC device. Use '-device ipmi-bmc-sim,id=3Dbmc0 -device isa-ipmi-bt,bmc=3Dbmc0,irq=3D10' to define one qemu-system-ppc64: warning: machine has no BMC device. Use '-device ipmi-bmc-sim,id=3Dbmc0 -device isa-ipmi-bt,bmc=3Dbmc0,irq=3D10' to define one This is expected since the pnv machine doesn't create the internal BMC simulator fallback when "-nodefaults" is passed on the command line, but these warnings appear in ci logs and confuse people. Not having a BMC isn't recommended but it is still a supported configuration, so a straightforward fix is to just silent this warning when qtest is enabled. Fixes: 25f3170b0654 ("ppc/pnv: Create BMC devices only when defaults are en= abled") Reported-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Greg Kurz Message-Id: <159280903824.485572.831378159272329707.stgit@bahia.lan> Reviewed-by: C=C3=A9dric Le Goater Signed-off-by: David Gibson --- hw/ppc/pnv.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c index 8bd03f3b10..643098ad5f 100644 --- a/hw/ppc/pnv.c +++ b/hw/ppc/pnv.c @@ -21,6 +21,7 @@ #include "qemu-common.h" #include "qemu/units.h" #include "qapi/error.h" +#include "sysemu/qtest.h" #include "sysemu/sysemu.h" #include "sysemu/numa.h" #include "sysemu/reset.h" @@ -587,9 +588,11 @@ static void pnv_reset(MachineState *machine) bmc =3D pnv_bmc_find(&error_fatal); if (!pnv->bmc) { if (!bmc) { - warn_report("machine has no BMC device. Use '-device " - "ipmi-bmc-sim,id=3Dbmc0 -device isa-ipmi-bt,bmc=3D= bmc0,irq=3D10' " - "to define one"); + if (!qtest_enabled()) { + warn_report("machine has no BMC device. Use '-device " + "ipmi-bmc-sim,id=3Dbmc0 -device isa-ipmi-bt,bm= c=3Dbmc0,irq=3D10' " + "to define one"); + } } else { pnv_bmc_set_pnor(bmc, pnv->pnor); pnv->bmc =3D bmc; --=20 2.26.2 From nobody Sun Apr 28 02:06:25 2024 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=1593153701; cv=none; d=zohomail.com; s=zohoarc; b=eZUh82oSw32kwawE0gPnpn3RjsQ6Js+dcvIsMsEN03KYkRWiRS7999f80bWxB4UrSm4NcutbOztkTsYtwheZD89Qu10lmiUcycFFpN++fFjwgfO1LcWX6UtDcnBJtMRTyIEuit1fQDmwmK9U5U/xAII2mkrmA5LUGeER+MCFQoE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593153701; h=Content-Type: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=I0Ho/cQf++QJhyymS9aPAoIr74bTFYc5MpOzqwzGfn4=; b=AXo/0gTVGhBWR7leRlXEM7XP9IycYrGoD+2Qx2LRvcHFZUpqs4pBQHC+gTDyz7owrbuC/jGuNmDcPpYeplD9DzC1YSw1dno8vSkc2UvOrmsoilTTdbcSyDh2H3ME4Tvt8EeBtd47reU6RWxSPf86TOrmKDmbO3SsIAgOBoLjO+Y= 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 1593153701568658.6759210410052; Thu, 25 Jun 2020 23:41:41 -0700 (PDT) Received: from localhost ([::1]:48744 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1joi3Q-00031o-IM for importer@patchew.org; Fri, 26 Jun 2020 02:41:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49728) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1joi2O-0001Pa-9q; Fri, 26 Jun 2020 02:40:36 -0400 Received: from bilbo.ozlabs.org ([203.11.71.1]:45655 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 1joi2K-0001ET-Ji; Fri, 26 Jun 2020 02:40:36 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 49tS1m0Ctcz9sTC; Fri, 26 Jun 2020 16:40:27 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1593153628; bh=16oUjRspYdbi1tHyxvIiuNrezffZ2LhSzj1qCNaS2KI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=b4XxXB+h8A7dTiUR6teQTaC7X2Y3KMEo5V0tncnJFaRQtO2lznaqX7k1jc1BcHd6+ 6rGA2NOShHTL1qVZg4RW8a4lunxFaeQpCcWtaISumuoGedMAoG8h5KxH/YpPQj6XbT n2RJx5SmpQupLelsPU/Ra2lAK31FZKK+nQBAPFkI= From: David Gibson To: peter.maydell@linaro.org Subject: [PULL 4/4] target/ppc: Remove TIDR from POWER10 processor Date: Fri, 26 Jun 2020 16:40:24 +1000 Message-Id: <20200626064024.383996-5-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200626064024.383996-1-david@gibson.dropbear.id.au> References: <20200626064024.383996-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=203.11.71.1; envelope-from=dgibson@ozlabs.org; helo=ozlabs.org X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/26 00:31:19 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.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, TVD_SUBJ_WIPE_DEBT=1.004, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN 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: clg@kaod.org, David Gibson , qemu-ppc@nongnu.org, qemu-devel@nongnu.org, groug@kaod.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: C=C3=A9dric Le Goater It is not part of Power ISA Version 3.1. Signed-off-by: C=C3=A9dric Le Goater Message-Id: <20200623154534.266065-1-clg@kaod.org> Signed-off-by: David Gibson --- target/ppc/translate_init.inc.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/target/ppc/translate_init.inc.c b/target/ppc/translate_init.in= c.c index a40888411c..49212bfd90 100644 --- a/target/ppc/translate_init.inc.c +++ b/target/ppc/translate_init.inc.c @@ -9086,11 +9086,6 @@ static void init_proc_POWER10(CPUPPCState *env) gen_spr_power8_rpr(env); gen_spr_power9_mmu(env); =20 - /* POWER9 Specific registers */ - spr_register_kvm(env, SPR_TIDR, "TIDR", NULL, NULL, - spr_read_generic, spr_write_generic, - KVM_REG_PPC_TIDR, 0); - /* FIXME: Filter fields properly based on privilege level */ spr_register_kvm_hv(env, SPR_PSSCR, "PSSCR", NULL, NULL, NULL, NULL, spr_read_generic, spr_write_generic, --=20 2.26.2