From nobody Sat Nov 15 22:23:01 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=1745936113; cv=none; d=zohomail.com; s=zohoarc; b=XBU/FeCnuZJQfJ8jv4Y32AuKXs1CJs114QE72EbI3rWtXAsbI16fqjEVd4swWTwLPyuPOKsylYmIHj5j4E03c89BsqL2ECRrWZJ5A+U2ph2tJ0XtLm2uoFnawFjcLayGmJScR+GQbQ8JWvm9kDTExqFy+LoGCvfTDTDx/c/S4SE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1745936113; 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=nr7yCouV+uxMprE88tWLr3G085FcChByOcq/6H66h8U=; b=d7sOz+hkAt9/D+Zu423jM47NrA4XuFsoDyce6BXMN8LPRhRck0VNVNOv5yoe5vWX/XfkawNfqD1V0tzdRb47YGYrfFrZcFjgg/WsoJnVH4VNdBKbh9QwJKXzVQsRTGSSAl/SkzrFTeIPszqzKsh+7wP/bogBfWEQ8IIJXG/lrQA= 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 1745936113215759.2708685487629; Tue, 29 Apr 2025 07:15:13 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u9lda-0000XU-Gl; Tue, 29 Apr 2025 10:08:42 -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 1u9ldX-0000Ti-5M for qemu-devel@nongnu.org; Tue, 29 Apr 2025 10:08:39 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u9ldT-0006Dd-IB for qemu-devel@nongnu.org; Tue, 29 Apr 2025 10:08:38 -0400 Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-3912fdddf8fso4533615f8f.1 for ; Tue, 29 Apr 2025 07:08: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-3a073ca556bsm14155091f8f.37.2025.04.29.07.08.31 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 29 Apr 2025 07:08:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745935712; x=1746540512; 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=nr7yCouV+uxMprE88tWLr3G085FcChByOcq/6H66h8U=; b=Uk7DFXXc5PmobtU4sF1Dk9QMcVJ6cyESFGpYAXzWLEYMjWlhDsXelSDSibeqQU85u4 S4TANXGpBFXMONucS3/rXmRXhHS/MZ4pK6DLHvoW7L9Xnx06Unlf6Iix+Uh+E9v6Ot4j 2n4LXKorQAmkGz2/tESeI+XlE3bNQKYfuiMEPgIAkaJzwOFTXi8P3hG3JQOSxyaQPJ71 0qKASg5o5vKr36vsMQQ2Uqas+1JLaizT3Ns7m754NBh7oWU3iNPJFUApYF9Pea3HsAWV bqicqbNKMTaUM5eIdIN83tVOHo/WFy3ggC0+Np95dhNxgIcW5qAsM6HdcsH8MjxAJQEY CxJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745935712; x=1746540512; 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=nr7yCouV+uxMprE88tWLr3G085FcChByOcq/6H66h8U=; b=YPO/wYAOydWFP3y8W6O1Ixaj82IgqYnp0AllC6m+hHhgyFlZJUDhQE34jFozCrD0q0 q31BHxft2jw4vmR1XEMrRWQ+1e4Ia8O1sk4ge4F8AeRHe+JiJYYVo1O9SqWlgKM9S2Vr f3Ejzg24h3PMKn2AOLdOhggc9L9iw9fD6FY0T7maxohXKnVjaxCXaQ3ft/NZne835Nkt C7uIGyRxaevWGAIwhTdOwvKdXGsyLWdd1LjgivtTqF7GaRJsvXyg7zsEwvInSjBvHZVt Xk1Ec6EQhWqeTfmdRgHVCShWEEd9tHT76ScrlVjxtYaI0ghQcr+1L9m4O9SIxJchSvwr E1rw== X-Gm-Message-State: AOJu0YyMyzC8kZGtdILNfo5EwoNNkw0P49olz+YkKssdplWX1SmSxEI/ +LC2E9zPDpnSsVnmsq/mHbSq6BNHaRiQtlDDrAq7gmoIDxN9a4z+vD/O30V2cg2gIQSmeTdKTJ5 J X-Gm-Gg: ASbGncvOr3p/h+UvkL7F17dwdV7ONrS8LaGjWQuRvfUJ/iycjBqYpexrihyVxSslSKE 1ZDv6qhpPgIV9yr6rO6bsryoco5NSHAcduDpprGDVGpdax5mM/kKy2g3PcxdmtFb7TfySJpreYH yuaIUGLM/pzX2ZsNJdEMPMICn6myHpL+T81dGzeAgt9sKO0btf9/buROyKvdYCoBgfkz7oTrCsa NzCeh6CphAfpMtoJCjiwPmcVO9Z13B9x6itC7fNa65yTpFQoEGitrGWycybC62XjtBYitI1CnFR 49m5apM3umhM6VuCPCHRlwfVKaLlPz40IXcWg8iZiS666ore4yS2aoYtyJ09etxF/60kLvranPX vwVjNIg5xv+hPxIf8GOsQ X-Google-Smtp-Source: AGHT+IGa4UVSXkeUt3y53K1WAL1xW9fIP8sPyPpScSQA4plpTkHdn4UnKEotXO2gSmxwHyHUTBrDNQ== X-Received: by 2002:a5d:59a7:0:b0:39c:30f7:b6ad with SMTP id ffacd0b85a97d-3a08a520647mr2915829f8f.18.1745935712417; Tue, 29 Apr 2025 07:08:32 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Hanna Reitz , Fam Zheng , Paolo Bonzini , Gerd Hoffmann , qemu-block@nongnu.org, John Snow , "Michael S. Tsirkin" , Zhao Liu , Eduardo Habkost , Jason Wang , Kevin Wolf , Yanan Wang , Marcel Apfelbaum , Dmitry Fleytman , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v2 01/19] hw/i386/pc: Remove deprecated pc-q35-2.4 and pc-i440fx-2.4 machines Date: Tue, 29 Apr 2025 16:08:07 +0200 Message-ID: <20250429140825.25964-2-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250429140825.25964-1-philmd@linaro.org> References: <20250429140825.25964-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=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: 1745936114954019100 These machines 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") they can now be removed. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Thomas Huth --- hw/i386/pc_piix.c | 13 ------------- hw/i386/pc_q35.c | 13 ------------- 2 files changed, 26 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 0dce512f184..04213b45b44 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -791,19 +791,6 @@ static void pc_i440fx_machine_2_5_options(MachineClass= *m) =20 DEFINE_I440FX_MACHINE(2, 5); =20 -static void pc_i440fx_machine_2_4_options(MachineClass *m) -{ - PCMachineClass *pcmc =3D PC_MACHINE_CLASS(m); - - pc_i440fx_machine_2_5_options(m); - m->hw_version =3D "2.4.0"; - pcmc->broken_reserved_end =3D true; - compat_props_add(m->compat_props, hw_compat_2_4, hw_compat_2_4_len); - compat_props_add(m->compat_props, pc_compat_2_4, pc_compat_2_4_len); -} - -DEFINE_I440FX_MACHINE(2, 4); - #ifdef CONFIG_ISAPC static void isapc_machine_options(MachineClass *m) { diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index c538b3d05b4..47e12602413 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -685,16 +685,3 @@ static void pc_q35_machine_2_5_options(MachineClass *m) } =20 DEFINE_Q35_MACHINE(2, 5); - -static void pc_q35_machine_2_4_options(MachineClass *m) -{ - PCMachineClass *pcmc =3D PC_MACHINE_CLASS(m); - - pc_q35_machine_2_5_options(m); - m->hw_version =3D "2.4.0"; - pcmc->broken_reserved_end =3D true; - compat_props_add(m->compat_props, hw_compat_2_4, hw_compat_2_4_len); - compat_props_add(m->compat_props, pc_compat_2_4, pc_compat_2_4_len); -} - -DEFINE_Q35_MACHINE(2, 4); --=20 2.47.1 From nobody Sat Nov 15 22:23:01 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=1745935800; cv=none; d=zohomail.com; s=zohoarc; b=iC10/vn3I5YVDii3Aj8jz0CGZhKf6iZQmMe3pOyUG1X0sT9WzFdsL/O3SXd+ptQgoZQD45ZVkGipJgsPPoSE2INCE6N27wuEnbMdANeXW18gRN2QQpVQQv6tj9XOdF9CxzlcHrrFC7Z3Bv2y6h+6G+uDQS1+CQAO57OKEcSbH6k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1745935800; 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=/fyCoBA0tWbab3gBiKQWh21M4Tnr1243A7o99XgmYbE=; b=JwXM0rSLJ689poeER3KnlTiVCW3W8u2qTfOX7DpkEJNCz7hh2opSfbwIVfpHX7LryMwXumRCCuo9AN23kndeEmgOdzEE1YyQ2mQYmVjXFS4LfJPgOj8HadzP1cIyPWfu7hFvD26wNUK2hJ/QUaAzcQfOw6YOOG9OFGeG9CUzCt4= 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 17459358008181005.9424821885826; Tue, 29 Apr 2025 07:10:00 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u9ldc-0000ZN-Lj; Tue, 29 Apr 2025 10:08:44 -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 1u9lda-0000Xn-PY for qemu-devel@nongnu.org; Tue, 29 Apr 2025 10:08:42 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u9ldX-0006Ej-Jc for qemu-devel@nongnu.org; Tue, 29 Apr 2025 10:08:42 -0400 Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-39c1ee0fd43so5527191f8f.0 for ; Tue, 29 Apr 2025 07:08: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-3a073ca4f88sm13718668f8f.29.2025.04.29.07.08.36 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 29 Apr 2025 07:08:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745935717; x=1746540517; 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=/fyCoBA0tWbab3gBiKQWh21M4Tnr1243A7o99XgmYbE=; b=Yl5L8NmC4RYYfD3th7N483rNT0hYxpDnufDzJlwEkiADXpC+fRy2lYOunF77HO+ad4 wR/JNSLSDfMmvNlsLNFv8736cqdLV9JPnpes7xJtSw00K87ptaJCh05NDEBTPj0RJFZZ ZtlVn/uLaY3IUaZvPLa1u8OykcV+i7covs1z5UQN5wj3U2oMRvKQESJJ6dg00hKYaoED nNsQC1XPeXSgpt9zbuNgKf92cWnfTazmYXBeF6lypqvJRi7ZMlunmpaafGXDqdnrjiQf LpqjRhxXZsLipXyBMiNYQYZLPMU1+Qg6szM5tQN3mAQW9N4ojkOP+K+6sZ9SSVK/YjwP 20VA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745935717; x=1746540517; 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=/fyCoBA0tWbab3gBiKQWh21M4Tnr1243A7o99XgmYbE=; b=mR3shrfw3w/Rq2U0qhG93jyfGw3o0r4r22VOLKs66fQcNoiXT63ceZSeBofSVLuQVc gCtTUrCuy75Tt7CP+3i0vRmJpQ7Putu+fWrXWHQiM6sbK2sMHJNXTTO81tU5QfrWcLSF uWKJoMghEgGTjgFaZUqedQ2GzNdxlDz/lRhxlnGZII02GLvonP8eOhPcPgqPVBoUnRi/ fzGm+bnLDsSiTEntVQbGRJuVXM0khqW8XAA6rkjnqjXGU5pqqawCGTPKzoOBzc6pkv9O Xh+Zbv++XrSTNtVlt6pM2VTiOuWAC7iwJwU8Qhd28bYrr4+WQSSRwuXyowX1up+8LA4x iWTA== X-Gm-Message-State: AOJu0Ywn135uB32jWgcIjEZvz4I8blhAWCCRyuBSXTHUFsDc5+kW7lHa BR7+aDKh4HHxJ0lTdzWFiIAWv4kYiQxmsyjGVwPgPmvxiOV+7qh6k/lzvhejWnGwlpKAVkSANoH U X-Gm-Gg: ASbGncttMR42ITLSoPFw0Ex8gkpFG570wDL1OgG/c/vfCU8Nb8nbMJyEhx1zrVBJoIP 2/NZYNM36rMrQYRkk1aJmezj7Rbnb1wV5M2RHjhQWzwMMIWQigEMB1aWgkSYTn5xpV3GH+F7EsG qPd7X7nD7FFekov3QvrEGk+9jLd0oDVlhXCn920KsDFcjVPrkOBL48Nre53rvmAhi3OqbjI1xLL 1KOYgTt+ecPatu57tjmn8IqUhlaYpVL6fIsGzvips6ePJSO4B5EeyU6n+iBdO6fdc9WEFqx/WOf LETVsQDY1hbOiwUG7gV2hyLJa/2gAONGk0/KzI7LYDCD0kSKS9ZwN1hTa8fFppDGDsMtq6ZUMs1 KXiXSo/oaW+dI58PHLJqVKlzWLAURoKM= X-Google-Smtp-Source: AGHT+IGxwNGZqzN3N5fqP3XhpSbMFiSPv55y+L0ZHJEuMsvopZsKHzkF7yroosJigv1sZcYFN6RQnA== X-Received: by 2002:a05:6000:401e:b0:39c:e0e:bb46 with SMTP id ffacd0b85a97d-3a07aa5fd30mr8824514f8f.4.1745935717318; Tue, 29 Apr 2025 07:08:37 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Hanna Reitz , Fam Zheng , Paolo Bonzini , Gerd Hoffmann , qemu-block@nongnu.org, John Snow , "Michael S. Tsirkin" , Zhao Liu , Eduardo Habkost , Jason Wang , Kevin Wolf , Yanan Wang , Marcel Apfelbaum , Dmitry Fleytman , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Thomas Huth Subject: [PATCH v2 02/19] hw/i386/pc: Remove PCMachineClass::broken_reserved_end field Date: Tue, 29 Apr 2025 16:08:08 +0200 Message-ID: <20250429140825.25964-3-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250429140825.25964-1-philmd@linaro.org> References: <20250429140825.25964-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::436; envelope-from=philmd@linaro.org; helo=mail-wr1-x436.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: 1745935802327019000 The PCMachineClass::broken_reserved_end field was only used by the pc-q35-2.4 and pc-i440fx-2.4 machines, which got removed. Remove it and simplify pc_memory_init(). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Thomas Huth --- include/hw/i386/pc.h | 1 - hw/i386/pc.c | 13 +++++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 9563674e2da..f4a874b17fc 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -107,7 +107,6 @@ struct PCMachineClass { /* RAM / address space compat: */ bool gigabyte_align; bool has_reserved_memory; - bool broken_reserved_end; bool enforce_amd_1tb_hole; bool isa_bios_alias; =20 diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 70656157ca0..c8bb4a3ee47 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -999,14 +999,13 @@ void pc_memory_init(PCMachineState *pcms, =20 if (machine->device_memory) { uint64_t *val =3D g_malloc(sizeof(*val)); - uint64_t res_mem_end =3D machine->device_memory->base; - - if (!pcmc->broken_reserved_end) { - res_mem_end +=3D memory_region_size(&machine->device_memory->m= r); - } + uint64_t res_mem_end; =20 if (pcms->cxl_devices_state.is_enabled) { res_mem_end =3D cxl_resv_end; + } else { + res_mem_end =3D machine->device_memory->base + + memory_region_size(&machine->device_memory->mr= ); } *val =3D cpu_to_le64(ROUND_UP(res_mem_end, 1 * GiB)); fw_cfg_add_file(fw_cfg, "etc/reserved-memory-end", val, sizeof(*va= l)); @@ -1044,9 +1043,7 @@ uint64_t pc_pci_hole64_start(void) hole64_start =3D pc_get_cxl_range_end(pcms); } else if (pcmc->has_reserved_memory && (ms->ram_size < ms->maxram_siz= e)) { pc_get_device_memory_range(pcms, &hole64_start, &size); - if (!pcmc->broken_reserved_end) { - hole64_start +=3D size; - } + hole64_start +=3D size; } else { hole64_start =3D pc_above_4g_end(pcms); } --=20 2.47.1 From nobody Sat Nov 15 22:23:01 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=1745936010; cv=none; d=zohomail.com; s=zohoarc; b=Hsgysfu7CjgJlyxpLZd96PxvxNg4KymMxB9RrIt5my2JklcCvB6a6O/rcnsv2zh4q64gJRafEClhi0yPWRw3YYrXDqwppbiVgT3t5UlaMxp5yDFrah3ASH5NAlN8hdpWv6g0Goqp4D1WNKqqaUDIeFAQWzMhj80gjTSMdO3emtY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1745936010; 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=1rBTFzGlpmN0XM4Xhc9yiz4Q5nlS539l0QvdyVgqZAM=; b=WcX74eJ4Y11Zf/vLCvliG/jyJQ/ElZTR+e08W/r00HAay/Vkh69mtx4EA5abPWyQmJh6Vmbfz0aWAjIxtCz89bJLa8LOKEz8SsHOZ9V3xdhwKrluxBC9ek3vWY4UUTFop4NRnqsDNu0gc4h0wiMBBjqqK7pQdXjRlfdMxknvLOI= 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 1745936010316115.11492250306776; Tue, 29 Apr 2025 07:13:30 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u9ldi-0000e4-N8; Tue, 29 Apr 2025 10:08: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 1u9ldh-0000dO-9a for qemu-devel@nongnu.org; Tue, 29 Apr 2025 10:08:49 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u9ldc-0006G7-UW for qemu-devel@nongnu.org; Tue, 29 Apr 2025 10:08:48 -0400 Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-39ee57c0b8cso6956006f8f.0 for ; Tue, 29 Apr 2025 07:08: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 ffacd0b85a97d-3a073cbedc4sm13721492f8f.47.2025.04.29.07.08.41 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 29 Apr 2025 07:08:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745935722; x=1746540522; 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=1rBTFzGlpmN0XM4Xhc9yiz4Q5nlS539l0QvdyVgqZAM=; b=cQpUk0XRCoVg0qk/yrI+21rLGJ5Mhc2s5Mg1MUBD+K4FtYrXRNWpfuPVrMQnRyj3iy EHOi+UUhcxbNp0mWKD02CQXR7MezCOXfChRy+zjCeCdNHcVLoRBFO/DAmSncmaSaV6mF TXHVMY2J0pqOU+pu4sLKFypztaR2FxsZLcG9XEAk8I7/39EmZlfw0VeTjsC5bd5Ueg2N YVo4aXdmf1MTojKReUa6rYan65KjPYdS6EnxzzpAj55kke2V02DWRDyNwQQqzhB7aQMz /KHmmNrV7k82doV29k1X2+5P1CuMVsev6sElsHdkc8dhidEk/1lkX+dUYqMF3sgPRLRm Te/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745935722; x=1746540522; 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=1rBTFzGlpmN0XM4Xhc9yiz4Q5nlS539l0QvdyVgqZAM=; b=qfJaGXuQRc96W8he6XeuDeFnBhJ6sjbRDRTU8l04t7HHa7xC+ZhalHXJ2HE/Bf7pkw OVvOy9m755qp2tQfLHsLjE48xLMcl5IcnALNHvaPslQW5bM7pgQPBwx+HljWXyTkjEh4 9YGHLBnK4h5yuaSMt0s1JmayGpISdpZLeGdFtPYOro80ocg6lDuugLZ9svt92Ba+8Gsw lMR45ePLkDFP/1HmvoNjdVXew/ArhDr1evMVuBsBr65Ib8BzbWrycjjof8R+r1l+kVAY 64ILfmVHM0swSbFjLW5D4L6WkBVH1SxZrDXAPpoqOMXIBRbbUECRsxZ1PoGLBTKQ9L58 zYxA== X-Gm-Message-State: AOJu0YxZ2zu5eL4EUux6pw6bmM+24JQn6iYYC9GAnXyFMALMnx+8UbR5 HDetiDn/zbM6QR6H4+KF/5V23Vv6m1rKxvr6lNjvG2thSgYrH0AIdlhMtMIoITupnQzzAsGH+fr 1 X-Gm-Gg: ASbGncuw2lxALLZMLrm8SMRzYbcU6cmLo2A/fwOk9bxIeVYR5Mi5n5trcZwS/30joJY rdWQ3oSf5jxP6XKJ1uh+cr10B7PeLcgL71M8qyT91CMmuE9pQFLSrH3PLJ9YIEUftgMD2etcY/h UfnufhFPJrtjE6Tfn6aWTOnfHl9NHBT8H2uvuvEAIIZxA+POai8CU/Cb2fHlmIFcueGhK3+w/Tu dXEy486ucjZGJU5B2vekSF4fCPy+nQolQhkXR/yFv6HUZAXFT1JFh/6xIoJeiGbA8ZYSM04t3RK GH+qUXXOBY2D8cuBE4mJfsjtWyVdubmveCl7s3aEmJMpdbMAuvFf4eFkukYowrjcy4hOZctHQ0T mEZ3jL+7kDzAH5Cy5IDrp X-Google-Smtp-Source: AGHT+IFnDrVcedbXHpcglRf3Zfr33IFFYKasSaoLQa9TB96b58tL9E1xh2++cLgtcB9Hp183gOayEg== X-Received: by 2002:adf:f7c5:0:b0:391:3406:b4e2 with SMTP id ffacd0b85a97d-3a0894a17f0mr2414426f8f.49.1745935722255; Tue, 29 Apr 2025 07:08:42 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Hanna Reitz , Fam Zheng , Paolo Bonzini , Gerd Hoffmann , qemu-block@nongnu.org, John Snow , "Michael S. Tsirkin" , Zhao Liu , Eduardo Habkost , Jason Wang , Kevin Wolf , Yanan Wang , Marcel Apfelbaum , Dmitry Fleytman , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v2 03/19] hw/i386/pc: Remove pc_compat_2_4[] array Date: Tue, 29 Apr 2025 16:08:09 +0200 Message-ID: <20250429140825.25964-4-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250429140825.25964-1-philmd@linaro.org> References: <20250429140825.25964-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=philmd@linaro.org; helo=mail-wr1-x429.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=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: 1745936011683019000 The pc_compat_2_4[] array was only used by the pc-q35-2.4 and pc-i440fx-2.4 machines, which got removed. Remove it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Daniel P. Berrang=C3=A9 --- include/hw/i386/pc.h | 3 --- hw/i386/pc.c | 19 ------------------- 2 files changed, 22 deletions(-) diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index f4a874b17fc..b34aa25fdce 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -301,9 +301,6 @@ extern const size_t pc_compat_2_6_len; extern GlobalProperty pc_compat_2_5[]; extern const size_t pc_compat_2_5_len; =20 -extern GlobalProperty pc_compat_2_4[]; -extern const size_t pc_compat_2_4_len; - #define DEFINE_PC_MACHINE(suffix, namestr, initfn, optsfn) \ static void pc_machine_##suffix##_class_init(ObjectClass *oc, \ const void *data) \ diff --git a/hw/i386/pc.c b/hw/i386/pc.c index c8bb4a3ee47..2b46714a5ac 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -262,25 +262,6 @@ const size_t pc_compat_2_6_len =3D G_N_ELEMENTS(pc_com= pat_2_6); GlobalProperty pc_compat_2_5[] =3D {}; const size_t pc_compat_2_5_len =3D G_N_ELEMENTS(pc_compat_2_5); =20 -GlobalProperty pc_compat_2_4[] =3D { - PC_CPU_MODEL_IDS("2.4.0") - { "Haswell-" TYPE_X86_CPU, "abm", "off" }, - { "Haswell-noTSX-" TYPE_X86_CPU, "abm", "off" }, - { "Broadwell-" TYPE_X86_CPU, "abm", "off" }, - { "Broadwell-noTSX-" TYPE_X86_CPU, "abm", "off" }, - { "host" "-" TYPE_X86_CPU, "host-cache-info", "on" }, - { TYPE_X86_CPU, "check", "off" }, - { "qemu64" "-" TYPE_X86_CPU, "sse4a", "on" }, - { "qemu64" "-" TYPE_X86_CPU, "abm", "on" }, - { "qemu64" "-" TYPE_X86_CPU, "popcnt", "on" }, - { "qemu32" "-" TYPE_X86_CPU, "popcnt", "on" }, - { "Opteron_G2" "-" TYPE_X86_CPU, "rdtscp", "on" }, - { "Opteron_G3" "-" TYPE_X86_CPU, "rdtscp", "on" }, - { "Opteron_G4" "-" TYPE_X86_CPU, "rdtscp", "on" }, - { "Opteron_G5" "-" TYPE_X86_CPU, "rdtscp", "on", } -}; -const size_t pc_compat_2_4_len =3D G_N_ELEMENTS(pc_compat_2_4); - /* * @PC_FW_DATA: * Size of the chunk of memory at the top of RAM for the BIOS ACPI tables --=20 2.47.1 From nobody Sat Nov 15 22:23:01 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=1745935778; cv=none; d=zohomail.com; s=zohoarc; b=gKfG24uc0VmNuRO3x+fAn57HAXHrzgTXhQyrJtNS80HChHDOBAgPNWDh1DtZUeG0OK/TigLIux3F/MIITG9zWNL2WNTT5qr4h2TjwV7to3OBFcxSxSx7cE5+uU8gqlWUURgmEGUJXLKvaRo1+D8A5rRKsq7UA19qTnX6/SrCpNA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1745935778; 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=2TdK0KknkLOYwI+XSWuaAcvX7rG//eSaXjO5J4+I7ro=; b=Fd9RovAKcWocekYM1euqmh3Ol45tGcwZJO8dKdmm2zvyQmLLQN7AivwSHxQDU3RgWwrR9RdkGtObbt2a/O/lNjwVWPGtVssa1GQSm2x02NEKbd67/IHN3alaVeEM48vidD3YwWbuv4lBWIFKoZSWu294aO2CFqkSloZQWZYmymU= 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 1745935778920862.9177854062158; Tue, 29 Apr 2025 07:09:38 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u9ldm-0000iv-S4; Tue, 29 Apr 2025 10:08:54 -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 1u9ldj-0000f1-QY for qemu-devel@nongnu.org; Tue, 29 Apr 2025 10:08:51 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u9ldh-0006HM-Ox for qemu-devel@nongnu.org; Tue, 29 Apr 2025 10:08:51 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-43cf58eea0fso26814245e9.0 for ; Tue, 29 Apr 2025 07:08: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 5b1f17b1804b1-440a5311403sm157348955e9.23.2025.04.29.07.08.46 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 29 Apr 2025 07:08:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745935727; x=1746540527; 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=2TdK0KknkLOYwI+XSWuaAcvX7rG//eSaXjO5J4+I7ro=; b=lPpH27jmnDxa6xJSXYh8p1T8Wr9xu+jVXwmjrU0fVqibE7XM6Zcu1/niDd48a0nDDz u9dBbR/CB+4ehkPFEhAMTolZsmWZumTrNr/UTc+KDVszL/U12R24TAgrVO0vthhtHqto A5Xp3TFbAmSXxrTjJ4Sfrf/+gVVxXUxQMBIZucA8NaqFCgWT2eXpk9ezWli5D1XcWcow lzW3KwZLcFJAJ9W0ZwpD15Y5WQIF4sCFE+9c9Loj4F53sRRW90ktpOZa1lQfLqIstVka KXQqbGLCjbea5jw0YHimEYQQqZfFOrelA/wCbZBoLCFjw2pm0DBBoUFOCJ1ejuHGM/Me aUxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745935727; x=1746540527; 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=2TdK0KknkLOYwI+XSWuaAcvX7rG//eSaXjO5J4+I7ro=; b=tyAK5mDiAszKjcC9djNtfVi7lk4SJ2FAMA5ezaATl7VGlsiZm16Ez+NBvsspfR5Z35 gHZDIaVNpORQp34qR4X5oeDBUiH6/AzlTGLjAveWOd1UqOuBYJJhcZduYp7P0zwIr8Py rbteR/LyeUZq689Gf6gpB+PytYW4447+AD6LRXcQxYHBOwVOabICwe5oOqyJY9fXxpjo Zw0GHua2uIVWVq62TzAHm6y8uOnXV/1HCJlxTajP9Pvei2BzroSSSB/k8BY5inkJcVHZ bM4TmH/3gtfbL7qiAlGZfCRPYPvQOj684+yfzRDuKPumyu8oP6t1HAMljaQxfkSPcaON 4JKw== X-Gm-Message-State: AOJu0YxLSEEOi2XVE6nFl6K+2/a4S0jJxk+mwpfOSUP9r+Vow1zHmYlf pA3CTq5TFOjARDfRl7DHOSnzeYICF7s82KWQ9mBQWn4ppEuZeN3gqF/CdVWnjtxe73vcz0pP8s9 Q X-Gm-Gg: ASbGncutY3KK8VC8XBnBRQwU6qXPUw07orG0N9FOfTx9LqMTxZy+Z6wh4ryn6CF1XL8 vitRL9NVODhrijkfGBxHkaekGsKxzCf7rl1OyWebSALf9gAfC/XcBuzcJdAUgKnlq9NLeKj78xC fl7n/EndzBjJsh54yIZ9Svvmdywm9/y9Raayd6UYaKQaFKhQc5PZvhUsFyYyCPSP7pYXnrieaon b3lIFuVd9wdAgPP+mTJmF3WZn5aA49+/H7ES62GL6XFyv2mdmkiRSrxsFOixCiNvXf8An1V8jFE soRmnPmYPshVKON91QJG7Js/BTMaX/G/ggAB9gPggWAMS7PRZ4r+eWfbL/sANJPmFqVRri4gra3 OlIgeujFbXfst5Cm7o6hq X-Google-Smtp-Source: AGHT+IFWlOuXDLcKoC6qJIRh5j/hcn7Yfp6eX8KlCf+i9kGpCj9E0hPGD/4Ol8IQcBfdMdTOYuCWpg== X-Received: by 2002:a05:600c:5491:b0:43c:fe15:41e1 with SMTP id 5b1f17b1804b1-441ac8ce2f9mr24719525e9.4.1745935727158; Tue, 29 Apr 2025 07:08:47 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Hanna Reitz , Fam Zheng , Paolo Bonzini , Gerd Hoffmann , qemu-block@nongnu.org, John Snow , "Michael S. Tsirkin" , Zhao Liu , Eduardo Habkost , Jason Wang , Kevin Wolf , Yanan Wang , Marcel Apfelbaum , Dmitry Fleytman , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v2 04/19] target/i386/cpu: Remove X86CPU::check_cpuid field Date: Tue, 29 Apr 2025 16:08:10 +0200 Message-ID: <20250429140825.25964-5-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250429140825.25964-1-philmd@linaro.org> References: <20250429140825.25964-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=philmd@linaro.org; helo=mail-wm1-x331.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1745935780209019000 The X86CPU::check_cpuid boolean was only set in the pc_compat_2_4[] array, via the 'check=3Doff' property. We removed all machines using that array, lets remove that CPU property and simplify x86_cpu_realizefn(). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Daniel P. Berrang=C3=A9 --- target/i386/cpu.h | 1 - target/i386/cpu.c | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/target/i386/cpu.h b/target/i386/cpu.h index 54bf9639f19..3a5e17e0741 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -2168,7 +2168,6 @@ struct ArchCPU { uint8_t hyperv_ver_id_sb; uint32_t hyperv_ver_id_sn; =20 - bool check_cpuid; bool enforce_cpuid; /* * Force features to be enabled even if the host doesn't support them. diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 6f21d5ed222..49179f35812 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -8169,7 +8169,7 @@ static void x86_cpu_realizefn(DeviceState *dev, Error= **errp) } } =20 - if (x86_cpu_filter_features(cpu, cpu->check_cpuid || cpu->enforce_cpui= d)) { + if (x86_cpu_filter_features(cpu, cpu->enforce_cpuid)) { if (cpu->enforce_cpuid) { error_setg(&local_err, accel_uses_host_cpuid() ? @@ -8808,7 +8808,6 @@ static const Property x86_cpu_properties[] =3D { DEFINE_PROP_UINT8("hv-version-id-sbranch", X86CPU, hyperv_ver_id_sb, 0= ), DEFINE_PROP_UINT32("hv-version-id-snumber", X86CPU, hyperv_ver_id_sn, = 0), =20 - DEFINE_PROP_BOOL("check", X86CPU, check_cpuid, true), DEFINE_PROP_BOOL("enforce", X86CPU, enforce_cpuid, false), DEFINE_PROP_BOOL("x-force-features", X86CPU, force_features, false), DEFINE_PROP_BOOL("kvm", X86CPU, expose_kvm, true), --=20 2.47.1 From nobody Sat Nov 15 22:23:01 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=1745935774; cv=none; d=zohomail.com; s=zohoarc; b=Yifomn9m9ei1vf6F+SlW0HT9+KSO2q3xtQvCOZK23Jg4mtHWnkBRHJCaoVVE99QqLxvtLaRGvhIeQs1nPWxgrVKJD50X8pK5ILr+TQL2WkB870g/5wG/+P4GKYu3UfJaiEbrGrNjbfTi2Brysi39NI3+uYV76htiCCB1+VGQPHg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1745935774; 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=Y41oplbkU9wFEHQN9IFbTeGkihP8bHFwwIYrwg5eFCU=; b=d0yPQyFvnAs+cA3GbjkXs1rGOiqgfZ3DcJJ4Gnll9ZM6cOUXltbVFokm2Paw8TofjSaNR47hDAFveTUx7gZGzdpWFzCR0aDi87bFCeozFJ53uAoyd+M5H41jiPU9vJBgyNHLgwqXeVGcAVvQIQTv3qMJXIysvps5q+cdg+CqnHE= 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 1745935774536316.0627428748526; Tue, 29 Apr 2025 07:09:34 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u9ldq-0000ol-VU; Tue, 29 Apr 2025 10:08:59 -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 1u9ldo-0000lL-Mq for qemu-devel@nongnu.org; Tue, 29 Apr 2025 10:08:56 -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 1u9ldm-0006IT-0y for qemu-devel@nongnu.org; Tue, 29 Apr 2025 10:08:56 -0400 Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-39c30d9085aso4447634f8f.1 for ; Tue, 29 Apr 2025 07:08: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 ffacd0b85a97d-3a073ca4742sm13810098f8f.23.2025.04.29.07.08.50 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 29 Apr 2025 07:08:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745935732; x=1746540532; 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=Y41oplbkU9wFEHQN9IFbTeGkihP8bHFwwIYrwg5eFCU=; b=EYYe0DQ6Z2PJ3Wse7CLLsldjIbap0voSi6u6xk9zwq9jZmQ7kwN/Lqg+4dUq6JRvYN o7ueJ39lXmXbqtkchPrAan48Ont4A+rprmgnxF+rDfgHxezUIlk1ILmtxdTWavG9TSNS JfWT2WXdVfen4hTP/2uVTvXPP+eux4IXRPK8MqTg5W0X3evgZzBglOwPR4cSHH7m9DsR 0/gTWn5NDz8qLb6z2KT7pOh+oiFE/EbkNXJNPw37M5OkGRbPS+d9OQPf6LklvDFMVcL0 JmSIIFpGQSXQu40BbQhJk2Ohh0s6Z04DkOGcE6Dr4BpfFpZp3GCTyifIbgA0L7JC7owz xLCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745935732; x=1746540532; 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=Y41oplbkU9wFEHQN9IFbTeGkihP8bHFwwIYrwg5eFCU=; b=ELOtlI/3UEfuUqqoc0Ogwbhuivo4MBPaY4SneLRDC7nWvSxDNOmjlgp+JVdCzujfKs woQbO0nGO3+SflmgIXi25Bgp46CdfLF2rnGzlW6oHWZOeks+adNQOVtF/VgjOIAWf8rs 3i3AoLSCNYlEVEPjrYl5abS8a4DKbi7mVvYaJ93EP1MTx77uNbHDjLHYScaYjBHmAeO2 2GAlxfchwIHmha3qA3rtBwzZnFIeHJ0jB7BuYWQsAoL00E7GART6WYLl+qEGHeBbma5E ri/jLInPfDYARV4v3Aw8mGE+g6lHLZyU0NFxKh+HcUrCFbd7+LsLnDv49gY+Ked4u1ew PYyg== X-Gm-Message-State: AOJu0YzVtJ1tH7tT2z2Q+7WSk+QL5AqbccL5kcgNoF5hassAuPE1gAfA gLqOYXuRiMLbN944MxdQdgNk1P/Oh9H04rjTgoxhgYjAUe2tZ7ICoM/pC4KgYiOsXiymPBq8GwD T X-Gm-Gg: ASbGncvLXOvqqaz/mITIL1JlPgooBjFfFc4SPeSAaPsARZJMMmuWnOZxtTgn/Wf4FBO 1J+D3BnCyyxRc/nIdA2e+1vjNdbAo9F+F1z3i+XXPna2ylZWEufT9nUeKEdzBWHY1Xmd1mUMQWO tQKsY94gm4sgcyHfWPrtOuGBhWp3h+4aEi9Uuj9Bwsy9c304IxhGQYYieNPvY/p86bbeOrpQwoA J1flze/aMneZMeDWObp7h79B9ARwUFyDVAbM20/2YOhUpGGjJ9RSxAiDpiSOHPeeD+XNad7/jEr K8WI/xMgZ8ZXCeMsy1dgDLbCSNOUWOo5QL7u21JR26RrBrFY7PXd2h87b92fqpLIqHka2XvDbLS ksaxoI6RHWioXdSbAsBca X-Google-Smtp-Source: AGHT+IEco0W5dgiz/k9F0w521n574zMOPJiaS2/f48WwzXtNScnfK9ipNQ6rnRYeDvAjM48e12A5RA== X-Received: by 2002:a05:6000:1f03:b0:3a0:7a8f:db22 with SMTP id ffacd0b85a97d-3a07aa6b57emr7712782f8f.24.1745935732109; Tue, 29 Apr 2025 07:08:52 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Hanna Reitz , Fam Zheng , Paolo Bonzini , Gerd Hoffmann , qemu-block@nongnu.org, John Snow , "Michael S. Tsirkin" , Zhao Liu , Eduardo Habkost , Jason Wang , Kevin Wolf , Yanan Wang , Marcel Apfelbaum , Dmitry Fleytman , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v2 05/19] hw/core/machine: Remove hw_compat_2_4[] array Date: Tue, 29 Apr 2025 16:08:11 +0200 Message-ID: <20250429140825.25964-6-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250429140825.25964-1-philmd@linaro.org> References: <20250429140825.25964-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=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: 1745935776206019100 The hw_compat_2_4[] array was only used by the pc-q35-2.4 and pc-i440fx-2.4 machines, which got removed. Remove it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Daniel P. Berrang=C3=A9 --- include/hw/boards.h | 3 --- hw/core/machine.c | 9 --------- 2 files changed, 12 deletions(-) diff --git a/include/hw/boards.h b/include/hw/boards.h index 765dc8dd35e..5c4e3d2a2cd 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -848,7 +848,4 @@ extern const size_t hw_compat_2_6_len; extern GlobalProperty hw_compat_2_5[]; extern const size_t hw_compat_2_5_len; =20 -extern GlobalProperty hw_compat_2_4[]; -extern const size_t hw_compat_2_4_len; - #endif diff --git a/hw/core/machine.c b/hw/core/machine.c index ed01798d37c..d66b02b564c 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -292,15 +292,6 @@ GlobalProperty hw_compat_2_5[] =3D { }; const size_t hw_compat_2_5_len =3D G_N_ELEMENTS(hw_compat_2_5); =20 -GlobalProperty hw_compat_2_4[] =3D { - { "e1000", "extra_mac_registers", "off" }, - { "virtio-pci", "x-disable-pcie", "on" }, - { "virtio-pci", "migrate-extra", "off" }, - { "fw_cfg_mem", "dma_enabled", "off" }, - { "fw_cfg_io", "dma_enabled", "off" } -}; -const size_t hw_compat_2_4_len =3D G_N_ELEMENTS(hw_compat_2_4); - MachineState *current_machine; =20 static char *machine_get_kernel(Object *obj, Error **errp) --=20 2.47.1 From nobody Sat Nov 15 22:23:01 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=1745935867; cv=none; d=zohomail.com; s=zohoarc; b=iZU3IFdXaDwQM+Qe5uvn2Zvca1A0g0rqCdDcozYIJVgqDUNLnfAhIVCN3SPpN8voNzAccP+Q/XFzG1MeGhfT+Bo2s0H5Zy7xbhB+nili+y5Rw24bjQ9xM/mHAdqwEyPWFUuSrda4aTuzThIswBWDQbQYIEoNVFKVcMNc12uDkUg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1745935867; 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=D7M6Tutx3exMAOrtlWY2rOEtIIwc+eHcrkvSbvRNBy0=; b=gBjP3V5GEqT5ODtEKsnwnA57nPfIjJqPWFncRmSmb1b/7KNfAdpWK+foD0NM1/7JdvKPVO9Rmz0YABgnyXO5QME7elrgB1W4Vy+pnn4hX6ixijZgyWfOUew/NKS7KUX2EBUnnfKbjUcudkFWQhsxGE2S5dhtxWYEr1xWdCY4DgQ= 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 1745935867853372.6899356678895; Tue, 29 Apr 2025 07:11:07 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u9ldu-00018V-Vv; Tue, 29 Apr 2025 10:09: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 1u9ldt-00011g-Kw for qemu-devel@nongnu.org; Tue, 29 Apr 2025 10:09:01 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u9ldr-0006JU-9r for qemu-devel@nongnu.org; Tue, 29 Apr 2025 10:09:01 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-43cfe574976so42268365e9.1 for ; Tue, 29 Apr 2025 07:08: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-4409d2ac26dsm191298615e9.21.2025.04.29.07.08.55 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 29 Apr 2025 07:08:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745935737; x=1746540537; 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=D7M6Tutx3exMAOrtlWY2rOEtIIwc+eHcrkvSbvRNBy0=; b=KykhTJl4Xws9JBBG3bXZJk1mi0PGCMGBmyA/uNraDXH+B5TLulq+XEWv1W43Usr5V7 q1eCfPhTZqFeykIi1jtpNP/bNNBJi6q2/bWFL9Q60v6GPfR2rTlgSq7VnoMaWi87pw6R Epe9sRDPS6h4qAEvFYXmLToolL3IoAYd4kTSdKM26AObU7syEaLAwjrEm4vrDepYvuSn 749kNRhU/9U/JY1WivZiTo4WBNIxCct/TZTSv/Dq0mR6ixYXxhB2O0dIidHhmAuo6oaX tTYrrtb89sk7+YMk6m2gNCF3mpPaqkjMHBHkLKQAj3WCl1cA8jm5P/nKECYKTE+5B9u8 Yhdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745935737; x=1746540537; 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=D7M6Tutx3exMAOrtlWY2rOEtIIwc+eHcrkvSbvRNBy0=; b=WUDP1ZhnC1edzWAEhm5faCSndLUsV65jW5HCifBSoWWtbsHLAUPPqoEYAHkmM+DX5s 2cuPFVw2yb+BcFPF6FG3WR8UF6J/N1Ke/4f7jYWZdBBfcIlhqwq9m0UjtXFW8FPxItre dthYFdeHOqHJFdWu2KEoIbNk1nsyklt8u5Nf2mNRRy8MzN305i08Ei5tzam2ogaCpnv4 S9yj0IiZM2bdSIZacgFQzz3rGqDxVGMFOz5nRm90GPuycyBu7Nhk9igP1ZfKk9hxLEB+ wNHwqlZ2jMBkI6oKGr+++HEjb3FAyDa00Wohb/gY10FlL0xUJNyr4w6mlH3F+Rd4PPs8 L9/w== X-Gm-Message-State: AOJu0Yy+nV0+TfB+DOI5APQwdaYoOLEOImEDZPSWp3j/498cg711q6Dg nkxMuNi24w3pQtGK5qWCn5WIc0eJDL0tw6s8deJ1gbWaIP12x4WcnZAWb6TjeNRsK1bxRCiBxOs R X-Gm-Gg: ASbGncsYsZmqP+GV7RiJBqEBVLpZrl5cAvlRi8ePd0ujFXBfa2dYNFYhXTBC9vPMzez FkzR1k2ysqrQi36fdcdc6x4tCfSpg810Dcki4Rmv/t2f7VFuZoFgDLskVaUKAt9Zea8T6dMT8A1 1ZAkrqJiuZ0AwZs6z0dcj5C3l6Idrfs0+sqEti67uiQqyu8PdJhKG6JKMPXq8YbGOD7fwvLKm1j lXwfbDC+YVczSBaJMMIgXtNubZJxZtGXfTCAyWEouU+sqa9rvtB3C0U31+jqYajjnBhJ/AGOb6i Cjd+bAEpkvu5JA48ALT16Ki3kqPdXUE43ASjtIu+HABU2Gbdd7/uLOsY32qqe3kMQLXOYeisDFP lEkNzYxkfDnXEK7jKv8Cw X-Google-Smtp-Source: AGHT+IFBdvLXaSfzgUODTJlwELKJq3jC658a3PXh4+8SDRkVU7raGgrxMfB7xaEKlZLs4jYTsI4TQw== X-Received: by 2002:a05:600c:3ca5:b0:43b:c0fa:f9dd with SMTP id 5b1f17b1804b1-441ac918133mr25754115e9.25.1745935737168; Tue, 29 Apr 2025 07:08:57 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Hanna Reitz , Fam Zheng , Paolo Bonzini , Gerd Hoffmann , qemu-block@nongnu.org, John Snow , "Michael S. Tsirkin" , Zhao Liu , Eduardo Habkost , Jason Wang , Kevin Wolf , Yanan Wang , Marcel Apfelbaum , Dmitry Fleytman , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v2 06/19] hw/net/e1000: Remove unused E1000_FLAG_MAC flag Date: Tue, 29 Apr 2025 16:08:12 +0200 Message-ID: <20250429140825.25964-7-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250429140825.25964-1-philmd@linaro.org> References: <20250429140825.25964-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=philmd@linaro.org; helo=mail-wm1-x335.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1745935868802019000 E1000_FLAG_MAC was only used by the hw_compat_2_4[] array, via the 'extra_mac_registers=3Doff' property. We removed all machines using that array, lets remove all the code around E1000_FLAG_MAC, including the MAC_ACCESS_FLAG_NEEDED enum, similarly to commit fa4ec9ffda7 ("e1000: remove old compatibility code"). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Daniel P. Berrang=C3=A9 --- hw/net/e1000.c | 72 ++++++++++---------------------------------------- 1 file changed, 14 insertions(+), 58 deletions(-) diff --git a/hw/net/e1000.c b/hw/net/e1000.c index cba4999e6d0..e0310aef872 100644 --- a/hw/net/e1000.c +++ b/hw/net/e1000.c @@ -127,10 +127,8 @@ struct E1000State_st { QEMUTimer *flush_queue_timer; =20 /* Compatibility flags for migration to/from qemu 1.3.0 and older */ -#define E1000_FLAG_MAC_BIT 2 #define E1000_FLAG_TSO_BIT 3 #define E1000_FLAG_VET_BIT 4 -#define E1000_FLAG_MAC (1 << E1000_FLAG_MAC_BIT) #define E1000_FLAG_TSO (1 << E1000_FLAG_TSO_BIT) #define E1000_FLAG_VET (1 << E1000_FLAG_VET_BIT) =20 @@ -1210,54 +1208,24 @@ static const writeops macreg_writeops[] =3D { =20 enum { NWRITEOPS =3D ARRAY_SIZE(macreg_writeops) }; =20 -enum { MAC_ACCESS_PARTIAL =3D 1, MAC_ACCESS_FLAG_NEEDED =3D 2 }; +enum { MAC_ACCESS_PARTIAL =3D 1 }; =20 -#define markflag(x) ((E1000_FLAG_##x << 2) | MAC_ACCESS_FLAG_NEEDED) /* In the array below the meaning of the bits is: [f|f|f|f|f|f|n|p] * f - flag bits (up to 6 possible flags) * n - flag needed * p - partially implenented */ static const uint8_t mac_reg_access[0x8000] =3D { - [IPAV] =3D markflag(MAC), [WUC] =3D markflag(MAC), - [IP6AT] =3D markflag(MAC), [IP4AT] =3D markflag(MAC), - [FFVT] =3D markflag(MAC), [WUPM] =3D markflag(MAC), - [ECOL] =3D markflag(MAC), [MCC] =3D markflag(MAC), - [DC] =3D markflag(MAC), [TNCRS] =3D markflag(MAC), - [RLEC] =3D markflag(MAC), [XONRXC] =3D markflag(MAC), - [XOFFTXC] =3D markflag(MAC), [RFC] =3D markflag(MAC), - [TSCTFC] =3D markflag(MAC), [MGTPRC] =3D markflag(MAC), - [WUS] =3D markflag(MAC), [AIT] =3D markflag(MAC), - [FFLT] =3D markflag(MAC), [FFMT] =3D markflag(MAC), - [SCC] =3D markflag(MAC), [FCRUC] =3D markflag(MAC), - [LATECOL] =3D markflag(MAC), [COLC] =3D markflag(MAC), - [SEQEC] =3D markflag(MAC), [CEXTERR] =3D markflag(MAC), - [XONTXC] =3D markflag(MAC), [XOFFRXC] =3D markflag(MAC), - [RJC] =3D markflag(MAC), [RNBC] =3D markflag(MAC), - [MGTPDC] =3D markflag(MAC), [MGTPTC] =3D markflag(MAC), - [RUC] =3D markflag(MAC), [ROC] =3D markflag(MAC), - [GORCL] =3D markflag(MAC), [GORCH] =3D markflag(MAC), - [GOTCL] =3D markflag(MAC), [GOTCH] =3D markflag(MAC), - [BPRC] =3D markflag(MAC), [MPRC] =3D markflag(MAC), - [TSCTC] =3D markflag(MAC), [PRC64] =3D markflag(MAC), - [PRC127] =3D markflag(MAC), [PRC255] =3D markflag(MAC), - [PRC511] =3D markflag(MAC), [PRC1023] =3D markflag(MAC), - [PRC1522] =3D markflag(MAC), [PTC64] =3D markflag(MAC), - [PTC127] =3D markflag(MAC), [PTC255] =3D markflag(MAC), - [PTC511] =3D markflag(MAC), [PTC1023] =3D markflag(MAC), - [PTC1522] =3D markflag(MAC), [MPTC] =3D markflag(MAC), - [BPTC] =3D markflag(MAC), - - [TDFH] =3D markflag(MAC) | MAC_ACCESS_PARTIAL, - [TDFT] =3D markflag(MAC) | MAC_ACCESS_PARTIAL, - [TDFHS] =3D markflag(MAC) | MAC_ACCESS_PARTIAL, - [TDFTS] =3D markflag(MAC) | MAC_ACCESS_PARTIAL, - [TDFPC] =3D markflag(MAC) | MAC_ACCESS_PARTIAL, - [RDFH] =3D markflag(MAC) | MAC_ACCESS_PARTIAL, - [RDFT] =3D markflag(MAC) | MAC_ACCESS_PARTIAL, - [RDFHS] =3D markflag(MAC) | MAC_ACCESS_PARTIAL, - [RDFTS] =3D markflag(MAC) | MAC_ACCESS_PARTIAL, - [RDFPC] =3D markflag(MAC) | MAC_ACCESS_PARTIAL, - [PBM] =3D markflag(MAC) | MAC_ACCESS_PARTIAL, + [TDFH] =3D MAC_ACCESS_PARTIAL, + [TDFT] =3D MAC_ACCESS_PARTIAL, + [TDFHS] =3D MAC_ACCESS_PARTIAL, + [TDFTS] =3D MAC_ACCESS_PARTIAL, + [TDFPC] =3D MAC_ACCESS_PARTIAL, + [RDFH] =3D MAC_ACCESS_PARTIAL, + [RDFT] =3D MAC_ACCESS_PARTIAL, + [RDFHS] =3D MAC_ACCESS_PARTIAL, + [RDFTS] =3D MAC_ACCESS_PARTIAL, + [RDFPC] =3D MAC_ACCESS_PARTIAL, + [PBM] =3D MAC_ACCESS_PARTIAL, }; =20 static void @@ -1268,8 +1236,7 @@ e1000_mmio_write(void *opaque, hwaddr addr, uint64_t = val, unsigned int index =3D (addr & 0x1ffff) >> 2; =20 if (index < NWRITEOPS && macreg_writeops[index]) { - if (!(mac_reg_access[index] & MAC_ACCESS_FLAG_NEEDED) - || (s->compat_flags & (mac_reg_access[index] >> 2))) { + if (s->compat_flags & (mac_reg_access[index] >> 2)) { if (mac_reg_access[index] & MAC_ACCESS_PARTIAL) { DBGOUT(GENERAL, "Writing to register at offset: 0x%08x. " "It is not fully implemented.\n", index<<2); @@ -1295,8 +1262,7 @@ e1000_mmio_read(void *opaque, hwaddr addr, unsigned s= ize) unsigned int index =3D (addr & 0x1ffff) >> 2; =20 if (index < NREADOPS && macreg_readops[index]) { - if (!(mac_reg_access[index] & MAC_ACCESS_FLAG_NEEDED) - || (s->compat_flags & (mac_reg_access[index] >> 2))) { + if (s->compat_flags & (mac_reg_access[index] >> 2)) { if (mac_reg_access[index] & MAC_ACCESS_PARTIAL) { DBGOUT(GENERAL, "Reading register at offset: 0x%08x. " "It is not fully implemented.\n", index<<2); @@ -1419,13 +1385,6 @@ static int e1000_tx_tso_post_load(void *opaque, int = version_id) return 0; } =20 -static bool e1000_full_mac_needed(void *opaque) -{ - E1000State *s =3D opaque; - - return chkflag(MAC); -} - static bool e1000_tso_state_needed(void *opaque) { E1000State *s =3D opaque; @@ -1451,7 +1410,6 @@ static const VMStateDescription vmstate_e1000_full_ma= c_state =3D { .name =3D "e1000/full_mac_state", .version_id =3D 1, .minimum_version_id =3D 1, - .needed =3D e1000_full_mac_needed, .fields =3D (const VMStateField[]) { VMSTATE_UINT32_ARRAY(mac_reg, E1000State, 0x8000), VMSTATE_END_OF_LIST() @@ -1679,8 +1637,6 @@ static void pci_e1000_realize(PCIDevice *pci_dev, Err= or **errp) =20 static const Property e1000_properties[] =3D { DEFINE_NIC_PROPERTIES(E1000State, conf), - DEFINE_PROP_BIT("extra_mac_registers", E1000State, - compat_flags, E1000_FLAG_MAC_BIT, true), DEFINE_PROP_BIT("migrate_tso_props", E1000State, compat_flags, E1000_FLAG_TSO_BIT, true), DEFINE_PROP_BIT("init-vet", E1000State, --=20 2.47.1 From nobody Sat Nov 15 22:23:01 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=1745936225; cv=none; d=zohomail.com; s=zohoarc; b=fAPj+Jtfr03QMGj0VXnAQLnE4zL6mfrZqLtarXq5eDiEsIFPE0b4hz71WCml6bVcantPTxKdYll3zS0QNnr1rp4Boxj4QA3BUpnB8OW8dlmPEqRmPmvnU3UCOKyVLERS3tlTU+liBgW72iwY/KcWlO2Zgf8FBxK68/tZkFp+Ixo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1745936225; 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=xJvF5VVqWRoBuruHMFkUoRv70wTkjLmBdIDnHMXKE5w=; b=JE6ngHeecIxfwR+ANt+Ll02CBSZ2kA7StUR5DDBCOq1HF9EW2hNTU/PZ3kE/XW6IzOsp/V0xr/LJg9CjUewas0Sd5Fn5iWTbe6OSgD4Ra+kSkosqtkqBtQVZXFCvgqiNxqzE3f2fxM/rl8HLQe8FDnydYN4pkJnq5Ta7W9wFBQQ= 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 1745936225679920.4015384156116; Tue, 29 Apr 2025 07:17:05 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u9le0-0001Yx-Fd; Tue, 29 Apr 2025 10:09:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u9ldy-0001NX-0B for qemu-devel@nongnu.org; Tue, 29 Apr 2025 10:09:06 -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 1u9ldw-0006Kh-5A for qemu-devel@nongnu.org; Tue, 29 Apr 2025 10:09:05 -0400 Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-39ee651e419so3152528f8f.3 for ; Tue, 29 Apr 2025 07:09: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-3a073c8ca72sm13769517f8f.4.2025.04.29.07.09.01 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 29 Apr 2025 07:09:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745935742; x=1746540542; 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=xJvF5VVqWRoBuruHMFkUoRv70wTkjLmBdIDnHMXKE5w=; b=EFil7s1UHwWd5OWtuX3OP5lQ+aJACrJJM20E5KYBj1VEWhaZWGL7icZoSYZtVzamTT sz5K67Jb8dLq4Ibs6M4urgley4+lUJZFRfVeYWRySrEaVRH1wFrAHAq6we/tMXci9QFn A5r5oQdsfSfMnlwdU2PBUxZkfDYvdevv3RmIellcgNz49K3EXHgWlsRJvYreOHbEGios asLa3x3Q+J6GBN6/1NGHzeWJ7wANRsquL+tWPyNpFHYvEcxG04uDLuCilgy2sTRjAZrx 8vMkcNMaHTq732+l+cl76sGSLKNuXhbhe8Q/5CsktGNjjOC1VMbEjLVokuvEhfIFmqC1 ZJgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745935742; x=1746540542; 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=xJvF5VVqWRoBuruHMFkUoRv70wTkjLmBdIDnHMXKE5w=; b=bzyMXHLKnJBfI8cLOfAh0xrwzOc+Gttu96n9RymWOlYtqxGh2YOd1pfiSJgf8GzwWp jmHVL0l1Fo5a8oy7HIpBHVMb9ENk8NdTQyikv9gMybqbx0J9AuTFsrnH9iQzlrv4eCDQ 6IwXBIA9VWCIWy5kJT+sAjHnUYsRvdNhNL1zi31yb9m+jHAOeSxUezNB7rV3mxx5kP2O 07K3cOcFpoFKa9LPinerLPk3PbGB2sr8ineWzJJR2nov/sHaCHPfYSjymAL2CPyzot+U cp5OdkMu4A3RPcNoLG+RW8EU+FjNZBEtbsc7+0P710AeTt+k4TzGFM6lo4sB4l1LIhOh 8I1Q== X-Gm-Message-State: AOJu0YwmxWcL/+b1isUdNdsIEchJVOBCz6BeFAxOvMUKmevHnXGhG2Mp mV7aXOWxhEBuml9PXkAul/ohnZeEjHjJ/46kqpdzHE1LAIJ9JMxdjGwD+cYDSCETJiLSod3NH9r S X-Gm-Gg: ASbGncssU8p41L7HIHs+u3LjTiKkGxjaUVYkSt0egXJW9FoL4ttp6Tx6QVRgNrU/L2k xxczzfCGzQBnTAezPabsUvVZfjqq++kgePpsqXuSuWHr6UdhaadNatkw42i5Oo+f8+9eymoglRm v3wDRuFB0sYUwuICeZdGycWHtIBqB4oRprQq/25nYJv1tDTYvwvairxH3IinydcHmoNf5jo9xwh QBKPiplwymFTLseW0FXPq89CeGuakuLqeKXqUyr8fWD20/pkwEijTBzouscxQ+LAKly5uFwH5G6 BrkFOSmbVDmzhKsYkUDBNWHafvXNuQ4sCo3q+j9X4cvcqEJ9he9qP4qsVR4qlYlrCH8aD1QPr92 XJKgQTZwJvYoAq5kpz7wB X-Google-Smtp-Source: AGHT+IHqhQZj26CkbljySSOi/m4T68KKNHqofreXrVFW0zi09YQEdDBKJr7vuuVmRYZg6Qr/vVZx5Q== X-Received: by 2002:a05:6000:400e:b0:3a0:6ae3:a1a with SMTP id ffacd0b85a97d-3a08a3517damr2748285f8f.23.1745935742143; Tue, 29 Apr 2025 07:09:02 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Hanna Reitz , Fam Zheng , Paolo Bonzini , Gerd Hoffmann , qemu-block@nongnu.org, John Snow , "Michael S. Tsirkin" , Zhao Liu , Eduardo Habkost , Jason Wang , Kevin Wolf , Yanan Wang , Marcel Apfelbaum , Dmitry Fleytman , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v2 07/19] hw/virtio/virtio-pci: Remove VIRTIO_PCI_FLAG_MIGRATE_EXTRA definition Date: Tue, 29 Apr 2025 16:08:13 +0200 Message-ID: <20250429140825.25964-8-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250429140825.25964-1-philmd@linaro.org> References: <20250429140825.25964-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: 1745936227510019000 VIRTIO_PCI_FLAG_MIGRATE_EXTRA was only used by the hw_compat_2_4[] array, via the 'migrate-extra=3Dtrue' property. We removed all machines using that array, lets remove all the code around VIRTIO_PCI_FLAG_MIGRATE_EXTRA. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Thomas Huth --- include/hw/virtio/virtio-pci.h | 4 ---- hw/virtio/virtio-pci.c | 6 +----- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/include/hw/virtio/virtio-pci.h b/include/hw/virtio/virtio-pci.h index 31ec144509f..d39161766e0 100644 --- a/include/hw/virtio/virtio-pci.h +++ b/include/hw/virtio/virtio-pci.h @@ -32,7 +32,6 @@ DECLARE_OBJ_CHECKERS(VirtioPCIBusState, VirtioPCIBusClass, enum { VIRTIO_PCI_FLAG_BUS_MASTER_BUG_MIGRATION_BIT, VIRTIO_PCI_FLAG_USE_IOEVENTFD_BIT, - VIRTIO_PCI_FLAG_MIGRATE_EXTRA_BIT, VIRTIO_PCI_FLAG_MODERN_PIO_NOTIFY_BIT, VIRTIO_PCI_FLAG_DISABLE_PCIE_BIT, VIRTIO_PCI_FLAG_PAGE_PER_VQ_BIT, @@ -57,9 +56,6 @@ enum { /* virtio version flags */ #define VIRTIO_PCI_FLAG_DISABLE_PCIE (1 << VIRTIO_PCI_FLAG_DISABLE_PCIE_BI= T) =20 -/* migrate extra state */ -#define VIRTIO_PCI_FLAG_MIGRATE_EXTRA (1 << VIRTIO_PCI_FLAG_MIGRATE_EXTRA_= BIT) - /* have pio notification for modern device ? */ #define VIRTIO_PCI_FLAG_MODERN_PIO_NOTIFY \ (1 << VIRTIO_PCI_FLAG_MODERN_PIO_NOTIFY_BIT) diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c index 0fa8fe49556..a3e2e007d6c 100644 --- a/hw/virtio/virtio-pci.c +++ b/hw/virtio/virtio-pci.c @@ -146,9 +146,7 @@ static const VMStateDescription vmstate_virtio_pci =3D { =20 static bool virtio_pci_has_extra_state(DeviceState *d) { - VirtIOPCIProxy *proxy =3D to_virtio_pci_proxy(d); - - return proxy->flags & VIRTIO_PCI_FLAG_MIGRATE_EXTRA; + return true; } =20 static void virtio_pci_save_extra_state(DeviceState *d, QEMUFile *f) @@ -2349,8 +2347,6 @@ static void virtio_pci_bus_reset_hold(Object *obj, Re= setType type) static const Property virtio_pci_properties[] =3D { DEFINE_PROP_BIT("virtio-pci-bus-master-bug-migration", VirtIOPCIProxy,= flags, VIRTIO_PCI_FLAG_BUS_MASTER_BUG_MIGRATION_BIT, false), - DEFINE_PROP_BIT("migrate-extra", VirtIOPCIProxy, flags, - VIRTIO_PCI_FLAG_MIGRATE_EXTRA_BIT, true), DEFINE_PROP_BIT("modern-pio-notify", VirtIOPCIProxy, flags, VIRTIO_PCI_FLAG_MODERN_PIO_NOTIFY_BIT, false), DEFINE_PROP_BIT("x-disable-pcie", VirtIOPCIProxy, flags, --=20 2.47.1 From nobody Sat Nov 15 22:23:01 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=1745936103; cv=none; d=zohomail.com; s=zohoarc; b=aJNDzewk2wStpN1b8iBGeJsBe2qZZgp1SZXLOgNsTwp0y49/YhkC8k7I+FfbvUzOTca+kWjEzFhwSf+8pygKW1qeIyGwhlsuwRADxbfSFm7zE2EIxFVfy0Jl9L+WK1dJj+BdeWbq3FV+Rq7Px1CXOVdQ8eoO6fBxYv17swWn3Yc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1745936103; 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=0BkDThoIzdV48soT64XeZ7dLWYwQOfmi2dWyVwZ8yvw=; b=Mw8Ojjfx/uZkQNTxNwDy7noves7Trpz6WeswH9TxAtJFX4y+Sn/pFs4teQj0eS5Q0EsmPwjEhOyDMaeWNbOHmBvZWPvOZq37wWFWTl1wi+RII0LusKcuQ6Rrt6F91a828t4xAcra3UWBAAslYilRhYzn0sDf6oz4yRbX48dM5ac= 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 17459361038641016.1329727420054; Tue, 29 Apr 2025 07:15:03 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u9le6-0001oG-7E; Tue, 29 Apr 2025 10:09: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 1u9le3-0001il-Vl for qemu-devel@nongnu.org; Tue, 29 Apr 2025 10:09:12 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u9le2-0006Mt-6p for qemu-devel@nongnu.org; Tue, 29 Apr 2025 10:09:11 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-4394a823036so59777555e9.0 for ; Tue, 29 Apr 2025 07:09:09 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4409d2e0241sm191035395e9.37.2025.04.29.07.09.06 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 29 Apr 2025 07:09:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745935748; x=1746540548; 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=0BkDThoIzdV48soT64XeZ7dLWYwQOfmi2dWyVwZ8yvw=; b=Yak1JtEYB7/rU6ct+aGcG7Tk4IRDAmsZREb2xKrC+G64CMQYDAUB49PLQfmxo4RPqg HfYCTyAvkbkMyvYw0zH4Uh6FJy1L/F+9TXkLIeyTrmxtVXDQtGSbxGnfzrDzPv/ZnoQM hIe84wuK6Ez41+gTq7pfRrk2EPU4TOaCb1oaIsV9dQdjJ6/a5x+NrU+inqk7QntVGMi+ jkY8q53ISnoVjc1BWXObdRd2R2aiCznsksSVTtCNKoV3BDoQfayJ4VX2K6iCgyuoOKSS DUN8+qXRYc+SRSQ6NMlXrIZg+ymvSDCAQ1CTswmXUE9oASB/6cI7tDClLFoFPLQAksCg /ZoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745935748; x=1746540548; 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=0BkDThoIzdV48soT64XeZ7dLWYwQOfmi2dWyVwZ8yvw=; b=jNehzPmRxAWBeVu1bAwau+rjm0ALI7afdaOrUSORBpAIzxZmk0FmDPrX4o5wlzwBra 6FC6rFPl4H0B8v3GjkAcoqjZ4pM7xrThS6OmxEmwqJCh1+yBd4XAkQ6SzCkRND4LfGHO FKYLtko1mMcZqBPpcX+h+mR+srBbvAOp+vNDbKwhJuMcfMQYGhQdZB31/ECmwQsCnhfY TjUUZA0MlzLKAO/WJ2wLLKpl4jIiTRi16Vr9UiDrcEpuk2ziBTivKlO1IO2ibzZFl7XV L9CNzHkzj/KxfTcFRmVAsF9PCk0WDreLi4rCtI/yZP0wMp3oqfUCYvugaCMIdVu3DDPr pfjw== X-Gm-Message-State: AOJu0YwfmxW7ZRB+pzHHuy4wK8E5HXGjsLsPI8UCVChmNgo54zpv74nI vO29rx0ABG7Cayh5+Lcjr/H+ocb4OB7Y5nTHJzNK0FO3eoXwCBsjlVl2goaoiIZMkEJNgVr/9mG t X-Gm-Gg: ASbGnctNVvhxN1OpyzmrD+Mn6nNw9RoQ8fqLT38BbJZqfXU7h/te4Pxt8LyD2ESUZ0j cVLM+iAuHTs7+nVepQWWCJedfkvfF1Epq7CE30VvVpV/qj8IrFB4o0wEXZ92+zblYfKpMmeabF1 a3wHL5u8Lm5SeE1nIH+YYawXbItRole5ueQFOc2MFfyQcJvMj2JgTaBezmiQsHoKSxKHJaZyVSX fqa2hSWp79N7fRz6vbuNqFw17hKlyWDP8+4JF6EBpzFQWyvg915wDqz+N+JwSSvmYuVIcjynSsC +WTm5GcY9TbxrJpjJykAR0gBXxv/uuWyh1noy6cRG1ovx7F6ykuutqCKsvHE7SJutbtd4mTSBwW Fj+YEjzdEXa8v0gmOn8Sx X-Google-Smtp-Source: AGHT+IFbgdgq3YX3mZzTAVSG1Sqr+MjwfiL6A7LR/kE4dSTV7LwM2dHShhBtv7zgYeKGghEghADm8Q== X-Received: by 2002:a05:600c:1e19:b0:43d:fa59:af98 with SMTP id 5b1f17b1804b1-441ad500331mr25384995e9.33.1745935748163; Tue, 29 Apr 2025 07:09:08 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Hanna Reitz , Fam Zheng , Paolo Bonzini , Gerd Hoffmann , qemu-block@nongnu.org, John Snow , "Michael S. Tsirkin" , Zhao Liu , Eduardo Habkost , Jason Wang , Kevin Wolf , Yanan Wang , Marcel Apfelbaum , Dmitry Fleytman , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Thomas Huth Subject: [PATCH v2 08/19] hw/virtio/virtio-pci: Remove VIRTIO_PCI_FLAG_DISABLE_PCIE definition Date: Tue, 29 Apr 2025 16:08:14 +0200 Message-ID: <20250429140825.25964-9-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250429140825.25964-1-philmd@linaro.org> References: <20250429140825.25964-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=philmd@linaro.org; helo=mail-wm1-x32e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1745936104898019100 VIRTIO_PCI_FLAG_DISABLE_PCIE was only used by the hw_compat_2_4[] array, via the 'x-disable-pcie=3Dfalse' property. We removed all machines using that array, lets remove all the code around VIRTIO_PCI_FLAG_DISABLE_PCIE (see commit 9a4c0e220d8 for similar VIRTIO_PCI_FLAG_* enum removal). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Thomas Huth --- include/hw/virtio/virtio-pci.h | 4 ---- hw/virtio/virtio-pci.c | 5 +---- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/include/hw/virtio/virtio-pci.h b/include/hw/virtio/virtio-pci.h index d39161766e0..f962c9116c1 100644 --- a/include/hw/virtio/virtio-pci.h +++ b/include/hw/virtio/virtio-pci.h @@ -33,7 +33,6 @@ enum { VIRTIO_PCI_FLAG_BUS_MASTER_BUG_MIGRATION_BIT, VIRTIO_PCI_FLAG_USE_IOEVENTFD_BIT, VIRTIO_PCI_FLAG_MODERN_PIO_NOTIFY_BIT, - VIRTIO_PCI_FLAG_DISABLE_PCIE_BIT, VIRTIO_PCI_FLAG_PAGE_PER_VQ_BIT, VIRTIO_PCI_FLAG_ATS_BIT, VIRTIO_PCI_FLAG_INIT_DEVERR_BIT, @@ -53,9 +52,6 @@ enum { * vcpu thread using ioeventfd for some devices. */ #define VIRTIO_PCI_FLAG_USE_IOEVENTFD (1 << VIRTIO_PCI_FLAG_USE_IOEVENTF= D_BIT) =20 -/* virtio version flags */ -#define VIRTIO_PCI_FLAG_DISABLE_PCIE (1 << VIRTIO_PCI_FLAG_DISABLE_PCIE_BI= T) - /* have pio notification for modern device ? */ #define VIRTIO_PCI_FLAG_MODERN_PIO_NOTIFY \ (1 << VIRTIO_PCI_FLAG_MODERN_PIO_NOTIFY_BIT) diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c index a3e2e007d6c..8d68e56641a 100644 --- a/hw/virtio/virtio-pci.c +++ b/hw/virtio/virtio-pci.c @@ -2349,8 +2349,6 @@ static const Property virtio_pci_properties[] =3D { VIRTIO_PCI_FLAG_BUS_MASTER_BUG_MIGRATION_BIT, false), DEFINE_PROP_BIT("modern-pio-notify", VirtIOPCIProxy, flags, VIRTIO_PCI_FLAG_MODERN_PIO_NOTIFY_BIT, false), - DEFINE_PROP_BIT("x-disable-pcie", VirtIOPCIProxy, flags, - VIRTIO_PCI_FLAG_DISABLE_PCIE_BIT, false), DEFINE_PROP_BIT("page-per-vq", VirtIOPCIProxy, flags, VIRTIO_PCI_FLAG_PAGE_PER_VQ_BIT, false), DEFINE_PROP_BOOL("x-ignore-backend-features", VirtIOPCIProxy, @@ -2379,8 +2377,7 @@ static void virtio_pci_dc_realize(DeviceState *qdev, = Error **errp) VirtIOPCIProxy *proxy =3D VIRTIO_PCI(qdev); PCIDevice *pci_dev =3D &proxy->pci_dev; =20 - if (!(proxy->flags & VIRTIO_PCI_FLAG_DISABLE_PCIE) && - virtio_pci_modern(proxy)) { + if (virtio_pci_modern(proxy)) { pci_dev->cap_present |=3D QEMU_PCI_CAP_EXPRESS; } =20 --=20 2.47.1 From nobody Sat Nov 15 22:23:01 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=1745935849; cv=none; d=zohomail.com; s=zohoarc; b=Rc71RyKC/81Q5dMusYgO7kL83RiI8mOY4i3BJPdeIP/cXaUOALqHkhyZI58Jv01mYCQLCpHjTjSoi2/wei6gi6voEMHmymZFODkreCCpvX4CHVEmkbh1/kIh3yC5B3lmcaFpT7VAoQeL64BN3BRz95I5OyTQuKBwrpCbid71dvk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1745935849; 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=0i+gB4qGYdD+t3Cj9VGzIhWK4paiq4kBCZvxw2YhKv4=; b=EL9wBaw3Cw5Ijexi1Pgtf6SPnW3OF+xjOmXspZZKwV6g99b4OX59tTQoCCtmJDk5nsguzc9eN5zDMiJJ0GuVKWPGvN22p9iVsOK1dKDH1iaVk0dvbeul9u8Zz/lOCnYSDFA1HK9Mj79UeVRJQbwKhmRYSRd513ojWta2hl4tmlg= 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 1745935849449893.2098745283224; Tue, 29 Apr 2025 07:10:49 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u9leA-0001wC-2v; Tue, 29 Apr 2025 10:09:18 -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 1u9le9-0001uk-5o for qemu-devel@nongnu.org; Tue, 29 Apr 2025 10:09:17 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u9le7-0006Ny-9x for qemu-devel@nongnu.org; Tue, 29 Apr 2025 10:09:16 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-43cfba466b2so57378335e9.3 for ; Tue, 29 Apr 2025 07:09:14 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a073ca4742sm13810924f8f.23.2025.04.29.07.09.11 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 29 Apr 2025 07:09:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745935753; x=1746540553; 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=0i+gB4qGYdD+t3Cj9VGzIhWK4paiq4kBCZvxw2YhKv4=; b=AWamMWcetZW6oWOSg6f+eiFcrLXxTQS65YvJ7uudA9xkmVl94sHeuYBP9jUae1NkeO 9/26/1mesyVITacWPthZts7lqmjH+Hjqqs+/H/VTmQ1jHf3DPv4mpJZzEtb1OwumSP9Q CxdiCprJL/EZ8HMduF56aK/4MqIc5y4oXEs/eWPKHy8taM0K4KSMeLIIQh6iAPlmnRKY mI1KpNjZo83dyRl51a7LZeXuu/pniypxk9fjDCeBhzlSmUV3oYfsiPCRmNMqpV03oSu5 f/w9Uh+uvIzyPs5N3MMohfKs6Tq5tDtj9zTpsztqW3Ydi4a+11G7VCHEFhQJOtS3Jtk/ wgsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745935753; x=1746540553; 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=0i+gB4qGYdD+t3Cj9VGzIhWK4paiq4kBCZvxw2YhKv4=; b=wVbeoT7XaOz1h9BWwfINe45ur8qj77dZeGHVFC9nBDxVcfH0iEWE4amaoVN+z+ngQa 77yV0ZZJqrjvInf+2yfz7Cx4TRFyBPjKajmxR6ipHBuKLUUyGs4cHA55pvvZQqFFckuO JPtBonSIK8vHb/V/nW2FtO0BBxtTpA+Dv6RQr8WyP1G+/ss6qaKXdZQyB9cwHO6CZ38b ODk8fuvG3GlezQcfYllZvqRSYit9my3KLPYGqKr3JBamQmIWdNU7lUefPXQLo0IV0t06 FBm0relHSrK6itKX5+wF+A5wsBu2PAwKpIf8F0NV4GWmhXSh6aGv92Nt45xbSCqCmKEN zd2Q== X-Gm-Message-State: AOJu0Yy/EiYcTdhcbqyO6OSAxGtxQL9siPBov1Hpbb3C/9iWPcOVwGG2 mk8PMyanzgPBCi4R7199O3Ly/K21/Ejd5NVkazGIFsddoN/cLrxOtwxl0+DjmCx2iGEv891T/mg s X-Gm-Gg: ASbGncuZO+JZ1Vct+P1zpSzCQoduV31Xr9YGZKnJ6Wb9gWafkrfVw+ILELdjaXlVYc+ Gq0jIym7M/P9eJe3a5b53qpfefj3+ZXwFVAp65SU8XJ/m8QTR9vofbgrsCm1uhKHMBraBBsCBg6 DESGnieFQEzGOTZpKtJKMY2PSoHvEI6PTO1Sxe+CuHIdes/KwjYLeyDwaGtLic4zVQffCH4NnfK xgHrBh5s/NHp7gaCdHkLtiXGeyJIrP+ZQqRlzRnvctS+VfZUlKGeYrGEZEvXBPP/YPWQrRNccAl TaRR+WuVuRzetbdTfOW3cCkcCVY8WwVK9fwtZeA5bqnBAh8RpiNfodCwxezJ3OSOE0PB41lFKI7 7AnTq4PBPSFLIhJUwLqnWpIrf4/AkVDo= X-Google-Smtp-Source: AGHT+IG0V+GEcw6tH8VrFu6UE4V9XaJvTJ1AeqPT4BaeV0LcbmcXUMKqgC2UkMSam2yLpr77TdqwpA== X-Received: by 2002:a05:6000:400c:b0:3a0:88e4:3d2f with SMTP id ffacd0b85a97d-3a088e43d58mr3313540f8f.5.1745935753110; Tue, 29 Apr 2025 07:09:13 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Hanna Reitz , Fam Zheng , Paolo Bonzini , Gerd Hoffmann , qemu-block@nongnu.org, John Snow , "Michael S. Tsirkin" , Zhao Liu , Eduardo Habkost , Jason Wang , Kevin Wolf , Yanan Wang , Marcel Apfelbaum , Dmitry Fleytman , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v2 09/19] hw/i386/pc: Remove deprecated pc-q35-2.5 and pc-i440fx-2.5 machines Date: Tue, 29 Apr 2025 16:08:15 +0200 Message-ID: <20250429140825.25964-10-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250429140825.25964-1-philmd@linaro.org> References: <20250429140825.25964-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=philmd@linaro.org; helo=mail-wm1-x32b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=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: 1745935850401019100 These machines 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") they can now be removed. Remove the now unused empty pc_compat_2_5[] array. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Daniel P. Berrang=C3=A9 --- include/hw/i386/pc.h | 3 --- hw/i386/pc.c | 3 --- hw/i386/pc_piix.c | 13 ------------- hw/i386/pc_q35.c | 13 ------------- 4 files changed, 32 deletions(-) diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index b34aa25fdce..79b72c54dd3 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -298,9 +298,6 @@ extern const size_t pc_compat_2_7_len; extern GlobalProperty pc_compat_2_6[]; extern const size_t pc_compat_2_6_len; =20 -extern GlobalProperty pc_compat_2_5[]; -extern const size_t pc_compat_2_5_len; - #define DEFINE_PC_MACHINE(suffix, namestr, initfn, optsfn) \ static void pc_machine_##suffix##_class_init(ObjectClass *oc, \ const void *data) \ diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 2b46714a5ac..cb375aabdc5 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -259,9 +259,6 @@ GlobalProperty pc_compat_2_6[] =3D { }; const size_t pc_compat_2_6_len =3D G_N_ELEMENTS(pc_compat_2_6); =20 -GlobalProperty pc_compat_2_5[] =3D {}; -const size_t pc_compat_2_5_len =3D G_N_ELEMENTS(pc_compat_2_5); - /* * @PC_FW_DATA: * Size of the chunk of memory at the top of RAM for the BIOS ACPI tables diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 04213b45b44..7a62bb06500 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -778,19 +778,6 @@ static void pc_i440fx_machine_2_6_options(MachineClass= *m) =20 DEFINE_I440FX_MACHINE(2, 6); =20 -static void pc_i440fx_machine_2_5_options(MachineClass *m) -{ - X86MachineClass *x86mc =3D X86_MACHINE_CLASS(m); - - pc_i440fx_machine_2_6_options(m); - x86mc->save_tsc_khz =3D false; - m->legacy_fw_cfg_order =3D 1; - compat_props_add(m->compat_props, hw_compat_2_5, hw_compat_2_5_len); - compat_props_add(m->compat_props, pc_compat_2_5, pc_compat_2_5_len); -} - -DEFINE_I440FX_MACHINE(2, 5); - #ifdef CONFIG_ISAPC static void isapc_machine_options(MachineClass *m) { diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 47e12602413..33211b1876f 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -672,16 +672,3 @@ static void pc_q35_machine_2_6_options(MachineClass *m) } =20 DEFINE_Q35_MACHINE(2, 6); - -static void pc_q35_machine_2_5_options(MachineClass *m) -{ - X86MachineClass *x86mc =3D X86_MACHINE_CLASS(m); - - pc_q35_machine_2_6_options(m); - x86mc->save_tsc_khz =3D false; - m->legacy_fw_cfg_order =3D 1; - compat_props_add(m->compat_props, hw_compat_2_5, hw_compat_2_5_len); - compat_props_add(m->compat_props, pc_compat_2_5, pc_compat_2_5_len); -} - -DEFINE_Q35_MACHINE(2, 5); --=20 2.47.1 From nobody Sat Nov 15 22:23:01 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=1745935785; cv=none; d=zohomail.com; s=zohoarc; b=ABURMW2QQhv0QSd3JT2iN6JmMkWzYMvVmwoCYInbf4ngtBpC7FomoKrDmHLokjjGgWd2ixKRCj4bJCg/Rm9s7fHzg34RoV+oFQ+ahl+pQTk12CRpSU8NLD/egJU34TT82nyyqbdvJfj4lOVShtdquTbQ7Iiy+6Hzg2mfos8IowQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1745935785; 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=Q1RXK9TNZCyuKZFLBANjjuVrJLcCqvX//mQ8ZqVm0L0=; b=Ewh9inv1lCagq1x6aifJ4icAMgKD3Oeo4QuzDpA901YnjtLi8gfr4oikFrlQP3Slyg/8nSZ689h5QS8L0FDuetHt95bmhc6bXt9lpeh0fNyWW7cJyBdsGXt70egxiN6L73rbAErd2Y+YSal0hD09pDkItOOFYWi2RdlfjTeM+1U= 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 1745935785330140.7249472671084; Tue, 29 Apr 2025 07:09:45 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u9leG-0002QF-5I; Tue, 29 Apr 2025 10:09: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 1u9leD-0002CF-Nb for qemu-devel@nongnu.org; Tue, 29 Apr 2025 10:09:21 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u9leB-0006P0-U2 for qemu-devel@nongnu.org; Tue, 29 Apr 2025 10:09:21 -0400 Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-39c13fa05ebso4003758f8f.0 for ; Tue, 29 Apr 2025 07:09:19 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a073e4698csm14136643f8f.62.2025.04.29.07.09.16 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 29 Apr 2025 07:09:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745935758; x=1746540558; 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=Q1RXK9TNZCyuKZFLBANjjuVrJLcCqvX//mQ8ZqVm0L0=; b=dydThUFYkRoJ5BnwDxTmJW4NgYqNaZ9RvtGaNLVIjXKKKzmunDf6ykEwfk+nYRlYTF pF6CtjahKPspfE07J9Y1cpY445J3ks9KIY3z4vA70HtBkHB/9QpobzAC+pQmZQz7/TaB mtqAHiE8M1SQtn95xpUxObvDQ4+75ILaQMOEdBXMSR4W0AwacPFGefBSmGLTvRJ/xICa fiC06jOrD+xqsioV1s6vNHaP6b8TSeyjDjHgBVxHSCiC3xteRSVco3NGVf1nN8P84wx7 VPpLwwRPc6NjevlYj1/zcemHrpk1BSBv1hQZCrYT7zD1KwcfV38dOmQji1aTASkT13jJ O/rA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745935758; x=1746540558; 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=Q1RXK9TNZCyuKZFLBANjjuVrJLcCqvX//mQ8ZqVm0L0=; b=O0OVAS1DFXWPHqW2dbjTbIGHRDWqKnQxjmpJp/KF6gsbIscKItyxLfRaWNBHghbtTV t8SZYexXdB6/OXkT2XQf5W4X22UbI/xm/yJCGDr4/Ws6eK60tSFuqleSM0REFogx5szv E7A6ifzDE2kd6gflmWKNzGOtLE/Q9wCXn3AV/oVOnU0/AcoMKBAh1h2IKoCSrR9XSM8x GOYbp/hD3T1iFPQp5oMgPyotClWFv1Zhj11qYZOm0N7feiBLmlPBWTvTuS2c6ViPY7mB ielH3S/nvWNlSEIPbkdb9jiRVWFrW/e1SRiQgC43EOPTMpQvq+SZ+cDV1II86P4GjY3+ XX4Q== X-Gm-Message-State: AOJu0Yxiy0zwHQtVyFJd9YVVv5QiqFX3/jMfDUiN88XfGfToO+i7IOQL HTkuud62so5B084AM+PJNupjmqE1oa6vTWfbXqVCVVFc77mujmeuFGQx/nnSFFb4SASerCH3de7 B X-Gm-Gg: ASbGncv2jpDES0VggDf0SHnCqf0thkjUYXth7+fEaITxkFzlkjZ85fuoKonl0C5bgsB z6VcT2JkEshrWKROlN6EWXhymLWU6gLcI9NXipAM7lhF4+VZsenZlHKhabXHIZAMoE5MaJZSCfS LCfXBvbKPBlGfuWHGOEoHQSb3hHLAKZ7BhvAka6d9XcQrFk7rucDADTQhDyDrW7NlbOsMs1MKlf IwBB7AMVmv/QxDGfwNiCv6ifCZ78EQ0AIJB82tbdTVScf+WtX1rYV24+gVbBUHVbF/fo3YxJl8R jFMB5Ix/qlji0mPr8ZxTTrs8sDu6mcaTSCwBmn/S2BEBcDi03Twkb/4OcEJ+J5fou8pp+LrS1WR O5VAeW/+wGMLcZNJCNili X-Google-Smtp-Source: AGHT+IHCB/jsYj3zwxBSGfvWFjGGiB+yG+BgwkFu/QQVgyRUHGUfaeCCWzLOgyEHFtklX/ddXYH2Kg== X-Received: by 2002:a5d:64c6:0:b0:3a0:80dd:16d5 with SMTP id ffacd0b85a97d-3a080dd1760mr8316018f8f.55.1745935758033; Tue, 29 Apr 2025 07:09:18 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Hanna Reitz , Fam Zheng , Paolo Bonzini , Gerd Hoffmann , qemu-block@nongnu.org, John Snow , "Michael S. Tsirkin" , Zhao Liu , Eduardo Habkost , Jason Wang , Kevin Wolf , Yanan Wang , Marcel Apfelbaum , Dmitry Fleytman , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Thomas Huth Subject: [PATCH v2 10/19] hw/i386/x86: Remove X86MachineClass::save_tsc_khz field Date: Tue, 29 Apr 2025 16:08:16 +0200 Message-ID: <20250429140825.25964-11-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250429140825.25964-1-philmd@linaro.org> References: <20250429140825.25964-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=philmd@linaro.org; helo=mail-wr1-x429.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1745935786322019100 The X86MachineClass::save_tsc_khz boolean was only used by the pc-q35-2.5 and pc-i440fx-2.5 machines, which got removed. Remove it and simplify tsc_khz_needed(). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Thomas Huth --- include/hw/i386/x86.h | 5 ----- hw/i386/x86.c | 1 - target/i386/machine.c | 5 ++--- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/include/hw/i386/x86.h b/include/hw/i386/x86.h index 258b1343a16..fc460b82f82 100644 --- a/include/hw/i386/x86.h +++ b/include/hw/i386/x86.h @@ -27,13 +27,8 @@ #include "qom/object.h" =20 struct X86MachineClass { - /*< private >*/ MachineClass parent; =20 - /*< public >*/ - - /* TSC rate migration: */ - bool save_tsc_khz; /* use DMA capable linuxboot option rom */ bool fwcfg_dma_enabled; /* CPU and apic information: */ diff --git a/hw/i386/x86.c b/hw/i386/x86.c index e2d04092992..f80533df1c5 100644 --- a/hw/i386/x86.c +++ b/hw/i386/x86.c @@ -382,7 +382,6 @@ static void x86_machine_class_init(ObjectClass *oc, con= st void *data) mc->get_default_cpu_node_id =3D x86_get_default_cpu_node_id; mc->possible_cpu_arch_ids =3D x86_possible_cpu_arch_ids; mc->kvm_type =3D x86_kvm_type; - x86mc->save_tsc_khz =3D true; x86mc->fwcfg_dma_enabled =3D true; nc->nmi_monitor_handler =3D x86_nmi; =20 diff --git a/target/i386/machine.c b/target/i386/machine.c index 6cb561c6322..dd2dac1d443 100644 --- a/target/i386/machine.c +++ b/target/i386/machine.c @@ -1060,9 +1060,8 @@ static bool tsc_khz_needed(void *opaque) { X86CPU *cpu =3D opaque; CPUX86State *env =3D &cpu->env; - MachineClass *mc =3D MACHINE_GET_CLASS(qdev_get_machine()); - X86MachineClass *x86mc =3D X86_MACHINE_CLASS(mc); - return env->tsc_khz && x86mc->save_tsc_khz; + + return env->tsc_khz; } =20 static const VMStateDescription vmstate_tsc_khz =3D { --=20 2.47.1 From nobody Sat Nov 15 22:23:01 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=1745936110; cv=none; d=zohomail.com; s=zohoarc; b=GRrgL0YXJZaFoSFGsW/ZSXaLcictYt1V6x3WAdMG3kP6qpjUAK5IxFPuxVC9pJutwzFf3QEjAJ80FDlF5FJviuEtzBELrJi5JfbvVvSgPbzcnnUqeAkQf6q5C+F+EYCCDMbB9i7ZXHEMEVG6K7i8NBt5K3xRJh/rAndV3Y2nroc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1745936110; 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=lOi5amPs94CRFUHcijuRRBsiadMoOd81cUGdXDypUyk=; b=FImjLMpCeGCKimBZclC/XJA5UUSe0lRSsx49+uxIA+TgMD+1TUPSKr2u2IMDHFa5y/Nqjg8Z0WSUXmv7KsEsaMiWtpHfwYNrKuag/+FfI83+GEZIibI5CD3pGM5POuY8uQ+/JgtJRZxiVYVdgI0d+36mrd3tE6/orIkP/tmnj2A= 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 1745936110101379.5552863898937; Tue, 29 Apr 2025 07:15:10 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u9leM-0002qy-F5; Tue, 29 Apr 2025 10:09: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 1u9leK-0002l1-FU for qemu-devel@nongnu.org; Tue, 29 Apr 2025 10:09:28 -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 1u9leH-0006Q0-7z for qemu-devel@nongnu.org; Tue, 29 Apr 2025 10:09:28 -0400 Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-39c0e0bc733so5546191f8f.1 for ; Tue, 29 Apr 2025 07:09: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 ffacd0b85a97d-3a073cbede5sm13908310f8f.49.2025.04.29.07.09.21 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 29 Apr 2025 07:09:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745935763; x=1746540563; 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=lOi5amPs94CRFUHcijuRRBsiadMoOd81cUGdXDypUyk=; b=K1K9VUE1bcmhTtLU1HmEnnbRXvg/32oENTtmOFcjzhpukx79kM0NwLR8kf9ZHZGO4r PBVXFfd4oPbuaAmSKWrWijtSUGAv+FLC5A1Eyiow8MsOs9JapA2RdDg8019H4iaJGbIo SNpG85wCT2gIGuNhGYx+2s8MW4VWGGOMfm/h/OWzQ1Bmmv1nrYoxEXxEMV9gc9O/AWbI nMY/F2MKVoIlaIyF1ZUptZTlHZy2DBkPkGaHVl4ujfqVWp0KlL8JNN/5ZFNggQofUQsr G4G9SHRbLe9Z+pOQ5g4saOjUpEYi78OAbcCnJB5fp06LuwA0mKbxXbrGYx7qngoiA49o rmyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745935763; x=1746540563; 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=lOi5amPs94CRFUHcijuRRBsiadMoOd81cUGdXDypUyk=; b=okEdtwDf+j5hg3FRdh7aYE4NppXhG8K3ZsHz4DzowiNP1USSl4bxML0abcd+ZAEq1I L7e9nN4HGWxkEOihCqdmUricZbaLeb7tOIrdhxkiEsx7s19zxnFlH0z48NQt2KTlib3Y QevacYLvV+QlSlrt4Tb9gze/M79FeK4A6wu87HsjeqBH/S76IDxzgmjjm8Nx/JcT9Iwe 3cUkZiqxVJPROInVoXkVWpYfo549rPSKiMxkwA9nME6dtH2HWEs1XBady4mfve5O4IvZ Twz1Ai43ZghSsbMvmeRsN8xqaVGvQ0aCKLgG5M7KCgVzGCvAAa/YJgkYZ6mpPrHwA9zA hutw== X-Gm-Message-State: AOJu0YyBBqALLFVaR+bZbharYnBd57GeGtUdXpVX8jWQTEn9uBqBqT+L bJ9CURdcX5em729iHLueYzN0YxJMS4x50HzJ4ppgT4/4Mnt0pFKyvBWVtyGoHWVc8r7+ZDeAhlD O X-Gm-Gg: ASbGnctWc8BLUEsdPQZzNC4Iigxwmi4euMqR8gVPSgg3Xw8rUq/Wml5kru0BPDsTVQG DXfdFRJnZ9rldseN5vFmhif2BJ4vXamC24G1zcSBDgNAS+Cguxcrx+bz3TjFz/zc74dh7prlfwC rxrl5CFGz7hxoZefTjkfktLUf/CUepMFdGndwh/QLgnFO3vOsuzzx1gjpWF5DbTWR6elR2dd3Hs Zre4oIcgab8jaFHDJev/zToa866E3d1cW2d6z9s9Uz6gYSRhawpnJ8ugZf5d1kz+/qzY1zLxjAp l9uU6/+KqUZjyUGGeCwWi8s2tIdD3/kJREaV+yQbn+h7jPYut4VWTrtFgmjif4x8OyADiz/Ycsg FnQQ7cQKGD7NvFknQDlLy X-Google-Smtp-Source: AGHT+IHA4KGy0pqJ3RUSu33G9yhNDWtYTFV3m6Ur90/jECgSLmlz1z1L0guNRL2DLYoHX4dawTqh+g== X-Received: by 2002:a05:6000:250f:b0:399:6dd9:9f40 with SMTP id ffacd0b85a97d-3a07aa5feedmr12956485f8f.9.1745935763112; Tue, 29 Apr 2025 07:09:23 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Hanna Reitz , Fam Zheng , Paolo Bonzini , Gerd Hoffmann , qemu-block@nongnu.org, John Snow , "Michael S. Tsirkin" , Zhao Liu , Eduardo Habkost , Jason Wang , Kevin Wolf , Yanan Wang , Marcel Apfelbaum , Dmitry Fleytman , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v2 11/19] hw/nvram/fw_cfg: Remove legacy FW_CFG_ORDER_OVERRIDE Date: Tue, 29 Apr 2025 16:08:17 +0200 Message-ID: <20250429140825.25964-12-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250429140825.25964-1-philmd@linaro.org> References: <20250429140825.25964-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: 1745936113164019100 The MachineClass::legacy_fw_cfg_order boolean was only used by the pc-q35-2.5 and pc-i440fx-2.5 machines, which got removed. Remove it along with: - FW_CFG_ORDER_OVERRIDE_* definitions - fw_cfg_set_order_override() - fw_cfg_reset_order_override() - fw_cfg_order[] - rom_set_order_override() - rom_reset_order_override() Simplify CLI and pc_vga_init() / pc_nic_init(). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Daniel P. Berrang=C3=A9 --- include/hw/boards.h | 3 +- include/hw/loader.h | 2 - include/hw/nvram/fw_cfg.h | 10 ---- hw/core/loader.c | 14 ----- hw/i386/pc.c | 7 +-- hw/nvram/fw_cfg.c | 109 +++----------------------------------- system/vl.c | 5 -- 7 files changed, 9 insertions(+), 141 deletions(-) diff --git a/include/hw/boards.h b/include/hw/boards.h index 5c4e3d2a2cd..5dc5e3b547d 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -286,8 +286,7 @@ struct MachineClass { no_parallel:1, no_floppy:1, no_cdrom:1, - pci_allow_0_address:1, - legacy_fw_cfg_order:1; + pci_allow_0_address:1; bool auto_create_sdcard; bool is_default; const char *default_machine_opts; diff --git a/include/hw/loader.h b/include/hw/loader.h index d280dc33e96..c96b5e141c6 100644 --- a/include/hw/loader.h +++ b/include/hw/loader.h @@ -270,8 +270,6 @@ int rom_add_elf_program(const char *name, GMappedFile *= mapped_file, void *data, AddressSpace *as); int rom_check_and_register_reset(void); void rom_set_fw(FWCfgState *f); -void rom_set_order_override(int order); -void rom_reset_order_override(void); =20 /** * rom_transaction_begin: diff --git a/include/hw/nvram/fw_cfg.h b/include/hw/nvram/fw_cfg.h index 47578ccc7f2..d41b9328fd1 100644 --- a/include/hw/nvram/fw_cfg.h +++ b/include/hw/nvram/fw_cfg.h @@ -42,14 +42,6 @@ struct FWCfgDataGeneratorClass { =20 typedef struct fw_cfg_file FWCfgFile; =20 -#define FW_CFG_ORDER_OVERRIDE_VGA 70 -#define FW_CFG_ORDER_OVERRIDE_NIC 80 -#define FW_CFG_ORDER_OVERRIDE_USER 100 -#define FW_CFG_ORDER_OVERRIDE_DEVICE 110 - -void fw_cfg_set_order_override(FWCfgState *fw_cfg, int order); -void fw_cfg_reset_order_override(FWCfgState *fw_cfg); - typedef struct FWCfgFiles { uint32_t count; FWCfgFile f[]; @@ -75,8 +67,6 @@ struct FWCfgState { uint32_t cur_offset; Notifier machine_ready; =20 - int fw_cfg_order_override; - bool dma_enabled; dma_addr_t dma_addr; AddressSpace *dma_as; diff --git a/hw/core/loader.c b/hw/core/loader.c index b792a54bb02..e7056ba4bd3 100644 --- a/hw/core/loader.c +++ b/hw/core/loader.c @@ -1333,20 +1333,6 @@ void rom_set_fw(FWCfgState *f) fw_cfg =3D f; } =20 -void rom_set_order_override(int order) -{ - if (!fw_cfg) - return; - fw_cfg_set_order_override(fw_cfg, order); -} - -void rom_reset_order_override(void) -{ - if (!fw_cfg) - return; - fw_cfg_reset_order_override(fw_cfg); -} - void rom_transaction_begin(void) { Rom *rom; diff --git a/hw/i386/pc.c b/hw/i386/pc.c index cb375aabdc5..49632b69d29 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1033,7 +1033,6 @@ DeviceState *pc_vga_init(ISABus *isa_bus, PCIBus *pci= _bus) { DeviceState *dev =3D NULL; =20 - rom_set_order_override(FW_CFG_ORDER_OVERRIDE_VGA); if (pci_bus) { PCIDevice *pcidev =3D pci_vga_init(pci_bus); dev =3D pcidev ? &pcidev->qdev : NULL; @@ -1041,7 +1040,7 @@ DeviceState *pc_vga_init(ISABus *isa_bus, PCIBus *pci= _bus) ISADevice *isadev =3D isa_vga_init(isa_bus); dev =3D isadev ? DEVICE(isadev) : NULL; } - rom_reset_order_override(); + return dev; } =20 @@ -1231,8 +1230,6 @@ void pc_nic_init(PCMachineClass *pcmc, ISABus *isa_bu= s, PCIBus *pci_bus) bool default_is_ne2k =3D g_str_equal(mc->default_nic, TYPE_ISA_NE2000); NICInfo *nd; =20 - rom_set_order_override(FW_CFG_ORDER_OVERRIDE_NIC); - while ((nd =3D qemu_find_nic_info(TYPE_ISA_NE2000, default_is_ne2k, NU= LL))) { pc_init_ne2k_isa(isa_bus, nd, &error_fatal); } @@ -1241,8 +1238,6 @@ void pc_nic_init(PCMachineClass *pcmc, ISABus *isa_bu= s, PCIBus *pci_bus) if (pci_bus) { pci_init_nic_devices(pci_bus, mc->default_nic); } - - rom_reset_order_override(); } =20 void pc_i8259_create(ISABus *isa_bus, qemu_irq *i8259_irqs) diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c index 237b9f7d1fe..54cfa07d3f5 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.c @@ -817,62 +817,6 @@ void fw_cfg_modify_i64(FWCfgState *s, uint16_t key, ui= nt64_t value) g_free(old); } =20 -void fw_cfg_set_order_override(FWCfgState *s, int order) -{ - assert(s->fw_cfg_order_override =3D=3D 0); - s->fw_cfg_order_override =3D order; -} - -void fw_cfg_reset_order_override(FWCfgState *s) -{ - assert(s->fw_cfg_order_override !=3D 0); - s->fw_cfg_order_override =3D 0; -} - -/* - * This is the legacy order list. For legacy systems, files are in - * the fw_cfg in the order defined below, by the "order" value. Note - * that some entries (VGA ROMs, NIC option ROMS, etc.) go into a - * specific area, but there may be more than one and they occur in the - * order that the user specifies them on the command line. Those are - * handled in a special manner, using the order override above. - * - * For non-legacy, the files are sorted by filename to avoid this kind - * of complexity in the future. - * - * This is only for x86, other arches don't implement versioning so - * they won't set legacy mode. - */ -static struct { - const char *name; - int order; -} fw_cfg_order[] =3D { - { "etc/boot-menu-wait", 10 }, - { "bootsplash.jpg", 11 }, - { "bootsplash.bmp", 12 }, - { "etc/boot-fail-wait", 15 }, - { "etc/smbios/smbios-tables", 20 }, - { "etc/smbios/smbios-anchor", 30 }, - { "etc/e820", 40 }, - { "etc/reserved-memory-end", 50 }, - { "genroms/kvmvapic.bin", 55 }, - { "genroms/linuxboot.bin", 60 }, - { }, /* VGA ROMs from pc_vga_init come here, 70. */ - { }, /* NIC option ROMs from pc_nic_init come here, 80. */ - { "etc/system-states", 90 }, - { }, /* User ROMs come here, 100. */ - { }, /* Device FW comes here, 110. */ - { "etc/extra-pci-roots", 120 }, - { "etc/acpi/tables", 130 }, - { "etc/table-loader", 140 }, - { "etc/tpm/log", 150 }, - { "etc/acpi/rsdp", 160 }, - { "bootorder", 170 }, - { "etc/msr_feature_control", 180 }, - -#define FW_CFG_ORDER_OVERRIDE_LAST 200 -}; - /* * Any sub-page size update to these table MRs will be lost during migrati= on, * as we use aligned size in ram_load_precopy() -> qemu_ram_resize() path. @@ -890,29 +834,6 @@ static void fw_cfg_acpi_mr_save(FWCfgState *s, const c= har *filename, size_t len) } } =20 -static int get_fw_cfg_order(FWCfgState *s, const char *name) -{ - int i; - - if (s->fw_cfg_order_override > 0) { - return s->fw_cfg_order_override; - } - - for (i =3D 0; i < ARRAY_SIZE(fw_cfg_order); i++) { - if (fw_cfg_order[i].name =3D=3D NULL) { - continue; - } - - if (strcmp(name, fw_cfg_order[i].name) =3D=3D 0) { - return fw_cfg_order[i].order; - } - } - - /* Stick unknown stuff at the end. */ - warn_report("Unknown firmware file in legacy mode: %s", name); - return FW_CFG_ORDER_OVERRIDE_LAST; -} - void fw_cfg_add_file_callback(FWCfgState *s, const char *filename, FWCfgCallback select_cb, FWCfgWriteCallback write_cb, @@ -921,7 +842,6 @@ void fw_cfg_add_file_callback(FWCfgState *s, const cha= r *filename, { int i, index, count; size_t dsize; - MachineClass *mc =3D MACHINE_GET_CLASS(qdev_get_machine()); int order =3D 0; =20 if (!s->files) { @@ -933,22 +853,10 @@ void fw_cfg_add_file_callback(FWCfgState *s, const c= har *filename, count =3D be32_to_cpu(s->files->count); assert(count < fw_cfg_file_slots(s)); =20 - /* Find the insertion point. */ - if (mc->legacy_fw_cfg_order) { - /* - * Sort by order. For files with the same order, we keep them - * in the sequence in which they were added. - */ - order =3D get_fw_cfg_order(s, filename); - for (index =3D count; - index > 0 && order < s->entry_order[index - 1]; - index--); - } else { - /* Sort by file name. */ - for (index =3D count; - index > 0 && strcmp(filename, s->files->f[index - 1].name) < = 0; - index--); - } + /* Find the insertion point, sorting by file name. */ + for (index =3D count; + index > 0 && strcmp(filename, s->files->f[index - 1].name) < 0; + index--); =20 /* * Move all the entries from the index point and after down one @@ -1058,7 +966,6 @@ bool fw_cfg_add_file_from_generator(FWCfgState *s, =20 static void fw_cfg_machine_reset(void *opaque) { - MachineClass *mc =3D MACHINE_GET_CLASS(qdev_get_machine()); FWCfgState *s =3D opaque; void *ptr; size_t len; @@ -1068,11 +975,9 @@ static void fw_cfg_machine_reset(void *opaque) ptr =3D fw_cfg_modify_file(s, "bootorder", (uint8_t *)buf, len); g_free(ptr); =20 - if (!mc->legacy_fw_cfg_order) { - buf =3D get_boot_devices_lchs_list(&len); - ptr =3D fw_cfg_modify_file(s, "bios-geometry", (uint8_t *)buf, len= ); - g_free(ptr); - } + buf =3D get_boot_devices_lchs_list(&len); + ptr =3D fw_cfg_modify_file(s, "bios-geometry", (uint8_t *)buf, len); + g_free(ptr); } =20 static void fw_cfg_machine_ready(struct Notifier *n, void *data) diff --git a/system/vl.c b/system/vl.c index 520956f4a19..dedd555eb87 100644 --- a/system/vl.c +++ b/system/vl.c @@ -1191,10 +1191,7 @@ static int parse_fw_cfg(void *opaque, QemuOpts *opts= , Error **errp) return -1; } } - /* For legacy, keep user files in a specific global order. */ - fw_cfg_set_order_override(fw_cfg, FW_CFG_ORDER_OVERRIDE_USER); fw_cfg_add_file(fw_cfg, name, buf, size); - fw_cfg_reset_order_override(fw_cfg); return 0; } =20 @@ -2744,7 +2741,6 @@ static void qemu_create_cli_devices(void) } =20 /* init generic devices */ - rom_set_order_override(FW_CFG_ORDER_OVERRIDE_DEVICE); qemu_opts_foreach(qemu_find_opts("device"), device_init_func, NULL, &error_fatal); QTAILQ_FOREACH(opt, &device_opts, next) { @@ -2755,7 +2751,6 @@ static void qemu_create_cli_devices(void) assert(ret_data =3D=3D NULL); /* error_fatal aborts */ loc_pop(&opt->loc); } - rom_reset_order_override(); } =20 static bool qemu_machine_creation_done(Error **errp) --=20 2.47.1 From nobody Sat Nov 15 22:23:01 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=1745935785; cv=none; d=zohomail.com; s=zohoarc; b=iZkQ1HHfGcrZR1AWACoNVAjQ6nQKijX7Wy7IXusbVkJ+YeImolmxAiK8HyIVb6quQSX8tycKw5YaLirJEThGUDYiwd8vrTW30+0sfnS2ZW2dHCbYvfQpnX1XcKZ1BIrjBXT50MURCapdbfgOgcAjnXKMfMgppH2tt/ADEmuUMZM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1745935785; 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=eXL4/W2KCy0v23MfOskz73x1LQjRcBzqdAtJsMYaNnI=; b=ClCXvPasacafSvOgqlJ0eB1yA23fciANIRdnPyduMTfQqUzuVhQvaOiEnTcBgmJABZ7YcesXrMSAr7D14SapH5RsGY8umK2cCy5/MS+a0anE3UDIgBcXJzZFZvEhKN/yWOLZA8RwmDtFMAphN4xN4J/NSgdeDyd5XM8UV6ZTE4M= 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 1745935785756641.3233832036714; Tue, 29 Apr 2025 07:09:45 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u9leP-0002yD-Oy; Tue, 29 Apr 2025 10:09:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u9leO-0002wL-1Y for qemu-devel@nongnu.org; Tue, 29 Apr 2025 10:09:32 -0400 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 1u9leM-0006RA-G3 for qemu-devel@nongnu.org; Tue, 29 Apr 2025 10:09:31 -0400 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-4394a823036so59785255e9.0 for ; Tue, 29 Apr 2025 07:09: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-4409d2ac26dsm191313335e9.21.2025.04.29.07.09.26 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 29 Apr 2025 07:09:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745935768; x=1746540568; 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=eXL4/W2KCy0v23MfOskz73x1LQjRcBzqdAtJsMYaNnI=; b=dFJvsBeddabeDJNS/UfMG0oWdNTae/dStcosvLYI0MoXwB9+Vd3YOjxMJwqAWLDW24 UOg4tAUYPSU/Bhb9TKlxsSXBFF4M5W5Af71Vqa5hwhTFH3A1cx1DXInMdeaK5G0HAzd7 IadIrgS1PIwIa7T5DXdv7FZqT6eT6IboWY5T/rjCgL7HaXyS83Z/kGf4Oxry+dQbXmns 7PlWNd5OTlMizhesNY1t4NIzC445W6mAWqHslZVLCPRg1NkJC/32uqQvY1H/XA8G0HQa mAsTSg8tPAGhOlKzdtmrFhEsFB8+i+UFH1t6fQ0SY2A13pS2wOul6QD16AZzmb/s6tyJ +P7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745935768; x=1746540568; 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=eXL4/W2KCy0v23MfOskz73x1LQjRcBzqdAtJsMYaNnI=; b=u4OxjKSV4aBAiteeDdlbXy4aWW55W+1hSfKr8VW1XkH/uNLi0jVbGiM3+sPb96RMbj CQziqU4rSnb13wKRhvBrTIs1m+pSKKr2fP+nC2jJQRd4r1wXfkK2s7Fje5aJm/uNaPE8 0K5bTyi66aUSs4UAJ9YkehRujHDxtkaOtopeSvX6nidK5ia+YLK4jQw7J6fgzvyk+LxW ZytUXoQMYSmDNwpZOYoaXWCHaBipLVfkFNb6y0eLEj3T0IBlkWRvhDTIN1yuXDbVTYjg wQWPlzKj3CXOvUq1eoawanjbcmCIWsNAlvRKa2W4NiskFzwUCEb/w2Uoe3ULCnvxC6wY PoSw== X-Gm-Message-State: AOJu0YyIPQr3E+rQcE/5z4ixGWrX73wUMbq15y1cpHhSkWM7c6XcEjRg rzUzGG8Zw0XQFcO2lslN4ipUhcpKzP9hnWZ74pNHmzvYhebpZJYyJ4khDRWCzlbFlH11aMWxoLi h X-Gm-Gg: ASbGncvnfAjCjV0DQI4wV/oVIqKhxlKUUUrPFbOyr/85h+GoNsYCH4fTpXke2l9UZVi IWR6BOtv1Hi3JRtchnDjtpcAy+sk+sWZhaGYidYjvByX+btESB+sma/fBUZC2YEEpWmvk7rPpj3 bV1S9adHXjHu6rIsGYKOyxnW6siX1EQewb1q4YEZBuwrFhvnbWGBGy9CKjgT2VCaTKmAWysIyVE Uwmd0+i712k9R39aqLR8TlmZ0XFmriebHMcRj2BpKhx6UQ+0TfbiE/O/0FrWZdm3z5/F/PaVfWD Mr83wmFZZH+7siiVWgBQHx61/HpAvj1UIWS9UiODDA0gtwlSOlopYTJX9cgnu+WJJx4ZH5MIKzn YIgK/867mCcJVb5dSV+rs X-Google-Smtp-Source: AGHT+IEdRrfAgd3XftcbCdMHLFCzzJRLUiQAR8tVcSfN/HNySPywkwWJ4aBd32Zn1FLecdT6cL/FYw== X-Received: by 2002:a05:600c:1c24:b0:440:6a37:be09 with SMTP id 5b1f17b1804b1-441ad3d6bfbmr28873985e9.16.1745935768081; Tue, 29 Apr 2025 07:09:28 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Hanna Reitz , Fam Zheng , Paolo Bonzini , Gerd Hoffmann , qemu-block@nongnu.org, John Snow , "Michael S. Tsirkin" , Zhao Liu , Eduardo Habkost , Jason Wang , Kevin Wolf , Yanan Wang , Marcel Apfelbaum , Dmitry Fleytman , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v2 12/19] hw/core/machine: Remove hw_compat_2_5[] array Date: Tue, 29 Apr 2025 16:08:18 +0200 Message-ID: <20250429140825.25964-13-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250429140825.25964-1-philmd@linaro.org> References: <20250429140825.25964-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::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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1745935786366019000 The hw_compat_2_5[] array was only used by the pc-q35-2.5 and pc-i440fx-2.5 machines, which got removed. Remove it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Daniel P. Berrang=C3=A9 --- include/hw/boards.h | 3 --- hw/core/machine.c | 9 --------- 2 files changed, 12 deletions(-) diff --git a/include/hw/boards.h b/include/hw/boards.h index 5dc5e3b547d..5f1a0fb7e28 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -844,7 +844,4 @@ extern const size_t hw_compat_2_7_len; extern GlobalProperty hw_compat_2_6[]; extern const size_t hw_compat_2_6_len; =20 -extern GlobalProperty hw_compat_2_5[]; -extern const size_t hw_compat_2_5_len; - #endif diff --git a/hw/core/machine.c b/hw/core/machine.c index d66b02b564c..e7001bf92cd 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -283,15 +283,6 @@ GlobalProperty hw_compat_2_6[] =3D { }; const size_t hw_compat_2_6_len =3D G_N_ELEMENTS(hw_compat_2_6); =20 -GlobalProperty hw_compat_2_5[] =3D { - { "isa-fdc", "fallback", "144" }, - { "pvscsi", "x-old-pci-configuration", "on" }, - { "pvscsi", "x-disable-pcie", "on" }, - { "vmxnet3", "x-old-msi-offsets", "on" }, - { "vmxnet3", "x-disable-pcie", "on" }, -}; -const size_t hw_compat_2_5_len =3D G_N_ELEMENTS(hw_compat_2_5); - MachineState *current_machine; =20 static char *machine_get_kernel(Object *obj, Error **errp) --=20 2.47.1 From nobody Sat Nov 15 22:23:01 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=1745935832; cv=none; d=zohomail.com; s=zohoarc; b=bwfbGJqtG5l6/mNbRpQqwd++KXvVrXImHq6N4uf2LMWHvkkw7L+2RwmpU2WQzR4eaiWtCUwIsg6caY7V88LzvjE5wRY9FQxCIUzv7Ig1C50XN+XhgdHAohtdxaYrY/I+wWkQb8aAqnij/WGXLa17rfQdY6pu7ba/AAa+F+Nc76g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1745935832; 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=gjm2NV3MsVuXzERs7qPetKCBg7pCwU7Ow/3BPmE8MOo=; b=VfJJISssrpUzow7RzCbbP4LNs0VFcNLvlDrqoGhu9ec2OyiEBDe3oDnZf30pvHb4h0Hr09BW6jYXlXxbq/tpKGn7AURy/Evgsp4bnURohP8yygAzABG4bTYxytXmiTf2E/3UWxdvui75kc2yid53JAq0EAx2OfmnN79ZLVeWZgk= 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 1745935832774300.4856285623305; Tue, 29 Apr 2025 07:10:32 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u9leY-00039G-0Z; Tue, 29 Apr 2025 10:09:43 -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 1u9leT-00035S-5C for qemu-devel@nongnu.org; Tue, 29 Apr 2025 10:09:37 -0400 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 1u9leR-0006ST-Hv for qemu-devel@nongnu.org; Tue, 29 Apr 2025 10:09:36 -0400 Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-39ac9aea656so7012002f8f.3 for ; Tue, 29 Apr 2025 07:09:35 -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-3a073c8cd7fsm14065276f8f.1.2025.04.29.07.09.31 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 29 Apr 2025 07:09:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745935773; x=1746540573; 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=gjm2NV3MsVuXzERs7qPetKCBg7pCwU7Ow/3BPmE8MOo=; b=s8tELiNfdWUMK/re0nnttFyDPyg2LCNNmhEUpPibsumqSYnO40Zt8XpMUjb1lkNvCB NP+PF+gIgDd2b7r/qUWLh1ymJuOZy9NPGXhyUTIOef7XoxUzZP/kll1KvzngCti0P/kM 6zx1E1wporjSQD1NStIOr2Qm2lMTdZWEcSYVlxW3TekCh833Yv6ZkXpHp7ZfCHZ/IK9a Hqx6Hfouz8Se47CzoLTjBdN27QtaNsxFvmT2lIbmjHvPIb7osieqdTTNw5oBDkpflhrI 3tXIbv4rbuUVVktpSyoCSkLlkZl7+rl04iQ7hfi2uhnFjWD4nB+6Mmh/KCXZPdtO4Y7I x5gQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745935773; x=1746540573; 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=gjm2NV3MsVuXzERs7qPetKCBg7pCwU7Ow/3BPmE8MOo=; b=IbfTBdTg8dpJ78wQq4HHj3x2DWzMMy3NlE4dXqQS8FcMP01cDV6hP8or7omsrEx333 B2PuerXaTaVMOOAJtn1sdBZovKxtr8lyoDP/zGXHSQ393V25JLnDOnXLwDNnedUNNz03 i433P7xmUgzWUfaiH0dYe3U/E45duXd0jELZNypiIThEirKSTz6JUvEf0F9b6dITCGpX CR47Btc8gCOn5B2EkiqBJic/DqHpel7ZRv6AQSbhc/ytDrXunJ1JpyvDd5G6BQggwlSt 4tUSUzVxYcnQEwY+s7yjQltEB6wKwVpdUsjwVEDA66O4YJ69k3qgXk4eEQsemGpbvDW4 8zeQ== X-Gm-Message-State: AOJu0YxMBIt4UUN5z8ywTZMxsbErqqd8k0qYdm1isPJ2767ixUlkX6B6 ueAFixKNWXYyFy2SPLRZ4GnyM7Bb3yiq0nh0ujIQ0dGQsimVtUoFvSiXTvc6r0/+aHAFtNNDTxH Q X-Gm-Gg: ASbGncul+K9cfnY6kHSYJhg0zgoA2rebwqJ4eOXsaCxlWlJA2TTD9VlGVsi7UoMaBqw Ag04PX6/QpViRxW/H41bgsT9MQi4YZnwnLM3Zw0yOReLszYYQPGE1NtR+G++/OkNfPGHcXaYUm6 0UGAmLEOF4MAqsSW/pdHgWZeQlI0JXX7khoLi6NBq+5woVqEBaYbWxKHj8Sq8N++9LJvRasfuno 7UH54lTeRwPlGIUPQkfexNW5esrst81jxLMp3vsdJqdiiM03JSwu4HWjGP3V8G5d5pHUo9jg0u2 Pkv/bY/BXPUqf/akavFLMsxmkr03NhYjIIpHNh2ZiePLsrWFqN6OTXSh98Ps7SIrIYPe9Y/w4bP TMFel+/0PBiLJHDgn+b71 X-Google-Smtp-Source: AGHT+IHmtjd22uvPcFnUpa/nMrx3oCiUUi2PRaaIGjDRAHalryLJau6NB77HdgTQ0VKUnMxJQN7Nrg== X-Received: by 2002:a5d:59a7:0:b0:390:f0ff:2c11 with SMTP id ffacd0b85a97d-3a0890a516cmr3487498f8f.2.1745935773168; Tue, 29 Apr 2025 07:09:33 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Hanna Reitz , Fam Zheng , Paolo Bonzini , Gerd Hoffmann , qemu-block@nongnu.org, John Snow , "Michael S. Tsirkin" , Zhao Liu , Eduardo Habkost , Jason Wang , Kevin Wolf , Yanan Wang , Marcel Apfelbaum , Dmitry Fleytman , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v2 13/19] hw/block/fdc-isa: Remove 'fallback' property Date: Tue, 29 Apr 2025 16:08:19 +0200 Message-ID: <20250429140825.25964-14-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250429140825.25964-1-philmd@linaro.org> References: <20250429140825.25964-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::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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1745935834595019000 The "fallback" property was only used by the hw_compat_2_5[] array, as 'fallback=3D144'. We removed all machines using that array, lets remove ISA floppy drive 'fallback' property, manually setting the default value in isabus_fdc_realize(). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Daniel P. Berrang=C3=A9 --- hw/block/fdc-isa.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/hw/block/fdc-isa.c b/hw/block/fdc-isa.c index 6d1790e0e61..090b91361cd 100644 --- a/hw/block/fdc-isa.c +++ b/hw/block/fdc-isa.c @@ -112,6 +112,7 @@ static void isabus_fdc_realize(DeviceState *dev, Error = **errp) } =20 qdev_set_legacy_instance_id(dev, isa->iobase, 2); + qdev_prop_set_enum(dev, "fallback", FLOPPY_DRIVE_TYPE_288); =20 fdctrl_realize_common(dev, fdctrl, &err); if (err !=3D NULL) { @@ -293,9 +294,6 @@ static const Property isa_fdc_properties[] =3D { DEFINE_PROP_SIGNED("fdtypeB", FDCtrlISABus, state.qdev_for_drives[1].t= ype, FLOPPY_DRIVE_TYPE_AUTO, qdev_prop_fdc_drive_type, FloppyDriveType), - DEFINE_PROP_SIGNED("fallback", FDCtrlISABus, state.fallback, - FLOPPY_DRIVE_TYPE_288, qdev_prop_fdc_drive_type, - FloppyDriveType), }; =20 static void isabus_fdc_class_init(ObjectClass *klass, const void *data) --=20 2.47.1 From nobody Sat Nov 15 22:23:01 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=1745935923; cv=none; d=zohomail.com; s=zohoarc; b=MlS+Jl7HZc4EMGbVuEC8op8tYfStp4b6YLy9fiDwCQ6lRPoxLfZu8PStDPi3xVw2yeqkbhunNAPtnfhxlMumBQkYyIy3oWvGnO25ogE5LmHXrqTwSIucf7cyTDwtuLJsKusr0ljAeKQGfk/kN+Kj0uaLvl6c++vlyGKIm7hSTRQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1745935923; 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=cgWjRtFl0Tqbcd4/+gPIcf2l4PP5xa+gpuaAj2NrLow=; b=ADfSPBsnCqHM2qjP33fUSl+XotTSS2iQWmOFdNr/NYI57LJqSfiBIlbMvNZqUSZh0p165E3DpUBPXWepSsOTilhulOkpZ2tMBI1Z2sCOTWLojgXhfGxdUetrlnfq6h0G95Kn04Gs+hAap5PgOzeeDKHuHLyLlxHHfPPGsFvxcFE= 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 1745935923776629.6348998858298; Tue, 29 Apr 2025 07:12:03 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u9lf2-0003TO-AL; Tue, 29 Apr 2025 10:10:15 -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 1u9leZ-0003As-B9 for qemu-devel@nongnu.org; Tue, 29 Apr 2025 10:09:43 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u9leX-0006TU-Nw for qemu-devel@nongnu.org; Tue, 29 Apr 2025 10:09:43 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-43d07ca6a80so23664365e9.1 for ; Tue, 29 Apr 2025 07:09:41 -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-3a073bbeb5esm14012581f8f.0.2025.04.29.07.09.36 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 29 Apr 2025 07:09:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745935780; x=1746540580; 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=cgWjRtFl0Tqbcd4/+gPIcf2l4PP5xa+gpuaAj2NrLow=; b=Y838GGm3mFEK6Q7WaC5H/eNdklCYSMjUbxJGxA41F4ELmmWUxbfkwnGBHsP/3ixJWH DThO5mMsn1L+eMJ+POVEFJXhgX1irvx5pXnZjsMNW093oIpAPMLSgStkV0/+doj9xUfp /aSxr9F+0f3pNGw2nWLfjZjAWglEsGWqosl+uLhbJat+VUX7ieMmqMNFSsnZYRL+yLfO pcNyqlU+TTUVXxjijbSK/YcZMEKpfUOKPvF4+0V/lXX9NdYly4QWFQ9vNQDRYXckslHk kM0L5ne1hgvSXyfLiaER6b8jmQy/tLwIpJJUAnY05zf9/QafC9aM2rx/5PtItCxTFru6 kr1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745935780; x=1746540580; 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=cgWjRtFl0Tqbcd4/+gPIcf2l4PP5xa+gpuaAj2NrLow=; b=wUfx8TDFNPyDRzyeTBkLT6bT51WcPsGfhMMVIxlgApVvtOGnKxq2wQ3Rhxjx6oGCDZ YT0PA1FS0/ItqmFI1kpqFya43eHxOw743NRQEsR5/WbLmJfmx7k27ESbC0ngG8b6j0P6 XKi3SdSoSvdS1bXSEdmpbX7L+0Pti0NHSqwnB4357vFKkXQroyVjPF+hrrDTlk2GEUXB 7E/K8YV5Y/+nnHORDZkd1yvNOt4QHqhkQtQszBq7vI23IBG4jXYkC/hFTgTrpZlM4g7s HdVwDJlWDstemoaHAaHtXggADDd1zOhGdjUlOSorgbKyA7X9/mqD9OGY7sbeEMMUIRTn Vs0g== X-Gm-Message-State: AOJu0YwFy29u/qZVoCUwAVP4szf1DSi9kKxkbO6MNjrA9yhMf0XrJ8KF 73uPOe4YuSEc9clqpHmh+Z/GUsZs5Gqxvkd+89E1Mr5iE4wXZUW7UzNOR2qt4b3W1H2HL1t8y+t P X-Gm-Gg: ASbGncsRGQd8J1D1TBckMt4gWwgv02t9MDhv68hW1S1LJUHZ/gt0OlcNjj2iyvSGoWt An4l4kKXL2LwazLGTJicey2PcYvXSs1TivhtJ64HDdQesxlRX4qJ3c45DlwTkfIL7QQ/fZBui3r P1R/Q5N3hlRWcJZCsaCA3hrpGlop/QI/qgCkKO5vpTHuAAejvMcpe1YbUTpBcOf8uld7Jtl9vK8 iOGDJoPf7Yu/maAJ8PBNXILkjVQByoyHK+JpmHyDTPFtcouFDc2x2bY1THkXLafdoiV75ayztno JvQQaFU4W3kOjDBJeO7/bvTTzJ7QJmtanKoHnis69wNyk63XdqKeSg5TBL1DNbZF2h5sexymwGr PDJS4Q8UuvaJyMru9LTgt X-Google-Smtp-Source: AGHT+IEyWXukeI+Pl5W22LKIsZz5SJqar6L1PSi+oMoZ13+hLI2v4xf8Dl64BDyxeCtUv8HLak6k/g== X-Received: by 2002:a05:600c:b9b:b0:43b:ca39:6c7d with SMTP id 5b1f17b1804b1-440ab782a91mr132704845e9.3.1745935778149; Tue, 29 Apr 2025 07:09:38 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Hanna Reitz , Fam Zheng , Paolo Bonzini , Gerd Hoffmann , qemu-block@nongnu.org, John Snow , "Michael S. Tsirkin" , Zhao Liu , Eduardo Habkost , Jason Wang , Kevin Wolf , Yanan Wang , Marcel Apfelbaum , Dmitry Fleytman , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v2 14/19] hw/scsi/vmw_pvscsi: Remove PVSCSI_COMPAT_OLD_PCI_CONFIGURATION definition Date: Tue, 29 Apr 2025 16:08:20 +0200 Message-ID: <20250429140825.25964-15-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250429140825.25964-1-philmd@linaro.org> References: <20250429140825.25964-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=philmd@linaro.org; helo=mail-wm1-x32b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1745935924676019100 PVSCSI_COMPAT_OLD_PCI_CONFIGURATION was only used by the hw_compat_2_5[] array, via the 'x-old-pci-configuration=3Don' property. We removed all machines using that array, lets remove all the code around PVSCSI_COMPAT_OLD_PCI_CONFIGURATION. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Thomas Huth --- hw/scsi/vmw_pvscsi.c | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/hw/scsi/vmw_pvscsi.c b/hw/scsi/vmw_pvscsi.c index d5825b67868..34de59a7cf6 100644 --- a/hw/scsi/vmw_pvscsi.c +++ b/hw/scsi/vmw_pvscsi.c @@ -69,17 +69,11 @@ OBJECT_DECLARE_TYPE(PVSCSIState, PVSCSIClass, PVSCSI) =20 =20 /* Compatibility flags for migration */ -#define PVSCSI_COMPAT_OLD_PCI_CONFIGURATION_BIT 0 -#define PVSCSI_COMPAT_OLD_PCI_CONFIGURATION \ - (1 << PVSCSI_COMPAT_OLD_PCI_CONFIGURATION_BIT) #define PVSCSI_COMPAT_DISABLE_PCIE_BIT 1 #define PVSCSI_COMPAT_DISABLE_PCIE \ (1 << PVSCSI_COMPAT_DISABLE_PCIE_BIT) =20 -#define PVSCSI_USE_OLD_PCI_CONFIGURATION(s) \ - ((s)->compat_flags & PVSCSI_COMPAT_OLD_PCI_CONFIGURATION) -#define PVSCSI_MSI_OFFSET(s) \ - (PVSCSI_USE_OLD_PCI_CONFIGURATION(s) ? 0x50 : 0x7c) +#define PVSCSI_MSI_OFFSET (0x7c) #define PVSCSI_EXP_EP_OFFSET (0x40) =20 typedef struct PVSCSIRingInfo { @@ -1110,7 +1104,7 @@ pvscsi_init_msi(PVSCSIState *s) int res; PCIDevice *d =3D PCI_DEVICE(s); =20 - res =3D msi_init(d, PVSCSI_MSI_OFFSET(s), PVSCSI_MSIX_NUM_VECTORS, + res =3D msi_init(d, PVSCSI_MSI_OFFSET, PVSCSI_MSIX_NUM_VECTORS, PVSCSI_USE_64BIT, PVSCSI_PER_VECTOR_MASK, NULL); if (res < 0) { trace_pvscsi_init_msi_fail(res); @@ -1158,15 +1152,11 @@ pvscsi_realizefn(PCIDevice *pci_dev, Error **errp) trace_pvscsi_state("init"); =20 /* PCI subsystem ID, subsystem vendor ID, revision */ - if (PVSCSI_USE_OLD_PCI_CONFIGURATION(s)) { - pci_set_word(pci_dev->config + PCI_SUBSYSTEM_ID, 0x1000); - } else { - pci_set_word(pci_dev->config + PCI_SUBSYSTEM_VENDOR_ID, - PCI_VENDOR_ID_VMWARE); - pci_set_word(pci_dev->config + PCI_SUBSYSTEM_ID, - PCI_DEVICE_ID_VMWARE_PVSCSI); - pci_config_set_revision(pci_dev->config, 0x2); - } + pci_set_word(pci_dev->config + PCI_SUBSYSTEM_VENDOR_ID, + PCI_VENDOR_ID_VMWARE); + pci_set_word(pci_dev->config + PCI_SUBSYSTEM_ID, + PCI_DEVICE_ID_VMWARE_PVSCSI); + pci_config_set_revision(pci_dev->config, 0x2); =20 /* PCI latency timer =3D 255 */ pci_dev->config[PCI_LATENCY_TIMER] =3D 0xff; @@ -1298,8 +1288,6 @@ static const VMStateDescription vmstate_pvscsi =3D { =20 static const Property pvscsi_properties[] =3D { DEFINE_PROP_UINT8("use_msg", PVSCSIState, use_msg, 1), - DEFINE_PROP_BIT("x-old-pci-configuration", PVSCSIState, compat_flags, - PVSCSI_COMPAT_OLD_PCI_CONFIGURATION_BIT, false), DEFINE_PROP_BIT("x-disable-pcie", PVSCSIState, compat_flags, PVSCSI_COMPAT_DISABLE_PCIE_BIT, false), }; --=20 2.47.1 From nobody Sat Nov 15 22:23:01 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=1745936105; cv=none; d=zohomail.com; s=zohoarc; b=RVhS9KXZwHUCQITTPOsl8mInxLDZZNCqNOCILIzhzlzcmvKVST7FfqQcELNSqpDNfLmNIlg3GwnPRew5k5aFjB8tj6d8E1Ttl2trIUDNydIGzjvaNxy7XjhNES16fKKrrt1jawa7MAtYzG2G4n2RXOoJOuxj9qciNIE/51zB+GI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1745936105; 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=1t2rS7sMqGG0jQ3p7FyGRdjclg6gvnu3KRb1lwZ8q+A=; b=Q75x+/6JFoj/086qk6h021zKhSgMOZuC8AnRAof1z29sD8+cNSaIaoAp1Du1EiCI2YSFYzsSY5krBaUVySwrT8ZP13mOxQXEFf5D+gY8psZJ0XOpvT3gs/1khZhKnTmjVS5OiIT7psy4k9rPKRX+dFgmNSPnpwe1i0drXH5swZ8= 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 1745936105885773.353957642836; Tue, 29 Apr 2025 07:15:05 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u9lfP-0004MK-Mr; Tue, 29 Apr 2025 10:10:35 -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 1u9lep-0003VJ-Q8 for qemu-devel@nongnu.org; Tue, 29 Apr 2025 10:10:05 -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 1u9lem-0006UP-IR for qemu-devel@nongnu.org; Tue, 29 Apr 2025 10:09:59 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-43edecbfb46so38649105e9.0 for ; Tue, 29 Apr 2025 07:09:46 -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-4409d2dfde6sm188177025e9.36.2025.04.29.07.09.42 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 29 Apr 2025 07:09:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745935785; x=1746540585; 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=1t2rS7sMqGG0jQ3p7FyGRdjclg6gvnu3KRb1lwZ8q+A=; b=VF6ETirT9sv+EJE1mPItdBkgv8i2P4DHQq3gA1hAE/a5C48LzXEk03OobOhO8qqBQ/ E0HRL/gv4pYJApCg86Yrw+1jXQ9SuInlOlUAmiKl3J02Tk/pVumRaoti/0qn7HNwLf3u tYbYnGxUtOpnQyx+QmJ1akxGQ+gcWudj/0tJ891Mm+jONRTV6oUkeD7MVN6oZ0ONngep Qh5lUiy/09L+pcgAnb1L0+tebINs9jBOHj5oK38UJmacAGWCtqe5x9FrNEsudCPeBUMy RQOd9C2mAM7K0c8JOEf7hTuWSYt5i/lXZebWeIRfm6ZE0Oif+EKAvBlGRdRl5A1oFpx2 Uf6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745935785; x=1746540585; 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=1t2rS7sMqGG0jQ3p7FyGRdjclg6gvnu3KRb1lwZ8q+A=; b=rBP4uKtsbIrmz1cM/udX5tRCqolgf9lwyD5w6VIcGwSsf/5rRcNtWzzWZ6sNxkqIX4 b5Q/H99Ameuzpma7K/ieMkHYE+u4sATmItpLiCnEc3v4vJcm94UtbnOS0nEOnA2V7kra Mc3EMqXbfN0iTz9oV/vkxGtNkfo8Dqv99tiz+jjozyfD+Lz3I1vpusCQjFVuYqOvNLND v/fYTcZtzfvUWq8lofEwX6MoN39JCLYqLDr3S3UkH4DCPJPT3efkWmqg/f1w7JRqMQhY 4P/pliHVcLcgN6navAiPCQpQh1x2Z7F0GhlmtcpJK664qiJ8USNX9WPo4ERG94pZa0gH WpIg== X-Gm-Message-State: AOJu0YxYKhHD6/W6VhxCzBI7UB1UsmrrkoFibqC5qIGHDIZDMBMDC5xt SChNV4t9RzSkKQTLTd5mL+3AutQyANhvN2m6vtnouWog5KF7ygZJkvsiDa662sNPQZ2wZ3ipDgf x X-Gm-Gg: ASbGncuPdnCpAiNnT4ZI/ZYUUXI4y5AElbBmosFWkpMAqQCufPabqPWCORNfXFwoxgi f+r9dn9IHYOJEe+xYdrwitdiS+nKdA+3YX8qkhpx4MMIiJW2vTBUhKDAJX67WMCCE0gIxOCf+GB DuEcIWOPkvSwXVvTYehMC4Z8aXFrjm21zEBIc8pbvmCWGU76Zu29sCX1LPCaDoSywgOMEDVPpoo KG+aMwGNCnjWd73run3tdz4XLSWeiKoWXp7rFr4TJYazz+Jn6ZMS7YPiGJ6jgOeaz6ijUrV2C5w nAGiCpOA4KDcq4oJlw60v3Wh7M2JF47yQiWVQ9B47Ar1Sqqop81HQyK5fndX9zcgzuswbPD/FOG l7WhVkHbSU3QKGPEcOhHn X-Google-Smtp-Source: AGHT+IE8XcOPfdl7iFneLDxHpg2ev2e3ba7JmOD8DPG+iVefvLC+e6qg6d0yARL12f59X6FJf25TiA== X-Received: by 2002:a05:600c:384d:b0:43d:53c:1ad6 with SMTP id 5b1f17b1804b1-440ab848aa3mr108657535e9.26.1745935783582; Tue, 29 Apr 2025 07:09:43 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Hanna Reitz , Fam Zheng , Paolo Bonzini , Gerd Hoffmann , qemu-block@nongnu.org, John Snow , "Michael S. Tsirkin" , Zhao Liu , Eduardo Habkost , Jason Wang , Kevin Wolf , Yanan Wang , Marcel Apfelbaum , Dmitry Fleytman , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v2 15/19] hw/scsi/vmw_pvscsi: Remove PVSCSI_COMPAT_DISABLE_PCIE_BIT definition Date: Tue, 29 Apr 2025 16:08:21 +0200 Message-ID: <20250429140825.25964-16-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250429140825.25964-1-philmd@linaro.org> References: <20250429140825.25964-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: 1745936107963019000 PVSCSI_COMPAT_DISABLE_PCIE_BIT was only used by the hw_compat_2_5[] array, via the 'x-disable-pcie=3Don' property. We removed all machines using that array, lets remove all the code around PVSCSI_COMPAT_DISABLE_PCIE_BIT, including the now unused PVSCSIState::compat_flags field. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Thomas Huth --- hw/scsi/vmw_pvscsi.c | 30 +----------------------------- 1 file changed, 1 insertion(+), 29 deletions(-) diff --git a/hw/scsi/vmw_pvscsi.c b/hw/scsi/vmw_pvscsi.c index 34de59a7cf6..e163023d14c 100644 --- a/hw/scsi/vmw_pvscsi.c +++ b/hw/scsi/vmw_pvscsi.c @@ -68,11 +68,6 @@ struct PVSCSIClass { OBJECT_DECLARE_TYPE(PVSCSIState, PVSCSIClass, PVSCSI) =20 =20 -/* Compatibility flags for migration */ -#define PVSCSI_COMPAT_DISABLE_PCIE_BIT 1 -#define PVSCSI_COMPAT_DISABLE_PCIE \ - (1 << PVSCSI_COMPAT_DISABLE_PCIE_BIT) - #define PVSCSI_MSI_OFFSET (0x7c) #define PVSCSI_EXP_EP_OFFSET (0x40) =20 @@ -123,8 +118,6 @@ struct PVSCSIState { uint8_t msi_used; /* For migration compatibility = */ PVSCSIRingInfo rings; /* Data transfer rings manager = */ uint32_t resetting; /* Reset in progress = */ - - uint32_t compat_flags; }; =20 typedef struct PVSCSIRequest { @@ -1224,21 +1217,8 @@ pvscsi_post_load(void *opaque, int version_id) return 0; } =20 -static bool pvscsi_vmstate_need_pcie_device(void *opaque) -{ - PVSCSIState *s =3D PVSCSI(opaque); - - return !(s->compat_flags & PVSCSI_COMPAT_DISABLE_PCIE); -} - -static bool pvscsi_vmstate_test_pci_device(void *opaque, int version_id) -{ - return !pvscsi_vmstate_need_pcie_device(opaque); -} - static const VMStateDescription vmstate_pvscsi_pcie_device =3D { .name =3D "pvscsi/pcie", - .needed =3D pvscsi_vmstate_need_pcie_device, .fields =3D (const VMStateField[]) { VMSTATE_PCI_DEVICE(parent_obj, PVSCSIState), VMSTATE_END_OF_LIST() @@ -1252,9 +1232,6 @@ static const VMStateDescription vmstate_pvscsi =3D { .pre_save =3D pvscsi_pre_save, .post_load =3D pvscsi_post_load, .fields =3D (const VMStateField[]) { - VMSTATE_STRUCT_TEST(parent_obj, PVSCSIState, - pvscsi_vmstate_test_pci_device, 0, - vmstate_pci_device, PCIDevice), VMSTATE_UINT8(msi_used, PVSCSIState), VMSTATE_UINT32(resetting, PVSCSIState), VMSTATE_UINT64(reg_interrupt_status, PVSCSIState), @@ -1288,19 +1265,14 @@ static const VMStateDescription vmstate_pvscsi =3D { =20 static const Property pvscsi_properties[] =3D { DEFINE_PROP_UINT8("use_msg", PVSCSIState, use_msg, 1), - DEFINE_PROP_BIT("x-disable-pcie", PVSCSIState, compat_flags, - PVSCSI_COMPAT_DISABLE_PCIE_BIT, false), }; =20 static void pvscsi_realize(DeviceState *qdev, Error **errp) { PVSCSIClass *pvs_c =3D PVSCSI_GET_CLASS(qdev); PCIDevice *pci_dev =3D PCI_DEVICE(qdev); - PVSCSIState *s =3D PVSCSI(qdev); =20 - if (!(s->compat_flags & PVSCSI_COMPAT_DISABLE_PCIE)) { - pci_dev->cap_present |=3D QEMU_PCI_CAP_EXPRESS; - } + pci_dev->cap_present |=3D QEMU_PCI_CAP_EXPRESS; =20 pvs_c->parent_dc_realize(qdev, errp); } --=20 2.47.1 From nobody Sat Nov 15 22:23:01 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=1745936010; cv=none; d=zohomail.com; s=zohoarc; b=oFlYkIAWhT4bBDfvI1hBmJCvLdVoLt4Ja8EPWyy2aj5k4LS4UC/QUvpCpg8OyvTe0Ic5zcGyH0lgYhfLWjc1nL0cg6akvpf3KKmURiMkuMqDIZbJgmC6t0JOaw83ZKbr9vh30kHXN8kkVZCYWmNdeQr/T4to6/RFkJegPvJ5qPI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1745936010; 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=j41fV/T5fVwdY4VDR58WCPqJo5aDoWrBkyOMJ4Dwydk=; b=lULwInZN8Ad9EZ1IknQgDDV2snC0AZcBVnVcpaiJ5g72sflvHa1NSalLcxZUpCyTOi9SRflKYnPENglAgYVcdOFA+ttZ9F8f5CA4G2wuGJzLZ928j5FVdf5d2j9UBFGFVuBm/0nm9DmjV1cEK3q+E0dqOtplh/YucqxaJOaDGhA= 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 1745936010762245.92771931599896; Tue, 29 Apr 2025 07:13:30 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u9lfN-00045R-7m; Tue, 29 Apr 2025 10:10:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u9lep-0003V8-Om for qemu-devel@nongnu.org; Tue, 29 Apr 2025 10:10:05 -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 1u9lem-0006Uy-J6 for qemu-devel@nongnu.org; Tue, 29 Apr 2025 10:09:59 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-43cef035a3bso43260795e9.1 for ; Tue, 29 Apr 2025 07:09:50 -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-3a073e5c6a0sm13996273f8f.86.2025.04.29.07.09.47 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 29 Apr 2025 07:09:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745935789; x=1746540589; 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=j41fV/T5fVwdY4VDR58WCPqJo5aDoWrBkyOMJ4Dwydk=; b=sSRybMXsNRHONHi260Dy9TnGh+3FDJfPzIKE7STPRsZdNgUpGb+aZ4YaK9pdOBZrxm DHtfy5zR0QGXCyQTUcbOj5vFAiLrLaPewqLWEzQWRQkNZlVDkQ1Ap0waox9PGSOU9tnf E+Yegwy9udbAAIExgEutNpnlBMMKrkFEqNiu4EPeq4/ZXYL+FxA0qH8gMrzVUpkhnqsC qAZqMlQDifVmGwYQ0ONFWkUSGcwhuujTkLjYhAIMLrY3E9Q99tXlIAwDLOIiZKIhqa3s 6uRHD+sFZhO1Q7QDSuOqee4NWASy8/NGn+pH11vKVne/qJOZikSb6gCRREYGFjxsUjv9 ri7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745935789; x=1746540589; 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=j41fV/T5fVwdY4VDR58WCPqJo5aDoWrBkyOMJ4Dwydk=; b=ITeaLDj7CQ7UkKmI1nwHD2+tiO8hsWkG9xyipjObGZkkF6TvrGIMJxPk8ZuyvdnZlT 9E2ukNstBRcK/cBnLaAcOgHXCiE4PUh6bg/NT1fWgwn5DqBNHfRKEMhYC76rhwTPL3G2 gcy8e1pOrwiDLs2N7fr/Gq53RJvdD2RfewdB/wE9qXu2iv99KkYDaKvkuyaiuMNRjJkt S5i7zvugNdXZTqMArqeLnp7FxUB+vvIp7QyGGIj8T/oYyl+hPfd0z+IBsZz3+xlmCyAO TZjJw42ZudMS5xEfD3eM7YdJPqW0ooKPgtLid/FmwmvncehCuZ83VrZx9G+XX8eRj8Aw wDPQ== X-Gm-Message-State: AOJu0Yxb/ltaWS5plLoj1lU6pSvqS+Ou7/7T5SPraaVEC7GW5nijl1ak ic12tJVug7Uj2EvAyaktJ015/AjGJdHwACJaESDMs+GJA4qJ7416i4oGNjwFiw/1J2IZ0mJPKC/ + X-Gm-Gg: ASbGncv/xxUAaRxycmryeenriu/c7e6pxsfjl+V7tBHl8F1XpzlWqU6uJnJgJe3tqSf aVd2Bak+LGKXQ9n0Rhw0ibrDIMNvOjhAEq6SA077RXCJv8sX4AN5r0Z5m4mjayRoE3l0ISzmc+U +PiqPH+QtucKNLU0PVW95fX70POqngzyJDlwNXdxmXYpQnFjMywD1AwxRgllg+fJTLu/gULdR8/ 6LGaY/ZHzqguLdeWWndyQWaXH01jJoKn+QPwwDuWmlwumGWMBtgGQ30c4O0YBb+ZVugofT22TXg 7nE2JLxJvDeOi25ERaAbL1kQsRQNLV+HJb3gZwhM3G8sQQX+Uy/K1c7t3DDMhB7kROqm8uRXV6q 75mX06iI3VjsYckeqNVoC X-Google-Smtp-Source: AGHT+IFb5nYayxjTU8XD3JSTOuyV3WiSXankX9wyKjueE1RtxtuSlbEIWCQvzlEg2kqY9bAFP0Pw1Q== X-Received: by 2002:a05:600c:1f91:b0:440:9b1a:cd78 with SMTP id 5b1f17b1804b1-440ab7b7969mr144090985e9.10.1745935789042; Tue, 29 Apr 2025 07:09:49 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Hanna Reitz , Fam Zheng , Paolo Bonzini , Gerd Hoffmann , qemu-block@nongnu.org, John Snow , "Michael S. Tsirkin" , Zhao Liu , Eduardo Habkost , Jason Wang , Kevin Wolf , Yanan Wang , Marcel Apfelbaum , Dmitry Fleytman , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v2 16/19] hw/scsi/vmw_pvscsi: Convert DeviceRealize -> InstanceInit Date: Tue, 29 Apr 2025 16:08:22 +0200 Message-ID: <20250429140825.25964-17-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250429140825.25964-1-philmd@linaro.org> References: <20250429140825.25964-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=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: 1745936011571019000 Simplify replacing pvscsi_realize() by pvscsi_instance_init(), removing the need for device_class_set_parent_realize(). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Daniel P. Berrang=C3=A9 --- hw/scsi/vmw_pvscsi.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/hw/scsi/vmw_pvscsi.c b/hw/scsi/vmw_pvscsi.c index e163023d14c..7c98b1b8ea6 100644 --- a/hw/scsi/vmw_pvscsi.c +++ b/hw/scsi/vmw_pvscsi.c @@ -1267,21 +1267,15 @@ static const Property pvscsi_properties[] =3D { DEFINE_PROP_UINT8("use_msg", PVSCSIState, use_msg, 1), }; =20 -static void pvscsi_realize(DeviceState *qdev, Error **errp) +static void pvscsi_instance_init(Object *obj) { - PVSCSIClass *pvs_c =3D PVSCSI_GET_CLASS(qdev); - PCIDevice *pci_dev =3D PCI_DEVICE(qdev); - - pci_dev->cap_present |=3D QEMU_PCI_CAP_EXPRESS; - - pvs_c->parent_dc_realize(qdev, errp); + PCI_DEVICE(obj)->cap_present |=3D QEMU_PCI_CAP_EXPRESS; } =20 static void pvscsi_class_init(ObjectClass *klass, const void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); PCIDeviceClass *k =3D PCI_DEVICE_CLASS(klass); - PVSCSIClass *pvs_k =3D PVSCSI_CLASS(klass); HotplugHandlerClass *hc =3D HOTPLUG_HANDLER_CLASS(klass); =20 k->realize =3D pvscsi_realizefn; @@ -1290,8 +1284,6 @@ static void pvscsi_class_init(ObjectClass *klass, con= st void *data) k->device_id =3D PCI_DEVICE_ID_VMWARE_PVSCSI; k->class_id =3D PCI_CLASS_STORAGE_SCSI; k->subsystem_id =3D 0x1000; - device_class_set_parent_realize(dc, pvscsi_realize, - &pvs_k->parent_dc_realize); device_class_set_legacy_reset(dc, pvscsi_reset); dc->vmsd =3D &vmstate_pvscsi; device_class_set_props(dc, pvscsi_properties); @@ -1306,6 +1298,7 @@ static const TypeInfo pvscsi_info =3D { .class_size =3D sizeof(PVSCSIClass), .instance_size =3D sizeof(PVSCSIState), .class_init =3D pvscsi_class_init, + .instance_init =3D pvscsi_instance_init, .interfaces =3D (const InterfaceInfo[]) { { TYPE_HOTPLUG_HANDLER }, { INTERFACE_PCIE_DEVICE }, --=20 2.47.1 From nobody Sat Nov 15 22:23:01 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=1745935918; cv=none; d=zohomail.com; s=zohoarc; b=iIrNzq72KatD02UOkCvayN3zstdKwvokj3EVZPnQnkp4GV4QJboce/T7oAnJD85q9mOCM9kC3zHnGaID8R6T98do1SC+AJIrBiwJi/nP2QEH0EbuzTnxyI9bv5N56OnYf5pyZuuNUzvRskE2nQymWXPixfo5iKtV0IUhAFNXDFA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1745935918; 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=+H9UYlRmqVO8yptjvYMIoxPGGH/04VbttZQFCTzfSSI=; b=fTKBOdYwTIAyD7IJPMiAIZizW9hM3uh2zrOdLmmJyKL1q7k6CBoZ5YvG0ByN8DZpvCcAPrZQCdO6Xs9QvrNxiYhmo2mS6RTnVcOjF4wgOk4+6ZGKYJlTRjsGoTtZpedWQQFTW/CNA1VguxpnfGADvKazV7fSHctj6b/bQQg4M6A= 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 1745935918821500.453701908771; Tue, 29 Apr 2025 07:11:58 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u9lfT-0004aG-U6; Tue, 29 Apr 2025 10:10: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 1u9ler-0003X3-NT for qemu-devel@nongnu.org; Tue, 29 Apr 2025 10:10:07 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u9len-0006Vz-Es for qemu-devel@nongnu.org; Tue, 29 Apr 2025 10:10:00 -0400 Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-3912fdddf8fso4535240f8f.1 for ; Tue, 29 Apr 2025 07:09:56 -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-3a073e5e351sm13788043f8f.100.2025.04.29.07.09.53 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 29 Apr 2025 07:09:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745935795; x=1746540595; 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=+H9UYlRmqVO8yptjvYMIoxPGGH/04VbttZQFCTzfSSI=; b=Sbk3vCA5vCtt21Z/i7B8G5BcuAJbZiMleeb/lV4qPIb57mod6W6myT7tZhDpwmUMMm sgXPmtHm0SB2jt3a/UTv07RnIteRb7jKeEda2dwkM3xdj4eoYPvHfVk1nz+b1ZBFoUdw ZIxW9/BOe2ZRZ6d6woAKkDFp7XIBs2/6jL5SU9e603PkgkZ+7VDHoApHGdExFj24FiZ3 Qv7j/bB0RwG8mWE1VO3KFM1d9/E/CD0eYsJcP+MKSNqblon/S0+DhrGw+t6q24ZMVHr2 IxsaHZdIDJv4sFXTD/qUTIOWBrJUhlzdvFktAISik0G0+8nEpyBBWso299LPcIp/qBGq 8oHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745935795; x=1746540595; 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=+H9UYlRmqVO8yptjvYMIoxPGGH/04VbttZQFCTzfSSI=; b=cgmdf1qkDF4P23nIZujdirl6xCJQ26a64HSGYRqL0+S7t5BSNSe+J7m2LBzjQzRYti i8vgiD/tOMnPlgJXiITzjzw+/ieWmigOeFtjSoulsQOKng2DosiE6hElzRzCVdlJH8mN coaSsrXqd1eDOWihvvnKdrZ/+17kKj6XCLbctYLsFcy7k2mRpUUmlMgTapbNg3Q/T4Tf qbHMuIOEe1NkKXHIBSIX9ZROTU+OZ0CrcX1Mo4Wyyj9XqL57000hEiCyheLzYk01hSPa J/X3tIcPWtWrXe4B16csXaEsshUlzQEnNoICVq55y1JgJeIW/5c3+rKdEQETPG6fXmL6 DXag== X-Gm-Message-State: AOJu0YwxWVWBMuXGdo/D4YHO+WVRhK9KcuSLtKmqku/cGosPtd9BNkq0 WuYeWJ10fZUN4LIfpH9XHFVOiuysN7ITaRCmR7sJ32oCMGyRCuHJklYuCi64+kBQZvoxAwC7KTf r X-Gm-Gg: ASbGncsG6bElI2C9ZS5mxcurXdm2KCd8X+dJvjG61ZSPfR1uqC+c/q33xGS87WT0Ykr rMn5XL4eAMMqnkpwrLVWcd1I1BCl6jyOE9IDrB8xr6WelFzn8MxVF/3Q2PnKpJ2zs6snX4Pkh4j VMy0hFB5DclWa53NOzIDfA51tWpq1x0dXkRKQh9+wCJwuKo5VG8sisz832B7TTZ83Kf1+h8QLGc 3uPIe2ADVNaWI+cCx+sS8OQae1MK1J7/9tgo4VR7QoeDhaZGxrMMGWkDz5s4me0h4Pv1Nk0voJZ 38+bsjDyNC14HoajSnlCkZ3gL4oF3gQcI9CSP5sjm2xPWiLPAaE3EVAUzgMQuF7KzfRzLnG4+w3 H8dMR5yGvSCWIzDP5kg0w X-Google-Smtp-Source: AGHT+IFpWx5aqDpYBbB6uRP2wJNrnFWKMAwD2ZyZRWg94EiWPLlMkY9XrxQt3yF69kCl71q9eD7Bsw== X-Received: by 2002:a05:6000:3112:b0:39f:bfa:7c90 with SMTP id ffacd0b85a97d-3a08a51cbe4mr2658356f8f.13.1745935795537; Tue, 29 Apr 2025 07:09:55 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Hanna Reitz , Fam Zheng , Paolo Bonzini , Gerd Hoffmann , qemu-block@nongnu.org, John Snow , "Michael S. Tsirkin" , Zhao Liu , Eduardo Habkost , Jason Wang , Kevin Wolf , Yanan Wang , Marcel Apfelbaum , Dmitry Fleytman , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v2 17/19] hw/net/vmxnet3: Remove VMXNET3_COMPAT_FLAG_OLD_MSI_OFFSETS definition Date: Tue, 29 Apr 2025 16:08:23 +0200 Message-ID: <20250429140825.25964-18-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250429140825.25964-1-philmd@linaro.org> References: <20250429140825.25964-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::436; envelope-from=philmd@linaro.org; helo=mail-wr1-x436.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: 1745935921006019000 VMXNET3_COMPAT_FLAG_OLD_MSI_OFFSETS was only used by the hw_compat_2_5[] array, via the 'x-old-msi-offsets=3Don' property. We removed all machines using that array, lets remove all the code around VMXNET3_COMPAT_FLAG_OLD_MSI_OFFSETS. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Daniel P. Berrang=C3=A9 --- hw/net/vmxnet3.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/hw/net/vmxnet3.c b/hw/net/vmxnet3.c index 83d942af179..3cf5d71f478 100644 --- a/hw/net/vmxnet3.c +++ b/hw/net/vmxnet3.c @@ -42,18 +42,13 @@ #define VMXNET3_MSIX_BAR_SIZE 0x2000 =20 /* Compatibility flags for migration */ -#define VMXNET3_COMPAT_FLAG_OLD_MSI_OFFSETS_BIT 0 -#define VMXNET3_COMPAT_FLAG_OLD_MSI_OFFSETS \ - (1 << VMXNET3_COMPAT_FLAG_OLD_MSI_OFFSETS_BIT) #define VMXNET3_COMPAT_FLAG_DISABLE_PCIE_BIT 1 #define VMXNET3_COMPAT_FLAG_DISABLE_PCIE \ (1 << VMXNET3_COMPAT_FLAG_DISABLE_PCIE_BIT) =20 #define VMXNET3_EXP_EP_OFFSET (0x48) -#define VMXNET3_MSI_OFFSET(s) \ - ((s)->compat_flags & VMXNET3_COMPAT_FLAG_OLD_MSI_OFFSETS ? 0x50 : 0x84) -#define VMXNET3_MSIX_OFFSET(s) \ - ((s)->compat_flags & VMXNET3_COMPAT_FLAG_OLD_MSI_OFFSETS ? 0 : 0x9c) +#define VMXNET3_MSI_OFFSET (0x84) +#define VMXNET3_MSIX_OFFSET (0x9c) #define VMXNET3_DSN_OFFSET (0x100) =20 #define VMXNET3_BAR0_IDX (0) @@ -61,8 +56,7 @@ #define VMXNET3_MSIX_BAR_IDX (2) =20 #define VMXNET3_OFF_MSIX_TABLE (0x000) -#define VMXNET3_OFF_MSIX_PBA(s) \ - ((s)->compat_flags & VMXNET3_COMPAT_FLAG_OLD_MSI_OFFSETS ? 0x800 : 0x1= 000) +#define VMXNET3_OFF_MSIX_PBA (0x1000) =20 /* Link speed in Mbps should be shifted by 16 */ #define VMXNET3_LINK_SPEED (1000 << 16) @@ -2122,8 +2116,8 @@ vmxnet3_init_msix(VMXNET3State *s) &s->msix_bar, VMXNET3_MSIX_BAR_IDX, VMXNET3_OFF_MSIX_TABLE, &s->msix_bar, - VMXNET3_MSIX_BAR_IDX, VMXNET3_OFF_MSIX_PBA(s), - VMXNET3_MSIX_OFFSET(s), NULL); + VMXNET3_MSIX_BAR_IDX, VMXNET3_OFF_MSIX_PBA, + VMXNET3_MSIX_OFFSET, NULL); =20 if (0 > res) { VMW_WRPRN("Failed to initialize MSI-X, error %d", res); @@ -2221,7 +2215,7 @@ static void vmxnet3_pci_realize(PCIDevice *pci_dev, E= rror **errp) /* Interrupt pin A */ pci_dev->config[PCI_INTERRUPT_PIN] =3D 0x01; =20 - ret =3D msi_init(pci_dev, VMXNET3_MSI_OFFSET(s), VMXNET3_MAX_NMSIX_INT= RS, + ret =3D msi_init(pci_dev, VMXNET3_MSI_OFFSET, VMXNET3_MAX_NMSIX_INTRS, VMXNET3_USE_64BIT, VMXNET3_PER_VECTOR_MASK, NULL); /* Any error other than -ENOTSUP(board's MSI support is broken) * is a programming error. Fall back to INTx silently on -ENOTSUP */ @@ -2472,8 +2466,6 @@ static const VMStateDescription vmstate_vmxnet3 =3D { =20 static const Property vmxnet3_properties[] =3D { DEFINE_NIC_PROPERTIES(VMXNET3State, conf), - DEFINE_PROP_BIT("x-old-msi-offsets", VMXNET3State, compat_flags, - VMXNET3_COMPAT_FLAG_OLD_MSI_OFFSETS_BIT, false), DEFINE_PROP_BIT("x-disable-pcie", VMXNET3State, compat_flags, VMXNET3_COMPAT_FLAG_DISABLE_PCIE_BIT, false), }; --=20 2.47.1 From nobody Sat Nov 15 22:23:01 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=1745936145; cv=none; d=zohomail.com; s=zohoarc; b=hdQiXtl4qewSmvol2koJ3l0Mpqo20Qu0d6FA7Uff0SFw2AyBV79/CgY9Gcm0YV4GRfV3kHhogVBLS5Ggf9CIm5V40mU5huxTZymA0zETp2e7sDs9hAO5M7AxQcT/JM/stCjmP9qh0Zf5/jkK1aq4oWiPC0Ik/YboWHx+LArPhG8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1745936145; 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=Pj+GFYlfc9iJo6yTyQ5Nz9Q5zJ67gCxIABOM4SRTAcA=; b=FpHajQowcqhaeenkw8Q1/Ggk5EIDqxCcmdyS90jfFkwx/1rdxKNdJOW1LSAxnAFKEw0EDXWM+yA8EOGH5y383ZzXnGE6lK1EgZxYCRZGVZVtaTrfnerWvaEjtzikikFZvXfW2DY74lpCBGyrPPi+4KGc3/4NgI+fJL7JM5uPncA= 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 1745936145566808.7144334487778; Tue, 29 Apr 2025 07:15:45 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u9lfR-0004Ta-Dy; Tue, 29 Apr 2025 10:10:37 -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 1u9lex-0003Ys-JX for qemu-devel@nongnu.org; Tue, 29 Apr 2025 10:10:13 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u9let-0006Y9-IQ for qemu-devel@nongnu.org; Tue, 29 Apr 2025 10:10:06 -0400 Received: by mail-wr1-x434.google.com with SMTP id ffacd0b85a97d-39c14016868so6138062f8f.1 for ; Tue, 29 Apr 2025 07:10:02 -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-3a073c8da58sm14202431f8f.15.2025.04.29.07.09.59 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 29 Apr 2025 07:10:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745935801; x=1746540601; 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=Pj+GFYlfc9iJo6yTyQ5Nz9Q5zJ67gCxIABOM4SRTAcA=; b=gXh/bVlQdJQTMAVRSkqnIAWAV7I9YCDkmkcdrfeZk4cRDELaohkEJ4fvil/Pj+ClqL 9hMGN41Gkv8BYsBQcuhePMjskOeFOt1sEYadga3ZHJvU0j1PxpPLeP9K6s3UPURMWBPQ TMX9tZ/XCP8U+jOME8tT1MKiW1jFIBUjlbOpkhqhYK43Geu64w+GSb8Xp1T/u7PnbC9q pM0/fkCrU4Ni8X6RYUNOOO/78vLa+TiFFnKBkyz3SLTvQ4UX5ayOkxRI03DBBGWf7Yd4 65W/r3WO5WY6sSiufIAa9ovMddvtR5stOiuZhC0D8s6Fv7003ht/snQXMSFaXRVE/3Yo eFtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745935801; x=1746540601; 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=Pj+GFYlfc9iJo6yTyQ5Nz9Q5zJ67gCxIABOM4SRTAcA=; b=xHj040E04T8rnPOGqI4ECcaWXsau+dIkly+iG+72G8J5qgcGVGIqZqCVmPilYJsHjS OHFlM9fYlXMTfeSkg1xSC9yc9cClrS3e3H/pr1tKIexN49wWIpBxz61mvshHGkCf2r+Z W/kSIFLr8HmCm7gr3mgEe8WDUGddcfLDF+4ZRPEwRYa6tIwh2cj3vOFXbwFyNwlU9q10 pd2JBPbuhbnpSpr9R3T9eQle4GkCJOo3bj5wty5LTa2T+qsilrHRA+RHtGJS2nYwyVQ5 wD+C6apHsJifujYDPPxYnt2ZBDC5+McW0aPcozI6bpsZQDl/4P6YhbSbrU3kVwqEUnO1 E8JQ== X-Gm-Message-State: AOJu0YyfuQlOLUFPc8Gp5I2lcD96oDEF8gBQGOphmBCP6yuDbVBjORfH EL69MSKVqBSnU12qtnUC5phvPjNK8VhMS5rluSUr02jeRZGWviK3ltbglfk/BV0Lm/3TMcrt1ry b X-Gm-Gg: ASbGncvi7RkUE2xpS4IE2Z0ivCp/j0C7DeHOVj6IQez8GXCDXl46ZeeQFzInWoZCEkc 4XA/0pSlcgAb7BDJ7+qWkoLu53kAhgVVu7Ha/XEF8JPe1nUcSz7XZ2v4z+EwoLXMHCeIjkU4UEx J+ifaIxJPegRZyoVNJ2gpWbo/U+sVZGeKfREh9hW2j0EXqBxFpPspdxn3vc7DnNPj2Ac0ptnjIQ 2+yKnmNBt1lwveXrGGwupmyXjjLJAtt7tJHWo0H18PNBsWtecE8vdJGzoCumBunXN5etakSnjo5 NTfIQIPSgBGyZ+5/ybh16DBaN3yIF4LBA9luCtPOl33882ZMFQEtMuD1fwgC79EAbM8DlZqN+S4 KW3xbrwRgHbFPNfu6sfFU X-Google-Smtp-Source: AGHT+IFVIY3rxNjKTFlO6YgU4hgP6PjtliadrJgM6zPKxeh0WA+yTsyWX+d11aO7yYXRFK0J0prRBA== X-Received: by 2002:a05:6000:507:b0:3a0:8119:7ab3 with SMTP id ffacd0b85a97d-3a0890ab0a3mr2962571f8f.15.1745935801186; Tue, 29 Apr 2025 07:10:01 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Hanna Reitz , Fam Zheng , Paolo Bonzini , Gerd Hoffmann , qemu-block@nongnu.org, John Snow , "Michael S. Tsirkin" , Zhao Liu , Eduardo Habkost , Jason Wang , Kevin Wolf , Yanan Wang , Marcel Apfelbaum , Dmitry Fleytman , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v2 18/19] hw/net/vmxnet3: Remove VMXNET3_COMPAT_FLAG_DISABLE_PCIE definition Date: Tue, 29 Apr 2025 16:08:24 +0200 Message-ID: <20250429140825.25964-19-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250429140825.25964-1-philmd@linaro.org> References: <20250429140825.25964-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::434; envelope-from=philmd@linaro.org; helo=mail-wr1-x434.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: 1745936146710019000 VMXNET3_COMPAT_FLAG_DISABLE_PCIE was only used by the hw_compat_2_5[] array, via the 'x-disable-pcie=3Don' property. We removed all machines using that array, lets remove all the code around VMXNET3_COMPAT_FLAG_DISABLE_PCIE. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Daniel P. Berrang=C3=A9 --- hw/net/vmxnet3.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/hw/net/vmxnet3.c b/hw/net/vmxnet3.c index 3cf5d71f478..d080fe9b38a 100644 --- a/hw/net/vmxnet3.c +++ b/hw/net/vmxnet3.c @@ -41,11 +41,6 @@ #define PCI_DEVICE_ID_VMWARE_VMXNET3_REVISION 0x1 #define VMXNET3_MSIX_BAR_SIZE 0x2000 =20 -/* Compatibility flags for migration */ -#define VMXNET3_COMPAT_FLAG_DISABLE_PCIE_BIT 1 -#define VMXNET3_COMPAT_FLAG_DISABLE_PCIE \ - (1 << VMXNET3_COMPAT_FLAG_DISABLE_PCIE_BIT) - #define VMXNET3_EXP_EP_OFFSET (0x48) #define VMXNET3_MSI_OFFSET (0x84) #define VMXNET3_MSIX_OFFSET (0x9c) @@ -2466,8 +2461,6 @@ static const VMStateDescription vmstate_vmxnet3 =3D { =20 static const Property vmxnet3_properties[] =3D { DEFINE_NIC_PROPERTIES(VMXNET3State, conf), - DEFINE_PROP_BIT("x-disable-pcie", VMXNET3State, compat_flags, - VMXNET3_COMPAT_FLAG_DISABLE_PCIE_BIT, false), }; =20 static void vmxnet3_realize(DeviceState *qdev, Error **errp) @@ -2476,9 +2469,7 @@ static void vmxnet3_realize(DeviceState *qdev, Error = **errp) PCIDevice *pci_dev =3D PCI_DEVICE(qdev); VMXNET3State *s =3D VMXNET3(qdev); =20 - if (!(s->compat_flags & VMXNET3_COMPAT_FLAG_DISABLE_PCIE)) { - pci_dev->cap_present |=3D QEMU_PCI_CAP_EXPRESS; - } + pci_dev->cap_present |=3D QEMU_PCI_CAP_EXPRESS; =20 vc->parent_dc_realize(qdev, errp); } --=20 2.47.1 From nobody Sat Nov 15 22:23:01 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=1745936029; cv=none; d=zohomail.com; s=zohoarc; b=ekWgEUv1FG/HdvPoi4qQxv5w2B01xbwqHjAEPJ/90c60RYtP5gKYRuAAzhjEKSBaF8ck72HxMUyFZdCQkNfGIlqs2lEJbdIhfAQXc0AaRazFu/6uP32EmEh3L9kmcR9mSEc2ida4moDMjAmNyQJU+vO7YL2/LLMOIV2E114WJiI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1745936029; 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=kg1vT0Z/kKcz1VyaWx5HUe6zicIy/oQzxPnBZl9mXrw=; b=T9zimz1KSlgwgU1UlipRHW9rQmCHt/H6y9wM6ICD/lflk0MdRREsqXC1qqXCU01sjaJmA/qcr84H/iFiCYjU5I0vVAI9fVGNQayLOX5czJsUxzI+8/VI+YQrDITKwiulS8k4qAIUElVvSEQ1UafNotmjfT6TV9BtY1fY6ros99I= 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 1745936029195238.4558425433372; Tue, 29 Apr 2025 07:13:49 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u9lfP-0004Er-6g; Tue, 29 Apr 2025 10:10:35 -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 1u9lf5-0003mP-7u for qemu-devel@nongnu.org; Tue, 29 Apr 2025 10:10:21 -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 1u9lf1-0006b1-JW for qemu-devel@nongnu.org; Tue, 29 Apr 2025 10:10:13 -0400 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-43cfa7e7f54so40884395e9.1 for ; Tue, 29 Apr 2025 07:10: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-4409d1e19e1sm188405515e9.0.2025.04.29.07.10.05 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 29 Apr 2025 07:10:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745935807; x=1746540607; 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=kg1vT0Z/kKcz1VyaWx5HUe6zicIy/oQzxPnBZl9mXrw=; b=H+5ob/45GKczEEZW8o5PqgsVP6V58hb6IltywBddL3pA1/R7Z64Z+NVCfZHuM8pKjt YW1qv0tasaEmC3V3Pgt663r17Vt3kPiYlzlKTkBwFc6rlelJ9U5c3DgWosV3UAqQTV9b LMzsT9gL5+TnPiWqvdaxbOUyijVSP6RvGVyKEG4+p0TMMRIZrrMoS5SKE1ki441StXEA O1Llq6XHQHsntWGodM95kXkl0O+S+cJri+xYlMcmtrR5KuXTXrSW04FE81jDNUzyc16q OqNfAcikxSOsJk0TNqtB5IIpDe3bUQUdlHJ9JiN6bWwlxLDvQ3BGJuiLrJy5zBTtwajo 7ftw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745935807; x=1746540607; 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=kg1vT0Z/kKcz1VyaWx5HUe6zicIy/oQzxPnBZl9mXrw=; b=A/++nffezrxCfK0vCVYFSciGXu8l7FvTh0nmK/BdyFAjODwaWrkJRvXbZBwDmLVbXi bkOlj8KcKonU2NhQajjapJ3PEVXPHnSEYR823m7IpE+bSeZITeJK3+TkszIAYzpQAkFt IKZ+jwpF96lIfy0Nhj/6HvX3+pS4aPKsEM4j32Wrs26c7alJbOnOu5+9x2kWIt5Pz+m3 FEFxAM8aEe92WvWhJBCvOQYFttcYxKlzsPgFclMk84E2VdbxwZkAeZaAS7zDNxZzVKip iCL6NfRMlTVT4eZF1FADYsTARm4MT+Fqlpl6S+ajyD9E2jvdnVUVJmR3NDfyjmg+W0Yn kWog== X-Gm-Message-State: AOJu0YwSLvhTcUyox3CGj5ia3bDGng5PTUQeYwk7xvsQSzTbcOWnMPdH Ld/FMsIbNW4eGD9+79lMweDstdb1qEC+IJUvyBbMt1DRFcZcWCHz3iWjOV6rP62RmaRIzBTjzSu i X-Gm-Gg: ASbGnctS+Ut8wm6OJAKgIABPhrIAPIMFycnGiuNw6AR7WvEcASiwSVX3u8f2eNGf2vO xPWr4QiePEdJkAVm5bBCFpYMibLUB4QwaS7I9m4FERrChyoQR5zLZ/+wZd9xL0PxayIImX+Xqg9 2Cuxr4iE8O1LV4y23T4usIBchi1eBpzj66xHAwuCVAPvPvk2uS3G6uBLpkm7AjuqsrIXp5HlRbu pFAb+J4VyNm346bnxPFbvK4J94Q0LAGKUrPC5k+H/6Q4wCLkfYySaKTanwsN+8B7l0NM78BP52c p75cGR3ZjbFq/knyEAqeebnNnAztVBua5NEgl1ssZIUhqsKLeSxV07JcTi7rKI7VR94URTJmLLE olOwnRdo3Sveme4rNQa9X X-Google-Smtp-Source: AGHT+IHk7wVMcAJ7CJy0vuobbFvebze2eS9GHWo0ETRu1ZsJtGW9dbeiW/vYH8PeKZOs2G5zL2MZCw== X-Received: by 2002:a05:600c:35cf:b0:439:4b23:9e8e with SMTP id 5b1f17b1804b1-441acadf4a7mr31220505e9.3.1745935806849; Tue, 29 Apr 2025 07:10:06 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Hanna Reitz , Fam Zheng , Paolo Bonzini , Gerd Hoffmann , qemu-block@nongnu.org, John Snow , "Michael S. Tsirkin" , Zhao Liu , Eduardo Habkost , Jason Wang , Kevin Wolf , Yanan Wang , Marcel Apfelbaum , Dmitry Fleytman , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v2 19/19] hw/net/vmxnet3: Merge DeviceRealize in InstanceInit Date: Tue, 29 Apr 2025 16:08:25 +0200 Message-ID: <20250429140825.25964-20-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250429140825.25964-1-philmd@linaro.org> References: <20250429140825.25964-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=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: 1745936029562019000 Simplify merging vmxnet3_realize() within vmxnet3_instance_init(), removing the need for device_class_set_parent_realize(). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Daniel P. Berrang=C3=A9 --- hw/net/vmxnet3.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/hw/net/vmxnet3.c b/hw/net/vmxnet3.c index d080fe9b38a..7c0ca56b7c0 100644 --- a/hw/net/vmxnet3.c +++ b/hw/net/vmxnet3.c @@ -2238,6 +2238,7 @@ static void vmxnet3_instance_init(Object *obj) device_add_bootindex_property(obj, &s->conf.bootindex, "bootindex", "/ethernet-phy@0", DEVICE(obj)); + PCI_DEVICE(obj)->cap_present |=3D QEMU_PCI_CAP_EXPRESS; } =20 static void vmxnet3_pci_uninit(PCIDevice *pci_dev) @@ -2463,22 +2464,10 @@ static const Property vmxnet3_properties[] =3D { DEFINE_NIC_PROPERTIES(VMXNET3State, conf), }; =20 -static void vmxnet3_realize(DeviceState *qdev, Error **errp) -{ - VMXNET3Class *vc =3D VMXNET3_DEVICE_GET_CLASS(qdev); - PCIDevice *pci_dev =3D PCI_DEVICE(qdev); - VMXNET3State *s =3D VMXNET3(qdev); - - pci_dev->cap_present |=3D QEMU_PCI_CAP_EXPRESS; - - vc->parent_dc_realize(qdev, errp); -} - static void vmxnet3_class_init(ObjectClass *class, const void *data) { DeviceClass *dc =3D DEVICE_CLASS(class); PCIDeviceClass *c =3D PCI_DEVICE_CLASS(class); - VMXNET3Class *vc =3D VMXNET3_DEVICE_CLASS(class); =20 c->realize =3D vmxnet3_pci_realize; c->exit =3D vmxnet3_pci_uninit; @@ -2489,8 +2478,6 @@ static void vmxnet3_class_init(ObjectClass *class, co= nst void *data) c->class_id =3D PCI_CLASS_NETWORK_ETHERNET; c->subsystem_vendor_id =3D PCI_VENDOR_ID_VMWARE; c->subsystem_id =3D PCI_DEVICE_ID_VMWARE_VMXNET3; - device_class_set_parent_realize(dc, vmxnet3_realize, - &vc->parent_dc_realize); dc->desc =3D "VMWare Paravirtualized Ethernet v3"; device_class_set_legacy_reset(dc, vmxnet3_qdev_reset); dc->vmsd =3D &vmstate_vmxnet3; --=20 2.47.1