From patchwork Mon May 12 08:39:30 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 889337 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp1497043wrr; Mon, 12 May 2025 01:40:56 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVW6Ud8YmW8QEoBIEEph+pz+9QE+h0bDoPkir6QjGJDstRXxYqNF6b10Gdgf4Cv8n3z+EX2hA==@linaro.org X-Google-Smtp-Source: AGHT+IGI1NAXTH3R+Y6gPTtXaCvAgxi9cORLTQPfIW9ZJ9GpYSkKaAXkzesarpyFFfkvUjQLIwOl X-Received: by 2002:a05:6214:1bc8:b0:6e8:98a1:3694 with SMTP id 6a1803df08f44-6f6e47956eamr240927996d6.8.1747039256372; Mon, 12 May 2025 01:40:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747039256; cv=none; d=google.com; s=arc-20240605; b=lmbwsVaOC0EVNSsagnNacddWwqDp3j4tR/1/RTxP6K8A9tWpowWH4mNbJn8T515x+X raO6ShXkMhPEaCDzvwA6wf5CEdwZ/vzRdeVvVg1qzc1Uwx9STOFDyMFEIQUZy8m9DpZd Olu/3ge3Tm+EmfpF6F3H/9fFjC7R25zlW9v55RFHUlDTPBrrx+sldi14hsmC8jxQaAeO FwRFF1PmkBFVp/24OKF2l2T6aKFTrHD2sGNepo7IzyhVoRogyp6x9MtnkRa1gXaGFPhC 6ft9ZF8I/dthDs2YSqClU6+cTi0RUA4FNd63zoEZ5iRMgSjXm8XmUTyDDlYx4BnKRVw8 eWrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=uTMQAKQrwsxKp+xMJSEkXrWXfxVvSZortm+STZ1AZKc=; fh=t+WM68hpZdukNUqoyhJ9Y8NKC5MnAAaNVsh7R6pJqwA=; b=Fh3CdUhP/iwfRdS6Pz+ZXOq4XsIzLTxn9iqItgAOLo8ZyozYk9wxI5swkvj6NMlQaQ AWRMuHj6l3CY0yHdBjP/myMJ2hFWVtkF3AWIfVzXeXVLhuczeH9SBRV3cagcDUwrxdAm p92zcB4u9XBIFyDWAnWmIm4+bB+FyHM9kNWwLOWRfZ5Xj1FyPlPIl9kkdqpeSo/O8Hfm Z52VYUpjzBb53b94QzwN0MIkSuqZoQCcNNrLw7HguhKcy7YYlbCEjiRajt+5RBW5T9Yz ezoXrk/km6kqC7k4isTfQu1KwfuFh6QYvTQKWqVmArwZ3HMQIKUgwO6oBj+8MPTiQL8G nWGg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ylqpoYzy; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6f6e3a58e14si82386476d6.459.2025.05.12.01.40.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 May 2025 01:40:56 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ylqpoYzy; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uEOiF-0007Il-9Q; Mon, 12 May 2025 04:40: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 1uEOhw-0007Df-1G for qemu-devel@nongnu.org; Mon, 12 May 2025 04:40:21 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uEOhn-0001fm-Uy for qemu-devel@nongnu.org; Mon, 12 May 2025 04:40:15 -0400 Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-3a1f5d2d91eso2123146f8f.1 for ; Mon, 12 May 2025 01:40:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747039205; x=1747644005; 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=uTMQAKQrwsxKp+xMJSEkXrWXfxVvSZortm+STZ1AZKc=; b=ylqpoYzyba04r6TOuY6tAL2s9SmQDaJyhVE6XAA/WRGhEJUz+/bWJUcG/Sn/zwKrb4 OrOPEg8beCcWxHvCijM8mKP0JkFG2FB6X0mC8bHS/qu46kxwOuTTk7CXIyeqoEVLi5eh bMsEqpqYh01YZmvuQ0mS81XJhcMfNzE3RRpouW8OMhqrbysJ/PPEKuAWCmhuhSGakCAb 7Z/a01sQdLrCjk7wNxGj0vpCmWkbi5K6Y/m1hQ5CrU1ChOVBvlGwnJlBGK+G5uu4pIVc nynTjqw6sS/BHzgb50wREgbRsedczSzfSK9IbGFbdTdPLGNQyvprFiRxODNX/UORAYl0 itcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747039205; x=1747644005; 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=uTMQAKQrwsxKp+xMJSEkXrWXfxVvSZortm+STZ1AZKc=; b=kmzTXfvfbpMk1vEaWgEnUotTHX07/XYKDZPII0hAsbf0M7OemDeargLXHqv/izJvfZ AFm7cL/VOmYRxN5fCHZlSh2GlMHkGF5RsS21FQpd/Lx977Yhmlqc1O4qynx4f1ZHx4Rq b2dK7VfPRaNt4UoqHCatlE+K+BUbgs2oeHa9Oe52BSr+i0GO7EWIhEpKtaXg42cWfPhd NrHSSgBdjUfWr1tOcoQpQWj/AX/nlCyUxuIh/N/RoODDKca25Qx7cCp7Sj1GBQfWQrnz SnxZvVufLWy/6wAlCHBLNkWPiJYHxBRV4YbD6QwMfiUaXrd/UNGuYtcM/d4UmbJVSMHZ 56KA== X-Gm-Message-State: AOJu0YzAdHPbcTgMYkxCtIFfB/5ns9hlJQUVuRF0HAvxa8CYlSFONIK1 xgLkX+1pQfJnNfqvSPAmsPNJlW60lIHRLCHDFO/VIHq5amqsibsGc+u9FioLL3e7sjSTotdQGpG hjrmk4Q== X-Gm-Gg: ASbGncuSBGxZ5VLgM+5GGvf50jJ2Njw1TQ5iWJ2ibxV99bHwUxfxezfEEotVfRnSKh0 KjeKWpEiJNCs95a/JAkXUWJp5eorKtYD8prBCVfy2VkEfhwbVzChoDkv2WuW4RZMx7bO8vhhcA3 H5FHyHcEldqkrLcvndazGr3O200sNrmAgw+5Lc7Mk8ILgwRLHd5LYqrApE3vIy8Q1jKjljVPjm+ bfDWm2mu4h1vUaF6E+VxibhKbC6RUR7Y68fUOFu4DkHydCRp8UscM91v2GXKFc6hqHKfl7yawC2 vcK/4f+UyPPKe+EuMOf/SCP8gJspjJ0qDpUesD6/Z1Wg4ISJaxznNVlZuV43UZkLBoC57tCcTwo UxCeBEHQm89A1FZZCtbcue5k= X-Received: by 2002:a05:6000:430e:b0:39f:efb:c2f6 with SMTP id ffacd0b85a97d-3a1f646600fmr10771552f8f.33.1747039205021; Mon, 12 May 2025 01:40:05 -0700 (PDT) Received: from localhost.localdomain (129.163.185.81.rev.sfr.net. [81.185.163.129]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a1f57ddd2dsm11702422f8f.9.2025.05.12.01.40.00 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 12 May 2025 01:40:04 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Yanan Wang , Kevin Wolf , Richard Henderson , Marcel Apfelbaum , qemu-block@nongnu.org, Fabiano Rosas , Fam Zheng , =?utf-8?q?Phil?= =?utf-8?q?ippe_Mathieu-Daud=C3=A9?= , Jason Wang , Laurent Vivier , Paolo Bonzini , Dmitry Fleytman , Eduardo Habkost , Hanna Reitz , Zhao Liu , John Snow , Gerd Hoffmann , "Michael S. Tsirkin" , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Thomas Huth Subject: [PATCH v4 01/19] hw/i386/pc: Remove deprecated pc-q35-2.4 and pc-i440fx-2.4 machines Date: Mon, 12 May 2025 10:39:30 +0200 Message-ID: <20250512083948.39294-2-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250512083948.39294-1-philmd@linaro.org> References: <20250512083948.39294-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::433; envelope-from=philmd@linaro.org; helo=mail-wr1-x433.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org 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 qtest in test-x86-cpuid-compat.c file. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Daniel P. Berrangé Reviewed-by: Thomas Huth Reviewed-by: Zhao Liu --- hw/i386/pc_piix.c | 13 ------------- hw/i386/pc_q35.c | 13 ------------- tests/qtest/test-x86-cpuid-compat.c | 14 -------------- 3 files changed, 40 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) DEFINE_I440FX_MACHINE(2, 5); -static void pc_i440fx_machine_2_4_options(MachineClass *m) -{ - PCMachineClass *pcmc = PC_MACHINE_CLASS(m); - - pc_i440fx_machine_2_5_options(m); - m->hw_version = "2.4.0"; - pcmc->broken_reserved_end = 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) } DEFINE_Q35_MACHINE(2, 5); - -static void pc_q35_machine_2_4_options(MachineClass *m) -{ - PCMachineClass *pcmc = PC_MACHINE_CLASS(m); - - pc_q35_machine_2_5_options(m); - m->hw_version = "2.4.0"; - pcmc->broken_reserved_end = 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); diff --git a/tests/qtest/test-x86-cpuid-compat.c b/tests/qtest/test-x86-cpuid-compat.c index c9de47bb269..456e2af6657 100644 --- a/tests/qtest/test-x86-cpuid-compat.c +++ b/tests/qtest/test-x86-cpuid-compat.c @@ -365,20 +365,6 @@ int main(int argc, char **argv) "level", 10); } - /* - * xlevel doesn't have any feature that triggers auto-level - * code on old machine-types. Just check that the compat code - * is working correctly: - */ - if (qtest_has_machine("pc-i440fx-2.4")) { - add_cpuid_test("x86/cpuid/xlevel-compat/pc-i440fx-2.4/npt-off", - "SandyBridge", NULL, "pc-i440fx-2.4", - "xlevel", 0x80000008); - add_cpuid_test("x86/cpuid/xlevel-compat/pc-i440fx-2.4/npt-on", - "SandyBridge", "svm=on,npt=on", "pc-i440fx-2.4", - "xlevel", 0x80000008); - } - /* Test feature parsing */ add_feature_test("x86/cpuid/features/plus", "486", "+arat", From patchwork Mon May 12 08:39:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 889338 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp1497264wrr; Mon, 12 May 2025 01:41:50 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWv7AWoMYFvhySvlh3mDSrYm3/LUWQmVBrTnXvic//mJXpqT5dYn5XSeM58X6n948PA1TAYmw==@linaro.org X-Google-Smtp-Source: AGHT+IGTmR9XHrq99TMji2NydIcHrI2ZJowWeJZHJfFP55iYZHJLQllrK74RBL8PH8IjvkFJB6bY X-Received: by 2002:a05:6214:240d:b0:6e6:630c:71e8 with SMTP id 6a1803df08f44-6f6e47a7b97mr241433126d6.7.1747039310201; Mon, 12 May 2025 01:41:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747039310; cv=none; d=google.com; s=arc-20240605; b=GPnEm7uRHtAVjxEWWAnbyh562bS5Bxf8/S/55j6k64o1ckBfO54YAZLJF9UPlWmy6t mo+rZDdQqDFLYZVN+aOsS3vlWUWLyWA+g14MuKq4MimebY1P2MypIoOOGbqU4PECctD3 Y0iNYTiseLOIDNI+p++jInakcHoB9moOCreghpu96rtC/g5QDuXRSCR0G+gi7ooVU9Rl I+oLr/Gcc2KZDbd33sSfGTmMTYj/oYa+HQyJbZhjmEezVjC5aUq6JMbboIScy0mAvRDP rEN90U5giA1KeeswaJdWxUJA5csPKiZm8BxJqi2YBWYExS3/xR6P/Fh4slwXOLsNppVM nCXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=IixRHUe01KuZJgZLnpgydiMWWiime3ZZSmn+E7k3wcw=; fh=t+WM68hpZdukNUqoyhJ9Y8NKC5MnAAaNVsh7R6pJqwA=; b=NXDXhxA1tKyEtlNtkyR7KkDe0LpWhBwGjJ6id/FcG7xRd4vixQnYTrCA9siRWXgnHd Vc9+faqE1iv2IiX8AYumhL+veRbg/uhhX+Onpz8FZoY24WDte5qqqKdE2t4yEaMT/PNt juw7/B8cc4cbFstNCD1nsWOPDWutOjOOs96G819XwjnHB5WoSc750Sxfi7+b6zd1mD6X NujroVNtgpnbujRQbHAf6NPaC/RMLjHW9KcJk5Kux72fhacbPfPRTbLPZ63iEElMVoIg eVJJ4zOsboWk2DNSQovAirARbdxHIPWm41G4hjmDZLq5E8XsneYzzohXnowRrfJ7NIuX W5gQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=dgyKQIBz; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6f6e3a42c99si86183556d6.189.2025.05.12.01.41.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 May 2025 01:41:50 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=dgyKQIBz; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uEOj7-0007wi-Cd; Mon, 12 May 2025 04:41:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uEOhz-0007Eb-AX for qemu-devel@nongnu.org; Mon, 12 May 2025 04:40:29 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uEOhu-0001hZ-Nx for qemu-devel@nongnu.org; Mon, 12 May 2025 04:40:21 -0400 Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-3a0b6aa08e5so3195000f8f.1 for ; Mon, 12 May 2025 01:40:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747039215; x=1747644015; 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=IixRHUe01KuZJgZLnpgydiMWWiime3ZZSmn+E7k3wcw=; b=dgyKQIBzJbIjjW3nLerrqaOjaINT9MvaHMVSuz/XCF65FiY5BbyWUF4Na4doKOWgRc bbeEdRjiGTEnWVQMEfrLU3/3tD7Nl6L44q657xnQAGA20K41moUzJ7h8Usyf45/TJVDa +T5kD7iAACA572N4wPDGAarbBFDa3vL/AFFh6cafrxKin5IrY8v9B6gjQAu8GnVkbrNW DPlCXRddFJkaKO4zC4r7schQGn32qR/p/vG4VUMu0P7FStvJmmj/IO9U8NIuPrwNRoEz enYheIimRIY6sgrgRzgv6eKbgtMNjpruRV7KMHIuhxtpgebN/SBx7iPEIJlzolEdcJJ2 eRYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747039215; x=1747644015; 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=IixRHUe01KuZJgZLnpgydiMWWiime3ZZSmn+E7k3wcw=; b=hOyKISo/Hzdnp6qaUwetvedS/cYxJRT3bhU0OdyZIOpPW0s0+GbWfURQNoYg2I07Q/ 4W/yOMk6GGG7PdqciELpQSxTEyjVEDzCGEyHFznW7uyfkv1jHvcY2kQVXoHWlurkz14K 3vnPld35/9bNUv6Da7Vd88f93mhxCL9hZknLNRuT4WzxuExbxLy/JbYg/VvP7HRotC6u uZVjJN9Fpk09kkdedPpxt43H6W97p0Y81reosuEf6ONfpVQ7AAbtJ7HLXI/X3HA5KZaz UniB9cj91lAKEBhSFSzk2eKdFE3qV8GYkId3nkIjh6Lm1wj74/Yw9hJ10upAsoRFVCjE y2qg== X-Gm-Message-State: AOJu0YxWad8/LCjuj/zwfyWvGI58fdcAXL8TobR5i8EOQTPlkiUA1nKa AHwcrTkZV0x9wlPL1Sf7oXxu0gXL/qsPA3xpwoUtjhmogCYg9N1PVfxrvw3bUDBpM0Ojisqosx8 YYcRggg== X-Gm-Gg: ASbGncs3+UBhvZRX/YauWavXWhxHtbwytCgpgdL1h5khAUr6k13JeM4WkuWuN1a6jxJ Fm5n+QmxQ+eXeFVapt+NLLz9TwPIYD7RrtJl47asaL9goF7GrIL5qR1eWzD9JWoBSyAIqnKKqk7 6lR/Dq51Qlv3nvUm0o3Cr2xwAd+MSNmhsbe9g4MgIphbGOu8qwl0eBiSYfgb050fF2vtAEFu5y0 gHcOe23Nco9TvdwcvH2fpAa71DQphaUFU8PRYMg1fBhQhT4PfoDY2fpsc9Ah95h95YY0wu1KIPP I04w/cQ75eHMAOUlWWUWosSqNutJSvh0yv8mHZoB6OBlj1zFQFed+b1ZbrhY+D15+00HxJpkJLD AKZFImokanNcyJvV0lU/XZTk= X-Received: by 2002:adf:fdcd:0:b0:3a1:f768:588a with SMTP id ffacd0b85a97d-3a1f7685969mr7962231f8f.10.1747039215080; Mon, 12 May 2025 01:40:15 -0700 (PDT) Received: from localhost.localdomain (129.163.185.81.rev.sfr.net. [81.185.163.129]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a1f58f2fc4sm11835252f8f.56.2025.05.12.01.40.11 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 12 May 2025 01:40:14 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Yanan Wang , Kevin Wolf , Richard Henderson , Marcel Apfelbaum , qemu-block@nongnu.org, Fabiano Rosas , Fam Zheng , =?utf-8?q?Phil?= =?utf-8?q?ippe_Mathieu-Daud=C3=A9?= , Jason Wang , Laurent Vivier , Paolo Bonzini , Dmitry Fleytman , Eduardo Habkost , Hanna Reitz , Zhao Liu , John Snow , Gerd Hoffmann , "Michael S. Tsirkin" , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Thomas Huth Subject: [PATCH v4 02/19] hw/i386/pc: Remove PCMachineClass::broken_reserved_end field Date: Mon, 12 May 2025 10:39:31 +0200 Message-ID: <20250512083948.39294-3-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250512083948.39294-1-philmd@linaro.org> References: <20250512083948.39294-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=philmd@linaro.org; helo=mail-wr1-x42f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org 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é Reviewed-by: Daniel P. Berrangé Reviewed-by: Thomas Huth Reviewed-by: Zhao Liu --- 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; 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, if (machine->device_memory) { uint64_t *val = g_malloc(sizeof(*val)); - uint64_t res_mem_end = machine->device_memory->base; - - if (!pcmc->broken_reserved_end) { - res_mem_end += memory_region_size(&machine->device_memory->mr); - } + uint64_t res_mem_end; if (pcms->cxl_devices_state.is_enabled) { res_mem_end = cxl_resv_end; + } else { + res_mem_end = machine->device_memory->base + + memory_region_size(&machine->device_memory->mr); } *val = cpu_to_le64(ROUND_UP(res_mem_end, 1 * GiB)); fw_cfg_add_file(fw_cfg, "etc/reserved-memory-end", val, sizeof(*val)); @@ -1044,9 +1043,7 @@ uint64_t pc_pci_hole64_start(void) hole64_start = pc_get_cxl_range_end(pcms); } else if (pcmc->has_reserved_memory && (ms->ram_size < ms->maxram_size)) { pc_get_device_memory_range(pcms, &hole64_start, &size); - if (!pcmc->broken_reserved_end) { - hole64_start += size; - } + hole64_start += size; } else { hole64_start = pc_above_4g_end(pcms); } From patchwork Mon May 12 08:39:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 889339 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp1497323wrr; Mon, 12 May 2025 01:42:02 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUEOfxPc8eSk726suz0j5YQjmQHu+m4W8VYRRIPzyxri9jpzFN2Nud6sYHJUgvobhBuz3XaVg==@linaro.org X-Google-Smtp-Source: AGHT+IE2vuvnGlNrzFi2UI1Zuyyc5+ShA9hUZuOc6HNgY2HSkI5BTXbEZF3SEoPRUmOLpsATEGM2 X-Received: by 2002:a05:622a:4243:b0:494:7d45:ab14 with SMTP id d75a77b69052e-4947d45ac5emr14916671cf.38.1747039322577; Mon, 12 May 2025 01:42:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747039322; cv=none; d=google.com; s=arc-20240605; b=WnJ5PpvLkZKx5ReacbxviIjs1mGAZ0c87/GEyMWOFP0T/djT56HetRTILGkrcMqdqF oX9ai4BM4KDiWD/J0No6EhvhRk5zt5upm2Zb+hy1aNQTgq19KUsv5r+mviVT3WwIGizc QKQdQFTjjtndQjcUsa6kCbhmcr0JXeHB0ynNGRTaXU3xeYNe6iOK+iGZ4V8wDuiJqo+0 FGRvSc7WcprVXGxYu3fkrxk6fZRoLm6bQmEbO8ZnMDeXUbofjLronZKeZviKKd0/2qud 36DlFhxwYJ9fRNFU1CIw6+iLZMMKKZiV7RtGnPkyLkLRlcECwNck9aFo1ovX+H2jPF/v +fog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=W2UGc10la9ot912AJoqwkd5n8Ckw6i6P0LfGrrfI+a8=; fh=Ncl/2H2FpHFyQPDEI+akN/dcSz5rzMHPSrZYqm/0AUw=; b=CJn1K5jkpOqsPCquhUbHDcoPjPW6k7OuTf8CmtrcvW0Asr9Bp4w4NAREuHmp3VRZK2 nf/2pn1JyDph0yol/3+MVWrWPMzasMVTkk9qfZ2j0+r9pkYOtc8Cd4hpUXDn/x1Yh8lv hCRHOwu2BRIK0/TxKEr+S0J/63wz/WAjLQoD/v0EWW0gEfnr7sQ4+MpjfTgkKkemOu2N PGmEP7cilKXQ1rIsGGalCFLqDIvJlZ35iIZUVDNlCQx8j1rT8CsMPyePPMM9hHBVMkSF Y2aGPUDCqZUNvTYFbYcjts0MEV6nBwScbJ4EqBbCpg1+uVQkF06gjFonCL63OuZUt+sT /DrQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="rjRv+/nr"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-4945259b1d9si83850261cf.551.2025.05.12.01.42.02 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 May 2025 01:42:02 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="rjRv+/nr"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uEOjT-0008El-4l; Mon, 12 May 2025 04:41:57 -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 1uEOiA-0007JE-Dw for qemu-devel@nongnu.org; Mon, 12 May 2025 04:40:36 -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 1uEOi6-0001if-Ki for qemu-devel@nongnu.org; Mon, 12 May 2025 04:40:33 -0400 Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-3a0b9625735so2089791f8f.2 for ; Mon, 12 May 2025 01:40:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747039223; x=1747644023; 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=W2UGc10la9ot912AJoqwkd5n8Ckw6i6P0LfGrrfI+a8=; b=rjRv+/nr/LWntTlVN9G9XWIu6mhGB2cMua8BA6TOFWkPgmEQqu0FIqAq1IkJOX/ThS BLDlRKWXbHiqVrdUefuD/ekGth6oCNtiSmEunpAn9Fshi930CV8e4bGju+29tlP+iz91 KbqeEQf1gDktVZifzfcli1CCKDLLw0OL8QZ2Y/yxLfamWuZRsFAP26I+ONjE6VqkuBgz hIhGgkLby1aD1+J+MryG//6MEPOdqjk6Pvr0l739tAY/VwCXTWhoxTWIRrXT586Cr2K5 kHSYGg4GFSgdCrA/hgI0KFwDYWyEDfJjR0w7EBE43CJxlgYx93Nc/8KQBUAjBQibPnW4 LqXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747039223; x=1747644023; 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=W2UGc10la9ot912AJoqwkd5n8Ckw6i6P0LfGrrfI+a8=; b=DzTL03Eu9e8CVxwaHtS35kREhn/MC1xb7y+IcwGokHELxHP7sbJgh2AjdC7Lzkljn4 6Qcdzmq9jXiqmpAQkedSseQmMfe+AAVk+w6OaoKjQFwHDJ1S+kEmN10CsaEko0MwDQkm bEtpTfvfFHIovC7zaF/zhaSWl8mMNJkYtNyhpNi6TKV6SNo9uqwGeUfIXPiWvcXNmaQk +b14R2U968iF2DT94JcZ41qnuvnuRuD84SJqQydzg10ErX5wjAUhIZ4OfiOmxbcgBuOr idnPYuKqelp4wxuOi9DMT1kQtX77VFdtAgEFdEVR3jlN1BTZNMiNgmjlUoIEWMRjvMZ+ Ivng== X-Gm-Message-State: AOJu0YxJ8JJpvOcyw2ykesKVKxPEntuzM8jhuvT4/j0kwMDytOePBnpS aGxxZgFRYLAzclva+XZNcKsGTwEMB8mXH3CJPaAQE0/IQAjiN6RXjyiACGCtS6QuKf+OWX4a+z4 bSG/z8w== X-Gm-Gg: ASbGnctXqs2bcXYtIEUrPhfZKh4MfLK14IC9vxZlCt6Est2WmDP37SE9MEN8HgtvnQu EhTyVPr4eoAWQwBJ2e3EmmL0gADC+vWohL7Fdcr553iyDU3NyhxuM+mokEHrBluQD+1Mqrpouyq 73jUpgoqyvu9yUzBbNJLnEnQwutB6Qb5mXhxJ1eltj+xY34CXVtgZaP1amw4gn5e6wLRW23yfBM V2fCsd6k7PVKgzrNTZmfQZP4O95FcAgPTL4uj9lYLvZ/6CiIKn4GV3Zyxamq7bsMgjUGqCt5s4c BmspOA9iv3Df8+ZnRYEW7qyIx+URidHHqGPWiFz0wpcJEgupHuGMEzf7Fd9PQGx9VhuKdqf4687 KjcffCgqOwQZ+Zav5HzV0AKE= X-Received: by 2002:a5d:584b:0:b0:3a0:9dc2:5e0e with SMTP id ffacd0b85a97d-3a1f6422323mr8805512f8f.11.1747039223100; Mon, 12 May 2025 01:40:23 -0700 (PDT) Received: from localhost.localdomain (129.163.185.81.rev.sfr.net. [81.185.163.129]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a1f58ebe00sm11878677f8f.38.2025.05.12.01.40.19 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 12 May 2025 01:40:22 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Yanan Wang , Kevin Wolf , Richard Henderson , Marcel Apfelbaum , qemu-block@nongnu.org, Fabiano Rosas , Fam Zheng , =?utf-8?q?Phil?= =?utf-8?q?ippe_Mathieu-Daud=C3=A9?= , Jason Wang , Laurent Vivier , Paolo Bonzini , Dmitry Fleytman , Eduardo Habkost , Hanna Reitz , Zhao Liu , John Snow , Gerd Hoffmann , "Michael S. Tsirkin" , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= Subject: [PATCH v4 03/19] hw/i386/pc: Remove pc_compat_2_4[] array Date: Mon, 12 May 2025 10:39:32 +0200 Message-ID: <20250512083948.39294-4-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250512083948.39294-1-philmd@linaro.org> References: <20250512083948.39294-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=philmd@linaro.org; helo=mail-wr1-x42d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org 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é Reviewed-by: Daniel P. Berrangé Reviewed-by: Zhao Liu --- 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; -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 = G_N_ELEMENTS(pc_compat_2_6); GlobalProperty pc_compat_2_5[] = {}; const size_t pc_compat_2_5_len = G_N_ELEMENTS(pc_compat_2_5); -GlobalProperty pc_compat_2_4[] = { - 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 = 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 From patchwork Mon May 12 08:39:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 889340 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp1497340wrr; Mon, 12 May 2025 01:42:05 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWJ2oY9b9rNQ3dJGdhSTW+PNKfwBUDGZMfvZb1Ks2qLRMpl6UVQA2xZBicjNaJN8ZEa1oWrgg==@linaro.org X-Google-Smtp-Source: AGHT+IFPx9HtbnuBn/jrqdY+Ve/Cpyjcyu4A+kY4AhozGt5W6RaIwddM5NrzRtgmdrRvie4B/kbw X-Received: by 2002:a05:622a:1996:b0:477:64b0:6a21 with SMTP id d75a77b69052e-4945275c323mr213709841cf.23.1747039325538; Mon, 12 May 2025 01:42:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747039325; cv=none; d=google.com; s=arc-20240605; b=HSzHlhze2w72gjEtnI+L4orcOyJkvnHGxHZJB2V9vbeXh9Vo4WoS1snTtIlA2RPm0r XWhUnH/Mvfm5/X3+o6/sSVlQvc+JgOjZnDNllyUejLFzuW5oDZCguUXuv5bIyEBSOfKa 6BDd3m3u9E2QKw+oGUy/7wljfE5jeyDwm/2PTYe+siCCi1yDoJ6+EqI/noTp3GYpgg87 XxFa7jqAkmPTygMKNre/2umxWFwh9kM63EtKnn3tsp5T8xgPWrJ2UdeQ55RQ8Oy9RbN3 /1vXya0SnNLhvtrwRwkX3TgiFm8QnT6wmq+xti5KMWifw+Vk8XApguIQsPjSpBzHf0Tb 25SQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=SGMxhkM+K1151m0Q6w06J+pb43qtIIW1myqQabt4VNk=; fh=Ncl/2H2FpHFyQPDEI+akN/dcSz5rzMHPSrZYqm/0AUw=; b=Vgx74EplxKXkaysYgJlde+Ujw2s5TXCCZw9gpYRVF8u78VSlHRMeagNZgDmaMd0jlz AoKBYDO6mAE1vfQeWJoSOvWd1FTwFYFWIV/kdVcsE9e9SjNf87IYXq3MMtUiFSR1JPCg ZhnBgxm227yO+2LUYCWE3cCYzSk2hgu1jFwwjy0vfffbQof3y+rEwnoannBCDx0tKDUU GR5dEDpEAcJrLT9SV8AnmsTO6YzWhO8nxD5PYHgqgQcMaCXzl5roYhWyKCsN6wIGjvm2 rdWRSgfgS9wfNeEVNNWMr1dIi8XEVImGdByIIQQZ6+M7AMGOOJU3g2z/tOC3neP9hXnX opHw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=DPhw2Qhr; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-49452479da0si83385581cf.195.2025.05.12.01.42.05 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 May 2025 01:42:05 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=DPhw2Qhr; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uEOjX-000091-BT; Mon, 12 May 2025 04:41: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 1uEOiE-0007K0-9e for qemu-devel@nongnu.org; Mon, 12 May 2025 04:40:42 -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 1uEOiA-0001j7-Jp for qemu-devel@nongnu.org; Mon, 12 May 2025 04:40:36 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-43cfa7e7f54so26150355e9.1 for ; Mon, 12 May 2025 01:40:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747039232; x=1747644032; 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=SGMxhkM+K1151m0Q6w06J+pb43qtIIW1myqQabt4VNk=; b=DPhw2QhroO9B7NPTfzDv5ekVm63wxzrG9tcgTvXs9U0BLfe3bwSJkWhAMi+gEu1Vm3 VsNRcvxIiUrja8ZPfiBqf9KLOo5TRwNYAUmeALgGrU8NbFTs06kGqz/6Hba1tAm1VHyg ObWL6PtNz1X3xx3V/FLFr5/uNPqrLWZQk1mHaA+s8trNnkeQmDi38y7xHlbMY3xuhSDh jQxfLmDC9DpeonX8khea1Cm2NIvz+Qe2Hvuf2wjZ41dkwb/KE7/eeJNBORcmsi34N0Rp C6PJEf1DZ2m5K4e+Qd5z9aMCfBL+tzqgd+8tDsVsk2/almqNe+XfqmS8j7MyeYvye83R fWgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747039232; x=1747644032; 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=SGMxhkM+K1151m0Q6w06J+pb43qtIIW1myqQabt4VNk=; b=Zil1wjEKsELpM30/pQeAEUosTsYlXJeg/FYHGiGAVhraJBgcizFy0hT5gy8PsYkYi/ 5fI/axyANfZY+Z/TPH/1PsrC3sMLfWif/M1Ofyk8PFJKDkHXV3UyVdQFmGpYg4EJGBKj 9McZkZem2FFbwS+yV32QFy9JtCS3Kl5NoaWy15otg0Ew07F5LNrbF65MlGpMm/aecBSg VYblueDN4PmR02ulPHT07m1XmKECZDKPMyxeySfyPc+0QWcvAUjnt48oGVsKrMKOOCUp bD33XD4L8O0wdVHzinS7p0rDNr+pxfPkgWiNANo7F4Jqg8kRzOHWFk62U3Q6g8vjetP3 4pew== X-Gm-Message-State: AOJu0Yyy3/C6Frs+WX7jl9e6S4F63mffkZJ1G+69HtN2IBgs9C79QTql YWI3XCtADoZLvQcdLZByun88WMYc2HZ+4Zu3kC/2tQx/hTtv/Rsh43c+o5Moq0gjfHNGo/GDkws Ybs9jLg== X-Gm-Gg: ASbGncvg7Gi4Lf4Xi7q7sFwW8+XVyW3VkiX7UwP48sSamxLAhRE3cXaisD4MvuQSfxA R8g7PFG5f3LI0F7Cs40hnyo0lSBrT/5IHxR2gNEEdX7PkbFWb4sGsLJED7aAKFnn1+c+L8/2Bjr pVW2YGGyJjgyKXTcBa6lkEdR8PobqsHSsW+VRtON42xvzSga0m3YvsgiecMR/yV/DMFqxUj/3GW 9PC+Hn1qHMdzGWWGTqSVLuekVDOR7ZmKg9V+K7V5ZRzlMnx24mePecI+bVbW+eYPFuxegf8D7HP P99l8PucTyU39KPNfXoDXGf404TGIEj4tVycdcnoaBhxhgW838FrAqrdFZ5kOqtaWt+C1TgG5Uu upghHUppNEEYvnq0E0RVz3YY= X-Received: by 2002:a05:600c:4745:b0:442:cd12:c68a with SMTP id 5b1f17b1804b1-442daebf181mr85667105e9.1.1747039232284; Mon, 12 May 2025 01:40:32 -0700 (PDT) Received: from localhost.localdomain (129.163.185.81.rev.sfr.net. [81.185.163.129]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442cd3b7dd5sm158810895e9.35.2025.05.12.01.40.28 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 12 May 2025 01:40:31 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Yanan Wang , Kevin Wolf , Richard Henderson , Marcel Apfelbaum , qemu-block@nongnu.org, Fabiano Rosas , Fam Zheng , =?utf-8?q?Phil?= =?utf-8?q?ippe_Mathieu-Daud=C3=A9?= , Jason Wang , Laurent Vivier , Paolo Bonzini , Dmitry Fleytman , Eduardo Habkost , Hanna Reitz , Zhao Liu , John Snow , Gerd Hoffmann , "Michael S. Tsirkin" , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= Subject: [PATCH v4 04/19] target/i386/cpu: Remove X86CPU::check_cpuid field Date: Mon, 12 May 2025 10:39:33 +0200 Message-ID: <20250512083948.39294-5-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250512083948.39294-1-philmd@linaro.org> References: <20250512083948.39294-1-philmd@linaro.org> MIME-Version: 1.0 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org The X86CPU::check_cpuid boolean was only set in the pc_compat_2_4[] array, via the 'check=off' property. We removed all machines using that array, lets remove that CPU property and simplify x86_cpu_realizefn(). Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Daniel P. Berrangé Reviewed-by: Zhao Liu --- 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 4f8ed8868e9..0db70a70439 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -2164,7 +2164,6 @@ struct ArchCPU { uint8_t hyperv_ver_id_sb; uint32_t hyperv_ver_id_sn; - 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 1ca6307c72e..cd4361b4227 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -8174,7 +8174,7 @@ static void x86_cpu_realizefn(DeviceState *dev, Error **errp) } } - if (x86_cpu_filter_features(cpu, cpu->check_cpuid || cpu->enforce_cpuid)) { + if (x86_cpu_filter_features(cpu, cpu->enforce_cpuid)) { if (cpu->enforce_cpuid) { error_setg(&local_err, accel_uses_host_cpuid() ? @@ -8813,7 +8813,6 @@ static const Property x86_cpu_properties[] = { 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), - 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), From patchwork Mon May 12 08:39:34 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 889341 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp1497346wrr; Mon, 12 May 2025 01:42:07 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXbMbKvDVOrPZ/z5ibefawriSqc+39srEbmQI33SBSDwX01l2vnLyNeYpKgtJ30s7pqr4elWw==@linaro.org X-Google-Smtp-Source: AGHT+IHUDcOERg8tXe4DZ6o78DqayE4TKG+3isEtNpVBoiIGS+NUZ4AX53dvODX0JvBLmjE0RefL X-Received: by 2002:a05:622a:5517:b0:494:7bfd:fca8 with SMTP id d75a77b69052e-4947bfdfcfemr26743621cf.46.1747039327329; Mon, 12 May 2025 01:42:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747039327; cv=none; d=google.com; s=arc-20240605; b=lhILmGvGdBDeJZZDd+P5bTXxDtm+9edT3CDGgdJrKqeMQqfq0MBS1fW7m1KKbiiw+J 0Q/ul+pC3LdNHlG9RxFgt8rwrSSUcC/MOufcUkuwP5op0+AYuPQSeLwINJqf+wmPCHUu RUaWEKQwTIUt+xIoa/+S9yWtpfIuqvxeWu2g6qVv3bunDw2RAC4s2+UuDn/0nlKGKmLu bD8Eiye5jGlUR5wRJNPTKcocrWGq/lEEAGwrmCQaQZeioRjM6WTQ0cQbBBtywbH/eabU 0LcH+S4n+N8NXbtZmW9UHLm1ueCIQ4EaEI+s9X9P6jjCcX0dVBhBafnCvTG/YBEb54L7 ppUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=dgVjgshxMDRG01s8Sek8b5MTSBVel00zSJP/aBMNpxE=; fh=Ncl/2H2FpHFyQPDEI+akN/dcSz5rzMHPSrZYqm/0AUw=; b=VThplh09YAf8zmO8Lz+9mCIeL5frEG36H1wgBuOMVPynkwu1nuw088fPiIeIMCXFA7 iBpG3b3IgmNnhLkbKu5a8WxGBmVtRqaEW9qp50wAIzj93KQgsRzzzQboUS8zHJom0xlt e8E5gjLGmJQqyGhQDS93wY2553q7N4+edEFZezDJhQCBknnREqPHRp+5fad7IV3MjEvD ahtAwj8YjjoYNe50cLUzUDvim6dyQTmcpXQhhoGsWusbIrUPjWCEdwZNj5CWrN2HAi9e mTLRDbhADfkCbZ96EgRYuxeJlxNRLaj8XbiIwStpav1X9OEcKAEJdFrbD0eCPM07i42P MaRg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=KzPhWzu5; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-494525b0b6asi83709361cf.614.2025.05.12.01.42.07 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 May 2025 01:42:07 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=KzPhWzu5; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uEOjW-0008Sq-BP; Mon, 12 May 2025 04:41:58 -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 1uEOiP-0007QN-L6 for qemu-devel@nongnu.org; Mon, 12 May 2025 04:40:52 -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 1uEOiK-0001jf-3A for qemu-devel@nongnu.org; Mon, 12 May 2025 04:40:46 -0400 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-442d146a1aaso38305325e9.1 for ; Mon, 12 May 2025 01:40:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747039240; x=1747644040; 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=dgVjgshxMDRG01s8Sek8b5MTSBVel00zSJP/aBMNpxE=; b=KzPhWzu53tqJBMggcxvdvwBTarACrw0DanT/WZSyZFaeKoKXgmtwWYbIcNSedFmBBV p4gVmBFCQ+krS0zi2wcUL+RdkEZ1Lurq3Rzq3/lErQ8x3bZCoHhpWfX52S6xNUAKayrQ 3NvtvbO/9CYNOM7ySgk0A6rLFOd0IXx43JOu03Jk7qdCgNLr1aEaHc03HblP1CcpHyzb MrEuYj2QXALqh0FHAcR5/G7LAm50lZ6sjz8o4fJO8yQluxkzaRLSJRu1KxF4kIJTWwnE bCAAoS0RtL+ObMk/+llGvHWA1XzucnTpkUABRkm8liaVbxDcDo/sGjK/SESHiu8NsKbK ORiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747039240; x=1747644040; 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=dgVjgshxMDRG01s8Sek8b5MTSBVel00zSJP/aBMNpxE=; b=mkKUhDUllwgFqSZkAV3/5GkxM54BFKjKQSJeicvIgLpdWZddQkIjQldn4xonHOgOuz agszDgSIBJif1VeV++LBZVAtp+RH12D8yp7fsgTrO0tKU3sqZRfL5fusmyOo2ZJ3MBGK 9iBoeaOE08Pf9/bAwUv4t5L1YpTah4IaAouE0J3Agyn8gYN1iY8a5QB4/Zygwb4nCZPx 1JJt8wigKOQqek1zEptWw6UvsNQ5aJOfTX6qKoOs+8o7OEPp+8IbUv+P4pIQ3GoYrCgo Ur7BDf/3AIv3AR0vhQwzEiA1tpieZVgD00tUqlp387L7rcNzJJi60zHSVNP3XRGMVu8w y3Pg== X-Gm-Message-State: AOJu0YzlvrgxSVLSPz7jE7+wEBURarWzej142j10/G8RSZtYsxGsBVkS MKEc6JAoI26S908KhHd39Arsixylt9aAyBpzsh8ySddIymw7rgsYUn9A9iBSaYFo9Bz/T5qkxm5 L8BA1vA== X-Gm-Gg: ASbGncs+2OnwIjB56iLLrLft+95dPFDWKk7+8Nw2HOOeijf7T5zFsf0d+G1Hhu/qGFX 8e9/C18IPmTS63ElLLxujzeAmsRwB4br45O2s2qMy5aapsORDZHy9q0ZUSEm177reMJkSkj1lU7 gKXcBm3m+qN41tRuYgtzIxYJZFMWQLjARBid5islo7X1fghbOzBHdaEtqSlTMWrnrNt4qpNO0mq ZFdUsgqdLBmpDeqf5vgDHNQXzzxEAlaCmXXDGEGqiw3WqHblxopfH6t5apBLD3b6d2Wjgtk03EI 7PhwWSKZXGpjtY2PUVlyGCGAHX8L2uYCqiJlXxSTvTVLMOMhjHzZx+O8nHn4UTsV9mrQi7QQC5m u/tGhdcSPaKMxq+yUfHEOHQ0= X-Received: by 2002:a05:600c:820e:b0:441:b3eb:574e with SMTP id 5b1f17b1804b1-442d8ffb0c3mr90500265e9.5.1747039240419; Mon, 12 May 2025 01:40:40 -0700 (PDT) Received: from localhost.localdomain (129.163.185.81.rev.sfr.net. [81.185.163.129]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442dc6f1a51sm84734705e9.22.2025.05.12.01.40.37 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 12 May 2025 01:40:39 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Yanan Wang , Kevin Wolf , Richard Henderson , Marcel Apfelbaum , qemu-block@nongnu.org, Fabiano Rosas , Fam Zheng , =?utf-8?q?Phil?= =?utf-8?q?ippe_Mathieu-Daud=C3=A9?= , Jason Wang , Laurent Vivier , Paolo Bonzini , Dmitry Fleytman , Eduardo Habkost , Hanna Reitz , Zhao Liu , John Snow , Gerd Hoffmann , "Michael S. Tsirkin" , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= Subject: [PATCH v4 05/19] hw/core/machine: Remove hw_compat_2_4[] array Date: Mon, 12 May 2025 10:39:34 +0200 Message-ID: <20250512083948.39294-6-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250512083948.39294-1-philmd@linaro.org> References: <20250512083948.39294-1-philmd@linaro.org> MIME-Version: 1.0 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org 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é Reviewed-by: Daniel P. Berrangé Reviewed-by: Zhao Liu --- 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 a7b1fcffae3..03e7cbeae82 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -866,7 +866,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; -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[] = { }; const size_t hw_compat_2_5_len = G_N_ELEMENTS(hw_compat_2_5); -GlobalProperty hw_compat_2_4[] = { - { "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 = G_N_ELEMENTS(hw_compat_2_4); - MachineState *current_machine; static char *machine_get_kernel(Object *obj, Error **errp) From patchwork Mon May 12 08:39:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 889346 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp1497965wrr; Mon, 12 May 2025 01:44:26 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXHDtTG5jU4jXx0wriLXPH4xXMGQOh9OjtU5BI+xK/uyQoLys/zcP4abptIAaHhuT3kVSJRMQ==@linaro.org X-Google-Smtp-Source: AGHT+IF2LrAQljJR+5IHuz9N4Tslel3fgZYrEJlbiiBS4oZyAevcVy7MyYoZDNOrRDwQXowtxWGp X-Received: by 2002:ad4:5cc1:0:b0:6f5:fb5:35f0 with SMTP id 6a1803df08f44-6f6e482d000mr170630526d6.30.1747039466401; Mon, 12 May 2025 01:44:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747039466; cv=none; d=google.com; s=arc-20240605; b=J/dJ/wbnPqPx1MoYuf5AL5GqcKMedpSYAvE3EITfamqFSHP0rMTLzWoMBU8HvNCIav xv7cdA9JvLl03gEWnHPHyUrhUkNQCwlpRjwtfHzSbnjqcu2yeOqhyHFUDFKaJ+R3StOR /kmykkOy1JSC2kwnWweQR8rvAZd/YD/r4lPzwGZGv52HsNN8r+B4GFiRtlrja04Jgl94 Iw+X+Mw/lSDikdEQqk8fXKjqt61ltHBVrnc/o7SZsaJFZhPsfrspXSNwmhFOR/sqtEZI ZrhBz1qQwHEjqzPW9Hme8V5K76TmahtSIlPpg+63f1sBNKYVV+Vo3MAQ1ntWIdDfaD04 0eHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Iz/xSSjZEmm554UoAp4855/8BqJuWGFPG+bFUFjEtXE=; fh=Ncl/2H2FpHFyQPDEI+akN/dcSz5rzMHPSrZYqm/0AUw=; b=UR7ECl2WFmbWt9tDQvmB8IAf+TgXJFS0Z6nIsdWDnuXWaum2n2h7ZD6WUlMBV2q3fb M5WX4CrS4CL+tHd1+WNj86NaoPUqUfzGXvhSLozfXZzaxlpVOCm2nafCFMawJtirPE7p vdUb41AJqOf+GSaFHxnvT+v7v+MD9BrRyN+MTOaV8qJH1pLSwXOceKR9FVaZQKXU6PDS 7uJVLWcGo6gt3Nkn8LjDuT4r+HfW+Rsr8gXoKWD1MVaTCcRORSo4XYP5yVLy1tGYhEyU URMYawTfFKFzn/KOWKDaeRd84SN/bj1wcT2im1Byyetq7dSEGNSYylWxcryjwp29dA+b qw9g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=YbyUOftD; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6f6e3a4bab5si88707566d6.303.2025.05.12.01.44.26 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 May 2025 01:44:26 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=YbyUOftD; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uEOjd-0000XT-Kg; Mon, 12 May 2025 04:42:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uEOiT-0007Rv-GB for qemu-devel@nongnu.org; Mon, 12 May 2025 04:40:57 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uEOiQ-0001kO-6R for qemu-devel@nongnu.org; Mon, 12 May 2025 04:40:52 -0400 Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-3a1f5d2d91eso2123675f8f.1 for ; Mon, 12 May 2025 01:40:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747039248; x=1747644048; 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=Iz/xSSjZEmm554UoAp4855/8BqJuWGFPG+bFUFjEtXE=; b=YbyUOftDX6I7bSRDy+Fmwcp61G+l+v14L1B+sktOVl1LQ0XntjjznrNOUfyMulrfc+ +CI/rp+W5+Zccuqc13DFRVGrcVC7wFPkxMMhhqdqtFY8Nkh9wuaYYP+JXVcp05ahHAjy kuKxVcHvsLZn3hgnjD3nBhAQq54JM93qoeYmnGH1kdkV3qqyHTZZAA353oDSOCst5hYS n8VEo8sKfyCFBTumI+Mi8OyF/qGXCHiBty2Dw1QfftoVlsk+Eg8QSpYmw9TewDNeBvgm RRT6FtkUD7CcW6l8QLBEmzeD8eighzfejgPiPGn2HePAC+fRsB+qqzii71TQ7YUIRXax jm0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747039248; x=1747644048; 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=Iz/xSSjZEmm554UoAp4855/8BqJuWGFPG+bFUFjEtXE=; b=OUniMi55SE9pHTpsiKooenqoYQH0ZU9eoyu8ykdK74rS2Eez6KeH+evlQ9SovAnal7 pKLpCCU4lDcLyZE9zAuZpx1WmtxvSQXO2hDXsOfjnKVnBSozapgds6hUvf1ZEp/nRRL6 SYoqTJDR6LcRWmtRaLCT9EWIMElY+QNK+M9yfVtQgmSpOpKuCT+wnQJ4RhbzG2mN5804 nmFDw0Rr8w0rf/mHQJkgdrv+SPJXd0BMB0lNHB+5ueE6ykndusYYwQYB3XvW9OY9U9Au k8v91xE+ZpOeY4+5PXqcgYd6aWwb7zLTK+7VWwBylIwilNC15949Ldr4hbCm1jqkGKJc sumw== X-Gm-Message-State: AOJu0Yzk/7DOrYIrz2Hl+H7rI03ZlWNnhCN48eRXFVNcDfGKGNcpN9om SNm1bdDggBw9ySGkviYVKKfm2bdahD/eOtkg6P2JYGMBIQCpj7ZDab6o8rb5gYADYccs7SNiIMQ Ajg2bzA== X-Gm-Gg: ASbGnctCVMAhKPdLFrm3whfDLvkjiV/aLHO+GgOIapCWkuu96e/pJLgUml9IrjCupwT w+txCjJHjBqYaHwR2p+p7+Pfyl4MdGQgJrhZg4U3AjmJn0yOxzBNU/k3ghpxpN7/IQcajMHncqM Ey/9rplGPO0/MbBbFy/q1XOWNzWG8INP6RVx+eRLX9pFefNLCmvJuvF21b46i/I45IyEmC9Z3hd P4XahuMBg6WSuDEb6RrE8VEP02tjpgia6kDfIScoyE5i0z4g1Yb20Cd1MUd84At0CC0ZJ7CtMwG 34VSAYFHZdfs7dIsU9ModAxRFtumTKnqvxlLdNJ5RmcGedwThnz8S0Sq7pLWhMtAF5WiHaqH4jX tTfOHc7ovO3OXSeHoLDrJReI= X-Received: by 2002:a05:6000:18a9:b0:3a0:88d5:6126 with SMTP id ffacd0b85a97d-3a1f64a5c07mr9634594f8f.39.1747039248032; Mon, 12 May 2025 01:40:48 -0700 (PDT) Received: from localhost.localdomain (129.163.185.81.rev.sfr.net. [81.185.163.129]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a1f5a2cf2bsm11539471f8f.80.2025.05.12.01.40.45 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 12 May 2025 01:40:47 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Yanan Wang , Kevin Wolf , Richard Henderson , Marcel Apfelbaum , qemu-block@nongnu.org, Fabiano Rosas , Fam Zheng , =?utf-8?q?Phil?= =?utf-8?q?ippe_Mathieu-Daud=C3=A9?= , Jason Wang , Laurent Vivier , Paolo Bonzini , Dmitry Fleytman , Eduardo Habkost , Hanna Reitz , Zhao Liu , John Snow , Gerd Hoffmann , "Michael S. Tsirkin" , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= Subject: [PATCH v4 06/19] hw/net/e1000: Remove unused E1000_FLAG_MAC flag Date: Mon, 12 May 2025 10:39:35 +0200 Message-ID: <20250512083948.39294-7-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250512083948.39294-1-philmd@linaro.org> References: <20250512083948.39294-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=philmd@linaro.org; helo=mail-wr1-x42f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, UPPERCASE_50_75=0.008 autolearn=no 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org E1000_FLAG_MAC was only used by the hw_compat_2_4[] array, via the 'extra_mac_registers=off' 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é Reviewed-by: Daniel P. Berrangé Reviewed-by: Zhao Liu --- hw/net/e1000.c | 93 ++++++++++++++++++++++---------------------------- 1 file changed, 40 insertions(+), 53 deletions(-) diff --git a/hw/net/e1000.c b/hw/net/e1000.c index cba4999e6d0..a80a7b0cdb4 100644 --- a/hw/net/e1000.c +++ b/hw/net/e1000.c @@ -127,10 +127,8 @@ struct E1000State_st { QEMUTimer *flush_queue_timer; /* 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) @@ -1212,52 +1210,51 @@ enum { NWRITEOPS = ARRAY_SIZE(macreg_writeops) }; enum { MAC_ACCESS_PARTIAL = 1, MAC_ACCESS_FLAG_NEEDED = 2 }; -#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 */ + * p - partially implemented */ static const uint8_t mac_reg_access[0x8000] = { - [IPAV] = markflag(MAC), [WUC] = markflag(MAC), - [IP6AT] = markflag(MAC), [IP4AT] = markflag(MAC), - [FFVT] = markflag(MAC), [WUPM] = markflag(MAC), - [ECOL] = markflag(MAC), [MCC] = markflag(MAC), - [DC] = markflag(MAC), [TNCRS] = markflag(MAC), - [RLEC] = markflag(MAC), [XONRXC] = markflag(MAC), - [XOFFTXC] = markflag(MAC), [RFC] = markflag(MAC), - [TSCTFC] = markflag(MAC), [MGTPRC] = markflag(MAC), - [WUS] = markflag(MAC), [AIT] = markflag(MAC), - [FFLT] = markflag(MAC), [FFMT] = markflag(MAC), - [SCC] = markflag(MAC), [FCRUC] = markflag(MAC), - [LATECOL] = markflag(MAC), [COLC] = markflag(MAC), - [SEQEC] = markflag(MAC), [CEXTERR] = markflag(MAC), - [XONTXC] = markflag(MAC), [XOFFRXC] = markflag(MAC), - [RJC] = markflag(MAC), [RNBC] = markflag(MAC), - [MGTPDC] = markflag(MAC), [MGTPTC] = markflag(MAC), - [RUC] = markflag(MAC), [ROC] = markflag(MAC), - [GORCL] = markflag(MAC), [GORCH] = markflag(MAC), - [GOTCL] = markflag(MAC), [GOTCH] = markflag(MAC), - [BPRC] = markflag(MAC), [MPRC] = markflag(MAC), - [TSCTC] = markflag(MAC), [PRC64] = markflag(MAC), - [PRC127] = markflag(MAC), [PRC255] = markflag(MAC), - [PRC511] = markflag(MAC), [PRC1023] = markflag(MAC), - [PRC1522] = markflag(MAC), [PTC64] = markflag(MAC), - [PTC127] = markflag(MAC), [PTC255] = markflag(MAC), - [PTC511] = markflag(MAC), [PTC1023] = markflag(MAC), - [PTC1522] = markflag(MAC), [MPTC] = markflag(MAC), - [BPTC] = markflag(MAC), + [IPAV] = MAC_ACCESS_FLAG_NEEDED, [WUC] = MAC_ACCESS_FLAG_NEEDED, + [IP6AT] = MAC_ACCESS_FLAG_NEEDED, [IP4AT] = MAC_ACCESS_FLAG_NEEDED, + [FFVT] = MAC_ACCESS_FLAG_NEEDED, [WUPM] = MAC_ACCESS_FLAG_NEEDED, + [ECOL] = MAC_ACCESS_FLAG_NEEDED, [MCC] = MAC_ACCESS_FLAG_NEEDED, + [DC] = MAC_ACCESS_FLAG_NEEDED, [TNCRS] = MAC_ACCESS_FLAG_NEEDED, + [RLEC] = MAC_ACCESS_FLAG_NEEDED, [XONRXC] = MAC_ACCESS_FLAG_NEEDED, + [XOFFTXC] = MAC_ACCESS_FLAG_NEEDED, [RFC] = MAC_ACCESS_FLAG_NEEDED, + [TSCTFC] = MAC_ACCESS_FLAG_NEEDED, [MGTPRC] = MAC_ACCESS_FLAG_NEEDED, + [WUS] = MAC_ACCESS_FLAG_NEEDED, [AIT] = MAC_ACCESS_FLAG_NEEDED, + [FFLT] = MAC_ACCESS_FLAG_NEEDED, [FFMT] = MAC_ACCESS_FLAG_NEEDED, + [SCC] = MAC_ACCESS_FLAG_NEEDED, [FCRUC] = MAC_ACCESS_FLAG_NEEDED, + [LATECOL] = MAC_ACCESS_FLAG_NEEDED, [COLC] = MAC_ACCESS_FLAG_NEEDED, + [SEQEC] = MAC_ACCESS_FLAG_NEEDED, [CEXTERR] = MAC_ACCESS_FLAG_NEEDED, + [XONTXC] = MAC_ACCESS_FLAG_NEEDED, [XOFFRXC] = MAC_ACCESS_FLAG_NEEDED, + [RJC] = MAC_ACCESS_FLAG_NEEDED, [RNBC] = MAC_ACCESS_FLAG_NEEDED, + [MGTPDC] = MAC_ACCESS_FLAG_NEEDED, [MGTPTC] = MAC_ACCESS_FLAG_NEEDED, + [RUC] = MAC_ACCESS_FLAG_NEEDED, [ROC] = MAC_ACCESS_FLAG_NEEDED, + [GORCL] = MAC_ACCESS_FLAG_NEEDED, [GORCH] = MAC_ACCESS_FLAG_NEEDED, + [GOTCL] = MAC_ACCESS_FLAG_NEEDED, [GOTCH] = MAC_ACCESS_FLAG_NEEDED, + [BPRC] = MAC_ACCESS_FLAG_NEEDED, [MPRC] = MAC_ACCESS_FLAG_NEEDED, + [TSCTC] = MAC_ACCESS_FLAG_NEEDED, [PRC64] = MAC_ACCESS_FLAG_NEEDED, + [PRC127] = MAC_ACCESS_FLAG_NEEDED, [PRC255] = MAC_ACCESS_FLAG_NEEDED, + [PRC511] = MAC_ACCESS_FLAG_NEEDED, [PRC1023] = MAC_ACCESS_FLAG_NEEDED, + [PRC1522] = MAC_ACCESS_FLAG_NEEDED, [PTC64] = MAC_ACCESS_FLAG_NEEDED, + [PTC127] = MAC_ACCESS_FLAG_NEEDED, [PTC255] = MAC_ACCESS_FLAG_NEEDED, + [PTC511] = MAC_ACCESS_FLAG_NEEDED, [PTC1023] = MAC_ACCESS_FLAG_NEEDED, + [PTC1522] = MAC_ACCESS_FLAG_NEEDED, [MPTC] = MAC_ACCESS_FLAG_NEEDED, + [BPTC] = MAC_ACCESS_FLAG_NEEDED, - [TDFH] = markflag(MAC) | MAC_ACCESS_PARTIAL, - [TDFT] = markflag(MAC) | MAC_ACCESS_PARTIAL, - [TDFHS] = markflag(MAC) | MAC_ACCESS_PARTIAL, - [TDFTS] = markflag(MAC) | MAC_ACCESS_PARTIAL, - [TDFPC] = markflag(MAC) | MAC_ACCESS_PARTIAL, - [RDFH] = markflag(MAC) | MAC_ACCESS_PARTIAL, - [RDFT] = markflag(MAC) | MAC_ACCESS_PARTIAL, - [RDFHS] = markflag(MAC) | MAC_ACCESS_PARTIAL, - [RDFTS] = markflag(MAC) | MAC_ACCESS_PARTIAL, - [RDFPC] = markflag(MAC) | MAC_ACCESS_PARTIAL, - [PBM] = markflag(MAC) | MAC_ACCESS_PARTIAL, + [TDFH] = MAC_ACCESS_FLAG_NEEDED | MAC_ACCESS_PARTIAL, + [TDFT] = MAC_ACCESS_FLAG_NEEDED | MAC_ACCESS_PARTIAL, + [TDFHS] = MAC_ACCESS_FLAG_NEEDED | MAC_ACCESS_PARTIAL, + [TDFTS] = MAC_ACCESS_FLAG_NEEDED | MAC_ACCESS_PARTIAL, + [TDFPC] = MAC_ACCESS_FLAG_NEEDED | MAC_ACCESS_PARTIAL, + [RDFH] = MAC_ACCESS_FLAG_NEEDED | MAC_ACCESS_PARTIAL, + [RDFT] = MAC_ACCESS_FLAG_NEEDED | MAC_ACCESS_PARTIAL, + [RDFHS] = MAC_ACCESS_FLAG_NEEDED | MAC_ACCESS_PARTIAL, + [RDFTS] = MAC_ACCESS_FLAG_NEEDED | MAC_ACCESS_PARTIAL, + [RDFPC] = MAC_ACCESS_FLAG_NEEDED | MAC_ACCESS_PARTIAL, + [PBM] = MAC_ACCESS_FLAG_NEEDED | MAC_ACCESS_PARTIAL, }; static void @@ -1419,13 +1416,6 @@ static int e1000_tx_tso_post_load(void *opaque, int version_id) return 0; } -static bool e1000_full_mac_needed(void *opaque) -{ - E1000State *s = opaque; - - return chkflag(MAC); -} - static bool e1000_tso_state_needed(void *opaque) { E1000State *s = opaque; @@ -1451,7 +1441,6 @@ static const VMStateDescription vmstate_e1000_full_mac_state = { .name = "e1000/full_mac_state", .version_id = 1, .minimum_version_id = 1, - .needed = e1000_full_mac_needed, .fields = (const VMStateField[]) { VMSTATE_UINT32_ARRAY(mac_reg, E1000State, 0x8000), VMSTATE_END_OF_LIST() @@ -1679,8 +1668,6 @@ static void pci_e1000_realize(PCIDevice *pci_dev, Error **errp) static const Property e1000_properties[] = { 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, From patchwork Mon May 12 08:39:36 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 889342 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp1497452wrr; Mon, 12 May 2025 01:42:29 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVbBwrZpoKhUuR5CV1TsNe0uaNZn9tHYY963Iq7MyPvoEG/rwXC5eeQoaTKlOc1yRSAgwqXLQ==@linaro.org X-Google-Smtp-Source: AGHT+IFxy3VcxlTqLC1FQSzKJVHcWh3xGwnPIdtagbmrzKg2zeksbKucK1enqZsaCgI/Hc4GNTOR X-Received: by 2002:ac8:7e95:0:b0:476:8f75:b885 with SMTP id d75a77b69052e-494527f3b83mr230210321cf.44.1747039349175; Mon, 12 May 2025 01:42:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747039349; cv=none; d=google.com; s=arc-20240605; b=VcWlZNhaT8xi8ufS5x0q3O6pTd4V59poEJes5O7WY7lWTu7TThdvrlPRouMHfu8URw iO7AWDFJ0dp3LEbgVuBjeUT43dmHpgbnWpgHrLGlyNK1SAUWWdMxelxY0T2qsAwqbEzN WOiqWdE3+rdBPDV7m5c5jo8aAwVUoUNSUrRJY/XYOF2ciB9zoRlNszJsfH4RkPJZWyYJ KFnFyCwopE7CHFdW/VfKcdKWl6lVuboAXlDZBYE76l0+cBdttWNwzkYGJMrCSj+I7hXJ 7PElLCmOZmIbciE/FYO6mikkSlwTCkjWOfJw3fJunTlwuwXKcQMP7byFJNpUibJo0ktn Aa8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=8B0TCm05qe7PpunGHX/ka1ZgS/TRYp4ybH1gTnihvoA=; fh=t+WM68hpZdukNUqoyhJ9Y8NKC5MnAAaNVsh7R6pJqwA=; b=LtyHFL2wb5OgDKYXtzlnbhM19Hy8jcWdLAkxtNeDSUX1ybqw4vbbIsnYj1g42gke0V I6o+HoRuFjX4L18YM5EflVN8kr6PsqMM82d+zKHKN+UONIvLVAqe5FbSrIvDW6XJMNZ7 neAIk5QozaYjZ71J8EYZOvYifSBAwCnvWx6HaPHH+Ny89k6KEGzQCcRpB0jF/YGYIM2L xV7PGkQ6LPLs9Z76siBxsvhmGVWAk+PxxNaLKOuNNulMYD1IfjTSUA0DMwXDoHnJg3eS FzvSWTjWE2xP5jvfcD5seDnybCo60N7jcCfUPiqmaYvWXbJd8tEonI3sEpkQUZmlW6/b oVlw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=LVmRGpJB; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-49452458c4dsi88798511cf.119.2025.05.12.01.42.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 May 2025 01:42:29 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=LVmRGpJB; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uEOjs-0001FL-Ar; Mon, 12 May 2025 04:42:20 -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 1uEOib-0007co-M6 for qemu-devel@nongnu.org; Mon, 12 May 2025 04:41:06 -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 1uEOiY-0001l6-MC for qemu-devel@nongnu.org; Mon, 12 May 2025 04:41:00 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-43cfe574976so29152835e9.1 for ; Mon, 12 May 2025 01:40:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747039256; x=1747644056; 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=8B0TCm05qe7PpunGHX/ka1ZgS/TRYp4ybH1gTnihvoA=; b=LVmRGpJBZK8+1+z1OnsHHHQEH6/fuOSJ7RcCQ2dU9ioDCRA0B8Zmpm9gqAHYOJ5Fql gn80Rvx1q7Xw7ufm7QMU435AE/UeE1A6D0YfVWpounMRNKl5FwF0uTnkcPy5vuEah0EZ 2tMS+dFo79Hen1JtUdkD+N0/LEcCOR2d56wiMYwX0mHBHaK5I02wo2WGW7ay68uqhnPA Qlb5OYGAkRWgWsVd21txevz5mmZts2jbvGuYVW7LxycoMZZmsBFc5qBmX/j+X0AxQxYi iV3+YxAHwTGFpzRUW5iZhsw5tqVOkhF3VXrx08WW7VihmpFj135DWJDQ0qb+SIAJDqsk MxDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747039256; x=1747644056; 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=8B0TCm05qe7PpunGHX/ka1ZgS/TRYp4ybH1gTnihvoA=; b=NLdG/Mvd0BUiYr5MD6TFDwJ4JKJdP4XR/Cjdy3cn1iaayQ7Y0Ly1cVHLpaykWO35dL hSR55uRgLLKjnb+wpF/FyZDr4nOIm+s8zcfc1GByjsqaYJ5MhqBIqlzN/mb7bAgg23Nk CylQ1XraVvhw6rHUCKT8nnjvmobp6hwWD+VeCCi8wY1RSIYka9SQHSOdc/BnImZDwI+K gFl3jkpkUipDgEZaEI4VLU8PGXGGNFG+YA0xOgEyGk+dKcVQXPTkPBW4RntTggn8Fe87 j+akOimo1f75uV0vNrep3H/E2Va2tKXlfjw4qt06/4rHkgk8RA9b08qCcVjnjYutA6kp aXcw== X-Gm-Message-State: AOJu0YxagJqkhimQhAamY1aOefide02eAPlATtxnGkZ2KXKWipfu7i6b kZKwMLXT7Ay4zc/MaZUt4x67yWY/FNjfBbkoBpi/Lx9bOBWPJHFdYt5eKqTDosnqqS9mzBSXnlJ 4YkVJgw== X-Gm-Gg: ASbGncvasbAjWGEQG/xZIMUcQfDHfeIGIn2R1qaQEa0ZwqTI0HpL7xZiRNVKgFtPIXj aTSjLWN0lsctxr7CO7KuWqSzRacMjb7izNjpBBkNsaA/876WL9kf3rHmh32tyLs3tQHkyUEGugQ Pi4KLLnTa1JiRA20j1/3ccZOSpHNeJWs1s178ApSxeMH7AWR3V7kmURtKgN7hYilyzVd2pNc9cs gHtk3MdsP6f3NxIlBnXIP7UNdnPxHKy7kVs3kGYMEngxnVD9QTkdwm8QLSykgOK5IeN3FxRsKXa Cv0oJ6Jj3l6LMbPJ4k1V91EFABMhPhpzgpPNqGHkW1efWQRHTRwok3Rl93mPtsrnCurKeA9IVuI k6Yh9eRj4wr2KsBbURw4Ztuo= X-Received: by 2002:a05:600c:a409:b0:43c:fe90:1282 with SMTP id 5b1f17b1804b1-442d7800805mr74622165e9.7.1747039256424; Mon, 12 May 2025 01:40:56 -0700 (PDT) Received: from localhost.localdomain (129.163.185.81.rev.sfr.net. [81.185.163.129]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442cd34bef4sm162315045e9.24.2025.05.12.01.40.52 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 12 May 2025 01:40:55 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Yanan Wang , Kevin Wolf , Richard Henderson , Marcel Apfelbaum , qemu-block@nongnu.org, Fabiano Rosas , Fam Zheng , =?utf-8?q?Phil?= =?utf-8?q?ippe_Mathieu-Daud=C3=A9?= , Jason Wang , Laurent Vivier , Paolo Bonzini , Dmitry Fleytman , Eduardo Habkost , Hanna Reitz , Zhao Liu , John Snow , Gerd Hoffmann , "Michael S. Tsirkin" , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Thomas Huth Subject: [PATCH v4 07/19] hw/virtio/virtio-pci: Remove VIRTIO_PCI_FLAG_MIGRATE_EXTRA definition Date: Mon, 12 May 2025 10:39:36 +0200 Message-ID: <20250512083948.39294-8-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250512083948.39294-1-philmd@linaro.org> References: <20250512083948.39294-1-philmd@linaro.org> MIME-Version: 1.0 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=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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org VIRTIO_PCI_FLAG_MIGRATE_EXTRA was only used by the hw_compat_2_4[] array, via the 'migrate-extra=true' 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é Reviewed-by: Daniel P. Berrangé Reviewed-by: Thomas Huth Reviewed-by: Zhao Liu --- 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_BIT) -/* 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 = { static bool virtio_pci_has_extra_state(DeviceState *d) { - VirtIOPCIProxy *proxy = to_virtio_pci_proxy(d); - - return proxy->flags & VIRTIO_PCI_FLAG_MIGRATE_EXTRA; + return true; } static void virtio_pci_save_extra_state(DeviceState *d, QEMUFile *f) @@ -2349,8 +2347,6 @@ static void virtio_pci_bus_reset_hold(Object *obj, ResetType type) static const Property virtio_pci_properties[] = { 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, From patchwork Mon May 12 08:39:37 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 889343 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp1497508wrr; Mon, 12 May 2025 01:42:43 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWXWOdty9zHFV224yyT6OmpsU0tnV26arXhx+6ntzopZZXZVqV7TNvViNb5caiaVprW0KlxUQ==@linaro.org X-Google-Smtp-Source: AGHT+IFQJJ5gDeAQKROJkVhzhe8tClis+g2Uwgwu5OAB36I+Ex5bNZtV7UlgNTWyTMHHXiRSuYlz X-Received: by 2002:a05:622a:4891:b0:48a:bbd7:19c2 with SMTP id d75a77b69052e-4945273c366mr156460251cf.15.1747039363750; Mon, 12 May 2025 01:42:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747039363; cv=none; d=google.com; s=arc-20240605; b=RF9O/69k1BTbM7q3ofdVE9zwImVbmUE0g9J5guJxcIK56iaYVbcrmeNikeIYWgTBW3 0pf52uFipqLrIbcLi3C0KCby+prjcS3YcCZ22+uKWxYiscqt51xAE3dGqY5+YcDvfh1H Feu4kXI+rKPqgw8xNJmfxgJ8lqFncslLyrW3P2L/tTf7HlyZajtDuP1AcDbyGrdyDIVX fjXZxhZlTjDmfpR1ArXBAFqAJ9jK/EYnqIrfCm8YouPiwivdpjPxyn23w/6bQvrEaULm exbKptU+Hbmn8Cgf4SpbZamGs5T5pDPQ/E0yD9id6OBR4bowzJ5j3yIDh/TNSZvLuPr3 yAoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=vcBK5F9fX1ixcWZyQOGrUKdvI9t7kjvAceG3Q+c4oSA=; fh=t+WM68hpZdukNUqoyhJ9Y8NKC5MnAAaNVsh7R6pJqwA=; b=Z55H+Q1TPh56dGPCRIl+YGu0FbdJcUhx8bPNtinSRHXcHV8kPK2I+2ZkumY253ul8O QgUIDPuBfAfkoXfxcuG8Pi0T1sfWATMdH7dolLgmvfitx0WOMGA4iYFQtRNjssja23qQ TBJAMPIErXFdQxEsd1nesp3JIGDJlmLj70XvTYf3IwxJBnOTbUU0KISIDH3XOhYvodPt RxNmgsMi0rAqB8tW7YytPb7gnqDrU/hLdSkD7o0+iMKNt+YYbGeA0a+h32yeNbrwIjZC 72DlG67sfPUyxVOCplNd9LluAy2V62nL9Gt2nsZ/kRbQ9Vjk5mugBpQ4nIkABkfn1CSy W3+w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=mEuDiEeH; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-49452581e1bsi84391261cf.428.2025.05.12.01.42.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 May 2025 01:42:43 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=mEuDiEeH; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uEOk3-0001jc-Nm; Mon, 12 May 2025 04:42:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uEOip-0007rO-CI for qemu-devel@nongnu.org; Mon, 12 May 2025 04:41:23 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uEOig-0001lg-UP for qemu-devel@nongnu.org; Mon, 12 May 2025 04:41:09 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-43d0782d787so28015605e9.0 for ; Mon, 12 May 2025 01:41:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747039265; x=1747644065; 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=vcBK5F9fX1ixcWZyQOGrUKdvI9t7kjvAceG3Q+c4oSA=; b=mEuDiEeHi7MWRqxJUUXRCPVdwui5iBIR+6m7aYiV52hcDB+Huze7fNYDyRyHS6fYDb 2q6CxhS4w3eDXJXS+csy/VtGMRR5Ahi9g6blGBEdSVQEJbG2DBx2BPeo4LBhl5eGv9eJ /1Ng/u3qmldrYSP0qVCAU42L7L8EpJOnCNPns39xUw3em1R/oE6ZM04RAgaDi8fwFnej OZ6yBnBl0mhXDPdoWWhF7ZFyCvpLMk0hSKyZ0yvKWw211n9/L1g/D7wi2+UHzK5hlU+Z e9D5WxPNHXXWjHSZHQ+A6WLogmYx9xKq5/CLjXiPq51VrTKOYep9PxL1nLYhgVj2Z6Dj cLQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747039265; x=1747644065; 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=vcBK5F9fX1ixcWZyQOGrUKdvI9t7kjvAceG3Q+c4oSA=; b=S0IZskqPb+HD8QwpCcn9w0OxXi48vxV0R4SXpRQjPq4VE3wg+YFdatqIKqroOkrini WGTgRuBLLW7avkD19GyJxzmoqhrlJyyJI80LT8fK4Vj274NhRIJ8rJMCn0eGF0xnwYbN 6HyIFh2II9I+ExTB4PtFT13ulK/64MR4FWBmBiHlYxSskhO5hanZ6ducQmqC5s6N+93w nQmjAyXdpqLz/TjHN7mVubXaJPnAtw4WHUEFWa4DBh3Sh6ORvHibEW2tuE65Ldlg+pRw j9H89/5WfWNmVv4wRPuQaYcNf3Qz5XnWWDipajr+sx3kt3gUZoJRqsTIBZvMoc5cixMQ A/4Q== X-Gm-Message-State: AOJu0YxEG7kJj9b3AxEDRCOZuMSdVlt8JU6p4wDHxqWlDYYGdAX8RJhA o83Ol96XupOE+gUyViriBkaentfNU2D23EGCr4lRwfd5QDizZRJDqbaj4/BMS4Is1z3KQQ7IAQ8 L1r1iQg== X-Gm-Gg: ASbGnctHMXj9A1fFQcMz9hkv4VxgNDc4hAy24dACyNg5X/MNZFbOdOCREPbfCbVh7ZO HxqDiZMJn8KJLsTodltZGNjgSFKZnIDgg6AGfZS9+Rm+FaN1Mal1OeAiq10eM0XkPlCO/THah25 XikO+XRbNZoUlJQeKo+4WEmFINzTbhKB0BSvJ8b5Raod0OdcSmSibzzAcfuraFAak/OZ7jD2cP5 X0MMJJNH5IReMFABmMsjrAui7hbYAMlQcuihicJRvXfW9t7pgdvWjlcDh8PY1FPZ/E+MchueLrM OP4wPZ7PGI8VQzd2EhTpemsUe1LinGIymYfeZgBEV614V7KVoQEXj4LSS3qGVo8cLfDS7UBtf/l uRWBE1MeFZ9fdZtpjBUJxdW8= X-Received: by 2002:a05:600c:c0d2:10b0:43c:f895:cb4e with SMTP id 5b1f17b1804b1-442d9cac8b6mr60485795e9.17.1747039264864; Mon, 12 May 2025 01:41:04 -0700 (PDT) Received: from localhost.localdomain (129.163.185.81.rev.sfr.net. [81.185.163.129]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442d67ee33bsm117390175e9.20.2025.05.12.01.41.01 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 12 May 2025 01:41:04 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Yanan Wang , Kevin Wolf , Richard Henderson , Marcel Apfelbaum , qemu-block@nongnu.org, Fabiano Rosas , Fam Zheng , =?utf-8?q?Phil?= =?utf-8?q?ippe_Mathieu-Daud=C3=A9?= , Jason Wang , Laurent Vivier , Paolo Bonzini , Dmitry Fleytman , Eduardo Habkost , Hanna Reitz , Zhao Liu , John Snow , Gerd Hoffmann , "Michael S. Tsirkin" , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Thomas Huth Subject: [PATCH v4 08/19] hw/virtio/virtio-pci: Remove VIRTIO_PCI_FLAG_DISABLE_PCIE definition Date: Mon, 12 May 2025 10:39:37 +0200 Message-ID: <20250512083948.39294-9-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250512083948.39294-1-philmd@linaro.org> References: <20250512083948.39294-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=philmd@linaro.org; helo=mail-wm1-x330.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org VIRTIO_PCI_FLAG_DISABLE_PCIE was only used by the hw_compat_2_4[] array, via the 'x-disable-pcie=false' 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é Reviewed-by: Daniel P. Berrangé Reviewed-by: Thomas Huth Reviewed-by: Zhao Liu --- 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_IOEVENTFD_BIT) -/* virtio version flags */ -#define VIRTIO_PCI_FLAG_DISABLE_PCIE (1 << VIRTIO_PCI_FLAG_DISABLE_PCIE_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 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[] = { 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 = VIRTIO_PCI(qdev); PCIDevice *pci_dev = &proxy->pci_dev; - if (!(proxy->flags & VIRTIO_PCI_FLAG_DISABLE_PCIE) && - virtio_pci_modern(proxy)) { + if (virtio_pci_modern(proxy)) { pci_dev->cap_present |= QEMU_PCI_CAP_EXPRESS; } From patchwork Mon May 12 08:39:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 889345 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp1497953wrr; Mon, 12 May 2025 01:44:24 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWbwRF9zFh3u+EbTqr6MTkVGIVKo690j0HDUNHBcPHsjJjoEptXvmIO+mK7SECrEqMxvB9rDw==@linaro.org X-Google-Smtp-Source: AGHT+IHymF5UpLBoxWetAofvja9labgm5jorhDyIHYifajdquGoGG+hKT0wESQHb9dm+d+MQM01W X-Received: by 2002:a05:620a:3906:b0:7ca:df49:e307 with SMTP id af79cd13be357-7cd0116909amr1831204385a.53.1747039464282; Mon, 12 May 2025 01:44:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747039464; cv=none; d=google.com; s=arc-20240605; b=HG/mVAxV26dumoHY3eupRAweBu3m8xCpFxZDtfBSFLuuYC5lnXt8eRbVg71lESG318 7Glm9hbOeUWIfsfy7OEDAAvqNa81U0L4sExUoJkspATC6Deu7OXRYf3ryd8Vijynx5Ln /caNjVX97MNkpVxTXZkJOhLaDUwlk45Gt395m/qXxHYTsrwnQOGfOXQZatMWbAG6rGb3 wLKTs2smQN3yti8Oq2sA7Tu0ky3ycKbGNGu9/H69feOpm+2UcMOJ5FYczHBPlbphmLDz F+LHGnK921oBMLA4YStXtiZkQD4jADRTQHKWl+OfXwwkGW8kVwvhsW3l7nPCNuxyuiwR Jnzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=jmmxRVO0JjDAOZF2VaJXzWNNbUhPq/11vrvQt3l5Apo=; fh=Ncl/2H2FpHFyQPDEI+akN/dcSz5rzMHPSrZYqm/0AUw=; b=CjDsPhwPvaN6lqcU4n4KlEplh/01CupSpcSOJ5toU2LGfmtjYnbi/999srS0eAJfSj Pppa2AUBQsCu5GRFXv7SdsIicgluEaH30WobY4lIFNzPWRHUc3ykK7NJ0V4TPktx+AAJ iSYtNpktRU8n6Mkjv61QqGeYOVQWxTP17EJJ5eS+RvMR2ZhXJWCFUg/bu9nA2EPZcAq2 gRoFFRaip2nNWzfn7k8ScrGjiDDUYWiX7PyuWSRKtpcC5+quX2bwcutQf0G3llpP6+fn /KReO/QQixjV39qfheMrPSrmVEdWR9I0t2g+8elRFYMz7VMqdAw22UNz4J5pePKHiUB0 hCig==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Yd+Ymkg0; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7cd00f51850si838638385a.78.2025.05.12.01.44.24 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 May 2025 01:44:24 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Yd+Ymkg0; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uEOk3-0001kw-Sy; Mon, 12 May 2025 04:42:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uEOj0-0007zK-7i for qemu-devel@nongnu.org; Mon, 12 May 2025 04:41:30 -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 1uEOiq-0001mI-9o for qemu-devel@nongnu.org; Mon, 12 May 2025 04:41:22 -0400 Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-3a0ac853894so3598259f8f.3 for ; Mon, 12 May 2025 01:41:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747039273; x=1747644073; 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=jmmxRVO0JjDAOZF2VaJXzWNNbUhPq/11vrvQt3l5Apo=; b=Yd+Ymkg0ZrB8Rv0TUMqTDUcmdOrmmELLc20zAvqLzF66+WCrTq60Pediwqi62CJl2g L+1mY5mC7fZFk21wseoLWeE3vq2gGXpwm39Ji4PTytzpDXIJBCd+odvKKyHlSWyuAOAc Vbkf+vPsPQWyO+CSsgs8AR+sP0rlXZ99+0cX/FniTRGgXzZM1GDdZ4Te1HxQ+9Yrhgkf dX9JWPUZChyzSoPZwb6F62jRDBDQFOdWKPNV2oDoq7XqQZndso+hU1zO5wcIdyD6yVwX HSjDZN8yAAd3evKcxxphoCCLwlanIAWW6A29xpbdTpuJmS29mcnmzl6GqJfjdgzIGsDI jOJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747039273; x=1747644073; 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=jmmxRVO0JjDAOZF2VaJXzWNNbUhPq/11vrvQt3l5Apo=; b=R+C+A7Rluy50mmXq61On6zXA6wms0SB5THU/stAv60+zQFAt8Espl8muCt6JmiJNE7 hXY7q8hNKHV98QQS+qQt7EVi5pST9lNekAUdJs33pR3QIXpikyTD/r+cIEf6CfPQnDjQ kCScCEes9jasbvnLSOZWOlU2N2nqdzWvGG7Zl+WK+/OVopY5WkZ3tbh4z60Fp4fJlbyC gQuNCGPaWxsN5El5PRBCqiEnCMYoXvaTixuZjMFuDtNdNhOENPmQTqxHYEFRl/tfTprE a1pW7D4zYpEHgblysI4kX+7UAsc228gIxc7FC11azVk7yEToDk0nye71NYGtGX9HWcTy bR0w== X-Gm-Message-State: AOJu0YyqkZBNBQJGLirdIDvP272HWwmxgBJQgzGA2MG1wbR/md4BpaOL nJseu1q0VosWUT+6vmFvawsCjC6LN/+D/ZudBU10eofcbp15nkhD8l61/FYdPlpZy8GisZf2dDI SI2scjA== X-Gm-Gg: ASbGncs8MsvAnL0DDJqgg67QUUzZcQFj208YtnNS4jfDK42kx8hkEAjYIpihh5AWVU+ QzM+nmfeNz0jA3pmlEsonXGn3nXOjcNOObYcKWiByHi1Ksmp+CTxtFgYISUOB2MyI6Xdl8DDRSp KRGFNz2SCWNpUuurVUExQ94spp/2qGGqHWaMuKcQex+FGoPjWY5sk8Gu7gMxqAvhIiZwalWTtQ2 YWmmXc5B0Lu4zzoo/hkSi3IBuesdBDovdp+TqqHCHlDAp4UkAbDTAijdD+cBjsOEN1SFM/kK06a 1sn7dy0OpO3dkXqgrcP2XNnAVULPl9GRiplK+l7NVEt6GttPbcBCPh62sqJMLkM5zP64YHcrKn4 RI8lIj0nv3X0Us4K9NghUOVY= X-Received: by 2002:a05:6000:4006:b0:39e:f9e8:d07d with SMTP id ffacd0b85a97d-3a1f6437e6emr10056092f8f.20.1747039272908; Mon, 12 May 2025 01:41:12 -0700 (PDT) Received: from localhost.localdomain (129.163.185.81.rev.sfr.net. [81.185.163.129]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a1f5a2ceccsm11807739f8f.64.2025.05.12.01.41.09 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 12 May 2025 01:41:12 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Yanan Wang , Kevin Wolf , Richard Henderson , Marcel Apfelbaum , qemu-block@nongnu.org, Fabiano Rosas , Fam Zheng , =?utf-8?q?Phil?= =?utf-8?q?ippe_Mathieu-Daud=C3=A9?= , Jason Wang , Laurent Vivier , Paolo Bonzini , Dmitry Fleytman , Eduardo Habkost , Hanna Reitz , Zhao Liu , John Snow , Gerd Hoffmann , "Michael S. Tsirkin" , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= Subject: [PATCH v4 09/19] hw/i386/pc: Remove deprecated pc-q35-2.5 and pc-i440fx-2.5 machines Date: Mon, 12 May 2025 10:39:38 +0200 Message-ID: <20250512083948.39294-10-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250512083948.39294-1-philmd@linaro.org> References: <20250512083948.39294-1-philmd@linaro.org> MIME-Version: 1.0 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org 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é Reviewed-by: Daniel P. Berrangé Reviewed-by: Zhao Liu --- 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; -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[] = { }; const size_t pc_compat_2_6_len = G_N_ELEMENTS(pc_compat_2_6); -GlobalProperty pc_compat_2_5[] = {}; -const size_t pc_compat_2_5_len = 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) DEFINE_I440FX_MACHINE(2, 6); -static void pc_i440fx_machine_2_5_options(MachineClass *m) -{ - X86MachineClass *x86mc = X86_MACHINE_CLASS(m); - - pc_i440fx_machine_2_6_options(m); - x86mc->save_tsc_khz = false; - m->legacy_fw_cfg_order = 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) } DEFINE_Q35_MACHINE(2, 6); - -static void pc_q35_machine_2_5_options(MachineClass *m) -{ - X86MachineClass *x86mc = X86_MACHINE_CLASS(m); - - pc_q35_machine_2_6_options(m); - x86mc->save_tsc_khz = false; - m->legacy_fw_cfg_order = 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); From patchwork Mon May 12 08:39:39 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 889344 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp1497640wrr; Mon, 12 May 2025 01:43:10 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXo5JzenW9d9wnpNdKK4CGdl3s4nLP5dD5/bBbPfzeyayvDqNVKzqCAXV9Faz/2oXrt4+exKg==@linaro.org X-Google-Smtp-Source: AGHT+IFSdpvtOiiqwWzr/NVWTCxLpkYQzREdofTL/IRB27WtdSGN3hJCkPDsDyRlIp4CPxN1ySDy X-Received: by 2002:a05:6214:4105:b0:6d8:80e8:d567 with SMTP id 6a1803df08f44-6f6e47c6b43mr207170156d6.18.1747039389829; Mon, 12 May 2025 01:43:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747039389; cv=none; d=google.com; s=arc-20240605; b=JYWZgIDFPhC3Ck2YKCY7436lJt+i0lxeJu7HUBnifIvVgd6rKJBpEOijZo0e3e4yVL wgnl9iCOQOSJylW7l19q5L4u8VgcP0F6ghobTH8e2h8ZeObUipsraJTcfQShYk0mHQdv 2WrKu6h25nDvOXwxcmscwECGIATi1Wo0J9/lwz2idxtrpbSP2ZBIkw0vTrLLmI1SG/I2 TqRE8aj7iJ23iPPz54DpE8nxSkNxxBDHawx36k2ufhR9qFtz6EetbzmqgfsWbosvoD/a Cv4U+obbUMlSbcFS8kJB/+sAVLe9LzC6RGJbvx5yzgJ2Sq6MLi0CQA6oAhSSCuccGbgu qGcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=CG3XKTeWK0piQR2+smzX+3iwbFcRaTIDsL5MWdVVSjk=; fh=t+WM68hpZdukNUqoyhJ9Y8NKC5MnAAaNVsh7R6pJqwA=; b=EF4Z8D+AoH8Icj+O2k/Pm9U8YnPoN1GIHxMoJYEyFS9Awn3M9/Y7lMMQ80eZPzvFMY NZwnH8e4yfULVMcTUEetLXvoTA1F+CaxOUYaSNoZx/gKVOnFXLBnBUZuIYlC242Viay0 PGGOSWrVzYvHzQp73pZuSx3bWNDXUuFWxxRwA962mCR1f3vIQzJ66gpki3OgLBwLKAQY Yfkqh6NdGV+KfOEY3eKpyReZeUR8CaNjdvPy8B33JstftoTdDyHr16SXNqftvZLEXISj +hZiRtbhC0+aIgdw5KCh0PRMmbG+Nh2uJRB9Tk8Pv7D7IlpXLewOLRH188W3d8ytl9Gm Golg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=NgN58Vp0; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6f6e3a58e70si83987686d6.434.2025.05.12.01.43.09 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 May 2025 01:43:09 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=NgN58Vp0; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uEOkE-0002LT-LB; Mon, 12 May 2025 04:42: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 1uEOj4-00081U-BK for qemu-devel@nongnu.org; Mon, 12 May 2025 04:41:32 -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 1uEOiz-0001my-61 for qemu-devel@nongnu.org; Mon, 12 May 2025 04:41:27 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-441ab63a415so41134715e9.3 for ; Mon, 12 May 2025 01:41:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747039281; x=1747644081; 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=CG3XKTeWK0piQR2+smzX+3iwbFcRaTIDsL5MWdVVSjk=; b=NgN58Vp0KK14rmsg8K/JzayyitXi+jDgEUKWK37Hl5s3U10Q1B3OvSCgQzYLHKs29W WY3A97ktkH+Q1EFn63mPgnfGBLxnMSNvp84Tr2CZyQEiLFkpRaJV/xQ0YAvZl3iYqH+Z ws6fYilPcHg0DedR6zchNwJFS4dIGNmsim0GuhR0wlMlm6CZQpRcfI7aaZgDK8VNkik0 Fo0+Dpbyp8j6YaijDsHQYatqNlal2B2viYpLRO99KgsgdzJEpKt1Y/mJsf5dO6km/OBV ZiyOzWKfFqddsWCg0N2UVfAcjcpP+kMIHwVkB4S0QaIBLeMchT1PN4qnoeHl2WLcXm0i Ygxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747039281; x=1747644081; 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=CG3XKTeWK0piQR2+smzX+3iwbFcRaTIDsL5MWdVVSjk=; b=ZTpmEkCBhETFm7XcQJWCDP4bwCcJdprohk9j6utDlKa0Tv99j9mcXuM85XTQ5goDem WzuL91necxxoeT2WQltTY3mzX2AJOrrXTD2Zv3R3uWqkIRulr5qfswDvb8nrt6FERT3u JFfoBSPfcGEamAaCGdCJ22ZZ8FNAcCxjJI9yh8Jmkm4ZZkwzIqyhlkbe1uuiUB4NNaAE ewhUtmC+DFauxKfRtGvVYd9WYOgsSaJhAC9Ajr9lzDZAj3QU+QoOZGBWc8oZO0RgdAep J5O1MZ5g6vGHpplDEeRF/0r7OZw89AtkwhBzIIDzGDekqBEwGd1elmn4d7braPeNSHh4 tBkQ== X-Gm-Message-State: AOJu0YyrnapRF4LNUg+Sj3cwsiZj85RSXXldSDV/huBGf3lMMJY4Yycn +Dfxc6UQF0/6HDvUbSPlbBCBjqbRvz70T7t5afiWSJMOaSZZyr+lNYsRRtDV28KdcyWRISOYcVC 7SXIwAw== X-Gm-Gg: ASbGncufjmw0bQAFgS4Tt/a82rk1qBUOemd03ayWF+b4RXUEPTQrYImMSHwK/3jmmPa iyrfskwkvSiETM3srgKm1zpUzpl9YUrf+a9bsa2LmYEMUW9DLiNZ5i5wPZrkIL7c8Jcf8rdtnNL fhs0bRpmLtgLvFwOq85/fCczu3aIhkiVNvdfNkwqgQ/C8oTDhTKHtsOi2fuJmevJz611xwlFV3+ fcqq6PHlWT1pylw6cna3hbvU5Cfu1CaNx+qvOnbbQTbcuLjb7QLUWOyj+0xHyLfs3CPlez5uuzl 3GLeTmyFGh+1Y26b2Nm1Cwi8NVqhzKnktpLtgo+uj04x9OWoeEYlThnSLWrhNwLCCYp+v6YHe6w NHSZpz9E4B8rkfr479iLJ1MM= X-Received: by 2002:a05:600c:46c3:b0:43c:fc04:6d35 with SMTP id 5b1f17b1804b1-442d6d0a9f6mr98072835e9.4.1747039281017; Mon, 12 May 2025 01:41:21 -0700 (PDT) Received: from localhost.localdomain (129.163.185.81.rev.sfr.net. [81.185.163.129]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442cd34bd84sm159345165e9.22.2025.05.12.01.41.17 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 12 May 2025 01:41:20 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Yanan Wang , Kevin Wolf , Richard Henderson , Marcel Apfelbaum , qemu-block@nongnu.org, Fabiano Rosas , Fam Zheng , =?utf-8?q?Phil?= =?utf-8?q?ippe_Mathieu-Daud=C3=A9?= , Jason Wang , Laurent Vivier , Paolo Bonzini , Dmitry Fleytman , Eduardo Habkost , Hanna Reitz , Zhao Liu , John Snow , Gerd Hoffmann , "Michael S. Tsirkin" , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Thomas Huth Subject: [PATCH v4 10/19] hw/i386/x86: Remove X86MachineClass::save_tsc_khz field Date: Mon, 12 May 2025 10:39:39 +0200 Message-ID: <20250512083948.39294-11-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250512083948.39294-1-philmd@linaro.org> References: <20250512083948.39294-1-philmd@linaro.org> MIME-Version: 1.0 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org 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é Reviewed-by: Daniel P. Berrangé Reviewed-by: Thomas Huth Reviewed-by: Zhao Liu --- 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" struct X86MachineClass { - /*< private >*/ MachineClass parent; - /*< 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, const void *data) mc->get_default_cpu_node_id = x86_get_default_cpu_node_id; mc->possible_cpu_arch_ids = x86_possible_cpu_arch_ids; mc->kvm_type = x86_kvm_type; - x86mc->save_tsc_khz = true; x86mc->fwcfg_dma_enabled = true; nc->nmi_monitor_handler = x86_nmi; 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 = opaque; CPUX86State *env = &cpu->env; - MachineClass *mc = MACHINE_GET_CLASS(qdev_get_machine()); - X86MachineClass *x86mc = X86_MACHINE_CLASS(mc); - return env->tsc_khz && x86mc->save_tsc_khz; + + return env->tsc_khz; } static const VMStateDescription vmstate_tsc_khz = { From patchwork Mon May 12 08:39:40 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 889350 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp1498248wrr; Mon, 12 May 2025 01:45:29 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXWVv4z80OQrItsRZ+S2Ygc45WIUnh3nRfbAPv1nixX52BcKzbUPHfVr1bHDowXikleHBHy+Q==@linaro.org X-Google-Smtp-Source: AGHT+IHgDoren3jNs1Pm98EzLiHS147ZzK109WcWXYEhPvgszRyG51LiDQ/CUoL7jA7nrauORGzf X-Received: by 2002:a05:620a:4588:b0:7c7:a5cd:5bd3 with SMTP id af79cd13be357-7cd011188d9mr1589364785a.28.1747039465465; Mon, 12 May 2025 01:44:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747039465; cv=none; d=google.com; s=arc-20240605; b=OlxsBZbjkqn/yFPqZbHNWowNyOpbtmawVYZdFfqcWRD/gRJMGSrC2hn9dB4nMpUras ayNMysPNH8L7/PPaelZBcowSurj2BW4Dq+uQEV+Bqi7z6KxHG/KdyGWToQM7bfLGuffX tdZUsfIvmw9rA+A8kPIX0iNXFTyN5Qfo2EPRD5lLeJu5zpjtOJPJTjzakDAI4ULPvqOT 561trtbNNjo/ZR9ZH/4m1XXGC9dBRQ9Ep4c4J62pK0uiP9l06EC7nTFfZTlqNqeLkBUP ZFdsabMwyuDm9NPVPO3v65kHN5CZcB7gHKU86M2vcgup9MaI5GoTvemzZz4yzmDlaH6Y jyDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=1frKODZfVTNx8C6LCobmlizA4xkItfE52ERke7j6olo=; fh=Ncl/2H2FpHFyQPDEI+akN/dcSz5rzMHPSrZYqm/0AUw=; b=hC2Z+VarPCpjdKvoOQNL8ky7PW8qnxtqoOykV0qRts8t+DJjDWNyOFoevaL/vs5pnj 28MgoSGotakFwsHcAum8WzXxVprCstBB27VXzb91bbKogMPqeXzlr5GZ/kkr+jg4V2Jj ggere1WLnyQMbdHGm5LF5KXGmRp+1rJi+0Fm0VooDaBifGnXmhjaE5K+Q+vqaRc8jtt4 RcZ4+hikZwIwH9CIFfPvEcF93zsyxSYJSVbWZRU8IFhOrxSuPOJWszrB+FnT+Jept1VB mEb1usmuor6m3NWsa4hEoAEk4MQfqsKUGlG7+jqb/i0iQMP32NhDURnuJowfV3VYNT5a O9rQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=rQ6agF0x; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7cd00fd4ba1si819450085a.222.2025.05.12.01.44.25 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 May 2025 01:44:25 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=rQ6agF0x; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uEOkJ-0002P4-UF; Mon, 12 May 2025 04:42:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uEOjB-00087P-2w for qemu-devel@nongnu.org; Mon, 12 May 2025 04:41:45 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uEOj6-0001nb-7j for qemu-devel@nongnu.org; Mon, 12 May 2025 04:41:35 -0400 Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-3a064a3e143so2283853f8f.3 for ; Mon, 12 May 2025 01:41:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747039290; x=1747644090; 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=1frKODZfVTNx8C6LCobmlizA4xkItfE52ERke7j6olo=; b=rQ6agF0xjIx0Yldnra9/uhqRHSqarG5+SHyb0nBR6NvZMOvt4takrxxnjbq5LlMZQ4 cgDJunytFwxjLcQzgm2ZG7pxdaaZuxVzwOR1CGbYoPbwKc7So/hQHLz9tC0LU9U3vJN4 lsPnjr6/w7v/xuGcUtQfE6vsInGlpaGTNnWLrtIbTeFTD1E9y4TqIGQxjd6NpPMwFrlf cYc8ToCU0sU2orEqvBCJTNXop/m/EsWvDl9uJYPWTMQMq1mjN/Gbffhlt5L8vEmVPmRt n+Ux3CYRoENbEiVq/pnf9XCu4B7jQ72bEMENha6TiJS+tww/LMBAHHxTfTfxT6wKvyHE J8lA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747039290; x=1747644090; 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=1frKODZfVTNx8C6LCobmlizA4xkItfE52ERke7j6olo=; b=kJpwCZX1Q3WFZXL7adbpOJjzShW0wJD2kVj03VMoommfxcPGXHV3DJwfwYRnls5lPJ 93GFl3qUnNa5+UEYJ2LXPA6c305Rr7bKQxKMZTh687UlmlpmI9/y9nGQzHOoHMoV5St+ wW31dj2I0z8nbbGb47vi3AY25xyjhysIeHly+CYtt+LOSd/fesi+JWP2+bck4jzc+nCS L1PP00LxXAYU/YRmNrxGhiLIW59CUmo6kqSsCeDH2oPeMy3kEDgT7BcQ5Z1XnOyPbDLj 6l1b+EOAnUuRxw08X6iSSYnxOUqlKezXxQuaYP6nGxeg1Up1KZ+KBsdfsQ3IUS98YenK HcNg== X-Gm-Message-State: AOJu0YyzKZenzvnQW49bBl66wWKV37aImwHy+6ROsZDIf67ckbiFoZ52 b7/Tn75lGxIOlT2HiLuftub/e+XfjtrPj6l8y096Zv04jJhWYbVq+Kr+cnYPBmgdhlBt2AD+cix bOpbN8g== X-Gm-Gg: ASbGncuRu41jbXIFwcDtSTJ7DFKV/NGhi0XVXl51m6k2TkBUDK05cHazDB3ogEyin8B QH32fZyGWgpxkntSS13N1z1vPXVeKmva0Mm/NRBfGhlduqs8v80vlHwzR4soM3cKpv0sO1l6tTn MCChNrZ9MW7WOV2SH6niVyOW5g/yCn6Ca1GVjPAfz+ya+yeH1fqyikEUcOsdENP5y+qk9gw/LMF 5rnsmRdM+vMJDjST3iwd0FCwc4lKFI6z1V4CWboibv/e1N4aqqGlXEyQwKjpf/pSqeZD2Vf+WSQ g2Zx4CHOIUtBI5Ml+QwT1IFGPIklgksoEt/IANlYhrS4Hicim/zaA9luyBErFP1yWleSdLy6Hjk XJp2zvM9wJZPb0///Dy+7ydQ= X-Received: by 2002:a05:6000:420f:b0:3a0:bdeb:c48c with SMTP id ffacd0b85a97d-3a1f64497a8mr9567222f8f.34.1747039290163; Mon, 12 May 2025 01:41:30 -0700 (PDT) Received: from localhost.localdomain (129.163.185.81.rev.sfr.net. [81.185.163.129]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a1f5a4c76dsm11812447f8f.92.2025.05.12.01.41.26 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 12 May 2025 01:41:29 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Yanan Wang , Kevin Wolf , Richard Henderson , Marcel Apfelbaum , qemu-block@nongnu.org, Fabiano Rosas , Fam Zheng , =?utf-8?q?Phil?= =?utf-8?q?ippe_Mathieu-Daud=C3=A9?= , Jason Wang , Laurent Vivier , Paolo Bonzini , Dmitry Fleytman , Eduardo Habkost , Hanna Reitz , Zhao Liu , John Snow , Gerd Hoffmann , "Michael S. Tsirkin" , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= Subject: [PATCH v4 11/19] hw/nvram/fw_cfg: Remove legacy FW_CFG_ORDER_OVERRIDE Date: Mon, 12 May 2025 10:39:40 +0200 Message-ID: <20250512083948.39294-12-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250512083948.39294-1-philmd@linaro.org> References: <20250512083948.39294-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::433; envelope-from=philmd@linaro.org; helo=mail-wr1-x433.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org 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é Reviewed-by: Daniel P. Berrangé Reviewed-by: Zhao Liu --- 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 03e7cbeae82..ab900dacabc 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); /** * 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 { typedef struct fw_cfg_file FWCfgFile; -#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; - 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 = f; } -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 = NULL; - rom_set_order_override(FW_CFG_ORDER_OVERRIDE_VGA); if (pci_bus) { PCIDevice *pcidev = pci_vga_init(pci_bus); dev = pcidev ? &pcidev->qdev : NULL; @@ -1041,7 +1040,7 @@ DeviceState *pc_vga_init(ISABus *isa_bus, PCIBus *pci_bus) ISADevice *isadev = isa_vga_init(isa_bus); dev = isadev ? DEVICE(isadev) : NULL; } - rom_reset_order_override(); + return dev; } @@ -1231,8 +1230,6 @@ void pc_nic_init(PCMachineClass *pcmc, ISABus *isa_bus, PCIBus *pci_bus) bool default_is_ne2k = g_str_equal(mc->default_nic, TYPE_ISA_NE2000); NICInfo *nd; - rom_set_order_override(FW_CFG_ORDER_OVERRIDE_NIC); - while ((nd = qemu_find_nic_info(TYPE_ISA_NE2000, default_is_ne2k, NULL))) { pc_init_ne2k_isa(isa_bus, nd, &error_fatal); } @@ -1241,8 +1238,6 @@ void pc_nic_init(PCMachineClass *pcmc, ISABus *isa_bus, PCIBus *pci_bus) if (pci_bus) { pci_init_nic_devices(pci_bus, mc->default_nic); } - - rom_reset_order_override(); } 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, uint64_t value) g_free(old); } -void fw_cfg_set_order_override(FWCfgState *s, int order) -{ - assert(s->fw_cfg_order_override == 0); - s->fw_cfg_order_override = order; -} - -void fw_cfg_reset_order_override(FWCfgState *s) -{ - assert(s->fw_cfg_order_override != 0); - s->fw_cfg_order_override = 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[] = { - { "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 migration, * 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 char *filename, size_t len) } } -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 = 0; i < ARRAY_SIZE(fw_cfg_order); i++) { - if (fw_cfg_order[i].name == NULL) { - continue; - } - - if (strcmp(name, fw_cfg_order[i].name) == 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 char *filename, { int i, index, count; size_t dsize; - MachineClass *mc = MACHINE_GET_CLASS(qdev_get_machine()); int order = 0; if (!s->files) { @@ -933,22 +853,10 @@ void fw_cfg_add_file_callback(FWCfgState *s, const char *filename, count = be32_to_cpu(s->files->count); assert(count < fw_cfg_file_slots(s)); - /* 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 = get_fw_cfg_order(s, filename); - for (index = count; - index > 0 && order < s->entry_order[index - 1]; - index--); - } else { - /* Sort by file name. */ - for (index = count; - index > 0 && strcmp(filename, s->files->f[index - 1].name) < 0; - index--); - } + /* Find the insertion point, sorting by file name. */ + for (index = count; + index > 0 && strcmp(filename, s->files->f[index - 1].name) < 0; + index--); /* * 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, static void fw_cfg_machine_reset(void *opaque) { - MachineClass *mc = MACHINE_GET_CLASS(qdev_get_machine()); FWCfgState *s = opaque; void *ptr; size_t len; @@ -1068,11 +975,9 @@ static void fw_cfg_machine_reset(void *opaque) ptr = fw_cfg_modify_file(s, "bootorder", (uint8_t *)buf, len); g_free(ptr); - if (!mc->legacy_fw_cfg_order) { - buf = get_boot_devices_lchs_list(&len); - ptr = fw_cfg_modify_file(s, "bios-geometry", (uint8_t *)buf, len); - g_free(ptr); - } + buf = get_boot_devices_lchs_list(&len); + ptr = fw_cfg_modify_file(s, "bios-geometry", (uint8_t *)buf, len); + g_free(ptr); } static void fw_cfg_machine_ready(struct Notifier *n, void *data) diff --git a/system/vl.c b/system/vl.c index fd402b8ff8f..3b7057e6c66 100644 --- a/system/vl.c +++ b/system/vl.c @@ -1192,10 +1192,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; } @@ -2745,7 +2742,6 @@ static void qemu_create_cli_devices(void) } /* 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) { @@ -2756,7 +2752,6 @@ static void qemu_create_cli_devices(void) assert(ret_data == NULL); /* error_fatal aborts */ loc_pop(&opt->loc); } - rom_reset_order_override(); } static bool qemu_machine_creation_done(Error **errp) From patchwork Mon May 12 08:39:41 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 889348 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp1498016wrr; Mon, 12 May 2025 01:44:38 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUJ0P3MQaM2WXe6MecnY7PjHMilVFA+NDahxq/UDzfgaycCKo2EKmwFkT9bGET3z80vH7mf7A==@linaro.org X-Google-Smtp-Source: AGHT+IHMvzz9b+PYZLO8nKz8goLmqdLM82hIANP3lmOn1Jv/7DBrwOK0OYIlUeBIHp62ntppwAlz X-Received: by 2002:a05:620a:2441:b0:7c9:4d96:24ce with SMTP id af79cd13be357-7cd0114f05bmr1969191285a.44.1747039478381; Mon, 12 May 2025 01:44:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747039478; cv=none; d=google.com; s=arc-20240605; b=i+3S5sgpykVdAvrpQ1vABUM9ceJ3nBmvdj+3b1rajVqJ6Kcx8qYiMMSkdRNpQLtJiZ h3eYmMB1YpAPb7Invtn3faH4sO3XxMW6gvT06HC0aB2vx0w3czyyJ7O4cTXArQMKK62g OIFMtu/nUs9qef+3WFeC1A/RLMJh4Ba2hAn8HLnKAMPLq1+MEopckfpwKX6Oa6gqwFgu T90l0+ZvH007cYXDEN/rTzu8a6SO+IKb34LK9syQnnVGqMoSD4/HUMLy70eTlrDehi5a 8Q4LvRMaADtQED9ZZetnqxbGnz5NPHEw8H/1EfcIAMPfnqZNNEpme5p0nb/NQydDwFu8 0SQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=tHY1YiLZvCACpZsrrksXO5DebeenPdJJpeqj3sZN6lI=; fh=Ncl/2H2FpHFyQPDEI+akN/dcSz5rzMHPSrZYqm/0AUw=; b=LZIbxx0/mh/daEj5xu2v23gCooP1J2Ep22BSG8KhoNAtum0qygiZP69XMpfUWcoZLT uPNLB4edM2qH3SFlj6MVtroh53HwULgA76ZYkqMz+belwuEuE5zzPU7ZUOnKh6v7W4jf EjZL+i2rK4tUjvGPAxBxKhQnIPRzWvy5gglgHYLEl0y/smjuuuMWRegh287xvlaGc1Ll Ep9zr0WG3IzUHi3zmORygqvpgxtidok5qYp2v9VM+XDWJbzEILrWLwOBulGBDC2LWe41 HuJJbBxk9C/ElDnX6okgI+rpZfr8/R0u7czLNjJkBe1CMojeqRBioLSXNmkqfUPPyxWz J6Ug==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fmIkIN0x; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-494524586bdsi83632991cf.2.2025.05.12.01.44.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 May 2025 01:44:38 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fmIkIN0x; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uEOjg-0000iL-UQ; Mon, 12 May 2025 04:42:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uEOjH-0008E0-Mw for qemu-devel@nongnu.org; Mon, 12 May 2025 04:41:48 -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 1uEOjF-0001oL-7C for qemu-devel@nongnu.org; Mon, 12 May 2025 04:41:43 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-43cf628cb14so34988025e9.1 for ; Mon, 12 May 2025 01:41:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747039299; x=1747644099; 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=tHY1YiLZvCACpZsrrksXO5DebeenPdJJpeqj3sZN6lI=; b=fmIkIN0x8itADxVUSEwboYwyqAqNsXJ+YoqhlioiXQsNWEvDwg02RWFyTg4hOPnVnB oiipdGlEonhipwRM59ZP0qo4UHV8YUOaNI4yLRVn71ISLjsc+A2ANpgHyuZ+J2jROEhy rb7v0Ffz7poWhEtPpQ9+WqI8ednt6T2L2hHQgVEMDWOptDIlpECNHHnzfTX21+9wvPnb LotySQNzMLR/scJy7IYMVfZO/SGr6JpAE3iiDojPgWvNmPmjw3JHRfqwoZqzcSvpna3S HUxoGMJtQhQPllcNes2oO/j4E+lPs5J4p+HNSY+cOK2VDhSL5Tt2rBxSzh0HLRJVQz+4 F46A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747039299; x=1747644099; 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=tHY1YiLZvCACpZsrrksXO5DebeenPdJJpeqj3sZN6lI=; b=R/g13TNLwmsZnaDfAInLKvK6wbOpj7K0G/7aYY/I+dRuFk8pel8C63NHk92gJk/+gj uddmGmJK03xdkoXBdULwuEaWzvNwzjRUB484RSNVrm7Jxw4mBInbS4xH+aR+FqkP4I/g TM0fC6JcNkcLeSkNVbLrJC57FNOQv3rQtQiZ36+k49LeBjTkzrKSRz6etMu2/io+0HIh 8j+RfT0zYJdmtV81+e3qpKIFB1iOTHEC5e/nLPUSGjyutZWWS0mlH/K6f2LZ7UNNVl35 /xXaFIMUge6wTVbQmm3BA9Hf7WYlou1Lzj3y+S5LtO1qLaBi+jNzHvdxXQT5LIB4XY6b 4SQg== X-Gm-Message-State: AOJu0Yw4jOMynBZF1lTWa4/cUZ4kW6DkHLQNcOORN+Jdg6tNswxxPn+x MHGsmZ63ASRvivRzjTwENER5uEFYGRygWRscmFu23jYLY35S8f7ML9tkWFcQ2KzlNcWVG84UbFh 4yfUqCg== X-Gm-Gg: ASbGnctrvqXvbpKFJ+h1qSdb+rqt48P0e2EM3xKeFukzlU8vnBDf2q4AaGZ8YKvy1gX dE5kfn8oOH/6ijUUYNNC3g5R2+8Q4LlEHmt9n8b67Wo7eE0AiK5mqKHGh3p36NHibmOWdA40Z7p LZ5gqn9460jlOEJgyXYabvVjUHRXCQmqSe3U4aB5bMD3DPgKVM33FeDIHxU8hUhHH91JlSfRwot OEgS8LQUmW8z7Nq8NT4DDI360nK8CBkKn/1vo1mg0Tk6UvPP9/B9ZjaD85zbJcPnkJuvRTsQOyG kwqFxGRYfbl8iYPdeAGj/ginx0TcJKK+1YHoy39J5gz7VF+feGZ9OSRqVVDE/VJGyfgyRO0YP7S jL16NloDmyQV0PZhfOm+sezc= X-Received: by 2002:a05:600c:c0c3:10b0:439:8878:5029 with SMTP id 5b1f17b1804b1-442d6d71e58mr66936525e9.2.1747039298621; Mon, 12 May 2025 01:41:38 -0700 (PDT) Received: from localhost.localdomain (129.163.185.81.rev.sfr.net. [81.185.163.129]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442e9c9a193sm588375e9.21.2025.05.12.01.41.35 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 12 May 2025 01:41:37 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Yanan Wang , Kevin Wolf , Richard Henderson , Marcel Apfelbaum , qemu-block@nongnu.org, Fabiano Rosas , Fam Zheng , =?utf-8?q?Phil?= =?utf-8?q?ippe_Mathieu-Daud=C3=A9?= , Jason Wang , Laurent Vivier , Paolo Bonzini , Dmitry Fleytman , Eduardo Habkost , Hanna Reitz , Zhao Liu , John Snow , Gerd Hoffmann , "Michael S. Tsirkin" , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= Subject: [PATCH v4 12/19] hw/core/machine: Remove hw_compat_2_5[] array Date: Mon, 12 May 2025 10:39:41 +0200 Message-ID: <20250512083948.39294-13-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250512083948.39294-1-philmd@linaro.org> References: <20250512083948.39294-1-philmd@linaro.org> MIME-Version: 1.0 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org 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é Reviewed-by: Daniel P. Berrangé Reviewed-by: Zhao Liu --- 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 ab900dacabc..f424b2b5058 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -862,7 +862,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; -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[] = { }; const size_t hw_compat_2_6_len = G_N_ELEMENTS(hw_compat_2_6); -GlobalProperty hw_compat_2_5[] = { - { "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 = G_N_ELEMENTS(hw_compat_2_5); - MachineState *current_machine; static char *machine_get_kernel(Object *obj, Error **errp) From patchwork Mon May 12 08:39:42 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 889347 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp1497972wrr; Mon, 12 May 2025 01:44:28 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV6NmuD7cGxuWT5/+XnaWUghEW25wJ16UFp4y60rHWOXC+8yS4EUYZRduwOXRdnzowtHaiJ5g==@linaro.org X-Google-Smtp-Source: AGHT+IEl0sfcRJAUE5xCSTffOhC4LW4glQfBkvGdVXlOhyNSZnfCV9C6rkyCVCtA1Ecn+CXT4Bj9 X-Received: by 2002:a05:6214:1c4d:b0:6e8:f166:b1a0 with SMTP id 6a1803df08f44-6f6e482d146mr214458066d6.36.1747039467847; Mon, 12 May 2025 01:44:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747039467; cv=none; d=google.com; s=arc-20240605; b=CGlND8vITomBKXjHpCRZZZKFMYrvne8mnhWUVKBWYxe5I6imqeCEY3Tp/jzN80OKW5 0l3IaZgyGRJjrF53y4Tw7vtl1dkxxFOKSDUhzrKwlL6aPt2bipEa6rqkwJW4Upa1CHwq 6DstoBC2CguiZabZjd/nGtAxqJbc7xz9n0thq1H6094WKKvQ5Ya35SOzkR6EuDqPEh9E gY9E6KNbcpOTBL7JyeMVxtpbqGa3GNdzQNpOzBbzJWSoIWEeIjVZhgfGpVu4cWG9jm4r puzvvCS0+zOAKur3JTSk4SAWPogr+YzfLdwGK/zVug9E+arYmmEQlNxlc+ToU0f5y9k7 Co5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=DxDElVV2Vn4WLDsSj0otIlxNm5IFXNud0/Q6aYpzZPw=; fh=Ncl/2H2FpHFyQPDEI+akN/dcSz5rzMHPSrZYqm/0AUw=; b=jf/rFB6lAAN961CD0xkYGyjZUD6fVZkHkJwFedzbaZ0GGrDMLbF7Py5yZCofDKQKbM 5hBqqtUKc8G0UOFLaQaPcW6cTBL2+EHa4YcPAMew4+iBQpdCDZ59LRm3r1H4qd+GcM09 ILc1gJgjayqypLiXrxoTHcfJmejck6EI9a7IvZry4KSYJZ6tlgjcTnBtZxiVVL/mgP2S LHVfaCP45iDEkqvvj920eaI49FaDpQikIQCN9k2Nd+jnNt91qEnfF++Zk+LjZgOXZ9wu 45fsNup/ZSnYIqWOOYJ5Y8EKD3dkRlPzEtC6+xlxhZb6sL2N+VkVs8+lrsbXlyu7x6JU xNog==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=riW86SrP; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6f6e3a58e09si81944926d6.425.2025.05.12.01.44.27 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 May 2025 01:44:27 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=riW86SrP; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uEOlp-0004WZ-0W; Mon, 12 May 2025 04:44:21 -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 1uEOjT-0008Lm-5w for qemu-devel@nongnu.org; Mon, 12 May 2025 04:41:57 -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 1uEOjM-0001oq-OC for qemu-devel@nongnu.org; Mon, 12 May 2025 04:41:54 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-441d1ed82dbso44926305e9.0 for ; Mon, 12 May 2025 01:41:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747039307; x=1747644107; 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=DxDElVV2Vn4WLDsSj0otIlxNm5IFXNud0/Q6aYpzZPw=; b=riW86SrPScdQsmfSEg5dJ56NCU6Ioa/B1+ntXLH9ZAzgTqLxv6a11YuZtnH9Lbbkvh 7bv/WpmKSWPocFCTGYkd8tpi/019bMNnyhiTsBJRKgGbPGjkwr2Ux0EmlVX+4uwzRNDQ fV73Rqm0BEa72O2k2kNpQ0foUV/XL1tbBKYkn9wZewbkZ+nQh8sK6pt4pgQCjETaxjcD FkJEgRMw+938iJEk9dEDl/NpCs1WKdnHtgXE/CcmRDz9/5oWIFLWaJi8IfV9OMCQqMP9 3Y0uZNnXqgF5hDRIzqmMPKmfZ9Ge+0B4mKkbUOtxMf0OvctDnD82xANs9LZ3k2bgHrkC Dr+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747039307; x=1747644107; 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=DxDElVV2Vn4WLDsSj0otIlxNm5IFXNud0/Q6aYpzZPw=; b=KPwc9UNsPpIMQDBma7FteDn5eTIQIKyY/+8JRUIwPBvTpYyx6YlZIgrUiPcwPLm/Xi 22JdQf2neCJHPOUe8ic6A6SRpc3NXrJVkaw4HaBqk77M8g/IAo+5cnzBvYZPg1AydNrK ZPp36cfSbd08qVHFoXJKnrj7iNh5z60RoRNQx3B/6xnOwh5gMfFHTzBc0vBm6+J+U2z9 3Jp4UPWcV2SgkdFWPGBGxkpwomYKcDXxagZzEutY1yERWRO0sFgPSqg3BCKD4h2si/MF sjanJtF3aLI2EMH2i7tgRegkRIkwOhIuXhUGzIhd09wvvAC6oAtWRkseWL7t7ZVeJKyC oCxA== X-Gm-Message-State: AOJu0YwIf0McvhHxkNV2CO2tYCR7oK5ph4lQVNk0TaX7qsQF+K0zKKI+ bFCLpmy1ibIn53Jhb6NAKTI/lpYCUQo7m39Vytn/lExJvApyisn24B3C2UpL3EOFmkMpnrLrq4S a4r0ILg== X-Gm-Gg: ASbGncsqJzyWnlj1syonU8A3h/1ST9mOVugDWBYpERQGTxG+Ht2/pYGZR4nwoTRZTyi RKLHYzLxl+EKgfoY0vrmqD8d0RrBBMcpR6R1o9FMeW2Jl0z/Ir0vss0HOd+mSmfFfkNPvWtrHct i+cGcfYm4YFqhI670Wkh5VXLPDWxpnDl8Ex1+aSpVLXSqDsImFEWXRYD1QKQ7PG95wwsTDg/pWP w3rDM9LxIfNglGvHjtun1R3prz4nSPEdkQm4vtOcb5tcj0xWFF8HtQpmIkpoKfKMsjgufoisuZh +j+1vwnqJGvo5zNquxKRxTSdlrmy9IrHYBST+5H92zWMRFCLApXuqTyiNjgvhcmjphB8nZ+cveo 6CVXlMQy8g7z2CSMujaiiMPA= X-Received: by 2002:a05:600c:34ca:b0:43c:f8fc:f6a6 with SMTP id 5b1f17b1804b1-442d6d37115mr115193495e9.9.1747039306695; Mon, 12 May 2025 01:41:46 -0700 (PDT) Received: from localhost.localdomain (129.163.185.81.rev.sfr.net. [81.185.163.129]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442cd3af15bsm161173755e9.30.2025.05.12.01.41.43 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 12 May 2025 01:41:46 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Yanan Wang , Kevin Wolf , Richard Henderson , Marcel Apfelbaum , qemu-block@nongnu.org, Fabiano Rosas , Fam Zheng , =?utf-8?q?Phil?= =?utf-8?q?ippe_Mathieu-Daud=C3=A9?= , Jason Wang , Laurent Vivier , Paolo Bonzini , Dmitry Fleytman , Eduardo Habkost , Hanna Reitz , Zhao Liu , John Snow , Gerd Hoffmann , "Michael S. Tsirkin" , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= Subject: [PATCH v4 13/19] hw/block/fdc-isa: Remove 'fallback' property Date: Mon, 12 May 2025 10:39:42 +0200 Message-ID: <20250512083948.39294-14-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250512083948.39294-1-philmd@linaro.org> References: <20250512083948.39294-1-philmd@linaro.org> MIME-Version: 1.0 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org The "fallback" property was only used by the hw_compat_2_5[] array, as 'fallback=144'. 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é Reviewed-by: Daniel P. Berrangé Reviewed-by: Zhao Liu --- 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..5d746d73165 100644 --- a/hw/block/fdc-isa.c +++ b/hw/block/fdc-isa.c @@ -97,6 +97,7 @@ static void isabus_fdc_realize(DeviceState *dev, Error **errp) isa->iobase, fdc_portio_list, fdctrl, "fdc"); + fdctrl->fallback = FLOPPY_DRIVE_TYPE_288; fdctrl->irq = isa_bus_get_irq(bus, isa->irq); fdctrl->dma_chann = isa->dma; if (fdctrl->dma_chann != -1) { @@ -293,9 +294,6 @@ static const Property isa_fdc_properties[] = { DEFINE_PROP_SIGNED("fdtypeB", FDCtrlISABus, state.qdev_for_drives[1].type, 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), }; static void isabus_fdc_class_init(ObjectClass *klass, const void *data) From patchwork Mon May 12 08:39:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 889354 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp1498412wrr; Mon, 12 May 2025 01:46:04 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV5SzCdBKFv9SbnV5p5CPQ6SYgf3+B7QeYeq0O8ry35Z7bs3V+t4wVPYtGqQGOZ/6VjsN2tAw==@linaro.org X-Google-Smtp-Source: AGHT+IEKHincfwsDv/bq5NzrWs46C65nHgywmWW3pAAPpNMVlJuUhMysX3mJfLEh/IEXr7UU/5JI X-Received: by 2002:a05:622a:2cf:b0:48d:df0e:ef38 with SMTP id d75a77b69052e-494527d28c0mr200672281cf.33.1747039564619; Mon, 12 May 2025 01:46:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747039564; cv=none; d=google.com; s=arc-20240605; b=WHcVCUohIH/FvhVqoCF3ynU0asTU7nn43tR7QA9Q7ERKOw4Q8GDe9nmKqXTSa4m/ri wyVzxKWtyXtb5QFNfQU+Wu+qp6j4nF1OYrICm0HgIcR8yH/hRSbeGkla2TlREAMtGjwp Rkkg3MBE50+/npjGc5XZ9MNX+zxKytWR12XO9n/vGlWXvoPu6uEaFDPiTSJoQCR9upVO qoS1VRHSFcDCWSB9wOkPtlNSPnkOLA6WSnpFZfXX3MmDqxpFoA80Jm4LtKe2jbeVsDi+ 3bkeYabxMSTLn0Qb651qqUKorCnAMt2EcNRI7pztdfiklqCDI0n0kxBjqHtJaVQwyTBG 7y2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Rm74PrW1PtvYLNFl6+XPtcJ/DOMNe0H9WpC4Rf0Ae0s=; fh=t+WM68hpZdukNUqoyhJ9Y8NKC5MnAAaNVsh7R6pJqwA=; b=SawDmCwhsXc479yKqrTvJ19+P6tUHUL2u42b9l0UCkZ4cFv2lkAUbDtm/XoZCZhHXO dr5Dxl0iFUvmOwEF9m5JxEXav3H+frVdoRWcNwnSI1vQiEJp6KULBOnDCJN2BKMy6Vfk s4r11tlEnHw53TEzpENdoX4VOFES3ps49gK/oc2lFeOBtuEtiT3FHq4XkVOItkPZEsku /jdK7Gu1QJVVltGIuMqOTjVSA1A3aT6sb6jGjpxcRJoqCCxQr6BKoi49yIJ3vXePzc3S hW0Cfrj5AzMH5XCaSGJdS/6xyqaS5dOc3uzkXd8L9Sff7Ooh0FzG/BexnluKyB3ehfpD 7Vtw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="K/ksHgrC"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-4945259c291si81011271cf.585.2025.05.12.01.46.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 May 2025 01:46:04 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="K/ksHgrC"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uEOlb-0003ga-S9; Mon, 12 May 2025 04:44:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uEOjX-0000Hw-Tn for qemu-devel@nongnu.org; Mon, 12 May 2025 04:42:00 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uEOjV-0001pM-TW for qemu-devel@nongnu.org; Mon, 12 May 2025 04:41:59 -0400 Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-3a0bdcd7357so2829548f8f.1 for ; Mon, 12 May 2025 01:41:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747039316; x=1747644116; 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=Rm74PrW1PtvYLNFl6+XPtcJ/DOMNe0H9WpC4Rf0Ae0s=; b=K/ksHgrCoz+mj5AjjLIC94e2i1cv/iQRbL3tSUdq+03ztX7XUcxLi19C2dDZjUCmHO PT2Bzq9NZlWFWOEoQ3l6AcmhEShfF6Lz9lYbmihMGdjaV2ZIZ/3HgYHbqX1MqksMpj4n NM8SeAv4vHfnDRBF0uyw9H9+1Dpg3EQjEICQKcYrxLigLawYIKL1Wo2iCfpE9ECU4qAR zCcf/4QA6A+tTl+aM0Rl/lf/k32hOg2o/qXntt8AS4awxvDg4bdkn0c3AAs4ooH0829U BAytiWFaIICqo39Q5nCUK7iWaUeUgxyeEf3lYwbtC/JdBK1TsuuPqdnsh4IiTcLxguEc HvXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747039316; x=1747644116; 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=Rm74PrW1PtvYLNFl6+XPtcJ/DOMNe0H9WpC4Rf0Ae0s=; b=Qjmp6oylvE/nUcHFXUUQxCIjLeDWZLyzrEnVaAcx6a6KpX4O6oB6nMiNKvsyLN6+F4 kucu+o+o9edavMJMKcG+h/U+AjsHCn7IWgH6aRa2lO2RWiPF2G6xh8BrFfxefo2oGTKE 8Orbasfqj4jB4wrDcyRJtXwbL/qLWylxyExdzDgxk7cCA4leFrGMW2sWYZFpLXC7FIUr cAP7V5je3QbjuyOheCFgSkrwhZe+0CnQlnKfkmcm+wV/m4uidwtrJVGPqQUnZQFYHhIA e2kdV02iJsQuILIYXu+eN3OkFq8LnrnieLDo9HiGdKc2teD9siKM4GqAtBAhRn+9dQEM etrA== X-Gm-Message-State: AOJu0YycISEwiPF25SG1WtcnMpTtnLbtGHNmRPMmlzlM6SUeAMuiYiw/ C04Oy7ULiHLr7w5RS9aaZZsBqWWPLjFeMXYRBeOSZGeehXzT1wp6mYAQatYpXVSYEV+KCqegVXq g1GWh1A== X-Gm-Gg: ASbGnctln+rvZtO+sYFl5iI6DecRh9k+mCLUX2LOGNL4Pwv4VGDBF1K21QyF5BDvWhC iGhPMqkkFx5pqhzXHSKDHecD/s553oGH7eI2EcWObs0c3DtRQdK5R7jcHzP6zeVitUdW5UMZgNA UnsqMh4/sjX4Qe753+9aryo/fU+9zmAjEF7em0D/0qewZSwYftL7/jdsofaT93Owv2JMbDz+WqW xyvZYsZ/lugk4C/IA8XkOCfJ/Qgkj7FX322XOyOXbJcE/a861ejIABLBUeyDGyAWCkABHR5VmQ+ ys4fL7TPsLS0rrIo6CT0kHqcetbusS6//Glcm+cLCbP99lShBdpU1JKsZgkaxDEoyjO7+S9ilpD v6aB/bsyLuqyC2DmKZUOdRqQ= X-Received: by 2002:a05:6000:2289:b0:3a0:6c62:8169 with SMTP id ffacd0b85a97d-3a1f646a66amr9345580f8f.25.1747039316005; Mon, 12 May 2025 01:41:56 -0700 (PDT) Received: from localhost.localdomain (129.163.185.81.rev.sfr.net. [81.185.163.129]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a1f57ddfd6sm11498123f8f.4.2025.05.12.01.41.52 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 12 May 2025 01:41:55 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Yanan Wang , Kevin Wolf , Richard Henderson , Marcel Apfelbaum , qemu-block@nongnu.org, Fabiano Rosas , Fam Zheng , =?utf-8?q?Phil?= =?utf-8?q?ippe_Mathieu-Daud=C3=A9?= , Jason Wang , Laurent Vivier , Paolo Bonzini , Dmitry Fleytman , Eduardo Habkost , Hanna Reitz , Zhao Liu , John Snow , Gerd Hoffmann , "Michael S. Tsirkin" , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Thomas Huth Subject: [PATCH v4 14/19] hw/scsi/vmw_pvscsi: Remove PVSCSI_COMPAT_OLD_PCI_CONFIGURATION definition Date: Mon, 12 May 2025 10:39:43 +0200 Message-ID: <20250512083948.39294-15-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250512083948.39294-1-philmd@linaro.org> References: <20250512083948.39294-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::433; envelope-from=philmd@linaro.org; helo=mail-wr1-x433.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org PVSCSI_COMPAT_OLD_PCI_CONFIGURATION was only used by the hw_compat_2_5[] array, via the 'x-old-pci-configuration=on' 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é Reviewed-by: Daniel P. Berrangé Reviewed-by: Thomas Huth Reviewed-by: Zhao Liu --- 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) /* 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) -#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) typedef struct PVSCSIRingInfo { @@ -1110,7 +1104,7 @@ pvscsi_init_msi(PVSCSIState *s) int res; PCIDevice *d = PCI_DEVICE(s); - res = msi_init(d, PVSCSI_MSI_OFFSET(s), PVSCSI_MSIX_NUM_VECTORS, + res = 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"); /* 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); /* PCI latency timer = 255 */ pci_dev->config[PCI_LATENCY_TIMER] = 0xff; @@ -1298,8 +1288,6 @@ static const VMStateDescription vmstate_pvscsi = { static const Property pvscsi_properties[] = { 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), }; From patchwork Mon May 12 08:39:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 889351 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp1498305wrr; Mon, 12 May 2025 01:45:41 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWyZI2hIABRPleR49WSO9k5GZnHs+omx9n84Lc0PDtWqjVxwXule43JEcElApgh6GQGew0Lvg==@linaro.org X-Google-Smtp-Source: AGHT+IGsRSJXZthtB+bAr7/Pan/AQ0NvKz8nLxj5c57Fc63uJdgzxi+zCifSV33Tt/eBL+YBQ6Ej X-Received: by 2002:a05:6214:2525:b0:6e6:6c7f:1116 with SMTP id 6a1803df08f44-6f6e47fb1bfmr171043916d6.24.1747039541607; Mon, 12 May 2025 01:45:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747039541; cv=none; d=google.com; s=arc-20240605; b=hA5OkkUl7EHrkLgarVbgabC+AQ/FbPzO8c9KSOvUJVjRBOnmjYR/pZgQjp0tJTUT6X MXHfawzXMu2ZROY/6jjdhnoufQI8j/QtINxnzhjC3WjMVbO//O4tzzcNN3hL61fvRKXq ATIyt2/v8XyoC2wKP5NxKsQ6azd7OtwCKaVIQqgaCQGNSfbeetHI0TtuB0kw5UeDr/ba LEkQWqehKU65xPp0X/f89siVShCFbcFSncmijd7q5hc9LFJgexik2r/mBNQ55cDwRlXs Boe6LukE+oOd+lm3jLK+ibCSO3oMjK4QbuBYBvZ7UKU/SCM/Z6b4vtCmodRLhWtC7MFB taZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=GVwv0FdE9kunPs7GKD3AsVw5npncB8R9kvNzX+qR/aM=; fh=t+WM68hpZdukNUqoyhJ9Y8NKC5MnAAaNVsh7R6pJqwA=; b=C3W9JHGW/DMLa/eUDLUTfu9fFEmYeEdQ8T2YqH5ePxPZk8BWHeG//oo/9t29Enei9k 6NhPE79jxcBERTDDYe6P7HAbxWLcTuqCBJECye267wzS661681Cqkb7sAhnpubNpssJY os8EZIgnK5tFgT/JDKBS0z6pV2ETWUmAa/W3sLsVuaF8Cjb3Q3l0nOAYfNkKCJu0LlQ8 dBRSKVRfFqBgAbukAU7jOTjLD+EaqAJZcwaqIGd3xF4wZ7aEYgfUsfMJ7cb9n8H9TB5L zoC7GH/Zr1H+1a155/hixDjMrSstY23h4m0ZUpn5Rn+VHVPaf0kBNct7e20Fi5RFsnAL BmhA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=MbEnxwhv; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6f6e3a42890si1673256d6.261.2025.05.12.01.45.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 May 2025 01:45:41 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=MbEnxwhv; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uEOlr-0004mz-UD; Mon, 12 May 2025 04:44: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 1uEOjg-0000qi-UX for qemu-devel@nongnu.org; Mon, 12 May 2025 04:42:12 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uEOje-0001pn-SC for qemu-devel@nongnu.org; Mon, 12 May 2025 04:42:08 -0400 Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-3a0be321968so2394931f8f.2 for ; Mon, 12 May 2025 01:42:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747039325; x=1747644125; 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=GVwv0FdE9kunPs7GKD3AsVw5npncB8R9kvNzX+qR/aM=; b=MbEnxwhvCsttajgXEfyktdHZCHFXqcDkgujXobK4+0aSkDiEfjirxibShpkX+Yc554 a3FlDE5HAF2kVpEv6VOBhODfe7aYctdVbqUTCA2QU8UuNHO0uJk0FOpAC0Za15/c/S/s +F2jMUAGHGv+YCPlIwwOVatIuIHiIUqcivSxFFAE8f52cY/S/GWXs60TKGpMkuNoEETJ PlMYUwjvlQwlLuSTPeKpf60Rmrer5sluVil/bh6HNYwslGlE3Y2fb8oKhKr11bnpk11G dWq/M45etSe2qky6Un+Xnhbs2T9e5exesXhGn0y1tO/DTi8lJEdhZb6AU+3L7N9r1ckC 0XRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747039325; x=1747644125; 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=GVwv0FdE9kunPs7GKD3AsVw5npncB8R9kvNzX+qR/aM=; b=H8yXVdFZgEXG+vTDWGxO5nkSplODFVS2IwS4QjxTgOsUpVupXM93cPWGX4o5JUvysy gMYHrILQwvyB1pZ8K2nk+5fQpNXl/wW/1x0LIPDkPBLctxlETooIP98lzhCQo0Epeqtr 1zx6LwBQJPTDvrg/sUDOElLMK2sArTks1igJZl6T5fxCF0hIx6f1sJTLv4Iaelbg9DaQ GvNKArCV+TDGNra5W29sOVTuK2Sk/2+qk12mBevcMmNNkxerZX71jHBn+fCpbjuT6dx8 GLH+psRuFdINrRWbGArSv18OEfccT9TZQoTEizfk2XiY0s+3bKmT0x9QRQMGIwHtylAR FtyQ== X-Gm-Message-State: AOJu0Yx8Fm3fqlxGB2mkAlolNN9ss0Xo2EWLU+P/eh6v0SpH2WpBDCJ3 /W6oClVGHxKjEFVDOyXPYWTrXJstY1gXmdnEPeZfN8kpqL1JJVpFQGud+LnMFP0wRTSpJDsqs75 wobQEsA== X-Gm-Gg: ASbGncvF1ZOORD/am9HgO11Pb7f9vEo4j3qYgYCAzXx+kBDCSaYLmu4cM4Vk6D1z4ip phcKBvVB8ptSSIuM0gN2lce7HJAwigpruyxliHAnexvQ9cWcTZt8y3jdYdYmunGikiAC5qP3xee oPvEN9KFdx4wyrVhwHYgjNrj8RlIFL1szxvvxp1b2fhpYi6qs/sXFLE+C430KRcsDM6H1zW4SzW 0Q4BM1TnKZSlXlQAHYASMLjwVfmhA9GCDLgH/Hfa8OlZGVtKvO+y+cMeL3jXU9ZBnhrkm/ZeRid sf2qt3+3mO8XGO8qZ8XO7WC+rgMGpS8yXMowpqaPoqHqZI7oH1JQ8dIl26M6zlvt80G6OJEHs9M HVH4nCqSZntms28YBKln45q6fBxf+4FnGOg== X-Received: by 2002:a05:6000:40cc:b0:3a2:6b2:e552 with SMTP id ffacd0b85a97d-3a206b2e856mr2850082f8f.29.1747039324545; Mon, 12 May 2025 01:42:04 -0700 (PDT) Received: from localhost.localdomain (129.163.185.81.rev.sfr.net. [81.185.163.129]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a1f5a2cf43sm11704423f8f.70.2025.05.12.01.42.01 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 12 May 2025 01:42:03 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Yanan Wang , Kevin Wolf , Richard Henderson , Marcel Apfelbaum , qemu-block@nongnu.org, Fabiano Rosas , Fam Zheng , =?utf-8?q?Phil?= =?utf-8?q?ippe_Mathieu-Daud=C3=A9?= , Jason Wang , Laurent Vivier , Paolo Bonzini , Dmitry Fleytman , Eduardo Habkost , Hanna Reitz , Zhao Liu , John Snow , Gerd Hoffmann , "Michael S. Tsirkin" , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Thomas Huth Subject: [PATCH v4 15/19] hw/scsi/vmw_pvscsi: Remove PVSCSI_COMPAT_DISABLE_PCIE_BIT definition Date: Mon, 12 May 2025 10:39:44 +0200 Message-ID: <20250512083948.39294-16-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250512083948.39294-1-philmd@linaro.org> References: <20250512083948.39294-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=philmd@linaro.org; helo=mail-wr1-x42e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org PVSCSI_COMPAT_DISABLE_PCIE_BIT was only used by the hw_compat_2_5[] array, via the 'x-disable-pcie=on' 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é Reviewed-by: Daniel P. Berrangé Reviewed-by: Thomas Huth Reviewed-by: Zhao Liu --- 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) -/* 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) @@ -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; }; typedef struct PVSCSIRequest { @@ -1224,21 +1217,8 @@ pvscsi_post_load(void *opaque, int version_id) return 0; } -static bool pvscsi_vmstate_need_pcie_device(void *opaque) -{ - PVSCSIState *s = 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 = { .name = "pvscsi/pcie", - .needed = pvscsi_vmstate_need_pcie_device, .fields = (const VMStateField[]) { VMSTATE_PCI_DEVICE(parent_obj, PVSCSIState), VMSTATE_END_OF_LIST() @@ -1252,9 +1232,6 @@ static const VMStateDescription vmstate_pvscsi = { .pre_save = pvscsi_pre_save, .post_load = pvscsi_post_load, .fields = (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 = { static const Property pvscsi_properties[] = { DEFINE_PROP_UINT8("use_msg", PVSCSIState, use_msg, 1), - DEFINE_PROP_BIT("x-disable-pcie", PVSCSIState, compat_flags, - PVSCSI_COMPAT_DISABLE_PCIE_BIT, false), }; static void pvscsi_realize(DeviceState *qdev, Error **errp) { PVSCSIClass *pvs_c = PVSCSI_GET_CLASS(qdev); PCIDevice *pci_dev = PCI_DEVICE(qdev); - PVSCSIState *s = PVSCSI(qdev); - if (!(s->compat_flags & PVSCSI_COMPAT_DISABLE_PCIE)) { - pci_dev->cap_present |= QEMU_PCI_CAP_EXPRESS; - } + pci_dev->cap_present |= QEMU_PCI_CAP_EXPRESS; pvs_c->parent_dc_realize(qdev, errp); } From patchwork Mon May 12 08:39:45 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 889353 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp1498404wrr; Mon, 12 May 2025 01:46:03 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVlX74hW1sxKJdF0UJq1e/idubGb3nCf2yH9odCexj/pbLfOvweT3Tt5xSPnGzMXZOIBjpZkQ==@linaro.org X-Google-Smtp-Source: AGHT+IEsmsCb/yYuuqx2qRej3K8HXqzpMh132VXeVcSVpSJNJ71vE9kuynqV2y3gqWSc2Gbufdn/ X-Received: by 2002:a05:620a:1907:b0:7ca:ca00:73f with SMTP id af79cd13be357-7cd01119af4mr2065578685a.30.1747039562964; Mon, 12 May 2025 01:46:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747039562; cv=none; d=google.com; s=arc-20240605; b=kGyJpfF56qOjo9kr6qMgQIgQIZjCwyJ3j2nZA4QPtxYBRN023dbGrxYVvugujEPu/p P4YkaRb9aZWKQxHDpOkXl82Q72xpf6GhxX9VbTA5EYcrc1L3IJUnbuo+oKI5zlGU0ei9 KweCwxU5ln5n08lKkxqf12aS16Rm4hnW3D/MISPPIOA740u6BtpqasCV9LMyPcqr2sds UFrhf0h4++sQLZ56ia8O+0126MCoMj8QGtB86TBF+tzBE72dazFJsIMdYPkR72xPTfrN yOE8E/XKaLUhFc6zMkWSQO7s1T04znldaW0uiBuG+8wiT9FCpVmgaqemtlWCxNDoJUiQ DAeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=gwde4m2vNeqC4ktqkmubqWfBQE/iNIb7Ju0SaXdDpA0=; fh=Ncl/2H2FpHFyQPDEI+akN/dcSz5rzMHPSrZYqm/0AUw=; b=k8DORKV8ysr7jt2TAZjqlp6inJ28d7XN8/jEoHftTy71RfwiWM+JE2jGH7FXGEhc3T Q+91p60UjKd+HHU1aXUnwjgu6I+jIzIrhdGfcassULqqKdCbY7ZIPgXzRcG6/IlbPYPn lXzUBjsINjm6u/ddE4ZSe0OuryJ9MYhAz+BFC/FDxZH85T2P7qT7ifEImKXsN9Oyeuvy W4ZvVdOlG1HAKyuw+nqI8NllWicTs7FEI9+kKeGp2XBsb8FeZM67niAoU9sHlqmGiM3H 928aDw0F1xOmLyrlXIY1L9GwXyYJT4qnvfdlZ5jHT3jdTZEo7PExoN/cbFTr5cmjrYgy youQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=f2mJv+ma; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6f6e39e7acasi88145366d6.20.2025.05.12.01.46.02 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 May 2025 01:46:02 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=f2mJv+ma; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uEOlv-0005BL-Gv; Mon, 12 May 2025 04:44:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uEOjp-0001CP-1p for qemu-devel@nongnu.org; Mon, 12 May 2025 04:42:18 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uEOjn-0001qh-7g for qemu-devel@nongnu.org; Mon, 12 May 2025 04:42:16 -0400 Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-3a1fb17a9beso1474355f8f.3 for ; Mon, 12 May 2025 01:42:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747039333; x=1747644133; 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=gwde4m2vNeqC4ktqkmubqWfBQE/iNIb7Ju0SaXdDpA0=; b=f2mJv+maOY+tLHlnHcez7ClcjskiYbJrTWu4lgO0aNHpS1t0+KSy5SItXZ3zp1qkvC o7NN4pOrXHN/Ej0ltEbuSg5n3OJcOOGdZu9TOJcCtkiAVJnPCacQWmGTEkrp9W85yHns xplGXPLSj+T2jj68EgELnJPyFn0jI5crglrLL9VXU19hGHC2Z9b//G6PkEtqrLez+toU nKC60JrJinIZckrO+nAgcS2h42X7aC1mhhCA3q9q2YZFR8KQ/3nxZVGdqK42vpH1nJqM RrLtvSNmzO/6FJquZqyrNonSO1eqmRy1juJYdLEy15nyOncokaoBeZBQHzIknnPYQZJb LeUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747039333; x=1747644133; 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=gwde4m2vNeqC4ktqkmubqWfBQE/iNIb7Ju0SaXdDpA0=; b=lL1pJdwZ4VI+buTBtXSvghx1XEU4XIKttBrVS9VkmEuYjykjG3cVoZZaxJCaxKHtez xh/aBgFSh2nbu0p6157zTjZ3UDmd2F+1+9kCsjD5l7QzXoMK+Hkr+Xs8sSdJUAwF8Yo8 9Yu4afpfnlPSi/PQE2Tu8bitMVUKKzyw8Rjrbh+wzcBnbil/T5eSBubD/wQjwDcfpL9/ wh2e/w97MFqMmEtImUXOmKaPy8W7b1+Afsl4ck+i+HxBcKwsSvSFDNfXJsg5fimB2LhA VUXJGvZos8dMXqKoMdkTAUo9seWpZYN8VR20RQGXivJG/BggZGIiLCBkaYzXSHLUTNe8 wbRw== X-Gm-Message-State: AOJu0Yz6suaywIT3SyfjM6xTmY4sfOWLCq+mbqbqGkBCcpvLxeY4cpbM LMtAVcH+qjyOJDEL7zgaZ03oMnc4vN0G7toZSrBfqhHssRKWHYtdtTwf8502Ue1UUXZixbKcO38 aAWXqtw== X-Gm-Gg: ASbGncsr7WP0ynvnCcReen0/PhDLh11warI2gT50vZd+Dse/zakfxP0TBRtFOexCWPf r+oyYfAPPcezkSnBsvoAvDacz82npx/KT1XzcWsNnZYwnMcaJ3ocoOy/71yuSqvgNICNMTX7qR1 nBl1iPYf+Nr0ULHCi2h7iS/ppNQ12420EKxgrUOi9JmwXi1kw6vS13X2xn1z81+KAFJqmWgtJm7 W8dP6E77VQ581fYS63ST/o2aSXk5wbscVZyJz8NRTMDeqJYAIDcR2qwL0T39JBAmkzEmhQD+g3n Q8R2imR1GYNY0OlEvo7r9Qyb1aWGjgYqoIFHfDxrQuFqLcXG04jZjwRZm/09toDeZxg2N1xO2Wo dc4RxnBfXjWkqV85kfCBDbCw= X-Received: by 2002:a5d:64cd:0:b0:3a0:7017:61f6 with SMTP id ffacd0b85a97d-3a1f6436694mr9961992f8f.14.1747039332786; Mon, 12 May 2025 01:42:12 -0700 (PDT) Received: from localhost.localdomain (129.163.185.81.rev.sfr.net. [81.185.163.129]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a1f5a4c599sm11874990f8f.94.2025.05.12.01.42.09 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 12 May 2025 01:42:12 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Yanan Wang , Kevin Wolf , Richard Henderson , Marcel Apfelbaum , qemu-block@nongnu.org, Fabiano Rosas , Fam Zheng , =?utf-8?q?Phil?= =?utf-8?q?ippe_Mathieu-Daud=C3=A9?= , Jason Wang , Laurent Vivier , Paolo Bonzini , Dmitry Fleytman , Eduardo Habkost , Hanna Reitz , Zhao Liu , John Snow , Gerd Hoffmann , "Michael S. Tsirkin" , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= Subject: [PATCH v4 16/19] hw/scsi/vmw_pvscsi: Convert DeviceRealize -> InstanceInit Date: Mon, 12 May 2025 10:39:45 +0200 Message-ID: <20250512083948.39294-17-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250512083948.39294-1-philmd@linaro.org> References: <20250512083948.39294-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::430; envelope-from=philmd@linaro.org; helo=mail-wr1-x430.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Simplify replacing pvscsi_realize() by pvscsi_instance_init(), removing the need for device_class_set_parent_realize(). Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Daniel P. Berrangé Reviewed-by: Zhao Liu --- 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[] = { DEFINE_PROP_UINT8("use_msg", PVSCSIState, use_msg, 1), }; -static void pvscsi_realize(DeviceState *qdev, Error **errp) +static void pvscsi_instance_init(Object *obj) { - PVSCSIClass *pvs_c = PVSCSI_GET_CLASS(qdev); - PCIDevice *pci_dev = PCI_DEVICE(qdev); - - pci_dev->cap_present |= QEMU_PCI_CAP_EXPRESS; - - pvs_c->parent_dc_realize(qdev, errp); + PCI_DEVICE(obj)->cap_present |= QEMU_PCI_CAP_EXPRESS; } static void pvscsi_class_init(ObjectClass *klass, const void *data) { DeviceClass *dc = DEVICE_CLASS(klass); PCIDeviceClass *k = PCI_DEVICE_CLASS(klass); - PVSCSIClass *pvs_k = PVSCSI_CLASS(klass); HotplugHandlerClass *hc = HOTPLUG_HANDLER_CLASS(klass); k->realize = pvscsi_realizefn; @@ -1290,8 +1284,6 @@ static void pvscsi_class_init(ObjectClass *klass, const void *data) k->device_id = PCI_DEVICE_ID_VMWARE_PVSCSI; k->class_id = PCI_CLASS_STORAGE_SCSI; k->subsystem_id = 0x1000; - device_class_set_parent_realize(dc, pvscsi_realize, - &pvs_k->parent_dc_realize); device_class_set_legacy_reset(dc, pvscsi_reset); dc->vmsd = &vmstate_pvscsi; device_class_set_props(dc, pvscsi_properties); @@ -1306,6 +1298,7 @@ static const TypeInfo pvscsi_info = { .class_size = sizeof(PVSCSIClass), .instance_size = sizeof(PVSCSIState), .class_init = pvscsi_class_init, + .instance_init = pvscsi_instance_init, .interfaces = (const InterfaceInfo[]) { { TYPE_HOTPLUG_HANDLER }, { INTERFACE_PCIE_DEVICE }, From patchwork Mon May 12 08:39:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 889352 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp1498306wrr; Mon, 12 May 2025 01:45:41 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWqMm4mJstaUSMnoG1YqTGk+7/IDG3Zmafmx3m5/yJSt+0I2cuK0X33aYP7RIgwc5u2oUVPjQ==@linaro.org X-Google-Smtp-Source: AGHT+IFMernmwnj+hbfXwgM93LG2TqMAnKHeJbM6kD2HEe6yehPbGLe5WDZ8Ml9NgVxwf8K5kUPD X-Received: by 2002:a05:6214:242b:b0:6eb:2e6c:3e02 with SMTP id 6a1803df08f44-6f6e47e69c1mr186383776d6.21.1747039541656; Mon, 12 May 2025 01:45:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747039541; cv=none; d=google.com; s=arc-20240605; b=jqKTwjoA2tErn7jhT7d2YT7BrcKlXyDUtiCM0AxAswH1bUgfWF75y1XJfPeigI5+st 67aMOpsymA5J97NIw/XUH6/kUYOAEtN+N60VaPjj3VRV0YUjF7dovbIcLehVKz4rYvUZ quewh+CTiF17x/CYxifLcsGaaFtPzctk67vjz98OoTRNQlC+t4qAXfEqCrWxpVgyyJtX 5Z/ufGzQ4EoMsVZ48cgvkhiSBLhjFWvcnfAZTt52gX+iDfY9zw/oiM2gZjR4krwxh2U1 e0TnBS2xH+7VAd9lXfJJkf5Lx/Wsy1fumhpj2l8kEfs6xLNAObeuT9jTJOkoMpMcEh2t ITzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=3kxaR/wAkaJaIx+pHgtintPSbDvCY+67DbaRSgHW/bQ=; fh=Ncl/2H2FpHFyQPDEI+akN/dcSz5rzMHPSrZYqm/0AUw=; b=BLuq9LzRCrvcDbyCC9l7GD7GhnPKYZRlh9QQDy7WUnAmMCy7RO7k67io/A9Ynq8gUa maUY5G896E7VXos7Wiz2QWtD28JgdrEnEIDUtL4WS0RIEHRuG0QVuSaX4UvuODwoVydh B/KuanTj2+y6H9BY5+Bc44c59m+6tIugn9WcsD39lFrtfobt/YKyfHpYZpqHNSokDv7X glCgBxL8Q0b7Eks7ku26VhoJ96ZJgiQfQyrNFhoy45JOBPQ7RlFWHP5efrN4CAckrGUT rAGVdaNs5+eZBrOnzk/V/brDsCT8VMLWfarunjk14Y8+ExC1qDxbzTsrXnx59txuIHBZ 6jbg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=USeaVPFy; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6f6eb0f6926si60737106d6.439.2025.05.12.01.45.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 May 2025 01:45:41 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=USeaVPFy; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uEOku-0003If-Iz; Mon, 12 May 2025 04:43:25 -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 1uEOjy-0001UR-Jo for qemu-devel@nongnu.org; Mon, 12 May 2025 04:42:27 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uEOjw-0001rJ-Vk for qemu-devel@nongnu.org; Mon, 12 May 2025 04:42:26 -0400 Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-3a0ac853894so3599167f8f.3 for ; Mon, 12 May 2025 01:42:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747039343; x=1747644143; 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=3kxaR/wAkaJaIx+pHgtintPSbDvCY+67DbaRSgHW/bQ=; b=USeaVPFyCPiQTxg6j6zAlHnWCC53HIaB8fLkuBntp2GT2Fu3KnA5HhJgxgFZDcE2Se q9Ddj4QUV6d7SQgXa9v38nZkw/wh7wmhdGN84jhlOj/vqA02ZXaQVDTAcu9x4H9FqWkj vTUCoZYPP7DUdW4snCup/bS+zKg2PLJwsv6LuRYDHfjgybVAHnkuCsd7vD2DiF5QD5Vh xu9e+P0mlbPa4pDFfbDgEGqnCb22kaZGeer5w/rCQkdnA2rsAw3+fa5zEh0LmGW8O2Ta gZHiJDwojuFGEOtfE6JjLGZdbRj9ZWHzjz28p4nduagZnDZszcYSgx46tN86u6PWNbWT nF/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747039343; x=1747644143; 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=3kxaR/wAkaJaIx+pHgtintPSbDvCY+67DbaRSgHW/bQ=; b=KFQy1uGnhSVw6uiChFHgUfhp9cAgHS3VNLxX4hf4U4627DvrmgGpt2mwyH/NkLBdtt lg2870P5SlX1ijReCYQ7CZNXajJ6gFLJbL4DMcppYH4t/Zl6PFpt8TgVy4dPFy13YNDG pNVz5DXNRAwLEaXIegV6IiMFSlk9lEHa3YSWYb1EZA08s+18LmpHmIIhHh1f0pjXG8Qf 0MwbodJu0CVUep5yIb+kjyacV7tgoavUzXFw0H0LwWlX+O3TBHB8rkU59vHIPZlV7KjK oORB9j+AaoezFkqGGtAmzN5taxTQ9s4ah07/1I6vw2HXMuRizOVDgoW5zArzKbVp79yn 0o4A== X-Gm-Message-State: AOJu0YzTINv0ya8/1jwTE/4lmf715wW/L2uScisOmtjBbxsimOojNbkz d+rHoDKOZ0yzLJUaLMlbzpxdLLIFpvCy+c8SgCHVxy/h3ancWBmbM1k4X0p7t8Ceqgh3c0fNE+5 sc0/O9w== X-Gm-Gg: ASbGncuSWU7gqf6FIORrn5Xs4CbiyTPu3HKE6ak3GLxwH8rHyHsSypiBNMMZwQBUWQo txA9cgZoa1llfw7jMnYJW5kXzxvXEKQInTkyKqlJK56opRiaKQvlqC3Nhz4JhLshFmTedNe/fps 1lsJM7nM5CnY/xfxF6XuQ44A0hZyEUQwmdhM/sPC+T/tzqMLrNb9M7ZK24j5oEyt4lSHRLWk2Hm UN7k2sWQ78Z/V9fCPpnPJWuMQeGCDbzveme+MX4iKW45sBcdyQuiHy5Y8eu7J1t3k6CvhD+96iF 2DoLHegdYR8223VqEERU7cB8Ssv5dRxkAvKZBz3Htelcuu8AlVhA1Nj5WTLF9q1ntWvmPsqBuLd fu32/wp7lsTyIbcNdca3OuBs= X-Received: by 2002:a05:6000:4313:b0:3a0:90c3:dd90 with SMTP id ffacd0b85a97d-3a1f6427809mr8694082f8f.11.1747039343167; Mon, 12 May 2025 01:42:23 -0700 (PDT) Received: from localhost.localdomain (129.163.185.81.rev.sfr.net. [81.185.163.129]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a1f5a4bc06sm11624364f8f.87.2025.05.12.01.42.19 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 12 May 2025 01:42:22 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Yanan Wang , Kevin Wolf , Richard Henderson , Marcel Apfelbaum , qemu-block@nongnu.org, Fabiano Rosas , Fam Zheng , =?utf-8?q?Phil?= =?utf-8?q?ippe_Mathieu-Daud=C3=A9?= , Jason Wang , Laurent Vivier , Paolo Bonzini , Dmitry Fleytman , Eduardo Habkost , Hanna Reitz , Zhao Liu , John Snow , Gerd Hoffmann , "Michael S. Tsirkin" , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= Subject: [PATCH v4 17/19] hw/net/vmxnet3: Remove VMXNET3_COMPAT_FLAG_OLD_MSI_OFFSETS definition Date: Mon, 12 May 2025 10:39:46 +0200 Message-ID: <20250512083948.39294-18-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250512083948.39294-1-philmd@linaro.org> References: <20250512083948.39294-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=philmd@linaro.org; helo=mail-wr1-x42f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org VMXNET3_COMPAT_FLAG_OLD_MSI_OFFSETS was only used by the hw_compat_2_5[] array, via the 'x-old-msi-offsets=on' 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é Reviewed-by: Daniel P. Berrangé Reviewed-by: Zhao Liu --- 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 /* 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) #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) #define VMXNET3_BAR0_IDX (0) @@ -61,8 +56,7 @@ #define VMXNET3_MSIX_BAR_IDX (2) #define VMXNET3_OFF_MSIX_TABLE (0x000) -#define VMXNET3_OFF_MSIX_PBA(s) \ - ((s)->compat_flags & VMXNET3_COMPAT_FLAG_OLD_MSI_OFFSETS ? 0x800 : 0x1000) +#define VMXNET3_OFF_MSIX_PBA (0x1000) /* 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); 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, Error **errp) /* Interrupt pin A */ pci_dev->config[PCI_INTERRUPT_PIN] = 0x01; - ret = msi_init(pci_dev, VMXNET3_MSI_OFFSET(s), VMXNET3_MAX_NMSIX_INTRS, + ret = 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 = { static const Property vmxnet3_properties[] = { 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), }; From patchwork Mon May 12 08:39:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 889349 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp1498085wrr; Mon, 12 May 2025 01:44:55 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUwZJtruaDNxXJ6xx/jBPq7HD1I5ReNCSOc4xRUg1YwRiC+pxSM7KL2mPA9/AVg4rO5lbIQqg==@linaro.org X-Google-Smtp-Source: AGHT+IFcq89S/ta9fQYswtWg1dhAFNUsrXrstXW1A8wFRDfawcl/SURhN0wMX1QywXgiecJHsXQ0 X-Received: by 2002:a05:622a:5a89:b0:494:7e24:4ef2 with SMTP id d75a77b69052e-4947e245055mr21034901cf.23.1747039495028; Mon, 12 May 2025 01:44:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747039495; cv=none; d=google.com; s=arc-20240605; b=L6Eayp7g08lHG9M2LhK4SvmbXk5/Rdo693JT88s7DA2MdcIeP4uWdNURcO8QhwHe9Z px92GYsL3sbFeYItVX2SG/oxqBwoB9Vtv/y/7aNpVuEtToZ+ktEgCK5WD5EQtw3OuC3k zUrF9hPvoHw4O3qKPkxtjRQXxPmjmA8SN3Mh9i+j+IWC7GxPgWmMllvHbg9UXFdu0y+1 tegzciv9t7yJKhPxi6PkkqjxaATn7xlTJraLIFdfI8NP2WFCvwh1V+6QdbGWyxfbSoQh ntBBzpoFiEza3an92FOtuhGygXaQX/SeF1ZtrXaOivb2qx7Q/9mY4RfYNSYOWM61jzS5 vIUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=P7mzFRrb3yOGmhUTPeHBYB68PxuCxaodYF8btQSDpv0=; fh=Ncl/2H2FpHFyQPDEI+akN/dcSz5rzMHPSrZYqm/0AUw=; b=I4QRCsJbBaFY9ZTp+3SwX8BeSF0UaKsx6L0j0xa17xpxQvN9zrLUFpxNWonyUsScr0 2gdqXc5q3g/S51gRx3ot/qrWjb5XSMjKq5IyuskmKZn2BAs8A/6+rzIUJmsbjcB4EFrL cdCUgvnBhHrQF60e5YqawSBpE4mZVs3NMynDH1KktM8ZL84lYtdFFMQFkmUPuwA2Rmgt +1v3bCs8zw6oWfepaecttNBAQN47VVGp2nbF7E2ilGGTYpMTnkHdbk/S+Ufixo4Tceea sAEjwvFLRJBgTkHHGYGsE66pVLiS5MFl9FJg3Olt+YhDkWXBSrK4gKfMTa1LghL2kJXc 6+8w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=aSLd9Ta0; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-4945258138bsi86259901cf.399.2025.05.12.01.44.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 May 2025 01:44:55 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=aSLd9Ta0; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uEOlf-0003mM-Tm; Mon, 12 May 2025 04:44:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uEOk7-0002Aw-51 for qemu-devel@nongnu.org; Mon, 12 May 2025 04:42:35 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uEOk5-0001rl-2I for qemu-devel@nongnu.org; Mon, 12 May 2025 04:42:34 -0400 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-441ab63a415so41149075e9.3 for ; Mon, 12 May 2025 01:42:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747039351; x=1747644151; 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=P7mzFRrb3yOGmhUTPeHBYB68PxuCxaodYF8btQSDpv0=; b=aSLd9Ta0ZrCwFGgE6iHi5/p9Qy8gZ7s1DonFdppbzlED6FWhB2ZJywME9wZgE9YpTO /Y904PR75Yi62WiJYg4x9XRCtUF6Z7S0/uYXKdqUpkrO+9A71UQUQGhKpVDYriQZu6ho tZWjgcSx47oWsscV5e7MpgrQQxTSwysAlMAFo+lmwdhSqgR/JBqfBoGxqDa1JqfOp6Yk zm2Mt1foVtAVshnMOmjkrXQ0Vt3cWCDpeEydwxpaHHf7cLyugOWK1knmpzGAnLBuZDg2 6GKpzybuAcaHzg8pGkd/xVIoA0MJNxwxBfz2JQrURHNealQR6zAZ0icFNIXi2D9A14WV 4MTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747039351; x=1747644151; 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=P7mzFRrb3yOGmhUTPeHBYB68PxuCxaodYF8btQSDpv0=; b=Ea0UoKm1tPjbojLQ3B53oeBdLFO2wERs2n0n/s4s0Y/eFImRs/EpeluizQZc6iEjUD WJOZ3qptXGdI6z4gjDvxpRs5nMeqwtr6ZcHCCNqtpH64dYtwH6E2wM+6lIbMHU5s7IfE r9yZ4RO4TmMzgrbbwaePOb6Lauhy3dkA6/6iq3JZc2efrNjSx8NzaiuCvCACQCQt6zR2 FLhxKMGiP7LnAcXDNcPRCXOpcNeC0HY2/jldNOkt4qb45s7Gkz8yVdwG/dqNyP7D9k3z yljqahL07gRZVE4OwjaRfKw0Splm62X7B+OiDGIoLUfmPlp5zUb5LJtbj1bkmi+qc1l/ S/KQ== X-Gm-Message-State: AOJu0YyYL7ErOF1tKvYWFQmtSx8CuCwyU5RDcyl+bXkmfmo93JU33WC/ gxNgT9WBFfi/Br8NeS3+CXindzEKQQ+h0oUNlcbsohBqNTXziqKZ7iriKym/v+Jm4l9c9gQA24n 8LiV55w== X-Gm-Gg: ASbGncuMHjS2IVDzugA68MdaVYNIs47Gyyl9KU9F7sfI+JLDxmVU/8sZ75Do3c55nrB Ru0xA7cbVyru+kZOePvP7tQ6H5UYXEBAj0BK3NEifTCT1zyFJOh80A5ieuuCI+YH+yoOKCHn86x JZgcMUbaXZwAUHzFLHEraGVvKmO/AKTNXji1fYulpSYJvmYfzNaVN/auOwkgMHI9622FfMfG4Pt IipJ30i5SgKkKyQzlHX9xw6HA7MFuqf72Txvb0bt8Hstk3RyJMIBe+Bj7ojjtAlhrrEriWxcNOk m1vsW7uu2xP3+AqJNSDaWr6XLnz/862FXrVLfu6IvgSpb4Q/yzOs+qKE/RfGIJ10o7pLy8TlCuz /Z4rTyJxOPfVXB3x76vfJ0ag/+hH1WCsEZg== X-Received: by 2002:a05:600c:6487:b0:43d:7a:471f with SMTP id 5b1f17b1804b1-442d6d5d178mr102814645e9.18.1747039351104; Mon, 12 May 2025 01:42:31 -0700 (PDT) Received: from localhost.localdomain (129.163.185.81.rev.sfr.net. [81.185.163.129]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a1f58f2f65sm11877250f8f.55.2025.05.12.01.42.28 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 12 May 2025 01:42:30 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Yanan Wang , Kevin Wolf , Richard Henderson , Marcel Apfelbaum , qemu-block@nongnu.org, Fabiano Rosas , Fam Zheng , =?utf-8?q?Phil?= =?utf-8?q?ippe_Mathieu-Daud=C3=A9?= , Jason Wang , Laurent Vivier , Paolo Bonzini , Dmitry Fleytman , Eduardo Habkost , Hanna Reitz , Zhao Liu , John Snow , Gerd Hoffmann , "Michael S. Tsirkin" , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= Subject: [PATCH v4 18/19] hw/net/vmxnet3: Remove VMXNET3_COMPAT_FLAG_DISABLE_PCIE definition Date: Mon, 12 May 2025 10:39:47 +0200 Message-ID: <20250512083948.39294-19-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250512083948.39294-1-philmd@linaro.org> References: <20250512083948.39294-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=philmd@linaro.org; helo=mail-wm1-x32f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org VMXNET3_COMPAT_FLAG_DISABLE_PCIE was only used by the hw_compat_2_5[] array, via the 'x-disable-pcie=on' 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é Reviewed-by: Daniel P. Berrangé Reviewed-by: Zhao Liu --- 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 -/* 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 = { static const Property vmxnet3_properties[] = { DEFINE_NIC_PROPERTIES(VMXNET3State, conf), - DEFINE_PROP_BIT("x-disable-pcie", VMXNET3State, compat_flags, - VMXNET3_COMPAT_FLAG_DISABLE_PCIE_BIT, false), }; static void vmxnet3_realize(DeviceState *qdev, Error **errp) @@ -2476,9 +2469,7 @@ static void vmxnet3_realize(DeviceState *qdev, Error **errp) PCIDevice *pci_dev = PCI_DEVICE(qdev); VMXNET3State *s = VMXNET3(qdev); - if (!(s->compat_flags & VMXNET3_COMPAT_FLAG_DISABLE_PCIE)) { - pci_dev->cap_present |= QEMU_PCI_CAP_EXPRESS; - } + pci_dev->cap_present |= QEMU_PCI_CAP_EXPRESS; vc->parent_dc_realize(qdev, errp); } From patchwork Mon May 12 08:39:48 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 889355 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp1499007wrr; Mon, 12 May 2025 01:48:16 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVFKunW14ki6tXiXl051zeGzYgoyTUse1el60155m47v+G7SuFqD/pVPHJlyvmF4rBSKFQbpQ==@linaro.org X-Google-Smtp-Source: AGHT+IHeNoUcHroc7a3NarxmBj4VtjAZckBsryHHC6mJsHHxg75bw6i2do6S2mShj3512VS3FvGK X-Received: by 2002:a05:620a:2585:b0:7c5:5f58:9158 with SMTP id af79cd13be357-7cd010d5178mr1689689285a.9.1747039696408; Mon, 12 May 2025 01:48:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747039696; cv=none; d=google.com; s=arc-20240605; b=iTQ28kUfCPWrtT7c5S/ontqgXte0qiIz2Y76XwzkhGfSs+8KRAN6KwW1ejzi4s7yVz 79Z160T/i4SnG4XZo4baamAe5Vxo6CrnMdnytZnl5lhyLkoEZR9YeDU3ayJ+DdgaGILr l+xKAjXgFCAyNF/xwMoJChnV2K3B6iwscmVP5tOI6X9hm8ScUYuUExleAV4UYmNQK9LA x8q5qE6RB/8G6DYU3QGbJXn2F7i2LJGXAWjlNYX8ErKZZblzrTd5CVtM+9Zfn6Zv9uJb nd/LSNhsDUBmdC6stjz1bv9B80kbT35rLbmFwSspq2b1lv+2ZiVdxe1japkV5MYxQVt/ U2Xg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=abVDebT8BBZMs6MJ6dO6mHGwZDtT7ZXaTDXgCLMhAz0=; fh=Ncl/2H2FpHFyQPDEI+akN/dcSz5rzMHPSrZYqm/0AUw=; b=FSrIcK87XNtNfqqbR6vLF9UiJGC1sL6xSdiuwE5ouhkv4BGXux4p3VwsW87+kGdJbJ NCRYTF/9+BBA33R2RxydPmLz+NG4cmPVxqj40nFGudfTT1EhZV7ELT0RnSnhC+uwemGt xu9mcDxpToxx3ZmoiARx8BEJcfm9xRyZgIl60ZZeWDz4a2Hsc4+Iq3bNmkjuvaIyM9Gd MNigls6fcP1+RwqW7KKSx71hyjYBuovoBXI36zInQJka+TbFaWrFezNrJ8V29fsoBA1d XB8bhZk/4Hwg/b45O5m0PTGFZgO89uIFxY6ewPfpo2WjSOZ3yFD3zt/9rthAiJPOH0Dy OA/Q==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=dAwOAwrQ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7cd00f51cdesi819256285a.34.2025.05.12.01.48.16 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 May 2025 01:48:16 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=dAwOAwrQ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uEOm2-0005sT-Ry; Mon, 12 May 2025 04:44: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 1uEOkG-0002Qm-8H for qemu-devel@nongnu.org; Mon, 12 May 2025 04:42:46 -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 1uEOkC-0001sI-Pn for qemu-devel@nongnu.org; Mon, 12 May 2025 04:42:43 -0400 Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-3a0b9e2d640so3815086f8f.2 for ; Mon, 12 May 2025 01:42:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747039359; x=1747644159; 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=abVDebT8BBZMs6MJ6dO6mHGwZDtT7ZXaTDXgCLMhAz0=; b=dAwOAwrQl9QcPUEXP+1992Pw8gyyTRKITC9SZRDQf3THUPHbVPwWtaF4MAgIHNZ8fB ljrqgqLJmZirMUe/Jb4zPv2rGQJ5dAR853jCYyVwJWaDa0mZA1IuSwn7g9MYj8l6WxFS Kyk9QlDKVv5IdOl+YzOI6OxwrweQc4cUayhClptjk03OaB+zv3e/jJs/ybjyHQKd6Hve fBfkSk8XJMFJDgudkec5VvBXdQ0TbkgoosV6qEPmwb2F9rvBp7Fy9Fbwz6z9jYW6Hu5b cLYlbmBmguTp+pv0EyqjlBjYYJXWvw7Vnc3aWUifpFjLpL9jx/Kj8TCOi8PSYzyJAw2v iscw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747039359; x=1747644159; 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=abVDebT8BBZMs6MJ6dO6mHGwZDtT7ZXaTDXgCLMhAz0=; b=d5bd4xmaS5j+fufPgFAS2pMTmqCta5yfvnajiaH90q8BldbjPkCwW59MQXnENe8QVR Cf0TL2DWcaK3h3Pph+8+HABb73PBUlXWcogAQCcbWxVJrF+tEHPFHdLQcxIqFcZNbfIJ 2z1MKZbZeCDfZbED97GfSCQ/fTupcl68dlxzgscUf1zWoqqg+p9Yu37d7LFZmvjcqa0Z Kc+zIVrk7k7O73N2woe2PlTB8a6iXOvBeQYpCWCk5kChbDqDcB2lhoe7TUwvdWFskjz0 uFkAa5xPiZ3GPFuQ3Xg/AdHCdYkDAGVESOGhGZxyFOhKZoCbGjRczjO2imKbf90HvIpw HGLA== X-Gm-Message-State: AOJu0Yx0hfkwR6B+4acq32zmMYq4lU8sFgePhh4ADiRsnCM8p38r8CdE K5x0jlC5dr0uxAGGS+4C/okMl/euW/B2z5UnNbyIlwYS8TObFi7h6jqeEuqpfL/KbQYSanp4JGw vF66r3g== X-Gm-Gg: ASbGncu7Er3pXUW5P8RAM3dY0OpIxzHbLkKli9WbPMM/y0JQ4B0FcT5wYo9pS1dUeZU 3oknYK8Gtrbk96xQfMfc2w3V89vpV0CaqX7tDSL6d38jdLsaEfsBv9CELZSQstZZQqj/56T+2MU YMhRI3MktXDYF4cyDOVCHCGFNSsl8q+MXlMdw4hUFpLyj8UVdBwo/+YuIAoQAbmOIMX0lYkcg64 6zUmnc2MUfjz5W72ILeoRp67in4iCxEr8XrzsyzPWNmAmqmc6RaMIzOx+wnn6alIYGY+FNhX44B TKO6wBGYnj8JcGc5Gmg21r2akse5Qo/tDNTOZe3cMNVzzlwmL4A9CigOqbx0WMEy60RctHHVDpI rf900oWa4Wo/ugPGr3pIWOLw= X-Received: by 2002:a05:6000:4008:b0:39f:175b:a68d with SMTP id ffacd0b85a97d-3a1f643a59emr8276841f8f.11.1747039358822; Mon, 12 May 2025 01:42:38 -0700 (PDT) Received: from localhost.localdomain (129.163.185.81.rev.sfr.net. [81.185.163.129]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a1f5a2d2e9sm11636692f8f.75.2025.05.12.01.42.35 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 12 May 2025 01:42:38 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Yanan Wang , Kevin Wolf , Richard Henderson , Marcel Apfelbaum , qemu-block@nongnu.org, Fabiano Rosas , Fam Zheng , =?utf-8?q?Phil?= =?utf-8?q?ippe_Mathieu-Daud=C3=A9?= , Jason Wang , Laurent Vivier , Paolo Bonzini , Dmitry Fleytman , Eduardo Habkost , Hanna Reitz , Zhao Liu , John Snow , Gerd Hoffmann , "Michael S. Tsirkin" , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= Subject: [PATCH v4 19/19] hw/net/vmxnet3: Merge DeviceRealize in InstanceInit Date: Mon, 12 May 2025 10:39:48 +0200 Message-ID: <20250512083948.39294-20-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250512083948.39294-1-philmd@linaro.org> References: <20250512083948.39294-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=philmd@linaro.org; helo=mail-wr1-x431.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Simplify merging vmxnet3_realize() within vmxnet3_instance_init(), removing the need for device_class_set_parent_realize(). Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Daniel P. Berrangé Reviewed-by: Zhao Liu --- 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 |= QEMU_PCI_CAP_EXPRESS; } static void vmxnet3_pci_uninit(PCIDevice *pci_dev) @@ -2463,22 +2464,10 @@ static const Property vmxnet3_properties[] = { DEFINE_NIC_PROPERTIES(VMXNET3State, conf), }; -static void vmxnet3_realize(DeviceState *qdev, Error **errp) -{ - VMXNET3Class *vc = VMXNET3_DEVICE_GET_CLASS(qdev); - PCIDevice *pci_dev = PCI_DEVICE(qdev); - VMXNET3State *s = VMXNET3(qdev); - - pci_dev->cap_present |= QEMU_PCI_CAP_EXPRESS; - - vc->parent_dc_realize(qdev, errp); -} - static void vmxnet3_class_init(ObjectClass *class, const void *data) { DeviceClass *dc = DEVICE_CLASS(class); PCIDeviceClass *c = PCI_DEVICE_CLASS(class); - VMXNET3Class *vc = VMXNET3_DEVICE_CLASS(class); c->realize = vmxnet3_pci_realize; c->exit = vmxnet3_pci_uninit; @@ -2489,8 +2478,6 @@ static void vmxnet3_class_init(ObjectClass *class, const void *data) c->class_id = PCI_CLASS_NETWORK_ETHERNET; c->subsystem_vendor_id = PCI_VENDOR_ID_VMWARE; c->subsystem_id = PCI_DEVICE_ID_VMWARE_VMXNET3; - device_class_set_parent_realize(dc, vmxnet3_realize, - &vc->parent_dc_realize); dc->desc = "VMWare Paravirtualized Ethernet v3"; device_class_set_legacy_reset(dc, vmxnet3_qdev_reset); dc->vmsd = &vmstate_vmxnet3;