From nobody Fri Nov 14 16:55:25 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=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1761036310; cv=none; d=zohomail.com; s=zohoarc; b=aVuzoKm1rdnSys/rtUKuzq4Wal4tcyTb4+GB8zitzCnOf3pQ+ynhQWB5Hn35etb25rxgCmvhUsgjrMAl8fhzZj3mo64BgQJ3wqzttNd0HfwYg3j5X+oPr0Amp1LPU4N1Zzc2Ep4HtJrC/f1iMCTkmFYj2n9NQbyC/hRMw6JdlqA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761036310; 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=7BOIFmB8Gn53IMH61nQhvpTXlwuNqzhANPdE60gyPKw=; b=gPV2fyK/CoJuXHuLGCG2kov36Zn4waSV18lfyu53E1paqqfOM9cBHR1NL+tKRZamMO76pThKpu/Jg8G7Y2PmBB68GM2Nfc/l8OJUG2VFGFj+LHe01GI6bkUrkozwQJCWbLng1+OQ9k1z2TIPe/n8PddCglEdk7agDE6/z5hEkF0= 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=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1761036310215434.9719281223895; Tue, 21 Oct 2025 01:45:10 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vB7yK-0008It-0R; Tue, 21 Oct 2025 04:44:00 -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 1vB7yH-0008IS-AK for qemu-devel@nongnu.org; Tue, 21 Oct 2025 04:43:57 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vB7yF-0000tb-3v for qemu-devel@nongnu.org; Tue, 21 Oct 2025 04:43:57 -0400 Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-3f0ae439bc3so2758483f8f.1 for ; Tue, 21 Oct 2025 01:43:54 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-427ea5a0f19sm19379117f8f.9.2025.10.21.01.43.51 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Oct 2025 01:43:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761036233; x=1761641033; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=7BOIFmB8Gn53IMH61nQhvpTXlwuNqzhANPdE60gyPKw=; b=pIudn02MZYD4oXxNvrqZw8qtlEP24FeF2oF3l/YdcZ+5Bq5wCRjRTC8hMSd8xBKBNq 0lwrzXe9xCC7S5ccF+IgnvI2IH6Rja90D+p3CuLwnNhDe7wOFeONP15qHkoSAPOHdAgQ GiiMirrtd1uvX9dDHQbIZAl8f0d/MlJK0jMojU4m6znz2Xtzc0vC3wibXi+jy01zn2n7 k6cl5NqxhGUW+nwtTK3pGkWEK9VEBoptyKcMGYvwA0AVf+UBkoZdF+bvE51qn6OzrKDR 48fzI3DlBeF4PSOSaizE9+p8/YjBAvjTQy7FWFORrBwyEtX0fF+Pw7NoRrG2j7F9EY9T pevA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761036233; x=1761641033; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7BOIFmB8Gn53IMH61nQhvpTXlwuNqzhANPdE60gyPKw=; b=xVZInnmqn2zsfsQU67weXE6s1EbOQoeRVe73k9hanVRAQhe8XXxbDUzncOclgEGCe8 qBJ33whvKUE9s2AuEUsLdxVj1RbO8buNA4qNnfcGBdQoA0T+ozOwF5YCZf6Uknlkjliw HUo88Jvw2PflUW7KuYp8cH7y7HC0UvPBU45ZCwOGZvSvZ1xQlYXpeDVazZsnXi8Y58Gi 6jzqQU8mdCYPXp7s9mVN+tK+tTAZH/iTnNF3eK1E2glslTCKooSCDmRlU9f+jWCF+hsA vl7aR/B5NMnTFw8AJ2zGQ98JxBYjaJlFl49EupPUOjCCujuJIguCMK5zY4gmR3H2utdv Wlcw== X-Gm-Message-State: AOJu0YxC8weDqNoprJWdG24ZNrSig52lfl4I3zVsEh5LCyIpFxqVAqj8 FjV9ggUaaPOFNxI1YKVogquU2yeqs1rbamjT1oOpjVrOFzBJzGKbBCVKleXT47KgkbZjWxxuOjh rQ7ynpXk= X-Gm-Gg: ASbGnctO8ARQjA4CzePmsG6GFSzSbU6T/xMf2KhUG+XMQmV4GeND2OnuMm7Qs5iNFWf oZh/Vryxousb6yubWWeGg1xESuWY8JXKl9NFUP4imBD76y+PDy+hKo46do4YaJ14mmrhkpsGNxJ jwirJYe8bAFHQ98F9yCkm20D6ly2Slwsoy5jNjdWL9Ethehd1A642AsNo0inOwGCgwOp6w52w3n 7BWRGIOwXlqYUKIlsm541wwiHnkY6Q2f/zw9WJtkgiNTgYwSYZ9m1BrxYeMv4ASlVKa8uq4CV+G 7rLefyp67SMZuQoujlByrzeaPV5ygcpE/X+HnL5es6VfyLErT5BILbbxAaXkDzklD0PCm3IM1j0 74UNRT0PVj7SOaIvezxBlHBI6/TQgoQxzlT/FeljUjlsLfKintmoRXQTP7YogLs+nyevd8/BNe/ P+wmBLXgKQKvqfBh3qSThYT8ztWcla8LbVMgFnsMVorzWhz/LG6sLWQVbiRVoJ X-Google-Smtp-Source: AGHT+IEZQr+iw/M9Ku1VF0WsywySY59sTo/B64DAO6tXU21KFPgALdQagDHy/sfU9C7qrWv2wKiXIg== X-Received: by 2002:a05:6000:186e:b0:428:3cff:3240 with SMTP id ffacd0b85a97d-4283cff3389mr6857358f8f.1.1761036232772; Tue, 21 Oct 2025 01:43:52 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Chinmay Rath , qemu-ppc@nongnu.org, Nicholas Piggin , kvm@vger.kernel.org, Paolo Bonzini , Harsh Prateek Bora , =?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: [PATCH v2 01/11] ppc/spapr: remove deprecated machine pseries-3.0 Date: Tue, 21 Oct 2025 10:43:35 +0200 Message-ID: <20251021084346.73671-2-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251021084346.73671-1-philmd@linaro.org> References: <20251021084346.73671-1-philmd@linaro.org> 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=2a00:1450:4864:20::429; envelope-from=philmd@linaro.org; helo=mail-wr1-x429.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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 @linaro.org) X-ZM-MESSAGEID: 1761036314442158500 From: Harsh Prateek Bora 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 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- 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 39bd5bd5ed3..0c1e5132de2 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 cb9a85f6575..5ddd1107c39 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 97ab6bebd25..426a778d3e8 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 832b0212f31..548a190ce89 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 d6d368dd08c..317d57a3802 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 f9095552e86..bdec8f0728d 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 7759436a4f5..c21a2a3274e 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 16:55:25 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=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1761036345; cv=none; d=zohomail.com; s=zohoarc; b=M9VRokexM/GoZ/60nk/6MT3rGYh/IlROvgKLMy2PGD6HoP6wCAtBsqPR3tWuh4tKUBfxSRz+dPAOyCPPqUlcXlM/k6igTQ5alcd1BDskoHZv3X3btV1wGzGDFy2JtmNtHrqhdhEFCInTxQAe1Rlye1I4oKtgCoBhbSTzbH0k3Gk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761036345; 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=0M4ai3rHfvY9hawDUvi5q45cAeCDeC3osatMpD7h84s=; b=PV+3LyQpWoCvqteC+BFxW8ARzrbWQwOS7sW55TrEm3dKqIJ7UmhdJyMOYBj7nGmnkGUr3mzQOiHyoNg9R9VFcGEsy1f9Tq+fprPACSgXYt7n4/mbFQYhtVIDum2eYzP4QGDkJt9PTHw6454b3Nv2pWZXlF8N9fIetOT7cEO6f2U= 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=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1761036345520620.9796487049031; Tue, 21 Oct 2025 01:45:45 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vB7yP-0008L0-Ca; Tue, 21 Oct 2025 04:44:05 -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 1vB7yN-0008Kb-E2 for qemu-devel@nongnu.org; Tue, 21 Oct 2025 04:44:03 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vB7yK-0000uT-SY for qemu-devel@nongnu.org; Tue, 21 Oct 2025 04:44:03 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-4711f156326so39723125e9.1 for ; Tue, 21 Oct 2025 01:44:00 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-427ea5a0f7dsm18932120f8f.4.2025.10.21.01.43.56 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Oct 2025 01:43:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761036238; x=1761641038; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=0M4ai3rHfvY9hawDUvi5q45cAeCDeC3osatMpD7h84s=; b=OFWoqE9cFOUhbfmX1HQx5tg/cFlkgjk/NA+5AF1QmmfVRKlY77ayRwGFnzIZxwoGoU Gk43oAMOb6bej+ayXWYEZEfnr59B7I05K3IF4dYmiWjuQBChDNf8eBnp1JrQHqA8vbQZ zaXJtuG0fDJ8yOKoD4zXjthkl/X2Xvh9kWrnehcIriTcs0nARzkaOdSuqJkSOI0N8NuQ LOyRftl4Um7iY8fZGtUj2ZPXhkMXDMoBpl1lGq+BL6NPOGHJ9da2vXgQt9aZSClLhE/m 6EgI0dmVBiRXZiVng/ksExs9sAAl0WudI0jlE2zgcRAHdm6clsADl6N/RuBOxhaUK3mi uyeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761036238; x=1761641038; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0M4ai3rHfvY9hawDUvi5q45cAeCDeC3osatMpD7h84s=; b=Uys8p6lif5+lM8o/QG8LW9cymKAmLUzFd+qf177ui+t7ID7elizQN8pRa+bB55DTiT 38KqKDK51FMEvZd8E41dm7VdOA/X+SXu9ZAYzdGWeUB2Xul3tPuvCskC773DTifmWBzj FwaLU4VheRGqGc5Xb6kswTefdTdsO8cLwXvuHrCDaUMzKpIoAqT1sK9ilFXd4MciV+tw gfZlmA9my89S5iIaWJuyaDnlfk9+DxfY+nH6Dq5NwaH66Cp5wW1QxVCPz0jS6qRUByQT wIJIdVs3JpmM1S7UCxWYX2evP4588x6QyqN+HkB0o+QE0dsd/f3JpKedybuEVDMcQmJo gReA== X-Gm-Message-State: AOJu0YxWiaV72IWAu6h+907gSa/84G74jQiqOVr9FevEMu/ivg5Rb/+5 gUorm7+tS5/pCH0SiX6aogtuGGnVNO/fpnVT21aFZPXFGm5tj1jFqOAuoryWgr8Z2OBIsrcTR3T LYQTClBM= X-Gm-Gg: ASbGnctjNENGIBDHJYXuvdEgnsO2bFZxpDijy6DZJQool/a1Ysc7VwUcuhVrnwnwc8i j9y/t4H7FaD1KmrbVtOs5ktU9eVo3np0NAeI/PTafbkk3KSex66PcMBicZFPFvD0+e3GYh7Chnn QKHz2reVTudfy3+qhOksw3A4+KMHd8dajSPM03dfkxc8CJhWUDATmctmeWdr1CjPgSaCP+XdP4E Ya4ejJLX8EPTKue4sWrT+6wV8gfNeybtjE0zQ3k539W3s4zmmeAoKJ6vI6cocO5ioiGTY9mrLzH SXLVewsps257lfvga5i9d+8SUVJWjIjbevrtYoAY2djmUwbHben1EG+pSf1xQY8KeHOzHYQHR4X e+If5RPPLRu3v3MDXx5FRl6rzDqwA3VpESi5EWS/mD1khNsHwuqMFpMd0/S12vB8F6tSWAcKHQA d5zV/wIA32qSqA+agE7B2Mcfx7CYIo4K+gYSYB8DvGQOyxr3lqL4ZiBmZsgMVY X-Google-Smtp-Source: AGHT+IF8DS0Pay/oC0pJ1fYSBffefIYbS8RO4hSfwedEHxc9anqZvGqetbuBUGSMzHhFnNO4Qmql8Q== X-Received: by 2002:a05:6000:2082:b0:425:7e40:1e02 with SMTP id ffacd0b85a97d-42704d49a0amr9499699f8f.7.1761036237724; Tue, 21 Oct 2025 01:43:57 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Chinmay Rath , qemu-ppc@nongnu.org, Nicholas Piggin , kvm@vger.kernel.org, Paolo Bonzini , Harsh Prateek Bora , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 02/11] hw/ppc/spapr: Remove SpaprMachineClass::nr_xirqs field Date: Tue, 21 Oct 2025 10:43:36 +0200 Message-ID: <20251021084346.73671-3-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251021084346.73671-1-philmd@linaro.org> References: <20251021084346.73671-1-philmd@linaro.org> 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=2a00:1450:4864:20::331; envelope-from=philmd@linaro.org; helo=mail-wm1-x331.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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 @linaro.org) X-ZM-MESSAGEID: 1761036350903158500 The SpaprMachineClass::nr_xirqs field was only used by the pseries-3.0 machine, which got removed. Remove it as now unused. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/ppc/spapr.h | 1 - hw/ppc/spapr.c | 1 - hw/ppc/spapr_irq.c | 22 +++++++--------------- 3 files changed, 7 insertions(+), 17 deletions(-) diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h index 0c1e5132de2..494367fb99a 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 */ - 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; diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 426a778d3e8..b5d20bc1756 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -4691,7 +4691,6 @@ static void spapr_machine_class_init(ObjectClass *oc,= const void *data) 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; xfc->match_nvt =3D spapr_match_nvt; vmc->client_architecture_support =3D spapr_vof_client_architecture_sup= port; vmc->quiesce =3D spapr_vof_quiesce; diff --git a/hw/ppc/spapr_irq.c b/hw/ppc/spapr_irq.c index 317d57a3802..2ce323457be 100644 --- a/hw/ppc/spapr_irq.c +++ b/hw/ppc/spapr_irq.c @@ -279,15 +279,11 @@ void spapr_irq_dt(SpaprMachineState *spapr, uint32_t = nr_servers, =20 uint32_t spapr_irq_nr_msis(SpaprMachineState *spapr) { - SpaprMachineClass *smc =3D SPAPR_MACHINE_GET_CLASS(spapr); - - return SPAPR_XIRQ_BASE + smc->nr_xirqs - SPAPR_IRQ_MSI; + return SPAPR_NR_XIRQS + SPAPR_XIRQ_BASE - SPAPR_IRQ_MSI; } =20 void spapr_irq_init(SpaprMachineState *spapr, Error **errp) { - SpaprMachineClass *smc =3D SPAPR_MACHINE_GET_CLASS(spapr); - if (kvm_enabled() && kvm_kernel_irqchip_split()) { error_setg(errp, "kernel_irqchip split mode not supported on pseri= es"); return; @@ -308,7 +304,7 @@ void spapr_irq_init(SpaprMachineState *spapr, Error **e= rrp) object_property_add_child(OBJECT(spapr), "ics", obj); object_property_set_link(obj, ICS_PROP_XICS, OBJECT(spapr), &error_abort); - object_property_set_int(obj, "nr-irqs", smc->nr_xirqs, &error_abor= t); + object_property_set_int(obj, "nr-irqs", SPAPR_NR_XIRQS, &error_abo= rt); if (!qdev_realize(DEVICE(obj), NULL, errp)) { return; } @@ -322,7 +318,7 @@ void spapr_irq_init(SpaprMachineState *spapr, Error **e= rrp) int i; =20 dev =3D qdev_new(TYPE_SPAPR_XIVE); - qdev_prop_set_uint32(dev, "nr-irqs", smc->nr_xirqs + SPAPR_IRQ_NR_= IPIS); + qdev_prop_set_uint32(dev, "nr-irqs", SPAPR_NR_XIRQS + SPAPR_IRQ_NR= _IPIS); /* * 8 XIVE END structures per CPU. One for each available * priority @@ -349,7 +345,7 @@ void spapr_irq_init(SpaprMachineState *spapr, Error **e= rrp) } =20 spapr->qirqs =3D qemu_allocate_irqs(spapr_set_irq, spapr, - smc->nr_xirqs + SPAPR_IRQ_NR_IPIS); + SPAPR_NR_XIRQS + SPAPR_IRQ_NR_IPIS); =20 /* * Mostly we don't actually need this until reset, except that not @@ -364,11 +360,10 @@ int spapr_irq_claim(SpaprMachineState *spapr, int irq= , bool lsi, Error **errp) { SpaprInterruptController *intcs[] =3D ALL_INTCS(spapr); int i; - SpaprMachineClass *smc =3D SPAPR_MACHINE_GET_CLASS(spapr); int rc; =20 assert(irq >=3D SPAPR_XIRQ_BASE); - assert(irq < (smc->nr_xirqs + SPAPR_XIRQ_BASE)); + assert(irq < (SPAPR_NR_XIRQS + SPAPR_XIRQ_BASE)); =20 for (i =3D 0; i < ARRAY_SIZE(intcs); i++) { SpaprInterruptController *intc =3D intcs[i]; @@ -388,10 +383,9 @@ void spapr_irq_free(SpaprMachineState *spapr, int irq,= int num) { SpaprInterruptController *intcs[] =3D ALL_INTCS(spapr); int i, j; - SpaprMachineClass *smc =3D SPAPR_MACHINE_GET_CLASS(spapr); =20 assert(irq >=3D SPAPR_XIRQ_BASE); - assert((irq + num) <=3D (smc->nr_xirqs + SPAPR_XIRQ_BASE)); + assert((irq + num) <=3D (SPAPR_NR_XIRQS + SPAPR_XIRQ_BASE)); =20 for (i =3D irq; i < (irq + num); i++) { for (j =3D 0; j < ARRAY_SIZE(intcs); j++) { @@ -408,8 +402,6 @@ void spapr_irq_free(SpaprMachineState *spapr, int irq, = int num) =20 qemu_irq spapr_qirq(SpaprMachineState *spapr, int irq) { - SpaprMachineClass *smc =3D SPAPR_MACHINE_GET_CLASS(spapr); - /* * This interface is basically for VIO and PHB devices to find the * right qemu_irq to manipulate, so we only allow access to the @@ -418,7 +410,7 @@ qemu_irq spapr_qirq(SpaprMachineState *spapr, int irq) * interfaces, we can change this if we need to in future. */ assert(irq >=3D SPAPR_XIRQ_BASE); - assert(irq < (smc->nr_xirqs + SPAPR_XIRQ_BASE)); + assert(irq < (SPAPR_NR_XIRQS + SPAPR_XIRQ_BASE)); =20 if (spapr->ics) { assert(ics_valid_irq(spapr->ics, irq)); --=20 2.51.0 From nobody Fri Nov 14 16:55:25 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=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1761036276; cv=none; d=zohomail.com; s=zohoarc; b=lrZVJORYsp/GCANBWp0yQiL6GLb+BqmJfxGTzU+6PPU8sH8oQKTztHPClMS0peC4VHtVHESsG7PhM+sfUmY/zLFWYpPKS2kYFDSrC2aDRIMFlfIEv+/Vpokd2/gOnrwrNIgoA4NSdtmy28aRc9o/JIJmWUJxO4KWrLP/YOp/a0M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761036276; 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=Wkrg0aZa1WjauUtDHq9tPYBBcjWPVRSRJlbYYy68XEA=; b=A6jIou4BRlwEBzSex8LN3KmQIfu40WdU0OevVO0Ecg4+y0CoSvuizTg5GLB7NYQN8UrQrgQfrV6ZgjXRfKC75Aexq7IDZPs/pKALkxl7RJQ9p6P2LCH9DWYEgHrM5it1yMLChR/3Yo0wyNtE33U/sp5c9wdlB/g9k7/pehmrvJg= 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=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1761036276142455.9746727889883; Tue, 21 Oct 2025 01:44:36 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vB7yU-0008O9-9o; Tue, 21 Oct 2025 04:44:10 -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 1vB7yR-0008MV-Fk for qemu-devel@nongnu.org; Tue, 21 Oct 2025 04:44:07 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vB7yO-0000ux-MN for qemu-devel@nongnu.org; Tue, 21 Oct 2025 04:44:07 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-47117f92e32so34533455e9.1 for ; Tue, 21 Oct 2025 01:44:04 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4715520dd65sm181550785e9.15.2025.10.21.01.44.01 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Oct 2025 01:44:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761036243; x=1761641043; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Wkrg0aZa1WjauUtDHq9tPYBBcjWPVRSRJlbYYy68XEA=; b=a1FTyJL8wN3r1alBekCSHXPzLjh+sBafWwdDe50j/FdjCeOEOz8GFavJQCn3/QCRM/ ll9yH4EL2nuUtH+VXuRdta9dlyWAVBT63RDYuiXyuMMACsdrsE51fYO2KOJNlnISIV/S 9lO9KdWazf7yowVtMijPNDdhoxOlC9/CcgoDlHdesmwKeHCj6b4XXNK+9YXsUpqRCrwk pk1xGuPaYrbqBYUrALHcX6QOBRJlkmsAjYCmIQ0WBG4EjB8cPWBJAHnFoLs4AGxQRA7X 3lTwwQG4UqI43mXVAitcELxWW3yTSUUkC5KJsgZ791z14tk205L4ThTJ4xW3r1R6debm XtKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761036243; x=1761641043; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Wkrg0aZa1WjauUtDHq9tPYBBcjWPVRSRJlbYYy68XEA=; b=dVo3dsGrwcH2ED60klY2GThr44Kb5DIgsWIhgYcRADAlzGdmSRAoUTTRm5o/rherhI 1JK4I/2YOInAppXBDsVncs6c93C24yZ0UXWeVXQgD663G0umRTQtFq+xP0gmLwW1oQC0 vbkRPE/XjscPQzX8QGUIYsKV8H8jMfmj8lVghLjZiW89Lf47dbiT6xmi/lHn5WBzKX3x 0DjbWROIPBqrVtvNd/l0OUaOwJeyiKLD6GDRusyeWQcyE/U/mTT0lg2U05/ZzR4i476E B/7gpffSGkdFboPEk8oR66ftzQJOHvgS4zwc69F9FDLaB7F3/sxT+A6WxSz84OuXVDxW hawg== X-Gm-Message-State: AOJu0Yx8NFDBerV99wGvB7GIG4DgwdDx352c/CsSb7Plua3o+3l5izJY mq75ngTY3v20gAtlDWPHKtFtuLlwY8YTvcjGgm1qANV1MNEMD39X7I/Vmi/LI4b6qBQQSUNFeS+ vYbX5BbQ= X-Gm-Gg: ASbGncvho7ziwlBtUa9StLNxg9oM8T3gWB9E3rTig9sXPjwavSfzZ0CmAEYzXhfx8UK DyT2GJmy+3/gsNJvZdH6JhlDSF38uB/T6FkldkDWV33mdzSuAc4N+PCGCe16su/Y4poctfVUuHt pnN0vRhgR5Z+runchXcvrt2BkrMQBIIa8TS0aS+1CRo2U46MUqwQBZtxiDkgDic/yXtZy3VEAi7 TSA/o+JBHt+H8cuk+KTCpnOGKPcRYDKTxNXXoJFD3CoexGqb/IVm9NMR9hEdCKbjHN7z5qphlJO UXH+BCcAMU0nGTcoro0RKp4BLFdyVJPbxKRXmTaw2izB8055qnDdW9KgoidySesTb7+F+2eMhUV Jl5RJn3ft9RBHqaD2wTyhbT0yJJKDwPUN6HkEveQmdUmRVth0/dC+3UAdVQIx0edhbA15KZQxpT DGHG0YSoNtp42uuJlPGu6Lrm8B/pR/cFOMYoaDaXUvVD/9ulgesQmGMfppc9Lm X-Google-Smtp-Source: AGHT+IFirZECNQbu8fTMpQHw/i7BErvqCsfDdrQA40bf/Y4sMvLQvdzRegS8xxtTQnqeKY56pJvjEg== X-Received: by 2002:a05:600c:4f95:b0:46e:345d:dfde with SMTP id 5b1f17b1804b1-471178ac017mr105182205e9.16.1761036242592; Tue, 21 Oct 2025 01:44:02 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Chinmay Rath , qemu-ppc@nongnu.org, Nicholas Piggin , kvm@vger.kernel.org, Paolo Bonzini , Harsh Prateek Bora , =?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: [PATCH v2 03/11] ppc/spapr: remove deprecated machine pseries-3.1 Date: Tue, 21 Oct 2025 10:43:37 +0200 Message-ID: <20251021084346.73671-4-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251021084346.73671-1-philmd@linaro.org> References: <20251021084346.73671-1-philmd@linaro.org> 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=2a00:1450:4864:20::32e; envelope-from=philmd@linaro.org; helo=mail-wm1-x32e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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 @linaro.org) X-ZM-MESSAGEID: 1761036284296158500 From: Harsh Prateek Bora 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 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/ppc/spapr.h | 3 -- hw/ppc/spapr.c | 62 ++++-------------------------------------- hw/ppc/spapr_hcall.c | 5 ---- 3 files changed, 5 insertions(+), 65 deletions(-) diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h index 494367fb99a..1db67784de8 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -143,9 +143,6 @@ 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 */ - 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 b5d20bc1756..458d1c29b4d 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,10 +2999,8 @@ 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 */ @@ -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; xfc->match_nvt =3D spapr_match_nvt; @@ -5032,28 +5002,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 8c1e0a4817b..8f03b3e7764 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 16:55:25 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=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1761036346; cv=none; d=zohomail.com; s=zohoarc; b=jzz4Ru/UNI8zq0A6c1HEEyunLZSdZlpdH+PeFOVehQtleQB42kBGnqtv6Bv8NuGxZVVCzwFlU6Lf7N0TpnGOtGqj0LE3z2IYiuxlfYprR8Sd8tOuB4FebZZJcD7KJQ57IFtBNlS7jlyD/9aF2VjAWwEowpVdPIg39klVpxkkpBg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761036346; 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=t3K5y5Cy9vHhm90mgMJ5DoRZ8l6l8+H0Bizm6UlEWJA=; b=Lu6+Z1P1iYTbPPLfXoz+HWKOPVhfDXuK2fMGs0aMbbkU7MamiJ2GfsA20BKRJfIy/bZfZeYSlMZqD5jjXKgt76NAyC3kYpo1xYFYv5lLTcTp+FLqytnTa09cqxS2BbmZe6B7MIAh61H5gfcsmLz8invvRSy/o0UC4sSxja5Hy9Q= 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=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1761036346256698.7946349162489; Tue, 21 Oct 2025 01:45:46 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vB7yX-0008SP-Ho; Tue, 21 Oct 2025 04:44:13 -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 1vB7yV-0008P2-DN for qemu-devel@nongnu.org; Tue, 21 Oct 2025 04:44:11 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vB7yT-0000vd-JA for qemu-devel@nongnu.org; Tue, 21 Oct 2025 04:44:11 -0400 Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-426edfffc66so3917234f8f.1 for ; Tue, 21 Oct 2025 01:44:09 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-427f00b9853sm19155987f8f.33.2025.10.21.01.44.06 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Oct 2025 01:44:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761036247; x=1761641047; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=t3K5y5Cy9vHhm90mgMJ5DoRZ8l6l8+H0Bizm6UlEWJA=; b=chQpY0zndARBr77YwkXaxzTsj14nPP70kHawkGUB+S5O30/SNzOGeTomJZvGTBwv83 8reLFm5VIBeFTxykFpDNatCKxhTFyYKgi6ECi6UVXgmGYLK3trXL6pC55fwywzH4Jlv2 A8AzPEOvW11rfqWPU1OeBBTAd7S2AIqn2WHsmXKlXKrUToVwnZIt2qiyStn8KXBvAOoC eoeiAzJjNrSMR1zpKdun3csAGkK7oMh+7myRmGWZ8kpAGmGKHHtLEmU/k9RlfcYpX0je RDK3BL97h/kTqYRRiYd0o6Ltiky0y0hT3J9QnuB0H1O+CyZa5/M7guYCnjYSFwGstTRt Knmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761036247; x=1761641047; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=t3K5y5Cy9vHhm90mgMJ5DoRZ8l6l8+H0Bizm6UlEWJA=; b=j6BEEZqhACLDxpV5Q9h0aut65RWttiAVu1bn5FPG/lFU5RWPBaf1dG25Fc6m+ecIWp wcwlRstQ3rDZcyzknxKZVB57ywkaaVnAHgUlXKP0uGNOHog1bSZbutL5SHH0923ua724 uqtzwHm6vlkE7zadhphivKVUeJqodIMqh4CdPd/7mveX47dxfR+XroDnBRQWKpUPStM/ z9YJ6Adm8CWtTRRi8w6+r66FrkYjZ7wjfnRKh4lWLMQScjE6CojC6UAmPuFk3PUUMPdv eHbPD3Wp8ecF/k7hsL/s6BbF+s/b9nLS3bx6HWcpGsuOot5LfVJjXAeSTr/oq4lAgFdS ZY3w== X-Gm-Message-State: AOJu0YzHUQf31Ya+yRV3RLxRTBgE4NkETrrFE4cHILHL1DwZcEChhLBX cZQjEfSPXDxz5dzDZIh2xySC1u+xyKLrrs4yNrz08VvbI+oSV3+0BL3rHq8AdICvm3wAarqUVwL LbBNZoKg= X-Gm-Gg: ASbGncvX6IPEhVlpwkGUPnFCPAbIjK0cIXfHqi15EE0FcrOO7iqVN38dFrT7lRinMqB oGi2MqWGSJfsPxHvAEjCNmbR7pUIdySGKgeQL9oQ/GKdo5F+e/prRa3oHFyAMdrxw7+WXLIwQmu I4633SWQG2FTQKtguwYsGWCy36LxIOPj5T390sQnxpf2d4ehm4P2HBcHVxYPaQLYG3dOO93GMDy vlu7swr7pvH/Dht0lw/jcDlzfUbBYhz8c+TF++ssq+zq82dypvHb1fF/wrvvTJUS0xcV4ayU2Y1 LoJPt8nwpC+HzUiqKKrT6kaW8OllFD0J7OfyN8E+lKt7bhe/Eiv3VBdhT8DA/5rGj3VifpEgM2t R5DBW3ZS/wVZkPZxmK1BKIroEN+q9llmho3gBGBQl8pW63DAnBwz/clqA23IpB8pGpLywxrB9Hm EzeoP+rWm5v7M9Hnlf08g7l4Ey2qbkOg1m3bAkfuS2ZD1DkwANDw== X-Google-Smtp-Source: AGHT+IFrUC44XvQIgOPF1oe6aZhOa3HgUHCNQaYkwG+BqMdOw9kgMknMuXUQUq9O++GPrdyZKrFphA== X-Received: by 2002:a05:6000:240d:b0:427:7cd:bde7 with SMTP id ffacd0b85a97d-42707cdc0c2mr9949977f8f.5.1761036247544; Tue, 21 Oct 2025 01:44:07 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Chinmay Rath , qemu-ppc@nongnu.org, Nicholas Piggin , kvm@vger.kernel.org, Paolo Bonzini , Harsh Prateek Bora , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 04/11] hw/ppc/spapr: Inline spapr_dtb_needed() Date: Tue, 21 Oct 2025 10:43:38 +0200 Message-ID: <20251021084346.73671-5-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251021084346.73671-1-philmd@linaro.org> References: <20251021084346.73671-1-philmd@linaro.org> 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=2a00:1450:4864:20::42f; envelope-from=philmd@linaro.org; helo=mail-wr1-x42f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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 @linaro.org) X-ZM-MESSAGEID: 1761036346902158500 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/ppc/spapr.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 458d1c29b4d..ad9fc61c299 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -2053,11 +2053,6 @@ static const VMStateDescription vmstate_spapr_irq_ma= p =3D { }, }; =20 -static bool spapr_dtb_needed(void *opaque) -{ - return true; /* backward migration compat */ -} - static int spapr_dtb_pre_load(void *opaque) { SpaprMachineState *spapr =3D (SpaprMachineState *)opaque; @@ -2073,7 +2068,6 @@ static const VMStateDescription vmstate_spapr_dtb =3D= { .name =3D "spapr_dtb", .version_id =3D 1, .minimum_version_id =3D 1, - .needed =3D spapr_dtb_needed, .pre_load =3D spapr_dtb_pre_load, .fields =3D (const VMStateField[]) { VMSTATE_UINT32(fdt_initial_size, SpaprMachineState), --=20 2.51.0 From nobody Fri Nov 14 16:55:25 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=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1761036315; cv=none; d=zohomail.com; s=zohoarc; b=BDBWUGOCwHVbMxbEFqZPYzWaIo0dInyBc8fCfTd+rxomwuIqIXdPLvYwIZ5Jy/g8bLv/+ok2SMTZggTQSNutcfX7d77XFKxFqI+xrHtM6A/jnRqQReNHgRdynYz/Opm6n9itHzHrfj41Mqm+0VxPCqIP50h4AI55iI1LD4qkC40= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761036315; 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=fggegq+zKz5OUQPZsxqCN6WOO/FKu9sNtbgG7iUQYj8=; b=FO9+3YjVQdcbNTGrX/Vrw7W3E+HmUx44um1r9EwgUQtkSyjPzYF8+5gTnQKUlPSv+2LPe2H/xS0EiFGBdBNnIso2RcXMfiBwM6Qs0ZfR2bTwYfdjOi94waatk15YSK8O2DaAjGB6o1K0ZFlhPaKcaGaBLOe6jRUZXisnThM0kgE= 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=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1761036315970128.4987686197038; Tue, 21 Oct 2025 01:45:15 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vB7yb-0008Tv-QB; Tue, 21 Oct 2025 04:44:17 -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 1vB7ya-0008TQ-Ne for qemu-devel@nongnu.org; Tue, 21 Oct 2025 04:44:16 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vB7yY-0000wA-NP for qemu-devel@nongnu.org; Tue, 21 Oct 2025 04:44:16 -0400 Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-3ecde0be34eso3636500f8f.1 for ; Tue, 21 Oct 2025 01:44:14 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-427f00ce3e2sm19285508f8f.47.2025.10.21.01.44.11 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Oct 2025 01:44:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761036252; x=1761641052; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=fggegq+zKz5OUQPZsxqCN6WOO/FKu9sNtbgG7iUQYj8=; b=UfCYlxyVTyQXwCnvkH1HIXVyl8OdP5RlQUSw72QVhlXcFsmh9jSWTeGzWb/TVW24Xa QNGp1ZSZx+zg81cxnDXlkAsAeWGEI40v4vaKyW4hEEGBrVSBbcHR0Euk/AH5fcItUQVs aeamnG+hnO87BCodCVY4XHDK3EppmtPrJ9nTlUFMccgPHqgMgvpD7kPG7XJul5kpJ+0E vpQApL4EqtCXTbzKRHZ+uSg6zMXmW57o1Aon5hybxgng0jMtA2Lmk3tdUId1bq5ejJRC NB84KGx737UpHAE+IVQCz6dNJZAty287Hjswm4xjpVfEAObbHzzZxc2j058KS38/Z9qn Iwog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761036252; x=1761641052; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fggegq+zKz5OUQPZsxqCN6WOO/FKu9sNtbgG7iUQYj8=; b=K04pwb+3IzT9uTptI06+GWXB5hQqJx3OEFLM6GCLYK6CLzgk1gizTSFhpMQ8KyZVSi tZ9ZRQNJysDoQWfayt/VraUlI2qf9rTP/o+1ch9M6+8HeLRJWTP6hj20O2CzWeKTAit/ +rUuSqpaJeAhduvTngjlnNR4Ks2HzlVkw9HLJkEUTSc+UYAuUUaiX4Q8DiRTcKNugVtK OmpARB0C6lURBFNanq2LBDJJiLY1kv9vlqhnk8lGNXHvD750l8XoxIBHg0cb9EmO1Rox jj0OG8Gq6aRI7TgaVuHnzgZhwDdJZLspO3sSlH5YWlz2hCTgSmDs24GdCkz/y1DFhX5z TBIw== X-Gm-Message-State: AOJu0YxArIn/9V0bTUEhdnj7Zx7gJTlMPew5Oa4uFNP4Cm972+Su9HC+ ozLmLxZ+d20e0K3EuK3/Y65kSyEg+00retiMXrHztVDI99CrJVrT8Z+yy4/QTZvfvVRWRsuyHIe kXnp0dDY= X-Gm-Gg: ASbGncsQCIDfdYEY1/zx9ih8mAr6bdF6LbYxAa10/d4JaxoJH913H3hoTORzSDlK90u 3G8ea2qKBUwUtumnTx/JVEjOB4nJbYHRyY8CwoM1lz7Z/7GBqQ9QtWvdmf8KM7GfqEQ96HuCAzj GL+JV23t+D4phfIWkrz7AemqDdNx4iUF4cTjhbo601bVBr/233iwe4uE06B0/64bkK3yZZV0g7m kspOZ+qIkTi1/jd8TdOtAIritf6NU0SBomSm5A/cvsTmCUEZ6KkI8xPHm+l2r1wS0OhPwR1kaYd ffZCncjj7Jg96+hnYr6iWgUEl/1VnDOzxrWgZ0eIzK5QGYnLSvg7YVVRLc3UVeItvNqU92maQ58 xhd//A00G1gBBkuDxihaKxVc5+hlGtL9L9+XUUKVmOIq/0uyDA4YRqRT8GSsNCjXvS2iDDxMXlr NHb+Vcl4biqr9h+c4ZpyKQiJ/7ENs7lj5f14igRVhRW7N6ScMupj2PYAM3PyHG X-Google-Smtp-Source: AGHT+IEoYici4uejy48h7rF7LlsVTKlA5+khtpcojAL22mlKWdDcTixLD0jI1vVMR+Nu/9WOupMBrA== X-Received: by 2002:a05:6000:4205:b0:3ec:db87:ff53 with SMTP id ffacd0b85a97d-42704b5a931mr12540847f8f.12.1761036252539; Tue, 21 Oct 2025 01:44:12 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Chinmay Rath , qemu-ppc@nongnu.org, Nicholas Piggin , kvm@vger.kernel.org, Paolo Bonzini , Harsh Prateek Bora , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 05/11] hw/ppc/spapr: Inline few SPAPR_IRQ_* uses Date: Tue, 21 Oct 2025 10:43:39 +0200 Message-ID: <20251021084346.73671-6-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251021084346.73671-1-philmd@linaro.org> References: <20251021084346.73671-1-philmd@linaro.org> 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=2a00:1450:4864:20::42f; envelope-from=philmd@linaro.org; helo=mail-wr1-x42f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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 @linaro.org) X-ZM-MESSAGEID: 1761036320484158500 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Chinmay Rath --- hw/ppc/spapr_events.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/hw/ppc/spapr_events.c b/hw/ppc/spapr_events.c index 548a190ce89..892ddc7f8f7 100644 --- a/hw/ppc/spapr_events.c +++ b/hw/ppc/spapr_events.c @@ -1041,16 +1041,14 @@ void spapr_clear_pending_hotplug_events(SpaprMachin= eState *spapr) =20 void spapr_events_init(SpaprMachineState *spapr) { - int epow_irq =3D SPAPR_IRQ_EPOW; - - spapr_irq_claim(spapr, epow_irq, false, &error_fatal); + spapr_irq_claim(spapr, SPAPR_IRQ_EPOW, false, &error_fatal); =20 QTAILQ_INIT(&spapr->pending_events); =20 spapr->event_sources =3D spapr_event_sources_new(); =20 spapr_event_sources_register(spapr->event_sources, EVENT_CLASS_EPOW, - epow_irq); + SPAPR_IRQ_EPOW); =20 /* NOTE: if machine supports modern/dedicated hotplug event source, * we add it to the device-tree unconditionally. This means we may @@ -1061,12 +1059,10 @@ void spapr_events_init(SpaprMachineState *spapr) * checking that it's enabled. */ if (spapr->use_hotplug_event_source) { - int hp_irq =3D SPAPR_IRQ_HOTPLUG; - - spapr_irq_claim(spapr, hp_irq, false, &error_fatal); + spapr_irq_claim(spapr, SPAPR_IRQ_HOTPLUG, false, &error_fatal); =20 spapr_event_sources_register(spapr->event_sources, EVENT_CLASS_HOT= _PLUG, - hp_irq); + SPAPR_IRQ_HOTPLUG); } =20 spapr->epow_notifier.notify =3D spapr_powerdown_req; --=20 2.51.0 From nobody Fri Nov 14 16:55:25 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=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1761036354; cv=none; d=zohomail.com; s=zohoarc; b=itC0WvR6h7YPuHA7wlX+yNRFIZeC8D5/jt8WF9EVMz+VnkfBulGQf44nxzkieqaX+yvzELdhMzG3mo85upd7Ao45yQxCAv+48yme4bHAv3HMUVKH79Duz54cFYR+Ljozl2Xa3pCTwJX92Rd5r6oKBCfJswln+aGVbiLh9i2DxXg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761036354; 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=EulFVp0cdEgXrWVzzt34/e5jn6jKRx8ym0Wu/90Pz4Y=; b=BdmEdDop5bFocbvOtd4Ct/h3saewdXrWfWlxF8nVpnff/49aIJmDSw4HY+3dgZOan8+MAY6Ru8TrmsAhJw6r4RM7Fcbz5xEOB+Z2CdoTqou9ehFWYgjlJOPT2ctwF+aMW+s0pUe/tXPN/tSA52RnIEbqfoqgrI/zZ7qHQepURnU= 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=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1761036354677254.1960109913074; Tue, 21 Oct 2025 01:45:54 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vB7z3-0000Ek-Om; Tue, 21 Oct 2025 04:44:48 -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 1vB7yf-000075-VI for qemu-devel@nongnu.org; Tue, 21 Oct 2025 04:44:22 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vB7ye-0000wi-10 for qemu-devel@nongnu.org; Tue, 21 Oct 2025 04:44:21 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-47106fc51faso62624295e9.0 for ; Tue, 21 Oct 2025 01:44:19 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-47152959b55sm189711035e9.6.2025.10.21.01.44.16 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Oct 2025 01:44:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761036257; x=1761641057; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=EulFVp0cdEgXrWVzzt34/e5jn6jKRx8ym0Wu/90Pz4Y=; b=C9iOamV3vhlh+RaVQDj5izBwGePnPpLChwsDXKdZE8jiKJ9J1MCgokgP/YstfKkwhl ++PX3eocOEcMwL6HhBG9nF4Gkc+EhfsUfugl5vzmdC1UWVzTOLITCn0y+DsSXF6gcLOH VoCR4WL063w8vShLjgtBhtJf2di7XCa5rNrp7ooyuLJWGXUzjYWhrc5Pf5vE3pTV8+PT B2CHBV/Pd/aKy0jJCaIVgoKrTn8xVZ6CwP4/OzjQWquBrBxp9pCSKV/sEWdB4mTOnGCm 92OZ+KivqrscFENJ87zq1pYDiIBT9YjRa0PfUONCiA8g3piq/a2JYsaD5GldfAXbR4MJ Dc8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761036257; x=1761641057; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=EulFVp0cdEgXrWVzzt34/e5jn6jKRx8ym0Wu/90Pz4Y=; b=c0Htl2hoqSt4cXbm7FyVliT5gnwHCbxo/0t1yNCoBHNix9nvpplsw6aYY4Yq2Pg1JI 3G9dMDIqE0+zm4yq3PcZXcE+rvwetnGpTpllAiz6LMONnZ1PXxpguG3y7yMEgrVNYGse MZHgVYRsAZFfiUltCtKxSKjFlEArR34v98FvSDFWAWqMlOjHNgC3RFyW8oAS90k3o41g z1JYV8em4d+zVBegt/JSWFqrzJX1nGYv8c65XRHNqAriTyayLoPDsVDDJINlJ+ULzdP9 7qxEQunkCfsiNt6ICyJdIPtQ8qUHysL/TCFy65530B+0UTPxw8zLoWxfqPLmZlfL6k0F zYhQ== X-Gm-Message-State: AOJu0Yw4sbnbDknrsACAvfeFc0gxEXKpxImre96kC9mlFN99HA/uwyr7 3pIdkO4Mm/o3Y+/jkP6CxYd52eEi3VpouUkQ4Y6Vhd0z3OZPxcq84Ppeus3ErWDQB8VVkeOLxKk Pf9LdSoY= X-Gm-Gg: ASbGnct07g2C/ZKdj5IF1RQ4lDCddZD/Nsd2+H0ujhAWh6eSQgNtYuC517cLNobJM5k N2N0xaD2ekubnSxlThtN5dSPQyS+n2jaG/Zxu+M+FFFhImlboxqREwsZXSh+Xf2RP57wvTXOsyV 39XXUf5aMKMgCp7pjTYcY2vKQ9EktEBAMWhcL1cSY8llnwzzl/UiBOom44M0rkHIHC5BkJ8hWrN dYs7h17jW3nhswEL7G0ykAyXVEslnrlR62BFxRwGbw8XfwSNEjdCr9tZEGfdf1zuUlLJaK8rXY6 3zL/LP5vgZQSEDAdip3vlOb+Jc/sAqk56XIMlnry/3fxU1IuvAgjWDuIDgjXpQVRATGnUfuzNiF jqsD86PVwbHYrAYxE1UAW/oeifRIkIdlOoTOTbc3STX+8Cs+3qMpVTpd/pXiVJ+kNSzAehyxbKR WG+awjVPQZktijD0Lf8wGcaYyYSDOAiuRB3KQ7rhiIjuk6qGUP4TqZ9fLJG4XWG5y43M4ce8Q= X-Google-Smtp-Source: AGHT+IEmd4GV6INTu4mcg5KDt0989nKH2jp2JP8h3QAR44T4Pq2UxoFRyjRrLBth8F3WNX4zMhdfAA== X-Received: by 2002:a05:600c:5296:b0:46e:1b89:77f1 with SMTP id 5b1f17b1804b1-47117879898mr121510145e9.9.1761036257489; Tue, 21 Oct 2025 01:44:17 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Chinmay Rath , qemu-ppc@nongnu.org, Nicholas Piggin , kvm@vger.kernel.org, Paolo Bonzini , Harsh Prateek Bora , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 06/11] target/ppc/kvm: Remove kvmppc_get_host_serial() as unused Date: Tue, 21 Oct 2025 10:43:40 +0200 Message-ID: <20251021084346.73671-7-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251021084346.73671-1-philmd@linaro.org> References: <20251021084346.73671-1-philmd@linaro.org> 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=2a00:1450:4864:20::335; envelope-from=philmd@linaro.org; helo=mail-wm1-x335.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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 @linaro.org) X-ZM-MESSAGEID: 1761036356857154100 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Chinmay Rath --- target/ppc/kvm_ppc.h | 6 ------ target/ppc/kvm.c | 6 ------ 2 files changed, 12 deletions(-) diff --git a/target/ppc/kvm_ppc.h b/target/ppc/kvm_ppc.h index a1d9ce9f9aa..f24cc4de3c2 100644 --- a/target/ppc/kvm_ppc.h +++ b/target/ppc/kvm_ppc.h @@ -22,7 +22,6 @@ uint32_t kvmppc_get_tbfreq(void); uint64_t kvmppc_get_clockfreq(void); bool kvmppc_get_host_model(char **buf); -bool kvmppc_get_host_serial(char **buf); int kvmppc_get_hasidle(CPUPPCState *env); int kvmppc_get_hypercall(CPUPPCState *env, uint8_t *buf, int buf_len); int kvmppc_set_interrupt(PowerPCCPU *cpu, int irq, int level); @@ -134,11 +133,6 @@ static inline bool kvmppc_get_host_model(char **buf) return false; } =20 -static inline bool kvmppc_get_host_serial(char **buf) -{ - return false; -} - static inline uint64_t kvmppc_get_clockfreq(void) { return 0; diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c index cd60893a17d..cb61e99f9d4 100644 --- a/target/ppc/kvm.c +++ b/target/ppc/kvm.c @@ -1864,12 +1864,6 @@ uint32_t kvmppc_get_tbfreq(void) return cached_tbfreq; } =20 -bool kvmppc_get_host_serial(char **value) -{ - return g_file_get_contents("/proc/device-tree/system-id", value, NULL, - NULL); -} - bool kvmppc_get_host_model(char **value) { return g_file_get_contents("/proc/device-tree/model", value, NULL, NUL= L); --=20 2.51.0 From nobody Fri Nov 14 16:55:25 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=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1761036320; cv=none; d=zohomail.com; s=zohoarc; b=VZSgcHm1hpJn56CRek/pdG4xrkIwd2yAH+/iCaraBffAbE293MSdfs7mvTt5Rk6KpyMKnadIABZsQxtmhBuqvuw5+mtpZCGn3GacY3rvu+Q+g4S2hlu1ZDrRs4twl1NWvsyhHdqzT4tVqj5gllI1DZLHTbTqjhOZGOnI1w9+So4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761036320; 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=qI+hF79G3saS4cJM9gBn0qvW7x/aK3K4EItDfXm9eIU=; b=ADsWkFvJgws0zYgGm2aQ7VIE7F50O9L+DMXs1MVbpp408xCIvXxx8MABjS9tcFeUbIJpUlOBGQYq+J+5PstYdquEmbrFNUQ/vwUl8p8UUQORa6mdtnCeHx4Eu8Svk9E+ptCs8LuX+DSjdN5sYL+cgpw1RQbcRssz8+SKQny/VFQ= 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=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1761036320900379.7309739703302; Tue, 21 Oct 2025 01:45:20 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vB7zQ-0000cV-2u; Tue, 21 Oct 2025 04:45:08 -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 1vB7yk-00008z-3v for qemu-devel@nongnu.org; Tue, 21 Oct 2025 04:44:32 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vB7yi-0000xP-8Z for qemu-devel@nongnu.org; Tue, 21 Oct 2025 04:44:25 -0400 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-47100eae3e5so8719905e9.1 for ; Tue, 21 Oct 2025 01:44:23 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-427ea5a0f7dsm18934148f8f.4.2025.10.21.01.44.21 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Oct 2025 01:44:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761036262; x=1761641062; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=qI+hF79G3saS4cJM9gBn0qvW7x/aK3K4EItDfXm9eIU=; b=ETsqUbdKHnwMAqctzEbyxKSbNzR6g2eLtI12NigYzvBcytiCys3HaXU0WpbnUH9evv qv5VseI4ff4VUsPEov94zg/YHFwfc4rogamcUKYa0sX6G9y+ojth6c72RA2sP4R2bxNI fKmMSJ86blPBHvh/rLS0A08ZqTAMu9gWMPU5S7gJ6y2wUsIDgnCQJ/JjJKfg6DhOWAe9 DtAl/joz033KNq46tTX9Q788/vdR+v0h54zDSIFk7dpHCNCkQdlcY5DvxkeF0lMDztt8 X/p6Tczw4CaEIWPraOOs8ZLKKMtMW7P3n/5mys8VzZXzNEdV9dGOY9sSphCrZRoQ45sy C/1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761036262; x=1761641062; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qI+hF79G3saS4cJM9gBn0qvW7x/aK3K4EItDfXm9eIU=; b=sNIj7D+bCJHCtQs5Aha4BLmUY0CFcaOvNi0g2PU+udwODIjRVsqG1/sFQIYTPxnkcC uP5o152NVnT2JNHwY817/ZlAwjfpA4OA1WsYPzN4R6nneRv1xgXekuQ8SdFWNtM12jGC AHLTsWyf38ToKyxb4DyBFPQtztURvSlawEJ+ccUZ7XfOP3NObAWYix8qLSyVuLCo01dE JtcIeQmTXcWEBtptCIMFZadnKN+puPltpRYI4ybJkE/K+NU4ulIosdanwpMH/lZiXyR2 Y+7PSnMvJPwT9w0bY0T1yKsahHeCoIBM/4B+YMowgZgnVbts4Ovh0rPiaMk40Gw1WiOD VfBg== X-Gm-Message-State: AOJu0Yw8vVy+KNMprUT9Wp3aNG7efV4fvziAxEYMowQY2C4TaPCqpWYA CX5cclBG6UTEPREQPjCwwGZzmo/uUjVWjz3ZtjhvEViHRU0kzLeULi3MmQsiUyoeyo1iCg2rFaJ +gZuXmIE= X-Gm-Gg: ASbGnctWg3DI2sv2+7VgeV+gyQC8N+CtFN2/H89QZAyWoCeKjrj/hWaabIbo2ozge6U Kz5UcW23jwPMINYArwHOIAbASwpnYtaynOIutTORSdoaK2jHSFSXwhh6VasPNVuv+iiy/ZGRkwc cNtAAteJn+L3wQV0JZla7xrn0qMpktLhOFuUsAOz1vzDpEpEy5oUMzWQYvLa3LfGHdyQR69F5Ve NqdhF6SRPi5K/PutHySGv0j6INQv/eIXFeUiI8v4B8ouijO6cR0BmamjasXmODTiif8uGcaGJUb rhgjdKOUjaoAE/Wglo2WMb9S4TgKup7XFQRwPLDA4Yu7qRzNsSG59UbkMoRu7jTiivKFwCyrFhh 7NFkeMyfpi4gujfOr4ZZds57uemX46zEznql9aK+qRUWf6/UCd22779ehNggguVk/iqkK5o21qc QiKnxcPzxytcB1nYIxJ+60H73iGkyf7KL2ibMqia5DRRk5MKUqUw== X-Google-Smtp-Source: AGHT+IE8rS6VZYx/i8JiXQJLTMpGlcor/1LQLKzg9IWBTT3rtLq5Bk5Lslt0pycRlR21ilSWorrGLA== X-Received: by 2002:a05:600c:8b62:b0:45d:d97c:235e with SMTP id 5b1f17b1804b1-47117876bcdmr112776075e9.12.1761036262467; Tue, 21 Oct 2025 01:44:22 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Chinmay Rath , qemu-ppc@nongnu.org, Nicholas Piggin , kvm@vger.kernel.org, Paolo Bonzini , Harsh Prateek Bora , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 07/11] target/ppc/kvm: Remove kvmppc_get_host_model() as unused Date: Tue, 21 Oct 2025 10:43:41 +0200 Message-ID: <20251021084346.73671-8-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251021084346.73671-1-philmd@linaro.org> References: <20251021084346.73671-1-philmd@linaro.org> 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=2a00:1450:4864:20::334; envelope-from=philmd@linaro.org; helo=mail-wm1-x334.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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 @linaro.org) X-ZM-MESSAGEID: 1761036322486158500 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Chinmay Rath --- target/ppc/kvm_ppc.h | 6 ------ target/ppc/kvm.c | 5 ----- 2 files changed, 11 deletions(-) diff --git a/target/ppc/kvm_ppc.h b/target/ppc/kvm_ppc.h index f24cc4de3c2..742881231e1 100644 --- a/target/ppc/kvm_ppc.h +++ b/target/ppc/kvm_ppc.h @@ -21,7 +21,6 @@ =20 uint32_t kvmppc_get_tbfreq(void); uint64_t kvmppc_get_clockfreq(void); -bool kvmppc_get_host_model(char **buf); int kvmppc_get_hasidle(CPUPPCState *env); int kvmppc_get_hypercall(CPUPPCState *env, uint8_t *buf, int buf_len); int kvmppc_set_interrupt(PowerPCCPU *cpu, int irq, int level); @@ -128,11 +127,6 @@ static inline uint32_t kvmppc_get_tbfreq(void) return 0; } =20 -static inline bool kvmppc_get_host_model(char **buf) -{ - return false; -} - static inline uint64_t kvmppc_get_clockfreq(void) { return 0; diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c index cb61e99f9d4..43124bf1c78 100644 --- a/target/ppc/kvm.c +++ b/target/ppc/kvm.c @@ -1864,11 +1864,6 @@ uint32_t kvmppc_get_tbfreq(void) return cached_tbfreq; } =20 -bool kvmppc_get_host_model(char **value) -{ - return g_file_get_contents("/proc/device-tree/model", value, NULL, NUL= L); -} - /* Try to find a device tree node for a CPU with clock-frequency property = */ static int kvmppc_find_cpu_dt(char *buf, int buf_len) { --=20 2.51.0 From nobody Fri Nov 14 16:55:25 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=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1761036326; cv=none; d=zohomail.com; s=zohoarc; b=aU4E5QTI0JG6I+cHDLcW/bBXqcExMoa3EECaCvEusVo84ilwpP8KUSzJFAaXG9MuR4vL3QdfL1lI5VfvUcJld3LULgNSsZZut7ViOKbsnjtmtHl8/5huNzznD+EVC+i4/jYUvdQ/3YXSyqfZjtv0I9RxVmcppKkzRHjzrOCWpyU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761036326; 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=da9rOiPMCykHVjkJsbrqebc9pkYcny2T2/SQshegPgk=; b=kLP+zn011fDE6V4r2FADi4dWvPv80aFPCmDZwZOM5Q2oL9D/4W1ErpzlHIDlxNhBNrVVHLNE6sw/I5ZSKREX2zt+ASsMM6YAO2GvGJc5x5ExR5lMCUxIvcYiN7XrEh8ZBCUcRpwTYFxkVNHv/rEax4nOBazeYvYMTZSb4bzi8BA= 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=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1761036326821349.78638554242434; Tue, 21 Oct 2025 01:45:26 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vB7zU-0000nV-7s; Tue, 21 Oct 2025 04:45:12 -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 1vB7yq-00009Y-GZ for qemu-devel@nongnu.org; Tue, 21 Oct 2025 04:44:39 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vB7yo-0000xq-He for qemu-devel@nongnu.org; Tue, 21 Oct 2025 04:44:32 -0400 Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-3ecde0be34eso3636691f8f.1 for ; Tue, 21 Oct 2025 01:44:29 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-427ea5b3dabsm20200098f8f.16.2025.10.21.01.44.26 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Oct 2025 01:44:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761036267; x=1761641067; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=da9rOiPMCykHVjkJsbrqebc9pkYcny2T2/SQshegPgk=; b=dSP+7oAtRFSbR7i0WgqS0ztVqZvziNY7ohwWsI+j+InECt+lJ90dWsqTC7O7JTQFVi 4Ikj+tCB/e/XN406GPwBa0zCS+BsiUhBXCjh/qwhldKTa1qkmQjEr8XG2qKBGgGe11dU kbFXd6moofBIO7vaS5TjsQuSAnFGh7J6v8jrXzCOw88vGNxYRRWeaeKwFcssMEmSmXku ZPE9Y65Yt+lOLweVm+HWRuJnGzfpgSbyj5nh7crLx3vkKRiYt2BJiDS7dJKUW7/UkBpA QmvXAd63my5cguXzZJfqZ9DFyvQ4TsNVqhWnupLw5SWw4P53KJRn4rzXh2nRfHKFaXGq xfjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761036267; x=1761641067; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=da9rOiPMCykHVjkJsbrqebc9pkYcny2T2/SQshegPgk=; b=SWR+eBG4hyCBGOl2zEhf82lBfVFLxscAbJqLnaTDwa4TkzRfqmK8Be0nHljFYy0ZMs sZ+XQmX1ycLxdPX7pkD5XVK6UedNedW1D3ptDzgQwju9wBshwPtFw8MTGDZgdsgKAovC T/LZ62a8SXtc/uh99NTaDzmv5OGlvt82luoRAMf2u00GEVdKEl9KQAJBWT6owPTvDs2f +WuT2cgC0vAmILVOuURT2qX471ouXpIjfsyt73I8jHZKnWOodcuE/eJ9BTLOfNEnoTbM blf++SoXyxnwjAZK/nsqFinLbMvwt/LcAweAoHLdY0lLu7XNKuXkPHpM9genVUd6T/8a U17w== X-Gm-Message-State: AOJu0Yx+PX1Uzn5S/kVKpBbK7VH1mdTlYNxMT+amuIFa+Nl+jrNYkGUX 1wIh9qLDf/MJNTGu95tX+XOjcA0s4ANEYc9ONWGecBhvH9FLKe4wK68inI/5rNxTg2vfhDFsgju Z5l434Fs= X-Gm-Gg: ASbGncsXyLirn+1CldiA9MInoP6bXMkK29ElgLouHzdEcLOwxcUh79z8Pu5nrY+8UdC dQfNOUeYFWPx5wRqQ+kwk5JG0AF0Bw+KMnj0ODQiZNSmc/gXLErNpA+Qwqpgq1/QW15pmUwW5gr tyGul9ffT9cTNtREWOMZOuV+/wc32eEwajK3B2s3WDjiGGCfWfbWULJyY6u8a5+gSKpFwtEBxOX bas7Dg8iA28Il0rCCa/qOtb/I5aca1qZQN3OD9FIrj7DBDijHOwfI2GgRKGuXtqlmYMepRuI9ig Xiz/OjwrvBwTAdS6d5CWzh53qzWXbnyxlWq9+oG5zrGwHguJMAZcNLH7r9aM56qr+qv0NYp5w9Z ZHo+N+pSG154OdlzzTgCzUkwpECRnkBJWFvLayOWSm2WdvkHcVHQSAQndmQXYlwVHdOMRzyIt1d IUkZtlLrGU6ZC3KNMgpc6RTt8CYwCd3sCv+5ek4XFyNPQcFHFwwA== X-Google-Smtp-Source: AGHT+IGdNU6grxDa0fovZHVQYjLk03VGAqM6vVuoTYaGlfenMJOg7eXSZCsDKxqPUFu1TflYXqOl4A== X-Received: by 2002:a5d:5849:0:b0:3e7:6424:1b47 with SMTP id ffacd0b85a97d-42704b3db46mr13625580f8f.6.1761036267320; Tue, 21 Oct 2025 01:44:27 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Chinmay Rath , qemu-ppc@nongnu.org, Nicholas Piggin , kvm@vger.kernel.org, Paolo Bonzini , Harsh Prateek Bora , =?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: [PATCH v2 08/11] ppc/spapr: remove deprecated machine pseries-4.0 Date: Tue, 21 Oct 2025 10:43:42 +0200 Message-ID: <20251021084346.73671-9-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251021084346.73671-1-philmd@linaro.org> References: <20251021084346.73671-1-philmd@linaro.org> 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=2a00:1450:4864:20::42d; envelope-from=philmd@linaro.org; helo=mail-wr1-x42d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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 @linaro.org) X-ZM-MESSAGEID: 1761036328629154100 From: Harsh Prateek Bora 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 [PMD: Remove SpaprMachineClass::pre_4_1_migration field] Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/ppc/spapr.h | 3 --- hw/ppc/spapr.c | 27 --------------------------- hw/ppc/spapr_caps.c | 12 +----------- 3 files changed, 1 insertion(+), 41 deletions(-) diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h index 1db67784de8..58d31b096cd 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -139,11 +139,8 @@ struct SpaprCapabilities { * SpaprMachineClass: */ struct SpaprMachineClass { - /*< private >*/ MachineClass parent_class; =20 - /*< public >*/ - 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 ad9fc61c299..deab613e070 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -4969,33 +4969,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 0f94c192fd4..170795ad6ad 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 16:55:25 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=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1761036377; cv=none; d=zohomail.com; s=zohoarc; b=XO0b4DLGO7H0ijm99p7bS+ENI+95P/hkAf2921aJYfKQm7nHSmDNX4O+aJO8IaldRY+8fCBR8TZbMMOloMJv9yYaUcIYpbDL5E0mEgr1OoYsDNchNVFZ+OMseN11rbDuro4OxIN6DV9yHA9hZX4nju2Zei7bQfWOyOzRiSTivAA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761036377; 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=hc11YiHtpmTqY0in4skO46MnwNo1SXkNGODEq2TMsMU=; b=dHzayleFGbb+aE0hU8I03AcT4POMgxB1GMSINaZL9B6trEDddBggoJy55NYCGtMM5EwqqaP/5KMMDgFI1cHGjXLRQqyPo4LgMkjIGAaJC5Q3ZHHySx/cURHLnaKkWXXFKDC9/Ne0Up+VwmPusITTaW5gYB5Xc2I00OE4699hhro= 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=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1761036377778937.6930953846132; Tue, 21 Oct 2025 01:46:17 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vB7zP-0000YT-Lx; Tue, 21 Oct 2025 04:45:07 -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 1vB7yw-0000FV-JE for qemu-devel@nongnu.org; Tue, 21 Oct 2025 04:44:43 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vB7yu-0000yD-1S for qemu-devel@nongnu.org; Tue, 21 Oct 2025 04:44:37 -0400 Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-4270a3464caso2279850f8f.1 for ; Tue, 21 Oct 2025 01:44:34 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-427f009a7dasm21117154f8f.25.2025.10.21.01.44.31 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Oct 2025 01:44:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761036272; x=1761641072; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=hc11YiHtpmTqY0in4skO46MnwNo1SXkNGODEq2TMsMU=; b=nN5n4R+xmK5neek1jPFXgb163XunnfSQLTO2aEq+6UofrD1G628WrS9aGj3XNJNadQ iOYZTIDh8VRggkRK3Y7Vtrf0o5RRkRavYcN/3hyK2po5zY2Dj1DmhoDD7cMTDORK2G05 PjpqjT012jmoXadwVQv0qkgfYiXR3MbhkU2e5GQ8h/4uMDOUXk4SMx5l3esRPRVDnN9t 48ZDPrbQ8BhQwTxR2H5Cnqr52tcb3lNLtUAtgkH0uvzZ5mtIig23wZAsG2ykbLEmlRsC g/uQu1YFpgFOoFwSB2a35uMFpzyY9ggtrnzv4At3k6aEjRwj+iIVtuFFaTO64GrlO8nA UJvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761036272; x=1761641072; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hc11YiHtpmTqY0in4skO46MnwNo1SXkNGODEq2TMsMU=; b=cLG26bb7jVnPNouxG01u78p1Ey3HfdzVGcs/XWN75NV5KReNTYxnBEAPvkNvb12fcu efimRlTU65n56tAcqcGGOOgJ4zxQBOlvo80SAAtD7hyfy7V9KmLCpe++1FS/gtkboQVa xG5ScO0h5LrhTzb4th5fItNXxBcU74ccbUJP8MhnwrZ7lB/nHsNaUNbQ0jjESA1+8k0B 65JG291rHS95Ozlivt+uyIMkQXg26hJ5gS2p+bC4KY+P4gS83Uf5J4M+CZdMAut4t+qu g5rAkULKPzbs6McIODqtHiSz6QHGjuH2M4gGKnPp2lH9ZlJi1sWmuh3Ht7bGYe49qBts wzPA== X-Gm-Message-State: AOJu0YzkGxBNg+Z2jb+XstwLAy+XfewScfNXD+h04qqnEBeNEaN7VXBA dFOk+j/cEti/kkiUsSZr8CYrqPRHuBdIB6138FYRVgNOQVd5OEfC2aNzxsHl0/zoQ7/goh0LKE2 fgriXknw= X-Gm-Gg: ASbGnct4z+ayQkk1gMNl2bS8c6W+ZReya4QlgV0EyErzLQ3TOlkhl9MUUfuxnkGpSPa kBcgiwqobIDzMUJsb3Z9pSmOFomFmVTRrAwL5XjojuZlUpt/mXNAqErLjfn9LZC0LsGwFHfq7la vZ0W+agUZvHDb7FzSbpuWqZWaCOjG+g1WlHBb0evgmAocb4nC1KGfUkv6AwgXqVKuitqQmbEBgl ed3w3sFRA1uRTU6ZjspRi1STWBbOMpcscvIDWmQMgtCj2kTqB4mKhsk5lcLimcviTWr+gXAyy36 SCpXHj+zbD8sa8ShA1dqSQoTNT72PQtxnQSWrs/BWeXDZwZFmZiswqjmWtPVIWfeaBW3bteNlVi z2ubTDHu3sZSc/Hj1mWJTzcB+25eKqyrMCkdQZapliASGCbln+diEA7AkLom2cS7aUgPXcLsjr3 pJ4J0hBo1ihzR1+41bsOV3p4ygkK5QyhEqDnA4hTQrc+/HLEsbWMdW3LJH0tSAKZSUi+FVBVE= X-Google-Smtp-Source: AGHT+IELZJiJfnJbVwdX1Os9p1hmB3XIZTwQOpbzRswBJhyGYUnWFGq++RhkpkJDYQ54jVhPBYkK3g== X-Received: by 2002:a5d:64c7:0:b0:427:8bc:a3c5 with SMTP id ffacd0b85a97d-42708bca6b2mr8568193f8f.37.1761036272084; Tue, 21 Oct 2025 01:44:32 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Chinmay Rath , qemu-ppc@nongnu.org, Nicholas Piggin , kvm@vger.kernel.org, Paolo Bonzini , Harsh Prateek Bora , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 09/11] hw/ppc/spapr: Remove SpaprMachineClass::phb_placement callback Date: Tue, 21 Oct 2025 10:43:43 +0200 Message-ID: <20251021084346.73671-10-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251021084346.73671-1-philmd@linaro.org> References: <20251021084346.73671-1-philmd@linaro.org> 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=2a00:1450:4864:20::42d; envelope-from=philmd@linaro.org; helo=mail-wr1-x42d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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 @linaro.org) X-ZM-MESSAGEID: 1761036379186154100 The SpaprMachineClass::phb_placement callback was only used by the pseries-4.0 machine, which got removed. Remove it as now unused, directly calling spapr_phb_placement(). Move spapr_phb_placement() definition to avoid forward declaration. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Chinmay Rath --- include/hw/ppc/spapr.h | 5 -- hw/ppc/spapr.c | 114 ++++++++++++++++++++--------------------- 2 files changed, 55 insertions(+), 64 deletions(-) diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h index 58d31b096cd..bd783e92e15 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -147,11 +147,6 @@ struct SpaprMachineClass { bool pre_5_1_assoc_refpoints; bool pre_5_2_numa_associativity; bool pre_6_2_numa_affinity; - - bool (*phb_placement)(SpaprMachineState *spapr, uint32_t index, - uint64_t *buid, hwaddr *pio, - hwaddr *mmio32, hwaddr *mmio64, - unsigned n_dma, uint32_t *liobns, Error **errp); SpaprResizeHpt resize_hpt_default; SpaprCapabilities default_caps; SpaprIrq *irq; diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index deab613e070..97736bba5a1 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -4068,12 +4068,62 @@ int spapr_phb_dt_populate(SpaprDrc *drc, SpaprMachi= neState *spapr, return 0; } =20 +static bool spapr_phb_placement(SpaprMachineState *spapr, uint32_t index, + uint64_t *buid, hwaddr *pio, + hwaddr *mmio32, hwaddr *mmio64, + unsigned n_dma, uint32_t *liobns, Error **= errp) +{ + /* + * New-style PHB window placement. + * + * Goals: Gives large (1TiB), naturally aligned 64-bit MMIO window + * for each PHB, in addition to 2GiB 32-bit MMIO and 64kiB PIO + * windows. + * + * Some guest kernels can't work with MMIO windows above 1<<46 + * (64TiB), so we place up to 31 PHBs in the area 32TiB..64TiB + * + * 32TiB..(33TiB+1984kiB) contains the 64kiB PIO windows for each + * PHB stacked together. (32TiB+2GiB)..(32TiB+64GiB) contains the + * 2GiB 32-bit MMIO windows for each PHB. Then 33..64TiB has the + * 1TiB 64-bit MMIO windows for each PHB. + */ + const uint64_t base_buid =3D 0x800000020000000ULL; + int i; + + /* Sanity check natural alignments */ + QEMU_BUILD_BUG_ON((SPAPR_PCI_BASE % SPAPR_PCI_MEM64_WIN_SIZE) !=3D 0); + QEMU_BUILD_BUG_ON((SPAPR_PCI_LIMIT % SPAPR_PCI_MEM64_WIN_SIZE) !=3D 0); + QEMU_BUILD_BUG_ON((SPAPR_PCI_MEM64_WIN_SIZE % SPAPR_PCI_MEM32_WIN_SIZE= ) !=3D 0); + QEMU_BUILD_BUG_ON((SPAPR_PCI_MEM32_WIN_SIZE % SPAPR_PCI_IO_WIN_SIZE) != =3D 0); + /* Sanity check bounds */ + QEMU_BUILD_BUG_ON((SPAPR_MAX_PHBS * SPAPR_PCI_IO_WIN_SIZE) > + SPAPR_PCI_MEM32_WIN_SIZE); + QEMU_BUILD_BUG_ON((SPAPR_MAX_PHBS * SPAPR_PCI_MEM32_WIN_SIZE) > + SPAPR_PCI_MEM64_WIN_SIZE); + + if (index >=3D SPAPR_MAX_PHBS) { + error_setg(errp, "\"index\" for PAPR PHB is too large (max %llu)", + SPAPR_MAX_PHBS - 1); + return false; + } + + *buid =3D base_buid + index; + for (i =3D 0; i < n_dma; ++i) { + liobns[i] =3D SPAPR_PCI_LIOBN(index, i); + } + + *pio =3D SPAPR_PCI_BASE + index * SPAPR_PCI_IO_WIN_SIZE; + *mmio32 =3D SPAPR_PCI_BASE + (index + 1) * SPAPR_PCI_MEM32_WIN_SIZE; + *mmio64 =3D SPAPR_PCI_BASE + (index + 1) * SPAPR_PCI_MEM64_WIN_SIZE; + return true; +} + static bool spapr_phb_pre_plug(HotplugHandler *hotplug_dev, DeviceState *d= ev, Error **errp) { SpaprMachineState *spapr =3D SPAPR_MACHINE(OBJECT(hotplug_dev)); SpaprPhbState *sphb =3D SPAPR_PCI_HOST_BRIDGE(dev); - SpaprMachineClass *smc =3D SPAPR_MACHINE_GET_CLASS(spapr); const unsigned windows_supported =3D spapr_phb_windows_supported(sphb); SpaprDrc *drc; =20 @@ -4092,12 +4142,10 @@ static bool spapr_phb_pre_plug(HotplugHandler *hotp= lug_dev, DeviceState *dev, * This will check that sphb->index doesn't exceed the maximum number = of * PHBs for the current machine type. */ - return - smc->phb_placement(spapr, sphb->index, - &sphb->buid, &sphb->io_win_addr, - &sphb->mem_win_addr, &sphb->mem64_win_addr, - windows_supported, sphb->dma_liobn, - errp); + return spapr_phb_placement(spapr, sphb->index, + &sphb->buid, &sphb->io_win_addr, + &sphb->mem_win_addr, &sphb->mem64_win_addr, + windows_supported, sphb->dma_liobn, errp); } =20 static void spapr_phb_plug(HotplugHandler *hotplug_dev, DeviceState *dev) @@ -4345,57 +4393,6 @@ static const CPUArchIdList *spapr_possible_cpu_arch_= ids(MachineState *machine) return machine->possible_cpus; } =20 -static bool spapr_phb_placement(SpaprMachineState *spapr, uint32_t index, - uint64_t *buid, hwaddr *pio, - hwaddr *mmio32, hwaddr *mmio64, - unsigned n_dma, uint32_t *liobns, Error **= errp) -{ - /* - * New-style PHB window placement. - * - * Goals: Gives large (1TiB), naturally aligned 64-bit MMIO window - * for each PHB, in addition to 2GiB 32-bit MMIO and 64kiB PIO - * windows. - * - * Some guest kernels can't work with MMIO windows above 1<<46 - * (64TiB), so we place up to 31 PHBs in the area 32TiB..64TiB - * - * 32TiB..(33TiB+1984kiB) contains the 64kiB PIO windows for each - * PHB stacked together. (32TiB+2GiB)..(32TiB+64GiB) contains the - * 2GiB 32-bit MMIO windows for each PHB. Then 33..64TiB has the - * 1TiB 64-bit MMIO windows for each PHB. - */ - const uint64_t base_buid =3D 0x800000020000000ULL; - int i; - - /* Sanity check natural alignments */ - QEMU_BUILD_BUG_ON((SPAPR_PCI_BASE % SPAPR_PCI_MEM64_WIN_SIZE) !=3D 0); - QEMU_BUILD_BUG_ON((SPAPR_PCI_LIMIT % SPAPR_PCI_MEM64_WIN_SIZE) !=3D 0); - QEMU_BUILD_BUG_ON((SPAPR_PCI_MEM64_WIN_SIZE % SPAPR_PCI_MEM32_WIN_SIZE= ) !=3D 0); - QEMU_BUILD_BUG_ON((SPAPR_PCI_MEM32_WIN_SIZE % SPAPR_PCI_IO_WIN_SIZE) != =3D 0); - /* Sanity check bounds */ - QEMU_BUILD_BUG_ON((SPAPR_MAX_PHBS * SPAPR_PCI_IO_WIN_SIZE) > - SPAPR_PCI_MEM32_WIN_SIZE); - QEMU_BUILD_BUG_ON((SPAPR_MAX_PHBS * SPAPR_PCI_MEM32_WIN_SIZE) > - SPAPR_PCI_MEM64_WIN_SIZE); - - if (index >=3D SPAPR_MAX_PHBS) { - error_setg(errp, "\"index\" for PAPR PHB is too large (max %llu)", - SPAPR_MAX_PHBS - 1); - return false; - } - - *buid =3D base_buid + index; - for (i =3D 0; i < n_dma; ++i) { - liobns[i] =3D SPAPR_PCI_LIOBN(index, i); - } - - *pio =3D SPAPR_PCI_BASE + index * SPAPR_PCI_IO_WIN_SIZE; - *mmio32 =3D SPAPR_PCI_BASE + (index + 1) * SPAPR_PCI_MEM32_WIN_SIZE; - *mmio64 =3D SPAPR_PCI_BASE + (index + 1) * SPAPR_PCI_MEM64_WIN_SIZE; - return true; -} - static ICSState *spapr_ics_get(XICSFabric *dev, int irq) { SpaprMachineState *spapr =3D SPAPR_MACHINE(dev); @@ -4606,7 +4603,6 @@ static void spapr_machine_class_init(ObjectClass *oc,= const void *data) smc->resize_hpt_default =3D SPAPR_RESIZE_HPT_ENABLED; fwc->get_dev_path =3D spapr_get_fw_dev_path; nc->nmi_monitor_handler =3D spapr_nmi; - smc->phb_placement =3D spapr_phb_placement; vhc->cpu_in_nested =3D spapr_cpu_in_nested; vhc->deliver_hv_excp =3D spapr_exit_nested; vhc->hypercall =3D emulate_spapr_hypercall; --=20 2.51.0 From nobody Fri Nov 14 16:55:25 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=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1761036365; cv=none; d=zohomail.com; s=zohoarc; b=ehnxqIIhYoCIQg+pT2es3Cgcg7ggxD2nPaGCMiyuiLPlogvUN6QFM7wiuP9q8jxDJnWLXO6brD/tJWfATzDvPPxWwL1ES/o3GhzuevBo1Ag5KUOT1cTPGY+5w1vkX6STSmO9E4ilYBSHtzjyDpDAPhW5kXaEJxtI6d1aVuVFuLo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761036365; 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=YiNDg4LVvxXZPHJPsAi2okquB/BtvFBYXh1pXELbRqU=; b=e+97JXY5rW9xt7pNmAQcQHODhh1k2PxVduLvYOkAlCuvdlgi13uj5K3iszbpx8K1LUGWMehsxAg6oTkSzbr/R0+sT1rcNNxpUhsAPhFtpRpcyZ2Bo5NH17cusrSol9U/oHoMI8eACs5XJ5qTuiQXZy16/FcMyQWfZ4pF7GMNlrk= 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=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1761036365545498.6448763484767; Tue, 21 Oct 2025 01:46:05 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vB7zU-0000q2-IA; Tue, 21 Oct 2025 04:45:12 -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 1vB7z2-0000GN-4k for qemu-devel@nongnu.org; Tue, 21 Oct 2025 04:44:48 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vB7yx-0000yY-M5 for qemu-devel@nongnu.org; Tue, 21 Oct 2025 04:44:43 -0400 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-47117f92e32so34539565e9.1 for ; Tue, 21 Oct 2025 01:44:38 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-427f00ba070sm19433697f8f.42.2025.10.21.01.44.35 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Oct 2025 01:44:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761036277; x=1761641077; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=YiNDg4LVvxXZPHJPsAi2okquB/BtvFBYXh1pXELbRqU=; b=tMygp0z3nGYfqjltQ68kba0mh08AOO9wF2JIDVuvbFo0uEzQTNkm66LVvb7GCjQAlR ePYL1LEB0fDzIP5EQMexqQGZal+3AGzL+6woGPhvHpO3efXnecuzETSvqKy4OBU4i6Ey NOlmTYE0xjzsiNyI14ZqSDOS6VZUFGegXC8HRfsom0Gbt0nidCFtfk/t8YtV/khGp4Kk rDCfdZys4vH0He/SyRvYRwyCUVeVOpCXqKK068zrGCBIIUfg33v04eSCwk4/DKm2/yei R4GuG2Gjr1Hu/GFz1LGq9MHUhzlTkrQ1TXZDfPwwEkr9sWn5eGAJypB4UTGRJs0OVL8L Un9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761036277; x=1761641077; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YiNDg4LVvxXZPHJPsAi2okquB/BtvFBYXh1pXELbRqU=; b=qmuae3w/Q2zrZ7vIyD0iLOm/7L2RDqlA2jegpnQZe9P3qDjrdZBS6uWcTlERrx+WMb x7e05jHjvIl9hRJ2xe255tAo0Zedkr0ouIEpSot7os8PqAgTzKbuPpLJCTsyzjuF4HtP Q6YLJ3t+cE+JCovcSG3VWKC5Ntj8zEFHct9NM9veXjUK6RHyxKTMlwo9SdUCeWlZhAut uXY8+DrukvBbzqlX9EpGI7bogF2FvzG4nii5l2D9fFA+t5AJx2UJQN6oe4P79YKEibWJ jZFNot29Attx/ZbW3KTr2l9Le2LXVPMQJVnkM4WuR3TqpCahdNdTIMdEyf8s/4DU1BDF LKgg== X-Gm-Message-State: AOJu0YysKSxk/T8Gf1tEZHuvaR0fLLlYAGDjH5gh2IYrPkJqMEoKrHyw f5yQ8h3s8HLWei564C+sOaM1UomqG0CfFWGwTm8uDb+sX8ZLRYrrolyEzugctMg0ZCZtwt/GTSW 3sgZhvuQ= X-Gm-Gg: ASbGncvwTrrJbqzEuhCSRBVU8DyE9AhAdux2KjHMfdh7yeYBOGYIsEeVkeR/vRUe0ZT 1fNLwiGlC4myzWxmVAaSAPKJ1IrDrPdgfrckj2liabkWiL/40/5MmC/bRM29OOBY0tD+4qXF9On UDtkrpviLQH/jFgNcVeWZU4SI1UKBl4tmUXGtGParD+Y0A3V8KA/5yHxlbC2gDY12xO9g0FuNmA gFUlyKJDt52ZGlrtveRycoK2jwcgvYaQMUCxXOgPmSn6hr3CiwXn7b0wvTgkE4l0fDPfMev/1wV ZR83tKCY6mjw9YH4kiyxgZhGJ1hb4UwiscZgOHKJX+aynDpR8xW4wVMZnSsWYn9udXv+GFnlo/F AMl1/Z0R0EgYnOK8bKovBDg8Vt5KsvTOrqgTgvkxnHRcBYz9mXDtd+2+WfjRa23imZdTn+oxNG4 EzVyQqGtmTKrIj8ZlTcgbqc7jWOzWNOdWIa6hKItKdrZ06vkceTg== X-Google-Smtp-Source: AGHT+IFhdkGQ+xzP76a1LK0Af58A5E8eJm2BpI+tUG3OCKUOZ2eJKgJRKsDfRIa0WxL1F37pxSSykw== X-Received: by 2002:a05:600c:828a:b0:46e:39e1:fc3c with SMTP id 5b1f17b1804b1-4711787617amr115466015e9.5.1761036276871; Tue, 21 Oct 2025 01:44:36 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Chinmay Rath , qemu-ppc@nongnu.org, Nicholas Piggin , kvm@vger.kernel.org, Paolo Bonzini , Harsh Prateek Bora , =?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: [PATCH v2 10/11] ppc/spapr: remove deprecated machine pseries-4.1 Date: Tue, 21 Oct 2025 10:43:44 +0200 Message-ID: <20251021084346.73671-11-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251021084346.73671-1-philmd@linaro.org> References: <20251021084346.73671-1-philmd@linaro.org> 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=2a00:1450:4864:20::334; envelope-from=philmd@linaro.org; helo=mail-wm1-x334.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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 @linaro.org) X-ZM-MESSAGEID: 1761036371245158500 From: Harsh Prateek Bora 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 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- 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 bd783e92e15..60d9a8a0377 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -141,8 +141,6 @@ struct SpaprCapabilities { struct SpaprMachineClass { MachineClass parent_class; =20 - 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 97736bba5a1..a06392beff1 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); } @@ -2589,7 +2586,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(); @@ -2625,15 +2621,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; } @@ -4649,8 +4636,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; xfc->match_nvt =3D spapr_match_nvt; vmc->client_architecture_support =3D spapr_vof_client_architecture_sup= port; vmc->quiesce =3D spapr_vof_quiesce; @@ -4945,26 +4930,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 16:55:25 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=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1761036327; cv=none; d=zohomail.com; s=zohoarc; b=VFybDbEGjqIc00NXwnl7y0uUpIFqO8vrHxsfBSu+l/yYrqEuei0h7nj145hNdcw/m+0V11dll01mZaXS5doAjXp5MXPf6uLIQigFqEQGu7gBDOmPhfSldjnhFVCeMn5zyv6Nb7RRiTU9G4WBeEnFRvlx7b6h3zQZ5EuDoKugSSI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761036327; 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=a6Urqf2BFQoz6tGL67HiUuAvlfebveNoSUnXOo9Qq+w=; b=JyHQbNER1xt6y5vkO2Rbyfl36msLIVDMy+WtsPbDN9ef3CSIoPN2OCjb1D4NHCqLaBOwCeMIlml6o9UTfhWJTEoshAmJwZKpXNn+nQn+Z/TkZfHfLV0GyuEFpCr0a2unURwan0muLBK+VVen0hnFvq5wMDIwT09wSW9mLRWXu3Y= 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=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1761036327603502.22895217865823; Tue, 21 Oct 2025 01:45:27 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vB7zQ-0000dV-No; Tue, 21 Oct 2025 04:45:09 -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 1vB7z5-0000Io-DK for qemu-devel@nongnu.org; Tue, 21 Oct 2025 04:44:49 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vB7z1-0000yx-Tg for qemu-devel@nongnu.org; Tue, 21 Oct 2025 04:44:46 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-47114a40161so10079185e9.3 for ; Tue, 21 Oct 2025 01:44:43 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-47496c43f68sm11891395e9.5.2025.10.21.01.44.40 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Oct 2025 01:44:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761036282; x=1761641082; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=a6Urqf2BFQoz6tGL67HiUuAvlfebveNoSUnXOo9Qq+w=; b=bQ0/NrlVxXwZf6EQvIUK7VPhTU6wt89GcphafSFpXEZ3uveQXBDt+XbQ3MeoN/wobe 5JoThl+/QtPswtF56YaVk1uZeOREN3I3YbOYPcx+YBwaXroa4i36u0Pl7AP9FNPMrhiM Q8Mtoig4fbXl5mfkrfE5Cie/oHpjnINUA33SQFYAnziaRzfnkgiSgWjfmzOpxOYmV+zD KpZLcNpR8owc/ajm4cvERcqQNXWq/v9l+biPehlAPshJX5u/k5ipXKaIBulav8gZcbDx DDh3V4USs+C8XjbE/UVFX6j4joAISikzUiMUShbIHGV1fWkHaGSwpxW/Ben3/NbRBoO5 e1rQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761036282; x=1761641082; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=a6Urqf2BFQoz6tGL67HiUuAvlfebveNoSUnXOo9Qq+w=; b=DoF4oUGl6yxk6wMhSlXSJtCDpzEQlkS69eMT453Np7lRCKOJvUEd5OoVydPOsYZRnI /5JyCeC4Js9GBLusvNRIXjQT/XOUEjYGiQEKUPSfPEMMpoQCg7WnUqXStczhkN3ojbPZ Puy990gmD/lYGhCh+CO2q/lBw7NRRZN11vtc2Edx4lRJyJq4ZR3YPn6VGoWz3zFDIxwC 0xWZ0L8do5qjuzQxBMNgqNgkBaDh9SSrgaJB26EPgl79fyhO6E+k898PiQWuxR68tKPw j4JXWJ1WH66jQvmjGYYEWkLGq8YGMvVnrHtxWQhH8xGQaznUcpaHdz7fXBYSda3HESZp w7dA== X-Gm-Message-State: AOJu0Yyu3mvsNkMsqfbSP4rVI5sY3z2Atukvm4baFlX4DPqj+ZUVj7Cn cHWt/aJv3F9c6UGn2tFN1eBySuaDU+DYy7Br75ky298LczXJ8/svu3Vqu9oV5K5EBT9Cdl9UcSb hHN0JGMM= X-Gm-Gg: ASbGncskoaaLoRdSyfHa422ZY5cAJfeZv2jrrimRFZsqrYDEl80x9EMYh/9q9sS2fNt gJmWQZUEAuH9TRYm+2AmEmK0YtdvgiB9nIA7thf/tyCezcBg+k077thg8VZTmbNYobt3Fhvinsv BgnHHbOfxyQNF3P26mQAVpr/aJutCDTlhOI83QLd54Ul+CV+tc2JrgfzibS/JvDOjwPqfcAOhPH A7n4gKSs6+xRupiraT7fIR5oQPkxDmA7d/rX3wT8Cqq3A8MHM7tW22vzoJmfSByXjOVxTqFH7qz AHBTpIlqlrC1/26S05b/TjRRfd3xovIFnMZzNXWVPnMQq4xJM1IVVXVIAM2a43ZaiocG35I+33w 8kucK09BTI59jkayhM24pwWpOwyVj7Ztjsb49H+jz4Qk8bXlqu3i26JdEkTb3bcijOET+0QY5hR rH6fArqr96MIYWuU94STKYbNBdhwMdMRavLaGO1RBaT9YIf7bMvQ== X-Google-Smtp-Source: AGHT+IHH5GeVeaqK1SOYHRnV5hnEGg+hDnGH3BWGPiH6VG3b1oQcncz2qQzO9HI9FYrWzz+B7lIX0Q== X-Received: by 2002:a05:600c:871a:b0:46f:b43a:aeef with SMTP id 5b1f17b1804b1-4711791d923mr96345475e9.38.1761036281808; Tue, 21 Oct 2025 01:44:41 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Chinmay Rath , qemu-ppc@nongnu.org, Nicholas Piggin , kvm@vger.kernel.org, Paolo Bonzini , Harsh Prateek Bora , =?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: [PATCH v2 11/11] ppc/spapr: remove deprecated machine pseries-4.2 Date: Tue, 21 Oct 2025 10:43:45 +0200 Message-ID: <20251021084346.73671-12-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251021084346.73671-1-philmd@linaro.org> References: <20251021084346.73671-1-philmd@linaro.org> 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=2a00:1450:4864:20::32b; envelope-from=philmd@linaro.org; helo=mail-wm1-x32b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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 @linaro.org) X-ZM-MESSAGEID: 1761036328610154100 From: Harsh Prateek Bora 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 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- 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 60d9a8a0377..b9d884745fe 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 a06392beff1..b6f151d7468 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.51.0