From nobody Fri Nov 14 19:43:56 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=reject dis=none) header.from=linux.ibm.com ARC-Seal: i=1; a=rsa-sha256; t=1761222939; cv=none; d=zohomail.com; s=zohoarc; b=b/RMQ8tDF9/fGHbuO2dN5X8cOrgvFi07uhJhb2cLGYS59DIUfB2cylrv5GNR9ktlJ16geGWTRfGpElagU4PKzh+ChFXxK8TNZhJZYsNNmUXjRuftvcis3ioMolqlHj5ZpHP5ilkjpQSQRbmab9kB8i4OnMlIENGXvpiP2RMThiE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761222939; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=0sCM4u3iEphtHlN1dpt9qYhAiTLimDJuilK5EN4Zb0g=; b=oBpjcjvdBKa2yPdyXhNpJ++IaUk+enwhW3OTGNPXQYHc7V0EijJKP3nBPHpSUeGg9dMHJ3Kbshg+8eyD+8MOma0ZJr4AjLXkVNqqpCT+WZ7wBackxjeOc/x9SEDCLL1J7MVWxomlY1HdPhBeIjVkkA2NA85UOC7FWesW3HjivUQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 17612229398595.768137658797286; Thu, 23 Oct 2025 05:35:39 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vBuJl-00059T-4E; Thu, 23 Oct 2025 08:21:21 -0400 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 1vBuG5-0001Fo-4r for qemu-devel@nongnu.org; Thu, 23 Oct 2025 08:17:42 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vBuG0-0006Ql-V8 for qemu-devel@nongnu.org; Thu, 23 Oct 2025 08:17:32 -0400 Received: from pps.filterd (m0353729.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 59N8E5dM027671; Thu, 23 Oct 2025 12:17:18 GMT Received: from ppma13.dal12v.mail.ibm.com (dd.9e.1632.ip4.static.sl-reverse.com [50.22.158.221]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 49v33fj25n-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 23 Oct 2025 12:17:18 +0000 (GMT) Received: from pps.filterd (ppma13.dal12v.mail.ibm.com [127.0.0.1]) by ppma13.dal12v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 59NAVjT5002926; Thu, 23 Oct 2025 12:17:17 GMT Received: from smtprelay04.fra02v.mail.ibm.com ([9.218.2.228]) by ppma13.dal12v.mail.ibm.com (PPS) with ESMTPS id 49vqejne3u-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 23 Oct 2025 12:17:17 +0000 Received: from smtpav07.fra02v.mail.ibm.com (smtpav07.fra02v.mail.ibm.com [10.20.54.106]) by smtprelay04.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 59NCHGfX8323448 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 23 Oct 2025 12:17:16 GMT Received: from smtpav07.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 1CB122004B; Thu, 23 Oct 2025 12:17:16 +0000 (GMT) Received: from smtpav07.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 11E4620040; Thu, 23 Oct 2025 12:17:15 +0000 (GMT) Received: from li-1901474c-32f3-11b2-a85c-fc5ff2c001f3.ibm.com.com (unknown [9.124.221.73]) by smtpav07.fra02v.mail.ibm.com (Postfix) with ESMTP; Thu, 23 Oct 2025 12:17:14 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=pp1; bh=0sCM4u 3iEphtHlN1dpt9qYhAiTLimDJuilK5EN4Zb0g=; b=hMbO3YwuLjhu7BsQ+k8hZ2 hgSLJMW6AeEqY3V2ApObI0OfFNNqiJiZ3+eiJZEvg7pm/puoBVpr2T6CDumv7jST RlyeLRhaVcYPeRimROdSXueN7sdy0rZLRIx9cZcAX4BMLZ8Ld7z75Cjoh+MHBxn7 FlFpmO5WO1VpYZuGMjImj9gxfHBW3/P1beCp/BpKQYGWUiQzA4rVOHdywh6m3/Ex nB9f+lD2WMzcNvY/lg51hb7J+MNLGhkwVpvVlAJ96MiYcVI9NEOHPR6MNYyayT2H 0UJmMOLDoY4XJUNkGw6hcsj/xd8F45/uBUvx2zvrenUO0C1vdQu+dfjWCx1v5VSQ == From: Harsh Prateek Bora To: qemu-devel@nongnu.org Cc: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 11/32] ppc/spapr: remove deprecated machine pseries-4.2 Date: Thu, 23 Oct 2025 17:46:30 +0530 Message-ID: <20251023121653.3686015-12-harshpb@linux.ibm.com> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20251023121653.3686015-1-harshpb@linux.ibm.com> References: <20251023121653.3686015-1-harshpb@linux.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Authority-Analysis: v=2.4 cv=FMYWBuos c=1 sm=1 tr=0 ts=68fa1cce cx=c_pps a=AfN7/Ok6k8XGzOShvHwTGQ==:117 a=AfN7/Ok6k8XGzOShvHwTGQ==:17 a=IkcTkHD0fZMA:10 a=x6icFKpwvdMA:10 a=f7IdgyKtn90A:10 a=VkNPw1HP01LnGYTKEx00:22 a=VwQbUJbxAAAA:8 a=KKAkSRfTAAAA:8 a=aow-egSQAAAA:8 a=20KFwNOVAAAA:8 a=VnNF1IyMAAAA:8 a=MSIEXOgWn6CInn48Bo0A:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=cvBusfyB2V15izCimMoJ:22 a=gFNbaldVC-z-bsjSTzMo:22 a=oH34dK2VZjykjzsv8OSz:22 a=pHzHmUro8NiASowvMSCR:22 a=n87TN5wuljxrRezIQYnT:22 X-Proofpoint-GUID: R9BLaSV8kj9gdNIXAOLypXznP8pYfwaN X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMDE4MDAyMiBTYWx0ZWRfX4BI40EPmQ9Sp AaSJwzHpmaOb8Z0qECOXEvhbZXlCy7LZVlURAB6aJ4XzCS9ac+vmCbeFy2dcpOewh0XRnEhZJha uOFBD4kJ+vj5/R92T8s3CHb4Jfw/yH8Sgsg+a/jcq8aouOypbeM2SPvQ4dgtIJkmywpwGI8rtz3 QibT+9MlO8BBdJmSWurXTKlp8cfncE+gWNBfCRkrc84CYIHeLYKIrr9KJTzg/PMgvlwP7asKXkC UHfnX15lKHpAvkouRSh1wwtMBboCNua/+3Cn0HnR3tcz8gzXbbe6PPNBp3gXjJ2YBKIq34qgw1T ufH9a9khzkitWRbS9NZhPzCDLWW9nAulMlJSGbt2XyWOBy7MAEdxqGLW3FCP04xgNgSP6qtReGz Qa66VM8kSSyRyIQ/NhT7KVwxEbAoDQ== X-Proofpoint-ORIG-GUID: R9BLaSV8kj9gdNIXAOLypXznP8pYfwaN X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.80.40 definitions=2025-10-22_08,2025-10-22_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 impostorscore=0 priorityscore=1501 adultscore=0 bulkscore=0 lowpriorityscore=0 suspectscore=0 phishscore=0 spamscore=0 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2510020000 definitions=main-2510180022 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=148.163.156.1; envelope-from=harshpb@linux.ibm.com; helo=mx0a-001b2d01.pphosted.com X-Spam_score_int: -26 X-Spam_score: -2.7 X-Spam_bar: -- X-Spam_report: (-2.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @ibm.com) X-ZM-MESSAGEID: 1761222940102158500 Remove the pseries-4.2 machine specific logic as had been deprecated and due for removal now as per policy. Suggested-by: C=C3=A9dric Le Goater Reviewed-by: C=C3=A9dric Le Goater Signed-off-by: Philippe Mathieu-Daud=C3=A9 Link: https://lore.kernel.org/qemu-devel/20251021084346.73671-12-philmd@lin= aro.org Signed-off-by: Harsh Prateek Bora --- include/hw/ppc/spapr.h | 1 - hw/ppc/spapr.c | 27 --------------------------- 2 files changed, 28 deletions(-) diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h index 60d9a8a037..b9d884745f 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -141,7 +141,6 @@ struct SpaprCapabilities { struct SpaprMachineClass { MachineClass parent_class; =20 - hwaddr rma_limit; /* clamp the RMA to this size */ bool pre_5_1_assoc_refpoints; bool pre_5_2_numa_associativity; bool pre_6_2_numa_affinity; diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 0e6218dc9c..117da76a3d 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -2729,7 +2729,6 @@ static PCIHostState *spapr_create_default_phb(void) static hwaddr spapr_rma_size(SpaprMachineState *spapr, Error **errp) { MachineState *machine =3D MACHINE(spapr); - SpaprMachineClass *smc =3D SPAPR_MACHINE_GET_CLASS(spapr); hwaddr rma_size =3D machine->ram_size; hwaddr node0_size =3D spapr_node0_size(machine); =20 @@ -2742,15 +2741,6 @@ static hwaddr spapr_rma_size(SpaprMachineState *spap= r, Error **errp) */ rma_size =3D MIN(rma_size, 1 * TiB); =20 - /* - * Clamp the RMA size based on machine type. This is for - * migration compatibility with older qemu versions, which limited - * the RMA size for complicated and mostly bad reasons. - */ - if (smc->rma_limit) { - rma_size =3D MIN(rma_size, smc->rma_limit); - } - if (rma_size < MIN_RMA_SLOF) { error_setg(errp, "pSeries SLOF firmware requires >=3D %" HWADDR_PRIx @@ -4913,23 +4903,6 @@ static void spapr_machine_5_0_class_options(MachineC= lass *mc) =20 DEFINE_SPAPR_MACHINE(5, 0); =20 -/* - * pseries-4.2 - */ -static void spapr_machine_4_2_class_options(MachineClass *mc) -{ - SpaprMachineClass *smc =3D SPAPR_MACHINE_CLASS(mc); - - spapr_machine_5_0_class_options(mc); - compat_props_add(mc->compat_props, hw_compat_4_2, hw_compat_4_2_len); - smc->default_caps.caps[SPAPR_CAP_CCF_ASSIST] =3D SPAPR_CAP_OFF; - smc->default_caps.caps[SPAPR_CAP_FWNMI] =3D SPAPR_CAP_OFF; - smc->rma_limit =3D 16 * GiB; - mc->nvdimm_supported =3D false; -} - -DEFINE_SPAPR_MACHINE(4, 2); - static void spapr_machine_register_types(void) { type_register_static(&spapr_machine_info); --=20 2.43.5