From nobody Fri Nov 14 16:53:45 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=1760956734; cv=none; d=zohomail.com; s=zohoarc; b=FqbQCi+WrJA3thqsXUB5+VyP7CyGYeqcmXEKYObkT//eQszBv7nQv7Dj/UNHIP01BmgGIy2TlQGLpCPaXlmHJKxVaGLkCiIEHkqXB1QZ5Zww+TEj1zX+TotrTvRSiWUlPaRqRCHn5HvBFn/IdX7KNcrlZXVfRb8QEa/FwfNZPHA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760956734; 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=Eb2zFhHkdjNt2ehW35HLRPZBhm40gE3e2lVHvPQ87tw=; b=Q6Co9uUhLrYV0KaF6SVAxg3PunlZn2XvIGoi4xQ+7a04k3MqaFa6KAPxqsV0el9zVSVYWAjBIr5FkKVHFCn3aLWB++WbUorH/Dv5iOrhXzBfbi/lFpjadUa/PK4mta1LztlpaT42aQomn0LnZaJqOmKrKqTYBTnA/GtNSUo8id0= 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 176095673457675.4709570912222; Mon, 20 Oct 2025 03:38:54 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vAnHX-0000NN-S3; Mon, 20 Oct 2025 06:38:27 -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 1vAnHW-0000Mn-JB for qemu-devel@nongnu.org; Mon, 20 Oct 2025 06:38:26 -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 1vAnHU-0000DF-QN for qemu-devel@nongnu.org; Mon, 20 Oct 2025 06:38:26 -0400 Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-4283be7df63so989233f8f.1 for ; Mon, 20 Oct 2025 03:38:24 -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-47154d382d8sm141032845e9.12.2025.10.20.03.38.21 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 20 Oct 2025 03:38:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760956702; x=1761561502; 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=Eb2zFhHkdjNt2ehW35HLRPZBhm40gE3e2lVHvPQ87tw=; b=rL+GHqUGmGbN7cXaH2dT5s5lGD1YZQyDmdg7wNh2xYjUpW0iMBJUU95Cz2JVjyrbrs chX0QUKW7Zt4HQ750+79tGxt+OupFqgONxpJpNTNEHuJfk9LayfrQHiHC2bFFlJcWUxX OrVH6vmN6DIoAymir6LesXDKtqLF7C0ocsHfd3kkc2Kxywj2Ry2R4Jlgl49NEcl9bb0b bA/jVr/PQF0iqtQn1+uM7AY5M5rsufCt/Gq9IxIqd1I4w4PqhrEMtw2I8sxK7Qnbgn3D a0+mBV3wJhAhhvZfj6Px3/L1SgDv+rK7QoTnFZ5G0l25cU76T0KrWx8/FTyFf8IDoBkc Pxgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760956702; x=1761561502; 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=Eb2zFhHkdjNt2ehW35HLRPZBhm40gE3e2lVHvPQ87tw=; b=TYBq+6syLHPv8Qe+fWdh7aqX6VEWtrVHui/P4u6UuoBxQUiK4VP0KsVolM5rE6NHCb lWUTSs7Uv142SxWffm1AObgLrV3ydGN9A7aHiKPu2RaeFxoqtWhEC+lus/xr6FYc6M5L sWVfX6bsYqLr1q2yoLc8GQPxlTdfepA8HJ8JHwOk7MKt7hNz1oqnGoI4rPg+ggKB+Saj XpP/DeYF/GG6kCTr3+vDFnWVgrAsLlMDn/VYbrX/bXbb2ffBdG/bor3duR5eK1JwZ3iQ BCZrM20zMOqbUkExiB+E6rxYukG0wORKA5T+ykpmn+PeOhcRkGP6Kgbdp/hgdfm980Nc 7Plw== X-Gm-Message-State: AOJu0Yw1M2jYw+dd2LTn9iVUdhEHypp4pTovLplgxHVMCPeJpvAUaABQ Yqi38pp2SK5w5S2mcnHSMA2FRTCQFy7LxH2Ct6rJdKOfatNLRhO2zgLJfG2BvQ6RWWgJKxuh9xK ZWsn2Ypc= X-Gm-Gg: ASbGncv8CkWsMnQFmS9zsv00aBZiGGany7kxadhx/TlblF8IOapx4UKd9ncx8f0M8Mz /KLtpBc5AelgggOTlqOCk2R7Xxqq/EAqG8O/lffR+1rNxbhW1tx7Xg5w+4CH6pYfGMngfXNp1xi b6ZVVxyolBFOACeqDKSpGHmGEWOa27QzcUZI2Ji9xXrWweRGDUKaMgsb6iqg1oED7OMZxQ32vX6 VrAwJ+ccW81+JZbKtHUEh8Uxi9EG8ZQnoB2YLyVi8QNaKLGVTa4VytK0SYK0058Hw3IAk24Znty lA1RP8xIUG9VoIq6tpnDXKWhykCI4gxboVVhBD5lP64XDL0PJIiuyfIu4F80/t1aK77sxUb/4vq aGrxLmSZfOgyT3HorV1zGVks44TZnXA3sautw4TRwDVGjx/rADdT9/mT6FSaBxnPrrXANZHObFb YmJ7Yj+cAFJ7/iXPcEscrd1rYJqdoJquqHfM8Dabx1IcZJvBgK2w== X-Google-Smtp-Source: AGHT+IFXtCupIGDq2siVPGNf1Z5WcGOG8FPQCLDkC6kjb+5DMC1Dp8EAQOlPDFoxVNiZGk46JqVF8g== X-Received: by 2002:a05:6000:25e1:b0:427:580:99a7 with SMTP id ffacd0b85a97d-42705809a1emr7079805f8f.59.1760956702518; Mon, 20 Oct 2025 03:38:22 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Nicholas Piggin , qemu-ppc@nongnu.org, kvm@vger.kernel.org, Chinmay Rath , Harsh Prateek Bora , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 01/18] hw/ppc/spapr: Remove deprecated pseries-3.0 machine Date: Mon, 20 Oct 2025 12:37:57 +0200 Message-ID: <20251020103815.78415-2-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251020103815.78415-1-philmd@linaro.org> References: <20251020103815.78415-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: 1760956735887154100 This machine has been supported for a period of more than 6 years. According to our versioned machine support policy (see commit ce80c4fa6ff "docs: document special exception for machine type deprecation & removal") it can now be removed. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/ppc/spapr.c | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 97ab6bebd25..85c27f36535 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -5062,24 +5062,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); --=20 2.51.0 From nobody Fri Nov 14 16:53:45 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=1760956790; cv=none; d=zohomail.com; s=zohoarc; b=iOyTf8clDyieOx3Ob0ELjMEUU+QiwZ2FAn2Xt1E9W7btr+8g2lcCLQzMNPpwOELFwF8LfTDyArAa4rfAtCJ9kjFwz0WHzRmPJ8Y1QYhI/2kbzUvdNMPzrrNyK2fglqjpJT83eY32lXxIwt1miNAtEwva4lmmbMcTbPz4wYrwtbQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760956790; 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=OH8+GFr3xguvK3YMgH40pVk9NXUnal96AS8GYRsqGP8=; b=NLRAvm/6XKlMCVZXfjyd3JKjV16WsHsg3PBF1gnlpkYOayUy/1dhn+b8xb3OE65+k9TnYnZ7G39mfWMDy8IPM6B2r4UU+Qnl2RA2jNflcShnQmt06pFHBerWpb6HO3RZKrV+cU+Id4Fj5nmlniVV8DXojwVjSeVMPLdPK5jLJB8= 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 1760956790010557.186561270957; Mon, 20 Oct 2025 03:39:50 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vAnHc-0000R1-OG; Mon, 20 Oct 2025 06:38:32 -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 1vAnHb-0000Pw-Hc for qemu-devel@nongnu.org; Mon, 20 Oct 2025 06:38:31 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vAnHZ-0000Dj-L0 for qemu-devel@nongnu.org; Mon, 20 Oct 2025 06:38:31 -0400 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-4711810948aso27444365e9.2 for ; Mon, 20 Oct 2025 03:38: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 5b1f17b1804b1-471144c82c9sm224080315e9.14.2025.10.20.03.38.26 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 20 Oct 2025 03:38:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760956707; x=1761561507; 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=OH8+GFr3xguvK3YMgH40pVk9NXUnal96AS8GYRsqGP8=; b=ySPZ62kFT+PBALrGdUZqJDycO/YeHgOQNTq9aUo1Pb7v8f0LNfA/sfFOHhe2uj7xLc 9MY8AAmllopJQy+6eGXLJle4Wx5xUYeTwR6pZJFtuC6ozN4DOvvssyUceco70WiWkkAR rW6gIYjf9qzn78zAnLNHTwN4XIVYlZRvXVOBLiG7MrfFoodz1OIYKhO1uxHLmaQvl7yQ R6bfL3R3JUauy601w6N0ygDoniDHiuvnoNqhfV+WTy6kiC2/aX0sGfLOGEnZ4R5I6IQs ycfpJ1rtHhsJd2N+HEMyMt71iRS+eagpkjiVUY6YQJwd9dVuo9uQ8dM6X5kDvBs8umEZ Yivg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760956707; x=1761561507; 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=OH8+GFr3xguvK3YMgH40pVk9NXUnal96AS8GYRsqGP8=; b=JFHVAWErUpro+UHOjH1XoowVhmrgYfxZjrpILp+E2gQZwmqkhxpX1bs2Y/7IZjcSEo I5lbFXwuBIqr1K/RksthA5l/EczK4ZYTUO3ZODOjh7Zah1SFjBkyVRKlv60Fh1UwE/yJ tbhbQ7AAvG6I4cQmTwDrvhI7j0Z96G/oKqdmTdP5/+CmDwRZu2zZMc5HoJNt39/2B4Gk U3oaFp16xAioDqZA8h8O5TwTbG7cOshXWZYb1PRGoyHbM/Zbhl4MjE9g6TyggHY3IcKI CNGW5WpfuSLfh3MKvxr32nZHiHFbJ6qoCECTAO/dtWP9eQzj9dGLrSbEcCeVMGcgs/NB iSow== X-Gm-Message-State: AOJu0YzRXPday4poJ2LcYXa/fZP+7ItrcE2Wvup4FDQ6z3+T6NVaqIzu nCxmJpGZfY7Ia9Il2tt082NOXMkspiKsbVD2HqrV1WQ7JZMAfSw3bYkniD60EYkxhvoxfoO/mBQ Y6Ugahjg= X-Gm-Gg: ASbGncvtoThIK0Y1lCJBS42Qd0L/L33s2El9L93+dFB/xFO9uQDaDxPzE41BYyHyYt2 Nh1bObSDZqi1j1n9dE5uKbP34O53f75WextmiNE7sFd8VsUOtBUdBfC4gsLl2W7EEQq+0Vz0mQk io3rhKRkYexacmIRA3EJ4KrxDfbYxEE3pBPR3lG0e9so1FZ7UFSPyDTHzdMksKmm5u8gRh1TfUZ 5QU+FiEUsAFw6j292aDj91IZF1vB34f3vFc6D3o0n2f5HNocX5kmmsoPoYfZiinxSVFYIR8ogJ0 gCMGOB7wtjN8TjbZuMRr4EEbUpdL8BkqvXMMDNNIeXP+Aedtt6H4rUzG/OR22fCIkcq0qC8dL36 Y+biuZ/l7SaU1WpTYb7IRtMuokBOdQB8VK9Wo/IKbhHE16MBiCYRPLE8nHHeFUMV34QhhJLUlij NQ1NYRYoiZc2e/OC/trrnWPe0tGGDilbHxXmN3qOBbL5G4SmY5nK68R8/kihXn X-Google-Smtp-Source: AGHT+IGxUCtLJns8ADc+1HMMtvl5A82E5LNFCmXiuMTK9tNnjkSI5PY25xr23c0GX4D7JFfhVYLyNw== X-Received: by 2002:a05:600c:8b0c:b0:471:1717:41c with SMTP id 5b1f17b1804b1-471179121f4mr77824755e9.24.1760956707510; Mon, 20 Oct 2025 03:38:27 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Nicholas Piggin , qemu-ppc@nongnu.org, kvm@vger.kernel.org, Chinmay Rath , Harsh Prateek Bora , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 02/18] hw/ppc/spapr: Remove SpaprMachineClass::spapr_irq_xics_legacy field Date: Mon, 20 Oct 2025 12:37:58 +0200 Message-ID: <20251020103815.78415-3-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251020103815.78415-1-philmd@linaro.org> References: <20251020103815.78415-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::329; envelope-from=philmd@linaro.org; helo=mail-wm1-x329.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: 1760956792552154100 The SpaprMachineClass::spapr_irq_xics_legacy 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_irq.h | 1 - hw/ppc/spapr.c | 4 +--- hw/ppc/spapr_irq.c | 5 ----- 3 files changed, 1 insertion(+), 9 deletions(-) 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 85c27f36535..ebc8e84512a 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"); diff --git a/hw/ppc/spapr_irq.c b/hw/ppc/spapr_irq.c index d6d368dd08c..363bfc00db4 100644 --- a/hw/ppc/spapr_irq.c +++ b/hw/ppc/spapr_irq.c @@ -588,11 +588,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); --=20 2.51.0 From nobody Fri Nov 14 16:53:45 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=1760956737; cv=none; d=zohomail.com; s=zohoarc; b=Iypvg10cILS0Cz74xp7L+6FFAL7or28gkB1LxjFU/XsGzHNXh6Egf/zupgYOuxtiqIsXUd0JVIxUTGUXSA23BlWRu6q7v5hTrTA+DOWEMMwP5AqRNqu/GB5ljOl9sLBIv+uOahGSMMPQJ+DpKQLmPKiHM7a4TaxN2dh4pnZ7GyI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760956737; 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=yCVCJzBQFldWaH4w+gbsije/shLLiDepBPxOaxlrC0k=; b=O/Yk3ydU7yhR6GK2q3CWk2IpObPKFu9A8Lp5j+9dk0u4GWt+yBuskBPo0yM8AZdnly9jqXG1Pqd49WkSj1ydKn32+livzjMxfaELtMTpoaHkU/khQ6GceBGc92vxNyj7JEv9kLMIxltKNICopv4iIAPnAY6GNM7x0mNh1bZkbtY= 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 1760956737375149.66469141629364; Mon, 20 Oct 2025 03:38:57 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vAnHk-0000cH-Ta; Mon, 20 Oct 2025 06:38:40 -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 1vAnHh-0000aU-Pq for qemu-devel@nongnu.org; Mon, 20 Oct 2025 06:38:37 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vAnHf-0000EA-B7 for qemu-devel@nongnu.org; Mon, 20 Oct 2025 06:38:37 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-4711825a02bso26009895e9.2 for ; Mon, 20 Oct 2025 03:38: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 5b1f17b1804b1-4715e2ee446sm61701135e9.6.2025.10.20.03.38.31 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 20 Oct 2025 03:38:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760956713; x=1761561513; 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=yCVCJzBQFldWaH4w+gbsije/shLLiDepBPxOaxlrC0k=; b=MJUpKsAFdiuduW3GM/sipiRhPLBhGlNyADWeqmcmf72NhTZaSMvipc9Rn0l1ZdRVgX i4yBN+7cUn/KlcNcdAFMOMMHKoJJIspDPhqnFAkem1qbD4KjRqSIfcIyaoanDbP6dkdA C89e5h5qLEAylVA0D/3sJDPJiT6jb7qBPlvC7Ft/mTQLcNKcvjV+EDhsFtesTMyqm8gv g/IU8T0hs6h+ksDdGcrWlmFyXlHgHbiKYtDurGvD3MKjZ8NZoVlbrRXBTmK42k5p5rOR WuxpLv3Wx/tty0kh7aK39VYfBccdcHrKSl8LFEp/OOqCnyazeTn7+vEd9X+EjKo5EKwv t2mA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760956713; x=1761561513; 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=yCVCJzBQFldWaH4w+gbsije/shLLiDepBPxOaxlrC0k=; b=reP7yTGWV2+9HXbrcVl1UIitY4d5MgXtBqg56S5RjO6kYnvU231gOCfPCdwkokpKRR PI8uc5d3iJq4o/elLvNbq16/0HtqIweypnEnFowCzuGMW9yjxa7AMcU8qEEoOSdi5YIv QaoU9EPvGIvDeNJJgzOVsQ/X5FAqozL76738mC9ZWXIemvFrr3lUkYtrgpgph39uBn3h fNOVM81oHhKzp107qasn9CnhDirXWcPIKfy+OfUzS83gEznrxmSjUDwKRJFSdnyhtGE5 W6p/2tNf95zuTXufLKzngOp7tWdGtzQQ8zOjAeF83K6bMY3NCE+9/zDt/UEyVlDrjLCU vL/A== X-Gm-Message-State: AOJu0YweIZeKiUpcyEfb978JxTqqqttl+apEayAb4Ucsnf3RImqO88DS bk696ikfegUQb5GOC90aH1TuOBSeda/0ZNgpgqiDRSbr+swXCfrTW+zg49OxlmMWrk0r/I137Fr 7JlUZlHY= X-Gm-Gg: ASbGnctXvFs1VAXNp4mdThDqb7lNBevy/AFucPgZpdQd1+yhaBbbdg+uzoWYi3Daaga eut1sEPorB1+zoQoE4Vtgj+HUow+bO4MAesS1EGH1QIfLmggpN+5o8GS2KyFmaRglKAiVwBWvPN gFlB4+Dp/kzQ6A9ttCoWRqT1HkaTJWqYqjpP3GmSv2V8QRtySAKeXAnvETmwGlO/F2RPRy5cVvm O5jcBfQUCxh1cyaHKY7Yck11QIFmC/EUZUrGAgUjQzVE4vJ7r3gKZTlFA9ZL52vN9pu1jlOxTnL 7uZJ315EDrJ/DUpo9PeqdQFhzjBlhyGr0RhEx0GKgA6hBfLvYY+Om62bS4kr0aakTRM8t/z+VmN yvRw6wbu2/dPIQb7FjTR00pwjposKYSeTs4eRwDOrUprOY+VBc0GMd3k6DNpHkExcjpkWdlRGUv TpsA1E0Kda0ZJlxb9/BJ2/+mWouvs/c6w8W9EAD/owUEZAkmXbYA== X-Google-Smtp-Source: AGHT+IE1F5AkBjZ2Kcl+ql57kKPzckKqh+6Vz8ZzF/8zSDBRUEs2BLnaHom0/e3CLqeN/DyttLrGiQ== X-Received: by 2002:a05:600c:548a:b0:46e:6d5f:f68 with SMTP id 5b1f17b1804b1-4711787a2cdmr85471925e9.12.1760956712528; Mon, 20 Oct 2025 03:38:32 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Nicholas Piggin , qemu-ppc@nongnu.org, kvm@vger.kernel.org, Chinmay Rath , Harsh Prateek Bora , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 03/18] hw/ppc/spapr: Remove SpaprMachineClass::legacy_irq_allocation field Date: Mon, 20 Oct 2025 12:37:59 +0200 Message-ID: <20251020103815.78415-4-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251020103815.78415-1-philmd@linaro.org> References: <20251020103815.78415-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::332; envelope-from=philmd@linaro.org; helo=mail-wm1-x332.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: 1760956739850154100 The SpaprMachineClass::legacy_irq_allocation 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 | 5 ----- hw/ppc/spapr_events.c | 20 ++++---------------- hw/ppc/spapr_irq.c | 11 +---------- hw/ppc/spapr_pci.c | 32 ++++---------------------------- hw/ppc/spapr_vio.c | 9 --------- 6 files changed, 9 insertions(+), 69 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/hw/ppc/spapr.c b/hw/ppc/spapr.c index ebc8e84512a..426a778d3e8 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -3361,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; diff --git a/hw/ppc/spapr_events.c b/hw/ppc/spapr_events.c index 832b0212f31..892ddc7f8f7 100644 --- a/hw/ppc/spapr_events.c +++ b/hw/ppc/spapr_events.c @@ -1041,20 +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; - - 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); + 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 @@ -1065,16 +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; - - 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); + 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; diff --git a/hw/ppc/spapr_irq.c b/hw/ppc/spapr_irq.c index 363bfc00db4..14e47acc65b 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 smc->nr_xirqs + SPAPR_XIRQ_BASE - SPAPR_IRQ_MSI; } =20 void spapr_irq_init(SpaprMachineState *spapr, Error **errp) 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:53:45 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=1760956865; cv=none; d=zohomail.com; s=zohoarc; b=U8vYer4CwOL6DYXGRbRBQ7fjOg54W43JnDU3ekhxaZQtj/cPzmExdGFO+BzjgObAKxdURPf19xJP3TSQt7WgMFxYb1NPsNpD9o4RfT/2ESuRlXzlPF/BdtECLgRfxN4cXy4/kyMBYxHaDX/0iZB+WbmEl7OziZA/Snpkcov8Hrk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760956865; 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=0ihxvz/zYsaWUtfE9vP9orWGk1XOSmxd+RXF63zIcqM=; b=RVk3HihGxjVwEtE+1yLT1p2ZuW5O0dn/e/mpLTxcwtnm6RUwI0RCCe5LZd/lbt9A3qvD+0gf7E0faF5td436ZoBPz9Ip0aVWQwfUr++2t371F9rWWC+C6rfF2Mol2er0BvgrR+DLVzHUvGy+d+W7d+DGCulS6vmWOym3h8kvDkU= 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 1760956865537966.420514854868; Mon, 20 Oct 2025 03:41:05 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vAnHp-0000eM-3I; Mon, 20 Oct 2025 06:38:46 -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 1vAnHl-0000d0-UU for qemu-devel@nongnu.org; Mon, 20 Oct 2025 06:38:42 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vAnHj-0000Et-KT for qemu-devel@nongnu.org; Mon, 20 Oct 2025 06:38:41 -0400 Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-3ee64bc6b85so5700560f8f.3 for ; Mon, 20 Oct 2025 03:38:39 -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-427ea5a0e9csm14845298f8f.5.2025.10.20.03.38.36 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 20 Oct 2025 03:38:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760956717; x=1761561517; 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=0ihxvz/zYsaWUtfE9vP9orWGk1XOSmxd+RXF63zIcqM=; b=c0pc5gQsT1vNbbLMIvUyJWH96PuuPNXuecRBE6RB+68+5KC5wn3sR0k19bM7hbUlRI 7+UEsCm61C+soSoyRZrKaXPy38Qx12WjDWX73LerV5Ya8rHhPLm1tUqoULI/DYzoCICv zqSC/DgwwGISdQF127tId8uF58PIzSDl3VFcmju5W4XjSu8iuMKlLGAmjZfmC+1dx32A yBtFqLIp7a+86r1VxBuWfMNmE885t9InqS8hbu85durWt3bFb6P/LE1TwF4KuXoDDQPn jd0Oul95fQYgeH8vHkm2Q2VaM1OSXX2S75jby30WFAScocgbJClN0yPmol3eSx+bv2zu Y3gQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760956717; x=1761561517; 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=0ihxvz/zYsaWUtfE9vP9orWGk1XOSmxd+RXF63zIcqM=; b=Fa0BIKWK2osXCZJk+XQRPCYltEGE0uN4dN6087kU2hfQz6dqi8gFB5saelRFoEwRH7 HbV8q4dlMy9JvFizYReJ1h3/9wnRyKmeNdDo3B2aql7vSN6jztVCrpHwuOwoPt6AJ3eb JZAqos0vRwJW+lNcV5Cj8vqRYDOovHACP/NDlPkOyLTsdg49QVtJDutwClktX1GhuLrW p18gSlMTUtwvawIbpJLcZH0QOBGxVX86EY7Xmsk6BNEPiY5fM2sUKxz/8AWTFKjq5i5a WlmraYLHydHHAAr0Nj/44uta+zTbe8ahLuiPzW0tEpzeLpjfFBjbfzboIWNWEKMaGzLi L9/Q== X-Gm-Message-State: AOJu0Yy61HPzf34UkOmI7yPf97J0u4ZSYsxtmIYpgROiVKsk4x1h9HBQ J57sYNP/sNndWOVK48Q+6XS2cQ8WHNEdx5cfJlh39enHtGX2Xg6JhDoulOIxTaBrYzrbcLJHEHP /jUGA3eo= X-Gm-Gg: ASbGncsN6w5myX8uKKpAP4Ua0uqxvg6o/mVRgik5kQa6iiYcA/cs2NJ85tnmmf4W4/8 EBBeNGwPbpc3mtIdhzUs/z6v8ydph7lexgRE1HAggJd9wwWhR2BFWdESL0Ej4x1bjsrBmYAe7mN 77//Ue5pRoCy/cXzY+TTNi4fDEDSoNEcuzejv4BZoopE0sdFTREjgNG3HLvNgi5XyVbefNBL1AA e93VyYjCN5YsoR+k9AkLcwXV1dF0lvSRJv4k1afJBwn1hOGlnEV20U+/ekWG5bbjZGu9ZMY2Af9 EW/AhvH/qjxVSYBgdjRKnXJw7+l+soUyQaHFAY1lZsg3Zfq7NT2A+zxf5+oICplgsQyL3C01um2 siZ7q8dZktetoEeor92VHcl/qnZpa4Q0sNWWUvqG5zKBNX6KUFVZGGg0gnGznwcadr7eWw9Sfvo xdZOBEf1KR85nKNMIBunW/a6V/xtBPNMyhXOA7RreQpPIjsm/v0gKlPLaE+V03 X-Google-Smtp-Source: AGHT+IFxCHaLufk14XE5nX0AAEVGB8FvcIDFeS8snE/LozpgkoX/10SV+mciQRu6gpCSHDLuCGf/jA== X-Received: by 2002:a05:6000:4021:b0:426:d836:f323 with SMTP id ffacd0b85a97d-42704d7e928mr8617320f8f.13.1760956717468; Mon, 20 Oct 2025 03:38:37 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Nicholas Piggin , qemu-ppc@nongnu.org, kvm@vger.kernel.org, Chinmay Rath , Harsh Prateek Bora , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 04/18] hw/ppc/spapr: Remove SpaprMachineClass::nr_xirqs field Date: Mon, 20 Oct 2025 12:38:00 +0200 Message-ID: <20251020103815.78415-5-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251020103815.78415-1-philmd@linaro.org> References: <20251020103815.78415-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::435; envelope-from=philmd@linaro.org; helo=mail-wr1-x435.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: 1760956867368154100 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 14e47acc65b..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 smc->nr_xirqs + SPAPR_XIRQ_BASE - 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:53:45 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=1760956790; cv=none; d=zohomail.com; s=zohoarc; b=ZjJklGu106/xCgW5l7/2LeqgUE/hshwcRdl3fN3tboxwQSrQTcprliMPdBf5cRzaHYUvhU2hkgdPO86HW9+PqMUoTUfbbQ/wK6T8FrwStEBDSHuqs8gqntTULKNtFwqpxNIZMzhkkvYvMWg8DodtfNy1Vjeylclu1EWpgxgZapM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760956790; 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=2QqASWvK1t899Gg+yC/9t/MGzsv3GeI3HMvGU+Y6Meg=; b=M2SxOYwTKJqQhy5Jw5IwiAU/t96JWlhXV5h4FW2pouleBuMHaq9f15M49m9g/QrRtHWDvtUsm8fjvrnNS/ix7+Bw8jHFZ6tnYh6MWQpkFfijwnqbWZ1h1qwyWCCkTUT/k914WT5hTeCmu7kcMRayEAu0GuxY/IeJNBUByy9N6X8= 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 1760956790044113.42071077602532; Mon, 20 Oct 2025 03:39:50 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vAnIE-0000o0-D8; Mon, 20 Oct 2025 06:39: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 1vAnHq-0000fc-CR for qemu-devel@nongnu.org; Mon, 20 Oct 2025 06:38:46 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vAnHo-0000FL-9X for qemu-devel@nongnu.org; Mon, 20 Oct 2025 06:38:46 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-47118259fd8so23118405e9.3 for ; Mon, 20 Oct 2025 03:38: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-4710ca4931csm117818495e9.0.2025.10.20.03.38.41 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 20 Oct 2025 03:38:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760956722; x=1761561522; 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=2QqASWvK1t899Gg+yC/9t/MGzsv3GeI3HMvGU+Y6Meg=; b=Zm8d6DkT86o3ebTFlGokFemniQU2KSQF5cMHFYmemrVHOf26bk5ca6z7O7GtWaxvA4 c87AWFYUfZE6/eVXEP2XIo+SsTbfydtPi8GPF3aWs2wv1ZhOJZEYO3wPrzx7HVOc9oi2 Z9zTAOaMwawnzdFGNmLic196CCrh5bw1J6DChDzZ/MdJTrvrcrkpl2HAm3g06SBvfsJ4 8m7EVfrMGYwvdJ+DnOLenxj25i5ytWHnGG7Kn91OowGiBHIQEM7kUnlIjf3l5xA1VLKt yW3NBBeyK7GH8t/qB237QJCMRCFLB5n8sSK5Y0ei+MtLhbKqN8Wsw7zrF/5Av13Nq6t3 mnVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760956722; x=1761561522; 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=2QqASWvK1t899Gg+yC/9t/MGzsv3GeI3HMvGU+Y6Meg=; b=W6SFKk7zurXsEupI8cit2mNxUL7Rs+ZTuPn+EmM1xjkY6lgEqNJEvP9rZsdoPDIDm0 2/S6tEtzutc/UI1uzt8LprNCLRb0mX5Ro/4DWpp9hljUDoUpQQgKfimgBcYO+ZpkfCGy BVW7ewiG0iVYG0B2s/qfZwyJOjkYsZnAg4NwN+TE/yGucEH3GTK+Ql/K8yXrINNJbvrE I9cYDVQvrJnAOKYxJEWgEqvnfwJvdvbXbkymkKekmM/MWjphLJul5seBKcm8SrcHoAZZ ZiBy8LD73JRg1fXe2lCIOsaj8z2RwPF4XfeGH4hITKuLfEQTuGJLheMrhhyTDz8vcONy BQMw== X-Gm-Message-State: AOJu0YzJmectBdp999hSZ96aRcvUQFCHVS+FrQOMrM4hxEE7URbjXDgh aq+WYgn15hJ7AK6IJuMknJdDhD4gk5DykcPzMPnZHKbv53hycIZxVRbW5qtYuAoiTGpmARI6EgE 95OK583A= X-Gm-Gg: ASbGncuw8UP2acNVmE7GvHe2wOi09m0O2lQ/38cCQLyMExxjvLpd4/dJ3BF4uU08qhC Jhf5D+fzwvWZbghVeo1tCaarRmzIEMvJjClapXBBE9FDnKAeccxjxWAQ2luBqHZHjtuzZ12XFl7 c4M0JyQKuzVuXQOwMU384MUe/vEN7vTXQiy2htgniQ8e+uGf1XQZJ1fY6QlvQA3lUYDHB2qzrqD mfN4uHCnzskT2wmioHOQZQEWDFpoUXAqbqwu2fbUYEGS9qd7Vd9IYW01A5kUKYTY4Idkjmqc+4H IXStmTdqQvfpBamlA999fahBboZiEDRXS3b0wHmhJZQL1bBtv6JH62FAz5LflcznmqZPpOd9Pwm cCUumocDMceRZSnnDlQQfgHn3D3cqCCtuEDI5uTr5KxEnVwpfyk5PoEgQ4NCi6JZxgddrDW6tu7 Nxo7weFNREC6CwG7qUbZSo68NgSFXkDnXDOBbfIXZbEer0UhAJiIJFfOkj7xSG X-Google-Smtp-Source: AGHT+IG+2OrotMm39mO/NMpFJE/4JTcqijQrOf5TAI7bKDmv2wXdxouIqwoMumQUqKhnsP0tNIQR8g== X-Received: by 2002:a05:600c:3513:b0:471:1415:b545 with SMTP id 5b1f17b1804b1-4711786d625mr98567695e9.7.1760956722179; Mon, 20 Oct 2025 03:38:42 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Nicholas Piggin , qemu-ppc@nongnu.org, kvm@vger.kernel.org, Chinmay Rath , Harsh Prateek Bora , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 05/18] hw/ppc/spapr: Remove deprecated pseries-3.1 machine Date: Mon, 20 Oct 2025 12:38:01 +0200 Message-ID: <20251020103815.78415-6-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251020103815.78415-1-philmd@linaro.org> References: <20251020103815.78415-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::32c; envelope-from=philmd@linaro.org; helo=mail-wm1-x32c.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: 1760956791353158500 This machine has been supported for a period of more than 6 years. According to our versioned machine support policy (see commit ce80c4fa6ff "docs: document special exception for machine type deprecation & removal") it can now be removed. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/ppc/spapr.c | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index b5d20bc1756..2e07c5604aa 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -5032,28 +5032,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); --=20 2.51.0 From nobody Fri Nov 14 16:53:45 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=1760956773; cv=none; d=zohomail.com; s=zohoarc; b=MdqJAmBFYTfJ50IaV1oMiLqy/1+GK8bMAyGkBSe7XJgUm5g4unqXr0P4S4Bw8tJJXEcfxDU1l5gwk6udSGFFxpSY/uo6WF1x5Sy5ZF+MwlasB1I8xQdbiwE3craSpuew7CKa9Ol1ygfUM+oIlWCTkc7TlJzmpxJUFEBPCdRh/j4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760956773; 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=XchvKX1P3pmKtpFUzec2QYG+hUglh7SzS1YPHheIc9Y=; b=WJDU0VAQyFxTtLQ/ZDkRTdEbLFXT6Od9slSQJJo9tX4/wqk1xy487Oy4SCeTjLIhPwvAaeFweddMLcSHENJxzjaJiigplljn0ca6ZG0MXx9o4/Svv86lSk9coheoxt56xk/BRx0tbwHtlN6KsoBJ8TKfL3Xrpnbb1s2TQ+PZnMM= 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 176095677344446.06974323227371; Mon, 20 Oct 2025 03:39:33 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vAnIG-0000oM-2g; Mon, 20 Oct 2025 06:39: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 1vAnHv-0000gv-7Y for qemu-devel@nongnu.org; Mon, 20 Oct 2025 06:38:53 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vAnHt-0000Fk-7s for qemu-devel@nongnu.org; Mon, 20 Oct 2025 06:38:50 -0400 Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-3ee12807d97so3793221f8f.0 for ; Mon, 20 Oct 2025 03:38:48 -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-427f00ba01bsm14420098f8f.41.2025.10.20.03.38.46 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 20 Oct 2025 03:38:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760956727; x=1761561527; 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=XchvKX1P3pmKtpFUzec2QYG+hUglh7SzS1YPHheIc9Y=; b=s6eQQEnzqlB71OFpF8B9Vm6z/Nr29PBFeJkPzkm0wZcl7Ay7Qsd8z9sbMNXTvJCzZu 5+K6VYOkxbOQKeRiPZZtrK6Ri0gZFHdUGjaYhTpEzzS18bgvl0r/kuY0lRZPWrTm/Dh0 OLDEIHY+lbj6B8lcDUIY1ncRgpgFkeq5bqdGEdQj0QixHd1iAJYtHSxIrwqEm8HWhqMT a9Ccg1wcjipG9LXlvhaHepC9H5TK9tFt9MOcEofIXbSg/eeDLUxOtyAFtasfPYNrwi6O ICb9/iy4K5jZ3WAVd2Er3Nc/IzgZlTRFmKXwjpQQ/EAwMINyvJUwMRDntr5YkpRrL5s0 wolw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760956727; x=1761561527; 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=XchvKX1P3pmKtpFUzec2QYG+hUglh7SzS1YPHheIc9Y=; b=a0Ex61qu+C/PJpk6eUUOkN9/Gb7LuiCbbRLtzTNzmaL3HTIeom6cMsbaVrEvCHDeYi 17p9xu186wrAO1/T7IHeBgP1+hsl+K7VmPjkXLQutBn7xcrigbfNsexHfHobwi+AmJC4 zIyx3DKj5ErBqYGz+EgQnvZdCpNiVtTeysS5clx/4ExTYJsEfeEzm8PUw1BAMrqgBWp8 6fw5F1oKK3TgPTV+dRDoyfIDz6Vj09QsgOg+xdg/IT7QSMTGcWgDqprBpMf1Py+msS5V 9q+6Z/e5C5DKRIohv0Rnv9ecz5YrK3G0J5IVnhVfmjSHn9lteZ7qYZK4o4UF3osaW976 wDYQ== X-Gm-Message-State: AOJu0Yy8iY3Pmgb3YO14VF03nka6n0Yuls0ALx9nYSa6S42fTcrnVElV 0hbKJCHvYymWw6yWIqixliDQqYqGzhnKB7/RKJeV6MYL1ln0DXomYpROguPWtS6AA0cQ9Hsp4hC jrubnuK0= X-Gm-Gg: ASbGncv7W/hcuxyn0qLQj4bTpnA6D0w6RR4P1p8SDakb+RvbbUFqyW7ev5Fq6ocoffh qs11xmY4XLyyHlqTSw9ryLTvQRS/fujfF7PAzV0bLLlM8FmogdtrQMhtM9ZHF5TyB83Mc0ndAWo oF4GC7t0399BVFjeptD5Rb11ekY7/Wn1Ad0tmdz9osu8B87lmC5D9UbIqMpO+1n/CTs7cYTyk7p x7Kto+PJLl8XwBnChNAcYNvAhicUrx14yE2DK0BNF1aaEdKohxH2HOA9dH+vFHebG6qq//HKZOc 7GLmTr9NqRYuYrt4hoPlO2N85BvH6h9cJsTJTOtDjeQdm0CSg4Z0ZTfHeXhbKCCG0P3cbIG7BF/ ESWDLM6D0LGhm8Tn8eKzaCuTTR8QS0fPNmZQGN29auKqAb/kemUsqLf9FLMtH6FKMe7qnP+VN4B mMcvRar0WpUbgmZCIhQeRFKIhw828xGLpsDE93/rvQm+SRC8orJ2IJL4lCVUEw X-Google-Smtp-Source: AGHT+IHQgd4IyBZk1X8qax/mfrCj0WRZC+hpDHiPajM8IGn0ydegHDG75cWXcjnzX++NX0Exg2anBQ== X-Received: by 2002:a5d:64c4:0:b0:426:d51c:4d71 with SMTP id ffacd0b85a97d-42704d44253mr6869195f8f.8.1760956726904; Mon, 20 Oct 2025 03:38:46 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Nicholas Piggin , qemu-ppc@nongnu.org, kvm@vger.kernel.org, Chinmay Rath , Harsh Prateek Bora , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 06/18] hw/ppc/spapr: Remove SpaprMachineClass::broken_host_serial_model field Date: Mon, 20 Oct 2025 12:38:02 +0200 Message-ID: <20251020103815.78415-7-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251020103815.78415-1-philmd@linaro.org> References: <20251020103815.78415-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::42c; envelope-from=philmd@linaro.org; helo=mail-wr1-x42c.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: 1760956774329154100 The SpaprMachineClass::broken_host_serial_model field was only used by the pseries-3.1 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 | 6 ------ 2 files changed, 7 deletions(-) diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h index 494367fb99a..06e2ad8ffe6 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 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 2e07c5604aa..e06eefa3233 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -1213,16 +1213,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)); --=20 2.51.0 From nobody Fri Nov 14 16:53:45 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=1760956879; cv=none; d=zohomail.com; s=zohoarc; b=FlcyDNO2watVVeZxZgnxIK2gJO7GtNQ0y+fNqOSiymbXU6J6BrciJ7vmTpimhk5bErCtmGV2aevKiO5DJkrcWQO+A4rtC7E9/mtNB098kTQ4FfMu+j7GAZCRPsahZsj7b87uYO/cG6vLmAn0gz+oJ/ewoSEDNy/WpJVhOzSYBZI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760956879; 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=e5Iw1zQnF7hHPv+UuhmGqw6pW0SW8a9NOm5KFrZQ/EKFy30RdnyDmGP2FkQ90WDOY3vMOBdOhTPaPw7uhgjDf50+C4frTipOlmxoA+ILldy4PMPSDfYXFArWb/DTdYSJ6vKBVnhQxwK6/WVqwPMvw/SplIKI2GJDqLTz3Cr/J6Q= 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 1760956879229750.1725338133915; Mon, 20 Oct 2025 03:41:19 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vAnIH-0000rj-Uj; Mon, 20 Oct 2025 06:39:14 -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 1vAnI2-0000l7-Dd for qemu-devel@nongnu.org; Mon, 20 Oct 2025 06:39:00 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vAnHz-0000G5-HK for qemu-devel@nongnu.org; Mon, 20 Oct 2025 06:38:57 -0400 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-47109187c32so19655395e9.2 for ; Mon, 20 Oct 2025 03:38:53 -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-4711442d3ddsm220057205e9.5.2025.10.20.03.38.50 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 20 Oct 2025 03:38:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760956732; x=1761561532; 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=ux2JWx8Q3s149sGupJTQZvdgH2xzZQbf7pSBw0vrxj6Edz696xDsJvRX4oC7N1FTRg Qs7Oz+BIN5vzKFAsWOSNbfPe2G0TvOvuYsZpV/YtxPth6NnAxqiuOU9Auc53x8EHtDyN uNSTfhZIO51A3+nRUAAEIpLlRs7RXG+JHaz6Y1P1rjRh/HQxyLBWD+A7f9bK9ZHAz7Fa xobLMAyXzPDS+AUWnwvjCiL5WdpPMNiTGzoWhWH7gNrj4Fkz3Ke8iUn7YacuKMRvr1Yr fdX8OhzziZIjc0+ayd/Ma9LS+sBk+E9GC5K4/mVei4bvxS4AgqKKOqqPEHEhQA4FnE5O 75TQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760956732; x=1761561532; 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=MtRcoCAA2jnNd2crCSeH0yfs3YxjIplmrdn+xjqEH4n6E3u9ifQSs0vCY7XO+jhMo4 I7kmLyqS4ZEGHs6oLMrKXFjoS0u4Q/tJQ+8nAxjzkj9m7SL/pj1XhxfFpFBK3u+WuBCf mkUmgwMqa6dPEx0IUtV5RQOhBJx0ZOGBSQQDwdkqoSkbdTGdz+8pFTEeYXokNc8Z7vPA VwgbZI/2F6IW2INpeX2PeudAfnGnmrXYkSnrCFvFAIofDSUA/BskpE6/CpZPPRIjT7Vg lhxeaJuqY7cPlr/LV2RYiDbO5Zs28AferbPDCp7Pf/aa5jdBDGBu+G1cOL0Ij+fRWm5h tJZQ== X-Gm-Message-State: AOJu0YxQCZES4W995dcmE4PBX2vKXs97GFOSeEoNL3ZBaak/HXJqXPU9 9UgL36jbd4MDhVoNYnmaKccAjbbauHRS+lBdKNnfmDMaZy+NHndiK2p3o2IKwQiLsR2Eha5DUf6 61VYyg5c= X-Gm-Gg: ASbGncvBG9CxR94U2xXVzVY/NEEcnHDtoFDpBjqMA7b2UhKO7RpXGC9HevsaLfTR8BF pybEA+ka1lTM+JrbuziKj+NwwbI4sE+jP8Vz0V3k5gDlFGzQ3DpSkldxL3Isa/JWTKk1JfGRAkm 6ZKRKd64g3y9QMxm0r5rk8uux7mxZX58QmThOEbHhpRpqLU3cB9QiT3etDYcSuLcsRdO3sGHDeZ xpNjfJWmtJst1XciZYp5uhOJ4iqVie+GyRBzVWCPkmvVY7OWSOIiWT4yvV18jusI5+D6EZLb2EY FWfy+zRj/h2k2qp0w+uGRXMtnjmmiQ0ma5X8Hh6tar7UsTqoDQCQ3c8cknlbHvicSg7TYrj/DRt RVwLyZLdzKQpRMobGKeru06UaRCN/d+ebxueBa1nFiBnKPVtbvQkIkzM/IvcHbN+v+4ZjELtP9O QhgbX3KdP2FXmbqmxY7V9gLubcF02cLbzZoMKpyaBYSLYcI82eFg== X-Google-Smtp-Source: AGHT+IHpRuvJt+vq6kMbYDeKVQiSVG3/mEBkDhXe9vJ1QjRj/WkWk4DI1OronxDF+lp7sfbpdSzGPw== X-Received: by 2002:a05:600c:3e86:b0:46e:36f8:1eb7 with SMTP id 5b1f17b1804b1-471178a3a94mr89203075e9.10.1760956731887; Mon, 20 Oct 2025 03:38:51 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Nicholas Piggin , qemu-ppc@nongnu.org, kvm@vger.kernel.org, Chinmay Rath , Harsh Prateek Bora , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 07/18] target/ppc/kvm: Remove kvmppc_get_host_serial() as unused Date: Mon, 20 Oct 2025 12:38:03 +0200 Message-ID: <20251020103815.78415-8-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251020103815.78415-1-philmd@linaro.org> References: <20251020103815.78415-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::329; envelope-from=philmd@linaro.org; helo=mail-wm1-x329.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: 1760956880263158500 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- 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:53:45 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=1760956865; cv=none; d=zohomail.com; s=zohoarc; b=B3nse6Z8C4pGXhl1uLX39eZZjVleyMkbUEE/YCNESFSmdHd7rf//VQBUZ7c6hyFboIC3axbKSDT/qBLFF0l6PKjf2ot8Fs+OIpbkSmPw7XQ+2ee1QxeKSzZEt3HzJJKca59ogq7NHW+dMNuJ4QfRBjnbYrG82UTyzsmXem5mcyE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760956865; 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=ekxMJXixU0HYmmbGz45oVHCzxYit6Ve0cwHIQjarrDPIBX19x3J3kbwe5NQIbuyDk1LK7MUQZaIdbF5KB9v9xMitKEiAqx5aaDd1GfJ+owDhWLfEE1uxx8KTXgcJjrhegSsUaR41Ttch8oRR/tqDooOJVryZ4aodKoDt986YPig= 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 1760956865223960.6653630180232; Mon, 20 Oct 2025 03:41:05 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vAnJ7-0001tw-Ms; Mon, 20 Oct 2025 06:40:06 -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 1vAnI6-0000lp-Mz for qemu-devel@nongnu.org; Mon, 20 Oct 2025 06:39:06 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vAnI4-0000GU-Mj for qemu-devel@nongnu.org; Mon, 20 Oct 2025 06:39:02 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-46e542196c7so33457705e9.0 for ; Mon, 20 Oct 2025 03:38:58 -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-4715257d972sm141722655e9.1.2025.10.20.03.38.55 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 20 Oct 2025 03:38:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760956737; x=1761561537; 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=nr621hplieuOYnv9ySTfae4yw73s1+XQi5hmYq7Tdq8uXpztfGawEVM/e0nBVTFZQZ 9ehm3vVXbGAtU2RJrH6wGVnPU/p7/PTmSkqXW4o915dqCYeF41fId2nkUUwllKrWNCiE sfYT5m4BQ4+dDiHwmQ20qr6YcdZf8SnBHYODaSQZRMJpddfN9sAB+clVvPxFIYGYmg+I b+E/YDTSx/p46tzC/k/tumoqN4Y7UnQhZ5tNRKSkUwLrRw+Fmf/v7a0Kq1QNpWd3y35s 7UQgqDs3hxVGR9BqVTtmKK9FIyGtsyFa1Kt+G2Qh2B4PDH0bTN62ZNMXVLdP5vcV8uZC F0og== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760956737; x=1761561537; 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=wKOGGkfGVyEqQadNOaOAdwqUpO4Ef9hJvAe7+8zB8AIj+jYiGVWn4AWXSkzEZvZFCd msN2Sr0o9+uWsbXKHkAKzrv074/5xViDiPnXyxOH1g1R/+fxFUs7lJhwjfwEv/eCepi6 YSt6NIgX1aeHc+n4FXrsnN7vaatoUvvcM/ttLcBAxm2X+hKrmm+GR/qK+8a2Bdzzzb22 PG+F1OJq1hDXRYSPvlTpl3odX6e7ZnVobROCr8rDYQne/EhfhmSRNFj/of8tp1BhicTJ WS793kG682LLvjN4aNSXIgCQrnHI4bHSYXJmaGPRY+eeEQmP4/lUvMd3rn4XXyCIMIMV WkHA== X-Gm-Message-State: AOJu0Yxb6lqqBusboSTniczGYB+T14YQRZ9WXryYL6OKuzZRE4bdXeK7 kKTl8X6SxdQqjSCfYDbsbjXEkda8xxlf1oheKHjVslzBL5rnQGLh6TD6ULul6zsRxU0Q6dpQitk jyJgKvzE= X-Gm-Gg: ASbGncul29XTj+wHi53LbqhjMOr2YxGRUn6JujQ7d2z8Mr4frx4TlLsB4Tsvn3qoZvR RfnIip2lmx3jwI9Gnt4qjebLZCFyfmJiV6o6oCzwPBzr9tf/TFdONp93vB3jf5zB5Cm1aq/4IMv XJ/e0PaAQpz0w4rlrKIYTa/Hca727j9y1rkWUxUwbFZSz3cvM5gATagVLjh5wEjJmdXMecSWVbX iVn28h9D/EQjfDKOr3/7nsfjQ6DIGUQ8ulBlIhVPUe+tNwl4cwrtlUEfwcZP5rLal7CK5JMLxyr 7gkHvHQL6xWmkSWmQxqmrSHB0+mP0NXrXW4gTApKgkdXl5WHqKCyMoPGGuoTFgAfBy4z0Cvl3Vj mNiLQiPUsGeOl+cuoiPvtBcfgk+ZD+EHSVqpra0tBy+YZC/61oZrURLXHJcMI1nm/LbQTZ9bNzb Rr4TYSBbLgPeK1Ff+pDneGEoU+GDmODl7TXr2FeD9atZQsq0cJYw== X-Google-Smtp-Source: AGHT+IGkiVeRk8iHXbbwarjONT3Tc41KOvva+qopWq1+Dk4GjlVt2+f7Q0Q/jxdpBNdogpqMLN5a2w== X-Received: by 2002:adf:a30a:0:b0:427:537:39e0 with SMTP id ffacd0b85a97d-42705373ac1mr6211391f8f.14.1760956736641; Mon, 20 Oct 2025 03:38:56 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Nicholas Piggin , qemu-ppc@nongnu.org, kvm@vger.kernel.org, Chinmay Rath , Harsh Prateek Bora , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 08/18] target/ppc/kvm: Remove kvmppc_get_host_model() as unused Date: Mon, 20 Oct 2025 12:38:04 +0200 Message-ID: <20251020103815.78415-9-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251020103815.78415-1-philmd@linaro.org> References: <20251020103815.78415-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::32d; envelope-from=philmd@linaro.org; helo=mail-wm1-x32d.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: 1760956867305154100 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- 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:53:45 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=1760956849; cv=none; d=zohomail.com; s=zohoarc; b=cnV7fdIAYj+CQecwCrYIMAyOMe1NVFecnb8jyBLlr7HljG05Vkoo88n3dkok0rjM5s3FgwjD3+67QY+raD9Cmu5M1nhMl0GavpkO6Ivqh/xuc+D7w/ef0dguKH+9ZGCEUrsy+Ea133U19xyFRlJkSiBnO0F7Oq1guCWEQKw3by4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760956849; 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=6xuVM3VBVeU3OiQAywkIH3HRIqyaSbIK3vlGaxdyGbI=; b=Kqy+I7InoiWQtxkdyEun1emvN4wsm3Z1vMdh8YG5yExmjXaewlSErjCP1kbyi00HBbw18luJXa5UZZYGh/iJd77rRl8zG1ZeXevKTOzZpa2HrN7mlX7O9IiTPS936Exx0YWdrMWyPkCgcLUe0zbt7XMk2yE/WnvMPOWp06DdGAc= 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 176095684995612.10049963791073; Mon, 20 Oct 2025 03:40:49 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vAnIr-0001DB-Cl; Mon, 20 Oct 2025 06:39:49 -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 1vAnI9-0000n4-RF for qemu-devel@nongnu.org; Mon, 20 Oct 2025 06:39:07 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vAnI7-0000Gv-Gz for qemu-devel@nongnu.org; Mon, 20 Oct 2025 06:39:05 -0400 Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-3ee64bc6b85so5701193f8f.3 for ; Mon, 20 Oct 2025 03:39:03 -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-427f009a781sm15047517f8f.30.2025.10.20.03.39.00 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 20 Oct 2025 03:39:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760956741; x=1761561541; 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=6xuVM3VBVeU3OiQAywkIH3HRIqyaSbIK3vlGaxdyGbI=; b=gboSN8lq6DqWD7cY8um0znb7tdv0MC1FE3bxZGE3dsOPbWXyn8d4y/bjKXDXNvAx5H NfFFQSyhGU7i9Scbo8zUnz+e+7Kuac7vUyR5VHl/4xMWCv0NP5EhjKyvPHfki0DPte3k Wiu/KXN4q0u/ujHaTIw3XoEd745/m4Gb1saH3alwKA0k6/KCz8tkd82jx9vTKGAvf4TP 6uOb4UcrQrL36nxafJlfuXdpl9fCzF3rRjwX9JSH2SGvODYKA8/Wre9xq6arhM9X/lvQ GR8Nyz7patmPv6goJKNgQH/FvCGFTjDgIbmc5AlT6HbxyL9AbKRihvAH2FqGbbsExSxD CI8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760956741; x=1761561541; 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=6xuVM3VBVeU3OiQAywkIH3HRIqyaSbIK3vlGaxdyGbI=; b=Ho14ZA3KxPemnC+LFHRvdTGfQoBOTWQvZu8aWqdWEsjEE5S+EIe4X4ycjWzgusg9pL o0ODDRm0GaaLdQr2ZdquLtuC2ePK9zjbjZ3DpRlLsTbkOTi0d0XJUX+b2LJIWwLCwPCL AMn8FcsaRIGxhxAQyekMXerbmDBriHIXSYQ6kWqpER+61UqkuOce1i38kA8ZJuMBoecW Df3Zxl6+MDYHOx2xmK/FrYPiWuNnzUaEmu+FsX7qSAyEXO72nYjxJdLbE4uM3b8CoJyM sLIJJ16eGcoMRK9pXw2wFdz/E9kOZgsiBBRwHDquoteBsHfZc2sWO/MtgP1hNQuDrlZ4 Em5A== X-Gm-Message-State: AOJu0YxIqWdZ2baLoPEUGRvY1F6u83a/jwzFQeDJ/G4p7ecnxWQAiDx5 mxenSUvzp2IrKWPYU81NH/4j5rH90L1Oquk+7RznMToYD6a16sZuSfIw0Ru8cJ2h9536FhM5U6e IVsL/WfI= X-Gm-Gg: ASbGncv/jlsLpY4Z57hsoGNnSY2uXzvlVKHXLBOZtjAPzZubPzCZlB7CIRdVgtiMbDe WtMFpkueXxI2cnVM1e4QrDIKiHcB4U/OQpIJHGEltbPL++qQu30BJTIp8Zd5malptpxQCv90GzX syjEM987QIJTl3IEopLq2V8JcVpB7DBeJNjBE9ODbMtHvUJRv6qIB8x5Hce3Px9YItQoGcn+z1L INC1wxRh06IIr2sjL44fdbC78xy4mpFJGizSzrw7zIqVAO27nMhZYuIRTU8ObrriqfwhPsiKJlv GID4Db/pf5l7AyGH447ue5dLn9r9jd8QBz1oevhH6B3ODhtbDH+Xv7gk1OHtMHDZoTxsHakhyfr n3voeN0kGdkOafnhRe+zfUDSKTQTLSPV+Tx+BNkqCjHZ+SYLxd3PBAGDX/OFocP40UifM/7X3eb zf3aV0AIpPg/QJ1Mq7cTuf4bY309rAAsjNYLKofufWcDWchl2BQzH7Q6Xk/PwT X-Google-Smtp-Source: AGHT+IGj40Tm0Y+OPmraCNCsy+lwL4gLutxE0a+akPs+fVR+0b8fI4LoEZvRXbYntpUAMFO0RpfcpQ== X-Received: by 2002:a05:6000:701:b0:427:614:83d9 with SMTP id ffacd0b85a97d-4270614848dmr7984928f8f.48.1760956741485; Mon, 20 Oct 2025 03:39:01 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Nicholas Piggin , qemu-ppc@nongnu.org, kvm@vger.kernel.org, Chinmay Rath , Harsh Prateek Bora , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 09/18] hw/ppc/spapr: Remove SpaprMachineClass::dr_phb_enabled field Date: Mon, 20 Oct 2025 12:38:05 +0200 Message-ID: <20251020103815.78415-10-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251020103815.78415-1-philmd@linaro.org> References: <20251020103815.78415-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::42e; envelope-from=philmd@linaro.org; helo=mail-wr1-x42e.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: 1760956851197154100 The SpaprMachineClass::dr_phb_enabled field was only used by the pseries-3.1 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 | 28 +++------------------------- 2 files changed, 3 insertions(+), 26 deletions(-) diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h index 06e2ad8ffe6..bc75e29084b 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -143,7 +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 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 e06eefa3233..b81eb7ffe73 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; @@ -1254,9 +1253,7 @@ 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; } @@ -3003,10 +3000,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 */ @@ -4089,11 +4084,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; @@ -4119,16 +4109,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); @@ -4254,7 +4238,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)) { @@ -4269,10 +4252,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); @@ -4682,7 +4661,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; --=20 2.51.0 From nobody Fri Nov 14 16:53:45 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=1760956858; cv=none; d=zohomail.com; s=zohoarc; b=gNYeL2AZdlLD1LIy96KPwo7SE9jgU8NcUdDl4TRBHAdvEVOKrDPPztF3/c0Tj1pbsi5mYZ1RgUMTdMxPkbnBS9L0lCDUMh1sPqe2Yb99jVVPbhW9XnX9QaSe00zNLfiBMrJ5Qk+M2szJFtNhHiZjNkwp1aH3FPDecf476E1sFiA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760956858; 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=G71RzqW1rRM1q68VyBiXz7BShoBGdhsR1BgR0TIYzSw=; b=X7lzu3vA+YAWtU/Z9TCLa0OEww1BLUWVKLt7iNa28KVIaUZlhN6p65NEPdDSqypEVgJitag4OUqXJkMVuULcSFrp/PrmqYDqLnGpEl4efg/kJxpvEdBT2VOl8HJFI/fNFq0rJz3ZHIRS+brkAwaDcsvDWYea06pxqTpFtCQtzEc= 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 1760956858672700.5284213584132; Mon, 20 Oct 2025 03:40:58 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vAnJD-0002Dl-8C; Mon, 20 Oct 2025 06:40:11 -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 1vAnIF-0000ph-Ow for qemu-devel@nongnu.org; Mon, 20 Oct 2025 06:39:12 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vAnID-0000HL-Sj for qemu-devel@nongnu.org; Mon, 20 Oct 2025 06:39:11 -0400 Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-3f2cf786abeso3247573f8f.3 for ; Mon, 20 Oct 2025 03:39:08 -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-471144239bdsm270295285e9.3.2025.10.20.03.39.05 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 20 Oct 2025 03:39:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760956746; x=1761561546; 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=G71RzqW1rRM1q68VyBiXz7BShoBGdhsR1BgR0TIYzSw=; b=Jr95HB1wgeORQ5XtMkMzpEoFp6KH+DHjGiLeVdKPTlJD1M6Mal3zYRODQDpT7gQIex sBKCdbvH5lIpX1WznFtw6RsttQK3JoAp4drideyJq7YEXjE8PsgnBv8M450AsAfLWkC4 QMBaND9utm6RbIZPQexRxkSQfyYF/oSXjRCb6MlESDCKKf+IIN5bM/LlUHrOotWfpkFL S4k7MVI8oq0c4hUzm2zVpGCB5GbXK0eFlby0SfYxE/3ygoKTUKp5hYj8IR4mvjPR6R7r ejY4lj+0ucrHEBDO0VvAgKJD89HZzB6faaykJ+PKwv7aRI4aA3QGe2KLJmtaK249I6ut fS8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760956746; x=1761561546; 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=G71RzqW1rRM1q68VyBiXz7BShoBGdhsR1BgR0TIYzSw=; b=OIWpsmCanKpTMjFHgZHNsH111SyUP8/SWSUtxtrQatGYyBWUglD2EmQMHUnOtI9LjU N6ElGwovSIlOcq8+xhJTDgSsSlDceAUfi8Q8YZsRWnmlcyFd09OgZmtcA4HPYgFkH8GR J+erIVOUF/Hf+hGpZc3dWdGXvwL+e57VvtQcZZ5aXdXILBiDyUh1FGZzA461LWwm4TYb lOPktggA/67LnCI/SovlM+JJMTaQfpVBF8apMSEiamROSd0SRd2DyQ49MpRkd9qdMQab uOMBDPhDV/r5IQLtDViMXVbf0wiHALuWseXBfpKf+v8MRR9bBjbterFaG24+cIW7y4nD VcoA== X-Gm-Message-State: AOJu0YzkeRzBYZTMLSzKc0wXGaDeQEYkFj6Bi5FvrNYECbqFl4SMNK7Z dNgprkEfYa9sm03n1j+DU94l7GEndPckylsyqB6KjuNK0g4VlK8q9nJS17ihpP2MxX5jJ0KEsMa JYCxFks4= X-Gm-Gg: ASbGnctYzCl79cWhCSRLSkqJbtG3jS5QRu/CjqE1ze6bNG0aAJ7UiBnoHaV9lpwGgj7 +zxbRHjaihI8Of0AXrh8bAyFKURY74LnQJ6l6mv9rQi3YHf5OoFdyJW6UOJDUhJZMfJba/m8s3D zlHq7Nelk91t3YNf8lrYS1rsKLYGedAZr98EAuMZDp+ziBqeT/kxDHYjMUWaHsI0bNznjbPP/2L LS9lEiDGiWkKLohFnjyJGjogLpuq4LHS65g1FRBFi6JP5J4gsIlSwl33LLH9tjtcph8hWP4T+m/ npUWACRZrPmrLY96Os+6mmqJISYDu/G1SponjWfUOhujjv1/oRCYaMXfMzVbWTfsgr0KOjsef1P l3Y12rYQph18nl7DjIGqyMqLw/Svch1yWlk8aHJG9ERDq0BZqMqUR4ADDQFnfqOWsA1ZGFbGnDX rTrxcs3COFqvb6IVE6X+LTZCVVf+Qlv9avK1Cbtl0Oc+e+Q40J8YsLixuRcQZ6hs6yvbWeB3g= X-Google-Smtp-Source: AGHT+IEA6OS/cJN8d7ANvIfUdQD0HaQc+Ga96+ciiQUpkqRgsXl2JRuNNPFZgrzIZpTMTtzjZnOK/A== X-Received: by 2002:a05:6000:18a8:b0:427:7f5:2b8 with SMTP id ffacd0b85a97d-42707f50382mr6302454f8f.43.1760956746374; Mon, 20 Oct 2025 03:39:06 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Nicholas Piggin , qemu-ppc@nongnu.org, kvm@vger.kernel.org, Chinmay Rath , Harsh Prateek Bora , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 10/18] hw/ppc/spapr: Remove SpaprMachineClass::update_dt_enabled field Date: Mon, 20 Oct 2025 12:38:06 +0200 Message-ID: <20251020103815.78415-11-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251020103815.78415-1-philmd@linaro.org> References: <20251020103815.78415-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::42c; envelope-from=philmd@linaro.org; helo=mail-wr1-x42c.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: 1760956860042158500 The SpaprMachineClass::update_dt_enabled field was only used by the pseries-3.1 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 | 9 --------- hw/ppc/spapr_hcall.c | 5 ----- 3 files changed, 15 deletions(-) diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h index bc75e29084b..1db67784de8 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -143,7 +143,6 @@ struct SpaprMachineClass { MachineClass parent_class; =20 /*< public >*/ - bool update_dt_enabled; /* enable KVMPPC_H_UPDATE_DT */ 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 b81eb7ffe73..feb1e78b7c0 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -2052,13 +2052,6 @@ static const VMStateDescription vmstate_spapr_irq_ma= p =3D { }, }; =20 -static bool spapr_dtb_needed(void *opaque) -{ - SpaprMachineClass *smc =3D SPAPR_MACHINE_GET_CLASS(opaque); - - return smc->update_dt_enabled; -} - static int spapr_dtb_pre_load(void *opaque) { SpaprMachineState *spapr =3D (SpaprMachineState *)opaque; @@ -2074,7 +2067,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), @@ -4607,7 +4599,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; 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:53:45 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=1760956832; cv=none; d=zohomail.com; s=zohoarc; b=bUyELuLHnHzfxldUIgtK+V48KJSUcqip7uRQOMeKYESHnFwHt9RoWLzQoEpxkxkrlR7+kwRyxw9O+KGfj2qFJ3wuEQgY96H6Ax8L4ZEwqc7P2sIkQVUsUkMmxKDJ++xrO7OULeGIr8VDLaJ+OHJzavvvsliJrlxtniyT1HEGZ0s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760956832; 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=TZHEWfyw9nXdEX4o90awyf1j98q0YkzoZ7smAeZYw1c=; b=S8kubikqOCwFnJHSu1Nd28oYHNGEqDUSioij/gPzqDbxZy6tvqw93uFD687ZEe9VxQvXE8buOAXy/BtVNZorgTGriXTU/zNkDFfTJ8UyyZB4RoWqAEasSzvNO5cS8ezl0uFCf/BnAGnH+0c9iZ+E9M6wbvIQaAztxRt4WFEhTjg= 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 1760956832387601.1728986010482; Mon, 20 Oct 2025 03:40:32 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vAnJ5-0001k5-6E; Mon, 20 Oct 2025 06:40:03 -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 1vAnIK-0000uy-GO for qemu-devel@nongnu.org; Mon, 20 Oct 2025 06:39:21 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vAnII-0000Hw-9b for qemu-devel@nongnu.org; Mon, 20 Oct 2025 06:39:15 -0400 Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-427007b1fe5so2732044f8f.1 for ; Mon, 20 Oct 2025 03:39:13 -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-427ea5b3c65sm14592118f8f.15.2025.10.20.03.39.10 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 20 Oct 2025 03:39:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760956752; x=1761561552; 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=TZHEWfyw9nXdEX4o90awyf1j98q0YkzoZ7smAeZYw1c=; b=N/7orSYzHzXMcSiG8kpsa7MTkEDu48TQQBZtS8i7xOTzQ6Nfky3seeNaXs/bPKCQb0 WMXNt5lV1auUfV2PL8rDBjZWQzQFR8B+YNdeFw3UIH1qoAVA54AUiu4rF1hE9kEF6TqU CWQkgcQEj3sd4CrLze6jLdj08nvvnqAEzjMHrfZarGfKrYQV8c3I7+0fhPW86OJfMGeC iRDlEMUzNcKi3QUMb7alak31cjCccUvmmIBHJYuKwd0hiOUNfesO3WI+rvkPBV9pktzg HG7LHYaDL2eR/Wqo8KQx55KvszopFzPoteMgH7Uo6NBRXIBzfo5Oa81VyGpvV2LzKa0U hQ7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760956752; x=1761561552; 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=TZHEWfyw9nXdEX4o90awyf1j98q0YkzoZ7smAeZYw1c=; b=aipZMCU12P9ADo+4eCM33xG22ubT2EC8VNwaVkdI7c6ICdysuJYOn/SpiH6aPj7H+a ZBZbD0rbov0CLDeLNhbTmJpiTD3xRg5faiaYj7QiCCPDPUy7irRqRj3GMlDcVw1882NT rNZO3Aw0o1qaVO6Ha3gdmMyvJInhMLC13ZBIa5jbJMh84AGtBWUchhSMVJlqBvS0MbvG K47nOiyC11GLlbktkF7Co8U3HSWElxLz1bF7CFYL7qunRJaIq0/XhmjasHX78sfJsPFE awQr/HjQUHIPC3XcjCTZYNJVEj3DnqGDRrXaQRj6XmIy7VCLq8exTAPiUWmVAZn/MemH OQSw== X-Gm-Message-State: AOJu0Yy7wiSFf5qlG5Dc07t19FNLF8pFuDQfbPsWra8Jrqp8V2vyQSP/ k1CAp6lmPJb3UvTBvhpLX+EmEjuy9O52TNYxjjIdmPgL3bJXay3tznlb9VRf1KlDi9ccxGJSz23 lt3lLzzw= X-Gm-Gg: ASbGncuPa9gKgKA9vmgBHIq0OifFd2igQLrq1LCPEAtd8FMToaQSIWqcSxcq5isU0Pv Q+orCnhuOetcP7HNeSOr+0ZBQVIghVqPA7EOPGwiSdcRKcNDtstuOYrv3BhhXqXxZkBqgQ/Q6+0 Nxgu3+j3acUIgPto8sTRxkt2sifNjYT0rp9bPDVLV/7ltRaVHd2OxZ+rRl6bYcqQaK8EbZSSOxx A4QLkbHETF8xK3jRocTdH3HdQR0+BMwTxCbx9N8shxBJaTn0OUALw6RPVdGc+7K6+j+L4C4dZHo ZmG1lpbzMXgpeKF4ekxnqlb7urmTtecp8d9UjnjaWCiWB19/gMArm/7orU+zUfcSK/Rpe9NYokg wl1bGbwboDJ7Yhz69jfaWYGqfzs5GagMgqugWimkhG01aTqgAMmXdH8rD2fWUqlHVw51u9vJ6tP /8pQ7KN35L7Hh5SS9vfXGiDDVB6sIqbrsD2CbrG4tRGpeTypAQ1g== X-Google-Smtp-Source: AGHT+IHt0NJvsiUGxeAB/Y5QARjE5h0PkET3wK8rookKp/FSOl9qyNOKlATuA3hZTZ2on/J37dayhQ== X-Received: by 2002:a05:6000:2c09:b0:3ee:15bb:72c8 with SMTP id ffacd0b85a97d-42704daececmr10159066f8f.36.1760956752274; Mon, 20 Oct 2025 03:39:12 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Nicholas Piggin , qemu-ppc@nongnu.org, kvm@vger.kernel.org, Chinmay Rath , Harsh Prateek Bora , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 11/18] hw/ppc/spapr: Remove deprecated pseries-4.0 machine Date: Mon, 20 Oct 2025 12:38:07 +0200 Message-ID: <20251020103815.78415-12-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251020103815.78415-1-philmd@linaro.org> References: <20251020103815.78415-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::42a; envelope-from=philmd@linaro.org; helo=mail-wr1-x42a.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: 1760956835064154100 This machine has been supported for a period of more than 6 years. According to our versioned machine support policy (see commit ce80c4fa6ff "docs: document special exception for machine type deprecation & removal") it can now be removed. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/ppc/spapr.c | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index feb1e78b7c0..e861a2e7466 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -4968,33 +4968,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); --=20 2.51.0 From nobody Fri Nov 14 16:53:45 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=1760956888; cv=none; d=zohomail.com; s=zohoarc; b=RASlG7lz+lpwr/qrThHjntW5jNPfyS06PbWd94eVfo9iTqxcH1iXCRyCFjJTUAJfZVJXumnUz2ZObL3ksYfaII9BPwNUExcRRmaYO5x2BKrmkEIOqcRJmObVlbQ7OM9CF13KE94ifZUs0s8F6s1tMPIqNNWDs0iVpl/X/gqWIo8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760956888; 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=xlOXqxMFTMw8d9zFUYVs1rlWsmgPvU0WJ3K5FcKTprA=; b=I+ZRcrcXczNbbx14Ccj6CqhfkVFAQTeC8oJo5fIhG2B0mxOLGfuHnCNRf52VOh1b/z0ggN8NR0ge7Xs5tU/nX7dqAazU4ScirhrN52YkyfJbVg3jC+B/eBS5J/Lde7Iw8QHz8kbVED9nUZ3BsCCOXjL/EA6F+V0YUNkuXMvNQpA= 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 1760956888398523.8953204648104; Mon, 20 Oct 2025 03:41:28 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vAnJG-0002MF-I9; Mon, 20 Oct 2025 06:40:14 -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 1vAnIX-00010N-HC for qemu-devel@nongnu.org; Mon, 20 Oct 2025 06:39:31 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vAnIP-0000IT-F7 for qemu-devel@nongnu.org; Mon, 20 Oct 2025 06:39:29 -0400 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-47100eae3e5so38974135e9.1 for ; Mon, 20 Oct 2025 03:39:20 -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-427ea5a1056sm14700438f8f.2.2025.10.20.03.39.16 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 20 Oct 2025 03:39:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760956758; x=1761561558; 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=xlOXqxMFTMw8d9zFUYVs1rlWsmgPvU0WJ3K5FcKTprA=; b=gPzxjBfR06A4wK3HVB92mLK6jDw2ZWg2UJBpfKZGMTTbIOsGLYjuHzBaZjFPeO3rpT DWoR55Jta62b5/oCil5YKmwjojl4VDLMh5Fr0TNNT2W6g8sWyO43eW79KkcVksWNSO6h D5yw8T6IK7z/WXT0pGC4MGmHC53LvtSCR2JdT6F2RXGnPH+Q6ogDiacdvII4o031AaH/ OB11KvZ/g9eGLKzwZrgeT8NL8z2QidHGrmlZP6ogZ3R5WADu5nJda5k5eo3WmuE10INS gQoWB19UAfSCW1PuJK+wWar6ABk2ZsdheQv7tm287EFMxPQdjzcLzefOC6qnMeaVFpMP PJoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760956758; x=1761561558; 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=xlOXqxMFTMw8d9zFUYVs1rlWsmgPvU0WJ3K5FcKTprA=; b=T4EHPAomkRCjICdBn2BRQMwNn6AIvahtNnHQTx33n343RrQNwZYN16YXtosTxgE4xP W2jcsluqkqkrW8MAWOdFWU9IkUjSBEpf7VmcLJX5VZsHYxGkV5rTShc9Gmc/J4+W4ubr mAVB1kXs3nEmTYdYhjWswfubofqu5THKWADK401+R2ZKnsVy1V7jAc2D/0rE/OjJRzdw VFgHmvoBgwzLQ11joHVSxw1bzpYpdYWgHCetsiochSoFNFvn3HkXShB+0Fc2+AD4aJj0 JgElfkxwg63XXsZ7enF2/M9QjbrOi5HaGkP6/nusq8ulm0aROyngaAEfHt+hFB6tzVF4 wEvw== X-Gm-Message-State: AOJu0Yy43f5xaMZ7PrWcXPscWQZnUL2sXa/KlOd0dKbivR95qAMACyql kCLiJOo1H8gRSNilrF+b0Ee2WCDr7bnnn65chcWDFtLQxRlD3L51szRwQiQVSnasLRRQYKytVJm IMkiYD9A= X-Gm-Gg: ASbGnctVat/uha0YbDIni4XhPUe4rHAQAYa2lPCcwhRCdK+w1RQ8RI9e6Dn9Zy5Z5eU 2oFC6usnQp82AIhV7QCl/1XqLrhaLjE2piH6gNiNaq8ah87I5Th3Kmc8f2L599svps9dfYdgI0p iF2VKdJbkymOYUIz804UwNprnbBzNA8o1KQ3W/Rx4ZZDevWVDsV7zVQTzLwK73xVjS4Y422u3+6 zSGXXXFKguocs1mOA+qzGnf0OOzuT+ArdxE7H2Mt73cNggwyPM4TNfi6FVXeAl6MUY62iRIQ/Id 2cZbC78d9ew/jj6BGT4Qmb/W+3ZDI1km5h7lIKAcXrW07Z9NGwIlcziR1aQ7osNXmkNX57OBt0h yAJluqGnunC9Xq56Rli6kmHa3VgtTztW0lm13ctms2AW7oB0GlLyqm0KGu86kAt75duzeMUK/Ij sXwNuK7yZ3NghdZUTeppfi+w8qKUHLcXPUDHeoUVl74c4OFwO3Rw== X-Google-Smtp-Source: AGHT+IF7+wUXYpVOjbp8GEPbCSzKhAI9puJAqL3LxJxPnhBl2+aekWdgyEWYzqWjmfgaFsRcy3QGxQ== X-Received: by 2002:a05:600c:4ec9:b0:471:15c1:45b9 with SMTP id 5b1f17b1804b1-471179133b2mr99816415e9.29.1760956758432; Mon, 20 Oct 2025 03:39:18 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Nicholas Piggin , qemu-ppc@nongnu.org, kvm@vger.kernel.org, Chinmay Rath , Harsh Prateek Bora , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 12/18] hw/ppc/spapr: Remove SpaprMachineClass::pre_4_1_migration field Date: Mon, 20 Oct 2025 12:38:08 +0200 Message-ID: <20251020103815.78415-13-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251020103815.78415-1-philmd@linaro.org> References: <20251020103815.78415-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::32f; envelope-from=philmd@linaro.org; helo=mail-wm1-x32f.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: 1760956890451158500 The SpaprMachineClass::pre_4_1_migration field was only used by the pseries-4.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_caps.c | 6 ------ 2 files changed, 7 deletions(-) diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h index 1db67784de8..4c1acd7af5e 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -143,7 +143,6 @@ struct SpaprMachineClass { 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_caps.c b/hw/ppc/spapr_caps.c index 0f94c192fd4..f3620b1d9bd 100644 --- a/hw/ppc/spapr_caps.c +++ b/hw/ppc/spapr_caps.c @@ -336,11 +336,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 +788,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", --=20 2.51.0 From nobody Fri Nov 14 16:53:45 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=1760956905; cv=none; d=zohomail.com; s=zohoarc; b=YIGqt7mcnzjIz40rAERnazkZc9Y6tSJNMzgeG3/Ed9S26S00+xFIEn23Y+cFWp5dldO90V4MwiINnN3ak7PnHk0yONZ5vihEEgruJ4gr/yJH0mNeQSzIgrby0fgxyvVBj/FED69m1DX6H6Cka4Dw5k3RxmNAbL09IH1su5iUUeE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760956905; 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=W8V6t72s6m9O+rQuQWdHSJVeQu4En69ObrbMa64lrwE=; b=WTYiSNEnRv+3T8pziwz+OVnOLSxKyTSbvDP3IM9rQVesJt+Ozaw+aCxEG22pkt+SdQWM/ZQ+cXxBo20S1IjFgXRfQWutRZGDMOnWzFBy8IH0S82XnjS5Ul3iwDmuIzG+kLUgn0QONeg5Q8/5X+gBADuNC90qhTTNv0ozwqWV8oI= 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 1760956905199870.2075163630143; Mon, 20 Oct 2025 03:41:45 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vAnJO-0002X8-Gm; Mon, 20 Oct 2025 06:40:24 -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 1vAnIZ-00011F-OJ for qemu-devel@nongnu.org; Mon, 20 Oct 2025 06:39:37 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vAnIV-0000Il-Ju for qemu-devel@nongnu.org; Mon, 20 Oct 2025 06:39:31 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-4711f156326so28246915e9.1 for ; Mon, 20 Oct 2025 03:39:25 -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-427ea5b3d4csm14321834f8f.19.2025.10.20.03.39.22 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 20 Oct 2025 03:39:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760956763; x=1761561563; 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=W8V6t72s6m9O+rQuQWdHSJVeQu4En69ObrbMa64lrwE=; b=lWKyBFS8fQhE2glG10K/BI9LJ+Uzk0lRbzDkzQ3d52HleGTfDRqHozcbahkv58edm2 x2enwj5HJDAmZRhQetxzpLBDbdNPNhc1xXHqfS29w5/Hob543ZxnHupcdyb89OLItTuq R4eahJrNmvLIqaCbX03kixMudDqdwDacpCs9S0fu2erBLQU7ItFadQa7opyGPTaBLqjU ik02UF1BKt1d2jP8YHgfxHeM+lriLhQOceFJ9acdvzLmfsnhtkizCyXkZg0anrrUAZF3 oaJcYD3+zPbZBJMq2j5rCYaj8PH5AKDDDsjUJNQamKk7m9JdR6rxkFGDu99ASxqiI8u/ KQkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760956763; x=1761561563; 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=W8V6t72s6m9O+rQuQWdHSJVeQu4En69ObrbMa64lrwE=; b=wsQZ2u9R6eDWcrSY9qfsL2pdibIrT7QoRvRTM91V/O/xZMpRr1cI9rcUDWA/KHItjN Vgbn0/7m/IhYNP5TY2TtyUHKsn9+r05bIizcj1tOi+nE1rrOMRM04cwV8pqm+7aefLTR Pltjv9/Q1jLk7tsvIq9AheaEAhC4+z8M1RuS0+kibJXazLaBDbhdQgp/IPGy7oO7SwSZ qkDDuK0I8KIf2OpTo4eHKQEdz6Ds2AY+dwS5jtioB3tDOY/2pEuJhFlIOFVapnrZbbfk 6EPzRlGLr8RG2KvFWNoVrS9MexPGFYslUlBcL5WTZ+JiIoS/NoOHqL/pm7fegMH95F7Q umLA== X-Gm-Message-State: AOJu0YyjfdBekas7DwC1HWkvJeIY2pfzARIdMoaIs7/qY8NiTOXw7ZBT T9ow+GkZIr6lQgcn/et32mlY7bvHqh5wYbtbJ/AR9MMTKFsBmntpxs9iqnYbkRCiZTMZhnOjqCh QD5wLasE= X-Gm-Gg: ASbGncsd/zqdJ6T6t6VszVuSGgbTMoIL9K8DeUxGnwwRPB3zEBx0Y6LoA/ke0T4EXUd Dhg8b1Qx1Urc/ITTQAaMX2n6BDe92WmHuHNdSFZaMLiNIm6gX9cyiCxse5RxNMDUvBc36I+SFsz pPotBxX0Hhgm8BijKzvzCOASe6ulwoI/LO1sLyVUNR2Wfg1AdQbq6mOkwmFLwMPdHW2SMeqqT0k V5WlStsAWRWYRLQynvTvpUYVc8oB/ZcIJuf74GW4O5D9DoR6edQmWBOqTb/MXfdkcTWMTsbdpcZ QOBD3Wl6Ss4sWfquutNb/myM3VIRjoo5/aweCI0+2bLTAlzPtAIKVSsiLdbL8omDsCC2i+uYJvb 5Ij+jetd5tP21aULsfUNJeh9TO+4wRb2UFygMYBJv8S6uP44HYKjV6GRlqG7e3bEYbl+F0Cr6RS 1LQg4H3cywyYN+zjDb/qUEEkhEPDsA4llhCBl1SfKJeXT1ywyOow== X-Google-Smtp-Source: AGHT+IGtRhefuOKzzFl9+PdkwonrQEzKn77Y5Nm+6QawC0+EavDuvCFIl4z0qnwNmWAUflc1D40aEw== X-Received: by 2002:a5d:5f82:0:b0:425:8133:8a89 with SMTP id ffacd0b85a97d-42704d75729mr9332637f8f.22.1760956763315; Mon, 20 Oct 2025 03:39:23 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Nicholas Piggin , qemu-ppc@nongnu.org, kvm@vger.kernel.org, Chinmay Rath , Harsh Prateek Bora , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 13/18] hw/ppc/spapr: Remove SpaprMachineClass::phb_placement callback Date: Mon, 20 Oct 2025 12:38:09 +0200 Message-ID: <20251020103815.78415-14-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251020103815.78415-1-philmd@linaro.org> References: <20251020103815.78415-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::32c; envelope-from=philmd@linaro.org; helo=mail-wm1-x32c.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: 1760956912950158500 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 --- 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 4c1acd7af5e..82f556f97e1 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -149,11 +149,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 e861a2e7466..200e68b8bc2 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -4067,12 +4067,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 @@ -4091,12 +4141,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) @@ -4344,57 +4392,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); @@ -4605,7 +4602,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:53:45 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=1760960157; cv=none; d=zohomail.com; s=zohoarc; b=EB2wMIJRio2NHIWQSJp+EA8nCmSXhsBl3k6n5q+xI0ym8sfjz7H8lSN1coGwnQNToXYmP5AJOSyE+wgZxJgMD5rj1sV4dv2w86Njy8YruvZc+y6NvIEOnO8Fyuul366oXx6be5tlDS+1S78lRyiPmW6SorPsCzsQfrKaUt0LLKQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760960157; 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=MzhPWMtAsbDZTthftO9YhohXMbNw1TnHtRaGw5lyOng=; b=CxGUdFFMfOztu2d18zcIYH5zedwpH2dCCdAefOxvnmfNzvRbGfV3aU+QmytFVmezdDHDoPjcjJqkv3HYDrpLgmcZUSY8kyfJPJozYa23g0B2Ks07Fnw9bsFit3f1MljejalzFqZSix+tugMwrMSq6WwclrHnef2BSf3KKp9xVpw= 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 1760960157830428.0605109578994; Mon, 20 Oct 2025 04:35:57 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vAoAk-0002S0-Pb; Mon, 20 Oct 2025 07:35:30 -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 1vAoAi-0002Q1-42 for qemu-devel@nongnu.org; Mon, 20 Oct 2025 07:35:28 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vAoAg-00015U-3d for qemu-devel@nongnu.org; Mon, 20 Oct 2025 07:35:27 -0400 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-47100eae3e5so39462805e9.1 for ; Mon, 20 Oct 2025 04:35:25 -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-427ea5b3d4csm14554230f8f.19.2025.10.20.04.35.22 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 20 Oct 2025 04:35:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760960123; x=1761564923; 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=MzhPWMtAsbDZTthftO9YhohXMbNw1TnHtRaGw5lyOng=; b=RlPiz0dvHrGZl9unpTNQimY2sUJh65W7F4p28OTavgzro/IeOMGHXuS7aAlxB7Syt/ 9VRpIQZZrUYbnBGg0k5MsOs5aLb5KfbSyhaAXVvpy70HiZscX5L2SxSmI4rdkulVbel4 kQeBHkKzFdF2e+Fo5sF/8XrFsreiiwG12jAmaWDt4y/FShJNq2OoAEsp2+NOKqIdarbl wA0birrGLIPFTmrCxP9AOwBEUdLuZfhTBMHHnN95QcgszcMUfKSFOyZeOa5oecHaJrIc iPTZ0UNb6fFjQn+Kh0hbjSwVAYIuXzsF8sf+rDEE/reVIJHHnAm+9YSP/T84DFW7wJaW RlYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760960123; x=1761564923; 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=MzhPWMtAsbDZTthftO9YhohXMbNw1TnHtRaGw5lyOng=; b=je5KScmiy61EFPcbECo/o70pDSl1MiMHOt3Osk+qAgDr7oFNH0R0oMSJ6Pdfs/WmMW NzRiJpwGALRrQUKAGRoduKkoCtsSCo1ze5wLYwIPoIe8Z/wBFS2GdWvQn3nx/LMtxOGI THah9M5IPuXYzET9ZJJHtHscdKcsT5rQx9XeOSZd+KIk45UpqLgbmMnc8g/1zbhVMbhx lYN5w+GWL32cQyc0weFiMSoC3iWupo12ZWRGcTYRQgcmKQCL688C+41uyKR/kXGhSLyE w58kmJKXX5g5N4n57EN/aH8gRkCcEsW58bfZeDBxhPRwLAEthnnpwJndwyGF1kK6v/lC 37BA== X-Gm-Message-State: AOJu0YzXdHtMhbpzvE9tUYKQKBUyn7AyXNAfGvLbnDe1oNMJpAJWG0lg jXDf1C+s7ORhbSNEtt8lSzXnVW6NtnKyjHkL0FnV+mqnfpbuY+T8M/zC5l21iVu1Xxp66NNqfy5 jtqhQHkc= X-Gm-Gg: ASbGncslUzSCKSKGsIwtz7hco7QyE/W6sX9Z2/NPgipfGyEz0/ZrYyGASyAOiueMt9n 37cQ3GKKsuEYoa1DooKZe4rH2i1jYSbYSd3IqbP02LyU65KUH5UrsxGHwFFO54VNyG9N1QWGMhR PTQEx3bxRte3wEwGys//PaA86RtHayK3e/8V7A7WFAVFXzR5O9WVjM26B0PZ7dt/ofgGHmYlbVe fuLvxj5XqFBbON6Rfv5LgNXfWfciFuU44yDNtPOo+99WThMQ/6PEn6GcjGUC0yGTZz/qVf0PkYP QEcH4PVn8U79NOXG1PBz2xI7DdAz+9R+o8S+recq/TBEOZhYACrPzWw2Yy+iVNXgcKrtwS1zui7 ESk0ojMpCAjV0vzRhFbkja7gPoRkz0LKUWANnF5jeYrp5UCFEB057XUkI7h4kCGbC8CvGPU7I8D 89DvL5FEdHIPOKIgWm1VO1tlg49HiyVJQgzAUasGhkKVEABF4iC8fHoQdNI6ZsiQSnw4NPzy0= X-Google-Smtp-Source: AGHT+IGx8/bW0BfFog+BbHV+wdKKj9MN2FMI8wIhdy1epDQbm/zZcQw4pC1e+iagJ9rBjrQOXHtOEA== X-Received: by 2002:a05:6000:240c:b0:426:ee84:25a1 with SMTP id ffacd0b85a97d-42704daed04mr9705653f8f.38.1760960123281; Mon, 20 Oct 2025 04:35:23 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Chinmay Rath , Harsh Prateek Bora , qemu-ppc@nongnu.org, Paolo Bonzini , kvm@vger.kernel.org, Nicholas Piggin , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 14/18] hw/ppc/spapr: Remove deprecated pseries-4.1 machine Date: Mon, 20 Oct 2025 13:35:17 +0200 Message-ID: <20251020113521.81495-1-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251020103815.78415-1-philmd@linaro.org> References: <20251020103815.78415-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::32f; envelope-from=philmd@linaro.org; helo=mail-wm1-x32f.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: 1760960159599158501 This machine has been supported for a period of more than 6 years. According to our versioned machine support policy (see commit ce80c4fa6ff "docs: document special exception for machine type deprecation & removal") it can now be removed. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/ppc/spapr.c | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 200e68b8bc2..546e100c9cd 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -4944,26 +4944,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:53:45 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=1760960200; cv=none; d=zohomail.com; s=zohoarc; b=PPgjc98B5fBWoxU1GwpzX/UQtIbnIzadyZnvdzexRRav5gCL4+Dj6N2QTsMH7YIbOt0vvlzmzqCfIRQiuOcpcDJoMvuLsNAapuHw5XcmxvE5FCv6AQegnA5P/Zqywy0n7kB9mAshF2ML7b/Nrktswd9irb1rcHqt47j+NSEcXsY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760960200; 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=UAkkZcqWQBPqLRoYMt3hCTfFtTwm8REFlMaR8FUYzOw=; b=b4KHA33tV/9lnjftzYE46ov7+CWis1OfN1mnXumjzVU1DM7HFXbRHpFouir8skepmU+ORLfjZSu13xfzgXL0vpbZ0wVxvNyTAod4ntVei3+1n6ytDt35fKFC8vmL2SmCxV97PGvMr6/WUco1+fQiuowFO2Sb9a5DibLv9Sh9GXg= 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 17609602008181009.9626678837429; Mon, 20 Oct 2025 04:36:40 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vAoAq-0002UJ-26; Mon, 20 Oct 2025 07:35:36 -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 1vAoAn-0002TS-3d for qemu-devel@nongnu.org; Mon, 20 Oct 2025 07:35:33 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vAoAk-000161-NE for qemu-devel@nongnu.org; Mon, 20 Oct 2025 07:35:32 -0400 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-471075c0a18so44970635e9.1 for ; Mon, 20 Oct 2025 04:35: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 5b1f17b1804b1-4711442d6c6sm221017245e9.6.2025.10.20.04.35.27 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 20 Oct 2025 04:35:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760960128; x=1761564928; 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=UAkkZcqWQBPqLRoYMt3hCTfFtTwm8REFlMaR8FUYzOw=; b=v0raHShWB9tF/43c3qL3sMheg00M9fl5ofmQIjBkQV6WaRuLfStaLiTl/+dSYcc981 aKxyuiz0Fc3KAoG5hAMFZ+Vp+k8nf4y8BPpcLUSaXbSSSLzq8HwWfcoWEFutP8eIhB/q Jhiqm4z3uPm3jRAsdBVpgxfyO/dLEtSMrhu0o8juxTYX86DbylSetCbfui//ptGxydWn EnuQ1zPUE8H9tjknsvtLIGK09XwNj4Ue3h16T43W7+2eFOmY5uEGeTKEhrBOt/WR1vVR jl3wjh80f9Raq10yTukp97+sV+EaWZWn8jC29+5C0Uv0JoK64t7SyDGKM6XdvlYCwNt9 kY0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760960128; x=1761564928; 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=UAkkZcqWQBPqLRoYMt3hCTfFtTwm8REFlMaR8FUYzOw=; b=tuJ6Oi1uFU31dgAIyi4vJmn94snsYsxPZqgXeG0KVhcsdOihreIC5vAFL4yDKKcRaW 0Bt7hChZnj1Ex9kBGBnzEPwQ8YIBlpnBYDiiE27XzjihfGFqX5rq7ir1rodO3i0NYNkh uygPYG8EOJSxnQh7Qc8qa4jzAZ0HckRjLC660uf/mGu5UULwdRrkRjN27ruZDkigoWBC HVl0CyP3gP8LZ0d+83vVs7+xI9EuMfx4IIQWSmvf1uhsvbzZGqluYwn03KfK2UDohMux eOyazPWZkHOnbEMnCUB5ipOYWCivJ8OA0O6Qrc4TaUj6lqjW8EVr2kSYGtu4toPg6dT5 atuQ== X-Gm-Message-State: AOJu0Yyi7kQRjimnocradchRh6LXUyrZZHg2ZYud72GmYM22WcE+Z4rH KmfDgD6/U0G+dWsTjPUqYlrtbWQ0jS9GOpP1MTwgXlMslfGc6M+eng4ilSVjE5cNo8ML/09WI6d HB1SOfT8= X-Gm-Gg: ASbGnct+MS4rJajT7Xl9+LUlconWF6wyi8SXn8iXRv/7XGggHBUwc+L1rTMYyLtgYAo DvuMTUyMo0wJhHkIxzc4mW2tVLpDnKddMVP3TBIDUAHSWIlyJWqkwxx61pWA8GGpWPnfjRJyapX xTBQThmpEW5Wk3KvDuIeg2DM/7lm3WlvrHX9wifluTHpqXrnGQJK4NBm8uyuDDrGTZKBuYmkUOf umidCwiS3kEkQ3k/IUP4f1yl3g88dZ7LMPHghOMaPMowJ9gjUwAlVvosF8HYXXWfqrZIL8Tbpi6 o7VZ2xKBEGFxHwo+Pbbh2ajJnhC494FtUrfmLBKW40PO4XBODrOCASgy2U+NqP05W4/Wh7JiArI evkpVIZSIdRX2rXhhjV1iLSAoLkZMkYFsMjbTN8QwyIy229wyabuELgAEk+KcrkwkAovw4/Unuc dciH1OJMExg44L8t9BBZ619Acksta01Ih94Ezc44hViXOM08jCvA== X-Google-Smtp-Source: AGHT+IF2AFfYUbg6zZHrbdDsDhS2C/ImRRjkdhB/lLsq6EYZa7SyNf2IVzSoyfvyJJ0wStkrODlcEw== X-Received: by 2002:a05:600c:5029:b0:46e:3686:a2dd with SMTP id 5b1f17b1804b1-47117879c4dmr86035915e9.11.1760960128118; Mon, 20 Oct 2025 04:35:28 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Chinmay Rath , Harsh Prateek Bora , qemu-ppc@nongnu.org, Paolo Bonzini , kvm@vger.kernel.org, Nicholas Piggin , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 15/18] hw/ppc/spapr: Remove SpaprMachineClass::smp_threads_vsmt field Date: Mon, 20 Oct 2025 13:35:18 +0200 Message-ID: <20251020113521.81495-2-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251020103815.78415-1-philmd@linaro.org> References: <20251020103815.78415-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::333; envelope-from=philmd@linaro.org; helo=mail-wm1-x333.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: 1760960202046158500 The SpaprMachineClass::smp_threads_vsmt field was only used by the pseries-4.1 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 | 11 ----------- 2 files changed, 12 deletions(-) diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h index 82f556f97e1..1629baf12ac 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -144,7 +144,6 @@ struct SpaprMachineClass { =20 /*< public >*/ 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 546e100c9cd..c8558e47db2 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -2588,7 +2588,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(); @@ -2624,15 +2623,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,7 +4639,6 @@ static void spapr_machine_class_init(ObjectClass *oc,= const void *data) 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; --=20 2.51.0 From nobody Fri Nov 14 16:53:45 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=1760960202; cv=none; d=zohomail.com; s=zohoarc; b=VxrfgmPJ0o8Y4qZMOcEOESxXDu70WjHnXLpDyWhN0qERJvHduE6IkxmA4l9PK6R/m/PXIJSnFT0I3fcfmfub36xZRNiot6ZTR6zMEv8HkvazQ9QZoBxMkuWxx47Gu0kBjNq1rNjbymgqU9YGL/Ny7jumF1zkVBqSXFKp0vWBp04= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760960202; 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=S13OAGdaDHxB33SgD+W/tXYSpC7CzxHFsXBICbw81Dc=; b=oCDwuwzg7Qizr3k+f+NmDVS4R0Ncured25oNAZJsJ3DUKpU3nDxpq+gIsirm+LkodjbKmpvuFEKxtVKy0VY1O2pckS1fGf8zb3Ku7kJehUS8wcUQiQs4WKiN8x9xIlbSMcTBT5Af8jTviQ1/Ke7tcIUDmHWLwPpp0dq3/R4oKPY= 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 1760960202522404.3415964873843; Mon, 20 Oct 2025 04:36:42 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vAoAu-0002WW-ED; Mon, 20 Oct 2025 07:35:40 -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 1vAoAr-0002VT-Sc for qemu-devel@nongnu.org; Mon, 20 Oct 2025 07:35:37 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vAoAp-00016n-9y for qemu-devel@nongnu.org; Mon, 20 Oct 2025 07:35:37 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-47103b6058fso30198895e9.1 for ; Mon, 20 Oct 2025 04:35: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-427ea5bbc50sm15087183f8f.21.2025.10.20.04.35.32 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 20 Oct 2025 04:35:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760960133; x=1761564933; 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=S13OAGdaDHxB33SgD+W/tXYSpC7CzxHFsXBICbw81Dc=; b=kj67OZKSGcMiA4SXtYRpbADnh3rN4SxKMAVYAyin44Eb92BJFb2KcfHC3McTOlVkln 56OEq3ZOJfWRmAroQYbvDqyeBMB0hBVIxLr6rzsqk+RdtLH1ZkPuJR9zXZRpH2Yf46vJ 1XNXO2SkQ18saYhYrBOWFgO3ONiSieeYi+qM94rjKqCHsy3ZTU7kiLaSlYzrPdhHkr/j yGlzUPD1jUDe7TPdhbnKIq4x6IjblfaoKEoiSJoafzuKBHGa7v5oFq4a4xFqyu5NS9dA f1XrNeDhh28I+E8obDK69GqC4pF2QA6feS0sFarjfXt8W2ka9xO4WrKsuk4rctqza+IL 4Ugg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760960133; x=1761564933; 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=S13OAGdaDHxB33SgD+W/tXYSpC7CzxHFsXBICbw81Dc=; b=wHRaoh2VV2ZNGe1+OoraWEw716Ofapm7NxmUbA3rgd4fD+lplsY3+WzJIrZRohUC8E 0SzIGrXMiLB1tnftna16SMUYV+JXGgKQwzxLRh0yJHVxjeZGPDdS4nnHynRgt/boCait ecFMGNhnXshQog78LQ6htigm3KeuAVnNr4OlFsnuVsEYAq6uunagHx4pa6CCnv5tuGjL 5B4NKes1vlEnD5T0NgO2h0ykxHI2dvhSvFG8NNEQ4A8uWPREZ23l2fs5cwUma9+ewilA DwBMzUFoR9Nw4HwfdhpqoZveOrQm3xaUmhSOd6/IqRtqr17SCIT4FU8NTNtFRD2uU5bO 5mlw== X-Gm-Message-State: AOJu0Yy56jREPInDRPTuOu6hA5zGbkAWV4c29weXmKcqwVzJcN8PknZC HlucxIcI4wqSEveRf+Jw1CHG1V3OcyXrTaCV6tLj3Uqzfgibd9lnrwsUBl+TLm0+Jc8Sc5885/i jpFRiCE4= X-Gm-Gg: ASbGncvWd782wH0tN/q8HL4DrKwYPllmtXMzWQ/mi+bfnE/30BhYYt7geiz3t5Bu/Sc SOhT1+DQLv65tgr3ia2QFqda3ev2wT39ErBXc4DVBKg43YR2oLjrCOFeFhbrHJKNZWbxvMkMZwN Ucy9LwUswsOXViM9OCo3MSCXUO8xUdAbcvfO9c/gqi2cge3lwJP1r22xHNoqAcx6C+U8HRE+aTK n/1CdHeGX8EN8c2lbz1sEJNhRSzGPgndMS5NpxJDBE7vuplm7jHuLICw8rt6exQYXeOh3JK/+Wn QsR0crTHPI2+O6M2o6Qg4jLlEORlAJYx6TcEoV6hTKhFnKxFVAit67pUts/c6hv8GyyG4veWDXO 4s5ZxCMoGtNC7+9+Z8U5LXtcHV4h7ooZAxMP/cdU4r3wREwoU9HTh0npnK4OmvQe04Pm+7hQODw pGmZij9O82/wftYUZ+Os5bqw3EkZbyQ+lHlTfRI30mOVN22OcMDQ== X-Google-Smtp-Source: AGHT+IHDgvdsyRBoa6BCavsmZEBa5Tkw6MjsxGG/H09wCivMI1OQ9hkaGo/cc3BuEl5TEQ0UmvIeFA== X-Received: by 2002:a05:600c:8183:b0:45f:29eb:2148 with SMTP id 5b1f17b1804b1-4711724e5bcmr94251665e9.7.1760960133000; Mon, 20 Oct 2025 04:35:33 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Chinmay Rath , Harsh Prateek Bora , qemu-ppc@nongnu.org, Paolo Bonzini , kvm@vger.kernel.org, Nicholas Piggin , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 16/18] hw/ppc/spapr: Remove SpaprMachineClass::linux_pci_probe field Date: Mon, 20 Oct 2025 13:35:19 +0200 Message-ID: <20251020113521.81495-3-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251020103815.78415-1-philmd@linaro.org> References: <20251020103815.78415-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::32c; envelope-from=philmd@linaro.org; helo=mail-wm1-x32c.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: 1760960204075158500 The SpaprMachineClass::linux_pci_probe field was only used by the pseries-4.1 machine, which got removed. Remove it as now unused. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/ppc/spapr.h | 3 --- hw/ppc/spapr.c | 6 +----- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h index 1629baf12ac..60d9a8a0377 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 linux_pci_probe; 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 c8558e47db2..30ffcbf3d2b 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); } @@ -4638,7 +4635,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; xfc->match_nvt =3D spapr_match_nvt; vmc->client_architecture_support =3D spapr_vof_client_architecture_sup= port; vmc->quiesce =3D spapr_vof_quiesce; --=20 2.51.0 From nobody Fri Nov 14 16:53:45 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=1760960174; cv=none; d=zohomail.com; s=zohoarc; b=Tdg1JdiDY2sZnfKQad4ibOQaSVgM2LWI8yr1KYu/8+s0EF7fmDB62POpk1SOfNmNdjyoCU8t6Fn6oWd3N+OrtozaCX8QTmFS5ySoUG8OkownEOLoB7UQ5R3Us0vZElhmQAAWQG+GwOZPGHAhqd+NBz6xAKSv74OAMjIs8E3QyAk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760960174; 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=dJ9NGAEw6N6YXfZFK516do0M00rTnJSh3CYQjYCLSO0=; b=JVmkGy7WCO1Wokc3W85LY6vaPMGZb7srHThfrPhvveGw9hDYwWs3CfMBJSGGtlwWoO7YUaQXz2yp17Q7PVgNv3x3pTmMY+yfFeq99qDgMV7ShFM7gsjT8JOQM0mUV+3yXemi4oR+LNPM5sePtihmEv8UG3TdU1NfMxjkXgbOogM= 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 1760960174896385.2899869790002; Mon, 20 Oct 2025 04:36:14 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vAoAz-0002YF-NV; Mon, 20 Oct 2025 07:35:46 -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 1vAoAx-0002Xa-I9 for qemu-devel@nongnu.org; Mon, 20 Oct 2025 07:35:43 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vAoAu-00017h-CC for qemu-devel@nongnu.org; Mon, 20 Oct 2025 07:35:43 -0400 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-47100eae3e5so39465125e9.1 for ; Mon, 20 Oct 2025 04:35:39 -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-471144b5c91sm225443755e9.11.2025.10.20.04.35.36 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 20 Oct 2025 04:35:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760960138; x=1761564938; 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=dJ9NGAEw6N6YXfZFK516do0M00rTnJSh3CYQjYCLSO0=; b=BnvC6NstohVNSngMeMMHzhibWYIzZF9Hb0jrVtryBHWDQM3SBp22SbkqamK2TAz6kT iT1jGpCapalarld/HZJ51gl2YDnLzZLNavF7H+6W1zr7JHwHkByN0Ts63k5qZnfbGkBl eDk83q22JKQbKAaY7+O5R/ox51f6S9cxtO3lcDRiAgqB5ud6yrC+ughIRcuYRqcDUbVK DN9f3PIpL1dN90CGIQ/NPXfCwvxU9Mf+lnwuCB+AwskRBxRTk1nSCyTq99ENWP9DbK+V 63zCyYLPjvYbtzkSDFWGOTWQB0juIDrPih5lkiR8B+3L8KIMDUYTytnu0gBwbcyBLJzh uf3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760960138; x=1761564938; 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=dJ9NGAEw6N6YXfZFK516do0M00rTnJSh3CYQjYCLSO0=; b=NJyN7vb3qNsIqetGCP/YKF/b9DPSdl6BUoaR0/u3miTy+sUH9jXk+26kH+ejNp5BVV zm9ik25bz+8BYu8Xu8L+MZVUZRzHeerC4xvqoUbwd09WvqXo08Hz8vaq9XEWylracLAX T6RxxzLMkxKulb7r5fSMd5TIiXBJwVCET0bmfAqEK05bDU0Ul4aG2cEatqdIHDAw9ym/ WW4gThjvFZZOZzwEddy0B00PgjpRQ7UnPTcrSXIfa6PECAV2nNjKH7br6nv73CleYcSx +Kb+gKWf5hPvfJxbdGuiUqaxGyVT5gq7WzG09rGlXXxboUkMtqjz6nwR5pR44lnv2Pmz Xz3g== X-Gm-Message-State: AOJu0YzLZeoID4STI7UpJoFPSmdmBAOwgdPHx/ns3eTBfGzrvASRJmD/ J9JqeJHRNGiHA+zxrqK4gzqfC3j/RiMsHpvKxtxoD9+4qZmtjZXPJRxhoi57fIliFDWG3sR/Oma 2g29zqNo= X-Gm-Gg: ASbGncuHwnBZRlmJFSLIjsRuCfJaME7rDujvDDmisB87ymvdIxNLThFUAi2u/U2RhkR xJsM5XBOktNRYp+KQyjUm+XJFWPCc51KgGyuU/K4IGDIUVVbuV9qaCTNClWxq8CycxulS1t9y2N GI4NSDH2M9fhoeiIeMqGbqcjMhIaOVFMh7o+lY+b/vMz+bi9pYdH1Nez9HLO9/NsGpZxDeeJEcZ 7OB676AH6CcLLxU7Q0qwHxMs5Hm8NtgBB7iWlKlXR4Y0asikEagCoDcjbzSNtbb0QrmPBYzAc2K vnpx1yQ3eLLs4xYwqSKBVd/9Aw1dlsJK5AQ0agaf0Inqh2UrNgPpHE6571756H1L4NE3tQNvZ7o iu9HZ4yNL3QPRXH7pcIIqmKXX55LNUhvO/LAhbrxyeLIv/QJjNauKHgEruCgsiu2d2DMnxcTro+ 6TjdOIXKFLT7S2IvQZXzA7ygzO0tKY8K9fqDyY8SeI73bjmuSvGmF+wndK7OcH X-Google-Smtp-Source: AGHT+IH9aVP2HDqi6fupN4F23f6aoUioti0VFzylksj46aoAXat7G3nwhgRBvFJu1VfuUwA74SWURg== X-Received: by 2002:a05:600c:528e:b0:471:7a:7905 with SMTP id 5b1f17b1804b1-4711791cba1mr121926425e9.34.1760960137640; Mon, 20 Oct 2025 04:35:37 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Chinmay Rath , Harsh Prateek Bora , qemu-ppc@nongnu.org, Paolo Bonzini , kvm@vger.kernel.org, Nicholas Piggin , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 17/18] hw/ppc/spapr: Remove deprecated pseries-4.2 machine Date: Mon, 20 Oct 2025 13:35:20 +0200 Message-ID: <20251020113521.81495-4-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251020103815.78415-1-philmd@linaro.org> References: <20251020103815.78415-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::32f; envelope-from=philmd@linaro.org; helo=mail-wm1-x32f.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: 1760960177797158501 This machine has been supported for a period of more than 6 years. According to our versioned machine support policy (see commit ce80c4fa6ff "docs: document special exception for machine type deprecation & removal") it can now be removed. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/ppc/spapr.c | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 30ffcbf3d2b..97211bc2ddc 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -4912,23 +4912,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 From nobody Fri Nov 14 16:53:45 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=1760960196; cv=none; d=zohomail.com; s=zohoarc; b=S58S+wtdiCC/DULB0mcOI7+a8tvESYB8xo8gCHWwusydWvfEFxSK2JYHY7gpYiYGb8Eeol5VajbsZ9rXwtsGW2PhkYv7POVIW7HcmkrhA4HMqay6vNoZ6mrnU7Pg2ZSChZkLidgujVy/Z2BT8+UM43u43Lv0AUidG8cbnOGSyew= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760960196; 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=71R8sAvBEiNvqEf9kiOYU72VRXxnt/PEhui8Mhvi1Og=; b=cw82S0/KJPoODpf8HJZwxAyG/ztLoQh3hk/f+N8YNUtsoZi3lHpdM900NH9z9YbkYQTQZHmA3++qJt97e2bVXYgLzc9dMuH6BU+EWGQaCHg2q5qw3L5gc1KKVAJCabvNYDPy7IgGAk65XOSzTnDxVsFe8uLqEbP2ZuU5Jh5EhPg= 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 1760960196229139.0990419495738; Mon, 20 Oct 2025 04:36:36 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vAoB4-0002ZR-1q; Mon, 20 Oct 2025 07:35:50 -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 1vAoB0-0002Yh-DD for qemu-devel@nongnu.org; Mon, 20 Oct 2025 07:35:46 -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 1vAoAy-00019N-Eh for qemu-devel@nongnu.org; Mon, 20 Oct 2025 07:35:46 -0400 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-47117e75258so14895545e9.2 for ; Mon, 20 Oct 2025 04:35:44 -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-427f00ce178sm14714271f8f.46.2025.10.20.04.35.41 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 20 Oct 2025 04:35:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760960142; x=1761564942; 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=71R8sAvBEiNvqEf9kiOYU72VRXxnt/PEhui8Mhvi1Og=; b=dMJA4sSRZfBlddDezyGAUzfKCVKFEroR3E6cSn0jtmPydHzpaZedJxq6LP+DdW0Z/V 7hJgXvdc7U0JG/E7PX5roLCJznugJHDkKO9MUgDQwBJvExb1igp2dDONfMEbC5q7+xTY lEKrnM6pJRbcy8tERZlylVndWAA8xYZ0plh0FPoVgC3UAW+RNdH9MxV8tjn9k/gMg7Z/ TCZwwY4UA30pRCKVHhKNGx+4kZLtIgbszVCMr0iiI9IqUxJn9Zaz3kO2tX9nxGfnSzn6 tOVaqXJsmJAjhnWaFxVOmNVPUdFxQBj52cYMQbqS/gH+NHymtaHkDIV91vWB8IIj7R9d pRXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760960142; x=1761564942; 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=71R8sAvBEiNvqEf9kiOYU72VRXxnt/PEhui8Mhvi1Og=; b=ngFA6RQjKtQgLEGS/KW7E5OW8MV77pi+QmN2VR4evLiQyMgjXwPheLrbZJELbeWpbm /43eiRSPwBp6HFMXNXhjErEkxunmYw34iQgpXFMMErO8Uf/FDd95sgxhLhe/SwfVAnZy I/ryQr3ZZcQHSItAm71amkFJJj78cIC2HuOpHkeotZkxVVxgvxqIhUfOSUJl99EeMuzb efPiBGtigcRS1Up2RjKstyT1S8z6nBu9Ho8CPKeOH9yaKe5THganpdgT/S+aOcibxphM yvULTCGuxZdWNhqzoSHta2YTrhQETxYmDkEsx5LUahDcj4pjoZEbrtYTBpODjkhGFaKf kk4w== X-Gm-Message-State: AOJu0YxEPgHzXozESOmrVjsOHRoo3UJV9HkCj8pYfdugMy+7Ms+BHsCX 75yy9r6FlDhfsD7HQJOBqZrcXbAqxSFS8Jbwj+lV4UYNPhnjjlMDgpxkZkBMBo8g4IBmJPls7ia i/UQO8L4= X-Gm-Gg: ASbGncvH6k5u0ETvAjnSvVSPSnQXDfZkBI2P5PG5WZ/EzGS/wvATzTDVfJn7UBngUw0 1cDW8VbaNATnRbl7yG/ToUQBHvWRSN08t+7sz7D+jG8x9teqcn0fABXH1tAyMMQ3395fHJdh7Mm dI70JgsCZFFuSbCNLtX/ixy+1wi4JNggQU6+Kw0njGluE3vYoMX+FftgvuGiIXuSkBfmZjdt2W3 gSZYXWLv6T2J15SS9DAd59dfcZOTk2wH2senmfGwmip4oz2rzepPHF3ehvl3+hHA1SVuNOtuFtS sMZ4q7ILurAgnj9sr6wBRGtDshCBVA3HC0OhvAs6vffDPjonJ6XCiS8IF9skLpBgqorIapzp9Ok yo5zczPONLOxgzx2rTTTIv8CMSW7/5DJo6zwxbrJuzRiO79FpjKMXMiZbxQIZ+8k2YbBbg6q4zn EGdnEO5fDhphDlTqqbeAUHpgHqDPODk5ACAigvphx9pKZiaZXM/gAeUh5PUOCp X-Google-Smtp-Source: AGHT+IEPx0SE5xUIDTfxvhDNmRz2LWgkyKXl8jschWeu+y/qt79zcqlwmwc9t+0lsEUm/8AyI37oAg== X-Received: by 2002:a05:600c:3513:b0:46f:b340:75e7 with SMTP id 5b1f17b1804b1-471178748a9mr100220295e9.8.1760960142366; Mon, 20 Oct 2025 04:35:42 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Chinmay Rath , Harsh Prateek Bora , qemu-ppc@nongnu.org, Paolo Bonzini , kvm@vger.kernel.org, Nicholas Piggin , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 18/18] hw/ppc/spapr: Remove SpaprMachineClass::rma_limit field Date: Mon, 20 Oct 2025 13:35:21 +0200 Message-ID: <20251020113521.81495-5-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251020103815.78415-1-philmd@linaro.org> References: <20251020103815.78415-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=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: 1760960200662154100 The SpaprMachineClass::rma_limit field was only used by the pseries-4.2 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 | 10 ---------- 2 files changed, 11 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 97211bc2ddc..52333250c68 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -2728,7 +2728,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 @@ -2741,15 +2740,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 --=20 2.51.0