From patchwork Thu Jan 16 14:59:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 13941809 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4F607C02187 for ; Thu, 16 Jan 2025 15:00:31 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tYRLg-0001ya-So; Thu, 16 Jan 2025 09:59:56 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tYRLf-0001xy-Mb for qemu-devel@nongnu.org; Thu, 16 Jan 2025 09:59:55 -0500 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 1tYRLe-0008G5-74 for qemu-devel@nongnu.org; Thu, 16 Jan 2025 09:59:55 -0500 Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-385f07cd1a4so869103f8f.1 for ; Thu, 16 Jan 2025 06:59:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1737039592; x=1737644392; 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=edEeMM294Jj9eaK1cuGwb945w01rmWMXCcUhBjpJv0s=; b=p+lCYgyjiyBFnbYLT6ER6eyvdnei2WSrsIiCklnOE2wgC7Ax3d7S93QhD73zubnVu9 lHOzxBBek4Tovg4ZYyuWHlV0Cg6P8sWvtNwVHClmkDRQnbYR548mBfxuV5P1XDrDMPFK CtAnyp97DOK642cAT30dMDZMnABxKEdQLXvruIBHkz9R+NrUudQfSsxv1PV+UZZIVygd o0Ew/2HtishYNtjthBXGw1gIvxII6kQdFIZi67vdXWemeF8RBlyADNWC/s+f5kbyWlii fDcMHhNSipLHxyyXKTxRJiNMeAHH55qMAtqfKNl7U2a1QgsSwKBQ2g33b8yu7PM2zaEW fjYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737039592; x=1737644392; 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=edEeMM294Jj9eaK1cuGwb945w01rmWMXCcUhBjpJv0s=; b=In8y9uqZPJbKqJxiEOvaekhGYTCFXA74qNqF/bMO+hX8Qo0Y0KuJKKzoy34y84KvmG eCpYE60+mHaTuzJ4KX6iAtgFeS6PvLVZKnuYpJ3TREWkL7dnJj1fp2eEjVoi6tMGY/oB p2SfpNjcj7PABAhK/9xWyT6PljPb+7w39Wi9nOhMoGroQO9epyeOdCKtpr3SOLlMn6Kv 96GG3YosCZVn6nLmqkr1eThtLi5k1lXK4+rn/NCR/ptwrzlQuTEM5EEoCCXxt9LPv8s7 5zKcDkoFVCYmSoJMr/S/mLI+7onGmNt7fZnhx9s+WRsqWQegCJ1BDdx7ZKUCmKqGy90h x5tg== X-Gm-Message-State: AOJu0YzQU4gpd0IoSIueUmcp1TeXIqvx+KKUuF1tGXMY5sPRczsjwe2c msKOzpeLD+U3GJEe9ldXZnRfkyoOCcYJGgKYzyeIKj1GO8sLdCNethKJ2UJnHomBnxvC6GbsjcP muLw= X-Gm-Gg: ASbGncv+d4m052PjnF9tTyuF0ejZb3RIa5udEYhNxXiFyvYrE9DjIBRnfIDJZ0RRGcj f7C0rmZqj8L0cpr77tzboI0lGCDLYn7gZScsNeP/uXNNUBRryZf8sL8jwq3mndXoTYnVdjVjgZC diRI0O6rV1f5bwtZ5MAAekbuikGNiukuaoGkw42XFQUTVv0uDEkAtyzs6EsnjTe4tPuew2D+mF5 Jf9PzeYcuxm9AiyX/mkBniHDiWG1fg9/EfiZ78b7a/GsQGYB3cgEg4tTcjxkc8iBJXeKTfaYaID eeNdXmvMuf1r7aBBkorCTUjeSXsEVJc= X-Google-Smtp-Source: AGHT+IEh/AgKZyY1I2j1uuqP6nQT+sNAh2qwlQTGWbLLZhJjVU8XXklD1XBAO5XCAOSWIEXealXpgg== X-Received: by 2002:a5d:5986:0:b0:385:e37a:2a56 with SMTP id ffacd0b85a97d-38a8733a214mr28849597f8f.52.1737039591769; Thu, 16 Jan 2025 06:59:51 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38bf32150a6sm95071f8f.15.2025.01.16.06.59.50 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 16 Jan 2025 06:59:51 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Igor Mammedov , Andrew Jones , Thomas Huth , Shannon Zhao , "Michael S. Tsirkin" , Ani Sinha , qemu-arm@nongnu.org, Peter Maydell , =?utf-8?q?Ph?= =?utf-8?q?ilippe_Mathieu-Daud=C3=A9?= Subject: [PATCH-for-10.1 v2 01/13] hw/arm/virt: Remove deprecated virt-2.6 machine Date: Thu, 16 Jan 2025 15:59:32 +0100 Message-ID: <20250116145944.38028-2-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250116145944.38028-1-philmd@linaro.org> References: <20250116145944.38028-1-philmd@linaro.org> MIME-Version: 1.0 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=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org 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. Reviewed-by: Thomas Huth Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- hw/arm/virt.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 99e0a68b6c5..3bb8a9c7bd6 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -3606,15 +3606,3 @@ static void virt_machine_2_7_options(MachineClass *mc) mc->minimum_page_bits = 0; } DEFINE_VIRT_MACHINE(2, 7) - -static void virt_machine_2_6_options(MachineClass *mc) -{ - VirtMachineClass *vmc = VIRT_MACHINE_CLASS(OBJECT_CLASS(mc)); - - virt_machine_2_7_options(mc); - compat_props_add(mc->compat_props, hw_compat_2_6, hw_compat_2_6_len); - vmc->disallow_affinity_adjustment = true; - /* Disable PMU for 2.6 as PMU support was first introduced in 2.7 */ - vmc->no_pmu = true; -} -DEFINE_VIRT_MACHINE(2, 6) From patchwork Thu Jan 16 14:59:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 13941815 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 32809C02188 for ; Thu, 16 Jan 2025 15:03:50 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tYRLl-00020Y-IQ; Thu, 16 Jan 2025 10:00:01 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tYRLk-0001zG-4S for qemu-devel@nongnu.org; Thu, 16 Jan 2025 10:00:00 -0500 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tYRLi-0008H9-HI for qemu-devel@nongnu.org; Thu, 16 Jan 2025 09:59:59 -0500 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-436a39e4891so6717425e9.1 for ; Thu, 16 Jan 2025 06:59:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1737039596; x=1737644396; 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=lzaMM/optD2vwl9fO9YSInAfvs4juuVTuQgymT75y4I=; b=JCjwccNk/UcRx0aa8OWOARQBLyjFjuJlMDkdAMtgbRlC2WmHnBw+k8tr/6HhdaiNiB 4Y3HygaE5E5iCo74ef/Hv3zLzP1KtDMCtUeGLC/buXxwr70M8SBnu6eY4v98oT9xj/Dk +hz/QNDdXL5X5LEYX/MaY8VbKYamHo3aYYeAtDypU2q83cU/XExQbzowDFG0YvPGZHZC xO9gbxxjpIJE7BAi0lxrbAzWBKQFJnM1F7MHekeWrV7kurc6Le9mupiDkC9vemTdTKOk mCIxGWrk50oXmU2VMHnhHbCANdboFODZQ530WuWyE50VFPoxwcIa2QqujenuGhWZANnl EgLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737039596; x=1737644396; 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=lzaMM/optD2vwl9fO9YSInAfvs4juuVTuQgymT75y4I=; b=bikoMzO8rVrXb4cHPCkhuJ/l7lAeZQJG1v0W71lKRzdyPap8pPrUkl1nrpX9R5lqBj MVKfMBgFyXZsNUP/vyi0v4uz9EVOszCdW04fMh2TCu6+iYW2thLEDDYbqztZ6DWlkUNR HL479yKbQtJOvcd6U/kHfGGNefnz6V3T/J6MM29AGEatTtnaZr9CA+/OsoHxKT0B0p09 Rt+rgNYDkv0Q6I1j5Hi3htz7IkhPgvVMHbLAMZ0JvYjFsZtSTNLfLQyWSGblho7nMYhx bVW51fbJKRfe0UTJzZIT/8hgSeFxNeQAUzwz5NQNJ4UMN1+Wuzi44iN2zS9m8sx9L6wo 9H3g== X-Gm-Message-State: AOJu0Yw+Ls1alX/D2VWxghi/H1/WEPhTCNuGJY3/gCwL4vW9xlb2UPMv c/2k/BgrjYIqzTh1LhI+Y2Rzbhbr2A2tXn9334WpPyNjTHU4WPv/ZVwNWQN8s9bzf2h9pOk3DMB ZNag= X-Gm-Gg: ASbGncunFXQS8iQoc70kR1TrjcCWExH3c/rotUo+0swcew+XAaRspChGkqLVwo6DGDe 7G0JaIAUqcaN6WG480l8747L5awkM1mVd5CrcjUxFij30DdZJtIOg9yLXb7rDSTi3EAyJ63PpxI v7Fh2UD+GAz8SbCIkXHlHVTbnLmDluqEHh17VMI7loHUd+HIrwpD7hSRbml7yewKpS5tGXUf9TK Pl9JVlwp/WMez4a66GFhIhvj28JjE4zfHLN7UjnGtunerS/DwjDmwz+cX6Bjmd63g1Df7u3fg6H RjGAk/kh0umn2HHLeaDLiOCbKNDFix0= X-Google-Smtp-Source: AGHT+IHQirEthn86XzGlYZw9mjU+NipwmN1Ye2Jl/4cEP7IpNFjZ510pKkVPTnQlsiD1qtrmei915A== X-Received: by 2002:a05:6000:18a2:b0:382:49f9:74bb with SMTP id ffacd0b85a97d-38a872f3202mr33624267f8f.35.1737039596605; Thu, 16 Jan 2025 06:59:56 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38bf327e1fdsm64753f8f.94.2025.01.16.06.59.55 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 16 Jan 2025 06:59:56 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Igor Mammedov , Andrew Jones , Thomas Huth , Shannon Zhao , "Michael S. Tsirkin" , Ani Sinha , qemu-arm@nongnu.org, Peter Maydell , =?utf-8?q?Ph?= =?utf-8?q?ilippe_Mathieu-Daud=C3=A9?= Subject: [PATCH-for-10.1 v2 02/13] hw/arm/virt: Remove VirtMachineClass::no_pmu field Date: Thu, 16 Jan 2025 15:59:33 +0100 Message-ID: <20250116145944.38028-3-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250116145944.38028-1-philmd@linaro.org> References: <20250116145944.38028-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=philmd@linaro.org; helo=mail-wm1-x32b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org The VirtMachineClass::no_pmu field was only used by virt-2.6 machine, which got removed. Remove it and simplify machvirt_init(). Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth Reviewed-by: Richard Henderson --- include/hw/arm/virt.h | 1 - hw/arm/virt.c | 4 ---- 2 files changed, 5 deletions(-) diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h index c8e94e6aedc..27c5bb585cb 100644 --- a/include/hw/arm/virt.h +++ b/include/hw/arm/virt.h @@ -120,7 +120,6 @@ struct VirtMachineClass { bool disallow_affinity_adjustment; bool no_its; bool no_tcg_its; - bool no_pmu; bool claim_edge_triggered_timers; bool smbios_old_sys_ver; bool no_highmem_compact; diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 3bb8a9c7bd6..0080577e1a9 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -2262,10 +2262,6 @@ static void machvirt_init(MachineState *machine) object_property_set_bool(cpuobj, "kvm-steal-time", false, NULL); } - if (vmc->no_pmu && object_property_find(cpuobj, "pmu")) { - object_property_set_bool(cpuobj, "pmu", false, NULL); - } - if (vmc->no_tcg_lpa2 && object_property_find(cpuobj, "lpa2")) { object_property_set_bool(cpuobj, "lpa2", false, NULL); } From patchwork Thu Jan 16 14:59:34 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 13941814 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 639CAC02183 for ; Thu, 16 Jan 2025 15:03:49 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tYRLt-00021p-OJ; Thu, 16 Jan 2025 10:00:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tYRLp-00020u-56 for qemu-devel@nongnu.org; Thu, 16 Jan 2025 10:00:05 -0500 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 1tYRLn-0008Jn-HA for qemu-devel@nongnu.org; Thu, 16 Jan 2025 10:00:04 -0500 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-4363ae65100so10440275e9.0 for ; Thu, 16 Jan 2025 07:00:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1737039601; x=1737644401; 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=JgiFcB97yHnaap/C1gN2qw1BdcOfgw1ZCK0YAaOeFGA=; b=GRGjilp1VvdmSymeJGJXIcOYvIuUq4c7Y2sZOQX+4vccRzWxJtn4NRujgAQvMJVa2N +L1h6A3YZT7Xixy30SAYrU0ESXb6og/2sznDp/ugK1Huf0ZwZOpUqIMXVEZS2tcpobzb GkDHpMxtoMW+afQz9mqd6i3R3N+OS9eh0puplZIVCQVjAQUVQMQMISRiccVc98VOZtcg zIzA8RbD1yy4CCNdeqUb+CtolNzYtb4Y00wZtpBCXUxkVfqC0mUjNeOtlNn2Gjmd2O6N t4v77V59lYj1gqKCzt4wcDSWCbK0HHHnMvfn+DVJNUP+9a+bJcHnasmMTga7qrDLszvv wplg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737039601; x=1737644401; 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=JgiFcB97yHnaap/C1gN2qw1BdcOfgw1ZCK0YAaOeFGA=; b=G3uW519/xTZR5/6mvnrG+oGiUxN7yU3TFPSRLjyHV2Xf49Rhy315BEOYwvAEwZhKQr XDXmYhCuv9bQbf1QiMOuDHhYNb86azpRB5mY6uosgp0cJQ2OIOsHaI/7cHCbUEi9fF7e NponV5E3wqBL2dpsi5lykmhYUEi1eU5Jf8jrlIvROmLaGHBRDRwGhzjhXfDOPaC4h/y9 weIZ3joVoHeLoi8EjIbrtvsNyWIRfjkYbJAsW2hlHIRFaRw5nGpw3runEswpLa9t7jVR m1XPUJOy3ZOFYcqNJHbQ3Le5PZGVdJpFofa8w5v477kGM7WbVXpuc5kQR69Z4eE+no8W lOIg== X-Gm-Message-State: AOJu0YxAkNIwxoMteeH8RKLkZ4i1Fw+9llBU8ShtwE93r9StRSU71HZQ Olh4wp72u23LLuVf0mbWErcJmoHg/ep7d3ekPDCB+P7yHHazJBVl1Lg6ulM+SnUJrQdRUrQjcbx dT/I= X-Gm-Gg: ASbGnctOpsk3RsQ04sTggvKZCfjmAY7XfiT5ShD3Qfsw83mpEuN72lD8wBpa7NVZ0M7 OaTkNXwgHsFeJpFU2md8ZstJDvKlyB5PWPnunPv2FAorH9XfjbZmx2zZ+f4pNgC6vc/XXZUMW3p AeUfmunRjeXXYtw7xfexk5QC95A+DrQaRcUKBgVWPO58pfuEUvDp65bIOgsP7C97h9bGlBdUmj3 2i6RDHK69cKmMjAXICo+vn2cuWHPlA6Th5RujW1zo+1s6VNA5IMf2uETQdlxcCtX3JcZsw9+/M8 FVbl8FQa9+i1IoDu0aue1nLuvGfVhnY= X-Google-Smtp-Source: AGHT+IEZPXs3p6L5It9y2YBNTNHF2fnv3JnWnizHHfLuam9vb8UlC2aAEpoA0zw6zNCSdkd898/rxQ== X-Received: by 2002:a05:600c:1987:b0:434:fddf:5c0c with SMTP id 5b1f17b1804b1-436e2679e05mr321645785e9.4.1737039601405; Thu, 16 Jan 2025 07:00:01 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38bf322a414sm84377f8f.47.2025.01.16.07.00.00 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 16 Jan 2025 07:00:00 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Igor Mammedov , Andrew Jones , Thomas Huth , Shannon Zhao , "Michael S. Tsirkin" , Ani Sinha , qemu-arm@nongnu.org, Peter Maydell , =?utf-8?q?Ph?= =?utf-8?q?ilippe_Mathieu-Daud=C3=A9?= Subject: [PATCH-for-10.1 v2 03/13] hw/arm/virt: Remove VirtMachineClass::disallow_affinity_adjustment Date: Thu, 16 Jan 2025 15:59:34 +0100 Message-ID: <20250116145944.38028-4-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250116145944.38028-1-philmd@linaro.org> References: <20250116145944.38028-1-philmd@linaro.org> MIME-Version: 1.0 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org The VirtMachineClass::disallow_affinity_adjustment field was only used by virt-2.6 machine, which got removed. Remove it and simplify virt_cpu_mp_affinity(). Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Reviewed-by: Thomas Huth --- include/hw/arm/virt.h | 1 - hw/arm/virt.c | 30 +++++++++++++++--------------- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h index 27c5bb585cb..5d3b25509ff 100644 --- a/include/hw/arm/virt.h +++ b/include/hw/arm/virt.h @@ -117,7 +117,6 @@ typedef enum VirtGICType { struct VirtMachineClass { MachineClass parent; - bool disallow_affinity_adjustment; bool no_its; bool no_tcg_its; bool claim_edge_triggered_timers; diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 0080577e1a9..53f4a96e517 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1759,24 +1759,24 @@ void virt_machine_done(Notifier *notifier, void *data) static uint64_t virt_cpu_mp_affinity(VirtMachineState *vms, int idx) { - uint8_t clustersz = ARM_DEFAULT_CPUS_PER_CLUSTER; + uint8_t clustersz; VirtMachineClass *vmc = VIRT_MACHINE_GET_CLASS(vms); - if (!vmc->disallow_affinity_adjustment) { - /* Adjust MPIDR like 64-bit KVM hosts, which incorporate the - * GIC's target-list limitations. 32-bit KVM hosts currently - * always create clusters of 4 CPUs, but that is expected to - * change when they gain support for gicv3. When KVM is enabled - * it will override the changes we make here, therefore our - * purposes are to make TCG consistent (with 64-bit KVM hosts) - * and to improve SGI efficiency. - */ - if (vms->gic_version == VIRT_GIC_VERSION_2) { - clustersz = GIC_TARGETLIST_BITS; - } else { - clustersz = GICV3_TARGETLIST_BITS; - } + /* + * Adjust MPIDR like 64-bit KVM hosts, which incorporate the + * GIC's target-list limitations. 32-bit KVM hosts currently + * always create clusters of 4 CPUs, but that is expected to + * change when they gain support for gicv3. When KVM is enabled + * it will override the changes we make here, therefore our + * purposes are to make TCG consistent (with 64-bit KVM hosts) + * and to improve SGI efficiency. + */ + if (vms->gic_version == VIRT_GIC_VERSION_2) { + clustersz = GIC_TARGETLIST_BITS; + } else { + clustersz = GICV3_TARGETLIST_BITS; } + return arm_build_mp_affinity(idx, clustersz); } From patchwork Thu Jan 16 14:59:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 13941826 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4C804C02188 for ; Thu, 16 Jan 2025 15:05:19 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tYRM1-000282-K5; Thu, 16 Jan 2025 10:00:17 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tYRLt-00021r-KZ for qemu-devel@nongnu.org; Thu, 16 Jan 2025 10:00:09 -0500 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tYRLs-0008WJ-45 for qemu-devel@nongnu.org; Thu, 16 Jan 2025 10:00:09 -0500 Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-385ef8b64b3so978404f8f.0 for ; Thu, 16 Jan 2025 07:00:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1737039606; x=1737644406; 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=su0CZjE/5ewS32kCJYLrA1GOf40qLVdjf6VbZ1IHg8M=; b=nWnCKHWkJiGnnISfTdsXdywkWElwOhJDH2klqHmdbrX9yKVmdVJ4LYMdSyfGzsnBUE 4NfhTnmm5qe2qRGwcoWPKo+mcAXSnsohmRQlgg3iWQAxG2gYT/ggx8mw9c+OlODfSouW S55FDqdJ32LuaCzNY9aBkzWvRONccdQz02tqU3VLK9ShdCjSY/NNyGE79XEstx5yrJ0V /dwrlnygm0ZgzkmSdH/sOXHW5a2jdr3W7yKycQG9oeofF6tAMiiy3/7iUW+lmWxE3j5F 26uAsAEdrDKjZgEi38lCwXtHXlvnyxRpgQCShAi+gdte1L8a9suVeB3M61Me4wm/u2i8 8G7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737039606; x=1737644406; 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=su0CZjE/5ewS32kCJYLrA1GOf40qLVdjf6VbZ1IHg8M=; b=AvsyI9bZ3C7+x3JyDxfGUPDyh1F5lRJ3opX/DwFSGGl/p/xPD7jMqjJ2qij8gvQbbK zNRigPbJeazk/2wlMS5bwgS9xLz4rRRFvVxJnr+BhffjmaxdkpchDU2QmnL2u7GRO3Bd Jys6HfhISY79TagRlSENrnvlI3xdHdSZXKzPtwl9Ng73G4xxkYNElgbX6KB+7mxU0Zhn JiFDTir1J8gjahNHKBsYFpQ77lUjd3OfesTlMHCPjg2f6kTFZKNuXtHYEpPb2NGP+eDe ikImO/67nGjgNp1nNeBdwGrMAJBU+aTc8cPh5XWmVtZqWSbQBw73SgUstASVfCOzhyKZ FFMg== X-Gm-Message-State: AOJu0Yx+aNMlO/1No3kdBK9M2nQqPeAu5hMPOUc201iq5weBBlpTqEpu FPYq4s6OaBdsEisPD/412oN1q+EY5/yTkclwCz8ttNsjsY/wTe5Xrjnr43VhTcNafnAD3hjOUNj Gfh4= X-Gm-Gg: ASbGncv86nxZTNono75dmTBZnEIzCBGeO4vcI+QgE+2E6Rj3xxP54Ydf/Mg+Lag9QGk ESNxqQU5KzEBBtQQMXCghQ27UPvgfYnV7sS0PUsf8V1DwfkwPCeUODpOv6QugY4g13e9IX/ifs+ c8uDj+bYCmw/LVTs/AdEPTbpDJBxq169CrFZwu9BhxeEB/KZKjKTMxtBHQ0bJZFSsX/79R9wrNH 9UVwRu8mdASG5JLacqD46LRY6mShFjavN3vNi3wfPuTG+yVyTvqzGaXb+Ax+BJcnfsBxwGLl6RG r3fH0m9CkxdGD9dJTtfrKNSbkFyMW9c= X-Google-Smtp-Source: AGHT+IEspvXms/1IclnMKzWLHVNSmlB1NvH1bB0X10sQK1RqiO4SP/5KgHkDKH6dNcFgfV0hyGp4Uw== X-Received: by 2002:a5d:5e8a:0:b0:386:3918:16b1 with SMTP id ffacd0b85a97d-38a8730fc4bmr33835844f8f.39.1737039606201; Thu, 16 Jan 2025 07:00:06 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38bf32150a6sm95726f8f.15.2025.01.16.07.00.05 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 16 Jan 2025 07:00:05 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Igor Mammedov , Andrew Jones , Thomas Huth , Shannon Zhao , "Michael S. Tsirkin" , Ani Sinha , qemu-arm@nongnu.org, Peter Maydell , =?utf-8?q?Ph?= =?utf-8?q?ilippe_Mathieu-Daud=C3=A9?= Subject: [PATCH-for-10.1 v2 04/13] hw/arm/virt: Remove deprecated virt-2.7 machine Date: Thu, 16 Jan 2025 15:59:35 +0100 Message-ID: <20250116145944.38028-5-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250116145944.38028-1-philmd@linaro.org> References: <20250116145944.38028-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=philmd@linaro.org; helo=mail-wr1-x431.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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org 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é Reviewed-by: Richard Henderson Reviewed-by: Thomas Huth --- hw/arm/virt.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 53f4a96e517..eb27305dcd3 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -3589,16 +3589,3 @@ static void virt_machine_2_8_options(MachineClass *mc) vmc->claim_edge_triggered_timers = true; } DEFINE_VIRT_MACHINE(2, 8) - -static void virt_machine_2_7_options(MachineClass *mc) -{ - VirtMachineClass *vmc = VIRT_MACHINE_CLASS(OBJECT_CLASS(mc)); - - virt_machine_2_8_options(mc); - compat_props_add(mc->compat_props, hw_compat_2_7, hw_compat_2_7_len); - /* ITS was introduced with 2.8 */ - vmc->no_its = true; - /* Stick with 1K pages for migration compatibility */ - mc->minimum_page_bits = 0; -} -DEFINE_VIRT_MACHINE(2, 7) From patchwork Thu Jan 16 14:59:36 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 13941812 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5B37CC02183 for ; Thu, 16 Jan 2025 15:01:19 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tYRM7-00029q-Pi; Thu, 16 Jan 2025 10:00:24 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tYRLy-000253-Bv for qemu-devel@nongnu.org; Thu, 16 Jan 2025 10:00:15 -0500 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 1tYRLw-00005l-QA for qemu-devel@nongnu.org; Thu, 16 Jan 2025 10:00:14 -0500 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-43690d4605dso6798625e9.0 for ; Thu, 16 Jan 2025 07:00:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1737039611; x=1737644411; 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=VLP6MHIeVotcuU3w8Dkkpq3gJTXXHTzTWILY4ffGEXM=; b=RXZEbZEJ0bF1uCZh1deNL0hT2F/KcKZeMQlcOqvuppFaKMusP84z9q0FBBkx/9SQo+ b/7I77yY7JBNsFd4V6aC2bqU4bI7Dh46t40OdGVcPs0TnyB7uVWuw7BtzHNsZtw8vKuV vF8PwcTwhsQJuGRMTxJ21l0zHAhgWmUPwUzkavr2r7rk60cXzvhNWqmAN0MhZ6icYC8N uIae8ZjxF0xyWR9zTIJrzEGvXkXdGGjAFpisPR3bpd9Jtnk+MWoZFgcCB8QqPyKnSnVm Atkzq8XtH2AXZdk0sUqpf2JznSzQ9o4J58CSIDNPHXTC4rIvGYVSTDJwOJ/MICjSiAgq w8/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737039611; x=1737644411; 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=VLP6MHIeVotcuU3w8Dkkpq3gJTXXHTzTWILY4ffGEXM=; b=RXp0Use/WfhL+d0r/pq+r0tEX71dti6oTcv129A1hMbxNoOdAF20V2FKHC55Bsjac/ zFXb1EOioUudzc726YPwxpxx0TCiS6n+A9vbC1j6r+DFfiwxnXQ0NM9Xq8yndls3D5bW SVyMyHwNA+dQab88BHCBGg18kJdkwS4iMtGZYZu8MsW7M2srkQj50nRB2MbI/RkhOuJq +hbIiuRo1ZyA1gh5St2jDclm4K1NGhQL4ULuRv4luy5cvCLqdTLOPDro/GK+uA4fBF9/ aIIlz6WY7qtSbpZsxvH58co1UCxxbvoPCKzYQ42IqBbqAEHckE79v86feAto3Un2XeM9 yMMw== X-Gm-Message-State: AOJu0YzA1UoteRZUzt4HdxWhFYAQAZ0UUyOpYLU4BpNZUA0HmJU0abwD enj0B5mgE3K3bx3qNKhCs/fISEonvJWoIvmDgtgdwrF/fOtV/uP3sCAKFc/UuDCsA+bA+BlaEIK zAg0= X-Gm-Gg: ASbGncsNeEurWoSDWkLPhVgGe2oUUWTOHDII8US/ROKVqUjH4INkVt5uQgSRMLCkxmH FN84j4/rugTNnyomAtZhNsrObcAUco/w71Wyj6J8tE0e45zQ7PBGlLd3+BNFwU2hv4IUbMsQos3 PEl6KW7/ce1orBj99mBAIGOs3rZ+8A8qvP4PWyt2AGYNS7WoxQTszIpaYsm2OAG50/flGhOamUu XI/GLtwzuvgQ6SJ8bzCdQDJKV34WS1dFXTmnCVJKEr9qGu72QPODJ+kHQZsLt9MHDmaKVP4GmE2 89pPlE9RjAzbt8lweqvdijTSCYHcoQU= X-Google-Smtp-Source: AGHT+IEgYDKRNJ2ZqmHOW+Uwb5j2NPJFWPziQeZT5yZXUNQYd2eOk4taK0ekUhtfYPEBQlrkO7wRDQ== X-Received: by 2002:a05:600c:5115:b0:434:feb1:adae with SMTP id 5b1f17b1804b1-436e266e823mr293591825e9.3.1737039610951; Thu, 16 Jan 2025 07:00:10 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38bf3282a63sm64775f8f.96.2025.01.16.07.00.10 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 16 Jan 2025 07:00:10 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Igor Mammedov , Andrew Jones , Thomas Huth , Shannon Zhao , "Michael S. Tsirkin" , Ani Sinha , qemu-arm@nongnu.org, Peter Maydell , =?utf-8?q?Ph?= =?utf-8?q?ilippe_Mathieu-Daud=C3=A9?= Subject: [PATCH-for-10.1 v2 05/13] hw/arm/virt: Remove VirtMachineClass::no_its field Date: Thu, 16 Jan 2025 15:59:36 +0100 Message-ID: <20250116145944.38028-6-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250116145944.38028-1-philmd@linaro.org> References: <20250116145944.38028-1-philmd@linaro.org> MIME-Version: 1.0 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org The VirtMachineClass::no_its field was only used by virt-2.7 machine, which got removed. Remove it and simplify virt_instance_init() and virt_acpi_build(). Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth Reviewed-by: Richard Henderson --- include/hw/arm/virt.h | 1 - hw/arm/virt-acpi-build.c | 5 ++--- hw/arm/virt.c | 16 ++++++---------- 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h index 5d3b25509ff..463ac09615e 100644 --- a/include/hw/arm/virt.h +++ b/include/hw/arm/virt.h @@ -117,7 +117,6 @@ typedef enum VirtGICType { struct VirtMachineClass { MachineClass parent; - bool no_its; bool no_tcg_its; bool claim_edge_triggered_timers; bool smbios_old_sys_ver; diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c index c9b13057a34..ccecea9e09b 100644 --- a/hw/arm/virt-acpi-build.c +++ b/hw/arm/virt-acpi-build.c @@ -670,7 +670,6 @@ static void build_madt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) { int i; - VirtMachineClass *vmc = VIRT_MACHINE_GET_CLASS(vms); const MemMapEntry *memmap = vms->memmap; AcpiTable table = { .sig = "APIC", .rev = 4, .oem_id = vms->oem_id, .oem_table_id = vms->oem_table_id }; @@ -741,7 +740,7 @@ build_madt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) memmap[VIRT_HIGH_GIC_REDIST2].size); } - if (its_class_name() && !vmc->no_its) { + if (its_class_name()) { /* * ACPI spec, Revision 6.0 Errata A * (original 6.0 definition has invalid Length) @@ -974,7 +973,7 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables *tables) vms->oem_table_id); } - if (its_class_name() && !vmc->no_its) { + if (its_class_name()) { acpi_add_table(table_offsets, tables_blob); build_iort(tables_blob, tables->linker, vms); } diff --git a/hw/arm/virt.c b/hw/arm/virt.c index eb27305dcd3..06530a5dbf8 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -3294,17 +3294,13 @@ static void virt_instance_init(Object *obj) vms->highmem_mmio = true; vms->highmem_redists = true; - if (vmc->no_its) { - vms->its = false; - } else { - /* Default allows ITS instantiation */ - vms->its = true; + /* Default allows ITS instantiation */ + vms->its = true; - if (vmc->no_tcg_its) { - vms->tcg_its = false; - } else { - vms->tcg_its = true; - } + if (vmc->no_tcg_its) { + vms->tcg_its = false; + } else { + vms->tcg_its = true; } /* Default disallows iommu instantiation */ From patchwork Thu Jan 16 14:59:37 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 13941813 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 243C9C02188 for ; Thu, 16 Jan 2025 15:01:44 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tYRN9-00031v-Lq; Thu, 16 Jan 2025 10:01:27 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tYRM3-00029E-N0 for qemu-devel@nongnu.org; Thu, 16 Jan 2025 10:00:23 -0500 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tYRM1-00007U-F3 for qemu-devel@nongnu.org; Thu, 16 Jan 2025 10:00:19 -0500 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-43635796b48so6904195e9.0 for ; Thu, 16 Jan 2025 07:00:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1737039616; x=1737644416; 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=ZG24h4qnQZXs1NKv3BZzjC6mbrq7P8tcOKtCiGYeems=; b=RYrOX6XjwtXXL0ucxd8NDpRDho6RRaOuA29vWcx+Cs/ll0IXcwzEPWSRPcR+qc9UF8 txfchvX4S+zmOXC4vJvSbPoi0pCrJ/5o/Kw8qIvg8GhgQ+sPDQUoH1VHSS3o/r3VfP2l DR5SoNBSXCpJ5uaqklIYDiVEaQ2OUH7sWVnytjCmbs/aYK/lpjpM+/2c5DHp830JtmGl FDzFWwPJckk0jdaV4fkJ4ozfzbVX+fbAwvLNoT6yrYMbWjS8r9mB7Gn9JeHcuItj+4aS hBH4FDQYq9cKnhqJrYXyPopBev122EU6p+EJ/EeZi4OQWp2HKd2C0elJ3Ue8O2l2B6Xp kK3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737039616; x=1737644416; 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=ZG24h4qnQZXs1NKv3BZzjC6mbrq7P8tcOKtCiGYeems=; b=hl98SNg0Rg7FT0gCm1F7G+T+j5/h/kAn18gOkxg+cfL6ob38L+chtfTLZXihnN1MPp sHyTY85lE1z5bsBK+H7PRt4vxH7/IShTsS6zlM+QeTBD8rWZds6ryEbunxLoYWjotLVj 95B48r/jP3oxAUI7g34G7NN7cYheRpaTebaXsfmdmSe3K+W1dnp01yQv7nxGu50hlYgK 5cscg72G9htQyMJJ38FiWurT0OzUl3iFvzoD8coVDikkpKMHBgUmeEl6aRiaYow4NCET ZQuT4KHZrpB5rLY6vfLUezzT65cT/P5Q+Shsz+IXDP+6n44bGVvhT6OK5f9fztYCc6aW M1Hw== X-Gm-Message-State: AOJu0Yyt5MyHzD8Ej31QzFc+LUBYwXf53euLoHEAAncgH5VhKcY8zHwi vh3S9l4Sj1zX+4z/L3hZk4ieoiDF5j4uPo7mY0TgJVvrdwBkhN5PfIlz7Lgu1E+4V91bV2QsG50 EfxQ= X-Gm-Gg: ASbGncs+tVQKgCMBpDko60ttltuDMj++me3QxR1o/0BjkXTNj98IB+cL8zSS1/qpnZU HjBqP+OdR/mtKUuoJAHG5nqoqtdluEMYzYXwuEpBhXKV3H1PuZWx76EiedcMCsdfPY8XooMqdvX vUmj7ZuOgDEsMbbPaOgYqQ4833G8luoMqSJKwwxSyHXDlYWVhfUxhqTsedVdPFcM5UpoWOBKkuA K5wxVTruTBLhOaNMC7+kdtVbqI9T2ralkV/vJ7aRhZDX3WZmT5vALeSPL2eOGJY3QF+r+yrbeV5 FX8NnvAWjEcfSclIyqk6lUKy5vQlEFo= X-Google-Smtp-Source: AGHT+IFaRWf2c1Owfs99JgKkoFFwEU89Hlv5dCfduSYPddXpPB0NANh7RBLvenci20pjRHKmRisaUg== X-Received: by 2002:a05:600c:1588:b0:436:747d:55c9 with SMTP id 5b1f17b1804b1-437c6af20d2mr60087905e9.5.1737039615721; Thu, 16 Jan 2025 07:00:15 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-437c7540ae7sm61296945e9.33.2025.01.16.07.00.14 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 16 Jan 2025 07:00:15 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Igor Mammedov , Andrew Jones , Thomas Huth , Shannon Zhao , "Michael S. Tsirkin" , Ani Sinha , qemu-arm@nongnu.org, Peter Maydell , =?utf-8?q?Ph?= =?utf-8?q?ilippe_Mathieu-Daud=C3=A9?= Subject: [PATCH-for-10.1 v2 06/13] hw/arm/virt: Remove deprecated virt-2.8 machine Date: Thu, 16 Jan 2025 15:59:37 +0100 Message-ID: <20250116145944.38028-7-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250116145944.38028-1-philmd@linaro.org> References: <20250116145944.38028-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=philmd@linaro.org; helo=mail-wm1-x32b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org 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é Reviewed-by: Richard Henderson Reviewed-by: Thomas Huth --- hw/arm/virt.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 06530a5dbf8..76d83cfdd3b 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -3572,16 +3572,3 @@ static void virt_machine_2_9_options(MachineClass *mc) compat_props_add(mc->compat_props, hw_compat_2_9, hw_compat_2_9_len); } DEFINE_VIRT_MACHINE(2, 9) - -static void virt_machine_2_8_options(MachineClass *mc) -{ - VirtMachineClass *vmc = VIRT_MACHINE_CLASS(OBJECT_CLASS(mc)); - - virt_machine_2_9_options(mc); - compat_props_add(mc->compat_props, hw_compat_2_8, hw_compat_2_8_len); - /* For 2.8 and earlier we falsely claimed in the DT that - * our timers were edge-triggered, not level-triggered. - */ - vmc->claim_edge_triggered_timers = true; -} -DEFINE_VIRT_MACHINE(2, 8) From patchwork Thu Jan 16 14:59:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 13941811 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E3AE3C02183 for ; Thu, 16 Jan 2025 15:01:08 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tYRMS-0002SV-Di; Thu, 16 Jan 2025 10:00:44 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tYRM9-0002AG-9Q for qemu-devel@nongnu.org; Thu, 16 Jan 2025 10:00:25 -0500 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 1tYRM6-000094-Be for qemu-devel@nongnu.org; Thu, 16 Jan 2025 10:00:24 -0500 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-436326dcb1cso6618905e9.0 for ; Thu, 16 Jan 2025 07:00:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1737039620; x=1737644420; 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=QKyurn3hyAn+7BGFNFmnur/chv9BVb1zR9y6ikplhXM=; b=E4BC0TtZooepjAwr/lMvl0KPECGC9c4R0OSYpr8yEroCyPBHqSRMH/B++BM/jpEEg8 PFh9cUpJM+nCzksdrusz/y9GPetI2Njl1DRVS3UUStNiCXzZ8gIuxkSwLYjfYRvyeXPN ovtUdV6Y8o15ognF0GzHKnY4/GdJYi66k+O7U1nNwqeI2F/a2FazC3PwpTrZx++5CRaK gafbkMEKsHf/RWSB/dcISB5Mtx+TE7AkukYXeRthHs/w78ZjToNj0qqVVY55xhjakc0J TGtTP41bFBQsREbrd/2RlxomRxAqUQpR5BhxDPijNc5odPOGvaU80VKE3ETBnRU5G/EW UNgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737039620; x=1737644420; 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=QKyurn3hyAn+7BGFNFmnur/chv9BVb1zR9y6ikplhXM=; b=PZzoixCzaOH9J00p145dbNJiVJqNGTvBeDxbjtT4i01dJuKecAlYT2hhNE8S/kqlPS 7OK+smqkzsCo5zQ3NaTEkdHQklsu+D+IT3Cjfxr1REZOsTJ3n2NmZQqrvcFUKJAZa9CE FWzpyRs03XuH0CU6xRAHZ0QsJk/uOLEaci6QdJg2CMTcu10HmZwLoA9JfquW69qsEuXk VjW47w9SgNjvr2fSAObkeUNrt2A0zIRvQGcQQc4CBKffPa1hu0wKI1ONzhlMhHA9a/8b AZHxFF/ic8LUK4wUUuHdQA6499t0czl2HyUhMTDPmVkuomSLmdmnbf8Md2l2/3eftfv9 U5Uw== X-Gm-Message-State: AOJu0YybYrjYRAOdAyr3ENAmObR1SeHpNkFHaOBD1jNFHkyXjO8N/gyg hJwe9B6AVk7BhqQ1d5ksvotaXjDx6UUlMuoxnjyvkooq0xbsS+oh3i700dk9/EkV4Qg5vi0C5+4 WBG0= X-Gm-Gg: ASbGncuqEKuNKX+mu8sJtHD9LHuP1c4FvhekOCLIWuk/f9eiAxfgL5BXQahrTslopRd yz3jlzZyZ+oGb9suo9XQytagWQxEixKL2xdLtiheglW1HxuA+eI12C7/ftQ5mhRhdPF9waeDDTw wKHKWbzVVi9mE0WgLxKP/I2IzQ+XvJCSCOOKvHEXB302Ao5Bg8T2LeBmHlcTLrChGx0Coebt+wx X+J3PdPHjHQfEKoCBt6W/z2f/6SkKfr2su+3rH1c6ORzbF35B9erO4IHONduJPoDgRs7rcMLL4K ur+Wmj8eRo3amdpImIWA/Sod/YNDskI= X-Google-Smtp-Source: AGHT+IG0mL/fu8nk7Ug/5D76XUaCPxb83P8UCjrFQRIXPUaV0yU6WoLetBmExPj6udOTruHCxiaSpw== X-Received: by 2002:a05:600c:1ca7:b0:434:ff9d:a370 with SMTP id 5b1f17b1804b1-436e255e2cbmr331132315e9.0.1737039620466; Thu, 16 Jan 2025 07:00:20 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-438904623a8sm1683135e9.26.2025.01.16.07.00.19 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 16 Jan 2025 07:00:20 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Igor Mammedov , Andrew Jones , Thomas Huth , Shannon Zhao , "Michael S. Tsirkin" , Ani Sinha , qemu-arm@nongnu.org, Peter Maydell , =?utf-8?q?Ph?= =?utf-8?q?ilippe_Mathieu-Daud=C3=A9?= Subject: [PATCH-for-10.1 v2 07/13] hw/arm/virt: Remove VirtMachineClass::claim_edge_triggered_timers field Date: Thu, 16 Jan 2025 15:59:38 +0100 Message-ID: <20250116145944.38028-8-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250116145944.38028-1-philmd@linaro.org> References: <20250116145944.38028-1-philmd@linaro.org> MIME-Version: 1.0 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org The VirtMachineClass::claim_edge_triggered_timers field was only used by virt-2.8 machine, which got removed. Remove it and simplify fdt_add_timer_nodes() and build_gtdt(). Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth Reviewed-by: Richard Henderson --- include/hw/arm/virt.h | 1 - hw/arm/virt-acpi-build.c | 5 +---- hw/arm/virt.c | 5 ----- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h index 463ac09615e..9c531e28d04 100644 --- a/include/hw/arm/virt.h +++ b/include/hw/arm/virt.h @@ -118,7 +118,6 @@ typedef enum VirtGICType { struct VirtMachineClass { MachineClass parent; bool no_tcg_its; - bool claim_edge_triggered_timers; bool smbios_old_sys_ver; bool no_highmem_compact; bool no_highmem_ecam; diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c index ccecea9e09b..6e04fea165a 100644 --- a/hw/arm/virt-acpi-build.c +++ b/hw/arm/virt-acpi-build.c @@ -537,15 +537,12 @@ build_srat(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) static void build_gtdt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) { - VirtMachineClass *vmc = VIRT_MACHINE_GET_CLASS(vms); /* * Table 5-117 Flag Definitions * set only "Timer interrupt Mode" and assume "Timer Interrupt * polarity" bit as '0: Interrupt is Active high' */ - uint32_t irqflags = vmc->claim_edge_triggered_timers ? - 1 : /* Interrupt is Edge triggered */ - 0; /* Interrupt is Level triggered */ + const uint32_t irqflags = 0; /* Interrupt is Level triggered */ AcpiTable table = { .sig = "GTDT", .rev = 3, .oem_id = vms->oem_id, .oem_table_id = vms->oem_table_id }; diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 76d83cfdd3b..589f3e27ee8 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -361,14 +361,9 @@ static void fdt_add_timer_nodes(const VirtMachineState *vms) * the correct information. */ ARMCPU *armcpu; - VirtMachineClass *vmc = VIRT_MACHINE_GET_CLASS(vms); uint32_t irqflags = GIC_FDT_IRQ_FLAGS_LEVEL_HI; MachineState *ms = MACHINE(vms); - if (vmc->claim_edge_triggered_timers) { - irqflags = GIC_FDT_IRQ_FLAGS_EDGE_LO_HI; - } - if (vms->gic_version == VIRT_GIC_VERSION_2) { irqflags = deposit32(irqflags, GIC_FDT_IRQ_PPI_CPU_START, GIC_FDT_IRQ_PPI_CPU_WIDTH, From patchwork Thu Jan 16 14:59:39 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 13941824 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8A856C02183 for ; Thu, 16 Jan 2025 15:04:40 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tYRNG-0003gv-Bj; Thu, 16 Jan 2025 10:01:34 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tYRMC-0002D1-Pz for qemu-devel@nongnu.org; Thu, 16 Jan 2025 10:00:36 -0500 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 1tYRMB-0000AQ-0C for qemu-devel@nongnu.org; Thu, 16 Jan 2025 10:00:28 -0500 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-43618283dedso9715675e9.3 for ; Thu, 16 Jan 2025 07:00:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1737039625; x=1737644425; 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=/MTHv/51XufZ1391deMGkMD7k2+fuA6D8r2HqDbrkqM=; b=wsw8hWEgTofEGWD+DYvOpii5z3/DcjK0GWMp89gfgbF/zZOHmbnT++OukoMUAvsF4w gLJWnKs998E0cjdAdDT7yxXcpJFFY+MjCXP6dhQH3mYbri1IuVB8kGkQwhFsFucJh3ko TTuCPPBp8oDOAGhmYeTs9Ff7oCMXH/h6/adkC8t94FuR7GRHYRr/dLbp93s/Utxur1s9 m1DxlXn4v7d4tE1GxEMhG7aQjaw09zq7w7cx5V6NbR9QW8lk0DJZeO2gJw1UepGDPNkW mHESy8ZDNqH7zBYYJc/16P0PH/jWPbSn4ht1mqG2drFpsinZ+h/dd5pQoQ8oftUEPO+7 dvhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737039625; x=1737644425; 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=/MTHv/51XufZ1391deMGkMD7k2+fuA6D8r2HqDbrkqM=; b=Ko8KIaaKLvOLQnNwme5+trT2dQ+SRnfgFoFhHVZU71bjXDH1E+g17UGeTg/Df2HVTm U2giBF5DMri0sI9tD5Vm26lbMzZQ/2BCAiCRce58Xlj8pgOVHGoWm7YpS09k75wAHw5R rc4L0t+GGEqbjPV4H5H5zKrHRnOJ4HIJ20103k2D0FSy3jjeUj2WjxFU/QGMACSsgfr5 Ix5wfkJ0psCpTyi7M/jEIv4pqC7aat3G4bCtZ7X2fuTBGaSRzYRWB2LiLmGcChfmhsw0 mvRlxef7oGfqaF1TkgUgnq6heHmYdCvCS04EHPCYAh8dk5dKnNoI3uB5sMbk0NB9cjJL 8bkw== X-Gm-Message-State: AOJu0YzY9sGXFcApIPYu0ukwnbdJ0gjOSLeRUJ2iXKC5m20HwRyUGGR3 D8mG1GpKnmBhSE+nPDM6tWfwgKbAWtOfknMWdacsokx+lwrT21VMFAr84VDsXKneizmYDIL1xL4 M7jw= X-Gm-Gg: ASbGnctXNRnePIDEQJHnm1fXAPQ0WtEt3io+dYgWAbjtsXnPyY1qT4xt6Dh7bvN/Y90 KQJhWfh9UDRnv8jivOaChNngp6fX2hVPYWEa4KJ+f0Yw1bGIFdBa80QQycIBzOSknMPSal1ipJ0 puCT0Lz9AghGppT7Y92/PAPPfXMgtFhKdz1gKdrQW6AObpHsD2nmGpAJJNkRZuzlS3iUnlYglNQ mGTNAYCcU/5q3i2grDkp5HUZLbn+SNVbY0TwrQVTar5e1AmqMANP8du8OfmTX69KyGs88zv+JS0 2nj6BCKlvJILRjhRnHzHQoIM/D9/WBA= X-Google-Smtp-Source: AGHT+IHtKg5dO8aqpPBQ7MFgQxNr8P/YuAorEtZnd1vDUeQVAZ7fTZbIxMpHOuXeVnUxDdsn0yObPA== X-Received: by 2002:a05:600c:5117:b0:434:fe62:28c1 with SMTP id 5b1f17b1804b1-436e26cfe5cmr170202295e9.18.1737039625202; Thu, 16 Jan 2025 07:00:25 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-438904625e5sm1720085e9.32.2025.01.16.07.00.24 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 16 Jan 2025 07:00:24 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Igor Mammedov , Andrew Jones , Thomas Huth , Shannon Zhao , "Michael S. Tsirkin" , Ani Sinha , qemu-arm@nongnu.org, Peter Maydell , =?utf-8?q?Ph?= =?utf-8?q?ilippe_Mathieu-Daud=C3=A9?= Subject: [PATCH-for-10.1 v2 08/13] hw/arm/virt: Remove deprecated virt-2.9 machine Date: Thu, 16 Jan 2025 15:59:39 +0100 Message-ID: <20250116145944.38028-9-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250116145944.38028-1-philmd@linaro.org> References: <20250116145944.38028-1-philmd@linaro.org> MIME-Version: 1.0 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org 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é Reviewed-by: Richard Henderson Reviewed-by: Thomas Huth --- hw/arm/virt.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 589f3e27ee8..14fc4b100a3 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -3560,10 +3560,3 @@ static void virt_machine_2_10_options(MachineClass *mc) mc->ignore_memory_transaction_failures = true; } DEFINE_VIRT_MACHINE(2, 10) - -static void virt_machine_2_9_options(MachineClass *mc) -{ - virt_machine_2_10_options(mc); - compat_props_add(mc->compat_props, hw_compat_2_9, hw_compat_2_9_len); -} -DEFINE_VIRT_MACHINE(2, 9) From patchwork Thu Jan 16 14:59:40 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 13941816 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 312CDC02187 for ; Thu, 16 Jan 2025 15:04:11 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tYRNC-0003LQ-Bi; Thu, 16 Jan 2025 10:01:30 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tYRMI-0002Of-P9 for qemu-devel@nongnu.org; Thu, 16 Jan 2025 10:00:36 -0500 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tYRMG-0000Bi-HM for qemu-devel@nongnu.org; Thu, 16 Jan 2025 10:00:34 -0500 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-436281c8a38so6741175e9.3 for ; Thu, 16 Jan 2025 07:00:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1737039630; x=1737644430; 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=Ncjei48IWitzJKqL1woSljhbl8hcDr3h6yIvRO+sxGY=; b=ftKcboLI6xevBOoFnn8wDlmJ63E9dqXgshPFRKH543E21PrMFaCI+wMLZT/YKfQOXu y8yvOgFo4iVtvMF84GdvEX6i+bsYrXvpDTOFAMlDuZFhyPweorC0ulVxAJJbt6jafzPH KUX+yd8Cwo/ujWB71M6Z4v937AFNaE7eiyxtyvY1BCPEhMa3Mr8h/eXf6ZkYOtBuqvTA xoV9UrJIhFODYCj5ossXw4jlHcEo74XFwW9hCOB21okJEbG28cYdUrvb8uLLKIPZiP6P mb0v+O+hoAiCDRpzi2YUODqDFtLE7Y5Pw573PAAZ3IKKCjocGjS3yZMnsblzvJdTP9Kz 2R4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737039630; x=1737644430; 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=Ncjei48IWitzJKqL1woSljhbl8hcDr3h6yIvRO+sxGY=; b=E6AIShJmQ+iS1Xl//exTJHtsbeT+pA3Cy0S1SQuZPnq1gcitfspkrc29PbbNkIlf0V TI3GLSq1MHRJDVrd2iAnn+ZwiW9HqityxBQ2/Crmc1gL/4juNqZvkJs1NjtDh76wx5kY d9A88fSajylPqZT8peWfD0pgjl2nwo2pVzGqomZLJCvRzdTNQdlQqRzqnAg8p6JAIuOs dCyXB4kWS0CihnrPTkdphTYhuQOxoBhbjQMTvjzY5nfaKLLb8GWWgF5ssiLZjCAElvIh iJCc989/PtoerFfhq8qip+JfLcn1tT6oxcVyQZVbQCDAPYztyOk/gFXc5IJUyNNEQqfD HSig== X-Gm-Message-State: AOJu0YyEtZM0DyQsft7l5KCNO6Cn1D+YdRBUNfXXwxizfkVTQVkEs9Te +HTDjJPxHGHZt3qLp1fI+ICDQFGlAsCUyiBOOe7SHXNeE9TJdRNpn0disDUxsbidrmvU+ZQEe0F 3s8A= X-Gm-Gg: ASbGncuJ143ScFEW6nZ0yR1wNo9xv8vU40MZqFH/az282doymykBlU5b85+Yq7b10/k wv2n4eesdx8t0fKrvCG2tSdUOZOyHE0asMEQQtzMDoUO6K5R8guE7rRAWZFDzrS3Y+fANGopPai XxgTXTxL4Bd6dX7EYev4B0i08zQPwIO2/GLmX329UXy/YUwpSKDUVXhFJ0dFLqJLFAGtqrmV2ie meshglDPfGi34x77aw15uTE2YDC9WJU7PTaU6uYP1o1FV6Lhz7L+P84kyza2VcKENEDf2VuuL4o c/iRLsExyH8/9nlpCTqtcRAVMMZO70c= X-Google-Smtp-Source: AGHT+IFy1Piogm3KLS6gRYg68IJP34wCP8tYJNMxF8R8ZvQFVq/mSdaoYyGSAaxL1rsHVrcQwb796w== X-Received: by 2002:a05:600c:a09:b0:434:f609:1afa with SMTP id 5b1f17b1804b1-436e2684aebmr303238395e9.4.1737039630130; Thu, 16 Jan 2025 07:00:30 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-437c7499932sm61857625e9.7.2025.01.16.07.00.29 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 16 Jan 2025 07:00:29 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Igor Mammedov , Andrew Jones , Thomas Huth , Shannon Zhao , "Michael S. Tsirkin" , Ani Sinha , qemu-arm@nongnu.org, Peter Maydell , =?utf-8?q?Ph?= =?utf-8?q?ilippe_Mathieu-Daud=C3=A9?= Subject: [PATCH-for-10.1 v2 09/13] hw/arm/virt: Remove deprecated virt-2.10 machine Date: Thu, 16 Jan 2025 15:59:40 +0100 Message-ID: <20250116145944.38028-10-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250116145944.38028-1-philmd@linaro.org> References: <20250116145944.38028-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=philmd@linaro.org; helo=mail-wm1-x32a.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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org 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é Reviewed-by: Richard Henderson Reviewed-by: Thomas Huth --- hw/arm/virt.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 14fc4b100a3..54c7b92b6d9 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -3551,12 +3551,3 @@ static void virt_machine_2_11_options(MachineClass *mc) vmc->smbios_old_sys_ver = true; } DEFINE_VIRT_MACHINE(2, 11) - -static void virt_machine_2_10_options(MachineClass *mc) -{ - virt_machine_2_11_options(mc); - compat_props_add(mc->compat_props, hw_compat_2_10, hw_compat_2_10_len); - /* before 2.11 we never faulted accesses to bad addresses */ - mc->ignore_memory_transaction_failures = true; -} -DEFINE_VIRT_MACHINE(2, 10) From patchwork Thu Jan 16 14:59:41 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 13941825 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id CF064C02183 for ; Thu, 16 Jan 2025 15:05:17 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tYRND-0003WG-TX; Thu, 16 Jan 2025 10:01:31 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tYRMM-0002Qi-DR for qemu-devel@nongnu.org; Thu, 16 Jan 2025 10:00:40 -0500 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 1tYRMK-0000DQ-Oy for qemu-devel@nongnu.org; Thu, 16 Jan 2025 10:00:38 -0500 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-436326dcb1cso6621275e9.0 for ; Thu, 16 Jan 2025 07:00:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1737039635; x=1737644435; 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=eFYoi1e0Rs5lhXGPiZea0Jlbba5nXuWhf697yraqXSo=; b=WME6JPvHC2GHou+nJLLFj9FU3Qy8IW3w5XQcAtElK9/9xP10JPTRefi1Yg7qidJIex NUMbMJtjtvHB0BzJdCH1hiBuNdeb4P6SV1utElqxBCxzoabGuR7x7AtC/xCnySqN1osk bVxq0ZgEdsUpUpg6PUgWUQE8S60NiOual3HDedNObeL0sLgBibylIa/AImYep5dAR5WH eIAfuMZt7EfWKdSVFIl9YJ6RUoPYLScZrO5c6P+hQYnvjSDl0SFoFMytoo7hei1Tnogu RGOo4RJYYM5DU/T32Bvf6BKlo8fWBu39E446lg3YrJ4h0PHhA27Qu0OvkxsP6Fy9BT6P of8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737039635; x=1737644435; 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=eFYoi1e0Rs5lhXGPiZea0Jlbba5nXuWhf697yraqXSo=; b=dJMYE2ExNlcTazr1+BtTGvP11Vk8xudjAbwWN0plxfQczh4nldWyd+GoKrAQy94DwR RjLWp2k0E1C4fqpJAxHgJwdn7BdF2GCW8gUBbB7rjxpEHmUgGiNPFDKIzFH7Zj5yzwfJ u43soxPzfe9gRwPt+9kwvS5fio7/SYTMJyt7Xp5JhexRIa4CIwYZiuC5mnEDq6bSfbud HlqE23McbqQt/792znCA2qxMx6pD6DzUlE89CIpzUfHKBUsRmUQp787WHDoigil39qGm Qqlbjo1eq1Lkd1yDbmdJbOiSR7A4/nlcTBcWdgldoJDpRENtv5g7KLv7KWIMDIpkPpHt ok3A== X-Gm-Message-State: AOJu0YwPbpDtZC60iSX+a8tJ3isgu/ssEoA6gj1aEzyXategAz6aB5jJ Ds9C0ALGf09bd9mf4ZRQnOIIRzmeuovApetTR+p4jYrKSHVK1tWpbrG303PIC1EeGdpKepDqo94 Akdo= X-Gm-Gg: ASbGncuL3E9HtXAjHvUgXmrIJU9t5023uKUefuUb/yK/5ml5kIBpCduwyQb2ik9r6Jm iqd0SdYySrPRRbDz0plMa6n9lDb89qhEzE6YoCYk5AKMDHEiEdkWs5dJa0xQSIAqGCqFtifXZ1a E3dljD7zjQx5CrrsBCfkW6wwaqMb6r59/zOrVm9/krLJ28vryYuMLKQS8Ej9NkIJUoikzZFmPq4 9ztstPoVQYBgKJa2Y6i38PsIiF0Z01tSUebAX35OdNInopF/S9d+8bRrCJ0Wuym2Y+nxHfPE2+X BCYO/vq7XCAIfLv4ZM44rVo8XDpiwm0= X-Google-Smtp-Source: AGHT+IG+Lae67MnATMNadiwuWS/coc9MFIrKqXjIHHGHOFpZTTWm78nGgEVETAjm0w9RA1a3DpXvMw== X-Received: by 2002:a05:600c:3b86:b0:434:fe4b:be18 with SMTP id 5b1f17b1804b1-436e26bde73mr334144405e9.18.1737039634909; Thu, 16 Jan 2025 07:00:34 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-437c16ba82csm42260715e9.1.2025.01.16.07.00.33 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 16 Jan 2025 07:00:34 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Igor Mammedov , Andrew Jones , Thomas Huth , Shannon Zhao , "Michael S. Tsirkin" , Ani Sinha , qemu-arm@nongnu.org, Peter Maydell , =?utf-8?q?Ph?= =?utf-8?q?ilippe_Mathieu-Daud=C3=A9?= Subject: [PATCH-for-10.1 v2 10/13] hw/arm/virt: Remove deprecated virt-2.11 machine Date: Thu, 16 Jan 2025 15:59:41 +0100 Message-ID: <20250116145944.38028-11-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250116145944.38028-1-philmd@linaro.org> References: <20250116145944.38028-1-philmd@linaro.org> MIME-Version: 1.0 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org 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é Reviewed-by: Richard Henderson Reviewed-by: Thomas Huth --- hw/arm/virt.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 54c7b92b6d9..582a5aa077b 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -3541,13 +3541,3 @@ static void virt_machine_2_12_options(MachineClass *mc) mc->max_cpus = 255; } DEFINE_VIRT_MACHINE(2, 12) - -static void virt_machine_2_11_options(MachineClass *mc) -{ - VirtMachineClass *vmc = VIRT_MACHINE_CLASS(OBJECT_CLASS(mc)); - - virt_machine_2_12_options(mc); - compat_props_add(mc->compat_props, hw_compat_2_11, hw_compat_2_11_len); - vmc->smbios_old_sys_ver = true; -} -DEFINE_VIRT_MACHINE(2, 11) From patchwork Thu Jan 16 14:59:42 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 13941817 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 28B35C02183 for ; Thu, 16 Jan 2025 15:04:17 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tYRNa-0004AX-JN; Thu, 16 Jan 2025 10:01:55 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tYRMS-0002U6-Hc for qemu-devel@nongnu.org; Thu, 16 Jan 2025 10:00:44 -0500 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tYRMQ-0000Ea-Ge for qemu-devel@nongnu.org; Thu, 16 Jan 2025 10:00:44 -0500 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-4362f61757fso9735095e9.2 for ; Thu, 16 Jan 2025 07:00:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1737039640; x=1737644440; 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=ras698VG4WQwvy9cNjVcAoc+PZd43poMNOebZYPMtOs=; b=xqerccLQbMAwDZRH2qd/hXBXqkuMp5afXauZXMAB6S29p2V1/ebz/eMwMwr+QtBfQZ nw3GM5eXKdxDAmwbhkGTalU13EttnCUaOxTz1x1Jecn0fLI4oI+3F9D7lyyiquioIPJV vquy5fCkXRpGq27oFng7V65lnkV+SNVw7+se8MSXcp/6A0X5trIO6LlSumMCzxhTbaZi lt6KMSpbGBGZMYD+UG389tl2DOXG//NRCbE+fvRUAq3RN7VBK3ekF4iMaTPRPAr91E5H 5cWlWSkoX9nvFhVteuHHPtOMgUGjU8xXkmD2Uq6qzbKEkl9jhYRIVtvDsyW8+5zelROP mVEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737039640; x=1737644440; 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=ras698VG4WQwvy9cNjVcAoc+PZd43poMNOebZYPMtOs=; b=HdWFaYqSRYf5lMUWfl5eECcmXMPUEWo3PwJZ6la1Ktmp9wjlhMXi2bqDyoK6YrG5p2 49HnJMZ94dqeAAxktNUCLFZNMhADOTe8aigk4LGpQUEkfgfOB7hWmTK4HK3aRwWu5/71 vJkr4+mxWZUHJBmhtf0fbwYGjDRZgXRi2Uf+qoM/y07xhdL2Rx4+6uygQVk8rOzcV6rQ 3uQqgR9c/zg1XWtfLWbR3TMO87LTVri11TrRuYdPMHHzc1563KznzDrqy46xlxdq/9IY fUqfpzWuqsaw1InnX2NxfsYy0RhGjgJHMdmpJAK9o4EXikOYmyJaA0zl6jy4atoh22vS I+cQ== X-Gm-Message-State: AOJu0YwR86kR8wKjXTlh8jxa9Q8ULwFZnzSRC3/SxAHyNl5qE7FJN92p EHeMTZR9JHiSqKNZnH5T69JEqIN3ViPwk5ocxlanyMSPx4WzWeOd/7hJfHC8Ow2CsepF9tm5H8w 3Pjs= X-Gm-Gg: ASbGnctKNnWl7YGBZTT6Yh0iFAr4O5G9ZHUcOyyqraWB+7UV238Jui30ldo9yh4UbJt ViqCO40EFZHGf78ePiano/giguwCfKoo/OQNWwTqi/xA9HbU4q+/7WrzRYr/zQD1JFaHRBEhxOq XaGDd/+anQETRwyZJVvraPS3t+l73M0CeEUA0RyD7NXMbiyWTIhjxruyMlUR6PrLoZv9shXu0ER bjFvU4pTlVBSyDQ5cj/bX7gmGyMzV6KMockWHxy89Bv1rRVk115BY5dQxarGYpd74foy1okdS7F JEXJ4UdoVbIwW1oOpLnfEUC8/GXQ37o= X-Google-Smtp-Source: AGHT+IEGqt5LYyRNuNwxmPUwveStM/Hobp0oxMyS+M+bn3FFSVEdw5nSG3lX8GlolFGroj7GUlTNGw== X-Received: by 2002:a05:600c:b55:b0:435:1b:65ee with SMTP id 5b1f17b1804b1-436e2707f2cmr264915725e9.24.1737039639770; Thu, 16 Jan 2025 07:00:39 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-437c73e7140sm63579865e9.0.2025.01.16.07.00.38 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 16 Jan 2025 07:00:39 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Igor Mammedov , Andrew Jones , Thomas Huth , Shannon Zhao , "Michael S. Tsirkin" , Ani Sinha , qemu-arm@nongnu.org, Peter Maydell , =?utf-8?q?Ph?= =?utf-8?q?ilippe_Mathieu-Daud=C3=A9?= Subject: [PATCH-for-10.1 v2 11/13] hw/arm/virt: Remove VirtMachineClass::smbios_old_sys_ver field Date: Thu, 16 Jan 2025 15:59:42 +0100 Message-ID: <20250116145944.38028-12-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250116145944.38028-1-philmd@linaro.org> References: <20250116145944.38028-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=philmd@linaro.org; helo=mail-wm1-x330.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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org The VirtMachineClass::smbios_old_sys_ver field was only used by virt-2.11 machine, which got removed. Remove it and simplify virt_build_smbios(). Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth Reviewed-by: Richard Henderson --- include/hw/arm/virt.h | 1 - hw/arm/virt.c | 4 +--- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h index 9c531e28d04..b2cc012a402 100644 --- a/include/hw/arm/virt.h +++ b/include/hw/arm/virt.h @@ -118,7 +118,6 @@ typedef enum VirtGICType { struct VirtMachineClass { MachineClass parent; bool no_tcg_its; - bool smbios_old_sys_ver; bool no_highmem_compact; bool no_highmem_ecam; bool no_ged; /* Machines < 4.2 have no support for ACPI GED device */ diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 582a5aa077b..f15d6f230b4 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1688,7 +1688,6 @@ static void virt_build_smbios(VirtMachineState *vms) { MachineClass *mc = MACHINE_GET_CLASS(vms); MachineState *ms = MACHINE(vms); - VirtMachineClass *vmc = VIRT_MACHINE_GET_CLASS(vms); uint8_t *smbios_tables, *smbios_anchor; size_t smbios_tables_len, smbios_anchor_len; struct smbios_phys_mem_area mem_array; @@ -1698,8 +1697,7 @@ static void virt_build_smbios(VirtMachineState *vms) product = "KVM Virtual Machine"; } - smbios_set_defaults("QEMU", product, - vmc->smbios_old_sys_ver ? "1.0" : mc->name); + smbios_set_defaults("QEMU", product, mc->name); /* build the array of physical mem area from base_memmap */ mem_array.address = vms->memmap[VIRT_MEM].base; From patchwork Thu Jan 16 14:59:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 13941827 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5EECBC0218A for ; Thu, 16 Jan 2025 15:05:19 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tYRNE-0003YZ-FY; Thu, 16 Jan 2025 10:01:32 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tYRMY-0002gY-OK for qemu-devel@nongnu.org; Thu, 16 Jan 2025 10:00:56 -0500 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tYRMU-0000FU-Cr for qemu-devel@nongnu.org; Thu, 16 Jan 2025 10:00:47 -0500 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-4361f65ca01so9803785e9.1 for ; Thu, 16 Jan 2025 07:00:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1737039644; x=1737644444; 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=j6rIE3w4PqFdvMDPG/J6E3dDoALYi4FR7d3zVik6HPo=; b=DRo5pHl98sMgEwWQxq8EymmMos4j9UrQ4atUEeEBGSvo/rKxoFUu5LN0Gv2L/4yBza EPWAifIO6yV9Xrw7/yqaP5G8hdR7LfExeCO0XhxVTZIADvJdMoemE2koB3vl2HG0hjPc yaX/wNNbfteEAiekE2RRhcVzonM7B5alt0F+0INV3xRxGobLqy52DCyyY5Z4hVM8NCgv +6i8bBaknXB5RfEfiw2QQ42lg2nAUoC7Rhn+gcQPIYlOUgRYWfGjC2dnYjTEsvKADt5M zZ4l47pr+rzevC5JRrRKI3AYiPBXbT7s6xcHRRy2c30bPsx9UHs5awikGBCtIrtbWMTD IoJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737039644; x=1737644444; 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=j6rIE3w4PqFdvMDPG/J6E3dDoALYi4FR7d3zVik6HPo=; b=mt+8/S9SRZp/aXs2wZJp595DXGRXewHaHlNDICWzLArB3F0aVGzc0Of2kP8ebAwR5b qJ7MfuoIU6QzSMdP1ifKYbky0rHF0R3LyiMkWUzDJXaqkMUyuiMPlM6GuNhSpr38n3BI lh9+8KFsDrf+YqmkGX3KMgipKqm/KrVXP6dh/3ob+c/nWUSkb9PHmUs8mYbKCkOAO/N1 R9hhuFZ2bYK0eQ59fC3cYvBKGCcOTtGADJPskS/7qokpUrHf/QJe0EinS9gNptrwkMrc i+4I6G1M6ujwYEsgrojHp4550nZjiA4ilGNoqlLse1BbDJYWMQ7r2uZVTzGSKCp3SXmT gZ2A== X-Gm-Message-State: AOJu0YzF5ahiOiGriSVUKMa3WqQj0iflRkSg0pr/vOcrOmJnV4zM1+bH PCOwv5dNDn5S/BtFEG33CNDSsu+U3/0wHpXTZr2VZyuUV0esI/FjrWpUgEybNZ7rAZHIRbPbPyZ m5Ys= X-Gm-Gg: ASbGncvKlcXigV4PEExJktnIGBa0GwhI1y45S8T6x+1V3c9Srs2w1a8pBFYQ/wSuZhU 9XcszsDwlZ1A/ppcVyyd5DUTtdkRRT7IXQi1E5JjfaOkTwhoDkn+bxCRRgIh/cCqFrjsj4qawA2 QfZPT6DEdt0IJ19sTnQ6vnKE6z9EqGqskJ7v+QP+2ZH0PoPvGJdGaYRycZHxJtZM126z9XayHKm JhwnXpu2GqygeWfbdxy5RrgTHOZp+OTkdYhc96ooprHs8n1kIRamoJhrMkJVjPzpRP2HFGDemi2 4i2rCZaSNKhSvsbnjOYc/liGtk3SZ8Q= X-Google-Smtp-Source: AGHT+IGP1sNf+blsC1nUM3qxo/7SxSdM0EITn8jTum5tZnutTJdQsQQvY2ZnWRLpfZ8BH+YIGYX90w== X-Received: by 2002:a05:600c:4f06:b0:431:12a8:7f1a with SMTP id 5b1f17b1804b1-436e26d018emr362254395e9.16.1737039644487; Thu, 16 Jan 2025 07:00:44 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-437c74c4f85sm63520845e9.18.2025.01.16.07.00.43 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 16 Jan 2025 07:00:44 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Igor Mammedov , Andrew Jones , Thomas Huth , Shannon Zhao , "Michael S. Tsirkin" , Ani Sinha , qemu-arm@nongnu.org, Peter Maydell , =?utf-8?q?Ph?= =?utf-8?q?ilippe_Mathieu-Daud=C3=A9?= Subject: [PATCH-for-10.1 v2 12/13] hw/arm/virt: Remove deprecated virt-2.12 machine Date: Thu, 16 Jan 2025 15:59:43 +0100 Message-ID: <20250116145944.38028-13-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250116145944.38028-1-philmd@linaro.org> References: <20250116145944.38028-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=philmd@linaro.org; helo=mail-wm1-x330.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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org 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é Reviewed-by: Richard Henderson Reviewed-by: Thomas Huth --- hw/arm/virt.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index f15d6f230b4..d22b445fe99 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -3528,14 +3528,3 @@ static void virt_machine_3_0_options(MachineClass *mc) compat_props_add(mc->compat_props, hw_compat_3_0, hw_compat_3_0_len); } DEFINE_VIRT_MACHINE(3, 0) - -static void virt_machine_2_12_options(MachineClass *mc) -{ - VirtMachineClass *vmc = VIRT_MACHINE_CLASS(OBJECT_CLASS(mc)); - - virt_machine_3_0_options(mc); - compat_props_add(mc->compat_props, hw_compat_2_12, hw_compat_2_12_len); - vmc->no_highmem_ecam = true; - mc->max_cpus = 255; -} -DEFINE_VIRT_MACHINE(2, 12) From patchwork Thu Jan 16 14:59:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 13941828 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7DBC7C02183 for ; Thu, 16 Jan 2025 15:05:22 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tYRNN-0003v1-92; Thu, 16 Jan 2025 10:01:42 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tYRMc-0002kN-Ui for qemu-devel@nongnu.org; Thu, 16 Jan 2025 10:01:00 -0500 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 1tYRMa-0000HI-ME for qemu-devel@nongnu.org; Thu, 16 Jan 2025 10:00:54 -0500 Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-3863c36a731so899862f8f.1 for ; Thu, 16 Jan 2025 07:00:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1737039651; x=1737644451; 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=cYzGP6d4KrcAWacK9hFHH1x2EKu15pc5aRijUf74uhE=; b=Ac2Ww1De0YGjaLkOp0L9zXwnF7lG4qwaTuxb1kfIIb/CvDu1/vQQCyv0vG062zCL00 vhqgWs0itcuShnW+TAN/HXi4nWQQ77wJaOd++Bt1OzROgNkSlCGmqAP9/pzawUkww9Mt eUbNrAAPTe8scAI/kEdPWgBoN+AxpZ4H5Jo3nA9kmIX+zFOABN4brXrsfCtG22wd3LLp JDsSdjMhg/I1NafS+drBz2sxDylzSD9H+P5gQV1ITzhtsWAA65U+FjduJjtT051kGCPx qzKHYxSr+3bhcYHpcKyqXxh40/N34yXU9WRYXuozUl1EGKziyZcJPzzd6zGU8yMnfCol 8Idg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737039651; x=1737644451; 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=cYzGP6d4KrcAWacK9hFHH1x2EKu15pc5aRijUf74uhE=; b=ZoCrYLg3vJnJrwcXIphbDQm7xmrbLJjHd2vpxqeYLyMNTTeTutxlwGksPmJJJC4vya IVAru2aiaqtPYuep1ZhcyPDMQfcyXbEoBrpxmzGqlvwWtdmpEjUmb8ajWW9TsqbPIENj 02YuCUhiGJoJAm3Z1h7nkaKJKIhTbUolSL8JltQBsod/9FwH14ueDTU4wyCktohnbUCH pjubZiFJHrdMGV/n4e6zwAmFNeR6Is3j43fKNniI72PqFw0OyArk1Wq+D6UjrVgjIxT3 Enodbqn9ak8EUycHI6ZEAJq8BeS5H80+O1UOQEA2Z+3OawJv3FDoOhe5B/2c18RvA4QQ Ftdw== X-Gm-Message-State: AOJu0Ywq+DBZvD+dbAD+a9ACvfIS7f5K+2ZlCFEysGfQFRmP7qJOUM3l kNm5sz22vdSsVsm1Z3XPfP/KDRJikRNbpsMfSA/r6zYr3gzGcrd56SaNrh9/pga7P3r3du/DgLq UpIQ= X-Gm-Gg: ASbGnctpet55pAaHde6NikZ3EB7tqBpQdQQ9QIetoI2ibD5ZsHBHh9OS0drxkEKiV1W 2tArhmh2wZZ76ha9X9B9muBGSlAnvICie6YR7WUF2vGU9vb7pmLjszRr5jBhtAFOxp1i2cDCPNZ OcNNsRM+g3a4P9+gI8oQtZlqVrV62JzRkkFFkgp+OTlcugdjIWusZlr0eKAEm2/gwMXWvNSjiOB +Krhm3/chQdOf7OaLMJnwRzPjbVyONxmfoi1VmZoKgXr66PWbX0hyeGAiBDGevGtHtgCZD1Kbnv ILQ9EhqAsBjEBRhMWAb6HSZFqv4G3Rc= X-Google-Smtp-Source: AGHT+IFnNouZVfmSrEl1WM7MP75dPQsAxjhyUBBw3x05zPxsrZeRXQxfvSB9lMJe3qHxbexTOplyTw== X-Received: by 2002:a05:6000:18a6:b0:38b:d8e0:a862 with SMTP id ffacd0b85a97d-38bd8e0aa1emr16675777f8f.43.1737039649256; Thu, 16 Jan 2025 07:00:49 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38bf3275622sm69834f8f.69.2025.01.16.07.00.48 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 16 Jan 2025 07:00:48 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Igor Mammedov , Andrew Jones , Thomas Huth , Shannon Zhao , "Michael S. Tsirkin" , Ani Sinha , qemu-arm@nongnu.org, Peter Maydell , =?utf-8?q?Ph?= =?utf-8?q?ilippe_Mathieu-Daud=C3=A9?= Subject: [PATCH-for-10.1 v2 13/13] hw/arm/virt: Remove VirtMachineClass::no_highmem_ecam field Date: Thu, 16 Jan 2025 15:59:44 +0100 Message-ID: <20250116145944.38028-14-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250116145944.38028-1-philmd@linaro.org> References: <20250116145944.38028-1-philmd@linaro.org> MIME-Version: 1.0 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org The VirtMachineClass::no_highmem_ecam field was only used by virt-2.12 machine, which got removed. Remove it and simplify virt_instance_init(). Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth Reviewed-by: Richard Henderson --- include/hw/arm/virt.h | 1 - hw/arm/virt.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h index b2cc012a402..9a1b0f53d21 100644 --- a/include/hw/arm/virt.h +++ b/include/hw/arm/virt.h @@ -119,7 +119,6 @@ struct VirtMachineClass { MachineClass parent; bool no_tcg_its; bool no_highmem_compact; - bool no_highmem_ecam; bool no_ged; /* Machines < 4.2 have no support for ACPI GED device */ bool kvm_no_adjvtime; bool no_kvm_steal_time; diff --git a/hw/arm/virt.c b/hw/arm/virt.c index d22b445fe99..8c5ca6b59d3 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -3283,7 +3283,7 @@ static void virt_instance_init(Object *obj) vms->highmem_compact = !vmc->no_highmem_compact; vms->gic_version = VIRT_GIC_VERSION_NOSEL; - vms->highmem_ecam = !vmc->no_highmem_ecam; + vms->highmem_ecam = true; vms->highmem_mmio = true; vms->highmem_redists = true;