From nobody Fri Nov 14 18:19:18 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=1760002652; cv=none; d=zohomail.com; s=zohoarc; b=OSvDOd2cHenZveW+x9iGXwBCY8g9oWpUCrJ5R59hsKhWycE5fwKzUtyeTgvbSgUY4PfD+elAT447rEyrTGa2cZoepRLOI6LmnwThAwBPxlDqmwdO5cX2hB6p2u7SL/CsgSc6dgwrk+dzQFSaT53qOaFhBGwkQqsOXZEmmmcr7yQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760002652; 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=POA1HeS75COE92NsOG/SsNmTEwJpDG97qvIL24lTrB0=; b=h0jYIvfi3oe82dnVNoJN95lYgDz+GGmE5qre2i8eCCmQ19R4wpiQQgx2FnsqbzSjC6BCuq+I7GAjji7F1U/J1pkLmtLB/mYpodSD1YjHDeXmvTGREYQ6M0D8fgPD4kCA7Qg6IYxA0+C7qGYt4aAMOwXtWiQZWGQed5kqGeLioNk= 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 1760002652161323.72906183349085; Thu, 9 Oct 2025 02:37:32 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v6n2g-0005uz-2b; Thu, 09 Oct 2025 05:34:34 -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 1v6n2e-0005sY-3U; Thu, 09 Oct 2025 05:34:32 -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 1v6n2U-0001lg-Uh; Thu, 09 Oct 2025 05:34:30 -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 59953vCd012427; Thu, 9 Oct 2025 09:34:12 GMT Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 49nv7ybwpy-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 09 Oct 2025 09:34:11 +0000 (GMT) Received: from m0353729.ppops.net (m0353729.ppops.net [127.0.0.1]) by pps.reinject (8.18.1.12/8.18.0.8) with ESMTP id 5999UVBI029054; Thu, 9 Oct 2025 09:34:11 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 49nv7ybwpw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 09 Oct 2025 09:34:11 +0000 (GMT) Received: from pps.filterd (ppma12.dal12v.mail.ibm.com [127.0.0.1]) by ppma12.dal12v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 5998Ub6Q012985; Thu, 9 Oct 2025 09:34:10 GMT Received: from smtprelay05.fra02v.mail.ibm.com ([9.218.2.225]) by ppma12.dal12v.mail.ibm.com (PPS) with ESMTPS id 49nvamusaq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 09 Oct 2025 09:34:10 +0000 Received: from smtpav02.fra02v.mail.ibm.com (smtpav02.fra02v.mail.ibm.com [10.20.54.101]) by smtprelay05.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 5999Y8Th52232496 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 9 Oct 2025 09:34:08 GMT Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 834B320075; Thu, 9 Oct 2025 09:34:08 +0000 (GMT) Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 4CAD520082; Thu, 9 Oct 2025 09:34:07 +0000 (GMT) Received: from ltcfuji9aw-lp7.ltc.tadn.ibm.com (unknown [9.5.7.39]) by smtpav02.fra02v.mail.ibm.com (Postfix) with ESMTP; Thu, 9 Oct 2025 09:34:07 +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=POA1He S75COE92NsOG/SsNmTEwJpDG97qvIL24lTrB0=; b=YjW4Kh/jhhzZ86AKL0ZszN IS2TBW58FWP8+xh16b/HMs5ZjFcZcurtsSkUUchO3Xqt01NvSfjn/jguo8cjgRKd V3VPgJ8tkKbkZ3qetlb2eBxZDzGri/z79V97RCN9nFzHvAAtah1LD55s1X+XDhJy nW5PLRlEM1T31pWTOE6vOWsD9Yr6urzjYmkYHSoGPrq6g16V1wa6Z12CuFkt2gWK sSJPpJVjeGA0X1Y0+wq1jmciTnvU1TfncS/VdkqwbzfC2ZcSzP7rP2GK0rtdwHup 1DIZx4Z3I1XKduHWeTpXT4qo0dEvRqDHozdTLa5j5tOEUGJ91YXjEE32uvh9NUSg == From: Harsh Prateek Bora To: qemu-ppc@nongnu.org, qemu-devel@nongnu.org, clg@kaod.org, philmd@linaro.org Cc: npiggin@gmail.com, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Subject: [PATCH v2 1/5] ppc/spapr: remove deprecated machine pseries-3.0 Date: Thu, 9 Oct 2025 14:40:53 -0400 Message-ID: <20251009184057.19973-2-harshpb@linux.ibm.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251009184057.19973-1-harshpb@linux.ibm.com> References: <20251009184057.19973-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-Proofpoint-GUID: URw9sM3SFWxZai4rqkufJ162dVtx-LaB X-Proofpoint-ORIG-GUID: G99mRDUBZDXyonkEyCEYR3-t3S7lOlbo X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMDA4MDEyMSBTYWx0ZWRfX8u56AvYOx8tS fECAQBc5Q6PhKUIS0eTH/kO+srgV6yi9E8DAog4+sFpw9Mgk9A19/m5TBMHssUpLuP+0PbAYcma CADz3tP85OZstHfcdGsNIpQ4aFRWgAsmFtZ8ksSCrcwFN6ZbrJFc7gD5q0/XSe7WPj4iVEPrbh5 oRHX6G6OOSGj+V+Sd9jUMqcFr73pKHXTTg2lakl/zdrSkc8MZSqimyX24rgxcPPhQMURSeVNW90 9DtAc5d8kTnYM54sNHo1VrfZ6NM3p1FGaW+SB/Ezu3yLCKTj4rDlFM/IBzbqpa7yfashtTYG9Fo nQsxVAMJKPaEYsLEb1OMl6k7Ww0m9mhls2oXK5gRe5A8q3qizn3MNN7Ew2PALI8s7UeUm25nC3T kSBfNSNY1R8yTsAGEpbGeJie6cpwdg== X-Authority-Analysis: v=2.4 cv=FtwIPmrq c=1 sm=1 tr=0 ts=68e78193 cx=c_pps a=bLidbwmWQ0KltjZqbj+ezA==:117 a=bLidbwmWQ0KltjZqbj+ezA==:17 a=IkcTkHD0fZMA:10 a=x6icFKpwvdMA:10 a=f7IdgyKtn90A:10 a=aow-egSQAAAA:8 a=VnNF1IyMAAAA:8 a=20KFwNOVAAAA:8 a=GhfPg2sD2UaM3MgJKtQA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=gFNbaldVC-z-bsjSTzMo:22 a=cPQSjfK2_nFv0Q5t_7PE:22 a=oH34dK2VZjykjzsv8OSz:22 a=Z5ABNNGmrOfJ6cZ5bIyy:22 a=jd6J4Gguk5HxikPWLKER:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1117,Hydra:6.1.9,FMLib:17.12.80.40 definitions=2025-10-09_03,2025-10-06_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 malwarescore=0 clxscore=1015 phishscore=0 spamscore=0 bulkscore=0 priorityscore=1501 adultscore=0 lowpriorityscore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2510020000 definitions=main-2510080121 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: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DATE_IN_FUTURE_06_12=1.947, 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: 1760002657013116600 pseries-3.0 had been deprecated and due for removal now as per policy. Also remove legacy irq support which existed for pre pseries-3.1 machines. Suggested-by: C=C3=A9dric Le Goater Signed-off-by: Harsh Prateek Bora Reviewed-by: C=C3=A9dric Le Goater --- include/hw/ppc/spapr.h | 1 - include/hw/ppc/spapr_irq.h | 1 - hw/ppc/spapr.c | 27 +-------------------------- hw/ppc/spapr_events.c | 8 -------- hw/ppc/spapr_irq.c | 16 +--------------- hw/ppc/spapr_pci.c | 32 ++++---------------------------- hw/ppc/spapr_vio.c | 9 --------- 7 files changed, 6 insertions(+), 88 deletions(-) diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h index 39bd5bd5ed..0c1e5132de 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -145,7 +145,6 @@ struct SpaprMachineClass { /*< public >*/ bool dr_phb_enabled; /* enable dynamic-reconfig/hotplug of PHBs = */ bool update_dt_enabled; /* enable KVMPPC_H_UPDATE_DT */ - bool legacy_irq_allocation; uint32_t nr_xirqs; bool broken_host_serial_model; /* present real host info to the guest = */ bool pre_4_1_migration; /* don't migrate hpt-max-page-size */ diff --git a/include/hw/ppc/spapr_irq.h b/include/hw/ppc/spapr_irq.h index cb9a85f657..5ddd1107c3 100644 --- a/include/hw/ppc/spapr_irq.h +++ b/include/hw/ppc/spapr_irq.h @@ -100,7 +100,6 @@ typedef struct SpaprIrq { } SpaprIrq; =20 extern SpaprIrq spapr_irq_xics; -extern SpaprIrq spapr_irq_xics_legacy; extern SpaprIrq spapr_irq_xive; extern SpaprIrq spapr_irq_dual; =20 diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 97ab6bebd2..426a778d3e 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -3347,9 +3347,7 @@ static char *spapr_get_ic_mode(Object *obj, Error **e= rrp) { SpaprMachineState *spapr =3D SPAPR_MACHINE(obj); =20 - if (spapr->irq =3D=3D &spapr_irq_xics_legacy) { - return g_strdup("legacy"); - } else if (spapr->irq =3D=3D &spapr_irq_xics) { + if (spapr->irq =3D=3D &spapr_irq_xics) { return g_strdup("xics"); } else if (spapr->irq =3D=3D &spapr_irq_xive) { return g_strdup("xive"); @@ -3363,11 +3361,6 @@ static void spapr_set_ic_mode(Object *obj, const cha= r *value, Error **errp) { SpaprMachineState *spapr =3D SPAPR_MACHINE(obj); =20 - if (SPAPR_MACHINE_GET_CLASS(spapr)->legacy_irq_allocation) { - error_setg(errp, "This machine only uses the legacy XICS backend, = don't pass ic-mode"); - return; - } - /* The legacy IRQ backend can not be set */ if (strcmp(value, "xics") =3D=3D 0) { spapr->irq =3D &spapr_irq_xics; @@ -5062,24 +5055,6 @@ static void spapr_machine_3_1_class_options(MachineC= lass *mc) =20 DEFINE_SPAPR_MACHINE(3, 1); =20 -/* - * pseries-3.0 - */ - -static void spapr_machine_3_0_class_options(MachineClass *mc) -{ - SpaprMachineClass *smc =3D SPAPR_MACHINE_CLASS(mc); - - spapr_machine_3_1_class_options(mc); - compat_props_add(mc->compat_props, hw_compat_3_0, hw_compat_3_0_len); - - smc->legacy_irq_allocation =3D true; - smc->nr_xirqs =3D 0x400; - smc->irq =3D &spapr_irq_xics_legacy; -} - -DEFINE_SPAPR_MACHINE(3, 0); - static void spapr_machine_register_types(void) { type_register_static(&spapr_machine_info); diff --git a/hw/ppc/spapr_events.c b/hw/ppc/spapr_events.c index 832b0212f3..548a190ce8 100644 --- a/hw/ppc/spapr_events.c +++ b/hw/ppc/spapr_events.c @@ -1043,10 +1043,6 @@ void spapr_events_init(SpaprMachineState *spapr) { int epow_irq =3D SPAPR_IRQ_EPOW; =20 - if (SPAPR_MACHINE_GET_CLASS(spapr)->legacy_irq_allocation) { - epow_irq =3D spapr_irq_findone(spapr, &error_fatal); - } - spapr_irq_claim(spapr, epow_irq, false, &error_fatal); =20 QTAILQ_INIT(&spapr->pending_events); @@ -1067,10 +1063,6 @@ void spapr_events_init(SpaprMachineState *spapr) if (spapr->use_hotplug_event_source) { int hp_irq =3D SPAPR_IRQ_HOTPLUG; =20 - if (SPAPR_MACHINE_GET_CLASS(spapr)->legacy_irq_allocation) { - hp_irq =3D spapr_irq_findone(spapr, &error_fatal); - } - spapr_irq_claim(spapr, hp_irq, false, &error_fatal); =20 spapr_event_sources_register(spapr->event_sources, EVENT_CLASS_HOT= _PLUG, diff --git a/hw/ppc/spapr_irq.c b/hw/ppc/spapr_irq.c index d6d368dd08..317d57a380 100644 --- a/hw/ppc/spapr_irq.c +++ b/hw/ppc/spapr_irq.c @@ -33,11 +33,6 @@ static const TypeInfo spapr_intc_info =3D { =20 static void spapr_irq_msi_init(SpaprMachineState *spapr) { - if (SPAPR_MACHINE_GET_CLASS(spapr)->legacy_irq_allocation) { - /* Legacy mode doesn't use this allocator */ - return; - } - spapr->irq_map_nr =3D spapr_irq_nr_msis(spapr); spapr->irq_map =3D bitmap_new(spapr->irq_map_nr); } @@ -286,11 +281,7 @@ uint32_t spapr_irq_nr_msis(SpaprMachineState *spapr) { SpaprMachineClass *smc =3D SPAPR_MACHINE_GET_CLASS(spapr); =20 - if (smc->legacy_irq_allocation) { - return smc->nr_xirqs; - } else { - return SPAPR_XIRQ_BASE + smc->nr_xirqs - SPAPR_IRQ_MSI; - } + return SPAPR_XIRQ_BASE + smc->nr_xirqs - SPAPR_IRQ_MSI; } =20 void spapr_irq_init(SpaprMachineState *spapr, Error **errp) @@ -588,11 +579,6 @@ int spapr_irq_find(SpaprMachineState *spapr, int num, = bool align, Error **errp) return first + ics->offset; } =20 -SpaprIrq spapr_irq_xics_legacy =3D { - .xics =3D true, - .xive =3D false, -}; - static void spapr_irq_register_types(void) { type_register_static(&spapr_intc_info); diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c index f9095552e8..bdec8f0728 100644 --- a/hw/ppc/spapr_pci.c +++ b/hw/ppc/spapr_pci.c @@ -268,7 +268,6 @@ static void rtas_ibm_change_msi(PowerPCCPU *cpu, SpaprM= achineState *spapr, target_ulong args, uint32_t nret, target_ulong rets) { - SpaprMachineClass *smc =3D SPAPR_MACHINE_GET_CLASS(spapr); uint32_t config_addr =3D rtas_ld(args, 0); uint64_t buid =3D rtas_ldq(args, 1); unsigned int func =3D rtas_ld(args, 3); @@ -373,13 +372,8 @@ static void rtas_ibm_change_msi(PowerPCCPU *cpu, Spapr= MachineState *spapr, } =20 /* Allocate MSIs */ - if (smc->legacy_irq_allocation) { - irq =3D spapr_irq_find(spapr, req_num, ret_intr_type =3D=3D RTAS_T= YPE_MSI, - &err); - } else { - irq =3D spapr_irq_msi_alloc(spapr, req_num, - ret_intr_type =3D=3D RTAS_TYPE_MSI, &err= ); - } + irq =3D spapr_irq_msi_alloc(spapr, req_num, + ret_intr_type =3D=3D RTAS_TYPE_MSI, &err); if (err) { error_reportf_err(err, "Can't allocate MSIs for device %x: ", config_addr); @@ -393,9 +387,7 @@ static void rtas_ibm_change_msi(PowerPCCPU *cpu, SpaprM= achineState *spapr, if (i) { spapr_irq_free(spapr, irq, i); } - if (!smc->legacy_irq_allocation) { - spapr_irq_msi_free(spapr, irq, req_num); - } + spapr_irq_msi_free(spapr, irq, req_num); error_reportf_err(err, "Can't allocate MSIs for device %x: ", config_addr); rtas_st(rets, 0, RTAS_OUT_HW_ERROR); @@ -1789,12 +1781,9 @@ static void spapr_phb_unrealize(DeviceState *dev) static void spapr_phb_destroy_msi(gpointer opaque) { SpaprMachineState *spapr =3D SPAPR_MACHINE(qdev_get_machine()); - SpaprMachineClass *smc =3D SPAPR_MACHINE_GET_CLASS(spapr); SpaprPciMsi *msi =3D opaque; =20 - if (!smc->legacy_irq_allocation) { - spapr_irq_msi_free(spapr, msi->first_irq, msi->num); - } + spapr_irq_msi_free(spapr, msi->first_irq, msi->num); spapr_irq_free(spapr, msi->first_irq, msi->num); g_free(msi); } @@ -1808,7 +1797,6 @@ static void spapr_phb_realize(DeviceState *dev, Error= **errp) SpaprMachineState *spapr =3D (SpaprMachineState *) object_dynamic_cast(qdev_get_machine(), TYPE_SPAPR_MACHINE); - SpaprMachineClass *smc =3D spapr ? SPAPR_MACHINE_GET_CLASS(spapr) : NU= LL; SysBusDevice *sbd =3D SYS_BUS_DEVICE(dev); SpaprPhbState *sphb =3D SPAPR_PCI_HOST_BRIDGE(sbd); PCIHostState *phb =3D PCI_HOST_BRIDGE(sbd); @@ -1956,18 +1944,6 @@ static void spapr_phb_realize(DeviceState *dev, Erro= r **errp) for (i =3D 0; i < PCI_NUM_PINS; i++) { int irq =3D SPAPR_IRQ_PCI_LSI + sphb->index * PCI_NUM_PINS + i; =20 - if (smc->legacy_irq_allocation) { - irq =3D spapr_irq_findone(spapr, errp); - if (irq < 0) { - error_prepend(errp, "can't allocate LSIs: "); - /* - * Older machines will never support PHB hotplug, ie, this= is an - * init only path and QEMU will terminate. No need to roll= back. - */ - return; - } - } - if (spapr_irq_claim(spapr, irq, true, errp) < 0) { error_prepend(errp, "can't allocate LSIs: "); goto unrealize; diff --git a/hw/ppc/spapr_vio.c b/hw/ppc/spapr_vio.c index 7759436a4f..c21a2a3274 100644 --- a/hw/ppc/spapr_vio.c +++ b/hw/ppc/spapr_vio.c @@ -507,15 +507,6 @@ static void spapr_vio_busdev_realize(DeviceState *qdev= , Error **errp) =20 dev->irq =3D spapr_vio_reg_to_irq(dev->reg); =20 - if (SPAPR_MACHINE_GET_CLASS(spapr)->legacy_irq_allocation) { - int irq =3D spapr_irq_findone(spapr, errp); - - if (irq < 0) { - return; - } - dev->irq =3D irq; - } - if (spapr_irq_claim(spapr, dev->irq, false, errp) < 0) { return; } --=20 2.51.0 From nobody Fri Nov 14 18:19:18 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=1760002554; cv=none; d=zohomail.com; s=zohoarc; b=Ghp3H87Pi8Wxx3y0ykK7K8AQE3ZXWBabRDCSGgbi2FprGhRqt9/j79GweYvZnXHKlOHSgMMl/RNJs/BpzvyFCxMu6Ovl/N0QsoZK19tf18PABtjmdb7vU+zqX2VA7B+HBppvyOOcjt2Na280p2dC+w7frQfIVXFBJ3XnSWBHCfo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760002554; 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=YoNGbj+zqq4UNVI4Szo9VUMgdLC4TgXxfV3lw5Z27lE=; b=SIT0QsmdFTBH7zGL0jTXWZ3GS3t1ZcquKg8jDjRq7y9RPfn/ie7m/XPal9SGkxAPjb4UEislFOGdm4ZT87NFow0UWX8A+Rj0f5rrYUvAR1Be3ij6pDCjmRCYSeDElQY+PBLvFNwW1v78QzB+D6J3vOPMIEx79PLrspK+mRbHRmM= 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 1760002554921391.006512184985; Thu, 9 Oct 2025 02:35:54 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v6n2Z-0005pK-9j; Thu, 09 Oct 2025 05:34:28 -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 1v6n2T-0005nz-QI; Thu, 09 Oct 2025 05:34:22 -0400 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 1v6n2P-0001jN-4z; Thu, 09 Oct 2025 05:34:20 -0400 Received: from pps.filterd (m0356516.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 59965peH030347; Thu, 9 Oct 2025 09:34:13 GMT Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 49nv81kugm-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 09 Oct 2025 09:34:13 +0000 (GMT) Received: from m0356516.ppops.net (m0356516.ppops.net [127.0.0.1]) by pps.reinject (8.18.1.12/8.18.0.8) with ESMTP id 5999KpYI026625; Thu, 9 Oct 2025 09:34:12 GMT Received: from ppma22.wdc07v.mail.ibm.com (5c.69.3da9.ip4.static.sl-reverse.com [169.61.105.92]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 49nv81kugj-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 09 Oct 2025 09:34:12 +0000 (GMT) Received: from pps.filterd (ppma22.wdc07v.mail.ibm.com [127.0.0.1]) by ppma22.wdc07v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 5998F4qk008357; Thu, 9 Oct 2025 09:34:12 GMT Received: from smtprelay03.fra02v.mail.ibm.com ([9.218.2.224]) by ppma22.wdc07v.mail.ibm.com (PPS) with ESMTPS id 49nvanurry-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 09 Oct 2025 09:34:12 +0000 Received: from smtpav02.fra02v.mail.ibm.com (smtpav02.fra02v.mail.ibm.com [10.20.54.101]) by smtprelay03.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 5999YAC357606554 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 9 Oct 2025 09:34:10 GMT Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 10F9620072; Thu, 9 Oct 2025 09:34:10 +0000 (GMT) Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id CF0FF20075; Thu, 9 Oct 2025 09:34:08 +0000 (GMT) Received: from ltcfuji9aw-lp7.ltc.tadn.ibm.com (unknown [9.5.7.39]) by smtpav02.fra02v.mail.ibm.com (Postfix) with ESMTP; Thu, 9 Oct 2025 09:34:08 +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=YoNGbj +zqq4UNVI4Szo9VUMgdLC4TgXxfV3lw5Z27lE=; b=aMV2qsLN1lvthzM27mtgXC lYLdCnWekkStPgZHe4hJ3jNA7AQwYpSGODJPCUZj4TlzddcSpg/BsYJt0wH0pZEn WuNaMnBmWEoqr4aWHFsbfiopNmvSLvWaYV9wJcyhvaBiKvnIH2G0qxaGmbl0lTxt ckf7GcjSsjOOTbJInLkhaz4j/wYEzAn3+83f2FDNtNoocuVn8WyPJsIexWHNdAv5 3zaToornH14HusJsMYaXX93OCS5sxzCsTHyIB1qiTvrHh1nLfPBIIJ04IAQfBOuM CsUVpgEa01kYJPA4K7uYn2J7QQqJ4Gyz2kczTeZg5STxMgJJr1FHw9njiWkgHzSA == From: Harsh Prateek Bora To: qemu-ppc@nongnu.org, qemu-devel@nongnu.org, clg@kaod.org, philmd@linaro.org Cc: npiggin@gmail.com, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Subject: [PATCH v2 2/5] ppc/spapr: remove deprecated machine pseries-3.1 Date: Thu, 9 Oct 2025 14:40:54 -0400 Message-ID: <20251009184057.19973-3-harshpb@linux.ibm.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251009184057.19973-1-harshpb@linux.ibm.com> References: <20251009184057.19973-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-Proofpoint-ORIG-GUID: g_eTtMzh1hgx5E-RhP1p9ifCnIeN1Zs2 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMDA4MDEyMSBTYWx0ZWRfX43tJX95yTiUj +6SHHmQ31vdvae4lY2djsBbeFTNkmcSoaRORtR86Uy87pyQPjVHijpi4tAtn7qrropJwDCyKcPB BcaFfrqdZBhu4OIMcjdWbTkkrFaDCd7IhZMtTmv6cawTGpwFZg9QwQvQKPyAgMjre6Ivas77CtO 43KOARal4U4YbkAOsDG7AfaT71woIZqDiuqDu7Fw27LTO7jrTiAmMBIiQX2TfBHemXCqDZXnONE UPaEh6wbZaePWrjBt8+tkVXiKC5LeD4uIqAb01q3weLUAs3DzaH6epsNCUW/vIfMc8DwtxaS82H XZRE0YX4F5IAgZ6hbXCiB6FLMgKrnnBHDRSLaFzEUcCsFinAevwIbfaj/Cb5Hrpk/rcjn6WzAHI zjPu+4pDMOn4yTi6k4droe1b+iqswg== X-Authority-Analysis: v=2.4 cv=cKntc1eN c=1 sm=1 tr=0 ts=68e78195 cx=c_pps a=5BHTudwdYE3Te8bg5FgnPg==:117 a=5BHTudwdYE3Te8bg5FgnPg==:17 a=IkcTkHD0fZMA:10 a=x6icFKpwvdMA:10 a=f7IdgyKtn90A:10 a=aow-egSQAAAA:8 a=VnNF1IyMAAAA:8 a=20KFwNOVAAAA:8 a=Yh3J_22oyFJWg4qsq-cA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=gFNbaldVC-z-bsjSTzMo:22 a=oH34dK2VZjykjzsv8OSz:22 a=cPQSjfK2_nFv0Q5t_7PE:22 a=Z5ABNNGmrOfJ6cZ5bIyy:22 a=jd6J4Gguk5HxikPWLKER:22 X-Proofpoint-GUID: ZeaL-2Blgp0OZ7wP6ps-cJX-xpfIup_7 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1117,Hydra:6.1.9,FMLib:17.12.80.40 definitions=2025-10-09_03,2025-10-06_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 impostorscore=0 adultscore=0 lowpriorityscore=0 malwarescore=0 suspectscore=0 bulkscore=0 phishscore=0 spamscore=0 priorityscore=1501 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2510020000 definitions=main-2510080121 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.158.5; envelope-from=harshpb@linux.ibm.com; helo=mx0b-001b2d01.pphosted.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DATE_IN_FUTURE_06_12=1.947, 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: 1760002561498116600 pseries-3.1 had been deprecated and due for removal now as per policy. Also remove backward compatibility flags and related code introduced for pre pseries-4.0 machines. Suggested-by: C=C3=A9dric Le Goater Signed-off-by: Harsh Prateek Bora Reviewed-by: C=C3=A9dric Le Goater --- include/hw/ppc/spapr.h | 3 -- hw/ppc/spapr.c | 64 ++++-------------------------------------- hw/ppc/spapr_hcall.c | 5 ---- 3 files changed, 6 insertions(+), 66 deletions(-) diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h index 0c1e5132de..02b66f7ffa 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -143,10 +143,7 @@ struct SpaprMachineClass { MachineClass parent_class; =20 /*< public >*/ - bool dr_phb_enabled; /* enable dynamic-reconfig/hotplug of PHBs = */ - bool update_dt_enabled; /* enable KVMPPC_H_UPDATE_DT */ uint32_t nr_xirqs; - bool broken_host_serial_model; /* present real host info to the guest = */ bool pre_4_1_migration; /* don't migrate hpt-max-page-size */ bool linux_pci_probe; bool smp_threads_vsmt; /* set VSMT to smp_threads by default */ diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 426a778d3e..48526ad69c 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -1182,7 +1182,6 @@ void *spapr_build_fdt(SpaprMachineState *spapr, bool = reset, size_t space) { MachineState *machine =3D MACHINE(spapr); MachineClass *mc =3D MACHINE_GET_CLASS(machine); - SpaprMachineClass *smc =3D SPAPR_MACHINE_GET_CLASS(machine); uint32_t root_drc_type_mask =3D 0; int ret; void *fdt; @@ -1213,16 +1212,10 @@ void *spapr_build_fdt(SpaprMachineState *spapr, boo= l reset, size_t space) /* Host Model & Serial Number */ if (spapr->host_model) { _FDT(fdt_setprop_string(fdt, 0, "host-model", spapr->host_model)); - } else if (smc->broken_host_serial_model && kvmppc_get_host_model(&buf= )) { - _FDT(fdt_setprop_string(fdt, 0, "host-model", buf)); - g_free(buf); } =20 if (spapr->host_serial) { _FDT(fdt_setprop_string(fdt, 0, "host-serial", spapr->host_serial)= ); - } else if (smc->broken_host_serial_model && kvmppc_get_host_serial(&bu= f)) { - _FDT(fdt_setprop_string(fdt, 0, "host-serial", buf)); - g_free(buf); } =20 _FDT(fdt_setprop_cell(fdt, 0, "#address-cells", 2)); @@ -1260,9 +1253,8 @@ void *spapr_build_fdt(SpaprMachineState *spapr, bool = reset, size_t space) =20 /* ibm,drc-indexes and friends */ root_drc_type_mask |=3D SPAPR_DR_CONNECTOR_TYPE_LMB; - if (smc->dr_phb_enabled) { - root_drc_type_mask |=3D SPAPR_DR_CONNECTOR_TYPE_PHB; - } + root_drc_type_mask |=3D SPAPR_DR_CONNECTOR_TYPE_PHB; + if (mc->nvdimm_supported) { root_drc_type_mask |=3D SPAPR_DR_CONNECTOR_TYPE_PMEM; } @@ -2063,9 +2055,7 @@ static const VMStateDescription vmstate_spapr_irq_map= =3D { =20 static bool spapr_dtb_needed(void *opaque) { - SpaprMachineClass *smc =3D SPAPR_MACHINE_GET_CLASS(opaque); - - return smc->update_dt_enabled; + return true; /* backward migration compat */ } =20 static int spapr_dtb_pre_load(void *opaque) @@ -3009,11 +2999,9 @@ static void spapr_machine_init(MachineState *machine) * connectors for a PHBs PCI slots) are added as needed during their * parent's realization. */ - if (smc->dr_phb_enabled) { - for (i =3D 0; i < SPAPR_MAX_PHBS; i++) { - spapr_dr_connector_new(OBJECT(machine), TYPE_SPAPR_DRC_PHB, i); - } - } + for (i =3D 0; i < SPAPR_MAX_PHBS; i++) { + spapr_dr_connector_new(OBJECT(machine), TYPE_SPAPR_DRC_PHB, i); + } =20 /* Set up PCI */ spapr_pci_rtas_init(); @@ -4095,11 +4083,6 @@ static bool spapr_phb_pre_plug(HotplugHandler *hotpl= ug_dev, DeviceState *dev, const unsigned windows_supported =3D spapr_phb_windows_supported(sphb); SpaprDrc *drc; =20 - if (dev->hotplugged && !smc->dr_phb_enabled) { - error_setg(errp, "PHB hotplug not supported for this machine"); - return false; - } - if (sphb->index =3D=3D (uint32_t)-1) { error_setg(errp, "\"index\" for PAPR PHB is mandatory"); return false; @@ -4125,16 +4108,10 @@ static bool spapr_phb_pre_plug(HotplugHandler *hotp= lug_dev, DeviceState *dev, =20 static void spapr_phb_plug(HotplugHandler *hotplug_dev, DeviceState *dev) { - SpaprMachineState *spapr =3D SPAPR_MACHINE(OBJECT(hotplug_dev)); - SpaprMachineClass *smc =3D SPAPR_MACHINE_GET_CLASS(spapr); SpaprPhbState *sphb =3D SPAPR_PCI_HOST_BRIDGE(dev); SpaprDrc *drc; bool hotplugged =3D spapr_drc_hotplugged(dev); =20 - if (!smc->dr_phb_enabled) { - return; - } - drc =3D spapr_drc_by_id(TYPE_SPAPR_DRC_PHB, sphb->index); /* hotplug hooks should check it's enabled before getting this far */ assert(drc); @@ -4260,7 +4237,6 @@ static void spapr_machine_device_unplug_request(Hotpl= ugHandler *hotplug_dev, { SpaprMachineState *sms =3D SPAPR_MACHINE(OBJECT(hotplug_dev)); MachineClass *mc =3D MACHINE_GET_CLASS(sms); - SpaprMachineClass *smc =3D SPAPR_MACHINE_CLASS(mc); =20 if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) { if (spapr_memory_hot_unplug_supported(sms)) { @@ -4275,10 +4251,6 @@ static void spapr_machine_device_unplug_request(Hotp= lugHandler *hotplug_dev, } spapr_core_unplug_request(hotplug_dev, dev, errp); } else if (object_dynamic_cast(OBJECT(dev), TYPE_SPAPR_PCI_HOST_BRIDGE= )) { - if (!smc->dr_phb_enabled) { - error_setg(errp, "PHB hot unplug not supported on this machine= "); - return; - } spapr_phb_unplug_request(hotplug_dev, dev, errp); } else if (object_dynamic_cast(OBJECT(dev), TYPE_SPAPR_TPM_PROXY)) { spapr_tpm_proxy_unplug(hotplug_dev, dev); @@ -4634,7 +4606,6 @@ static void spapr_machine_class_init(ObjectClass *oc,= const void *data) hc->unplug_request =3D spapr_machine_device_unplug_request; hc->unplug =3D spapr_machine_device_unplug; =20 - smc->update_dt_enabled =3D true; mc->default_cpu_type =3D POWERPC_CPU_TYPE_NAME("power10_v2.0"); mc->has_hotpluggable_cpus =3D true; mc->nvdimm_supported =3D true; @@ -4688,7 +4659,6 @@ static void spapr_machine_class_init(ObjectClass *oc,= const void *data) smc->default_caps.caps[SPAPR_CAP_AIL_MODE_3] =3D SPAPR_CAP_ON; spapr_caps_add_properties(smc); smc->irq =3D &spapr_irq_dual; - smc->dr_phb_enabled =3D true; smc->linux_pci_probe =3D true; smc->smp_threads_vsmt =3D true; smc->nr_xirqs =3D SPAPR_NR_XIRQS; @@ -5033,28 +5003,6 @@ static void spapr_machine_4_0_class_options(MachineC= lass *mc) =20 DEFINE_SPAPR_MACHINE(4, 0); =20 -/* - * pseries-3.1 - */ -static void spapr_machine_3_1_class_options(MachineClass *mc) -{ - SpaprMachineClass *smc =3D SPAPR_MACHINE_CLASS(mc); - - spapr_machine_4_0_class_options(mc); - compat_props_add(mc->compat_props, hw_compat_3_1, hw_compat_3_1_len); - - mc->default_cpu_type =3D POWERPC_CPU_TYPE_NAME("power8_v2.0"); - smc->update_dt_enabled =3D false; - smc->dr_phb_enabled =3D false; - smc->broken_host_serial_model =3D true; - smc->default_caps.caps[SPAPR_CAP_CFPC] =3D SPAPR_CAP_BROKEN; - smc->default_caps.caps[SPAPR_CAP_SBBC] =3D SPAPR_CAP_BROKEN; - smc->default_caps.caps[SPAPR_CAP_IBS] =3D SPAPR_CAP_BROKEN; - smc->default_caps.caps[SPAPR_CAP_LARGE_DECREMENTER] =3D SPAPR_CAP_OFF; -} - -DEFINE_SPAPR_MACHINE(3, 1); - static void spapr_machine_register_types(void) { type_register_static(&spapr_machine_info); diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c index 8c1e0a4817..8f03b3e776 100644 --- a/hw/ppc/spapr_hcall.c +++ b/hw/ppc/spapr_hcall.c @@ -1475,16 +1475,11 @@ static target_ulong h_update_dt(PowerPCCPU *cpu, Sp= aprMachineState *spapr, target_ulong dt =3D ppc64_phys_to_real(args[0]); struct fdt_header hdr =3D { 0 }; unsigned cb; - SpaprMachineClass *smc =3D SPAPR_MACHINE_GET_CLASS(spapr); void *fdt; =20 cpu_physical_memory_read(dt, &hdr, sizeof(hdr)); cb =3D fdt32_to_cpu(hdr.totalsize); =20 - if (!smc->update_dt_enabled) { - return H_SUCCESS; - } - /* Check that the fdt did not grow out of proportion */ if (cb > spapr->fdt_initial_size * 2) { trace_spapr_update_dt_failed_size(spapr->fdt_initial_size, cb, --=20 2.51.0 From nobody Fri Nov 14 18:19:18 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=1760002650; cv=none; d=zohomail.com; s=zohoarc; b=mchWjj8DY6q/CQW5zUny9vAbMie3z8U8+di+WWL9lwGFjTkBDjkso4hd5J9xWJaOTdgkVOeOnmJzrZUdODulIfaLojQ5lH6MkgnBGieSoXVDgIBQ3B/zn4C4oIJe3fumdEA14qiziriKORCWMfWiIw9zvNtOyxgyn1sIlZyEhU0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760002650; 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=bcZgkA2B7l0ubR6zJsm659M6fCSWFRvN7M+ZtYY+20A=; b=W4DKDqPS0ympPQ4hIejPXCKyL+UvKyGJEAcT3azsLPO3mrdbR41ZTICIx7jhbVDpyzd16Pu25lCps75qqMzDNJPeskroA75zh4WkW+F3LZ8la2Z4KD2qp9qyOuX1+pkrFOzkX7tj02x8IZ3N5RvWHUhlOWmbKafXsPRBdeZkIN4= 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 1760002649994372.22242333255645; Thu, 9 Oct 2025 02:37:29 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v6n2f-0005u9-BL; Thu, 09 Oct 2025 05:34:33 -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 1v6n2b-0005rB-VD; Thu, 09 Oct 2025 05:34:30 -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 1v6n2W-0001l8-8v; Thu, 09 Oct 2025 05:34:28 -0400 Received: from pps.filterd (m0360083.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 59962VI8031850; Thu, 9 Oct 2025 09:34:15 GMT Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 49nv823xxs-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 09 Oct 2025 09:34:15 +0000 (GMT) Received: from m0360083.ppops.net (m0360083.ppops.net [127.0.0.1]) by pps.reinject (8.18.1.12/8.18.0.8) with ESMTP id 5999YFkT026169; Thu, 9 Oct 2025 09:34:15 GMT Received: from ppma22.wdc07v.mail.ibm.com (5c.69.3da9.ip4.static.sl-reverse.com [169.61.105.92]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 49nv823xxp-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 09 Oct 2025 09:34:15 +0000 (GMT) Received: from pps.filterd (ppma22.wdc07v.mail.ibm.com [127.0.0.1]) by ppma22.wdc07v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 59987eig008363; Thu, 9 Oct 2025 09:34:13 GMT Received: from smtprelay02.fra02v.mail.ibm.com ([9.218.2.226]) by ppma22.wdc07v.mail.ibm.com (PPS) with ESMTPS id 49nvanurs2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 09 Oct 2025 09:34:13 +0000 Received: from smtpav02.fra02v.mail.ibm.com (smtpav02.fra02v.mail.ibm.com [10.20.54.101]) by smtprelay02.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 5999YBqf53739894 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 9 Oct 2025 09:34:11 GMT Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 8FA5D20082; Thu, 9 Oct 2025 09:34:11 +0000 (GMT) Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 5959E20072; Thu, 9 Oct 2025 09:34:10 +0000 (GMT) Received: from ltcfuji9aw-lp7.ltc.tadn.ibm.com (unknown [9.5.7.39]) by smtpav02.fra02v.mail.ibm.com (Postfix) with ESMTP; Thu, 9 Oct 2025 09:34:10 +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=bcZgkA 2B7l0ubR6zJsm659M6fCSWFRvN7M+ZtYY+20A=; b=FWZ9a9hNz9nbZHMTUJFBXw s5DyZ+wv4yJd6JuCfaGB8UGeM0lyn7V2VreJbvAoQx3jONs170BHyBmKqLEUXClr BpUKKxpAlyVCQQuQE7FQiYuhSreqKhgotW+vj3TMyzy+L+F19fc2eYFRfyS17RDI O3M0o0hvuoXnYD0DHcNAnnOI131QlOnRCpIBDLynS+oHAiISFdhkCm7EyoQwQYi/ wr/DhMICqOpwbrtqO0NKCbulSm/HVEQB4JAvnVd18FDmLlMWeN1q7wdJmwoLjrgi j1QAyzsNAATsj0vbWlKafq6dQknFm4M5ddD7G5ULqSwju5Ny2AUTS2HWzV0TQBIg == From: Harsh Prateek Bora To: qemu-ppc@nongnu.org, qemu-devel@nongnu.org, clg@kaod.org, philmd@linaro.org Cc: npiggin@gmail.com, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Subject: [PATCH v2 3/5] ppc/spapr: remove deprecated machine pseries-4.0 Date: Thu, 9 Oct 2025 14:40:55 -0400 Message-ID: <20251009184057.19973-4-harshpb@linux.ibm.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251009184057.19973-1-harshpb@linux.ibm.com> References: <20251009184057.19973-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=KrpAGGWN c=1 sm=1 tr=0 ts=68e78197 cx=c_pps a=5BHTudwdYE3Te8bg5FgnPg==:117 a=5BHTudwdYE3Te8bg5FgnPg==:17 a=IkcTkHD0fZMA:10 a=x6icFKpwvdMA:10 a=f7IdgyKtn90A:10 a=aow-egSQAAAA:8 a=VnNF1IyMAAAA:8 a=20KFwNOVAAAA:8 a=v6HMyaa53sa_SYkxinkA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=gFNbaldVC-z-bsjSTzMo:22 a=oH34dK2VZjykjzsv8OSz:22 a=cPQSjfK2_nFv0Q5t_7PE:22 a=Z5ABNNGmrOfJ6cZ5bIyy:22 a=jd6J4Gguk5HxikPWLKER:22 X-Proofpoint-GUID: Uy2lbuPEs51KFUE8t2Tx-kSd8t4aEim0 X-Proofpoint-ORIG-GUID: LXnNpwEonQku4CzHe9qhF7qW1OVBG4n5 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMDA4MDEyMSBTYWx0ZWRfX5fnY52P94y0l gWQXbhGCTE2o3WEntz9fZqvoTEfmoXQfmeeDhItqDCf6Odx5fsiIhI2gGNrc7qo8rnetET6ynjA y1wTiwEzU0S/M8OrWAuWN+2q2dmbnCCaKIPiU05vDDyiWNy31pmiRX2aergpNvKVPL3nzKK3Ge3 NLHG4E0AkDIVRpxA7125jd5btTdt2+uUgbYcgiy2szt9ZrS2Umrul4St+tubDfI10U52EXNX9HK Mf4RRxhyuswVRmbL6rJvFG6XPZuLAnWFImej8hxoyv15qUPOaA+FHfm38TbNCeklDfO4JwwzASk c3mvgZEVZ469cIibPlbuZW5H2TW13/IgGykPIB3GcZGOfVhUR231H6QRzujxEP8Quq4QFJP50Q9 pzS5ciRBlVpczDIrl3ZnoZAB/ukiEg== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1117,Hydra:6.1.9,FMLib:17.12.80.40 definitions=2025-10-09_03,2025-10-06_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 phishscore=0 adultscore=0 lowpriorityscore=0 clxscore=1015 priorityscore=1501 impostorscore=0 bulkscore=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-2510080121 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: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DATE_IN_FUTURE_06_12=1.947, 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: 1760002651762154101 pseries-4.0 had been deprecated and due for removal now as per policy. Also remove pre-4.1 migration hacks which were introduced for backward compatibility. Suggested-by: C=C3=A9dric Le Goater Signed-off-by: Harsh Prateek Bora Reviewed-by: C=C3=A9dric Le Goater --- include/hw/ppc/spapr.h | 1 - hw/ppc/spapr.c | 27 --------------------------- hw/ppc/spapr_caps.c | 12 +----------- 3 files changed, 1 insertion(+), 39 deletions(-) diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h index 02b66f7ffa..328681a585 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -144,7 +144,6 @@ struct SpaprMachineClass { =20 /*< public >*/ uint32_t nr_xirqs; - bool pre_4_1_migration; /* don't migrate hpt-max-page-size */ bool linux_pci_probe; bool smp_threads_vsmt; /* set VSMT to smp_threads by default */ hwaddr rma_limit; /* clamp the RMA to this size */ diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 48526ad69c..b93015c335 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -4976,33 +4976,6 @@ static void spapr_machine_4_1_class_options(MachineC= lass *mc) =20 DEFINE_SPAPR_MACHINE(4, 1); =20 -/* - * pseries-4.0 - */ -static bool phb_placement_4_0(SpaprMachineState *spapr, uint32_t index, - uint64_t *buid, hwaddr *pio, - hwaddr *mmio32, hwaddr *mmio64, - unsigned n_dma, uint32_t *liobns, Error **er= rp) -{ - if (!spapr_phb_placement(spapr, index, buid, pio, mmio32, mmio64, n_dm= a, - liobns, errp)) { - return false; - } - return true; -} -static void spapr_machine_4_0_class_options(MachineClass *mc) -{ - SpaprMachineClass *smc =3D SPAPR_MACHINE_CLASS(mc); - - spapr_machine_4_1_class_options(mc); - compat_props_add(mc->compat_props, hw_compat_4_0, hw_compat_4_0_len); - smc->phb_placement =3D phb_placement_4_0; - smc->irq =3D &spapr_irq_xics; - smc->pre_4_1_migration =3D true; -} - -DEFINE_SPAPR_MACHINE(4, 0); - static void spapr_machine_register_types(void) { type_register_static(&spapr_machine_info); diff --git a/hw/ppc/spapr_caps.c b/hw/ppc/spapr_caps.c index 0f94c192fd..170795ad6a 100644 --- a/hw/ppc/spapr_caps.c +++ b/hw/ppc/spapr_caps.c @@ -66,7 +66,6 @@ typedef struct SpaprCapabilityInfo { void (*apply)(SpaprMachineState *spapr, uint8_t val, Error **errp); void (*cpu_apply)(SpaprMachineState *spapr, PowerPCCPU *cpu, uint8_t val, Error **errp); - bool (*migrate_needed)(void *opaque); } SpaprCapabilityInfo; =20 static void spapr_cap_get_bool(Object *obj, Visitor *v, const char *name, @@ -336,11 +335,6 @@ static void cap_hpt_maxpagesize_apply(SpaprMachineStat= e *spapr, spapr_check_pagesize(spapr, qemu_minrampagesize(), errp); } =20 -static bool cap_hpt_maxpagesize_migrate_needed(void *opaque) -{ - return !SPAPR_MACHINE_GET_CLASS(opaque)->pre_4_1_migration; -} - static bool spapr_pagesize_cb(void *opaque, uint32_t seg_pshift, uint32_t pshift) { @@ -793,7 +787,6 @@ SpaprCapabilityInfo capability_table[SPAPR_CAP_NUM] =3D= { .type =3D "int", .apply =3D cap_hpt_maxpagesize_apply, .cpu_apply =3D cap_hpt_maxpagesize_cpu_apply, - .migrate_needed =3D cap_hpt_maxpagesize_migrate_needed, }, [SPAPR_CAP_NESTED_KVM_HV] =3D { .name =3D "nested-hv", @@ -982,11 +975,8 @@ int spapr_caps_post_migration(SpaprMachineState *spapr) static bool spapr_cap_##sname##_needed(void *opaque) \ { \ SpaprMachineState *spapr =3D opaque; \ - bool (*needed)(void *opaque) =3D \ - capability_table[cap].migrate_needed; \ \ - return needed ? needed(opaque) : true && \ - spapr->cmd_line_caps[cap] && \ + return spapr->cmd_line_caps[cap] && \ (spapr->eff.caps[cap] !=3D \ spapr->def.caps[cap]); \ } \ --=20 2.51.0 From nobody Fri Nov 14 18:19:18 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=1760002559; cv=none; d=zohomail.com; s=zohoarc; b=C/oS3h6wMLmo8POd797XSm6J7o6qjU6UqfJAxjjttRSafIDhg95FtoA2AL+Y449F69tPnfmFIstCuYj9jElw25ozmLFu8j+d8Ta2PExpj0tV3oNpf/3G1BtR2PB9nZkia8E8FkkhCXF1UpvNFEX1ghS4yc5egICosALCr6yHlY8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760002559; 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=UJsam/dfveOxGjlSLxbmOckc1isELOCxyoEWERpAL34=; b=ipBR/mGJrhtN0/7a4yn/YhY0bIRfXjIpEDAq4vpCjW8EptGuMeRZTiPBQoIsolSmQjLgHs5morEhhQqCswr+/QiblQd/eTtCKcW+oQaXsneI0ag6PueWRfgepl6dG4vAujqhHMIKZF59idAVFFLAl1bMiDCJTiR1jc5ZbuSN6GI= 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 1760002559064201.05087854183375; Thu, 9 Oct 2025 02:35:59 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v6n2f-0005u2-At; Thu, 09 Oct 2025 05:34:33 -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 1v6n2d-0005sH-M5; Thu, 09 Oct 2025 05:34:31 -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 1v6n2a-0001mw-4w; Thu, 09 Oct 2025 05:34:31 -0400 Received: from pps.filterd (m0360083.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 59951QBk032654; Thu, 9 Oct 2025 09:34:16 GMT Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 49nv823xxu-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 09 Oct 2025 09:34:15 +0000 (GMT) Received: from m0360083.ppops.net (m0360083.ppops.net [127.0.0.1]) by pps.reinject (8.18.1.12/8.18.0.8) with ESMTP id 5999Dno9017429; Thu, 9 Oct 2025 09:34: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 49nv823xxq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 09 Oct 2025 09:34:15 +0000 (GMT) Received: from pps.filterd (ppma12.dal12v.mail.ibm.com [127.0.0.1]) by ppma12.dal12v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 5998KtcK012977; Thu, 9 Oct 2025 09:34:14 GMT Received: from smtprelay04.fra02v.mail.ibm.com ([9.218.2.228]) by ppma12.dal12v.mail.ibm.com (PPS) with ESMTPS id 49nvamusb0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 09 Oct 2025 09:34:14 +0000 Received: from smtpav02.fra02v.mail.ibm.com (smtpav02.fra02v.mail.ibm.com [10.20.54.101]) by smtprelay04.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 5999YDwI35127940 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 9 Oct 2025 09:34:13 GMT Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id EA08A20072; Thu, 9 Oct 2025 09:34:12 +0000 (GMT) Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id D78E620084; Thu, 9 Oct 2025 09:34:11 +0000 (GMT) Received: from ltcfuji9aw-lp7.ltc.tadn.ibm.com (unknown [9.5.7.39]) by smtpav02.fra02v.mail.ibm.com (Postfix) with ESMTP; Thu, 9 Oct 2025 09:34:11 +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=UJsam/ dfveOxGjlSLxbmOckc1isELOCxyoEWERpAL34=; b=cLrCaNWYIXXUTG05dBL19w Ep5JMqDtk0QeJVUVEuiwk34svNfpBaSlygvIanLWg7dUSPH+w5KOo/vWhJr5eZch G8PZrZp9idMGlx3SdVIuA+ZF5C4ZcjFNb9W8j+QT+CO7IYTUwsWSJW2gNJPq6eAF Lj/uZH/gk2Sao0kckAoWXxpkyH5speGN4Kl89aDz7o4yhvv7NphVUgN2xFLj0sLN V74Sy1AJxZaNBlk5+UAdgGDnHJycUcZ4PL2z2m1meR5IuEPpbnA3iz593hM/O5cI NSSZUNlMZ8LZDMRElVEQTK7vvGARzp3cdwHqKLEzXE8FAGOunZSc2YbXYAcpl0Ww == From: Harsh Prateek Bora To: qemu-ppc@nongnu.org, qemu-devel@nongnu.org, clg@kaod.org, philmd@linaro.org Cc: npiggin@gmail.com Subject: [PATCH v2 4/5] ppc/spapr: remove deprecated machine pseries-4.1 Date: Thu, 9 Oct 2025 14:40:56 -0400 Message-ID: <20251009184057.19973-5-harshpb@linux.ibm.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251009184057.19973-1-harshpb@linux.ibm.com> References: <20251009184057.19973-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=KrpAGGWN c=1 sm=1 tr=0 ts=68e78198 cx=c_pps a=bLidbwmWQ0KltjZqbj+ezA==:117 a=bLidbwmWQ0KltjZqbj+ezA==:17 a=IkcTkHD0fZMA:10 a=x6icFKpwvdMA:10 a=f7IdgyKtn90A:10 a=aow-egSQAAAA:8 a=VnNF1IyMAAAA:8 a=DRTwgpVIqhQ9bHD4Ks0A:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=gFNbaldVC-z-bsjSTzMo:22 a=oH34dK2VZjykjzsv8OSz:22 a=pHzHmUro8NiASowvMSCR:22 a=n87TN5wuljxrRezIQYnT:22 X-Proofpoint-GUID: txCuuUSdheyBVP3a_DUxYxXsxKan-bq_ X-Proofpoint-ORIG-GUID: slxuMj4JbXrTkHt7ZrNlU7EL0eS2WVwu X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMDA4MDEyMSBTYWx0ZWRfX8qTeaj+PxKjN dP3LA9qlkkEJh6LL2kGclBu72Hfy6KRWOnxTkVv6OouasnKOWYtQTakVNTBf89w1BgUH5+y1MFv tG9JdkP7s8J2Alo+Kgne6zlYLNMdVStThYwT765ltXCMNFzuOpwLIqr/osTeCs48V+/dXSOLauP Foh7kRes6o+97vsfRNoOjiXzZCQu9jktLYxmtVYDK6l1qXecHW9NKJCxTN2aVZDWGSMVMLsEOXM Xi7BR6wyyH2PqthbYQsLgVGhmQM51zYkzWA7A6XBQpGkqnWGfv5HH1yg/3OA3bVWdniCoIcqCzV ipFxl+GK+IFoH2x2wGwoQJHqPfeKnaUOgIpd7oUxLPHtj8O7pAb/nqMwh0Br5siTi1JXe2GW7vg ZGNuvI5+k4coQKmDnMFZOuZHCGUtmw== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1117,Hydra:6.1.9,FMLib:17.12.80.40 definitions=2025-10-09_03,2025-10-06_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 phishscore=0 adultscore=0 lowpriorityscore=0 clxscore=1015 priorityscore=1501 impostorscore=0 bulkscore=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-2510080121 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: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DATE_IN_FUTURE_06_12=1.947, 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: 1760002560836154101 Remove the pseries-4.1 machine specific logic as had been deprecated and due for removal now as per policy. Suggested-by: C=C3=A9dric Le Goater Signed-off-by: Harsh Prateek Bora Reviewed-by: C=C3=A9dric Le Goater --- include/hw/ppc/spapr.h | 2 -- hw/ppc/spapr.c | 37 +------------------------------------ 2 files changed, 1 insertion(+), 38 deletions(-) diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h index 328681a585..96ee868e88 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -144,8 +144,6 @@ struct SpaprMachineClass { =20 /*< public >*/ uint32_t nr_xirqs; - bool linux_pci_probe; - bool smp_threads_vsmt; /* set VSMT to smp_threads by default */ hwaddr rma_limit; /* clamp the RMA to this size */ bool pre_5_1_assoc_refpoints; bool pre_5_2_numa_associativity; diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index b93015c335..780688deaf 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -1072,7 +1072,6 @@ static void spapr_dt_ov5_platform_support(SpaprMachin= eState *spapr, void *fdt, static void spapr_dt_chosen(SpaprMachineState *spapr, void *fdt, bool rese= t) { MachineState *machine =3D MACHINE(spapr); - SpaprMachineClass *smc =3D SPAPR_MACHINE_GET_CLASS(machine); int chosen; =20 _FDT(chosen =3D fdt_add_subnode(fdt, 0, "chosen")); @@ -1143,9 +1142,7 @@ static void spapr_dt_chosen(SpaprMachineState *spapr,= void *fdt, bool reset) * We can deal with BAR reallocation just fine, advertise it * to the guest */ - if (smc->linux_pci_probe) { - _FDT(fdt_setprop_cell(fdt, chosen, "linux,pci-probe-only", 0)); - } + _FDT(fdt_setprop_cell(fdt, chosen, "linux,pci-probe-only", 0)); =20 spapr_dt_ov5_platform_support(spapr, fdt, chosen); } @@ -2595,7 +2592,6 @@ static CPUArchId *spapr_find_cpu_slot(MachineState *m= s, uint32_t id, int *idx) static void spapr_set_vsmt_mode(SpaprMachineState *spapr, Error **errp) { MachineState *ms =3D MACHINE(spapr); - SpaprMachineClass *smc =3D SPAPR_MACHINE_GET_CLASS(spapr); Error *local_err =3D NULL; bool vsmt_user =3D !!spapr->vsmt; int kvm_smt =3D kvmppc_smt_threads(); @@ -2631,15 +2627,6 @@ static void spapr_set_vsmt_mode(SpaprMachineState *s= papr, Error **errp) return; } /* In this case, spapr->vsmt has been set by the command line */ - } else if (!smc->smp_threads_vsmt) { - /* - * Default VSMT value is tricky, because we need it to be as - * consistent as possible (for migration), but this requires - * changing it for at least some existing cases. We pick 8 as - * the value that we'd get with KVM on POWER8, the - * overwhelmingly common case in production systems. - */ - spapr->vsmt =3D MAX(8, smp_threads); } else { spapr->vsmt =3D smp_threads; } @@ -4659,8 +4646,6 @@ static void spapr_machine_class_init(ObjectClass *oc,= const void *data) smc->default_caps.caps[SPAPR_CAP_AIL_MODE_3] =3D SPAPR_CAP_ON; spapr_caps_add_properties(smc); smc->irq =3D &spapr_irq_dual; - smc->linux_pci_probe =3D true; - smc->smp_threads_vsmt =3D true; smc->nr_xirqs =3D SPAPR_NR_XIRQS; xfc->match_nvt =3D spapr_match_nvt; vmc->client_architecture_support =3D spapr_vof_client_architecture_sup= port; @@ -4956,26 +4941,6 @@ static void spapr_machine_4_2_class_options(MachineC= lass *mc) =20 DEFINE_SPAPR_MACHINE(4, 2); =20 -/* - * pseries-4.1 - */ -static void spapr_machine_4_1_class_options(MachineClass *mc) -{ - SpaprMachineClass *smc =3D SPAPR_MACHINE_CLASS(mc); - static GlobalProperty compat[] =3D { - /* Only allow 4kiB and 64kiB IOMMU pagesizes */ - { TYPE_SPAPR_PCI_HOST_BRIDGE, "pgsz", "0x11000" }, - }; - - spapr_machine_4_2_class_options(mc); - smc->linux_pci_probe =3D false; - smc->smp_threads_vsmt =3D false; - compat_props_add(mc->compat_props, hw_compat_4_1, hw_compat_4_1_len); - compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat)); -} - -DEFINE_SPAPR_MACHINE(4, 1); - static void spapr_machine_register_types(void) { type_register_static(&spapr_machine_info); --=20 2.51.0 From nobody Fri Nov 14 18:19:18 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=1760002554; cv=none; d=zohomail.com; s=zohoarc; b=biwLqqjKNJX1rjCqRaVx91WZ4G8gm3bRYgrS6m4bEHeS40f2tj05tWLx7dNUKTK1ljY766kaiGNCfNsJlyw5JsOdEp3XxQ2fqqzPiEkjlUYl5kx3iAUm9ajUKhQFfuL21oSdaU/fm/5tnJqLJPfwCoTK41Z6L94MJEFikvT6b3Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760002554; 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=U1lZCN5t5t2cUWc2MJRZQdkpuGhvGJX+V8WiiTSTB9M=; b=gq8WW9909RR3sK3yle43/ngzD4WruCeANJVZ75gza8ibuTQEQpCal0zNscjnxwHkc5qP1bzNEm3f7jmFKZW4c+2YEg8CgzEnctkId8jEJdNzz0lzI1fZNmPdluJeB6k+qWPHIgQgNx/1VKvQlx3jkHGd0MdexacTBaWgkefs9XM= 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 1760002554053753.2476235974997; Thu, 9 Oct 2025 02:35:54 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v6n2n-0005zl-2K; Thu, 09 Oct 2025 05:34:41 -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 1v6n2l-0005yO-HZ; Thu, 09 Oct 2025 05:34:39 -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 1v6n2d-0001nw-T5; Thu, 09 Oct 2025 05:34:39 -0400 Received: from pps.filterd (m0356517.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 5993RMWU006790; Thu, 9 Oct 2025 09:34:18 GMT Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 49nv803xxx-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 09 Oct 2025 09:34:18 +0000 (GMT) Received: from m0356517.ppops.net (m0356517.ppops.net [127.0.0.1]) by pps.reinject (8.18.1.12/8.18.0.8) with ESMTP id 5999P4DM020182; Thu, 9 Oct 2025 09:34:17 GMT Received: from ppma22.wdc07v.mail.ibm.com (5c.69.3da9.ip4.static.sl-reverse.com [169.61.105.92]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 49nv803xxw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 09 Oct 2025 09:34:17 +0000 (GMT) Received: from pps.filterd (ppma22.wdc07v.mail.ibm.com [127.0.0.1]) by ppma22.wdc07v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 5998GOMK008377; Thu, 9 Oct 2025 09:34:16 GMT Received: from smtprelay01.fra02v.mail.ibm.com ([9.218.2.227]) by ppma22.wdc07v.mail.ibm.com (PPS) with ESMTPS id 49nvanurs5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 09 Oct 2025 09:34:16 +0000 Received: from smtpav02.fra02v.mail.ibm.com (smtpav02.fra02v.mail.ibm.com [10.20.54.101]) by smtprelay01.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 5999YEVn56885734 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 9 Oct 2025 09:34:14 GMT Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 4F78C20084; Thu, 9 Oct 2025 09:34:14 +0000 (GMT) Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 3DBB320072; Thu, 9 Oct 2025 09:34:13 +0000 (GMT) Received: from ltcfuji9aw-lp7.ltc.tadn.ibm.com (unknown [9.5.7.39]) by smtpav02.fra02v.mail.ibm.com (Postfix) with ESMTP; Thu, 9 Oct 2025 09:34:13 +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=U1lZCN 5t5t2cUWc2MJRZQdkpuGhvGJX+V8WiiTSTB9M=; b=GuJi/0aWqgxjzSLaJ+0f4m tZ3hZIF3jyIDY774MAvmQAsLLqOypN8g0X9DC7lGWtdMp1PG3zdE5x+1c/8eDkep ck5+S4R77w1T3SW5x07XwGe+Z5WWO7Hkgh46ixC6a+gvrH7Ko79zy8iwUeM+vvZV tLiKQouevOzPuEah3R47l6D64W20AQyO2OxmXM1sBiKjKVnkV7KpWn3cVrKCZcik QTUFsW5tXNe7jXNwgY3snwMBkjid3wBeZLVdEDvaKt0PgqRh4EM/hpl+C0Iea2rM LSGdTxwvaTW6Y9RXnX/ii6JKsTS2AmFHDecr0xXN256y5iIeQEAnqyhSyZV5oyhQ == From: Harsh Prateek Bora To: qemu-ppc@nongnu.org, qemu-devel@nongnu.org, clg@kaod.org, philmd@linaro.org Cc: npiggin@gmail.com Subject: [PATCH v2 5/5] ppc/spapr: remove deprecated machine pseries-4.2 Date: Thu, 9 Oct 2025 14:40:57 -0400 Message-ID: <20251009184057.19973-6-harshpb@linux.ibm.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251009184057.19973-1-harshpb@linux.ibm.com> References: <20251009184057.19973-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=NsDcssdJ c=1 sm=1 tr=0 ts=68e7819a cx=c_pps a=5BHTudwdYE3Te8bg5FgnPg==:117 a=5BHTudwdYE3Te8bg5FgnPg==:17 a=IkcTkHD0fZMA:10 a=x6icFKpwvdMA:10 a=f7IdgyKtn90A:10 a=aow-egSQAAAA:8 a=VnNF1IyMAAAA:8 a=f2lMtB83b2L1IpRQv6cA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=gFNbaldVC-z-bsjSTzMo:22 a=oH34dK2VZjykjzsv8OSz:22 a=pHzHmUro8NiASowvMSCR:22 a=n87TN5wuljxrRezIQYnT:22 X-Proofpoint-GUID: D2ZnYGKcuMjg37tQtEJTV1P3VRvZ1I4z X-Proofpoint-ORIG-GUID: 5-elUU47LxH8vU2idb2gZKhzG3NLBbo6 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMDA4MDEyMSBTYWx0ZWRfX6KsRE0tKhhyN GEmTT/jgGZdYB9rMjmJQRiu/ZI/M7sfEWk7RgkKMfSOyD1phnrstNKn5+76QcWNUcc5SlAiB7n3 vCI9wrfl3+uN2bzxss+0ex1+z3l3z7ziRLechzgObwQqQ8epcwzcP+zyq9iYvS6PWFUY0C7SsNe 9PEy1JZwkeBys++KU8ZIbWiOG3X21StY7o+X0t3wB5gihDj6dZayEE/kg4BdioHBez22cIz4VoS So+IsQcIl4pDYkV8lcH1cTGhh+Diz6ruox0/iztV3ez25qa0eYlma7/NFwggGr7B4hNvKvd1eTk fYUV+UdwsU+5qeb9D4nuou8i3b2t/0cpaFHsRAgqZFinA1fLgYI8rcaidK/J2TlQ5/SW0F0wnZa MWX46oyfXm0Rt+eJKEsMnnXjiwy89A== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1117,Hydra:6.1.9,FMLib:17.12.80.40 definitions=2025-10-09_03,2025-10-06_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 spamscore=0 impostorscore=0 adultscore=0 phishscore=0 priorityscore=1501 malwarescore=0 clxscore=1015 bulkscore=0 lowpriorityscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2510020000 definitions=main-2510080121 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: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DATE_IN_FUTURE_06_12=1.947, 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: 1760002561051116600 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 Signed-off-by: Harsh Prateek Bora Reviewed-by: C=C3=A9dric Le Goater --- 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 96ee868e88..a9cf8677ac 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -144,7 +144,6 @@ struct SpaprMachineClass { =20 /*< public >*/ uint32_t nr_xirqs; - 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 780688deaf..d704b8ce21 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -2735,7 +2735,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 @@ -2748,15 +2747,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 @@ -4924,23 +4914,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.51.0