From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2DB3EC4707C for ; Fri, 12 Jan 2024 04:58:32 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rO9bw-0006Rs-AK; Thu, 11 Jan 2024 23:57:40 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rO9bt-0006R1-Cu; Thu, 11 Jan 2024 23:57:37 -0500 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rO9bq-0008Fw-VI; Thu, 11 Jan 2024 23:57:37 -0500 Received: from pps.filterd (m0353723.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 40C4cVsE011035; Fri, 12 Jan 2024 04:57:16 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=message-id : date : mime-version : subject : to : cc : references : from : in-reply-to : content-type : content-transfer-encoding; s=pp1; bh=3odoyL3jliDsBAVWShZwixrk/Um6WDQEdhLzbPSMr+Q=; b=GvcoAQ+2pVDrjkJ3g7GclR/cpgzUUGazl6BWDJcxtbv23MtYQCQs+ofq5TUw6nswS/YB Z/ce1OQTWvXb/HJaX2+bOAIqEnXoW6RjtYriVepe3eEhD3vcIsmu6LDKOb0roUj5bFtx 9/BsboHdQCCheRvsu5VcSHnRhdsU59cEs8Ed5PJTtRpsZesBnADyaCWNG3gRwjsKdoiG fciIO1Xqqp/RDyuEYWF5wYdNCh+Ml7DpbS2GoI3OO4IlghKlJiYNGuimRVP6OCEp8xMV CWUqLj0Ji4P9JqVErTJ4Yip9SATHybe6YNaiCgjnP9sH4qd47MVGBLxBSXgin0k/NiSL Ww== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3vjmwhd3wx-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 12 Jan 2024 04:57:16 +0000 Received: from m0353723.ppops.net (m0353723.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 40C4dUCE013526; Fri, 12 Jan 2024 04:57:15 GMT Received: from ppma12.dal12v.mail.ibm.com (dc.9e.1632.ip4.static.sl-reverse.com [50.22.158.220]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3vjmwhd3wn-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 12 Jan 2024 04:57:15 +0000 Received: from pps.filterd (ppma12.dal12v.mail.ibm.com [127.0.0.1]) by ppma12.dal12v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 40C1dUYF028035; Fri, 12 Jan 2024 04:57:14 GMT Received: from smtprelay05.wdc07v.mail.ibm.com ([172.16.1.72]) by ppma12.dal12v.mail.ibm.com (PPS) with ESMTPS id 3vgwft4062-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 12 Jan 2024 04:57:14 +0000 Received: from smtpav06.dal12v.mail.ibm.com (smtpav06.dal12v.mail.ibm.com [10.241.53.105]) by smtprelay05.wdc07v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 40C4vDra12452390 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 12 Jan 2024 04:57:14 GMT Received: from smtpav06.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id C6AAA58055; Fri, 12 Jan 2024 04:57:13 +0000 (GMT) Received: from smtpav06.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 7FA3258059; Fri, 12 Jan 2024 04:57:09 +0000 (GMT) Received: from [9.179.24.49] (unknown [9.179.24.49]) by smtpav06.dal12v.mail.ibm.com (Postfix) with ESMTP; Fri, 12 Jan 2024 04:57:09 +0000 (GMT) Message-ID: <70fae07d-f6c1-4143-b632-a988ae53ccb0@linux.ibm.com> Date: Fri, 12 Jan 2024 10:27:07 +0530 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 1/2] target/ppc/cpu-models: Rename power5+ and power7+ for new QOM naming rules To: Thomas Huth , Nicholas Piggin , qemu-devel@nongnu.org Cc: devel@lists.libvirt.org, Daniel Henrique Barboza , =?UTF-8?Q?C=C3=A9dric_Le_Goater?= , David Gibson , Eduardo Habkost , qemu-ppc@nongnu.org, Markus Armbruster References: <20240111164652.908182-1-thuth@redhat.com> <20240111164652.908182-2-thuth@redhat.com> Content-Language: en-US From: Harsh Prateek Bora In-Reply-To: <20240111164652.908182-2-thuth@redhat.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-TM-AS-GCONF: 00 X-Proofpoint-GUID: nNMYbNTWmL-otTRpCw4N_vDFc_btZFGw X-Proofpoint-ORIG-GUID: gEgZ6yMV9xRiHP3l_Nvo1TZm1gNlyf6d X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.997,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-01-12_01,2024-01-11_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 lowpriorityscore=0 suspectscore=0 impostorscore=0 spamscore=0 mlxlogscore=999 clxscore=1011 adultscore=0 mlxscore=0 bulkscore=0 phishscore=0 priorityscore=1501 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2401120034 Received-SPF: pass client-ip=148.163.158.5; envelope-from=harshpb@linux.ibm.com; helo=mx0b-001b2d01.pphosted.com X-Spam_score_int: -19 X-Spam_score: -2.0 X-Spam_bar: -- X-Spam_report: (-2.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On 1/11/24 22:16, Thomas Huth wrote: > The character "+" is now forbidden in QOM device names (see commit > b447378e1217 - "Limit type names to alphanumerical and some few special > characters"). For the "power5+" and "power7+" CPU names, there is > currently a hack in type_name_is_valid() to still allow them for > compatibility reasons. However, there is a much nicer solution for this: > Simply use aliases! This way we can still support the old names without > the need for the ugly hack in type_name_is_valid(). > > Signed-off-by: Thomas Huth > --- > hw/ppc/spapr_cpu_core.c | 4 ++-- > qom/object.c | 4 ---- > target/ppc/cpu-models.c | 10 ++++++---- > 3 files changed, 8 insertions(+), 10 deletions(-) > > diff --git a/hw/ppc/spapr_cpu_core.c b/hw/ppc/spapr_cpu_core.c > index 5aa1ed474a..214b7a03d8 100644 > --- a/hw/ppc/spapr_cpu_core.c > +++ b/hw/ppc/spapr_cpu_core.c > @@ -389,9 +389,9 @@ static const TypeInfo spapr_cpu_core_type_infos[] = { > DEFINE_SPAPR_CPU_CORE_TYPE("970_v2.2"), > DEFINE_SPAPR_CPU_CORE_TYPE("970mp_v1.0"), > DEFINE_SPAPR_CPU_CORE_TYPE("970mp_v1.1"), > - DEFINE_SPAPR_CPU_CORE_TYPE("power5+_v2.1"), > + DEFINE_SPAPR_CPU_CORE_TYPE("power5plus_v2.1"), > DEFINE_SPAPR_CPU_CORE_TYPE("power7_v2.3"), > - DEFINE_SPAPR_CPU_CORE_TYPE("power7+_v2.1"), > + DEFINE_SPAPR_CPU_CORE_TYPE("power7plus_v2.1"), Will using Power5x, Power7x be a better naming than using 'plus' suffix ? Otherwise, Reviewed-by: Harsh Prateek Bora > DEFINE_SPAPR_CPU_CORE_TYPE("power8_v2.0"), > DEFINE_SPAPR_CPU_CORE_TYPE("power8e_v2.1"), > DEFINE_SPAPR_CPU_CORE_TYPE("power8nvl_v1.0"), > diff --git a/qom/object.c b/qom/object.c > index 654e1afaf2..2c4c64d2b6 100644 > --- a/qom/object.c > +++ b/qom/object.c > @@ -160,10 +160,6 @@ static bool type_name_is_valid(const char *name) > > /* Allow some legacy names with '+' in it for compatibility reasons */ > if (name[plen] == '+') { > - if (plen == 6 && g_str_has_prefix(name, "power")) { > - /* Allow "power5+" and "power7+" CPU names*/ > - return true; > - } > if (plen >= 17 && g_str_has_prefix(name, "Sun-UltraSparc-I")) { > /* Allow "Sun-UltraSparc-IV+" and "Sun-UltraSparc-IIIi+" */ > return true; > diff --git a/target/ppc/cpu-models.c b/target/ppc/cpu-models.c > index 7dbb47de64..6d854bb023 100644 > --- a/target/ppc/cpu-models.c > +++ b/target/ppc/cpu-models.c > @@ -716,11 +716,11 @@ > "PowerPC 970MP v1.0") > POWERPC_DEF("970mp_v1.1", CPU_POWERPC_970MP_v11, 970, > "PowerPC 970MP v1.1") > - POWERPC_DEF("power5+_v2.1", CPU_POWERPC_POWER5P_v21, POWER5P, > + POWERPC_DEF("power5plus_v2.1", CPU_POWERPC_POWER5P_v21, POWER5P, > "POWER5+ v2.1") > POWERPC_DEF("power7_v2.3", CPU_POWERPC_POWER7_v23, POWER7, > "POWER7 v2.3") > - POWERPC_DEF("power7+_v2.1", CPU_POWERPC_POWER7P_v21, POWER7, > + POWERPC_DEF("power7plus_v2.1", CPU_POWERPC_POWER7P_v21, POWER7, > "POWER7+ v2.1") > POWERPC_DEF("power8e_v2.1", CPU_POWERPC_POWER8E_v21, POWER8, > "POWER8E v2.1") > @@ -902,10 +902,12 @@ PowerPCCPUAlias ppc_cpu_aliases[] = { > { "970", "970_v2.2" }, > { "970fx", "970fx_v3.1" }, > { "970mp", "970mp_v1.1" }, > - { "power5+", "power5+_v2.1" }, > + { "power5+", "power5plus_v2.1" }, > + { "power5+_v2.1", "power5plus_v2.1" }, > { "power5gs", "power5+_v2.1" }, > { "power7", "power7_v2.3" }, > - { "power7+", "power7+_v2.1" }, > + { "power7+", "power7plus_v2.1" }, > + { "power7+_v2.1", "power7plus_v2.1" }, > { "power8e", "power8e_v2.1" }, > { "power8", "power8_v2.0" }, > { "power8nvl", "power8nvl_v1.0" },